new-20250827 优化蓝牙订阅在首页的弹窗 #42

Merged
liubiao merged 6 commits from liubiao/APP:new-20250827 into main 2026-04-07 11:29:13 +08:00
17 changed files with 3250 additions and 1713 deletions
Showing only changes of commit 6715507125 - Show all commits

View File

@ -459,6 +459,13 @@
"style": {
"navigationBarTitleText": ""
}
},
{
"path": "pages/210/HBY210",
"style": {
"navigationStyle": "custom",
"navigationBarTitleText": "HBY210"
}
}
],

View File

@ -58,6 +58,11 @@
<text class="value"
:class="deviceInfo.onlineStatus===0?'red':'green'">{{ deviceInfo.onlineStatus === 0 ? '离线': '在线' }}</text>
</view>
<view class="item">
<text class="lbl">充电状态</text>
<text class="value"
>{{ deviceInfo.chargingStatus === 0 ? '未充电': '充电中' }}</text>
</view>
<view class="info-row">
<text class="info-label" style="display: flex; align-items: center;">定位信息</text>
<view class="info-value status-running" @click="gpsPosition(deviceInfo)">
@ -192,6 +197,16 @@
</view>
</view>
<ProParams :id="device.id"></ProParams>
<MessagePopup :visible="Status.Pop.showPop" :type="Status.Pop.popType" :bgColor="Status.Pop.bgColor"
:borderColor="Status.Pop.borderColor" :textColor="Status.Pop.textColor"
:buttonBgColor="Status.Pop.buttonBgColor" :buttonTextColor="Status.Pop.buttonTextColor"
:iconUrl="Status.Pop.iconUrl" :message="Status.Pop.message" :buttonText="Status.Pop.buttonText"
@buttonClick="HidePop" :visiblePrompt="Status.Pop.visiblePrompt"
:promptTitle="Status.Pop.promptTitle" v-model="Status.Pop.modelValue"
:buttonCancelText="Status.Pop.buttonCancelText" :showCancel="Status.Pop.showCancel"
@cancelPop="closePop" />
<MsgBox ref="msgPop" />
</view>
</view>
@ -1506,7 +1521,7 @@
option.buttonBgColor = '#BBE600';
}
these.Status.Pop.showPop = true;
showPop(option,this);
},
btnClick() {

File diff suppressed because it is too large Load Diff

1528
pages/210/HBY210Old.vue Normal file

File diff suppressed because it is too large Load Diff

View File

@ -27,7 +27,8 @@ class BleReceive {
'/pages/102/HBY102': this.Receive_102.bind(this),
'/pages/6170/deviceControl/index': this.Receive_6170.bind(this),
'/pages/100J/HBY100-J': this.Receive_100J.bind(this),
'/pages/6075J/BJQ6075J': this.Receive_6075.bind(this)
'/pages/6075J/BJQ6075J': this.Receive_6075.bind(this),
'/pages/210/HBY210':this.Receive_210.bind(this),
};
}
@ -970,6 +971,34 @@ class BleReceive {
return receiveData;
}
Receive_210(receive, f, path, recArr) {
let receiveData = {};
try {
receiveData = JSON.parse(receive.str);
let recCnt = recArr.find(v => {
return v.key.replace(/\//g, "").toLowerCase() == f.device.detailPageUrl
.replace(/\//g, "").toLowerCase();
});
if (!recCnt && this.ref) {
if (receiveData.sta_PowerPercent <= 20 && (receiveData.sta_system != 3 || receiveData.sta_system !=1)) {
MsgError("设备'" + f.device.deviceName + "'电量低", '', this.ref, () => {
MsgClear(this.ref);
});
}
}
} catch (error) {
receiveData = {};
console.log("文本解析失败", error)
}
return receiveData;
}
}