|
@@ -926,34 +926,34 @@ Page({
|
|
|
|
|
|
// 区分在线wifi和蓝牙 wifi在前 离线在后
|
|
// 区分在线wifi和蓝牙 wifi在前 离线在后
|
|
var onLineWifiList = [];
|
|
var onLineWifiList = [];
|
|
- var onLineNoWifiList = [];
|
|
|
|
|
|
+ var onLineBlueList = [];
|
|
onLineList.forEach(element => {
|
|
onLineList.forEach(element => {
|
|
if (element.connectType == 3) {
|
|
if (element.connectType == 3) {
|
|
onLineWifiList.push(element)
|
|
onLineWifiList.push(element)
|
|
} else {
|
|
} else {
|
|
- onLineNoWifiList.push(element)
|
|
|
|
|
|
+ onLineBlueList.push(element)
|
|
}
|
|
}
|
|
});
|
|
});
|
|
finalList = finalList.concat(onLineWifiList);
|
|
finalList = finalList.concat(onLineWifiList);
|
|
- finalList = finalList.concat(onLineNoWifiList);
|
|
|
|
|
|
+ finalList = finalList.concat(onLineBlueList);
|
|
|
|
|
|
let mDeviceList = []
|
|
let mDeviceList = []
|
|
mDeviceList = mDeviceList.concat(onLineWifiList);
|
|
mDeviceList = mDeviceList.concat(onLineWifiList);
|
|
- mDeviceList = mDeviceList.concat(onLineNoWifiList);
|
|
|
|
|
|
+ mDeviceList = mDeviceList.concat(onLineBlueList);
|
|
getApp().globalData.mDeviceList = mDeviceList;
|
|
getApp().globalData.mDeviceList = mDeviceList;
|
|
|
|
|
|
///区分离线wifi和蓝牙 wifi在前 离线在后
|
|
///区分离线wifi和蓝牙 wifi在前 离线在后
|
|
var onNoLineWifiList = [];
|
|
var onNoLineWifiList = [];
|
|
- var onNoLineNoWifiList = [];
|
|
|
|
|
|
+ var onNoLineBlueList = [];
|
|
onNoLineList.forEach(element => {
|
|
onNoLineList.forEach(element => {
|
|
if (element.connectType == 3) {
|
|
if (element.connectType == 3) {
|
|
onNoLineWifiList.push(element)
|
|
onNoLineWifiList.push(element)
|
|
} else {
|
|
} else {
|
|
- onNoLineNoWifiList.push(element)
|
|
|
|
|
|
+ onNoLineBlueList.push(element)
|
|
}
|
|
}
|
|
});
|
|
});
|
|
finalList = finalList.concat(onNoLineWifiList);
|
|
finalList = finalList.concat(onNoLineWifiList);
|
|
- finalList = finalList.concat(onNoLineNoWifiList);
|
|
|
|
|
|
+ finalList = finalList.concat(onNoLineBlueList);
|
|
// 更新缓存
|
|
// 更新缓存
|
|
wx.setStorageSync("deviceList", JSON.stringify(finalList));
|
|
wx.setStorageSync("deviceList", JSON.stringify(finalList));
|
|
that.setData({
|
|
that.setData({
|