From 08bfe3072377b53c60e0952f00c26bce2e5b4bc0 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 18 六月 2025 17:05:55 +0800
Subject: [PATCH] feat(card): 添加卡片返还功能- 新增 CardReturnActivity 用于执行卡片返还操作 - 在 BSCardFragment 中添加返还按钮，跳转到 CardReturnActivity - 在 CardOperationType 中添加 ReturnCard 类型 - 修改 CardReadActivity，优化卡片信息显示逻辑 - 更新 CardWriteSuccessActivity，支持返还成功提示 - 新增 ic_morny_back 图标用于返还操作
---
generallibrary/src/main/java/com/dayu/general/activity/RechargeDetailActivity.kt | 6 +++---
1 files changed, 3 insertions(+), 3 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 8ea5625..f460d84 100644
--- a/generallibrary/src/main/java/com/dayu/general/activity/RechargeDetailActivity.kt
+++ b/generallibrary/src/main/java/com/dayu/general/activity/RechargeDetailActivity.kt
@@ -267,7 +267,7 @@
binding.redRemainderBlance.text = "$balance 鍏�"
// 璁剧疆鍗＄姸鎬佸拰瀵瑰簲棰滆壊
- val cardStatus = when (info.status) {
+ val cardStatus = when (info.state) {
1 -> "姝ｅ父"
2 -> "鎸傚け"
3 -> "閿佸畾"
@@ -277,7 +277,7 @@
binding.redStatu.text = cardStatus
// 鏍规嵁鍗＄姸鎬佽缃笉鍚岄鑹�
- val statusColor = when (info.status) {
+ val statusColor = when (info.state) {
1 -> android.graphics.Color.parseColor("#4CAF50") // 缁胯壊-姝ｅ父
2 -> android.graphics.Color.parseColor("#FF9800") // 姗欒壊-鎸傚け
3 -> android.graphics.Color.parseColor("#F44336") // 绾㈣壊-閿佸畾
@@ -433,7 +433,7 @@
putExtra("bonusAmount", bonusAmount) // 浼犻�掕禒閫侀噾棰�
}
startActivity(intent)
-
+ finish()
} catch (e: Exception) {
ToastUtil.show("鍚姩鍐欏崱鐣岄潰澶辫触: ${e.message}")
}
--
Gitblit v1.8.0