no message

zhangxiaowen
1 parent fcc25a96
Showing 7 changed files with 102 additions and 44 deletions
CNLivePlayer/Classes/Cache/CNLivePlayerCache.h
CNLivePlayer/Classes/Cache/CNLivePlayerCache.m
CNLivePlayer/Classes/Player/CNLivePlayer.h
CNLivePlayer/Classes/Player/CNLivePlayer.m
CNLivePlayer/Classes/Tools/CNLivePlayerTools.h
CNLivePlayer/Classes/Tools/CNLivePlayerTools.m
Example/CNLivePlayer/CNLivePlayerController.m
@@ -66,14 +66,14 @@ NS_ASSUME_NONNULL_BEGIN
 /**
- * 删除所有的磁盘换存文件
- * 删除所有的磁盘缓存url
+ * 删除所有的磁盘缓存url(YYCache)
  */
 + (void)player_RemoveAllUrlCache;
 /**
- * 删除所有的磁盘缓存url和视频
+ * 删除所有的磁盘缓存url(YYCache)
+ * 删除所有的磁盘缓存视频(KSYHTTPProxyService)
  */
 + (void)player_clearAllCache;
@@ -7,6 +7,7 @@
 //
 #import "CNLivePlayerCache.h"
+//缓存url
 #import "YYCache.h"
 //缓存视频
 #import <KSYHTTPCache/KSYHTTPProxyService.h>
@@ -21,12 +21,19 @@
 NS_ASSUME_NONNULL_BEGIN
+/*
+ * 获取主播状态通知
+ */
 UIKIT_EXTERN NSString *const CNLiveHostStatusChangedNotification;
-// 成功回调
+/*
+ * 成功回调
+ */
 typedef void(^AuthSuccessBlock)(void);
-// 失败回调
+/*
+ * 失败回调
+ */
 typedef void(^AuthFailureBlock)(NSDictionary *errorInfo);
 @interface CNLivePlayer : NSObject
@@ -34,7 +41,7 @@ typedef void(^AuthFailureBlock)(NSDictionary *errorInfo);
 /*
  * 播放器类型
  */
-@property (nonatomic, assign) CNLivePlayerType type;
+@property (nonatomic, assign, readonly) CNLivePlayerType type;
 /*
  * 播放器
@@ -42,6 +49,15 @@ typedef void(^AuthFailureBlock)(NSDictionary *errorInfo);
 @property (nonatomic, strong) KSYMoviePlayerController *player;
 #pragma mark - 初始化方法
+/*
+ * 初始化播放器并设置播放地址
+ *
+ * url     视频url
+ *
+ */
+- (instancetype)initWithContentURL:(NSURL *)url;
+
+
 /* 初始化点播播放器  初始化成功后才能对播放器进行设置（如：自动播放、是否开启硬件解码等）和调用准备播放视频方法（prepareToPlay）
  *
  * videoId           视频Id
@@ -105,7 +121,7 @@ typedef void(^AuthFailureBlock)(NSDictionary *errorInfo);
  * 默认不静音
  * [prepareToPlay]方法前设置即生效，也可以在播放过程中动态切换
  */
-@property(nonatomic) BOOL shouldMute;
+@property (nonatomic) BOOL shouldMute;
 /**
  @abstract 是否循环播放
@@ -113,7 +129,7 @@ typedef void(^AuthFailureBlock)(NSDictionary *errorInfo);
  * 只在[prepareToPlay]调用前设置生效；
  * 只有点播生效,直播场景请勿设置
  */
-@property(nonatomic) BOOL shouldLoop;
+@property (nonatomic) BOOL shouldLoop;
 /**
  @abstract 指定逆时针旋转角度，只能是0/90/180/270, 不符合上述值不进行旋转
@@ -127,16 +143,16 @@ typedef void(^AuthFailureBlock)(NSDictionary *errorInfo);
  @discussion NO: 可以与其他后台播放共存，相互之间不会被打断
  @discussion 默认为YES
  */
-@property(nonatomic) BOOL  bInterruptOtherAudio;
+@property (nonatomic) BOOL  bInterruptOtherAudio;
 /*
  * 查询视频准备是否完成（只读）
  */
-@property(nonatomic, readonly) BOOL isPreparedToPlay;
+@property (nonatomic, readonly) BOOL isPreparedToPlay;
 #pragma mark - 方法
 /*
- * 获取主播状态（离开/已结束
+ * 获取主播状态（离开/已结束)
  */
 - (void)getHostStatus:(void(^)(BOOL result))result;
