From 3505a9caa17576606915a99191d8af9a6239c3a0 Mon Sep 17 00:00:00 2001
From: lijia <john_095130@163.com>
Date: Wed, 30 Aug 2023 15:56:18 +0800
Subject: [PATCH] =?UTF-8?q?ocr=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  3 ++-
 .../report/ALProcess.java                     |  4 ++--
 .../ui/home/HomeFragment.java                 | 23 +++++++++++++------
 settings.gradle                               |  1 +
 4 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 10198c8..1165ba6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -113,7 +113,7 @@ android {
     productFlavors {
         qa {
             manifestPlaceholders = [CHANNEL_VALUE: "好运司机测试"]
-            buildConfigField("String", "OPEN_AL_URL", "\"https://oapi-staging.alct56.com/api/v1/openapi/\"")
+            buildConfigField("String", "OPEN_AL_URL", "\"https://oapi-staging.alct56.com\"")
             buildConfigField("String", "BASE_URL", "\"http://app.test.dahehuoyun.com/api/\"")
             buildConfigField "boolean", "isTest", "true"
         }
@@ -221,5 +221,6 @@ dependencies {
     implementation 'com.github.getActivity:XToast:8.2'
 
     implementation project(path: ':mylibrary')
+    implementation project(path: ':ocr_ui')
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/report/ALProcess.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/report/ALProcess.java
index 00d390a..885ca39 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/report/ALProcess.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/report/ALProcess.java
@@ -35,9 +35,9 @@ public class ALProcess {
     //企业代码-测试
     private static final String ENTERPRISE_CODE_TEXT="E0019093";
     //企业app的身份码-测试
-    private static final String APP_IDENTITY_TEXT="07a6256cad5642138ed6e962a5a157be";
+    private static final String APP_IDENTITY_TEXT="a15b4ba5bd2542cc9a6bea9bdadf9ef9";
     //企业app验证码-测试
-    private static final String APP_KEY_TEXT="a15b4ba5bd2542cc9a6bea9bdadf9ef9";
+    private static final String APP_KEY_TEXT="07a6256cad5642138ed6e962a5a157be";
 
 
     public static void verification(Context con){
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 5691688..d6a5f1b 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
@@ -47,6 +47,7 @@ import com.arpa.hndahesudintocctmsdriver.ui.auth.CertificatesActivity;
 import com.arpa.hndahesudintocctmsdriver.ui.news.NewActivity;
 import com.arpa.hndahesudintocctmsdriver.util.MessageUtils;
 import com.arpa.hndahesudintocctmsdriver.util.string.StringUtil;
+import com.baidu.ocr.ui.camera.CameraActivity;
 import com.bumptech.glide.Glide;
 import com.google.gson.Gson;
 import com.gyf.cactus.Cactus;
@@ -94,6 +95,7 @@ import com.youth.banner.loader.ImageLoader;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -336,13 +338,20 @@ public class HomeFragment extends BaseFragment {
             }
         });
         news_btn.setOnClickListener(v -> {
-            if (UiAuxiliary.isLogin(con)) {
-                Intent in = new Intent(con, NewActivity.class);
-                startActivity(in);
-            } else {
-                Intent in = new Intent(con, LoginActivity.class);
-                startActivity(in);
-            }
+            // 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"));
+            intent.putExtra(CameraActivity.KEY_CONTENT_TYPE, CameraActivity.CONTENT_TYPE_ID_CARD_FRONT);
+            startActivityForResult(intent, 1111);
+
+//            if (UiAuxiliary.isLogin(con)) {
+//                Intent in = new Intent(con, NewActivity.class);
+//                startActivity(in);
+//            } else {
+//                Intent in = new Intent(con, LoginActivity.class);
+//                startActivity(in);
+//            }
         });
         //Intent serviceIn=new Intent(con, LocationService.class);
         //getActivity().startService(serviceIn);
diff --git a/settings.gradle b/settings.gradle
index 934a5db..fa5efdf 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,3 +6,4 @@ include ':record'
 //include ':ocr_ui'
 //include ':AliyunListPlayer'
 include ':mylibrary'
+include ':ocr_ui'