no message

yanglingyu
1 parent 90108bd0
Showing 50 changed files with 1628 additions and 70 deletions
CNLiveVideoClassifyKit.podspec
CNLiveVideoClassifyKit/Assets/CNSegmentControl.bundle/ClassifyMore@2x.png
CNLiveVideoClassifyKit/Assets/CNSegmentControl.bundle/ClassifyMore@3x.png
CNLiveVideoClassifyKit/Assets/CNSegmentControl.bundle/dzty-text@2x.png
CNLiveVideoClassifyKit/Assets/CNSegmentControl.bundle/dzty-text@3x.png
CNLiveVideoClassifyKit/Assets/CNSegmentControl.bundle/dzty@2x.png
CNLiveVideoClassifyKit/Assets/CNSegmentControl.bundle/dzty@3x.png
CNLiveVideoClassifyKit/Assets/CNSegmentControl.bundle/listen_downloading@2x.png
CNLiveVideoClassifyKit/Assets/CNSegmentControl.bundle/listen_downloading@3x.png
CNLiveVideoClassifyKit/Assets/CNSegmentControl.bundle/listen_historey@2x.png
CNLiveVideoClassifyKit/Assets/CNSegmentControl.bundle/listen_historey@3x.png
CNLiveVideoClassifyKit/Assets/CNSegmentControl.bundle/mjz-arrow@2x.png
CNLiveVideoClassifyKit/Assets/CNSegmentControl.bundle/mjz-arrow@3x.png
CNLiveVideoClassifyKit/Assets/CNSegmentControl.bundle/mjz-new-text@2x.png
CNLiveVideoClassifyKit/Assets/CNSegmentControl.bundle/mjz-new-text@3x.png
CNLiveVideoClassifyKit/Assets/CNSegmentControl.bundle/mjz@2x.png
CNLiveVideoClassifyKit/Assets/CNSegmentControl.bundle/mjz@3x.png
CNLiveVideoClassifyKit/Assets/CNSegmentControl.bundle/mjzgx_an@2x.png
CNLiveVideoClassifyKit/Assets/CNSegmentControl.bundle/mjzgx_an@3x.png
CNLiveVideoClassifyKit/Assets/CNSegmentControl.bundle/playBtn@2x.png
@@ -38,6 +38,7 @@ TODO: Add long description of the pod here.
 #   }
     s.prefix_header_contents = '#import "CNLivevideoClassifyPCH.h"'
    s.public_header_files = 'Pod/Classes/**/*.h'
+#   s.static_framework = true
    s.frameworks = 'UIKit', 'MapKit'
    s.dependency 'JXCategoryView'
    s.dependency 'CNLiveTripartiteManagement/MJExtension'
@@ -47,6 +48,7 @@ TODO: Add long description of the pod here.
    s.dependency 'CNLiveCommonCategory'
    s.dependency 'CNLiveBeeHive'
    s.dependency 'CNLiveEnvironment'
+   s.dependency 'UMCCommon'
    s.dependency 'CNLiveTripartiteManagement/SDWebImage'
    s.dependency 'CNLiveTripartiteManagement/Masonry'
    s.dependency 'CNLiveTripartiteManagement/YYKit'
@@ -23,6 +23,7 @@ NS_ASSUME_NONNULL_BEGIN
 -(void)addTheFirstPage; //默认页
 -(JXCategoryBaseView *)preferredCategoryView;
 -(CGFloat)preferredCategoryViewHeight;
+-(void)categoryView:(JXCategoryBaseView *)categoryView didSelectedItemAtIndex:(NSInteger)index;
 @end
  
 NS_ASSUME_NONNULL_END
@@ -102,6 +102,7 @@
         [self.pageViewController setViewControllers:@[vc] direction:UIPageViewControllerNavigationDirectionForward animated:YES completion:NULL];
     }else
     {
+        self.ld_currentIndex = index;
         [self.pageViewController setViewControllers:@[vc] direction:UIPageViewControllerNavigationDirectionReverse animated:YES completion:NULL];
     }
 }
@@ -10,7 +10,7 @@
 NS_ASSUME_NONNULL_BEGIN
  
 @interface CNLiveClassifySegmentController : CNCategoryBaseViewController
-
+- (void)dataDivideIntoNormalAndOtherWithFirst:(BOOL)first;
 @end
  
 NS_ASSUME_NONNULL_END
@@ -11,23 +11,32 @@
 #import "CNCategoryGetChannelModel.h"
 #import "CNLiveListManager.h"
 #import "CNLiveSubSegmentController.h"
+#import "CNWebRedirectHandle.h"
+#import "CNWitnessShadeManager.h"
+#import "CNSupervisionGuideViewManager.h"
  
 static const CGFloat animationTime = 0.3;
 static const CGFloat animationHeight = 15;
  
-@interface CNLiveClassifySegmentController ()<JXCategoryViewDelegate,CNCustomChannelListViewDelegate>
+@interface CNLiveClassifySegmentController ()<JXCategoryViewDelegate,CNCustomChannelListViewDelegate,CNSubClassifySegmentControllerDelegate>
  
 @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) UIView *fuzzyView;//游客登录弹框
 @property (nonatomic, strong) UIImageView             *topBgImg; //头部图片
 @property (nonatomic, assign) CGFloat                  topBgImgHeight;//头部图片高度
 @property (nonatomic, assign) CGFloat               lastOffsetY;
  
+@property (nonatomic, assign) NSInteger       isLoginIndex;
  
 @property (nonatomic, strong) NSString *    currentAtatusColor;
+//电商通知返回
+@property (nonatomic,   copy) NSString       *naviBackgroundColor;
+@property (nonatomic,   copy) NSString       *naviNormalTitleColor;
+@property (nonatomic,   copy) NSString       *naviSelectTitleColor;
+@property (nonatomic, assign) NSUInteger      statusState;
  
 @property (nonatomic, strong) NSMutableArray *dataArray; //数据
 @property (nonatomic, strong) NSMutableArray *bgImages; //背景图
@@ -42,6 +51,8 @@ static const CGFloat animationHeight = 15;
 @property (nonatomic, assign) BOOL            isEditing;
 @property (nonatomic, assign) BOOL            oldStatusBar;
 @property (nonatomic, assign) BOOL            isLoading;
+@property (nonatomic, assign) BOOL            isDSShopChanged;
+@property (nonatomic, assign) BOOL            contentLogin;//从内容跳过来的
  
 @end
  
@@ -49,10 +60,15 @@ static const CGFloat animationHeight = 15;
 static CGFloat moveHeight = 50;
 - (void)viewDidLoad {
     [super viewDidLoad];
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(classifyChannelsRequest:) name:CNWjjClassifyChannelsRequestStateNotifiName object:nil];
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(classifyChannelsRequestedHideLoading:) name:CNWjjClassifyChannelsRequestHideLoadingNotifiName object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(DSShopNavColorChange:) name:CNWjjDSShopNavColorChangeNotifiName object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(PageControlScrollEnable:) name:kDSHappinessPageControlScrollEnableNotification object:nil];
+    self.navigationController.navigationBar.barTintColor = kWhiteColor;
+    [CNWebRedirectHandle manager].isSelectedClassify = YES;
+    [BHConfig set:CNLiveLaunchWithFirsh boolValue:NO];
+    
     self.topBgImgHeight = kStatusHeight+100;
     self.ld_currentIndex = 0;
+    self.isLoginIndex = -1;
     [self.view addSubview:self.topBgImg];
     [self.view sendSubviewToBack:self.topBgImg];
     [self dataDivideIntoNormalAndOtherWithFirst:YES];
@@ -79,39 +95,129 @@ static CGFloat moveHeight = 50;
     if (!self.isLoading) {
         [self uploadSubViews];
     }
-    
+    if (![CNUserShareManager isLogin]) {
+        NSString *showGuide = [[NSUserDefaults standardUserDefaults] objectForKey:CNLiveNetAddShowGuideKey];
+        if ([showGuide isEqualToString:@"1"] && ![BHConfig boolValue:ChannelsShowGuide]) {
+            NSString *showGuideH = [[NSUserDefaults standardUserDefaults] objectForKey:CNLiveNetAddShowGuideHKey];
+            BOOL result = [self judgeShowGuide:showGuideH];
+            if (!result) {
+                [CNLiveClassifyJumpBridge showViewOrPushVCWithCurrentVC:self pushType:CNLiveClassifyJumpShowLoginView];
+            }
+        } else {
+            [CNLiveClassifyJumpBridge showViewOrPushVCWithCurrentVC:self pushType:CNLiveClassifyJumpShowLoginView];
+        }
+    }
+    if (![CNUserShareManager isLogin]) {
+        [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"is_Active_Application"];
+        [[NSUserDefaults standardUserDefaults] synchronize];
+    }
+    NSString *channelId = [BHConfig get:ChannelsSelectFirst];
+    [BHConfig set:ChannelsSelectFirst value:@""];
+    NSInteger selectChannelId = -1;
+    if (!CNLiveStringIsEmpty(channelId)) {
+        selectChannelId = [self containsWithChannelId:channelId];
+        if (selectChannelId != -1) {
+            self.isLoginIndex = selectChannelId;
+        }
+    }
+    if ([CNWebRedirectHandle manager].isClickedIntegral) {
+        [CNWebRedirectHandle manager].isClickedIntegral = NO;
+        [self categoryView:self.myCategoryView didSelectedItemAtIndex:[CNWebRedirectHandle manager].channelId];
+        CNLiveSubSegmentController *svc = [self.controllersArr safetyObjectAtIndex:[CNWebRedirectHandle manager].classifyId];
+        if([svc isKindOfClass:[CNLiveSubSegmentController class]]){
+            //目击者 - 今日要闻 - 中国冰雪
+            [svc categoryView:svc.categoryView didSelectedItemAtIndex:[CNWebRedirectHandle manager].classifyId];
+        }
+        [CNWebRedirectHandle manager].channelId = 0;
+        [CNWebRedirectHandle manager].classifyId = 0;
+    } else {
+        
+        if (!CNLiveStringIsEmpty(channelId)) {
+            self.contentLogin = YES;
+            if(selectChannelId == -1){
+                //我的频道中没有这个频道
+                [self categoryView:self.myCategoryView didSelectedItemAtIndex:self.ld_currentIndex];
+                self.fuzzyView =  [CNLiveClassifyJumpBridge showViewOrPushVCWithCurrentVC:self pushType:CNLiveClassifyJumpShowFuzzyView];
+                [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(touristsLoginTipsViewIsClassify:) name:TouristloginTipsViewActionNotification object:nil];
+            } else {
+                [self categoryView:self.myCategoryView didSelectedItemAtIndex:selectChannelId];
+            }
+            //最后判断是否有url//
+            NSString *url = [BHConfig get:LoginPrepositionUrl];
+            if(url && ![url isEqualToString:@""]){
+                if ([url isEqualToString:@"DSShopLoginUrl"]) {
+                   [CNLiveClassifyJumpBridge  showViewOrPushVCWithCurrentVC:self pushType:CNLiveClassifyJumpPushShopSDKVC];
+                }
+                else if ([url isEqualToString:@"judgeGiftUrl"]) {
+                    NSURL *otherUrl = [BHConfig get:ActivityNewUrl];
+                    if (otherUrl && [CNUserShareManager isLogin]) {
+                        [CNLiveClassifyJumpBridge checkForloginTurnToWithURL:otherUrl];
+                    }
+                }
+                else {
+                    [CNLiveClassifyJumpBridge checkWithFunctionForShareURL:url];
+                }
+            } else {
+                if ([CNUserShareManager isLogin]) {
+                    NSURL *otherUrl = [BHConfig get:ActivityNewUrl];
+                    if (otherUrl) {
+                        [CNLiveClassifyJumpBridge checkForloginTurnToWithURL:otherUrl];
+                    }
+                }
+            }
+        } else {
+            [self categoryView:self.myCategoryView didSelectedItemAtIndex:self.ld_currentIndex];
+        }
+    }
     // Do any additional setup after loading the view.
 }
