搜索栏代码重构,从组头中提取出来

王军波
1 parent d5520be1
Showing 5 changed files with 178 additions and 51 deletions
LiveVideoCloud.xcodeproj/project.pbxproj
LiveVideoCloud/Classes/Sections/HomePageSections/LVCBigHorizontalCollectionViewCell.h
LiveVideoCloud/Classes/Sections/HomePageSections/LVCBigHorizontalCollectionViewCell.m
LiveVideoCloud/Classes/Sections/HomePageSections/LVCChannelPagingView.m
LiveVideoCloud/Classes/Sections/HomePageSections/LVCMainHeaderCollectionReusableView.m
@@ -202,6 +202,7 @@
 		D217A24A1E7B76C7003B44CB /* PresentView.m in Sources */ = {isa = PBXBuildFile; fileRef = D217A2471E7B76C7003B44CB /* PresentView.m */; };
 		D217A24B1E7B76C7003B44CB /* PresentViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D217A2491E7B76C7003B44CB /* PresentViewCell.m */; };
 		D217A24E1E7B77C7003B44CB /* ComboCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D217A24D1E7B77C7003B44CB /* ComboCell.m */; };
+		D219E86B1EFD04A700650F38 /* LVCBigHorizontalCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D219E86A1EFD04A700650F38 /* LVCBigHorizontalCollectionViewCell.m */; };
 		D224B1971E826ED800CC61D0 /* ChatBarrageAnimAction.m in Sources */ = {isa = PBXBuildFile; fileRef = D224B1961E826ED800CC61D0 /* ChatBarrageAnimAction.m */; };
 		D22830F11E778C0F00627701 /* LiveBaseView.m in Sources */ = {isa = PBXBuildFile; fileRef = D22830F01E778C0F00627701 /* LiveBaseView.m */; };
 		D22830FC1E77C2D900627701 /* BottomToolView.m in Sources */ = {isa = PBXBuildFile; fileRef = D22830FB1E77C2D900627701 /* BottomToolView.m */; };
@@ -714,6 +715,8 @@
 		D217A2491E7B76C7003B44CB /* PresentViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PresentViewCell.m; sourceTree = "<group>"; };
 		D217A24C1E7B77C7003B44CB /* ComboCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ComboCell.h; path = Present/ComboCell.h; sourceTree = "<group>"; };
 		D217A24D1E7B77C7003B44CB /* ComboCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ComboCell.m; path = Present/ComboCell.m; sourceTree = "<group>"; };
+		D219E8691EFD04A700650F38 /* LVCBigHorizontalCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCBigHorizontalCollectionViewCell.h; sourceTree = "<group>"; };
+		D219E86A1EFD04A700650F38 /* LVCBigHorizontalCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCBigHorizontalCollectionViewCell.m; sourceTree = "<group>"; };
 		D224B1951E826ED800CC61D0 /* ChatBarrageAnimAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChatBarrageAnimAction.h; sourceTree = "<group>"; };
 		D224B1961E826ED800CC61D0 /* ChatBarrageAnimAction.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChatBarrageAnimAction.m; sourceTree = "<group>"; };
 		D22830EF1E778C0F00627701 /* LiveBaseView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LiveBaseView.h; sourceTree = "<group>"; };
@@ -1783,6 +1786,8 @@
 				D23BBDC61EF8FBD1002FE0B8 /* LVCSectionHeaderCollectionReusableView.m */,
 				D23BBDC21EF8FB99002FE0B8 /* LVCMainHorizontalCollectionViewCell.h */,
 				D23BBDC31EF8FB99002FE0B8 /* LVCMainHorizontalCollectionViewCell.m */,
+				D219E8691EFD04A700650F38 /* LVCBigHorizontalCollectionViewCell.h */,
+				D219E86A1EFD04A700650F38 /* LVCBigHorizontalCollectionViewCell.m */,
 				D24F40931EFB965A00833738 /* JBSearchView.h */,
 				D24F40941EFB965A00833738 /* JBSearchView.m */,
 				D24CFC1E1EFA092300AA6ADB /* JBBannerView.h */,
