修复bug

朱林
1 parent 2ef8d273
Showing 22 changed files with 265 additions and 174 deletions
LiveVideoCloud/LiveVideoCloud.xcodeproj/project.pbxproj
LiveVideoCloud/LiveVideoCloud/AppDelegate/AppDelegate.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/ChatView/LVCChatView.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/ChatView/LVCChatView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/ChatView/LVCChatViewTableViewCell.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/ChatView/LVCMessage.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/ChatView/LVCMessage.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCLivePlayerController.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCMoreProgramViewController.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Model/LVCBannerModel.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Model/LVCBannerModel.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/View/LVCFirstHeaderReusableView.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/View/LVCFirstHeaderReusableView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/View/LVCPlayer.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/View/LVCPlayerLoadingView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/View/LVCRequestFailedView.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/View/LVCRequestFailedView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/View/LVCTelevisionView.m
LiveVideoCloud/LiveVideoCloud/animation.xcassets/Interaction/22.imageset/Contents.json
LiveVideoCloud/LiveVideoCloud/animation.xcassets/Interaction/privateChat11.imageset/Contents.json
@@ -32,7 +32,6 @@
 		81A1B9A91E8277410079FF5F /* LVCInputView.m in Sources */ = {isa = PBXBuildFile; fileRef = 81A1B9A81E8277410079FF5F /* LVCInputView.m */; };
 		81A482F51E88ACC80097A80A /* LVCTelevisionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 81A482F41E88ACC80097A80A /* LVCTelevisionView.m */; };
 		81A482F81E88AFA20097A80A /* LVCFirstHeaderReusableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 81A482F71E88AFA20097A80A /* LVCFirstHeaderReusableView.m */; };
-		81A483011E88B0130097A80A /* LVCBannerModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 81A482FE1E88B0130097A80A /* LVCBannerModel.m */; };
 		81A483021E88B0130097A80A /* LVCChatRoomModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 81A483001E88B0130097A80A /* LVCChatRoomModel.m */; };
 		81A483051E88B32C0097A80A /* LVCHeaderRollCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 81A483041E88B32C0097A80A /* LVCHeaderRollCollectionViewCell.m */; };
 		81A483081E88B6140097A80A /* UIView+ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81A483071E88B6140097A80A /* UIView+ViewController.m */; };
@@ -44,6 +43,7 @@
 		81A4831A1E88E19C0097A80A /* LVCMoreProgramViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81A483191E88E19C0097A80A /* LVCMoreProgramViewController.m */; };
 		81A4831D1E88E1EB0097A80A /* LVCMoreSortTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 81A4831C1E88E1EB0097A80A /* LVCMoreSortTableViewCell.m */; };
 		81A483201E88F4BF0097A80A /* LVCProgramModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 81A4831F1E88F4BF0097A80A /* LVCProgramModel.m */; };
+		81CE9E1B1E8CF567000F8F6B /* LVCRequestFailedView.m in Sources */ = {isa = PBXBuildFile; fileRef = 81CE9E1A1E8CF567000F8F6B /* LVCRequestFailedView.m */; };
 		81F1C8381E8BBDDA0085C2B8 /* MHPagingScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 81F1C8371E8BBDDA0085C2B8 /* MHPagingScrollView.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		81F1C83D1E8BBDE40085C2B8 /* V8HorizontalPickerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 81F1C83B1E8BBDE40085C2B8 /* V8HorizontalPickerView.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		81F1C8401E8BC5CC0085C2B8 /* NSArray+Safety.m in Sources */ = {isa = PBXBuildFile; fileRef = 81F1C83F1E8BC5CC0085C2B8 /* NSArray+Safety.m */; };
