From 167eea1eeb0d02be0e4372ba787ddde11219de1e Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 11 六月 2025 10:24:55 +0800
Subject: [PATCH] feat(generallibrary): 新增写卡成功页面并优化开卡流程
---
generallibrary/src/main/java/com/dayu/general/activity/NfcWreatActivity.kt | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 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..e21fe66 100644
--- a/generallibrary/src/main/java/com/dayu/general/activity/NfcWreatActivity.kt
+++ b/generallibrary/src/main/java/com/dayu/general/activity/NfcWreatActivity.kt
@@ -28,7 +28,6 @@
class NfcWreatActivity : BaseNfcActivity() {
var binding: ActivityNfcWriteGeBinding? = null
var cardType = ""
- var orderId = ""
var cardAddr = ""
var cardFee = 0
@@ -50,9 +49,9 @@
*/
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)
if (intent?.hasExtra("cardFee") == true) {
cardFee = intent?.getIntExtra("cardFee", 0) ?: 0
@@ -111,10 +110,7 @@
runOnUiThread {
if (success) {
postCardData(cardType, cardAddr)
- // 鍐欏崱鎴愬姛鍚庢洿鏂版暟鎹簱涓殑isCardWritten鐘舵��
- updateCardWrittenStatus(cardAddr)
ToastUtil.show("鍐欏崱鎴愬姛!")
- // 澶勭悊鍐欏崱鎴愬姛鐨勬儏鍐�
} else {
// 澶勭悊鍐欏崱澶辫触鐨勬儏鍐�
ToastUtil.show(message)
@@ -129,9 +125,8 @@
// 纭繚Toast鍦ㄤ富绾跨▼涓皟鐢�
runOnUiThread {
if (flag) {
- // 鍐欏崱鎴愬姛鍚庢洿鏂版暟鎹簱涓殑isCardWritten鐘舵��
- updateCardWrittenStatus(cardAddr)
- ToastUtil.show("鍐欏崱鎴愬姛!")
+ postCardData(cardType, cardAddr)
+
} else {
ToastUtil.show("鍐欏崱澶辫触: ${msg ?: "鏈煡閿欒"}")
}
@@ -169,11 +164,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 +210,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