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/CardWriteSuccessActivity.kt | 114 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 74 insertions(+), 40 deletions(-)
diff --git a/generallibrary/src/main/java/com/dayu/general/activity/CardWriteSuccessActivity.kt b/generallibrary/src/main/java/com/dayu/general/activity/CardWriteSuccessActivity.kt
index 6872853..8af188e 100644
--- a/generallibrary/src/main/java/com/dayu/general/activity/CardWriteSuccessActivity.kt
+++ b/generallibrary/src/main/java/com/dayu/general/activity/CardWriteSuccessActivity.kt
@@ -7,6 +7,7 @@
import com.dayu.general.BaseApplication
import com.dayu.general.bean.card.UserCard
import com.dayu.general.bean.net.CardInfoResult
+import com.dayu.general.bean.net.ClientInfo
import com.dayu.general.databinding.ActivityCardWriteSuccessBinding
import com.dayu.general.tool.CardOperationType
@@ -24,6 +25,7 @@
private var userCard: UserCard? = null
private var orderNumber: String? = null
private var cardInfo: CardInfoResult? = null
+ private var clientInfo: ClientInfo? = null
// 鍏呭�肩浉鍏冲弬鏁�
private var rechargeAmount = 0.0
@@ -69,6 +71,10 @@
if (intent.hasExtra("cardInfo")) {
cardInfo = intent.getSerializableExtra("cardInfo") as CardInfoResult
+ }
+
+ if (intent.hasExtra("clientInfo")) {
+ clientInfo = intent.getSerializableExtra("clientInfo") as ClientInfo
}
initView()
@@ -186,12 +192,38 @@
CardOperationType.OpenCard -> {
binding.titleBar.setCenterText("寮�鍗℃垚鍔�")
binding.successTitle.text = "寮�鍗℃垚鍔�"
+
val messageBuilder = StringBuilder()
+ messageBuilder.append("寮�鍗℃搷浣滃凡鎴愬姛瀹屾垚\n")
+
+ // 鏄剧ず鐢ㄦ埛濮撳悕
+ val userName = getUserName()
+ if (!userName.isNullOrEmpty()) {
+ messageBuilder.append("鐢ㄦ埛濮撳悕锛�$userName\n")
+ }
+
+ // 鏄剧ず鍗″湴鍧�
+ val cardAddress = cardNumber ?: cardAddr
+ if (!cardAddress.isNullOrEmpty()) {
+ messageBuilder.append("鍗″湴鍧�锛�$cardAddress\n")
+ }
+
+ // 鏄剧ず宸ユ湰璐�
+ if (cardFee > 0) {
+ messageBuilder.append("宸ユ湰璐癸細${cardFee}鍏僜n")
+ }
+
+ // 鏄剧ず鍏呭�奸噾棰�
if (rechargeAmount > 0) {
messageBuilder.append("鍏呭�奸噾棰濓細${String.format("%.2f", rechargeAmount)}鍏僜n")
}
+
+ // 鏄剧ず鍗″唴浣欓
messageBuilder.append("鍗″唴浣欓锛�${MornyUtil.changeF2Y(userCard?.balance ?: 0)}鍏�")
- // 鍏呭�兼垚鍔熷悗鑷姩鎵撳嵃
+
+ binding.successMessage.text = messageBuilder.toString()
+
+ // 寮�鍗℃垚鍔熷悗鑷姩鎵撳嵃
userCard?.let { card ->
doPrint(card)
}
@@ -230,6 +262,14 @@
}
/**
+ * 鑾峰彇鐢ㄦ埛濮撳悕锛屼紭鍏堜粠ClientInfo鑾峰彇锛屽鏋滄病鏈夊啀浠嶤ardInfo鑾峰彇
+ * @return 鐢ㄦ埛濮撳悕
+ */
+ private fun getUserName(): String? {
+ return clientInfo?.name ?: cardInfo?.userName
+ }
+
+ /**
* 鎵撳嵃鍏呭�兼垚鍔熶俊鎭埌鎵撳嵃鏈�
* @param userCard 鐢ㄦ埛鍗＄墖淇℃伅锛屽寘鍚綑棰濈瓑淇℃伅
* 鍑芥暟浼氭瀯寤烘墦鍗版暟鎹苟璋冪敤鎵撳嵃閫傞厤鍣ㄨ繘琛屾墦鍗�
@@ -249,11 +289,10 @@
data.add(" 鍏呭�煎嚟璇�")
data.add("*****************************")
- // 娣诲姞鐢ㄦ埛鍚嶏紙浠嶤ardInfo涓幏鍙栵級
- cardInfo?.userName?.let { userName ->
- if (userName.isNotEmpty()) {
- data.add("鐢ㄦ埛濮撳悕锛�$userName")
- }
+ // 娣诲姞鐢ㄦ埛鍚嶏紙浼樺厛浠嶤lientInfo涓幏鍙栵紝濡傛灉娌℃湁鍐嶄粠CardInfo涓幏鍙栵級
+ val userName = getUserName()
+ if (!userName.isNullOrEmpty()) {
+ data.add("鐢ㄦ埛濮撳悕锛�$userName")
}
// 娣诲姞鍗″湴鍧�
@@ -305,11 +344,10 @@
data.add(" 琛ュ崱鍑瘉")
data.add("*****************************")
- // 娣诲姞鐢ㄦ埛鍚嶏紙浠嶤ardInfo涓幏鍙栵級
- cardInfo?.userName?.let { userName ->
- if (userName.isNotEmpty()) {
- data.add("鐢ㄦ埛濮撳悕锛�$userName")
- }
+ // 娣诲姞鐢ㄦ埛鍚嶏紙浼樺厛浠嶤lientInfo涓幏鍙栵紝濡傛灉娌℃湁鍐嶄粠CardInfo涓幏鍙栵級
+ val userName = getUserName()
+ if (!userName.isNullOrEmpty()) {
+ data.add("鐢ㄦ埛濮撳悕锛�$userName")
}
val cardAddress = cardNumber ?: cardAddr
@@ -352,11 +390,10 @@
data.add(" 閿�鍗″嚟璇�")
data.add("*****************************")
- // 娣诲姞鐢ㄦ埛鍚嶏紙浠嶤ardInfo涓幏鍙栵級
- cardInfo?.userName?.let { userName ->
- if (userName.isNotEmpty()) {
- data.add("鐢ㄦ埛濮撳悕锛�$userName")
- }
+ // 娣诲姞鐢ㄦ埛鍚嶏紙浼樺厛浠嶤lientInfo涓幏鍙栵紝濡傛灉娌℃湁鍐嶄粠CardInfo涓幏鍙栵級
+ val userName = getUserName()
+ if (!userName.isNullOrEmpty()) {
+ data.add("鐢ㄦ埛濮撳悕锛�$userName")
}
val cardAddress = cardNumber ?: cardAddr
@@ -397,11 +434,10 @@
data.add(" 杩旇繕鍑瘉")
data.add("*****************************")
- // 娣诲姞鐢ㄦ埛鍚嶏紙浠嶤ardInfo涓幏鍙栵級
- cardInfo?.userName?.let { userName ->
- if (userName.isNotEmpty()) {
- data.add("鐢ㄦ埛濮撳悕锛�$userName")
- }
+ // 娣诲姞鐢ㄦ埛鍚嶏紙浼樺厛浠嶤lientInfo涓幏鍙栵紝濡傛灉娌℃湁鍐嶄粠CardInfo涓幏鍙栵級
+ val userName = getUserName()
+ if (!userName.isNullOrEmpty()) {
+ data.add("鐢ㄦ埛濮撳悕锛�$userName")
}
val cardAddress = cardNumber ?: cardAddr
@@ -442,11 +478,10 @@
data.add(" 琛ユ墸鍑瘉")
data.add("*****************************")
- // 娣诲姞鐢ㄦ埛鍚嶏紙浠嶤ardInfo涓幏鍙栵級
- cardInfo?.userName?.let { userName ->
- if (userName.isNotEmpty()) {
- data.add("鐢ㄦ埛濮撳悕锛�$userName")
- }
+ // 娣诲姞鐢ㄦ埛鍚嶏紙浼樺厛浠嶤lientInfo涓幏鍙栵紝濡傛灉娌℃湁鍐嶄粠CardInfo涓幏鍙栵級
+ val userName = getUserName()
+ if (!userName.isNullOrEmpty()) {
+ data.add("鐢ㄦ埛濮撳悕锛�$userName")
}
val cardAddress = cardNumber ?: cardAddr
@@ -486,11 +521,10 @@
data.add(" 寮�鍗″嚟璇�")
data.add("*****************************")
- // 娣诲姞鐢ㄦ埛鍚嶏紙浠嶤ardInfo涓幏鍙栵級
- cardInfo?.userName?.let { userName ->
- if (userName.isNotEmpty()) {
- data.add("鐢ㄦ埛濮撳悕锛�$userName")
- }
+ // 娣诲姞鐢ㄦ埛鍚嶏紙浼樺厛浠嶤lientInfo涓幏鍙栵紝濡傛灉娌℃湁鍐嶄粠CardInfo涓幏鍙栵級
+ val userName = getUserName()
+ if (!userName.isNullOrEmpty()) {
+ data.add("鐢ㄦ埛濮撳悕锛�$userName")
}
// 娣诲姞鍗″湴鍧�
@@ -507,14 +541,15 @@
// 娣诲姞鍏呭�奸噾棰�
if (rechargeAmount > 0) {
data.add("鍏呭�奸噾棰濓細${String.format("%.2f", rechargeAmount)} 鍏�")
- // 娣诲姞鍏呭�煎悗浣欓
- data.add("鍏呭�煎悗浣欓锛�${MornyUtil.changeF2Y(userCard.balance)} 鍏�")
}
- // 娣诲姞璧犻�侀噾棰�
+ // 娣诲姞宸ユ湰璐�
if (cardFee > 0) {
- data.add("宸ユ湰璐癸細" + MornyUtil.changeF2Y(cardFee) + "鍏�")
+ data.add("宸ユ湰璐癸細" + cardFee + "鍏�")
}
+
+ // 娣诲姞鍗″唴浣欓锛堝紑鍗″悗鐨勪綑棰濓級
+ data.add("鍗″唴浣欓锛�${MornyUtil.changeF2Y(userCard.balance)} 鍏�")
// 娣诲姞璁㈠崟鍙�
if (!orderNumber.isNullOrEmpty()) {
@@ -541,11 +576,10 @@
data.add(" 鎿嶄綔鍑瘉")
data.add("*****************************")
- // 娣诲姞鐢ㄦ埛鍚嶏紙浠嶤ardInfo涓幏鍙栵級
- cardInfo?.userName?.let { userName ->
- if (userName.isNotEmpty()) {
- data.add("鐢ㄦ埛濮撳悕锛�$userName")
- }
+ // 娣诲姞鐢ㄦ埛鍚嶏紙浼樺厛浠嶤lientInfo涓幏鍙栵紝濡傛灉娌℃湁鍐嶄粠CardInfo涓幏鍙栵級
+ val userName = getUserName()
+ if (!userName.isNullOrEmpty()) {
+ data.add("鐢ㄦ埛濮撳悕锛�$userName")
}
val cardAddress = cardNumber ?: cardAddr
--
Gitblit v1.8.0