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 类型，改为字符串处理
---
generallibrary/src/main/java/com/dayu/general/activity/NfcWreatActivity.kt | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/generallibrary/src/main/java/com/dayu/general/activity/NfcWreatActivity.kt b/generallibrary/src/main/java/com/dayu/general/activity/NfcWreatActivity.kt
index af95df2..94a11b3 100644
--- a/generallibrary/src/main/java/com/dayu/general/activity/NfcWreatActivity.kt
+++ b/generallibrary/src/main/java/com/dayu/general/activity/NfcWreatActivity.kt
@@ -254,8 +254,9 @@
// 杩旇繕鎿嶄綔鏄剧ず淇℃伅
var textData = StringBuilder()
textData.append("杩旇繕\n")
- textData.append("鍗″唴浣欓锛�" + MornyUtil.changeF2Y(userCard.balance) + "鍏僜n")
- textData.append("杩旇繕閲戦锛�" + returnAmount + "鍏�")
+ textData.append("杩旇繕閲戦锛�" + returnAmount + "鍏僜n")
+ textData.append("杩旇繕鍚庡崱鍐呬綑棰濓細" + MornyUtil.changeF2Y(userCard.balance) + "鍏僜n")
+
binding?.cardData?.text = textData.toString()
}
@@ -263,8 +264,9 @@
// 琛ユ墸鎿嶄綔鏄剧ず淇℃伅
var textData = StringBuilder()
textData.append("琛ユ墸\n")
- textData.append("鍗″唴浣欓锛�" + MornyUtil.changeF2Y(userCard.balance) + "鍏僜n")
- textData.append("琛ユ墸閲戦锛�" + deductAmount + "鍏�")
+ textData.append("琛ユ墸閲戦锛�" + deductAmount + "鍏僜n")
+ textData.append("琛ユ墸鍚庡崱鍐呬綑棰濓細" + MornyUtil.changeF2Y(userCard.balance) + "鍏僜n")
+
binding?.cardData?.text = textData.toString()
}
@@ -514,7 +516,7 @@
CardOperationType.RegionCardMake -> {
// 鍖哄煙琛ㄥ彿鍗″啓鍗￠�昏緫锛堝姛鑳藉崱锛屾棤闇�鍐欏叆鐢ㄦ埛鏁版嵁锛�
var areaCard = AreaCard()
- areaCard.areaNumber = regionNumber.toInt()
+ areaCard.areaNumber = regionNumber
areaCard.projectCode = projectNumber.toInt()
nfcWreatHelper.writeDataAsync(
areaCard.getZeroBytes(),
--
Gitblit v1.8.0