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

删除测试App的部分文件,修复loading有时不显示的问题

Browse Source
This commit is contained in:
liub
2025-11-25 16:08:45 +08:00
parent 2ba53fcf92
commit b01ad9d698
20 changed files with 131 additions and 14002 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
utils/BleHelper.js
View File

@ -74,9 +74,9 @@ class BleHelper {
stateRecoveryCallback: [], //蓝牙适配器恢复可用事件
stateBreakCallback: [] //蓝牙适配器不可用事件
}
// this.addReceiveCallback((a, b, c) => {
// recei.ReceiveData(a, b, c);
// }, "BleReceiveData");
this.addReceiveCallback((receive, f, path, recArr) => {
recei.ReceiveData(receive, f, path, recArr);
}, "BleReceiveData");
this.dic = {
errRemarks: [{
key: '10000',
@ -639,7 +639,7 @@ class BleHelper {
console.log("111111111")
uni.onBluetoothDeviceFound((res) => {
// console.log("发现新设备:" + JSON.stringify(res,'name'));
//console.log("发现新设备:" + JSON.stringify(res,'name'));
let arr = [];
for (var i = 0; i < res.devices.length; i++) {
let item = res.devices[i];
@ -653,7 +653,7 @@ class BleHelper {
});
if (f) {
// console.log("发现目标设备:", item);
// console.log("发现目标设备:", item);
arr.push(item);
}
@ -678,12 +678,14 @@ class BleHelper {
});
}
}else{
console.error("无人订阅发现设备的回调");
}
});
uni.onBLECharacteristicValueChange((receive) => {
//订阅消息
console.log("收到订阅消息", receive);
// console.log("收到订阅消息", receive);
let f = this.data.LinkedList.find((v) => {
return v.deviceId == receive.deviceId;
})
@ -838,10 +840,10 @@ class BleHelper {
}
})
} else {
console.log("无人订阅消息");
console.error("无人订阅消息");
}
} else {
console.log("无人订阅receivDataCallback,不处理数据");
console.error("无人订阅receivDataCallback,不处理数据");
}
} catch (ex) {
console.error("处理订阅消息失败,ex=", ex);

39
utils/BleReceive.js
View File

@ -46,20 +46,20 @@ class BleReceive {
let handler = null;
let keys = Object.keys(this.HandlerMap);
let devKey = f.device.detailPageUrl ? f.device.detailPageUrl.replace(/\//g, '').toLowerCase() : '';
console.log("查找handler - detailPageUrl:", f.device.detailPageUrl, "转换后:", devKey);
// console.log("查找handler - detailPageUrl:", f.device.detailPageUrl, "转换后:", devKey);
for (let index = 0; index < keys.length; index++) {
let devKey = f.device.detailPageUrl ? f.device.detailPageUrl.replace(/\//g, "").toLowerCase() : '';
let key = keys[index].replace(/\//g, '').toLowerCase();
if (key == devKey) {
handler = this.HandlerMap[keys[index]];
console.log("找到匹配的handler:", keys[index]);
// console.log("找到匹配的handler:", keys[index]);
break;
}
}
if (handler) {
let data = handler(receive, f, path, recArr);
console.log("设备"+f.device.deviceName+"收到消息,handler返回的数据:", data);
// console.log("设备"+f.device.deviceName+"收到消息,数据:", data);
return data;
} else {
console.error("已收到消息,但无指定处理程序, deviceUrl:", f.device.detailPageUrl, "可用handlers:", keys);
@ -162,7 +162,7 @@ class BleReceive {
if (iswarn) {
uni.showModal({
content: "环境存在漏电电源",
content: "'"+f.device.deviceName+"'环境存在漏电电源",
title: "警告",
success(res) {
if (res.confirm) {
@ -330,7 +330,7 @@ class BleReceive {
if (this.formData.staticWarn) { //有静止报警
uni.showModal({
title: "警告",
content: "设备静止报警中",
content: "设备'"+f.device.deviceName+"'静止报警中",
showCancel: false
});
}
@ -420,19 +420,23 @@ class BleReceive {
let name = "";
switch (type) {
case 0x02:
name = '弱光';
// name = '弱光';
name=1;
break;
case 0x04:
name = '工作光';
break;
case 0x01:
name = '强光';
// name = '强光';
name=0;
break;
case 0x03:
name = '爆闪';
// name = '爆闪';
name=2;
break;
case 0x00:
name = '关闭';
// name = '关闭';
name=3;
break;
}
return name;
@ -472,8 +476,7 @@ class BleReceive {
formData.statu = warn;
formData.xuhang = lightingTime;
console.log("7305解析结果 - 电量:", batteryLevel, "续航:", lightingTime, "完整数据:", formData);
let recCnt = recArr.find(v => {
return v.key.replace(/\//g, "").toLowerCase() === f.device.detailPageUrl.replace(/\//g, '').toLowerCase();
@ -484,10 +487,10 @@ class BleReceive {
if (!recCnt) {
if (batteryLevel <= 20) {
// 会弹出两个框,暂且注释掉这段代码
// uni.showModal({
// content: "设备电量低",
// title: "提示"
// });
uni.showModal({
content: "设备'"+f.device.deviceName+"'电量低",
title: "提示"
});
}
}
@ -518,7 +521,7 @@ class BleReceive {
if (receiveData.sta_PowerPercent<=20) {
uni.showModal({
title: "提示",
content: "设备电量低",
content: "设备'"+f.device.deviceName+"'电量低",
showCancel: false
});
}
@ -547,7 +550,7 @@ class BleReceive {
if (receiveData.sta_battery<=20) {
uni.showModal({
title: "提示",
content: "设备电量低",
content: "设备'"+f.device.deviceName+"'电量低",
showCancel: false
});
}
@ -577,7 +580,7 @@ class BleReceive {
if (receiveData.sta_PowerPercent<=20) {
uni.showModal({
title: "提示",
content: "设备电量低",
content: "设备'"+f.device.deviceName+"'电量低",
showCancel: false
});
}

2
utils/request.js
View File

@ -1,5 +1,5 @@
import config from '../config/index.js';
export const env = 'production'; //production development //开发of线上 改这里就行
export const env = 'development'; //production development //开发of线上 改这里就行
const BASE = config[env];
const request = (options) => {
console.log("options" + JSON.stringify(options), BASE.BASE_URL)