no message

yanglingyu
1 parent 18b43dc4
Showing 10 changed files with 231 additions and 156 deletions
CNLiveVideoClassifyKit.podspec
CNLiveVideoClassifyKit/Classes/Controller/CNCategoryBaseViewController.m
CNLiveVideoClassifyKit/Classes/Controller/ListViewController.h → CNLiveVideoClassifyKit/Classes/Controller/CNListViewController.h
CNLiveVideoClassifyKit/Classes/Controller/CNListViewController.m
CNLiveVideoClassifyKit/Classes/Controller/CNLiveClassifySegmentController.m
CNLiveVideoClassifyKit/Classes/Controller/CNLiveSubSegmentController.h
CNLiveVideoClassifyKit/Classes/Controller/CNLiveSubSegmentController.m
CNLiveVideoClassifyKit/Classes/Controller/ListViewController.m
Example/CNLiveVideoClassifyKit.xcodeproj/project.pbxproj
Example/Podfile
@@ -28,7 +28,7 @@ TODO: Add long description of the pod here.
   s.source           = { :git => 'http://bj.gitlab.cnlive.com/ios-team/CNLiveVideoClassifyKit.git', :tag => s.version.to_s }
   # s.social_media_url = 'https://twitter.com/<TWITTER_USERNAME>'
-  s.ios.deployment_target = '9.0'
+  s.ios.deployment_target = '10.0'
   s.source_files = 'CNLiveVideoClassifyKit/Classes/**/*'
@@ -45,6 +45,7 @@ TODO: Add long description of the pod here.
    s.dependency 'CNLiveBaseClass'
    s.dependency 'CNLiveUserManagement'
    s.dependency 'CNLiveCommonCategory'
+   s.dependency 'CNLiveCWebViewModule'
    s.dependency 'CNLiveTripartiteManagement/SDWebImage'
    s.dependency 'CNLiveTripartiteManagement/Masonry'
    s.dependency 'CNLiveTripartiteManagement/YYKit'
@@ -6,7 +6,8 @@
 // 分类控制器根类
 #import "CNCategoryBaseViewController.h"
-#import "ListViewController.h"
+#import "CNListViewController.h"
+
 @interface CNCategoryBaseViewController ()
@@ -37,6 +38,7 @@
     [super viewWillAppear:animated];
     self.navigationController.interactivePopGestureRecognizer.enabled = YES;
     self.navigationHidden = YES;
+    
 }
 #pragma mark - Public
@@ -65,7 +67,7 @@
 -(id<JXCategoryListContentViewDelegate>)listContainerView:(JXCategoryListContainerView *)listContainerView initListForIndex:(NSInteger)index
 {
-    ListViewController *list = [ListViewController new];
+    CNListViewController *list = [CNListViewController new];
     return list;
 }
 //
-//  ListViewController.h
+//  CNListViewController.h
 //  CNLiveVideoClassifyKit
 //
 //  Created by CNLive on 2021/8/12.
 //
 #import <UIKit/UIKit.h>
-
+#import <CNLiveBaseClass/CNLiveBaseViewController.h>
+@class CNCategoryGetChannelModel;
 NS_ASSUME_NONNULL_BEGIN
-@interface ListViewController : UIViewController<JXCategoryListContentViewDelegate>
+@interface CNListViewController : CNLiveBaseViewController<JXCategoryListContentViewDelegate>
 @property (nonatomic, copy) void (^scrollViewDidScrollBlock)(UIScrollView *);
-@property (nonatomic, copy) void (^willBeginDragging)(UIScrollView *);
-@property (nonatomic, copy) void (^didEndDragging)(UIScrollView *);
+@property (nonatomic, copy) void (^willBeginDragging)(CGFloat);
-- (void)stopScrolling;
+-(instancetype)initWithModel:(CNCategoryGetChannelModel *)model black:(BOOL)black;
 @end
 NS_ASSUME_NONNULL_END
