分类控制器修改

yanglingyu
1 parent d4abf9b9
Showing 34 changed files with 1569 additions and 79 deletions
CNLiveVideoClassifyKit.podspec
CNLiveVideoClassifyKit/Assets/Assets.xcassets/Contents.json
CNLiveVideoClassifyKit/Assets/Assets.xcassets/selectImage.imageset/Contents.json
CNLiveVideoClassifyKit/Assets/Assets.xcassets/selectImage.imageset/crab_selected-1.png
CNLiveVideoClassifyKit/Assets/Assets.xcassets/selectImage.imageset/crab_selected.png
CNLiveVideoClassifyKit/Assets/CNSegmentControl.bundle/ik_subtitle_more_black@2x.png
CNLiveVideoClassifyKit/Assets/CNSegmentControl.bundle/ik_subtitle_more_black@3x.png
CNLiveVideoClassifyKit/Assets/CNSegmentControl.bundle/ik_subtitle_more_white@2x.png
CNLiveVideoClassifyKit/Assets/CNSegmentControl.bundle/ik_subtitle_more_white@3x.png
CNLiveVideoClassifyKit/Assets/CNSegmentControl.bundle/jj_close@2x.png
CNLiveVideoClassifyKit/Assets/CNSegmentControl.bundle/jj_close@3x.png
CNLiveVideoClassifyKit/Classes/Controller/CNCategoryBaseViewController.h
CNLiveVideoClassifyKit/Classes/Controller/CNCategoryBaseViewController.m
CNLiveVideoClassifyKit/Classes/Controller/CNLiveClassifySegmentController.m
CNLiveVideoClassifyKit/Classes/Controller/CNLiveSubSegmentController.h
CNLiveVideoClassifyKit/Classes/Controller/CNLiveSubSegmentController.m
CNLiveVideoClassifyKit/Classes/Controller/ListViewController.h
CNLiveVideoClassifyKit/Classes/Controller/ListViewController.m
CNLiveVideoClassifyKit/Classes/Header/CNLiveCommonDefines.h
CNLiveVideoClassifyKit/Classes/Header/CNLiveViewClassifyKitPCH.h
@@ -32,15 +32,21 @@ TODO: Add long description of the pod here.
   s.source_files = 'CNLiveVideoClassifyKit/Classes/**/*'
-  
-   s.resource_bundles = {
-     'CNLiveVideoClassifyKit' => ['CNLiveVideoClassifyKit/Assets/Assets.xcassets']
-   }
-
-  # s.public_header_files = 'Pod/Classes/**/*.h'
+  s.resources =  'CNLiveVideoClassifyKit/Assets/**/*.bundle'
+#   s.resource_bundles = {
+#     'CNLiveVideoClassifyKit' => ['CNLiveVideoClassifyKit/Assets/CNSegmentControl.bundle']
+#   }
+    s.prefix_header_contents = '#import "CNLivevideoClassifyPCH.h"'
+   s.public_header_files = 'Pod/Classes/**/*.h'
   # s.frameworks = 'UIKit', 'MapKit'
    s.dependency 'JXCategoryView'
-   s.dependency 'MJExtension'
+   s.dependency 'CNLiveTripartiteManagement/MJExtension'
    s.dependency 'CNLiveBaseKit'
    s.dependency 'CNLiveBaseClass'
+   s.dependency 'CNLiveUserManagement'
+   s.dependency 'CNLiveCommonCategory'
+   s.dependency 'CNLiveTripartiteManagement/SDWebImage'
+   s.dependency 'CNLiveTripartiteManagement/Masonry'
+   s.dependency 'CNLiveTripartiteManagement/YYKit'
+
 end
-{
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "crab_selected.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "crab_selected-1.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
@@ -6,11 +6,12 @@
 //分类试图控制器基类
 #import <CNLiveBaseClass/CNLiveBaseViewController.h>
+#import <JXCategoryView/JXCategoryView.h>
 NS_ASSUME_NONNULL_BEGIN
 @interface CNCategoryBaseViewController : CNLiveBaseViewController<JXCategoryListContainerViewDelegate,JXCategoryViewDelegate>
-@property (nonatomic, strong) NSArray *titles;
+@property (nonatomic, strong) NSMutableArray *titles;
 @property (nonatomic, strong) JXCategoryBaseView *categoryView;
 @property (nonatomic, strong) JXCategoryListContainerView *listContainerView;
 @property (nonatomic, assign) BOOL isNeedIndicatorPositionChangeItem;
@@ -8,7 +8,6 @@
 #import "CNCategoryBaseViewController.h"
 #import "ListViewController.h"
-
 @interface CNCategoryBaseViewController ()
 @end
@@ -17,9 +16,11 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
+    [self handleDateWithChannelsArray];
     [self.view addSubview: self.categoryView];
     [self.view addSubview:self.listContainerView];
     self.view.backgroundColor = [UIColor whiteColor];
+    self.navigationHidden = YES;
     // Do any additional setup after loading the view.
 }
@@ -35,9 +36,13 @@
 {
     [super viewWillAppear:animated];
     self.navigationController.interactivePopGestureRecognizer.enabled = YES;
+    self.navigationHidden = YES;
 }
 #pragma mark - Public
+-(void)handleDateWithChannelsArray{
+    
+}
 -(JXCategoryBaseView *)preferredCategoryView{
     return [[JXCategoryBaseView alloc] init];
 }
@@ -78,8 +83,18 @@
 - (JXCategoryListContainerView *)listContainerView
 {
     if (!_listContainerView) {
-        _listContainerView = [[JXCategoryListContainerView alloc] initWithType:JXCategoryListContainerType_CollectionView delegate:self];
+        _listContainerView = [[JXCategoryListContainerView alloc] initWithType:JXCategoryListContainerType_ScrollView delegate:self];
+        _listContainerView.scrollView.backgroundColor = [UIColor clearColor];
+        _listContainerView.listCellBackgroundColor = [UIColor clearColor];
     }
     return _listContainerView;
 }
+
+-(NSMutableArray *)titles
+{
+    if (!_titles) {
+        _titles = [[NSMutableArray alloc] init];
+    }
+    return _titles;
+}
 @end
@@ -6,53 +6,274 @@
 //
 #import "CNLiveClassifySegmentController.h"
-#import <JXCategoryView/JXCategoryTitleImageView.h>
+#import <UIKit/UIKit.h>
+#import "CNCustomChannelListView.h"
+#import "CNCategoryGetChannelModel.h"
+#import "ListViewController.h"
+#import "CNLiveSubSegmentController.h"
+
+@interface CNLiveClassifySegmentController ()<JXCategoryViewDelegate>
+
+@property (nonatomic, strong)JXCategoryTitleImageView *myCategoryView; //选择器
+@property (nonatomic, strong) UIButton                *customChannelsBtn;
+@property (nonatomic, strong) UIButton                *loginBtn;
+@property (nonatomic, strong) CNCustomChannelListView *customChannelsV;
+//@property (nonatomic, strong) CNTouristsLoginTipsView *fuzzyView;//游客登录弹框
+@property (nonatomic, strong) UIImageView             *topBgImg; //头部图片
+@property (nonatomic, assign) CGFloat                  topBgImgHeight;//头部图片高度
+@property (nonatomic, assign) CGFloat               lastOffsetY;
+
+@property (nonatomic, assign) NSInteger       currentIndex;//当前页
+
+@property (nonatomic, strong) NSString *    currentAtatusColor;
+
+@property (nonatomic, strong) NSMutableArray *dataArray; //数据
+@property (nonatomic, strong) NSMutableArray *bgImages; //背景图
+@property (nonatomic, strong) NSMutableArray *bgColors; //背景色
+@property (nonatomic, strong) NSMutableArray *imageNames; //选择器图片
+@property (nonatomic, strong) NSMutableArray *imageTypes; //展示类型：图片/文字
+@property (nonatomic, strong) NSMutableArray *statusBarColors; //状态栏颜色
+@property (nonatomic, strong) NSMutableArray *textColors; //未选中字体颜色
+@property (nonatomic, strong) NSMutableArray *textColorSeleteds; //选中字体颜色
-@interface CNLiveClassifySegmentController ()
-@property (nonatomic, strong)JXCategoryTitleImageView *myCategoryView;
 @end
 @implementation CNLiveClassifySegmentController
