liubiao/APP
1
0
Fork 0
forked from dyf/APP
Code Pull Requests Activity

修复蓝牙配对时多设备串数据的问题

Browse Source
This commit is contained in:
liub
2026-05-20 11:26:13 +08:00
parent 7f56e46ace
commit 958aa1374a
2 changed files with 42 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pages/008A/HBY008A.vue
View File

@ -215,7 +215,7 @@
sta_leftFan: null, sta_leftFan: null,
sta_rightFan: null, sta_rightFan: null,
sta_channel: null, sta_channel: null,
sta_Ms: null, sta_Ms: 'S',
sta_PowerPercent: null, sta_PowerPercent: null,
sta_PowerTime: null, sta_PowerTime: null,
sta_system: null, sta_system: null,
@ -1010,10 +1010,11 @@
border-width: 5rpx; border-width: 5rpx;
border-color: #00000000; border-color: #00000000;
padding: 5rpx; padding: 5rpx;
height:130rpx !important;
} }
.lampMode .type .txt { .lampMode .type .txt {
color: rgba(255, 255, 255, 0.2); color: rgba(255, 255, 255, 0.5);
background-color: #00000000; background-color: #00000000;
font-family: "PingFang SC"; font-family: "PingFang SC";
font-size: 50rpx; font-size: 50rpx;

22
pages/common/addBLE/addEquip.vue
View File

@ -276,7 +276,7 @@
} }
console.log("处理蓝牙不可用"); console.log("处理蓝牙不可用");
hideLoading(these); hideLoading(these);
clearInterval(these.Status.intval);
these.PairEquip = []; these.PairEquip = [];
these.EquipMents = []; these.EquipMents = [];
uni.showToast({ uni.showToast({
@ -317,6 +317,7 @@
setTimeout(() => { setTimeout(() => {
hideLoading(these); hideLoading(these);
clearInterval(these.Status.intval);
}, 1500); }, 1500);
}, pagePath); }, pagePath);
@ -409,9 +410,12 @@
return; return;
} }
if ((receivData.str && (receivData.str.indexOf('mac address:') > -1 || receivData.str.indexOf( if (f.deviceId == this.item.deviceId) {//只处理本次连接的设备消息
if ((receivData.str && (receivData.str.indexOf('mac address:') > -1 || receivData
.str.indexOf(
'sta_address') > -1)) || 'sta_address') > -1)) ||
(receivData.bytes && receivData.bytes[0] === 0xFC && receivData.bytes.length >= 7)) { (receivData.bytes && receivData.bytes[0] === 0xFC && receivData.bytes.length >=
7)) {
if (f.macAddress && these.device) { if (f.macAddress && these.device) {
@ -428,6 +432,7 @@
}, 0); }, 0);
} }
} }
}
}, pagePath); }, pagePath);
} }
} }
@ -721,9 +726,9 @@
return false; return false;
}, },
Link: function(item) { Link: function(item) {
this.item.deviceId = item.deviceId;
showLoading(this, { showLoading(this, {
text: "正在连接:第1次" text: "正在连接..."
}); });
let index = 1; let index = 1;
@ -761,15 +766,18 @@
ble.LinkBlue(item.deviceId).then((res) => { ble.LinkBlue(item.deviceId).then((res) => {
this.tmpLink = [item]; this.tmpLink = [item];
console.log("连接成功"); console.log("连接成功");
ble.StopSearch(); these.item.deviceId = item.deviceId;
ble.StopSearch().catch(ex=>{});
resolve(res); resolve(res);
}).catch((ex) => { }).catch((ex) => {
if (index == total) { if (index == total) {
console.log("连接了N次都没连上"); console.log("连接了N次都没连上");
reject(ex); reject(ex);
updateLoading(this, { updateLoading(this, {
text: ex.msg text: ex.msg
}) });
this.item.deviceId =null;
return; return;
} }
index++; index++;