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/NewCard2Activity.kt | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/generallibrary/src/main/java/com/dayu/general/activity/NewCard2Activity.kt b/generallibrary/src/main/java/com/dayu/general/activity/NewCard2Activity.kt
index 947b440..045f203 100644
--- a/generallibrary/src/main/java/com/dayu/general/activity/NewCard2Activity.kt
+++ b/generallibrary/src/main/java/com/dayu/general/activity/NewCard2Activity.kt
@@ -69,6 +69,7 @@
companion object {
private const val TAG = "NewCard2Activity"
+ private const val REQUEST_CODE_NFC_WRITE = 1001
}
@@ -355,16 +356,10 @@
try {
BaseDaoSingleton.getInstance(this@NewCard2Activity)
.cardRegistrationDao().insert(cardRegistration)
-
- Toast.makeText(
- this@NewCard2Activity,
- "寮�鍗℃垚鍔�",
- Toast.LENGTH_SHORT
- ).show()
setResult(RESULT_OK)
Intent(this@NewCard2Activity, NfcWreatActivity::class.java).apply {
putExtra("cardType", USER_CARD_TYPE_1)
- putExtra("orderId", orderId)
+ putExtra("orderNumber", orderId)
putExtra("cardAddr", cardPhysicalId)
var userCard = UserCard()
userCard.areaNumber = response.content?.cardNum?.substring(0, 12).toString()
@@ -379,9 +374,8 @@
userCard.rechargeDate = DateUtils.parseStringToCalendar(response.content?.time)
putExtra("userCard", userCard)
putExtra("operationTypeCode", CardOperationType.OpenCard.code)
- putExtra("orderNumber", response.content?.orderNo)
putExtra("cardFee", cardFee)
- startActivity(this)
+ startActivityForResult(this, REQUEST_CODE_NFC_WRITE)
}
} catch (e: Exception) {
CrashReport.postCatchedException(e)
@@ -499,4 +493,12 @@
}
}
+ override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+ super.onActivityResult(requestCode, resultCode, data)
+ if (requestCode == REQUEST_CODE_NFC_WRITE && resultCode == RESULT_OK) {
+ // 鍐欏崱鎴愬姛锛屽叧闂綋鍓岮ctivity
+ finish()
+ }
+ }
+
}
\ No newline at end of file
--
Gitblit v1.8.0