From 1e2d09f0009c16ac36f199e1723bbe31dc335657 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 13 五月 2025 17:54:09 +0800
Subject: [PATCH] feat(generallibrary): 优化开卡流程和界面

---
 baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NfcWriteAdapter.java |   54 +++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NfcWriteAdapter.java b/baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NfcWriteAdapter.java
index 8eab97b..14e1e19 100644
--- a/baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NfcWriteAdapter.java
+++ b/baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NfcWriteAdapter.java
@@ -8,6 +8,8 @@
 import com.dayu.baselibrary.bean.BaseUserCardCard;
 import com.dayu.baselibrary.utils.ModelUtils;
 
+import java.util.List;
+
 /**
  * author: zuo
  * Date: 2024-09-26
@@ -16,19 +18,25 @@
  */
 public class NfcWriteAdapter extends BaseNfcWriteHelper {
     NativeNfcWriteHelper nativeNfcWriteHelper;
+
     public NfcWriteAdapter(Intent intent, Activity activity) {
-        switch (BaseNfcActivity.adapterType){
+        switch (BaseNfcActivity.adapterType) {
             case ModelUtils.defaultType:
-                nativeNfcWriteHelper=new NativeNfcWriteHelper(intent,activity);
+                nativeNfcWriteHelper = NativeNfcWriteHelper.getInstence(intent, activity);
                 break;
         }
     }
 
     @Override
-    public boolean writeUserData(BaseUserCardCard userCard) {
-        switch (BaseNfcActivity.adapterType){
+    public void setIntent(Intent intent) {
+        nativeNfcWriteHelper.setIntent(intent);
+    }
+
+    @Override
+    public boolean writeUserData(BaseUserCardCard userCard,int sector) {
+        switch (BaseNfcActivity.adapterType) {
             case ModelUtils.defaultType:
-                return  nativeNfcWriteHelper.writeUserData(userCard);
+                return nativeNfcWriteHelper.writeUserData(userCard, sector);
 
         }
         return false;
@@ -36,9 +44,29 @@
 
     @Override
     public boolean writeData(byte[] str, int a, int b) {
-        switch (BaseNfcActivity.adapterType){
+        switch (BaseNfcActivity.adapterType) {
             case ModelUtils.defaultType:
-                return  nativeNfcWriteHelper.writeData(str,a,b);
+                return nativeNfcWriteHelper.writeData(str, a, b);
+
+        }
+        return false;
+    }
+
+    @Override
+    public boolean writeData(byte[] str, int a, int b, NFCCallBack callBack) {
+        switch (BaseNfcActivity.adapterType) {
+            case ModelUtils.defaultType:
+                return nativeNfcWriteHelper.writeData(str, a, b,callBack);
+
+        }
+        return false;
+    }
+
+    @Override
+    public boolean writeData(byte[] str, int a, int b, boolean isConnect, NFCCallBack callBack) {
+        switch (BaseNfcActivity.adapterType) {
+            case ModelUtils.defaultType:
+                return nativeNfcWriteHelper.writeData(str, a, b,isConnect,callBack);
 
         }
         return false;
@@ -46,11 +74,19 @@
 
     @Override
     public boolean changePasword(int a, MifareClassic mfc) {
-        switch (BaseNfcActivity.adapterType){
+        switch (BaseNfcActivity.adapterType) {
             case ModelUtils.defaultType:
-                return  nativeNfcWriteHelper.changePasword(a,mfc);
+                return nativeNfcWriteHelper.changePasword(a, mfc);
 
         }
         return false;
     }
+
+    public boolean changePasword( List<byte[]> passWord, boolean isConnect, boolean isClose, NFCCallBack callBack) {
+        switch (BaseNfcActivity.adapterType) {
+            case ModelUtils.defaultType:
+                return nativeNfcWriteHelper.changePasword(passWord,isConnect, isClose,callBack);
+        }
+        return false;
+    }
 }

--
Gitblit v1.8.0