From 0faae97cd2523f840c426da68464e577e01dfa80 Mon Sep 17 00:00:00 2001
From: zuojincheng <lf_zuo@163.com>
Date: 星期一, 23 六月 2025 20:35:08 +0800
Subject: [PATCH] refactor(CardReplaceActivity): 重构补卡流程并优化界面显示- 重新设计卡片信息展示布局，增加新卡卡地址、客户编号等字段 - 优化补卡逻辑，支持通过卡号或客户编号获取卡片信息 -调整工本费和返回金额输入框位置 - 更新API调用路径，使用新的卡片查询接口
---
generallibrary/src/main/java/com/dayu/general/activity/NfcWreatActivity.kt | 186 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 158 insertions(+), 28 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..1ccb366 100644
--- a/generallibrary/src/main/java/com/dayu/general/activity/NfcWreatActivity.kt
+++ b/generallibrary/src/main/java/com/dayu/general/activity/NfcWreatActivity.kt
@@ -9,17 +9,15 @@
import com.dayu.baselibrary.utils.ToastUtil
import com.dayu.general.bean.card.ClearCard
import com.dayu.general.bean.card.UserCard
-import com.dayu.general.tool.CardCommon
-import com.dayu.general.tool.CardOperationType
+import com.dayu.general.dao.BaseDaoSingleton
import com.dayu.general.databinding.ActivityNfcWriteGeBinding
import com.dayu.general.net.ApiManager
import com.dayu.general.net.BaseResponse
+import com.dayu.general.tool.CardOperationType
import com.dayu.general.tool.NfcReadHelper
import com.dayu.general.tool.NfcWreatHelper
-import com.dayu.general.dao.BaseDaoSingleton
import com.tencent.bugly.crashreport.CrashReport
import kotlinx.coroutines.launch
-import java.lang.StringBuilder
/**
* @author: zuo
@@ -35,6 +33,20 @@
// 鍏呭�肩浉鍏抽噾棰�
private var rechargeAmount = 0.0
private var bonusAmount = 0.0
+
+ // 閿�鍗＄浉鍏充俊鎭�
+ private var refundAmount = 0.0
+ private var cardBalance = 0.0
+
+ // 杩旇繕鐩稿叧淇℃伅
+ private var returnAmount = 0.0
+
+ // 琛ユ墸鐩稿叧淇℃伅
+ private var deductAmount = 0.0
+
+ // 琛ュ崱鐩稿叧淇℃伅
+ private var cardCost = 0.0
+ private var reissueAmount = 0.0
//璁㈠崟缂栧彿
var orderNumber = ""
@@ -63,6 +75,20 @@
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
+
+ // 鑾峰彇杩旇繕鐩稿叧淇℃伅
+ returnAmount = intent?.getDoubleExtra("returnAmount", 0.0) ?: 0.0
+
+ // 鑾峰彇琛ユ墸鐩稿叧淇℃伅
+ deductAmount = intent?.getDoubleExtra("deductAmount", 0.0) ?: 0.0
+
+ // 鑾峰彇琛ュ崱鐩稿叧淇℃伅
+ cardCost = intent?.getDoubleExtra("cardCost", 0.0) ?: 0.0
+ reissueAmount = intent?.getDoubleExtra("reissueAmount", 0.0) ?: 0.0
+
if (intent?.hasExtra("cardFee") == true) {
cardFee = intent?.getIntExtra("cardFee", 0) ?: 0
}
@@ -77,7 +103,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 -> {
@@ -116,20 +162,51 @@
if (userCard.balance != 0) {
val totalBalanceInYuan = userCard.balance / 100.0 // 杞崲涓哄厓
textData.append(
- "鍗″唴鎬讳綑棰濓細" + String.format(
- "%.2f",
- totalBalanceInYuan
- ) + "鍏�"
+ "鍏呭�煎悗浣欓锛�" + MornyUtil.changeF2Y(userCard.balance)+ "鍏�"
)
}
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.ReturnCard -> {
+ var textData = StringBuilder()
+ textData.append("杩旇繕\n")
+ textData.append("鍗″唴浣欓锛�" + MornyUtil.changeF2Y(userCard.balance) + "鍏僜n")
+ textData.append("杩旇繕閲戦锛�" + returnAmount + "鍏�")
+ binding?.cardData?.text = textData.toString()
+ }
+
+ CardOperationType.DeductCard -> {
+ var textData = StringBuilder()
+ textData.append("琛ユ墸\n")
+ textData.append("鍗″唴浣欓锛�" + MornyUtil.changeF2Y(userCard.balance) + "鍏僜n")
+ textData.append("琛ユ墸閲戦锛�" + deductAmount + "鍏�")
+ binding?.cardData?.text = textData.toString()
+ }
+
+ CardOperationType.ReplaceCard -> {
+ var textData = StringBuilder()
+ textData.append("琛ュ崱\n")
+ textData.append("鍗″唴浣欓锛�" + MornyUtil.changeF2Y(userCard.balance) + "鍏僜n")
+ if (cardCost > 0) {
+ textData.append("宸ユ湰璐癸細" + String.format("%.2f", cardCost) + "鍏僜n")
+ }
+ if (reissueAmount > 0) {
+ textData.append("琛ュ崱閲戦锛�" + String.format("%.2f", reissueAmount) + "鍏�")
+ }
+ binding?.cardData?.text = textData.toString()
+ }
+
CardOperationType.CheckCard -> TODO()
- CardOperationType.DeductCard -> TODO()
- CardOperationType.ReplaceCard -> TODO()
null -> TODO()
}
}
@@ -151,7 +228,7 @@
// 纭繚Toast鍦ㄤ富绾跨▼涓皟鐢�
runOnUiThread {
if (success) {
- postCardData(cardType, cardAddr)
+ postCardData(cardAddr)
ToastUtil.show("鍐欏崱鎴愬姛!")
} else {
// 澶勭悊鍐欏崱澶辫触鐨勬儏鍐�
@@ -167,7 +244,7 @@
// 纭繚Toast鍦ㄤ富绾跨▼涓皟鐢�
runOnUiThread {
if (flag) {
- postCardData(cardType, cardAddr)
+ postCardData(cardAddr)
} else {
ToastUtil.show("鍐欏崱澶辫触: ${msg ?: "鏈煡閿欒"}")
@@ -184,8 +261,7 @@
// 纭繚Toast鍦ㄤ富绾跨▼涓皟鐢�
runOnUiThread {
if (flag) {
- postCardData(cardType, cardAddr)
- ToastUtil.show("鍏呭�煎啓鍗℃垚鍔�!")
+ postCardData(cardAddr)
} else {
ToastUtil.show("鍏呭�煎啓鍗″け璐�: ${msg ?: "鏈煡閿欒"}")
}
@@ -194,10 +270,69 @@
})
}
- 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.ReturnCard -> {
+ nfcWreatHelper.writeUserDataAsync(userCard, object : NFCCallBack {
+ override fun isSusses(flag: Boolean, msg: String?) {
+ // 纭繚Toast鍦ㄤ富绾跨▼涓皟鐢�
+ runOnUiThread {
+ if (flag) {
+ postCardData(cardAddr)
+ } else {
+ ToastUtil.show("杩旇繕鍐欏崱澶辫触: ${msg ?: "鏈煡閿欒"}")
+ }
+ }
+ }
+ })
+ }
+
+ CardOperationType.DeductCard -> {
+ nfcWreatHelper.writeUserDataAsync(userCard, object : NFCCallBack {
+ override fun isSusses(flag: Boolean, msg: String?) {
+ // 纭繚Toast鍦ㄤ富绾跨▼涓皟鐢�
+ runOnUiThread {
+ if (flag) {
+ postCardData(cardAddr)
+ } else {
+ ToastUtil.show("琛ユ墸鍐欏崱澶辫触: ${msg ?: "鏈煡閿欒"}")
+ }
+ }
+ }
+ })
+ }
+
+ CardOperationType.ReplaceCard -> {
+ 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()
null -> TODO()
}
} else {
@@ -228,6 +363,8 @@
finish()
Intent(this@NfcWreatActivity, CardWriteSuccessActivity::class.java).apply {
putExtra("cardNumber", cardNumber)
+ putExtra("userCard", userCard)
+ putExtra("operationTypeCode", operationTypeCode)
startActivity(this)
}
}
@@ -242,12 +379,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 +400,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