no message

yanglingyu
1 parent 3d9e36a9
Showing 16 changed files with 304 additions and 91 deletions
CNLiveVideoClassifyKit/Assets/CNSegmentControl.bundle/more_add@2x.png
CNLiveVideoClassifyKit/Assets/CNSegmentControl.bundle/more_add@3x.png
CNLiveVideoClassifyKit/Assets/CNSegmentControl.bundle/more_reduce@2x.png
CNLiveVideoClassifyKit/Assets/CNSegmentControl.bundle/more_reduce@3x.png
CNLiveVideoClassifyKit/Assets/CNSegmentControl.bundle/more_zwf@2x.png
CNLiveVideoClassifyKit/Assets/CNSegmentControl.bundle/more_zwf@3x.png
CNLiveVideoClassifyKit/Classes/Category/UIImage+AdBundleImage.m
CNLiveVideoClassifyKit/Classes/Controller/CNCategoryBaseViewController.m
CNLiveVideoClassifyKit/Classes/Controller/CNListViewController.m
CNLiveVideoClassifyKit/Classes/Controller/CNLiveClassifySegmentController.m
CNLiveVideoClassifyKit/Classes/Controller/CNLiveSubSegmentController.m
CNLiveVideoClassifyKit/Classes/Header/CNLiveCommonDefines.h
CNLiveVideoClassifyKit/Classes/Header/CNLivevideoClassifyPCH.h
CNLiveVideoClassifyKit/Classes/view/CNCustomChannelListCell.m
CNLiveVideoClassifyKit/Classes/view/CNCustomChannelListView.m
Example/CNLiveVideoClassifyKit/CNLIVEViewController.m
@@ -7,18 +7,12 @@
 #import "UIImage+AdBundleImage.h"
 #import "CNCategoryBaseViewController.h"
+#import <CNLiveCategory/CNLiveCategory.h>
 @implementation UIImage (AdBundleImage)
 +(UIImage *)loadBundleImage:(NSString *)imageName{
-    // 获取当前的bundle,self只是在当前pod库中的一个类，也可以随意写一个其他的类
-    NSBundle *currentBundle = [NSBundle bundleForClass:[CNCategoryBaseViewController class]];
-    // 获取屏幕pt和px之间的比例
-    NSInteger scale = [UIScreen mainScreen].scale;
-    NSString *imagefailName = [NSString stringWithFormat:@"%@@%zdx.png",imageName,scale];
-    // 获取图片的路径,其中BMCH5WebView是组件名
-    NSString *imagePath = [currentBundle pathForResource:imagefailName ofType:nil inDirectory:[NSString stringWithFormat:@"%@.bundle",@"CNSegmentControl"]];
-    // 获取图片
-    return [UIImage imageWithContentsOfFile:imagePath];
+    
+    return [UIImage getImageWithImageName:imageName bundleName:@"CNSegmentControl" targetClass:[CNCategoryBaseViewController class]];
 }
 @end
@@ -17,7 +17,6 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
-    [self handleDateWithChannelsArray];
     [self.view addSubview: self.categoryView];
     [self.view addSubview:self.listContainerView];
     self.view.backgroundColor = [UIColor whiteColor];
@@ -42,9 +41,6 @@
 }
 #pragma mark - Public
--(void)handleDateWithChannelsArray{
-    
-}
 -(JXCategoryBaseView *)preferredCategoryView{
     return [[JXCategoryBaseView alloc] init];
 }
@@ -41,12 +41,12 @@
 }
 -(void)dealloc
 {
-    for (UIView*subView in subVC.view.subviews) {
-        if ([subView isKindOfClass:[WKWebView class]]) {
-            WKWebView *webView = (WKWebView *)subView;
-            [webView.scrollView removeObserver:self forKeyPath:@"contentOffset"];
-        }
-    }
+//    for (UIView*subView in subVC.view.subviews) {
+//        if ([subView isKindOfClass:[WKWebView class]]) {
+//            WKWebView *webView = (WKWebView *)subView;
+//            [webView.scrollView removeObserver:self forKeyPath:@"contentOffset"];
+//        }
+//    }
 }
