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

王军波
2 parents 40b163dc fa6e96f8
Showing 3 changed files with 27 additions and 17 deletions
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/TopToolView/TopToolView.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Controller/HomeViewController.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCLivePlayerController.m
@@ -14,4 +14,5 @@
 - (instancetype _Nonnull)initWithFrame:(CGRect)frame isHost:(BOOL)isHost;
 @property (nonatomic ,strong) userInfoModel * _Nullable             model;
+
 @end
@@ -54,7 +54,7 @@
     [UGCLiveListBtn addTarget:self action:@selector(UGCLiveListAction) forControlEvents:UIControlEventTouchUpInside];
     [self.view addSubview:UGCLiveListBtn];
-    _titleArr = @[@"直播",@"推荐",@"频道"];
+    _titleArr = @[@"直播",@"频道"];
     CGFloat width = 0;
     for (NSString *title in _titleArr) {
         CGSize size = [title sizeWithAttributes:@{NSFontAttributeName:self.titleView.elementFont}];
@@ -71,7 +71,7 @@
     [self.view addSubview:self.pageView];
     [_pageView reloadPages];
     [_titleView reloadData];
-    [self.titleView scrollToElement:1 animated:NO];
+    [self.titleView scrollToElement:0 animated:NO];
 }
@@ -151,15 +151,7 @@
 - (UIView *)pagingScrollView:(MHPagingScrollView *)pagingScrollView pageForIndex:(NSUInteger)index
 {
-    if ([_titleArr[index] isEqualToString:@"推荐"]) {
-
-        LVCTelevisionView *tvView = (LVCTelevisionView *)[pagingScrollView pageViewByIndex:index];
-        if (!tvView) {
-            tvView = [[LVCTelevisionView alloc] init];
-        }
-        return tvView;
-        
-    }else if ([_titleArr[index] isEqualToString:@"频道"]) {
+    if ([_titleArr[index] isEqualToString:@"频道"]) {
         LVCTelevisionView *tvView = (LVCTelevisionView *)[pagingScrollView pageViewByIndex:index];
         if (!tvView) {
@@ -16,7 +16,7 @@
 #import "CNBarrageView.h"
 #import "chatMsgModel.h"
-@interface LVCLivePlayerController ()<LVCPlayerDelegate,LVCInputViewDelegate,LVCChatViewDelegate>
+@interface LVCLivePlayerController ()<LVCPlayerDelegate,LVCInputViewDelegate,LVCChatViewDelegate,UIGestureRecognizerDelegate>
 {
     BOOL isHiddenStatusBar;             //记录状态的隐藏显示
     CGRect     playerFrame;             //播放器原始位置
@@ -35,6 +35,7 @@
 @property (nonatomic, strong) CNBarrageManager *barrageManager;     //弹幕管理者
 @property (nonatomic ,strong) UIView *barrageBaseView;              //弹幕总View
+@property (nonatomic, strong) UITapGestureRecognizer *tap;
 @end
@@ -87,6 +88,10 @@
     };
     [self.player.contentView addSubview:self.barrageBaseView];
+    
+    _tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(dismissKeyboard)];
+    _tap.delegate = self;
+    [self.view addGestureRecognizer:self.tap];
 }
 - (void)addBarrageView:(CNBarrageView *)barrageView {
@@ -307,11 +312,6 @@
     inputView.hidden = YES;
 }
-- (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
-{
-    [self.view endEditing:YES];
-}
-
 - (void)removeViews
 {
     [_player removeFromSuperview];
@@ -324,6 +324,23 @@
     [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
+- (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
+{
+    [self.view endEditing:YES];
+}
+
+- (void)dismissKeyboard
+{
+    [self.view endEditing:YES];
+}
+
+- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch {
+    if ([NSStringFromClass([touch.view class]) isEqualToString:@"LVCChatView"]) {
+        return NO;
+    }
+    return  YES;
+}
+
 #pragma mark -
 #pragma mark - makeConstraints
 - (void)makeConstraints