From b8ed2b19e0aaf3c357e2f601d8304acdc525f4f9 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 25 四月 2025 16:54:02 +0800
Subject: [PATCH] refactor(nfc): 优化 NFC 读卡工具类

---
 generallibrary/src/main/java/com/dayu/general/activity/RechargeFragment.kt |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/generallibrary/src/main/java/com/dayu/general/activity/RechargeFragment.kt b/generallibrary/src/main/java/com/dayu/general/activity/RechargeFragment.kt
index 703ab3f..28d6e50 100644
--- a/generallibrary/src/main/java/com/dayu/general/activity/RechargeFragment.kt
+++ b/generallibrary/src/main/java/com/dayu/general/activity/RechargeFragment.kt
@@ -13,6 +13,7 @@
 import com.dayu.general.databinding.FragmentRechargeBinding
 import com.dayu.general.net.ApiManager
 import com.dayu.general.net.BaseResponse
+import com.dayu.general.tool.NfcReadHelper
 
 class RechargeFragment : Fragment() {
     var binding: FragmentRechargeBinding? = null
@@ -56,9 +57,15 @@
     fun handleNfcIntent(intent: Intent) {
         activity?.let { activity ->
             try {
+                // 妫�鏌ntent涓槸鍚﹀寘鍚玁FC Tag
+                if (intent.getParcelableExtra<android.nfc.Tag>(android.nfc.NfcAdapter.EXTRA_TAG) == null) {
+                    ToastUtil.show("鏈娴嬪埌NFC鍗$墖锛岃纭繚鍗$墖宸叉纭斁缃�")
+                    return
+                }
+                
                 // 浣跨敤NfcReadAdapter璇诲彇鍗″彿
-                val nfcAdapter = NfcReadAdapter(intent, activity)
-                cardNumber = nfcAdapter.cardNumber
+                val nfcAdapter = NfcReadHelper.getInstance(intent, activity)
+                cardNumber = nfcAdapter.getCardNumber()
                 
                 if (cardNumber.isNullOrEmpty()) {
                     ToastUtil.show("璇诲崱澶辫触锛岃閲嶆柊鍒峰崱")

--
Gitblit v1.8.0