From 1057af10a464e70d10b8a90315d0ecec6a7cb205 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期一, 04 十二月 2023 11:19:26 +0800
Subject: [PATCH] 注释修改密码 密码现识别为ffffffffffff和010203040506
---
app/src/main/java/com/dayu/recharge/activity/NewCardActivity.java | 162 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 144 insertions(+), 18 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..0d5db30 100644
--- a/app/src/main/java/com/dayu/recharge/activity/NewCardActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/NewCardActivity.java
@@ -1,13 +1,18 @@
package com.dayu.recharge.activity;
+import android.Manifest;
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.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;
@@ -24,8 +29,11 @@
import com.dayu.recharge.tools.Utils;
import com.dayu.recharge.utils.CRC8;
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.permissionx.guolindev.PermissionX;
+
+import org.json.JSONException;
+import org.json.JSONObject;
import java.util.Arrays;
@@ -37,7 +45,7 @@
*/
public class NewCardActivity extends BaseNfcActivity {
-
+ public static final int SCAN_IDCARD_REQUEST = 1;
UserCardBean userCardBean;
Dialog dialog;
@@ -54,9 +62,21 @@
setContentView(newCardBinding.getRoot());
setData();
initView();
+// LibraryInitOCR.initOCR(NewCardActivity.this);
}
private void initView() {
+ 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) {
+
+ rxPermission();
+ }
+ });
+
newCardBinding.newCardRegistBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -71,16 +91,15 @@
&& !TextUtils.isEmpty(phone) && !TextUtils.isEmpty(userID)
) {
if (userName.length() <= 1 || !validateName(userName)) {
- ToastUtil.show(NewCardActivity.this, "璇疯緭鍏ユ纭鍚�");
+ TipUtil.show(NewCardActivity.this, "璇疯緭鍏ユ纭鍚�");
return;
} else if (phone.length() < 11) {
- ToastUtil.show(NewCardActivity.this, "璇疯緭鍏ユ纭墜鏈哄彿");
+ TipUtil.show(NewCardActivity.this, "璇疯緭鍏ユ纭墜鏈哄彿");
return;
} else if (!Utils.check(userID)) {
- ToastUtil.show(NewCardActivity.this, "璇疯緭鍏ユ纭韩浠借瘉鍙�");
+ TipUtil.show(NewCardActivity.this, "璇疯緭鍏ユ纭韩浠借瘉鍙�");
return;
} else {
- dialog = ProgressDialog.show(NewCardActivity.this, "", "姝ｅ湪閫氫俊璇风◢鍚�", true, true);
userCardBean = new UserCardBean();
userCardBean.setUserName(userName);
userCardBean.setDate(date);
@@ -91,10 +110,71 @@
}
} else {
- ToastUtil.show(NewCardActivity.this, "璇疯緭鍏ュ畬鏁村唴瀹�");
+ TipUtil.show(NewCardActivity.this, "璇疯緭鍏ュ畬鏁村唴瀹�");
}
}
});
+ }
+
+ private void rxPermission() {
+ PermissionX.init(NewCardActivity.this).permissions(Manifest.permission.CAMERA)
+ .onExplainRequestReason((scope, deniedList) -> {
+
+// val message = "PermissionX闇�瑕佹偍鍚屾剰浠ヤ笅鏉冮檺鎵嶈兘姝ｅ父浣跨敤"
+ })
+ .request((allGranted, grantedList, deniedList) -> {
+ if (allGranted) {//鎵�鏈夌敵璇风殑鏉冮檺閮藉凡閫氳繃
+ startCamera();
+ } else {//鎮ㄦ嫆缁濅簡濡備笅鏉冮檺锛�$deniedList
+
+
+ }
+ });
+ }
+
+
+ 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);
+ }
+
+ @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 +193,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());
@@ -143,7 +223,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鍏朵粬鍘熷洜澶辫触
@@ -157,6 +237,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 +252,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 +284,46 @@
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