From d773ab0295feba24ae4fc14f61e8aa310e40f4ba Mon Sep 17 00:00:00 2001
From: zuojincheng <lf_zuo@163.com>
Date: 星期五, 06 六月 2025 16:55:57 +0800
Subject: [PATCH] refactor(nfc): 优化写卡流程和状态更新
---
generallibrary/src/main/java/com/dayu/general/activity/NfcWreatActivity.kt | 165 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 148 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 202d43b..74bb8e9 100644
--- a/generallibrary/src/main/java/com/dayu/general/activity/NfcWreatActivity.kt
+++ b/generallibrary/src/main/java/com/dayu/general/activity/NfcWreatActivity.kt
@@ -2,19 +2,33 @@
import android.content.Intent
import android.os.Bundle
-import com.dayu.general.bean.card.CardCommon
+import androidx.lifecycle.lifecycleScope
+import com.dayu.baselibrary.net.subscribers.SubscriberListener
+import com.dayu.baselibrary.tools.nfc.NFCCallBack
+import com.dayu.baselibrary.utils.ToastUtil
+import com.dayu.general.bean.card.ClearCard
+import com.dayu.general.bean.card.UserCard
+import com.dayu.general.tool.CardCommon
import com.dayu.general.databinding.ActivityNfcWriteGeBinding
+import com.dayu.general.net.ApiManager
+import com.dayu.general.net.BaseResponse
+import com.dayu.general.tool.NfcReadHelper
+import com.dayu.general.tool.NfcWreatHelper
+import com.dayu.general.dao.BaseDaoSingleton
+import com.tencent.bugly.crashreport.CrashReport
+import kotlinx.coroutines.launch
/**
* @author: zuo
* @date: 2021/3/30
* @description:鍐欏崱鐣岄潰
*/
-class NfcWreatActivity:BaseNfcActivity() {
-
- var binding:ActivityNfcWriteGeBinding? = null
-
+class NfcWreatActivity : BaseNfcActivity() {
+ var binding: ActivityNfcWriteGeBinding? = null
var cardType = ""
+ var orderId = ""
+ var cardAddr = ""
+ private lateinit var userCard: UserCard
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
@@ -26,23 +40,140 @@
/**
* 鑾峰彇鏁版嵁
*/
- private fun getInitData(){
- cardType= intent?.getStringExtra("cardType")?:""
+ 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)!!
+ }
+
+ if (cardType.isNotEmpty()) {
+ when (cardType) {
+ CardCommon.CLEAN_CARD_TYPE -> {
+ binding?.cardData?.text = "娓呴浂鍗″啓鍗�"
+ }
+
+ }
+ }
+
}
- private fun setTextData(){
- when(cardType){
- CardCommon.CHECK_CARD->{
- binding?.cardData?.text = "鍐欑敤鎴峰崱"
- }
+ override fun onNfcBack(intent: Intent) {
+ val nfcReadHelper = NfcReadHelper.getInstance(intent, this)
+ val cardNumber = nfcReadHelper.getCardNumberNoClose()
+ if (cardNumber.isNotEmpty() && cardNumber == cardAddr) {
+ val nfcWreatHelper = NfcWreatHelper.getInstance(intent, this)
+ when (cardType) {
+ CardCommon.CLEAN_CARD_TYPE -> {
+ 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)
+ }
+ }
+ }
+
+ CardCommon.USER_CARD_TYPE_1 -> {
+ binding?.cardData?.text = "鍐欑敤鎴峰崱"
+ nfcWreatHelper.writeUserDataAsync(userCard, object : NFCCallBack {
+ override fun isSusses(flag: Boolean, msg: String?) {
+ if (flag) {
+ // 鍐欏崱鎴愬姛鍚庢洿鏂版暟鎹簱涓殑isCardWritten鐘舵��
+ updateCardWrittenStatus(cardAddr)
+ ToastUtil.show("鍐欏崱鎴愬姛!")
+ } else {
+ ToastUtil.show("鍐欏崱澶辫触: ${msg ?: "鏈煡閿欒"}")
+ }
+ }
+ })
+
+ }
+ }
+ } else {
+ ToastUtil.show("鍗＄墖閿欒锛屽綋鍓嶅埛鐨勫崱涓庡垰鍒氱殑鍗′笉涓�鑷�")
}
}
- override fun onNfcBack(intent: Intent?) {
- TODO("Not yet implemented")
-
-
-
+ /**
+ * 鏇存柊CardRegistrationBean涓殑isCardWritten鐘舵�佷负true
+ */
+ private fun updateCardWrittenStatus(cardNumber: String) {
+ lifecycleScope.launch {
+ try {
+ val cardRegistrationDao = BaseDaoSingleton.getInstance(this@NfcWreatActivity)
+ .cardRegistrationDao()
+
+ // 鏍规嵁鍗″彿鏌ユ壘CardRegistrationBean璁板綍
+ val cardRegistration = cardRegistrationDao.getByCardNumber(cardNumber)
+ if (cardRegistration != null) {
+ // 鍒涘缓鏇存柊鍚庣殑CardRegistrationBean瀵硅薄锛屽皢isCardWritten璁剧疆涓簍rue
+ val updatedCardRegistration = cardRegistration.copy(isCardWritten = true)
+ // 鏇存柊鏁版嵁搴撹褰�
+ cardRegistrationDao.update(updatedCardRegistration)
+ }
+ } catch (e: Exception) {
+ CrashReport.postCatchedException(e)
+ e.printStackTrace()
+ ToastUtil.show("鏇存柊鍐欏崱鐘舵�佸け璐�: ${e.message}")
+ }
+ }
}
+
+ fun postCardData(cardType: String, cardAddr: String, remark: String) {
+ when (cardType) {
+ CardCommon.CHECK_CARD -> {
+ binding?.cardData?.text = "鍐欑敤鎴峰崱"
+ }
+ }
+ val map = mutableMapOf<String, Any>()
+
+ if (cardAddr.isNotEmpty()) {
+ map["cardAddr"] = cardAddr
+ }
+
+ if (cardType.isNotEmpty()) {
+// map["cardType"] = cardType
+ map["operateType"] = "1"
+ }
+ if (remark.isNotEmpty()) {
+ map["remarks"] = remark
+ }
+ // 浣跨敤姝ｇ‘鐨勭被鍨嬪弬鏁�
+ ApiManager.getInstance().requestPostLoading(
+ this,
+ "/sell/card/call_back",
+ String::class.java,
+ map,
+ object : SubscriberListener<BaseResponse<String>>() {
+ override fun onNext(t: BaseResponse<String>) {
+ if (t.success) {
+ ToastUtil.show("鍐欏崱鎴愬姛")
+ this@NfcWreatActivity.finish()
+
+ } else {
+ // 澶勭悊鎼滅储澶辫触鐨勬儏鍐�
+ ToastUtil.show(t.msg)
+ }
+ }
+
+ override fun onError(e: Throwable?) {
+ super.onError(e)
+ ToastUtil.show("涓婃姤澶辫触: ${e?.message ?: "鏈煡閿欒"}")
+ }
+ }
+ )
+ }
+
+
}
\ No newline at end of file
--
Gitblit v1.8.0