2.0.1

雷浩杰
1 parent e46f2f47
Showing 7 changed files with 16 additions and 29 deletions
CNLivePlayerSDKTest/CNLivePlayerSDK.framework/CNLivePlayerSDK
CNLivePlayerSDKTest/CNLivePlayerSDK.framework/Headers/CNLiveGPUStreamerKit.h
CNLivePlayerSDKTest/CNLivePlayerSDK.framework/Info.plist
CNLivePlayerSDKTest/CNLivePlayerSDKTest.xcodeproj/project.pbxproj
CNLivePlayerSDKTest/CNLivePlayerSDKTest/Streamer/StreamerDetailViewController.m
推流SDK文档.pdf
播放SDK文档.pdf
@@ -39,13 +39,6 @@
                            isHorizontalScreen:(NSString *)isHorizontalScreen;
 /**
- @abstract      获取推流地址
- @warning       请传入所需参数后调用 (若返回失败请重新调用此方法获取推流地址)
- */
-- (void)getStreamerURLWithSuccess:(void (^)(void))success
-                         failure :(void (^)(NSError *error))failure;
-
-/**
  @abstract      活动名称（非必传）
  */
 @property (nonatomic, strong) NSString *activityName;
@@ -7,8 +7,6 @@
 	objects = {
 /* Begin PBXBuildFile section */
-		3228BEAF1D9B969A002E600B /* CNLivePlayerSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3228BEAD1D9B9692002E600B /* CNLivePlayerSDK.framework */; };
-		3228BEB01D9B969A002E600B /* CNLivePlayerSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3228BEAD1D9B9692002E600B /* CNLivePlayerSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		32B4C85A1D9B66A400925AF0 /* CNLiveViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 32B4C8591D9B66A400925AF0 /* CNLiveViewController.m */; };
 		32B4C85D1D9B66E500925AF0 /* StreamerDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 32B4C85C1D9B66E500925AF0 /* StreamerDetailViewController.m */; };
 		32E6CA2B1D5B0AF400B58EBC /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 32E6CA2A1D5B0AF400B58EBC /* main.m */; };
@@ -21,16 +19,18 @@
 		32E6CA921D5B2AF700B58EBC /* NormalViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 32E6CA881D5B2AF700B58EBC /* NormalViewController.m */; };
 		32E6CA931D5B2AF700B58EBC /* PlayerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 32E6CA8A1D5B2AF700B58EBC /* PlayerViewController.m */; };
 		32E6CA951D5B2AF700B58EBC /* StreamerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 32E6CA8F1D5B2AF700B58EBC /* StreamerViewController.m */; };
+		32F437DF1DC9E03300A074BE /* CNLivePlayerSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 32F437DE1DC9E03300A074BE /* CNLivePlayerSDK.framework */; };
+		32F437E11DC9E04900A074BE /* CNLivePlayerSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 32F437DE1DC9E03300A074BE /* CNLivePlayerSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 /* End PBXBuildFile section */
 /* Begin PBXCopyFilesBuildPhase section */
-		32E6CA7A1D5B280B00B58EBC /* Embed Frameworks */ = {
+		32F437E21DC9E04900A074BE /* Embed Frameworks */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				3228BEB01D9B969A002E600B /* CNLivePlayerSDK.framework in Embed Frameworks */,
+				32F437E11DC9E04900A074BE /* CNLivePlayerSDK.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -38,7 +38,6 @@
 /* End PBXCopyFilesBuildPhase section */
 /* Begin PBXFileReference section */
-		3228BEAD1D9B9692002E600B /* CNLivePlayerSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLivePlayerSDK.framework; sourceTree = "<group>"; };
 		32B4C8581D9B66A400925AF0 /* CNLiveViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLiveViewController.h; sourceTree = "<group>"; };
 		32B4C8591D9B66A400925AF0 /* CNLiveViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNLiveViewController.m; sourceTree = "<group>"; };
 		32B4C85B1D9B66E500925AF0 /* StreamerDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StreamerDetailViewController.h; sourceTree = "<group>"; };
@@ -61,6 +60,7 @@
 		32E6CA8A1D5B2AF700B58EBC /* PlayerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PlayerViewController.m; sourceTree = "<group>"; };
 		32E6CA8E1D5B2AF700B58EBC /* StreamerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StreamerViewController.h; sourceTree = "<group>"; };
 		32E6CA8F1D5B2AF700B58EBC /* StreamerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StreamerViewController.m; sourceTree = "<group>"; };
+		32F437DE1DC9E03300A074BE /* CNLivePlayerSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLivePlayerSDK.framework; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 /* Begin PBXFrameworksBuildPhase section */
@@ -68,7 +68,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				3228BEAF1D9B969A002E600B /* CNLivePlayerSDK.framework in Frameworks */,
+				32F437DF1DC9E03300A074BE /* CNLivePlayerSDK.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -78,7 +78,7 @@
 		32E6CA1D1D5B0AF400B58EBC = {
 			isa = PBXGroup;
 			children = (
-				3228BEAD1D9B9692002E600B /* CNLivePlayerSDK.framework */,
+				32F437DE1DC9E03300A074BE /* CNLivePlayerSDK.framework */,
 				32E6CA281D5B0AF400B58EBC /* CNLivePlayerSDKTest */,
 				32E6CA271D5B0AF400B58EBC /* Products */,
 			);
@@ -162,7 +162,7 @@
 				32E6CA221D5B0AF400B58EBC /* Sources */,
 				32E6CA231D5B0AF400B58EBC /* Frameworks */,
 				32E6CA241D5B0AF400B58EBC /* Resources */,
-				32E6CA7A1D5B280B00B58EBC /* Embed Frameworks */,
+				32F437E21DC9E04900A074BE /* Embed Frameworks */,
 			);
 			buildRules = (
 			);
@@ -40,21 +40,12 @@
         NSString *activityId = [NSString stringWithFormat:@"%ld", (long)time];
         _kitCN = [[CNLiveGPUStreamerKit alloc] initWithDefaultConfigWithAppId:@"60_irg1rhs308" appKey:@"4e7a37b27a717a9e9b0a7aea4620ee55ea61fbf923bf46" activityId:activityId channelId:@"iOStest" isHorizontalScreen:@"0"];
-//        _kitCN.activityName = @"iOS test";
-//        _kitCN.coverImgUrl = @"djfiwooa";
-        
-        
-        [_kitCN getStreamerURLWithSuccess:^{
-            
-            [self setStreamerCfg];
-            [self addObservers];
-            
-        } failure:^(NSError *error) {
-            
-            [self toast:[NSString stringWithFormat:@"初始化失败：%@",error.localizedDescription]];
-            
-        }];
+        //推流配置
+        [self setStreamerCfg];
+        [_kitCN startPreview:self.captureView];
+        //推流状态通知
+        [self addObservers];
     }else{
@@ -145,6 +136,9 @@
         [button setTitle:@"停止直播" forState:UIControlStateNormal];
         if (_isAuthLive) {
+#warning 活动附加信息必须在开始推流前设置
+            _kitCN.activityName = @"iOStest";
+            
             [_kitCN startStream:^{
                 NSLog(@"success");
             } failure:^(NSError *error) {