From 32d1501e6fe6338eb6dc51c26df7fe0808caac0d Mon Sep 17 00:00:00 2001
From: zuoxiao <lf_zuo@163.com>
Date: 星期四, 26 六月 2025 15:05:28 +0800
Subject: [PATCH] feat(general): 优化写卡成功界面并添加开卡功能- 重新设计写卡成功界面布局，增加滚动视图以支持长文本显示 - 添加开卡功能相关的UI和逻辑，包括工本费和充值金额的展示- 增加用户姓名和卡片信息的显示 - 优化打印凭证的内容和格式 -调整NFC连接逻辑，提高连接成功率
---
generallibrary/src/main/java/com/dayu/general/activity/RechargeDetailActivity.kt | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/generallibrary/src/main/java/com/dayu/general/activity/RechargeDetailActivity.kt b/generallibrary/src/main/java/com/dayu/general/activity/RechargeDetailActivity.kt
index 7658e5b..ec3c4d3 100644
--- a/generallibrary/src/main/java/com/dayu/general/activity/RechargeDetailActivity.kt
+++ b/generallibrary/src/main/java/com/dayu/general/activity/RechargeDetailActivity.kt
@@ -529,14 +529,18 @@
bonusAmount: Double
) {
try {
- // 鍒涘缓UserCard瀵硅薄鐢ㄤ簬鍐欏崱
- val userCard = UserCard().apply {
- // 璁剧疆鐢ㄦ埛鍗′俊鎭�
- cardInfo?.let { info ->
- balance = MornyUtil.changeY2F(rechargeResult.balance)
- }
+ // 妫�鏌ユ槸鍚︽湁浼犻�掕繃鏉ョ殑userCard瀵硅薄
+ val cardToWrite = this.userCard ?: run {
+ ToastUtil.show("鐢ㄦ埛鍗′俊鎭己澶�")
+ return
+ }
- // 璁剧疆鍏朵粬蹇呰淇℃伅
+ // 鏇存柊浼犻�掕繃鏉ョ殑UserCard瀵硅薄鏁版嵁
+ cardToWrite.apply {
+ // 鏇存柊鍏呭�煎悗鐨勪綑棰�
+ balance = MornyUtil.changeY2F(rechargeResult.balance)
+
+ // 鏇存柊鍏朵粬鍏呭�肩浉鍏充俊鎭�
projectCode = rechargeResult.projectNo
waterPrice = MornyUtil.changeY2F(rechargeResult.waterPrice.toString())
rechargeDate = java.util.Calendar.getInstance()
@@ -548,9 +552,11 @@
putExtra("cardAddr", cardAddress)
putExtra("operationTypeCode", CardOperationType.Recharge.code)
putExtra("orderNumber", rechargeResult.orderNo)
- putExtra("userCard", userCard)
+ putExtra("userCard", cardToWrite)
putExtra("rechargeAmount", rechargeAmount) // 浼犻�掑厖鍊奸噾棰�
putExtra("bonusAmount", bonusAmount) // 浼犻�掕禒閫侀噾棰�
+ putExtra("cardInfo", cardInfo)
+ putExtra(EXTRA_CARD_INFO, cardInfo)
}
startActivity(intent)
finish()
--
Gitblit v1.8.0