From 72880a3df304d21b897aecae5ab25a66069c0187 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期一, 16 六月 2025 17:47:18 +0800
Subject: [PATCH] refactor(generallibrary):优化卡片信息展示和处理逻辑- 修改卡片信息展示布局，调整字段顺序和格式 - 优化卡片读取和处理逻辑，增加日志输出 - 调整金额显示和计算方式，确保精度正确 - 修复部分字段解析和填充逻辑
---
generallibrary/src/main/java/com/dayu/general/activity/NfcWreatActivity.kt | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 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 e1c384c..ad1a0c3 100644
--- a/generallibrary/src/main/java/com/dayu/general/activity/NfcWreatActivity.kt
+++ b/generallibrary/src/main/java/com/dayu/general/activity/NfcWreatActivity.kt
@@ -5,6 +5,7 @@
import androidx.lifecycle.lifecycleScope
import com.dayu.baselibrary.net.subscribers.SubscriberListener
import com.dayu.baselibrary.tools.nfc.NFCCallBack
+import com.dayu.baselibrary.utils.MornyUtil
import com.dayu.baselibrary.utils.ToastUtil
import com.dayu.general.bean.card.ClearCard
import com.dayu.general.bean.card.UserCard
@@ -30,7 +31,7 @@
var cardType = ""
var cardAddr = ""
var cardFee = 0
-
+
// 鍏呭�肩浉鍏抽噾棰�
private var rechargeAmount = 0.0
private var bonusAmount = 0.0
@@ -57,11 +58,11 @@
operationTypeCode = intent?.getIntExtra("operationTypeCode", -1) ?: -1
orderNumber = intent?.getStringExtra("orderNumber") ?: ""
operationType = CardOperationType.fromCode(operationTypeCode)
-
+
// 鑾峰彇鍏呭�肩浉鍏抽噾棰�
rechargeAmount = intent?.getDoubleExtra("rechargeAmount", 0.0) ?: 0.0
bonusAmount = intent?.getDoubleExtra("bonusAmount", 0.0) ?: 0.0
-
+
if (intent?.hasExtra("cardFee") == true) {
cardFee = intent?.getIntExtra("cardFee", 0) ?: 0
}
@@ -86,7 +87,7 @@
textData.append("宸ユ湰璐癸細" + cardFee + "鍏僜n")
}
if (userCard.balance != 0) {
- textData.append("鍏呭�奸噾棰濓細" + userCard.balance + "鍏�")
+ textData.append("鍏呭�奸噾棰濓細" + MornyUtil.changeF2Y(userCard.balance) + "鍏�")
}
binding?.cardData?.text = textData.toString()
@@ -95,23 +96,33 @@
CardOperationType.Recharge -> {
var textData = StringBuilder()
textData.append("鐢ㄦ埛鍏呭�糪n")
-
+
// 鏄剧ず鍏呭�奸噾棰�
if (rechargeAmount > 0) {
- textData.append("鍏呭�奸噾棰濓細" + String.format("%.2f", rechargeAmount) + "鍏僜n")
+ textData.append(
+ "鍏呭�奸噾棰濓細" + String.format(
+ "%.2f",
+ rechargeAmount
+ ) + "鍏僜n"
+ )
}
-
+
// 鏄剧ず璧犻�侀噾棰�
if (bonusAmount > 0) {
textData.append("璧犻�侀噾棰濓細" + String.format("%.2f", bonusAmount) + "鍏僜n")
}
-
+
// 鏄剧ず鎬婚噾棰濓紙鍐欏叆鍗″唴鐨勬�讳綑棰濓級
if (userCard.balance != 0) {
val totalBalanceInYuan = userCard.balance / 100.0 // 杞崲涓哄厓
- textData.append("鍗″唴鎬讳綑棰濓細" + String.format("%.2f", totalBalanceInYuan) + "鍏�")
+ textData.append(
+ "鍗″唴鎬讳綑棰濓細" + String.format(
+ "%.2f",
+ totalBalanceInYuan
+ ) + "鍏�"
+ )
}
-
+
binding?.cardData?.text = textData.toString()
}
@@ -130,7 +141,7 @@
val nfcReadHelper = NfcReadHelper.getInstance(intent, this)
// 浣跨敤姝ｅ父鐨刧etCardNumber()鏂规硶锛屽畠浼氳嚜鍔ㄥ叧闂繛鎺�
val cardNumber = nfcReadHelper.getCardNumber()
-
+
if (cardNumber.isNotEmpty() && cardNumber == cardAddr) {
val nfcWreatHelper = NfcWreatHelper.getInstance(intent, this)
when (operationType) {
@@ -210,7 +221,7 @@
val updatedCardRegistration = cardRegistration.copy(isCardWritten = true)
// 鏇存柊鏁版嵁搴撹褰�
cardRegistrationDao.update(updatedCardRegistration)
-
+
// 鍦ㄤ富绾跨▼涓叧闂瑼ctivity
runOnUiThread {
setResult(RESULT_OK)
--
Gitblit v1.8.0