@@ -52,6 +52,32 @@ NSString * const CNLivePlayerMsgReceiveNotification = @&quot;CNLiveMsgToolsPlayerRece
 NSString * const CNLiveHostStatusChangedNotification = @"CNLiveAnchorStatusChangedNotification";
 #pragma mark - 初始化方法
+/*
+ * 初始化播放器并设置播放地址
+ *
+ * url     视频url
+ *
+ */
+- (instancetype)initWithContentURL:(NSURL *)url {
+    self = [super init];
+    if (self) {
+        [UIApplication sharedApplication].idleTimerDisabled = YES;
+
+        _contentType = @"";
+        _contentId = @"";
+        _idName = @"";
+        
+        [self addMovieNotificationObservers];
+        self.player = [[KSYMoviePlayerController alloc] initWithContentURL:url];
+        [self.view addSubview:self.player.view];
+        _player.view.frame = self.view.bounds;
+        _player.view.autoresizingMask = UIViewAutoresizingFlexibleWidth|UIViewAutoresizingFlexibleHeight;
+        _player.shouldEnableKSYStatModule = NO;
+     
+    }
+    return self;
+}
+
 /* 初始化点播播放器  初始化成功后才能对播放器进行设置（如：自动播放、是否开启硬件解码等）和调用准备播放视频方法（prepareToPlay）
  *
  * videoId           点播视频Id
@@ -66,7 +92,7 @@ NSString * const CNLiveHostStatusChangedNotification = @&quot;CNLiveAnchorStatusChang
         }
-        self.type = CNLivePlayerVod;
+        _type = CNLivePlayerVod;
         _idName = @"vid";
         _contentType = @"vod";
@@ -101,7 +127,7 @@ NSString * const CNLiveHostStatusChangedNotification = @&quot;CNLiveAnchorStatusChang
             activityId = activityId ? [NSString stringWithFormat:@"%@",activityId] : @"";
         }
-        self.type = CNLivePlayerLive;
+        _type = CNLivePlayerLive;
         _idName = @"cid";
         _contentType = @"live";
@@ -140,7 +166,7 @@ NSString * const CNLiveHostStatusChangedNotification = @&quot;CNLiveAnchorStatusChang
         }
-        self.type = CNLivePlayerAudio;
+        _type = CNLivePlayerAudio;
         _idName = @"vid";
         _contentType = @"vod";
@@ -372,7 +398,7 @@ NSString * const CNLiveHostStatusChangedNotification = @&quot;CNLiveAnchorStatusChang
                          @"tag": PLAYER_Tag,
                          @"from": @"apple",
                          @"sid": PLAYER_UserId,
-                         @"uid": [CNLivePlayerTools getUidForStat:stamp]};
+                         @"uid": [CNLivePlayerTools getUidForTimestamp:stamp]};
     NSString *videoUrl = [CNLivePlayerTools encryptionSignWithUrl:vodUrl parameter:parameter];
@@ -426,7 +452,7 @@ NSString * const CNLiveHostStatusChangedNotification = @&quot;CNLiveAnchorStatusChang
                                  @"tag": PLAYER_Tag,
                                  @"from": @"apple",
                                  @"sid": PLAYER_UserId,
-                                 @"uid": [CNLivePlayerTools getUidForStat:timestamp]};
+                                 @"uid": [CNLivePlayerTools getUidForTimestamp:timestamp]};
     NSString *videoUrl = [CNLivePlayerTools encryptionSignWithUrl:liveUrl parameter:parameter];
@@ -711,8 +737,8 @@ NSString * const CNLiveHostStatusChangedNotification = @&quot;CNLiveAnchorStatusChang
     }
     _playTime++;
-    NSString *stamp = [CNLivePlayerTools getTimestamp];
-    NSString *url = [NSString stringWithFormat:@"%@?sver=%@&uid=%@&tm=%@&from=apple&spid=&appid=%@&version=1001_%@&eventid=1001&uri=%@&sid=&plat=i_%@&objid=%@_%@", StatUrl, StatVersion, [CNLivePlayerTools getUidForStat:stamp], stamp, PLAYER_AppID, PlayerSDKVersion, [NSString stringWithFormat:@"%ld_30", (long)_playTime], StatAppVersion,_contentId, _idName];
+    NSString *timestamp = [CNLivePlayerTools getTimestamp];
+    NSString *url = [NSString stringWithFormat:@"%@?sver=%@&uid=%@&tm=%@&from=apple&spid=&appid=%@&version=1001_%@&eventid=1001&uri=%@&sid=&plat=i_%@&objid=%@_%@", StatUrl, StatVersion, [CNLivePlayerTools getUidForTimestamp:timestamp], timestamp, PLAYER_AppID, PlayerSDKVersion, [NSString stringWithFormat:@"%ld_30", (long)_playTime], StatAppVersion,_contentId, _idName];
     [NSURLConnection connectionWithRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:url]] delegate:nil];
 }
@@ -22,7 +22,7 @@
 /**
  * 获取UUID_Timestamp
  */