@@ -68,12 +68,12 @@
 - (UIView *)listView {
     subVC = [CNLiveCWebViewModule showWebVCWithLunchForWebURL:_thirdUrl
                                 ParamDict:_paramDic ShowType:CNLiveWebViewLunchShowTypeHidden];
-    for (UIView*subView in subVC.view.subviews) {
-        if ([subView isKindOfClass:[WKWebView class]]) {
-            WKWebView *webView = (WKWebView *)subView;
-            [webView.scrollView addObserver:self forKeyPath:@"contentOffset" options:NSKeyValueObservingOptionOld  context:NULL];
-        }
-    }
+//    for (UIView*subView in subVC.view.subviews) {
+//        if ([subView isKindOfClass:[WKWebView class]]) {
+//            WKWebView *webView = (WKWebView *)subView;
+//            [webView.scrollView addObserver:self forKeyPath:@"contentOffset" options:NSKeyValueObservingOptionOld  context:NULL];
+//        }
+//    }
     return subVC.view;
 }
@@ -13,7 +13,10 @@
 #import "CNLiveSubSegmentController.h"
 #import <CNLiveCWebViewModule/CNLiveWebViewJumpBridge.h>
-@interface CNLiveClassifySegmentController ()<JXCategoryViewDelegate>
+static const CGFloat animationTime = 0.3;
+static const CGFloat animationHeight = 15;
+
+@interface CNLiveClassifySegmentController ()<JXCategoryViewDelegate,CNCustomChannelListViewDelegate>
 @property (nonatomic, strong)JXCategoryTitleImageView *myCategoryView; //选择器
 @property (nonatomic, strong) UIButton                *customChannelsBtn;
@@ -37,6 +40,10 @@
 @property (nonatomic, strong) NSMutableArray *textColors; //未选中字体颜色
 @property (nonatomic, strong) NSMutableArray *textColorSeleteds; //选中字体颜色
+@property (nonatomic, assign) BOOL            hasChanged;
+@property (nonatomic, assign) BOOL            isEditing;
+@property (nonatomic, assign) BOOL            oldStatusBar;
+
 @end
 @implementation CNLiveClassifySegmentController
@@ -44,27 +51,20 @@ static CGFloat moveHeight = 50;
 - (void)viewDidLoad {
     [super viewDidLoad];
     self.topBgImgHeight = kStatusHeight+100;
+    self.currentIndex = 0;
     [self.view addSubview:self.topBgImg];
     [self.view sendSubviewToBack:self.topBgImg];
+    [self dataDivideIntoNormalAndOtherWithFirst:YES];
+    [self handleDateWithChannelsArray];
     if ([CNUserShareManager isLogin]) {
-        [self.myCategoryView addSubview:self.customChannelsBtn];
+        [self.view addSubview:self.customChannelsBtn];
     }else
     {
-        [self.myCategoryView addSubview:self.loginBtn];
+        [self.view addSubview:self.loginBtn];
     }
-
-    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.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];
@@ -76,10 +76,8 @@ static CGFloat moveHeight = 50;
     self.myCategoryView.cellWidthZoomEnabled = YES;
     self.myCategoryView.cellWidthZoomScale = 1.3;
     self.myCategoryView.imageSize = CGSizeMake(56, 18);
-    [self updateSelectColors:0];
-    [self configCategoryViewWithType:JXCategoryTitleImageType_OnlyImage selectIndex:0 unselectIndex:0];
-    
     self.listContainerView.translatesAutoresizingMaskIntoConstraints = NO;
+    [self uploadSubViews];
     // Do any additional setup after loading the view.
 }
@@ -89,12 +87,12 @@ static CGFloat moveHeight = 50;
     self.listContainerView.frame = CGRectMake(0,self.myCategoryView.bottom, kScreenWidth, self.view.height -kStatusHeight);
     if ([CNUserShareManager isLogin]) {
         self.myCategoryView.width =  kScreenWidth - 45;
-        self.customChannelsBtn.centerY = self.myCategoryView.height/2;
+        self.customChannelsBtn.centerY = self.myCategoryView.centerY;
         self.customChannelsBtn.right = kScreenWidth - 18;
     }else
     {
         self.myCategoryView.width = kScreenWidth - 70;
-        self.loginBtn.centerY = self.myCategoryView.height/2;
+        self.loginBtn.centerY = self.myCategoryView.centerY;
         self.loginBtn.right = kScreenWidth - 11;
     }