-
+static CGFloat moveHeight = 50;
 - (void)viewDidLoad {
     [super viewDidLoad];
-    self.titles = @[@"推荐",@"视讯中国",@"听见中国",@"健康中国",@"发现中国"];
-    NSArray *selectImageNames = @[@"selectImage",@"selectImage",@"selectImage",@"selectImage",@"selectImage"];
+    self.topBgImgHeight = kStatusHeight+100;
+    [self.view insertSubview:self.topBgImg atIndex:0];
+
+    for (int i = 0;i<self.imageNames.count;i++) {
+        NSURL *url = [NSURL URLWithString:self.imageNames[i]];
+        [self.imageNames replaceObjectAtIndex:i withObject:url];
+    }
+    //分类控制器基础配置
     self.myCategoryView.titles = self.titles;
-    self.myCategoryView.selectedImageNames = selectImageNames;
+    self.myCategoryView.delegate = self;
+    self.myCategoryView.translatesAutoresizingMaskIntoConstraints = NO;
+    self.myCategoryView.imageURLs = self.imageNames;
+    self.myCategoryView.loadImageCallback = ^(UIImageView *imageView, NSURL *imageURL) {
+        [imageView sd_setImageWithURL:imageURL];
+    };
+    self.myCategoryView.titleColorGradientEnabled = YES;
+    self.myCategoryView.contentEdgeInsetLeft = 10;
+    self.myCategoryView.titleFont = [UIFont fontWithName:@"PingFangSC-Medium" size:15];
     self.myCategoryView.imageZoomEnabled = YES;
     self.myCategoryView.imageZoomScale = 1.3;
-    self.myCategoryView.averageCellSpacingEnabled = NO;
+    self.myCategoryView.selectedAnimationEnabled = YES;
+    self.myCategoryView.titleLabelZoomEnabled = YES;
+    self.myCategoryView.titleLabelZoomScale = 1.4;
+    self.myCategoryView.cellWidthZoomEnabled = YES;
+    self.myCategoryView.cellWidthZoomScale = 1.3;
+    self.myCategoryView.imageSize = CGSizeMake(56, 18);
     [self configCategoryViewWithType:JXCategoryTitleImageType_OnlyImage selectIndex:0];
+    
+    self.listContainerView.translatesAutoresizingMaskIntoConstraints = NO;
+//    //增加上下滑动手势
+//    UISwipeGestureRecognizer *recognizerUp = [[UISwipeGestureRecognizer alloc] initWithTarget:self action:@selector(handleSwipeFrom:)];
+//    [recognizerUp setDirection:UISwipeGestureRecognizerDirectionUp];
+//    [self.listContainerView addGestureRecognizer:recognizerUp];
+//
+//    UISwipeGestureRecognizer *recognizerDown = [[UISwipeGestureRecognizer alloc] initWithTarget:self action:@selector(handleSwipeFrom:)];
+//    [recognizerDown setDirection:UISwipeGestureRecognizerDirectionDown];
+//    [self.listContainerView addGestureRecognizer:recognizerDown];
     // Do any additional setup after loading the view.
 }
+
+-(void)viewDidLayoutSubviews
+{
+    [super viewDidLayoutSubviews];
+    [self.myCategoryView.heightAnchor constraintEqualToConstant:[self preferredCategoryViewHeight]].active = YES;
+    [self.myCategoryView.leftAnchor constraintEqualToAnchor:self.view.leftAnchor].active = YES;
+    [self.myCategoryView.topAnchor constraintEqualToAnchor:self.myCategoryView.topAnchor].active = YES;
+    [self.myCategoryView.rightAnchor constraintEqualToAnchor:self.view.rightAnchor].active = YES;
+    [self.myCategoryView.bottomAnchor constraintEqualToAnchor:self.listContainerView.topAnchor].active = YES;
+    [self.listContainerView.leftAnchor constraintEqualToAnchor:self.view.leftAnchor].active = YES;
+    [self.listContainerView.rightAnchor constraintEqualToAnchor:self.view.rightAnchor].active = YES;
+    CGFloat listContainerViewHeight = self.view.bounds.size.height;
+    [self.listContainerView.heightAnchor constraintEqualToConstant:listContainerViewHeight].active = YES;
+    
+}
+
+-(void)viewDidAppear:(BOOL)animated
+{
+    [super viewDidAppear:animated];
+}
+
+-(UIStatusBarStyle)preferredStatusBarStyle
+{
+    if (self.currentAtatusColor.intValue == 0) {
+        return UIStatusBarStyleLightContent;
+    }else
+    {
+        return UIStatusBarStyleDefault;
+    }
+    
+}
 #pragma mark - Method
+//配置选中状态显示图片，未选中展示文字
 - (void)configCategoryViewWithType:(JXCategoryTitleImageType)imageType selectIndex:(NSInteger)index
 {
         NSMutableArray *types = [NSMutableArray array];
         for (int i = 0; i < self.titles.count; i ++) {
             if (i == index) {
+                NSURL *url = self.imageNames[i];
+                NSString *str = [url absoluteString];
+                if ([str isEqual:@""]) {
+                    [types addObject:@(JXCategoryTitleImageType_OnlyTitle)];
+                }else{
                 [types addObject:@(imageType)];
+                }
             }else{
             [types addObject:@(JXCategoryTitleImageType_OnlyTitle)];
             }
         }
+    NSString *backgroundImage = [self.bgImages safetyObjectAtIndex:index];
+    [self.topBgImg sd_setImageWithURL:[NSURL URLWithString:backgroundImage]];
+    NSString *backgroundColor = [self.bgColors safetyObjectAtIndex:index];
+    self.topBgImg.backgroundColor = CNLiveColorWithHexString(backgroundColor);
+    self.myCategoryView.titleColor = self.textColors[index];
+    self.myCategoryView.titleSelectedColor = self.textColorSeleteds[index];
     self.myCategoryView.imageTypes = types;
-    [self.categoryView reloadData];
+    if (!self.currentAtatusColor || ![self.currentAtatusColor isEqualToString:self.statusBarColors[index]] ) {
+        self.currentAtatusColor = self.statusBarColors[index];
+        [self setNeedsStatusBarAppearanceUpdate];
+    }
+    for (int i = 0; i < self.titles.count; i ++) {
+    [self.myCategoryView reloadCellAtIndex:i];
+    }
+}
+
+//解析数据
+-(void)handleDateWithChannelsArray
+{
+    NSString *normalStr = [[NSUserDefaults standardUserDefaults] objectForKey:CNLiveNetAddGetCategoryChannels];
+    NSDictionary *dic =CNLiveStringJsonToDictionary(normalStr);
+    NSArray *normalArray = dic[@"data"];
+    [self.dataArray removeAllObjects];
+    [self.titles removeAllObjects];
+    [self.imageNames removeAllObjects];
+    [self.bgImages removeAllObjects];
+    [self.bgColors removeAllObjects];
+    [self.textColors removeAllObjects];
+    [self.textColorSeleteds removeAllObjects];
+    [self.statusBarColors removeAllObjects];
+    for (NSDictionary *dic in normalArray) {
+        CNCategoryGetChannelModel *model = [CNCategoryGetChannelModel mj_objectWithKeyValues:dic];
+        [self.dataArray addObject:model];
+        [self.titles addObject:model.showName];
+        if (model.img) {
+            [self.imageNames addObject:model.img];
+        }else{
+            [self.imageNames addObject:@""];
+        }
+        if (!CNLiveStringIsEmpty(model.backgroundImg)) {
+            [self.bgImages addObject:model.backgroundImg];
+        } else {
+            [self.bgImages addObject:@""];
+        }
+        if (!CNLiveStringIsEmpty(model.backgroundColor)) {
+            [self.bgColors addObject:model.backgroundColor];
+        } else {
+            [self.bgColors addObject:@"#FFFFFF"];
+        }
+        if (!CNLiveStringIsEmpty(model.textColor)) {
+            [self.textColors addObject:CNLiveColorWithHexString(model.textColor)];
+        } else {
+            [self.textColors addObject:CNLiveColorWithHexString(@"#848494")];
+        }
+        if (!CNLiveStringIsEmpty(model.textColorSelected)) {
+            [self.textColorSeleteds addObject:CNLiveColorWithHexString(model.textColorSelected)];
+        } else {
+            [self.textColorSeleteds addObject:CNLiveColorWithHexString(@"#13CC0C")];
+        }
+        if (!CNLiveStringIsEmpty(model.statusBarColor)) {
+            [self.statusBarColors addObject:model.statusBarColor];
+            [self setNeedsStatusBarAppearanceUpdate];
+        }else
+        {
+            [self.statusBarColors addObject:@"1"];
+        }
+    }
+}
+- (void)listScrollViewDidScroll:(UIScrollView *)scrollView {
+    CGPoint point = CGPointZero;
+    CGFloat offsetY = 0;
+    if (scrollView.contentOffset.y <= 0 && self.myCategoryView.frame.origin.y != kStatusHeight) {
+        point = [scrollView.panGestureRecognizer translationInView:scrollView];
+        offsetY = point.y - self.lastOffsetY;
+    }else {
+        if ((scrollView.contentOffset.y < 0 && self.myCategoryView.frame.origin.y == kStatusHeight) || scrollView.contentOffset.y + scrollView.bounds.size.height >= scrollView.contentSize.height) {
+            return;
+        }
+        point = scrollView.contentOffset;
+        offsetY = -(point.y - self.lastOffsetY);
+    }
+
+    if (self.lastOffsetY == 0) {
+        self.lastOffsetY = point.y;
+        return;
+    }
+    CGRect naviBarFrame = self.myCategoryView.frame;
+    naviBarFrame.origin.y += offsetY;
+    naviBarFrame.origin.y = MAX(-[self preferredCategoryViewHeight], MIN(kStatusHeight, naviBarFrame.origin.y));
+    self.myCategoryView.frame = naviBarFrame;
+    double percent = (naviBarFrame.origin.y + [self preferredCategoryViewHeight])/[self preferredCategoryViewHeight];
+    self.myCategoryView.alpha = percent;
+    self.lastOffsetY = point.y;
+}
+
+-(void)managerScrollView:(BOOL)enabled
+{
+    for (UIView *view in self.listContainerView.scrollView.subviews) {
+        if ([view.viewController isKindOfClass:[CNLiveSubSegmentController class]]) {
+            for (UIView *subView in view.subviews) {
+                if ([subView isKindOfClass:[JXCategoryListContainerView class]]) {
+                    JXCategoryListContainerView *titleView = (JXCategoryListContainerView *)subView;
+                    titleView.scrollView.scrollEnabled = enabled;
+                    self.listContainerView.scrollView.scrollEnabled = !enabled;
+                }
+            }
+            
+        }
+    }
 }
 #pragma mark - JXCategoryViewDelegate
 - (void)categoryView:(JXCategoryBaseView *)categoryView didSelectedItemAtIndex:(NSInteger)index {
     NSLog(@"%@", NSStringFromSelector(_cmd));
-    
+    self.currentIndex = index;
     // 侧滑手势处理
     self.navigationController.interactivePopGestureRecognizer.enabled = (index == 0);
     [self configCategoryViewWithType:JXCategoryTitleImageType_OnlyImage selectIndex:index];
 }
