From 5775568cd60cada43101ecb9bef43449cef85743 Mon Sep 17 00:00:00 2001 From: Guoguo Date: Thu, 2 Jul 2026 06:06:11 -0700 Subject: [PATCH] feat: add loading animation on reconnect button, 5s timeout --- miniprogram/pages/wear-check/wear-check.js | 12 ++++++++---- miniprogram/pages/wear-check/wear-check.wxml | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/miniprogram/pages/wear-check/wear-check.js b/miniprogram/pages/wear-check/wear-check.js index b4d398d..8d9eac2 100644 --- a/miniprogram/pages/wear-check/wear-check.js +++ b/miniprogram/pages/wear-check/wear-check.js @@ -4,7 +4,8 @@ Page({ data: { statusBarHeight: 44, battery: 0, - connected: false + connected: false, + reconnecting: false }, onBack: function () { @@ -37,29 +38,32 @@ Page({ onRetry: function () { var self = this + if (self.data.reconnecting) return if (ble.isConnected()) { self.setData({ connected: true }) return } - self.setData({ connected: false }) + self.setData({ connected: false, reconnecting: true }) ble.disconnect() setTimeout(function () { ble.startScan({ onFound: function () {}, onConnected: function () { clearTimeout(self._reconnectTimer) - self.setData({ connected: true }) + self.setData({ connected: true, reconnecting: false }) wx.showToast({ title: '连接成功', icon: 'success' }) }, onError: function (err) { clearTimeout(self._reconnectTimer) + self.setData({ reconnecting: false }) wx.showToast({ title: err.msg || '连接失败', icon: 'none' }) } }) self._reconnectTimer = setTimeout(function () { ble.stopScan() + self.setData({ reconnecting: false }) wx.showToast({ title: '搜索超时', icon: 'none' }) - }, 15000) + }, 5000) }, 500) }, diff --git a/miniprogram/pages/wear-check/wear-check.wxml b/miniprogram/pages/wear-check/wear-check.wxml index c03806b..c61b7ca 100644 --- a/miniprogram/pages/wear-check/wear-check.wxml +++ b/miniprogram/pages/wear-check/wear-check.wxml @@ -29,6 +29,6 @@ - +