From f5a94baf0fdce4bdfcd6792a9988a5c32fbe6ecb Mon Sep 17 00:00:00 2001
From: liwei1dao <liwei1dao@gmail.com>
Date: Thu, 11 Sep 2025 11:27:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=89=AB=E6=8F=8F=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/modules/pairing/controllers/pairing_controller.dart  | 8 ++++++--
 .../kotlin/com/yunqiinnovation/ble_service/BleService.kt | 9 ---------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/lib/modules/pairing/controllers/pairing_controller.dart b/lib/modules/pairing/controllers/pairing_controller.dart
index df9198b89..99602941d 100644
--- a/lib/modules/pairing/controllers/pairing_controller.dart
+++ b/lib/modules/pairing/controllers/pairing_controller.dart
@@ -922,6 +922,7 @@ class PairingController extends GetxController with WidgetsBindingObserver {
       }
 
       List<int> macBytes = [];
+      List<int> tempBytes = [];
       if (Platform.isIOS) {
         for (int i = 7; i <= 12; i++) {
           // 每个字节异或0x5A
@@ -930,6 +931,7 @@ class PairingController extends GetxController with WidgetsBindingObserver {
         }
       } else if (Platform.isAndroid) {
         for (int i = 9; i <= 14; i++) {
+          tempBytes.add(bytes[i]);
           // 每个字节异或0x5A
           int decodedByte = bytes[i] ^ 0x5A;
           macBytes.add(decodedByte);
@@ -940,13 +942,15 @@ class PairingController extends GetxController with WidgetsBindingObserver {
       String extractedMac = macBytes
           .map((b) => b.toRadixString(16).padLeft(2, '0').toUpperCase())
           .join(':');
-
+      String tempMac = tempBytes
+          .map((b) => b.toRadixString(16).padLeft(2, '0').toUpperCase())
+          .join(':');
       // 格式化当前设备MAC地址（确保格式一致）
       String formattedDeviceMac = deviceMac.replaceAll(':', '').toUpperCase();
       String formattedExtractedMac =
           extractedMac.replaceAll(':', '').toUpperCase();
 
-      print('设备MAC: $deviceMac, 提取的MAC: $extractedMac');
+      print('设备MAC: $deviceMac, 提取的MAC: $extractedMac tempMac: $tempMac');
 
       // 对比MAC地址
       if (formattedDeviceMac == formattedExtractedMac) {
diff --git a/local_plugins/ble_service/android/src/main/kotlin/com/yunqiinnovation/ble_service/BleService.kt b/local_plugins/ble_service/android/src/main/kotlin/com/yunqiinnovation/ble_service/BleService.kt
index ebad04d7e..d2b474f56 100644
--- a/local_plugins/ble_service/android/src/main/kotlin/com/yunqiinnovation/ble_service/BleService.kt
+++ b/local_plugins/ble_service/android/src/main/kotlin/com/yunqiinnovation/ble_service/BleService.kt
@@ -475,16 +475,7 @@ object BleService {
                     ret.add(info)
                 }
             }
-        } else {
-            // 如果没找到匹配设备名的结果,返回所有扫描到的设备信息
-            for (result in scanResults) {
-                val info = printDeviceInfo(result)
-                if (info != null) {
-                    ret.add(info)
-                }
-            }
         }
-
         return ret
     }