From 15a3fc02c120ff630a9721a2f48a82f76675213f Mon Sep 17 00:00:00 2001
From: zuojincheng <lf_zuo@163.com>
Date: 星期一, 07 四月 2025 09:04:20 +0800
Subject: [PATCH] feat(generallibrary): 添加新卡开卡界面并更新扫描图标
---
generallibrary/src/main/java/com/dayu/general/activity/NfcWreatActivity.kt | 105 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 90 insertions(+), 15 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..8b61caa 100644
--- a/generallibrary/src/main/java/com/dayu/general/activity/NfcWreatActivity.kt
+++ b/generallibrary/src/main/java/com/dayu/general/activity/NfcWreatActivity.kt
@@ -1,20 +1,27 @@
-package com.dayu.general.activity
+ package com.dayu.general.activity
import android.content.Intent
import android.os.Bundle
-import com.dayu.general.bean.card.CardCommon
+import com.dayu.baselibrary.net.subscribers.SubscriberListener
+import com.dayu.baselibrary.utils.ToastUtil
+import com.dayu.general.bean.card.ClearCard
+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
/**
* @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 = ""
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
@@ -26,23 +33,91 @@
/**
* 鑾峰彇鏁版嵁
*/
- private fun getInitData(){
- cardType= intent?.getStringExtra("cardType")?:""
+ private fun getInitData() {
+ cardType = intent?.getStringExtra("cardType") ?: ""
+ orderId = intent?.getStringExtra("orderId") ?: ""
+ cardAddr = intent?.getStringExtra("cardAddr") ?: ""
+ 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, "")
+ ToastUtil.show("鍐欏崱鎴愬姛!")
+ // 澶勭悊鍐欏崱鎴愬姛鐨勬儏鍐�
+ } else {
+ // 澶勭悊鍐欏崱澶辫触鐨勬儏鍐�
+ ToastUtil.show(message)
+ }
+ }
+ }
+ }
+ } else {
+ ToastUtil.show("鍗＄墖閿欒锛屽綋鍓嶅埛鐨勫崱涓庡垰鍒氱殑鍗′笉涓�鑷�")
}
}
- override fun onNfcBack(intent: Intent?) {
- TODO("Not yet implemented")
+ 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