Commit a82bb69f by zhangyunjie

2709

parent 1880fb7a
...@@ -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.7.0.8' s.version = '2.7.0.9'
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.7.0.8"; static const NSString *OffcnLiveSDKVersion = @"2.7.0.9";
//事件通知 //事件通知
#define kOffcnEventNotification @"kOffcnEventNotification" #define kOffcnEventNotification @"kOffcnEventNotification"
......
#import <Foundation/Foundation.h>
#import "WebRTC.h"
#import "RTCMacros.h"
#define USER_LOCAL @"local"
#define USER_REMOTE @"remote"
static const char *ZGWebrtcVersion = "0.1.20";
@protocol P2PFactoryDelegate <NSObject>
- (void)onCreateView:(RTCEAGLVideoView*)view
type:(NSString*)userType;
- (void)onCreateSdp:(NSString*)type
sdp:(RTCSessionDescription *)sdp;
- (void)onCreateCandidate:(RTCIceCandidate *)candidate;
- (void)onCreateRemoteUser:(NSString *)userID;
@optional
- (void)onViewSizeChanged:(RTCEAGLVideoView *)videoView streamID:(NSString*)streamID didChangeVideoSize:(CGSize)size;
- (void)onVolumeChanged:(NSString*)userID didChangeVolume:(unsigned short)volume;
- (void)onIceState:(RTCIceConnectionState)state userID:(NSString *)userID streamID:(NSString*)streamID clientType:(ClientType)clientType;
- (void)onOpenCameraFailed;
- (void)onSendStats:(RTCMediaStats *)stats;
- (void)onRecieveStats:(RTCMediaStats *)stats;
- (void)onLogOut:(NSString *)logInfo;
- (void)onSnapshot:(UIImage*)snapshot;
@end
@interface P2PFactory : NSObject <RTCPeerConnectionDelegate,RTCVideoViewDelegate,RTCAudioSinkDelegate>
- (instancetype)init;
@property(nonatomic, weak) id<P2PFactoryDelegate> delegate;
@property(nonatomic, copy) NSString* remoteUserID;
/**
创建推流用户
@param userID 推流用户ID
*/
- (void)setPublisher:(NSString *)userID isCalled:(BOOL)bCalled;
/**
推流用户设置服务器sdp
@param jsep 远程服务器sdp信息
*/
- (void)setRemoteAnswer:(NSDictionary *)jsep;
/**
订阅用户设置远程推流用户
@param userID 远程用户ID
*/
- (void)setRemoteCall: (NSString *)userID;
/**
订阅用户设置远程sdp
@param jsep 远程sdp
*/
- (void)setRemoteOffer:(NSDictionary *)jsep;
/**
订阅用户设置远程candidate
@param candidate 远程candidate
*/
- (void)setRemoteCandidate:(NSDictionary *)candidate;
/**
停止本地推流
*/
- (void)stopPublish;
/**
切换摄像头
*/
- (void)switchCamera;
/**
播放
*/
- (void)play;
/**
暂停
*/
- (void)pause;
/**
关闭连麦
*/
- (void)close;
/**
开启关闭日志功能 true打开,false 关闭
*/
-(void)logOutput:(BOOL)logEnable;
@end
...@@ -28,7 +28,6 @@ RTC_OBJC_EXPORT ...@@ -28,7 +28,6 @@ RTC_OBJC_EXPORT
- (void)addAudioSink:(RTCAudioSink*) audioSink; - (void)addAudioSink:(RTCAudioSink*) audioSink;
- (void)removeAudioSink; - (void)removeAudioSink;
- (void)setVolume:(double)volume; - (void)setVolume:(double)volume;
@end @end
NS_ASSUME_NONNULL_END NS_ASSUME_NONNULL_END
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
...@@ -12,5 +12,6 @@ ...@@ -12,5 +12,6 @@
@property (readwrite, nonatomic) RTCEAGLVideoView *videoView; @property (readwrite, nonatomic) RTCEAGLVideoView *videoView;
@property (readwrite, nonatomic) RTCAudioTrack *audioTrack; @property (readwrite, nonatomic) RTCAudioTrack *audioTrack;
@property (readwrite, nonatomic) NSString *receive_video; @property (readwrite, nonatomic) NSString *receive_video;
@property (readwrite, nonatomic) BOOL bCheck;
@end @end
...@@ -24,4 +24,3 @@ typedef NS_ENUM(NSInteger, ClassMode) { ...@@ -24,4 +24,3 @@ typedef NS_ENUM(NSInteger, ClassMode) {
CLASS_BIG, CLASS_BIG,
CLASS_SMALL CLASS_SMALL
}; };
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
No preview for this file type
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