解决答记者问部分视频不播放问题

yanglingyu
1 parent e9177677
Showing 3 changed files with 19 additions and 55 deletions
CNLiveScioLive/Pages/Home/新闻详情/OldController/OldVideoDetailViewController.h
CNLiveScioLive/Pages/Home/新闻详情/OldController/OldVideoDetailViewController.m
CNLiveScioLive/Pages/Tools/CNLivePlayer/CNLivePlayerController.m
@@ -6,7 +6,6 @@
 //  Copyright © 2018年 CNLive. All rights reserved.
 //
  
-#import "ZXVideoPlayerController.h"
 #import "CNLiveMyCollectionViewController.h"
 #import "CNLivePlayerController.h"
 #import "BaseViewController.h"
@@ -29,7 +28,6 @@
 }
 @property (strong, nonatomic) UILabel *errorLabe;
 @property (strong, nonatomic) UITableView *tableView;
-@property (strong, nonatomic) ZXVideoPlayerController *videoController;
  
 @property (nonatomic, strong) CNLivePlayerController *liveController;
  
@@ -50,9 +50,9 @@
                 NSData *data = [NSData dataWithContentsOfURL:[NSURL URLWithString:self->_dictionary[@"imgSmall"]]];
                     self->bgImg = [UIImage imageWithData:data];
                 dispatch_async(dispatch_get_main_queue(), ^{
-                    if (self.videoController && self->bgImg) {
-                        self.videoController.view.contentMode=UIViewContentModeScaleToFill;
-                            self.videoController.view.layer.contents = (__bridge id _Nullable) (self->bgImg.CGImage);
+                    if (self.liveController && self->bgImg) {
+                        self.liveController.view.contentMode=UIViewContentModeScaleToFill;
+                            self.liveController.view.layer.contents = (__bridge id _Nullable) (self->bgImg.CGImage);
  
                     }
                 });
@@ -95,7 +95,6 @@
 {
     [self.liveController stop];
     self.liveController = nil;
-    self.videoController = nil;
     NSLog(@"delloc");
 }
 - (void)loadShareView {
@@ -201,7 +200,6 @@
 }
 - (void)viewWillDisappear:(BOOL)animated {
     [super viewWillDisappear:animated];
-    [self.videoController stop];
     [self.liveController stopShow];
 //    self.liveController = nil;
     [self.navigationController setNavigationBarHidden:NO];
@@ -269,11 +267,7 @@
     [backgroundView addSubview:self.errorLabe];
     self.errorLabe.text = @"没有数据";
     self.errorLabe.hidden = YES;
-    if (!_dictionary[@"imgSmall"]||[_dictionary[@"imgSmall"] isEqualToString:@""]) {
         [self addCNLivePlayer];
-    } else {
-        [self addZXVideo:movieUrl];
-    }
 }
  
 // CNLivePlayer
@@ -290,6 +284,10 @@
         [bgView addSubview:backButton];
         [self.view addSubview:bgView];
         self.liveController = [[CNLivePlayerController alloc] initWithContentURL:[NSURL URLWithString:self -> url]];
+        if (!(nil==bgImg)) {
+            self.liveController.view.contentMode=UIViewContentModeScaleToFill;
+                self.liveController.view.layer.contents = (__bridge id _Nullable)(self->bgImg.CGImage);
+        }
         [[AVAudioSession sharedInstance] setActive:YES error:nil];
         [bgView removeFromSuperview];
         [self.liveController configPlayerWithFrame:frame isLiving:NO];
@@ -317,44 +315,6 @@
             [strongSelf.liveController destroyPlayer];
 //            strongSelf.liveController = nil;
             [strongSelf Pop:nil];
-        };
-    }
-    ZXVideo *video = [[ZXVideo alloc] init];
-    video.title = _dictionary[@"title"];
-    video.playUrl = url;
-    self.liveController.video = video;
-}
-- (void)viewDidDisappear:(BOOL)animated{
-    [(AppDelegate *)[UIApplication sharedApplication].delegate initializeSDKConfiguration];
-
-}
-- (void)backButtonAction:(UIButton *)sender {
-    [(AppDelegate *)[UIApplication sharedApplication].delegate initializeSDKConfiguration];
-    [self.navigationController popViewControllerAnimated:YES];
-}
-
-- (void)addZXVideo:(NSURL *)videoUrl {
-    if (!self.videoController) {
-        CGRect frame = CGRectMake(0, iPhoneX ? 44 : 0, MainScreenWidth, videoHeight);
-        self.videoController = [[ZXVideoPlayerController alloc] initWithFrame:frame];
-        //增加播放器背景图片
-        if (!(nil==bgImg)) {
-            self.videoController.view.contentMode=UIViewContentModeScaleToFill;
-                self.videoController.view.layer.contents = (__bridge id _Nullable)(self->bgImg.CGImage);
-        }
-        self.liveController.delegate = self;
-        [self.videoController showInView:self.view];
-        
-        __weak typeof(self) weakSelf = self;
-        self.videoController.videoPlayerShare = ^{
-            __strong typeof(self) strongSelf = weakSelf;
-            [strongSelf shareButtonTaped:strongSelf->_shareBtn];
-        };
-        self.videoController.videoPlayerGoBackBlock = ^{
-            __strong typeof(self) strongSelf = weakSelf;
-            [[NSUserDefaults standardUserDefaults] setObject:@0 forKey:@"ZXVideoPlayer_DidLockScreen"];
-//            strongSelf.videoController = nil;
-            [strongSelf Pop:nil];
             //时长统计结束
             if ([strongSelf->_dictionary[@"cmsColumnId"] isEqualToString:@"spzl/djzw/"]) {
                 //记者问答
@@ -380,9 +340,7 @@
             }
  
         };
- 
     }
-    
     //时长统计开始
     if ([_dictionary[@"cmsColumnId"] isEqualToString:@"spzl/djzw/"]) {
         //记者问答
@@ -407,10 +365,19 @@
         [CNLiveStat beginEvent:@"gxzssc"];
     }
     ZXVideo *video = [[ZXVideo alloc] init];
-    video.playUrl = url;
     video.title = _dictionary[@"title"];
-    self.videoController.video = video;
+    video.playUrl = url;
+    self.liveController.video = video;
+}
+- (void)viewDidDisappear:(BOOL)animated{
+    [(AppDelegate *)[UIApplication sharedApplication].delegate initializeSDKConfiguration];
+
 }
+- (void)backButtonAction:(UIButton *)sender {
+    [(AppDelegate *)[UIApplication sharedApplication].delegate initializeSDKConfiguration];
+    [self.navigationController popViewControllerAnimated:YES];
+}
+
 - (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler {
     NSURL *requestURL = webView.URL;
     if (([[requestURL scheme] isEqualToString: @"http"] || [[requestURL scheme] isEqualToString:@"https"] || [[requestURL scheme] isEqualToString: @"mailto" ]) && (navigationAction.navigationType == WKNavigationTypeLinkActivated)) {