|
@@ -8,7 +8,9 @@ import timeUtil from '../../utils/time_util.js';
|
|
import strings from '../../utils/strings.js';
|
|
import strings from '../../utils/strings.js';
|
|
import route_constant from '../../utils/route_constant.js';
|
|
import route_constant from '../../utils/route_constant.js';
|
|
import route_util from '../../utils/route_util.js';
|
|
import route_util from '../../utils/route_util.js';
|
|
-import { BtHelper } from '../../devices/bt_helper.js';
|
|
|
|
|
|
+import {
|
|
|
|
+ BtHelper
|
|
|
|
+} from '../../devices/bt_helper.js';
|
|
|
|
|
|
Page({
|
|
Page({
|
|
data: {
|
|
data: {
|
|
@@ -117,8 +119,7 @@ Page({
|
|
that.addConnectBlueDevice(connectDevice);
|
|
that.addConnectBlueDevice(connectDevice);
|
|
}
|
|
}
|
|
})
|
|
})
|
|
- } else {
|
|
|
|
- }
|
|
|
|
|
|
+ } else {}
|
|
})
|
|
})
|
|
}
|
|
}
|
|
},
|
|
},
|
|
@@ -127,10 +128,30 @@ Page({
|
|
var devicelist = wx.getStorageSync("devicelist") || "";
|
|
var devicelist = wx.getStorageSync("devicelist") || "";
|
|
if (!strings.isEmpty(devicelist)) {
|
|
if (!strings.isEmpty(devicelist)) {
|
|
var list = JSON.parse(devicelist);
|
|
var list = JSON.parse(devicelist);
|
|
-
|
|
|
|
that.updateDeviceList(list, true);
|
|
that.updateDeviceList(list, true);
|
|
that.tryConnectBle()
|
|
that.tryConnectBle()
|
|
|
|
|
|
|
|
+ ///对比在线的蓝牙设备
|
|
|
|
+ var tempList = that.data.devicelist;
|
|
|
|
+ var isChanged = false;
|
|
|
|
+ BtHelper.getInstance().getAllOnlineDevices(function (devices) {
|
|
|
|
+ for (var i = 0; i < tempList.length; i++) {
|
|
|
|
+ var tempItem = tempList[i];
|
|
|
|
+ if (tempItem.connectType != 3) {
|
|
|
|
+ for (var j = 0; j < devices.length; j++) {
|
|
|
|
+ // "state":"online"
|
|
|
|
+ if (tempItem.deviceId === devices[j].deviceId) {
|
|
|
|
+ isChanged = true;
|
|
|
|
+ tempItem.state = "online";
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+ if (isChanged) {
|
|
|
|
+ that.updateDeviceList(list, false);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
},
|
|
},
|
|
|
|
|