From 22ec43b446a3a46b7947171b18f8f79aa58b8bdc Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期四, 28 三月 2024 15:37:22 +0800
Subject: [PATCH] 登录界面添加版本信息
---
app/src/main/java/com/dayu/recharge/activity/NewCardActivity.java | 130 ++++++++++++++++++++++++++++++++----------
1 files changed, 98 insertions(+), 32 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 1c3029e..43fea77 100644
--- a/app/src/main/java/com/dayu/recharge/activity/NewCardActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/NewCardActivity.java
@@ -1,11 +1,11 @@
package com.dayu.recharge.activity;
-import android.app.Dialog;
import android.content.Intent;
import android.os.Bundle;
import android.text.InputFilter;
import android.text.Spanned;
import android.text.TextUtils;
+import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
@@ -29,18 +29,22 @@
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.hjq.permissions.OnPermissionCallback;
import com.hjq.permissions.Permission;
import com.hjq.permissions.XXPermissions;
-
-import org.json.JSONException;
-import org.json.JSONObject;
+import com.kernal.passportreader.sdk.CardsCameraActivity;
+import com.kernal.passportreader.sdk.utils.DefaultPicSavePath;
import java.util.Arrays;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+
+import kernal.idcard.android.ResultMessage;
+import kernal.idcard.camera.CardOcrRecogConfigure;
+import kernal.idcard.camera.SharedPreferencesHelper;
/**
* Copyright (C), 2023,
@@ -52,7 +56,6 @@
public static final int SCAN_IDCARD_REQUEST = 1;
UserCardBean userCardBean;
- Dialog dialog;
ActivityNewCardBinding newCardBinding;
AdminDataBean adminData;
@@ -95,13 +98,10 @@
) {
if (userName.length() <= 1 || !validateName(userName)) {
TipUtil.show(NewCardActivity.this, "璇疯緭鍏ユ纭鍚�");
- return;
} else if (phone.length() < 11 || !isValidPhoneNumber(phone)) {
TipUtil.show(NewCardActivity.this, "璇疯緭鍏ユ纭墜鏈哄彿");
- return;
} else if (!Utils.check(userID)) {
TipUtil.show(NewCardActivity.this, "璇疯緭鍏ユ纭韩浠借瘉鍙�");
- return;
} else {
userCardBean = new UserCardBean();
userCardBean.setUserName(userName);
@@ -116,6 +116,69 @@
TipUtil.show(NewCardActivity.this, "璇疯緭鍏ュ畬鏁村唴瀹�");
}
});
+
+ //韬唤璇佽瘑鍒�
+ newCardBinding.newCardScanBtn.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+
+ rxPermission();
+ }
+ });
+
+ }
+
+ private void rxPermission() {
+ XXPermissions.with(this)
+ // 鐢宠鍗曚釜鏉冮檺
+// .permission(Permission.RECORD_AUDIO)
+ // 鐢宠澶氫釜鏉冮檺
+ .permission(Permission.CAMERA)
+ .request(new OnPermissionCallback() {
+
+ @Override
+ public void onGranted(@NonNull List<String> permissions, boolean allGranted) {
+ if (allGranted) {//鎵�鏈夌敵璇风殑鏉冮檺閮藉凡閫氳繃
+ startCamera();
+ }
+ }
+
+ @Override
+ public void onDenied(@NonNull List<String> permissions, boolean doNotAskAgain) {
+ if (doNotAskAgain) {
+ // 濡傛灉鏄姘镐箙鎷掔粷灏辫烦杞埌搴旂敤鏉冮檺绯荤粺璁剧疆椤甸潰
+ } else {
+// toast("鑾峰彇褰曢煶鍜屾棩鍘嗘潈闄愬け璐�");
+ }
+ }
+ });
+ }
+
+ 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);
+ }
+
+ 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);
}
private boolean isValidPhoneNumber(String phoneNumber) {
@@ -199,29 +262,28 @@
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;
}
}
@@ -270,7 +332,7 @@
initCardRequestBean.setPhone(phoneBuffer.toString());
String userId = userCardBean.getUserID();
initCardRequestBean.setIdCard(SocketUtil.str2HexStr(userId));
- SocketNet.getInstance().sendTestMessage(initCardRequestBean.pack(), new SocketCallBack() {
+ SocketNet.getInstance().sendTestMessage(initCardRequestBean.pack(), "93", new SocketCallBack() {
@Override
public void onSocketResponse(SocketData readData) {
@@ -278,9 +340,10 @@
if (CRC8.isCRC8(readData.getOriginDataBytes())) {
String state = BcdUtil.bcdToStr(readData.getBodyBytes()[26]); //BCD鐮�00鎴愬姛01韬唤璇佸凡娉ㄥ唽02鍏朵粬鍘熷洜澶辫触
+ Log.i("initCard", "state:" + state);
if (state.equalsIgnoreCase("00")) {
- String initPeasantCode = HexUtil.bytesToHex(Arrays.copyOfRange(readData.getBodyBytes(), 10, 26));
+ String initPeasantCode = HexUtil.bytesToHex(Arrays.copyOfRange(readData.getBodyBytes(), 10, 26));
String serial = baseDao.adminDao().findFirst().getSerial();
UserCard userCard = new UserCard();
userCard.setRechargeTimes(0);
@@ -322,8 +385,11 @@
@Override
public void onSocketError(int code, String msg) {
- ProgressDialog.dismiss();
- TipUtil.show(NewCardActivity.this, msg);
+
+ runOnUiThread(() -> {
+ ProgressDialog.dismiss();
+ TipUtil.show(NewCardActivity.this, msg);
+ });
}
});
--
Gitblit v1.8.0