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

修复RPC录像下载停止

dev/数据库统合
648540858 2024-12-13 17:52:33 +08:00
parent 3b4818c579
commit 26d2dd0450
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/genersoft/iot/vmp/gb28181/service/IGbChannelPlayService.java
View File

@ -17,7 +17,7 @@ public interface IGbChannelPlayService {
void playGbDeviceChannel(CommonGBChannel channel, ErrorCallback<StreamInfo> callback); void playGbDeviceChannel(CommonGBChannel channel, ErrorCallback<StreamInfo> callback);
void stopPlayDeviceChannel(CommonGBChannel channel, String stream); void stopPlayDeviceChannel(InviteSessionType type, CommonGBChannel channel, String stream);
void playProxy(CommonGBChannel channel, ErrorCallback<StreamInfo> callback); void playProxy(CommonGBChannel channel, ErrorCallback<StreamInfo> callback);

6
src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelPlayServiceImpl.java
View File

@ -94,7 +94,7 @@ public class GbChannelPlayServiceImpl implements IGbChannelPlayService {
public void stopPlay(InviteSessionType type, CommonGBChannel channel, String stream) { public void stopPlay(InviteSessionType type, CommonGBChannel channel, String stream) {
if (channel.getGbDeviceDbId() != null) { if (channel.getGbDeviceDbId() != null) {
// 国标通道 // 国标通道
stopPlayDeviceChannel(channel, stream); stopPlayDeviceChannel(type, channel, stream);
} else if (channel.getStreamProxyId() != null) { } else if (channel.getStreamProxyId() != null) {
// 拉流代理 // 拉流代理
stopPlayProxy(channel); stopPlayProxy(channel);
@ -145,10 +145,10 @@ public class GbChannelPlayServiceImpl implements IGbChannelPlayService {
} }
@Override @Override
public void stopPlayDeviceChannel(CommonGBChannel channel, String stream) { public void stopPlayDeviceChannel(InviteSessionType type, CommonGBChannel channel, String stream) {
// 国标通道 // 国标通道
try { try {
deviceChannelPlayService.stop(InviteSessionType.PLAY, channel, stream); deviceChannelPlayService.stop(type, channel, stream);
} catch (Exception e) { } catch (Exception e) {
log.error("[停止点播失败] {}({})", channel.getGbName(), channel.getGbDeviceId(), e); log.error("[停止点播失败] {}({})", channel.getGbName(), channel.getGbDeviceId(), e);
} }