-
-
+#pragma mark - JXCategoryListContainerViewDelegate
+-(id<JXCategoryListContentViewDelegate>)listContainerView:(JXCategoryListContainerView *)listContainerView initListForIndex:(NSInteger)index
+{
+    CNCategoryGetChannelModel *model = self.dataArray[index];
+    if (model.pageStyleList.count>0) {
+        self.topBgImg.frame = CGRectMake(0, 0, KScreenWidth, self.topBgImgHeight);
+        CNLiveSubSegmentController *subVC = [[CNLiveSubSegmentController alloc] initWithModel:model];
+        weakself
+        subVC.scrollViewDidScrollBlock = ^(UIScrollView * _Nonnull scrollView) {
+            [weakSelf listScrollViewDidScroll:scrollView];
+        };
+        subVC.willBeginDragging = ^(CGFloat lastOffsetY) {
+            weakSelf.lastOffsetY = lastOffsetY;
+        };
+        subVC.didEndDragging = ^(CGFloat lastOffsetY) {
+            weakSelf.lastOffsetY = lastOffsetY;
+        };
+        return subVC;
+    }
+    self.topBgImg.frame = CGRectMake(0, 0, KScreenWidth, self.topBgImgHeight - 50);
+    ListViewController *list = [ListViewController new];
+    return list;
+}
 #pragma mark - Public
 -(JXCategoryBaseView *)preferredCategoryView
 {
@@ -65,7 +286,97 @@
     return (JXCategoryTitleImageView *)self.categoryView;
 }
