UIpageController 不好控制scroll的滑动效果，替换ContaintView

yanglingyu
1 parent f6e4752a
Showing 10 changed files with 185 additions and 205 deletions
CNLiveVideoClassifyKit.podspec
CNLiveVideoClassifyKit/Classes/Controller/CNCategoryBaseViewController.h
CNLiveVideoClassifyKit/Classes/Controller/CNCategoryBaseViewController.m
CNLiveVideoClassifyKit/Classes/Controller/CNLiveClassifySegmentController.m
CNLiveVideoClassifyKit/Classes/Controller/CNLiveListController.h
CNLiveVideoClassifyKit/Classes/Controller/CNLiveListController.m
CNLiveVideoClassifyKit/Classes/Controller/CNLiveSubSegmentController.h
CNLiveVideoClassifyKit/Classes/Controller/CNLiveSubSegmentController.m
CNLiveVideoClassifyKit/Classes/Manager/CNLiveListManager.h
CNLiveVideoClassifyKit/Classes/Manager/CNLiveListManager.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveVideoClassifyKit'
-  s.version          = '0.0.10'
+  s.version          = '0.0.11'
   s.summary          = '视讯头部一二级菜单组件'
 # This description is used to generate tags and improve search results.
@@ -9,20 +9,16 @@
 NS_ASSUME_NONNULL_BEGIN
-@interface CNCategoryBaseViewController : UIViewController<JXCategoryViewDelegate,UIPageViewControllerDelegate,UIPageViewControllerDataSource>
+@interface CNCategoryBaseViewController : UIViewController<JXCategoryViewDelegate,JXCategoryListContainerViewDelegate>
 @property (nonatomic, strong) JXCategoryBaseView *categoryView;
-@property (nonatomic, strong) UIPageViewController *pageViewController;
-@property (nonatomic, strong) UIScrollView *findScrollView;//控制器的scrollView
+@property (nonatomic, strong) JXCategoryListContainerView *listContainerView;
 @property (nonatomic, strong) NSMutableArray *titles;//标题
-@property (nonatomic, strong) NSMutableArray *controllersArr;/// 控制器数组
-
 @property (nonatomic, assign) NSInteger ld_currentIndex; //当前选中
--(void)addTheFirstPage; //默认页
 -(JXCategoryBaseView *)preferredCategoryView;
 -(CGFloat)preferredCategoryViewHeight;
--(void)categoryView:(JXCategoryBaseView *)categoryView didSelectedItemAtIndex:(NSInteger)index;
+- (void)categoryView:(JXCategoryBaseView *)categoryView didSelectedItemAtIndex:(NSInteger)index;
 @end
 NS_ASSUME_NONNULL_END
@@ -6,6 +6,7 @@
 // 分类控制器根类
 #import "CNCategoryBaseViewController.h"
+#import "CNLiveListController.h"
 @interface CNCategoryBaseViewController ()
 @end
@@ -15,8 +16,7 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     [self.view addSubview: self.categoryView];
-    [self addChildViewController:self.pageViewController];
-    [self.view addSubview:self.pageViewController.view];
+    [self.view addSubview:self.listContainerView];
     self.view.backgroundColor = [UIColor whiteColor];
     // Do any additional setup after loading the view.
@@ -27,6 +27,7 @@
     [super viewDidLayoutSubviews];
     self.categoryView.frame = CGRectMake(0, kStatusHeight, self.view.bounds.size.width, [self preferredCategoryViewHeight]);
+    self.listContainerView.frame = CGRectMake(0, [self preferredCategoryViewHeight], self.view.bounds.size.width, self.view.bounds.size.height);
 }
 -(void)viewWillAppear:(BOOL)animated
 {
@@ -37,13 +38,7 @@
 }
 #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];
 }
@@ -53,57 +48,19 @@
     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 - JXCategoryListContainerViewDelegate
+- (NSInteger)numberOfListsInlistContainerView:(JXCategoryListContainerView *)listContainerView
+{
+    return self.titles.count;
 }
