|
@@ -799,10 +799,14 @@ Page({
|
|
_this.data._clickOtherDevice = false
|
|
_this.data._clickOtherDevice = false
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
- console.log("断开连接--", event.commonValue, event.deviceId);
|
|
|
|
var selectDev = _this.getCurrentDevice()
|
|
var selectDev = _this.getCurrentDevice()
|
|
- var isSelect = selectDev == null || (selectDev != null) && selectDev.deviceId === event.deviceId
|
|
|
|
- if (isSelect && selectDev.deviceId === event.deviceId && event.deviceId === device.deviceId && event.commonValue === "offline" && !_this.data._hasShowModal) {
|
|
|
|
|
|
+ console.log("断开连接--", event.commonValue, event.deviceId, selectDev);
|
|
|
|
+ let selectDevId = "";
|
|
|
|
+ if (selectDev) {
|
|
|
|
+ selectDevId = selectDev.deviceId;
|
|
|
|
+ }
|
|
|
|
+ var isSelect = selectDev === null || selectDevId === event.deviceId
|
|
|
|
+ if (isSelect && selectDevId === event.deviceId && event.deviceId === device.deviceId && event.commonValue === "offline" && !_this.data._hasShowModal) {
|
|
_this.data._hasShowModal = true
|
|
_this.data._hasShowModal = true
|
|
wx.showModal({
|
|
wx.showModal({
|
|
title: '提示',
|
|
title: '提示',
|