Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud

张旭
2 parents 6137bf4a fe5ffd1c
Showing 5 changed files with 51 additions and 51 deletions
LiveVideoCloud/AppDelegate/AppDelegate.m
LiveVideoCloud/Classes/Sections/PGCSections/Controller/LVCLivePlayerController.m
LiveVideoCloud/Classes/Sections/PGCSections/Controller/LVCTelevisioController.m
LiveVideoCloud/Classes/Sections/PGCSections/View/LVCPlayer.h
LiveVideoCloud/Classes/Sections/PGCSections/View/LVCPlayer.m
@@ -22,7 +22,7 @@
     self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
     self.window.rootViewController = [[ZXTabBarController alloc] init];
  
-    //初始化直播SDK
+    //APP 启动是初始化直播SDK
     [[CNLiveWebcastManager manager] initWithAppId:UserAppId appKey:UserAppKey isTestEnvironment:YES];
  
     //初始化聊天SDK并连接服务器
@@ -45,7 +45,7 @@
  
     // 20170327 20170328
  
-    CNLiveChatUserInfo *userInfo = [[CNLiveChatUserInfo alloc] initWithUserId:@"20170328" name:@"20170328" portrait:@""];
+    CNLiveChatUserInfo *userInfo = [[CNLiveChatUserInfo alloc] initWithUserId:@"20170328ll" name:@"20170328" portrait:@""];
     [[CNLiveChatManager sharedCNLiveChatManager] loginServer:userInfo success:^(NSString *userId) {
         NSLog(@"连接服务器-----success");
  
@@ -41,11 +41,18 @@
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
+    self.navigationController.navigationBar.hidden = YES;
     [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent];
     [[UIApplication sharedApplication] setStatusBarHidden:NO withAnimation:UIStatusBarAnimationFade];
  
 }
  
+- (void)viewDidDisappear:(BOOL)animated
+{
+    [super viewDidDisappear:animated];
+    self.navigationController.navigationBar.hidden = NO;
+}
+
 - (void)viewWillDisappear:(BOOL)animated
 {
     [super viewWillDisappear:animated];
@@ -99,6 +106,7 @@
  
 - (void)addObservers
 {
+    //设备旋转
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(onDeviceOrientationChange:)
                                                  name:UIDeviceOrientationDidChangeNotification
@@ -263,7 +271,6 @@
         [_chatView quitChatroom];
         [self removeViews];
  
-        self.navigationController.navigationBar.hidden = NO;
         [self.navigationController popViewControllerAnimated:YES];
     }
 }
@@ -13,7 +13,7 @@
  
 @interface LVCTelevisioController ()<UITableViewDelegate, UITableViewDataSource>
 {
-    NSMutableArray *_channelsModelArray;
+    NSMutableArray *_channelsModelArray;        //数据源
 }
  
 @property (nonatomic, strong) UITableView *tableView;
@@ -21,13 +21,18 @@
 @end
  
 @implementation LVCTelevisioController
+- (void)viewWillAppear:(BOOL)animated {
+    [super viewWillAppear:animated];
+     self.edgesForExtendedLayout = UIRectEdgeNone;
+    self.navigationController.navigationBar.hidden = NO;
+}
  
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     self.view.backgroundColor = [UIColor whiteColor];
     self.navigationItem.title = @"直播";
-    
+
     _channelsModelArray = [[NSMutableArray alloc] init];
  
     [self.view addSubview:self.tableView];
@@ -37,6 +42,7 @@
  
 - (void)loadData {
  
+    //demo使用的是本地数据
     NSString *path = [[NSBundle mainBundle] pathForResource:@"TelevisionData" ofType:@"json"];
     NSData *data=[NSData dataWithContentsOfFile:path];
     NSError *error;
@@ -93,7 +99,7 @@
 - (UITableView *)tableView
 {
     if (!_tableView) {
-        _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT-49) style:UITableViewStylePlain];
+        _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT-49-64) style:UITableViewStylePlain];
         _tableView.delegate = self;
         _tableView.dataSource = self;
     }