-
-#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];
-    }
+- (id<JXCategoryListContentViewDelegate>)listContainerView:(JXCategoryListContainerView *)listContainerView initListForIndex:(NSInteger)index{
+    return [CNLiveListController new];
 }
 #pragma mark - JXCategoryViewDelegate
--(void)categoryView:(JXCategoryBaseView *)categoryView didSelectedItemAtIndex:(NSInteger)index
+- (void)categoryView:(JXCategoryBaseView *)categoryView didSelectedItemAtIndex:(NSInteger)index
 {
     self.navigationController.interactivePopGestureRecognizer.enabled = (index ==0);
-    UIViewController *vc = self.controllersArr[index];
-    vc.navigationController.navigationBarHidden = YES;
-    if (index>self.ld_currentIndex) {
-        [self.pageViewController setViewControllers:@[vc] direction:UIPageViewControllerNavigationDirectionForward animated:YES completion:NULL];
-    }else
-    {
-        self.ld_currentIndex = index;
-        [self.pageViewController setViewControllers:@[vc] direction:UIPageViewControllerNavigationDirectionReverse animated:YES completion:NULL];
-    }
+    self.ld_currentIndex = index;
 }
@@ -113,29 +70,16 @@
     if (!_categoryView) {
         _categoryView = [self preferredCategoryView];
         _categoryView.delegate = self;
+        _categoryView.listContainer = self.listContainerView;
     }
     return _categoryView;
 }
