推流状态处理

朱林
1 parent f55b0521
Showing 10 changed files with 194 additions and 64 deletions
CNLivePlayerSDKTest/CNLivePlayerSDK.framework/CNLivePlayerSDK
CNLivePlayerSDKTest/CNLivePlayerSDK.framework/Info.plist
CNLivePlayerSDKTest/CNLivePlayerSDKTest.xcodeproj/project.pbxproj
CNLivePlayerSDKTest/CNLivePlayerSDKTest.xcodeproj/project.xcworkspace/xcuserdata/iOS.xcuserdatad/UserInterfaceState.xcuserstate
CNLivePlayerSDKTest/CNLivePlayerSDKTest.xcodeproj/xcuserdata/iOS.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
CNLivePlayerSDKTest/CNLivePlayerSDKTest.xcodeproj/xcuserdata/iOS.xcuserdatad/xcschemes/CNLivePlayerSDKTest.xcscheme
CNLivePlayerSDKTest/CNLivePlayerSDKTest.xcodeproj/xcuserdata/iOS.xcuserdatad/xcschemes/xcschememanagement.plist
CNLivePlayerSDKTest/CNLivePlayerSDKTest/Streamer/StreamerDetailViewController.m
推流SDK文档.pdf
播放SDK文档.pdf
@@ -7,9 +7,6 @@
 	objects = {
 /* Begin PBXBuildFile section */
-		3236EF121DEEE1C800BF905D /* CNLivePlayerSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3236EF111DEEE1C800BF905D /* CNLivePlayerSDK.framework */; };
-		32ACF8B41DEEE1D4003247CD /* CNLivePlayerSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3236EF111DEEE1C800BF905D /* CNLivePlayerSDK.framework */; };
-		32ACF8B51DEEE1D4003247CD /* CNLivePlayerSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3236EF111DEEE1C800BF905D /* 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 */; };
@@ -22,6 +19,9 @@
 		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 */; };
+		8185C9EC1DF028E000AA83C7 /* CNLivePlayerSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8185C9EB1DF028E000AA83C7 /* CNLivePlayerSDK.framework */; };
+		8185C9ED1DF028E400AA83C7 /* CNLivePlayerSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8185C9EB1DF028E000AA83C7 /* CNLivePlayerSDK.framework */; };
+		8185C9EE1DF028E400AA83C7 /* CNLivePlayerSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 8185C9EB1DF028E000AA83C7 /* CNLivePlayerSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 /* End PBXBuildFile section */
 /* Begin PBXCopyFilesBuildPhase section */
@@ -31,7 +31,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				32ACF8B51DEEE1D4003247CD /* CNLivePlayerSDK.framework in Embed Frameworks */,
+				8185C9EE1DF028E400AA83C7 /* CNLivePlayerSDK.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -39,7 +39,6 @@
 /* End PBXCopyFilesBuildPhase section */
 /* Begin PBXFileReference section */
-		3236EF111DEEE1C800BF905D /* 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>"; };
@@ -62,6 +61,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>"; };
+		8185C9EB1DF028E000AA83C7 /* CNLivePlayerSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLivePlayerSDK.framework; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 /* Begin PBXFrameworksBuildPhase section */
@@ -69,8 +69,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				3236EF121DEEE1C800BF905D /* CNLivePlayerSDK.framework in Frameworks */,
-				32ACF8B41DEEE1D4003247CD /* CNLivePlayerSDK.framework in Frameworks */,
+				8185C9EC1DF028E000AA83C7 /* CNLivePlayerSDK.framework in Frameworks */,
+				8185C9ED1DF028E400AA83C7 /* CNLivePlayerSDK.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -80,7 +80,7 @@
 		32E6CA1D1D5B0AF400B58EBC = {
 			isa = PBXGroup;
 			children = (
-				3236EF111DEEE1C800BF905D /* CNLivePlayerSDK.framework */,
+				8185C9EB1DF028E000AA83C7 /* CNLivePlayerSDK.framework */,
 				32E6CA281D5B0AF400B58EBC /* CNLivePlayerSDKTest */,
 				32E6CA271D5B0AF400B58EBC /* Products */,
 			);
+<?xml version="1.0" encoding="UTF-8"?>
+<Bucket
+   type = "1"
+   version = "2.0">
+</Bucket>
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0810"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "32E6CA251D5B0AF400B58EBC"
+               BuildableName = "CNLivePlayerSDKTest.app"
+               BlueprintName = "CNLivePlayerSDKTest"
+               ReferencedContainer = "container:CNLivePlayerSDKTest.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "32E6CA251D5B0AF400B58EBC"
+            BuildableName = "CNLivePlayerSDKTest.app"
+            BlueprintName = "CNLivePlayerSDKTest"
+            ReferencedContainer = "container:CNLivePlayerSDKTest.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "32E6CA251D5B0AF400B58EBC"
+            BuildableName = "CNLivePlayerSDKTest.app"
+            BlueprintName = "CNLivePlayerSDKTest"
+            ReferencedContainer = "container:CNLivePlayerSDKTest.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "32E6CA251D5B0AF400B58EBC"
+            BuildableName = "CNLivePlayerSDKTest.app"
+            BlueprintName = "CNLivePlayerSDKTest"
+            ReferencedContainer = "container:CNLivePlayerSDKTest.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>CNLivePlayerSDKTest.xcscheme</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+	<key>SuppressBuildableAutocreation</key>
+	<dict>
+		<key>32E6CA251D5B0AF400B58EBC</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+	</dict>
+</dict>
+</plist>
@@ -8,14 +8,21 @@
 #import "StreamerDetailViewController.h"
 #import <CNLivePlayerSDK/CNLiveGPUStreamerKit.h>
