Commit 33855c29 by zhangyunjie

2.5.4.0

parent 4f6ace50
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'OffcnLiveSDKiOS' s.name = 'OffcnLiveSDKiOS'
s.version = '2.5.3.3' s.version = '2.5.4.0'
s.summary = 'OffcnLiveSDKiOS.' s.summary = 'OffcnLiveSDKiOS.'
s.description = <<-DESC s.description = <<-DESC
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
//#import "OffcnShareWindow.h" //#import "OffcnShareWindow.h"
static const NSString *OffcnLiveSDKVersion = @"2.5.3.3"; static const NSString *OffcnLiveSDKVersion = @"2.5.4.0";
@interface OffcnPlaybackModel : NSObject @interface OffcnPlaybackModel : NSObject
//口令 //口令
...@@ -38,7 +38,7 @@ typedef NS_ENUM(NSUInteger, OffcnJumpMode) { ...@@ -38,7 +38,7 @@ typedef NS_ENUM(NSUInteger, OffcnJumpMode) {
typedef void(^liveQuitCallBack)(NSString *password); typedef void(^liveQuitCallBack)(NSString *password);
/** /**
回放观看进度回调 回放观看进度退出房间后回调
@param password 课程口令 @param password 课程口令
@param recentlyWatchValue 最近观看的秒数 @param recentlyWatchValue 最近观看的秒数
...@@ -47,6 +47,7 @@ typedef void(^liveQuitCallBack)(NSString *password); ...@@ -47,6 +47,7 @@ typedef void(^liveQuitCallBack)(NSString *password);
*/ */
typedef void(^playbackCallBack)(NSString *password, NSInteger recentlyWatchValue, CGFloat maxWatchValue, NSInteger totalValue); typedef void(^playbackCallBack)(NSString *password, NSInteger recentlyWatchValue, CGFloat maxWatchValue, NSInteger totalValue);
@interface OffcnLiveSDK : NSObject @interface OffcnLiveSDK : NSObject
/** /**
...@@ -75,7 +76,7 @@ typedef void(^playbackCallBack)(NSString *password, NSInteger recentlyWatchValue ...@@ -75,7 +76,7 @@ typedef void(^playbackCallBack)(NSString *password, NSInteger recentlyWatchValue
//直播间退出房间后回调 //直播间退出房间后回调
@property (nonatomic, copy) liveQuitCallBack offcnLiveQuitCallBack; @property (nonatomic, copy) liveQuitCallBack offcnLiveQuitCallBack;
//回放观看退出房间后进度回调 //回放观看进度退出房间后回调
@property (nonatomic, copy) playbackCallBack offcnPlaybackCallBack; @property (nonatomic, copy) playbackCallBack offcnPlaybackCallBack;
//回放观看过程中进度model(只在观看过程中有数据,退出房间后就被清空了) //回放观看过程中进度model(只在观看过程中有数据,退出房间后就被清空了)
......
...@@ -23,6 +23,7 @@ NS_EXTENSION_UNAVAILABLE_IOS("Camera not available in app extensions.") ...@@ -23,6 +23,7 @@ NS_EXTENSION_UNAVAILABLE_IOS("Camera not available in app extensions.")
@protocol RtcCameraDelegate <NSObject> @protocol RtcCameraDelegate <NSObject>
- (void)onCaptureError; - (void)onCaptureError;
- (void)onScreenshot:(UIImage*) snapshot;
@end @end
@interface RTCCameraVideoCapturer : RTCVideoCapturer @interface RTCCameraVideoCapturer : RTCVideoCapturer
...@@ -58,6 +59,7 @@ NS_EXTENSION_UNAVAILABLE_IOS("Camera not available in app extensions.") ...@@ -58,6 +59,7 @@ NS_EXTENSION_UNAVAILABLE_IOS("Camera not available in app extensions.")
// Stops the capture session asynchronously. // Stops the capture session asynchronously.
- (void)stopCapture; - (void)stopCapture;
- (void)snapshot;
@end @end
NS_ASSUME_NONNULL_END NS_ASSUME_NONNULL_END
...@@ -39,6 +39,7 @@ NS_EXTENSION_UNAVAILABLE_IOS("Rendering not available in app extensions.") ...@@ -39,6 +39,7 @@ NS_EXTENSION_UNAVAILABLE_IOS("Rendering not available in app extensions.")
- (instancetype)initWithCoder:(NSCoder *)aDecoder - (instancetype)initWithCoder:(NSCoder *)aDecoder
shader:(id<RTCVideoViewShading>)shader NS_DESIGNATED_INITIALIZER; shader:(id<RTCVideoViewShading>)shader NS_DESIGNATED_INITIALIZER;
- (UIImage*)snapShot:(BOOL)isPreview;
@end @end
NS_ASSUME_NONNULL_END NS_ASSUME_NONNULL_END
...@@ -21,6 +21,7 @@ static const char *ZGWebrtcVersion = "0.1.20"; ...@@ -21,6 +21,7 @@ static const char *ZGWebrtcVersion = "0.1.20";
- (void)onSendStats:(RTCMediaStats *)stats; - (void)onSendStats:(RTCMediaStats *)stats;
- (void)onRecieveStats:(RTCMediaStats *)stats; - (void)onRecieveStats:(RTCMediaStats *)stats;
- (void)onLogOut:(NSString *)logInfo; - (void)onLogOut:(NSString *)logInfo;
- (void)onSnapshot:(UIImage*)snapshot;
@end @end
@interface RtcFactory : NSObject <RTCPeerConnectionDelegate,RTCVideoViewDelegate,RTCAudioSinkDelegate,RtcCameraDelegate> @interface RtcFactory : NSObject <RTCPeerConnectionDelegate,RTCVideoViewDelegate,RTCAudioSinkDelegate,RtcCameraDelegate>
...@@ -172,6 +173,15 @@ static const char *ZGWebrtcVersion = "0.1.20"; ...@@ -172,6 +173,15 @@ static const char *ZGWebrtcVersion = "0.1.20";
*/ */
- (void)close; - (void)close;
/**
获取camera的截图
*/
- (void)getSnapshot;
- (void)openCameraForSnapshot;
- (void)closeCameraForSnapshot;
@end @end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment