推流核心类添加退出并销毁方法

朱林
1 parent 8b402f34
Showing 10 changed files with 29 additions and 16 deletions
CNLivePlayerSDKTest/CNLivePlayerSDK.framework/CNLivePlayerSDK
CNLivePlayerSDKTest/CNLivePlayerSDK.framework/Headers/CNLiveGPUStreamerKit.h
CNLivePlayerSDKTest/CNLivePlayerSDK.framework/Info.plist
CNLivePlayerSDKTest/CNLivePlayerSDKTest.xcodeproj/project.pbxproj
CNLivePlayerSDKTest/CNLivePlayerSDKTest/AppDelegate.m
CNLivePlayerSDKTest/CNLivePlayerSDKTest/Player/CNLiveViewController.m
CNLivePlayerSDKTest/CNLivePlayerSDKTest/Streamer/StreamerDetailViewController.m
发布版SDK/CNLivePlayerSDK.framework/CNLivePlayerSDK
发布版SDK/CNLivePlayerSDK.framework/Headers/CNLiveGPUStreamerKit.h
发布版SDK/CNLivePlayerSDK.framework/Info.plist
@@ -248,6 +248,12 @@ FOUNDATION_EXPORT NSString *const CNLiveStreamStateDidChangeNotification NS_AVAI
  */
 - (void) appBecomeActive;
+/**
+ @abstract   销毁推流核心类
+ @discussion 退出页面时调用此方法以销毁推流推流对象
+ */
+- (void)cleanKit;
+
 #pragma mark -  mirror & rotate
 /**
@@ -290,4 +296,5 @@ FOUNDATION_EXPORT NSString *const CNLiveStreamStateDidChangeNotification NS_AVAI
  */
 @property (nonatomic, assign)   CGFloat pinchZoomFactor;
+
 @end
@@ -25,8 +25,8 @@
 		8139160B1E7006B800C55553 /* FilterFunctionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 813916081E7006B800C55553 /* FilterFunctionView.m */; };
 		8139160C1E7006B800C55553 /* SliderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8139160A1E7006B800C55553 /* SliderView.m */; };
 		813916191E70085A00C55553 /* KSYGPUResource.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 813916181E70085A00C55553 /* KSYGPUResource.bundle */; };
-		814FC95E1E7F843800944D7D /* CNLivePlayerSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 814FC95D1E7F843800944D7D /* CNLivePlayerSDK.framework */; };
-		814FC9601E7F843F00944D7D /* CNLivePlayerSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 814FC95D1E7F843800944D7D /* CNLivePlayerSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		81A1B99D1E8239880079FF5F /* CNLivePlayerSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81A1B99B1E8239020079FF5F /* CNLivePlayerSDK.framework */; };
+		81A1B99E1E8239880079FF5F /* CNLivePlayerSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 81A1B99B1E8239020079FF5F /* CNLivePlayerSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 /* End PBXBuildFile section */
 /* Begin PBXCopyFilesBuildPhase section */