+//
+//  CNListViewController.m
+//  CNLiveVideoClassifyKit
+//
+//  Created by CNLive on 2021/8/12.
+//
+
+#import "CNListViewController.h"
+#import <CNLiveCWebViewModule/CNLiveCWebViewModule.h>
+#import <CNLiveCWebViewModule/CNLiveSubWebViewController.h>
+#import "CNCategoryGetChannelModel.h"
+
+@interface CNListViewController ()<UIScrollViewDelegate>
+{
+    NSString *_thirdUrl;
+    NSDictionary *_paramDic;
+   
+}
+@end
+
+@implementation CNListViewController
+-(instancetype)initWithModel:(CNCategoryGetChannelModel *)model black:(BOOL)black
+{
+    self = [super init];
+    if (self) {
+        _thirdUrl = model.thirdUrl;
+        _paramDic = @{
+            @"title": model.showName,
+            @"intercept": @(YES),
+            @"isBlack":@(black)
+            
+        };
+    }
+    return self;
+}
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    self.view.backgroundColor = [UIColor whiteColor];
+    self.navigationHidden = YES;
+}
+
+-(void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context
+{
+    if ([keyPath isEqualToString:@"contentOffset"]) {
+        CGPoint oldPoint = [change[NSKeyValueChangeOldKey] CGPointValue];
+        !self.willBeginDragging ?:self.willBeginDragging(oldPoint.y);
+        UIScrollView *scrollView = (UIScrollView *)object;
+        !self.scrollViewDidScrollBlock ?: self.scrollViewDidScrollBlock(scrollView);
+        
+    }
+}
+#pragma mark - JXCategoryListContentViewDelegate
+
+/**
+ 实现 <JXCategoryListContentViewDelegate> 协议方法，返回该视图控制器所拥有的「视图」
+ */
+- (UIView *)listView {
+    CNLiveSubWebViewController *subVC = [CNLiveCWebViewModule showWebVCWithLunchForWebURL:_thirdUrl
+                                ParamDict:_paramDic ShowType:CNLiveWebViewLunchShowTypeHidden];
+    for (UIView*subView in subVC.view.subviews) {
+        if ([subView isKindOfClass:[WKWebView class]]) {
+            WKWebView *webView = (WKWebView *)subView;
+            [webView.scrollView addObserver:self forKeyPath:@"contentOffset" options:NSKeyValueObservingOptionOld  context:NULL];
+        }
+    }
+    
+    return subVC.view;
+}
+/*
+#pragma mark - Navigation
+
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+
+@end
@@ -9,8 +9,9 @@
 #import <UIKit/UIKit.h>
 #import "CNCustomChannelListView.h"
 #import "CNCategoryGetChannelModel.h"
-#import "ListViewController.h"
+#import "CNListViewController.h"
 #import "CNLiveSubSegmentController.h"
+#import <CNLiveCWebViewModule/CNLiveWebViewJumpBridge.h>
 @interface CNLiveClassifySegmentController ()<JXCategoryViewDelegate>
@@ -43,7 +44,14 @@ static CGFloat moveHeight = 50;
 - (void)viewDidLoad {
     [super viewDidLoad];
     self.topBgImgHeight = kStatusHeight+100;
-    [self.view insertSubview:self.topBgImg atIndex:0];
+    [self.view addSubview:self.topBgImg];
+    [self.view sendSubviewToBack:self.topBgImg];
+    if ([CNUserShareManager isLogin]) {
+        [self.myCategoryView addSubview:self.customChannelsBtn];
+    }else
+    {
+        [self.myCategoryView addSubview:self.loginBtn];
+    }
     for (int i = 0;i<self.imageNames.count;i++) {
         NSURL *url = [NSURL URLWithString:self.imageNames[i]];
@@ -68,59 +76,86 @@ static CGFloat moveHeight = 50;
     self.myCategoryView.cellWidthZoomEnabled = YES;
     self.myCategoryView.cellWidthZoomScale = 1.3;
     self.myCategoryView.imageSize = CGSizeMake(56, 18);
-    [self configCategoryViewWithType:JXCategoryTitleImageType_OnlyImage selectIndex:0];
+    [self updateSelectColors:0];
+    [self configCategoryViewWithType:JXCategoryTitleImageType_OnlyImage selectIndex:0 unselectIndex:0];
     self.listContainerView.translatesAutoresizingMaskIntoConstraints = NO;
-//    //增加上下滑动手势
-//    UISwipeGestureRecognizer *recognizerUp = [[UISwipeGestureRecognizer alloc] initWithTarget:self action:@selector(handleSwipeFrom:)];
-//    [recognizerUp setDirection:UISwipeGestureRecognizerDirectionUp];
-//    [self.listContainerView addGestureRecognizer:recognizerUp];
-//
-//    UISwipeGestureRecognizer *recognizerDown = [[UISwipeGestureRecognizer alloc] initWithTarget:self action:@selector(handleSwipeFrom:)];
-//    [recognizerDown setDirection:UISwipeGestureRecognizerDirectionDown];
-//    [self.listContainerView addGestureRecognizer:recognizerDown];
     // Do any additional setup after loading the view.
 }
 -(void)viewDidLayoutSubviews
 {
     [super viewDidLayoutSubviews];
-    [self.myCategoryView.heightAnchor constraintEqualToConstant:[self preferredCategoryViewHeight]].active = YES;
-    [self.myCategoryView.leftAnchor constraintEqualToAnchor:self.view.leftAnchor].active = YES;
-    [self.myCategoryView.topAnchor constraintEqualToAnchor:self.myCategoryView.topAnchor].active = YES;
-    [self.myCategoryView.rightAnchor constraintEqualToAnchor:self.view.rightAnchor].active = YES;
-    [self.myCategoryView.bottomAnchor constraintEqualToAnchor:self.listContainerView.topAnchor].active = YES;
-    [self.listContainerView.leftAnchor constraintEqualToAnchor:self.view.leftAnchor].active = YES;
-    [self.listContainerView.rightAnchor constraintEqualToAnchor:self.view.rightAnchor].active = YES;
-    CGFloat listContainerViewHeight = self.view.bounds.size.height;
-    [self.listContainerView.heightAnchor constraintEqualToConstant:listContainerViewHeight].active = YES;
+    self.listContainerView.frame = CGRectMake(0,self.myCategoryView.bottom, kScreenWidth, self.view.height -kStatusHeight);
+    if ([CNUserShareManager isLogin]) {
+        self.myCategoryView.width =  kScreenWidth - 45;
+        self.customChannelsBtn.centerY = self.myCategoryView.height/2;
+        self.customChannelsBtn.right = kScreenWidth - 18;
+    }else
+    {
+        self.myCategoryView.width = kScreenWidth - 70;
+        self.loginBtn.centerY = self.myCategoryView.height/2;
+        self.loginBtn.right = kScreenWidth - 11;
+    }
 }
 -(void)viewDidAppear:(BOOL)animated
 {
     [super viewDidAppear:animated];
+    
 }
+-(void)viewDidDisappear:(BOOL)animated
+{
+    [super viewDidDisappear: animated];
+
+}
+
+
 -(UIStatusBarStyle)preferredStatusBarStyle
 {
     if (self.currentAtatusColor.intValue == 0) {
+        self.customChannelsBtn.selected = YES;
         return UIStatusBarStyleLightContent;
     }else
     {
+        self.customChannelsBtn.selected = NO;
         return UIStatusBarStyleDefault;
     }
 }
-#pragma mark - Method
+#pragma mark - Action
+// 点击定制频道按钮进入定制
+- (void)customAction:(UIButton *)sender {
+    
+}
+// 登录
+- (void)loginAction:(UIButton *)sender {
+    
+}
+#pragma mark - Method
+-(void)updateSelectColors:(NSInteger)index
+{
+    NSString *backgroundImage = [self.bgImages safetyObjectAtIndex:index];
+    [self.topBgImg sd_setImageWithURL:[NSURL URLWithString:backgroundImage]];
+    NSString *backgroundColor = [self.bgColors safetyObjectAtIndex:index];
+    self.topBgImg.backgroundColor = CNLiveColorWithHexString(backgroundColor);
+    self.myCategoryView.titleColor = self.textColors[index];
+    self.myCategoryView.titleSelectedColor = self.textColorSeleteds[index];
+    if (!self.currentAtatusColor || ![self.currentAtatusColor isEqualToString:self.statusBarColors[index]] ) {
+        self.currentAtatusColor = self.statusBarColors[index];
+        [self setNeedsStatusBarAppearanceUpdate];
+    }
+}
 //配置选中状态显示图片，未选中展示文字
-- (void)configCategoryViewWithType:(JXCategoryTitleImageType)imageType selectIndex:(NSInteger)index
+- (void)configCategoryViewWithType:(JXCategoryTitleImageType)imageType selectIndex:(NSInteger)index unselectIndex:(NSInteger)unIndex
 {
         NSMutableArray *types = [NSMutableArray array];
         for (int i = 0; i < self.titles.count; i ++) {
-            if (i == index) {
+            if (i == index || i == unIndex) {
                 NSURL *url = self.imageNames[i];
                 NSString *str = [url absoluteString];
                 if ([str isEqual:@""]) {
@@ -132,17 +167,7 @@ static CGFloat moveHeight = 50;
             [types addObject:@(JXCategoryTitleImageType_OnlyTitle)];
             }
         }
-    NSString *backgroundImage = [self.bgImages safetyObjectAtIndex:index];
-    [self.topBgImg sd_setImageWithURL:[NSURL URLWithString:backgroundImage]];
-    NSString *backgroundColor = [self.bgColors safetyObjectAtIndex:index];
-    self.topBgImg.backgroundColor = CNLiveColorWithHexString(backgroundColor);
-    self.myCategoryView.titleColor = self.textColors[index];
-    self.myCategoryView.titleSelectedColor = self.textColorSeleteds[index];
     self.myCategoryView.imageTypes = types;
-    if (!self.currentAtatusColor || ![self.currentAtatusColor isEqualToString:self.statusBarColors[index]] ) {
-        self.currentAtatusColor = self.statusBarColors[index];
-        [self setNeedsStatusBarAppearanceUpdate];
-    }
     for (int i = 0; i < self.titles.count; i ++) {
     [self.myCategoryView reloadCellAtIndex:i];
     }
@@ -201,30 +226,47 @@ static CGFloat moveHeight = 50;
     }
 }
 - (void)listScrollViewDidScroll:(UIScrollView *)scrollView {
-    CGPoint point = CGPointZero;
-    CGFloat offsetY = 0;
-    if (scrollView.contentOffset.y <= 0 && self.myCategoryView.frame.origin.y != kStatusHeight) {
-        point = [scrollView.panGestureRecognizer translationInView:scrollView];
-        offsetY = point.y - self.lastOffsetY;
-    }else {
-        if ((scrollView.contentOffset.y < 0 && self.myCategoryView.frame.origin.y == kStatusHeight) || scrollView.contentOffset.y + scrollView.bounds.size.height >= scrollView.contentSize.height) {
-            return;
+    CGPoint point = scrollView.contentOffset;
+    CGFloat offsetY = point.y - self.lastOffsetY;
+
+    [self scrollViewUpDowm:offsetY>0?YES:NO];
+}
+-(void)scrollViewUpDowm:(BOOL)isUp
+{
+    [UIView animateWithDuration:0.3 animations:^{
+        if (isUp) {
+            [self scrollViewUp];
+        }else
+        {
+            [self scrollViewDown];
         }
-        point = scrollView.contentOffset;
-        offsetY = -(point.y - self.lastOffsetY);
-    }
+        if ([CNUserShareManager isLogin]) {
+            self.customChannelsBtn.centerY = self.myCategoryView.collectionView.centerY;
+        }else
+        {
+            self.loginBtn.centerY = self.myCategoryView.collectionView.centerY;
+        }
+    }];
+}
-    if (self.lastOffsetY == 0) {
-        self.lastOffsetY = point.y;
+-(void)scrollViewUp{
+    if (self.topBgImg.top<0) {
         return;
     }
-    CGRect naviBarFrame = self.myCategoryView.frame;
-    naviBarFrame.origin.y += offsetY;
-    naviBarFrame.origin.y = MAX(-[self preferredCategoryViewHeight], MIN(kStatusHeight, naviBarFrame.origin.y));
-    self.myCategoryView.frame = naviBarFrame;
-    double percent = (naviBarFrame.origin.y + [self preferredCategoryViewHeight])/[self preferredCategoryViewHeight];
-    self.myCategoryView.alpha = percent;
-    self.lastOffsetY = point.y;
+    [self managerScrollView:YES];
+    self.topBgImg.top -= moveHeight;
+    self.myCategoryView.collectionView.top = -50-kStatusHeight;
+    self.listContainerView.top = kStatusHeight;
+}
+-(void)scrollViewDown{
+    if (self.topBgImg.top==0) {
+        return;
+    }
+    [self managerScrollView:NO];
+    self.topBgImg.top += moveHeight;
+    self.myCategoryView.collectionView.top = 0;
+    self.listContainerView.top = self.myCategoryView.bottom;
+
 }
 -(void)managerScrollView:(BOOL)enabled
@@ -243,21 +285,34 @@ static CGFloat moveHeight = 50;
     }
 }
 #pragma mark - JXCategoryViewDelegate
+// 正在滚动中的回调，这里调整背景图片的 alpha 透明度
+- (void)categoryView:(JXCategoryBaseView *)categoryView scrollingFromLeftIndex:(NSInteger)leftIndex toRightIndex:(NSInteger)rightIndex ratio:(CGFloat)ratio {
+    [self configCategoryViewWithType:JXCategoryTitleImageType_OnlyImage selectIndex:leftIndex unselectIndex:rightIndex];
+}
+
 - (void)categoryView:(JXCategoryBaseView *)categoryView didSelectedItemAtIndex:(NSInteger)index {
     NSLog(@"%@", NSStringFromSelector(_cmd));
     self.currentIndex = index;
     // 侧滑手势处理
     self.navigationController.interactivePopGestureRecognizer.enabled = (index == 0);
-    [self configCategoryViewWithType:JXCategoryTitleImageType_OnlyImage selectIndex:index];
+    [self updateSelectColors:index];
+    [self configCategoryViewWithType:JXCategoryTitleImageType_OnlyImage selectIndex:index unselectIndex:index];
 }
 #pragma mark - JXCategoryListContainerViewDelegate
 -(id<JXCategoryListContentViewDelegate>)listContainerView:(JXCategoryListContainerView *)listContainerView initListForIndex:(NSInteger)index
 {
     CNCategoryGetChannelModel *model = self.dataArray[index];
+    BOOL isBlack = NO;
+    if (CNLiveStringIsEmpty(model.statusBarColor)) {
+        isBlack = YES;
+    } else {
+        isBlack = [model.statusBarColor boolValue];//1 黑色
+    }
     if (model.pageStyleList.count>0) {
         self.topBgImg.frame = CGRectMake(0, 0, KScreenWidth, self.topBgImgHeight);
         CNLiveSubSegmentController *subVC = [[CNLiveSubSegmentController alloc] initWithModel:model];
+        subVC.isBlack = isBlack;
         weakself
         subVC.scrollViewDidScrollBlock = ^(UIScrollView * _Nonnull scrollView) {
             [weakSelf listScrollViewDidScroll:scrollView];
@@ -265,13 +320,17 @@ static CGFloat moveHeight = 50;
         subVC.willBeginDragging = ^(CGFloat lastOffsetY) {
             weakSelf.lastOffsetY = lastOffsetY;
         };
-        subVC.didEndDragging = ^(CGFloat lastOffsetY) {
-            weakSelf.lastOffsetY = lastOffsetY;
-        };
         return subVC;
     }
     self.topBgImg.frame = CGRectMake(0, 0, KScreenWidth, self.topBgImgHeight - 50);
-    ListViewController *list = [ListViewController new];
+    CNListViewController *list = [[CNListViewController alloc] initWithModel:model black:isBlack];
+    weakself
+    list.scrollViewDidScrollBlock = ^(UIScrollView * _Nonnull scrollView) {
+        [weakSelf listScrollViewDidScroll:scrollView];
+    };
+    list.willBeginDragging = ^(CGFloat lastOffsetY) {
+        weakSelf.lastOffsetY = lastOffsetY;
+    };
     return list;
 }
 #pragma mark - Public
@@ -11,10 +11,12 @@
 NS_ASSUME_NONNULL_BEGIN
 @interface CNLiveSubSegmentController : CNCategoryBaseViewController<JXCategoryListContentViewDelegate>
+
+@property (nonatomic, assign) BOOL                      isBlack;
+
 -(instancetype)initWithModel:(CNCategoryGetChannelModel *)model;
 @property (nonatomic, copy) void (^scrollViewDidScrollBlock)(UIScrollView *);
 @property (nonatomic, copy) void (^willBeginDragging)(CGFloat );
-@property (nonatomic, copy) void (^didEndDragging)(CGFloat );
 //- (void)stopScrolling;
@@ -7,11 +7,11 @@
 #import "CNLiveSubSegmentController.h"
 #import "CNCategoryGetChannelModel.h"
-#import "ListViewController.h"
+#import "CNListViewController.h"
 @interface CNLiveSubSegmentController ()
 @property (nonatomic, strong)JXCategoryTitleView *myCategoryView;
-@property (nonatomic, strong)NSArray *pageListArr;
+@property (nonatomic, strong)NSArray<CNCategoryGetChannelModel*> *pageListArr;
 @property (nonatomic, strong)UIColor *textColor;
 @property (nonatomic, strong)UIColor *backgroundColor;
 @property (nonatomic, strong)NSString *backImage;
@@ -93,16 +93,14 @@
 -(id<JXCategoryListContentViewDelegate>)listContainerView:(JXCategoryListContainerView *)listContainerView initListForIndex:(NSInteger)index
 {
-    ListViewController *list = [ListViewController new];
+    CNCategoryGetChannelModel *model = self.pageListArr[index];
+    CNListViewController *list = [[CNListViewController alloc] initWithModel:model black:self.isBlack];
     weakself
     list.scrollViewDidScrollBlock = ^(UIScrollView * _Nonnull scrollView) {
-        weakSelf.scrollViewDidScrollBlock(scrollView);
+        !weakSelf.scrollViewDidScrollBlock ?: weakSelf.scrollViewDidScrollBlock(scrollView);
     };
-    list.willBeginDragging = ^(UIScrollView * _Nonnull scrollView) {
-        weakSelf.willBeginDragging(0);
-    };
-    list.didEndDragging = ^(UIScrollView * _Nonnull scrollView) {
-        weakSelf.didEndDragging(0);
+    list.willBeginDragging = ^(CGFloat lastOffsetY) {
+        !weakSelf.willBeginDragging ?: weakSelf.willBeginDragging(lastOffsetY);
     };
     return list;
 }
-//
-//  ListViewController.m
-//  CNLiveVideoClassifyKit
-//
-//  Created by CNLive on 2021/8/12.
-//
-
-#import "ListViewController.h"
-
-@interface ListViewController ()<UITableViewDataSource, UITableViewDelegate>
-@property (nonatomic, strong) UITableView *tableView;
-@end
-
-@implementation ListViewController
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    self.view.backgroundColor = [UIColor whiteColor];
-    self.tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain];
-    if (@available(iOS 11.0, *)) {
-        if ([self.tableView respondsToSelector:@selector(setContentInsetAdjustmentBehavior:)]) {
-            self.tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
-        }
-    }
-    self.tableView.dataSource = self;
-    self.tableView.delegate = self;
-    [self.tableView registerClass:[UITableViewCell class] forCellReuseIdentifier:@"cell"];
-    [self.view addSubview:self.tableView];
-    // Do any additional setup after loading the view.
-}
-- (void)viewDidLayoutSubviews {
-    [super viewDidLayoutSubviews];
-
-    self.tableView.frame = self.view.bounds;
-}
-- (void)stopScrolling {
-    [self.tableView setContentOffset:self.tableView.contentOffset animated:NO];
-}
-- (nonnull UITableViewCell *)tableView:(nonnull UITableView *)tableView cellForRowAtIndexPath:(nonnull NSIndexPath *)indexPath {
-    UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"cell" forIndexPath:indexPath];
-    cell.textLabel.text = [NSString stringWithFormat:@"row:%ld", indexPath.row];
-    return cell;
-}
-
-- (NSInteger)tableView:(nonnull UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-    return 100;
-}
-
-- (void)scrollViewDidScroll:(UIScrollView *)scrollView {
-    !self.scrollViewDidScrollBlock ?: self.scrollViewDidScrollBlock(scrollView);
-}
-
-- (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView {
-    !self.willBeginDragging ?: self.willBeginDragging(scrollView);
-}
-
-- (void)scrollViewDidEndDragging:(UIScrollView *)scrollView willDecelerate:(BOOL)decelerate {
-    !self.didEndDragging ?: self.didEndDragging(scrollView);
-}
-#pragma mark - JXCategoryListContentViewDelegate
-
-/**
- 实现 <JXCategoryListContentViewDelegate> 协议方法，返回该视图控制器所拥有的「视图」
- */
-- (UIView *)listView {
-    return self.view;
-}
-/*
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
-    // Get the new view controller using [segue destinationViewController].
-    // Pass the selected object to the new view controller.
-}
-*/
-
-@end
@@ -358,16 +358,21 @@
 				"${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveBaseClass/CNLiveBaseClass.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveBaseKit/CNLiveBaseKit.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveBusinessTools/CNLiveBusinessTools.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveCWebViewModule/CNLiveCWebViewModule.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCategory/CNLiveCategory.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCustomControl/CNLiveCustomControl.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveCustomUI/CNLiveCustomUI.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveVideoClassifyKit/CNLiveVideoClassifyKit.framework",
+				"${BUILT_PRODUCTS_DIR}/FWDebug/FWDebug.framework",
 				"${BUILT_PRODUCTS_DIR}/JXCategoryView/JXCategoryView.framework",
 				"${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework",
+				"${BUILT_PRODUCTS_DIR}/MJRefresh/MJRefresh.framework",
 				"${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework",
 				"${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework",
 				"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
@@ -379,16 +384,21 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseClass.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseKit.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessTools.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCWebViewModule.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCategory.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomControl.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomUI.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveVideoClassifyKit.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FWDebug.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JXCategoryView.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJRefresh.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
 use_frameworks!
-platform :ios, '9.0'
+platform :ios, '10.0'
 source 'https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git'
 source 'http://bj.gitlab.cnlive.com/ios-team/CNLiveRepos.git'
 #source 'http://bj.gitlab.cnlive.com/DSIOSTeam/DSSpecRepos.git'
@@ -8,6 +8,8 @@ target &#39;CNLiveVideoClassifyKit_Example&#39; do
   pod 'CNLiveVideoClassifyKit', :path => '../'
   pod 'CNLiveEnvironment'
   pod 'CNLiveRequestBastKit'
+  pod 'CNLiveCWebViewModule'
+  pod 'FWDebug', :configurations => ['Debug']
   #依赖三方私有库,如果里面有.a的时候加上这个
   pre_install do |installer| Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {}
     ############################################  #删除WebViewJavascriptBridge中的WebViewJavascriptBridge.h和WebViewJavascriptBridge.m文件