no message

yanglingyu
1 parent c0efbe6f
Showing 11 changed files with 192 additions and 179 deletions
CNLiveVideoClassifyKit/Classes/Controller/CNCategoryBaseViewController.h
CNLiveVideoClassifyKit/Classes/Controller/CNCategoryBaseViewController.m
CNLiveVideoClassifyKit/Classes/Controller/CNLiveClassifySegmentController.m
CNLiveVideoClassifyKit/Classes/Controller/CNLiveListViewController.h
CNLiveVideoClassifyKit/Classes/Controller/CNLiveListViewController.m
CNLiveVideoClassifyKit/Classes/Controller/CNLiveSubSegmentController.h
CNLiveVideoClassifyKit/Classes/Controller/CNLiveSubSegmentController.m
CNLiveVideoClassifyKit/Classes/Manager/CNLiveListManager.h
CNLiveVideoClassifyKit/Classes/Manager/CNLiveListManager.m
Example/CNLiveVideoClassifyKit/CNLIVEDemoViewController.m
Example/CNLiveVideoClassifyKit/CNLIVEViewController.m
@@ -10,12 +10,17 @@
 NS_ASSUME_NONNULL_BEGIN
-@interface CNCategoryBaseViewController : CNLiveBaseViewController<JXCategoryListContainerViewDelegate,JXCategoryViewDelegate>
-@property (nonatomic, strong) NSMutableArray *titles;
+@interface CNCategoryBaseViewController : CNLiveBaseViewController<JXCategoryViewDelegate,UIPageViewControllerDelegate,UIPageViewControllerDataSource>
+
 @property (nonatomic, strong) JXCategoryBaseView *categoryView;
-@property (nonatomic, strong) JXCategoryListContainerView *listContainerView;
-@property (nonatomic, assign) BOOL isNeedIndicatorPositionChangeItem;
+@property (nonatomic, strong) UIPageViewController *pageViewController;
+@property (nonatomic, strong) UIScrollView *findScrollView;
+@property (nonatomic, strong) NSMutableArray *titles;
+@property (nonatomic, strong) NSMutableArray *controllersArr;/// 控制器数组
+
+@property (nonatomic, assign) NSInteger ld_currentIndex; //当前选中
+-(void)addTheFirstPage; //默认页
 -(JXCategoryBaseView *)preferredCategoryView;
 -(CGFloat)preferredCategoryViewHeight;
 @end
@@ -6,22 +6,21 @@
 // 分类控制器根类
 #import "CNCategoryBaseViewController.h"
-#import "CNLiveListManager.h"
-
 @interface CNCategoryBaseViewController ()
-
 @end
 @implementation CNCategoryBaseViewController
 - (void)viewDidLoad {
     [super viewDidLoad];
-    
+    self.navigationController.navigationBarHidden = YES;
     [self.view addSubview: self.categoryView];
-    [self.view addSubview:self.listContainerView];
+    [self addChildViewController:self.pageViewController];
+    [self.view addSubview:self.pageViewController.view];
     self.view.backgroundColor = [UIColor whiteColor];
     self.navigationHidden = YES;
+    
     // Do any additional setup after loading the view.
 }
@@ -30,17 +29,23 @@
     [super viewDidLayoutSubviews];
     self.categoryView.frame = CGRectMake(0, kStatusHeight, self.view.bounds.size.width, [self preferredCategoryViewHeight]);
-    self.listContainerView.frame = CGRectMake(0, [self preferredCategoryViewHeight] +kStatusHeight, self.view.bounds.size.width, self.view.bounds.size.height - [self preferredCategoryViewHeight]-kStatusHeight);
 }
 -(void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
-    self.navigationController.interactivePopGestureRecognizer.enabled = YES;
+    self.navigationController.interactivePopGestureRecognizer.enabled = NO;
     self.navigationHidden = YES;
 }
 #pragma mark - Public
+-(void)addTheFirstPage{
+    UIViewController *vc = self.controllersArr[self.ld_currentIndex];
+    [self.pageViewController setViewControllers:@[vc] direction:UIPageViewControllerNavigationDirectionReverse animated:YES completion:nil];
+}
+- (void)configCategoryViewWithType:(JXCategoryTitleImageType)imageType selectIndex:(NSInteger)index unselectIndex:(NSInteger)unIndex{
+    
+}
 -(JXCategoryBaseView *)preferredCategoryView{
     return [[JXCategoryBaseView alloc] init];
 }
