no message

yanglingyu
1 parent a448c4cc
Showing 13 changed files with 106 additions and 30 deletions
CNLiveVideoClassifyKit.podspec
CNLiveVideoClassifyKit/Classes/Controller/CNCategoryBaseViewController.m
CNLiveVideoClassifyKit/Classes/Controller/CNLiveClassifySegmentController.m
CNLiveVideoClassifyKit/Classes/Controller/CNLiveSubSegmentController.m
CNLiveVideoClassifyKit/Classes/Header/CNLivevideoClassifyPCH.h
CNLiveVideoClassifyKit/Classes/Manager/CNLiveClassifyJumpBridge.h
CNLiveVideoClassifyKit/Classes/Manager/CNLiveClassifyJumpBridge.m
CNLiveVideoClassifyKit/Classes/Manager/CNLiveListManager.h
CNLiveVideoClassifyKit/Classes/Manager/CNLiveListManager.m
CNLiveVideoClassifyKit/Classes/Manager/CNLiveVideoClassifyProtocol.h
Example/CNLiveVideoClassifyKit/CNLIVEDemoViewController.h
Example/CNLiveVideoClassifyKit/CNLIVEViewController.h
Example/CNLiveVideoClassifyKit/CNLiveClassifyKitImpl.m
@@ -45,11 +45,9 @@ TODO: Add long description of the pod here.
    s.dependency 'CNLiveBaseClass'
    s.dependency 'CNLiveUserManagement'
    s.dependency 'CNLiveCommonCategory'
-   s.dependency 'CNLiveCWebViewModule'
    s.dependency 'CNLiveBeeHive'
    s.dependency 'CNLiveTripartiteManagement/SDWebImage'
    s.dependency 'CNLiveTripartiteManagement/Masonry'
    s.dependency 'CNLiveTripartiteManagement/YYKit'
-   s.dependency 'CNLiveTripartiteManagement/QMUIKit'
 end
@@ -17,6 +17,7 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
+    
     [self.view addSubview: self.categoryView];
     [self.view addSubview:self.listContainerView];
     self.view.backgroundColor = [UIColor whiteColor];
@@ -530,14 +530,14 @@ static CGFloat moveHeight = 50;
         subVC.isBlack = isBlack;
         weakself
         subVC.scrollViewDidScrollBlock = ^(BOOL isUp) {
-            [self scrollViewUpDowm:isUp];
+            [weakSelf scrollViewUpDowm:isUp];
         };
         return subVC;
     }
     self.topBgImg.frame = CGRectMake(0, 0, KScreenWidth, self.topBgImgHeight - 50);
     CNLiveListManager *list = [CNLiveListManager shareListManager];
-    [list model:model black:isBlack];
+    [list model:model black:isBlack bgImage:[self.bgImages safetyObjectAtIndex:index] bgColor:model.backgroundColor bgImageH5:model.backgroundImgH5];
     list.contentVC = self;
     weakself
     list.scrollViewDidScrollBlock = ^(BOOL isUp) {
@@ -17,6 +17,7 @@
 @property (nonatomic, strong)UIColor *textColor;
 @property (nonatomic, strong)UIColor *backgroundColor;
 @property (nonatomic, strong)NSString *backImage;
+@property (nonatomic, strong)NSString *backImageH5;
 @end
@@ -43,7 +44,7 @@
         {
             self.backgroundColor = CNLiveColorWithHexString(@"#FFFFFF");
         }
-        
+        self.backImageH5 = model.backgroundImgH5;
         self.backImage = model.backgroundImg;
     }
