From feb1c3628a4d5da3c85bd3f3dae3be22ed4f5625 Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期二, 19 十月 2021 11:18:40 +0800 Subject: [PATCH] 2021-10-19 1.更新SDK --- Demo/EZOpensdk_iOS_4.15.1_build20201104/DynamicSDK/EZOpenSDKFramework.framework/Headers/EZVideoTalkSDK.h | 275 +++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 195 insertions(+), 80 deletions(-) diff --git a/Demo/EZOpensdk_iOS_4.15.1_build20201104/DynamicSDK/EZOpenSDKFramework.framework/Headers/EZVideoTalkSDK.h b/Demo/EZOpensdk_iOS_4.15.1_build20201104/DynamicSDK/EZOpenSDKFramework.framework/Headers/EZVideoTalkSDK.h index 9b02087..2cfce3d 100644 --- a/Demo/EZOpensdk_iOS_4.15.1_build20201104/DynamicSDK/EZOpenSDKFramework.framework/Headers/EZVideoTalkSDK.h +++ b/Demo/EZOpensdk_iOS_4.15.1_build20201104/DynamicSDK/EZOpenSDKFramework.framework/Headers/EZVideoTalkSDK.h @@ -7,112 +7,89 @@ // #import <UIKit/UIKit.h> -#import "EZVideoTalkParam.h" + +#import "EZBAVParam.h" + NS_ASSUME_NONNULL_BEGIN -typedef enum : NSUInteger { - EZVideoTalkMessageUnkown, - EZVideoTalkMessageRoomCreated, //鍒涘缓鎴块棿鎴愬姛 - EZVideoTalkMessagePeerEnteredRoom, //鐩墠鏈娇鐢紝鐢ㄤ簬澶氭柟 - EZVideoTalkMessagePeerLeaveRoom, //鐩墠鏈娇鐢紝鐢ㄤ簬澶氭柟 - EZVideoTalkMessageStartInputData //閾炬帴寤虹珛鎴愬姛锛屽紑濮嬫帹娴� -} EZVideoTalkMessageType; -typedef NS_OPTIONS(NSUInteger, EZVideoTalkCaptureType) { - EZVideoTalkCaptureNone = 1 << 0, - EZVideoTalkCaptureVideo = 1 << 1, - EZVideoTalkCaptureAudio = 1 << 2, -}; - - -@class EZVideoTalkSDK; +@class EZVideoTalkSDK, EZMediaSessionVideoParam, EZVideoTalkView, EZBAVParam, EZConferenceParam; @protocol EZVideoTalkSDKDelegate<NSObject> -- (void)videoTalk:(EZVideoTalkSDK *)client didReceivedError:(int32_t)errorCode; +- (void)videoTalk:(id)client didReceivedError:(int32_t)errorCode; /** 鍥炶皟娑堟伅 @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; - -/** - 鍥炶皟娑堟伅 bavclient log鍥炶皟 - - @param client client - @param msg 閫忎紶娑堟伅 - */ -- (void)videoTalk:(EZVideoTalkSDK *)client didReceivedBavClientLogMsg:(NSString*)msg; - -/** - 鏄剧ず鍥炶皟锛岄娆$敾闈㈠嚭鏉ヤ互鍙婂悗缁敾闈㈠昂瀵稿彂鐢熷彉鍖栨椂鍥炶皟 - - @param client client - @param width 鐢婚潰瀹藉害 - @param height 鐢婚潰楂樺害 - */ -- (void)videoTalk:(EZVideoTalkSDK *)clientt didDisplayWidth:(int32_t)width height:(int32_t)height; - -/** - 鎾斁鍗¢】 - - @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; +- (void)videoTalk:(id)client didReceivedMessage:(int32_t)messageCode msg:(id)msg; @end @interface EZVideoTalkSDK : NSObject -@property (nonatomic, assign, readonly) int32_t roomID; @property (nonatomic, weak) id<EZVideoTalkSDKDelegate> delegate; -#pragma mark - SDK -/** -SDK鍒濆鍖� - - @param param 蹇呭~ 閰嶇疆鍙傛暟 - @param localWin 鏈湴绐楀彛 - @param remoteWin 杩滅绐楀彛 - - @return 杩斿洖鍊� - */ -- (instancetype)initWithParam:(EZVideoTalkParam *)param - localWindow:(UIView *)localWin - remoteWindow:(UIView *)remoteWin; +/// 鍔犲叆鐨勬埧闂村彿 +- (int32_t)roomID; /** - 寮�濮嬪弻鍚戦煶瑙嗛瀵硅锛岃�楁椂鎺ュ彛锛岄粯璁� EZVideoTalkCaptureVideo | EZVideoTalkCaptureAudio 鍚屾椂寮�鍚� + 瀵硅鏃讹紝寮哄埗閲囩敤鎵0鍣ㄦ挱鏀惧0闊筹紝榛樿涓篩ES */ -- (void)start; +@property (nonatomic, assign) BOOL forceToSpeaker; -/** - 寮�濮嬪弻鍚戦煶瑙嗛瀵硅锛岃�楁椂鎺ュ彛 - */ -- (void)startWithType:(EZVideoTalkCaptureType)type; -/** - 鍋滄鍙屽悜闊宠棰戝璁� - */ -- (void)stop; +/// 鍒濆鍖栬棰戦�氳瘽SDK瀵硅薄 +/// @param videoParam 瑙嗛閫氳瘽涓棰戠殑鍙傛暟 +- (instancetype)initWithVideoParam:(EZMediaSessionVideoParam *)videoParam; -/// 寮�鍚0闊筹紝鎺ユ敹鍒癊ZVideoTalkMessageStartInputData娑堟伅鍚庤皟鐢� -/// @param open 寮�鍏崇姸鎬� -- (int32_t) openSound:(BOOL)open; + +/// 璁剧疆鏈湴鐨勯瑙堢獥鍙� +/// @param localWin 绐楀彛window +- (void)setLocalWindow:(EZVideoTalkView *)localWin; + + +/// 鏈湴鎽勫儚澶村紑鍚�/鍏抽棴鎺ュ彛 +/// @param enable 鏄惁寮�鍚憚鍍忓ご +- (NSInteger)enableVideoCapture:(BOOL)enable; + + +/// 鏈湴楹﹀厠椋庡紑鍚�/鍏抽棴鎺ュ彛 +/// @param enable 鏄惁寮�鍚害鍏嬮 +- (NSInteger)enableAudioCatpure:(BOOL)enable; + + +/// 鏄惁寮�鍚睆骞曞叡浜� +/// @param enable 鏄惁寮�鍚� +- (NSInteger)enableScreenShare:(BOOL)enable withName:(NSString *)name; + + +/// 鍙戣捣鍙屽悜闊宠棰戝璁诧紝鑰楁椂鎺ュ彛锛屾垚鍔熻繑鍥� noErr锛屽け璐ヨ繑鍥為敊璇爜 +/// @param param EZBAVParam +- (int32_t)startWithParam:(EZBAVParam *)param; + +/// 璁剧疆杩滅▼绐楀彛锛�.濡傛灉璁剧疆闈炵┖瀵硅薄view锛屽繀椤诲湪涓荤嚎绋嬭皟鐢紙濡傛灉鏄缃垚nil锛屽彲浠ヤ笉鍦ㄤ富绾跨▼璋冪敤锛� +/// @param window 鎾斁绐楀彛 +- (int32_t)setRemoteWindow:(UIView *)window; + +/// 鍋滄鍙屽悜闊宠棰戝璁诧紝鎴愬姛杩斿洖 noErr锛屽け璐ヨ繑鍥為敊璇爜 +- (int32_t)stop; + +/// 鍒囨崲瀵硅鏃朵娇鐢ㄧ殑鎽勫儚澶达紝榛樿閲囩敤鍓嶇疆 鍚屾鎺ュ彛 +/// @param backCameraSelected YES:閫夋嫨鍚庣疆锛孨O:閫夋嫨鍓嶇疆 +- (int32_t)switchCamera:(BOOL)backCameraSelected; + + +/// 寮�鍏宠繙绋嬪0闊筹紝榛樿寮� +/// @param open 寮�鍚� +- (int32_t)enableRemoteSound:(BOOL)open; #pragma mark - 鏃ュ織璋冭瘯 /** @@ -139,4 +116,142 @@ @end + +@interface EZConfOpenSDK : NSObject + +@property (nonatomic, weak) id<EZVideoTalkSDKDelegate> delegate; + +/// 鍔犲叆鐨勬埧闂村彿 +- (int32_t)roomID; + +/// 鑷繁鐨刢lientID +- (int32_t)clientID; + +/** + 瀵硅鏃讹紝寮哄埗閲囩敤鎵0鍣ㄦ挱鏀惧0闊筹紝榛樿涓篩ES + */ +@property (nonatomic, assign) BOOL forceToSpeaker; + + +/// 鍒濆鍖栬棰戦�氳瘽SDK瀵硅薄 +/// @param videoParam 瑙嗛閫氳瘽涓棰戠殑鍙傛暟 +- (instancetype)initWithVideoParam:(EZMediaSessionVideoParam *)videoParam; + + +/// 鍔犲叆浼氳锛堟柊鎺ュ彛锛� +/// @param roomId 鎴块棿鍙� +/// @param password 瀵嗙爜 +/// @param customId 鑷畾涔夌殑customid +- (void)enterRoom:(int32_t)roomId withPassword:(NSString *)password withCustomId:(NSString *)customId; + + +/// 閫�鍑轰細璁� +- (int32_t)leaveRoom; + +/// 瑙f暎浼氳锛岃В鏁e悗锛屽叾浠栦笌浼氳�呬細鏀跺埌浼氳琚В鏁f秷鎭� +- (void)dissolveRoom; + +/// 鏈湴鎽勫儚澶村紑鍚�/鍏抽棴鎺ュ彛. +/// @param enable 鏄惁寮�鍚憚鍍忓ご +- (NSInteger)enableVideoCapture:(BOOL)enable; + + +/// 鏈湴楹﹀厠椋庡紑鍚�/鍏抽棴鎺ュ彛 +/// @param enable 鏄惁寮�鍚害鍏嬮 +/// @param block 涓荤嚎绋嬪洖璋冪粨鏋� +- (void)enableAudioCatpure:(BOOL)enable withResultBlock:(EZAudioOpenResultBlock)block; + +/// 鏄惁寮�鍚緟娴侊紝杈呮祦鍒嗚鲸鐜囨洿浣庛�佺爜鐜囨洿灏� +/// @param enable 鏄惁寮�鍚� +- (NSInteger)enableThumbnailCatpure:(BOOL)enable; + +/// 鏄惁寮�鍚睆骞曞叡浜� +/// @param enable 鏄惁寮�鍚� +/// @param name 鍙�夌殑鍒嗕韩鐨勫悕绉� +/// @param block 涓荤嚎绋嬪洖璋冪粨鏋� +- (void)enableScreenShare:(BOOL)enable andName:(NSString *)name withResultBlock:(EZScreenShareResultBlock)block; + +/// 璁剧疆鏈湴鐨勯瑙堢獥鍙� +/// @param localWin 绐楀彛window +- (void)setLocalWindow:(EZVideoTalkView *)localWin; + +/// 璁剧疆杩滅▼绐楀彛锛�1.蹇呴』鍦ㄦ嬁鍒拌繙绔鎴风鍔犲叆鐨勬秷鎭悗璁剧疆锛�2.濡傛灉璁剧疆闈炵┖瀵硅薄view锛屽繀椤诲湪涓荤嚎绋嬭皟鐢� +/// @param window 鎾斁绐楀彛 +/// @param clientID 鍔犲叆鐨勫鎴风鐨処D +/// @param streamType 1瑙嗛 2闊抽 4灏忔祦 +- (int32_t)setRemoteWindow:(UIView *)window ofClient:(int32_t)clientID withStream:(NSInteger)streamType; + +/// 璁剧疆瑙傜湅灞忓箷鍏变韩鐨勭獥鍙� +/// @param window 绐楀彛 +- (int32_t)setWindowForScreenShare:(UIView *)window; + +/// 鍒囨崲瀵硅鏃朵娇鐢ㄧ殑鎽勫儚澶达紝榛樿閲囩敤鍓嶇疆 鍚屾鎺ュ彛 +/// @param backCameraSelected YES:閫夋嫨鍚庣疆锛孨O:閫夋嫨鍓嶇疆 +- (int32_t)switchCamera:(BOOL)backCameraSelected; + +#pragma mark - 褰曞埗鐩稿叧鎺ュ彛 +/// 寮�濮嬫埧闂磋棰戜細璁綍鍒� +/// @param roomId 鎴块棿鍙� +/// @param customId 寮�鍙戣�呰嚜瀹氫箟鐢ㄦ埛ID +/// @param recUsers 闇�瑕佸綍鍒剁殑鎴块棿鍙備笌鑰卛d +/// @param projectId 浜戝瓨鍌ㄩ」鐩甀D +/// @param fileId 浜戝瓨鍌ㄦ枃浠跺悕 +/// @param completion operation ++ (void)requestStartRecordRoomId:(NSString *)roomId + customId:(NSInteger)customId + recUsers:(NSArray *)recUsers + projectId:(NSString *)projectId + fileId:(NSString *)fileId + completion:(void (^)(bool success, NSError *error))completion; + +/// 鍋滄鎴块棿瑙嗛浼氳褰曞埗 +/// @param roomId 鎴块棿鍙� +/// @param customId 寮�鍙戣�呰嚜瀹氫箟鐢ㄦ埛ID +/// @param completion operation ++ (void)requestStopRecordRoomId:(NSString *)roomId + customId:(NSInteger)customId + completion:(void (^)(bool success, NSError *error))completion; + +/// 鑾峰彇鏂囦欢涓嬭浇鍦板潃 +/// @param projectId 椤圭洰ID +/// @param fileId 鏂囦欢ID +/// @param completion operation ++ (void)requestGetRecordFileProjectId:(NSString *)projectId + fileId:(NSString *)fileId + completion:(void (^)(id responseObject, NSError *error))completion; + + +/// 鏂板缓椤圭洰鎺ュ彛 +/// @param projectId 椤圭洰ID +/// @param projectName 椤圭洰鍚嶇О +/// @param expireDays 椤圭洰瀛樺偍瀵硅薄杩囨湡澶╂暟 榛樿姘镐笉杩囨湡 +/// @param completion operation ++ (void)requestCreateProjectId:(NSString *)projectId + projectName:(NSString *)projectName + expireDays:(NSInteger )expireDays + completion:(void (^)(bool success, NSError *error))completion; + + + +#pragma mark - 4.16.3 鏂扮殑浼氭帶鎺ュ彛 +/// 棰勮浼氳鎺ュ彛 +/// @param customId 涓绘寔浜虹敤鎴穒d锛堝紑鍙戣�呰嚜瀹氫箟鐨勭敤鎴穒d锛� +/// @param password 鎴块棿瀵嗙爜锛堣嫢涓嶄紶鎴栦负绌哄垯璁や负鎴块棿鍏紑銆佹棤瀵嗙爜锛� +/// @param limit 鎴块棿浜烘暟闄愬埗锛�<100锛屼笉浼犲垯榛樿100锛� +/// @param beginTime 姣鏃堕棿鎴筹紝浼氳棰勮寮�濮嬫椂闂达紙>=褰撳墠鏃堕棿锛� +/// @param endTime 姣鏃堕棿鎴筹紝浼氳棰勮缁撴潫鏃堕棿锛�>beginTime涓�<涓冨ぉ鍚庣殑鏃堕棿鎴筹級 +/// @param completion completion ++ (NSURLSessionDataTask *)orderMeetingWithCustomId:(NSString *)customId + password:(NSString *)password + limit:(NSInteger)limit + beginTime:(long)beginTime + endTime:(long)endTime + completion:(void (^)(int32_t roomId, NSInteger limit, NSError *error))completion; + + + +@end + + + NS_ASSUME_NONNULL_END -- Gitblit v1.8.0