1
0
forked from dyf/APP

完成100

This commit is contained in:
liub
2025-11-07 11:57:35 +08:00
parent c39cbcb34d
commit 2493bb7113
16 changed files with 1278 additions and 527 deletions

View File

@ -7,7 +7,7 @@ class BleReceive {
'/pages/650/HBY650': this.Receive_650.bind(this),
'/pages/670/HBY670': this.Receive_670.bind(this),
'/pages/4877/BJQ4877': this.Receive_4877.bind(this),
'/pages/100/HBY100': this.Receive_4877.bind(this)
'/pages/100/HBY100': this.Receive_100.bind(this)
};
}
@ -45,8 +45,9 @@ class BleReceive {
let handler = null;
let keys = Object.keys(this.HandlerMap);
for (let index = 0; index < keys.length; index++) {
let key = keys[index].replaceAll('/', '').toLowerCase();
let devKey = f.device.detailPageUrl ? f.device.detailPageUrl.replaceAll('/', '').toLowerCase() : '';
let key = keys[index].replace(/\//g, "").toLowerCase();
let devKey = f.device.detailPageUrl ? f.device.detailPageUrl.replace(/\//g, "").toLowerCase() : '';
if (key == devKey) {
handler = this.HandlerMap[keys[index]];
break;
@ -150,8 +151,8 @@ class BleReceive {
this.setBleFormData(formData, f);
let recCnt = recArr.find(v => {
return v.key.replaceAll('/', '').toLowerCase() == f.device.detailPageUrl
.replaceAll('/', '').toLowerCase();
return v.key.replace(/\//g, "").toLowerCase() == f.device.detailPageUrl
.replace(/\//g, "").toLowerCase();
});
if (!recCnt) {
@ -318,8 +319,8 @@ class BleReceive {
this.setBleFormData(receiveData, f);
console.log("recArr=", recArr);
let recCnt = recArr.find(v => {
return v.key.replaceAll('/', '').toLowerCase() == f.device.detailPageUrl
.replaceAll('/', '').toLowerCase();
return v.key.replace(/\//g, "").toLowerCase() == f.device.detailPageUrl
.replace(/\//g, "").toLowerCase();
});
if (!recCnt) {
if (this.formData.staticWarn) { //有静止报警
@ -470,7 +471,7 @@ class BleReceive {
let recCnt = recArr.find(v => {
return v.key.replaceAll('/', '').toLowerCase() === f.device.detailPageUrl.replaceAll(
return v.key.replace(/\//g, "").toLowerCase() === f.device.detailPageUrl.replaceAll(
'/', '').toLowerCase();
});
if (!recCnt) {
@ -497,12 +498,12 @@ class BleReceive {
try {
console.log("str=",receive.str);
// console.log("str=",receive.str);
receiveData = JSON.parse(receive.str);
let recCnt = recArr.find(v => {
return v.key.replaceAll('/', '').toLowerCase() == f.device.detailPageUrl
.replaceAll('/', '').toLowerCase();
return v.key.replace(/\//g, "").toLowerCase() == f.device.detailPageUrl
.replace(/\//g, "").toLowerCase();
});
if (!recCnt) {
if (receiveData.sta_PowerPercent<=20) {
@ -521,7 +522,36 @@ class BleReceive {
}
Receive_100(receive,f,path,recArr){
let receiveData={};
try {
// console.log("str=",receive.str);
receiveData = JSON.parse(receive.str);
let recCnt = recArr.find(v => {
return v.key.replace(/\//g, "").toLowerCase() == f.device.detailPageUrl
.replace(/\//g, "").toLowerCase();
});
if (!recCnt) {
if (receiveData.sta_battery<=20) {
uni.showModal({
title: "提示",
content: "设备电量低",
showCancel: false
});
}
}
} catch (error) {
receiveData = {};
console.log("文本解析失败",error)
}
return receiveData;
}
}