From 0382d300b6edac231d2c8e80e4cc40b923db36ae Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Fri, 14 Jun 2024 16:48:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AF=AD=E9=9F=B3=E5=AF=B9?=
 =?UTF-8?q?=E8=AE=B2=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iot/vmp/service/impl/PlayServiceImpl.java  | 18 +++++++++---------
 .../vmanager/gb28181/play/PlayController.java  |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
index ee2abd49..55e68224 100755
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
@@ -1141,15 +1141,15 @@ public class PlayServiceImpl implements IPlayService {
             AudioBroadcastCatch audioBroadcastCatch = new AudioBroadcastCatch(device.getDeviceId(), channelId, mediaServerItem, app, stream, event, AudioBroadcastCatchStatus.Ready, isFromPlatform);
             audioBroadcastManager.update(audioBroadcastCatch);
             // 等待invite消息， 超时则结束
-            String key = VideoManagerConstants.BROADCAST_WAITE_INVITE +  device.getDeviceId();
-            if (!SipUtils.isFrontEnd(device.getDeviceId())) {
-                key += audioBroadcastCatch.getChannelId();
-            }
-            dynamicTask.startDelay(key, ()->{
-                logger.info("[语音广播]等待invite消息超时：{}/{}", device.getDeviceId(), channelId);
-                event.call(-1,"等待invite消息超时");
-                stopAudioBroadcast(device.getDeviceId(), channelId);
-            }, 10*1000);
+//            String key = VideoManagerConstants.BROADCAST_WAITE_INVITE +  device.getDeviceId();
+//            if (!SipUtils.isFrontEnd(device.getDeviceId())) {
+//                key += audioBroadcastCatch.getChannelId();
+//            }
+//            dynamicTask.startDelay(key, ()->{
+//                logger.info("[语音广播]等待invite消息超时：{}/{}", device.getDeviceId(), channelId);
+//                event.call(-1,"等待invite消息超时");
+//                stopAudioBroadcast(device.getDeviceId(), channelId);
+//            }, 10*1000);
         }, eventResultForError -> {
             // 发送失败
             logger.error("语音广播发送失败： {}:{}", channelId, eventResultForError.msg);
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
index 0623c18a..5785139a 100755
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
@@ -281,7 +281,7 @@ public class PlayController {
 			playService.stopAudioBroadcast();
 		});
         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.setCode(code);
                 wvpResult.setMsg(msg);