From a8751388c9a86ae95714a15279994d8aa426a26d Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 13 六月 2025 14:59:02 +0800
Subject: [PATCH] feat(generallibrary): 优化充值功能并添加水价获取- 在 activity_recharge_detail.xml 中移除了不必要的 bold 样式- 在 EditText 中添加了金额输入限制（数字和小数点）- 在 BaseApplication 中添加了水价信息存储 - 在 MainActivity 中实现了延时获取水价的功能- 优化了 RechargeDetailActivity 中的水价检查和使用逻辑 - 在 README.md 中添加了金额格式化和水价获取的最佳实践指南
---
generallibrary/src/main/java/com/dayu/general/activity/NfcWreatActivity.kt | 161 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 120 insertions(+), 41 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 74bb8e9..dbdc7ff 100644
--- a/generallibrary/src/main/java/com/dayu/general/activity/NfcWreatActivity.kt
+++ b/generallibrary/src/main/java/com/dayu/general/activity/NfcWreatActivity.kt
@@ -9,6 +9,7 @@
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.databinding.ActivityNfcWriteGeBinding
import com.dayu.general.net.ApiManager
import com.dayu.general.net.BaseResponse
@@ -17,6 +18,7 @@
import com.dayu.general.dao.BaseDaoSingleton
import com.tencent.bugly.crashreport.CrashReport
import kotlinx.coroutines.launch
+import java.lang.StringBuilder
/**
* @author: zuo
@@ -26,9 +28,14 @@
class NfcWreatActivity : BaseNfcActivity() {
var binding: ActivityNfcWriteGeBinding? = null
var cardType = ""
- var orderId = ""
var cardAddr = ""
+ var cardFee = 0
+
+ //璁㈠崟缂栧彿
+ var orderNumber = ""
private lateinit var userCard: UserCard
+ private var operationTypeCode = -1;
+ private var operationType: CardOperationType? = null
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
@@ -42,20 +49,57 @@
*/
private fun getInitData() {
cardType = intent?.getStringExtra("cardType") ?: ""
- orderId = intent?.getStringExtra("orderId") ?: ""
cardAddr = intent?.getStringExtra("cardAddr") ?: ""
- if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU) {
- userCard = intent?.getSerializableExtra("userCard", UserCard::class.java)!!
- } else {
- userCard = (intent?.getSerializableExtra("userCard") as? UserCard)!!
+ operationTypeCode = intent?.getIntExtra("operationTypeCode", -1) ?: -1
+ orderNumber = intent?.getStringExtra("orderNumber") ?: ""
+ operationType = CardOperationType.fromCode(operationTypeCode)
+ if (intent?.hasExtra("cardFee") == true) {
+ cardFee = intent?.getIntExtra("cardFee", 0) ?: 0
}
+ if (intent?.hasExtra("userCard") == true) {
+ if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU) {
+ userCard = intent?.getSerializableExtra("userCard", UserCard::class.java)!!
+ } else {
+ userCard = (intent?.getSerializableExtra("userCard") as? UserCard)!!
+ }
- if (cardType.isNotEmpty()) {
- when (cardType) {
- CardCommon.CLEAN_CARD_TYPE -> {
+ }
+ if (operationTypeCode != -1) {
+ when (operationType) {
+ CardOperationType.CleanCard -> {
binding?.cardData?.text = "娓呴浂鍗″啓鍗�"
}
+ CardOperationType.OpenCard -> {
+ var textData = StringBuilder()
+ textData.append("鐢ㄦ埛寮�鍗n")
+ if (cardFee != 0) {
+ textData.append("宸ユ湰璐癸細" + cardFee + "鍏僜n")
+ }
+ if (userCard.balance != 0) {
+ textData.append("鍏呭�奸噾棰濓細" + userCard.balance + "鍏�")
+ }
+
+ binding?.cardData?.text = textData.toString()
+ }
+
+ CardOperationType.Recharge -> {
+ var textData = StringBuilder()
+ textData.append("鐢ㄦ埛鍏呭�糪n")
+ textData.append("璁㈠崟鍙凤細" + orderNumber + "\n")
+ if (userCard.balance != 0) {
+ val balanceInYuan = userCard.balance / 100.0 // 杞崲涓哄厓
+ textData.append("鍏呭�奸噾棰濓細" + String.format("%.2f", balanceInYuan) + "鍏�")
+ }
+
+ binding?.cardData?.text = textData.toString()
+ }
+
+ CardOperationType.CancelCard -> TODO()
+ CardOperationType.CheckCard -> TODO()
+ CardOperationType.DeductCard -> TODO()
+ CardOperationType.ReplaceCard -> TODO()
+ null -> TODO()
}
}
@@ -64,41 +108,66 @@
override fun onNfcBack(intent: Intent) {
val nfcReadHelper = NfcReadHelper.getInstance(intent, this)
- val cardNumber = nfcReadHelper.getCardNumberNoClose()
+ // 浣跨敤姝ｅ父鐨刧etCardNumber()鏂规硶锛屽畠浼氳嚜鍔ㄥ叧闂繛鎺�
+ val cardNumber = nfcReadHelper.getCardNumber()
+
if (cardNumber.isNotEmpty() && cardNumber == cardAddr) {
val nfcWreatHelper = NfcWreatHelper.getInstance(intent, this)
- when (cardType) {
- CardCommon.CLEAN_CARD_TYPE -> {
+ when (operationType) {
+ CardOperationType.CleanCard -> {
var clearCard = ClearCard()
nfcWreatHelper.writeData(clearCard.getZeroBytes(), 7, 0) { success, message ->
- if (success) {
- postCardData(cardType, cardAddr, "")
- // 鍐欏崱鎴愬姛鍚庢洿鏂版暟鎹簱涓殑isCardWritten鐘舵��
- updateCardWrittenStatus(cardAddr)
- ToastUtil.show("鍐欏崱鎴愬姛!")
- // 澶勭悊鍐欏崱鎴愬姛鐨勬儏鍐�
- } else {
- // 澶勭悊鍐欏崱澶辫触鐨勬儏鍐�
- ToastUtil.show(message)
+ // 纭繚Toast鍦ㄤ富绾跨▼涓皟鐢�
+ runOnUiThread {
+ if (success) {
+ postCardData(cardType, cardAddr)
+ ToastUtil.show("鍐欏崱鎴愬姛!")
+ } else {
+ // 澶勭悊鍐欏崱澶辫触鐨勬儏鍐�
+ ToastUtil.show(message)
+ }
}
}
}
- CardCommon.USER_CARD_TYPE_1 -> {
- binding?.cardData?.text = "鍐欑敤鎴峰崱"
+ CardOperationType.OpenCard -> {
nfcWreatHelper.writeUserDataAsync(userCard, object : NFCCallBack {
override fun isSusses(flag: Boolean, msg: String?) {
- if (flag) {
- // 鍐欏崱鎴愬姛鍚庢洿鏂版暟鎹簱涓殑isCardWritten鐘舵��
- updateCardWrittenStatus(cardAddr)
- ToastUtil.show("鍐欏崱鎴愬姛!")
- } else {
- ToastUtil.show("鍐欏崱澶辫触: ${msg ?: "鏈煡閿欒"}")
+ // 纭繚Toast鍦ㄤ富绾跨▼涓皟鐢�
+ runOnUiThread {
+ if (flag) {
+ postCardData(cardType, cardAddr)
+
+ } else {
+ ToastUtil.show("鍐欏崱澶辫触: ${msg ?: "鏈煡閿欒"}")
+ }
}
}
})
}
+
+ 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.ReplaceCard -> TODO()
+ null -> TODO()
}
} else {
ToastUtil.show("鍗＄墖閿欒锛屽綋鍓嶅埛鐨勫崱涓庡垰鍒氱殑鍗′笉涓�鑷�")
@@ -113,7 +182,7 @@
try {
val cardRegistrationDao = BaseDaoSingleton.getInstance(this@NfcWreatActivity)
.cardRegistrationDao()
-
+
// 鏍规嵁鍗″彿鏌ユ壘CardRegistrationBean璁板綍
val cardRegistration = cardRegistrationDao.getByCardNumber(cardNumber)
if (cardRegistration != null) {
@@ -121,16 +190,28 @@
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}")
+ }
}
}
}
- fun postCardData(cardType: String, cardAddr: String, remark: String) {
+ fun postCardData(cardType: String, cardAddr: String) {
when (cardType) {
CardCommon.CHECK_CARD -> {
binding?.cardData?.text = "鍐欑敤鎴峰崱"
@@ -142,24 +223,22 @@
map["cardAddr"] = cardAddr
}
- if (cardType.isNotEmpty()) {
-// map["cardType"] = cardType
- map["operateType"] = "1"
- }
- if (remark.isNotEmpty()) {
- map["remarks"] = remark
+ map["operateType"] = operationTypeCode
+ if (orderNumber.isNotEmpty()) {
+ map["orderNumber"] = orderNumber
}
// 浣跨敤姝ｇ‘鐨勭被鍨嬪弬鏁�
ApiManager.getInstance().requestPostLoading(
this,
- "/sell/card/call_back",
+ "terminal/card/termCallBack",
String::class.java,
map,
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