dyf/APP
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加102J蓝牙协议待设备验证

Browse Source
This commit is contained in:
微微一笑
2026-04-17 09:45:02 +08:00
parent c6a33832d4
commit 736f24839f
4 changed files with 384 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -357,8 +357,12 @@
device.isTarget = true;
}
}
// 102J：与 100J 同 AE30 芯片；协议不同。广播名一般为 HBY102J-xxxxxx（见协议）
if (device.name && /^HBY102J/i.test(device.name)) {
device.isTarget = true;
}
if (device.name) {
device.name = device.name.replace('JQZM-', '');
device.name = device.name.replace(/^JQZM-/i, '').replace(/^HBY102J-/i, '');
}
these.EquipMents.push(device);
}
@ -399,9 +403,9 @@
return;
}
if (receivData.str.indexOf('mac address:') > -1 || receivData.str.indexOf(
'sta_address') > -1 ||
(receivData.bytes[0] === 0xFC && receivData.bytes.length >= 7)) {
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) {