@@ -298,8 +298,6 @@
 		81A482F41E88ACC80097A80A /* LVCTelevisionView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = LVCTelevisionView.m; path = LiveVideoCloud/Classes/Sections/homeSections/View/LVCTelevisionView.m; sourceTree = SOURCE_ROOT; };
 		81A482F61E88AFA20097A80A /* LVCFirstHeaderReusableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCFirstHeaderReusableView.h; sourceTree = "<group>"; };
 		81A482F71E88AFA20097A80A /* LVCFirstHeaderReusableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCFirstHeaderReusableView.m; sourceTree = "<group>"; };
-		81A482FD1E88B0130097A80A /* LVCBannerModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCBannerModel.h; sourceTree = "<group>"; };
-		81A482FE1E88B0130097A80A /* LVCBannerModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCBannerModel.m; sourceTree = "<group>"; };
 		81A482FF1E88B0130097A80A /* LVCChatRoomModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCChatRoomModel.h; sourceTree = "<group>"; };
 		81A483001E88B0130097A80A /* LVCChatRoomModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCChatRoomModel.m; sourceTree = "<group>"; };
 		81A483031E88B32C0097A80A /* LVCHeaderRollCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCHeaderRollCollectionViewCell.h; sourceTree = "<group>"; };
@@ -322,6 +320,8 @@
 		81A4831C1E88E1EB0097A80A /* LVCMoreSortTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCMoreSortTableViewCell.m; sourceTree = "<group>"; };
 		81A4831E1E88F4BF0097A80A /* LVCProgramModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCProgramModel.h; sourceTree = "<group>"; };
 		81A4831F1E88F4BF0097A80A /* LVCProgramModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCProgramModel.m; sourceTree = "<group>"; };
+		81CE9E191E8CF567000F8F6B /* LVCRequestFailedView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCRequestFailedView.h; sourceTree = "<group>"; };
+		81CE9E1A1E8CF567000F8F6B /* LVCRequestFailedView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCRequestFailedView.m; sourceTree = "<group>"; };
 		81F1C8361E8BBDDA0085C2B8 /* MHPagingScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MHPagingScrollView.h; sourceTree = "<group>"; };
 		81F1C8371E8BBDDA0085C2B8 /* MHPagingScrollView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MHPagingScrollView.m; sourceTree = "<group>"; };
 		81F1C83A1E8BBDE40085C2B8 /* V8HorizontalPickerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = V8HorizontalPickerView.h; sourceTree = "<group>"; };
@@ -762,8 +762,6 @@
 		81A482FC1E88B0130097A80A /* Model */ = {
 			isa = PBXGroup;
 			children = (
-				81A482FD1E88B0130097A80A /* LVCBannerModel.h */,
-				81A482FE1E88B0130097A80A /* LVCBannerModel.m */,
 				81A4830C1E88B8300097A80A /* LVCChannelsModel.h */,
 				81A4830D1E88B8300097A80A /* LVCChannelsModel.m */,
 				81A4830F1E88B8630097A80A /* LVCChannelDetailsModel.h */,
@@ -1719,6 +1717,8 @@
 				81A483041E88B32C0097A80A /* LVCHeaderRollCollectionViewCell.m */,
 				8112D42F1E7927A5002E00F6 /* LVCPlayerLoadingView.h */,
 				8112D4301E7927A5002E00F6 /* LVCPlayerLoadingView.m */,
+				81CE9E191E8CF567000F8F6B /* LVCRequestFailedView.h */,
+				81CE9E1A1E8CF567000F8F6B /* LVCRequestFailedView.m */,
 				D2A089E61E89FA720071412C /* LVCUGCLivePlayerCell.h */,
 				D2A089E71E89FA720071412C /* LVCUGCLivePlayerCell.m */,
 				D25BF8811E7F775F007FB138 /* LVCUGCPlayerLoadingView.h */,
@@ -2037,7 +2037,6 @@
 				D2029C9F1E6EADE10027CD92 /* NSObject+MJKeyValue.m in Sources */,
 				D25BF8A01E80C4BD007FB138 /* UIImage+LVCVagueImage.m in Sources */,
 				D2888DB11E6EC05F003A77C8 /* TempViewController.m in Sources */,
-				81A483011E88B0130097A80A /* LVCBannerModel.m in Sources */,
 				810B65021E779B1F00133E15 /* MASViewAttribute.m in Sources */,
 				D2B7B2511E8247D400ED084E /* ChatBarrageManager.m in Sources */,
 				D2029CAC1E6EADE10027CD92 /* MJRefreshBackStateFooter.m in Sources */,
@@ -2077,6 +2076,7 @@
 				D25BF87A1E7B8A82007FB138 /* FilterFunctionView.m in Sources */,
 				D207BEA11E84C1EC006A0CE8 /* AnimationBaseView.m in Sources */,
 				D2029D001E6EAE2E0027CD92 /* NSNumber+ScaleHeight.m in Sources */,
+				81CE9E1B1E8CF567000F8F6B /* LVCRequestFailedView.m in Sources */,
 				D2888D9E1E6EBF1B003A77C8 /* LVCLiveViewController.m in Sources */,
 				D2029C951E6EADE10027CD92 /* UIWebView+AFNetworking.m in Sources */,
 				810B650A1E77B39D00133E15 /* LVCFullScreenPlayerController.m in Sources */,
@@ -38,10 +38,13 @@
      NSLog(@"连接服务器失败-----%ld", errors);
      }];
      */
-    // 20170327 20170328
+    
     /*
+     CNLiveChatUserInfo *userInfo = [[CNLiveChatUserInfo alloc] initWithUserId:@"20170311" name:@"zzllzzzll" portrait:@"https://y3.cnliveimg.com/mobile/images/mobilehead/2017/03/30/1490844962259_small.jpg"];
      */
