no message

yanglingyu
1 parent b081d723
Showing 12 changed files with 135 additions and 4 deletions
CNLiveVideoClassifyKit.podspec
CNLiveVideoClassifyKit/Assets/CNSegmentControl.bundle/ClassifySearch@2x.png
CNLiveVideoClassifyKit/Assets/CNSegmentControl.bundle/ClassifySearch@3x.png
CNLiveVideoClassifyKit/Assets/CNSegmentControl.bundle/ClassifySearchBlack@2x.png
CNLiveVideoClassifyKit/Assets/CNSegmentControl.bundle/ClassifySearchBlack@3x.png
CNLiveVideoClassifyKit/Classes/Category/UIImage+AdBundleImage.h
CNLiveVideoClassifyKit/Classes/Category/UIImage+AdBundleImage.m
CNLiveVideoClassifyKit/Classes/Controller/CNListViewController.m
CNLiveVideoClassifyKit/Classes/Controller/CNLiveClassifySegmentController.m
CNLiveVideoClassifyKit/Classes/Controller/CNLiveSubSegmentController.h
CNLiveVideoClassifyKit/Classes/Controller/CNLiveSubSegmentController.m
CNLiveVideoClassifyKit/Classes/Header/CNLivevideoClassifyPCH.h
@@ -49,5 +49,6 @@ TODO: Add long description of the pod here.
    s.dependency 'CNLiveTripartiteManagement/SDWebImage'
    s.dependency 'CNLiveTripartiteManagement/Masonry'
    s.dependency 'CNLiveTripartiteManagement/YYKit'
+   s.dependency 'CNLiveTripartiteManagement/QMUIKit'
 end
+//
+//  UIImage+AdBundleImage.h
+//  CNLiveVideoClassifyKit
+//
+//  Created by CNLive on 2021/9/7.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface UIImage (AdBundleImage)
+
++(UIImage *)loadBundleImage:(NSString *)imageName;
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  UIImage+AdBundleImage.m
+//  CNLiveVideoClassifyKit
+//
+//  Created by CNLive on 2021/9/7.
+//
+
+#import "UIImage+AdBundleImage.h"
+#import "CNCategoryBaseViewController.h"
+
+@implementation UIImage (AdBundleImage)
++(UIImage *)loadBundleImage:(NSString *)imageName{
+
+    // 获取当前的bundle,self只是在当前pod库中的一个类，也可以随意写一个其他的类
+    NSBundle *currentBundle = [NSBundle bundleForClass:[CNCategoryBaseViewController class]];
+    // 获取屏幕pt和px之间的比例
+    NSInteger scale = [UIScreen mainScreen].scale;
+    NSString *imagefailName = [NSString stringWithFormat:@"%@@%zdx.png",imageName,scale];
+    // 获取图片的路径,其中BMCH5WebView是组件名
+    NSString *imagePath = [currentBundle pathForResource:imagefailName ofType:nil inDirectory:[NSString stringWithFormat:@"%@.bundle",@"CNSegmentControl"]];
+    // 获取图片
+    return [UIImage imageWithContentsOfFile:imagePath];
+}
+@end
@@ -14,6 +14,7 @@
 {
     NSString *_thirdUrl;
     NSDictionary *_paramDic;
+    CNLiveSubWebViewController *subVC;
 }
 @end
@@ -38,6 +39,16 @@
     self.view.backgroundColor = [UIColor whiteColor];
     self.navigationHidden = YES;
 }
