我的收藏布局逻辑修改0.3.4

yanglingyu
1 parent 516b3cc5
Showing 7 changed files with 35 additions and 40 deletions
CNLiveCMineModule.podspec
CNLiveCMineModule/Classes/Colletion/ViewController/CNMineCollectController.h
CNLiveCMineModule/Classes/Colletion/ViewController/CNMineCollectController.m
CNLiveCMineModule/Classes/Colletion/ViewController/CNMineGoodsCollectViewController.h
CNLiveCMineModule/Classes/Colletion/ViewController/CNMineGoodsCollectViewController.m
CNLiveCMineModule/Classes/Colletion/ViewController/CNMineTotleCollectViewController.m
Example/CNLiveCMineModule/CNLIVEAppDelegate.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveCMineModule'
-  s.version          = '0.3.3'
+  s.version          = '0.3.4'
   s.summary          = '网家家C端个人中心'
 # This description is used to generate tags and improve search results.
@@ -8,6 +8,6 @@
 // 收藏
 #import "CNCommonTableViewController.h"
-@interface CNMineCollectController : CNCommonTableViewController
+@interface CNMineCollectController : CNCommonTableViewController<JXCategoryListContentViewDelegate>
 @end
@@ -287,5 +287,8 @@ static NSString * const kCNLiveWebViewForCollectionRefreshKey = @&quot;kCNLiveWebView
     }
     return _data;
 }
-
+#pragma mark - JXCategoryListContentViewDelegate
+- (UIView *)listView{
+    return self.view;
+}
 @end
@@ -10,7 +10,7 @@
 NS_ASSUME_NONNULL_BEGIN
-@interface CNMineGoodsCollectViewController : CNCommonTableViewController
+@interface CNMineGoodsCollectViewController : CNCommonTableViewController<JXCategoryListContentViewDelegate>
 @end
@@ -172,6 +172,10 @@
     }];
 }
+#pragma mark - JXCategoryListContentViewDelegate
+- (UIView *)listView{
+    return self.view;
+}
 /*
 #pragma mark - Navigation
@@ -13,9 +13,9 @@
 #import "UIColor+CNLiveExtension.h"
 #import "UIViewController+CNLivePhotoBrowserStatusBar.h"
-@interface CNMineTotleCollectViewController ()<JXCategoryViewDelegate,UIScrollViewDelegate>
+@interface CNMineTotleCollectViewController ()<JXCategoryViewDelegate,UIScrollViewDelegate,JXCategoryListContainerViewDelegate>
 @property (nonatomic, strong) JXCategoryTitleView *titleCategoryView;
-@property (nonatomic, strong) UIScrollView *scrollView;
+@property (nonatomic, strong) JXCategoryListContainerView *contaimerView;
 @property (nonatomic, strong) NSArray *titles;
 @end
@@ -26,7 +26,11 @@ static const CGFloat height = 44;
     self.title = @"收藏";
     self.view.backgroundColor = CNLiveColorWithHexString(@"#F2F2F2");
     [self.view addSubview:self.titleCategoryView];
-    [self.view addSubview:self.scrollView];
+    [self.view addSubview:self.contaimerView];
+    [self.contaimerView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.right.bottom.equalTo(self.view);
+        make.top.equalTo(self.titleCategoryView.mas_bottom);
+    }];
     // Do any additional setup after loading the view.
 }
 -(void)viewWillAppear:(BOOL)animated
@@ -50,7 +54,16 @@ static const CGFloat height = 44;
 //    }
 //    [self addCNLiveStat];
 }
-
+- (NSInteger)numberOfListsInlistContainerView:(JXCategoryListContainerView *)listContainerView{
+    return self.titles.count;
+}
+- (id<JXCategoryListContentViewDelegate>)listContainerView:(JXCategoryListContainerView *)listContainerView initListForIndex:(NSInteger)index{
+    if (index == 0) {
+        return [[CNMineCollectController alloc]init];
+    }else{
+        return [[CNMineGoodsCollectViewController alloc]init];
+    }
+}
 #pragma mark - 懒加载
 - (JXCategoryTitleView *)titleCategoryView{
     if (!_titleCategoryView) {
@@ -66,12 +79,12 @@ static const CGFloat height = 44;
         _titleCategoryView.titleLabelZoomScale = 1.0;
         _titleCategoryView.titleLabelZoomEnabled = YES;
         _titleCategoryView.titleColorGradientEnabled = YES;
+        _titleCategoryView.listContainer = self.contaimerView;
         JXCategoryIndicatorLineView *lineView = [[JXCategoryIndicatorLineView alloc] init];
         lineView.indicatorColor = UIColorHex(#FC1541);
         lineView.indicatorWidth = 20;
         _titleCategoryView.indicators = @[lineView];
-        _titleCategoryView.contentScrollView = self.scrollView;
         UIView *line = [[UIView alloc] initWithFrame:CGRectMake(KScreenWidth/2-0.2, 14.5, 0.5, 13)];
         line.backgroundColor = UIColorHex(#E6E6E6);
@@ -80,38 +93,13 @@ static const CGFloat height = 44;
     }
     return _titleCategoryView;
 }
-
-- (UIScrollView *)scrollView {
-    if (!_scrollView) {
-        CGFloat scrollW = SCREEN_WIDTH;
-        CGFloat scrollH = SCREEN_HEIGHT - NavigationContentTop - height;
-        _scrollView = [[UIScrollView alloc] initWithFrame:CGRectMake(0, NavigationContentTop + height, scrollW, scrollH)];
-        _scrollView.contentSize = CGSizeMake(scrollW * self.titles.count, scrollH);
-        _scrollView.pagingEnabled = YES;
-        _scrollView.bounces = NO;
-        _scrollView.delegate = self;
-        _scrollView.showsHorizontalScrollIndicator = NO;
-        _scrollView.scrollEnabled = YES;
-        _scrollView.backgroundColor = [UIColor whiteColor];
-
-        for(int i = 0; i < self.titles.count; i++){
-            UIViewController *vc = nil;
-            if(i == 0){
-                vc = [[CNMineCollectController alloc]init];
-
-            }else if (i == 1){
-                vc = [[CNMineGoodsCollectViewController alloc]init];
-        
-            }
-            vc.view.frame = CGRectMake(i*scrollW, 0, scrollW, scrollH);
-            [self addChildViewController:vc];
-            [_scrollView addSubview:vc.view];
-        }
-
+- (JXCategoryListContainerView *)contaimerView
+{
+    if (!_contaimerView) {
+        _contaimerView = [[JXCategoryListContainerView alloc] initWithType:JXCategoryListContainerType_CollectionView delegate:self];
     }
-    return _scrollView;
+    return _contaimerView;
 }
-
 - (NSArray *)titles{
     if (!_titles) {
         _titles = [NSArray arrayWithObjects:@"资讯", @"商品", nil];
@@ -28,7 +28,7 @@
     [super application:application didFinishLaunchingWithOptions:launchOptions];
-    [CNUserInfoManager manager].userInfoModel.uid = @"353001";//@"10510277";//
+    [CNUserInfoManager manager].userInfoModel.uid = @"11174272";//@"10510277";//11174272
     self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
     self.window.backgroundColor = [UIColor whiteColor];