Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

添加语音对讲接口

2.7.1-多对一语音对讲
648540858 2024-06-14 16:48:58 +08:00
parent e83e880991
commit 0382d300b6
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
View File

@ -1141,15 +1141,15 @@ public class PlayServiceImpl implements IPlayService {
AudioBroadcastCatch audioBroadcastCatch = new AudioBroadcastCatch(device.getDeviceId(), channelId, mediaServerItem, app, stream, event, AudioBroadcastCatchStatus.Ready, isFromPlatform); AudioBroadcastCatch audioBroadcastCatch = new AudioBroadcastCatch(device.getDeviceId(), channelId, mediaServerItem, app, stream, event, AudioBroadcastCatchStatus.Ready, isFromPlatform);
audioBroadcastManager.update(audioBroadcastCatch); audioBroadcastManager.update(audioBroadcastCatch);
// 等待invite消息， 超时则结束 // 等待invite消息， 超时则结束
String key = VideoManagerConstants.BROADCAST_WAITE_INVITE + device.getDeviceId(); // String key = VideoManagerConstants.BROADCAST_WAITE_INVITE + device.getDeviceId();
if (!SipUtils.isFrontEnd(device.getDeviceId())) { // if (!SipUtils.isFrontEnd(device.getDeviceId())) {
key += audioBroadcastCatch.getChannelId(); // key += audioBroadcastCatch.getChannelId();
} // }
dynamicTask.startDelay(key, ()->{ // dynamicTask.startDelay(key, ()->{
logger.info("[语音广播]等待invite消息超时：{}/{}", device.getDeviceId(), channelId); // logger.info("[语音广播]等待invite消息超时：{}/{}", device.getDeviceId(), channelId);
event.call(-1,"等待invite消息超时"); // event.call(-1,"等待invite消息超时");
stopAudioBroadcast(device.getDeviceId(), channelId); // stopAudioBroadcast(device.getDeviceId(), channelId);
}, 10*1000); // }, 10*1000);
}, eventResultForError -> { }, eventResultForError -> {
// 发送失败 // 发送失败
logger.error("语音广播发送失败： {}:{}", channelId, eventResultForError.msg); logger.error("语音广播发送失败： {}:{}", channelId, eventResultForError.msg);

2
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
View File

@ -281,7 +281,7 @@ public class PlayController {
playService.stopAudioBroadcast(); playService.stopAudioBroadcast();
}); });
try { try {
playService.audioBroadcastCmd(device, channelId, mediaServerItem, app, stream, 60, false, (code, msg) -> { playService.audioBroadcastCmd(device, channel, mediaServerItem, app, stream, 60, false, (code, msg) -> {
WVPResult<Void> wvpResult = new WVPResult<>(); WVPResult<Void> wvpResult = new WVPResult<>();
wvpResult.setCode(code); wvpResult.setCode(code);
wvpResult.setMsg(msg); wvpResult.setMsg(msg);