no message

雷浩杰
1 parent 5f6e63d2
Showing 8 changed files with 50 additions and 74 deletions
CNLivePlayerSDKTest/CNLivePlayerSDK.framework/CNLivePlayerSDK
CNLivePlayerSDKTest/CNLivePlayerSDK.framework/Headers/CNLiveGPUStreamerKit.h
CNLivePlayerSDKTest/CNLivePlayerSDK.framework/Headers/CNLiveTypeDef.h
CNLivePlayerSDKTest/CNLivePlayerSDK.framework/Info.plist
CNLivePlayerSDKTest/CNLivePlayerSDKTest.xcodeproj/project.pbxproj
CNLivePlayerSDKTest/CNLivePlayerSDKTest/Streamer/StreamerDetailViewController.m
推流SDK文档.pdf
播放SDK文档.pdf
@@ -82,24 +82,7 @@
  @abstract      启动推流
  @warning       鉴权成功后开启推流
  */
-- (void) startStream:(void (^)(void))success  failure:(void (^)(NSError *error))failure;
-
-/**
- @abstract      推流过程中异常通知
- */
-FOUNDATION_EXPORT NSString *const CNLiveStreamAbnormalNotification NS_AVAILABLE_IOS(7_0);
-
-/**
- @abstract      结束推流成功
- */
-FOUNDATION_EXPORT NSString *const CNLiveStreamStopSuccessNotification NS_AVAILABLE_IOS(7_0);
-
-/**
- @abstract      结束推流失败
- */
-FOUNDATION_EXPORT NSString *const CNLiveStreamStopFailedNotification NS_AVAILABLE_IOS(7_0);
-
-
+- (void) startStream:(void (^)(void))successBlock  failure:(void (^)(NSDictionary *errorDic))failureBlock;
 #pragma mark - 普通推流
@@ -82,6 +82,10 @@ typedef NS_ENUM(NSUInteger, CNLiveStreamState) {
     CNLiveStreamStateDisconnecting,
     /// 推流出错
     CNLiveStreamStateError,
+    /// 结束推流成功
+    CNLiveStopStreamSuccess,
+    /// 结束推流失败
+    CNLiveStopStreamFailure,
 };
 /*!
@@ -124,6 +128,8 @@ typedef NS_ENUM(NSUInteger, CNLiveStreamErrorCode) {
     CNLiveStreamErrorCode_FRAMES_THRESHOLD,
     /// 没有输入的数据，无法开始推流
     CNLiveStreamErrorCode_NO_INPUT_SAMPLE,
+    /// 异常
+    CNLiveStreamErrorCode_ABNORMAL,
 };
 #endif /* CNLiveTypeDef_h */
@@ -7,6 +7,9 @@
 	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 */; };
@@ -19,8 +22,6 @@
 		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 */
@@ -30,7 +31,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				32F437E11DC9E04900A074BE /* CNLivePlayerSDK.framework in Embed Frameworks */,
+				32ACF8B51DEEE1D4003247CD /* CNLivePlayerSDK.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -38,6 +39,7 @@
 /* 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>"; };
@@ -60,7 +62,6 @@
 		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 +69,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				32F437DF1DC9E03300A074BE /* CNLivePlayerSDK.framework in Frameworks */,
+				3236EF121DEEE1C800BF905D /* CNLivePlayerSDK.framework in Frameworks */,
+				32ACF8B41DEEE1D4003247CD /* CNLivePlayerSDK.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -78,7 +80,7 @@
 		32E6CA1D1D5B0AF400B58EBC = {
 			isa = PBXGroup;
 			children = (
-				32F437DE1DC9E03300A074BE /* CNLivePlayerSDK.framework */,
+				3236EF111DEEE1C800BF905D /* CNLivePlayerSDK.framework */,
 				32E6CA281D5B0AF400B58EBC /* CNLivePlayerSDKTest */,
 				32E6CA271D5B0AF400B58EBC /* Products */,
 			);
@@ -140,9 +140,9 @@
             _kitCN.activityName = @"iOStest";
             [_kitCN startStream:^{
-                NSLog(@"success");
-            } failure:^(NSError *error) {
-                [self toast:error.localizedDescription];
+                NSLog(@"开启推流成功 ------- success");
+            } failure:^(NSDictionary *errorDic) {
+                [self toast:errorDic[@"errorMessage"]];
             }];
         }else{
@@ -203,55 +203,27 @@
                                              selector:@selector(streamStateChange)
                                                  name:CNLiveStreamStateDidChangeNotification
                                                object:nil];
-    
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(abnormalState)
-                                                 name:CNLiveStreamAbnormalNotification
-                                               object:nil];
-    
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(streamStopSuccess)
-                                                 name:CNLiveStreamStopSuccessNotification
-                                               object:nil];
-    
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(streamStopFailed)
-                                                 name:CNLiveStreamStopFailedNotification
-                                               object:nil];
 }
 #pragma mark - notification
