修复6155/7305全局订阅与详情订阅重复弹窗
This commit is contained in:
liub
@ -9,42 +9,28 @@ class BleReceive {
|
||||
};
|
||||
}
|
||||
|
||||
getCurrentPagePath() {
|
||||
|
||||
const pages = getCurrentPages();
|
||||
|
||||
if (pages.length === 0) {
|
||||
console.log("pages.length=0");
|
||||
return "";
|
||||
}
|
||||
|
||||
const currentPage = pages[pages.length - 1];
|
||||
console.log("currentPage=", currentPage.route);
|
||||
return currentPage.route;
|
||||
}
|
||||
|
||||
|
||||
setBleFormData(data,f) {
|
||||
if(data){
|
||||
let linkedList=uni.getStorageSync(this.StorageKey);
|
||||
if(!linkedList){
|
||||
setBleFormData(data, f) {
|
||||
if (data) {
|
||||
let linkedList = uni.getStorageSync(this.StorageKey);
|
||||
if (!linkedList) {
|
||||
return;
|
||||
}
|
||||
linkedList.find((v)=>{
|
||||
if(f.deviceId==v.deviceId){
|
||||
let keys=Object.keys(data);
|
||||
keys.forEach((key)=>{
|
||||
if(!v.formData){
|
||||
v.formData={};
|
||||
linkedList.find((v) => {
|
||||
if (f.deviceId == v.deviceId) {
|
||||
let keys = Object.keys(data);
|
||||
keys.forEach((key) => {
|
||||
if (!v.formData) {
|
||||
v.formData = {};
|
||||
}
|
||||
if(!f.formData){
|
||||
f.formData={};
|
||||
if (!f.formData) {
|
||||
f.formData = {};
|
||||
}
|
||||
v.formData[key]=data[key];
|
||||
f.formData[key]=data[key];
|
||||
v.formData[key] = data[key];
|
||||
f.formData[key] = data[key];
|
||||
});
|
||||
|
||||
uni.setStorageSync(this.StorageKey,linkedList);
|
||||
uni.setStorageSync(this.StorageKey, linkedList);
|
||||
}
|
||||
});
|
||||
}
|
||||
@ -52,26 +38,36 @@ class BleReceive {
|
||||
}
|
||||
|
||||
|
||||
ReceiveData(receive,f,path,recArr) {
|
||||
if(f && f.macAddress && f.device && f.device.id){
|
||||
let handler = this.HandlerMap[f.device.detailPageUrl];
|
||||
if(handler){
|
||||
let data=handler(receive, f, path, recArr);
|
||||
ReceiveData(receive, f, path, recArr) {
|
||||
if (f && f.macAddress && f.device && f.device.id) {
|
||||
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() : '';
|
||||
if (key == devKey) {
|
||||
handler = this.HandlerMap[keys[index]];
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (handler) {
|
||||
let data = handler(receive, f, path, recArr);
|
||||
return data;
|
||||
}else{
|
||||
console.log("已收到消息,但无指定处理程序",receive);
|
||||
} else {
|
||||
console.log("已收到消息,但无指定处理程序", receive);
|
||||
}
|
||||
|
||||
}else{
|
||||
console.log("已收到该消息,但无法处理",receive);
|
||||
} else {
|
||||
console.log("已收到该消息,但无法处理", receive);
|
||||
}
|
||||
|
||||
return receive;
|
||||
|
||||
}
|
||||
|
||||
Receive_650(receive,f,path,recArr) {
|
||||
console.log("通用程序正在处理650的数据",receive);
|
||||
Receive_650(receive, f, path, recArr) {
|
||||
console.log("通用程序正在处理650的数据", receive);
|
||||
|
||||
var parseData = () => {
|
||||
let bytes = receive.bytes;
|
||||
@ -142,26 +138,29 @@ class BleReceive {
|
||||
warn = '非常强预警';
|
||||
}
|
||||
|
||||
let formData={};
|
||||
let formData = {};
|
||||
formData.battary = batteryLevel;
|
||||
formData.xuhang = xuhang;
|
||||
formData.cMode = lightingLevelByte === 0x6e;
|
||||
formData.modeCurr = modeCurr;
|
||||
formData.warnLevel = warn;
|
||||
formData.iswarn = iswarn;
|
||||
this.setBleFormData(formData,f);
|
||||
this.setBleFormData(formData, f);
|
||||
|
||||
let route=this.getCurrentPagePath();
|
||||
console.log("f=",f);
|
||||
console.log("route="+route);
|
||||
if (iswarn && f.detailPageUrl.indexOf(route)==-1 ) {
|
||||
let recCnt = recArr.find(v => {
|
||||
return v.key.replaceAll('/', '').toLowerCase() == f.device.detailPageUrl
|
||||
.replaceAll('/', '').toLowerCase();
|
||||
});
|
||||
if (!recCnt) {
|
||||
|
||||
if (iswarn) {
|
||||
uni.showModal({
|
||||
content:"环境存在漏电电源",
|
||||
title:"警告",
|
||||
success(res){
|
||||
if(res.confirm){
|
||||
content: "环境存在漏电电源",
|
||||
title: "警告",
|
||||
success(res) {
|
||||
if (res.confirm) {
|
||||
|
||||
if(f){
|
||||
if (f) {
|
||||
uni.navigateTo({
|
||||
url: f.detailPageUrl,
|
||||
events: {
|
||||
@ -179,8 +178,7 @@ class BleReceive {
|
||||
}
|
||||
}
|
||||
})
|
||||
}else{
|
||||
console.log("当前全局不处理此消息");
|
||||
}
|
||||
}
|
||||
return formData;
|
||||
} catch (error) {
|
||||
@ -194,47 +192,44 @@ class BleReceive {
|
||||
let str = receive.str;
|
||||
|
||||
if (str.indexOf('mac address:') == 0) {
|
||||
let formData={};
|
||||
let formData = {};
|
||||
formData.macAddress = str.split(':')[1];
|
||||
this.setBleFormData(formData,f);
|
||||
this.setBleFormData(formData, f);
|
||||
return formData;
|
||||
}
|
||||
else{
|
||||
let receiveData={a:1};
|
||||
} else {
|
||||
let receiveData = {
|
||||
a: 1
|
||||
};
|
||||
try {
|
||||
let json=JSON.parse(str);
|
||||
let json = JSON.parse(str);
|
||||
|
||||
if("staBlue_picture" in json){
|
||||
if ("staBlue_picture" in json) {
|
||||
//重发图片
|
||||
console.log("收到重新发送图片的命令");
|
||||
receiveData=json;
|
||||
}
|
||||
else if("staBlue_text" in json){
|
||||
receiveData = json;
|
||||
} else if ("staBlue_text" in json) {
|
||||
//重发文本
|
||||
console.log("收到重新发送文本的命令");
|
||||
receiveData=json;
|
||||
}
|
||||
else if("staBlue_vidio" in json){
|
||||
receiveData = json;
|
||||
} else if ("staBlue_vidio" in json) {
|
||||
//重发视频
|
||||
console.log("收到重新发送视频的命令");
|
||||
receiveData=json;
|
||||
}
|
||||
else if("staBlue" in json){
|
||||
if(json.staBlue=="finish"){
|
||||
receiveData = json;
|
||||
} else if ("staBlue" in json) {
|
||||
if (json.staBlue == "finish") {
|
||||
console.log("收到设备回复,全部传输完成");
|
||||
receiveData=json;
|
||||
receiveData = json;
|
||||
}
|
||||
|
||||
}
|
||||
else{
|
||||
receiveData={};
|
||||
} else {
|
||||
receiveData = {};
|
||||
console.log("无法解析该文本");
|
||||
}
|
||||
|
||||
|
||||
|
||||
} catch (error) {
|
||||
receiveData={};
|
||||
receiveData = {};
|
||||
console.log("文本解析失败")
|
||||
}
|
||||
return receiveData;
|
||||
@ -247,15 +242,15 @@ class BleReceive {
|
||||
|
||||
}
|
||||
|
||||
let data=parseData(receive.bytes);
|
||||
console.log("data=",data);
|
||||
let data = parseData(receive.bytes);
|
||||
console.log("data=", data);
|
||||
return data;
|
||||
|
||||
}
|
||||
|
||||
Receive_670(receive,f,path,recArr){
|
||||
console.log("pagh=",path);
|
||||
var todo = (bytes) =>{
|
||||
Receive_670(receive, f, path, recArr) {
|
||||
console.log("pagh=", path);
|
||||
var todo = (bytes) => {
|
||||
// console.log("todo",receive);
|
||||
let receiveData = {};
|
||||
if (bytes[0] == 0x55) {
|
||||
@ -281,7 +276,8 @@ class BleReceive {
|
||||
// console.log("todo");
|
||||
// 解析照明档位
|
||||
let lightingLevelByte = bytes[2];
|
||||
let lightingLevelText = lightingLevelByte === 0x6d ? 'hight': lightingLevelByte === 0x6e ? 'low': 'close';
|
||||
let lightingLevelText = lightingLevelByte === 0x6d ? 'hight' : lightingLevelByte === 0x6e ?
|
||||
'low' : 'close';
|
||||
|
||||
// 解析剩余照明时间（第三和第四字节，小端序）
|
||||
let lightingTime = (bytes[3] << 8) | bytes[4];
|
||||
@ -304,34 +300,35 @@ class BleReceive {
|
||||
warn = 'veryhight';
|
||||
}
|
||||
|
||||
let staticWarn = bytes[7] == 0x01;//静止报警
|
||||
let staticWarn = bytes[7] == 0x01; //静止报警
|
||||
let fourGStrenth = bytes[8]; //4g信号强度
|
||||
let sosTxt = bytes[9] == 0x00 ? 'close' : bytes[9] == 0x01 ? 'sg' : 'rb';
|
||||
// console.log("todo");
|
||||
receiveData.modeCurr = staticLevelText;
|
||||
receiveData.lightCurr = lightingLevelText;
|
||||
receiveData.xuhang = lightingTime ;
|
||||
receiveData.xuhang = lightingTime;
|
||||
receiveData.battary = batteryLevel;
|
||||
receiveData.warnLevel = warn;
|
||||
receiveData.staticWarn = staticWarn;
|
||||
receiveData.fourGStrenth = fourGStrenth;
|
||||
receiveData.SOS=sosTxt;
|
||||
receiveData.SOS = sosTxt;
|
||||
|
||||
this.setBleFormData(receiveData,f);
|
||||
console.log("recArr=",recArr);
|
||||
let recCnt=recArr.find(v=>{
|
||||
return v.key == f.device.detailPageUrl;
|
||||
this.setBleFormData(receiveData, f);
|
||||
console.log("recArr=", recArr);
|
||||
let recCnt = recArr.find(v => {
|
||||
return v.key.replaceAll('/', '').toLowerCase() == f.device.detailPageUrl
|
||||
.replaceAll('/', '').toLowerCase();
|
||||
});
|
||||
if(!recCnt){
|
||||
if (!recCnt) {
|
||||
if (this.formData.staticWarn) { //有静止报警
|
||||
uni.showModal({
|
||||
title:"警告",
|
||||
content:"设备静止报警中",
|
||||
showCancel:false
|
||||
title: "警告",
|
||||
content: "设备静止报警中",
|
||||
showCancel: false
|
||||
});
|
||||
}
|
||||
}
|
||||
} catch(error) {
|
||||
} catch (error) {
|
||||
console.log('数据解析错误:', error);
|
||||
}
|
||||
// console.log("todo");
|
||||
@ -359,58 +356,55 @@ class BleReceive {
|
||||
} else {
|
||||
try {
|
||||
// console.log("str=",str);
|
||||
let json=JSON.parse(str);
|
||||
if("staBlue_picture" in json){
|
||||
let json = JSON.parse(str);
|
||||
if ("staBlue_picture" in json) {
|
||||
//重发图片
|
||||
console.log("收到重新发送图片的命令");
|
||||
receiveData=json;
|
||||
}
|
||||
else if("staBlue_text" in json){
|
||||
receiveData = json;
|
||||
} else if ("staBlue_text" in json) {
|
||||
//重发文本
|
||||
console.log("收到重新发送文本的命令");
|
||||
receiveData=json;
|
||||
}
|
||||
else if("staBlue_vidio" in json){
|
||||
receiveData = json;
|
||||
} else if ("staBlue_vidio" in json) {
|
||||
//重发视频
|
||||
console.log("收到重新发送视频的命令");
|
||||
receiveData=json;
|
||||
}
|
||||
else if("staBlue" in json){
|
||||
if(json.staBlue=="finish"){
|
||||
receiveData = json;
|
||||
} else if ("staBlue" in json) {
|
||||
if (json.staBlue == "finish") {
|
||||
console.log("收到设备回复,全部传输完成");
|
||||
receiveData=json;
|
||||
receiveData = json;
|
||||
}
|
||||
|
||||
}
|
||||
else{
|
||||
receiveData={};
|
||||
} else {
|
||||
receiveData = {};
|
||||
console.log("无法解析该文本");
|
||||
}
|
||||
|
||||
|
||||
|
||||
} catch (error) {
|
||||
receiveData={};
|
||||
receiveData = {};
|
||||
// console.log("文本解析失败",error)
|
||||
}
|
||||
}
|
||||
} catch(ex) {
|
||||
receiveData={};
|
||||
} catch (ex) {
|
||||
receiveData = {};
|
||||
console.log('将数据转文本失败', ex);
|
||||
}
|
||||
}
|
||||
// console.log("todo",receiveData);
|
||||
this.setBleFormData(receiveData,f);
|
||||
this.setBleFormData(receiveData, f);
|
||||
return receiveData;
|
||||
}
|
||||
|
||||
|
||||
let data=todo(receive.bytes);
|
||||
let data = todo(receive.bytes);
|
||||
|
||||
return data;
|
||||
}
|
||||
Receive_6155(receive,f,path,recArr) {
|
||||
let bytes=receive.bytes;
|
||||
|
||||
Receive_6155(receive, f, path, recArr) {
|
||||
let bytes = receive.bytes;
|
||||
if (bytes[0] == 0xFB && bytes[1] == 0x64 && bytes.length >= 8) {
|
||||
try {
|
||||
|
||||
@ -464,21 +458,33 @@ class BleReceive {
|
||||
let HH = Math.max(0, Math.min(100, bytes[6]));
|
||||
let mm = Math.max(0, Math.min(100, bytes[7]));
|
||||
lightingTime = HH + "小时" + mm + "分钟";
|
||||
let formData={};
|
||||
let formData = {};
|
||||
formData.mode = staticLevelText;
|
||||
formData.fuMode = lightingLevelText;
|
||||
formData.battary = batteryLevel;
|
||||
formData.battary = 20; // batteryLevel;
|
||||
formData.statu = warn;
|
||||
formData.xuhang = lightingTime;
|
||||
|
||||
if (batteryLevel <= 20) {
|
||||
uni.showModal({
|
||||
content:"设备电量低",
|
||||
title:"提示"
|
||||
});
|
||||
batteryLevel = 20;
|
||||
console.log("recArr=", recArr);
|
||||
|
||||
let recCnt = recArr.find(v => {
|
||||
|
||||
return v.key.replaceAll('/', '').toLowerCase() === f.device.detailPageUrl.replaceAll(
|
||||
'/', '').toLowerCase();
|
||||
});
|
||||
if (!recCnt) {
|
||||
if (batteryLevel <= 20) {
|
||||
|
||||
uni.showModal({
|
||||
content: "设备电量低",
|
||||
title: "提示"
|
||||
});
|
||||
}
|
||||
this.setBleFormData(formData,f);
|
||||
}
|
||||
|
||||
|
||||
this.setBleFormData(formData, f);
|
||||
return formData;
|
||||
} catch (error) {
|
||||
console.log('数据解析错误:', error);
|
||||
|
||||
Reference in New Issue
Block a user