@@ -49,23 +54,58 @@
 {
     return 50;
 }
+
+#pragma mark - UIPageViewControllerDataSource
+/// 展示上一页
+- (nullable UIViewController *)pageViewController:(UIPageViewController *)pageViewController viewControllerBeforeViewController:(UIViewController *)viewController {
+    NSInteger index = self.ld_currentIndex;
+    if (index == 0 || (index == NSNotFound)) {
+        return nil;
+    }
+    index--;
+    self.ld_currentIndex = index;
+//    [self.categoryView.delegate categoryView:self.categoryView didSelectedItemAtIndex:self.ld_currentIndex];
+    return [self.controllersArr objectAtIndex:index];
+}
+/// 展示下一页
+- (nullable UIViewController *)pageViewController:(UIPageViewController *)pageViewController viewControllerAfterViewController:(UIViewController *)viewController {
+    NSInteger index = self.ld_currentIndex;
+    if (index == self.controllersArr.count - 1 || (index == NSNotFound)) {
+        return nil;
+    }
+    index++;
+    self.ld_currentIndex = index;
+//    [self.categoryView.delegate categoryView:self.categoryView didSelectedItemAtIndex:self.ld_currentIndex];
+    return [self.controllersArr objectAtIndex:index];
+}
+
+#pragma mark - UIPageViewControllerDelegate
+- (void)pageViewController:(UIPageViewController *)pageViewController willTransitionToViewControllers:(NSArray<UIViewController *> *)pendingViewControllers {
+    UIViewController *nextVC = [pendingViewControllers firstObject];
+    NSInteger index = [self.controllersArr indexOfObject:nextVC];
+    self.ld_currentIndex = index;
+}
+- (void)pageViewController:(UIPageViewController *)pageViewController didFinishAnimating:(BOOL)finished previousViewControllers:(NSArray<UIViewController *> *)previousViewControllers transitionCompleted:(BOOL)completed {
+    if (completed) {
+        NSIndexPath *path = [NSIndexPath indexPathForRow:self.ld_currentIndex inSection:0];
+        [self.categoryView.collectionView scrollToItemAtIndexPath:path atScrollPosition:UICollectionViewScrollPositionCenteredHorizontally animated:YES];
+        [self.categoryView.delegate categoryView:self.categoryView didSelectedItemAtIndex:self.ld_currentIndex];
+        [self.categoryView selectCellAtIndex:self.ld_currentIndex selectedType:JXCategoryCellSelectedTypeScroll];
+    }
+}
 #pragma mark - JXCategoryViewDelegate
 -(void)categoryView:(JXCategoryBaseView *)categoryView didSelectedItemAtIndex:(NSInteger)index
 {
     self.navigationController.interactivePopGestureRecognizer.enabled = (index ==0);
+    UIViewController *vc = self.controllersArr[index];
+    if (index>self.ld_currentIndex) {
+        [self.pageViewController setViewControllers:@[vc] direction:UIPageViewControllerNavigationDirectionForward animated:YES completion:NULL];
+    }else
+    {
+        [self.pageViewController setViewControllers:@[vc] direction:UIPageViewControllerNavigationDirectionReverse animated:YES completion:NULL];
+    }
 }
-#pragma mark - JXCategoryListContainerViewDelegate
-- (NSInteger)numberOfListsInlistContainerView:(JXCategoryListContainerView *)listContainerView
-{
-    return self.titles.count;
-}
-
--(id<JXCategoryListContentViewDelegate>)listContainerView:(JXCategoryListContainerView *)listContainerView initListForIndex:(NSInteger)index
-{
-    CNLiveListManager *list = [CNLiveListManager new];
-    return list;
-}
 #pragma mark - Getting
 -(JXCategoryBaseView *)categoryView
@@ -73,21 +113,30 @@
     if (!_categoryView) {
         _categoryView = [self preferredCategoryView];
         _categoryView.delegate = self;
-        _categoryView.listContainer = self.listContainerView;
     }
     return _categoryView;
 }
