no message

zhangxiaowen
1 parent 966a5db2
Showing 9 changed files with 91 additions and 39 deletions
CNLivePlayer/Classes/Header/CNLivePlayerConst.h
CNLivePlayer/Classes/Player/CNLivePlayer.h
CNLivePlayer/Classes/Player/CNLivePlayer.m
CNLivePlayer/Classes/Player/CNLivePlayerManager.h
CNLivePlayer/Classes/Player/CNLivePlayerManager.m
CNLivePlayer/Classes/Player/CNLivePlayerTools.m
Example/CNLivePlayer/CNLiveAppDelegate.m
Example/CNLivePlayer/CNLivePlayerController.m
Example/CNLivePlayer/CNLiveViewController.m
@@ -9,10 +9,5 @@
 #ifndef CNLivePlayerConst_h
 #define CNLivePlayerConst_h
-#define CNLivePlayer_AppId @"60_irn9edco29"
-
-#define CNLivePlayer_AppKey @"69fe70bda67e059286ad509d9f5377f815955645b52f94"
-
-#define CNLivePlayer_BundleID @"com.cnlive.video"
 #endif /* CNLivePlayerConst_h */
@@ -13,6 +13,9 @@
 // 枚举定义
 #import "CNLivePlayerDefines.h"
+//常量
+#import "CNLivePlayerConst.h"
+
 // 播放器管理类
 #import "CNLivePlayerManager.h"
@@ -58,7 +61,7 @@ typedef void(^AuthFailureBlock)(NSDictionary *errorInfo);
  * url     视频url
  *
  */
-- (instancetype)initWithContentURL:(NSURL *)url;
+- (instancetype)initWithContentURL:(NSString *)url;
 /* 初始化点播播放器  初始化成功后才能对播放器进行设置（如：自动播放、是否开启硬件解码等）和调用准备播放视频方法（prepareToPlay）
@@ -13,12 +13,11 @@
 #import "CNLivePlayerTools.h"
 //IM
 #import <CNLiveMsgTools/CNLiveMsgManager.h>
-//常量
-#import "CNLivePlayerConst.h"
 //url
 #import "CNLivePlayerUrl.h"
 //缓存视频
 #import <KSYHTTPCache/HTTPCacheDefines.h>
+#import "CNLiveHTTPProxyService.h"
 @interface CNLivePlayer () {
     NSString *_idName;
@@ -44,10 +43,6 @@
 }
 @property (nonatomic, strong, readwrite) UIView *view;
 @property (nonatomic, copy) NSString *videoUrl;
-/*
- * 是否缓存(暂时不能用)
- */
-@property (nonatomic, assign) BOOL openCache;
 @end
@@ -65,7 +60,7 @@ NSString * const CNLiveHostStatusChangedNotification = @&quot;CNLiveAnchorStatusChang
  * url     视频url
  *
  */