--(UIPageViewController *)pageViewController
-{
-    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;
+// 列表容器视图
+- (JXCategoryListContainerView *)listContainerView {
+    if (!_listContainerView) {
+        _listContainerView = [[JXCategoryListContainerView alloc] initWithType:JXCategoryListContainerType_ScrollView delegate:self];
     }
-    return _pageViewController;
-    
-}
-- (UIScrollView *)findScrollView{
-for(id subview in self.pageViewController.view.subviews){
-if([subview isKindOfClass:UIScrollView.class]){
-    _findScrollView=subview;
-    break;
-}
-}
-return _findScrollView;
-
+    return _listContainerView;
 }
 -(NSMutableArray *)titles
 {
@@ -145,12 +89,5 @@ return _findScrollView;
     return _titles;
 }
--(NSMutableArray *)controllersArr
-{
-    if (!_controllersArr) {
-        _controllersArr = [[NSMutableArray alloc] init];
-    }
-    return _controllersArr;
-}
 @end
@@ -13,6 +13,7 @@
 #import "CNWebRedirectHandle.h"
 #import "CNWitnessShadeManager.h"
 #import "CNSupervisionGuideViewManager.h"
+#import "CNLiveListController.h"
 static const CGFloat animationTime = 0.3;
 static const CGFloat animationHeight = 15;
@@ -116,7 +117,8 @@ static CGFloat moveHeight = 50;
     if ([CNWebRedirectHandle manager].isClickedIntegral) {
         [CNWebRedirectHandle manager].isClickedIntegral = NO;
         [self categoryView:self.myCategoryView didSelectedItemAtIndex:[CNWebRedirectHandle manager].channelId];
-        CNLiveSubSegmentController *svc = [self.controllersArr safetyObjectAtIndex:[CNWebRedirectHandle manager].classifyId];
+        NSNumber *key = @([CNWebRedirectHandle manager].classifyId);
+        CNLiveSubSegmentController *svc = (CNLiveSubSegmentController *)self.listContainerView.validListDict[key];
         if([svc isKindOfClass:[CNLiveSubSegmentController class]]){
             //目击者 - 今日要闻 - 中国冰雪
             [svc categoryView:svc.categoryView didSelectedItemAtIndex:[CNWebRedirectHandle manager].classifyId];
@@ -168,6 +170,10 @@ static CGFloat moveHeight = 50;
     {
         [self.view addSubview:self.loginBtn];
     }
+    weakself
+    [CNLiveListManager shareListManager].scrollViewDidScrollBlock = ^(BOOL isUp) {
+                [weakSelf scrollViewUpDowm:isUp];
+            };
     // Do any additional setup after loading the view.
 }
 -(void)viewWillAppear:(BOOL)animated {
@@ -203,7 +209,7 @@ static CGFloat moveHeight = 50;
 -(void)viewDidLayoutSubviews
 {
     [super viewDidLayoutSubviews];
-    self.pageViewController.view.frame = CGRectMake(0, self.myCategoryView.bottom, kScreenWidth, self.view.bounds.size.height - self.myCategoryView.bottom+ moveHeight);
+    self.listContainerView.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 preferredCategoryViewHeight]/2 + kStatusHeight;
@@ -247,42 +253,6 @@ static CGFloat moveHeight = 50;
     };
     [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;
-            subVC.delegate = self;
-            if (i == self.isLoginIndex) {
-                subVC.selectChannelId = i;
-            }
-            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];
     self.isLoad = YES;
     if (![CNUserShareManager isLogin]) {
         [CNLiveClassifyJumpBridge bringCenterLoginViewToFront];
@@ -341,12 +311,12 @@ static CGFloat moveHeight = 50;
 // 电商中国可以下拉出地图页面  当下拉出地图页面时不可以左右滚动
 - (void)PageControlScrollEnable:(NSNotification *)noti {
-    if (!self.findScrollView.isScrollEnabled) {
+    if (!self.listContainerView.scrollView.isScrollEnabled) {
         return;
     }
     BOOL scrollEnable = [noti.object boolValue];
     NSLog(@"是否可滚动:%d",scrollEnable);
-    self.findScrollView.scrollEnabled = scrollEnable;
+    self.listContainerView.scrollView.scrollEnabled = scrollEnable;
 }
 - (void)touristsLoginTipsViewIsClassify:(NSNotification *)noti{
@@ -606,7 +576,6 @@ 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];
@@ -658,10 +627,10 @@ static CGFloat moveHeight = 50;
 }
 -(void)scrollViewUpDowm:(BOOL)isUp
 {
-    if (isUp != self.findScrollView.isScrollEnabled) {
+    if (isUp != self.listContainerView.scrollView.isScrollEnabled) {
         return;
     }
-    self.findScrollView.scrollEnabled = !isUp;
+    self.listContainerView.scrollView.scrollEnabled = !isUp;
     self.isHiddenFirst = isUp;
     [UIView animateWithDuration:0.3 animations:^{
         if (isUp) {
@@ -676,7 +645,7 @@ static CGFloat moveHeight = 50;
 -(void)scrollViewUp{
     self.topBgImg.top -= moveHeight;
     self.myCategoryView.collectionView.top = -50-kStatusHeight;
-    self.pageViewController.view.top = kStatusHeight;
+    self.listContainerView.top = kStatusHeight;
     if ([CNUserShareManager isLogin]) {
         self.customChannelsBtn.centerY = self.myCategoryView.collectionView.centerY + kStatusHeight;
     }else
@@ -687,7 +656,7 @@ static CGFloat moveHeight = 50;
 -(void)scrollViewDown{
     self.topBgImg.top += moveHeight;
     self.myCategoryView.collectionView.top = 0;
-    self.pageViewController.view.top = self.myCategoryView.bottom;
+    self.listContainerView.top = self.myCategoryView.bottom;
     if ([CNUserShareManager isLogin]) {
         self.customChannelsBtn.centerY = self.myCategoryView.centerY;
     }else
@@ -808,18 +777,36 @@ static CGFloat moveHeight = 50;
         self.customChannelsV = nil;
     }];
 }
+#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;
+                    subVC.delegate = self;
+                    if (index == self.isLoginIndex) {
+                        subVC.selectChannelId = index;
+                    }
+        weakself
+        subVC.scrollViewDidScrollBlock = ^(BOOL isUp) {
+                    [weakSelf scrollViewUpDowm:isUp];
+                };
+        return subVC;
+    }
+    self.topBgImg.frame = CGRectMake(0, 0, KScreenWidth, self.topBgImgHeight - 50);
+    return [[CNLiveListController alloc] initWithModel:model black:isBlack bgImage:self.bgImages[index]  bgColor:model.backgroundColor bgImageH5:model.backgroundImgH5];
+}
 #pragma mark - JXCategoryViewDelegate
 - (void)categoryView:(JXCategoryBaseView *)categoryView didSelectedItemAtIndex:(NSInteger)index {
     NSLog(@"%@", NSStringFromSelector(_cmd));
-    UIViewController *vc = self.controllersArr[index];
-    vc.navigationController.navigationBarHidden = YES;
-    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];
@@ -829,7 +816,7 @@ static CGFloat moveHeight = 50;
         [BHConfig set:ChannelsSelectFirst value:model.id];
     }
     if (model.pageStyleList.count>0) {
-        CNLiveSubSegmentController *subVC = (CNLiveSubSegmentController *)self.controllersArr[index];
+        CNLiveSubSegmentController *subVC = (CNLiveSubSegmentController *)self.listContainerView.validListDict[@(index)];
         if (subVC && [subVC respondsToSelector:@selector(refreshCurrentVCData)]) {
             [subVC refreshCurrentVCData];
         }
@@ -862,7 +849,7 @@ static CGFloat moveHeight = 50;
         if ([model.id isEqualToString:@"1"]) {
             time = 60;
         }
-        [CNLiveClassifyJumpBridge listViewRefreshWithVC:self.controllersArr[index] pageType:model.pageType.integerValue param:paramDic refreshTime:time];
+        [CNLiveClassifyJumpBridge listViewRefreshWithVC:self.listContainerView.viewController pageType:model.pageType.integerValue param:paramDic refreshTime:time];
     }
     if (index != self.myCategoryView.selectedIndex) {
         [[NSNotificationCenter defaultCenter] postNotificationName:WjjH5StopVideoPlayerNotification object:nil];
+//
+//  CNLiveListController.h
+//  CNLiveVideoClassifyKit
+//
+//  Created by CNLive on 2021/9/30.
+//
+
+#import <UIKit/UIKit.h>
+#import "CNCategoryGetChannelModel.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface CNLiveListController : UIViewController<JXCategoryListContentViewDelegate>
+-(instancetype)initWithModel:(CNCategoryGetChannelModel *)model black:(BOOL)black bgImage:(NSString *)bgImage bgColor:(NSString *)bgColor bgImageH5:(NSString *)bgImageH5;
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  CNLiveListController.m
+//  CNLiveVideoClassifyKit
+//
+//  Created by CNLive on 2021/9/30.
+//
+
+#import "CNLiveListController.h"
+
+@interface CNLiveListController ()
+@property (nonatomic, strong)NSDictionary * paramDic;
+@property (nonatomic, strong)CNCategoryGetChannelModel *model;
+@end
+
+@implementation CNLiveListController
+-(instancetype)initWithModel:(CNCategoryGetChannelModel *)model black:(BOOL)black bgImage:(NSString *)bgImage bgColor:(NSString *)bgColor bgImageH5:(NSString *)bgImageH5
+{
+    if (self = [super init]) {
+        _model = model;
+        if ([model.pageType isEqualToString:@"4"] || [model.pageType isEqualToString:@"5"]){
+             self.paramDic= @{
+                 @"title": model.showName?model.showName:@"",
+                @"bgColor": bgColor?bgColor:@"",
+                @"isBlack":@(black),
+                 @"backgroundImg": bgImage?bgImage:@"",
+                 @"channelId":model.channelId?model.channelId:@"",
+                 @"channelName":model.id?model.id:@"",
+                 @"pageId":model.pageId?model.pageId:@""
+                
+            };
+        }else{
+             self.paramDic= @{
+                @"title": model.showName?model.showName:@"",
+                @"bgColor": bgColor?bgColor:@"",
+                @"isBlack":@(black),
+                @"thirdUrl":model.thirdUrl?model.thirdUrl:@"",
+                @"backgroundImgH5":bgImageH5?bgImageH5:@""
+            };
+        }
+    }
+    return self;
+}
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    UIViewController *subVC = [CNLiveClassifyJumpBridge ListViewWithPageType:_model.pageType.integerValue param:_paramDic];
+    [self.view addSubview:subVC.view];
+    [self addChildViewController:subVC];
+    [subVC didMoveToParentViewController:self];
+    // Do any additional setup after loading the view.
+}
+-(void)viewDidLayoutSubviews
+{
+    [super viewDidLayoutSubviews];
+}
+#pragma mark - JXCategoryListContentViewDelegate
+-(UIView *)listView
+{
+    return self.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
@@ -16,7 +16,7 @@ NS_ASSUME_NONNULL_BEGIN
 @end
-@interface CNLiveSubSegmentController : CNCategoryBaseViewController
+@interface CNLiveSubSegmentController : CNCategoryBaseViewController<JXCategoryListContentViewDelegate>
 @property (nonatomic, assign) BOOL                      isBlack;
 @property (nonatomic, assign) NSInteger                 selectChannelId;
@@ -8,6 +8,7 @@
 #import "CNLiveSubSegmentController.h"
 #import "CNAudioPlayProgressView.h"
 #import "CNLiveListManager.h"
+#import "CNLiveListController.h"
 @interface CNLiveSubSegmentController ()
 @property (nonatomic, strong)JXCategoryTitleView *myCategoryView;
@@ -97,7 +98,7 @@
     // 添加二级频道右侧的搜索按钮
     [self.view addSubview:self.searchBtn];
     self.view.backgroundColor = [UIColor clearColor];
-    self.findScrollView.scrollEnabled = NO;
+    self.listContainerView.scrollView.scrollEnabled = NO;
     self.myCategoryView.titles = self.titles;
     if (CNLiveStringIsEmpty(self.backImage)) {
         self.view.backgroundColor = CNLiveColorWithHexString(self.backgroundColor);
@@ -114,20 +115,6 @@
     self.myCategoryView.indicators = @[lineView];
     [self.categoryView reloadData];
-    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);
-            [weakSelf rightSubViewWithShow:isUp];
-        };
-        [self.controllersArr addObject:listVC];
-    }
-    [self addTheFirstPage];
-    
     if ([self.channelId isEqualToString:@"219"]) {
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updatePlayingStatus:) name:WjjAudioPlayerStatusNotification object:nil];
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updatePlayingSchedule:) name:WjjAudioPlayerScheduleNotification object:nil];
@@ -169,7 +156,6 @@
     }
     self.myCategoryView.top = 0;