-
-- (JXCategoryListContainerView *)listContainerView
+-(UIPageViewController *)pageViewController
 {
-    if (!_listContainerView) {
-        _listContainerView = [[JXCategoryListContainerView alloc] initWithType:JXCategoryListContainerType_ScrollView delegate:self];
-        _listContainerView.scrollView.backgroundColor = [UIColor clearColor];
-        _listContainerView.listCellBackgroundColor = [UIColor clearColor];
+    if (!_pageViewController) {
+        NSDictionary *option = [NSDictionary dictionaryWithObject:[NSNumber numberWithInteger:0] forKey:UIPageViewControllerOptionInterPageSpacingKey];
+            _pageViewController = [[UIPageViewController alloc]initWithTransitionStyle:UIPageViewControllerTransitionStyleScroll navigationOrientation:UIPageViewControllerNavigationOrientationHorizontal options:option];
+            _pageViewController.delegate = self;
+            _pageViewController.dataSource = self;
     }
-    return _listContainerView;
+    return _pageViewController;
+    
 }
+- (UIScrollView *)findScrollView{
+for(id subview in self.pageViewController.view.subviews){
+if([subview isKindOfClass:UIScrollView.class]){
+    _findScrollView=subview;
+    break;
+}
+}
+return _findScrollView;
+}
 -(NSMutableArray *)titles
 {
     if (!_titles) {
@@ -95,4 +144,13 @@
     }
     return _titles;
 }
+
+-(NSMutableArray *)controllersArr
+{
+    if (!_controllersArr) {
+        _controllersArr = [[NSMutableArray alloc] init];
+    }
+    return _controllersArr;
+}
+
 @end
@@ -26,7 +26,6 @@ static const CGFloat animationHeight = 15;
 @property (nonatomic, assign) CGFloat                  topBgImgHeight;//头部图片高度
 @property (nonatomic, assign) CGFloat               lastOffsetY;
-@property (nonatomic, assign) NSInteger       currentIndex;//当前页
 @property (nonatomic, strong) NSString *    currentAtatusColor;
@@ -53,7 +52,7 @@ static CGFloat moveHeight = 50;
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(classifyChannelsRequest:) name:CNWjjClassifyChannelsRequestStateNotifiName object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(classifyChannelsRequestedHideLoading:) name:CNWjjClassifyChannelsRequestHideLoadingNotifiName object:nil];
     self.topBgImgHeight = kStatusHeight+100;
-    self.currentIndex = 0;
+    self.ld_currentIndex = 0;
     [self.view addSubview:self.topBgImg];
     [self.view sendSubviewToBack:self.topBgImg];
     [self dataDivideIntoNormalAndOtherWithFirst:YES];
@@ -64,7 +63,6 @@ static CGFloat moveHeight = 50;
     {
         [self.view addSubview:self.loginBtn];
     }
-    self.myCategoryView.delegate = self;
     self.myCategoryView.translatesAutoresizingMaskIntoConstraints = NO;
     self.myCategoryView.titleColorGradientEnabled = YES;
@@ -78,7 +76,6 @@ static CGFloat moveHeight = 50;
     self.myCategoryView.cellWidthZoomEnabled = YES;
     self.myCategoryView.cellWidthZoomScale = 1.3;
     self.myCategoryView.imageSize = CGSizeMake(56, 18);
-    self.listContainerView.translatesAutoresizingMaskIntoConstraints = NO;
     if (!self.isLoading) {
         [self uploadSubViews];
     }
