From 5a8278faefaefaa90cbe438c1643c987da2f473b Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 08 十二月 2023 11:27:08 +0800
Subject: [PATCH] Changes
---
app/src/main/java/com/dayu/recharge/activity/NewCardActivity.java | 108 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 79 insertions(+), 29 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 0d5db30..815a50d 100644
--- a/app/src/main/java/com/dayu/recharge/activity/NewCardActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/NewCardActivity.java
@@ -10,9 +10,6 @@
import android.view.LayoutInflater;
import android.view.View;
-import com.dayu.recharge.utils.DeviceNumberUtils;
-import com.dayu.recharge.view.ProgressDialog;
-import com.msd.ocr.idcard.LibraryInitOCR;
import com.dayu.recharge.MyApplication;
import com.dayu.recharge.card.UserCard;
import com.dayu.recharge.databinding.ActivityNewCardBinding;
@@ -28,14 +25,24 @@
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.utils.ToastUtil;
+import com.dayu.recharge.view.ProgressDialog;
+import com.kernal.passportreader.sdk.CardsCameraActivity;
+import com.kernal.passportreader.sdk.utils.DefaultPicSavePath;
+import com.kernal.passportreader.sdk.utils.ManageIDCardRecogResult;
import com.permissionx.guolindev.PermissionX;
import org.json.JSONException;
import org.json.JSONObject;
import java.util.Arrays;
+
+import kernal.idcard.android.ResultMessage;
+import kernal.idcard.camera.CardOcrRecogConfigure;
+import kernal.idcard.camera.SharedPreferencesHelper;
/**
* Copyright (C), 2023,
@@ -63,6 +70,7 @@
setData();
initView();
// LibraryInitOCR.initOCR(NewCardActivity.this);
+// registerForActivityResult()
}
private void initView() {
@@ -134,12 +142,30 @@
private void startCamera() {
+ CardOcrRecogConfigure.getInstance()
+ .initLanguage(getApplicationContext())
+ .setSaveCut(true)
+ .setOpenIDCopyFuction(true)
+ .setnMainId(getSharedPreferencesStoreMainId())
+ .setnSubID(getSharedPreferencesStoreSubId())
+ .setFlag(0)
+ .setnCropType(0)
+ .setSavePath(new DefaultPicSavePath(this, true));
+ Intent intent = new Intent(this, CardsCameraActivity.class);
+ startActivityForResult(intent, SCAN_IDCARD_REQUEST);
+ }
- 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);
+ private int defValueMainId = 2;
+ private int defValueSubId = 0;
+
+ public int getSharedPreferencesStoreMainId() {
+ return SharedPreferencesHelper.getInt(
+ getApplicationContext(), "nMainId", defValueMainId);
+ }
+
+ public int getSharedPreferencesStoreSubId() {
+ return SharedPreferencesHelper.getInt(
+ getApplicationContext(), "nSubID", defValueSubId);
}
@Override
@@ -148,34 +174,57 @@
if (resultCode == RESULT_OK) {
switch (requestCode) {
case SCAN_IDCARD_REQUEST:
- String result = data.getStringExtra("OCRResult");
try {
- JSONObject jo = new JSONObject(result);
+ //璺宠浆鎵弿鐣岄潰璇嗗埆瀹屾垚涔嬪悗锛屾暟鎹洖浼�
+ if (data != null) {
+ //鏁版嵁鍥炰紶鐨勮幏鍙�
+ Bundle bundle = data.getBundleExtra("resultbundle");
+ //bundle涓嶄负null锛屼唬琛ㄨ繖璇嗗埆鎴愬姛
+ if (bundle != null) {
+ ResultMessage resultMessage = (ResultMessage) bundle.getSerializable("resultMessage");
+ newCardBinding.newCardName.setText(resultMessage.GetRecogResult[1]);
+ newCardBinding.newCardId.setText(resultMessage.GetRecogResult[6]);
+ newCardBinding.newCardIdTip.setVisibility(View.VISIBLE);
+ } else {
+ String error = data.getStringExtra("error");
+ String StrPath = data.getStringExtra("strpicpath");
+ ToastUtil.show(error);
+ }
-// sb.append(String.format("姝ｉ潰 = %s\n", jo.opt("type")));
-// sb.append(String.format("濮撳悕 = %s\n", jo.opt("name")));
-// sb.append(String.format("鎬у埆 = %s\n", jo.opt("sex")));
-// sb.append(String.format("姘戞棌 = %s\n", jo.opt("folk")));
-// sb.append(String.format("鏃ユ湡 = %s\n", jo.opt("birt")));
-// sb.append(String.format("鍙风爜 = %s\n", jo.opt("num")));
-// sb.append(String.format("浣忓潃 = %s\n", jo.opt("addr")));
-// sb.append(String.format("绛惧彂鏈哄叧 = %s\n", jo.opt("issue")));
-// sb.append(String.format("鏈夋晥鏈熼檺 = %s\n", jo.opt("valid")));
-// sb.append(String.format("鏁翠綋鐓х墖 = %s\n", jo.opt("imgPath")));
-// sb.append(String.format("澶村儚璺緞 = %s\n", jo.opt("headPath")));
-
- newCardBinding.newCardName.setText(jo.opt("name").toString());
- newCardBinding.newCardId.setText(jo.opt("num").toString());
- newCardBinding.newCardIdTip.setVisibility(View.VISIBLE);
-
- } catch (JSONException e) {
- throw new RuntimeException(e);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
}
+
break;
}
}
}
+
+ /**
+ * 杩涘叆鐩告満鐣岄潰鎵弿鎴愬姛涔嬪悗鐨勮皟鐢�
+ */
+ private void CameraScanSuccess(Bundle bundle) {
+ ResultMessage resultMessage = (ResultMessage) bundle.getSerializable("resultMessage");
+ String[] picPath = bundle.getStringArray("picpath");
+ //鏁版嵁鐨勫皝瑁�
+ String result = ManageIDCardRecogResult.managerSucessRecogResult(resultMessage, getApplicationContext());
+ try {
+ /**
+ * @param recogResult 璇嗗埆缁撴灉
+ * @param picPath 鍥剧墖璺緞鏁扮粍锛宲icPath[0]: 鍏ㄥ浘璺緞锛沺icPath[1]: 瑁佸垏鍥撅紱picPath[2]: 璇佷欢澶村儚
+ */
+// Intent intent = new Intent(this, ShowResultActivity.class);
+// intent.putExtra("recogResult", result);
+// intent.putExtra("fullPagePath", picPath[0]);
+// intent.putExtra("cutPagePath", picPath[1]);
+// startActivity(intent);
+ } catch (Exception e) {
+
+ }
+ }
+
private void setData() {
@@ -320,10 +369,11 @@
return (c >= 0x4e00 && c <= 0x9fa5);
}
}
+
@Override
protected void onDestroy() {
super.onDestroy();
- newCardActivity=null;
+ newCardActivity = null;
}
}
--
Gitblit v1.8.0