+-(void)dealloc
+{
+    for (UIView*subView in subVC.view.subviews) {
+        if ([subView isKindOfClass:[WKWebView class]]) {
+            WKWebView *webView = (WKWebView *)subView;
+            [webView.scrollView removeObserver:self forKeyPath:@"contentOffset"];
+        }
+    }
+    
+}
 -(void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context
 {
@@ -55,7 +66,7 @@
  实现 <JXCategoryListContentViewDelegate> 协议方法，返回该视图控制器所拥有的「视图」
  */
 - (UIView *)listView {
-    CNLiveSubWebViewController *subVC = [CNLiveCWebViewModule showWebVCWithLunchForWebURL:_thirdUrl
+    subVC = [CNLiveCWebViewModule showWebVCWithLunchForWebURL:_thirdUrl
                                 ParamDict:_paramDic ShowType:CNLiveWebViewLunchShowTypeHidden];
     for (UIView*subView in subVC.view.subviews) {
         if ([subView isKindOfClass:[WKWebView class]]) {
@@ -273,6 +273,8 @@ static CGFloat moveHeight = 50;
 {
     for (UIView *view in self.listContainerView.scrollView.subviews) {
         if ([view.viewController isKindOfClass:[CNLiveSubSegmentController class]]) {
+            CNLiveSubSegmentController *subVc = view.viewController;
+            [subVc layoutRightSubViewWithShow:!enabled];
             for (UIView *subView in view.subviews) {
                 if ([subView isKindOfClass:[JXCategoryListContainerView class]]) {
                     JXCategoryListContainerView *titleView = (JXCategoryListContainerView *)subView;
@@ -18,7 +18,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) void (^scrollViewDidScrollBlock)(UIScrollView *);
 @property (nonatomic, copy) void (^willBeginDragging)(CGFloat );
-//- (void)stopScrolling;
+// 一级频道显示隐藏时二级频道右侧的搜索按钮变宽变窄控制
+- (void)layoutRightSubViewWithShow:(BOOL)show;
 @end
@@ -11,6 +11,8 @@
 @interface CNLiveSubSegmentController ()
 @property (nonatomic, strong)JXCategoryTitleView *myCategoryView;
+@property (nonatomic, strong) QMUIButton              *searchBtn;
+
 @property (nonatomic, strong)NSArray<CNCategoryGetChannelModel*> *pageListArr;
 @property (nonatomic, strong)UIColor *textColor;
 @property (nonatomic, strong)UIColor *backgroundColor;
@@ -47,6 +49,8 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
+    // 添加二级频道右侧的搜索按钮
+    [self.view addSubview:self.searchBtn];
     self.view.backgroundColor = [UIColor clearColor];
     self.myCategoryView.titles = self.titles;
     if (CNLiveStringIsEmpty(self.backImage)) {
@@ -69,9 +73,13 @@
 -(void)viewDidLayoutSubviews
 {
     [super viewDidLayoutSubviews];
-    
-    self.categoryView.frame = CGRectMake(0, 0, self.view.bounds.size.width, [self preferredCategoryViewHeight]);
+    self.searchBtn.frame = CGRectMake(0, 0, 66, 30);
+    self.searchBtn.right = KScreenWidth-12;
+    self.searchBtn.centerY = self.myCategoryView.height/2;
+    self.myCategoryView.top = 0;
+    self.myCategoryView.width = self.searchBtn.left;
     self.listContainerView.frame = CGRectMake(0, [self preferredCategoryViewHeight]+10, self.view.bounds.size.width, self.view.bounds.size.height - [self preferredCategoryViewHeight]);
+    
 }
 #pragma mark - Method
 -(void)handleDateWithChannelsArray{
@@ -81,6 +89,47 @@
         [self.titles addObject:model.name];
     }
 }
+// 一级频道显示隐藏时二级频道右侧的搜索按钮变宽变窄控制
+- (void)layoutRightSubViewWithShow:(BOOL)show {
+    
+    if (show) {
+        // 正常
+        [UIView animateWithDuration:0.3 animations:^{
+            
+            self.searchBtn.width = 66;
+            self.searchBtn.right = KScreenWidth-12;
+            [self.searchBtn setTitle:@"搜索" forState:UIControlStateNormal];
+            
+//            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;
+        }];
+    } else {
+        // 变窄
+        [UIView animateWithDuration:0.3 animations:^{
+            
+            
+
+            self.searchBtn.width = 30;
+            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;
+//            }
+            self.myCategoryView.width = self.searchBtn.left;
+        }];
+    }
+}
+
 #pragma mark - Public
 -(JXCategoryTitleView *)preferredCategoryView{
     return [[JXCategoryTitleView alloc] init];
@@ -119,6 +168,30 @@
     return (JXCategoryTitleView *)self.categoryView;
 }
+- (QMUIButton *)searchBtn {
+    if (!_searchBtn) {
+        _searchBtn = [QMUIButton buttonWithType:UIButtonTypeCustom];
+        [_searchBtn setTitle:@"搜索" forState:UIControlStateNormal];
+        _searchBtn.titleLabel.font = [UIFont systemFontOfSize:14.0];
+        if (self.isBlack) {
+            _searchBtn.backgroundColor = RGBA(245, 245, 245, 0.3);
+            [_searchBtn setTitleColor:KGray153Color forState:UIControlStateNormal];
+            [_searchBtn setImage:[UIImage loadBundleImage:@"ClassifySearchBlack"] forState:UIControlStateNormal];
+        }else
+        {
+            _searchBtn.backgroundColor = RGBA(249, 249, 249, 0.14);
+            [_searchBtn setTitleColor:kWhiteColor forState:UIControlStateNormal];
+            [_searchBtn setImage:[UIImage loadBundleImage:@"ClassifySearch"] forState:UIControlStateNormal];
+        }
+        _searchBtn.imagePosition = QMUIButtonImagePositionLeft;
+        _searchBtn.spacingBetweenImageAndTitle = 5;
+        _searchBtn.layer.cornerRadius = 15;
+        _searchBtn.layer.masksToBounds = YES;
+        [_searchBtn addTarget:self action:@selector(searchAction:) forControlEvents:UIControlEventTouchUpInside];
+    }
+    return _searchBtn;
+}
+
 /*
 #pragma mark - Navigation
@@ -19,6 +19,8 @@
 #import <CNLiveCommonCategory/UIColor+CNLiveExtension.h>
 #import <MJExtension/MJExtension.h>
 #import "CNLiveCommonDefines.h"
+#import <QMUIKit/QMUIKit.h>
+#import "UIImage+AdBundleImage.h"
 #endif /* CNLivevideoClassifyPCH_h */