|
@@ -127,12 +127,10 @@ 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);
|
|
|
-<<<<<<< Updated upstream
|
|
|
|
|
|
|
+
|
|
|
that.updateDeviceList(list, true);
|
|
that.updateDeviceList(list, true);
|
|
|
-=======
|
|
|
|
|
- that.updateDeviceList(list, false);
|
|
|
|
|
that.tryConnectBle()
|
|
that.tryConnectBle()
|
|
|
->>>>>>> Stashed changes
|
|
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
|
|
|
