From 26d2dd0450d65cf85ba63c0418e6a0c09305a7ff Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Fri, 13 Dec 2024 17:52:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DRPC=E5=BD=95=E5=83=8F?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=81=9C=E6=AD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot/vmp/gb28181/service/IGbChannelPlayService.java | 2 +- .../vmp/gb28181/service/impl/GbChannelPlayServiceImpl.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/service/IGbChannelPlayService.java b/src/main/java/com/genersoft/iot/vmp/gb28181/service/IGbChannelPlayService.java index 6c5e0fcf..3a3d2618 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/service/IGbChannelPlayService.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/service/IGbChannelPlayService.java @@ -17,7 +17,7 @@ public interface IGbChannelPlayService { void playGbDeviceChannel(CommonGBChannel channel, ErrorCallback callback); - void stopPlayDeviceChannel(CommonGBChannel channel, String stream); + void stopPlayDeviceChannel(InviteSessionType type, CommonGBChannel channel, String stream); void playProxy(CommonGBChannel channel, ErrorCallback callback); diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelPlayServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelPlayServiceImpl.java index a9fe9dec..d6d8dc52 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelPlayServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelPlayServiceImpl.java @@ -94,7 +94,7 @@ public class GbChannelPlayServiceImpl implements IGbChannelPlayService { public void stopPlay(InviteSessionType type, CommonGBChannel channel, String stream) { if (channel.getGbDeviceDbId() != null) { // 国标通道 - stopPlayDeviceChannel(channel, stream); + stopPlayDeviceChannel(type, channel, stream); } else if (channel.getStreamProxyId() != null) { // 拉流代理 stopPlayProxy(channel); @@ -145,10 +145,10 @@ public class GbChannelPlayServiceImpl implements IGbChannelPlayService { } @Override - public void stopPlayDeviceChannel(CommonGBChannel channel, String stream) { + public void stopPlayDeviceChannel(InviteSessionType type, CommonGBChannel channel, String stream) { // 国标通道 try { - deviceChannelPlayService.stop(InviteSessionType.PLAY, channel, stream); + deviceChannelPlayService.stop(type, channel, stream); } catch (Exception e) { log.error("[停止点播失败] {}({})", channel.getGbName(), channel.getGbDeviceId(), e); }