no message

zhangxiaowen
1 parent a94c9c99
Showing 4 changed files with 81 additions and 36 deletions
CNLivePlayer/Classes/Player/CNLivePlayer.h
CNLivePlayer/Classes/Player/CNLivePlayer.m
CNLivePlayer/Classes/Player/CNLivePlayerTools.m
Example/CNLivePlayer/CNLivePlayerController.m
@@ -167,6 +167,14 @@ typedef void(^AuthFailureBlock)(NSDictionary *errorInfo);
  */
 - (void)setPlayerWithContentId:(NSString *)contentId type:(CNLivePlayerType)type authSuccess:(AuthSuccessBlock)authSuccessBlock authFailure:(AuthFailureBlock)authFailureBlock;
+/* 给播放器切换码率设置内容id 设置成功后才能播放（如：自动播放、是否开启硬件解码等）和调用准备播放视频方法（prepareToPlay）
+ * 切换视频
+ * rate              码率 1-流畅，2-标清，3-高清，4-超清，默认为2
+ * type              内容类型
+ *
+ */
+- (void)setPlayerWithRate:(NSString *)rate authSuccess:(AuthSuccessBlock)authSuccessBlock authFailure:(AuthFailureBlock)authFailureBlock;
+
 /*
  * 销毁播放器
  */
@@ -28,6 +28,9 @@
     //直播
     NSString *_activityId;
+    // 1-流畅，2-标清，3-高清，4-超清，默认为2
+    NSString *_rate;
+    
     //音频标识
     BOOL _isAudio;
     NSString *_roomId;
@@ -70,11 +73,12 @@ NSString * const CNLiveHostStatusChangedNotification = @&quot;CNLiveAnchorStatusChang
         _contentType = @"";
         _contentId = @"";
         _idName = @"";
-
+        _rate = @"2";
+    
         [self addMovieNotificationObservers];
         self.player = [[KSYMoviePlayerController alloc] initWithContentURL:url];
-        [self.view addSubview:_player.view];
+        [self.view addSubview:self.player.view];
         _player.view.frame = self.view.bounds;
         _player.view.autoresizingMask = UIViewAutoresizingFlexibleWidth|UIViewAutoresizingFlexibleHeight;
         _player.shouldEnableKSYStatModule = NO;
@@ -140,6 +144,7 @@ NSString * const CNLiveHostStatusChangedNotification = @&quot;CNLiveAnchorStatusChang
         _contentId = channelId;
         _activityId = [NSString stringWithFormat:@"%@",activityId];
         _isAudio = NO;
