From 465c8abaa982fba6868a900d25316c70afc20fb7 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 18 六月 2025 13:59:46 +0800
Subject: [PATCH] feat(card): 优化销卡功能并添加写卡操作

---
 baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NfcReadAdapter.java |   26 +++++++++++++++++++++++---
 1 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NfcReadAdapter.java b/baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NfcReadAdapter.java
index e845c04..e3d8fbd 100644
--- a/baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NfcReadAdapter.java
+++ b/baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NfcReadAdapter.java
@@ -3,9 +3,13 @@
 import android.app.Activity;
 import android.content.Intent;
 
+import androidx.annotation.NonNull;
+
 import com.dayu.baselibrary.activity.BaseNfcActivity;
 import com.dayu.baselibrary.bean.BaseUserCardCard;
 import com.dayu.baselibrary.utils.ModelUtils;
+
+import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 
@@ -63,16 +67,16 @@
         }
     }
 
+    @Override
     public String getCardNumber() {
         return getCardNumber(false);
     }
 
 
-    @Override
     public String getCardNumber(boolean isChangePS) {
         switch (BaseNfcActivity.adapterType) {
             case ModelUtils.defaultType:
-                return nativeNfcReadHelper.getCardNumber(isChangePS);
+                return nativeNfcReadHelper.getCardNumber();
         }
         return "";
     }
@@ -92,8 +96,15 @@
         switch (BaseNfcActivity.adapterType) {
             case ModelUtils.defaultType:
                 return nativeNfcReadHelper.getCradTypeAndCardNumber();
+        }
+        return "";
+    }
 
-
+    @Override
+    public String getCradTypeAndCardNumber(int sectorIndex, int blockIndex, int cardTypeIndex) {
+        switch (BaseNfcActivity.adapterType) {
+            case ModelUtils.defaultType:
+                return nativeNfcReadHelper.getCradTypeAndCardNumber(sectorIndex, blockIndex, cardTypeIndex);
         }
         return "";
     }
@@ -126,4 +137,13 @@
         }
         return null;
     }
+
+    @Override
+    public BaseUserCardCard getUserCardData(int sectorIndex, BaseUserCardCard userCardCard) {
+        switch (BaseNfcActivity.adapterType) {
+            case ModelUtils.defaultType:
+                return nativeNfcReadHelper.getUserCardData(sectorIndex, userCardCard);
+        }
+        return null;
+    }
 }

--
Gitblit v1.8.0