-- (instancetype)initWithContentURL:(NSURL *)url {
+- (instancetype)initWithContentURL:(NSString *)url {
     self = [super init];
     if (self) {
         [UIApplication sharedApplication].idleTimerDisabled = YES;
@@ -76,8 +71,8 @@ NSString * const CNLiveHostStatusChangedNotification = @&quot;CNLiveAnchorStatusChang
         _rate = @"2";
         [self addMovieNotificationObservers];
-
-        self.player = [[KSYMoviePlayerController alloc] initWithContentURL:url];
+        NSString *proxyUrl = [[CNLiveHTTPProxyService manager] getProxyUrl:url];
+        self.player = [[KSYMoviePlayerController alloc] initWithContentURL:[NSURL URLWithString:PLAYER_OpenCache?proxyUrl:url]];
         [self.view addSubview:self.player.view];
         _player.view.frame = self.view.bounds;
         _player.view.autoresizingMask = UIViewAutoresizingFlexibleWidth|UIViewAutoresizingFlexibleHeight;
@@ -324,7 +319,8 @@ NSString * const CNLiveHostStatusChangedNotification = @&quot;CNLiveAnchorStatusChang
             __strong typeof(self) strongSelf = weakSelf;
             strongSelf.videoUrl = model.url;
             if(!strongSelf.player){
-                strongSelf.player = [[KSYMoviePlayerController alloc] initWithContentURL:[NSURL URLWithString:strongSelf.videoUrl]];
+                NSString *proxyUrl = [[CNLiveHTTPProxyService manager] getProxyUrl:strongSelf.videoUrl];
+                strongSelf.player = [[KSYMoviePlayerController alloc] initWithContentURL:[NSURL URLWithString:PLAYER_OpenCache?proxyUrl:strongSelf.videoUrl]];
                 [strongSelf.view addSubview:self.player.view];
                 strongSelf.player.view.frame = self.view.bounds;
                 strongSelf.player.view.autoresizingMask = UIViewAutoresizingFlexibleWidth|UIViewAutoresizingFlexibleHeight;
@@ -460,7 +456,8 @@ NSString * const CNLiveHostStatusChangedNotification = @&quot;CNLiveAnchorStatusChang
             __strong typeof(self) strongSelf = weakSelf;
             strongSelf.videoUrl = videoURL;
             if(!strongSelf.player){
-                strongSelf.player = [[KSYMoviePlayerController alloc] initWithContentURL:[NSURL URLWithString:videoUrl]];
+                NSString *proxyUrl = [[CNLiveHTTPProxyService manager] getProxyUrl:strongSelf.videoUrl];
+                strongSelf.player = [[KSYMoviePlayerController alloc] initWithContentURL:[NSURL URLWithString:PLAYER_OpenCache?proxyUrl:strongSelf.videoUrl]];
                 [strongSelf.view addSubview:strongSelf.player.view];
                 strongSelf.player.view.frame = strongSelf.view.bounds;
                 strongSelf.player.view.autoresizingMask = UIViewAutoresizingFlexibleWidth|UIViewAutoresizingFlexibleHeight;
@@ -537,7 +534,8 @@ NSString * const CNLiveHostStatusChangedNotification = @&quot;CNLiveAnchorStatusChang
             __strong typeof(self) strongSelf = weakSelf;
             strongSelf.videoUrl = url;
             if(!strongSelf.player){
-                strongSelf.player = [[KSYMoviePlayerController alloc] initWithContentURL:[NSURL URLWithString:url]];
+                NSString *proxyUrl = [[CNLiveHTTPProxyService manager] getProxyUrl:strongSelf.videoUrl];
+                strongSelf.player = [[KSYMoviePlayerController alloc] initWithContentURL:[NSURL URLWithString:PLAYER_OpenCache?proxyUrl:strongSelf.videoUrl]];
                 [strongSelf.view addSubview:strongSelf.player.view];
                 strongSelf.player.view.frame = strongSelf.view.bounds;
                 strongSelf.player.view.autoresizingMask = UIViewAutoresizingFlexibleWidth|UIViewAutoresizingFlexibleHeight;
@@ -622,7 +620,7 @@ NSString * const CNLiveHostStatusChangedNotification = @&quot;CNLiveAnchorStatusChang
                                              selector:@selector(mediaIsPreparedToPlayDidChange:)
                                                  name:MPMediaPlaybackIsPreparedToPlayDidChangeNotification
                                                object:nil];
-    if(self.openCache){
+    if(PLAYER_OpenCache){
         // 缓存状态
         [[NSNotificationCenter defaultCenter] addObserver:self
                                                  selector:@selector(mediaCacheDidChanged:)
@@ -14,6 +14,7 @@
 #define PLAYER_ChannelName   [CNLivePlayerManager manager].channelName?[CNLivePlayerManager manager].channelName:@""
 #define PLAYER_Tag   [CNLivePlayerManager manager].tag?[CNLivePlayerManager manager].tag:@""
 #define PLAYER_TestEnvironment   [CNLivePlayerManager manager].isTestEnvironment
+#define PLAYER_OpenCache   [CNLivePlayerManager manager].openCache
 NS_ASSUME_NONNULL_BEGIN
@@ -35,6 +36,11 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property (nonatomic, assign, readonly) BOOL isTestEnvironment;
+/*
+ * 是否开启边播放边缓存
+ */
+@property (nonatomic, assign) BOOL openCache;
+
 /**
  *  用户ID
  */
@@ -73,6 +79,16 @@ NS_ASSUME_NONNULL_BEGIN
 + (void)setAppId:(NSString *)appId appKey:(NSString *)appKey isTestEnvironment:(BOOL)isTestEnvironment;
 /**
+ @abstract      初始化直播云SDK
+ @param         appId              在open.cnlive.com网站申请得到的appId
+ @param         appKey             在open.cnlive.com网站申请得到的appKey
+ @param         isTestEnvironment  YES:测试环境  NO:正式环境
+ @param         openCache          YES:开启视频边播放边缓存  NO:关闭视频边播放边缓存
+ @warning       必传参数
+ */
++ (void)setAppId:(NSString *)appId appKey:(NSString *)appKey isTestEnvironment:(BOOL)isTestEnvironment openCache:(BOOL)openCache;
+
+/**
  @abstract      获取版本号
  */
 + (NSString *)getVersion;
@@ -8,9 +8,9 @@
 #import "CNLivePlayerManager.h"
 #import <libksygpulive/KSYGPUStreamerKit.h>
-#import "CNLivePlayerConst.h"
 #import "CNLivePlayerUrl.h"
 #import "CNLivePlayerDBTool.h"
+#import "CNLiveHTTPProxyService.h"
 @interface CNLivePlayerManager()
 /**
@@ -40,6 +40,7 @@ static CNLivePlayerManager * _instance = nil;
         _instance = [[self alloc] init];
         //清除播放器鉴权缓存
         [CNLivePlayerManager clearAuthentication];
+        //创建数据库
         [[CNLivePlayerDBTool shared] createTable];
     });
@@ -53,24 +54,63 @@ static CNLivePlayerManager * _instance = nil;
 }
 + (void)setAppId:(NSString *)appId appKey:(NSString *)appKey isTestEnvironment:(BOOL)isTestEnvironment{
-    [[CNLivePlayerManager manager] setAppId:appId appKey:appKey isTestEnvironment:isTestEnvironment];
+    [CNLivePlayerManager setAppId:appId appKey:appKey isTestEnvironment:isTestEnvironment openCache:NO];
 }
-#pragma mark - 私有方法
-- (void)setAppId:(NSString *)appId appKey:(NSString *)appKey {
-    [self setAppId:appId appKey:appKey isTestEnvironment:NO];
++ (void)setAppId:(NSString *)appId appKey:(NSString *)appKey isTestEnvironment:(BOOL)isTestEnvironment openCache:(BOOL)openCache{
+    [[CNLivePlayerManager manager] setAppId:appId appKey:appKey isTestEnvironment:isTestEnvironment openCache:openCache];
+
 }
-- (void)setAppId:(NSString *)appId appKey:(NSString *)appKey isTestEnvironment:(BOOL)isTestEnvironment {
+#pragma mark - 私有方法
+- (void)setAppId:(NSString *)appId appKey:(NSString *)appKey isTestEnvironment:(BOOL)isTestEnvironment openCache:(BOOL)openCache{
     [CNLivePlayerManager manager].appId  = appId ? [NSString stringWithFormat:@"%@",appId] : @"";
     [CNLivePlayerManager manager].appKey = appKey ? [NSString stringWithFormat:@"%@",appKey] : @"";
     [CNLivePlayerManager manager].isTestEnvironment = isTestEnvironment;
+    [CNLivePlayerManager manager].openCache = openCache;
+    if(openCache){
+        //进入前台
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationDidBecomeActive) name:UIApplicationDidBecomeActiveNotification object:nil];
+        //进入后台
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationDidEnterBackground) name:UIApplicationDidEnterBackgroundNotification object:nil];
+        //缓存视频的位置
+        [[CNLiveHTTPProxyService manager] setCacheRoot:[NSTemporaryDirectory() stringByAppendingPathComponent:@"cnlive_player_cache"]];
+        //边播放边缓存
+        [[CNLiveHTTPProxyService manager] startServer];
+        
+    }
     if (PLAYER_TestEnvironment) {
         NSLog(@"CNLivePlayer的版本是:%@", [CNLivePlayerManager getVersion]);
+        if(openCache){
+            //边播放边缓存
+            NSLog(@"CNLivePlayer-->开启边播放边缓存");
+            
+        }
+        
+    }
+    
+}
+
+- (void)applicationDidBecomeActive{
+    if (![[CNLiveHTTPProxyService manager] isRunning]) {
+        [[CNLiveHTTPProxyService manager] startServer];
+
+    }
+    
+}
+
+- (void)applicationDidEnterBackground{
+    if ([[CNLiveHTTPProxyService manager] isRunning]) {
+        [[CNLiveHTTPProxyService manager] stopServer];
+
     }
 }
+- (void)dealloc{
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
 + (NSString *)getVersion {
     KSYGPUStreamerKit *kit = [[KSYGPUStreamerKit alloc] init];
     NSString *str = [[[kit.streamerBase getKSYVersion] componentsSeparatedByString:@"-"] lastObject];
@@ -9,7 +9,6 @@
 #import "CNLivePlayerTools.h"
 #import "CommonCrypto/CommonDigest.h"
 #import "CNLivePlayerManager.h"
-#import "CNLivePlayerConst.h"
 #import "CNLivePlayerUrl.h"
 @implementation CNLivePlayerTools
@@ -9,16 +9,16 @@
 #import "CNLiveAppDelegate.h"
 #import "CNLivePlayer.h"
-#define KAppId @"60_irn9edco29"
-#define KAppKey @"69fe70bda67e059286ad509d9f5377f815955645b52f94"
-#define bundleID @"com.cnlive.video"
+#define CNLivePlayer_AppId @"60_irn9edco29"
+#define CNLivePlayer_AppKey @"69fe70bda67e059286ad509d9f5377f815955645b52f94"
+#define CNLivePlayer_BundleID @"com.cnlive.video"
 @implementation CNLiveAppDelegate
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
     // Override point for customization after application launch.
-    [CNLivePlayerManager setAppId:KAppId appKey:KAppKey isTestEnvironment:YES];
+    [CNLivePlayerManager setAppId:CNLivePlayer_AppId appKey:CNLivePlayer_AppKey isTestEnvironment:YES openCache:NO];
     return YES;
 } 
@@ -63,11 +63,11 @@
     back.backgroundColor = [UIColor greenColor];
     [back addTarget:self action:@selector(backDidClicked) forControlEvents:UIControlEventTouchUpInside];
     [self.view addSubview:back];
-    CNLivePlayerDownloader *dowa = [[CNLivePlayerDownloader alloc]initWithUrlString:@"http://wideo02.cnlive.com/video/data1/2017/0423/206473/800/c8ff347048414b7295cef882f8361073_206473_800.m3u8" progressBlock:^(float progress) {
-        NSLog(@"缓存进度中%f",progress);
-    }];
-    NSLog(@"缓存的url是:%@",dowa.urlString);
-    [dowa startDownload];
+//    CNLivePlayerDownloader *dowa = [[CNLivePlayerDownloader alloc]initWithUrlString:@"http://wideo02.cnlive.com/video/data1/2017/0423/206473/800/c8ff347048414b7295cef882f8361073_206473_800.m3u8" progressBlock:^(float progress) {
+//        NSLog(@"缓存进度中%f",progress);
+//    }];
+//    NSLog(@"缓存的url是:%@",dowa.urlString);
+//    [dowa startDownload];
 //    self.player = [[CNLivePlayer alloc] initWithContentURL:[NSURL URLWithString:@"http://wideo02.cnlive.com/video/data1/2017/0423/206473/800/c8ff347048414b7295cef882f8361073_206473_800.m3u8"]];
 //    self.player.view.frame = CGRectMake(0, 0, [UIScreen mainScreen].bounds.size.width, [UIScreen mainScreen].bounds.size.width*9/16.0);
@@ -98,14 +98,12 @@
 //
 //    }];
     NSLog(@"当时已播放的时间是:%f",self.player.currentPlaybackTime);
-    [_player setplay]
-    [_player setPlayerWithRate:@"4" authSuccess:^{
+    [_player setPlayerWithContentId:nil rate:@"4" authSuccess:^{
         __strong typeof(self) strongSelf = weakSelf;
         [strongSelf.player prepareToPlay];
         strongSelf.player.currentPlaybackTime = 10;
-
     } authFailure:^(NSDictionary * _Nonnull errorInfo) {
-
+        
     }];
 }
@@ -9,6 +9,7 @@
 #import "CNLiveViewController.h"
 #import "CNLivePlayerController.h"
 #import "CNLivePlayerDBTool.h"
+#import "CNLiveHTTPProxyService.h"
 @interface CNLiveViewController ()
@@ -22,6 +23,8 @@
     for(CNLivePlayerDBModel *model in data){
         NSLog(@"%@---%@",model.contentId,model.url);
     }
+    NSLog(@"--是否缓存--%d----",[[CNLiveHTTPProxyService manager]isCacheCompleteForUrl:[NSURL URLWithString:@"http://wideo02.cnlive.com/video/data1/2017/0423/206473/800/c8ff347048414b7295cef882f8361073_206473_800.m3u8"]]);
+
 }
 - (void)viewDidLoad