From f5180b600511d1871635bd364beb5bdd15f6ae88 Mon Sep 17 00:00:00 2001
From: zuojincheng <lf_zuo@163.com>
Date: 星期三, 26 三月 2025 18:05:07 +0800
Subject: [PATCH] feat(nfc): 优化 NFC写卡功能并添加新方法- 在 BaseNfcWriteHelper 中添加了新的 writeData 方法,增加了 isConnect 参数 - 优化了 NativeNfcWriteHelper 中的 writeData 实现,支持选择性连接 NFC - 更新了 NfcWriteAdapter,支持新的 writeData 方法- 修改了 NfcWreatHelper 中的 writeData 方法,使用新的接口 - 优化了 NfcWreatActivity 中的写卡逻辑

---
 baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NativeNfcReadHelper.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NativeNfcReadHelper.java b/baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NativeNfcReadHelper.java
index 1080205..4c8aa09 100644
--- a/baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NativeNfcReadHelper.java
+++ b/baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NativeNfcReadHelper.java
@@ -128,7 +128,6 @@
 
     @Override
     public String getCradType() {
-
         MifareClassic mfc = MifareClassic.get(tag);
         if (null != mfc) {
             try {
@@ -402,7 +401,9 @@
                         }
                     }
                 } else if (!listA_PS.isEmpty()) {
-                    if (mfc.authenticateSectorWithKeyA(0, listA_PS.get(0))) {
+                    if (mfc.authenticateSectorWithKeyA(0, defauleKey)) {
+                        isOpen = true;
+                    } else if (mfc.authenticateSectorWithKeyA(0, listA_PS.get(0))) {
                         isOpen = true;
                     }
                 }
@@ -448,7 +449,9 @@
                         }
                     }
                 } else if (!listA_PS.isEmpty()) {
-                    if (mfc.authenticateSectorWithKeyA(0, listA_PS.get(0))) {
+                    if (mfc.authenticateSectorWithKeyA(0, defauleKey)) {
+                        isOpen = true;
+                    } else if (mfc.authenticateSectorWithKeyA(0, listA_PS.get(0))) {
                         isOpen = true;
                     }
                 }

--
Gitblit v1.8.0