奔溃问题处理

ocr_ui/src/main/java/com/baidu/ocr/ui/camera/Camera1Control.java

@@ -19,11 +19,12 @@ import android.graphics.Rect;
 import android.graphics.SurfaceTexture;
 import android.graphics.YuvImage;
 import android.hardware.Camera;
-import android.support.v4.app.ActivityCompat;
 import android.view.TextureView;
 import android.view.View;
 import android.widget.FrameLayout;
 
+import androidx.core.app.ActivityCompat;
+
 /**
  * 5.0以下相机API的封装。
  */

ocr_ui/src/main/java/com/baidu/ocr/ui/camera/Camera2Control.java

@@ -40,8 +40,6 @@ import android.media.ImageReader;
 import android.os.Build;
 import android.os.Handler;
 import android.os.HandlerThread;
-import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
 import android.util.Size;
 import android.util.SparseIntArray;
 import android.view.Surface;
@@ -49,6 +47,9 @@ import android.view.TextureView;
 import android.view.View;
 import android.view.WindowManager;
 
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+
 @TargetApi(Build.VERSION_CODES.LOLLIPOP)
 public class Camera2Control implements ICameraControl {
     @Override

ocr_ui/src/main/java/com/baidu/ocr/ui/camera/CameraActivity.java

@@ -26,13 +26,14 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.provider.MediaStore;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
 import android.view.Surface;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+
 public class CameraActivity extends Activity {
 
     public static final String KEY_OUTPUT_FILE_PATH = "outputFilePath";

ocr_ui/src/main/java/com/baidu/ocr/ui/camera/CameraView.java

@@ -23,7 +23,6 @@ import android.graphics.Rect;
 import android.media.ImageReader;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.IntDef;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.Gravity;
@@ -33,6 +32,8 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.annotation.IntDef;
+
 /**
  * 负责，相机的管理。同时提供，裁剪遮罩功能。
  */

ocr_ui/src/main/java/com/baidu/ocr/ui/camera/ICameraControl.java

@@ -4,9 +4,10 @@
 package com.baidu.ocr.ui.camera;
 
 import android.graphics.Rect;
-import android.support.annotation.IntDef;
 import android.view.View;
 
+import androidx.annotation.IntDef;
+
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**

ocr_ui/src/main/java/com/baidu/ocr/ui/camera/MaskView.java

@@ -17,12 +17,13 @@ import android.graphics.PorterDuffXfermode;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.annotation.IntDef;
-import android.support.annotation.RequiresApi;
-import android.support.v4.content.res.ResourcesCompat;
 import android.util.AttributeSet;
 import android.view.View;
 
+import androidx.annotation.IntDef;
+import androidx.annotation.RequiresApi;
+import androidx.core.content.res.ResourcesCompat;
+
 @SuppressWarnings("unused")
 public class MaskView extends View {