-- (void)streamStopSuccess
-{
-    NSLog(@"---------CNLiveStreamStopSuccess");
-}
-
-- (void)streamStopFailed
-{
-    NSLog(@"---------CNLiveStreamStopFailed");
-}
-
 - (void)captureStateChange
 {
     if ( _kitCN.captureState == CNLiveCaptureStateIdle){
         //初始化时状态为空闲
-        NSLog(@"---------CNLiveCaptureStateIdle");
-        _stateLab.text = @"idle";
+        _stateLab.text = @"CNLiveCaptureStateIdle";
         return;
     }
     else if (_kitCN.captureState == CNLiveCaptureStateCapturing ) {
         //设备工作中
-        NSLog(@"---------CNLiveCaptureStateCapturing");
-        _stateLab.text = @"capturing";
+        _stateLab.text = @"CNLiveCaptureStateCapturing";
         return;
     }
     else if (_kitCN.captureState == CNLiveCaptureStateClosingCapture ) {
         //关闭采集设备中
-        NSLog(@"---------CNLiveCaptureStateClosingCapture");
-        _stateLab.text = @"closing capture";
+        _stateLab.text = @"CNLiveCaptureStateClosingCapture";
         return;
     }
@@ -279,19 +251,20 @@
 - (void)streamStateChange
 {
+    
     if (_kitCN.streamState == CNLiveStreamStateIdle) {
         NSLog(@"---------CNLiveStreamStateIdle");
-        _stateLab.text = @"idle";
+        _stateLab.text = @"CNLiveStreamStateIdle";
     }
     if (_kitCN.streamState == CNLiveStreamStateConnected) {
         NSLog(@"---------CNLiveStreamStateConnected");
-        _stateLab.text = [NSString stringWithFormat:@"connected------%@",_hostURL];
+        _stateLab.text = [NSString stringWithFormat:@"CNLiveStreamStateConnected------%@",_hostURL];
     }
     if (_kitCN.streamState == CNLiveStreamStateConnecting) {
         NSLog(@"---------CNLiveStreamStateConnecting");
-        _stateLab.text = @"kit connecting";
+        _stateLab.text = @"CNLiveStreamStateConnecting";
     }
     //推流出错
@@ -303,7 +276,21 @@
     //断开推流
     if ( _kitCN.streamState == CNLiveStreamStateDisconnecting) {
         NSLog(@"---------CNLiveStreamStateDisconnecting");
-        _stateLab.text = @"disconnecting";
+        _stateLab.text = @"CNLiveStreamStateDisconnecting";
+        
+    }
+    
+    //结束推流成功
+    if ( _kitCN.streamState == CNLiveStopStreamSuccess) {
+        NSLog(@"---------CNLiveStopStreamSuccess");
+        _stateLab.text = @"CNLiveStopStreamSuccess";
+        
+    }
+    
+    //结束推流成功
+    if ( _kitCN.streamState == CNLiveStopStreamFailure) {
+        NSLog(@"---------CNLiveStopStreamSuccess");
+        _stateLab.text = @"CNLiveStopStreamFailure";
     }
 }
@@ -323,8 +310,14 @@
     else if ( CNLiveStreamErrorCode_CONNECT_BREAK == err) {
         _stateLab.text = @"Connection break";
     }
+    else if ( CNLiveStreamErrorCode_ABNORMAL == err) {
+        _stateLab.text = @"Connection break";
+    }
     else {
-        
+        [self toast:@"推流异常中断~~"];
+        NSLog(@"---------推流异常中断~~");
+        [_startLiveBtn setTitle:@"开始直播" forState:UIControlStateNormal];
+        _startLiveBtn.selected = NO;
     }
     NSLog(@"onErr: %lu [%@]", (unsigned long) err, _stateLab.text);
     // 断网重连
@@ -336,9 +329,9 @@
             if (_isAuthLive) {
                 [_kitCN startStream:^{
-                    NSLog(@"success");
-                } failure:^(NSError *error) {
-                    [self toast:error.localizedDescription];
+                    NSLog(@"开启推流成功 ------- success");
+                } failure:^(NSDictionary *errorDic) {
+                    [self toast:errorDic[@"errorMessage"]];
                 }];
             }else{
@@ -348,14 +341,6 @@
     }
 }
-- (void)abnormalState
-{
-    [self toast:@"推流异常中断~~"];
-    NSLog(@"---------推流异常中断~~");
-    [_startLiveBtn setTitle:@"开始直播" forState:UIControlStateNormal];
-    _startLiveBtn.selected = NO;
-}
-
 //对焦
 - (void)onTap:(UIGestureRecognizer *)sender
 {