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

优化100J问题

Browse Source
This commit is contained in:
微微一笑
2026-03-27 18:07:59 +08:00
parent 35d6574754
commit b6ce2dbe25
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
api/100J/HBY100-J.js
View File

@ -1200,21 +1200,27 @@ export function deviceUpdateVolume(data) {
); );
} }
/** 蓝牙侧语音播报：自定义音(mode=7)部分固件需先 0x0C 带模式再 0x06，否则无声音 */ /** 蓝牙侧语音播报：自定义音(mode=7)且强制报警仍开时，需先 0x0C 关报警+模式7 再 0x06；已解除则不必重复下发 0x0C */
function bleVoiceBroadcastChain(data) { function bleVoiceBroadcastChain(data) {
const on = Number(data.voiceBroadcast) === 1; const on = Number(data.voiceBroadcast) === 1;
const mode = data.mode != null ? String(data.mode) : ''; const mode = data.mode != null ? String(data.mode) : '';
if (on && mode === '7') { if (on && mode === '7') {
const alarmOn = Number(data.voiceStrobeAlarm) === 1;
if (alarmOn) {
return protocolInstance.setForceAlarm(0, 7).then(() => protocolInstance.setVoiceBroadcast(1)); return protocolInstance.setForceAlarm(0, 7).then(() => protocolInstance.setVoiceBroadcast(1));
} }
return protocolInstance.setVoiceBroadcast(1);
}
return protocolInstance.setVoiceBroadcast(on ? 1 : 0); return protocolInstance.setVoiceBroadcast(on ? 1 : 0);
} }
// 语音播放（HTTP 透传 data，便于后端识别 mode） // 语音播放（HTTP 透传 data，便于后端识别 mode）
export function deviceVoiceBroadcast(data) { export function deviceVoiceBroadcast(data) {
const httpData = data && typeof data === 'object' ? { ...data } : data;
if (httpData && typeof httpData === 'object') delete httpData.voiceStrobeAlarm;
return execWithBleFirst( return execWithBleFirst(
() => bleVoiceBroadcastChain(data).then(() => ({ code: 200, msg: '操作成功(蓝牙)' })), () => bleVoiceBroadcastChain(data).then(() => ({ code: 200, msg: '操作成功(蓝牙)' })),
() => request({ url: `/app/hby100j/device/voiceBroadcast`, method: 'post', data }), () => request({ url: `/app/hby100j/device/voiceBroadcast`, method: 'post', data: httpData }),
'语音播报' '语音播报'
); );
} }

15
pages/100J/HBY100-J.vue
View File

@ -1065,7 +1065,8 @@
const data = { const data = {
deviceId: this.deviceInfo.deviceId, deviceId: this.deviceInfo.deviceId,
voiceBroadcast: Number(this.formData.sta_VoiceType) === -1 ? 0 : 1, voiceBroadcast: Number(this.formData.sta_VoiceType) === -1 ? 0 : 1,
mode: this.formData.sta_VoiceType mode: this.formData.sta_VoiceType,
voiceStrobeAlarm: this.deviceInfo.voiceStrobeAlarm
}; };
deviceVoiceBroadcast(data).then((res) => { deviceVoiceBroadcast(data).then((res) => {
if (res.code == 200) { if (res.code == 200) {
@ -1090,7 +1091,8 @@
const data = { const data = {
deviceId: this.deviceInfo.deviceId, deviceId: this.deviceInfo.deviceId,
voiceBroadcast: 0, voiceBroadcast: 0,
mode: val mode: val,
voiceStrobeAlarm: this.deviceInfo.voiceStrobeAlarm
}; };
deviceVoiceBroadcast(data).then((res) => { deviceVoiceBroadcast(data).then((res) => {
if (res.code == 200) { if (res.code == 200) {
@ -1118,6 +1120,15 @@
console.log(this.deviceInfo, '44444'); console.log(this.deviceInfo, '44444');
console.log(item, 'tent'); console.log(item, 'tent');
const isClose = item === 0; const isClose = item === 0;
// 与「已解除不再重复关报警」对称：已在报警中不再弹窗重复下发「开启」，未报警时不再重复「解除」
if (!isClose && this.deviceInfo.voiceStrobeAlarm === 1) {
uni.showToast({ title: '当前已在报警中', icon: 'none' });
return;
}
if (isClose && this.deviceInfo.voiceStrobeAlarm !== 1) {
uni.showToast({ title: '当前未在报警中', icon: 'none' });
return;
}
if (!this.Status) this.Status = {}; if (!this.Status) this.Status = {};
if (!this.Status.Pop) this.Status.Pop = { if (!this.Status.Pop) this.Status.Pop = {
showPop: false showPop: false