2.0.5 log日志，播放崩溃修复，心跳

雷浩杰
1 parent 2db7eab9
Showing 8 changed files with 21 additions and 10 deletions
CNLivePlayerSDKTest/CNLivePlayerSDK.framework/CNLivePlayerSDK
CNLivePlayerSDKTest/CNLivePlayerSDK.framework/Headers/CNLiveGPUStreamerKit.h
CNLivePlayerSDKTest/CNLivePlayerSDK.framework/Headers/CNLiveMoviePlayerController.h
CNLivePlayerSDKTest/CNLivePlayerSDK.framework/Info.plist
CNLivePlayerSDKTest/CNLivePlayerSDKTest.xcodeproj/project.pbxproj
CNLivePlayerSDKTest/CNLivePlayerSDKTest/Streamer/StreamerDetailViewController.m
推流SDK文档.pdf
播放SDK文档.pdf
@@ -39,6 +39,12 @@
                            isHorizontalScreen:(NSString *)isHorizontalScreen;
  
 /**
+ @abstract      是否开启控制台输出日志
+ @discussion    默认为开启
+ */
+@property (nonatomic, assign) BOOL logPrintEnable;
+
+/**
  @abstract      活动名称（非必传）
  */
 @property (nonatomic, strong) NSString *activityName;
@@ -224,20 +230,20 @@
 /**
  @abstract      采集设备状态
  */
-@property (nonatomic, assign) CNLiveCaptureState captureState;
+@property (nonatomic, readonly) CNLiveCaptureState captureState;
  
 FOUNDATION_EXPORT NSString *const CNLiveCaptureStateDidChangeNotification NS_AVAILABLE_IOS(7_0);
  
 /**
  @abstract      推流状态
  */
-@property (nonatomic, assign) CNLiveStreamState streamState;
+@property (nonatomic, readonly) CNLiveStreamState streamState;
  
 FOUNDATION_EXPORT NSString *const CNLiveStreamStateDidChangeNotification NS_AVAILABLE_IOS(7_0);
  
 /**
  * @abstract    推流错误码，用于指示推流失败的原因
  */
-@property (nonatomic, assign) CNLiveStreamErrorCode streamErrorCode;
+@property (nonatomic, readonly) CNLiveStreamErrorCode streamErrorCode;
  
 @end
@@ -50,6 +50,11 @@
                           authSuccess:(void(^)(void))authSuccessBlock
                            authFailed:(void(^)(NSDictionary *errorInfo))authFailedBlock;
  
+/*
+ * 是否开启控制台输出日志（默认YES）
+ */
+@property (nonatomic, assign) BOOL logPrintEnable;
+
 /* 切换视角和码率
  *
  * 调用此方法会获取视频的不同视角或码率，并重新加载视频（获取视频的不同视角或码率需要一定的时间，在这段时间内，播放器不会停止播放，建议将播放器设为暂停状态(pause)，并展示加载视频时的UI）
@@ -7,8 +7,8 @@
 	objects = {
  
 /* Begin PBXBuildFile section */
-		32ADA40C1DF91D5800B4585A /* CNLivePlayerSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 32ADA40A1DF91D5400B4585A /* CNLivePlayerSDK.framework */; };
-		32ADA40D1DF91D5800B4585A /* CNLivePlayerSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 32ADA40A1DF91D5400B4585A /* CNLivePlayerSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		3238FD4F1DFABEEE00377CA4 /* CNLivePlayerSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3238FD4E1DFABEEE00377CA4 /* CNLivePlayerSDK.framework */; };
+		3238FD511DFABEF100377CA4 /* CNLivePlayerSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3238FD4E1DFABEEE00377CA4 /* 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 */; };
@@ -30,7 +30,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				32ADA40D1DF91D5800B4585A /* CNLivePlayerSDK.framework in Embed Frameworks */,
+				3238FD511DFABEF100377CA4 /* CNLivePlayerSDK.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -38,7 +38,7 @@
 /* End PBXCopyFilesBuildPhase section */
  
 /* Begin PBXFileReference section */
-		32ADA40A1DF91D5400B4585A /* CNLivePlayerSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLivePlayerSDK.framework; sourceTree = "<group>"; };
+		3238FD4E1DFABEEE00377CA4 /* 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>"; };
@@ -68,7 +68,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				32ADA40C1DF91D5800B4585A /* CNLivePlayerSDK.framework in Frameworks */,
+				3238FD4F1DFABEEE00377CA4 /* CNLivePlayerSDK.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -78,7 +78,7 @@
 		32E6CA1D1D5B0AF400B58EBC = {
 			isa = PBXGroup;
 			children = (
-				32ADA40A1DF91D5400B4585A /* CNLivePlayerSDK.framework */,
+				3238FD4E1DFABEEE00377CA4 /* CNLivePlayerSDK.framework */,
 				32E6CA281D5B0AF400B58EBC /* CNLivePlayerSDKTest */,
 				32E6CA271D5B0AF400B58EBC /* Products */,
 			);
@@ -45,7 +45,7 @@
  
         _activityId = activityId;
  
-        _kitCN = [[CNLiveGPUStreamerKit alloc] initWithDefaultConfigWithAppId:kAPPID appKey:kAPPKEY activityId:activityId channelId:@"iosTest" isHorizontalScreen:@"0"];
+        _kitCN = [[CNLiveGPUStreamerKit alloc] initWithDefaultConfigWithAppId:kAPPID appKey:kAPPKEY activityId:activityId channelId:@"test001" isHorizontalScreen:@"0"];
  
         //        _kitCN.activityName = @"iOS test";
         //        _kitCN.coverImgUrl = @"djfiwooa";