+-(void)viewWillAppear:(BOOL)animated {
+    
+    [super viewWillAppear:animated];
+    if (![[NSUserDefaults standardUserDefaults] boolForKey:CNLiveLaunchWithFirsh]) {
+        [[NSNotificationCenter defaultCenter] postNotificationName:kCNLiveDeepLinkPushNotification object:nil];
+        [[NSNotificationCenter defaultCenter] postNotificationName:kCNLiveRemotePushNotification object:nil];
+    }
+    self.navigationController.navigationBar.hidden = YES;
+    [[NSUserDefaults standardUserDefaults] setBool:YES forKey:CNLiveLaunchWithFirsh];
+    [[NSUserDefaults standardUserDefaults] synchronize];
+    self.tabBarController.tabBar.hidden = NO;
+}
+- (void)viewDidAppear:(BOOL)animated {
+    [super viewDidAppear:animated];
  
+    if ([[NSUserDefaults standardUserDefaults] boolForKey:CNLiveLaunchWithFirsh] && ![BHConfig get:CNLiveLaunchWithFirsh]) {
+        [[NSNotificationCenter defaultCenter] postNotificationName:kCNLiveDeepLinkPushNotification object:nil];
+        [[NSNotificationCenter defaultCenter] postNotificationName:kCNLiveRemotePushNotification object:nil];
+    }
+}
+- (void)viewWillDisappear:(BOOL)animated {
+    [super viewWillDisappear:animated];
+    [self quitCustomChannels];
+    self.navigationController.navigationBar.hidden = NO;
+}
+- (void)dealloc
+{
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+    NSLog(@"CNClassifySegmentController dealloc");
+}
 -(void)viewDidLayoutSubviews
 {
     [super viewDidLayoutSubviews];
     self.pageViewController.view.frame = CGRectMake(0, self.myCategoryView.bottom, kScreenWidth, self.view.bounds.size.height - self.myCategoryView.bottom+ moveHeight);
     if ([CNUserShareManager isLogin]) {
         self.myCategoryView.width =  kScreenWidth - 45;
-        self.customChannelsBtn.centerY = self.myCategoryView.centerY;
+        self.customChannelsBtn.centerY = self.myCategoryView.height/2 + kStatusHeight;
         self.customChannelsBtn.right = kScreenWidth - 18;
     }else
     {
         self.myCategoryView.width = kScreenWidth - 70;
-        self.loginBtn.centerY = self.myCategoryView.centerY;
+        self.loginBtn.centerY = self.myCategoryView.height/2 + kStatusHeight;
         self.loginBtn.right = kScreenWidth - 11;
     }
  
 }
  
--(void)viewDidAppear:(BOOL)animated
-{
-    [super viewDidAppear:animated];
-    
-}
-
--(void)viewDidDisappear:(BOOL)animated
-{
-    [super viewDidDisappear: animated];
-    [self quitCustomChannels];
-}
-
  
 -(UIStatusBarStyle)preferredStatusBarStyle
 {
@@ -157,6 +263,10 @@ static CGFloat moveHeight = 50;
             self.topBgImg.frame = CGRectMake(0, 0, KScreenWidth, self.topBgImgHeight);
             CNLiveSubSegmentController *subVC = [[CNLiveSubSegmentController alloc] initWithModel:model];
             subVC.isBlack = isBlack;
+            subVC.delegate = self;
+            if (i == self.isLoginIndex) {
+                subVC.selectChannelId = i;
+            }
             weakself
             subVC.scrollViewDidScrollBlock = ^(BOOL isUp) {
                 [weakSelf scrollViewUpDowm:isUp];
@@ -175,6 +285,9 @@ static CGFloat moveHeight = 50;
         }
     }
     [self addTheFirstPage];
+    if (![CNUserShareManager isLogin]) {
+        [CNLiveClassifyJumpBridge bringCenterLoginViewToFront];
+    }
 }
  
  
@@ -193,7 +306,63 @@ static CGFloat moveHeight = 50;
  
     [QMUITips hideAllTipsInView:self.view];
 }
+// 电商中国通过电商SDK发通知修改电商频道的选择器样式
+- (void)DSShopNavColorChange:(NSNotification *)noti {
+    
+    self.naviBackgroundColor = [noti.userInfo objectForKey:@"naviBackgroundColor"];
+    self.naviNormalTitleColor = [noti.userInfo objectForKey:@"naviNormalTitleColor"];
+    self.naviSelectTitleColor = [noti.userInfo objectForKey:@"naviSelectTitleColor"];
+    self.statusState = [[noti.userInfo objectForKey:@"statusState"] integerValue];
+    
+    if (CNLiveStringIsEmpty(self.naviBackgroundColor)||CNLiveStringIsEmpty(self.naviNormalTitleColor)||CNLiveStringIsEmpty(self.naviSelectTitleColor)) {
+        return;
+    }
+    // 判断是否是电商中国
+    NSInteger selectedIndex = self.myCategoryView.selectedIndex>=self.dataArray.count?0:self.myCategoryView.selectedIndex;
+    NSString *dataStr = [self.dataArray safetyObjectAtIndex:selectedIndex];
+    NSMutableDictionary *dataDic = [[NSMutableDictionary alloc] initWithDictionary:CNLiveStringJsonToDictionary(dataStr)];
+    if ([[dataDic objectForKey:@"pageType"] integerValue] != 2) {//电商中国
+        return;
+    }
+    // 改变电商中国channels UI
+    self.myCategoryView.titleColor = CNLiveColorWithHexString(self.naviNormalTitleColor);
+    self.myCategoryView.titleSelectedColor = CNLiveColorWithHexString(self.naviSelectTitleColor);
+    self.topBgImg.backgroundColor = CNLiveColorWithHexString(self.naviBackgroundColor);
+    self.currentAtatusColor = [NSString stringWithFormat:@"%lu",(unsigned long)self.statusState];
+    [self setNeedsStatusBarAppearanceUpdate];
+    
+    // 改变数据
+    [self.textColors replaceObjectAtIndex:selectedIndex withObject:CNLiveColorWithHexString(self.naviNormalTitleColor)];
+    [self.textColorSeleteds replaceObjectAtIndex:selectedIndex withObject:CNLiveColorWithHexString(self.naviSelectTitleColor)];
+    [self.statusBarColors replaceObjectAtIndex:selectedIndex withObject:self.statusState==0 ? @"0" : @"1"];
+    [self.bgColors replaceObjectAtIndex:selectedIndex withObject:self.naviBackgroundColor];
+    self.isDSShopChanged = YES; //改变过
+    
+}
  
+// 电商中国可以下拉出地图页面  当下拉出地图页面时不可以左右滚动
+- (void)PageControlScrollEnable:(NSNotification *)noti {
+    if (!self.findScrollView.isScrollEnabled) {
+        return;
+    }
+    BOOL scrollEnable = [noti.object boolValue];
+    NSLog(@"是否可滚动:%d",scrollEnable);
+    self.findScrollView.scrollEnabled = scrollEnable;
+}
+
+- (void)touristsLoginTipsViewIsClassify:(NSNotification *)noti{
+    NSString *isClassify = noti.userInfo[@"isClassify"];
+    if([isClassify isEqualToString:@"close"]){
+        //隐藏TouristsLoginTipsView
+        [self.fuzzyView removeFromSuperview];
+        
+    }else if([isClassify isEqualToString:@"jump"]){
+        //进入频道管理页面
+        [self.fuzzyView removeFromSuperview];
+        [self customAction:self.customChannelsBtn];
+    }
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:TouristloginTipsViewActionNotification object:nil];
+}
 #pragma mark - Action
 // 点击定制频道按钮进入定制
 - (void)customAction:(UIButton *)sender {
@@ -219,10 +388,51 @@ static CGFloat moveHeight = 50;
  
 }
 #pragma mark - Method
+- (NSInteger)containsWithChannelId:(NSString *)channelId {
+    NSString *normalKey = [NSString stringWithFormat:@"%@_%@",NormalChannelArray,CNUserShareModel.uid];
+    NSMutableArray *channelArray = [[NSMutableArray alloc] initWithArray:[[NSUserDefaults standardUserDefaults] objectForKey:normalKey]];
+    
+    NSInteger i = 0;
+    for (NSString *str in channelArray) {
+        NSDictionary *dic = CNLiveStringJsonToDictionary(str);
+        CNCategoryGetChannelModel *model = [CNCategoryGetChannelModel mj_objectWithKeyValues:dic];
+        if ([model.id isEqualToString:channelId]) {
+            return i;
+        }
+        i++;
+    }
+    return -1;
+}
+- (BOOL)judgeShowGuide:(NSString *)guide {
+    
+    if (CNLiveStringIsEmpty(guide)) {
+        return NO;;
+    }
+    NSString *locaVersion = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"];
+    
+    if ([locaVersion compare:guide options:NSNumericSearch]==NSOrderedAscending) {
+        //show
+        [BHConfig set:ChannelsShowGuide boolValue:YES];
+        [CNLiveClassifyJumpBridge showViewOrPushVCWithCurrentVC:self pushType:CNLiveClassifyJumpShowGuideView];
+        return YES;
+    } else {
+        return NO;
+    }
+}
 -(void)updateSelectColors:(NSInteger)index
 {
     NSString *backgroundImage = [self.bgImages safetyObjectAtIndex:index];
-    [self.topBgImg sd_setImageWithURL:[NSURL URLWithString:backgroundImage]];
+    weakself
+    [self.topBgImg sd_setImageWithURL:[NSURL URLWithString:backgroundImage] completed:^(UIImage * _Nullable image, NSError * _Nullable error, SDImageCacheType cacheType, NSURL * _Nullable imageURL) {
+        if (image) {
+            weakSelf.topBgImgHeight = KScreenWidth*image.size.height/image.size.width;
+        } else {
+            weakSelf.topBgImgHeight = kStatusHeight+100;
+        }
+        weakSelf.topBgImg.height = weakSelf.topBgImgHeight;
+        weakSelf.topBgImg.bottom = kStatusHeight+100;
+        weakSelf.myCategoryView.bottom = weakSelf.topBgImg.height-60;
+    }];
     NSString *backgroundColor = [self.bgColors safetyObjectAtIndex:index];
     self.topBgImg.backgroundColor = CNLiveColorWithHexString(backgroundColor);
     self.myCategoryView.titleColor = self.textColors[index];
@@ -317,6 +527,9 @@ static CGFloat moveHeight = 50;
  
     } else {  // 从未请求到过数据
         if ([BHConfig boolValue: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;
@@ -426,6 +639,16 @@ static CGFloat moveHeight = 50;
         {
             [self.statusBarColors addObject:@"1"];
         }
+        if (!CNLiveStringIsEmpty(model.defaultPage) && [model.defaultPage isEqualToString:@"1"]) {
+            self.ld_currentIndex = [normalArray indexOfObject:dic];
+        }
+        if ([model.pageType isEqualToString:@"2"] && self.isDSShopChanged) {//是电商中国且刷新过颜色
+            NSInteger i = [normalArray indexOfObject:str];
+            [self.bgColors replaceObjectAtIndex:i withObject:self.naviBackgroundColor];
+            [self.statusBarColors replaceObjectAtIndex:i withObject:[NSString stringWithFormat:@"%lu",(unsigned long)self.statusState]];
+            [self.textColors replaceObjectAtIndex:i withObject:CNLiveColorWithHexString(self.naviNormalTitleColor)];
+            [self.textColorSeleteds replaceObjectAtIndex:i withObject:CNLiveColorWithHexString(self.naviSelectTitleColor)];
+        }
     }
 }
 -(void)scrollViewUpDowm:(BOOL)isUp
@@ -437,12 +660,6 @@ static CGFloat moveHeight = 50;
         {
             [self scrollViewDown];
         }
-        if ([CNUserShareManager isLogin]) {
-            self.customChannelsBtn.centerY = self.myCategoryView.collectionView.centerY + kStatusHeight;
-        }else
-        {
-            self.loginBtn.centerY = self.myCategoryView.collectionView.centerY+kStatusHeight;
-        }
     }];
 }
  
@@ -454,6 +671,12 @@ static CGFloat moveHeight = 50;
     self.topBgImg.top -= moveHeight;
     self.myCategoryView.collectionView.top = -50-kStatusHeight;
     self.pageViewController.view.top = kStatusHeight;
+    if ([CNUserShareManager isLogin]) {
+        self.customChannelsBtn.centerY = self.myCategoryView.collectionView.centerY + kStatusHeight;
+    }else
+    {
+        self.loginBtn.centerY = self.myCategoryView.collectionView.centerY+kStatusHeight;
+    }
 }
 -(void)scrollViewDown{
     if (self.topBgImg.top==0) {
@@ -463,7 +686,12 @@ static CGFloat moveHeight = 50;
     self.topBgImg.top += moveHeight;
     self.myCategoryView.collectionView.top = 0;
     self.pageViewController.view.top = self.myCategoryView.bottom;
-
+    if ([CNUserShareManager isLogin]) {
+        self.customChannelsBtn.centerY = self.myCategoryView.centerY;
+    }else
+    {
+        self.loginBtn.centerY = self.myCategoryView.centerY;
+    }
 }
  
 -(void)managerScrollView:(BOOL)enabled
@@ -474,6 +702,33 @@ static CGFloat moveHeight = 50;
            [subVc layoutRightSubViewWithShow:!enabled];
         }
 }