-+ (NSString *)getUidForStat:(NSString *)date;
++ (NSString *)getUidForTimestamp:(NSString *)timestamp;
 //错误信息
 + (NSError *)customErrorWithResponseObject:(id)responseObject errorInfo:(NSString *)errorInfo;
@@ -39,6 +39,9 @@
 #pragma mark - 方法
+/**
+ * 视频出错,上传接口
+ */
 + (void)errorStat:(NSString *)errorString contentId:(NSString *)contentId idName:(NSString *)idName;
 + (void)statSDKWithContentId:(NSString *)contentId idName:(NSString *)idName;
@@ -14,9 +14,9 @@
 @implementation CNLivePlayerTools
 #pragma mark - 加密
 + (NSString *)encryptionSignWithUrl:(NSString *)url parameter:(NSDictionary *)parameter {
-    NSString *string1 = [NSString stringWithFormat:@"%@&key=%@", [CNLivePlayerTools signvalue:parameter], PLAYER_AppKey];
-    NSString *signString1 = [[CNLivePlayerTools sha1:string1] uppercaseString];
-    return [NSString stringWithFormat:@"%@?%@&sign=%@", url, [CNLivePlayerTools signvalue:parameter], signString1];
+    NSString *keyString = [NSString stringWithFormat:@"%@&key=%@", [CNLivePlayerTools signvalue:parameter], PLAYER_AppKey];
+    NSString *signString = [[CNLivePlayerTools sha1:keyString] uppercaseString];
+    return [NSString stringWithFormat:@"%@?%@&sign=%@", url, [CNLivePlayerTools signvalue:parameter], signString];
 }
@@ -46,7 +46,7 @@
     NSArray *arr = [keyArr sortedArrayUsingSelector:@selector(compare:)];
     NSMutableString *str = [[NSMutableString alloc]init];
-    for (int i=0; i < arr.count; i++) {
+    for (int i = 0; i < arr.count; i++) {
         NSString *parameterString = parameter[[arr objectAtIndex:i]];
         if (parameterString.length > 0) {
@@ -62,8 +62,8 @@
 }
 #pragma mark - UUID
-+ (NSString *)getUidForStat:(NSString *)date {
-    
++ (NSString *)getUidForTimestamp:(NSString *)timestamp {
+
     NSString *uid = @"";
     NSUserDefaults *defauts = [NSUserDefaults standardUserDefaults];
@@ -73,7 +73,7 @@
         return uid;
     }
     else {
-        NSString *stamp = [NSString stringWithFormat:@"%.3f", [date floatValue]];
+        NSString *stamp = [NSString stringWithFormat:@"%.3f", [timestamp floatValue]];
         stamp = [stamp stringByReplacingOccurrencesOfString:@"." withString:@""];
         NSString *idfv = [[[[UIDevice currentDevice] identifierForVendor] UUIDString] stringByReplacingOccurrencesOfString:@"-" withString:@""];
@@ -119,15 +119,18 @@
 #pragma mark - 方法
+/**
+ * 视频出错,上传接口
+ */
 + (void)errorStat:(NSString *)errorString contentId:(NSString *)contentId idName:(NSString *)idName{
-    NSString *stamp = [CNLivePlayerTools getTimestamp];
-    NSString *url = [NSString stringWithFormat:@"%@?sver=%@&uid=%@&tm=%@&from=apple&spid=&appid=%@&version=1001_%@&eventid=1000&uri=%@&sid=&plat=i_%@&objid=%@_%@", StatUrl, StatVersion, [CNLivePlayerTools getUidForStat:stamp], stamp, PLAYER_AppID, PlayerSDKVersion, errorString, StatAppVersion, contentId, idName];
+    NSString *timestamp = [CNLivePlayerTools getTimestamp];
+    NSString *url = [NSString stringWithFormat:@"%@?sver=%@&uid=%@&tm=%@&from=apple&spid=&appid=%@&version=1001_%@&eventid=1000&uri=%@&sid=&plat=i_%@&objid=%@_%@", StatUrl, StatVersion, [CNLivePlayerTools getUidForTimestamp:timestamp], timestamp, PLAYER_AppID, PlayerSDKVersion, errorString, StatAppVersion, contentId, idName];
     [NSURLConnection connectionWithRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:url]] delegate:nil];
 }
 + (void)statSDKWithContentId:(NSString *)contentId idName:(NSString *)idName {
-    NSString *stamp = [CNLivePlayerTools getTimestamp];
-    NSString *url = [NSString stringWithFormat:@"%@?sver=%@&uid=%@&tm=%@&from=apple&spid=&appid=%@&version=1001_%@&eventid=1400&uri=&sid=&plat=i_%@&objid=%@_%@", StatUrl, StatVersion, [CNLivePlayerTools getUidForStat:stamp], stamp, PLAYER_AppID, PlayerSDKVersion, StatAppVersion, contentId , idName];
+    NSString *timestamp = [CNLivePlayerTools getTimestamp];
+    NSString *url = [NSString stringWithFormat:@"%@?sver=%@&uid=%@&tm=%@&from=apple&spid=&appid=%@&version=1001_%@&eventid=1400&uri=&sid=&plat=i_%@&objid=%@_%@", StatUrl, StatVersion, [CNLivePlayerTools getUidForTimestamp:timestamp], timestamp, PLAYER_AppID, PlayerSDKVersion, StatAppVersion, contentId , idName];
     [NSURLConnection connectionWithRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:url]] delegate:nil];
 }
