提取分类遗留管理类

yanglingyu
1 parent 079680ca
Showing 13 changed files with 179 additions and 118 deletions
CNLiveVideoClassifyKit.podspec
CNLiveVideoClassifyKit/Assets/CNSegmentControl.bundle/backWhite@2x.png
CNLiveVideoClassifyKit/Assets/CNSegmentControl.bundle/backWhite@3x.png
CNLiveVideoClassifyKit/Classes/ClassifyCategory/Controller/CNCategoryBaseViewController.m
CNLiveVideoClassifyKit/Classes/ClassifyCategory/Controller/CNLiveClassifySegmentController.m
CNLiveVideoClassifyKit/Classes/ClassifyCategory/Controller/CNLiveListController.m
CNLiveVideoClassifyKit/Classes/ClassifyCategory/Controller/CNLiveSubSegmentController.h
CNLiveVideoClassifyKit/Classes/ClassifyCategory/Controller/CNLiveSubSegmentController.m
CNLiveVideoClassifyKit/Classes/ClassifyCategory/Header/CNLivevideoClassifyPCH.h
Example/CNLiveVideoClassifyKit.xcodeproj/project.pbxproj
Example/CNLiveVideoClassifyKit/CNLIVEDemoViewController.m
Example/CNLiveVideoClassifyKit/CNLIVEViewController.m
Example/Podfile.lock
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveVideoClassifyKit'
-  s.version          = '0.0.30'
+  s.version          = '0.0.31'
   s.summary          = '视讯头部一二级菜单组件'
 # This description is used to generate tags and improve search results.
@@ -42,12 +42,14 @@ Pod::Spec.new do |s|
    s.frameworks = 'UIKit', 'MapKit'
    s.dependency 'JXCategoryView'
    s.dependency 'CNLiveNewTripartiteManagement/MJExtension'
+   s.dependency 'CNLiveNewTripartiteManagement/MJRefresh'
    s.dependency 'CNLiveBaseKit'
    s.dependency 'CNLiveCategory'
    s.dependency 'CNLiveUserManagement'
    s.dependency 'CNLiveCommonCategory'
    s.dependency 'CNLiveBeeHive'
    s.dependency 'CNLiveEnvironment'
+   s.dependency 'CNLiveCustomControl'
    s.dependency 'UMCCommon'
    s.dependency 'CNLiveNewTripartiteManagement/SDWebImage'
    s.dependency 'CNLiveNewTripartiteManagement/Masonry'
@@ -30,12 +30,6 @@
     self.categoryView.frame = CGRectMake(0, kStatusHeight, self.view.bounds.size.width, [self preferredCategoryViewHeight]);
     self.listContainerView.frame = CGRectMake(0, [self preferredCategoryViewHeight], self.view.bounds.size.width, self.view.bounds.size.height);
 }
--(void)viewWillAppear:(BOOL)animated
-{
-    [super viewWillAppear:animated];
-    self.navigationController.navigationBarHidden = YES;
-    
-}
 #pragma mark - Public
 - (void)categoryViewSelectedItemAtIndex:(NSInteger)index
@@ -174,7 +174,7 @@ static const CGFloat animationHeight = 15;
         [[NSNotificationCenter defaultCenter] postNotificationName:kCNLiveDeepLinkPushNotification object:nil];
         [[NSNotificationCenter defaultCenter] postNotificationName:kCNLiveRemotePushNotification object:nil];
     }
-    self.navigationController.navigationBar.hidden = YES;
+    self.navigationController.navigationBarHidden = YES;
     [[NSUserDefaults standardUserDefaults] setBool:YES forKey:CNLiveLaunchWithFirsh];
     [[NSUserDefaults standardUserDefaults] synchronize];
     self.tabBarController.tabBar.hidden = NO;
@@ -756,13 +756,17 @@ static const CGFloat animationHeight = 15;
     NSDictionary *dic = CNLiveStringJsonToDictionary(dataStr);
     CNCategoryGetChannelModel *model = [CNCategoryGetChannelModel mj_objectWithKeyValues:dic];
     NSDictionary *paramDic = nil;