+#pragma mark -
+#pragma mark - CNSubClassifySegmentControllerDelegate
+// 显示 目击者/监管/大众体育 首次使用引导页
+- (void)showGuideShadeViewWithType:(NSInteger)type cellFrame:(CGRect)cellFrame {
+    if (type==1) {
+        [CNWitnessShadeManager showWitnessShadeViewWithTopImg:@"mjz" contentImg:@"mjz-new-text" topImgRect:CGRectMake(cellFrame.origin.x-10, cellFrame.origin.y+10, 75, 30) contentImgSize:CGSizeMake(199, 68) vc:self cancelBlock:^{
+            [BHConfig set:wjjIsShowWitnessShadeKey boolValue:nil];
+            if (![[NSUserDefaults standardUserDefaults] boolForKey:[NSString stringWithFormat:@"%@_%@",wjjIsShowSupervisionShadeKey,CNUserShareModelUid]]) {
+                [CNSupervisionGuideViewManager showSupervisionGuideViewWithVC:self];
+                [[NSUserDefaults standardUserDefaults] setBool:YES forKey:[NSString stringWithFormat:@"%@_%@",wjjIsShowSupervisionShadeKey,CNUserShareModelUid]];
+                [[NSUserDefaults standardUserDefaults] synchronize];
+            }
+        }];
+        [BHConfig set:wjjIsShowWitnessShadeKey boolValue:YES];
+        [[NSUserDefaults standardUserDefaults] setBool:YES forKey:[NSString stringWithFormat:@"%@_%@",wjjIsShowWitnessShadeKey,CNUserShareModelUid]];
+        [[NSUserDefaults standardUserDefaults] synchronize];
+    } else if(type==2) {
+        [CNWitnessShadeManager showWitnessShadeViewWithTopImg:@"dzty" contentImg:@"dzty-text" topImgRect:CGRectMake(cellFrame.origin.x-10, cellFrame.origin.y+10, 102, 30) contentImgSize:CGSizeMake(276, 129) vc:self cancelBlock:nil];
+        [[NSUserDefaults standardUserDefaults] setBool:YES forKey:[NSString stringWithFormat:@"%@_%@",wjjIsShowSportShadeKey,CNUserShareModelUid]];
+        [[NSUserDefaults standardUserDefaults] synchronize];
+    } else if (type==3) {
+        [CNSupervisionGuideViewManager showSupervisionGuideViewWithVC:self];
+        [[NSUserDefaults standardUserDefaults] setBool:YES forKey:[NSString stringWithFormat:@"%@_%@",wjjIsShowSupervisionShadeKey,CNUserShareModelUid]];
+        [[NSUserDefaults standardUserDefaults] synchronize];
+    }
+}
+
 #pragma mark - CNCustomChannelListViewDelegate !!!!!!!!!!!!!!!!!!!!!!
 - (void)changeChannelsList
 {
@@ -493,7 +748,43 @@ static CGFloat moveHeight = 50;
 - (void)pushToControllerWithIndex:(NSInteger)index
 {
     // 跳到其他频道的对应页面
-//    [self goToOtherChannelViewControllerWithIndex:index];
+    NSString *otherKey = [NSString stringWithFormat:@"%@_%@",OtherChannelArray,CNUserShareModel.uid];
+    NSArray *otherArray = [[NSUserDefaults standardUserDefaults] objectForKey:otherKey];
+    NSString *dataStr = [otherArray safetyObjectAtIndex:index];
+    NSDictionary *dic = CNLiveStringJsonToDictionary(dataStr);
+    CNCategoryGetChannelModel *model = [CNCategoryGetChannelModel mj_objectWithKeyValues:dic];
+    NSDictionary *paramDic = nil;
+    if (model.pageStyleList.count>0) {
+        paramDic = @{
+            @"showName":model.showName?model.showName:@"",
+            @"backgroundColor":model.backgroundColor?model.backgroundColor:@""
+        };
+    }else if([model.pageType isEqualToString:@"4"] || [model.pageType isEqualToString:@"5"]){
+        paramDic= @{
+           @"bgColor": model.backgroundColor?model.backgroundColor:@"",
+            @"channelId":model.channelId?model.channelId:@"",
+            @"channelName":model.id?model.id:@"",
+            @"pageId":model.pageId?model.pageId:@"",
+       };
+    }else if ([model.pageType isEqualToString:@"2"]) {//电商中国
+        paramDic = @{
+            @"showName":model.showName?model.showName:@""
+        };
+    }else
+    {
+        BOOL isBlack = NO;
+        if (CNLiveStringIsEmpty(model.statusBarColor)) {
+            isBlack = YES;
+        } else {
+            isBlack = [model.statusBarColor boolValue];//1 黑色
+        }
+        paramDic= @{
+           @"title": model.showName?model.showName:@"",
+           @"isBlack":@(isBlack),
+           @"thirdUrl":model.thirdUrl?model.thirdUrl:@""
+       };
+    }
+    [CNLiveClassifyJumpBridge showViewOrPushVCWithCurrentVC:self pushType:CNLiveClassifyJumpPushCustomVC pageType:model.pageType.integerValue param:paramDic];
 }
  
 - (void)closeCustomChannelsView {
@@ -533,7 +824,46 @@ static CGFloat moveHeight = 50;
     self.navigationController.interactivePopGestureRecognizer.enabled = (index == 0);
     [self updateSelectColors:index];
     [self configCategoryViewWithType:JXCategoryTitleImageType_OnlyImage selectIndex:index unselectIndex:index];
-    
+    CNCategoryGetChannelModel *model = (CNCategoryGetChannelModel *)[self.dataArray safetyObjectAtIndex:index];
+    if (![CNUserShareManager isLogin]) {
+        [BHConfig set:ChannelsSelectFirst value:model.id];
+    }
+    if (model.pageStyleList.count>0) {
+        CNLiveSubSegmentController *subVC = (CNLiveSubSegmentController *)self.controllersArr[index];
+        if (subVC && [subVC respondsToSelector:@selector(refreshCurrentVCData)]) {
+            [subVC refreshCurrentVCData];
+        }
+        BOOL witness = ![[NSUserDefaults standardUserDefaults] boolForKey:[NSString stringWithFormat:@"%@_%@",wjjIsShowWitnessShadeKey,CNUserShareModelUid]];
+        BOOL sport = ![[NSUserDefaults standardUserDefaults] boolForKey:[NSString stringWithFormat:@"%@_%@",wjjIsShowSportShadeKey,CNUserShareModelUid]];
+        BOOL supervision = ![[NSUserDefaults standardUserDefaults] boolForKey:[NSString stringWithFormat:@"%@_%@",wjjIsShowSupervisionShadeKey,CNUserShareModelUid]];
+        if (!self.contentLogin && (witness || sport || supervision) && [CNUserShareManager isLogin]) {
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                [subVC showGuideView];
+            });
+        }
+        self.contentLogin = NO;
+    }else{
+    NSDictionary *paramDic = nil;
+    if ([model.pageType isEqualToString:@"4"] || [model.pageType isEqualToString:@"5"]){
+         paramDic= @{
+            @"bgColor": model.backgroundColor?model.backgroundColor:@"",
+             @"backgroundImg": model.backgroundImg?model.backgroundImg:@"",
+             @"channelId":model.channelId?model.channelId:@"",
+             @"channelName":model.id?model.id:@"",
+             @"pageId":model.pageId?model.pageId:@"",
+        };
+    }
+        NSTimeInterval time = 300;
+        if ([model.id isEqualToString:@"1"]) {
+            time = 60;
+        }
+        [CNLiveClassifyJumpBridge listViewRefreshWithVC:self.controllersArr[index] pageType:model.pageType.integerValue param:paramDic refreshTime:time];
+    }
+    if (index != self.myCategoryView.selectedIndex) {
+        [[NSNotificationCenter defaultCenter] postNotificationName:WjjH5StopVideoPlayerNotification object:nil];
+        [[NSNotificationCenter defaultCenter] postNotificationName:kDSHappinessPageControlScrollEnableNotification object:@(YES)];
+    }
+//    [MobClick event:@"channel_click_top"];
 }
 #pragma mark - Public
 -(JXCategoryBaseView *)preferredCategoryView
@@ -9,10 +9,18 @@
 @class CNCategoryGetChannelModel;
  
 NS_ASSUME_NONNULL_BEGIN
+@protocol CNSubClassifySegmentControllerDelegate <NSObject>
+//  1/2/3  目击者/大众体/监管
+- (void)showGuideShadeViewWithType:(NSInteger)type cellFrame:(CGRect)cellFrame;
+
+@end
+
  
 @interface CNLiveSubSegmentController : CNCategoryBaseViewController
  
 @property (nonatomic, assign) BOOL                      isBlack;
+@property (nonatomic, assign) NSInteger                 selectChannelId;
+@property (nonatomic, weak) id <CNSubClassifySegmentControllerDelegate>delegate;
  
 -(instancetype)initWithModel:(CNCategoryGetChannelModel *)model;
 @property (nonatomic, copy) void (^scrollViewDidScrollBlock)(BOOL isUp);
@@ -20,6 +28,9 @@ NS_ASSUME_NONNULL_BEGIN
 // 一级频道显示隐藏时二级频道右侧的搜索按钮变宽变窄控制
 - (void)layoutRightSubViewWithShow:(BOOL)show;
  
+- (void)refreshCurrentVCData;
+- (void)showGuideView;
+
 @end
  
 NS_ASSUME_NONNULL_END
@@ -7,25 +7,36 @@
  
 #import "CNLiveSubSegmentController.h"
 #import "CNCategoryGetChannelModel.h"
+#import "CNAudioPlayProgressView.h"
 #import "CNLiveListManager.h"
  
 @interface CNLiveSubSegmentController ()
 @property (nonatomic, strong)JXCategoryTitleView *myCategoryView;
 @property (nonatomic, strong) QMUIButton              *searchBtn;
+@property (nonatomic, strong) UIButton                *moreBtn;
+@property (nonatomic, strong) UIImageView             *bgImgView;//背景图
+@property (nonatomic, strong) CNAudioPlayProgressView *progressView;//听见中国二级频道当前播放音乐的进度
+@property (nonatomic, strong) UIButton                *playingBtn;//听见中国二级频道当前播放音乐按钮
+@property (nonatomic, strong) UIImageView             *playingImgV;//听见中国二级频道当前播放音乐背景图
+@property (nonatomic, strong) UIImageView             *playTipImgV;//听见中国二级频道当前播放tip
+@property (nonatomic, strong) UIButton                *historyBtn;//历史记录
+@property (nonatomic, strong) UIButton                *downloadingBtn;//听见中国下载按钮
+
  
 @property (nonatomic, strong)NSArray<CNCategoryGetChannelModel*> *pageListArr;
 @property (nonatomic, strong)UIColor *textColor;
 @property (nonatomic, strong)NSString *backgroundColor;
 @property (nonatomic, strong)NSString *backImage;
 @property (nonatomic, strong)NSString *backImageH5;
+@property (nonatomic, strong)NSString *channelId;
  
  
 @end
  
 @implementation CNLiveSubSegmentController
--(void)dealloc
-{
-    
+- (void)dealloc {
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+
 }
 -(instancetype)initWithModel:(CNCategoryGetChannelModel *)model
 {
@@ -46,13 +57,41 @@
         }
         self.backImageH5 = model.backgroundImgH5;
         self.backImage = model.backgroundImg;
+        self.channelId = model.id;
  
+        self.ld_currentIndex = 0;
+        self.selectChannelId = -1;
     }
     return self;
 }
  
 - (void)viewDidLoad {
     [super viewDidLoad];
+    
+    if (!CNLiveStringIsEmpty(self.backImageH5)) {
+        // 如果后台传了背景图  就设置背景图
+        [self.view addSubview:self.bgImgView];
+        [self.view sendSubviewToBack:self.bgImgView];
+        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.selectChannelId != -1) {
+        NSString *classifyId = [BHConfig get:ChannelsSelectSecond];
+        [BHConfig set:ChannelsSelectSecond value:nil];
+        if (!CNLiveStringIsEmpty(classifyId)) {
+            NSInteger selectChannelId = [self containsWithChannelIndex:self.selectChannelId classifyId:classifyId];
+            if(selectChannelId == -1){
+                //我的频道中没有这个频道
+            } else {
+                self.myCategoryView.defaultSelectedIndex = selectChannelId;
+                self.ld_currentIndex = selectChannelId;
+            }
+        }
+    }
     [self handleDateWithChannelsArray];
     // 添加二级频道右侧的搜索按钮
     [self.view addSubview:self.searchBtn];
@@ -86,24 +125,166 @@
         [self.controllersArr addObject:listVC];
     }
     [self addTheFirstPage];
