From 0add6304d59f710cafa5c4d2d40d2bd4a9ac6ffc Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 19 四月 2021 18:50:33 +0800
Subject: [PATCH] 1.更新SDKEZOpensdk_iOS_4.16.1_build20210330。
---
EZSDK/EZSDK/SDK/include/modules/EZVideoTalkSDK.h | 81 ++++++++++++++++++++++------------------
1 files changed, 45 insertions(+), 36 deletions(-)
diff --git a/EZSDK/EZSDK/SDK/include/modules/EZVideoTalkSDK.h b/EZSDK/EZSDK/SDK/include/modules/EZVideoTalkSDK.h
index 9b02087..170a928 100644
--- a/EZSDK/EZSDK/SDK/include/modules/EZVideoTalkSDK.h
+++ b/EZSDK/EZSDK/SDK/include/modules/EZVideoTalkSDK.h
@@ -7,7 +7,6 @@
//
#import <UIKit/UIKit.h>
-#import "EZVideoTalkParam.h"
NS_ASSUME_NONNULL_BEGIN
@@ -16,8 +15,10 @@
EZVideoTalkMessageRoomCreated, //鍒涘缓鎴块棿鎴愬姛
EZVideoTalkMessagePeerEnteredRoom, //鐩墠鏈娇鐢紝鐢ㄤ簬澶氭柟
EZVideoTalkMessagePeerLeaveRoom, //鐩墠鏈娇鐢紝鐢ㄤ簬澶氭柟
- EZVideoTalkMessageStartInputData //閾炬帴寤虹珛鎴愬姛锛屽紑濮嬫帹娴�
+ EZVideoTalkMessageStartInputData, //閾炬帴寤虹珛鎴愬姛锛屽紑濮嬫帹娴�
+ EZVideoTalkMessageTransferData, //閫忎紶娑堟伅
} EZVideoTalkMessageType;
+
typedef NS_OPTIONS(NSUInteger, EZVideoTalkCaptureType) {
EZVideoTalkCaptureNone = 1 << 0,
@@ -26,7 +27,7 @@
};
-@class EZVideoTalkSDK;
+@class EZVideoTalkSDK, EZVideoTalkParam, EZMediaSessionVideoParam, EZVideoTalkView;
@protocol EZVideoTalkSDKDelegate<NSObject>
@@ -36,18 +37,20 @@
鍥炶皟娑堟伅
@param client client
- @param messageCode 娑堟伅鐮�
- @param msg 閫忎紶娑堟伅
+ @param messageCode 娑堟伅鐮� 鍙傝EZBAVMessage
+ @param msg 閫忎紶娑堟伅锛�
+ 濡傛灉鏄疎ZVideoTalkMessagePeerEnteredRoom鍜孍ZVideoTalkMessagePeerLeaveRoom娑堟伅锛宮sg鏄瘂@"clientID":@(9527),@"clientName":@"寮犱笁"}
+ 濡傛灉娑堟伅鏄� EZVideoTalkMessageTransferData msg鏄� msg鏄瘂@"content":@"瀹為檯鐨勯�忎紶娑堟伅"}
*/
-- (void)videoTalk:(EZVideoTalkSDK *)client didReceivedMessage:(EZVideoTalkMessageType)messageType msg:(NSString*)msg;
+- (void)videoTalk:(EZVideoTalkSDK *)client didReceivedMessage:(EZVideoTalkMessageType)messageCode msg:(NSDictionary *)msg;
-/**
- 鍥炶皟娑堟伅 bavclient log鍥炶皟
-
- @param client client
- @param msg 閫忎紶娑堟伅
- */
-- (void)videoTalk:(EZVideoTalkSDK *)client didReceivedBavClientLogMsg:(NSString*)msg;
+
+// 鍥炶皟娑堟伅 bavclient log鍥炶皟
+//
+// @param client client
+// @param msg 閫忎紶娑堟伅
+// */
+//- (void)bavClient:(EZVideoTalk *)client didReceivedBavClientLogMsg:(NSString*)msg;
/**
鏄剧ず鍥炶皟锛岄娆＄敾闈㈠嚭鏉ヤ互鍙婂悗缁敾闈㈠昂瀵稿彂鐢熷彉鍖栨椂鍥炶皟
@@ -56,23 +59,8 @@
@param width 鐢婚潰瀹藉害
@param height 鐢婚潰楂樺害
*/
-- (void)videoTalk:(EZVideoTalkSDK *)clientt didDisplayWidth:(int32_t)width height:(int32_t)height;
+- (void)videoTalk:(EZVideoTalkSDK *)client didDisplayWidth:(int32_t)width height:(int32_t)height ofRemoteClient:(int)clientID;
-/**
- 鎾斁鍗￠】
-
- @param client client
- @param delayTime 鍗￠】鏃堕棿
- */
-- (void)videoTalk:(EZVideoTalkSDK *)client playDelayTime:(int32_t)delayTime;
-
-/**
- 鎾斁鍗￠】缁熻
-
- @param client client
- @param delayTimeStat 鍗￠】鏃堕棿
- */
-- (void)videoTalk:(EZVideoTalkSDK *)client playDelayTimeStatistics:(double)delayTimeStat;
@end
@@ -87,32 +75,53 @@
@param param 蹇呭～ 閰嶇疆鍙傛暟
@param localWin 鏈湴绐楀彛
- @param remoteWin 杩滅绐楀彛
@return 杩斿洖鍊�
*/
-- (instancetype)initWithParam:(EZVideoTalkParam *)param
- localWindow:(UIView *)localWin
- remoteWindow:(UIView *)remoteWin;
+- (instancetype)initWithParam:(EZMediaSessionVideoParam *)param
+ localWindow:(EZVideoTalkView *)localWin;
+
+/// 璁剧疆杩滅▼绐楀彛
+/// 1.蹇呴』鍦ㄦ嬁鍒拌繙绔鎴风鍔犲叆鐨勬秷鎭悗璁剧疆锛�
+/// 2.蹇呴』鍦ㄤ富绾跨▼璋冪敤锛�
+/// 3.缁撴潫鍚庨渶瑕佸皢window鍙负nil锛�
+/// @param remoteWin 杩滅绐楀彛
+/// @param clientID 鍔犲叆鐨勫鎴风鐨処D
+- (int32_t)setRemoteWindow:(UIView * _Nullable)remoteWin ofClient:(int32_t)clientID;
/**
寮�濮嬪弻鍚戦煶瑙嗛瀵硅锛岃�楁椂鎺ュ彛锛岄粯璁� EZVideoTalkCaptureVideo | EZVideoTalkCaptureAudio 鍚屾椂寮�鍚�
*/
-- (void)start;
+- (void)startWithBAVParam:(EZVideoTalkParam *)param;
/**
寮�濮嬪弻鍚戦煶瑙嗛瀵硅锛岃�楁椂鎺ュ彛
+ @param param 蹇呭～ 閰嶇疆鍙傛暟
+ @param type 閲囬泦绫诲瀷
*/
-- (void)startWithType:(EZVideoTalkCaptureType)type;
+- (void)startWithBAVParam:(EZVideoTalkParam *)param type:(EZVideoTalkCaptureType)type;
/**
鍋滄鍙屽悜闊宠棰戝璁�
*/
- (void)stop;
+/// 鏈湴閲囬泦鐨勯煶棰戞垨鑰呮槸瑙嗛閰嶇疆锛屽彲浠ュ湪闊宠棰戦�氳瘽杩囩▼涓垏鎹�
+/// @param type EZMediaCaptureSessionType
+- (int32_t)configCaptureType:(EZVideoTalkCaptureType)type;
+
/// 寮�鍚０闊筹紝鎺ユ敹鍒癊ZVideoTalkMessageStartInputData娑堟伅鍚庤皟鐢�
/// @param open 寮�鍏崇姸鎬�
-- (int32_t) openSound:(BOOL)open;
+/// @param clientId clientId
+- (int32_t) openSound:(BOOL)open forClient:(int32_t)clientId;
+
+/**
+ 鍒囨崲瀵硅鏃朵娇鐢ㄧ殑鎽勫儚澶达紝榛樿閲囩敤鍓嶇疆 鍚屾鎺ュ彛
+
+ @param backCameraSelected YES:閫夋嫨鍚庣疆锛孨O:閫夋嫨鍓嶇疆
+ @return 鎴愬姛杩斿洖 noErr锛屽け璐ヨ繑鍥為敊璇爜
+ */
+- (int32_t)switchCamera:(BOOL)backCameraSelected;
#pragma mark - 鏃ュ織璋冭瘯
/**
--
Gitblit v1.8.0