+        
         if (agree) {
             //初始化IM
             [[CNLiveMsgManager sharedCNLiveMsgManager] initCNLiveMsgToolsWithAppKey:PLAYER_AppKey appId:PLAYER_AppID];
@@ -189,6 +194,7 @@ NSString * const CNLiveHostStatusChangedNotification = @&quot;CNLiveAnchorStatusChang
 - (void)createPlayerWithContentId:(NSString *)contentId authSuccess:(AuthSuccessBlock)authSuccessBlock authFailure:(AuthFailureBlock)authFailureBlock{
     [UIApplication sharedApplication].idleTimerDisabled = YES;
+    _rate = @"2";
     _retryTime = 0;
     [self addMovieNotificationObservers];
@@ -211,6 +217,7 @@ NSString * const CNLiveHostStatusChangedNotification = @&quot;CNLiveAnchorStatusChang
     if([_contentId isEqualToString:contentId]){
         return;
     }
+    [self pause];
     _retryTime = 0;
     _type = type;
     switch (type) {
@@ -251,6 +258,22 @@ NSString * const CNLiveHostStatusChangedNotification = @&quot;CNLiveAnchorStatusChang
 }
+/* 给播放器切换码率设置内容id 设置成功后才能播放（如：自动播放、是否开启硬件解码等）和调用准备播放视频方法（prepareToPlay）
+ * 切换视频
+ * rate              码率 1-流畅，2-标清，3-高清，4-超清，默认为2
+ * type              内容类型
+ *
+ */
+- (void)setPlayerWithRate:(NSString *)rate authSuccess:(AuthSuccessBlock)authSuccessBlock authFailure:(AuthFailureBlock)authFailureBlock{
+    _rate = rate;
+    __weak typeof(self) weakSelf = self;
+    dispatch_async(dispatch_get_global_queue(0, 0), ^{
+        __strong typeof(self) strongSelf = weakSelf;
+        [strongSelf getUrlSuccess:authSuccessBlock failure:authFailureBlock];
+        
+    });
+}
+
 /*
  * 销毁播放器
  */
@@ -280,7 +303,8 @@ NSString * const CNLiveHostStatusChangedNotification = @&quot;CNLiveAnchorStatusChang
 #pragma mark - 查找本地是否有缓存url
 - (void)getUrlSuccess:(void (^)(void))authSuccessBlock failure:(void (^)(NSDictionary *errorDic))authFailureBlock {
-    id data = [[CNLivePlayerDBTool shared] searchInTable:_contentId];
+    NSString *key = [NSString stringWithFormat:@"%@:%@",_contentId,_rate];
+    id data = [[CNLivePlayerDBTool shared] searchInTable:key];
     CNLivePlayerDBModel *model = (CNLivePlayerDBModel *)data;
     //1.判断是否存在缓存url
     if (![model isEmpty]) {
@@ -404,6 +428,7 @@ NSString * const CNLiveHostStatusChangedNotification = @&quot;CNLiveAnchorStatusChang
                          @"playType": _isAudio ? @"a": @"v",
                          @"platform_id": [NSBundle mainBundle].bundleIdentifier,
                          @"channelName": PLAYER_ChannelName,
+                         @"rate":_rate?_rate:@"2",
                          @"tag": PLAYER_Tag,
                          @"from": @"apple",
                          @"sid": PLAYER_UserId,
@@ -414,7 +439,8 @@ NSString * const CNLiveHostStatusChangedNotification = @&quot;CNLiveAnchorStatusChang
     __weak typeof(self) weakSelf = self;
     [[CNLivePlayerNetworkManager manager] getVideoURL:videoUrl success:^(NSString * _Nullable videoURL, NSInteger code) {
         __strong typeof(self) strongSelf = weakSelf;
-        CNLivePlayerDBModel *model = [[CNLivePlayerDBModel alloc]initWithContenId:self->_contentId url:videoURL];
+        NSString *key = [NSString stringWithFormat:@"%@:%@",strongSelf->_contentId, strongSelf->_rate];
+        CNLivePlayerDBModel *model = [[CNLivePlayerDBModel alloc]initWithContenId:key url:videoURL];
         [[CNLivePlayerDBTool shared] insertTable:model];
         __weak typeof(self) weakSelf = strongSelf;
@@ -490,8 +516,8 @@ NSString * const CNLiveHostStatusChangedNotification = @&quot;CNLiveAnchorStatusChang
             url = videoUrl;
         }
-        
-        CNLivePlayerDBModel *model = [[CNLivePlayerDBModel alloc]initWithContenId:_contentId url:url];
+        NSString *key = [NSString stringWithFormat:@"%@:%@",strongSelf->_contentId, strongSelf->_rate];
+        CNLivePlayerDBModel *model = [[CNLivePlayerDBModel alloc]initWithContenId:key url:url];
         [[CNLivePlayerDBTool shared] insertTable:model];
         __weak typeof(self) weakSelf = strongSelf;
@@ -712,8 +738,11 @@ NSString * const CNLiveHostStatusChangedNotification = @&quot;CNLiveAnchorStatusChang
     NSDictionary *userInfo = notification.userInfo;
     float progress = [userInfo[CacheProgressKey] floatValue];
     if ((NSInteger)(progress * 10000) > 10000) {
+        __weak typeof(self) weakSelf = self;
         dispatch_async(dispatch_get_main_queue(), ^{
-            [[CNLivePlayerDBTool shared] updateInTable:_contentId];
+            __strong typeof(self) strongSelf = weakSelf;
+            NSString *key = [NSString stringWithFormat:@"%@:%@",strongSelf->_contentId, strongSelf->_rate];
+            [[CNLivePlayerDBTool shared] updateInTable:key];
         });
     }
 }
@@ -869,6 +898,7 @@ NSString * const CNLiveHostStatusChangedNotification = @&quot;CNLiveAnchorStatusChang
  * 视频暂停
  */
 - (void)pause{
+    [_player reset:YES];
     [_player pause];
 }
@@ -41,7 +41,7 @@
 }
-+ (NSString *)signvalue:(NSDictionary*)parameter {
++ (NSString *)signvalue:(NSDictionary *)parameter {
     //对所有传入参数按照字段名的 ASCII 码从小到大排序
     NSArray *keyArr=[parameter allKeys];
     NSArray *arr = [keyArr sortedArrayUsingSelector:@selector(compare:)];
@@ -22,35 +22,33 @@
     self.view.backgroundColor = [UIColor whiteColor];
     // Do any additional setup after loading the view.
-    //    _player = [[CNLivePlayer alloc]initVodPlayerWithVideoId:@"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];
-    //    } authFailed:^(NSDictionary * _Nonnull errorInfo) {
-    //        NSLog(@"%@", errorInfo);
-    //
-    //    }];
-    //1066_716fabeaafb64236b60ecf74167c5c96
-    //82_c8ff347048414b7295cef882f8361073
-    __weak typeof(self) weakSelf = self;
-    self.player = [[CNLivePlayer alloc]initAudioPlayerWithAudioId:@"1066_716fabeaafb64236b60ecf74167c5c96" authSuccess:^{
-        NSLog(@"---------------初始化播放器成功---------------");
-        __strong typeof(self) strongSelf = weakSelf;
-        strongSelf.player.view.frame = CGRectMake(0, 0, [UIScreen mainScreen].bounds.size.width, [UIScreen mainScreen].bounds.size.width*9/16.0);
-
-        [strongSelf.player prepareToPlay];
-        [strongSelf.view addSubview:weakSelf.player.view];
-
-        NSLog(@"-----%@", strongSelf.player.contentURL);
-
-
+    _player = [[CNLivePlayer alloc]initVodPlayerWithVideoId:@"82_c8ff347048414b7295cef882f8361073" authSuccess:^{
+        _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];
     } authFailure:^(NSDictionary * _Nonnull errorInfo) {
-        NSLog(@"%@", errorInfo);
-
+        
     }];
-    _player.view.frame = CGRectMake(0, 0, [UIScreen mainScreen].bounds.size.width, [UIScreen mainScreen].bounds.size.width*9/16.0);
+    
+    //1066_716fabeaafb64236b60ecf74167c5c96
+    //82_c8ff347048414b7295cef882f8361073
+//    __weak typeof(self) weakSelf = self;
+//    self.player = [[CNLivePlayer alloc]initAudioPlayerWithAudioId:@"1066_716fabeaafb64236b60ecf74167c5c96" authSuccess:^{
+//        NSLog(@"---------------初始化播放器成功---------------");
+//        __strong typeof(self) strongSelf = weakSelf;
+//        strongSelf.player.view.frame = CGRectMake(0, 0, [UIScreen mainScreen].bounds.size.width, [UIScreen mainScreen].bounds.size.width*9/16.0);
+//
+//        [strongSelf.player prepareToPlay];
+//        [strongSelf.view addSubview:weakSelf.player.view];
+//
+//        NSLog(@"-----%@", strongSelf.player.contentURL);
+//
+//
+//    } authFailure:^(NSDictionary * _Nonnull errorInfo) {
+//        NSLog(@"%@", errorInfo);
+//
+//    }];
     UIButton *btn = [UIButton buttonWithType:UIButtonTypeCustom];
     btn.frame =CGRectMake(0, 0, 100, 100);
@@ -86,12 +84,21 @@
 }
 - (void)btnDidClicked{
-    [_player setPlayerWithContentId:@"82_c8ff347048414b7295cef882f8361073" type:CNLivePlayerVod authSuccess:^{
-        [_player prepareToPlay];
+    
+    __weak typeof(self) weakSelf = self;
+    [_player setPlayerWithContentId:@"1066_716fabeaafb64236b60ecf74167c5c96" type:CNLivePlayerVod authSuccess:^{
+        __strong typeof(self) strongSelf = weakSelf;
+        [strongSelf.player prepareToPlay];
     } authFailure:^(NSDictionary * _Nonnull errorInfo) {
     }];
+//    [_player setPlayerWithRate:@"4" authSuccess:^{
+//        __strong typeof(self) strongSelf = weakSelf;
+//        [strongSelf.player prepareToPlay];
+//    } authFailure:^(NSDictionary * _Nonnull errorInfo) {
+//
+//    }];
 }
 - (void)backDidClicked{