+- (UIImageView *)topBgImg
+{
+    if (!_topBgImg) {
+        _topBgImg = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, self.topBgImgHeight)];
+        _topBgImg.contentMode = UIViewContentModeScaleAspectFill;
+        
+    }
+    return _topBgImg;
+}
+
+- (UIButton *)customChannelsBtn {
+    if (!_customChannelsBtn) {
+        _customChannelsBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 19, 19)];
+        [_customChannelsBtn setImage:[UIImage imageNamed:@"ik_subtitle_more-black"] forState:UIControlStateNormal];
+        [self.customChannelsBtn setImage:[UIImage imageNamed:@"ik_subtitle_more-white"] forState:UIControlStateSelected];
+        [_customChannelsBtn addTarget:self action:@selector(customAction:) forControlEvents:UIControlEventTouchUpInside];
+        _customChannelsBtn.touchAreaInsets = UIEdgeInsetsMake(20, 20, 20, 20);
+    }
+    return _customChannelsBtn;
+}
+
+- (UIButton *)loginBtn {
+    if (!_loginBtn) {
+        _loginBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+        _loginBtn.backgroundColor = RGBA(35, 212, 30, 1);
+        _loginBtn.frame = CGRectMake(0, 0, 52, 24);
+        _loginBtn.layer.cornerRadius = 12;
+        _loginBtn.layer.masksToBounds = YES;
+        [_loginBtn setTitle:@"登录" forState:UIControlStateNormal];
+        [_loginBtn setTitleColor:kWhiteColor forState:UIControlStateNormal];
+        _loginBtn.titleLabel.font = [UIFont systemFontOfSize:13];
+        [_loginBtn addTarget:self action:@selector(loginAction:) forControlEvents:UIControlEventTouchUpInside];
+        _loginBtn.touchAreaInsets = UIEdgeInsetsMake(8, 8, 8, 8);
+    }
+    return _loginBtn;
+}
+
+-(NSMutableArray *)imageNames
+{
+    if (!_imageNames) {
+        _imageNames = [[NSMutableArray alloc] init];
+    }
+    return _imageNames;
+}
+- (NSMutableArray *)bgImages
+{
+    if (!_bgImages) {
+        _bgImages = [[NSMutableArray alloc] init];
+    }
+    return _bgImages;
+}
+
+- (NSMutableArray *)bgColors
+{
+    if (!_bgColors) {
+        _bgColors = [[NSMutableArray alloc] init];
+    }
+    return _bgColors;
+}
+
+-(NSMutableArray *)textColors
+{
+    if (!_textColors) {
+        _textColors = [[NSMutableArray alloc] init];
+    }
+    return _textColors;
+}
+
+-(NSMutableArray *)textColorSeleteds
+{
+    if (!_textColorSeleteds) {
+        _textColorSeleteds = [[NSMutableArray alloc] init];
+    }
+    return _textColorSeleteds;
+}
+
+-(NSMutableArray *)dataArray
+{
+    if (!_dataArray) {
+        _dataArray = [[NSMutableArray alloc] init];
+    }
+    return _dataArray;
+}
+- (NSMutableArray *)statusBarColors
+{
+    if (!_statusBarColors) {
+        _statusBarColors = [[NSMutableArray alloc] init];
+    }
+    return _statusBarColors;
+}
 /*
 #pragma mark - Navigation
+//
+//  CNLiveSubSegmentController.h
+//  CNLiveVideoClassifyKit
+//
+//  Created by CNLive on 2021/8/30.
+//
+
+#import "CNCategoryBaseViewController.h"
+@class CNCategoryGetChannelModel;
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface CNLiveSubSegmentController : CNCategoryBaseViewController<JXCategoryListContentViewDelegate>
+-(instancetype)initWithModel:(CNCategoryGetChannelModel *)model;
+@property (nonatomic, copy) void (^scrollViewDidScrollBlock)(UIScrollView *);
+@property (nonatomic, copy) void (^willBeginDragging)(CGFloat );
+@property (nonatomic, copy) void (^didEndDragging)(CGFloat );
+
+//- (void)stopScrolling;
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  CNLiveSubSegmentController.m
+//  CNLiveVideoClassifyKit
+//
+//  Created by CNLive on 2021/8/30.
+//
+
+#import "CNLiveSubSegmentController.h"
+#import "CNCategoryGetChannelModel.h"
+#import "ListViewController.h"
+
+@interface CNLiveSubSegmentController ()
+@property (nonatomic, strong)JXCategoryTitleView *myCategoryView;
+@property (nonatomic, strong)NSArray *pageListArr;
+@property (nonatomic, strong)UIColor *textColor;
+@property (nonatomic, strong)UIColor *backgroundColor;
+@property (nonatomic, strong)NSString *backImage;
+
+
+@end
+
+@implementation CNLiveSubSegmentController
+
+-(instancetype)initWithModel:(CNCategoryGetChannelModel *)model
+{
+    self = [super init];
+    if(self){
+        self.pageListArr = model.pageStyleList;
+        if (!CNLiveStringIsEmpty(model.textColor)) {
+            self.textColor = CNLiveColorWithHexString(model.textColor);
+        }else
+        {
+            self.textColor = CNLiveColorWithHexString(@"#848494");
+        }
+        if (!CNLiveStringIsEmpty(model.backgroundColor)) {
+            self.backgroundColor = CNLiveColorWithHexString(model.backgroundColor);
+        }else
+        {
+            self.backgroundColor = CNLiveColorWithHexString(@"#FFFFFF");
+        }
+        
+        self.backImage = model.backgroundImg;
+        
+    }
+    return self;
+}
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    self.view.backgroundColor = [UIColor clearColor];
+    self.myCategoryView.titles = self.titles;
+    if (CNLiveStringIsEmpty(self.backImage)) {
+        self.view.backgroundColor = self.backgroundColor;
+    }
+    self.myCategoryView.titleColor = self.textColor;
+    self.myCategoryView.titleSelectedColor = self.textColor;
+    self.myCategoryView.cellSpacing = 32;
+    self.myCategoryView.contentEdgeInsetLeft = 25;
+    self.myCategoryView.averageCellSpacingEnabled = NO;
+    self.myCategoryView.titleFont = [UIFont fontWithName:@"PingFangSC-Medium" size:14];
+    JXCategoryIndicatorLineView *lineView = [[JXCategoryIndicatorLineView alloc] init];
+    lineView.indicatorWidth = 18;
+    lineView.indicatorColor = self.textColor;
+    self.myCategoryView.indicators = @[lineView];
+    [self.categoryView reloadData];
+    self.listContainerView.scrollView.scrollEnabled = NO;
+    // Do any additional setup after loading the view.
+}
+-(void)viewDidLayoutSubviews
+{
+    [super viewDidLayoutSubviews];
+    
+    self.categoryView.frame = CGRectMake(0, 0, self.view.bounds.size.width, [self preferredCategoryViewHeight]);
+    self.listContainerView.frame = CGRectMake(0, [self preferredCategoryViewHeight]+10, self.view.bounds.size.width, self.view.bounds.size.height - [self preferredCategoryViewHeight]);
+}
+#pragma mark - Method
+-(void)handleDateWithChannelsArray{
+    [self.titles removeAllObjects];
+
+    for (CNCategoryGetChannelModel *model in self.pageListArr) {
+        [self.titles addObject:model.name];
+    }
+}
+#pragma mark - Public
+-(JXCategoryTitleView *)preferredCategoryView{
+    return [[JXCategoryTitleView alloc] init];
+}
+-(CGFloat)preferredCategoryViewHeight
+{
+    return 40;
+}
+#pragma mark - JXCategoryListContainerViewDelegate
+
+-(id<JXCategoryListContentViewDelegate>)listContainerView:(JXCategoryListContainerView *)listContainerView initListForIndex:(NSInteger)index
+{
+    ListViewController *list = [ListViewController new];
+    weakself
+    list.scrollViewDidScrollBlock = ^(UIScrollView * _Nonnull scrollView) {
+        weakSelf.scrollViewDidScrollBlock(scrollView);
+    };
+    list.willBeginDragging = ^(UIScrollView * _Nonnull scrollView) {
+        weakSelf.willBeginDragging(0);
+    };
+    list.didEndDragging = ^(UIScrollView * _Nonnull scrollView) {
+        weakSelf.didEndDragging(0);
+    };
+    return list;
+}
+#pragma mark - JXCategoryListContentViewDelegate
+
+/**
+ 实现 <JXCategoryListContentViewDelegate> 协议方法，返回该视图控制器所拥有的「视图」
+ */
+- (UIView *)listView {
+    return self.view;
+}
+
+#pragma mark - Getting&&Setting
+-(JXCategoryTitleView *)myCategoryView
+{
+    return (JXCategoryTitleView *)self.categoryView;
+}
+
+/*
+#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
@@ -6,12 +6,16 @@
 //
 #import <UIKit/UIKit.h>
-#import <JXCategoryView/JXCategoryView.h>
+
 NS_ASSUME_NONNULL_BEGIN
 @interface ListViewController : UIViewController<JXCategoryListContentViewDelegate>
+@property (nonatomic, copy) void (^scrollViewDidScrollBlock)(UIScrollView *);
+@property (nonatomic, copy) void (^willBeginDragging)(UIScrollView *);
+@property (nonatomic, copy) void (^didEndDragging)(UIScrollView *);
+- (void)stopScrolling;
 @end
 NS_ASSUME_NONNULL_END
@@ -7,16 +7,56 @@
 #import "ListViewController.h"
-@interface ListViewController ()
-
+@interface ListViewController ()<UITableViewDataSource, UITableViewDelegate>
+@property (nonatomic, strong) UITableView *tableView;
 @end
 @implementation ListViewController
 - (void)viewDidLoad {
     [super viewDidLoad];
+    self.view.backgroundColor = [UIColor whiteColor];
+    self.tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain];
+    if (@available(iOS 11.0, *)) {
+        if ([self.tableView respondsToSelector:@selector(setContentInsetAdjustmentBehavior:)]) {
+            self.tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+        }
+    }
+    self.tableView.dataSource = self;
+    self.tableView.delegate = self;
+    [self.tableView registerClass:[UITableViewCell class] forCellReuseIdentifier:@"cell"];
+    [self.view addSubview:self.tableView];
     // Do any additional setup after loading the view.
 }
+- (void)viewDidLayoutSubviews {
+    [super viewDidLayoutSubviews];
+
+    self.tableView.frame = self.view.bounds;
+}
+- (void)stopScrolling {
+    [self.tableView setContentOffset:self.tableView.contentOffset animated:NO];
+}
+- (nonnull UITableViewCell *)tableView:(nonnull UITableView *)tableView cellForRowAtIndexPath:(nonnull NSIndexPath *)indexPath {
+    UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"cell" forIndexPath:indexPath];
+    cell.textLabel.text = [NSString stringWithFormat:@"row:%ld", indexPath.row];
+    return cell;
+}
+
+- (NSInteger)tableView:(nonnull UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+    return 100;
+}
+
+- (void)scrollViewDidScroll:(UIScrollView *)scrollView {
+    !self.scrollViewDidScrollBlock ?: self.scrollViewDidScrollBlock(scrollView);
+}
+
+- (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView {
+    !self.willBeginDragging ?: self.willBeginDragging(scrollView);
+}
+
+- (void)scrollViewDidEndDragging:(UIScrollView *)scrollView willDecelerate:(BOOL)decelerate {
+    !self.didEndDragging ?: self.didEndDragging(scrollView);
+}
 #pragma mark - JXCategoryListContentViewDelegate
 /**
+//
+//  CNLiveCommonDefines.h
+//  Pods
+//
+//  Created by CNLive on 2021/8/17.
+//
+
+#ifndef CNLiveCommonDefines_h
+#define CNLiveCommonDefines_h
+
+//#ifndef CNTouristsId
+//#define CNTouristsId @"100056"  //游客Id
+//#endif
+#ifndef CNLiveNetAddGetCategoryChannels
+#define CNLiveNetAddGetCategoryChannels @"CNLiveNetAddGetCategoryChannels"
+#endif
+#define NormalChannelArray      @"CNLiveNetAddNormalChannelArray"       //常用频道
+#define OtherChannelArray       @"CNLiveNetAddOtherChannelArray"        //其他频道
+//#define wjjLastAudioInfoSaveKey @"wjjLastAudioInfoSaveKey"
+//#define CNConnectSuccNotification           @"CNConnectSuccNotification"
+//
+//// 本地存储音频信息KEY
+//#define wjjLastAudioInfoSaveKey @"wjjLastAudioInfoSaveKey"
+//#define wjjIsShowWitnessShadeKey @"wjjIsShowWitnessShadeKey"
+//#define wjjIsShowSportShadeKey   @"wjjIsShowSportShadeKey"
+//#define wjjIsShowSupervisionShadeKey @"wjjIsShowSupervisionShadeKey"//监管
+//
+//// 分类-听见中国-音频播放进度
+//#ifndef WjjAudioPlayerScheduleNotification
+//#define WjjAudioPlayerScheduleNotification @"WjjAudioPlayerScheduleNotification"
+//#endif
+//
+//
+//#ifndef WjjAudioPlayerStatusNotification
+//#define WjjAudioPlayerStatusNotification @"WjjAudioPlayerStatusNotification"
+//#endif
+//// 分类-听见中国-播放哪一首音频(contenId)
+//#ifndef WjjAudioPlayerWhichPlayingNotification
+//#define WjjAudioPlayerWhichPlayingNotification @"WjjAudioPlayerWhichPlayingNotification"
+//#endif
+//// 分类-听见中国-自动切换下一首音频(selectedIndex)详情里面的列表
+//#ifndef WjjAudioPlayerWhichPlayingListViewNotification
+//#define WjjAudioPlayerWhichPlayingListViewNotification @"WjjAudioPlayerWhichPlayingListViewNotification"
+//#endif
+//// 分类-听见中国-通知栏中切换上下首音频(Index)
+//#ifndef WjjNotificationBarChangeUpDownAudioNotification
+//#define WjjNotificationBarChangeUpDownAudioNotification @"WjjNotificationBarChangeUpDownAudioNotification"
+//#endif
+//// 分类-听见中国-一首音频播放完成
+//#ifndef WjjAudioPlayDidFinishNotification
+//#define WjjAudioPlayDidFinishNotification @"WjjAudioPlayDidFinishNotification"
+//#endif
+//
+//// 分类停止播放目击者列表中的视频
+//#ifndef WjjH5StopVideoPlayerNotification
+//#define WjjH5StopVideoPlayerNotification @"WjjH5StopVideoPlayerNotification"
+//#endif
+//
+//#define kCNLiveGeneralMargin 10*RATIO  //通用间距
+//#define kCNLiveNotGeneralMargin 10  //通用间距
+//#define KCNLiveShortGeneralMargin 8.5*RATIO  //小间距
+//#define KCNLiveShortNotGeneralMargin 8.5  //间距
+//#define kCNLiveCellTopMargin 10 * RATIO      //cell 顶部灰色留白(添加扩大因数)
+//#define kCNLiveCellTopFactorMargin 10       //cell 顶部灰色留白(不添加扩大因数)
+//#define kCNLiveCellPaddingPic 5     // cell 多张图片中间留白
+//#define TableViewDefaultOffestHeight 64.f
+//
+//static NSString *const CNLiveFirendCircleEmptyItemDesc = @"当前版本过低，暂不支持查看此动态，请升级网家家最新版本查看消息。";
+//
+//#pragma mark - 电商中国首页
+////NSString * const kDSHappinessPageControlScrollEnableNotification = @"kDSHappinessPageControlScrollEnableNotification";
+//
+//
+//
+//#define cn_WjjH5_Host(url)                    [NSString stringWithFormat:@"%@%@",[CNLiveEnvironmentManager manager].kWjjH5_Host,url]
+//
+//#define RGBACOLOR(r,g,b,a) \
+//[UIColor colorWithRed:r/256.f green:g/256.f blue:b/256.f alpha:a]
+
+#endif /* CNLiveCommonDefines_h */
-//
-//  CNLiveViewClassifyKitPCH.h
-//  Pods
-//
-//  Created by CNLive on 2021/8/12.
-//
-
-#ifndef CNLiveViewClassifyKitPCH_h
-#define CNLiveViewClassifyKitPCH_h
-
-
-#import <QMUIKit/QMUIKit.h>
-#import <CNLiveBaseKit/CNLiveBaseKit.h>
-#import <JXCategoryView/JXCategoryView.h>
-
-
-#endif /* CNLiveViewClassifyKitPCH_h */
+//
+//  CNLivevideoClassifyPCH.h
+//  Pods
+//
+//  Created by CNLive on 2021/8/18.
+//
+
+#ifndef CNLivevideoClassifyPCH_h
+#define CNLivevideoClassifyPCH_h
+
+#import <JXCategoryView/JXCategoryTitleImageView.h>
+#import <CNLiveBaseKit/CNLiveBaseKit.h>
+#import <CNLiveUserManagement/CNUserInfoManager.h>
+#import <JXCategoryView/JXCategoryView.h>
+#import <Masonry/Masonry.h>
+#import <YYKit/YYKit.h>
+#import <SDWebImage/SDWebImage.h>
+#import <CNLiveCommonCategory/CNLiveCommonCategory.h>
+#import <CNLiveCommonCategory/UIColor+CNLiveExtension.h>
+#import <MJExtension/MJExtension.h>
+#import "CNLiveCommonDefines.h"
+
+
+#endif /* CNLivevideoClassifyPCH_h */
+//
+//  CNCategoryGetChannelModel.h
+//  CNLiveNetAdd
+//
+//  Created by cnliveJunBo on 2018/7/3.
+//  Copyright © 2018年 cnlive. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface CNCategoryGetChannelModel : NSObject
+
+//@property (nonatomic, strong) NSString *title;
+//@property (nonatomic, strong) NSString *img;
+//@property (nonatomic, strong) NSString *type;
+@property (nonatomic, strong) NSString *cid;
+//@property (nonatomic, strong) NSString *url;
+@property (nonatomic, strong) NSString *icon;
+
+@property (nonatomic ,assign) BOOL flag;
+@property (nonatomic ,copy)   NSString *pageUrl;
+@property (nonatomic ,copy)   NSString *channelName;
+@property (nonatomic ,copy)   NSString *channelType;
+@property (nonatomic ,copy)   NSString *channelId;
+@property (nonatomic ,copy)   NSString *channelVer;
+
+@property (nonatomic ,copy)   NSString *id;
+@property (nonatomic ,copy)   NSString *typeName;
+@property (nonatomic ,copy)   NSString *parentId;
+@property (nonatomic ,copy)   NSString *siteId;
+@property (nonatomic ,copy)   NSString *enable;
+@property (nonatomic ,copy)   NSString *backgroundColor;
+@property (nonatomic ,copy)   NSString *statusBarColor;
+@property (nonatomic ,copy)   NSString *pageId;
+@property (nonatomic ,copy)   NSString *backgroundImg;
+@property (nonatomic ,copy)   NSString *backgroundImgH5;
+@property (nonatomic ,copy)   NSString *thirdUrl;
+@property (nonatomic ,copy)   NSString *textColor;
+@property (nonatomic ,copy)   NSString *type;
+@property (nonatomic ,copy)   NSString *textColorSelected;
+@property (nonatomic ,copy)   NSString *img;
+@property (nonatomic ,strong) NSArray <CNCategoryGetChannelModel*>*pageStyleList;
+@property (nonatomic ,copy)   NSString *pageType;
+@property (nonatomic ,copy)   NSString *sort;
+@property (nonatomic ,copy)   NSString *name;
+@property (nonatomic ,copy)   NSString *showName;
+@property (nonatomic ,copy)   NSString *defaultPage;//二级默认选中页
+@property (nonatomic ,copy)   NSString *module;//二级小功能模块,1搜索,2扫一扫
+
+- (NSInteger)containsWithChannelArray:(NSArray <NSString *>*)channelArray;
+
+@end
+//
+//  CNCategoryGetChannelModel.m
+//  CNLiveNetAdd
+//
+//  Created by cnliveJunBo on 2018/7/3.
+//  Copyright © 2018年 cnlive. All rights reserved.
+//
+
+#import "CNCategoryGetChannelModel.h"
+#import "NSString+CNLiveExtension.h"
+
+@implementation CNCategoryGetChannelModel
+
+- (instancetype)init
+{
+    if (self = [super init]) {
+        [self loadModel];
+    }
+    return self;
+}
+
+- (void)loadModel
+{
+    [CNCategoryGetChannelModel mj_setupObjectClassInArray:^NSDictionary *{
+        return @{@"pageStyleList":[CNCategoryGetChannelModel class]};
+    }];
+}
+
+- (NSInteger)containsWithChannelArray:(NSArray <NSString *>*)channelArray {
+    
+    NSInteger i = 0;
+    for (NSString *str in channelArray) {
+        NSDictionary *dic = CNLiveStringJsonToDictionary(str);
+        CNCategoryGetChannelModel *model = [CNCategoryGetChannelModel mj_objectWithKeyValues:dic];
+        if ([model.id isEqualToString:self.id]) {
+            return i;
+        }
+        i++;
+    }
+    return -1;
+}
+
+@end
+//
+//  CNCustomChannelListCell.h
+//  CNLiveNetAdd
+//
+//  Created by cnliveJunBo on 2018/8/21.
+//  Copyright © 2018年 cnlive. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface CNCustomChannelListCell : UICollectionViewCell
+
+@property (nonatomic, strong)UIImageView *imageView;
+@property (nonatomic, strong)UILabel *titleLbl;
+@property (nonatomic, assign)BOOL isHideAdd;
+@property (nonatomic, assign)BOOL isNeedAdd; //yes 为＋ no 为－
+
+@end
+//
+//  CNCustomChannelListCell.m
+//  CNLiveNetAdd
+//
+//  Created by cnliveJunBo on 2018/8/21.
+//  Copyright © 2018年 cnlive. All rights reserved.
+//
+
+#import "CNCustomChannelListCell.h"
+
+#define CellWidth (KScreenWidth / 3)
+static CGFloat const imageViewHeight      = 25.0f;
+
+@interface CNCustomChannelListCell ()
+
+@property (nonatomic, strong)UIImageView *addImageView;
+
+@end
+
+@implementation CNCustomChannelListCell
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        
+        self.imageView = [[UIImageView alloc] initWithFrame:CGRectMake((CellWidth-imageViewHeight)*0.5, 15, imageViewHeight, imageViewHeight)];
+        self.imageView.image = [UIImage imageNamed:@"more_zwf"];
+        [self addSubview:self.imageView];
+        
+        self.titleLbl = [[UILabel alloc] initWithFrame:CGRectMake(0, 15 + imageViewHeight + 22, CellWidth, 14*RATIO)];
+        self.titleLbl.textAlignment = NSTextAlignmentCenter;
+        self.titleLbl.textColor = KGray102Color;
+        self.titleLbl.font = UIFontCNMake(14);
+        [self addSubview:self.titleLbl];
+        
+        self.addImageView = [[UIImageView alloc] initWithFrame:CGRectMake(CellWidth - 20, 6, 14, 14)];
+        self.addImageView.image = [UIImage imageNamed:@"more_add"];
+        self.addImageView.hidden = YES;
+        [self addSubview:self.addImageView];
+        
+    }
+    return self;
+}
+
+#pragma mark <SetMethod>
+- (void)setIsHideAdd:(BOOL)isHideAdd
+{
+    _isHideAdd = isHideAdd;
+    if (isHideAdd) {
+        self.addImageView.hidden = YES;
+    }
+    else {
+        self.addImageView.hidden = NO;
+    }
+}
+
+- (void)setIsNeedAdd:(BOOL)isNeedAdd
+{
+    _isNeedAdd = isNeedAdd;
+    if (isNeedAdd) {
+        self.addImageView.image = [UIImage imageNamed:@"more_add"];
+    }
+    else {
+        self.addImageView.image = [UIImage imageNamed:@"more_reduce"];
+    }
+}
+
+@end
+//
+//  CNCustomChannelListReusableView.h
+//  CNLiveNetAdd
+//
+//  Created by cnliveJunBo on 2018/8/21.
+//  Copyright © 2018年 cnlive. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface CNCustomChannelListReusableView : UICollectionReusableView
+
+@property (nonatomic, strong)UILabel *label;
+@property (nonatomic, assign)BOOL    showTip;
+
+@end
+//
+//  CNCustomChannelListReusableView.m
+//  CNLiveNetAdd
+//
+//  Created by cnliveJunBo on 2018/8/21.
+//  Copyright © 2018年 cnlive. All rights reserved.
+//
+
+#import "CNCustomChannelListReusableView.h"
+
+@interface CNCustomChannelListReusableView ()
+
+@property (nonatomic, strong) UILabel *tipLab;
+
+@end
+
+@implementation CNCustomChannelListReusableView
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        self.backgroundColor = [UIColor clearColor];
+        self.label = [[UILabel alloc] initWithFrame:CGRectMake(13, 25, KScreenWidth - 26, 16*RATIO)];
+        self.label.backgroundColor = [UIColor clearColor];
+        self.label.textColor = KTextBlackColor;
+        [self addSubview:self.label];
+        [self addSubview:self.tipLab];
+        [self.tipLab mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.equalTo(self.label);
+            make.top.equalTo(self.label.mas_bottom).offset(8);
+            make.width.mas_equalTo(KScreenWidth-24);
+            make.height.mas_equalTo(12*RATIO);
+        }];
+    }
+    return self;
+}
+
+- (void)setShowTip:(BOOL)showTip {
+    _showTip = showTip;
+    
+    if (showTip) {
+        self.tipLab.hidden = NO;
+    } else {
+        self.tipLab.hidden = YES;
+    }
+    
+}
+
+- (UILabel *)tipLab {
+    if (!_tipLab) {
+        _tipLab = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth-24, 12*RATIO)];
+        _tipLab.font = UIFontBoldCNMake(12.0f);
+        _tipLab.textColor = KGray153Color;
+        _tipLab.text = @"长按拖动可自定义排序及增减频道";
+        _tipLab.hidden = YES;
+    }
+    return _tipLab;
+}
+
+@end
+//
+//  CNCustomChannelListView.h
+//  CNLiveNetAdd
+//
+//  Created by cnliveJunBo on 2018/12/17.
+//  Copyright © 2018年 cnlive. All rights reserved.
+//  编辑分类频道页面
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@protocol CNCustomChannelListViewDelegate <NSObject>
+//点击关闭按钮
+- (void)closeCustomChannelsView;
+//编辑完频道后点击完成
+- (void)changeChannelsList;
+// 点击了我的频道偏移到对应频道
+- (void)didSelectedCommonChannelWithIndex:(NSInteger)index;
+// 跳转其他频道
+- (void)pushToControllerWithIndex:(NSInteger)index;
+
+@end
+
+@interface CNCustomChannelListView : UIView
+
+@property (nonatomic, weak) id <CNCustomChannelListViewDelegate>delegate;
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  CNCustomChannelListView.m
+//  CNLiveNetAdd
+//
+//  Created by cnliveJunBo on 2018/12/17.
+//  Copyright © 2018年 cnlive. All rights reserved.
+//
+
+#import "CNCustomChannelListView.h"
+#import "CNCustomChannelListCell.h"
+#import "CNCategoryGetChannelModel.h"
+#import "CNCustomChannelListReusableView.h"
+#import "NSString+CNLiveExtension.h"
+
+static NSString * const reuseIdentifier = @"CustomChannelsCell";
+static NSString * const headerIdentifier = @"CustomChannelsHeader";
+
+@interface CNCustomChannelListView ()<UICollectionViewDelegate, UICollectionViewDataSource>
+
+@property (nonatomic, strong) UILabel *titleLab;
+@property (nonatomic, strong) UIButton *closeBtn;
+@property (nonatomic, strong) UIButton *finishBtn;
+@property (nonatomic, strong) UIView *lineV;
+@property (nonatomic, strong) UICollectionView *collectionView;
+@property (nonatomic, strong) UILongPressGestureRecognizer *longPress;
+@property (nonatomic, strong) UITapGestureRecognizer *tap;
+
+@property (nonatomic, strong) NSMutableArray *commonChannel;
+@property (nonatomic, strong) NSMutableArray *otherChannel;
+
+@property (nonatomic, assign)BOOL isEdit;
+@property (nonatomic, assign)BOOL isTopY;
+@property (nonatomic, assign)BOOL isBottomY;
+@property (nonatomic, assign)BOOL isMoveBegin;
+
+@end
+
+@implementation CNCustomChannelListView
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        [self setupUI];
+    }
+    return self;
+}
+
+- (void)setupUI {
+    
+    [self addSubview:self.titleLab];
+    [self addSubview:self.closeBtn];
+    self.closeBtn.centerY = self.titleLab.centerY;
+    self.closeBtn.right = KScreenWidth-22;
+    [self addSubview:self.finishBtn];
+    self.finishBtn.centerY = self.titleLab.centerY;
+    self.finishBtn.right = KScreenWidth-16;
+    [self addSubview:self.lineV];
+    self.lineV.top = self.titleLab.bottom+10;
+    [self addSubview:self.collectionView];
+    [self.collectionView registerClass:[CNCustomChannelListCell class] forCellWithReuseIdentifier:reuseIdentifier];
+    [self.collectionView registerClass:[CNCustomChannelListReusableView class] forSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:headerIdentifier];
+    
+    [self getLocalDataAndRefresh];
+}
+
+- (void)layoutSubviews {
+    [super layoutSubviews];
+    
+}
+
+#pragma mark - 加载本地数据
+- (void)getLocalDataAndRefresh
+{
+    NSString *normalKey = [NSString stringWithFormat:@"%@_%@",NormalChannelArray,CNUserShareModel.uid];
+    NSString *otherKey = [NSString stringWithFormat:@"%@_%@",OtherChannelArray,CNUserShareModel.uid];
+    self.commonChannel = [NSMutableArray arrayWithArray:[[NSUserDefaults standardUserDefaults] objectForKey:normalKey]];
+    self.otherChannel = [NSMutableArray arrayWithArray:[[NSUserDefaults standardUserDefaults] objectForKey:otherKey]];
+    
+    [self.collectionView reloadData];
+}
+
+#pragma mark -
+#pragma mark - Action !!!!!!!!!!!!!!!!!!!!!!!!
+//      关闭
+- (void)closeAction:(UIButton *)sender {
+    
+    if (self.delegate && [self.delegate respondsToSelector:@selector(closeCustomChannelsView)]) {
+        [self.delegate closeCustomChannelsView];
+    }
+}
+//      完成
+- (void)finishAction:(UIButton *)sender {
+    
+    [self setUIWithIsEdit:NO];
+    NSString *normalKey = [NSString stringWithFormat:@"%@_%@",NormalChannelArray,CNUserShareModel.uid];
+    NSString *otherKey = [NSString stringWithFormat:@"%@_%@",OtherChannelArray,CNUserShareModel.uid];
+    [[NSUserDefaults standardUserDefaults] setObject:self.commonChannel forKey:normalKey];
+    [[NSUserDefaults standardUserDefaults] setObject:self.otherChannel forKey:otherKey];
+    [[NSUserDefaults standardUserDefaults] synchronize];
+    
+    if (self.delegate && [self.delegate respondsToSelector:@selector(changeChannelsList)]) {
+        [self.delegate changeChannelsList];
+    }
+}
+//      是否编辑
+- (void)setUIWithIsEdit:(BOOL)edit {
+    
+    if (edit) {
+        self.isEdit = YES;
+        self.closeBtn.hidden = YES;
+        self.finishBtn.hidden = NO;
+        [self.collectionView reloadData];
+    } else {
+        self.isEdit = NO;
+        self.closeBtn.hidden = NO;
+        self.finishBtn.hidden = YES;
+        [self.collectionView reloadData];
+    }
+}
+//      截图
+- (UIView *)customSnapshotFromView:(UIView *)inputView {
+    
+    // Make an image from the input view.
+    UIGraphicsBeginImageContextWithOptions(inputView.bounds.size, NO, 0);
+    [inputView.layer renderInContext:UIGraphicsGetCurrentContext()];
+    UIImage *image = UIGraphicsGetImageFromCurrentImageContext();
+    UIGraphicsEndImageContext();
+    
+    // Create an image view.
+    UIView *snapshot = [[UIImageView alloc] initWithImage:image];
+    snapshot.layer.masksToBounds = NO;
+    snapshot.layer.cornerRadius = 0.0;
+    snapshot.layer.shadowOffset = CGSizeMake(-5.0, 0.0);
+    snapshot.layer.shadowRadius = 5.0;
+    snapshot.layer.shadowOpacity = 0.4;
+    
+    return snapshot;
+}
+
+#pragma mark - GestureAction !!!!!!!!!!!!!!!!!
+#pragma mark - 长按 !!!!!!!!!!!!!!!!!!
+- (void)longPressAction:(UILongPressGestureRecognizer *)longPress
+{
+    UIGestureRecognizerState state = longPress.state;
+    
+    CGPoint location = [longPress locationInView:self.collectionView];
+    NSIndexPath *indexPath = [self.collectionView indexPathForItemAtPoint:location];
+    
+    static UICollectionViewCell *firstCell = nil;
+    static UICollectionViewCell *lastCell = nil;
+    static float topY;
+    static float bottomY;
+    
+    NSIndexPath *firstIndexPath = [NSIndexPath indexPathForRow:0 inSection:indexPath.section];
+    firstCell = [self.collectionView cellForItemAtIndexPath:firstIndexPath];
+    if (firstCell && self.isTopY == NO) {
+        topY = firstCell.frame.origin.y;
+        self.isTopY = YES;
+    }
+    else if(location.y <= topY) {
+        location.y = topY;
+    }
+    
+    NSInteger numberOfSection = [self.collectionView numberOfItemsInSection:indexPath.section];
+    NSIndexPath *lastIndexPath = [NSIndexPath indexPathForRow:numberOfSection - 1 inSection:indexPath.section];
+    lastCell = [self.collectionView cellForItemAtIndexPath:lastIndexPath];
+    if (lastCell && self.isBottomY == NO) {
+        
+        bottomY = lastCell.frame.origin.y + lastCell.frame.size.height;
+        self.isBottomY = YES;
+    }
+    else if(self.isBottomY == YES) {
+        if (location.y >= bottomY) {
+            location.y = bottomY;
+        }
+    }
+    
+    static UIView *snapshot = nil;
+    static NSIndexPath *sourceIndexPath = nil;
+    
+    switch (state) {
+            
+        case UIGestureRecognizerStateBegan:
+        {
+//            indexPath.section == 1 || 其它频道长按编辑解禁
+            if ((indexPath.section == 0 && indexPath.row == 0)) {
+                self.isMoveBegin = YES;
+                return;
+            }
+            if ((indexPath.section == 1)) {//其他频道禁止拖动
+                self.isMoveBegin = YES;
+            }
+            
+            if (indexPath) {
+                sourceIndexPath = indexPath;
+                
+                CNCustomChannelListCell *cell = (CNCustomChannelListCell *)[self.collectionView cellForItemAtIndexPath:indexPath];
+                if (!cell) {
+                    return;
+                }
+                
+                if (!self.isEdit) {
+                    [self setUIWithIsEdit:YES];
+                }
+                
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    //刷新完成
+                    CGPoint location2 = [longPress locationInView:self.collectionView];
+                    NSIndexPath *indexPath2 = [self.collectionView indexPathForItemAtPoint:location2];
+                    CNCustomChannelListCell *cell2 = (CNCustomChannelListCell *)[self.collectionView cellForItemAtIndexPath:indexPath2];
+                    
+                    snapshot = [self customSnapshotFromView:cell2];
+                    
+                    __block CGPoint center = cell2.center;
+                    snapshot.center = center;
+                    
+                    [self.collectionView addSubview:snapshot];
+                    
+                    [UIView animateWithDuration:0.25 animations:^{
+                        
+                        //                    center.y = location.y;
+                        //                    center.x = location.x;
+                        //                    snapshot.center = center;
+                        
+                        snapshot.transform = CGAffineTransformMakeScale(1.05, 1.05);
+                        snapshot.alpha = 0.98;
+                        cell2.alpha = 0;
+                        cell2.hidden = YES;
+                    }];
+                });
+                
+            }
+        }
+            break;
+            
+        case UIGestureRecognizerStateChanged:
+        {
+            
+            if (self.isMoveBegin) {
+                return;
+            }
+            
+            CGPoint center = snapshot.center;
+            center.x = location.x;
+            center.y = location.y;
+            
+            snapshot.center = center;
+            
+            if (indexPath.section != sourceIndexPath.section) {
+                return;
+            }
+            
+            if (indexPath && indexPath.row != 0 && ![indexPath isEqual:sourceIndexPath]) {
+                
+                long fabs = indexPath.row - sourceIndexPath.row;
+                if (fabs < 0) {
+                    
+                    NSIndexPath *currentIndexPath = sourceIndexPath;
+                    for (int i = 0; i < -fabs; i++) {
+                        NSIndexPath *lastIndexPath = [NSIndexPath indexPathForRow:sourceIndexPath.row - i - 1 inSection:sourceIndexPath.section];
+                        [self.commonChannel exchangeObjectAtIndex:lastIndexPath.row withObjectAtIndex:currentIndexPath.row];
+                        [self.collectionView moveItemAtIndexPath:lastIndexPath toIndexPath:currentIndexPath];
+
+                        currentIndexPath = lastIndexPath;
+                        
+                    }
+                }
+                else {
+                    
+                    NSIndexPath *currentIndexPath = sourceIndexPath;
+                    for (int i = 0; i < fabs; i++) {
+                        NSIndexPath *nextIndexPath = [NSIndexPath indexPathForRow:sourceIndexPath.row +i + 1 inSection:sourceIndexPath.section];
+                        [self.commonChannel exchangeObjectAtIndex:nextIndexPath.row withObjectAtIndex:currentIndexPath.row];
+                        [self.collectionView moveItemAtIndexPath:nextIndexPath toIndexPath:currentIndexPath];
+
+                        currentIndexPath = nextIndexPath;
+                    }
+                }
+                
+                sourceIndexPath = indexPath;
+            }
+        }
+            break;
+            
+        case UIGestureRecognizerStateEnded:
+        {
+            [snapshot removeFromSuperview];
+            snapshot = nil;
+            CNCustomChannelListCell *cell = (CNCustomChannelListCell *)[self.collectionView cellForItemAtIndexPath:sourceIndexPath];
+            
+            cell.hidden = NO;
+            cell.alpha = 1;
+            
+            self.isTopY = NO;
+            self.isBottomY = NO;
+            self.isMoveBegin = NO;
+        }
+            break;
+            
+        default:
+            break;
+    }
+}
+#pragma mark - 点击 !!!!!!!!!!!!!!!!!
+- (void)tapAction:(UITapGestureRecognizer *)tap
+{
+    CGPoint location = [tap locationInView:self.collectionView];
+    
+    NSIndexPath *indexPath = [self.collectionView indexPathForItemAtPoint:location];
+    
+    if (!indexPath) {
+        return;
+    }
+    if (self.isEdit) {
+        if (indexPath.section == 0 && indexPath.row == 0) {
+            return;
+        }
+        
+        if (indexPath.section == 0) {
+            
+            NSIndexPath *secondSectionIndexPath = [NSIndexPath indexPathForRow:self.otherChannel.count inSection:indexPath.section + 1];
+            
+            [self.otherChannel addObject:[self.commonChannel safetyObjectAtIndex:indexPath.row]];
+            [self.commonChannel removeObjectAtIndex:indexPath.row];
+            
+            CNCustomChannelListCell *cell = (CNCustomChannelListCell *)[self.collectionView cellForItemAtIndexPath:indexPath];
+            cell.isNeedAdd = YES;
+            [self.collectionView moveItemAtIndexPath:indexPath toIndexPath:secondSectionIndexPath];
+        }
+        else if (indexPath.section == 1) {
+            
+            NSIndexPath *firstSectionIndexPath = [NSIndexPath indexPathForRow:self.commonChannel.count inSection:indexPath.section - 1];
+            [self.commonChannel addObject:[self.otherChannel safetyObjectAtIndex:indexPath.row]];
+            [self.otherChannel removeObjectAtIndex:indexPath.row];
+            
+            CNCustomChannelListCell *cell = (CNCustomChannelListCell *)[self.collectionView cellForItemAtIndexPath:indexPath];
+            cell.isNeedAdd = NO;
+            [self.collectionView moveItemAtIndexPath:indexPath toIndexPath:firstSectionIndexPath];
+        }
+    }
+    else {
+        
+        if (indexPath.section == 0) {
+            if (self.delegate && [self.delegate respondsToSelector:@selector(didSelectedCommonChannelWithIndex:)]) {
+                [self.delegate didSelectedCommonChannelWithIndex:indexPath.row];
+            }
+        } else if (indexPath.section == 1) {
+            
+            if (self.delegate && [self.delegate respondsToSelector:@selector(pushToControllerWithIndex:)]) {
+                [self.delegate pushToControllerWithIndex:indexPath.row];
+            }
+        }
+    }
+}
+
+
+#pragma mark -
+#pragma mark - Delegate
+#pragma mark - UICollectionViewDelegateFlowLayout !!!!!!!!!!!!!!!!!!!!!!!!!!!!
+- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout referenceSizeForHeaderInSection:(NSInteger)section
+{
+    if (section==0) {
+        return CGSizeMake(KScreenWidth, 56+12*RATIO);
+    } else if (section==1) {
+        return CGSizeMake(KScreenWidth, 56);
+    } else {
+        return CGSizeZero;
+    }
+}
+
+- (UICollectionReusableView *)collectionView:(UICollectionView *)collectionView viewForSupplementaryElementOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath{
+    
+    CNCustomChannelListReusableView *view = [collectionView dequeueReusableSupplementaryViewOfKind :kind withReuseIdentifier:headerIdentifier forIndexPath:indexPath];
+    view.label.font = UIFontBoldCNMake(16);
+    
+    if ([kind isEqualToString: UICollectionElementKindSectionHeader]){
+        if (indexPath.section == 0) {
+            view.label.text = @"我的频道:";
+            view.showTip = YES;
+        }
+        else if (indexPath.section == 1) {
+            view.label.text = @"其它频道:";
+            view.showTip = NO;
+        }
+        return view;
+    }
+    else {
+        return view;
+    }
+}
+
+#pragma mark - UICollectionViewDataSource !!!!!!!!!!!!!!!!!!!!!!!!!!!
+- (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView
+{
+    return 2;
+}
+
+- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
+{
+    if (section == 0) {
+        return self.commonChannel.count;
+    }
+    else if (section == 1) {
+        return self.otherChannel.count;
+    }
+    else {
+        return 0;
+    }
+}
+
+- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
+{
+    CNCustomChannelListCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:reuseIdentifier forIndexPath:indexPath];
+    
+    cell.userInteractionEnabled = NO;
+    
+    if (indexPath.section == 0) {
+        NSString *dataStr = [self.commonChannel safetyObjectAtIndex:indexPath.row];
+        NSDictionary *dic = CNLiveStringJsonToDictionary(dataStr);
+        CNCategoryGetChannelModel *model = [CNCategoryGetChannelModel mj_objectWithKeyValues:dic];
+        [cell.imageView sd_setImageWithURL:[NSURL URLWithString:model.icon?model.icon:@""] placeholderImage:[UIImage imageNamed:@"more_zwf"]];
+        cell.titleLbl.text = model.showName;
+        if (indexPath.row == 0) {
+            cell.isHideAdd = YES;
+        }
+        else {
+            if (self.isEdit) {
+                cell.isHideAdd = NO;
+            } else {
+                cell.isHideAdd = YES;
+            }
+            cell.isNeedAdd = NO;
+        }
+    }
+    else if (indexPath.section == 1) {
+        NSString *dataStr = [self.otherChannel safetyObjectAtIndex:indexPath.row];
+        NSDictionary *dic = CNLiveStringJsonToDictionary(dataStr);
+        CNCategoryGetChannelModel *model = [CNCategoryGetChannelModel mj_objectWithKeyValues:dic];
+        [cell.imageView sd_setImageWithURL:[NSURL URLWithString:model.icon?model.icon:@""] placeholderImage:[UIImage imageNamed:@"more_zwf"]];
+        cell.titleLbl.text = model.showName;
+        if (self.isEdit) {
+            cell.isHideAdd = NO;
+        } else {
+            cell.isHideAdd = YES;
+        }
+        cell.isNeedAdd = YES;
+    }
+    
+    return cell;
+}
+
+#pragma mark -
+#pragma mark - Getter !!!!!!!!!!!!!!!!!!!!!!!!
+- (UILabel *)titleLab {
+    if (!_titleLab) {
+        _titleLab = [[UILabel alloc] initWithFrame:CGRectMake(13, kStatusHeight+13, 180, 20*RATIO)];
+        _titleLab.font = UIFontBoldCNMake(19);
+        _titleLab.textColor = KTextBlackColor;
+        _titleLab.text = @"频道管理";
+    }
+    return _titleLab;
+}
+
+- (UIButton *)closeBtn {
+    if (!_closeBtn) {
+        _closeBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 16, 16)];
+        [_closeBtn setImage:[UIImage imageNamed:@"jj_close"] forState:UIControlStateNormal];
+        [_closeBtn addTarget:self action:@selector(closeAction:) forControlEvents:UIControlEventTouchUpInside];
+        _closeBtn.touchAreaInsets = UIEdgeInsetsMake(20, 20, 20, 20);
+    }
+    return  _closeBtn;
+}
+
+- (UIButton*)finishBtn {
+    if (!_finishBtn) {
+        _finishBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 100, 16*RATIO)];
+        [_finishBtn setTitle:@"完成" forState:UIControlStateNormal];
+        [_finishBtn setTitleColor:KTextBlackColor forState:UIControlStateNormal];
+        _finishBtn.titleLabel.font = UIFontCNMake(16);
+        _finishBtn.contentHorizontalAlignment = UIControlContentHorizontalAlignmentRight;
+        [_finishBtn addTarget:self action:@selector(finishAction:) forControlEvents:UIControlEventTouchUpInside];
+        _finishBtn.touchAreaInsets = UIEdgeInsetsMake(20, 20, 20, 20);
+        _finishBtn.hidden = YES;
+    }
+    return _finishBtn;
+}
+
+- (UIView *)lineV {
+    if (!_lineV) {
+        _lineV = [[UIView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 0.5)];
+        _lineV.backgroundColor = KCommonLineColor;
+    }
+    return _lineV;
+}
+
+- (UICollectionView *)collectionView {
+    if (!_collectionView) {
+        UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init];
+        layout.itemSize = CGSizeMake((KScreenWidth / 3), 15+25+22+14*RATIO+15);
+        layout.minimumInteritemSpacing = 0;
+        layout.minimumLineSpacing = 10;
+        _collectionView = [[UICollectionView alloc] initWithFrame:CGRectMake(0, kNavigationBarHeight, KScreenWidth, KScreenHeight-kNavigationBarHeight-49-kVerticalBottomSafeHeight) collectionViewLayout:layout];
+        _collectionView.backgroundColor = kWhiteColor;
+        _collectionView.delegate = self;
+        _collectionView.dataSource = self;
+        [_collectionView addGestureRecognizer:self.tap];
+        [_collectionView addGestureRecognizer:self.longPress];
+    }
+    return _collectionView;
+}
+
+- (UILongPressGestureRecognizer *)longPress
+{
+    if (!_longPress) {
+        _longPress = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(longPressAction:)];
+    }
+    return _longPress;
+}
+
+- (UITapGestureRecognizer *)tap
+{
+    if (!_tap) {
+        _tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapAction:)];
+    }
+    return _tap;
+}
+
+- (NSMutableArray *)commonChannel
+{
+    if (!_commonChannel) {
+        _commonChannel = [[NSMutableArray alloc] initWithCapacity:10];
+    }
+    return _commonChannel;
+}
+
+- (NSMutableArray *)otherChannel
+{
+    if (!_otherChannel) {
+        _otherChannel = [[NSMutableArray alloc] initWithCapacity:10];
+    }
+    return _otherChannel;
+}
+
+@end
@@ -7,7 +7,7 @@
 	objects = {
 /* Begin PBXBuildFile section */
-		0816338F26BE298900B076D6 /* CNliveCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 0816338E26BE298900B076D6 /* CNliveCollectionViewCell.m */; };
+		083CB9C326D4ED2000E21EBC /* CNliveCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 0816338E26BE298900B076D6 /* CNliveCollectionViewCell.m */; };
 		14963F4E510A1E5865D15ED8 /* Pods_CNLiveVideoClassifyKit_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7743536FE5FB6796BFAA55B5 /* Pods_CNLiveVideoClassifyKit_Tests.framework */; };
 		6003F58E195388D20070C39A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58D195388D20070C39A /* Foundation.framework */; };
 		6003F590195388D20070C39A /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58F195388D20070C39A /* CoreGraphics.framework */; };
