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 | 220 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 201 insertions(+), 19 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 45d5bba..e21fe66 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,40 @@
import android.content.Intent
import android.os.Bundle
+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.tool.CardOperationType
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
+import java.lang.StringBuilder
/**
* @author: zuo
* @date: 2021/3/30
* @description:鍐欏崱鐣岄潰
*/
-class NfcWreatActivity:BaseNfcActivity() {
-
- var binding:ActivityNfcWriteGeBinding? = null
-
+class NfcWreatActivity : BaseNfcActivity() {
+ var binding: ActivityNfcWriteGeBinding? = null
var cardType = ""
+ 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)
@@ -26,25 +47,186 @@
/**
* 鑾峰彇鏁版嵁
*/
- private fun getInitData(){
- cardType= intent?.getStringExtra("cardType")?:""
- }
-
- private fun setTextData(){
- when(cardType){
- CardCommon.CHECK_CARD->{
- binding?.cardData?.text = "鍐欑敤鎴峰崱"
+ private fun getInitData() {
+ cardType = intent?.getStringExtra("cardType") ?: ""
+ 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
+ }
+ 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)!!
}
}
- }
- override fun onNfcBack(intent: Intent?) {
- TODO("Not yet implemented")
- when(cardType){
- CardCommon.CHECK_CARD->{
- binding?.cardData?.text = "鍐欑敤鎴峰崱"
- }
+ 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.CancelCard -> TODO()
+ CardOperationType.CheckCard -> TODO()
+ CardOperationType.DeductCard -> TODO()
+ CardOperationType.Recharge -> TODO()
+ CardOperationType.ReplaceCard -> TODO()
+ null -> TODO()
+ }
+ }
+
+ }
+
+
+ override fun onNfcBack(intent: Intent) {
+ val nfcReadHelper = NfcReadHelper.getInstance(intent, this)
+ // 浣跨敤姝ｅ父鐨刧etCardNumber()鏂规硶锛屽畠浼氳嚜鍔ㄥ叧闂繛鎺�
+ val cardNumber = nfcReadHelper.getCardNumber()
+
+ if (cardNumber.isNotEmpty() && cardNumber == cardAddr) {
+ val nfcWreatHelper = NfcWreatHelper.getInstance(intent, this)
+ when (operationType) {
+ CardOperationType.CleanCard -> {
+ var clearCard = ClearCard()
+ nfcWreatHelper.writeData(clearCard.getZeroBytes(), 7, 0) { success, message ->
+ // 纭繚Toast鍦ㄤ富绾跨▼涓皟鐢�
+ runOnUiThread {
+ if (success) {
+ postCardData(cardType, cardAddr)
+ ToastUtil.show("鍐欏崱鎴愬姛!")
+ } else {
+ // 澶勭悊鍐欏崱澶辫触鐨勬儏鍐�
+ ToastUtil.show(message)
+ }
+ }
+ }
+ }
+
+ CardOperationType.OpenCard -> {
+ nfcWreatHelper.writeUserDataAsync(userCard, object : NFCCallBack {
+ override fun isSusses(flag: Boolean, msg: String?) {
+ // 纭繚Toast鍦ㄤ富绾跨▼涓皟鐢�
+ runOnUiThread {
+ if (flag) {
+ postCardData(cardType, cardAddr)
+
+ } else {
+ ToastUtil.show("鍐欏崱澶辫触: ${msg ?: "鏈煡閿欒"}")
+ }
+ }
+ }
+ })
+
+ }
+
+ CardOperationType.CancelCard -> TODO()
+ CardOperationType.CheckCard -> TODO()
+ CardOperationType.DeductCard -> TODO()
+ CardOperationType.Recharge -> TODO()
+ CardOperationType.ReplaceCard -> TODO()
+ null -> TODO()
+ }
+ } else {
+ ToastUtil.show("鍗＄墖閿欒锛屽綋鍓嶅埛鐨勫崱涓庡垰鍒氱殑鍗′笉涓�鑷�")
}
}
+
+ /**
+ * 鏇存柊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)
+
+ // 鍦ㄤ富绾跨▼涓叧闂瑼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()
+ runOnUiThread {
+ ToastUtil.show("鏇存柊鍐欏崱鐘舵�佸け璐�: ${e.message}")
+ }
+ }
+ }
+ }
+
+ fun postCardData(cardType: String, cardAddr: String) {
+ when (cardType) {
+ CardCommon.CHECK_CARD -> {
+ binding?.cardData?.text = "鍐欑敤鎴峰崱"
+ }
+ }
+ val map = mutableMapOf<String, Any>()
+
+ if (cardAddr.isNotEmpty()) {
+ map["cardAddr"] = cardAddr
+ }
+
+ map["operateType"] = operationTypeCode
+ if (orderNumber.isNotEmpty()) {
+ map["orderNumber"] = orderNumber
+ }
+ // 浣跨敤姝ｇ‘鐨勭被鍨嬪弬鏁�
+ ApiManager.getInstance().requestPostLoading(
+ this,
+ "terminal/card/termCallBack",
+ String::class.java,
+ map,
+ object : SubscriberListener<BaseResponse<String>>() {
+ override fun onNext(t: BaseResponse<String>) {
+ if (t.success) {
+
+ updateCardWrittenStatus(cardAddr)
+
+
+ } 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