fix: ADC notifications no longer emit 'status' (prevents timer jump)

- ADC (17-byte) now emits 'adc' + 'battery' events, not 'status'
- Fixes CRITICAL timer jump: remaining_ms:0 was resetting countdown
- Drop ADC packets with bad XOR checksum
- treating.js + index.js subscribe to 'battery' for live battery updates
- onStatus only updates remaining_ms when > 0
这个提交包含在:
Guoguo
2026-05-19 03:57:47 -07:00
父节点 3fd7578163
当前提交 f1a2523cb4
修改 3 个文件,包含 28 行新增18 行删除
+10
查看文件
@@ -21,7 +21,9 @@ Page({
this.setData({ devMode: config.__DEV__ || false })
this.checkState()
this._onStatus = this.onBleStatus.bind(this)
this._onBattery = this.onBleBattery.bind(this)
ble.on('status', this._onStatus)
ble.on('battery', this._onBattery)
},
_cleanup: function () {
@@ -29,6 +31,10 @@ Page({
ble.off('status', this._onStatus)
this._onStatus = null
}
if (this._onBattery) {
ble.off('battery', this._onBattery)
this._onBattery = null
}
},
onHide: function () {
@@ -78,6 +84,10 @@ Page({
})
},
onBleBattery: function (info) {
this.setData({ battery: info.battery, connected: true })
},
onConnectBle: function () {
var self = this
self.setData({ bleState: 'scanning' })
+12 -4
查看文件
@@ -55,7 +55,9 @@ Page({
this._onReconnectFailed = this.onReconnectFailed.bind(this)
this._sessionId = 'SESS_' + Date.now()
this._onBattery = this.onBattery.bind(this)
ble.on('status', this._onStatus)
ble.on('battery', this._onBattery)
ble.on('treatment_complete', this._onComplete)
ble.on('exception', this._onException)
ble.on('disconnected', this._onDisconnect)
@@ -68,6 +70,7 @@ Page({
onUnload: function () {
if (this._onStatus) ble.off('status', this._onStatus)
if (this._onBattery) ble.off('battery', this._onBattery)
if (this._onComplete) ble.off('treatment_complete', this._onComplete)
if (this._onException) ble.off('exception', this._onException)
if (this._onDisconnect) ble.off('disconnected', this._onDisconnect)
@@ -104,16 +107,21 @@ Page({
},
onStatus: function (status) {
var remaining = status.remaining_ms || 0
this.updateProgress(remaining)
if (status.remaining_ms > 0) {
this.updateProgress(status.remaining_ms)
}
this.setData({
battery: status.battery,
temperature: status.temperature,
battery: status.battery || this.data.battery,
temperature: status.temperature || this.data.temperature,
paused: status.mode_state === 0x03
})
this.syncCommands()
},
onBattery: function (info) {
this.setData({ battery: info.battery })
},
syncCommands: function () {
var app = getApp()
var device = app.globalData.currentDevice || {}