From 2b02b6e854a56a511588e4865ddf2c6597675329 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期一, 16 六月 2025 16:04:54 +0800
Subject: [PATCH] feat(nfc): 添加读卡功能并优化写卡流程
---
generallibrary/src/main/java/com/dayu/general/activity/NfcWreatActivity.kt | 80 +++++++++++++++++++++++++++++++++------
1 files changed, 67 insertions(+), 13 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 3c9910b..e1c384c 100644
--- a/generallibrary/src/main/java/com/dayu/general/activity/NfcWreatActivity.kt
+++ b/generallibrary/src/main/java/com/dayu/general/activity/NfcWreatActivity.kt
@@ -28,9 +28,12 @@
class NfcWreatActivity : BaseNfcActivity() {
var binding: ActivityNfcWriteGeBinding? = null
var cardType = ""
- var orderId = ""
var cardAddr = ""
var cardFee = 0
+
+ // 鍏呭�肩浉鍏抽噾棰�
+ private var rechargeAmount = 0.0
+ private var bonusAmount = 0.0
//璁㈠崟缂栧彿
var orderNumber = ""
@@ -50,10 +53,15 @@
*/
private fun getInitData() {
cardType = intent?.getStringExtra("cardType") ?: ""
- orderId = intent?.getStringExtra("orderId") ?: ""
cardAddr = intent?.getStringExtra("cardAddr") ?: ""
operationTypeCode = intent?.getIntExtra("operationTypeCode", -1) ?: -1
+ orderNumber = intent?.getStringExtra("orderNumber") ?: ""
operationType = CardOperationType.fromCode(operationTypeCode)
+
+ // 鑾峰彇鍏呭�肩浉鍏抽噾棰�
+ rechargeAmount = intent?.getDoubleExtra("rechargeAmount", 0.0) ?: 0.0
+ bonusAmount = intent?.getDoubleExtra("bonusAmount", 0.0) ?: 0.0
+
if (intent?.hasExtra("cardFee") == true) {
cardFee = intent?.getIntExtra("cardFee", 0) ?: 0
}
@@ -84,10 +92,32 @@
binding?.cardData?.text = textData.toString()
}
+ CardOperationType.Recharge -> {
+ var textData = StringBuilder()
+ textData.append("鐢ㄦ埛鍏呭�糪n")
+
+ // 鏄剧ず鍏呭�奸噾棰�
+ if (rechargeAmount > 0) {
+ textData.append("鍏呭�奸噾棰濓細" + String.format("%.2f", rechargeAmount) + "鍏僜n")
+ }
+
+ // 鏄剧ず璧犻�侀噾棰�
+ if (bonusAmount > 0) {
+ textData.append("璧犻�侀噾棰濓細" + String.format("%.2f", bonusAmount) + "鍏僜n")
+ }
+
+ // 鏄剧ず鎬婚噾棰濓紙鍐欏叆鍗″唴鐨勬�讳綑棰濓級
+ if (userCard.balance != 0) {
+ val totalBalanceInYuan = userCard.balance / 100.0 // 杞崲涓哄厓
+ textData.append("鍗″唴鎬讳綑棰濓細" + String.format("%.2f", totalBalanceInYuan) + "鍏�")
+ }
+
+ binding?.cardData?.text = textData.toString()
+ }
+
CardOperationType.CancelCard -> TODO()
CardOperationType.CheckCard -> TODO()
CardOperationType.DeductCard -> TODO()
- CardOperationType.Recharge -> TODO()
CardOperationType.ReplaceCard -> TODO()
null -> TODO()
}
@@ -111,10 +141,7 @@
runOnUiThread {
if (success) {
postCardData(cardType, cardAddr)
- // 鍐欏崱鎴愬姛鍚庢洿鏂版暟鎹簱涓殑isCardWritten鐘舵��
- updateCardWrittenStatus(cardAddr)
ToastUtil.show("鍐欏崱鎴愬姛!")
- // 澶勭悊鍐欏崱鎴愬姛鐨勬儏鍐�
} else {
// 澶勭悊鍐欏崱澶辫触鐨勬儏鍐�
ToastUtil.show(message)
@@ -129,9 +156,8 @@
// 纭繚Toast鍦ㄤ富绾跨▼涓皟鐢�
runOnUiThread {
if (flag) {
- // 鍐欏崱鎴愬姛鍚庢洿鏂版暟鎹簱涓殑isCardWritten鐘舵��
- updateCardWrittenStatus(cardAddr)
- ToastUtil.show("鍐欏崱鎴愬姛!")
+ postCardData(cardType, cardAddr)
+
} else {
ToastUtil.show("鍐欏崱澶辫触: ${msg ?: "鏈煡閿欒"}")
}
@@ -141,10 +167,25 @@
}
+ CardOperationType.Recharge -> {
+ nfcWreatHelper.writeUserDataAsync(userCard, object : NFCCallBack {
+ override fun isSusses(flag: Boolean, msg: String?) {
+ // 纭繚Toast鍦ㄤ富绾跨▼涓皟鐢�
+ runOnUiThread {
+ if (flag) {
+ postCardData(cardType, cardAddr)
+ ToastUtil.show("鍏呭�煎啓鍗℃垚鍔�!")
+ } else {
+ ToastUtil.show("鍏呭�煎啓鍗″け璐�: ${msg ?: "鏈煡閿欒"}")
+ }
+ }
+ }
+ })
+ }
+
CardOperationType.CancelCard -> TODO()
CardOperationType.CheckCard -> TODO()
CardOperationType.DeductCard -> TODO()
- CardOperationType.Recharge -> TODO()
CardOperationType.ReplaceCard -> TODO()
null -> TODO()
}
@@ -169,11 +210,23 @@
val updatedCardRegistration = cardRegistration.copy(isCardWritten = true)
// 鏇存柊鏁版嵁搴撹褰�
cardRegistrationDao.update(updatedCardRegistration)
+
+ // 鍦ㄤ富绾跨▼涓叧闂瑼ctivity
+ runOnUiThread {
+ setResult(RESULT_OK)
+ finish()
+ Intent(this@NfcWreatActivity, CardWriteSuccessActivity::class.java).apply {
+ putExtra("cardNumber", cardNumber)
+ startActivity(this)
+ }
+ }
}
} catch (e: Exception) {
CrashReport.postCatchedException(e)
e.printStackTrace()
- ToastUtil.show("鏇存柊鍐欏崱鐘舵�佸け璐�: ${e.message}")
+ runOnUiThread {
+ ToastUtil.show("鏇存柊鍐欏崱鐘舵�佸け璐�: ${e.message}")
+ }
}
}
}
@@ -203,8 +256,9 @@
object : SubscriberListener<BaseResponse<String>>() {
override fun onNext(t: BaseResponse<String>) {
if (t.success) {
- ToastUtil.show("鍐欏崱鎴愬姛")
- this@NfcWreatActivity.finish()
+
+ updateCardWrittenStatus(cardAddr)
+
} else {
// 澶勭悊鎼滅储澶辫触鐨勬儏鍐�
--
Gitblit v1.8.0