@@ -109,7 +107,7 @@ static CGFloat moveHeight = 50;
 -(void)viewDidDisappear:(BOOL)animated
 {
     [super viewDidDisappear: animated];
-
+    [self quitCustomChannels];
 }
@@ -125,11 +123,45 @@ static CGFloat moveHeight = 50;
     }
 }
-
+- (void)uploadSubViews
+{
+    if (self.currentIndex>=self.titles.count) {
+        self.currentIndex = 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.delegate = self;
+    self.myCategoryView.imageURLs = self.imageNames;
+    self.myCategoryView.defaultSelectedIndex = self.currentIndex;
+    self.myCategoryView.loadImageCallback = ^(UIImageView *imageView, NSURL *imageURL) {
+        [imageView sd_setImageWithURL:imageURL];
+    };
+    [self updateSelectColors:self.currentIndex];
+    [self configCategoryViewWithType:JXCategoryTitleImageType_OnlyImage selectIndex:self.currentIndex unselectIndex:self.currentIndex];
+}
 #pragma mark - Action
 // 点击定制频道按钮进入定制
 - (void)customAction:(UIButton *)sender {
-    
+    [[NSNotificationCenter defaultCenter] postNotificationName:WjjH5StopVideoPlayerNotification object:nil];
+    [[NSNotificationCenter defaultCenter] postNotificationName:kDSHappinessPageControlScrollEnableNotification object:@(YES)];
+    self.hasChanged = NO;
+    self.isEditing = YES;
+    if (self.currentAtatusColor.intValue == 0) {
+        self.oldStatusBar = YES;
+        self.currentAtatusColor = @"1";
+        [self setNeedsStatusBarAppearanceUpdate];
+    } else {
+        self.oldStatusBar = NO;
+    }
+    [self.view addSubview:self.customChannelsV];
+    [UIView animateWithDuration:animationTime animations:^{
+        self.customChannelsV.alpha = 1.0;
+        self.customChannelsV.y = 0;
+    }];
 }
 // 登录
 - (void)loginAction:(UIButton *)sender {
@@ -172,13 +204,134 @@ static CGFloat moveHeight = 50;
     [self.myCategoryView reloadCellAtIndex:i];
     }
 }
