From 899cb6ce779b24a659ec3515dd3fb1cd1afef7d2 Mon Sep 17 00:00:00 2001
From: zuojincheng <lf_zuo@163.com>
Date: 星期二, 24 六月 2025 14:02:46 +0800
Subject: [PATCH] feat(card): 增加区域表号卡制作功能
---
generallibrary/src/main/java/com/dayu/general/activity/NfcWreatActivity.kt | 91 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 74 insertions(+), 17 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 a464809..b8bd087 100644
--- a/generallibrary/src/main/java/com/dayu/general/activity/NfcWreatActivity.kt
+++ b/generallibrary/src/main/java/com/dayu/general/activity/NfcWreatActivity.kt
@@ -44,6 +44,10 @@
// 琛ユ墸鐩稿叧淇℃伅
private var deductAmount = 0.0
+ // 琛ュ崱鐩稿叧淇℃伅
+ private var cardCost = 0.0
+ private var reissueAmount = 0.0
+
//璁㈠崟缂栧彿
var orderNumber = ""
private lateinit var userCard: UserCard
@@ -80,6 +84,10 @@
// 鑾峰彇琛ユ墸鐩稿叧淇℃伅
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
@@ -185,8 +193,37 @@
binding?.cardData?.text = textData.toString()
}
- CardOperationType.CheckCard -> TODO()
- CardOperationType.ReplaceCard -> TODO()
+ 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 -> {
+ var textData = StringBuilder()
+ textData.append("妫�鏌ュ崱鍒朵綔")
+ binding?.cardData?.text = textData.toString()
+ }
+
+ CardOperationType.RegionCard -> {
+ var textData = StringBuilder()
+ textData.append("鍖哄煙琛ㄥ彿鍗″埗浣�")
+ binding?.cardData?.text = textData.toString()
+ }
+
+ CardOperationType.DebugCard -> {
+ var textData = StringBuilder()
+ textData.append("璋冭瘯鍗″埗浣�")
+ binding?.cardData?.text = textData.toString()
+ }
+
null -> TODO()
}
}
@@ -203,19 +240,8 @@
val nfcWreatHelper = NfcWreatHelper.getInstance(intent, this)
when (operationType) {
CardOperationType.CleanCard -> {
- var clearCard = ClearCard()
- nfcWreatHelper.writeData(clearCard.getZeroBytes(), 7, 0) { success, message ->
- // 纭繚Toast鍦ㄤ富绾跨▼涓皟鐢�
- runOnUiThread {
- if (success) {
- postCardData(cardAddr)
- ToastUtil.show("鍐欏崱鎴愬姛!")
- } else {
- // 澶勭悊鍐欏崱澶辫触鐨勬儏鍐�
- ToastUtil.show(message)
- }
- }
- }
+
+
}
CardOperationType.OpenCard -> {
@@ -297,8 +323,39 @@
})
}
- CardOperationType.CheckCard -> TODO()
- CardOperationType.ReplaceCard -> TODO()
+ 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 -> {
+ // 妫�鏌ュ崱鍐欏崱閫昏緫
+ ToastUtil.show("妫�鏌ュ崱鍐欏崱鎴愬姛!")
+ postCardData(cardAddr)
+ }
+
+ CardOperationType.RegionCard -> {
+ // 鍖哄煙琛ㄥ彿鍗″啓鍗￠�昏緫
+ ToastUtil.show("鍖哄煙琛ㄥ彿鍗″啓鍗℃垚鍔�!")
+ postCardData(cardAddr)
+ }
+
+ CardOperationType.DebugCard -> {
+ // 璋冭瘯鍗″啓鍗￠�昏緫
+ ToastUtil.show("璋冭瘯鍗″啓鍗℃垚鍔�!")
+ postCardData(cardAddr)
+ }
+
null -> TODO()
}
} else {
--
Gitblit v1.8.0