-    self.pageViewController.view.frame = CGRectMake(0, self.myCategoryView.bottom+10, kScreenWidth, self.view.bounds.size.height - self.myCategoryView.bottom);
     self.searchBtn.right = KScreenWidth-12;
     CGFloat width = self.searchBtn.left;
     self.searchBtn.centerY = self.myCategoryView.height/2;
@@ -185,13 +171,18 @@
         width = self.historyBtn.left;
     }
     self.myCategoryView.width = width;
+    weakself
+    [CNLiveListManager shareListManager].scrollViewDidScrollBlock = ^(BOOL isUp) {
+    !self.scrollViewDidScrollBlock ?: self.scrollViewDidScrollBlock(isUp);
+    [weakSelf rightSubViewWithShow:isUp];
+    };
     // Do any additional setup after loading the view.
 }
 -(void)viewDidLayoutSubviews
 {
     [super viewDidLayoutSubviews];
     self.myCategoryView.top = 0;
-    self.pageViewController.view.frame = CGRectMake(0, self.myCategoryView.bottom+10, kScreenWidth, self.view.bounds.size.height - self.myCategoryView.bottom);
+    self.listContainerView.frame = CGRectMake(0, self.myCategoryView.bottom+10, kScreenWidth, self.view.bounds.size.height - self.myCategoryView.bottom);
     self.searchBtn.right = KScreenWidth-12;
     CGFloat width = self.searchBtn.left;
     self.searchBtn.centerY = self.myCategoryView.height/2;
@@ -308,10 +299,10 @@
 }
 // 一级频道显示隐藏时二级频道右侧的搜索按钮变宽变窄控制
 - (void)rightSubViewWithShow:(BOOL)show {
-    if (show == self.findScrollView.isScrollEnabled) {
+    if (show == self.listContainerView.scrollView.isScrollEnabled) {
         return;
     }
-    self.findScrollView.scrollEnabled = show;
+    self.listContainerView.scrollView.scrollEnabled = show;
     self.isHiddenFirst = show;
     weakself
     [UIView animateWithDuration:0.3 animations:^{
@@ -382,7 +373,7 @@
         if ([model.id isEqualToString:@"1"]) {
             time = 60;
         }
-        [CNLiveClassifyJumpBridge listViewRefreshWithVC:self.controllersArr[self.ld_currentIndex] pageType:model.pageType.integerValue param:paramDic refreshTime:time];
+        [CNLiveClassifyJumpBridge listViewRefreshWithVC:self.listContainerView.viewController pageType:model.pageType.integerValue param:paramDic refreshTime:time];
 }
 -(void)showGuideView
 {
@@ -513,22 +504,26 @@
 {
     return 40;
 }
+#pragma mark - JXCategoryListContainerViewDelegate
+- (id<JXCategoryListContentViewDelegate>)listContainerView:(JXCategoryListContainerView *)listContainerView initListForIndex:(NSInteger)index{
+    CNCategoryGetChannelModel *model = self.pageListArr[index];
+    return [[CNLiveListController alloc] initWithModel:model black:_isBlack bgImage:self.backImage  bgColor:self.backgroundColor bgImageH5:self.backImageH5];
+}
+#pragma mark - JXCategoryListContentViewDelegate
+-(UIView *)listView
+{
+    return self.view;
+}
 #pragma mark - JXCategoryViewDelegate
--(void)categoryView:(JXCategoryBaseView *)categoryView didSelectedItemAtIndex:(NSInteger)index
+- (void)categoryView:(JXCategoryBaseView *)categoryView didSelectedItemAtIndex:(NSInteger)index
 {
     self.navigationController.interactivePopGestureRecognizer.enabled = (index ==0);
     self.myCategoryView.defaultSelectedIndex = index;
-    UIViewController *vc = self.controllersArr[index];
-    if (index>self.ld_currentIndex) {
-        [self.pageViewController setViewControllers:@[vc] direction:UIPageViewControllerNavigationDirectionForward animated:YES completion:NULL];
-    }else
-    {
         self.ld_currentIndex = index;
         if (index != self.myCategoryView.selectedIndex) {
             [[NSNotificationCenter defaultCenter] postNotificationName:WjjH5StopVideoPlayerNotification object:nil];
             [[NSNotificationCenter defaultCenter] postNotificationName:kDSHappinessPageControlScrollEnableNotification object:@(YES)];
         }
-        [self.pageViewController setViewControllers:@[vc] direction:UIPageViewControllerNavigationDirectionReverse animated:YES completion:NULL];
         CNCategoryGetChannelModel *model = (CNCategoryGetChannelModel *)[self.pageListArr safetyObjectAtIndex:index];
         if (![CNUserShareManager isLogin]) {
             [BHConfig set:ChannelsSelectSecond value:model.id];
@@ -552,7 +547,7 @@
             if ([model.id isEqualToString:@"1"]) {
                 time = 60;
             }
-            [CNLiveClassifyJumpBridge listViewRefreshWithVC:self.controllersArr[index] pageType:model.pageType.integerValue param:paramDic refreshTime:time];
+            [CNLiveClassifyJumpBridge listViewRefreshWithVC:self.listContainerView.viewController pageType:model.pageType.integerValue param:paramDic refreshTime:time];
         [self showGuideView];
         weakself
         [self.bgImgView sd_setImageWithURL:[NSURL URLWithString:self.backImageH5] completed:^(UIImage * _Nullable image, NSError * _Nullable error, SDImageCacheType cacheType, NSURL * _Nullable imageURL) {
@@ -560,7 +555,6 @@
                 weakSelf.bgImgView.height = KScreenWidth*image.size.height/image.size.width;
             }
         }];
-    }
 }
 #pragma mark - Getting&&Setting
 -(JXCategoryTitleView *)myCategoryView
@@ -11,11 +11,10 @@ NS_ASSUME_NONNULL_BEGIN
 @interface CNLiveListManager : NSObject
 @property (nonatomic, copy) void (^scrollViewDidScrollBlock)(BOOL isUp);
+@property (nonatomic, assign) BOOL isHiddenFirst;
 +(instancetype)shareListManager;
--(UIViewController *)model:(CNCategoryGetChannelModel *)model black:(BOOL)black bgImage:(NSString *)bgImage bgColor:(NSString *)bgColor bgImageH5:(NSString *)bgImageH5;
-
 - (void)requestWebViewForScrollView:(nonnull UIScrollView *)scrollView isBeginDragging:(BOOL)isBeginDragging;
 + (CNCategoryBaseViewController *)CNCategoryBaseViewController;
@@ -29,42 +29,22 @@
 {
     return [[CNLiveClassifySegmentController alloc] init];
 }
-
--(UIViewController *)model:(CNCategoryGetChannelModel *)model black:(BOOL)black bgImage:(NSString *)bgImage bgColor:(nonnull NSString *)bgColor bgImageH5:(nonnull NSString *)bgImageH5
-{
-    NSDictionary * paramDic = nil;
-    if ([model.pageType isEqualToString:@"4"] || [model.pageType isEqualToString:@"5"]){
-         paramDic= @{
-             @"title": model.showName?model.showName:@"",
-            @"bgColor": bgColor?bgColor:@"",
-            @"isBlack":@(black),
-             @"backgroundImg": bgImage?bgImage:@"",
-             @"channelId":model.channelId?model.channelId:@"",
-             @"channelName":model.id?model.id:@"",
-             @"pageId":model.pageId?model.pageId:@""
-            
-        };
-    }else{
-         paramDic= @{
-            @"title": model.showName?model.showName:@"",
-            @"bgColor": bgColor?bgColor:@"",
-            @"isBlack":@(black),
-            @"thirdUrl":model.thirdUrl?model.thirdUrl:@"",
-            @"backgroundImgH5":bgImageH5?bgImageH5:@""
-        };
-    }
-   UIViewController *subVC = [CNLiveClassifyJumpBridge ListViewWithPageType:model.pageType.integerValue param:paramDic];
-    return subVC;
-}
 - (void)requestWebViewForScrollView:(nonnull UIScrollView *)scrollView isBeginDragging:(BOOL)isBeginDragging
 {
     if (isBeginDragging) {
         beginoffsetY = scrollView.offsetY;
     }else
     {
-        if (scrollView.offsetY - beginoffsetY>5) {
+        CGFloat hight = scrollView.frame.size.height;
+        CGFloat contentOffset = scrollView.contentOffset.y;
+        CGFloat distanceFromBottom = scrollView.contentSize.height - contentOffset;
+        CGFloat offset = contentOffset - beginoffsetY;
+        beginoffsetY = contentOffset;
+        if (offset > 0 && contentOffset > 0 && !self.isHiddenFirst) {
+            self.isHiddenFirst = YES;
             !self.scrollViewDidScrollBlock ?: self.scrollViewDidScrollBlock(YES);
-        }else if (scrollView.offsetY - beginoffsetY<0) {
+        }else if (offset < 0 && ((scrollView.contentSize.height<hight && contentOffset<0) || distanceFromBottom>hight+1) && self.isHiddenFirst) {
+            self.isHiddenFirst = NO;
             !self.scrollViewDidScrollBlock ?: self.scrollViewDidScrollBlock(NO);
         }
     }