+    
+    if ([self.channelId isEqualToString:@"219"]) {
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updatePlayingStatus:) name:WjjAudioPlayerStatusNotification object:nil];
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updatePlayingSchedule:) name:WjjAudioPlayerScheduleNotification object:nil];
+        [[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]];
+        CNLiveAlbumAudioListModel *model = (CNLiveAlbumAudioListModel *)[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];
+    }
     // Do any additional setup after loading the view.
 }
 -(void)viewDidLayoutSubviews
 {
     [super viewDidLayoutSubviews];
-    self.searchBtn.right = KScreenWidth-12;
-    self.searchBtn.centerY = self.myCategoryView.height/2;
     self.myCategoryView.top = 0;
-    self.myCategoryView.width = self.searchBtn.left;
     self.pageViewController.view.frame = CGRectMake(0, self.myCategoryView.bottom+10, kScreenWidth, self.view.bounds.size.height - self.myCategoryView.bottom);
+    self.searchBtn.right = KScreenWidth-12;
+    CGFloat width = self.searchBtn.left;
+    self.searchBtn.centerY = self.myCategoryView.height/2;
+    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;
+    }
+    self.myCategoryView.width = width;
+}
+#pragma mark - Notification
+- (void)updatePlayingStatus:(NSNotification *)notifi {
+    
+    NSInteger status = [[notifi.userInfo objectForKey:@"Status"] integerValue];//1播放  0暂停
+    if (status == 1) {
+        self.playTipImgV.hidden = YES;
+        [self playingStartAnimating];
+    }else {
+        self.playTipImgV.hidden = NO;
+        [self playingStopAnimating];
+    }
+}
+- (void)updatePlayingSchedule:(NSNotification *)notifi {
+    
+    NSDictionary *dic = notifi.userInfo;
+    [self.progressView animationWithProgres:[[dic objectForKey:@"schedule"] floatValue] duration:0.8];
+}
+// 通知方法 更新当前播放音乐完成时的进度
+- (void)audioPlayFinishedUpdateSchedule:(NSNotification *)notifi {
+    
+    [self.progressView animationWithProgres:0.0f duration:0.0f];
+}
+// 通知方法 切换音乐时的显示
+- (void)audioPlayUpdateInfo:(NSNotification *)notifi {
+    
+    CNLiveAlbumAudioListModel *model = notifi.object;
+    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;
+    }
 }
 #pragma mark - Method
+
+// 开始当前播放音乐转动动画
+- (void)playingStartAnimating {
+    
+    CABasicAnimation *rotationAnimation;
+    rotationAnimation = [CABasicAnimation animationWithKeyPath:@"transform.rotation.z"];
+    rotationAnimation.fromValue           = @0;
+    rotationAnimation.toValue             = @(M_PI * 2);
+    rotationAnimation.duration            = 5.0;
+    rotationAnimation.repeatCount         = HUGE;
+    rotationAnimation.removedOnCompletion = NO;
+    [self.playingImgV.layer addAnimation:rotationAnimation forKey:@"rotationAnimation"];
+    
+}
+// 停止当前播放音乐转动动画
+- (void)playingStopAnimating {
+    
+    [self.playingImgV.layer removeAllAnimations];//停止动画
+}
+// 判断我的频道中是否包含参数中的一级频道中的二级频道(偏移前的判断)
+- (NSInteger)containsWithChannelIndex:(NSInteger)index classifyId:(NSString *)classifyId {
+    NSString *normalKey = [NSString stringWithFormat:@"%@_%@",NormalChannelArray,CNUserShareModel.uid];
+    NSMutableArray *channelArray = [[NSMutableArray alloc] initWithArray:[[NSUserDefaults standardUserDefaults] objectForKey:normalKey]];
+    NSInteger i = 0;
+
+    if(channelArray.count > index){
+        NSString *modelStr = channelArray[index];
+        NSDictionary *dic = CNLiveStringJsonToDictionary(modelStr);
+        CNCategoryGetChannelModel *model = [CNCategoryGetChannelModel mj_objectWithKeyValues:dic];
+        for (CNCategoryGetChannelModel *subModel in model.pageStyleList) {
+            if ([subModel.id isEqualToString:classifyId]) {
+                return i;
+            }
+            if (CNLiveStringIsEmpty(subModel.pageType)) {
+                continue;
+            }else{
+                i++;
+            }
+        }
+    }
+    return -1;
+    
+}
 -(void)handleDateWithChannelsArray{
     [self.titles removeAllObjects];
-
+    NSMutableArray *array = [NSMutableArray array];
     for (CNCategoryGetChannelModel *model in self.pageListArr) {
-        [self.titles addObject:model.name];
+        if (!CNLiveStringIsEmpty(model.showName) && !CNLiveStringIsEmpty(model.pageType)) {
+            [self.titles addObject:model.name];
+            [array addObject:model];
+            if (!CNLiveStringIsEmpty(model.defaultPage) && [model.defaultPage isEqualToString:@"1"]) {
+                self.myCategoryView.defaultSelectedIndex = [self.pageListArr indexOfObject:model];
+                self.ld_currentIndex = [self.pageListArr indexOfObject:model];
+            }
+        }
     }
+    self.pageListArr = array.copy;
 }
 // 一级频道显示隐藏时二级频道右侧的搜索按钮变宽变窄控制
 - (void)layoutRightSubViewWithShow:(BOOL)show {
@@ -114,15 +295,17 @@
             self.searchBtn.width = 66;
             self.searchBtn.right = KScreenWidth-12;
             [self.searchBtn setTitle:@"搜索" forState:UIControlStateNormal];
+        CGFloat width = self.searchBtn.left;
+            if ([self.channelId isEqualToString:@"219"]) {
+                self.moreBtn.right = KScreenWidth-12-66-15;
+                self.progressView.right = KScreenWidth-93-18-15;
+                width = self.progressView.left;
+            } else if ([self.channelId isEqualToString:@"11"]) {
+                self.historyBtn.right = KScreenWidth-93;
+                width = self.historyBtn.left;
+            }
  
-//            if ([self.channelModel.id isEqualToString:@"219"]) {
-//                self.moreBtn.right = KScreenWidth-12-66-15;
-//                self.progressView.right = KScreenWidth-93-18-15;
-//            } else if ([self.channelModel.id isEqualToString:@"11"]) {
-//                self.historyBtn.right = KScreenWidth-93;
-//            }
-            
-            self.myCategoryView.width = self.searchBtn.left;
+            self.myCategoryView.width = width;
     } else {
         // 变窄
  
@@ -130,16 +313,167 @@
             self.searchBtn.right = KScreenWidth-12;
             [self.searchBtn setTitle:nil forState:UIControlStateNormal];
  
-//            if ([self.channelModel.id isEqualToString:@"219"]) {
-//                self.moreBtn.right = KScreenWidth-12-66-15+30;
-//                self.progressView.right = KScreenWidth-93-18-15+30;
-//            } else if ([self.channelModel.id isEqualToString:@"11"]) {
-//                self.historyBtn.right = KScreenWidth-93+30;
-//            }
+            if ([self.channelId isEqualToString:@"219"]) {
+                self.moreBtn.right = KScreenWidth-12-66-15+30;
+                self.progressView.right = KScreenWidth-93-18-15+30;
+            } else if ([self.channelId isEqualToString:@"11"]) {
+                self.historyBtn.right = KScreenWidth-93+30;
+            }
             self.myCategoryView.width = self.searchBtn.left;
     }
 }
  
+-(void)refreshCurrentVCData
+{
+    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;
+        }
+    }];
+    CNCategoryGetChannelModel *model = (CNCategoryGetChannelModel *)[self.pageListArr safetyObjectAtIndex:self.ld_currentIndex];
+    if (![CNUserShareManager isLogin]) {
+        [BHConfig set:ChannelsSelectSecond value:self.channelId];
+    }
+    NSDictionary *paramDic = nil;
+    if ([model.pageType isEqualToString:@"4"] || [model.pageType isEqualToString:@"5"]){
+         paramDic= @{
+            @"bgColor": model.backgroundColor?model.backgroundColor:@"",
+             @"backgroundImg": model.backgroundImg?model.backgroundImg:@"",
+             @"channelId":model.channelId?model.channelId:@"",
+             @"channelName":model.id?model.id:@"",
+             @"pageId":model.pageId?model.pageId:@"",
+        };
+    }
+        NSTimeInterval time = 300;
+        if ([model.id isEqualToString:@"1"]) {
+            time = 60;
+        }
+        [CNLiveClassifyJumpBridge listViewRefreshWithVC:self.controllersArr[self.ld_currentIndex] pageType:model.pageType.integerValue param:paramDic refreshTime:time];
+}
+-(void)showGuideView
+{
+    if (![CNUserShareManager isLogin] || [BHConfig boolValue:wjjIsShowWitnessShadeKey]) {
+        return;
+    }
+    CNCategoryGetChannelModel *model = (CNCategoryGetChannelModel *)[self.pageListArr safetyObjectAtIndex:self.ld_currentIndex];
+    if (![[NSUserDefaults standardUserDefaults] boolForKey:[NSString stringWithFormat:@"%@_%@",wjjIsShowWitnessShadeKey,CNUserShareModelUid]]) {
+        [self showWitnessShadeViewWithModel:model];
+    } else if (![[NSUserDefaults standardUserDefaults] boolForKey:[NSString stringWithFormat:@"%@_%@",wjjIsShowSupervisionShadeKey,CNUserShareModelUid]]) {
+        [self showSupervisionViewWithModel:model];
+    }
+    if (![[NSUserDefaults standardUserDefaults] boolForKey:[NSString stringWithFormat:@"%@_%@",wjjIsShowSportShadeKey,CNUserShareModelUid]]) {
+        [self showSportShadeViewWithModel:model];
+    }
+    
+}
+- (void)showWitnessShadeViewWithModel:(CNCategoryGetChannelModel *)model {
+    if (![CNUserShareManager isLogin]) {
+        return;
+    }
+    if (model && [model.id isEqualToString:@"101"]) {
+        
+        UICollectionViewLayoutAttributes * att = [self.myCategoryView.collectionView layoutAttributesForItemAtIndexPath:[NSIndexPath indexPathForRow:self.ld_currentIndex inSection:0]];
+        CGRect cellRect = att.frame;
+        CGRect cellFrame = [self.myCategoryView.collectionView convertRect:cellRect toView:AppKeyWindow];
+        
+        if (self.delegate && [self.delegate respondsToSelector:@selector(showGuideShadeViewWithType:cellFrame:)]) {
+            [self.delegate showGuideShadeViewWithType:1 cellFrame:cellFrame];
+        }
+    }
+    
+}
+// 显示目击者中监管首次显示引导图
+- (void)showSupervisionViewWithModel:(CNCategoryGetChannelModel *)model {
+    
+    if (![CNUserShareManager isLogin]) {
+        return;
+    }
+    if (model && [model.id isEqualToString:@"101"]) {
+        if (self.delegate && [self.delegate respondsToSelector:@selector(showGuideShadeViewWithType:cellFrame:)]) {
+            [self.delegate showGuideShadeViewWithType:3 cellFrame:CGRectZero];
+        }
+    }
+    
+}
+// 显示大众体育首次使用引导图
+- (void)showSportShadeViewWithModel:(CNCategoryGetChannelModel *)model {
+    if (![CNUserShareManager isLogin]) {
+        return;
+    }
+    if (model && ([model.id isEqualToString:@"223"] || [model.id isEqualToString:@"801"])) {//大众体育
+        
+        UICollectionViewLayoutAttributes * att = [self.myCategoryView.collectionView layoutAttributesForItemAtIndexPath:[NSIndexPath indexPathForRow:self.ld_currentIndex inSection:0]];
+        CGRect cellRect = att.frame;
+        CGRect cellFrame = [self.myCategoryView.collectionView convertRect:cellRect toView:AppKeyWindow];
+        
+        if (self.delegate && [self.delegate respondsToSelector:@selector(showGuideShadeViewWithType:cellFrame:)]) {
+            [self.delegate showGuideShadeViewWithType:2 cellFrame:cellFrame];
+        }
+    }
+}
+#pragma mark - Action !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+#pragma mark -  TODO 正在播放
+- (void)playingAction:(UIButton *)sender {
+    
+    YYCache * yyCache = [YYCache cacheWithName:[NSString stringWithFormat:@"CNLastPlayedAudio_%@",CNUserShareModel.uid]];
+    CNLiveAlbumAudioListModel *model = (CNLiveAlbumAudioListModel *)[yyCache objectForKey:[NSString stringWithFormat:@"%@_%@",wjjLastAudioInfoSaveKey,CNUserShareModel.uid]];
+    if (model && model.activityId) {
+        [CNLiveClassifyJumpBridge showViewOrPushVCWithCurrentVC:self pushType:CNLiveClassifyJumpPushAudioPlayerVC];
+    }
+    
+}
+#pragma mark - TODO 历史
+- (void)historyAction:(UIButton *)sender {
+    if (![CNUserShareManager isLogin]) {
+        [BHConfig set:LoginPrepositionUrl value:@""];
+        [CNLiveClassifyJumpBridge showViewOrPushVCWithCurrentVC:self pushType:CNLiveClassifyJumpPushLoginVC];
+        return;
+    }
+    if ([self.channelId isEqualToString:@"11"]){
+        //美食中国历史
+       [CNLiveClassifyJumpBridge showViewOrPushVCWithCurrentVC:self pushType:CNLiveClassifyJumpPushHistoryVC];
+
+    }else if ([self.channelId isEqualToString:@"219"]) {
+        [CNLiveClassifyJumpBridge showViewOrPushVCWithCurrentVC:self pushType:CNLiveClassifyJumpPushRecordVC];
+    }
+}
+#pragma mark -  TODO 下载中...
+- (void)loadingAction:(UIButton *)sender {
+    [CNLiveClassifyJumpBridge showViewOrPushVCWithCurrentVC:self pushType:CNLiveClassifyJumpPushDownloadVC];
+}
+#pragma mark - TODO 搜索
+- (void)searchAction:(UIButton *)sender {
+//    [MobClick event:@"channel_click_search"];
+    [CNLiveClassifyJumpBridge showViewOrPushVCWithCurrentVC:self pushType:CNLiveClassifyJumpPushSearchVC];
+}
+
+#pragma mark - TODO 听见中国-更多
+- (void)moreAction:(UIButton *)sender event:(UIEvent *)event{
+    if (![CNUserShareManager isLogin]) {
+        [BHConfig set:LoginPrepositionUrl value:@""];
+        [CNLiveClassifyJumpBridge showViewOrPushVCWithCurrentVC:self pushType:CNLiveClassifyJumpPushLoginVC];
+        return;
+    }
+    [CNLiveClassifyJumpBridge popOverShowEvent:event imageDone:^(NSInteger selectIndex) {
+        if (selectIndex == 0) {
+            // 下载中
+            [self loadingAction:self.downloadingBtn];
+        } else if (selectIndex == 1) {
+            // 历史记录
+            [self historyAction:self.historyBtn];
+        } else if (selectIndex == 2) {
+            // 我的设备
+     
+#pragma mark - TODO:皮肤测试
+            [CNLiveClassifyJumpBridge showViewOrPushVCWithCurrentVC:self pushType:CNLiveClassifyJumpPushAddDiviceVC];
+            
+        }
+    } dismissBlock:^{
+        NSLog(@"dismiss");
+    }];
+    
+}
 #pragma mark - Public
 -(JXCategoryTitleView *)preferredCategoryView{
     return [[JXCategoryTitleView alloc] init];
@@ -157,16 +491,109 @@
         [self.pageViewController setViewControllers:@[vc] direction:UIPageViewControllerNavigationDirectionForward animated:YES completion:NULL];
     }else
     {
+        self.ld_currentIndex = index;
+        if (index != self.myCategoryView.selectedIndex) {
+            [[NSNotificationCenter defaultCenter] postNotificationName:WjjH5StopVideoPlayerNotification object:nil];
+            [[NSNotificationCenter defaultCenter] postNotificationName:kDSHappinessPageControlScrollEnableNotification object:@(YES)];
+        }
         [self.pageViewController setViewControllers:@[vc] direction:UIPageViewControllerNavigationDirectionReverse animated:YES completion:NULL];
+        CNCategoryGetChannelModel *model = (CNCategoryGetChannelModel *)[self.pageListArr safetyObjectAtIndex:index];
+        if (![CNUserShareManager isLogin]) {
+            [BHConfig set:ChannelsSelectSecond value:model.id];
+        }
+        NSDictionary *paramDic = nil;
+        if ([model.pageType isEqualToString:@"4"] || [model.pageType isEqualToString:@"5"]){
+             paramDic= @{
+                @"bgColor": model.backgroundColor?model.backgroundColor:@"",
+                 @"backgroundImg": model.backgroundImg?model.backgroundImg:@"",
+                 @"channelId":model.channelId?model.channelId:@"",
+                 @"channelName":model.id?model.id:@"",
+                 @"pageId":model.pageId?model.pageId:@"",
+            };
+        }
+            NSTimeInterval time = 300;
+            if ([model.id isEqualToString:@"1"]) {
+                time = 60;
+            }
+            [CNLiveClassifyJumpBridge listViewRefreshWithVC:self.controllersArr[index] pageType:model.pageType.integerValue param:paramDic refreshTime:time];
+        [self showGuideView];
+        weakself
+        [self.bgImgView sd_setImageWithURL:[NSURL URLWithString:self.backImageH5] completed:^(UIImage * _Nullable image, NSError * _Nullable error, SDImageCacheType cacheType, NSURL * _Nullable imageURL) {
+            if (image) {
+                weakSelf.bgImgView.height = KScreenWidth*image.size.height/image.size.width;
+            }
+        }];
     }
