yuchunlei/bodyWeight
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

list

Browse Source
This commit is contained in:
17792275749
2025-04-01 09:54:08 +08:00
parent 802cb8ae80
commit f6301affba
2 changed files with 37 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pages/connectedDevice/connectedDevice.js
+1 -1
View File
@@ -53,7 +53,7 @@ Page({
}) })
setTimeout(() => { setTimeout(() => {
wx.navigateBack({ wx.navigateBack({
delta: 1 delta: 2
}) })
}, 1500); }, 1500);
}); });
pages/searchDevice/searchDevice.js
+36 -28
View File
@@ -164,37 +164,45 @@ Page({
this.setData({ this.setData({
devicesList: res devicesList: res
}); });
this.selectDevice();
}); });
},
selectDevice() {
setTimeout(() => { setTimeout(() => {
this.setData({ if(this.data.devicesList && this.data.devicesList.length) {
getDeviceSetting: false, this.setData({
initText: "设备搜索完成" getDeviceSetting: false,
}); initText: "设备搜索完成"
app.globalData.ppScale.plugin.Blue.stopBluetoothDevicesDiscovery(); });
app.globalData.ppScale.device.list = this.data.devicesList; app.globalData.ppScale.plugin.Blue.stopBluetoothDevicesDiscovery();
if(this.data.devicesList.length === 1) { app.globalData.ppScale.device.list = this.data.devicesList;
app.globalData.ppScale.device.connection = this.data.devicesList[0]; if(this.data.devicesList.length === 1) {
wx.navigateTo({ app.globalData.ppScale.device.connection = this.data.devicesList[0];
url: "/pages/connectedDevice/connectedDevice" wx.navigateTo({
}) url: "/pages/connectedDevice/connectedDevice"
})
} else {
let itemLists = this.data.devicesList.map(item => item.name);
wx.showActionSheet({
itemList: itemLists,
alertText: "请选择你要使用的设备",
success: (res) => {
app.globalData.ppScale.device.connection = this.data.devicesList[res.tapIndex];
wx.navigateTo({
url: "/pages/connectedDevice/connectedDevice"
})
},
fail: () => {
wx.navigateBack({
delta: 1
})
}
})
}
} else { } else {
let itemLists = this.data.devicesList.map(item => item.name); this.selectDevice();
wx.showActionSheet({
itemList: itemLists,
alertText: "请选择你要使用的设备",
success: (res) => {
app.globalData.ppScale.device.connection = this.data.devicesList[res.tapIndex];
wx.navigateTo({
url: "/pages/connectedDevice/connectedDevice"
})
},
fail: () => {
wx.navigateBack({
delta: 1
})
}
})
} }
}, 3000) }, 3000);
} }
}) })