From 44809df2cfd9cf0edf8d08bd8649c74747be8877 Mon Sep 17 00:00:00 2001 From: lijia Date: Thu, 31 Aug 2023 16:42:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A5=94=E6=BA=83=E9=97=AE=E9=A2=98=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hndahesudintocctmsdriver/ui/home/HomeFragment.java | 2 +- .../main/java/com/baidu/ocr/ui/camera/Camera1Control.java | 3 ++- .../main/java/com/baidu/ocr/ui/camera/Camera2Control.java | 5 +++-- .../main/java/com/baidu/ocr/ui/camera/CameraActivity.java | 5 +++-- .../src/main/java/com/baidu/ocr/ui/camera/CameraView.java | 3 ++- .../main/java/com/baidu/ocr/ui/camera/ICameraControl.java | 3 ++- ocr_ui/src/main/java/com/baidu/ocr/ui/camera/MaskView.java | 7 ++++--- 7 files changed, 17 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java index d6a5f1b..4803723 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java @@ -341,7 +341,7 @@ public class HomeFragment extends BaseFragment { // TODO: 2023/8/30 测试orc拍照 Intent intent = new Intent(getActivity(), CameraActivity.class); intent.putExtra(CameraActivity.KEY_OUTPUT_FILE_PATH, - new File(getActivity().getFilesDir(), "pic.jpg")); + new File(getActivity().getFilesDir(), "pic.jpg").getAbsolutePath()); intent.putExtra(CameraActivity.KEY_CONTENT_TYPE, CameraActivity.CONTENT_TYPE_ID_CARD_FRONT); startActivityForResult(intent, 1111); diff --git a/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/Camera1Control.java b/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/Camera1Control.java index 50b3ffc..bf1e9eb 100644 --- a/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/Camera1Control.java +++ b/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的封装。 */ diff --git a/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/Camera2Control.java b/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/Camera2Control.java index aab3307..a8304d1 100644 --- a/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/Camera2Control.java +++ b/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 diff --git a/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/CameraActivity.java b/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/CameraActivity.java index 2591ca4..d580876 100644 --- a/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/CameraActivity.java +++ b/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"; diff --git a/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/CameraView.java b/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/CameraView.java index bed99d1..ac6a6a2 100644 --- a/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/CameraView.java +++ b/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; + /** * 负责，相机的管理。同时提供，裁剪遮罩功能。 */ diff --git a/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/ICameraControl.java b/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/ICameraControl.java index d676070..6575e2f 100644 --- a/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/ICameraControl.java +++ b/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; /** diff --git a/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/MaskView.java b/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/MaskView.java index e3c39a5..64dec3c 100644 --- a/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/MaskView.java +++ b/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 {