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

解决合并冲突

Browse Source 
# Conflicts:
#	utils/BleReceive.js
This commit is contained in:
liub
2026-03-19 09:22:28 +08:00
parent bb0610ff1a a9848bd299
commit f86e6a4fb7
5 changed files with 312 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
utils/BleReceive.js
View File

@ -1,4 +1,5 @@
import Common from '@/utils/Common.js'
import { parseBleData } from '@/api/100J/HBY100-J.js'
class BleReceive {
constructor() {
@ -12,7 +13,9 @@ class BleReceive {
'/pages/4877/BJQ4877': this.Receive_4877.bind(this),
'/pages/100/HBY100': this.Receive_100.bind(this),
'/pages/102/HBY102': this.Receive_102.bind(this),
'/pages/6170/deviceControl/index':this.Receive_6170.bind(this)
'/pages/6170/deviceControl/index':this.Receive_6170.bind(this),
'/pages/100J/HBY100-J': this.Receive_100J.bind(this),
'/pages/102/HBY102': this.Receive_102.bind(this)
};
}
@ -671,6 +674,21 @@ class BleReceive {
}
Receive_100J(receive, f, path, recArr) {
let receiveData = {};
try {
if (!receive.bytes || receive.bytes.length < 3) return receiveData;
const parsed = parseBleData(receive.bytes);
if (!parsed) return receiveData;
if (parsed.longitude !== undefined) receiveData.longitude = parsed.longitude;
if (parsed.latitude !== undefined) receiveData.latitude = parsed.latitude;
if (parsed.batteryPercentage !== undefined) receiveData.batteryPercentage = parsed.batteryPercentage;
if (parsed.batteryRemainingTime !== undefined) receiveData.batteryRemainingTime = parsed.batteryRemainingTime;
} catch (e) {
console.log('[100J] BleReceive 解析失败', e);
}
return receiveData;
}
Receive_6170(receive, f, path, recArr) {
let receiveData = {};