-
 }
 #pragma mark - Getting&&Setting
 -(JXCategoryTitleView *)myCategoryView
 {
     return (JXCategoryTitleView *)self.categoryView;
 }
+- (UIImageView *)bgImgView {
+    if (!_bgImgView) {
+        _bgImgView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 50, KScreenWidth, self.view.height-50)];
+        _bgImgView.backgroundColor = kWhiteColor;
+    }
+    return _bgImgView;
+
+}
+- (UIButton *)historyBtn {
+    if (!_historyBtn) {
+        _historyBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 19, 19)];
+        [_historyBtn setBackgroundImage:[UIImage loadBundleImage:@"listen_historey"] forState:UIControlStateNormal];
+        [_historyBtn addTarget:self action:@selector(historyAction:) forControlEvents:UIControlEventTouchUpInside];
+        _historyBtn.touchAreaInsets = UIEdgeInsetsMake(9, 9, 9, 9);
+
+    }
+    return _historyBtn;
+}
+- (UIButton *)downloadingBtn {
+    if (!_downloadingBtn) {
+        _downloadingBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 21, 19)];
+        [_downloadingBtn setBackgroundImage:[UIImage loadBundleImage:@"listen_historey"] forState:UIControlStateNormal];
+        [_downloadingBtn addTarget:self action:@selector(loadingAction:) forControlEvents:UIControlEventTouchUpInside];
+        _downloadingBtn.touchAreaInsets = UIEdgeInsetsMake(9, 9, 9, 9);
+    }
+    return _downloadingBtn;
+}
+- (CNAudioPlayProgressView *)progressView {
+    if (!_progressView) {
+        _progressView = [[CNAudioPlayProgressView alloc] initWithFrame:CGRectMake(0, 0, 40, 40)];
+        _progressView.backgroundColor = CNLiveColorWithHexString(@"#5CBFB1");
+        _progressView.layer.cornerRadius = 20;
+        _progressView.layer.masksToBounds = YES;
+        _progressView.hidden = YES;
+    }
+    return _progressView;
+}
+- (UIButton *)playingBtn {
+    if (!_playingBtn) {
+        _playingBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 40, 40)];
+        [_playingBtn addTarget:self action:@selector(playingAction:) forControlEvents:UIControlEventTouchUpInside];
+        _playingBtn.userInteractionEnabled = NO;
+    }
+    return _playingBtn;
+}
  
+- (UIImageView *)playingImgV {
+    if (!_playingImgV) {
+        _playingImgV = [[UIImageView alloc]initWithFrame:CGRectMake(2, 2, 36, 36)];
+        _playingImgV.image = [UIImage loadBundleImage:@""];
+        _playingImgV.backgroundColor = RGBA(255, 169, 82, 1);
+        _playingImgV.layer.cornerRadius = 18;
+        _playingImgV.layer.masksToBounds = YES;
+    }
+    return _playingImgV;
+}
+
+- (UIImageView *)playTipImgV {
+    if (!_playTipImgV) {
+        _playTipImgV = [[UIImageView alloc]initWithFrame:CGRectMake(13, 12, 10, 12)];
+        _playTipImgV.image = [UIImage loadBundleImage:@"playBtn"];
+    }
+    return _playTipImgV;
+}
 - (QMUIButton *)searchBtn {
     if (!_searchBtn) {
         _searchBtn = [QMUIButton buttonWithType:UIButtonTypeCustom];
@@ -191,7 +618,16 @@
     }
     return _searchBtn;
 }
-
+- (UIButton *)moreBtn {
+    if (!_moreBtn) {
+        _moreBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+        _moreBtn.frame = CGRectMake(0, 0, 18, 44);
+        [_moreBtn setImage:[UIImage loadBundleImage:@"ClassifyMore"] forState:UIControlStateNormal];
+        [_moreBtn addTarget:self action:@selector(moreAction:event:) forControlEvents:UIControlEventTouchUpInside];
+        _moreBtn.touchAreaInsets = UIEdgeInsetsMake(9, 9, 9, 9);
+    }
+    return _moreBtn;
+}
 /*
 #pragma mark - Navigation
  
@@ -8,9 +8,41 @@
 #ifndef CNLiveCommonDefines_h
 #define CNLiveCommonDefines_h
  
-//#ifndef CNTouristsId
-//#define CNTouristsId @"100056"  //游客Id
-//#endif
+typedef enum : NSUInteger {
+    CNLiveClassifyJumpShowLoginView,
+    CNLiveClassifyJumpShowGuideView,
+    CNLiveClassifyJumpShowFuzzyView,
+    CNLiveClassifyJumpPushShopSDKVC,
+    CNLiveClassifyJumpPushAudioPlayerVC,
+    CNLiveClassifyJumpPushLoginVC,
+    CNLiveClassifyJumpPushHistoryVC,
+    CNLiveClassifyJumpPushRecordVC,
+    CNLiveClassifyJumpPushDownloadVC,
+    CNLiveClassifyJumpPushSearchVC,
+    CNLiveClassifyJumpPushAddDiviceVC,
+    CNLiveClassifyJumpPushCustomVC
+} CNLiveClassifyJumpType;
+
+static NSString *const CNLiveLaunchWithFirsh = @"CNLiveLaunchWithFirsh";
+static NSString * const kCNLiveDeepLinkPushNotification = @"CNLiveDeepLinkPushNotification";//外部拉起启动相应
+static NSString * const kCNLiveRemotePushNotification = @"CNLiveRemotePushNotification";//远程推送启动相应
+
+// 重定向链接失败通知
+#define CNLiveScanQRCodeScanErrorNotification @"CNLiveScanQRCodeScanError"
+
+// 本地存储音频信息KEY
+#define wjjIsShowWitnessShadeKey @"wjjIsShowWitnessShadeKey"
+#define wjjIsShowSportShadeKey   @"wjjIsShowSportShadeKey"
+#define wjjIsShowSupervisionShadeKey @"wjjIsShowSupervisionShadeKey"//监管
+// showGuide"提示导航页"
+#ifndef CNLiveNetAddShowGuideKey
+#define CNLiveNetAddShowGuideKey @"CNLiveNetAddShowGuideKey"
+#endif
+
+#ifndef CNLiveNetAddShowGuideHKey
+#define CNLiveNetAddShowGuideHKey @"CNLiveNetAddShowGuideHKey"
+#endif
+
 #ifndef CNLiveNetAddGetCategoryChannels
 #define CNLiveNetAddGetCategoryChannels @"CNLiveNetAddGetCategoryChannels"
 #endif
@@ -34,6 +66,33 @@
 #ifndef CNWjjClassifyChannelsRequestHideLoadingNotifiName
 #define CNWjjClassifyChannelsRequestHideLoadingNotifiName @"CNWjjClassifyChannelsRequestHideLoadingNotifiName"
 #endif
+#pragma mark - 电商中国首页
+#ifndef kDSHappinessPageControlScrollEnableNotification
+#define kDSHappinessPageControlScrollEnableNotification @"kDSHappinessPageControlScrollEnableNotification"
+#endif
+
+#pragma mark - 登录
+#ifndef TouristloginTipsViewActionNotification
+#define TouristloginTipsViewActionNotification @"touristloginTipsViewActionNotification"
+#endif
+#pragma mark - 听见中国
+// 分类-听见中国-音频播放状态(播放,暂停)
+#ifndef WjjAudioPlayerStatusNotification
+#define WjjAudioPlayerStatusNotification @"WjjAudioPlayerStatusNotification"
+#endif
+// 分类-听见中国-音频播放进度
+#ifndef WjjAudioPlayerScheduleNotification
+#define WjjAudioPlayerScheduleNotification @"WjjAudioPlayerScheduleNotification"
+#endif
+// 分类-听见中国-一首音频播放完成
+#ifndef WjjAudioPlayDidFinishNotification
+#define WjjAudioPlayDidFinishNotification @"WjjAudioPlayDidFinishNotification"
+#endif
+// 分类-听见中国-播放哪一首音频(contenId)
+#ifndef WjjAudioPlayerWhichPlayingNotification
+#define WjjAudioPlayerWhichPlayingNotification @"WjjAudioPlayerWhichPlayingNotification"
+#endif
+#define wjjLastAudioInfoSaveKey @"wjjLastAudioInfoSaveKey"
 //分类-频道-新版本
 #ifndef CNWjjNewCategoryChannelVerKey
 #define CNWjjNewCategoryChannelVerKey @"CNWjjNewCategoryChannelVerKey"
@@ -42,13 +101,37 @@
 #ifndef CNWjjOldCategoryChannelVerKey
 #define CNWjjOldCategoryChannelVerKey @"CNWjjOldCategoryChannelVerKey"
 #endif
-#pragma mark - 电商中国首页
-#ifndef kDSHappinessPageControlScrollEnableNotification
-#define kDSHappinessPageControlScrollEnableNotification @"kDSHappinessPageControlScrollEnableNotification"
-#endif
-
 #ifndef ChannelsRequested
 #define ChannelsRequested   @"channelsRequested"
 #endif
  
+#ifndef ChannelsShowGuide
+#define ChannelsShowGuide   @"channelsShowGuide"
+#endif
+
+#ifndef ChannelsSelectFirst
+#define ChannelsSelectFirst @"channelsSelectFirst"
+#endif
+#ifndef ChannelsSelectSecond
+#define ChannelsSelectSecond @"channelsSelectSecond"
+#endif
+
+#ifndef LoginPrepositionUrl
+#define LoginPrepositionUrl @"loginPrepositionUrl"
+#endif
+
+#ifndef ActivityNewUrl
+#define ActivityNewUrl  @"activityNewUrl"
+#endif
+
+//分类-频道-幸福中国导航更新颜色
+#ifndef CNWjjDSShopNavColorChangeNotifiName
+#define CNWjjDSShopNavColorChangeNotifiName @"CNWjjDSShopNavColorChangeNotifiName"
+#endif
+
+//分类-频道-幸福中国是否可左右滑动
+#ifndef kDSHappinessPageControlScrollEnableNotification
+#define kDSHappinessPageControlScrollEnableNotification @"kDSHappinessPageControlScrollEnableNotification"
+#endif
+
 #endif /* CNLiveCommonDefines_h */
