From f1285cb2e67894609d09329c9abfa49a1dd7b833 Mon Sep 17 00:00:00 2001
From: liyi <m18269109817@163.com>
Date: Fri, 19 Sep 2025 11:28:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E8=BF=9E=E6=8E=A5?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=97=B6=E7=9B=B4=E6=8E=A5=E4=BC=A0=E9=80=92?=
 =?UTF-8?q?mac=E5=9C=B0=E5=9D=80=E8=BF=9B=E8=A1=8C=E8=BF=9E=E6=8E=A5?=
 =?UTF-8?q?=EF=BC=8C=E9=81=BF=E5=BC=80=E4=B8=8D=E5=BF=85=E8=A6=81=E7=9A=84?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 star-cloud/lock.js | 16 ++++++++++++++--
 uni/basic.js       | 33 +++++++++++++--------------------
 2 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/star-cloud/lock.js b/star-cloud/lock.js
index 0181e8a..6618341 100644
--- a/star-cloud/lock.js
+++ b/star-cloud/lock.js
@@ -66,6 +66,9 @@ export async function selectLock(params) {
  */
 export async function openDoor(params) {
     const {type} = params
+    // ⏱️ 记录开始时间
+    const startTime = Date.now();
+
     log.info({
         ...new Result(
             Result.Success.code,
@@ -102,7 +105,8 @@ export async function openDoor(params) {
 
     // 确认设备连接正常
     if (!params.connected) {
-        const searchResult = await searchAndConnectDevice(this.lockInfo.bluetooth.bluetoothDeviceName)
+        const searchResult = await searchAndConnectDevice(this.lockInfo.bluetooth.bluetoothDeviceName, true, this.lockInfo.bluetooth.bluetoothDeviceId)
+
         log.info({
             ...new Result(
                 searchResult.code,
@@ -266,8 +270,16 @@ export async function openDoor(params) {
         ),
         name: 'openDoor'
     })
+    // 获取最终结果
+    const finalResult = this.getWriteResult(this.openDoor, params);
 
-    return this.getWriteResult(this.openDoor, params)
+    // ⏱️ 计算耗时
+    const endTime = Date.now();
+    const duration = endTime - startTime;
+
+    console.log(`开门耗时：${duration}`)
+
+    return finalResult;
 }
 
 /**
diff --git a/uni/basic.js b/uni/basic.js
index f5a0187..cbb9f58 100644
--- a/uni/basic.js
+++ b/uni/basic.js
@@ -8,13 +8,18 @@ import {Result} from '../constant'
  */
 
 // 查找设备并连接
-export function searchAndConnectDevice(name, reset = true) {
+export function searchAndConnectDevice(name, reset = true, deviceId = null) {
     // 循环查找设备
     let timer
     // 超时计时器
     let timeoutTimer
 
     return new Promise(async resolve => {
+        // 如果提供了deviceId，则直接连接
+        if (deviceId) {
+            const connectResult = await createBLEConnection(deviceId)
+            resolve(connectResult)
+        }
         const result = await startBluetoothDevicesDiscovery()
         if (result.code === Result.Success.code) {
             let searchFlag = false
@@ -189,28 +194,16 @@ export function createBLEConnection(deviceId, reconnectNumber = 0) {
                     res.data.serviceId,
                     res.data.notifyCharacteristicId
                 )
-                // 使用同步方法获取系统信息
-                const systemInfo = uni.getSystemInfoSync();
-
-                if (systemInfo.platform === 'android') {
-                    // 如果是Android机型，则设置BLE MTU
-                    uni.setBLEMTU({
-                        deviceId: deviceId,
-                        mtu: 512,
-                        fail: res => {
-                            // console.log('mtu fail', res);
-                        },
-                        success: res => {
-                            // console.log('mtu success', res);
-                        }
-                    });
-                } else {
-                    // 对于非Android设备，可以在这里添加其他逻辑或者直接忽略
-                    // console.log('当前设备不是Android，跳过设置BLE MTU');
-                }
                 resolve(res)
             },
             async fail(err) {
+                if (err.errno === 1500101) {
+                    // 未初始化，初始化成功后在重连
+                    const result = await openBluetoothAdapter()
+                    if (result.code === Result.Success.code) {
+                        resolve(await createBLEConnection(deviceId, reconnectNumber + 1))
+                    }
+                }
                 if (err.errno === 1509007) {
                     const res = await getBLEDeviceServicesAndCharacteristics(deviceId)
                     await notifyBLECharacteristicValueChange(