@@ -31,7 +31,7 @@ typedef void(^HideInputViewBlock)(BOOL hide);
 @property (nonatomic, strong) UIImageView *contentView;             //所有空间统一管理在这个view中
 @property (nonatomic, strong) LVCTelevisionModel *model;             //所有空间统一管理在这个view中
 @property (nonatomic, readwrite, assign) BOOL isFullScreen;         //是否是全屏
-@property (nonatomic, copy) HideInputViewBlock  hideBlock;               //全屏模式下是否隐藏输入框
+@property (nonatomic, copy) HideInputViewBlock  hideBlock;            //全屏模式下是否隐藏输入框
 @property (nonatomic, assign, readonly) BOOL displayBarrage;          //是否显示弹幕
 @property (nonatomic, assign) id<LVCPlayerDelegate> delegate;
  
@@ -39,6 +39,6 @@ typedef void(^HideInputViewBlock)(BOOL hide);
  
 - (void)autoHideControlView;        //自动隐藏上下功能条
  
-- (void)stopPlaying;        //停止播放
+- (void)stopPlaying;                //停止播放
  
 @end
@@ -33,6 +33,7 @@
  
 - (void)dealloc
 {
+    [self exitPlayer];
     NSLog(@"LVCPlayer dealloc");
 }
  
@@ -72,9 +73,9 @@
     NSString *channelId = [NSString stringWithFormat:@"82_%@",model.mediaId];
     _player = [[CNLiveMoviePlayerController alloc] initLivePlayWithChannelId:channelId anchorStatus:NO authSuccess:^{
         [self addObservers];
-        _player.videoDecoderMode = CNLiveMovieVideoDecoderMode_AUTO;
-        _player.shouldAutoplay = YES;
-        [_player prepareToPlay];
+        _player.videoDecoderMode = CNLiveMovieVideoDecoderMode_AUTO;    //自动解码
+        _player.shouldAutoplay = YES;                                   //自动播放
+        [_player prepareToPlay];                                        //准备播放
         [self.contentView addSubview:_player.view];
         [self.contentView sendSubviewToBack:_player.view];
  
@@ -86,31 +87,12 @@
         [_loadingView stopLoading];
  
     } getAnchorStatusResult:NULL];
-    
-    /*
-     //点播播放
-     _player = [[CNLiveMoviePlayerController alloc] initVodPlayWithVId:@"aaa123"
-     authSuccess:^{
-     
-     [self addObservers];
-     _player.videoDecoderMode = CNLiveMovieVideoDecoderMode_AUTO;
-     _player.shouldAutoplay = YES;
-     [_player prepareToPlay];
-     [self.contentView addSubview:_player.view];
-     [self.contentView sendSubviewToBack:_player.view];
-     
-     [self makePlayerConstraint];
-     
-     
-     } authFailed:^(NSDictionary *errorInfo) {
-     NSLog(@"初始化点播播放器失败%@", errorInfo);
-     
-     }];
-     */
+
 }
  
 #pragma mark -
 #pragma mark - action
