From 87e5604ad04c0b7aaacf3d52bae85e62d308cb6d Mon Sep 17 00:00:00 2001
From: zuoxiao <lf_zuo@163.com>
Date: 星期四, 26 六月 2025 16:41:02 +0800
Subject: [PATCH] refactor(generallibrary):重构开卡成功界面并移除未使用的开卡界面
---
generallibrary/src/main/java/com/dayu/general/activity/CardCancelActivity.kt | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/generallibrary/src/main/java/com/dayu/general/activity/CardCancelActivity.kt b/generallibrary/src/main/java/com/dayu/general/activity/CardCancelActivity.kt
index 4d29030..e6256ba 100644
--- a/generallibrary/src/main/java/com/dayu/general/activity/CardCancelActivity.kt
+++ b/generallibrary/src/main/java/com/dayu/general/activity/CardCancelActivity.kt
@@ -244,12 +244,20 @@
binding.tvUserName.text = info.userName ?: "鏈煡"
binding.tvPhone.text = info.phone ?: "鏈粦瀹�"
- // 鏍规嵁status瀛楁鏄剧ず鐘舵��
- val statusText = when (info.state) {
- 1 -> "姝ｅ父"
- 2 -> "鎸傚け"
- 3 -> "閿佸畾"
- else -> "鏈煡"
+ // 鏍规嵁state瀛楁鏄剧ず鐘舵��
+ val (statusText, statusColor) = when (info.state) {
+ 1 -> Pair("姝ｅ父", android.graphics.Color.parseColor("#4CAF50")) // 缁胯壊
+ 2 -> Pair("宸叉敞閿�", android.graphics.Color.parseColor("#FF5722")) // 娣辨鑹�
+ 3 -> Pair("宸叉寕澶�", android.graphics.Color.parseColor("#FF9800")) // 姗欒壊
+ 4 -> Pair("鏃犳晥鍗＄墖", android.graphics.Color.parseColor("#F44336")) // 绾㈣壊
+ else -> Pair("鏈煡鐘舵��", android.graphics.Color.parseColor("#9E9E9E")) // 鐏拌壊
+ }
+ binding.tvCardStatus.text = statusText
+ binding.tvCardStatus.setTextColor(statusColor)
+ if (info.state == 3) {
+ binding.btnCancelCard.visibility = android.view.View.GONE
+ } else {
+ binding.btnCancelCard.visibility = android.view.View.VISIBLE
}
}
}
@@ -381,6 +389,7 @@
putExtra("orderNumber", cancelResult.orderNo)
putExtra("refundAmount", refundAmount)
putExtra("userCard", userCard)
+ putExtra("cardInfo", cardInfo)
// 浼犻�掑綋鍓嶅崱鍐呬綑棰濅俊鎭�
cardInfo?.let { info ->
putExtra("cardBalance", info.balance ?: 0.0)
--
Gitblit v1.8.0