2706

Example/Podfile

@@ -4,6 +4,7 @@ platform :ios, '9.0'
 
 target 'OffcnLiveSDKiOS_Example' do
   pod 'OffcnLiveSDKiOS', :path => '../'
+  
 
   target 'OffcnLiveSDKiOS_Tests' do
     inherit! :search_paths

OffcnLiveSDKiOS.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'OffcnLiveSDKiOS'
-  s.version          = '2.7.0.5'
+  s.version          = '2.7.0.6'
   s.summary          = 'OffcnLiveSDKiOS.'
 
   s.description      = <<-DESC
@@ -41,6 +41,22 @@ TODO: Add long description of the pod here.
   
   s.user_target_xcconfig = {'OTHER_LDFLAGS' => '-ObjC'}
   
-  #dependency : 该pod依赖的pod
+  
+  
+#  s.subspec 'OffcnVideoView' do |category|
+#    category.source_files = 'OffcnLiveSDKiOS/Classes/OffcnVideoView.h'
+#    category.public_header_files = 'OffcnLiveSDKiOS/Classes/OffcnVideoView.h'
+#
+#    #vendored_frameworks: 第三方framework
+#    category.vendored_frameworks = ['OffcnLiveSDKiOS/Frameworks/ZGIJKMediaFramework.framework']
+#
+#    #frameworks: 该pod依赖的系统framework
+#    category.frameworks = 'CFNetwork', 'CoreFoundation', 'CoreData', 'Foundation', 'AudioToolbox', 'AVFoundation', 'CoreGraphics', 'CoreMedia', 'CoreVideo', 'MediaPlayer', 'MobileCoreServices', 'OpenGLES', 'QuartzCore', 'UIKit', 'VideoToolbox', 'SystemConfiguration', 'CoreTelephony', 'CoreText', 'ImageIO', 'MapKit'
+#    #libraries: 该pod依赖的系统library
+#    category.libraries = 'c++','bz2','z','xml2','sqlite3','xml2','resolv'
+#    category.resource = 'OffcnLiveSDKiOS/Resources/*.bundle'
+#    category.user_target_xcconfig = {'OTHER_LDFLAGS' => '-ObjC'}
+#  end
+
 end
 

OffcnLiveSDKiOS/Classes/OffcnLiveSDK.h

@@ -9,7 +9,7 @@
 #import <UIKit/UIKit.h>
 #import "OffcnShareWindow.h"
 
-static const NSString *OffcnLiveSDKVersion = @"2.7.0.5";
+static const NSString *OffcnLiveSDKVersion = @"2.7.0.6";
 
 //事件通知
 #define kOffcnEventNotification @"kOffcnEventNotification"

OffcnLiveSDKiOS/Classes/OffcnVideoView.h

@@ -39,11 +39,13 @@ typedef void(^windowRotationCallBack)(UIInterfaceOrientation interfaceOrientatio
 
 @property (nonatomic, copy) recentlyWatchCallBack recentlyWatchCallBack;//回放观看进度回调
 
+@property (nonatomic, copy) void(^returnBtnActionCallBack)(UIInterfaceOrientation interfaceOrientation, NSInteger recentlyWatchValue, NSInteger totalValue);//返回按钮回调
+
+
+//暂不支持
 @property (nonatomic, assign) UIInterfaceOrientation interfaceOrientation;//竖横屏
 
 @property (nonatomic, copy) windowRotationCallBack windowRotationCallBack;//窗口旋转回调
-
-@property (nonatomic, copy) void(^returnBtnActionCallBack)(UIInterfaceOrientation interfaceOrientation, NSInteger recentlyWatchValue, NSInteger totalValue);//返回按钮回调
 @end
 
 

OffcnLiveSDKiOS/Frameworks/WebRTC.framework/Headers/P2PFactory.h

-#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
-

OffcnLiveSDKiOS/Frameworks/WebRTC.framework/Headers/RTCAudioTrack.h

@@ -28,6 +28,7 @@ RTC_OBJC_EXPORT
 - (void)addAudioSink:(RTCAudioSink*) audioSink;
 - (void)removeAudioSink;
 - (void)setVolume:(double)volume;
+
 @end
 
 NS_ASSUME_NONNULL_END

OffcnLiveSDKiOS/Frameworks/WebRTC.framework/Headers/RtcDefined.h

@@ -24,3 +24,4 @@ typedef NS_ENUM(NSInteger, ClassMode) {
     CLASS_BIG,
     CLASS_SMALL
 };
+