+    BOOL isBlack = NO;
+            if (CNLiveStringIsEmpty(model.statusBarColor)) {
+                isBlack = YES;
+            } else {
+                isBlack = [model.statusBarColor boolValue];//1 黑色
+            }
     if (model.pageStyleList.count>0) {
-        paramDic = @{
-            @"showName":model.showName?model.showName:@"",
-            @"backgroundColor":model.backgroundColor?model.backgroundColor:@"",
-            @"index":@(index)
-        };
-        [CNLiveClassifyJumpBridge showViewOrPushVCWithCurrentVC:self pushType:CNLiveClassifyJumpPushOtherSegmentVC pageType:model.pageType.integerValue param:paramDic];
+        CNLiveSubSegmentController *subVC = [[CNLiveSubSegmentController alloc] initWithModel:model];
+        subVC.showType = CNLiveSubVCShowtypeChannel;
+        subVC.isBlack = isBlack;
+        [self.navigationController pushViewController:subVC animated:YES];
     }else{
         if([model.pageType isEqualToString:@"4"] || [model.pageType isEqualToString:@"5"]){
@@ -828,6 +832,7 @@ static const CGFloat animationHeight = 15;
     if (model.pageStyleList.count>0) {
         self.topBgImg.frame = CGRectMake(0, 0, KScreenWidth, self.topBgImgHeight);
                     CNLiveSubSegmentController *subVC = [[CNLiveSubSegmentController alloc] initWithModel:model];
+                    subVC.showType = CNLiveSubVCShowtypeClassify;
                     subVC.isBlack = isBlack;
                     subVC.delegate = self;
                     if (index == self.isLoginIndex) {
@@ -856,6 +861,8 @@ static const CGFloat animationHeight = 15;
     }
     if (model.pageStyleList.count>0) {
         CNLiveSubSegmentController *subVC = (CNLiveSubSegmentController *)self.listContainerView.validListDict[@(index)];
+        subVC.showType = CNLiveSubVCShowtypeClassify;
+
         if (subVC && [subVC respondsToSelector:@selector(refreshCurrentVCData)]) {
             [subVC refreshCurrentVCData];
         }
@@ -76,13 +76,17 @@
     [self.view addSubview:subVC.view];
     [self addChildViewController:subVC];
     [subVC didMoveToParentViewController:self];
-    //调用当前vc的刷新功能获取数据
-    [CNLiveClassifyJumpBridge listViewRefreshWithVC:subVC pageType:_model.pageType.integerValue param:_paramDic refreshTime:time];
+//    //调用当前vc的刷新功能获取数据
+//    [CNLiveClassifyJumpBridge listViewRefreshWithVC:subVC pageType:_model.pageType.integerValue param:_paramDic refreshTime:time];
     //监听滑动下拉刷新
     UIViewController *vc = self.childViewControllers[0];
     if (([CNLiveListController searchProperties:[vc class] string:@"webView"]||[CNLiveListController searchProperties:[vc.superclass class] string:@"webView"])&&[vc valueForKey:@"webView"]&&[[vc valueForKey:@"webView"] isKindOfClass:[WKWebView class]]) {
         WKWebView *webView = (WKWebView *)[vc valueForKey:@"webView"];
         [webView.scrollView addObserver:self forKeyPath:@"contentOffset" options:NSKeyValueObservingOptionNew context:nil];
+        if (!self.isLoading) {
+            [webView.scrollView.mj_header beginRefreshing];
+        }
+        
         if ([webView.scrollView valueForKey:@"mj_header"]) {
             id header = [webView.scrollView valueForKey:@"mj_header"];
             [header addObserver:self forKeyPath:@"state" options:NSKeyValueObservingOptionNew context:nil];
@@ -91,6 +95,9 @@
     }else if ([CNLiveListController searchProperties:[vc class] string:@"collectionView"]&&[vc valueForKey:@"collectionView"] && [[vc valueForKey:@"collectionView"] isKindOfClass:[UICollectionView class]]){
         UICollectionView *collectionView = (UICollectionView *)[vc valueForKey:@"collectionView"];
         [collectionView addObserver:self forKeyPath:@"contentOffset" options:NSKeyValueObservingOptionNew context:nil];
+        if (!self.isLoading) {
+            [collectionView.mj_header beginRefreshing];
+        }
         if ([collectionView valueForKey:@"mj_header"]) {
             id header = [collectionView valueForKey:@"mj_header"];
             [header addObserver:self forKeyPath:@"state" options:NSKeyValueObservingOptionNew context:nil];
@@ -14,12 +14,16 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)showGuideShadeViewWithType:(NSInteger)type cellFrame:(CGRect)cellFrame;
 @end
-
+typedef NS_ENUM(NSInteger , CNLiveSubVCShowtype) {
+    CNLiveSubVCShowtypeChannel,      //频道管理器进入
+    CNLiveSubVCShowtypeClassify,       //频道选择器展示
+};
 @interface CNLiveSubSegmentController : CNCategoryBaseViewController<JXCategoryListContentViewDelegate>
 @property (nonatomic, assign) BOOL                      isBlack;
 @property (nonatomic, assign) NSInteger                 selectChannelId;
+@property (nonatomic, assign) CNLiveSubVCShowtype showType;
 @property (nonatomic, weak) id <CNSubClassifySegmentControllerDelegate>delegate;
 -(instancetype)initWithModel:(CNCategoryGetChannelModel *)model;
@@ -12,6 +12,8 @@
 @interface CNLiveSubSegmentController ()
 @property (nonatomic, strong)JXCategoryTitleView *myCategoryView;
+
+@property (nonatomic, strong) CNLiveNavigationBar     *navigationBar;
 @property (nonatomic, strong) QMUIButton              *searchBtn;
 @property (nonatomic, strong) UIButton                *moreBtn;
 @property (nonatomic, strong) UIImageView             *bgImgView;//背景图
@@ -60,7 +62,7 @@
         self.backImageH5 = model.backgroundImgH5;
         self.backImage = model.backgroundImg;
         self.channelId = model.id;
-        
+        self.title = model.showName;
         self.ld_currentIndex = 0;
         self.selectChannelId = -1;
     }
@@ -77,7 +79,11 @@
         weakself
         [self.bgImgView sd_setImageWithURL:[NSURL URLWithString:self.backImageH5] completed:^(UIImage * _Nullable image, NSError * _Nullable error, SDImageCacheType cacheType, NSURL * _Nullable imageURL) {
             if (image) {
-                weakSelf.bgImgView.height = KScreenWidth*image.size.height/image.size.width;
+                if (self.showType == CNLiveSubVCShowtypeChannel) {
+                    weakSelf.bgImgView.height = KScreenWidth*image.size.height/image.size.width + 50;
+                }else{
+                    weakSelf.bgImgView.height = KScreenWidth*image.size.height/image.size.width;
+                }
             }
         }];
     }
@@ -101,10 +107,7 @@
         }
     }
-    // 添加二级频道右侧的搜索按钮
-    [self.view addSubview:self.searchBtn];
     self.view.backgroundColor = [UIColor clearColor];
-    self.listContainerView.scrollView.scrollEnabled = NO;
     self.myCategoryView.titles = self.titles;
     if (CNLiveStringIsEmpty(self.backImage)) {
         self.view.backgroundColor = CNLiveColorWithHexString(self.backgroundColor);
@@ -123,73 +126,71 @@
         self.ld_currentIndex = 0;
     }
     self.categoryView.defaultSelectedIndex = self.ld_currentIndex;
-    
-    if ([self.channelId isEqualToString:@"219"]) {
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updatePlayingStatus:) name:WjjAudioPlayerStatusNotification object:nil];
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updatePlayingSchedule:) name:WjjAudioPlayerScheduleNotification object:nil];
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(audioPlayFinishedUpdateSchedule:) name:WjjAudioPlayDidFinishNotification object:nil];
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(audioPlayUpdateInfo:) name:WjjAudioPlayerWhichPlayingNotification object:nil];
-        
-        [self.view addSubview:self.moreBtn];
-        [self.view addSubview:self.progressView];
-        [self.progressView addSubview:self.playingImgV];
-        [self.playingImgV addSubview:self.playTipImgV];
-        [self.progressView addSubview:self.playingBtn];
-        YYCache * yyCache = [YYCache cacheWithName:[NSString stringWithFormat:@"CNLastPlayedAudio_%@",CNUserShareModel.uid]];
-        CNLiveAlbumAudioListModelModule *model = (CNLiveAlbumAudioListModelModule *)[yyCache objectForKey:[NSString stringWithFormat:@"%@_%@",wjjLastAudioInfoSaveKey,CNUserShareModel.uid]];
-        if (model) {
-            if (model && !CNLiveStringIsEmpty(model.activityId)) {
-                self.playingBtn.userInteractionEnabled = YES;
-                self.progressView.hidden = NO;
-            } else {
-                self.playingBtn.userInteractionEnabled = NO;
-                self.progressView.hidden = YES;
-            }
-            if (model && (!CNLiveStringIsEmpty(model.img) || !CNLiveStringIsEmpty(model.poster) || !CNLiveStringIsEmpty(model.albumImg)) ) {
-                [self.playingImgV sd_setImageWithURL:[NSURL URLWithString:model.img?[model.img stringByRemovingPercentEncoding]:(model.poster?[model.poster stringByRemovingPercentEncoding]:[model.albumImg stringByRemovingPercentEncoding])] placeholderImage:[UIImage loadBundleImage:@""]];
-            } else {
-                self.playingImgV.image = nil;
-            }
+    if (self.showType == CNLiveSubVCShowtypeClassify) {
+        self.listContainerView.scrollView.scrollEnabled = NO;
+        // 添加二级频道右侧的搜索按钮
+        [self.view addSubview:self.searchBtn];
+        if ([self.channelId isEqualToString:@"219"]) {
+            [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updatePlayingStatus:) name:WjjAudioPlayerStatusNotification object:nil];
+            [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updatePlayingSchedule:) name:WjjAudioPlayerScheduleNotification object:nil];
+            [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(audioPlayFinishedUpdateSchedule:) name:WjjAudioPlayDidFinishNotification object:nil];
+            [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(audioPlayUpdateInfo:) name:WjjAudioPlayerWhichPlayingNotification object:nil];
-            if ([CNLiveClassifyJumpBridge audioPlayerIsplaying]) {
-                self.playTipImgV.hidden = YES;
-                [self playingStartAnimating];
-            } else {
-                self.playTipImgV.hidden = NO;
-                [self playingStopAnimating];
+            [self.view addSubview:self.moreBtn];
+            [self.view addSubview:self.progressView];
+            [self.progressView addSubview:self.playingImgV];
+            [self.playingImgV addSubview:self.playTipImgV];
+            [self.progressView addSubview:self.playingBtn];
+            YYCache * yyCache = [YYCache cacheWithName:[NSString stringWithFormat:@"CNLastPlayedAudio_%@",CNUserShareModel.uid]];
+            CNLiveAlbumAudioListModelModule *model = (CNLiveAlbumAudioListModelModule *)[yyCache objectForKey:[NSString stringWithFormat:@"%@_%@",wjjLastAudioInfoSaveKey,CNUserShareModel.uid]];
+            if (model) {
+                if (model && !CNLiveStringIsEmpty(model.activityId)) {
+                    self.playingBtn.userInteractionEnabled = YES;
+                    self.progressView.hidden = NO;
+                } else {
+                    self.playingBtn.userInteractionEnabled = NO;
+                    self.progressView.hidden = YES;
+                }
+                if (model && (!CNLiveStringIsEmpty(model.img) || !CNLiveStringIsEmpty(model.poster) || !CNLiveStringIsEmpty(model.albumImg)) ) {
+                    [self.playingImgV sd_setImageWithURL:[NSURL URLWithString:model.img?[model.img stringByRemovingPercentEncoding]:(model.poster?[model.poster stringByRemovingPercentEncoding]:[model.albumImg stringByRemovingPercentEncoding])] placeholderImage:[UIImage loadBundleImage:@""]];
+                } else {
+                    self.playingImgV.image = nil;
+                }
+                
+                if ([CNLiveClassifyJumpBridge audioPlayerIsplaying]) {
+                    self.playTipImgV.hidden = YES;
+                    [self playingStartAnimating];
+                } else {
+                    self.playTipImgV.hidden = NO;
+                    [self playingStopAnimating];
+                }
             }
+        }else if ([self.channelId isEqualToString:@"11"]) {
+            // 美食中国 历史记录
+            [self.view addSubview:self.historyBtn];
         }
-    }else if ([self.channelId isEqualToString:@"11"]) {
-        // 美食中国 历史记录
-        [self.view addSubview:self.historyBtn];
-    }
-    
-    self.myCategoryView.top = 0;
-    self.searchBtn.right = KScreenWidth-12;
-    CGFloat width = self.searchBtn.left;
-    self.searchBtn.centerY = self.myCategoryView.height/2;
-    if ([self.channelId isEqualToString:@"219"]) {
-        self.moreBtn.right = KScreenWidth-12-66-15;
-        self.moreBtn.centerY = self.myCategoryView.height/2;
-        self.progressView.right = KScreenWidth-93-18-15;
-        self.progressView.centerY = self.myCategoryView.height/2;
-        width = self.progressView.left;
-    }else if ([self.channelId isEqualToString:@"11"]){
-        self.historyBtn.right = KScreenWidth-93;
-        self.historyBtn.centerY = self.myCategoryView.height/2;
-        width = self.historyBtn.left;
+        
+        weakself
+        [CNLiveListManager shareListManager].scrollViewDidScrollBlock = ^(BOOL isUp) {
+        !weakSelf.scrollViewDidScrollBlock ?: weakSelf.scrollViewDidScrollBlock(isUp);
+        };
+    }else{
+        [self.view addSubview:self.navigationBar];
+        self.bgImgView.top = 0;
+        self.listContainerView.scrollView.scrollEnabled = YES;
     }
