|
@@ -204,8 +204,8 @@ class bleManager {
|
|
|
}
|
|
|
// that.disconnect(result)
|
|
|
//断开连接是失败的, 只能监听到下线。
|
|
|
- console.log("监听到设备状态变化:", result);
|
|
|
- that.errorDisconnect(result);
|
|
|
+ console.log("监听到设备状态变化0:", result);
|
|
|
+ that.errorDisconnect(result.connected);
|
|
|
|
|
|
|
|
|
// ///是否已配对
|
|
@@ -484,7 +484,7 @@ class bleManager {
|
|
|
that.disconnect({ "deviceId": device.deviceId })
|
|
|
} else {
|
|
|
that.isConnecting = false;
|
|
|
- that.errorDisconnect()
|
|
|
+ that.errorDisconnect(false)
|
|
|
that.publicDevice = null
|
|
|
}
|
|
|
console.error('连接失败:', err);
|
|
@@ -514,15 +514,15 @@ class bleManager {
|
|
|
dataView.setUint8(index, value); // 将每个16进制数值写入到 buffer 中
|
|
|
});
|
|
|
// }
|
|
|
- let logData = new Uint8Array(buffer);
|
|
|
- console.log('开始发送数据:', logData);
|
|
|
+ // let logData = new Uint8Array(buffer);
|
|
|
+ console.log('开始发送数据:', buffer);
|
|
|
wx.writeBLECharacteristicValue({
|
|
|
deviceId: that.publicDevice.deviceId,
|
|
|
serviceId: that.publicDevice.serviceId,
|
|
|
characteristicId: that.publicDevice.characteristicId,
|
|
|
value: buffer,
|
|
|
success: (res) => {
|
|
|
- console.log('发送数据成功:', res, callback);
|
|
|
+ // console.log('发送数据成功:', res, callback);
|
|
|
if (callback) {
|
|
|
callback(true)
|
|
|
}
|
|
@@ -533,7 +533,7 @@ class bleManager {
|
|
|
callback(false)
|
|
|
}
|
|
|
console.log('数据发送失败:', err);
|
|
|
- that.errorDisconnect()
|
|
|
+ that.errorDisconnect(false)
|
|
|
resolve(false);
|
|
|
}
|
|
|
});
|
|
@@ -735,8 +735,9 @@ class bleManager {
|
|
|
setStateChangeCallback(callback) {
|
|
|
this.stateChangeCallback = callback;
|
|
|
}
|
|
|
- errorDisconnect() {
|
|
|
+ errorDisconnect(result) {
|
|
|
// this.disconnect();
|
|
|
+ console.log("监听到设备状态变化:", result, this.stateChangeCallback);
|
|
|
if (this.stateChangeCallback) {
|
|
|
let device = this.publicDevice ?? {};
|
|
|
this.stateChangeCallback({ "deviceId": device.deviceId ?? "", "state": "offline" });
|