no message

zhangxiaowen
1 parent e49b9a9a
Showing 4 changed files with 13 additions and 8 deletions
CNLivePlayer/Classes/DataRequest/CNLivePlayerNetworkManager.h
CNLivePlayer/Classes/DataRequest/CNLivePlayerNetworkManager.m
CNLivePlayer/Classes/Player/CNLivePlayer.m
Example/CNLivePlayer/CNLivePlayerController.m
@@ -52,7 +52,7 @@ typedef void(^GetVideoURLSuccessBlock)(NSString * _Nullable videoURL, NSInteger 
 /**
  *  获取视频url
  */
-+ (void)getVideoURL:(nullable NSString *)URL success:(GetVideoURLSuccessBlock)success;
+- (void)getVideoURL:(nullable NSString *)URL success:(GetVideoURLSuccessBlock)success;
 @end
@@ -177,8 +177,8 @@ static CNLivePlayerNetworkManager *_manager = nil;
 /**
  *  获取视频url
  */
-+ (void)getVideoURL:(nullable NSString *)URL success:(GetVideoURLSuccessBlock)success {
-    [CNLivePlayerNetworkManager manager].successBlock = success;
+- (void)getVideoURL:(nullable NSString *)URL success:(GetVideoURLSuccessBlock)success {
+    _manager.successBlock = success;
     _manager.result = NO;
     NSURLSessionConfiguration *sessionConfig = [NSURLSessionConfiguration defaultSessionConfiguration];
@@ -264,6 +264,10 @@ NSString * const CNLiveHostStatusChangedNotification = @&quot;CNLiveAnchorStatusChang
     [self removeMovieNotificationObservers];
     [self removeHostStatusNotificationObservers];
+    if (PLAYER_TestEnvironment) {
+        NSLog(@"CNLivePlayer-->dealloc");
+    }
+    
 }
 - (void)dealloc {
@@ -315,7 +319,7 @@ NSString * const CNLiveHostStatusChangedNotification = @&quot;CNLiveAnchorStatusChang
         }else{
             __weak typeof(self) weakSelf = self;
             //4.不存在鉴权成功,先请求鉴权
-            [weakSelf authenticateSuccess:^{
+            [self authenticateSuccess:^{
                 //5.鉴权成功,再请求url
                 __strong typeof(self) strongSelf = weakSelf;
                 if([strongSelf->_contentType isEqualToString:@"vod"]){
@@ -405,9 +409,9 @@ NSString * const CNLiveHostStatusChangedNotification = @&quot;CNLiveAnchorStatusChang
     NSString *videoUrl = [CNLivePlayerTools encryptionSignWithUrl:vodUrl parameter:parameter];
     __weak typeof(self) weakSelf = self;
-    [CNLivePlayerNetworkManager getVideoURL:videoUrl success:^(NSString * _Nullable videoURL, NSInteger code) {
+    [[CNLivePlayerNetworkManager manager] getVideoURL:videoUrl success:^(NSString * _Nullable videoURL, NSInteger code) {
         __strong typeof(self) strongSelf = weakSelf;
-        CNLivePlayerDBModel *model = [[CNLivePlayerDBModel alloc]initWithContenId:self->_contentId url:videoUrl];
+        CNLivePlayerDBModel *model = [[CNLivePlayerDBModel alloc]initWithContenId:self->_contentId url:videoURL];
         [[CNLivePlayerDBTool shared] insertTable:model];
         __weak typeof(self) weakSelf = strongSelf;
@@ -637,6 +641,7 @@ NSString * const CNLiveHostStatusChangedNotification = @&quot;CNLiveAnchorStatusChang
         if (!_preparedToPlay && !_statTimer) {
             [self mediaIsPreparedToPlayDidChange:nil];
         }
+        
     }
 }
@@ -34,7 +34,7 @@
     //1066_716fabeaafb64236b60ecf74167c5c96
     //82_c8ff347048414b7295cef882f8361073
-    _player = [[CNLivePlayer alloc]initAudioPlayerWithAudioId:@"82_c8ff347048414b7295cef882f8361073" authSuccess:^{
+    _player = [[CNLivePlayer alloc]initAudioPlayerWithAudioId:@"1066_716fabeaafb64236b60ecf74167c5c96" authSuccess:^{
         NSLog(@"---------------初始化播放器成功---------------");
         _player.view.frame = CGRectMake(0, 0, [UIScreen mainScreen].bounds.size.width, [UIScreen mainScreen].bounds.size.width*9/16.0);
@@ -84,7 +84,7 @@
 }
 - (void)btnDidClicked{
-    [_player setPlayerWithContentId:@"1066_716fabeaafb64236b60ecf74167c5c96" type:CNLivePlayerVod authSuccess:^{
+    [_player setPlayerWithContentId:@"82_c8ff347048414b7295cef882f8361073" type:CNLivePlayerVod authSuccess:^{
         [_player prepareToPlay];
     } authFailure:^(NSDictionary * _Nonnull errorInfo) {