@@ -20,6 +20,7 @@
 #import <CNLiveBeeHive/BHConfig.h>
 #import <CNLiveEnvironment/CNLiveEnvironment.h>
 #import <MJExtension/MJExtension.h>
+//#import <UMCommon/MobClick.h>
 #import "CNLiveCommonDefines.h"
 #import <QMUIKit/QMUIKit.h>
 #import "UIImage+AdBundleImage.h"
@@ -13,9 +13,28 @@ NS_ASSUME_NONNULL_BEGIN
 @interface CNLiveClassifyJumpBridge : NSObject
 @property (nonatomic, strong) id<CNLiveVideoClassifyProtocol> protocol;
  
-+(instancetype)shareInstance;
++ (instancetype)shareInstance;
  
-+(UIViewController *)ListViewWithPageType:(NSInteger)pageType param:(NSDictionary *_Nullable)param;
++ (UIViewController *)ListViewWithPageType:(NSInteger)pageType param:(NSDictionary *_Nullable)param;
+
++ (void)listViewRefreshWithVC:(UIViewController *)currentVC pageType:(NSInteger)pageType param:(NSDictionary * _Nullable)param refreshTime:(NSTimeInterval)time;
+
++ (UIView *)showViewOrPushVCWithCurrentVC:(UIViewController *)currentVC pushType:(CNLiveClassifyJumpType)type;
+
++ (UIView *)showViewOrPushVCWithCurrentVC:(UIViewController *)currentVC pushType:(CNLiveClassifyJumpType)type pageType:(NSInteger)pageType param:(NSDictionary * _Nullable)param;
+
++(void)popOverShowEvent:(UIEvent *)event
+                imageDone:(FTPopDoneBlock)doneBlock
+            dismissBlock:(FTPopDismissBlock)dismissBlock;
++(void)showGuideShadeViewType:(NSInteger)type cellFrame:(CGRect)cellFrame cancelBlock:(FTPopDismissBlock)cancelBlock;
+
++ (void)checkForloginTurnToWithURL:(NSURL *)url;
+
++ (void)checkWithFunctionForShareURL:(NSString *)shareUrl;
+
++ (void)bringCenterLoginViewToFront;
+
++ (BOOL)audioPlayerIsplaying;
 @end
  
 NS_ASSUME_NONNULL_END
@@ -32,4 +32,51 @@
 {
     return [[CNLiveClassifyJumpBridge shareInstance].protocol listViewShowPageType:pageType param:param];
 }
+
++(void)listViewRefreshWithVC:(UIViewController *)currentVC pageType:(NSInteger)pageType param:(NSDictionary *)param refreshTime:(NSTimeInterval)time
+{
+    
+}
+
++(UIView *)showViewOrPushVCWithCurrentVC:(UIViewController *)currentVC pushType:(CNLiveClassifyJumpType)type
+{
+    return [CNLiveClassifyJumpBridge showViewOrPushVCWithCurrentVC:currentVC pushType:type pageType:0 param:nil];
+}
++(UIView *)showViewOrPushVCWithCurrentVC:(UIViewController *)currentVC pushType:(CNLiveClassifyJumpType)type pageType:(NSInteger)pageType  param:(NSDictionary *_Nullable)param
+{
+    return [[CNLiveClassifyJumpBridge shareInstance].protocol showViewOrPushVCWithCurrentVC:currentVC pushType:type pageType:pageType param:param];
+}
++(void)popOverShowEvent:(UIEvent *)event imageDone:(FTPopDoneBlock)doneBlock dismissBlock:(FTPopDismissBlock)dismissBlock
+{
+    [[CNLiveClassifyJumpBridge shareInstance].protocol popOverShowEvent:event imageDone:doneBlock dismissBlock:dismissBlock];
+}
++(void)checkForloginTurnToWithURL:(NSURL *)url
+{
+    Class class = NSClassFromString(@"CNLiveSkipActionManager");
+    SEL sel = NSSelectorFromString(@"checkForloginTurnToWithURL");
+    if (class && sel) {
+        [class performSelector:sel withObject:url];
+    }
+}
+
++(void)checkWithFunctionForShareURL:(NSString *)shareUrl
+{
+    Class class = NSClassFromString(@"CNLiveSkipActionManager");
+    SEL sel = NSSelectorFromString(@"checkWithFunctionForShareURL");
+    if (class && sel) {
+        [class performSelector:sel withObject:shareUrl];
+    }
+    
+}
+
++ (void)bringCenterLoginViewToFront
+{
+    Class class = NSClassFromString(@"CNTouristsLoginView");
+    SEL sel = NSSelectorFromString(@"bringCenterLoginViewToFront");
+    [class performSelector:sel];
+}
++ (BOOL)audioPlayerIsplaying
+{
+    return [[CNLiveClassifyJumpBridge shareInstance].protocol audioPlayerIsplaying];
+}
 @end
@@ -19,6 +19,8 @@ NS_ASSUME_NONNULL_BEGIN
 -(UIViewController *)model:(CNCategoryGetChannelModel *)model black:(BOOL)black bgImage:(NSString *)bgImage bgColor:(NSString *)bgColor bgImageH5:(NSString *)bgImageH5;
  
 - (void)requestWebViewForScrollView:(nonnull UIScrollView *)scrollView isBeginDragging:(BOOL)isBeginDragging;
+
++ (CNCategoryBaseViewController *)CNCategoryBaseViewController;
 @end
  
 NS_ASSUME_NONNULL_END
@@ -7,6 +7,7 @@
  
 #import "CNLiveListManager.h"
 #import "CNCategoryGetChannelModel.h"
+#import "CNLiveClassifySegmentController.h"
  
 @interface CNLiveListManager()
 {
@@ -25,6 +26,10 @@
     return manager;
 }
  
