From 7e036576e3ad62d53d1b66200b9c0268ba2d4a83 Mon Sep 17 00:00:00 2001
From: Guoguo <i@qwq.trade>
Date: Tue, 12 May 2026 06:37:51 -0700
Subject: [PATCH] fix: wear-check reconnect scans and connects directly

- Retry button disconnects then re-scans for device (no page navigation)
- Prevents duplicate scan with checking guard
- Disconnect before scan with 500ms delay for adapter recovery
- Clears reconnect timer on success/error/unload
- Error text updated to guide user to retry button
---
 miniprogram/pages/wear-check/wear-check.js | 32 +++++++++++++++++++---
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/miniprogram/pages/wear-check/wear-check.js b/miniprogram/pages/wear-check/wear-check.js
index b9f40af..10ad066 100644
--- a/miniprogram/pages/wear-check/wear-check.js
+++ b/miniprogram/pages/wear-check/wear-check.js
@@ -39,7 +39,7 @@ Page({
     self.setData({ checking: true, result: null, error: '' })
 
     if (!ble.isConnected()) {
-      self.setData({ checking: false, result: 'fail', error: '设备未连接，请返回重新连接' })
+      self.setData({ checking: false, result: 'fail', error: '设备未连接，请点击重新连接' })
       return
     }
 
@@ -70,6 +70,8 @@ Page({
 
   onUnload: function () {
     if (this._onStatus) ble.off('status', this._onStatus)
+    clearTimeout(this._reconnectTimer)
+    ble.stopScan()
   },
 
   onNext: function () {
@@ -77,11 +79,33 @@ Page({
   },
 
   onRetry: function () {
-    if (!ble.isConnected()) {
-      wx.navigateBack()
+    var self = this
+    if (self.data.checking) return
+    if (ble.isConnected()) {
+      self.checkWearing()
       return
     }
-    this.checkWearing()
+    self.setData({ checking: true, result: null, error: '', connected: false })
+    clearTimeout(self._reconnectTimer)
+    ble.disconnect()
+    setTimeout(function () {
+      ble.startScan({
+        onFound: function () {},
+        onConnected: function () {
+          clearTimeout(self._reconnectTimer)
+          self.setData({ checking: false, connected: true })
+          self.checkWearing()
+        },
+        onError: function (err) {
+          clearTimeout(self._reconnectTimer)
+          self.setData({ checking: false, result: 'fail', error: err.msg || '连接失败' })
+        }
+      })
+      self._reconnectTimer = setTimeout(function () {
+        ble.stopScan()
+        self.setData({ checking: false, result: 'fail', error: '搜索超时，请确认设备已开机' })
+      }, 15000)
+    }, 500)
   },
 
   onMockWearOk: function () {