2.5.7.6

Example/OffcnLiveSDKiOS.xcodeproj/project.pbxproj

@@ -249,8 +249,8 @@
 				ORGANIZATIONNAME = "zhangyunjie  ";
 				TargetAttributes = {
 					6003F589195388D20070C39A = {
-						DevelopmentTeam = LA78A3696S;
-						ProvisioningStyle = Manual;
+						DevelopmentTeam = 4P2C5EPJRW;
+						ProvisioningStyle = Automatic;
 					};
 					6003F5AD195388D20070C39A = {
 						TestTargetID = 6003F589195388D20070C39A;
@@ -519,8 +519,9 @@
 			baseConfigurationReference = 93D1E234B11F13A8A49A11EB /* Pods-OffcnLiveSDKiOS_Example.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_STYLE = Manual;
-				DEVELOPMENT_TEAM = LA78A3696S;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = 4P2C5EPJRW;
 				ENABLE_BITCODE = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "OffcnLiveSDKiOS/OffcnLiveSDKiOS-Prefix.pch";
@@ -528,9 +529,9 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MODULE_NAME = ExampleApp;
 				ONLY_ACTIVE_ARCH = NO;
-				PRODUCT_BUNDLE_IDENTIFIER = com.eoffcn.classonline;
+				PRODUCT_BUNDLE_IDENTIFIER = offcn1;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = ClassonlineDev;
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 4.0;
 				WRAPPER_EXTENSION = app;
 			};
@@ -541,17 +542,18 @@
 			baseConfigurationReference = D6184155640B8A41D8A765B9 /* Pods-OffcnLiveSDKiOS_Example.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_STYLE = Manual;
-				DEVELOPMENT_TEAM = LA78A3696S;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = 4P2C5EPJRW;
 				ENABLE_BITCODE = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "OffcnLiveSDKiOS/OffcnLiveSDKiOS-Prefix.pch";
 				INFOPLIST_FILE = "OffcnLiveSDKiOS/OffcnLiveSDKiOS-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MODULE_NAME = ExampleApp;
-				PRODUCT_BUNDLE_IDENTIFIER = com.eoffcn.classonline;
+				PRODUCT_BUNDLE_IDENTIFIER = offcn1;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = ClassonlineDev;
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 4.0;
 				WRAPPER_EXTENSION = app;
 			};

Example/OffcnLiveSDKiOS/iOSAppDelegate.m

@@ -24,13 +24,7 @@
     [self.window makeKeyAndVisible];
     
     //启动SDK
-    [[OffcnLiveSDK defaultService] setupWithAppUrlSchemes:@"zaixianketang" imageType:OffcnImageType_e60012 buttonType:OffcnButtonTypeRadius isTest:YES eventCallBack:^(OffcnSDKEvent event) {
-        
-        if (event == OffcnSDKEventLookCourse) {
-            //查看课程
-        }
-        NSLog(@"eventCallBack:%lu",(unsigned long)event);
-    }];
+    [[OffcnLiveSDK defaultService] setupWithImageType:OffcnImageType_e60012 buttonType:OffcnButtonTypeRadius isTest:YES];
     
     return YES;
 }

Example/OffcnLiveSDKiOS/iOSViewController.m

@@ -30,7 +30,7 @@
     
     [self.view endEditing:YES];
 
-    [[OffcnLiveSDK defaultService] authWithNavigationController:self.navigationController VideoType:OffcnVideoTypeBigClassLive jumpMode:OffcnJumpModePush appName:@"zaixianketang" phone:@"" nickname:self.nameTextField.text password:self.koulingTextField.text uuid:self.uuidTextField.text hook:@"123" documentPath:@"123" extensionDic:[NSDictionary dictionaryWithObject:@"123" forKey:@"123"] playbackSeekTime:0];
+    [[OffcnLiveSDK defaultService] authWithNavigationController:self.navigationController VideoType:OffcnVideoTypeBigClassLive jumpMode:OffcnJumpModePush nickname:self.nameTextField.text password:self.koulingTextField.text uuid:self.uuidTextField.text hook:@"123" documentPath:@"123" extensionDic:[NSDictionary dictionaryWithObject:@"123" forKey:@"123"] playbackSeekTime:0];
     
 //更换某个控件颜色
 //        NSString *colorStr = @"#ff895f";
@@ -39,7 +39,7 @@
 
 #pragma mark - 回放视频事件
 - (IBAction)playBackAction:(UIButton *)sender {
-    [[OffcnLiveSDK defaultService] authWithNavigationController:self.navigationController VideoType:OffcnVideoTypeBigClassPlayback jumpMode:OffcnJumpModePush appName:@"zaixianketang" phone:@"" nickname:self.nameTextField.text password:self.koulingTextField.text uuid:self.uuidTextField.text hook:@"123" documentPath:@"123" extensionDic:[NSDictionary dictionaryWithObject:@"123" forKey:@"123"] playbackSeekTime:0];
+    [[OffcnLiveSDK defaultService] authWithNavigationController:self.navigationController VideoType:OffcnVideoTypeBigClassPlayback jumpMode:OffcnJumpModePush  nickname:self.nameTextField.text password:self.koulingTextField.text uuid:self.uuidTextField.text hook:@"123" documentPath:@"123" extensionDic:[NSDictionary dictionaryWithObject:@"123" forKey:@"123"] playbackSeekTime:0];
 }
 
 - (void)viewDidLoad {

Example/Podfile

 use_frameworks!
 
-platform :ios, '8.0'
+platform :ios, '9.0'
 
 target 'OffcnLiveSDKiOS_Example' do
   pod 'OffcnLiveSDKiOS', :path => '../'

OffcnLiveSDKiOS.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'OffcnLiveSDKiOS'
-  s.version          = '2.5.9.5'
+  s.version          = '2.5.7.6'
   s.summary          = 'OffcnLiveSDKiOS.'
 
   s.description      = <<-DESC

OffcnLiveSDKiOS/Classes/OffcnLiveSDK.h

@@ -7,12 +7,9 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "OffcnShareWindow.h"
+//#import "OffcnShareWindow.h"
 
-static const NSString *OffcnLiveSDKVersion = @"2.5.9.5";
-
-//事件通知
-#define kOffcnEventNotification @"kOffcnEventNotification"
+static const NSString *OffcnLiveSDKVersion = @"2.5.7.6";
 
 @interface OffcnPlaybackModel : NSObject
 //口令
@@ -54,10 +51,6 @@ typedef NS_ENUM(NSUInteger, OffcnSDKReachabilityStatus) {
     OffcnSDKReachabilityStatusViaWiFi,
 };
 
-typedef NS_ENUM(NSUInteger, OffcnSDKEvent) {
-    OffcnSDKEventLookCourse = 1, //查看课程
-};
-
 //直播间退出房间后回调
 typedef void(^liveQuitCallBack)(NSString *password);
 
@@ -74,9 +67,6 @@ typedef void(^playbackCallBack)(NSString *password, NSInteger recentlyWatchValue
 //网络监听回调
 typedef void(^OffcnSDKReachabilityStatusCallBack)(OffcnSDKReachabilityStatus status);
 
-//事件回调
-typedef void(^OffcnSDKEventCallBack)(OffcnSDKEvent event);
-
 
 @interface OffcnLiveSDK : NSObject
 
@@ -88,12 +78,7 @@ typedef void(^OffcnSDKEventCallBack)(OffcnSDKEvent event);
 + (OffcnLiveSDK *)defaultService;
 
 //共享窗口
-@property (nonatomic, strong) OffcnShareWindow *shareWindow;
-@property (nonatomic, assign) BOOL isSmallWindow;
-@property (nonatomic, assign) CGRect shareWindowFrame;
-@property (nonatomic, strong) UIWindow *KKeyWindow;//获取自定义window
-@property (nonatomic, strong) UIWindow *oldKKeyWindow;//三方的window
-@property (nonatomic, strong) UIViewController *shareVC;
+//@property (nonatomic,strong) OffcnShareWindow *shareWindow;
 
 //是否支持全屏
 @property (nonatomic, assign) BOOL isFull;
@@ -112,7 +97,6 @@ typedef void(^OffcnSDKEventCallBack)(OffcnSDKEvent event);
 @property (nonatomic, assign) OffcnSDKReachabilityStatus OffcnReachabilityStatus;
 @property (nonatomic, copy) OffcnSDKReachabilityStatusCallBack reachabilityStatusCallBack;
 
-
 //是否选用测试环境
 @property (nonatomic, assign) BOOL isTest;
 //选用图片类型
@@ -124,12 +108,10 @@ typedef void(^OffcnSDKEventCallBack)(OffcnSDKEvent event);
 
 
 /// 启动sdk
-/// @param appUrlSchemes app设置的UrlSchemes
 /// @param imageType 主色调类型
 /// @param buttonType 按钮样式
 /// @param isTest 是否选用测试环境
-/// @param callBack 事件回调
--(void)setupWithAppUrlSchemes:(NSString *)appUrlSchemes imageType:(OffcnImageType)imageType buttonType:(OffcnButtonType)buttonType isTest:(BOOL)isTest eventCallBack:(OffcnSDKEventCallBack)callBack;
+-(void)setupWithImageType:(OffcnImageType)imageType buttonType:(OffcnButtonType)buttonType isTest:(BOOL)isTest;
 
 /**
  登录授权
@@ -137,8 +119,6 @@ typedef void(^OffcnSDKEventCallBack)(OffcnSDKEvent event);
  @param navigationController 导航控制器
  @param videoType 观看模式是：大班课直播/大班课回放/小班课直播(注:小班课目前只传OffcnVideoTypeSmallClassLive)
  @param jumpMode 跳转方式：Push/Present(注:小班课只传OffcnJumpModePresent)
- @param appName app名字拼音
- @param phone 手机号
  @param nickname 昵称
  @param password 不同课程的学生口令
  @param uuid 用户唯一标识码
@@ -150,8 +130,6 @@ typedef void(^OffcnSDKEventCallBack)(OffcnSDKEvent event);
 -(void)authWithNavigationController:(UINavigationController *)navigationController
             VideoType:(OffcnVideoType)videoType
             jumpMode:(OffcnJumpMode)jumpMode
-            appName:(NSString *)appName
-            phone:(NSString *)phone
             nickname:(NSString *)nickname
             password:(NSString *)password
             uuid:(NSString *)uuid
@@ -163,8 +141,6 @@ typedef void(^OffcnSDKEventCallBack)(OffcnSDKEvent event);
 -(void)authWithNavigationController:(UINavigationController *)navigationController
             VideoType:(OffcnVideoType)videoType
             jumpMode:(OffcnJumpMode)jumpMode
-            appName:(NSString *)appName
-            phone:(NSString *)phone
             nickname:(NSString *)nickname
             password:(NSString *)password
             uuid:(NSString *)uuid
@@ -175,10 +151,7 @@ typedef void(^OffcnSDKEventCallBack)(OffcnSDKEvent event);
 /**
  *  resignKeyWindow，并还原到上一次的keyWindow
  */
-- (void)recoverLastKeyWindow;
-
-//关闭小窗口
--(void)closeShareWindow;
+//- (void)recoverLastKeyWindow;
 
 //开启,关闭日志
 -(void)setEnableLog:(BOOL)enable;

OffcnLiveSDKiOS/Frameworks/WebRTC.framework/Headers/RTCSessionDescription+JSON.m

+/*
+ *  Copyright 2014 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#import "RTCSessionDescription+JSON.h"
+
+static NSString const *kRTCSessionDescriptionTypeKey = @"path";
+static NSString const *kRTCSessionDescriptionSdpKey = @"sdp";
+
+@implementation RTCSessionDescription (JSON)
+
++ (RTCSessionDescription *)descriptionFromJSONDictionary:
+    (NSDictionary *)dictionary {
+  NSString *typeString = dictionary[kRTCSessionDescriptionTypeKey];
+  //typeString = [typeString stringByReplacingOccurrencesOfString:@"rtcserver/" withString:@""];
+  RTCSdpType type = [[self class] typeForString:typeString];
+  NSString *sdp = dictionary[kRTCSessionDescriptionSdpKey];
+  return [[RTCSessionDescription alloc] initWithType:type sdp:sdp];
+}
+
+- (NSData *)JSONData {
+  NSString *type = [[self class] stringForType:self.type];
+  NSDictionary *json = @{
+    kRTCSessionDescriptionTypeKey : type,
+    kRTCSessionDescriptionSdpKey : self.sdp
+  };
+  return [NSJSONSerialization dataWithJSONObject:json options:0 error:nil];
+}
+
+@end

OffcnLiveSDKiOS/Frameworks/WebRTC.framework/Headers/RtcConnection.m

+#import "RtcConnection.h"
+
+
+@implementation RtcConnection
+
+
+@end

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

@@ -112,9 +112,6 @@ static const char *ZGWebrtcVersion = "0.1.20";
  */
 - (void)stopPull:(NSString *)handleId streamID:(NSString *)streamID;
 
-/// 是否正在推流
--(bool)isPushing;
-
 /**
  停止本地推流
  */

OffcnLiveSDKiOS/Frameworks/WebRTC.framework/Headers/RtcHandle.m

+#import "RtcHandle.h"
+
+@implementation RtcHandle
+
+
+@end

OffcnLiveSDKiOS/Frameworks/WebRTC.framework/Headers/RtcTransaction.m

+#import "RtcTransaction.h"
+
+@implementation RtcTransaction
+
+@end