+#import "CommonCrypto/CommonDigest.h"
 #define Width [UIScreen mainScreen].bounds.size.width
 #define Height [UIScreen mainScreen].bounds.size.height
+#define kAPPID      @"60_irg1rhs308"
+#define kAPPKEY     @"4e7a37b27a717a9e9b0a7aea4620ee55ea61fbf923bf46"
+
+
 @interface StreamerDetailViewController ()<UIGestureRecognizerDelegate>
 {
     UILabel *_stateLab;
     UIButton *_startLiveBtn;
+    
+    NSString *_activityId;      //用于查询活动状态
 }
 @property (nonatomic,strong) UIView *captureView;
@@ -34,17 +41,16 @@
     if (_isAuthLive) {
-        //用时间戳作为活动id 确保唯一性
-        NSDate *date = [NSDate date];
-        NSInteger time = [date timeIntervalSince1970];
-        NSString *activityId = [NSString stringWithFormat:@"%ld", (long)time];
+        NSString *activityId = [NSString stringWithFormat:@"%d%d%d%d%d",arc4random()%9,arc4random()%9,arc4random()%9,arc4random()%9,arc4random()%9];
+        
+        _activityId = activityId;
-        _kitCN = [[CNLiveGPUStreamerKit alloc] initWithDefaultConfigWithAppId:@"60_irg1rhs308" appKey:@"4e7a37b27a717a9e9b0a7aea4620ee55ea61fbf923bf46" activityId:activityId channelId:@"iOStest" isHorizontalScreen:@"0"];
+        _kitCN = [[CNLiveGPUStreamerKit alloc] initWithDefaultConfigWithAppId:kAPPID appKey:kAPPKEY activityId:activityId channelId:@"iosTest" isHorizontalScreen:@"0"];
+        
+        //        _kitCN.activityName = @"iOS test";
+        //        _kitCN.coverImgUrl = @"djfiwooa";
-        //推流配置
         [self setStreamerCfg];
-        [_kitCN startPreview:self.captureView];
-        //推流状态通知
         [self addObservers];
     }else{
@@ -54,12 +60,14 @@
         [self setStreamerCfg];
         [self addObservers];
-
+        
     }
     _startLiveBtn = [self addButton:@"开始直播" frame:CGRectMake(100, 40, 80, 40) action:@selector(startCapture:)];
+    [_startLiveBtn setTitle:@"开始直播" forState:UIControlStateNormal];
+    [_startLiveBtn setTitle:@"停止直播" forState:UIControlStateSelected];
-    [self addButton:@"开启预览" frame:CGRectMake(10, 40, 80, 40) action:@selector(startPreview:)];
+    [self addButton:@"关闭预览" frame:CGRectMake(10, 40, 80, 40) action:@selector(startPreview:)];
     [self addButton:@"退出" frame:CGRectMake(190, 40, 80, 40) action:@selector(quit)];
@@ -81,6 +89,20 @@
 }
+- (void)addObservers
+{
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(captureStateChange)
+                                                 name:CNLiveCaptureStateDidChangeNotification
+                                               object:nil];
+    
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(streamStateChange)
+                                                 name:CNLiveStreamStateDidChangeNotification
+                                               object:nil];
+    
+}
+
 - (UIButton *)addButton:(NSString*)title
                   frame:(CGRect)frame
                  action:(SEL)action {
@@ -91,6 +113,11 @@
     button.backgroundColor = [UIColor lightGrayColor];
     [button addTarget:self action:action forControlEvents:UIControlEventTouchUpInside];
     button.titleLabel.font = [UIFont systemFontOfSize:15];
+    [button setTitleColor:[UIColor colorWithRed:23/255.0 green:110/255.0 blue:254/255.0 alpha:1] forState:UIControlStateNormal];
+    button.layer.cornerRadius = 10;
+    button.layer.masksToBounds = YES;
+    button.layer.borderColor = [UIColor blackColor].CGColor;
+    button.layer.borderWidth = 1;
     [self.captureView addSubview:button];
     return button;
 }
@@ -107,6 +134,7 @@
     _kitCN.enAutoApplyEstimateBW = YES;
     _kitCN.isOpenImageFilter = YES;
     [_kitCN setVideoOrientationBy:UIInterfaceOrientationPortrait];
