From dd2562d8dc2b01bcdfca3152f82f09efbbd09259 Mon Sep 17 00:00:00 2001
From: zuoxiao <lf_zuo@163.com>
Date: 星期三, 25 六月 2025 19:49:48 +0800
Subject: [PATCH] fix(generallibrary): 优化卡片处理和支付方式获取逻辑- 修复地区卡处理逻辑，增加对"00"类型卡的特殊处理 - 优化用户卡数据解析和显示逻辑，提高容错性 - 改进支付方式获取方法，增加错误处理和日志记录 -调整充值接口调用参数，确保正确传递当前余额等信息- 修复 AreaCard 中 areaNumber 类型，改为字符串处理
---
baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NfcWriteAdapter.java | 49 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 45 insertions(+), 4 deletions(-)
diff --git a/baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NfcWriteAdapter.java b/baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NfcWriteAdapter.java
index e8230c9..afee1df 100644
--- a/baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NfcWriteAdapter.java
+++ b/baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NfcWriteAdapter.java
@@ -8,6 +8,8 @@
import com.dayu.baselibrary.bean.BaseUserCardCard;
import com.dayu.baselibrary.utils.ModelUtils;
+import java.util.List;
+
/**
* author: zuo
* Date: 2024-09-26
@@ -20,17 +22,38 @@
public NfcWriteAdapter(Intent intent, Activity activity) {
switch (BaseNfcActivity.adapterType) {
case ModelUtils.defaultType:
- nativeNfcWriteHelper = new NativeNfcWriteHelper(intent, activity);
+ nativeNfcWriteHelper = NativeNfcWriteHelper.getInstence(intent, activity);
break;
}
}
@Override
- public boolean writeUserData(BaseUserCardCard userCard) {
+ public void setIntent(Intent intent) {
+ nativeNfcWriteHelper.setIntent(intent);
+ }
+
+ @Override
+ public boolean writeUserData(BaseUserCardCard userCard, int sector) {
switch (BaseNfcActivity.adapterType) {
case ModelUtils.defaultType:
- return nativeNfcWriteHelper.writeUserData(userCard);
+ return nativeNfcWriteHelper.writeUserData(userCard, sector);
+ }
+ return false;
+ }
+
+ /**
+ * 鍐欑敤鎴锋暟鎹紙甯﹀洖璋冿級
+ *
+ * @param userCard 鐢ㄦ埛鍗℃暟鎹�
+ * @param sector 鎵囧尯
+ * @param callBack 鍥炶皟鎺ュ彛
+ * @return 鏄惁鎴愬姛
+ */
+ public boolean writeUserData(BaseUserCardCard userCard, int sector, NFCCallBack callBack) {
+ switch (BaseNfcActivity.adapterType) {
+ case ModelUtils.defaultType:
+ return nativeNfcWriteHelper.writeUserData(userCard, sector, callBack);
}
return false;
}
@@ -49,7 +72,17 @@
public boolean writeData(byte[] str, int a, int b, NFCCallBack callBack) {
switch (BaseNfcActivity.adapterType) {
case ModelUtils.defaultType:
- return nativeNfcWriteHelper.writeData(str, a, b,callBack);
+ return nativeNfcWriteHelper.writeData(str, a, b, callBack);
+
+ }
+ return false;
+ }
+
+ @Override
+ public boolean writeData(byte[] str, int a, int b, boolean isConnect, NFCCallBack callBack) {
+ switch (BaseNfcActivity.adapterType) {
+ case ModelUtils.defaultType:
+ return nativeNfcWriteHelper.writeData(str, a, b, isConnect, callBack);
}
return false;
@@ -64,4 +97,12 @@
}
return false;
}
+
+ public boolean changePasword(List<byte[]> passWord, boolean isConnect, boolean isClose, NFCCallBack callBack) {
+ switch (BaseNfcActivity.adapterType) {
+ case ModelUtils.defaultType:
+ return nativeNfcWriteHelper.changePasword(passWord, isConnect, isClose, callBack);
+ }
+ return false;
+ }
}
--
Gitblit v1.8.0