-    self.myCategoryView.width = width;
-    weakself
-    [CNLiveListManager shareListManager].scrollViewDidScrollBlock = ^(BOOL isUp) {
-    !weakSelf.scrollViewDidScrollBlock ?: weakSelf.scrollViewDidScrollBlock(isUp);
-    };
+   
     // Do any additional setup after loading the view.
 }
 -(void)viewDidLayoutSubviews
 {
     [super viewDidLayoutSubviews];
-    self.myCategoryView.top = 0;
+    if (self.showType == CNLiveSubVCShowtypeChannel) {
+        self.myCategoryView.top = kNavigationBarHeight;
+    }else{
+        self.myCategoryView.top = 0;
+    }
+    
     self.listContainerView.frame = CGRectMake(0, self.myCategoryView.bottom+10, kScreenWidth, self.view.bounds.size.height - self.myCategoryView.bottom);
     self.searchBtn.right = KScreenWidth-12;
     CGFloat width = self.searchBtn.left;
@@ -207,6 +208,16 @@
     }
     self.myCategoryView.width = width-10;
 }
+
+- (void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+    self.navigationController.navigationBarHidden = YES;
+}
+- (void)viewWillDisappear:(BOOL)animated
+{
+    [super viewWillDisappear:animated];
+}
 #pragma mark - Notification
 - (void)updatePlayingStatus:(NSNotification *)notifi {
@@ -348,7 +359,11 @@
     weakself
     [self.bgImgView sd_setImageWithURL:[NSURL URLWithString:self.backImageH5] completed:^(UIImage * _Nullable image, NSError * _Nullable error, SDImageCacheType cacheType, NSURL * _Nullable imageURL) {
         if (image) {
-            weakSelf.bgImgView.height = KScreenWidth*image.size.height/image.size.width;
+            if (self.showType == CNLiveSubVCShowtypeChannel) {
+                weakSelf.bgImgView.height = KScreenWidth*image.size.height/image.size.width + 50;
+            }else{
+                weakSelf.bgImgView.height = KScreenWidth*image.size.height/image.size.width;
+            }
         }
     }];
     CNCategoryGetChannelModel *model = (CNCategoryGetChannelModel *)[self.pageListArr wjj_safetyObjectAtIndex:self.ld_currentIndex];
@@ -551,7 +566,11 @@
         weakself
         [self.bgImgView sd_setImageWithURL:[NSURL URLWithString:self.backImageH5] completed:^(UIImage * _Nullable image, NSError * _Nullable error, SDImageCacheType cacheType, NSURL * _Nullable imageURL) {
             if (image) {
-                weakSelf.bgImgView.height = KScreenWidth*image.size.height/image.size.width;
+                if (self.showType == CNLiveSubVCShowtypeChannel) {
+                    weakSelf.bgImgView.height = KScreenWidth*image.size.height/image.size.width + 50;
+                }else{
+                    weakSelf.bgImgView.height = KScreenWidth*image.size.height/image.size.width;
+                }
             }
         }];
 }