@@ -355,29 +355,45 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-CNLiveVideoClassifyKit_Example/Pods-CNLiveVideoClassifyKit_Example-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveBaseClass/CNLiveBaseClass.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveBaseKit/CNLiveBaseKit.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCategory/CNLiveCategory.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCustomControl/CNLiveCustomControl.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveVideoClassifyKit/CNLiveVideoClassifyKit.framework",
 				"${BUILT_PRODUCTS_DIR}/JXCategoryView/JXCategoryView.framework",
 				"${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework",
+				"${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework",
 				"${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework",
+				"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
 				"${BUILT_PRODUCTS_DIR}/WebViewJavascriptBridge/WebViewJavascriptBridge.framework",
+				"${BUILT_PRODUCTS_DIR}/YYKit/YYKit.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseClass.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCategory.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomControl.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveVideoClassifyKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JXCategoryView.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WebViewJavascriptBridge.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKit.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -391,8 +407,8 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				083CB9C326D4ED2000E21EBC /* CNliveCollectionViewCell.m in Sources */,
 				6003F59E195388D20070C39A /* CNLIVEAppDelegate.m in Sources */,
-				0816338F26BE298900B076D6 /* CNliveCollectionViewCell.m in Sources */,
 				6003F5A7195388D20070C39A /* CNLIVEViewController.m in Sources */,
 				6003F59A195388D20070C39A /* main.m in Sources */,
 			);
