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

12
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) {
const on = Number(data.voiceBroadcast) === 1;
const mode = data.mode != null ? String(data.mode) : '';
if (on && mode === '7') {
return protocolInstance.setForceAlarm(0, 7).then(() => protocolInstance.setVoiceBroadcast(1));
const alarmOn = Number(data.voiceStrobeAlarm) === 1;
if (alarmOn) {
return protocolInstance.setForceAlarm(0, 7).then(() => protocolInstance.setVoiceBroadcast(1));
}
return protocolInstance.setVoiceBroadcast(1);
}
return protocolInstance.setVoiceBroadcast(on ? 1 : 0);
}
// 语音播放（HTTP 透传 data，便于后端识别 mode）
export function deviceVoiceBroadcast(data) {
const httpData = data && typeof data === 'object' ? { ...data } : data;
if (httpData && typeof httpData === 'object') delete httpData.voiceStrobeAlarm;
return execWithBleFirst(
() => 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 }),
'语音播报'
);
}