@@ -658,14 +677,26 @@
     }
     return _moreBtn;
 }
-/*
 #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.
+- (CNLiveNavigationBar *)navigationBar {
+    if (!_navigationBar) {
+        _navigationBar = [CNLiveNavigationBar navigationBar];
+        _navigationBar.lineHidden = YES;
+        _navigationBar.backgroundColor = [UIColor clearColor];
+        _navigationBar.title.text = self.title;
+        _navigationBar.title.textColor = self.textColor;
+        if (!self.isBlack) {
+            _navigationBar.leftImage = [UIImage loadBundleImage:@"backWhite"];
+        }
+        weakself
+        _navigationBar.onClickLeftButton = ^{
+           strongself
+            [self.navigationController popViewControllerAnimated:YES];
+        };
+    }
+    return _navigationBar;
 }
-*/
+
 @end
@@ -20,8 +20,10 @@
 #import <CNLiveCommonCategory/UIColor+CNLiveExtension.h>
 #import <CNLiveBeeHive/BHConfig.h>
 #import <CNLiveEnvironment/CNLiveEnvironment.h>
+#import <CNLiveCustomControl/CNLiveNavigationBar.h>
 #import <MJExtension/MJExtension.h>
 //#import <UMCommon/MobClick.h>
+#import <MJRefresh/MJRefresh.h>
 #import "CNLiveCommonDefines.h"
 #import <QMUIKit/QMUIKit.h>
 #import "UIImage+AdBundleImage.h"