@@ -37,7 +37,7 @@
 			dstSubfolderSpec = 10;
 			files = (
 				811A0B0A1E7B8C9D00B56CC9 /* CNLiveMsgTools.framework in Embed Frameworks */,
-				814FC9601E7F843F00944D7D /* CNLivePlayerSDK.framework in Embed Frameworks */,
+				81A1B99E1E8239880079FF5F /* CNLivePlayerSDK.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -75,7 +75,7 @@
 		813916091E7006B800C55553 /* SliderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SliderView.h; sourceTree = "<group>"; };
 		8139160A1E7006B800C55553 /* SliderView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SliderView.m; sourceTree = "<group>"; };
 		813916181E70085A00C55553 /* KSYGPUResource.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = KSYGPUResource.bundle; sourceTree = "<group>"; };
-		814FC95D1E7F843800944D7D /* CNLivePlayerSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLivePlayerSDK.framework; sourceTree = "<group>"; };
+		81A1B99B1E8239020079FF5F /* CNLivePlayerSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLivePlayerSDK.framework; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 /* Begin PBXFrameworksBuildPhase section */
@@ -84,7 +84,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				811A0B071E7B8C9400B56CC9 /* CNLiveMsgTools.framework in Frameworks */,
-				814FC95E1E7F843800944D7D /* CNLivePlayerSDK.framework in Frameworks */,
+				81A1B99D1E8239880079FF5F /* CNLivePlayerSDK.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -94,7 +94,7 @@
 		32E6CA1D1D5B0AF400B58EBC = {
 			isa = PBXGroup;
 			children = (
-				814FC95D1E7F843800944D7D /* CNLivePlayerSDK.framework */,
+				81A1B99B1E8239020079FF5F /* CNLivePlayerSDK.framework */,
 				811A0B051E7B8C9400B56CC9 /* CNLiveMsgTools.framework */,
 				813916181E70085A00C55553 /* KSYGPUResource.bundle */,
 				32E6CA281D5B0AF400B58EBC /* CNLivePlayerSDKTest */,
@@ -7,6 +7,10 @@
 //
 #import "AppDelegate.h"
+#import <CNLivePlayerSDK/CNLiveWebcastManager.h>
+
+#define KAppId @"60_irn9edco29"
+#define KAppKey @"69fe70bda67e059286ad509d9f5377f815955645b52f94"
 @interface AppDelegate ()
@@ -16,7 +20,10 @@
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-    // Override point for customization after application launch.
+
+    //初始化直播SDK
+    [[CNLiveWebcastManager manager] initWithAppId:KAppId appKey:KAppKey];
+    
     return YES;
 }
@@ -44,9 +44,6 @@
     //添加播放器通知
     [self installMovieNotificationObservers];
-    
-    [[CNLiveWebcastManager manager] initWithAppId:KAppId appKey:KAppKey];
-    
     if (_type == PlayerTypeLiving) {
         //直播播放
@@ -13,10 +13,6 @@
 #define Width [UIScreen mainScreen].bounds.size.width
 #define Height [UIScreen mainScreen].bounds.size.height
-#define KAppId @"60_irn9edco29"
-#define KAppKey @"69fe70bda67e059286ad509d9f5377f815955645b52f94"
-#define KBundleId @"com.cnlive.video"
-
 @interface StreamerDetailViewController ()<UIGestureRecognizerDelegate>
 {
     UIButton *_startLiveBtn;
@@ -67,8 +63,6 @@
     if (_isAuthLive) {
         NSString *activityId = [NSString stringWithFormat:@"%d%d%d%d%d",arc4random()%9,arc4random()%9,arc4random()%9,arc4random()%9,arc4random()%9];
-
-        [[CNLiveWebcastManager manager] initWithAppId:KAppId appKey:KAppKey];
         _kitCN = [[CNLiveGPUStreamerKit alloc] initWithDefaultConfigWithActivityId:activityId channelId:@"iOStest" isHorizontalScreen:@"0"];
@@ -561,6 +555,7 @@
     [[NSNotificationCenter defaultCenter] removeObserver:self name:CNLiveCaptureStateDidChangeNotification object:nil];
+    [_kitCN cleanKit];
     self.kitCN = nil;
 }
@@ -248,6 +248,12 @@ FOUNDATION_EXPORT NSString *const CNLiveStreamStateDidChangeNotification NS_AVAI
  */
 - (void) appBecomeActive;
+/**
+ @abstract   销毁推流核心类
+ @discussion 退出页面时调用此方法以销毁推流推流对象
+ */
+- (void)cleanKit;
+
 #pragma mark -  mirror & rotate
 /**
@@ -290,4 +296,5 @@ FOUNDATION_EXPORT NSString *const CNLiveStreamStateDidChangeNotification NS_AVAI
  */
 @property (nonatomic, assign)   CGFloat pinchZoomFactor;
+
 @end