@@ -2425,6 +2430,7 @@
 				D233EE721EEA88EF00674ED5 /* LVCHomePageViewController.m in Sources */,
 				D236967E1E7F9E4100E4BF71 /* GiftPayButton.m in Sources */,
 				4BD8560A1EBACD530082061D /* UIWebView+AFNetworking.m in Sources */,
+				D219E86B1EFD04A700650F38 /* LVCBigHorizontalCollectionViewCell.m in Sources */,
 				4B45CE831EB86A590079AFB7 /* LVCMineModel.m in Sources */,
 				4B45CE791EB86A590079AFB7 /* MineAboutUsController.m in Sources */,
 				81A483081E88B6140097A80A /* UIView+ViewController.m in Sources */,
+//
+//  LVCBigHorizontalCollectionViewCell.h
+//  LiveVideoCloud
+//
+//  Created by cnliveJunBo on 17/6/23.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface LVCBigHorizontalCollectionViewCell : UICollectionViewCell
+
+@property (nonatomic, strong)ProgramModel *model;
+@property (nonatomic, strong)ProgramModel *liveModel;
+
+@end
+//
+//  LVCBigHorizontalCollectionViewCell.m
+//  LiveVideoCloud
+//
+//  Created by cnliveJunBo on 17/6/23.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "LVCBigHorizontalCollectionViewCell.h"
+
+@interface LVCBigHorizontalCollectionViewCell() {
+    
+    CGFloat _x;
+}
+
+@property (nonatomic, strong) UIImageView *imageView;
+@property (nonatomic, strong) UILabel *title;
+@property (nonatomic, strong) UILabel *detail;
+@property (nonatomic, strong) UIImageView *typeImage;   //节目类型角标
+
+@end
+
+@implementation LVCBigHorizontalCollectionViewCell
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        if ([UIDevice currentDevice].systemVersion.floatValue >= 10) {
+            _x = 0;
+        } else {
+            _x = 10;
+        }
+        [self.contentView addSubview:self.imageView];
+        [self.contentView addSubview:self.title];
+        [self.contentView addSubview:self.detail];
+        [self.imageView addSubview:self.typeImage];
+    }
+    return self;
+}
+
+- (void)setModel:(ProgramModel *)model {
+    
+    if (_model != model) {
+        _model = model;
+    }
+}
+
+- (void)setLiveModel:(ProgramModel *)liveModel {
+    
+    if (_liveModel != liveModel) {
+        _liveModel = liveModel;
+    }
+}
+
+#pragma mark - GetMethod !!!!!!!!!!!!!!!!!!
+- (UIImageView *)imageView
+{
+    if (!_imageView) {
+        _imageView = [[UIImageView alloc] initWithFrame:CGRectMake(_x, 0, self.contentView.width-20, (self.contentView.width-20)/2)];
+        _imageView.backgroundColor = [UIColor grayColor];
+    }
+    return _imageView;
+}
+
+- (UILabel *)title
+{
+    if (!_title) {
+        _title = [[UILabel alloc] initWithFrame:CGRectMake(_x, self.imageView.bottom+7, self.contentView.width-10, 12)];
+        _title.font = [UIFont systemFontOfSize:14];
+        _title.textColor = [UIColor blackColorCNLive];
+    }
+    return _title;
+}
+
+- (UILabel *)detail
+{
+    if (!_detail) {
+        _detail = [[UILabel alloc] initWithFrame:CGRectMake(_x, self.title.bottom+7, self.contentView.width-10, 11)];
+        _detail.font = [UIFont systemFontOfSize:12];
+        _detail.textColor = [UIColor grayColorCNLive];
+    }
+    return _detail;
+}
+
+- (UIImageView *)typeImage
+{
+    if (!_typeImage) {
+        _typeImage = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 39, 39)];
+    }
+    return _typeImage;
+}
+
+@end
@@ -10,6 +10,7 @@
 #import "LVCMainHeaderCollectionReusableView.h"
 #import "LVCSectionHeaderCollectionReusableView.h"
 #import "LVCMainHorizontalCollectionViewCell.h"
