From 32c73ff595c9939b342017ffbd8c86bc16877ba6 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期一, 17 七月 2023 16:56:58 +0800 Subject: [PATCH] Merge branch '2.6.8' into wvp-28181-2.0 --- src/main/java/com/genersoft/iot/vmp/service/IInviteStreamService.java | 47 ++--------------------------------------------- 1 files changed, 2 insertions(+), 45 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/service/IInviteStreamService.java b/src/main/java/com/genersoft/iot/vmp/service/IInviteStreamService.java index 1036efd..ae30f26 100644 --- a/src/main/java/com/genersoft/iot/vmp/service/IInviteStreamService.java +++ b/src/main/java/com/genersoft/iot/vmp/service/IInviteStreamService.java @@ -4,8 +4,6 @@ import com.genersoft.iot.vmp.common.InviteSessionType; import com.genersoft.iot.vmp.service.bean.ErrorCallback; -import java.util.List; - /** * 璁板綍鍥芥爣鐐规挱鐨勭姸鎬侊紝鍖呮嫭瀹炴椂棰勮锛屼笅杞斤紝褰曞儚鍥炴斁 */ @@ -15,6 +13,8 @@ * 鏇存柊鐐规挱鐨勭姸鎬佷俊鎭� */ void updateInviteInfo(InviteInfo inviteInfo); + + InviteInfo updateInviteInfoForStream(InviteInfo inviteInfo, String stream); /** * 鑾峰彇鐐规挱鐨勭姸鎬佷俊鎭� @@ -72,49 +72,6 @@ * 缁熻鍚屼竴涓獄lm涓嬬殑鍥芥爣鏀舵祦涓暟 */ int getStreamInfoCount(String mediaServerId); - - - /*======================璁惧涓诲瓙鐮佹祦閫昏緫START=========================*/ - /** - * 鑾峰彇鐐规挱鐨勭姸鎬佷俊鎭� - */ - InviteInfo getInviteInfoByDeviceAndChannel(InviteSessionType type, - String deviceId, - String channelId,boolean isSubStream); - - void removeInviteInfoByDeviceAndChannel(InviteSessionType inviteSessionType, String deviceId, String channelId,boolean isSubStream); - - InviteInfo getInviteInfo(InviteSessionType type, - String deviceId, - String channelId, - boolean isSubStream, - String stream); - - void removeInviteInfo(InviteSessionType type, - String deviceId, - String channelId, - boolean isSubStream, - String stream); - - void once(InviteSessionType type, String deviceId, String channelId,boolean isSubStream, String stream, ErrorCallback<Object> callback); - - void call(InviteSessionType type, String deviceId, String channelId,boolean isSubStream, String stream, int code, String msg, Object data); - - void updateInviteInfoSub(InviteInfo inviteInfo); - - /** - * 鑾峰彇鐐规挱鐨勭姸鎬佷俊鎭� - */ - InviteInfo getInviteInfoByStream(InviteSessionType type, String stream,boolean isSubStream); - - /** - * 鑾峰彇鐐规挱鐨勭姸鎬佷俊鎭� - */ - List<Object> getInviteInfos(InviteSessionType type, - String deviceId, - String channelId, - String stream); - /*======================璁惧涓诲瓙鐮佹祦閫昏緫END=========================*/ -- Gitblit v1.8.0