+//播放/暂停
 - (void)playOrPauseBtnAction:(UIButton *)btn
 {
     if (btn.selected) {
@@ -123,6 +105,7 @@
  
 }
  
+//返回
 - (void)backBtnAction:(UIButton *)btn
 {
     if (self.delegate && [self.delegate respondsToSelector:@selector(lvcPlayer:clickedBackBtn:)]) {
@@ -130,14 +113,15 @@
     }
 }
  
+//全屏
 - (void)fullScreenBtnAction:(UIButton *)btn
 {
     if (self.delegate && [self.delegate respondsToSelector:@selector(lvcPlayer:clickedFullScreenBtn:)]) {
         [self.delegate lvcPlayer:self clickedFullScreenBtn:btn];
     }
-   
 }
  
+//弹幕
 - (void)barrageSwitchAction
 {
     self.editBtn.hidden =! self.barrageSwitch.on;
@@ -148,6 +132,7 @@
  
 }
  
+//编辑弹幕
 - (void)editBtnAction:(UIButton *)btn
 {
     if (self.hideBlock) {
@@ -161,7 +146,7 @@
     }
 }
  
-
+//单击显示和隐藏工具条
 - (void)singleTapView
 {
     [UIView animateWithDuration:0.25 animations:^{
@@ -181,6 +166,7 @@
  
 }
  
+//自动隐藏工具条
 - (void)autoHideControlView
 {
     if (!_timer) {
@@ -192,6 +178,7 @@
     }
 }
  
+//手动隐藏工具条
 - (void)hideControlView
 {
  
@@ -211,8 +198,7 @@
     }
 }
  
-#pragma mark -
-#pragma mark - LVCPlayerLoadingViewDelegate
+//播放异常，重试
 - (void)retryBtnClick
 {
     [_loadingView setLVCPlayerStatus:LVCPlayerStatusStartLoading];
@@ -272,6 +258,7 @@
                                                object:nil];
 }
  
+//加载状态通知
 - (void)loadStateDidChange:(NSNotification *)notification
 {
     if (_player) {
@@ -291,6 +278,7 @@
     }
 }
  
+//播放完成通知，当状态为MPMovieFinishReasonPlaybackError时为异常结束，应显示重试页面
 - (void)moviePlayBackDidFinish:(NSNotification *)notification
 {
     if (_player) {
@@ -314,6 +302,7 @@
     }
 }
  
+//播放状态改变通知
 - (void)moviePlayBackStateDidChange:(NSNotification *)notification
 {
     if (_player) {
@@ -361,6 +350,7 @@
     return netString;
 }
  
+//退到后台将播放器暂停
 - (void)appResignActive:(NSNotification *)noti
 {
     if (_player.playbackState == MPMoviePlaybackStatePlaying) {
@@ -368,6 +358,7 @@
     }
 }
  
+//回到前台继续播放
 - (void)appBecomeActive:(NSNotification *)noti
 {
     if (_player.playbackState == MPMoviePlaybackStatePaused) {
@@ -377,9 +368,14 @@
  
 #pragma mark -
 #pragma mark - public
+//停止播放
 - (void)stopPlaying
 {
-    [_player stop];
+    if (_player) {
+        [_player stop];     //注* stop调用多次是会导致崩溃
+    }
+    
+    [_player destroyPlayer];
     _player = nil;
  
     if (_timer) {
@@ -392,18 +388,7 @@
  
 - (void)removeMovieNotificationObservers
 {
-    [[NSNotificationCenter defaultCenter]removeObserver:self
-                                                   name:MPMoviePlayerLoadStateDidChangeNotification
-                                                 object:nil];
-    [[NSNotificationCenter defaultCenter]removeObserver:self
-                                                   name:MPMoviePlayerPlaybackDidFinishNotification
-                                                 object:nil];
-    [[NSNotificationCenter defaultCenter]removeObserver:self
-                                                   name:MPMediaPlaybackIsPreparedToPlayDidChangeNotification
-                                                 object:nil];
-    [[NSNotificationCenter defaultCenter]removeObserver:self
-                                                   name:MPMoviePlayerPlaybackStateDidChangeNotification
-                                                 object:nil];
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
  
 #pragma mark -
@@ -511,18 +496,20 @@
 }
  
 - (void)exitPlayer {
-    if (_player.isPlaying) {
+    
+    if (_player) {
         [_player stop];
     }
  
     [_player destroyPlayer];
     _player = nil;
-    [self removeMovieNotificationObservers];
  
     if (_timer) {
         [_timer invalidate];
         _timer = nil;
     }
+    
+    [self removeMovieNotificationObservers];
 }
  
 #pragma mark -