@@ -141,7 +142,7 @@
 {
     CNCategoryGetChannelModel *model = self.pageListArr[index];
     CNLiveListManager *list = [CNLiveListManager shareListManager];
-    [list model:model black:_isBlack];
+    [list model:model black:_isBlack bgImage:self.backImage bgColor:self.backgroundColor bgImageH5:self.backImageH5];
     list.contentVC = self;
     weakself
     list.scrollViewDidScrollBlock = ^(BOOL isUp) {
@@ -24,6 +24,7 @@
 #import <QMUIKit/QMUIKit.h>
 #import "UIImage+AdBundleImage.h"
 #import "CNLiveClassifySegmentController.h"
+#import "CNLiveClassifyJumpBridge.h"
 #endif /* CNLivevideoClassifyPCH_h */
@@ -6,12 +6,16 @@
 //
 #import <Foundation/Foundation.h>
-#
+#import "CNLiveVideoClassifyProtocol.h"
 NS_ASSUME_NONNULL_BEGIN
 @interface CNLiveClassifyJumpBridge : NSObject
-@p
+@property (nonatomic, weak) id<CNLiveVideoClassifyProtocol> protocol;
+
++(instancetype)shareInstance;
+
++(UIViewController *)ListViewWithPageType:(NSInteger)pageType param:(NSDictionary *_Nullable)param;
 @end
 NS_ASSUME_NONNULL_END
@@ -7,6 +7,30 @@
 #import "CNLiveClassifyJumpBridge.h"
+
 @implementation CNLiveClassifyJumpBridge
++(instancetype)shareInstance
+{
+    static dispatch_once_t onceToken;
+    static CNLiveClassifyJumpBridge *bridge = nil;
+    dispatch_once(&onceToken, ^{
+        bridge = [[CNLiveClassifyJumpBridge alloc] init];
+    });
+    return bridge;
+}
+-(instancetype)init
+{
+    self = [super init];
+    if (self) {
+        Class class = NSClassFromString(@"CNLiveClassifyKitImpl");
+        self.protocol = [CNLiveVideoClassifyProtocol Protocol];
+        [[BeeHive shareInstance] registerService:self.protocol service:class];
+    }
+    return self;
+}
++(UIViewController *)ListViewWithPageType:(NSInteger)pageType param:(NSDictionary *)param
+{
+    return [[CNLiveClassifyJumpBridge shareInstance].protocol listViewShowPageType:pageType param:param];
+}
 @end
@@ -16,7 +16,7 @@ NS_ASSUME_NONNULL_BEGIN
 +(instancetype)shareListManager;
--(void)model:(CNCategoryGetChannelModel *)model black:(BOOL)black;
+-(void)model:(CNCategoryGetChannelModel *)model black:(BOOL)black bgImage:(NSString *)bgImage bgColor:(NSString *)bgColor bgImageH5:(NSString *)bgImageH5;
 - (void)requestWebViewForScrollView:(nonnull UIScrollView *)scrollView isBeginDragging:(BOOL)isBeginDragging;
 @end
@@ -9,13 +9,13 @@
 #import "CNCategoryGetChannelModel.h"
 #import <CNLiveCWebViewModule/CNLiveCWebViewModule.h>
 #import <CNLiveCWebViewModule/CNLiveSubWebViewController.h>
-#import "CNLiveVideoClassifyProtocol.h"
 @interface CNLiveListManager()
 {
     BOOL _black;
     CNCategoryGetChannelModel *_model;
     CGFloat beginoffsetY;
+    NSString *_backImage, *_backColor ,*_backImageH5;
 }
 @end
@@ -31,10 +31,13 @@
 }
--(void)model:(CNCategoryGetChannelModel *)model black:(BOOL)black
+-(void)model:(CNCategoryGetChannelModel *)model black:(BOOL)black bgImage:(NSString *)bgImage bgColor:(nonnull NSString *)bgColor bgImageH5:(nonnull NSString *)bgImageH5
 {
     _model = model;
     _black = black;
+    _backImage = bgImage;
+    _backColor = bgColor;
+    _backImageH5 = bgImageH5;
 }
 - (void)requestWebViewForScrollView:(nonnull UIScrollView *)scrollView isBeginDragging:(BOOL)isBeginDragging
 {
@@ -57,18 +60,28 @@
  实现 <JXCategoryListContentViewDelegate> 协议方法，返回该视图控制器所拥有的「视图」
  */
 - (UIView *)listView {
+    NSDictionary * paramDic = nil;
     if ([_model.pageType isEqualToString:@"4"] || [_model.pageType isEqualToString:@"5"]){
-        Class class = NSClassFromString(@"CNLiveClassifyKitImpl");
-//        [[BeeHive shareInstance] registerService:cnlivevid service:<#(__unsafe_unretained Class)#>];
+         paramDic= @{
+             @"title": _model.showName?_model.showName:@"",
+            @"bgColor": _backColor?_backColor:@"",
+            @"isBlack":@(_black),
+             @"backgroundImg": _backImage?_backImage:@"",
+             @"channelId":_model.channelId?_model.channelId:@"",
+             @"channelName":_model.id?_model.id:@"",
+             @"pageId":_model.pageId?_model.pageId:@""
+            
+        };
+    }else{
+         paramDic= @{
+            @"title": _model.showName,
+            @"bgColor": _backColor,
+            @"isBlack":@(_black),
+            @"thirdUrl":_model.thirdUrl,
+            @"backgroundImgH5":_backImageH5
+        };
     }
-    NSDictionary * paramDic= @{
-        @"title": _model.showName,
-        @"intercept": @(YES),
-        @"isBlack":@(_black)
-        
-    };
-    CNLiveSubWebViewController *subVC = [CNLiveCWebViewModule showWebVCWithLunchForWebURL:_model.thirdUrl
-                                ParamDict:paramDic ShowType:CNLiveWebViewLunchShowTypeHidden];
+    UIViewController *subVC = [CNLiveClassifyJumpBridge ListViewWithPageType:_model.pageType.integerValue param:paramDic];
     [self.contentVC addChildViewController:subVC];
     return subVC.view;
 }
@@ -2,15 +2,21 @@
 //  CNLiveVideoClassifyProtocol.h
 //  CNLiveVideoClassifyKit
 //
-//  Created by CNLive on 2021/9/9.
+//  Created by CNLive on 2021/9/10.
 //
 #import <Foundation/Foundation.h>
+NS_ASSUME_NONNULL_BEGIN
 @protocol CNLiveVideoClassifyProtocol <NSObject>
-
--(UIView *)listViewShowPageType:(NSUInteger)pageType  param:(NSDictionary *)param;
-
+/**
+ *返回需要加载的View
+ *pageType加载页面类型
+ *param 传给View的参数
+ */
+-(UIViewController *)listViewShowPageType:(NSUInteger)pageType
+                          param:(NSDictionary *)param;
 @end
+NS_ASSUME_NONNULL_END
@@ -7,10 +7,11 @@
 //
 #import <UIKit/UIKit.h>
+#import <QMUIKit/QMUIKit.h>
 NS_ASSUME_NONNULL_BEGIN
-@interface CNLIVEDemoViewController : UIViewController
+@interface CNLIVEDemoViewController :QMUICommonViewController
 @end
@@ -7,7 +7,8 @@
 //
 @import UIKit;
+#import <QMUIKit/QMUIKit.h>
-@interface CNLIVEViewController : UIViewController
+@interface CNLIVEViewController : QMUICommonViewController
 @end
@@ -8,12 +8,38 @@
 #import "CNLiveClassifyKitImpl.h"
 #import "CNLIVEDemoViewController.h"
+#import "CNLIVEViewController.h"
+#import <CNLiveCWebViewModule/CNLiveCWebViewModule.h>
+#import <CNLiveCWebViewModule/CNLiveSubWebViewController.h>
+#import <CNLiveCommonCategory/NSString+CNLiveUrlEncode.h>
 @implementation CNLiveClassifyKitImpl
--(UIView *)listViewShowPageType:(NSUInteger)pageType param:(NSDictionary *)param
+-(UIViewController *)listViewShowPageType:(NSUInteger)pageType param:(NSDictionary *)param
 {
-    CNLIVEDemoViewController *demo = [CNLIVEDemoViewController new];
-    return demo.view;
+    if (pageType == 4|| pageType == 5) {
+        CNLIVEDemoViewController *demo = [CNLIVEDemoViewController new];
+        return demo;
+    }else if (pageType == 2){
+        CNLIVEViewController *demo = [CNLIVEViewController new];
+        return demo;
+    }else if (pageType == 7){
+        CNLIVEViewController *demo = [CNLIVEViewController new];
+        return demo;
+    }else{
+        NSString *thirdUrl = param[@"thirdUrl"];
+        NSString *backgroundColor = param[@"backgroundColor"];
+        NSString *backImageH5 = param[@"backgroundImgH5"];
+        if (!CNLiveStringIsEmpty(thirdUrl)) {
+            NSString *andStr = @"&";
+            if (![thirdUrl cn_containsString:@"?"]) {
+                andStr = @"?";
+            }
+            thirdUrl = [thirdUrl stringByAppendingFormat:@"%@backgroundColor=%@&backgroundImgH5=%@",andStr,backgroundColor?[backgroundColor urlEncode]:@"",backImageH5?[backImageH5 urlEncode]:@""];
+        }
+        CNLiveSubWebViewController *subVC = [CNLiveCWebViewModule showWebVCWithLunchForWebURL:thirdUrl ParamDict:param ShowType:CNLiveWebViewLunchShowTypeHidden];
+        return subVC;
+    }
+    
 }
 @end