no message

yanglingyu
1 parent a59f0ce2
Showing 10 changed files with 211 additions and 53 deletions
CNLiveVideoClassifyKit/Classes/Controller/CNLiveClassifySegmentController.m
CNLiveVideoClassifyKit/Classes/Controller/CNLiveSubSegmentController.h
CNLiveVideoClassifyKit/Classes/Controller/CNLiveSubSegmentController.m
CNLiveVideoClassifyKit/Classes/Manager/CNLiveListManager.h
CNLiveVideoClassifyKit/Classes/Manager/CNLiveListManager.m
CNLiveVideoClassifyKit/Classes/Manager/CNLiveVideoClassifyProtocol.h
Example/CNLiveVideoClassifyKit.xcodeproj/project.pbxproj
Example/CNLiveVideoClassifyKit/CNLiveWebViewModuleImpl.h
Example/CNLiveVideoClassifyKit/CNLiveWebViewModuleImpl.m
Example/CNLiveVideoClassifyKit/CNTools.m
@@ -399,12 +399,6 @@ static CGFloat moveHeight = 50;
         }
     }
 }
-- (void)listScrollViewDidScroll:(UIScrollView *)scrollView {
-    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:^{
@@ -535,23 +529,19 @@ static CGFloat moveHeight = 50;
         CNLiveSubSegmentController *subVC = [[CNLiveSubSegmentController alloc] initWithModel:model];
         subVC.isBlack = isBlack;
         weakself
-        subVC.scrollViewDidScrollBlock = ^(UIScrollView * _Nonnull scrollView) {
-            [weakSelf listScrollViewDidScroll:scrollView];
-        };
-        subVC.willBeginDragging = ^(CGFloat lastOffsetY) {
-            weakSelf.lastOffsetY = lastOffsetY;
+        subVC.scrollViewDidScrollBlock = ^(BOOL isUp) {
+            [self scrollViewUpDowm:isUp];
         };
+
         return subVC;
     }
     self.topBgImg.frame = CGRectMake(0, 0, KScreenWidth, self.topBgImgHeight - 50);
-    CNLiveListManager *list = [[CNLiveListManager alloc] initWithModel:model black:isBlack];
+    CNLiveListManager *list = [[CNLiveListManager shareListManager] model:model black:isBlack];
     weakself
-    list.scrollViewDidScrollBlock = ^(UIScrollView * _Nonnull scrollView) {
-        [weakSelf listScrollViewDidScroll:scrollView];
-    };
-    list.willBeginDragging = ^(CGFloat lastOffsetY) {
-        weakSelf.lastOffsetY = lastOffsetY;
+    list.scrollViewDidScrollBlock = ^(BOOL isUp) {
+        [self scrollViewUpDowm:isUp];
     };
+
     return list;
 }
 #pragma mark - Public
@@ -15,8 +15,7 @@ NS_ASSUME_NONNULL_BEGIN
 @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 (^scrollViewDidScrollBlock)(BOOL isUp);
 // 一级频道显示隐藏时二级频道右侧的搜索按钮变宽变窄控制
 - (void)layoutRightSubViewWithShow:(BOOL)show;
@@ -140,14 +140,12 @@
 -(id<JXCategoryListContentViewDelegate>)listContainerView:(JXCategoryListContainerView *)listContainerView initListForIndex:(NSInteger)index
 {
     CNCategoryGetChannelModel *model = self.pageListArr[index];
-    CNLiveListManager *list = [[CNLiveListManager alloc] initWithModel:model black:self.isBlack];
+    CNLiveListManager *list = [[CNLiveListManager shareListManager] model:model black:isBlack];
     weakself
-    list.scrollViewDidScrollBlock = ^(UIScrollView * _Nonnull scrollView) {
-        !weakSelf.scrollViewDidScrollBlock ?: weakSelf.scrollViewDidScrollBlock(scrollView);
-    };
-    list.willBeginDragging = ^(CGFloat lastOffsetY) {
-        !weakSelf.willBeginDragging ?: weakSelf.willBeginDragging(lastOffsetY);
-    };
+    list.scrollViewDidScrollBlock = ^(BOOL isUp) {
+        !weakSelf.scrollViewDidScrollBlock ?: weakSelf.scrollViewDidScrollBlock(isUp);
+    }};
+
     return list;
 }
 #pragma mark - JXCategoryListContentViewDelegate
@@ -11,10 +11,13 @@
 NS_ASSUME_NONNULL_BEGIN
 @interface CNLiveListManager : NSObject<JXCategoryListContentViewDelegate>
-@property (nonatomic, copy) void (^scrollViewDidScrollBlock)(UIScrollView *);
-@property (nonatomic, copy) void (^willBeginDragging)(CGFloat);
+@property (nonatomic, copy) void (^scrollViewDidScrollBlock)(BOOL isUp);
--(instancetype)initWithModel:(CNCategoryGetChannelModel *)model black:(BOOL)black;
++(instancetype)shareListManager;
+
+-(void)model:(CNCategoryGetChannelModel *)model black:(BOOL)black;
+
+- (void)requestWebViewForScrollView:(nonnull UIScrollView *)scrollView isBeginDragging:(BOOL)isBeginDragging;
 @end
 NS_ASSUME_NONNULL_END
@@ -10,29 +10,37 @@
 #import <CNLiveCWebViewModule/CNLiveCWebViewModule.h>
 #import <CNLiveCWebViewModule/CNLiveSubWebViewController.h>
-@interface CNLiveListManager()<UIScrollViewDelegate>
+@interface CNLiveListManager()
 {
-    NSDictionary *_paramDic;
+    BOOL _black;
     CNCategoryGetChannelModel *_model;
 }
 @end
 @implementation CNLiveListManager
--(instancetype)initWithModel:(CNCategoryGetChannelModel *)model black:(BOOL)black
+
++(instancetype)shareListManager
 {
-    self = [super init];
-    if (self) {
-        _model = model;
-        _paramDic = @{
-            @"title": model.showName,
-            @"intercept": @(YES),
-            @"isBlack":@(black)
-            
-        };
-    }
-    return self;
+    static dispatch_once_t onceToken;
+    static CNLiveListManager *manager = nil;
+    dispatch_once(&onceToken, ^{
+        manager = [[CNLiveListManager alloc] init];
+    });
+    return manager;
 }
+
+-(void)model:(CNCategoryGetChannelModel *)model black:(BOOL)black
+{
+    _model = model;
+    _black = black;
+}
+- (void)requestWebViewForScrollView:(nonnull UIScrollView *)scrollView isBeginDragging:(BOOL)isBeginDragging
+{
+    
+}
+
+
 #pragma mark - JXCategoryListContentViewDelegate
 /**
@@ -40,16 +48,28 @@
  */
 - (UIView *)listView {
     if ([_model.pageType isEqualToString:@"4"] || [_model.pageType isEqualToString:@"5"]){
-        
+        Class class = NSClassFromString(@"CNAmuseChinaViewController");
+        QMUICommonViewController *vc = [class new];
+        SEL black = NSSelectorFromString(@"setIsBlack");
+//        SEL bgColor = NSSelectorFromString(@"setBgColor");
+//        SEL title = NSSelectorFromString(@"setTitle");
+//        SEL backgroundImg = NSSelectorFromString(@"setBackgroundImg");
+//        SEL channelId = NSSelectorFromString(@"setChannelId");
+//        SEL channelName = NSSelectorFromString(@"setChannelName");
+//        SEL pageId = NSSelectorFromString(@"setPageId");
+//        SEL delegate = NSSelectorFromString(@"setDelegate");
+        [vc performSelector:black withObject:_model.statusBarColor];
+        return vc.view;
     }
+    NSDictionary * paramDic= @{
+        @"title": model.showName,
+        @"intercept": @(YES),
+        @"isBlack":@(black)
+        
+    };
     CNLiveSubWebViewController *subVC = [CNLiveCWebViewModule showWebVCWithLunchForWebURL:_model.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];
-//        }
-//    }
+                                ParamDict:paramDic ShowType:CNLiveWebViewLunchShowTypeHidden];
+    
     return subVC.view;
 }
