|
@@ -897,7 +897,7 @@ Page({
|
|
|
console.log("有蓝牙设备上线")
|
|
|
that.stopIntervalId1();
|
|
|
} else {
|
|
|
-
|
|
|
+ // 有wifi设备在线
|
|
|
let wifiDevice = deviceList.find(item => {
|
|
|
return item.state == "online" && item.connectType === 3
|
|
|
})
|
|
@@ -919,15 +919,15 @@ Page({
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- that.disconnectDev(event, disDevice)
|
|
|
disDevice.state = event.commonValue;
|
|
|
console.log("首页设备状态变化", disDevice.state, disDevice.deviceId)
|
|
|
|
|
|
if (event.commonValue == "online") {
|
|
|
// BtHelper.getInstance().connect()
|
|
|
- console.log("首页上线连接", disDevice)
|
|
|
+ console.log("首页连接上线", disDevice)
|
|
|
} else {
|
|
|
- console.log("首页断开连接", disDevice)
|
|
|
+ that.disconnectDev(event, disDevice)
|
|
|
+ console.log("首页连接断开", disDevice)
|
|
|
that.updateDeviceList(deviceList, false, false);
|
|
|
}
|
|
|
}
|
|
@@ -995,6 +995,9 @@ Page({
|
|
|
onTapBanner(e) {
|
|
|
var item = e.currentTarget.dataset.item;
|
|
|
try {
|
|
|
+ if (!strings.isEmpty(item.forwardUrl)) {
|
|
|
+ return
|
|
|
+ }
|
|
|
if (item.forwardType == 0) {
|
|
|
// 内链,暂时不支持
|
|
|
route_util.jump(item.forwardUrl, item.forwardUrl);
|