no message

yanglingyu
1 parent 27b95679
Showing 7 changed files with 79 additions and 40 deletions
CNLiveVideoClassifyKit/Classes/Controller/CNLiveClassifySegmentController.m
CNLiveVideoClassifyKit/Classes/Controller/CNLiveListViewController.h
CNLiveVideoClassifyKit/Classes/Controller/CNLiveListViewController.m
CNLiveVideoClassifyKit/Classes/Controller/CNLiveSubSegmentController.m
CNLiveVideoClassifyKit/Classes/Manager/CNLiveClassifyJumpBridge.h
CNLiveVideoClassifyKit/Classes/Manager/CNLiveListManager.h
CNLiveVideoClassifyKit/Classes/Manager/CNLiveListManager.m
@@ -529,14 +529,14 @@ static CGFloat moveHeight = 50;
     }
     self.topBgImg.frame = CGRectMake(0, 0, KScreenWidth, self.topBgImgHeight - 50);
     CNLiveListManager *list = [CNLiveListManager shareListManager];
-    [list model:model black:isBlack bgImage:[self.bgImages safetyObjectAtIndex:index] bgColor:model.backgroundColor bgImageH5:model.backgroundImgH5];
+   UIViewController *listView = [list model:model black:isBlack bgImage:[self.bgImages safetyObjectAtIndex:index] bgColor:model.backgroundColor bgImageH5:model.backgroundImgH5];
     list.contentVC = self;
     weakself
     list.scrollViewDidScrollBlock = ^(BOOL isUp) {
         [weakSelf scrollViewUpDowm:isUp];
     };
-    return list;
+    return listView;
 }
 #pragma mark - Public
 -(JXCategoryBaseView *)preferredCategoryView
+//
+//  CNLiveListViewController.h
+//  CNLiveVideoClassifyKit
+//
+//  Created by CNLive on 2021/9/10.
+//
+
+#import <CNLiveBaseClass/CNLiveBaseClass.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface CNLiveListViewController : CNLiveBaseViewController
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  CNLiveListViewController.m
+//  CNLiveVideoClassifyKit
+//
+//  Created by CNLive on 2021/9/10.
+//
+
+#import "CNLiveListViewController.h"
+
+@interface CNLiveListViewController ()
+
+@end
+
+@implementation CNLiveListViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    self.navigationHidden = YES;
+    // Do any additional setup after loading the 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
@@ -143,14 +143,14 @@
 {
     CNCategoryGetChannelModel *model = self.pageListArr[index];
     CNLiveListManager *list = [CNLiveListManager shareListManager];
-    [list model:model black:_isBlack bgImage:self.backImage bgColor:self.backgroundColor bgImageH5:self.backImageH5];
+    UIViewController *listView = [list model:model black:_isBlack bgImage:self.backImage bgColor:self.backgroundColor bgImageH5:self.backImageH5];
     list.contentVC = self;
     weakself
     list.scrollViewDidScrollBlock = ^(BOOL isUp) {
         !weakSelf.scrollViewDidScrollBlock ?: weakSelf.scrollViewDidScrollBlock(isUp);
     };
-    return list;
+    return listView;
 }
 #pragma mark - JXCategoryListContentViewDelegate
@@ -11,7 +11,7 @@
 NS_ASSUME_NONNULL_BEGIN
 @interface CNLiveClassifyJumpBridge : NSObject
-@property (nonatomic, weak) id<CNLiveVideoClassifyProtocol> protocol;
+@property (nonatomic, strong) id<CNLiveVideoClassifyProtocol> protocol;
 +(instancetype)shareInstance;
@@ -16,7 +16,7 @@ NS_ASSUME_NONNULL_BEGIN
 +(instancetype)shareListManager;
--(void)model:(CNCategoryGetChannelModel *)model black:(BOOL)black bgImage:(NSString *)bgImage bgColor:(NSString *)bgColor bgImageH5:(NSString *)bgImageH5;
+-(UIViewController *)model:(CNCategoryGetChannelModel *)model black:(BOOL)black bgImage:(NSString *)bgImage bgColor:(NSString *)bgColor bgImageH5:(NSString *)bgImageH5;
 - (void)requestWebViewForScrollView:(nonnull UIScrollView *)scrollView isBeginDragging:(BOOL)isBeginDragging;
 @end
@@ -7,15 +7,11 @@
 #import "CNLiveListManager.h"
 #import "CNCategoryGetChannelModel.h"
-#import <CNLiveCWebViewModule/CNLiveCWebViewModule.h>
-#import <CNLiveCWebViewModule/CNLiveSubWebViewController.h>
 @interface CNLiveListManager()
 {
-    BOOL _black;
-    CNCategoryGetChannelModel *_model;
+    UIViewController *subVC;
     CGFloat beginoffsetY;
-    NSString *_backImage, *_backColor ,*_backImageH5;
 }
 @end
@@ -31,13 +27,31 @@
 }
--(void)model:(CNCategoryGetChannelModel *)model black:(BOOL)black bgImage:(NSString *)bgImage bgColor:(nonnull NSString *)bgColor bgImageH5:(nonnull NSString *)bgImageH5
+-(UIViewController *)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;
+    NSDictionary * paramDic = nil;
+    if ([model.pageType isEqualToString:@"4"] || [model.pageType isEqualToString:@"5"]){
+         paramDic= @{
+             @"title": model.showName?model.showName:@"",
+            @"bgColor": bgColor?bgColor:@"",
+            @"isBlack":@(black),
+             @"backgroundImg": bgImage?bgImage:@"",
+             @"channelId":model.channelId?model.channelId:@"",
+             @"channelName":model.id?model.id:@"",
+             @"pageId":model.pageId?model.pageId:@""
+            
+        };
+    }else{
+         paramDic= @{
+            @"title": model.showName?model.showName:@"",
+            @"bgColor": bgColor?bgColor:@"",
+            @"isBlack":@(black),
+            @"thirdUrl":model.thirdUrl?model.thirdUrl:@"",
+            @"backgroundImgH5":bgImageH5?bgImageH5:@""
+        };
+    }
+    subVC = [CNLiveClassifyJumpBridge ListViewWithPageType:model.pageType.integerValue param:paramDic];
+    return subVC;
 }
 - (void)requestWebViewForScrollView:(nonnull UIScrollView *)scrollView isBeginDragging:(BOOL)isBeginDragging
 {
@@ -60,29 +74,6 @@
  实现 <JXCategoryListContentViewDelegate> 协议方法，返回该视图控制器所拥有的「视图」
  */
 - (UIView *)listView {
-    NSDictionary * paramDic = nil;
-    if ([_model.pageType isEqualToString:@"4"] || [_model.pageType isEqualToString:@"5"]){
-         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
-        };
-    }
-    UIViewController *subVC = [CNLiveClassifyJumpBridge ListViewWithPageType:_model.pageType.integerValue param:paramDic];
-    [self.contentVC addChildViewController:subVC];
     return subVC.view;
 }
 @end