++(CNCategoryBaseViewController *)CNCategoryBaseViewController
+{
+    return [[CNLiveClassifySegmentController alloc] init];
+}
  
 -(UIViewController *)model:(CNCategoryGetChannelModel *)model black:(BOOL)black bgImage:(NSString *)bgImage bgColor:(nonnull NSString *)bgColor bgImageH5:(nonnull NSString *)bgImageH5
 {
@@ -58,9 +63,9 @@
         beginoffsetY = scrollView.offsetY;
     }else
     {
-        if (scrollView.offsetY - beginoffsetY>2) {
+        if (scrollView.offsetY - beginoffsetY>5) {
             !self.scrollViewDidScrollBlock ?: self.scrollViewDidScrollBlock(YES);
-        }else if (scrollView.offsetY - beginoffsetY<-2) {
+        }else if (scrollView.offsetY - beginoffsetY<0) {
             !self.scrollViewDidScrollBlock ?: self.scrollViewDidScrollBlock(NO);
         }
     }
@@ -7,8 +7,11 @@
  
 #import <Foundation/Foundation.h>
  
-NS_ASSUME_NONNULL_BEGIN
+typedef void(^FTPopDoneBlock)(NSInteger selectIndex);
+
+typedef void(^FTPopDismissBlock)(void);
  
+NS_ASSUME_NONNULL_BEGIN
 @protocol CNLiveVideoClassifyProtocol <NSObject>
 /**
  *返回需要加载的View
@@ -17,6 +20,13 @@ NS_ASSUME_NONNULL_BEGIN
  */
 -(UIViewController *)listViewShowPageType:(NSUInteger)pageType
                           param:(NSDictionary *)param;
+-(UIView *)showViewOrPushVCWithCurrentVC:(UIViewController *)currentVC
+                                pushType:(CNLiveClassifyJumpType)type pageType:(NSInteger)pageType param:(NSDictionary *_Nullable)param;
+-(BOOL)audioPlayerIsplaying;
+
+-(void)popOverShowEvent:(UIEvent *)event
+                imageDone:(FTPopDoneBlock)doneBlock
+            dismissBlock:(FTPopDismissBlock)dismissBlock;
 @end
  
 NS_ASSUME_NONNULL_END
+//
+//  CNWebRedirectHandle.h
+//  CNLiveNetAdd
+//
+//  Created by cnliveJunBo on 2019/1/3.
+//  Copyright © 2019年 cnlive. All rights reserved.
+//  跳转二级webview的管理类
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface CNWebRedirectHandle : NSObject
+
+@property (nonatomic, assign) BOOL isSelectedClassify;//是否进入过分类页面
+@property (nonatomic, assign) BOOL isClickedIntegral; //未进入过分类页面时,是否点击过积分任务跳转
+@property (nonatomic, assign) NSInteger channelId;    //一级index
+@property (nonatomic, assign) NSInteger classifyId;   //二级index
+
++ (CNWebRedirectHandle *)manager;
+
+// 外部使用(短连接->长连接)（多了encode  decode操作）
+- (void)webRedirectHandleWithUrlStr:(NSString *)urlStr;
+// 外部使用(跳转二级webView页)（无encode  decode，无短链重定向长链操作，仅仅初始化二级webview做跳转）
+- (void)turnToCategorySubWebVCWithUrl:(NSString *)urlStr;
+
+// junbo自己使用 （无encode  decode操作。因为一二级webview内不再做任何encode decode操作，容易产生多次encode问题，所以一二级webview内使用这个）
+- (void)jb_webRedirectHandleWithUrlStr:(NSString *)urlStr;
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  CNWebRedirectHandle.m
+//  CNLiveNetAdd
+//
+//  Created by cnliveJunBo on 2019/1/3.
+//  Copyright © 2019年 cnlive. All rights reserved.
+//
+
+#import "CNWebRedirectHandle.h"
+
+@interface CNWebRedirectHandle ()<NSURLSessionTaskDelegate>
+
+@property (nonatomic, copy)   NSString *loadUrlStr;
+@property (nonatomic, assign) BOOL isRedirect;
+@property (nonatomic, copy)   NSString *oldUrlStr;
+@property (nonatomic, copy)   NSString *redirectUrlStr;
+
+@end
+
+@implementation CNWebRedirectHandle
+
++ (CNWebRedirectHandle *)manager
+{
+    static id instance = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        instance = [[self alloc] init];
+    });
+    return instance;
+}
+
+- (void)webRedirectHandleWithUrlStr:(NSString *)urlStr {
+    
+    urlStr = [urlStr stringByURLDecode];
+    urlStr = [urlStr stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+    [self jb_webRedirectHandleWithUrlStr:urlStr];
+}
+
+- (void)turnToCategorySubWebVCWithUrl:(NSString *)urlStr {
+#warning pushVC
+    // 二级页
+//    NSDictionary *dic = [NSString getURLParameters:urlStr];
+//    AppDelegate *delegte = (AppDelegate *)[UIApplication sharedApplication].delegate;
+//    delegte.shouldChangeOrientation = WebPlayer;
+//    NSString *pageTitle = @" ";
+//    if ([dic containsObjectForKey:@"isShowTitle"] && [dic[@"isShowTitle"] isEqualToString:@"true"]) {
+//        pageTitle = nil;
+//    }
+//    CNDarenCategoryWebController *webVC =  [[CNDarenCategoryWebController alloc] initWithUrl:urlStr pageTitle:pageTitle];
+//    webVC.statUrl = urlStr;
+//    if([dic[@"model"] isEqualToString:@"witness"]){
+//        webVC.shareType = @"witnessVideo";
+//    }
+//    else if([dic[@"model"] isEqualToString:@"3_witness"]){
+//        webVC.shareType = @"witnessArticle";
+//    }
+//    else {
+//        webVC.shareType = @"article";
+//    }
+//    [[AppDelegate sharedAppDelegate] pushViewController:webVC withBackTitle:@" "];
+}
+
+- (void)jb_webRedirectHandleWithUrlStr:(NSString *)urlStr {
+    [QMUITips showLoadingInView:AppKeyWindow];
+    self.loadUrlStr = urlStr?urlStr:@"";
+    NSURL *url = [NSURL URLWithString:urlStr];
+    NSMutableURLRequest *quest = [NSMutableURLRequest requestWithURL:url];
+    quest.HTTPMethod = @"GET";
+    
+    weakself
+    NSURLSessionConfiguration *config = [NSURLSessionConfiguration defaultSessionConfiguration];
+    config.requestCachePolicy = NSURLRequestReloadIgnoringLocalCacheData;
+    NSURLSession *urlSession = [NSURLSession sessionWithConfiguration:config delegate:self delegateQueue:[NSOperationQueue currentQueue]];
+    NSURLSessionDataTask *task = [urlSession dataTaskWithRequest:quest completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error)
+                                  {
+                                      [QMUITips hideAllTipsInView:AppKeyWindow];
+                                      if (error) {
+                                          if (error.code == -1009) {
+                                              [QMUITips showError:@"似乎已断开与互联网的连接。" inView:AppKeyWindow hideAfterDelay:1.5];
+                                          }
+                                          weakSelf.isRedirect = NO;
+                                          weakSelf.oldUrlStr = nil;
+                                          weakSelf.redirectUrlStr = nil;
+                                          return ;
+                                      }
+                                      
+                                      NSString *loadUrlStr = weakSelf.loadUrlStr;
+                                      if (weakSelf.isRedirect) {
+                                          loadUrlStr = weakSelf.redirectUrlStr;
+                                          [CNLiveClassifyJumpBridge checkWithFunctionForShareURL:loadUrlStr];
+                                      } else {
+                                          // 没有重定向
+                                          [[NSNotificationCenter defaultCenter] postNotificationName:CNLiveScanQRCodeScanErrorNotification object:nil];
+                                          [QMUITips showWithText:@"链接地址错误" inView:AppKeyWindow hideAfterDelay:1.5f];
+                                      }
+                                      weakSelf.isRedirect = NO;
+                                      weakSelf.oldUrlStr = nil;
+                                      weakSelf.redirectUrlStr = nil;
+                                  }];
+    [task resume];
+    
+}
+
+#pragma mark - NSURLSessionTaskDelegate
+- (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task willPerformHTTPRedirection:(NSHTTPURLResponse *)response newRequest:(NSURLRequest *)request completionHandler:(void (^)(NSURLRequest * __nullable))completionHandler
+{
+    NSLog(@"statusCode: %ld", response.statusCode);
+    
+    NSDictionary *headers = response.allHeaderFields;
+    NSLog(@"%@", headers);
+    if (response.statusCode==302 || response.statusCode==301) {
+        self.isRedirect = YES;
+        self.oldUrlStr = [[response URL] absoluteString];
+        self.redirectUrlStr = headers[@"Location"];
+        NSLog(@"======>>>>>>111111:%@",headers[@"Location"]);
+    }
+    NSLog(@"redirect   url: %@", headers[@"Location"]); // 重定向的地址，如：http://www.jd.com
+    NSLog(@"newRequest url: %@", [request URL]);        // 重定向的地址，如：http://www.jd.com
+    NSLog(@"redirect response url: %@", [response URL]);// 触发重定向请求的地址，如：http://www.360buy.com
+    
+    completionHandler(request);
+    //    completionHandler(nil);// 参数为nil，表示拦截（禁止）重定向
+}
+
+@end
@@ -50,3 +50,79 @@
 - (NSInteger)containsWithChannelArray:(NSArray <NSString *>*)channelArray;
  
 @end
+
+@interface CNLiveAlbumAudioListModel : NSObject<NSCoding>
+@property (nonatomic, copy) NSString *activityId; //活动ID
+@property (nonatomic, copy) NSString *cmccActiveId;//音响播放id
+@property (nonatomic, copy) NSString *title; //标题名称
+@property (nonatomic, copy) NSString *albumId; //专辑ID
+@property (nonatomic, copy) NSString *albumName; //专辑名称
+@property (nonatomic, copy) NSString *actor; //作者
+@property (nonatomic, copy) NSString *modelId; //类型ID,5是音频
+@property (nonatomic, copy) NSString *time;
+@property (nonatomic, copy) NSString *img;
+@property (nonatomic, copy) NSString *counts; //后面标题号
+@property (nonatomic, copy) NSString *viewCounts; //人数
+@property (nonatomic, copy) NSString *schedule; //播放长度
+@property (nonatomic, copy) NSString *comments; //评论数
+@property (nonatomic, copy) NSString *contentId;
+@property (nonatomic, copy) NSString *duration; //时长
+@property (nonatomic, copy) NSString *shareUrl;
+@property (nonatomic, copy) NSString *aid;          //专辑ID
+@property (nonatomic, copy) NSString *poster;       //封面图
+@property (nonatomic, copy) NSString *channelName;  //
+@property (nonatomic, copy) NSString *likesNum;     //点赞人数
+@property (nonatomic, copy) NSString *goodsJson;    //商品
+@property (nonatomic, assign) BOOL    liked;        //自己是否点赞
+// 付费音频 h5->app
+@property (nonatomic, copy)   NSString   *   productId;
+@property (nonatomic, copy)   NSString   *   productType; //类型 0 免费 1 积分 2 付费  3 4试听
+@property (nonatomic, copy)   NSString   *   iosRmb;
+@property (nonatomic, copy)   NSString   *   androidRmb;
+@property (nonatomic, copy)   NSString   *   point; //积分
+// 分享
+@property (nonatomic, copy)   NSString   *   aProductId;
+@property (nonatomic, copy)   NSString   *   aProductType;
+// 播放详情接口
+@property (nonatomic, copy)   NSString   *   desc;         //描述
+@property (nonatomic, copy)   NSString   *   cultureDesc;
+@property (nonatomic, copy)   NSString   *   bodyContent;  //内容简介
+@property (nonatomic, copy)   NSString   *   model;        //
+@property (nonatomic, copy)   NSString   *   publishTime;  //
+@property (nonatomic, copy)   NSString   *   siteId;       //
+@property (nonatomic, copy)   NSString   *   subTitle;
+@property (nonatomic, copy)   NSString *isSelected; //是否被播放过
+// 历史记录
+@property (nonatomic, copy) NSString *recordId;
+@property (nonatomic, copy) NSString *activeId;
+@property (nonatomic, copy) NSString *recent;
+@property (nonatomic, copy) NSString *sid;
+@property (nonatomic, copy) NSString *albumImg;
+@property (nonatomic, copy) NSString *number; //展示前面的数字,自己加的
+@property (nonatomic, copy) NSString *isCellSelected; //cell是否被选中
+//下载的数据
+@property (nonatomic, copy) NSString *localPath;            // 下载完成路径
+@property (nonatomic, copy) NSString *url;                  // url
+@property (nonatomic, strong) NSData *resumeData;           // 下载的数据
+@property (nonatomic, assign) CGFloat progress;             // 下载进度
+@property (nonatomic, assign) NSUInteger totalFileSize;     // 文件总大小
+@property (nonatomic, assign) NSUInteger tmpFileSize;       // 下载大小
+@property (nonatomic, assign) NSUInteger speed;             // 下载速度
+@property (nonatomic, assign) NSTimeInterval lastSpeedTime; // 上次计算速度时的时间戳
+@property (nonatomic, assign) NSUInteger intervalFileSize;  // 计算速度时间内下载文件的大小
+@property (nonatomic, assign) NSUInteger lastStateTime;     // 记录任务加入准备下载的时间（点击默认、暂停、失败状态），用于计算开始、停止任务的先后顺序
+@property (nonatomic, copy) NSString *fileSize; //服务器返的文件大小
+@property (nonatomic, copy) NSString *isProgram; //是节目列表还是简介列表里的  "0"简介 "1"节目
+@property (nonatomic, copy) NSString *createTime; //已购列表创建时间
+//@property (nonatomic, assign) BOOL isPay; //是否付费
+@property (nonatomic, assign) BOOL downloadType; //是否可下载  YES可下载 NO不可下载
+@property (nonatomic, copy) NSString  *isHorizontalScreen;//是否是竖屏视频（非null&&=0是竖屏,1是横屏） 跳到点播详情使用
+@property (nonatomic, copy) NSString  *liveType;  //直播类型
+
+@property (nonatomic, copy) NSString  *albumType; // 0 是视频 1 是音频
+@property (nonatomic, assign) BOOL    isVideoType; //是否是视频类型 Yes是包括点播和直播 NO 音频
+@property (nonatomic, copy) NSString *isStudy; // 1 可以考试 2 已学完
+
+
+@end
+
@@ -41,3 +41,6 @@
 }
  
 @end
