From dd0f9e5f533d868d68c5fc343a44356b537b3988 Mon Sep 17 00:00:00 2001
From: zuojincheng <lf_zuo@163.com>
Date: 星期五, 06 六月 2025 15:36:45 +0800
Subject: [PATCH] feat(nfc): 新增用户卡写入功能并优化开卡流程
---
generallibrary/src/main/java/com/dayu/general/activity/NfcWreatActivity.kt | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 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 cd60f9c..f8f55a4 100644
--- a/generallibrary/src/main/java/com/dayu/general/activity/NfcWreatActivity.kt
+++ b/generallibrary/src/main/java/com/dayu/general/activity/NfcWreatActivity.kt
@@ -1,10 +1,11 @@
- package com.dayu.general.activity
+package com.dayu.general.activity
import android.content.Intent
import android.os.Bundle
import com.dayu.baselibrary.net.subscribers.SubscriberListener
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
@@ -22,6 +23,7 @@
var cardType = ""
var orderId = ""
var cardAddr = ""
+ private lateinit var userCard: UserCard
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
@@ -37,6 +39,12 @@
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 -> {
@@ -68,6 +76,12 @@
}
}
}
+
+ CardCommon.USER_CARD_TYPE_1 -> {
+ binding?.cardData?.text = "鍐欑敤鎴峰崱"
+ nfcWreatHelper.writeUserData(userCard)
+
+ }
}
} else {
ToastUtil.show("鍗＄墖閿欒锛屽綋鍓嶅埛鐨勫崱涓庡垰鍒氱殑鍗′笉涓�鑷�")
@@ -88,7 +102,7 @@
if (cardType.isNotEmpty()) {
// map["cardType"] = cardType
- map["cardType"] = "5"
+ map["operateType"] = "1"
}
if (remark.isNotEmpty()) {
map["remarks"] = remark
@@ -102,7 +116,9 @@
object : SubscriberListener<BaseResponse<String>>() {
override fun onNext(t: BaseResponse<String>) {
if (t.success) {
+ ToastUtil.show("鍐欏崱鎴愬姛")
this@NfcWreatActivity.finish()
+
} else {
// 澶勭悊鎼滅储澶辫触鐨勬儏鍐�
ToastUtil.show(t.msg)
@@ -111,7 +127,7 @@
override fun onError(e: Throwable?) {
super.onError(e)
- ToastUtil.show("鎼滅储澶辫触: ${e?.message ?: "鏈煡閿欒"}")
+ ToastUtil.show("涓婃姤澶辫触: ${e?.message ?: "鏈煡閿欒"}")
}
}
)
--
Gitblit v1.8.0