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

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

@ -35,8 +35,8 @@
</view>
<view class="centertxt ">
<view class="name" v-text="item.name"></view>
</view>
<view class="rightIco center">
<image src="/static/images/BLEAdd/linked.png" class="img" mode="aspectFit">
@ -49,8 +49,8 @@
</view>
<view class="lblTitle">
<text>发现设备:{{EquipMents.length}} 筛选设备:{{deviceCnt}}</text>
<text>发现设备:{{EquipMents.length}} 筛选设备:{{deviceCnt}}</text>
<view @click="refreshBleList()">刷新</view>
</view>
<view class="">
@ -68,7 +68,7 @@
<view class="name">
<text>{{item.name?item.name:'Unnamed'}}</text>
</view>
</view>
<view class="id">
<text>信号:{{item.RSSI}}dBm</text>
</view>
@ -131,7 +131,7 @@
var ble = null;
var these = null;
var eventChannel = null;
var sortTime=null;
var sortTime = null;
export default {
data() {
return {
@ -276,7 +276,7 @@
}
console.log("处理蓝牙不可用");
hideLoading(these);
clearInterval(these.Status.intval);
these.PairEquip = [];
these.EquipMents = [];
uni.showToast({
@ -317,6 +317,7 @@
setTimeout(() => {
hideLoading(these);
clearInterval(these.Status.intval);
}, 1500);
}, pagePath);
@ -348,7 +349,7 @@
});
if (!f) {
if (these.device && these.device.bluetoothName && device.name) {
const bn = these.device.bluetoothName;
if (bn === device.name ||
@ -370,10 +371,10 @@
}
clearTimeout(sortTime);
sortTime=setTimeout(()=>{
these.EquipMents.sort((a, b) => b.RSSI - a.RSSI);
},500);
sortTime = setTimeout(() => {
these.EquipMents.sort((a, b) => b.RSSI - a.RSSI);
}, 500);
}, pagePath);
@ -409,23 +410,27 @@
return;
}
if ((receivData.str && (receivData.str.indexOf('mac address:') > -1 || receivData.str.indexOf(
'sta_address') > -1)) ||
(receivData.bytes && receivData.bytes[0] === 0xFC && receivData.bytes.length >= 7)) {
if (f.deviceId == this.item.deviceId) {//只处理本次连接的设备消息
if ((receivData.str && (receivData.str.indexOf('mac address:') > -1 || receivData
.str.indexOf(
'sta_address') > -1)) ||
(receivData.bytes && receivData.bytes[0] === 0xFC && receivData.bytes.length >=
7)) {
if (f.macAddress && these.device) {
if (f.macAddress && these.device) {
clearInterval(this.Status.intval);
this.Status.intval = null;
this.Status.time = null;
clearInterval(this.Status.intval);
this.Status.intval = null;
this.Status.time = null;
showLoading(these, {
text: '正在验证设备'
});
showLoading(these, {
text: '正在验证设备'
});
setTimeout(() => {
these.DeviceVerdict(f.deviceId);
}, 0);
setTimeout(() => {
these.DeviceVerdict(f.deviceId);
}, 0);
}
}
}
}, pagePath);
@ -634,8 +639,8 @@
return;
}
hideLoading(these);
these.device.bleId=deviceId;
these.device.bleId = deviceId;
ble.updateCache();
eventChannel.emit('BindOver', these.device);
uni.navigateBack();
@ -721,9 +726,9 @@
return false;
},
Link: function(item) {
this.item.deviceId = item.deviceId;
showLoading(this, {
text: "正在连接:第1次"
text: "正在连接..."
});
let index = 1;
@ -761,15 +766,18 @@
ble.LinkBlue(item.deviceId).then((res) => {
this.tmpLink = [item];
console.log("连接成功");
ble.StopSearch();
these.item.deviceId = item.deviceId;
ble.StopSearch().catch(ex=>{});
resolve(res);
}).catch((ex) => {
if (index == total) {
console.log("连接了N次都没连上");
reject(ex);
updateLoading(this, {
text: ex.msg
})
});
this.item.deviceId =null;
return;
}
index++;