+- (void)dataDivideIntoNormalAndOtherWithFirst:(BOOL)first {
+    
+    NSArray *channelsArray = [[NSUserDefaults standardUserDefaults] objectForKey:CNLiveNetAddGetCategoryChannels];
+    NSString *normalKey = [NSString stringWithFormat:@"%@_%@",NormalChannelArray,CNUserShareModel.uid];
+    NSString *otherKey = [NSString stringWithFormat:@"%@_%@",OtherChannelArray,CNUserShareModel.uid];
+    NSMutableArray *normalArray = [[NSMutableArray alloc] initWithArray:[[NSUserDefaults standardUserDefaults] objectForKey:normalKey]];
+    NSMutableArray *otherArray = [[NSMutableArray alloc] initWithArray:[[NSUserDefaults standardUserDefaults] objectForKey:otherKey]];
+    
+    //  请求到过数据
+    if ([NSArray isArray:channelsArray]) {
+        
+        NSString *newChannelVer = [[NSUserDefaults standardUserDefaults] objectForKey:CNWjjNewCategoryChannelVerKey];
+        NSString *oldChannelVer = [[NSUserDefaults standardUserDefaults] objectForKey:CNWjjOldCategoryChannelVerKey];
+        if (CNLiveStringIsEmpty(newChannelVer) || CNLiveStringIsEmpty(oldChannelVer) || [newChannelVer isEqualToString:oldChannelVer]) {// 没有新版本
+            
+            NSMutableArray *tempAllArray = [[NSMutableArray alloc] initWithArray:channelsArray]; //临时总频道
+            NSMutableArray *tempOtherArray = [NSMutableArray array];//临时其他频道
+            NSMutableArray *tempNormalArray = [NSMutableArray array];//临时我的频道
+            if ([NSArray isArray:otherArray]) {//"其他频道"有数据
+                // 比较数据并存储
+                for (NSString *str in otherArray) {//遍历其他频道
+                    NSDictionary *dic = CNLiveStringJsonToDictionary(str);
+                    CNCategoryGetChannelModel *model = [CNCategoryGetChannelModel mj_objectWithKeyValues:dic];
+                    NSInteger index = [model containsWithChannelArray:tempAllArray];
+                    if (index==-1) {
+                        continue;
+                    }
+                    [tempOtherArray addObject:[tempAllArray safetyObjectAtIndex:index]];
+                    if (index<tempAllArray.count) {
+                        [tempAllArray removeObjectAtIndex:index];
+                    }
+                }
+                [otherArray removeAllObjects];
+                otherArray = tempOtherArray; //新"其他频道"
+            }
+            for (NSString *str in normalArray) { //对"我的频道"按本地顺序排序
+                NSDictionary *dic = CNLiveStringJsonToDictionary(str);
+                CNCategoryGetChannelModel *model = [CNCategoryGetChannelModel mj_objectWithKeyValues:dic];
+                NSInteger index = [model containsWithChannelArray:tempAllArray];
+                if (index==-1) {
+                    continue;
+                }
+                [tempNormalArray addObject:[tempAllArray safetyObjectAtIndex:index]];
+                if (index<tempAllArray.count) {
+                    [tempAllArray removeObjectAtIndex:index];
+                }
+            }
+            [tempNormalArray addObjectsFromArray:tempAllArray];
+            [normalArray removeAllObjects];
+            normalArray = tempNormalArray;
+            
+        } else {
+            
+            // 有新版本
+            normalArray = channelsArray.mutableCopy;
+            [otherArray removeAllObjects];
+            
+        }
+        [[NSUserDefaults standardUserDefaults] setObject:newChannelVer forKey:CNWjjOldCategoryChannelVerKey];
+        
+    } else {  // 从未请求到过数据
+        
+//        if (![CNTools manager].channelsRequested && first) {
+//            [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(classifyChannelsRequest:) name:CNWjjClassifyChannelsRequestStateNotifiName object:nil];
+//            [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(classifyChannelsRequestedHideLoading:) name:CNWjjClassifyChannelsRequestHideLoadingNotifiName object:nil];
+//            [QMUITips showLoadingInView:self.view];
+//            self.isLoading = YES;
+//            return;
+//        }
+        
+        //  默认数据
+        NSMutableArray *defaultArray = [NSMutableArray array];
+        NSString *jsonName = [CNLiveEnvironmentManager manager].isTestEnvironment?@"wjjCategoryH5Test":@"wjjCategoryH5";
+        NSString *path = [[NSBundle mainBundle] pathForResource:jsonName ofType:@"json"];
+        NSData *data = [[NSData alloc] initWithContentsOfFile:path];
+        NSArray *dataArray = [NSJSONSerialization JSONObjectWithData:data options:kNilOptions error:nil];
+        for (NSDictionary *dic in dataArray) {
+            [defaultArray addObject:CNLiveNSDictionaryDicToJson(dic)];
+        }
+        NSMutableArray *tempAllArray = [[NSMutableArray alloc] initWithArray:defaultArray];
+        NSMutableArray *tempOtherArray = [NSMutableArray array];
+        NSMutableArray *tempNormalArray = [NSMutableArray array];//临时我的频道
+        if ([NSArray isArray:otherArray]) {//其他频道有数据
+            // 比较数据并存储
+            for (NSString *str in otherArray) {
+                NSDictionary *dic = CNLiveStringJsonToDictionary(str);
+                CNCategoryGetChannelModel *model = [CNCategoryGetChannelModel mj_objectWithKeyValues:dic];
+                NSInteger index = [model containsWithChannelArray:tempAllArray];
+                if (index==-1) {
+                    continue;
+                }
+                [tempOtherArray addObject:[tempAllArray safetyObjectAtIndex:index]];
+                if (index<tempAllArray.count) {
+                    [tempAllArray removeObjectAtIndex:index];
+                }
+            }
+            [otherArray removeAllObjects];
+            otherArray = tempOtherArray;
+            
+        }
+        for (NSString *str in normalArray) { //对"我的频道"按本地顺序排序
+            NSDictionary *dic = CNLiveStringJsonToDictionary(str);
+            CNCategoryGetChannelModel *model = [CNCategoryGetChannelModel mj_objectWithKeyValues:dic];
+            NSInteger index = [model containsWithChannelArray:tempAllArray];
+            if (index==-1) {
+                continue;
+            }
+            [tempNormalArray addObject:[tempAllArray safetyObjectAtIndex:index]];
+            if (index<tempAllArray.count) {
+                [tempAllArray removeObjectAtIndex:index];
+            }
+        }
+        [tempNormalArray addObjectsFromArray:tempAllArray];
+        [normalArray removeAllObjects];
+        normalArray = tempNormalArray;
+        [[NSUserDefaults standardUserDefaults] setObject:@"default" forKey:CNWjjOldCategoryChannelVerKey];
+    }
+    
+    [[NSUserDefaults standardUserDefaults] setObject:normalArray forKey:normalKey];
+    [[NSUserDefaults standardUserDefaults] setObject:otherArray forKey:otherKey];
+    [[NSUserDefaults standardUserDefaults] synchronize];
+}
 //解析数据
 -(void)handleDateWithChannelsArray
 {
-    NSString *normalStr = [[NSUserDefaults standardUserDefaults] objectForKey:CNLiveNetAddGetCategoryChannels];
-    NSDictionary *dic =CNLiveStringJsonToDictionary(normalStr);
-    NSArray *normalArray = dic[@"data"];
+    NSString *normalKey = [NSString stringWithFormat:@"%@_%@",NormalChannelArray,CNUserShareModel.uid];
+    NSArray *normalArray = [[NSUserDefaults standardUserDefaults] objectForKey:normalKey];
     [self.dataArray removeAllObjects];
     [self.titles removeAllObjects];
     [self.imageNames removeAllObjects];
@@ -187,7 +340,8 @@ static CGFloat moveHeight = 50;
     [self.textColors removeAllObjects];
     [self.textColorSeleteds removeAllObjects];
     [self.statusBarColors removeAllObjects];
-    for (NSDictionary *dic in normalArray) {
+    for (NSString *str in normalArray) {
+        NSDictionary *dic = CNLiveStringJsonToDictionary(str);
         CNCategoryGetChannelModel *model = [CNCategoryGetChannelModel mj_objectWithKeyValues:dic];
         [self.dataArray addObject:model];
         [self.titles addObject:model.showName];
@@ -241,10 +395,10 @@ static CGFloat moveHeight = 50;
             [self scrollViewDown];
         }
         if ([CNUserShareManager isLogin]) {
-            self.customChannelsBtn.centerY = self.myCategoryView.collectionView.centerY;
+            self.customChannelsBtn.centerY = self.myCategoryView.collectionView.centerY + kStatusHeight;
         }else
         {
-            self.loginBtn.centerY = self.myCategoryView.collectionView.centerY;
+            self.loginBtn.centerY = self.myCategoryView.collectionView.centerY+kStatusHeight;
         }
     }];
 }