@@ -31,22 +31,23 @@
     //        NSLog(@"%@", errorInfo);
     //
     //    }];
+    
     //1066_716fabeaafb64236b60ecf74167c5c96
     //82_c8ff347048414b7295cef882f8361073
-    _player = [[CNLivePlayer alloc]initAudioPlayerWithAudioId:@"82_c8ff347048414b7295cef882f8361073" authSuccess:^{
-        NSLog(@"---------------初始化播放器成功---------------");
-        _player.view.frame = CGRectMake(0, 0, [UIScreen mainScreen].bounds.size.width, [UIScreen mainScreen].bounds.size.width*9/16.0);
-        
-        [_player prepareToPlay];
-        [self.view addSubview:_player.view];
-        
-        NSLog(@"-----%@", _player.contentURL);
-
-        
-    } authFailure:^(NSDictionary * _Nonnull errorInfo) {
-        NSLog(@"%@", errorInfo);
-        
-    }];
+//    _player = [[CNLivePlayer alloc]initAudioPlayerWithAudioId:@"82_c8ff347048414b7295cef882f8361073" authSuccess:^{
+//        NSLog(@"---------------初始化播放器成功---------------");
+//        _player.view.frame = CGRectMake(0, 0, [UIScreen mainScreen].bounds.size.width, [UIScreen mainScreen].bounds.size.width*9/16.0);
+//
+//        [_player prepareToPlay];
+//        [self.view addSubview:_player.view];
+//
+//        NSLog(@"-----%@", _player.contentURL);
+//
+//
+//    } authFailure:^(NSDictionary * _Nonnull errorInfo) {
+//        NSLog(@"%@", errorInfo);
+//
+//    }];
     UIButton *btn = [UIButton buttonWithType:UIButtonTypeCustom];
     btn.frame =CGRectMake(0, 0, 100, 100);
@@ -61,6 +62,14 @@
     [back addTarget:self action:@selector(backDidClicked) forControlEvents:UIControlEventTouchUpInside];
     [self.view addSubview:back];
+    
+    CNLivePlayer *player = [[CNLivePlayer alloc] initWithContentURL:[NSURL URLWithString:@"http://wideo02.cnlive.com/video/data1/2017/0423/206473/800/c8ff347048414b7295cef882f8361073_206473_800.m3u8"]];
+    player.view.frame = CGRectMake(0, 0, [UIScreen mainScreen].bounds.size.width, [UIScreen mainScreen].bounds.size.width*9/16.0);
+    player.view.autoresizingMask = UIViewAutoresizingFlexibleWidth|UIViewAutoresizingFlexibleHeight;
+    [player prepareToPlay];
+    [self.view addSubview:player.view];
+    
+    
 //    KSYMoviePlayerController *player = [[KSYMoviePlayerController alloc] initWithContentURL:[NSURL URLWithString:@"http://wideo02.cnlive.com/video/data1/2017/0423/206473/800/c8ff347048414b7295cef882f8361073_206473_800.m3u8"]];
 //    player.view.frame = CGRectMake(0, 0, [UIScreen mainScreen].bounds.size.width, [UIScreen mainScreen].bounds.size.width*9/16.0);
 //    player.view.autoresizingMask = UIViewAutoresizingFlexibleWidth|UIViewAutoresizingFlexibleHeight;