From a8751388c9a86ae95714a15279994d8aa426a26d Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 13 六月 2025 14:59:02 +0800
Subject: [PATCH] feat(generallibrary): 优化充值功能并添加水价获取- 在 activity_recharge_detail.xml 中移除了不必要的 bold 样式- 在 EditText 中添加了金额输入限制（数字和小数点）- 在 BaseApplication 中添加了水价信息存储 - 在 MainActivity 中实现了延时获取水价的功能- 优化了 RechargeDetailActivity 中的水价检查和使用逻辑 - 在 README.md 中添加了金额格式化和水价获取的最佳实践指南
---
henanlibrary/src/main/java/com/dayu/henanlibrary/activity/ReadCardAcitivy.java | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/ReadCardAcitivy.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/ReadCardAcitivy.java
index ee8176a..d8cbfe3 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/ReadCardAcitivy.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/ReadCardAcitivy.java
@@ -7,14 +7,17 @@
import android.view.LayoutInflater;
import android.view.View;
+import com.dayu.baselibrary.activity.BaseNfcActivity;
import com.dayu.baselibrary.tools.BcdUtil;
import com.dayu.baselibrary.tools.HexUtil;
+import com.dayu.baselibrary.tools.nfc.BaseNfcReadHelper;
+import com.dayu.baselibrary.tools.nfc.CardCommonState;
import com.dayu.baselibrary.utils.CRC8;
import com.dayu.baselibrary.utils.MornyUtil;
import com.dayu.baselibrary.utils.TipUtil;
-import com.dayu.henanlibrary.card.ConfigurationPowerCard;
+import com.dayu.henanlibrary.card.ConfigurationPowerCardHN;
import com.dayu.henanlibrary.card.DomainCard;
-import com.dayu.henanlibrary.card.UserCard;
+import com.dayu.henanlibrary.card.UserCardHN;
import com.dayu.henanlibrary.databinding.ActivityRedCardHnBinding;
import com.dayu.henanlibrary.net.SocketCallBack;
import com.dayu.henanlibrary.net.SocketData;
@@ -37,9 +40,9 @@
* Date: 2023-11-10 19:52
* Description: 璇诲崱鐣岄潰
*/
-public class ReadCardAcitivy extends BaseNfcActivity {
+public class ReadCardAcitivy extends HNBaseNfcActivity {
- volatile UserCard userCard;
+ volatile UserCardHN userCard;
ActivityRedCardHnBinding redCardBinding;
Intent intent;
@@ -78,14 +81,13 @@
}
+
@Override
- public void onNewIntent(Intent intent) {
- this.intent = intent;
+ public void onNfcBack(Intent intent) {
ProgressDialog.show(this);
if (NfcAdapter.ACTION_TAG_DISCOVERED.equals(intent.getAction())) {
readAllData(intent);
}
- super.onNewIntent(intent);
}
/**
@@ -94,7 +96,7 @@
public void readAllData(Intent intent) {
NfcReadHelper.getInstence(intent, this)
- .getOneSectorData(new NfcReadHelper.NFCCallListback() {
+ .getOneSectorData(new BaseNfcReadHelper.NFCCallListback() {
@Override
public void callBack(List<byte[]> data) {
//鑾峰彇1鎵囧尯鏁版嵁
@@ -105,7 +107,7 @@
case CardCommon.USER_CARD_TYPE_1:
case CardCommon.USER_CARD_TYPE_2:
case CardCommon.USER_CARD_TYPE_3:
- userCard = UserCard.getBean(data);
+ userCard = new UserCardHN().getBean(data);
selectBalance(userCard.getInitPeasantCode());
break;
case CardCommon.MANAGE_CRAD:
@@ -132,9 +134,9 @@
case CardCommon.DOMAIN_CARD_TYPE:
viweGone(false);
DomainCard domainXinXiangCard = DomainCard.toBean(data);
- if(domainXinXiangCard.getType()==0){
+ if (domainXinXiangCard.getType() == 0) {
redCardBinding.readCardTypeTV.setText("褰撳墠涓烘柊涔″煙鍚嶅崱");
- }else {
+ } else {
redCardBinding.readCardTypeTV.setText("褰撳墠涓洪箍閭戝煙鍚嶅崱");
}
StringBuilder builder = new StringBuilder();
@@ -160,12 +162,12 @@
case CardCommon.CONFIGURATION_POWER_CARD_TYPE:
viweGone(false);
redCardBinding.readCardTypeTV.setText("褰撳墠閰嶇疆姘存车鍔熺巼鍗�");
- ConfigurationPowerCard powerCard = ConfigurationPowerCard.toBean(data.get(0));
+ ConfigurationPowerCardHN powerCard = ConfigurationPowerCardHN.toBean(data.get(0));
redCardBinding.readCardDataTV.setText(powerCard.getPower());
stopAnim();
break;
default:
- TipUtil.show(ReadCardAcitivy.this, "鍗＄墖鏃犳硶璇嗗埆");
+ TipUtil.show(ReadCardAcitivy.this, "褰撳墠鍗＄墖涓虹櫧鍗★紝璇峰埗鍗″悗璇诲彇");
stopAnim();
break;
}
@@ -180,7 +182,7 @@
@Override
public void error(int code) {
switch (code) {
- case CardCommon.ERROR_MOVE:
+ case CardCommonState.ERROR_MOVE:
stopAnim();
TipUtil.show("杩炴帴涓柇锛岃閲嶆柊璐村悎鍗＄墖");
break;
--
Gitblit v1.8.0