@@ -383,6 +383,7 @@
 				"${BUILT_PRODUCTS_DIR}/CNLiveCWebViewModule/CNLiveCWebViewModule.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCategory/CNLiveCategory.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveCustomControl/CNLiveCustomControl.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCustomUI/CNLiveCustomUI.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveNewTripartiteManagement/CNLiveNewTripartiteManagement.framework",
@@ -415,6 +416,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCWebViewModule.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}/CNLiveCustomUI.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveNewTripartiteManagement.framework",
@@ -22,7 +22,7 @@
 -(void)viewDidAppear:(BOOL)animated
 {
     [super viewDidAppear:animated];
-    self.navigationController.navigationBarHidden = YES;
+//    self.navigationController.navigationBarHidden = YES;
 }
 /*
@@ -50,7 +50,7 @@
 -(void)viewDidAppear:(BOOL)animated
 {
     [super viewDidAppear:animated];
-    self.navigationController.navigationBarHidden = YES;
+    self.navigationController.navigationBarHidden = NO;
 }
 #pragma mrk - UICollectionViewDataSource
 - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
@@ -39,16 +39,24 @@ PODS:
     - CNLiveCommonCategory/ImageInBundle (= 0.5.2)
   - CNLiveCommonCategory/ARC (0.5.2)
   - CNLiveCommonCategory/ImageInBundle (0.5.2)
-  - CNLiveCustomUI (0.5.6):
+  - CNLiveCustomControl (0.0.6):
+    - CNLiveCustomControl/Button (= 0.0.6)
+    - CNLiveCustomControl/NavigationBar (= 0.0.6)
+    - CNLiveCustomControl/WebView (= 0.0.6)
+  - CNLiveCustomControl/Button (0.0.6)
+  - CNLiveCustomControl/NavigationBar (0.0.6):
+    - CNLiveCategory
+  - CNLiveCustomControl/WebView (0.0.6)
+  - CNLiveCustomUI (0.5.7):
     - CNLiveBaseKit
     - CNLiveBusinessTools
-    - CNLiveCustomUI/CNLiveBasicsUI (= 0.5.6)
-    - CNLiveCustomUI/CNLiveContentToolTextView (= 0.5.6)
-    - CNLiveCustomUI/CNLiveCycleScrollView (= 0.5.6)
-    - CNLiveCustomUI/CNLiveGetImage (= 0.5.6)
-    - CNLiveCustomUI/CNLivePopView (= 0.5.6)
-    - CNLiveCustomUI/CNLiveRefresh (= 0.5.6)
-  - CNLiveCustomUI/CNLiveBasicsUI (0.5.6):
+    - CNLiveCustomUI/CNLiveBasicsUI (= 0.5.7)
+    - CNLiveCustomUI/CNLiveContentToolTextView (= 0.5.7)
+    - CNLiveCustomUI/CNLiveCycleScrollView (= 0.5.7)
+    - CNLiveCustomUI/CNLiveGetImage (= 0.5.7)
+    - CNLiveCustomUI/CNLivePopView (= 0.5.7)
+    - CNLiveCustomUI/CNLiveRefresh (= 0.5.7)
+  - CNLiveCustomUI/CNLiveBasicsUI (0.5.7):
     - CNLiveBaseKit
     - CNLiveBusinessTools
     - CNLiveCustomUI/CNLiveGetImage
@@ -63,28 +71,28 @@ PODS:
     - CNLiveNewTripartiteManagement/YYModel
     - CNLiveNewTripartiteManagement/YYText
     - CNLiveNewTripartiteManagement/YYWebImage
-  - CNLiveCustomUI/CNLiveContentToolTextView (0.5.6):
+  - CNLiveCustomUI/CNLiveContentToolTextView (0.5.7):
     - CNLiveBaseKit
     - CNLiveBusinessTools
     - CNLiveNewTripartiteManagement/Masonry
     - CNLiveNewTripartiteManagement/QMUIKit
-  - CNLiveCustomUI/CNLiveCycleScrollView (0.5.6):
+  - CNLiveCustomUI/CNLiveCycleScrollView (0.5.7):
     - CNLiveBaseKit
     - CNLiveBusinessTools
     - CNLiveNewTripartiteManagement/SDWebImage
-  - CNLiveCustomUI/CNLiveGetImage (0.5.6):
+  - CNLiveCustomUI/CNLiveGetImage (0.5.7):
     - CNLiveBaseKit
     - CNLiveBusinessTools
-  - CNLiveCustomUI/CNLivePopView (0.5.6):
+  - CNLiveCustomUI/CNLivePopView (0.5.7):
     - CNLiveBaseKit
     - CNLiveBusinessTools
     - CNLiveNewTripartiteManagement/QMUIKit
-  - CNLiveCustomUI/CNLiveRefresh (0.5.6):
+  - CNLiveCustomUI/CNLiveRefresh (0.5.7):
     - CNLiveBaseKit
     - CNLiveBusinessTools
     - CNLiveCustomUI/CNLiveGetImage
     - CNLiveNewTripartiteManagement/MJRefresh
-  - CNLiveCWebViewModule (0.0.15):
+  - CNLiveCWebViewModule (0.1.2):
     - CNLiveCustomUI
     - CNLiveEnvironment
     - CNLiveNewTripartiteManagement/Masonry
@@ -95,21 +103,21 @@ PODS:
     - CNLiveUserManagement
     - WebViewJavascriptBridge
   - CNLiveEnvironment (0.3.3)
-  - CNLiveNewTripartiteManagement/Masonry (0.2.0.5):
+  - CNLiveNewTripartiteManagement/Masonry (0.2.0.6):
     - Masonry (= 1.1.0)
-  - CNLiveNewTripartiteManagement/MJExtension (0.2.0.5):
+  - CNLiveNewTripartiteManagement/MJExtension (0.2.0.6):
     - MJExtension (= 3.2.1)
   - CNLiveNewTripartiteManagement/MJRefresh (0.2.0.6):
     - MJRefresh (= 3.2.0)
-  - CNLiveNewTripartiteManagement/QMUIKit (0.2.0.5):
+  - CNLiveNewTripartiteManagement/QMUIKit (0.2.0.6):
     - QMUIKit (= 4.2.1)
-  - CNLiveNewTripartiteManagement/SDWebImage (0.2.0.5):
+  - CNLiveNewTripartiteManagement/SDWebImage (0.2.0.6):
     - SDWebImage (= 5.2.3)
   - CNLiveNewTripartiteManagement/YYAsyncLayer (0.2.0.6):
     - YYAsyncLayer (= 1.0)
-  - CNLiveNewTripartiteManagement/YYCache (0.2.0.5):
+  - CNLiveNewTripartiteManagement/YYCache (0.2.0.6):
     - YYCache (= 1.0.4)
-  - CNLiveNewTripartiteManagement/YYCategories (0.2.0.5):
+  - CNLiveNewTripartiteManagement/YYCategories (0.2.0.6):
     - YYCategories (= 1.0.4)
   - CNLiveNewTripartiteManagement/YYDispatchQueuePool (0.2.0.6):
     - YYDispatchQueuePool (= 1.0)
@@ -123,19 +131,21 @@ PODS:
     - YYText (= 1.0.7)
   - CNLiveNewTripartiteManagement/YYWebImage (0.2.0.6):
     - YYWebImage (= 1.0.5)
-  - CNLiveRequestBastKit (0.2.5.6):
+  - CNLiveRequestBastKit (0.2.5.7):
     - AFNetworking
   - CNLiveSDK/CNLiveStat (0.3.4.8)
   - CNLiveUserManagement (0.1.5):
     - CNLiveNewTripartiteManagement/MJExtension
-  - CNLiveVideoClassifyKit (0.0.23):
+  - CNLiveVideoClassifyKit (0.0.30):
     - CNLiveBaseKit
     - CNLiveBeeHive
     - CNLiveCategory
     - CNLiveCommonCategory
+    - CNLiveCustomControl
     - CNLiveEnvironment
     - CNLiveNewTripartiteManagement/Masonry
     - CNLiveNewTripartiteManagement/MJExtension
+    - CNLiveNewTripartiteManagement/MJRefresh
     - CNLiveNewTripartiteManagement/QMUIKit
     - CNLiveNewTripartiteManagement/SDWebImage
     - CNLiveNewTripartiteManagement/YYCache
@@ -468,7 +478,7 @@ PODS:
   - SDWebImage (5.2.3):
     - SDWebImage/Core (= 5.2.3)
   - SDWebImage/Core (5.2.3)
-  - UMAPM (1.5.2)
+  - UMAPM (1.5.5)
   - UMCCommon (7.3.5):
     - UMAPM
     - UMDevice
@@ -504,6 +514,7 @@ SPEC REPOS:
     - CNLiveBusinessTools
     - CNLiveCategory
     - CNLiveCommonCategory
+    - CNLiveCustomControl
     - CNLiveCustomUI
     - CNLiveCWebViewModule
     - CNLiveEnvironment
@@ -545,14 +556,15 @@ SPEC CHECKSUMS:
   CNLiveBusinessTools: dfd3270d885523be2599bdc3a95a416277682d0d
   CNLiveCategory: c90a01af1e20cd89f47d4f551d47d2ddc9ca96f3
   CNLiveCommonCategory: 22c9842b31f2087803ae69e983b2c944fb80eae1
-  CNLiveCustomUI: 55057d1da8c3b6987d8b427ae251db1dc71a3a19
-  CNLiveCWebViewModule: 27d1bbc10be19f90830a1671983d42eb4d34d7d8
+  CNLiveCustomControl: a692e47171afb799cebc210a8e77c5a4ddfc2099
+  CNLiveCustomUI: b704f07f5f734e45c06bda1877e67b5f9e5d3581
+  CNLiveCWebViewModule: 1af1e2853cc1203dacad5a66e8215e62ede2bfc9
   CNLiveEnvironment: 6af0a2f332b704ffdec67106b4ba044c7f8da371
   CNLiveNewTripartiteManagement: 29ddb2d23ee77bcd42ba5eaf5f1322ed37db5baa
-  CNLiveRequestBastKit: c6ae13843ee0f96082c58230dc92c249edd6220f
+  CNLiveRequestBastKit: 9fe28913b94a0a072298eba3356f17b98ef0b6cd
   CNLiveSDK: 75bafaafbb8c09dcb4420adfe0f05130405b25e7
   CNLiveUserManagement: ead053f2d701b01ea8fb5f1da572be788f2dd3cf
-  CNLiveVideoClassifyKit: 361be0bea9fa85e6d819e88f7a0d83565dce2253
+  CNLiveVideoClassifyKit: 69256224dd4833a46653960b28576b9f42574e24
   FWDebug: 5a20d089a300517153de1438d8128ad4c4690951
   JXCategoryView: 2ef9ecfd3735158d009ce02d1f29811aa822da65
   Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
@@ -560,7 +572,7 @@ SPEC CHECKSUMS:
   MJRefresh: ed450d6eb9d3346a2cb033ab7eb6de090aeef437
   QMUIKit: 15294d6a350466e4a6f4df0333eac5bff474f995
   SDWebImage: 46a7f73228f84ce80990c786e4372cf4db5875ce
-  UMAPM: 163962b8a6ec1a10a3034468da070b28ca510d5b
+  UMAPM: 1ab13287a2b05c1d491009321270daddf5659a74
   UMCCommon: 3c535e9e3958f72df075cc6fe4776fb5e403c8bc
   UMDevice: c13bbb2e8ca6c67d1e23e03162553e3ec5a8b5b0
   WebViewJavascriptBridge: 7f5bc4d3581e672e8f32bd0f812d54bc69bb8e29