@@ -89,7 +86,7 @@ static CGFloat moveHeight = 50;
 -(void)viewDidLayoutSubviews
 {
     [super viewDidLayoutSubviews];
-    self.listContainerView.frame = CGRectMake(0,self.myCategoryView.bottom, kScreenWidth, self.view.height -kStatusHeight);
+    self.pageViewController.view.frame = CGRectMake(0, self.myCategoryView.bottom, kScreenWidth, self.view.bounds.size.height - self.myCategoryView.bottom+ moveHeight);
     if ([CNUserShareManager isLogin]) {
         self.myCategoryView.width =  kScreenWidth - 45;
         self.customChannelsBtn.centerY = self.myCategoryView.centerY;
@@ -130,8 +127,8 @@ static CGFloat moveHeight = 50;
 }
 - (void)uploadSubViews
 {
-    if (self.currentIndex>=self.titles.count) {
-        self.currentIndex = 0;
+    if (self.ld_currentIndex>=self.titles.count) {
+        self.ld_currentIndex = 0;
     }
     for (int i = 0;i<self.imageNames.count;i++) {
         NSURL *url = [NSURL URLWithString:self.imageNames[i]];
@@ -139,16 +136,48 @@ static CGFloat moveHeight = 50;
     }
     //分类控制器基础配置
     self.myCategoryView.titles = self.titles;
-    self.myCategoryView.delegate = self;
     self.myCategoryView.imageURLs = self.imageNames;
-    self.myCategoryView.defaultSelectedIndex = self.currentIndex;
+    self.myCategoryView.defaultSelectedIndex = self.ld_currentIndex;
     self.myCategoryView.loadImageCallback = ^(UIImageView *imageView, NSURL *imageURL) {
         [imageView sd_setImageWithURL:imageURL];
     };
-    [self updateSelectColors:self.currentIndex];
-    [self configCategoryViewWithType:JXCategoryTitleImageType_OnlyImage selectIndex:self.currentIndex unselectIndex:self.currentIndex];
+    [self updateSelectColors:self.ld_currentIndex];
+    [self configCategoryViewWithType:JXCategoryTitleImageType_OnlyImage selectIndex:self.ld_currentIndex unselectIndex:self.ld_currentIndex];
+    
+    
+    for (int i = 0; i<self.titles.count; i++) {
+        CNCategoryGetChannelModel *model = self.dataArray[i];
+        BOOL isBlack = NO;
+        if (CNLiveStringIsEmpty(model.statusBarColor)) {
+            isBlack = YES;
+        } else {
+            isBlack = [model.statusBarColor boolValue];//1 黑色
+        }
+        if (model.pageStyleList.count>0) {
+            self.topBgImg.frame = CGRectMake(0, 0, KScreenWidth, self.topBgImgHeight);
+            CNLiveSubSegmentController *subVC = [[CNLiveSubSegmentController alloc] initWithModel:model];
+            subVC.isBlack = isBlack;
+            weakself
+            subVC.scrollViewDidScrollBlock = ^(BOOL isUp) {
+                [weakSelf scrollViewUpDowm:isUp];
+            };
+
+            [self.controllersArr addObject:subVC];
+        }else{
+        self.topBgImg.frame = CGRectMake(0, 0, KScreenWidth, self.topBgImgHeight - 50);
+        CNLiveListManager *list = [CNLiveListManager shareListManager];
+       UIViewController *listVC = [list model:model black:isBlack bgImage:self.bgImages[i] bgColor:model.backgroundColor bgImageH5:model.backgroundImgH5];
+        weakself
+        list.scrollViewDidScrollBlock = ^(BOOL isUp) {
+            [weakSelf scrollViewUpDowm:isUp];
+        };
+            [self.controllersArr addObject:listVC];
+        }
+    }
+    [self addTheFirstPage];
 }
+
 #pragma mark - 通知的监听方法 Notification
 // 分类接口请求成功或者失败
 - (void)classifyChannelsRequest:(NSNotification *)noti {
@@ -359,6 +388,7 @@ static CGFloat moveHeight = 50;
     [self.textColors removeAllObjects];
     [self.textColorSeleteds removeAllObjects];
     [self.statusBarColors removeAllObjects];
+    [self.controllersArr removeAllObjects];
     for (NSString *str in normalArray) {
         NSDictionary *dic = CNLiveStringJsonToDictionary(str);
         CNCategoryGetChannelModel *model = [CNCategoryGetChannelModel mj_objectWithKeyValues:dic];
@@ -423,7 +453,7 @@ static CGFloat moveHeight = 50;
     [self managerScrollView:YES];
     self.topBgImg.top -= moveHeight;
     self.myCategoryView.collectionView.top = -50-kStatusHeight;
-    self.listContainerView.top = kStatusHeight;
+    self.pageViewController.view.top = kStatusHeight;
 }
 -(void)scrollViewDown{
     if (self.topBgImg.top==0) {
@@ -432,19 +462,17 @@ static CGFloat moveHeight = 50;
     [self managerScrollView:NO];
     self.topBgImg.top += moveHeight;
     self.myCategoryView.collectionView.top = 0;
-    self.listContainerView.top = self.myCategoryView.bottom;
+    self.pageViewController.view.top = self.myCategoryView.bottom;
 }
 -(void)managerScrollView:(BOOL)enabled
 {
-    self.listContainerView.scrollView.scrollEnabled = !enabled;
-    for (UIView *view in self.listContainerView.scrollView.subviews) {
-        if ([view.viewController isKindOfClass:[CNLiveSubSegmentController class]]) {
-            CNLiveSubSegmentController *subVc = (CNLiveSubSegmentController *)view.viewController;
-            [subVc layoutRightSubViewWithShow:!enabled];
-            }
-    }
+    self.findScrollView.scrollEnabled = !enabled;
+    if ([self.pageViewController.viewControllers.firstObject isKindOfClass:[CNLiveSubSegmentController class]]) {
+        CNLiveSubSegmentController *subVc = (CNLiveSubSegmentController *)self.pageViewController.viewControllers.firstObject;
+           [subVc layoutRightSubViewWithShow:!enabled];
+        }
 }
 #pragma mark - CNCustomChannelListViewDelegate !!!!!!!!!!!!!!!!!!!!!!
 - (void)changeChannelsList
@@ -492,51 +520,20 @@ static CGFloat moveHeight = 50;
 }
 #pragma mark - JXCategoryViewDelegate
-// 正在滚动中的回调，这里调整背景图片的 alpha 透明度
-- (void)categoryView:(JXCategoryBaseView *)categoryView scrollingFromLeftIndex:(NSInteger)leftIndex toRightIndex:(NSInteger)rightIndex ratio:(CGFloat)ratio {
-    [self configCategoryViewWithType:JXCategoryTitleImageType_OnlyImage selectIndex:leftIndex unselectIndex:rightIndex];
-}
-
-
 - (void)categoryView:(JXCategoryBaseView *)categoryView didSelectedItemAtIndex:(NSInteger)index {
     NSLog(@"%@", NSStringFromSelector(_cmd));
-    self.currentIndex = index;
+    UIViewController *vc = self.controllersArr[index];
+    if (index>self.ld_currentIndex) {
+        [self.pageViewController setViewControllers:@[vc] direction:UIPageViewControllerNavigationDirectionForward animated:YES completion:NULL];
+    }else
+    {
+        [self.pageViewController setViewControllers:@[vc] direction:UIPageViewControllerNavigationDirectionReverse animated:YES completion:NULL];
+    }
     // 侧滑手势处理
     self.navigationController.interactivePopGestureRecognizer.enabled = (index == 0);
     [self updateSelectColors:index];
     [self configCategoryViewWithType:JXCategoryTitleImageType_OnlyImage selectIndex:index unselectIndex:index];
-}
-#pragma mark - JXCategoryListContainerViewDelegate
--(id<JXCategoryListContentViewDelegate>)listContainerView:(JXCategoryListContainerView *)listContainerView initListForIndex:(NSInteger)index
-{
-    CNCategoryGetChannelModel *model = self.dataArray[index];
-    BOOL isBlack = NO;
-    if (CNLiveStringIsEmpty(model.statusBarColor)) {
-        isBlack = YES;
-    } else {
-        isBlack = [model.statusBarColor boolValue];//1 黑色
-    }
-    if (model.pageStyleList.count>0) {
-        self.topBgImg.frame = CGRectMake(0, 0, KScreenWidth, self.topBgImgHeight);
-        CNLiveSubSegmentController *subVC = [[CNLiveSubSegmentController alloc] initWithModel:model];
-        subVC.isBlack = isBlack;
-        weakself
-        subVC.scrollViewDidScrollBlock = ^(BOOL isUp) {
-            [weakSelf scrollViewUpDowm:isUp];
-        };
-
-        return subVC;
-    }
-    self.topBgImg.frame = CGRectMake(0, 0, KScreenWidth, self.topBgImgHeight - 50);
-    CNLiveListManager *list = [CNLiveListManager shareListManager];
-   UIViewController *listView = [list model:model black:isBlack bgImage:[self.bgImages safetyObjectAtIndex:index] bgColor:model.backgroundColor bgImageH5:model.backgroundImgH5];
-    list.contentVC = self;
-    weakself
-    list.scrollViewDidScrollBlock = ^(BOOL isUp) {
-        [weakSelf scrollViewUpDowm:isUp];
-    };
-
-    return listView;
+    
 }
 #pragma mark - Public
 -(JXCategoryBaseView *)preferredCategoryView
-//
-//  CNLiveListViewController.h
-//  CNLiveVideoClassifyKit
-//
-//  Created by CNLive on 2021/9/10.
-//
-
-#import <CNLiveBaseClass/CNLiveBaseClass.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface CNLiveListViewController : CNLiveBaseViewController
-
-@end
-
-NS_ASSUME_NONNULL_END
-//
-//  CNLiveListViewController.m
-//  CNLiveVideoClassifyKit
-//
-//  Created by CNLive on 2021/9/10.
-//
-
-#import "CNLiveListViewController.h"
-
-@interface CNLiveListViewController ()
-
-@end
-
-@implementation CNLiveListViewController
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    self.navigationHidden = YES;
-    // Do any additional setup after loading the view.
-}
-
-/*
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
-    // Get the new view controller using [segue destinationViewController].
-    // Pass the selected object to the new view controller.
-}
-*/
-
-@end
@@ -10,7 +10,7 @@
 NS_ASSUME_NONNULL_BEGIN
-@interface CNLiveSubSegmentController : CNCategoryBaseViewController<JXCategoryListContentViewDelegate>
+@interface CNLiveSubSegmentController : CNCategoryBaseViewController
 @property (nonatomic, assign) BOOL                      isBlack;
@@ -53,10 +53,11 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
+    [self handleDateWithChannelsArray];
     // 添加二级频道右侧的搜索按钮
     [self.view addSubview:self.searchBtn];
     self.view.backgroundColor = [UIColor clearColor];
-    [self handleDateWithChannelsArray];
+    self.findScrollView.scrollEnabled = NO;
     self.myCategoryView.titles = self.titles;
     if (CNLiveStringIsEmpty(self.backImage)) {
         self.view.backgroundColor = CNLiveColorWithHexString(self.backgroundColor);
@@ -72,7 +73,19 @@
     lineView.indicatorColor = self.textColor;
     self.myCategoryView.indicators = @[lineView];
     [self.categoryView reloadData];
-    self.listContainerView.scrollView.scrollEnabled = NO;
+    
+    for (int i = 0; i<self.titles.count; i++) {
+        CNCategoryGetChannelModel *model = self.pageListArr[i];
+        CNLiveListManager *list = [CNLiveListManager shareListManager];
+        UIViewController *listVC = [list model:model black:_isBlack bgImage:self.backImage bgColor:self.backgroundColor bgImageH5:self.backImageH5];
+
+        weakself
+        list.scrollViewDidScrollBlock = ^(BOOL isUp) {
+            !weakSelf.scrollViewDidScrollBlock ?: weakSelf.scrollViewDidScrollBlock(isUp);
+        };
+        [self.controllersArr addObject:listVC];
+    }
+    [self addTheFirstPage];
     // Do any additional setup after loading the view.
 }
 -(void)viewDidLayoutSubviews
@@ -82,8 +95,7 @@
     self.searchBtn.centerY = self.myCategoryView.height/2;
     self.myCategoryView.top = 0;
     self.myCategoryView.width = self.searchBtn.left;
-    self.listContainerView.frame = CGRectMake(0, [self preferredCategoryViewHeight]+10, self.view.bounds.size.width, self.view.bounds.size.height - [self preferredCategoryViewHeight]);
-    
+    self.pageViewController.view.frame = CGRectMake(0, self.myCategoryView.bottom+10, kScreenWidth, self.view.bounds.size.height - self.myCategoryView.bottom);
 }
 #pragma mark - Method
 -(void)handleDateWithChannelsArray{
@@ -95,8 +107,7 @@
 }
 // 一级频道显示隐藏时二级频道右侧的搜索按钮变宽变窄控制
 - (void)layoutRightSubViewWithShow:(BOOL)show {
-    
-    self.listContainerView.scrollView.scrollEnabled = !show;
+    self.findScrollView.scrollEnabled = !show;
     if (show) {
         // 正常
@@ -137,30 +148,19 @@
 {
     return 40;
 }
-#pragma mark - JXCategoryListContainerViewDelegate
-
--(id<JXCategoryListContentViewDelegate>)listContainerView:(JXCategoryListContainerView *)listContainerView initListForIndex:(NSInteger)index
+#pragma mark - JXCategoryViewDelegate
+-(void)categoryView:(JXCategoryBaseView *)categoryView didSelectedItemAtIndex:(NSInteger)index
 {
-    CNCategoryGetChannelModel *model = self.pageListArr[index];
-    CNLiveListManager *list = [CNLiveListManager shareListManager];
-    UIViewController *listView = [list model:model black:_isBlack bgImage:self.backImage bgColor:self.backgroundColor bgImageH5:self.backImageH5];
-    list.contentVC = self;
-    weakself
-    list.scrollViewDidScrollBlock = ^(BOOL isUp) {
-        !weakSelf.scrollViewDidScrollBlock ?: weakSelf.scrollViewDidScrollBlock(isUp);
-    };
-
-    return listView;
-}
-#pragma mark - JXCategoryListContentViewDelegate
+    self.navigationController.interactivePopGestureRecognizer.enabled = (index ==0);
+    UIViewController *vc = self.controllersArr[index];
+    if (index>self.ld_currentIndex) {
+        [self.pageViewController setViewControllers:@[vc] direction:UIPageViewControllerNavigationDirectionForward animated:YES completion:NULL];
+    }else
+    {
+        [self.pageViewController setViewControllers:@[vc] direction:UIPageViewControllerNavigationDirectionReverse animated:YES completion:NULL];
+    }
-/**
- 实现 <JXCategoryListContentViewDelegate> 协议方法，返回该视图控制器所拥有的「视图」
- */
-- (UIView *)listView {
-    return self.view;
 }
-
 #pragma mark - Getting&&Setting
 -(JXCategoryTitleView *)myCategoryView
 {
@@ -7,12 +7,12 @@
 #import <Foundation/Foundation.h>
 @class CNCategoryGetChannelModel;
+@class CNLiveListViewController;
 NS_ASSUME_NONNULL_BEGIN
-@interface CNLiveListManager : NSObject<JXCategoryListContentViewDelegate>
+@interface CNLiveListManager : NSObject
 @property (nonatomic, copy) void (^scrollViewDidScrollBlock)(BOOL isUp);
-@property (nonatomic, weak) UIViewController *contentVC;
 +(instancetype)shareListManager;
@@ -10,7 +10,6 @@
 @interface CNLiveListManager()
 {
-    UIViewController *subVC;
     CGFloat beginoffsetY;
 }
 @end
@@ -50,7 +49,7 @@
             @"backgroundImgH5":bgImageH5?bgImageH5:@""
         };
     }
-    subVC = [CNLiveClassifyJumpBridge ListViewWithPageType:model.pageType.integerValue param:paramDic];
+   UIViewController *subVC = [CNLiveClassifyJumpBridge ListViewWithPageType:model.pageType.integerValue param:paramDic];
     return subVC;
 }
 - (void)requestWebViewForScrollView:(nonnull UIScrollView *)scrollView isBeginDragging:(BOOL)isBeginDragging
@@ -67,13 +66,4 @@
     }
 }
-
-#pragma mark - JXCategoryListContentViewDelegate
-
-/**
- 实现 <JXCategoryListContentViewDelegate> 协议方法，返回该视图控制器所拥有的「视图」
- */
-- (UIView *)listView {
-    return subVC.view;
-}
 @end
@@ -19,7 +19,12 @@
     self.view.backgroundColor = [UIColor greenColor];
     // Do any additional setup after loading the view.
 }
-
+-(void)viewDidAppear:(BOOL)animated
+{
+    [super viewDidAppear:animated];
+    self.navigationController.navigationBarHidden = YES;
+    
+}
 /*
 #pragma mark - Navigation
@@ -40,11 +40,17 @@
 - (void)viewDidLoad
 {
     [super viewDidLoad];
+    
     [CNTools GetClassifyChannelsUrlsAndSave];
     self.title = @"首页";
     segArr = @[@"分类"];
     [self.view addSubview:self.collectionView];
 }
+-(void)viewDidAppear:(BOOL)animated
+{
+    [super viewDidAppear:animated];
+    self.navigationController.navigationBarHidden = YES;
+}
 #pragma mrk - UICollectionViewDataSource
 - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
 {