From ebc06a3ae3a42bd6ac1359a59c55d5e6f1a0e2f0 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 26 三月 2024 16:18:08 +0800
Subject: [PATCH] 优化通讯 写卡界面添加二次确认 优化用户写卡逻辑，提高写卡速度。
---
app/src/main/java/com/dayu/recharge/activity/NewCardActivity.java | 278 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 229 insertions(+), 49 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 46f9bb0..64d3a63 100644
--- a/app/src/main/java/com/dayu/recharge/activity/NewCardActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/NewCardActivity.java
@@ -1,12 +1,16 @@
package com.dayu.recharge.activity;
import android.app.Dialog;
-import android.app.ProgressDialog;
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;
+
+import androidx.annotation.NonNull;
import com.dayu.recharge.MyApplication;
import com.dayu.recharge.card.UserCard;
@@ -23,11 +27,21 @@
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.ToastUtil;
-import com.dayu.recharge.utils.WSHelper;
+import com.dayu.recharge.utils.TipUtil;
+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 java.util.Arrays;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
/**
* Copyright (C), 2023,
@@ -37,9 +51,8 @@
*/
public class NewCardActivity extends BaseNfcActivity {
-
+ public static final int SCAN_IDCARD_REQUEST = 1;
UserCardBean userCardBean;
- Dialog dialog;
ActivityNewCardBinding newCardBinding;
AdminDataBean adminData;
@@ -54,47 +67,165 @@
setContentView(newCardBinding.getRoot());
setData();
initView();
+// LibraryInitOCR.initOCR(NewCardActivity.this);
}
private void initView() {
- newCardBinding.newCardRegistBtn.setOnClickListener(new View.OnClickListener() {
+ newCardBinding.newCardName.setFilters(new InputFilter[]{new ChineseInputFilter()});
+ newCardBinding.newCardId.setFilters(new InputFilter[]{new AlphaNumericXFilter(), new InputFilter.LengthFilter(18)});
+ //韬唤璇佽瘑鍒�
+ newCardBinding.newCardScanBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- String userName = newCardBinding.newCardName.getText().toString();
- long date = System.currentTimeMillis();
- String phone = newCardBinding.newCardPhone.getText().toString();
- String userID = newCardBinding.newCardId.getText().toString().toUpperCase();
-
-
- if (!TextUtils.isEmpty(userName)
- && !TextUtils.isEmpty(phone) && !TextUtils.isEmpty(userID)
- ) {
- if (userName.length() <= 1 || !validateName(userName)) {
- ToastUtil.show(NewCardActivity.this, "璇疯緭鍏ユ纭鍚�");
- return;
- } else if (phone.length() < 11) {
- ToastUtil.show(NewCardActivity.this, "璇疯緭鍏ユ纭墜鏈哄彿");
- return;
- } else if (!Utils.check(userID)) {
- ToastUtil.show(NewCardActivity.this, "璇疯緭鍏ユ纭韩浠借瘉鍙�");
- return;
- } else {
- dialog = ProgressDialog.show(NewCardActivity.this, "", "姝ｅ湪閫氫俊璇风◢鍚�", true, true);
- userCardBean = new UserCardBean();
- userCardBean.setUserName(userName);
- userCardBean.setDate(date);
- userCardBean.setSerial(adminData.getSerial());
- userCardBean.setPhone(phone);
- userCardBean.setUserID(userID);
- initCard();
- }
-
- } else {
- ToastUtil.show(NewCardActivity.this, "璇疯緭鍏ュ畬鏁村唴瀹�");
- }
+ getPermission();
}
});
+
+ newCardBinding.newCardRegistBtn.setOnClickListener(v -> {
+
+ String userName = newCardBinding.newCardName.getText().toString();
+ long date = System.currentTimeMillis();
+ String phone = newCardBinding.newCardPhone.getText().toString();
+ String userID = newCardBinding.newCardId.getText().toString().toUpperCase();
+
+
+ if (!TextUtils.isEmpty(userName)
+ && !TextUtils.isEmpty(phone) && !TextUtils.isEmpty(userID)
+ ) {
+ 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);
+ userCardBean.setDate(date);
+ userCardBean.setSerial(adminData.getSerial());
+ userCardBean.setPhone(phone);
+ userCardBean.setUserID(userID);
+ initCard();
+ }
+
+ } else {
+ TipUtil.show(NewCardActivity.this, "璇疯緭鍏ュ畬鏁村唴瀹�");
+ }
+ });
+ }
+
+ private boolean isValidPhoneNumber(String phoneNumber) {
+ // 瀹氫箟鎵嬫満鍙风殑姝ｅ垯琛ㄨ揪寮忥紝纭繚鏁板瓧閮ㄥ垎娌℃湁杩炵画6浣嶇浉鍚岀殑鏁板瓧
+ String phoneRegex = "^1[0-9]{10}$";
+
+ // 鍒涘缓 Pattern 瀵硅薄
+ Pattern pattern = Pattern.compile(phoneRegex);
+
+ // 鍒涘缓 matcher 瀵硅薄
+ Matcher matcher = pattern.matcher(phoneNumber);
+
+ // 鍒ゆ柇鎵嬫満鍙锋槸鍚﹀尮閰嶆鍒欒〃杈惧紡
+ return matcher.matches() && !hasSixConsecutiveSameDigits(phoneNumber);
+ }
+
+ /**
+ * 鍒ゆ柇鏄惁鏈�6涓浉鍚岀殑杩炵画鏁板瓧
+ *
+ * @param input
+ * @return
+ */
+ public static boolean hasSixConsecutiveSameDigits(String input) {
+ char[] digits = input.toCharArray();
+
+ for (int i = 0; i <= digits.length - 6; i++) {
+ boolean consecutiveSame = true;
+ for (int j = 1; j < 6; j++) {
+ if (digits[i + j] != digits[i + j - 1]) {
+ consecutiveSame = false;
+ break;
+ }
+ }
+ if (consecutiveSame) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+
+ private void getPermission() {
+ try {
+ XXPermissions.with(this)
+ // 鐢宠鍗曚釜鏉冮檺
+// .permission(Permission.RECORD_AUDIO)
+ // 鐢宠澶氫釜鏉冮檺
+ .permission(Permission.CAMERA)
+ // 璁剧疆鏉冮檺璇锋眰鎷︽埅鍣紙灞�閮ㄨ缃級
+ //.interceptor(new PermissionInterceptor())
+ // 璁剧疆涓嶈Е鍙戦敊璇娴嬫満鍒讹紙灞�閮ㄨ缃級
+ //.unchecked()
+ .request(new OnPermissionCallback() {
+
+ @Override
+ public void onGranted(@NonNull List<String> permissions, boolean allGranted) {
+ if (allGranted) {
+
+ }
+ }
+
+ @Override
+ public void onDenied(@NonNull List<String> permissions, boolean doNotAskAgain) {
+ if (doNotAskAgain) {
+ // 濡傛灉鏄姘镐箙鎷掔粷灏辫烦杞埌搴旂敤鏉冮檺绯荤粺璁剧疆椤甸潰
+ } else {
+// toast("鑾峰彇褰曢煶鍜屾棩鍘嗘潈闄愬け璐�");
+ }
+ }
+ });
+ } catch (
+ Throwable e) {
+ e.printStackTrace();
+ }
+ }
+
+
+ @Override
+ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+ super.onActivityResult(requestCode, resultCode, data);
+ if (resultCode == RESULT_OK) {
+ switch (requestCode) {
+ case SCAN_IDCARD_REQUEST:
+ String result = data.getStringExtra("OCRResult");
+ try {
+ JSONObject jo = new JSONObject(result);
+
+// 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);
+ }
+ break;
+ }
+ }
+
}
private void setData() {
@@ -113,10 +244,10 @@
* 寮�鍗℃姤鏂�
*/
private void initCard() {
-
- String initCode = WSHelper.getInstance(this).get("initCode", "");
+ ProgressDialog.show(this);
+ String initCode = DeviceNumberUtils.getDeviceNumber();
if (TextUtils.isEmpty(initCode)) {
- ToastUtil.show(this, "璁惧娉ㄥ唽鍙蜂负绌猴紝璇峰厛璁剧疆IP鍜岀鐞嗗憳鍦板潃");
+ TipUtil.show(this, "璁惧娉ㄥ唽鍙蜂负绌猴紝璇峰厛璁剧疆IP鍜岀鐞嗗憳鍦板潃");
IpBean ipBean = baseDao.ipDao().findFirst();
if (ipBean != null && adminData != null) {
MyApplication.myApplication.initMachineRequestBean(ipBean.getIp(), ipBean.getPort(), adminData.getAddressCode());
@@ -139,17 +270,18 @@
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) {
- dialog.dismiss();
+ ProgressDialog.dismiss();
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);
@@ -157,6 +289,9 @@
ElectricPriceBean electricPriceBean = baseDao.electricPriceDao().findFirst();
if (electricPriceBean != null) {
userCard.setElectricityPrice(electricPriceBean.getPrice());
+ } else {
+ //榛樿鏄�1鍏�
+ userCard.setElectricityPrice(1.000f);
}
userCard.setState("00");
userCard.setBalance(0);
@@ -169,26 +304,27 @@
userCardBean.setPhone(newCardBinding.newCardPhone.getText().toString());
userCardBean.setUserID(newCardBinding.newCardId.getText().toString());
userCardBean.setDate(System.currentTimeMillis());
+ baseDao.userCardDao().insert(userCardBean);
Intent intent = new Intent(NewCardActivity.this, NFCWreatActivity.class);
intent.putExtra("userCard", userCard);
intent.putExtra("dbUserCard", userCardBean);
startActivity(intent);
} else if (state.equalsIgnoreCase("01")) {
- ToastUtil.show(NewCardActivity.this, "寮�鍗℃姤鏂�--韬唤璇佸凡娉ㄥ唽");
+ TipUtil.show(NewCardActivity.this, "寮�鍗℃姤鏂�--韬唤璇佸凡娉ㄥ唽");
} else if (state.equalsIgnoreCase("02")) {
- ToastUtil.show(NewCardActivity.this, "寮�鍗℃姤鏂�--鍏朵粬鍘熷洜澶辫触");
+ TipUtil.show(NewCardActivity.this, "寮�鍗℃姤鏂�--鍏朵粬鍘熷洜澶辫触");
}
} else {
//鏍￠獙CRC閿欒
- ToastUtil.show(NewCardActivity.this, "寮�鍗℃姤鏂囨牎楠孋RC閿欒");
+ TipUtil.show(NewCardActivity.this, "寮�鍗℃姤鏂囨牎楠孋RC閿欒");
}
}
@Override
public void onSocketError(int code, String msg) {
- dialog.dismiss();
- ToastUtil.show(NewCardActivity.this, msg);
+ ProgressDialog.dismiss();
+ TipUtil.show(NewCardActivity.this, msg);
}
});
@@ -200,4 +336,48 @@
return name.matches(regex);
}
+ private static class AlphaNumericXFilter implements InputFilter {
+ // 姝ｅ垯琛ㄨ揪寮忓畾涔夊彧鑳借緭鍏ユ暟瀛楀拰瀛楁瘝 "X"锛堝ぇ鍐欐垨灏忓啓锛�
+ private final String regex = "[0-9Xx]*";
+
+ @Override
+ public CharSequence filter(CharSequence source, int start, int end, Spanned dest, int dstart, int dend) {
+ // 妫�鏌ユ瘡涓緭鍏ュ瓧绗︽槸鍚︾鍚堟鍒欒〃杈惧紡
+ for (int i = start; i < end; i++) {
+ if (!String.valueOf(source.charAt(i)).matches(regex)) {
+ return ""; // 涓嶇鍚堣瀹氱殑瀛楃琚繃婊ゆ帀
+ }
+ }
+ return null; // 鍏佽杈撳叆瀛楃
+ }
+ }
+
+ public class ChineseInputFilter implements InputFilter {
+ @Override
+ public CharSequence filter(CharSequence source, int start, int end, Spanned dest, int dstart, int dend) {
+ StringBuilder builder = new StringBuilder();
+ for (int i = start; i < end; i++) {
+ char currentChar = source.charAt(i);
+ // 鍙厑璁告眽瀛�
+ if (isChineseCharacter(currentChar)) {
+ builder.append(currentChar);
+ }
+ }
+ return builder.toString();
+ }
+
+ private boolean isChineseCharacter(char c) {
+ // 杩欓噷浣跨敤Unicode鑼冨洿鍒ゆ柇鏄惁涓烘眽瀛�
+ // 姹夊瓧鐨刄nicode鑼冨洿鏄細0x4e00 - 0x9fa5
+ return (c >= 0x4e00 && c <= 0x9fa5);
+ }
+
+ }
+
+ @Override
+ protected void onDestroy() {
+ super.onDestroy();
+ newCardActivity = null;
+ }
+
}
--
Gitblit v1.8.0