From 465c8abaa982fba6868a900d25316c70afc20fb7 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 18 六月 2025 13:59:46 +0800
Subject: [PATCH] feat(card): 优化销卡功能并添加写卡操作
---
generallibrary/src/main/java/com/dayu/general/activity/NfcWreatActivity.kt | 75 +++++++++++++++++++++++++++++--------
1 files changed, 59 insertions(+), 16 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 ad1a0c3..3bf4fce 100644
--- a/generallibrary/src/main/java/com/dayu/general/activity/NfcWreatActivity.kt
+++ b/generallibrary/src/main/java/com/dayu/general/activity/NfcWreatActivity.kt
@@ -36,6 +36,10 @@
private var rechargeAmount = 0.0
private var bonusAmount = 0.0
+ // 閿�鍗＄浉鍏充俊鎭�
+ private var refundAmount = 0.0
+ private var cardBalance = 0.0
+
//璁㈠崟缂栧彿
var orderNumber = ""
private lateinit var userCard: UserCard
@@ -63,6 +67,10 @@
rechargeAmount = intent?.getDoubleExtra("rechargeAmount", 0.0) ?: 0.0
bonusAmount = intent?.getDoubleExtra("bonusAmount", 0.0) ?: 0.0
+ // 鑾峰彇閿�鍗＄浉鍏充俊鎭�
+ refundAmount = intent?.getDoubleExtra("refundAmount", 0.0) ?: 0.0
+ cardBalance = intent?.getDoubleExtra("cardBalance", 0.0) ?: 0.0
+
if (intent?.hasExtra("cardFee") == true) {
cardFee = intent?.getIntExtra("cardFee", 0) ?: 0
}
@@ -77,7 +85,27 @@
if (operationTypeCode != -1) {
when (operationType) {
CardOperationType.CleanCard -> {
- binding?.cardData?.text = "娓呴浂鍗″啓鍗�"
+ val textData = StringBuilder()
+
+ // 鍒ゆ柇鏄惁鏉ヨ嚜閿�鍗℃搷浣滐紙鏈夐��娆鹃噾棰濇垨鍗″唴浣欓淇℃伅锛�
+ if (refundAmount > 0 || cardBalance > 0) {
+ textData.append("閿�鍗℃竻闆舵搷浣淺n")
+ textData.append("鍗″湴鍧�锛�$cardAddr\n")
+
+ if (cardBalance > 0) {
+ textData.append("鍗″唴浣欓锛�${String.format("%.2f", cardBalance)}鍏僜n")
+ }
+
+ if (refundAmount > 0) {
+ textData.append("閫�娆鹃噾棰濓細${String.format("%.2f", refundAmount)}鍏�")
+ } else {
+ textData.append("鏃犻��娆鹃噾棰�")
+ }
+ } else {
+ textData.append("娓呴浂鍗″啓鍗�")
+ }
+
+ binding?.cardData?.text = textData.toString()
}
CardOperationType.OpenCard -> {
@@ -126,7 +154,14 @@
binding?.cardData?.text = textData.toString()
}
- CardOperationType.CancelCard -> TODO()
+ CardOperationType.CancelCard -> {
+ var textData = StringBuilder()
+ textData.append("閿�鍗n")
+ textData.append("鍗″唴浣欓锛�" + MornyUtil.changeF2Y(userCard.balance) + "鍏僜n")
+ textData.append("閫�娆鹃噾棰濓細" + refundAmount + "鍏�")
+ binding?.cardData?.text = textData.toString()
+ }
+
CardOperationType.CheckCard -> TODO()
CardOperationType.DeductCard -> TODO()
CardOperationType.ReplaceCard -> TODO()
@@ -151,7 +186,7 @@
// 纭繚Toast鍦ㄤ富绾跨▼涓皟鐢�
runOnUiThread {
if (success) {
- postCardData(cardType, cardAddr)
+ postCardData(cardAddr)
ToastUtil.show("鍐欏崱鎴愬姛!")
} else {
// 澶勭悊鍐欏崱澶辫触鐨勬儏鍐�
@@ -167,7 +202,7 @@
// 纭繚Toast鍦ㄤ富绾跨▼涓皟鐢�
runOnUiThread {
if (flag) {
- postCardData(cardType, cardAddr)
+ postCardData(cardAddr)
} else {
ToastUtil.show("鍐欏崱澶辫触: ${msg ?: "鏈煡閿欒"}")
@@ -184,8 +219,7 @@
// 纭繚Toast鍦ㄤ富绾跨▼涓皟鐢�
runOnUiThread {
if (flag) {
- postCardData(cardType, cardAddr)
- ToastUtil.show("鍏呭�煎啓鍗℃垚鍔�!")
+ postCardData(cardAddr)
} else {
ToastUtil.show("鍏呭�煎啓鍗″け璐�: ${msg ?: "鏈煡閿欒"}")
}
@@ -194,7 +228,23 @@
})
}
- CardOperationType.CancelCard -> TODO()
+ CardOperationType.CancelCard -> {
+ var userCard = UserCard()
+ userCard.cardType = "00";
+ nfcWreatHelper.writeUserDataAsync(userCard, object : NFCCallBack {
+ override fun isSusses(flag: Boolean, msg: String?) {
+ // 纭繚Toast鍦ㄤ富绾跨▼涓皟鐢�
+ runOnUiThread {
+ if (flag) {
+ postCardData(cardAddr)
+ } else {
+ ToastUtil.show("閿�鍗″啓鍗″け璐�: ${msg ?: "鏈煡閿欒"}")
+ }
+ }
+ }
+ })
+ }
+
CardOperationType.CheckCard -> TODO()
CardOperationType.DeductCard -> TODO()
CardOperationType.ReplaceCard -> TODO()
@@ -242,12 +292,8 @@
}
}
- fun postCardData(cardType: String, cardAddr: String) {
- when (cardType) {
- CardCommon.CHECK_CARD -> {
- binding?.cardData?.text = "鍐欑敤鎴峰崱"
- }
- }
+ fun postCardData(cardAddr: String) {
+
val map = mutableMapOf<String, Any>()
if (cardAddr.isNotEmpty()) {
@@ -267,10 +313,7 @@
object : SubscriberListener<BaseResponse<String>>() {
override fun onNext(t: BaseResponse<String>) {
if (t.success) {
-
updateCardWrittenStatus(cardAddr)
-
-
} else {
// 澶勭悊鎼滅储澶辫触鐨勬儏鍐�
ToastUtil.show(t.msg)
--
Gitblit v1.8.0