@@ -7,7 +7,6 @@
 /* CNLiveVideoClassifyProtocol_h */
 //
-#imp
 /**
  *与主工程交互
  */
@@ -9,6 +9,7 @@
 /* Begin PBXBuildFile section */
 		083CB9C326D4ED2000E21EBC /* CNliveCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 0816338E26BE298900B076D6 /* CNliveCollectionViewCell.m */; };
 		08DAFBDE26E8A2660099999A /* CNTools.m in Sources */ = {isa = PBXBuildFile; fileRef = 08DAFBDC26E8A2660099999A /* CNTools.m */; };
+		08DAFBE326E9B63F0099999A /* CNLiveWebViewModuleImpl.m in Sources */ = {isa = PBXBuildFile; fileRef = 08DAFBE226E9B63F0099999A /* CNLiveWebViewModuleImpl.m */; };
 		14963F4E510A1E5865D15ED8 /* Pods_CNLiveVideoClassifyKit_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7743536FE5FB6796BFAA55B5 /* Pods_CNLiveVideoClassifyKit_Tests.framework */; };
 		6003F58E195388D20070C39A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58D195388D20070C39A /* Foundation.framework */; };
 		6003F590195388D20070C39A /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58F195388D20070C39A /* CoreGraphics.framework */; };
@@ -43,6 +44,8 @@
 		0816338E26BE298900B076D6 /* CNliveCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CNliveCollectionViewCell.m; sourceTree = "<group>"; };
 		08DAFBDC26E8A2660099999A /* CNTools.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNTools.m; sourceTree = "<group>"; };
 		08DAFBDD26E8A2660099999A /* CNTools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNTools.h; sourceTree = "<group>"; };
+		08DAFBE126E9B63F0099999A /* CNLiveWebViewModuleImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLiveWebViewModuleImpl.h; sourceTree = "<group>"; };
+		08DAFBE226E9B63F0099999A /* CNLiveWebViewModuleImpl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNLiveWebViewModuleImpl.m; sourceTree = "<group>"; };
 		24BF123CDE580DC9CCCE1718 /* Pods-CNLiveVideoClassifyKit_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CNLiveVideoClassifyKit_Example.release.xcconfig"; path = "Target Support Files/Pods-CNLiveVideoClassifyKit_Example/Pods-CNLiveVideoClassifyKit_Example.release.xcconfig"; sourceTree = "<group>"; };
 		3A8AB8DB19B4EF9ACF33573D /* Pods-CNLiveVideoClassifyKit_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CNLiveVideoClassifyKit_Tests.release.xcconfig"; path = "Target Support Files/Pods-CNLiveVideoClassifyKit_Tests/Pods-CNLiveVideoClassifyKit_Tests.release.xcconfig"; sourceTree = "<group>"; };
 		5793570C0C400C4B3B4942CE /* Pods-CNLiveVideoClassifyKit_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CNLiveVideoClassifyKit_Example.debug.xcconfig"; path = "Target Support Files/Pods-CNLiveVideoClassifyKit_Example/Pods-CNLiveVideoClassifyKit_Example.debug.xcconfig"; sourceTree = "<group>"; };
@@ -147,6 +150,8 @@
 				0816338E26BE298900B076D6 /* CNliveCollectionViewCell.m */,
 				08DAFBDD26E8A2660099999A /* CNTools.h */,
 				08DAFBDC26E8A2660099999A /* CNTools.m */,
