1
0
forked from dyf/APP

修复部分机型蓝牙报错的问题

This commit is contained in:
liub
2026-02-02 10:12:48 +08:00
parent 5399ecf359
commit f3d502b00e
3 changed files with 42 additions and 26 deletions

View File

@ -2,7 +2,7 @@
const config = {
// 开发环境
development: {
BASE_URL: 'http://139.224.253.23:8000',//http://139.224.253.23:8000
BASE_URL: 'http://192.168.110.172:8000',//http://139.224.253.23:8000
API_PREFIX: '',
// MQTT 配置
MQTT_HOST: 'www.cnxhyc.com',

View File

@ -2,7 +2,7 @@
"name" : "星汉物联",
"appid" : "__UNI__A21EF43",
"description" : "设备管控",
"versionName" : "1.0.13",
"versionName" : "1.0.14",
"versionCode" : "100",
"transformPx" : false,
/* 5+App */

View File

@ -184,22 +184,22 @@
},
onLoad(option) {
eventChannel = this.getOpenerEventChannel();
eventChannel.on('detailData', function(rec) {
console.log("接收到父页面的参数:", rec);
these.device = rec.data;
if (rec.data.bluetoothName) {
these.search = rec.data.bluetoothName;
}else if(rec.data.deviceName){
} else if (rec.data.deviceName) {
these.search = rec.data.deviceName;
}
startValidDevice();
});
let search = option.search;
these = this;
const systemInfo = uni.getSystemInfoSync();
ble = bleTool.getBleTool(); // Ensure ble is initialized
@ -464,7 +464,7 @@
StartSubsrib();
},
@ -533,21 +533,15 @@
return;
}
}
ble.StopSearch().finally(() => {
let disconnectPromises = [];
if (ble.data && ble.data.LinkedList) {
ble.data.LinkedList.forEach(device => {
console.log(`Requesting disconnect for ${device.deviceId}`);
disconnectPromises.push(ble.disconnectDevice(device.deviceId));
});
showLoading(these,{text:'正在刷新'})
let time = null;
let startSearch = () => {
if(time){
clearTimeout(time);
}
Promise.allSettled(disconnectPromises).finally(() => {
time = setTimeout(() => {
these.EquipMents = [];
these.PairEquip = [];
@ -563,8 +557,31 @@
content: '开始搜索失败:' + err.msg
});
}
}).finally(()=>{
hideLoading(these);
});
});
}, 500);
}
ble.StopSearch().finally(() => {
let disconnectPromises = [];
if (ble.data && ble.data.LinkedList) {
ble.data.LinkedList.forEach(device => {
if (device.Linked) {
disconnectPromises.push(ble.disconnectDevice(device.deviceId));
}
});
}
if (disconnectPromises.length > 0) {
Promise.allSettled(disconnectPromises).finally(() => {
startSearch();
});
} else {
startSearch();
}
});
@ -678,12 +695,11 @@
console.log("客户端验证失败");
deviceInvalid();
return;
}
else if (f.macAddress == these.device.deviceMac){
} else if (f.macAddress == these.device.deviceMac) {
console.log("客户端验证成功");
deviceOK();
}
return true;
} else {