-    CNLiveChatUserInfo *userInfo = [[CNLiveChatUserInfo alloc] initWithUserId:@"20170328" name:@"20170328" portrait:@""];
+
+    // 20170327 20170328
+    CNLiveChatUserInfo *userInfo = [[CNLiveChatUserInfo alloc] initWithUserId:@"20170311" name:@"zzllzzzll" portrait:@"https://y3.cnliveimg.com/mobile/images/mobilehead/2017/03/30/1490844962259_small.jpg"];
     [[CNLiveChatManager sharedCNLiveChatManager] loginServer:userInfo success:^(NSString *userId) {
         NSLog(@"连接服务器-----success");
@@ -24,5 +24,4 @@
 - (void)sendMsgWithMessage:(NSString *)message;
-
 @end
@@ -75,23 +75,23 @@
         LVCMessage *msg = [LVCMessage messageWihtContent:message isRight:YES];
         dispatch_sync(dispatch_get_main_queue(), ^{
-            [self addData:msg];
             if (self.delegate && [self.delegate respondsToSelector:@selector(lvcChatView:sendBarrageWithModel:)]) {
                 [self.delegate lvcChatView:self sendBarrageWithModel:model];
             }
+            [self addData:msg];
         });
-        NSLog(@"电视台--发送消息---success-（%@）",msg.content);
-        
     } error:^(CNLiveChatErrorCode errors, NSString *messageId, NSString *targetId) {
         NSLog(@"电视台--发送消息---failed-（%ld）",(long)errors);
-        
+        [SVProgressHUD showInfoWithStatus:@"抱歉，消息发送失败~"];
     }];
 }
 //退出聊天室
 - (void)quit
 {
+    if (!_roomId) return;   //如果聊天室不存在，不作处理
+    
     [[CNLiveChatManager sharedCNLiveChatManager] quitChatRoom:_roomId success:^(NSString *targetId) {
         NSLog(@"电视台--退出聊天室---success-%@",targetId);
     } error:^(CNLiveChatErrorCode errors, NSString *targetId) {
@@ -106,12 +106,19 @@
     //接收消息
      dispatch_queue_t globalQueue=dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0);
     dispatch_async(globalQueue, ^{
-        LVCMessage *msg = [LVCMessage messageWihtContent:message isRight:NO];
+        NSString *myUserId = [CNLiveChatManager sharedCNLiveChatManager].currentUserInfo.userId;
+       
+        LVCMessage *msg;
+        if ([message.userInfo.userId isEqualToString:myUserId]) {
+           msg = [LVCMessage messageWihtContent:message isRight:YES];
+        } else {
+            msg = [LVCMessage messageWihtContent:message isRight:NO];
+        }
         chatMsgModel *model = [[chatMsgModel alloc] init];
         model.content = message.messageContent;
         model.isMine = NO;
-       
+        
         dispatch_sync(dispatch_get_main_queue(), ^{
             [self addData:msg];
             if (self.delegate && [self.delegate respondsToSelector:@selector(lvcChatView:sendBarrageWithModel:)]) {
@@ -51,13 +51,15 @@
         _bgImageView.frame = message.popFrame;
         _messageLab.text = message.content;
         _messageLab.frame = message.contentFrame;
-        _nickNameLab.frame = message.nikenameFrame;
         _iconImageView.frame = message.portraitsFrame;
         [_iconImageView sd_setImageWithURL:[NSURL URLWithString:message.portraits] placeholderImage:[UIImage imageNamed:@"touxiang"]];
         _lineLab.hidden = YES;
+        _nickNameLab.hidden = YES;
     } else {                    //收到的消息
+        _lineLab.hidden = NO;
+        _nickNameLab.hidden = NO;
         UIImage *bgImage = [UIImage imageNamed:@"Gift box"];
         bgImage = [bgImage stretchableImageWithLeftCapWidth:10 topCapHeight:27];
         _bgImageView.image = bgImage;
@@ -65,7 +67,6 @@
         _nickNameLab.text = message.nikename;
         _nickNameLab.frame = message.nikenameFrame;
         _lineLab.frame = message.lineFrame;
-        _lineLab.hidden = NO;
         [_iconImageView sd_setImageWithURL:[NSURL URLWithString:message.portraits] placeholderImage:[UIImage imageNamed:@"touxiang"]];
         _iconImageView.frame = message.portraitsFrame;
         _messageLab.text = message.content;
@@ -80,6 +81,8 @@
 {
     if (!_iconImageView) {
         _iconImageView = [[UIImageView alloc] init];
+        _iconImageView.layer.masksToBounds = YES;
+        _iconImageView.layer.cornerRadius = HEAD_SIZE/2;
     }
     return _iconImageView;
 }
@@ -23,7 +23,6 @@
 @property (nonatomic, assign, readonly) BOOL isRight;               //是否是接收者
-
 //构造消息对象 -- 消息文本
 + (instancetype)messageWihtContent:(CNLiveChatMessage *)content isRight:(BOOL)isRight;
@@ -12,6 +12,8 @@
 #define ICON_TOP_SPACE  8.0         //头像与cell间距
 #define POP_TOP_SPACE   10          //pop与cell间距
+#define KScreenWidth ([UIScreen mainScreen].bounds.size.width > [UIScreen mainScreen].bounds.size.height ? [UIScreen mainScreen].bounds.size.height : [UIScreen mainScreen].bounds.size.width)
+
 @interface LVCMessage ()
 @property (nonatomic, strong) NSString *nikename;           //昵称
@@ -39,34 +41,38 @@
     msg.nikename = content.userInfo.name;
     msg.portraits = content.userInfo.portraitUri;
-    CGFloat width = SCREEN_WIDTH > SCREEN_HEIGHT ? SCREEN_HEIGHT : SCREEN_WIDTH;
+    CGRect contentRect = [msg.content boundingRectWithSize:CGSizeMake((KScreenWidth-60)*0.8, MAXFLOAT) options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:14]} context:nil];
+    
+    CGRect nameRect = [msg.nikename boundingRectWithSize:CGSizeMake((KScreenWidth-60)*0.8, MAXFLOAT) options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:10]} context:nil];
-    CGRect rect = [msg.content boundingRectWithSize:CGSizeMake((width-60)*0.8, MAXFLOAT) options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:14]} context:nil];
     CGRect frameOfLabel = CGRectZero;
-    frameOfLabel.size = rect.size;
+    frameOfLabel.size = contentRect.size;
     if (isRight) {      //我的消息
-        msg.portraitsFrame = CGRectMake(SCREEN_WIDTH-45, ICON_TOP_SPACE, ICON_WIDTH, ICON_WIDTH);
+        msg.portraitsFrame = CGRectMake(KScreenWidth-45, ICON_TOP_SPACE, ICON_WIDTH, ICON_WIDTH);
-        msg.popFrame = CGRectMake(SCREEN_WIDTH-60-CGRectGetWidth(rect)-POP_TOP_SPACE, POP_TOP_SPACE, CGRectGetWidth(rect)+2*POP_TOP_SPACE, CGRectGetHeight(rect)+2*POP_TOP_SPACE);
+        msg.popFrame = CGRectMake(KScreenWidth-60-CGRectGetWidth(contentRect)-POP_TOP_SPACE, POP_TOP_SPACE, CGRectGetWidth(contentRect)+2*POP_TOP_SPACE, CGRectGetHeight(contentRect)+2*POP_TOP_SPACE);
-        msg.contentFrame = CGRectMake(POP_TOP_SPACE, POP_TOP_SPACE, CGRectGetWidth(rect), CGRectGetHeight(rect));
+        msg.contentFrame = CGRectMake(POP_TOP_SPACE, POP_TOP_SPACE, CGRectGetWidth(contentRect), CGRectGetHeight(contentRect));
         msg.cellHeight = CGRectGetHeight(msg.popFrame)+20;
     } else {        //收到的消息
-        msg.nikenameFrame = CGRectMake(POP_TOP_SPACE, ICON_TOP_SPACE, CGRectGetWidth(rect), 12);
+        CGFloat maxWith =  CGRectGetWidth(nameRect) > CGRectGetWidth(contentRect) ? CGRectGetWidth(nameRect) : CGRectGetWidth(contentRect);
+        CGFloat popWidth = maxWith + 2*POP_TOP_SPACE;
+        
+        msg.nikenameFrame = CGRectMake(POP_TOP_SPACE, ICON_TOP_SPACE, popWidth, 12);
-        msg.lineFrame = CGRectMake(POP_TOP_SPACE, 25, CGRectGetWidth(rect), 0.5);
+        msg.lineFrame = CGRectMake(POP_TOP_SPACE, 25, maxWith, 0.5);
         msg.portraitsFrame = CGRectMake(10, ICON_TOP_SPACE , ICON_WIDTH, ICON_WIDTH);
-        msg.popFrame = CGRectMake(50, POP_TOP_SPACE , CGRectGetWidth(rect)+2*POP_TOP_SPACE, CGRectGetHeight(rect)+2*POP_TOP_SPACE+20);
+        msg.popFrame = CGRectMake(50, POP_TOP_SPACE , popWidth, CGRectGetHeight(contentRect)+2*POP_TOP_SPACE+20);
-        msg.contentFrame = CGRectMake(POP_TOP_SPACE, 30, CGRectGetWidth(rect), CGRectGetHeight(rect));
+        msg.contentFrame = CGRectMake(POP_TOP_SPACE, 30, CGRectGetWidth(contentRect), CGRectGetHeight(contentRect));
         msg.cellHeight = CGRectGetHeight(msg.popFrame)+20;
@@ -59,7 +59,7 @@
     [super viewDidLoad];
     self.view.backgroundColor = [UIColor blackColor];
-    _roomId = @"778899";
+    _roomId = [NSString stringWithFormat:@"syn%@",self.model.docID];
     playerFrame = CGRectMake(0, 20, SCREEN_WIDTH, SCREEN_WIDTH*9/16);
     _originalDirection = 0;
@@ -213,7 +213,7 @@
 //旋转至半屏
 - (void)toHalfScreenWithrotationAngle:(CGFloat)angle
-{
+{    
     _player.isFullScreen = NO;
     _inputView.hidden = NO;
@@ -260,8 +260,9 @@
         //退出聊天室
         [[CNLiveChatManager sharedCNLiveChatManager] quitChatRoom:_roomId success:NULL error:NULL];
+        [self removeViews];
+        
         self.navigationController.navigationBar.hidden = NO;
-        self.tabBarController.tabBar.hidden = NO;
         [self.navigationController popViewControllerAnimated:YES];
     }
 }
@@ -311,6 +312,17 @@
     [self.view endEditing:YES];
 }
+- (void)removeViews
+{
+    [_player removeFromSuperview];
+    [_chatView removeFromSuperview];
+    [_inputView removeFromSuperview];
+    _player = nil;
+    _chatView = nil;
+    _inputView = nil;
+    _player.delegate = nil;
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
 #pragma mark -
 #pragma mark - makeConstraints
@@ -9,6 +9,8 @@
 #import "LVCMoreProgramViewController.h"
 #import "LVCMoreSortTableViewCell.h"
 #import "LVCProgramModel.h"
+#import "LVCChannelsModel.h"
+#import "LVCLivePlayerController.h"
 @interface LVCMoreProgramViewController ()<UITableViewDelegate,UITableViewDataSource>
 {
@@ -132,6 +134,12 @@
 {
     [tableView deselectRowAtIndexPath:indexPath animated:YES];
+    LVCChannelDetailsModel *details = _data[indexPath.row];
+    LVCLivePlayerController *playVC = [[LVCLivePlayerController alloc] init];
+    playVC.model = details;
+    self.navigationController.navigationBar.hidden = YES;
+    self.hidesBottomBarWhenPushed = YES;
+    [self.navigationController pushViewController:playVC animated:YES];
 }
 #pragma mark -
-//
-//  LVCBannerModel.h
-//  LiveVideoCloud
-//
-//  Created by iOS on 17/3/27.
-//  Copyright © 2017年 cnlive. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-@interface LVCBannerModel : NSObject
-
-
-@property (nonatomic, copy) NSString *img;              // 滚动图片 url
-@property (nonatomic, copy) NSString *title;            // 滚动小标题
-@property (nonatomic, copy) NSString *type;
-@property (nonatomic, copy) NSString *mediaId;
-@property (nonatomic, copy) NSString *docID;
-@property (nonatomic, copy) NSString *activityId;
-@property (nonatomic, copy) NSString *url;
-@property (nonatomic, copy) NSString *subTitle;
-@property (nonatomic, copy) NSString *currentPlay;      // 正在直播
-@property (nonatomic, copy) NSString *nextPlay;         // 即将直播
-
-@end
-//
-//  LVCBannerModel.m
-//  LiveVideoCloud
-//
-//  Created by iOS on 17/3/27.
-//  Copyright © 2017年 cnlive. All rights reserved.
-//
-
-#import "LVCBannerModel.h"
-
-@implementation LVCBannerModel
-
-- (void)setValue:(id)value forUndefinedKey:(NSString *)key{}
-
-@end
@@ -7,11 +7,11 @@
 //
 #import <UIKit/UIKit.h>
-#import "LVCBannerModel.h"
+#import "LVCChannelDetailsModel.h"
 @interface LVCFirstHeaderReusableView : UICollectionReusableView
 @property (nonatomic, strong) NSArray <NSURL *> *imageUrls;
-@property (nonatomic, strong) NSArray <LVCBannerModel *> *modelArray;
+@property (nonatomic, strong) NSArray <LVCChannelDetailsModel *> *modelArray;
 @end
@@ -77,7 +77,7 @@ static NSString *cellId = @&quot;cellId&quot;;
     [[NSRunLoop currentRunLoop] addTimer:_timer forMode:NSRunLoopCommonModes];
 }
-- (void)setModelArray:(NSArray<LVCBannerModel *> *)modelArray {
+- (void)setModelArray:(NSArray<LVCChannelDetailsModel *> *)modelArray {
     _modelArray = modelArray;
     self.cycleViewTitle.text = [NSString stringWithFormat:@"  %@",_modelArray[0].title];
 }
@@ -195,11 +195,15 @@ static NSString *cellId = @&quot;cellId&quot;;
 // 选择
 - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath
 {
-    /*
-     LVCBannerModel *model = self.modelArray[indexPath.row % 5];
-     LVCLivePlayerController *player = [[LVCLivePlayerController alloc]init];
-     [self.viewController.navigationController pushViewController:player animated:YES];
-     */
+    
+    LVCChannelDetailsModel *details = [_modelArray safetyObjectAtIndex:indexPath.row % 5];
+    self.viewController.tabBarController.tabBar.hidden = YES;
+    LVCLivePlayerController *playVC = [[LVCLivePlayerController alloc] init];
+    playVC.model = details;
+    self.viewController.navigationController.navigationBar.hidden = YES;
+    self.viewController.hidesBottomBarWhenPushed = YES;
+    [self.viewController.navigationController pushViewController:playVC animated:YES];
+    self.viewController.hidesBottomBarWhenPushed = NO;
 }
 #pragma mark - 第一个组头设置界面
@@ -10,22 +10,22 @@
 #import "LVCPlayerLoadingView.h"
 #import "SevenSwitch.h"
-@interface LVCPlayer ()<UIGestureRecognizerDelegate>
+@interface LVCPlayer ()<UIGestureRecognizerDelegate,LVCPlayerLoadingViewDelegate>
 {
     LVCChannelDetailsModel *_model;
 }
+@property (nonatomic, strong) CNLiveMoviePlayerController   *player;
 @property (nonatomic, strong) UIButton *backBtn;                    //返回
 @property (nonatomic, strong) UIButton *playOrPauseBtn;             //播放/暂停
 @property (nonatomic, strong) UILabel *titleLab;                    //标题
 @property (nonatomic, strong) UIButton *fullScreenBtn;              //控制全屏按钮
 @property (nonatomic, strong) UITapGestureRecognizer *singleTap;    //单击手势
 @property (nonatomic, strong) LVCPlayerLoadingView *loadingView;    //加载图
-@property (nonatomic, strong) CNLiveMoviePlayerController   *player;
 @property (nonatomic, strong) SevenSwitch *barrageSwitch;           //弹幕开关
 @property (nonatomic, strong) UIButton *editBtn;                    //全屏编辑按钮
-
 @property (nonatomic, strong) NSTimer *timer;                       //控制上下工具条定时器
+
 @end
 @implementation LVCPlayer
@@ -61,7 +61,8 @@
 {
     /*
      */
-    _player = [[CNLiveMoviePlayerController alloc] initLivePlayWithChannelId:[NSString stringWithFormat:@"82_%@",model.mediaId] authSuccess:^{
+    NSString *channelId = [NSString stringWithFormat:@"82_%@",model.mediaId];
+    _player = [[CNLiveMoviePlayerController alloc] initLivePlayWithChannelId:channelId authSuccess:^{
         [self addObservers];
         _player.videoDecoderMode = CNLiveMovieVideoDecoderMode_AUTO;
         _player.shouldAutoplay = YES;
@@ -73,6 +74,9 @@
     } authFailed:^(NSDictionary *errorInfo) {
          NSLog(@"初始化点播播放器失败%@", errorInfo);
+        [SVProgressHUD showInfoWithStatus:@"抱歉，加载失败~"];
+        [_loadingView stopLoading];
+        
     } getAnchorStatusResult:NULL];
     /*
@@ -199,6 +203,14 @@
     }
 }
+#pragma mark -
+#pragma mark - LVCPlayerLoadingViewDelegate
+- (void)retryBtnClick
+{
+    [_loadingView startLoading];
+    [_player reload:nil];
+}
+
 #pragma mark - UIGestureRecognizerDelegate 手势冲突
 - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch {
     if ([NSStringFromClass([touch.view class]) isEqualToString:@"SevenSwitch"]) {
@@ -267,8 +279,9 @@
     if (_player) {
         int reason = [[[notification userInfo] valueForKey:MPMoviePlayerPlaybackDidFinishReasonUserInfoKey] intValue];
         if (MPMovieFinishReasonPlaybackError == reason) {
+            _loadingView.hidden = NO;
         } else {
-//            _loadingView.retryBtn.hidden = YES;
+            _loadingView.hidden = YES;
         }
         switch (reason)
@@ -305,7 +318,7 @@
         if (_player.playbackState == MPMoviePlaybackStatePlaying) {
             _playOrPauseBtn.selected = YES;
-            [self.loadingView retry];
+            _loadingView.hidden = YES;
         } else {
             _playOrPauseBtn.selected = NO;
         }
@@ -511,8 +524,7 @@
 {
     if (!_contentView) {
         _contentView = [[UIImageView alloc] init];
-        _contentView.image = [UIImage imageNamed:@""];
-        _contentView.backgroundColor = [UIColor lightGrayColor];
+        _contentView.backgroundColor = [UIColor blackColor];
         _contentView.userInteractionEnabled = YES;
     }
     return _contentView;
@@ -119,11 +119,11 @@
     if (!_retryBtn) {
         _retryBtn = [UIButton buttonWithType:UIButtonTypeCustom];
         [_retryBtn setTitle:@"重试" forState:UIControlStateNormal];
-        [_retryBtn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
+        [_retryBtn setTitleColor:[UIColor yellowColor] forState:UIControlStateNormal];
         _retryBtn.hidden = YES;
         _retryBtn.layer.cornerRadius = 10;
         _retryBtn.layer.masksToBounds = YES;
-        _retryBtn.layer.borderColor = [UIColor blackColor].CGColor;
+        _retryBtn.layer.borderColor = [UIColor yellowColor].CGColor;
         _retryBtn.layer.borderWidth = 1;
         [_retryBtn addTarget:self action:@selector(retryBtnAction) forControlEvents:UIControlEventTouchUpInside];
     }
+//
+//  LVCRequestFailedView.h
+//  LiveVideoCloud
+//
+//  Created by iOS on 17/3/30.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@class LVCRequestFailedView;
+@protocol  LVCRequestFailedViewDelegate <NSObject>
+
+- (void)reloadDataWithView:(LVCRequestFailedView *)view;
+
+@end
+
+@interface LVCRequestFailedView : UIView
+
+@property (nonatomic, assign) id<LVCRequestFailedViewDelegate> delegate;
+
+- (instancetype)initWithFrame:(CGRect)frame words:(NSString *)text;
+
+@end
+//
+//  LVCRequestFailedView.m
+//  LiveVideoCloud
+//
+//  Created by iOS on 17/3/30.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "LVCRequestFailedView.h"
+
+@interface LVCRequestFailedView ()<UIGestureRecognizerDelegate>
+{
+    NSString *_text;
+}
+
+@property (nonatomic, strong) UIImageView *imageView;
+@property (nonatomic, strong) UILabel *textLab;
+@property (nonatomic, strong) UITapGestureRecognizer *singleTap;    //单击手势
+
+@end
+
+@implementation LVCRequestFailedView
+
+- (instancetype)initWithFrame:(CGRect)frame words:(NSString *)text
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        _text = text;
+        [self addSubview:self.imageView];
+        [self addSubview:self.textLab];
+        [self addGestureRecognizer:self.singleTap];
+    }
+    return self;
+}
+
+- (void)singleTapView
+{
+    self.hidden = YES;
+    if (self.delegate && [self.delegate respondsToSelector:@selector(reloadDataWithView:)]) {
+        [self.delegate reloadDataWithView:self];
+    }
+}
+
+#pragma mark -
+#pragma mark - getter
+- (UIImageView *)imageView
+{
+    if (!_imageView) {
+        _imageView = [[UIImageView alloc] initWithFrame:CGRectMake(self.width-(self.width*0.25)/2, self.height*0.2, self.width*0.25, self.width*0.25)];
+        _imageView.image = [UIImage imageNamed:@"warn"];
+        _imageView.center = self.center;
+    }
+    return _imageView;
+}
+
+- (UILabel *)textLab
+{
+    if (!_textLab) {
+        _textLab = [[UILabel alloc] initWithFrame:CGRectMake(0, _imageView.bottom+20, self.width, 20)];
+        _textLab.text = _text;
+        _textLab.textAlignment = NSTextAlignmentCenter;
+        _textLab.textColor = [UIColor lightGrayColor];
+        _textLab.font = [UIFont systemFontOfSize:15];
+    }
+    return _textLab;
+}
+
+- (UITapGestureRecognizer *)singleTap
+{
+    if (!_singleTap) {
+        _singleTap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(singleTapView)];
+        _singleTap.delegate = self;
+    }
+    return _singleTap;
+}
+@end
@@ -12,17 +12,16 @@
 #import "LVCOtherHeaderReusableView.h"
 #import "LVCChannelDetailsModel.h"
 #import "LVCChannelsModel.h"
-#import "LVCBannerModel.h"
 #import "LVCLivePlayerController.h"
+#import "LVCRequestFailedView.h"
 static NSString *cellId             = @"LVCLiveListCollectionViewCell";
 static NSString *firstHeaderId      = @"LVCFirstHeaderReusableView";
 static NSString *otherHeaderId      = @"LVCOtherHeaderReusableView";
-@interface LVCTelevisionView ()<UICollectionViewDelegate,UICollectionViewDataSource>
+@interface LVCTelevisionView ()<UICollectionViewDelegate,UICollectionViewDataSource,LVCRequestFailedViewDelegate>
 {
     long long _timestamp;
-    NSTimer *_autoRefreshTimer;
     CGFloat _refreshTime;
     NSNotification *_liveNotification;
     BOOL _adImageHidden;                //开机广告或引导页是否显示完毕
@@ -32,9 +31,7 @@ static NSString *otherHeaderId      = @&quot;LVCOtherHeaderReusableView&quot;;
 @property (nonatomic, strong) NSArray  *bannerModelArray;           //banner数据源
 @property (nonatomic, strong) NSArray  *marqueeModelArray;          //
 @property (nonatomic, strong) NSArray  *channelsModelArray;         //
-@property (nonatomic, strong) UIButton *reloadBtn;                  // 刷新按钮
-@property (nonatomic, strong) UILabel *reloadLab;                   // 刷新提示文字
-@property (nonatomic, strong) UIImageView *reloadImg;               //刷新图片
+@property (nonatomic, strong) LVCRequestFailedView *failedView;     //请求失败提示view
 @end
@@ -48,60 +45,29 @@ static NSString *otherHeaderId      = @&quot;LVCOtherHeaderReusableView&quot;;
         self.backgroundColor = [UIColor lightGrayColor];
         [self loadData];
-        
-//        _timestamp = [[self timestamp] longLongValue];
-//        if (_refreshTime != 0) {
-//            _autoRefreshTimer = [NSTimer scheduledTimerWithTimeInterval:_refreshTime target:self selector:@selector(autoRefresh) userInfo:nil repeats:YES];
-//        }
-        
+        [self.collectionView addSubview:self.failedView];
         [self addSubview:self.collectionView];
         [self.collectionView.header beginRefreshing];
-
     }
     return self;
 }
 #pragma mark -
 #pragma mark - action
-- (void)reloadBtnAction
-{
-    //    [self.reloadBtn removeFromSuperview];
-    //    [self.collectionView.header beginRefreshing];
-    [self refresh];
-}
-
 - (void)refresh
 {
-    [self.reloadBtn removeFromSuperview];
     [self loadData];
 }
-- (void)isNeedToRefresh
-{
-    if (_refreshTime != 0) {
-        [_autoRefreshTimer invalidate];
-        _autoRefreshTimer = nil;
-        _autoRefreshTimer = [NSTimer scheduledTimerWithTimeInterval:_refreshTime target:self selector:@selector(autoRefresh) userInfo:nil repeats:YES];
-    }
-    long long timestamp = [[self timestamp] longLongValue];
-    if (timestamp-_timestamp > 180000) {
-        [self.collectionView.header beginRefreshing];
-    }
-}
-
-- (void)autoRefresh
+#pragma mark -
+#pragma mark - LVCRequestFailedViewDelegate
+- (void)reloadDataWithView:(LVCRequestFailedView *)view
 {
     [self.collectionView.header beginRefreshing];
     [self loadData];
 }
-- (void)stopAutoRefresh
-{
-    [_autoRefreshTimer invalidate];
-    _autoRefreshTimer = nil;
-}
-
 #pragma mark -
 #pragma mark - UICollectionViewDataSource
 - (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView {
@@ -167,7 +133,7 @@ static NSString *otherHeaderId      = @&quot;LVCOtherHeaderReusableView&quot;;
 - (NSArray <NSURL *>*)bannerImage {
     NSMutableArray *arrayM = [NSMutableArray array];
-    for (LVCBannerModel *model in _bannerModelArray) {
+    for (LVCChannelDetailsModel *model in _bannerModelArray) {
         NSString *imgStr = model.img;
         NSURL *url = [NSURL URLWithString:imgStr];
         [arrayM addObject:url];
@@ -190,18 +156,20 @@ static NSString *otherHeaderId      = @&quot;LVCOtherHeaderReusableView&quot;;
     LVCChannelsModel *model = _channelsModelArray[indexPath.section - 1];
     LVCChannelDetailsModel *details = model.programs[indexPath.item];
-    self.viewController.tabBarController.tabBar.hidden = YES;
-    
+    self.viewController.hidesBottomBarWhenPushed = YES;
     LVCLivePlayerController *playVC = [[LVCLivePlayerController alloc] init];
     playVC.model = details;
     self.viewController.navigationController.navigationBar.hidden = YES;
     [self.viewController.navigationController pushViewController:playVC animated:YES];
+    self.viewController.hidesBottomBarWhenPushed = NO;
 }
 #pragma mark -
 #pragma mark - 加载数据
 - (void)loadData {
+    _failedView.hidden = YES;
+    
     NSDictionary *parameter = @{@"cid": @"zb/",
                                 @"plat":@"i",
                                 @"appid":@"spzg",
@@ -209,11 +177,6 @@ static NSString *otherHeaderId      = @&quot;LVCOtherHeaderReusableView&quot;;
     [[AFHTTPSessionManager manager] GET:@"http://app.jczb.cnlive.com/api/appindex?appid=spzg&cid=zb%2F&plat=i&version=1" parameters:nil progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id  _Nullable responseObject) {
         _timestamp = [[self timestamp] longLongValue];
-//        if (_refreshTime != 0) {
-//            [_autoRefreshTimer invalidate];
-//            _autoRefreshTimer = nil;
-//            _autoRefreshTimer = [NSTimer scheduledTimerWithTimeInterval:_refreshTime target:self selector:@selector(autoRefresh) userInfo:nil repeats:YES];
-//        }
         [self.collectionView.header endRefreshing];
@@ -230,7 +193,7 @@ static NSString *otherHeaderId      = @&quot;LVCOtherHeaderReusableView&quot;;
             NSMutableArray *arrayM = [NSMutableArray array];
             for (NSDictionary *dict in responseObject[@"banner"]) {
-                LVCBannerModel *rollModel = [LVCBannerModel mj_objectWithKeyValues:dict];
+                LVCChannelDetailsModel *rollModel = [LVCChannelDetailsModel mj_objectWithKeyValues:dict];
                 [arrayM addObject:rollModel];
             }
             self.bannerModelArray = arrayM;
@@ -241,12 +204,12 @@ static NSString *otherHeaderId      = @&quot;LVCOtherHeaderReusableView&quot;;
     } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
         [self.collectionView.header endRefreshing];
-
-        NSLog(@"获取电视台数据失败");
+        if (self.channelsModelArray.count == 0 && self.bannerModelArray.count == 0) {
+            _failedView.hidden = NO;
+        }
     }];
-    
 }
 - (NSString *)timestamp {
@@ -287,38 +250,16 @@ static NSString *otherHeaderId      = @&quot;LVCOtherHeaderReusableView&quot;;
     return _collectionView;
 }
-//- (UIButton *)reloadBtn
-//{
-//    if (!_reloadBtn) {
-//        _reloadBtn = [Tools getReloadBtn];
-//        //        _reloadBtn.backgroundColor = [UIColor brownColor];
-//        _reloadBtn.x = (self.width-220)/2;
-//        _reloadBtn.y = (self.height-[Tools adapterReloadBtnHeight])/2-50;
-//        [_reloadBtn addTarget:self action:@selector(reloadBtnAction) forControlEvents:UIControlEventTouchUpInside];
-//        [_reloadBtn addSubview:self.reloadImg];
-//        [_reloadBtn addSubview:self.reloadLab];
-//    }
-//    return _reloadBtn;
-//}
-
-//- (UILabel *)reloadLab
-//{
-//    if (!_reloadLab) {
-//        _reloadLab = [Tools getReloadLab];
-//    }
-//    return _reloadLab;
-//}
-//- (UIImageView *)reloadImg
-//{
-//    if (!_reloadImg) {
-//        _reloadImg = [[UIImageView alloc] init];
-//        //        _reloadImg.backgroundColor = [UIColor redColor];
-//        _reloadImg.frame = CGRectMake(_reloadBtn.width/2-[Tools adapterImgWidth]/2+10, 0, [Tools adapterImgWidth], [Tools adapterImgWidth]);
-//    }
-//    return _reloadImg;
-//}
-
-
+- (LVCRequestFailedView *)failedView
+{
+    if (!_failedView) {
+        _failedView = [[LVCRequestFailedView alloc] initWithFrame:CGRectMake(0, 0, 150, 100) words:@"您的网络不太顺畅哦~"];
+        _failedView.center = self.collectionView.center;
+        _failedView.delegate = self;
+        _failedView.hidden = YES;
+    }
+    return _failedView;
+}
 /*
 // Only override drawRect: if you perform custom drawing.
@@ -4,6 +4,14 @@
       "idiom" : "universal",
       "filename" : "22.png",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {
@@ -4,6 +4,14 @@
       "idiom" : "universal",
       "filename" : "privateChat11.png",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "warn.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file