From d58bc0e2057f58342f490f5605eda3b80dc0ca29 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 27 三月 2024 11:47:21 +0800
Subject: [PATCH] 添加中安身份证识别相关功能 优化贴卡提示 优化二次确认的按钮样式 添加超时时不在主线程的处理
---
app/src/main/res/layout/activity_new_card.xml | 2
app/src/main/java/com/dayu/recharge/activity/NewCardActivity.java | 125 +++++++++++++++++++++++-------
app/src/main/res/layout/activity_write_text.xml | 2
app/src/main/java/com/dayu/recharge/activity/ReadCardAcitivy.java | 9 +
app/src/main/res/layout/activity_recharge.xml | 2
app/src/main/java/com/dayu/recharge/activity/NFCWreatActivity.java | 16 ++-
app/src/main/res/drawable/button_custom.xml | 17 ++++
app/src/main/java/com/dayu/recharge/net/SocketNet.java | 18 ++-
app/src/main/java/com/dayu/recharge/view/ConfirmDialog.java | 5
app/src/main/java/com/dayu/recharge/activity/RechargeActivity.java | 10 +-
app/src/main/res/layout/activity_red_card.xml | 2
app/src/main/res/layout/confirm_dialog.xml | 25 +++---
app/build.gradle | 6
13 files changed, 169 insertions(+), 70 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 5c1cf3e..30e76eb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -20,9 +20,9 @@
versionName "2.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-// ndk{
-// abiFilters 'armeabi-v7a'
-// }
+ ndk{
+ abiFilters 'armeabi-v7a'
+ }
signingConfig signingConfigs.debug
}
diff --git a/app/src/main/java/com/dayu/recharge/activity/NFCWreatActivity.java b/app/src/main/java/com/dayu/recharge/activity/NFCWreatActivity.java
index adc20fe..096e8f7 100644
--- a/app/src/main/java/com/dayu/recharge/activity/NFCWreatActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/NFCWreatActivity.java
@@ -437,7 +437,7 @@
//00鍚敤01绂佺敤02闅跺睘淇℃伅涓嶇03鏃犳鍗′俊鎭�04鍏跺畠
if ("00".equalsIgnoreCase(state)) {
rechargeIsOk = true;
- binding.cardData.setText("鍏呭�奸�氫俊瀹屾垚锛岃甯栧崱鍏呭��");
+ binding.cardData.setText("鍏呭��"+morny+"鍏冮�氫俊瀹屾垚锛岃甯栧崱鍐欏崱");
rechargeBean = new RechargeBean();
rechargeBean.setDate(System.currentTimeMillis());
rechargeBean.setMorny(morny);
@@ -480,8 +480,11 @@
@Override
public void onSocketError(int code, String msg) {
- stopAnim();
- TipUtil.show(NFCWreatActivity.this, msg);
+ runOnUiThread(() -> {
+ stopAnim();
+ TipUtil.show(NFCWreatActivity.this, msg);
+ });
+
}
});
} catch (Exception e) {
@@ -691,8 +694,11 @@
@Override
public void onSocketError(int code, String msg) {
- stopAnim();
- TipUtil.show(NFCWreatActivity.this, msg);
+ runOnUiThread(() -> {
+ stopAnim();
+ TipUtil.show(NFCWreatActivity.this, msg);
+ });
+
}
});
} catch (Exception e) {
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 64d3a63..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,6 +1,5 @@
package com.dayu.recharge.activity;
-import android.app.Dialog;
import android.content.Intent;
import android.os.Bundle;
import android.text.InputFilter;
@@ -30,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,
@@ -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(), "93",new SocketCallBack() {
+ SocketNet.getInstance().sendTestMessage(initCardRequestBean.pack(), "93", new SocketCallBack() {
@Override
public void onSocketResponse(SocketData readData) {
@@ -323,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);
+ });
}
});
diff --git a/app/src/main/java/com/dayu/recharge/activity/ReadCardAcitivy.java b/app/src/main/java/com/dayu/recharge/activity/ReadCardAcitivy.java
index 5371a40..63c6b8d 100644
--- a/app/src/main/java/com/dayu/recharge/activity/ReadCardAcitivy.java
+++ b/app/src/main/java/com/dayu/recharge/activity/ReadCardAcitivy.java
@@ -215,7 +215,7 @@
requestBean.setInitCode(initCode);
requestBean.setInitPeasantCode(initPeasantCode);
requestBean.setXuLie(SocketUtil.getXuLie(this));
- SocketNet.getInstance().sendTestMessage(requestBean.pack(), "94",new SocketCallBack() {
+ SocketNet.getInstance().sendTestMessage(requestBean.pack(), "94", new SocketCallBack() {
@Override
public void onSocketResponse(SocketData readData) {
if (CRC8.isCRC8(readData.getOriginDataBytes())) {
@@ -271,8 +271,11 @@
@Override
public void onSocketError(int code, String msg) {
- stopAnim();
- TipUtil.show(ReadCardAcitivy.this, msg);
+ runOnUiThread(() -> {
+ stopAnim();
+ TipUtil.show(ReadCardAcitivy.this, msg);
+ });
+
}
});
}
diff --git a/app/src/main/java/com/dayu/recharge/activity/RechargeActivity.java b/app/src/main/java/com/dayu/recharge/activity/RechargeActivity.java
index 57b9d9b..9e837ff 100644
--- a/app/src/main/java/com/dayu/recharge/activity/RechargeActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/RechargeActivity.java
@@ -167,12 +167,12 @@
requestBean.setInitCode(initCode);
requestBean.setInitPeasantCode(initPeasantCode);
requestBean.setXuLie(SocketUtil.getXuLie(this));
- SocketNet.getInstance().sendTestMessage(requestBean.pack(),"94", new SocketCallBack() {
+ SocketNet.getInstance().sendTestMessage(requestBean.pack(), "94", new SocketCallBack() {
@Override
public void onSocketResponse(SocketData readData) {
ProgressDialog.dismiss();
if (CRC8.isCRC8(readData.getOriginDataBytes())) {
- StringBuffer stateText ;
+ StringBuffer stateText;
try {
stateText = new StringBuffer();
String state = BcdUtil.bcdToStr(readData.getBodyBytes()[2]); //BCD鐮�00鍚敤 01绂佺敤 02闅跺睘淇℃伅涓嶇 03鏃犳鍗′俊鎭� 04鍏跺畠s
@@ -233,8 +233,10 @@
@Override
public void onSocketError(int code, String msg) {
- ProgressDialog.dismiss();
- TipUtil.show(RechargeActivity.this, msg);
+ runOnUiThread(() -> {
+ ProgressDialog.dismiss();
+ TipUtil.show(RechargeActivity.this, msg);
+ });
}
});
} catch (Exception e) {
diff --git a/app/src/main/java/com/dayu/recharge/net/SocketNet.java b/app/src/main/java/com/dayu/recharge/net/SocketNet.java
index 592d458..ebabc9d 100644
--- a/app/src/main/java/com/dayu/recharge/net/SocketNet.java
+++ b/app/src/main/java/com/dayu/recharge/net/SocketNet.java
@@ -1,8 +1,10 @@
package com.dayu.recharge.net;
+import android.app.Activity;
import android.content.Context;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
+import android.os.Looper;
import android.text.TextUtils;
import android.util.Log;
@@ -19,6 +21,8 @@
import com.easysocket.interfaces.conn.SocketActionListener;
import com.easysocket.utils.HexUtil;
import com.tencent.bugly.crashreport.CrashReport;
+
+import java.util.logging.Handler;
/**
@@ -39,10 +43,8 @@
public static SocketNet getInstance() {
if (socketNet == null) {
socketNet = new SocketNet();
- if (socketNet.socketActionListener != null) {
-
- }
}
+
return socketNet;
}
@@ -66,7 +68,7 @@
try {
mSender = null;
- myCallBack=null;
+ myCallBack = null;
Log.i("SocketActionListener", "SimpleCallBack鏀跺埌鏁版嵁-->" + HexUtil.bytesToHex(data.getBodyBytes()));
SocketData socketData = new SocketData();
socketData.setBodyData(data.getBodyBytes());
@@ -76,7 +78,7 @@
callBack.onSocketResponse(socketData);
}
} catch (Exception e) {
- e.printStackTrace();
+ e.printStackTrace();
}
}
@@ -84,20 +86,22 @@
public void onError(Exception e) {
super.onError(e);
mSender = null;
- myCallBack=null;
+ myCallBack = null;
try {
if (e instanceof RequestTimeOutException) {
+ // 鍦ㄨ繖閲屾墽琛岄渶瑕佸湪涓荤嚎绋嬩腑鎵ц鐨勬搷浣�
callBack.onSocketError(-3, "璇锋眰瓒呮椂锛屾鍦ㄩ噸璇�");
//瓒呮椂鍚庨噸鏂拌繛鎺�
EasySocket.getInstance().disconnect(true);
}
+
} catch (Exception ex) {
throw new RuntimeException(ex);
}
}
});
} else {
- callBack.onSocketError(-2, "涓庢湇鍔″櫒杩炴帴鏂紑锛岃妫�鏌ョ綉缁滐紝鎴栬�呯◢鍚庡啀璇�");
+ callBack.onSocketError(-2, "涓庢湇鍔″櫒杩炴帴鏂紑锛岃妫�鏌ョ綉缁滅◢鍚庡啀璇�");
MyApplication.myApplication.initEasySocket(false, null);
}
} else {
diff --git a/app/src/main/java/com/dayu/recharge/view/ConfirmDialog.java b/app/src/main/java/com/dayu/recharge/view/ConfirmDialog.java
index 68ccef3..ca6f98f 100644
--- a/app/src/main/java/com/dayu/recharge/view/ConfirmDialog.java
+++ b/app/src/main/java/com/dayu/recharge/view/ConfirmDialog.java
@@ -4,6 +4,7 @@
import android.app.Dialog;
import android.view.Gravity;
import android.view.View;
+import android.widget.Button;
import android.widget.TextView;
import androidx.annotation.NonNull;
@@ -39,8 +40,8 @@
getWindow().setGravity(Gravity.CENTER);
setContentView(R.layout.confirm_dialog);
setCanceledOnTouchOutside(false);
- TextView cannel = (TextView) this.findViewById(R.id.confirm_cancel);
- TextView ok = (TextView) this.findViewById(R.id.confirm_ok);
+ Button cannel = (Button) this.findViewById(R.id.confirm_cancel);
+ Button ok = (Button) this.findViewById(R.id.confirm_ok);
cannel.setOnClickListener(v -> ConfirmDialog.this.dismiss());
if (mListner == null) {
ok.setOnClickListener((View v) -> {
diff --git a/app/src/main/res/drawable/button_custom.xml b/app/src/main/res/drawable/button_custom.xml
new file mode 100644
index 0000000..55bb2e5
--- /dev/null
+++ b/app/src/main/res/drawable/button_custom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <!-- 鎸夐挳鎸変笅鏃剁殑鐘舵�� -->
+ <item android:state_pressed="true">
+ <shape android:shape="rectangle">
+ <solid android:color="#DCDCDC"/> <!-- 鎸夐挳鎸変笅鏃剁殑鑳屾櫙棰滆壊 -->
+ <corners android:radius="10dp"/> <!-- 鍦嗚鍗婂緞 -->
+ </shape>
+ </item>
+ <!-- 榛樿鐘舵�� -->
+ <item>
+ <shape android:shape="rectangle">
+ <solid android:color="#DCDCDC"/> <!-- 鎸夐挳榛樿鐨勮儗鏅鑹� -->
+ <corners android:radius="10dp"/> <!-- 鍦嗚鍗婂緞 -->
+ </shape>
+ </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_new_card.xml b/app/src/main/res/layout/activity_new_card.xml
index c365bc9..9e50706 100644
--- a/app/src/main/res/layout/activity_new_card.xml
+++ b/app/src/main/res/layout/activity_new_card.xml
@@ -67,7 +67,7 @@
android:id="@+id/newCard_scanBtn"
android:layout_width="45dp"
android:layout_height="45dp"
- android:visibility="gone"
+ android:visibility="visible"
android:padding="10dp"
android:src="@mipmap/icon_scan" />
diff --git a/app/src/main/res/layout/activity_recharge.xml b/app/src/main/res/layout/activity_recharge.xml
index d48cb50..a537772 100644
--- a/app/src/main/res/layout/activity_recharge.xml
+++ b/app/src/main/res/layout/activity_recharge.xml
@@ -25,7 +25,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:gravity="center"
- android:text="璇峰皢鍗¤创鍦ㄨ澶囦笂杩涜璇诲崱"
+ android:text="璇峰皢鍗¤创鍦ㄨ澶囬《閮ㄨ繘琛岃鍗�"
android:textSize="@dimen/text_size" />
<ImageView
diff --git a/app/src/main/res/layout/activity_red_card.xml b/app/src/main/res/layout/activity_red_card.xml
index cf603f9..c5f78cb 100644
--- a/app/src/main/res/layout/activity_red_card.xml
+++ b/app/src/main/res/layout/activity_red_card.xml
@@ -149,7 +149,7 @@
android:layout_below="@id/titleBar"
android:layout_marginTop="20dp"
android:gravity="center"
- android:text="璇峰皢鍗¤创鍦ㄨ澶囦笂杩涜璇诲崱"
+ android:text="璇峰皢鍗¤创鍦ㄨ澶囬《閮ㄨ繘琛岃鍗�"
android:textSize="@dimen/text_size" />
diff --git a/app/src/main/res/layout/activity_write_text.xml b/app/src/main/res/layout/activity_write_text.xml
index 691da23..7b59e50 100644
--- a/app/src/main/res/layout/activity_write_text.xml
+++ b/app/src/main/res/layout/activity_write_text.xml
@@ -32,7 +32,7 @@
android:layout_below="@id/cardData"
android:layout_marginTop="20dp"
android:gravity="center"
- android:text="璇峰皢鍗¤创鍦ㄨ澶囦笂杩涜鍐欏崱"
+ android:text="璇峰皢鍗¤创鍦ㄨ澶囬《閮ㄨ繘琛屽啓鍗�"
android:textSize="@dimen/text_size" />
diff --git a/app/src/main/res/layout/confirm_dialog.xml b/app/src/main/res/layout/confirm_dialog.xml
index cdde6c5..eeeb71a 100644
--- a/app/src/main/res/layout/confirm_dialog.xml
+++ b/app/src/main/res/layout/confirm_dialog.xml
@@ -18,10 +18,9 @@
android:id="@+id/confirm_data"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="22sp"
- android:textColor="#000000"
android:text="纭閫�鍑哄悧锛�"
- />
+ android:textColor="#000000"
+ android:textSize="22sp" />
<LinearLayout
@@ -29,31 +28,33 @@
android:layout_height="wrap_content"
android:orientation="horizontal">
- <TextView
+ <Button
android:id="@+id/confirm_cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
- android:background="@drawable/ws_login_red_btn_one"
- android:paddingLeft="15dp"
+ android:paddingLeft="30dp"
android:paddingTop="5dp"
- android:paddingRight="15dp"
+ android:background="@drawable/button_custom"
+ android:paddingRight="30dp"
android:paddingBottom="5dp"
android:text="鍙栨秷"
+ android:textColor="#000000"
android:textSize="@dimen/text_size" />
- <TextView
+ <Button
android:id="@+id/confirm_ok"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="100dp"
+ android:background="@drawable/button_custom"
+ android:layout_marginLeft="70dp"
android:layout_marginTop="20dp"
- android:background="@drawable/ws_login_red_btn_one"
- android:paddingLeft="15dp"
+ android:paddingLeft="30dp"
android:paddingTop="5dp"
- android:paddingRight="15dp"
+ android:paddingRight="30dp"
android:paddingBottom="5dp"
android:text="纭"
+ android:textColor="#000000"
android:textSize="@dimen/text_size" />
</LinearLayout>
--
Gitblit v1.8.0