@@ -273,7 +427,7 @@ static CGFloat moveHeight = 50;
 {
     for (UIView *view in self.listContainerView.scrollView.subviews) {
         if ([view.viewController isKindOfClass:[CNLiveSubSegmentController class]]) {
-            CNLiveSubSegmentController *subVc = view.viewController;
+            CNLiveSubSegmentController *subVc = (CNLiveSubSegmentController *)view.viewController;
             [subVc layoutRightSubViewWithShow:!enabled];
             for (UIView *subView in view.subviews) {
                 if ([subView isKindOfClass:[JXCategoryListContainerView class]]) {
@@ -286,6 +440,51 @@ static CGFloat moveHeight = 50;
         }
     }
 }
+#pragma mark - CNCustomChannelListViewDelegate !!!!!!!!!!!!!!!!!!!!!!
+- (void)changeChannelsList
+{
+    // "完成"分类频道顺序重排
+    [self handleDateWithChannelsArray];
+    [self uploadSubViews];
+    [self.myCategoryView reloadData];
+    self.hasChanged = YES;
+}
+
+- (void)didSelectedCommonChannelWithIndex:(NSInteger)index
+{
+    [self quitCustomChannels];
+    [self.myCategoryView selectItemAtIndex:index];
+}
+
+- (void)pushToControllerWithIndex:(NSInteger)index
+{
+    // 跳到其他频道的对应页面
+//    [self goToOtherChannelViewControllerWithIndex:index];
+}
+
+- (void)closeCustomChannelsView {
+    // 关闭定制频道页
+    [self quitCustomChannels];
+}
+// 退出定制频道编辑页面
+- (void)quitCustomChannels {
+    
+    self.isEditing = NO;
+    if (self.oldStatusBar && !self.hasChanged) {
+        self.oldStatusBar = NO;
+        self.currentAtatusColor = @"0";
+        [self setNeedsStatusBarAppearanceUpdate];
+    }
+    self.hasChanged = NO;
+    [UIView animateWithDuration:animationTime animations:^{
+        self.customChannelsV.alpha = 0.0;
+        self.customChannelsV.y = animationHeight;
+    } completion:^(BOOL finished) {
+        [self.customChannelsV removeFromSuperview];
+        self.customChannelsV = nil;
+    }];
+}
+
 #pragma mark - JXCategoryViewDelegate
 // 正在滚动中的回调，这里调整背景图片的 alpha 透明度
 - (void)categoryView:(JXCategoryBaseView *)categoryView scrollingFromLeftIndex:(NSInteger)leftIndex toRightIndex:(NSInteger)rightIndex ratio:(CGFloat)ratio {
@@ -314,14 +513,14 @@ static CGFloat moveHeight = 50;
     if (model.pageStyleList.count>0) {
         self.topBgImg.frame = CGRectMake(0, 0, KScreenWidth, self.topBgImgHeight);
         CNLiveSubSegmentController *subVC = [[CNLiveSubSegmentController alloc] initWithModel:model];
-        subVC.isBlack = isBlack;
-        weakself
-        subVC.scrollViewDidScrollBlock = ^(UIScrollView * _Nonnull scrollView) {
-            [weakSelf listScrollViewDidScroll:scrollView];
-        };
-        subVC.willBeginDragging = ^(CGFloat lastOffsetY) {
-            weakSelf.lastOffsetY = lastOffsetY;
-        };
+//        subVC.isBlack = isBlack;
+//        weakself
+//        subVC.scrollViewDidScrollBlock = ^(UIScrollView * _Nonnull scrollView) {
+//            [weakSelf listScrollViewDidScroll:scrollView];
+//        };
+//        subVC.willBeginDragging = ^(CGFloat lastOffsetY) {
+//            weakSelf.lastOffsetY = lastOffsetY;
+//        };
         return subVC;
     }
     self.topBgImg.frame = CGRectMake(0, 0, KScreenWidth, self.topBgImgHeight - 50);
@@ -360,14 +559,22 @@ static CGFloat moveHeight = 50;
 - (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 setImage:[UIImage loadBundleImage:@"ik_subtitle_more_black"] forState:UIControlStateNormal];
+        [_customChannelsBtn setImage:[UIImage loadBundleImage:@"ik_subtitle_more_white"] forState:UIControlStateSelected];
         [_customChannelsBtn addTarget:self action:@selector(customAction:) forControlEvents:UIControlEventTouchUpInside];
         _customChannelsBtn.touchAreaInsets = UIEdgeInsetsMake(20, 20, 20, 20);
     }
     return _customChannelsBtn;
 }
-
+- (CNCustomChannelListView *)customChannelsV {
+    if (!_customChannelsV) {
+        _customChannelsV = [[CNCustomChannelListView alloc] initWithFrame:CGRectMake(0, animationHeight, KScreenWidth, KScreenHeight)];
+        _customChannelsV.backgroundColor = kWhiteColor;
+        _customChannelsV.alpha = 0;
+        _customChannelsV.delegate = self;
+    }
+    return _customChannelsV;
+}
 - (UIButton *)loginBtn {
     if (!_loginBtn) {
@@ -22,7 +22,10 @@
 @end
 @implementation CNLiveSubSegmentController
-
+-(void)dealloc
+{
+    
+}
 -(instancetype)initWithModel:(CNCategoryGetChannelModel *)model
 {
     self = [super init];
@@ -52,6 +55,7 @@
     // 添加二级频道右侧的搜索按钮
     [self.view addSubview:self.searchBtn];
     self.view.backgroundColor = [UIColor clearColor];
+    [self handleDateWithChannelsArray];
     self.myCategoryView.titles = self.titles;
     if (CNLiveStringIsEmpty(self.backImage)) {
         self.view.backgroundColor = self.backgroundColor;
@@ -73,7 +77,6 @@
 -(void)viewDidLayoutSubviews
 {
     [super viewDidLayoutSubviews];
-    self.searchBtn.frame = CGRectMake(0, 0, 66, 30);
     self.searchBtn.right = KScreenWidth-12;
     self.searchBtn.centerY = self.myCategoryView.height/2;
     self.myCategoryView.top = 0;
@@ -94,7 +97,6 @@
     if (show) {
         // 正常
-        [UIView animateWithDuration:0.3 animations:^{
             self.searchBtn.width = 66;
             self.searchBtn.right = KScreenWidth-12;
@@ -108,12 +110,8 @@
 //            }
             self.myCategoryView.width = self.searchBtn.left;
-        }];
     } else {
         // 变窄
-        [UIView animateWithDuration:0.3 animations:^{
-            
-            
             self.searchBtn.width = 30;
             self.searchBtn.right = KScreenWidth-12;
@@ -126,7 +124,6 @@
 //                self.historyBtn.right = KScreenWidth-93+30;
 //            }
             self.myCategoryView.width = self.searchBtn.left;
-        }];
     }
 }
@@ -171,6 +168,7 @@
 - (QMUIButton *)searchBtn {
     if (!_searchBtn) {
         _searchBtn = [QMUIButton buttonWithType:UIButtonTypeCustom];
+        _searchBtn.frame = CGRectMake(0, 0, 66, 30);
         [_searchBtn setTitle:@"搜索" forState:UIControlStateNormal];
         _searchBtn.titleLabel.font = [UIFont systemFontOfSize:14.0];
         if (self.isBlack) {
@@ -52,9 +52,9 @@
 //#endif
 //
 //// 分类停止播放目击者列表中的视频
-//#ifndef WjjH5StopVideoPlayerNotification
-//#define WjjH5StopVideoPlayerNotification @"WjjH5StopVideoPlayerNotification"
-//#endif
+#ifndef WjjH5StopVideoPlayerNotification
+#define WjjH5StopVideoPlayerNotification @"WjjH5StopVideoPlayerNotification"
+#endif
 //
 //#define kCNLiveGeneralMargin 10*RATIO  //通用间距
 //#define kCNLiveNotGeneralMargin 10  //通用间距
@@ -67,11 +67,24 @@
 //
 //static NSString *const CNLiveFirendCircleEmptyItemDesc = @"当前版本过低，暂不支持查看此动态，请升级网家家最新版本查看消息。";
 //
-//#pragma mark - 电商中国首页
-////NSString * const kDSHappinessPageControlScrollEnableNotification = @"kDSHappinessPageControlScrollEnableNotification";
-//
-//
-//
+
+#ifndef CNWjjClassifyChannelsRequestHideLoadingNotifiName
+#define CNWjjClassifyChannelsRequestHideLoadingNotifiName @"CNWjjClassifyChannelsRequestHideLoadingNotifiName"
+#endif
+//分类-频道-新版本
+#ifndef CNWjjNewCategoryChannelVerKey
+#define CNWjjNewCategoryChannelVerKey @"CNWjjNewCategoryChannelVerKey"
+#endif
+//分类-频道-旧版本
+#ifndef CNWjjOldCategoryChannelVerKey
+#define CNWjjOldCategoryChannelVerKey @"CNWjjOldCategoryChannelVerKey"
+#endif
+#pragma mark - 电商中国首页
+#ifndef kDSHappinessPageControlScrollEnableNotification
+#define kDSHappinessPageControlScrollEnableNotification @"kDSHappinessPageControlScrollEnableNotification"
+#endif
+
+
 //#define cn_WjjH5_Host(url)                    [NSString stringWithFormat:@"%@%@",[CNLiveEnvironmentManager manager].kWjjH5_Host,url]
 //
 //#define RGBACOLOR(r,g,b,a) \
@@ -21,6 +21,7 @@
 #import "CNLiveCommonDefines.h"
 #import <QMUIKit/QMUIKit.h>
 #import "UIImage+AdBundleImage.h"
+#import "CNLiveClassifySegmentController.h"
 #endif /* CNLivevideoClassifyPCH_h */
@@ -25,7 +25,7 @@ static CGFloat const imageViewHeight      = 25.0f;
     if (self) {
         self.imageView = [[UIImageView alloc] initWithFrame:CGRectMake((CellWidth-imageViewHeight)*0.5, 15, imageViewHeight, imageViewHeight)];
-        self.imageView.image = [UIImage imageNamed:@"more_zwf"];
+        self.imageView.image = [UIImage loadBundleImage:@"more_zwf"];
         [self addSubview:self.imageView];
         self.titleLbl = [[UILabel alloc] initWithFrame:CGRectMake(0, 15 + imageViewHeight + 22, CellWidth, 14*RATIO)];
@@ -35,7 +35,7 @@ static CGFloat const imageViewHeight      = 25.0f;
         [self addSubview:self.titleLbl];
         self.addImageView = [[UIImageView alloc] initWithFrame:CGRectMake(CellWidth - 20, 6, 14, 14)];
-        self.addImageView.image = [UIImage imageNamed:@"more_add"];
+        self.addImageView.image = [UIImage loadBundleImage:@"more_add"];
         self.addImageView.hidden = YES;
         [self addSubview:self.addImageView];
@@ -59,10 +59,10 @@ static CGFloat const imageViewHeight      = 25.0f;
 {
     _isNeedAdd = isNeedAdd;
     if (isNeedAdd) {
-        self.addImageView.image = [UIImage imageNamed:@"more_add"];
+        self.addImageView.image = [UIImage loadBundleImage:@"more_add"];
     }
     else {
-        self.addImageView.image = [UIImage imageNamed:@"more_reduce"];
+        self.addImageView.image = [UIImage loadBundleImage:@"more_reduce"];
     }
 }
@@ -419,7 +419,7 @@ static NSString * const headerIdentifier = @&quot;CustomChannelsHeader&quot;;
         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.imageView sd_setImageWithURL:[NSURL URLWithString:model.icon?model.icon:@""] placeholderImage:[UIImage loadBundleImage:@"more_zwf"]];
         cell.titleLbl.text = model.showName;
         if (indexPath.row == 0) {
             cell.isHideAdd = YES;
@@ -437,7 +437,7 @@ static NSString * const headerIdentifier = @&quot;CustomChannelsHeader&quot;;
         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.imageView sd_setImageWithURL:[NSURL URLWithString:model.icon?model.icon:@""] placeholderImage:[UIImage loadBundleImage:@"more_zwf"]];
         cell.titleLbl.text = model.showName;
         if (self.isEdit) {
             cell.isHideAdd = NO;
@@ -465,7 +465,7 @@ static NSString * const headerIdentifier = @&quot;CustomChannelsHeader&quot;;
 - (UIButton *)closeBtn {
     if (!_closeBtn) {
         _closeBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 16, 16)];
-        [_closeBtn setImage:[UIImage imageNamed:@"jj_close"] forState:UIControlStateNormal];
+        [_closeBtn setImage:[UIImage loadBundleImage:@"jj_close"] forState:UIControlStateNormal];
         [_closeBtn addTarget:self action:@selector(closeAction:) forControlEvents:UIControlEventTouchUpInside];
         _closeBtn.touchAreaInsets = UIEdgeInsetsMake(20, 20, 20, 20);
     }
@@ -9,7 +9,7 @@
 #import "CNLIVEViewController.h"
 #import <CNLiveBaseKit/CNLiveBaseKit.h>
 #import "CNliveCollectionViewCell.h"
-#import <CNLiveVideoClassifyKit/CNLiveClassifySegmentController.h>
+#import <CNLiveVideoClassifyKit/CNLivevideoClassifyPCH.h>
 #import <CNLiveNetworking.h>
 #import <NSString+CNLiveExtension.h>
 #import <CNLiveEnvironment/CNLiveEnvironment.h>
@@ -45,8 +45,12 @@
   };
 [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];
+        NSMutableArray *jsonArray = [[NSMutableArray alloc] init];
+        for (NSDictionary *dic in responseObject[@"data"]) {
+            NSString *jsonStr = CNLiveNSDictionaryDicToJson(dic);
+            [jsonArray addObject:jsonStr];
+        }
+        [[NSUserDefaults standardUserDefaults] setObject:jsonArray forKey:CNLiveNetAddGetCategoryChannels];
         [[NSUserDefaults standardUserDefaults] synchronize];
     }