From f4fc58196bd246272bf755a767660c03f573cbc6 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 03 六月 2025 14:03:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NativeNfcWriteHelper.java |  129 ++++++++++++++++++++++++++++++++++++++----
 1 files changed, 116 insertions(+), 13 deletions(-)

diff --git a/baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NativeNfcWriteHelper.java b/baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NativeNfcWriteHelper.java
index 22349c3..ba9a494 100644
--- a/baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NativeNfcWriteHelper.java
+++ b/baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NativeNfcWriteHelper.java
@@ -12,6 +12,7 @@
 import com.tencent.bugly.crashreport.CrashReport;
 
 import java.io.IOException;
+import java.util.List;
 
 /**
  * author: zuo
@@ -249,12 +250,120 @@
     /**
      * 淇敼瀵嗙爜
      *
-     * @param a 涔﹀啓鐨勬墖鍖�
-     *          //     * @param callback 杩斿洖鐩戝惉
+     * @param         涔﹀啓鐨勬墖鍖�
+     * @param passWord 瀵嗙爜
+     * @return
+     */
+    public boolean changePasword( List<byte[]> passWord, boolean isConnect, boolean isClose, NFCCallBack callBack) {
+        if (passWord == null || passWord.size()!=16) {
+            if (callBack != null) {
+                callBack.isSusses(false, "瀵嗙爜鏁扮粍涓虹┖鎴栭暱搴︿笉涓�16");
+            }
+            return false;
+        }
+        try {
+            MifareClassic mfc = MifareClassic.get(tag);
+            if (mfc == null) {
+                if (callBack != null) {
+                    callBack.isSusses(false, "鑾峰彇MifareClassic瀹炰緥澶辫触");
+                }
+                return false;
+            }
+
+            try {
+                // 杩炴帴NFC
+                if (isConnect) {
+                    mfc.connect();
+                }
+                for (int i = 0; i < passWord.size(); i++) {
+                    byte [] passWordItem = passWord.get(i);
+                    // 楠岃瘉鎵囧尯瀵嗙爜
+                    boolean isAuthenticated = false;
+
+                    // 灏濊瘯浣跨敤榛樿瀵嗛挜楠岃瘉
+                    if (mfc.authenticateSectorWithKeyA(i, defauleKey)) {
+                        isAuthenticated = true;
+                    } else if (mfc.authenticateSectorWithKeyA(i, listA_PS.get(i))) {
+                        continue;
+                    }
+                    if (!isAuthenticated) {
+                        if (callBack != null) {
+                            callBack.isSusses(false, "鎵囧尯" + i + "瀵嗙爜楠岃瘉澶辫触");
+                        }
+                        return false;
+                    }
+
+                    // 鍑嗗鏁版嵁
+                    byte[] data = new byte[16];
+
+                    if (passWordItem.length == 16) {
+                        // 濡傛灉鏄畬鏁寸殑16瀛楄妭鏁版嵁锛岀洿鎺ヤ娇鐢�
+                        System.arraycopy(passWordItem, 0, data, 0, 16);
+                    } else if (passWordItem.length == 6) {
+                        // 濡傛灉鍙槸6瀛楄妭瀵嗛挜锛屾瀯寤哄畬鏁寸殑鎺у埗鍧�
+                        // 灏嗗瘑鐮佽浆鎹负keyA
+                        System.arraycopy(passWordItem, 0, data, 0, 6);
+                        // 杈撳叆鎺у埗浣�
+                        data[6] = (byte) 0xFF;
+                        data[7] = (byte) 0x07;
+                        data[8] = (byte) 0x80;
+                        data[9] = (byte) 0x69;
+                        // 灏嗗瘑鐮佷綔涓篕eyB
+                        System.arraycopy(passWordItem, 0, data, 10, 6);
+                    } else {
+                        if (callBack != null) {
+                            callBack.isSusses(false, "鎵囧尯" + i + "瀵嗙爜闀垮害涓嶆纭紝搴斾负6瀛楄妭鎴�16瀛楄妭");
+                        }
+                        return false;
+                    }
+
+                    // 鑾峰彇鍐欏叆浣嶇疆
+                    int bIndex = mfc.sectorToBlock(i);
+                    int bCount = mfc.getBlockCountInSector(i);
+
+                    try {
+                        // 鍐欏埌鎵囧尯鐨勬渶鍚庝竴涓潡(鎺у埗鍧�)
+                        mfc.writeBlock(bIndex + bCount - 1, data);
+                    } catch (IOException e) {
+                        if (callBack != null) {
+                            callBack.isSusses(false, "鎵囧尯" + i + "鍐欏叆鎺у埗鍧楀け璐�: " + e.getMessage());
+                        }
+                        return false;
+                    }
+                }
+
+                if (callBack != null) {
+                    callBack.isSusses(true, "鎵�鏈夋墖鍖哄瘑鐮佷慨鏀规垚鍔�");
+                }
+                return true;
+            } finally {
+                try {
+                    if (isClose) {
+                        mfc.close();
+                    }
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            CrashReport.postCatchedException(e);
+            if (callBack != null) {
+                callBack.isSusses(false, "淇敼瀵嗙爜鏃跺彂鐢熷紓甯�: " + e.getMessage());
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 淇敼瀵嗙爜
+     *
+     * @param a  鎵囧尯
+     * @param mfc MifareClassic瀹炰緥
+     * @return
      */
     @Override
     public boolean changePasword(int a, MifareClassic mfc) {
-
         byte[] data = new byte[16];
         if (null != mfc) {
             try {
@@ -277,26 +386,20 @@
                 int bCount = mfc.getBlockCountInSector(a);
                 //鍐欏埌鎵囧尯鐨勬渶鍚庝竴涓潡
                 mfc.writeBlock(bIndex + bCount - 1, data);
+
                 return true;
             } catch (Exception e) {
                 e.printStackTrace();
+                CrashReport.postCatchedException(e);
+
                 return false;
             }
         }
+
         return false;
     }
 
 
-    public boolean changePasword(int a,byte[] passWord, MifareClassic mfc) {
-        try {
-
-
-        } catch (Exception e) {
-            e.printStackTrace();
-            CrashReport.postCatchedException(e);
-        }
-        return false;
-    }
 
     /**
      * 鍒濆鍖栧崱

--
Gitblit v1.8.0