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

merge upstream

Browse Source
This commit is contained in:
liubiao
2026-05-19 17:40:44 +08:00
parent 8f53a45280 736f24839f
commit 7ed3813e7c
6 changed files with 2642 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2302
pages/102J/HBY102J.vue Normal file
View File

File diff suppressed because it is too large Load Diff

4
pages/6075J/BJQ6075J.vue
View File

@ -260,7 +260,7 @@
baseURL
} from '@/utils/request.js';
import {
showLoading,
showLoading,
hideLoading,
updateLoading
} from '@/utils/loading.js';
@ -295,7 +295,7 @@
},
data() {
return {
Status: {
Status: {
pageHide: false,

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);
}
@ -402,9 +406,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) {