@@ -7,11 +7,13 @@
 //
 #import "CNLIVEAppDelegate.h"
+#import <CNLiveEnvironment/CNLiveEnvironment.h>
 @implementation CNLIVEAppDelegate
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
+    [CNLiveEnvironmentManager setEnvironment:CNLiveDebugAppStore];//CNLiveDebugAppStore];//CNLiveProductionAppStore//CNLiveTestFlight
     // Override point for customization after application launch.
     return YES;
 }
@@ -10,8 +10,23 @@
 #import <CNLiveBaseKit/CNLiveBaseKit.h>
 #import "CNliveCollectionViewCell.h"
 #import <CNLiveVideoClassifyKit/CNLiveClassifySegmentController.h>
+#import <CNLiveNetworking.h>
+#import <NSString+CNLiveExtension.h>
+#import <CNLiveEnvironment/CNLiveEnvironment.h>
+#import <CNUserInfoManager.h>
+#import <CNLiveNetworking.h>
+#import <CNLiveCommonCategory/CNLiveCommonCategory.h>
+#import <MJExtension.h>
+#ifndef CNTouristsId
+#define CNTouristsId @"100056"  //游客Id
+#endif
+
+#ifndef CNLiveNetAddGetCategoryChannels
+#define CNLiveNetAddGetCategoryChannels @"CNLiveNetAddGetCategoryChannels"
+#endif
+
 @interface CNLIVEViewController ()<UICollectionViewDelegate,UICollectionViewDataSource>
 {
     NSArray *segArr;
@@ -24,6 +39,18 @@
 - (void)viewDidLoad
 {
     [super viewDidLoad];
+    NSLog(@"%@,%@",CNCategoryGetChannelUrl,CNLiveStringIsEmpty(CNUserShareModel.uid)?CNTouristsId:CNUserShareModel.uid);
+  NSDictionary *dic = @{
+    @"plat":@"i"
+  };
+[CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodGET URLString:CNCategoryGetChannelUrl Param:dic CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
+    if ([NSArray isArray:responseObject[@"data"]]) {
+        NSString *jsonStr = CNLiveNSDictionaryDicToJson(responseObject);
+        [[NSUserDefaults standardUserDefaults] setObject:jsonStr forKey:CNLiveNetAddGetCategoryChannels];
+        [[NSUserDefaults standardUserDefaults] synchronize];
+    }
+    
+}];
     self.title = @"首页";
     segArr = @[@"分类"];
     [self.view addSubview:self.collectionView];
@@ -2,6 +2,11 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
@@ -3,15 +3,27 @@ use_frameworks!
 platform :ios, '9.0'
 source 'https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git'
 source 'http://bj.gitlab.cnlive.com/ios-team/CNLiveRepos.git'
+#source 'http://bj.gitlab.cnlive.com/DSIOSTeam/DSSpecRepos.git'
 target 'CNLiveVideoClassifyKit_Example' do
   pod 'CNLiveVideoClassifyKit', :path => '../'
-  pod 'JXCategoryView'
-  pod 'MJExtension'
-  #基础UI组件库
-#  pod 'CNLiveCustomUI'
-  pod 'CNLiveBaseClass'
-  #基础组件库
-  pod 'CNLiveBaseKit'
+  pod 'CNLiveEnvironment'
+  pod 'CNLiveRequestBastKit'
+  #依赖三方私有库,如果里面有.a的时候加上这个
+  pre_install do |installer| Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {}
+    ############################################  #删除WebViewJavascriptBridge中的WebViewJavascriptBridge.h和WebViewJavascriptBridge.m文件
+      
+        dir_web = File.join(installer.sandbox.pod_dir('WebViewJavascriptBridge'), 'WebViewJavascriptBridge')
+        Dir.foreach(dir_web) {|x|
+          real_path = File.join(dir_web, x)
+          if (!File.directory?(real_path) && File.exists?(real_path))
+            if(x == 'WebViewJavascriptBridge.h' || x == 'WebViewJavascriptBridge.m')
+              File.delete(real_path)
+            end
+          end
+        }
+        #删除WebViewJavascriptBridge中的WebViewJavascriptBridge.h和WebViewJavascriptBridge.m文件
+    #################################################
+  end
   target 'CNLiveVideoClassifyKit_Tests' do
     inherit! :search_paths