+				08DAFBE126E9B63F0099999A /* CNLiveWebViewModuleImpl.h */,
+				08DAFBE226E9B63F0099999A /* CNLiveWebViewModuleImpl.m */,
 				71719F9D1E33DC2100824A3D /* LaunchScreen.storyboard */,
 				6003F5A8195388D20070C39A /* Images.xcassets */,
 				6003F594195388D20070C39A /* Supporting Files */,
@@ -428,6 +433,7 @@
 				6003F59E195388D20070C39A /* CNLIVEAppDelegate.m in Sources */,
 				6003F5A7195388D20070C39A /* CNLIVEViewController.m in Sources */,
 				6003F59A195388D20070C39A /* main.m in Sources */,
+				08DAFBE326E9B63F0099999A /* CNLiveWebViewModuleImpl.m in Sources */,
 				08DAFBDE26E8A2660099999A /* CNTools.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
+//
+//  CNLiveWebViewModuleImpl.h
+//  CNLiveCWebViewModule_Example
+//
+//  Created by open on 2021/1/15.
+//  Copyright © 2021 woshiliushiyu. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <CNLiveCWebViewModule/CNLiveCWebViewModule.h>
+#import <CNLiveCWebViewModule/CNLiveWebViewModuleHeader.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface CNLiveWebViewModuleImpl : NSObject<CNLiveWebViewModuleProtocol>
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  CNLiveWebViewModuleImpl.m
+//  CNLiveCWebViewModule_Example
+//
+//  Created by open on 2021/1/15.
+//  Copyright © 2021 woshiliushiyu. All rights reserved.
+//
+
+#import "CNLiveWebViewModuleImpl.h"
+#import <CNLiveCWebViewModule/CNLiveWebViewModuleEnum.h>
+#import <CNLiveVideoClassifyKit/CNLiveListManager.h>
+
+@implementation CNLiveWebViewModuleImpl
+
+/// 调用工程中复制Appdelegate参数方法
+/// @param shareTaskId 分享动作方法
+/// @param shareId 分享id
+/// @param shareUrl 分享链接
+-(void)requestWebViewShareContentShareTaskId:(NSString *)shareTaskId
+                                     ShareId:(NSString *)shareId
+                                    ShareUrl:(NSString *)shareUrl
+{
+    
+}
+
+/// 调用工程中分享功能
+/// @param shareName 分享标题
+/// @param shareDesc 分享描述
+/// @param shareUrl 分享链接
+/// @param shareImg 分享图片地址
+/// @param imageArray 动作按钮图片集合
+/// @param titleArray 动作按钮标题集合
+/// @param fromType 调用平台
+-(void)requestWebViewShareClickWithShareName:(NSString *)shareName
+                                   ShareDesc:(NSString *)shareDesc
+                                    ShareUrl:(NSString *)shareUrl
+                                    ShareImg:(NSString *)shareImg
+                                  ImageArray:(NSArray *)imageArray
+                                  TitleArray:(NSArray *)titleArray
+                                PlatformType:(CNLiveWebSharePlatformType)fromType
+{
+    NSLog(@"调用分享方法");
+}
+
+/// 与H5交互方法
+/// @param handleName 交互key通着这个值进行点击判别
+/// @param webBridge 桥接文件
+/// @param resultData 交互参数
+-(void)requestWebViewBridgeClickWithHandlerName:(NSString *)handleName
+                                                        WebBridge:(WKWebViewJavascriptBridge *)webBridge
+                                                            FromVC:(CNLiveWebViewController *)fromVC
+                                                        ResultData:(id)resultData
+                                 CompleterBlock:(nonnull void (^)(id _Nonnull))completerBlock
+{
+    NSLog(@"交互方法响应了=>%@  参数=>%@",handleName,resultData);
+    if ([handleName isEqualToString:kCNLiveWebForJSRegisterKWIdentifier]) {
+        
+    }
+}
+
+/// 调用主工程中支付宝支付方法
+/// @param contentURL 内容url
+/// @param completerBlock 完成回调
+-(BOOL)requestWebViewWithAlipayForContentUrl:(NSString *)contentURL
+                              CompleterBlock:(void(^)(NSDictionary *result))completerBlock
+{
+    
+    return YES;
+}
+
+/// 目击者视频下载
+/// @param videoURL 下载地址
+-(void)requestWebViewDownLoadWitnessVideoWithVideoURL:(NSString *)videoURL
+{
+    
+}
+
+/// 设置跳转工程中其他界面的方法
+/// @param contentURL 内容URL
+-(void)requestWebViewSkipManagerForContentURL:(NSString *)contentURL
+{
+    
+}
+
+/// 设置跳转工程中其他界面的方法(输入)
+/// @param inputURL 内容URL
+-(void)requestWebViewSkipManagerForInputURL:(NSString *)inputURL
+{
+    
+}
+
+/// 通过设置改方法为YES 则工程中所有调用网页入口方法都会转为 requestWebViewWithSkipWebViewForWebURL:方法进行响应
+-(BOOL)requestWebViewWithSkipNewWebViewOrJunBoWebView
+{
+    return NO;
+}
+
+/// 通过设置 requestWebViewWithSkipNewWebViewOrJunBoWebView 方法返回NO时调用改方法
+/// @param webUrl 链接地址
+/// @param paramDict 参数字典
+/// @param showType 显示类型
+-(CNLiveWebViewController *)requestWebViewWithSkipWebViewForWebURL:(NSString *)webUrl
+                                                            ParamDict:(NSDictionary *)paramDict
+                                                             ShowType:(CNLiveWebViewLunchShowType)showType
+{
+    NSLog(@"用老webView跳转到这个地址=>%@",webUrl);
+    return [CNLiveWebViewController new];
+}
+
+/// 获取注册JS方法回调,用于实现方法:
+/// responseWebViewWithWebViewToJavascriptBridgeForBridgeName
+/// responseWebViewWithJavascriptBridgeToWebViewForBridgeName
+-(void)requestWebViewRegisterJavascriptBridgeMethod
+{
+    
+}
+
+- (void)requestWebViewForScrollView:(nonnull UIScrollView *)scrollView isBeginDragging:(BOOL)isBeginDragging {
+    [CNLiveListManager sha]
+}
+
+
+
+@end
@@ -66,7 +66,7 @@ static NSString * const CNDarenDownloadShareSourceUrl = @&quot;CNDarenDownloadShareSo
             [[NSNotificationCenter defaultCenter] postNotificationName:CNWjjClassifyChannelsRequestHideLoadingNotifiName object:nil userInfo:nil];
         }
         [CNTools manager].channelsRequesting = NO;
-        [BHConFig set:ChannelsRequested boolValue:YES];
+        [BHConfig set:ChannelsRequested boolValue:YES];
     }];
 }