Guoguo和Claude Opus 4.6
267c75718b
- fix manual bind stuck at BLE scan, redirect to bind-success - add 15s timeout and stopScan to ble-connect - add stopScan method to ble.js - add back-to-home button on bind-success page - fix field name in subscribe-plans (plan -> plan_type) - fix history.js to handle created_at field - fix index.js to handle device name field - add subscription route alias in request.js - extend admin cloud function from 1 to 9 actions - add mock mode to admin-console request.js - remove unused discover page and legacy record function Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
78 行
1.9 KiB
JavaScript
78 行
1.9 KiB
JavaScript
var ble = require('../../services/ble')
|
|
var app = getApp()
|
|
var SCAN_TIMEOUT = 15000
|
|
|
|
Page({
|
|
data: {
|
|
statusBarHeight: 44,
|
|
deviceId: '',
|
|
bindToken: '',
|
|
state: 'scanning',
|
|
error: ''
|
|
},
|
|
|
|
onLoad: function (options) {
|
|
this.setData({ statusBarHeight: app.globalData.statusBarHeight })
|
|
this.setData({
|
|
deviceId: options.device_id || '',
|
|
bindToken: options.bind_token || ''
|
|
})
|
|
this.startBleConnect()
|
|
},
|
|
|
|
onUnload: function () {
|
|
clearTimeout(this._scanTimer)
|
|
ble.stopScan()
|
|
},
|
|
|
|
startBleConnect: function () {
|
|
var self = this
|
|
self.setData({ state: 'scanning', error: '' })
|
|
|
|
self._scanTimer = setTimeout(function () {
|
|
ble.stopScan()
|
|
self.setData({ state: 'error', error: '搜索超时，请确认设备已开机并在附近' })
|
|
}, SCAN_TIMEOUT)
|
|
|
|
ble.startScan({
|
|
onFound: function (device) {
|
|
clearTimeout(self._scanTimer)
|
|
self.setData({ state: 'connecting' })
|
|
},
|
|
onConnected: function (device) {
|
|
clearTimeout(self._scanTimer)
|
|
self.setData({ state: 'binding' })
|
|
self.doBind()
|
|
},
|
|
onError: function (err) {
|
|
clearTimeout(self._scanTimer)
|
|
self.setData({ state: 'error', error: err.msg || '连接失败' })
|
|
}
|
|
})
|
|
},
|
|
|
|
doBind: function () {
|
|
var self = this
|
|
var userId = app.globalData.userId || ''
|
|
ble.on('bind_result', function (result) {
|
|
if (result.success) {
|
|
self.setData({ state: 'done' })
|
|
wx.redirectTo({
|
|
url: '/pages/bind-success/bind-success?device_id=' + self.data.deviceId
|
|
})
|
|
} else {
|
|
self.setData({ state: 'error', error: '设备绑定失败' })
|
|
}
|
|
})
|
|
|
|
ble.bindDevice(userId, self.data.bindToken).catch(function (err) {
|
|
self.setData({ state: 'error', error: err.error_msg || '绑定命令失败' })
|
|
})
|
|
},
|
|
|
|
onRetry: function () {
|
|
ble.disconnect()
|
|
this.startBleConnect()
|
|
}
|
|
})
|