+    [_kitCN startPreview:self.captureView];
 }
 #pragma mark - Action
@@ -115,16 +143,17 @@
 {
     button.selected = !button.selected;
     if (button.selected) {
-        [_kitCN startPreview:self.captureView];
-        [button setTitle:@"关闭预览" forState:UIControlStateNormal];
-    }else{
+        _startLiveBtn.enabled = NO;
         [button setTitle:@"开启预览" forState:UIControlStateNormal];
         if (_kitCN.streamState == CNLiveStreamStateConnected) {
             [_kitCN stopStream];
-            [_startLiveBtn setTitle:@"开始直播" forState:UIControlStateNormal];
             _startLiveBtn.selected = NO;
         }
         [_kitCN stopPreview];
+    }else{
+        [_kitCN startPreview:self.captureView];
+        [button setTitle:@"关闭预览" forState:UIControlStateNormal];
+        _startLiveBtn.enabled = YES;
     }
 }
@@ -133,27 +162,21 @@
     button.selected = !button.selected;
     if (button.selected) {
-        [button setTitle:@"停止直播" forState:UIControlStateNormal];
         if (_isAuthLive) {
-#warning 活动附加信息必须在开始推流前设置
-            _kitCN.activityName = @"iOStest";
-            
             [_kitCN startStream:^{
                 NSLog(@"开启推流成功 ------- success");
             } failure:^(NSDictionary *errorDic) {
                 [self toast:errorDic[@"errorMessage"]];
+                _startLiveBtn.selected = NO;
             }];
-
+            
         }else{
             [_kitCN startStream:_hostURL];
         }
     }else{
         _stateLab.text = nil;
-        
         [_kitCN stopStream];
-        
-        [button setTitle:@"开始直播" forState:UIControlStateNormal];
     }
 }
@@ -165,19 +188,19 @@
 - (void)changeCamera:(UIButton *)button
 {
-//    button.selected = !button.selected;
-//    if (button.selected) {
-//        _kitCN.cameraPosition = AVCaptureDevicePositionBack;
-//    }else{
-//        _kitCN.cameraPosition = AVCaptureDevicePositionFront;
-//    }
+    //    button.selected = !button.selected;
+    //    if (button.selected) {
+    //        _kitCN.cameraPosition = AVCaptureDevicePositionBack;
+    //    }else{
+    //        _kitCN.cameraPosition = AVCaptureDevicePositionFront;
+    //    }
     [_kitCN switchCamera];
 }
 - (void)openFlash
 {
     [_kitCN toggleTorch];
-//    [_kitCN setTorchMode:AVCaptureTorchModeOn];
+    //    [_kitCN setTorchMode:AVCaptureTorchModeOn];
 }
 - (void)quit
@@ -192,20 +215,8 @@
     [self dismissViewControllerAnimated:YES completion:NULL];
 }
-- (void)addObservers
-{
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(captureStateChange)
-                                                 name:CNLiveCaptureStateDidChangeNotification
-                                               object:nil];
-    
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(streamStateChange)
-                                                 name:CNLiveStreamStateDidChangeNotification
-                                               object:nil];
-}
-
 #pragma mark - notification
+
 - (void)captureStateChange
 {
@@ -295,7 +306,8 @@
     }
 }
-- (void) onStreamError {
+- (void)onStreamError {
+    
     CNLiveStreamErrorCode err = _kitCN.streamErrorCode;
     if ( CNLiveStreamErrorCode_CNLiveAUTHFAILED == err ) {
@@ -311,14 +323,13 @@
         _stateLab.text = @"Connection break";
     }
     else if ( CNLiveStreamErrorCode_ABNORMAL == err) {
-        _stateLab.text = @"Connection break";
-    }
-    else {
+        _stateLab.text = @"CNLiveStreamErrorCode_ABNORMAL";
         [self toast:@"推流异常中断~~"];
-        NSLog(@"---------推流异常中断~~");
-        [_startLiveBtn setTitle:@"开始直播" forState:UIControlStateNormal];
         _startLiveBtn.selected = NO;
     }
+    else {
+        
+    }
     NSLog(@"onErr: %lu [%@]", (unsigned long) err, _stateLab.text);
     // 断网重连
     if ( CNLiveStreamErrorCode_CONNECT_BREAK == err) {
@@ -332,6 +343,7 @@
                     NSLog(@"开启推流成功 ------- success");
                 } failure:^(NSDictionary *errorDic) {
                     [self toast:errorDic[@"errorMessage"]];
+                    _startLiveBtn.selected = NO;
                 }];
             }else{
@@ -404,13 +416,13 @@
 }
 /*
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
-    // Get the new view controller using [segue destinationViewController].
-    // Pass the selected object to the new view controller.
-}
-*/
+ #pragma mark - Navigation
+ 
+ // In a storyboard-based application, you will often want to do a little preparation before navigation
+ - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+ // Get the new view controller using [segue destinationViewController].
+ // Pass the selected object to the new view controller.
+ }
+ */
 @end