+#import "JBSearchView.h"
 static NSString *mainHeaderId = @"mainHeader";
 static NSString *SectionHeaderId = @"SectionHeader";
@@ -22,11 +23,14 @@ static NSString *MainHorizontalCellId = @&quot;MainHorizontalCell&quot;;
     NSMutableArray *_banners;
     NSMutableArray *_marquees;
     NSMutableArray *_channels;
+    LVCMainHeaderCollectionReusableView *_mainHeader;
+    CGFloat _collectionOffsetY;
 }
 @property (nonatomic, strong)UICollectionView *collectionView;
-@property (nonatomic, strong)UIView *searchBackground;
-@property (nonatomic, strong)UIButton *searchBtn;
+//@property (nonatomic, strong)UIView *searchBackground;
+@property (nonatomic, strong)JBSearchView *searchView;
+//@property (nonatomic, strong)UIButton *searchBtn;
 @property (nonatomic, strong)UIView *searchLine;
 @property (nonatomic, strong)UILabel *searchHotLab;
@@ -91,7 +95,7 @@ static NSString *MainHorizontalCellId = @&quot;MainHorizontalCell&quot;;
             // 搜索旁的分类
         } else {
-            self.searchBtn.width = KScreenWidth - 20;
+//            self.searchBtn.width = KScreenWidth - 20;
         }
         if (responseObject[@"banner"] && [responseObject[@"banner"] isKindOfClass:[NSArray class]]) {
@@ -146,7 +150,42 @@ static NSString *MainHorizontalCellId = @&quot;MainHorizontalCell&quot;;
 #pragma mark - UICollectionViewDelegate !!!!!!!!!!!!!!!!!!!!!!!!!
 - (void)scrollViewDidScroll:(UIScrollView *)scrollView {
-    
+    if (_hasSearchBox) {
+        
+        if (scrollView == self.collectionView) {
+            
+            if (scrollView.contentOffset.y <= 0) {
+
+                self.searchView.y = 0;
+                if (_channels.count > 0) {
+                    [_mainHeader addSubview:self.searchView];
+                } else {
+                    [self.collectionView addSubview:self.searchView];
+                }
+                _collectionOffsetY = scrollView.contentOffset.y;
+            } else {
+                
+                if (scrollView.contentOffset.y >= 45) {
+                    if (self.searchView.superview != self) {
+                        self.searchView.y = -45;
+                        [self.searchView addSubview:self.searchLine];
+                        [self addSubview:self.searchView];
+                    }
+                }
+                if (scrollView.contentOffset.y-_collectionOffsetY > 0) {
+                    _collectionOffsetY = scrollView.contentOffset.y;
+                    [UIView animateWithDuration:0.2 animations:^{
+                        self.searchView.y = -45;
+                    }];
+                } else {
+                    _collectionOffsetY = scrollView.contentOffset.y;
+                    [UIView animateWithDuration:0.2 animations:^{
+                        self.searchView.y = 0;
+                    }];
+                }
+            }
+        }
+    }
 }
 - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath {
@@ -175,9 +214,12 @@ static NSString *MainHorizontalCellId = @&quot;MainHorizontalCell&quot;;
 - (UICollectionReusableView *)collectionView:(UICollectionView *)collectionView viewForSupplementaryElementOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath {
     if (indexPath.section == 0) {
-        LVCMainHeaderCollectionReusableView *view = [collectionView dequeueReusableSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:mainHeaderId forIndexPath:indexPath];
-        view.backgroundColor = [UIColor redColor];
-        return view;
+        _mainHeader = [collectionView dequeueReusableSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:mainHeaderId forIndexPath:indexPath];
+        _mainHeader.backgroundColor = [UIColor redColor];
+        if (!self.searchView.superview) {
+            [_mainHeader addSubview:self.searchView];
+        }
+        return _mainHeader;
     } else {
         LVCSectionHeaderCollectionReusableView *view = [collectionView dequeueReusableSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:SectionHeaderId forIndexPath:indexPath];
         view.backgroundColor = [UIColor yellowColor];
@@ -236,33 +278,21 @@ static NSString *MainHorizontalCellId = @&quot;MainHorizontalCell&quot;;
     return _collectionView;
 }
-- (UIView *)searchBackground {
+- (JBSearchView *)searchView {
-    if (!_searchBackground) {
-        _searchBackground = [[UIView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 45)];
-        _searchBackground.backgroundColor = [UIColor backgroundColor];
-        [_searchBackground addSubview:self.searchBtn];
-    }
-    return _searchBackground;
-}
-
-- (UIButton *)searchBtn {
-    
-    if (!_searchBtn) {
+    if (!_searchView) {
+        _searchView = [[JBSearchView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 45)];
+        _searchView.backgroundColor = [UIColor backgroundColor];
+        
+        NSMutableArray *arrayM = [[NSMutableArray alloc] init];
+        NSDictionary *dict1 = @{@"name":@"liveShow"};
+        [arrayM addObject:dict1];
+        NSDictionary *dict2 = @{@"name":@"全部"};
+        [arrayM addObject:dict2];
+        _searchView.sortArray = arrayM;
-        _searchBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        _searchBtn.frame = CGRectMake(10, 6, KScreenWidth-20, 33);
-        [_searchBtn setImage:[UIImage imageNamed:@"search"] forState:UIControlStateNormal];
-        [_searchBtn setTitle:@"搜索" forState:UIControlStateNormal];
-        [_searchBtn setTitleColor:[UIColor grayColor] forState:UIControlStateNormal];
-        [_searchBtn setImageEdgeInsets:UIEdgeInsetsMake(0, -5, 0, 0)];
-        _searchBtn.titleLabel.font = [UIFont systemFontOfSize:14];
-        _searchBtn.backgroundColor = [UIColor whiteColor];
-        _searchBtn.layer.cornerRadius = 16;
-        _searchBtn.layer.masksToBounds = YES;
-        [_searchBtn addTarget:self action:@selector(searchBtnAction) forControlEvents:UIControlEventTouchUpInside];
     }
-    return _searchBtn;
+    return _searchView;
 }
 - (UIView *)searchLine {
@@ -7,7 +7,6 @@
 //
 #import "LVCMainHeaderCollectionReusableView.h"
-#import "JBSearchView.h"
 #import "JBBannerView.h"
 #import "JBAutoRollTableView.h"
@@ -15,7 +14,6 @@
 @property (nonatomic, strong) JBBannerView *bannerView;
 @property (nonatomic, strong) JBAutoRollTableView *rollTableView;
-@property (nonatomic, strong) JBSearchView *searchView;
 @end
@@ -25,7 +23,7 @@
 {
     self = [super initWithFrame:frame];
     if (self) {
-        [self addSubview:self.searchView];
+//        [self addSubview:self.searchView];
         [self addSubview:self.bannerView];
         [self addSubview:self.rollTableView];
     }
@@ -33,23 +31,6 @@
 }
 #pragma mark - GetMethod !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-- (JBSearchView *)searchView {
-    
-    if (!_searchView) {
-        _searchView = [[JBSearchView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 45)];
-        _searchView.backgroundColor = [UIColor backgroundColor];
-        
-        NSMutableArray *arrayM = [[NSMutableArray alloc] init];
-        NSDictionary *dict1 = @{@"name":@"liveShow"};
-        [arrayM addObject:dict1];
-        NSDictionary *dict2 = @{@"name":@"全部"};
-        [arrayM addObject:dict2];
-        _searchView.sortArray = arrayM;
-        
-    }
-    return _searchView;
-}
-
 - (JBBannerView *)bannerView {
     if (!_bannerView) {