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 中添加了金额格式化和水价获取的最佳实践指南
---
baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NfcReadAdapter.java | 65 ++++++++++++++++++++++++--------
1 files changed, 49 insertions(+), 16 deletions(-)
diff --git a/baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NfcReadAdapter.java b/baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NfcReadAdapter.java
index fcbae8b..515b27a 100644
--- a/baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NfcReadAdapter.java
+++ b/baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NfcReadAdapter.java
@@ -3,10 +3,14 @@
import android.app.Activity;
import android.content.Intent;
+import androidx.annotation.NonNull;
+
import com.dayu.baselibrary.activity.BaseNfcActivity;
import com.dayu.baselibrary.bean.BaseUserCardCard;
+import com.dayu.baselibrary.utils.ModelUtils;
-import java.util.Collections;
+import org.jetbrains.annotations.NotNull;
+
import java.util.List;
/**
@@ -19,10 +23,15 @@
NativeNfcReadHelper nativeNfcReadHelper;
+ @Override
+ public void setIntent(Intent intent) {
+ nativeNfcReadHelper.setIntent(intent);
+ }
+
public NfcReadAdapter(Intent intent, Activity activity) {
switch (BaseNfcActivity.adapterType) {
- case NfcCommonData.defaultType:
- nativeNfcReadHelper = new NativeNfcReadHelper(intent, activity);
+ case ModelUtils.defaultType:
+ nativeNfcReadHelper = NativeNfcReadHelper.getInstence(intent, activity);
break;
}
@@ -31,7 +40,7 @@
@Override
public String getCradType() {
switch (BaseNfcActivity.adapterType) {
- case NfcCommonData.defaultType:
+ case ModelUtils.defaultType:
return nativeNfcReadHelper.getCradType();
}
@@ -41,7 +50,7 @@
@Override
public void getAllData(NFCCallMapback callback) {
switch (BaseNfcActivity.adapterType) {
- case NfcCommonData.defaultType:
+ case ModelUtils.defaultType:
nativeNfcReadHelper.getAllData(callback);
break;
@@ -51,31 +60,51 @@
@Override
public void getOneSectorData(NFCCallListback callback) {
switch (BaseNfcActivity.adapterType) {
- case NfcCommonData.defaultType:
+ case ModelUtils.defaultType:
nativeNfcReadHelper.getOneSectorData(callback);
break;
}
}
-
@Override
public String getCardNumber() {
+ return getCardNumber(false);
+ }
+
+
+
+ public String getCardNumber(boolean isChangePS) {
switch (BaseNfcActivity.adapterType) {
- case NfcCommonData.defaultType:
+ case ModelUtils.defaultType:
return nativeNfcReadHelper.getCardNumber();
+ }
+ return "";
+ }
+ public String getCardNumberNoClose() {
+ switch (BaseNfcActivity.adapterType) {
+ case ModelUtils.defaultType:
+ return nativeNfcReadHelper.getCardNumberNoClose();
+ }
+ return "";
+ }
+
+
+ @Override
+ public String getCradTypeAndCardNumber() {
+ switch (BaseNfcActivity.adapterType) {
+ case ModelUtils.defaultType:
+ return nativeNfcReadHelper.getCradTypeAndCardNumber();
}
return "";
}
@Override
- public String getCradTypeAndCardNumber() {
+ public String getCradTypeAndCardNumber(int sectorIndex) {
switch (BaseNfcActivity.adapterType) {
- case NfcCommonData.defaultType:
- return nativeNfcReadHelper.getCradTypeAndCardNumber();
-
-
+ case ModelUtils.defaultType:
+ return nativeNfcReadHelper.getCradTypeAndCardNumber(sectorIndex);
}
return "";
}
@@ -83,7 +112,7 @@
@Override
public void getData(int a, int b, NFCCallByteback callback) {
switch (BaseNfcActivity.adapterType) {
- case NfcCommonData.defaultType:
+ case ModelUtils.defaultType:
nativeNfcReadHelper.getData(a, b, callback);
break;
}
@@ -92,7 +121,7 @@
@Override
public List<byte[]> getOnesectorData() {
switch (BaseNfcActivity.adapterType) {
- case NfcCommonData.defaultType:
+ case ModelUtils.defaultType:
return nativeNfcReadHelper.getOnesectorData();
@@ -103,9 +132,13 @@
@Override
public BaseUserCardCard getUserCardData(BaseUserCardCard userCardCard) {
switch (BaseNfcActivity.adapterType) {
- case NfcCommonData.defaultType:
+ case ModelUtils.defaultType:
return nativeNfcReadHelper.getUserCardData(userCardCard);
}
return null;
}
+
+
+
+
}
--
Gitblit v1.8.0