|
@@ -522,14 +522,16 @@ Page({
|
|
|
num++;
|
|
num++;
|
|
|
} else {
|
|
} else {
|
|
|
clearInterval(timeId);
|
|
clearInterval(timeId);
|
|
|
- wx.showModal({
|
|
|
|
|
- title: '提示',
|
|
|
|
|
- content: '配网失败,请检查wifi密码或设备是否连接正常',
|
|
|
|
|
- showCancel: false
|
|
|
|
|
- });
|
|
|
|
|
- self.setData({
|
|
|
|
|
- showBluetoothConnected: false
|
|
|
|
|
- });
|
|
|
|
|
|
|
+ if (self.data.showBluetoothConnected) {
|
|
|
|
|
+ wx.showModal({
|
|
|
|
|
+ title: '提示',
|
|
|
|
|
+ content: '配网失败,请检查wifi密码或设备是否连接正常',
|
|
|
|
|
+ showCancel: false
|
|
|
|
|
+ });
|
|
|
|
|
+ self.setData({
|
|
|
|
|
+ showBluetoothConnected: false
|
|
|
|
|
+ });
|
|
|
|
|
+ }
|
|
|
// self.setFailProcess(true, util.descFailList[4]);
|
|
// self.setFailProcess(true, util.descFailList[4]);
|
|
|
}
|
|
}
|
|
|
}, 1000)
|
|
}, 1000)
|