+@implementation CNLiveAlbumAudioListModel
+
+@end
+//
+//  CNAudioPlayProgressView.h
+//  CNLiveNetAdd
+//
+//  Created by cnliveJunBo on 2019/7/3.
+//  Copyright © 2019年 cnlive. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface CNAudioPlayProgressView : UIView
+
+- (void)animationWithProgres:(CGFloat)progress duration:(CGFloat)duration;
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  CNAudioPlayProgressView.m
+//  CNLiveNetAdd
+//
+//  Created by cnliveJunBo on 2019/7/3.
+//  Copyright © 2019年 cnlive. All rights reserved.
+//
+
+#import "CNAudioPlayProgressView.h"
+
+@interface CNAudioPlayProgressView ()
+
+@property (nonatomic, strong) CAShapeLayer *progressLayer;
+@property (nonatomic, assign) CGFloat progress;
+
+@end
+
+@implementation CNAudioPlayProgressView
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        self.progress = 0.0f;
+    }
+    return self;
+}
+
+- (void)drawRect:(CGRect)rect {
+    
+    CGFloat lineWidth = 2.0f;
+    
+    //创建一个圆形贝塞尔曲线
+    UIBezierPath *aPath2 = [UIBezierPath bezierPathWithArcCenter:CGPointMake(self.width/2, self.height/2) radius:(self.width - lineWidth)/ 2 startAngle:-M_PI_2 endAngle:M_PI * 3.0 / 2.0 clockwise:YES];
+    aPath2.lineCapStyle = kCGLineCapRound; //线条拐角
+    aPath2.lineJoinStyle = kCGLineJoinRound; //终点处理
+    CAShapeLayer *shapeLayer = [CAShapeLayer layer];
+    shapeLayer.frame = self.bounds;//设置shapeLayer的尺寸和位置
+    shapeLayer.fillColor = [UIColor clearColor].CGColor;//填充颜色为ClearColor
+    //设置线条的宽度和颜色
+    shapeLayer.lineWidth = lineWidth;
+    shapeLayer.strokeColor = kWhiteColor.CGColor;
+    //将贝塞尔曲线设置为CAShapeLayer的path
+    shapeLayer.path = aPath2.CGPath;
+    //将shapeLayer添加到视图的layer上
+    [self.layer addSublayer:shapeLayer];
+    
+    self.progressLayer = [CAShapeLayer layer];
+    self.progressLayer.frame = self.bounds;
+    self.progressLayer.fillColor = [UIColor clearColor].CGColor;//填充颜色为ClearColor
+    //设置线条的宽度和颜色
+    self.progressLayer.lineWidth = lineWidth;
+    self.progressLayer.strokeColor = RGBA(255, 169, 82, 1).CGColor;
+    self.progressLayer.path = aPath2.CGPath;
+    self.progressLayer.strokeStart = 0;
+    self.progressLayer.strokeEnd = self.progress;
+    [self.layer addSublayer:self.progressLayer];
+    
+}
+
+- (void)animationWithProgres:(CGFloat)progress duration:(CGFloat)duration {
+    
+    self.progress = progress;
+    if (progress>1.0) {
+        progress = 1.0;
+    }
+//    NSLog(@"look here 进度:%f",progress);
+    [CATransaction begin];
+    [CATransaction setAnimationTimingFunction:[CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseIn]];
+    [CATransaction setAnimationDuration:duration];
+    self.progressLayer.strokeEnd =  progress;
+    [CATransaction commit];
+    
+}
+
+@end
+//
+//  CNSupervisionGuideViewManager.h
+//  CNLiveNetAdd
+//
+//  Created by cnliveJunBo on 2020/3/10.
+//  Copyright © 2020 cnlive. All rights reserved.
+//  目击者监管首次引导管理类
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface CNSupervisionGuideViewManager : NSObject
+
++ (void)showSupervisionGuideViewWithVC:(UIViewController *)vc;
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  CNSupervisionGuideViewManager.m
+//  CNLiveNetAdd
+//
+//  Created by cnliveJunBo on 2020/3/10.
+//  Copyright © 2020 cnlive. All rights reserved.
+//
+
+#import "CNSupervisionGuideViewManager.h"
+
+static CNSupervisionGuideViewManager * instance = nil;
+
+@interface CNSupervisionGuideViewManager ()
+
+@property (nonatomic, strong) UIView *bgView;
+@property (nonatomic, strong) UIImageView *titleView;
+@property (nonatomic, strong) UIImageView *arrowsView;
+@property (nonatomic, strong) UIImageView *contentView;
+@property (nonatomic, strong) UIButton *cancelBtn;
+
+@end
+
+@implementation CNSupervisionGuideViewManager
+
++ (void)showSupervisionGuideViewWithVC:(UIViewController *)vc {
+    
+    instance = [[self alloc] init];
+    [vc.view addSubview:instance.bgView];
+    [instance.bgView addSubview:instance.contentView];
+    [instance.bgView addSubview:instance.arrowsView];
+    [instance.bgView addSubview:instance.titleView];
+    [instance.bgView addSubview:instance.cancelBtn];
+    if (instance.titleView.bottom>instance.cancelBtn.top-20) {
+        instance.cancelBtn.top=instance.titleView.bottom+20;
+    }
+    
+}
+
+- (void)cancelAction:(UIButton *)sender {
+    
+    [instance.contentView removeFromSuperview];
+    [instance.arrowsView removeFromSuperview];
+    [instance.titleView removeFromSuperview];
+    [instance.cancelBtn removeFromSuperview];
+    instance.contentView = nil;
+    instance.arrowsView = nil;
+    instance.titleView = nil;
+    instance.cancelBtn = nil;
+    [instance.bgView removeFromSuperview];
+    instance.bgView = nil;
+    
+}
+
+- (UIView *)bgView {
+    if (!_bgView) {
+        _bgView = [[UIView alloc] initWithFrame:[UIScreen mainScreen].bounds];
+        _bgView.backgroundColor = RGBA(0, 0, 0, 0.7);
+    }
+    return _bgView;
+}
+
+- (UIImageView *)titleView {
+    if (!_titleView) {
+        CGFloat height = (KScreenWidth-22)*191/353;
+        _titleView = [[UIImageView alloc] initWithFrame:CGRectMake(11, kStatusHeight+72, KScreenWidth-22, height)];
+        _titleView.image = [UIImage imageNamed:@"spjg_title"];
+    }
+    return _titleView;
+}
+
+- (UIImageView *)arrowsView {
+    if (!_arrowsView) {
+        _arrowsView = [[UIImageView alloc] initWithFrame:CGRectMake(KScreenWidth*0.5-46.5, instance.titleView.bottom+7, 20, 43)];
+        _arrowsView.image = [UIImage imageNamed:@"spjg_arrow"];
+    }
+    return _arrowsView;
+}
+
+- (UIImageView *)contentView {
+    if (!_contentView) {
+        CGFloat height = (KScreenWidth-22)*80/353;
+        _contentView = [[UIImageView alloc] initWithFrame:CGRectMake(11, instance.arrowsView.bottom+7 , KScreenWidth-22, height)];
+        _contentView.image = [UIImage imageNamed:@"spjg_content"];
+    }
+    return _contentView;
+}
+
+- (UIButton *)cancelBtn {
+    if (!_cancelBtn) {
+        _cancelBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+        _cancelBtn.frame = CGRectMake((KScreenWidth-96)*0.5, instance.contentView.bottom+104.5, 96, 39);
+        [_cancelBtn setImage:[UIImage imageNamed:@"spjg_know"] forState:UIControlStateNormal];
+        [_cancelBtn addTarget:self action:@selector(cancelAction:) forControlEvents:UIControlEventTouchUpInside];
+    }
+    return _cancelBtn;
+}
+
+@end
+//
+//  CNWitnessShadeManager.h
+//  CNLiveNetAdd
+//
+//  Created by cnliveJunBo on 2019/7/5.
+//  Copyright © 2019年 cnlive. All rights reserved.
+//  目击者遮罩引导管理类
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface CNWitnessShadeManager : NSObject
+
+// y: kStatusHeight+50+5
++ (void)showWitnessShadeViewWithTopImg:(NSString *)topImg contentImg:(NSString *)contentImg topImgRect:(CGRect)topImgRect contentImgSize:(CGSize)contentImgSize vc:(UIViewController *)vc cancelBlock:(void(^)(void))cancelBlock;
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  CNWitnessShadeManager.m
+//  CNLiveNetAdd
+//
+//  Created by cnliveJunBo on 2019/7/5.
+//  Copyright © 2019年 cnlive. All rights reserved.
+//
+
+#import "CNWitnessShadeManager.h"
+
+static CNWitnessShadeManager * instance = nil;
+typedef void(^CancelBlock)(void);
+@interface CNWitnessShadeManager ()
+
+@property (nonatomic, strong) UIView *bgView;
+@property (nonatomic, strong) UIImageView *mjzView;
+@property (nonatomic, strong) UIImageView *arrowsView;
+@property (nonatomic, strong) UIImageView *titleView;
+@property (nonatomic, strong) UIButton *cancelBtn;
+
+@property (nonatomic, copy) NSString *topImgName;
+@property (nonatomic, copy) NSString *contentImgName;
+@property (nonatomic, assign) CGRect topImgRect;
+@property (nonatomic, assign) CGSize contentImgSize;
+@property (nonatomic, copy) CancelBlock cancelBlock;
+
+@end
+
+@implementation CNWitnessShadeManager
+
++ (void)showWitnessShadeViewWithTopImg:(NSString *)topImg contentImg:(NSString *)contentImg topImgRect:(CGRect)topImgRect contentImgSize:(CGSize)contentImgSize vc:(UIViewController *)vc cancelBlock:(void(^)(void))cancelBlock {
+    
+    instance = [[self alloc] init];
+    instance.topImgName = topImg;
+    instance.contentImgName = contentImg;
+    instance.topImgRect = topImgRect;
+    instance.contentImgSize = contentImgSize;
+    instance.cancelBlock = cancelBlock;
+    [vc.view addSubview:instance.bgView];
+    [instance.bgView addSubview:instance.mjzView];
+    [instance.bgView addSubview:instance.arrowsView];
+    [instance.bgView addSubview:instance.titleView];
+    [instance.bgView addSubview:instance.cancelBtn];
+    if (instance.titleView.bottom>instance.cancelBtn.top-20) {
+        instance.cancelBtn.top=instance.titleView.bottom+20;
+    }
+    
+}
+
+- (void)cancelAction:(UIButton *)sender {
+    
+    [instance.mjzView removeFromSuperview];
+    [instance.arrowsView removeFromSuperview];
+    [instance.titleView removeFromSuperview];
+    [instance.cancelBtn removeFromSuperview];
+    instance.mjzView = nil;
+    instance.arrowsView = nil;
+    instance.titleView = nil;
+    instance.cancelBtn = nil;
+    [instance.bgView removeFromSuperview];
+    instance.bgView = nil;
+    if (instance.cancelBlock) {
+        instance.cancelBlock();
+    }
+}
+
+- (UIView *)bgView {
+    if (!_bgView) {
+        _bgView = [[UIView alloc] initWithFrame:[UIScreen mainScreen].bounds];
+        _bgView.backgroundColor = RGBA(0, 0, 0, 0.7);
+    }
+    return _bgView;
+}
+
+- (UIImageView *)mjzView {
+    if (!_mjzView) {
+        _mjzView = [[UIImageView alloc] initWithFrame:instance.topImgRect];
+        _mjzView.image = [UIImage loadBundleImage:instance.topImgName];
+    }
+    return _mjzView;
+}
+
+- (UIImageView *)arrowsView {
+    if (!_arrowsView) {
+        _arrowsView = [[UIImageView alloc] initWithFrame:CGRectMake(instance.mjzView.x+53, instance.mjzView.bottom+3, 47, 136)];
+        _arrowsView.image = [UIImage loadBundleImage:@"mjz-arrow"];
+    }
+    return _arrowsView;
+}
+
+- (UIImageView *)titleView {
+    if (!_titleView) {
+        _titleView = [[UIImageView alloc] initWithFrame:CGRectMake((KScreenWidth-instance.contentImgSize.width)*0.5, instance.arrowsView.bottom+10, instance.contentImgSize.width, instance.contentImgSize.height)];
+        _titleView.image = [UIImage loadBundleImage:instance.contentImgName];
+    }
+    return _titleView;
+}
+
+- (UIButton *)cancelBtn {
+    if (!_cancelBtn) {
+        _cancelBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+        _cancelBtn.frame = CGRectMake((KScreenWidth-96)*0.5, 410.0*KScreenHeight/667.0, 96, 39);
+        [_cancelBtn setImage:[UIImage loadBundleImage:@"mjzgx_an"] forState:UIControlStateNormal];
+        [_cancelBtn addTarget:self action:@selector(cancelAction:) forControlEvents:UIControlEventTouchUpInside];
+    }
+    return _cancelBtn;
+}
+
+@end
@@ -579,9 +579,11 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
+				ENABLE_BITCODE = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "CNLiveVideoClassifyKit/CNLiveVideoClassifyKit-prefix.pch";
 				INFOPLIST_FILE = "CNLiveVideoClassifyKit/CNLiveVideoClassifyKit-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MARKETING_VERSION = 1.0;
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}";
@@ -597,9 +599,11 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
+				ENABLE_BITCODE = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "CNLiveVideoClassifyKit/CNLiveVideoClassifyKit-prefix.pch";
 				INFOPLIST_FILE = "CNLiveVideoClassifyKit/CNLiveVideoClassifyKit-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MARKETING_VERSION = 1.0;
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}";
@@ -17,6 +17,7 @@
 #import <CNLiveNetworking.h>
 #import <CNLiveCommonCategory/CNLiveCommonCategory.h>
 #import <MJExtension.h>
+#import <CNLiveBeeHive/CNLiveBeeHive.h>
 #import "CNTools.h"
  
  
@@ -40,7 +41,7 @@
 - (void)viewDidLoad
 {
     [super viewDidLoad];
-    
+    [BHConfig set:ChannelsSelectFirst value:@"0"];
     [CNTools GetClassifyChannelsUrlsAndSave];
     self.title = @"首页";
     segArr = @[@"分类"];
@@ -7,7 +7,7 @@
 //
  
 #import <Foundation/Foundation.h>
-#import <CNLiveVideoClassifyKit/CNLiveVideoClassifyProtocol.h>
+#import <CNLiveVideoClassifyKit/CNLivevideoClassifyPCH.h>
  
 NS_ASSUME_NONNULL_BEGIN
  
@@ -42,4 +42,21 @@
     }
  
 }
+-(UIView *)showViewOrPushVCWithCurrentVC:(UIViewController *)currentVC
+                                pushType:(CNLiveClassifyJumpType)type pageType:(NSInteger)pageType param:(NSDictionary *_Nullable)param {
+    return [UIView new];
+}
+-(BOOL)audioPlayerIsplaying
+{
+    return YES;
+}
+
+-(void)popOverShowEvent:(UIEvent *)event
+                imageDone:(FTPopDoneBlock)doneBlock
+           dismissBlock:(FTPopDismissBlock)dismissBlock{
+    
+}
+-(void)showGuideShadeViewType:(NSInteger)type cellFrame:(CGRect)cellFrame cancelBlock:(FTPopDismissBlock)cancelBlock{
+    
+}
 @end
@@ -50,7 +50,7 @@
                                                         WebBridge:(WKWebViewJavascriptBridge *)webBridge
                                                             FromVC:(CNLiveWebViewController *)fromVC
                                                         ResultData:(id)resultData
-                                 CompleterBlock:(nonnull void (^)(id _Nonnull))completerBlock
+                                 CompleterBlock:( void (^)(id _Nonnull))completerBlock
 {
     NSLog(@"交互方法响应了=>%@  参数=>%@",handleName,resultData);
     if ([handleName isEqualToString:kCNLiveWebForJSRegisterKWIdentifier]) {
@@ -26,6 +26,17 @@ target &#39;CNLiveVideoClassifyKit_Example&#39; do
         #删除WebViewJavascriptBridge中的WebViewJavascriptBridge.h和WebViewJavascriptBridge.m文件
     #################################################
   end
+
+  post_install do |installer_representation|
+    installer_representation.pods_project.targets.each do |target|
+      target.build_configurations.each do |config|
+         #share使用pod库时，pod中包含[UIApplication sharedApplication]的代码，需要下面的配置
+         config.build_settings['APPLICATION_EXTENSION_API_ONLY'] = 'NO'
+           config.build_settings['ENABLE_BITCODE'] = false
+      end
+    end
+  end
+
   target 'CNLiveVideoClassifyKit_Tests' do
     inherit! :search_paths