Update build.gradle tool version

Author: zhouruotong

app/build.gradle

@@ -2,11 +2,10 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 27
-    buildToolsVersion '27.0.3'
     defaultConfig {
         applicationId "com.iknow.android"
         minSdkVersion 16
-        targetSdkVersion 24
+        targetSdkVersion 26
         versionCode 1
         versionName "1.0"
     }

app/src/main/java/com/iknow/android/features/camera/view/CameraPreviewLayout.java

@@ -18,8 +18,6 @@
 public class CameraPreviewLayout extends RelativeLayout {
 
   private Context mContext;
-  private int circleWidth = 0;//指定半径
-  private int borderWidth = 0;//指定边框
 
   public CameraPreviewLayout(Context context) {
     super(context);
@@ -41,23 +39,23 @@ private void init(Context context, AttributeSet attrs, int defStyleAttr, int def
   }
 
   public void show(CameraPreviewSurfaceView surfaceView) {
-    circleWidth = DeviceUtil.getDeviceWidth();
+    int previewWith = DeviceUtil.getDeviceWidth();
     RelativeLayout cameraRoot = new RelativeLayout(mContext);
     RelativeLayout.LayoutParams rootParams = new RelativeLayout.LayoutParams(
-        ViewGroup.LayoutParams.MATCH_PARENT, 1300);
+        ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
     rootParams.addRule(CENTER_IN_PARENT, TRUE);
     cameraRoot.setClipChildren(false);
 
     FrameLayout cameraLayout = new FrameLayout(mContext);
     Camera.Size preSize = surfaceView.getCameraSize();
-    int cameraHeight = (int) ((float) preSize.width / (float) preSize.height * circleWidth);
-    RelativeLayout.LayoutParams cameraParams = new RelativeLayout.LayoutParams(circleWidth, cameraHeight);
+    int cameraHeight = (int) ((float) preSize.width / (float) preSize.height * previewWith);
+    RelativeLayout.LayoutParams cameraParams = new RelativeLayout.LayoutParams(previewWith, cameraHeight);
     cameraParams.addRule(CENTER_IN_PARENT, TRUE);
     cameraLayout.setLayoutParams(cameraParams);
     cameraLayout.addView(surfaceView);
     CameraPreviewMaskView maskView = new CameraPreviewMaskView(mContext);
 
-    int margin = (cameraHeight - circleWidth) / 2 - borderWidth / 2;
+    int margin = (cameraHeight - previewWith) / 2;
     rootParams.setMargins(0, -margin, 0, -margin);
     cameraRoot.setLayoutParams(rootParams);
     cameraRoot.addView(cameraLayout);

app/src/main/java/com/iknow/android/features/camera/view/CameraPreviewSurfaceView.java

@@ -2,13 +2,9 @@
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Matrix;
 import android.hardware.Camera;
 import android.util.DisplayMetrics;
 import android.util.Log;
-import android.view.MotionEvent;
 import android.view.Surface;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;

app/src/main/java/com/iknow/android/features/select/VideoSelectActivity.java

@@ -28,7 +28,6 @@ public class VideoSelectActivity extends AppCompatActivity implements View.OnCli
   private VideoLoadManager mVideoLoadManager;
   private CameraPreviewSurfaceView mSurfaceView;
   private CameraPreviewLayout cameraPreviewLayout;
-  private boolean isHasSurface = false;
 
   @SuppressLint("CheckResult")
   @Override protected void onCreate(Bundle bundle) {
@@ -39,7 +38,6 @@ public class VideoSelectActivity extends AppCompatActivity implements View.OnCli
     cameraPreviewLayout = findViewById(R.id.capturePreview);
 
     mBinding.mBtnBack.setOnClickListener(this);
-    mSurfaceView = new CameraPreviewSurfaceView(this);
 
     RxPermissions rxPermissions = new RxPermissions(this);
     rxPermissions.request(Manifest.permission.READ_EXTERNAL_STORAGE).subscribe(granted -> {
@@ -62,23 +60,24 @@ public class VideoSelectActivity extends AppCompatActivity implements View.OnCli
       }
     });
     if (rxPermissions.isGranted(Manifest.permission.CAMERA)) {
-      initCameraManager();
+      initCameraPreview();
     } else {
       mBinding.cameraPreviewLy.setVisibility(View.GONE);
       mBinding.openCameraPermissionLy.setVisibility(View.VISIBLE);
       mBinding.mOpenCameraPermission.setOnClickListener(new View.OnClickListener() {
         @Override public void onClick(View v) {
           rxPermissions.request(Manifest.permission.CAMERA).subscribe(granted -> {
             if (granted) {
-              initCameraManager();
+              initCameraPreview();
             }
           });
         }
       });
     }
   }
 
-  private void initCameraManager() {
+  private void initCameraPreview() {
+    mSurfaceView = new CameraPreviewSurfaceView(this);
     mBinding.cameraPreviewLy.setVisibility(View.VISIBLE);
     mBinding.openCameraPermissionLy.setVisibility(View.GONE);
     cameraPreviewLayout.show(mSurfaceView);

build.gradle

@@ -2,16 +2,18 @@
 
 buildscript {
     repositories {
+        google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.android.tools.build:gradle:3.3.1'
         classpath 'me.tatarka:gradle-retrolambda:3.3.1'
     }
 }
 
 allprojects {
     repositories {
+        google()
         jcenter()
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip