From c9c5dc252530a4d4b79decf3c7abde377a534ce3 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 01 十二月 2023 13:41:51 +0800
Subject: [PATCH] 身份证识别相关资源和代码

---
 app/src/main/java/com/dayu/recharge/activity/NewCardActivity.java |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/dayu/recharge/activity/NewCardActivity.java b/app/src/main/java/com/dayu/recharge/activity/NewCardActivity.java
index 007a915..8beda8e 100644
--- a/app/src/main/java/com/dayu/recharge/activity/NewCardActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/NewCardActivity.java
@@ -2,7 +2,6 @@
 
 import android.Manifest;
 import android.app.Dialog;
-import android.app.ProgressDialog;
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.InputFilter;
@@ -11,8 +10,6 @@
 import android.view.LayoutInflater;
 import android.view.View;
 
-import com.dayu.recharge.utils.DeviceNumberUtils;
-import com.msd.ocr.idcard.LibraryInitOCR;
 import com.dayu.recharge.MyApplication;
 import com.dayu.recharge.card.UserCard;
 import com.dayu.recharge.databinding.ActivityNewCardBinding;
@@ -28,8 +25,10 @@
 import com.dayu.recharge.tools.HexUtil;
 import com.dayu.recharge.tools.Utils;
 import com.dayu.recharge.utils.CRC8;
+import com.dayu.recharge.utils.DeviceNumberUtils;
 import com.dayu.recharge.utils.SocketUtil;
 import com.dayu.recharge.utils.TipUtil;
+import com.dayu.recharge.view.ProgressDialog;
 import com.permissionx.guolindev.PermissionX;
 
 import org.json.JSONException;
@@ -100,7 +99,6 @@
                         TipUtil.show(NewCardActivity.this, "璇疯緭鍏ユ纭韩浠借瘉鍙�");
                         return;
                     } else {
-                        dialog = ProgressDialog.show(NewCardActivity.this, "", "姝e湪閫氫俊璇风◢鍚�", true, true);
                         userCardBean = new UserCardBean();
                         userCardBean.setUserName(userName);
                         userCardBean.setDate(date);
@@ -135,12 +133,9 @@
 
 
     private void startCamera() {
-
-        Bundle bundle = new Bundle();
-        bundle.putBoolean("saveImage", false);
-        bundle.putInt("requestCode", SCAN_IDCARD_REQUEST);
-        bundle.putInt("type", 0); //0韬唤璇�, 1椹鹃┒璇�
-        LibraryInitOCR.startScan(NewCardActivity.this, bundle);
+        Intent intent = new Intent(NewCardActivity.this, CameraActivity.class);
+        intent.putExtra("typeFront", 1);
+        startActivityForResult(intent, 110);
     }
 
     @Override
@@ -194,7 +189,7 @@
      * 寮�鍗℃姤鏂�
      */
     private void initCard() {
-
+        ProgressDialog.show(this);
         String initCode = DeviceNumberUtils.getDeviceNumber();
         if (TextUtils.isEmpty(initCode)) {
             TipUtil.show(this, "璁惧娉ㄥ唽鍙蜂负绌猴紝璇峰厛璁剧疆IP鍜岀鐞嗗憳鍦板潃");
@@ -224,7 +219,7 @@
 
             @Override
             public void onSocketResponse(SocketData readData) {
-                dialog.dismiss();
+                ProgressDialog.dismiss();
                 if (CRC8.isCRC8(readData.getOriginDataBytes())) {
 
                     String state = BcdUtil.bcdToStr(readData.getBodyBytes()[26]); //BCD鐮�00鎴愬姛01韬唤璇佸凡娉ㄥ唽02鍏朵粬鍘熷洜澶辫触
@@ -272,7 +267,7 @@
 
             @Override
             public void onSocketError(int code, String msg) {
-                dialog.dismiss();
+                ProgressDialog.dismiss();
                 TipUtil.show(NewCardActivity.this, msg);
             }
         });
@@ -322,5 +317,10 @@
         }
     }
 
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        newCardActivity = null;
+    }
 
 }

--
Gitblit v1.8.0