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

跟朱工合并7305的功能

Browse Source 
# Conflicts:
#	utils/BleHelper.js
#	utils/BleReceive.js
This commit is contained in:
liub
2025-10-23 16:10:53 +08:00
parent 1ac41b3ed5 8487a4303a
commit 738ce209a6
3 changed files with 132 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
utils/BleHelper.js
View File

@ -729,12 +729,13 @@ class BleHelper {
this.updateCache();
}
}
console.log("str=", str);
// console.log("str1=", str);
} catch (ex) {
console.error("将数据转文本失败", ex);
}
try {
console.log("11111");
let recData = {
deviceId: receive.deviceId,
serviceId: receive.serviceId,
@ -1222,6 +1223,7 @@ class BleHelper {
}
setTimeout(function() {
startgetService(id);
}, 100+repeatCnt*300);
}
},

54
utils/BleReceive.js
View File

@ -1,27 +1,9 @@
class BleReceive {
constructor() {
this.StorageKey = "linkedDevices";
this.ReceiveDic=[
{
url:'/pages/6155/deviceDetail',
method:this.Receive_6155
},
{
url:'/pages/7305/BJQ7305',
method:this.Receive_6155
},
{
url:'/pages/650/HBY650',
method:this.Receive_650
},
{
url:'/pages/670/HBY670',
method:this.Receive_670
}
];
}
getCurrentPagePath() {
const pages = getCurrentPages();
@ -68,31 +50,19 @@ class BleReceive {
ReceiveData(receive,f,path,recArr) {
if(f && f.macAddress && f.device && f.device.id){
let data={};
let rec=this.ReceiveDic.find(r=>{
return r.url==f.device.detailPageUrl;
})
if(rec){
data=rec.method(receive,f,path,recArr);
if(f.device.detailPageUrl=='/pages/6155/deviceDetail' || f.device.detailPageUrl=='/pages/7305/BJQ7305'){
// console.log("该设备是6155");
data= this.Receive_6155(receive,f,path,recArr);
}
// if(f.device.detailPageUrl=='/pages/6155/deviceDetail'){
// // console.log("该设备是6155");
// data= this.Receive_6155(receive,f,path,recArr);
// }
// if(f.device.detailPageUrl=='/pages/7305/BJQ7305'){
// // console.log("该设备是7305");
// data= this.Receive_6155(receive,f,path,recArr);
// }
// if(f.device.detailPageUrl=='/pages/650/HBY650'){
// // console.log("该设备是650");
// data= this.Receive_650(receive,f,path,recArr);
// }
// if(f.device.detailPageUrl=='/pages/670/HBY670'){
// // console.log("该设备是670");
// data= this.Receive_670(receive,f,path,recArr);
// }
if(f.device.detailPageUrl=='/pages/650/HBY650'){
// console.log("该设备是650");
data= this.Receive_650(receive,f,path,recArr);
}
if(f.device.detailPageUrl=='/pages/670/HBY670'){
// console.log("该设备是670");
data= this.Receive_670(receive,f,path,recArr);
}
// console.log("收到数据并处理完毕,",data);
return data;
}else{