增加融媒体联盟

yanglingyu
1 parent 8351c338
Showing 5 changed files with 85 additions and 46 deletions
CNLiveCServiceModule/Classes/Model/CNLiveSearchModel.h
CNLiveCServiceModule/Classes/Present/CNLiveServicePresent.m
CNLiveCServiceModule/Classes/View/CNLiveCycleCell.m
CNLiveCServiceModule/Classes/View/CNLiveCycleView.m
CNLiveCServiceModule/Classes/View/CNLiveServiceChinasCell.m
@@ -61,6 +61,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface CNLiveSearchHotsModel : NSObject
 @property (nonatomic, copy) NSString *title;
+@property (nonatomic, copy) NSString *subTitle;
 @property (nonatomic, strong) NSArray *lists;
 @property (nonatomic, assign) CGFloat cellHeight;
 ///布局
@@ -52,7 +52,7 @@ static const CGFloat margin = 15;
 {
     CNLiveSearchHotsModel *model1 = nil;
     if (hots && hots.count > 0) {
-        model1 = [CNLiveServicePresent dealDataSource:hots title:@"热度推荐" cellHeight:0 itemSize:CGSizeMake((SCREEN_WIDTH-4*margin-3*margin)/4.0, 80)showNum:0];
+        model1 = [CNLiveServicePresent dealDataSource:hots title:@"热度推荐" subtitle:@"" cellHeight:0 itemSize:CGSizeMake((SCREEN_WIDTH-4*margin-3*margin)/4.0, 80)showNum:0];
     }
     NSMutableArray *array2 = [NSMutableArray array];
@@ -95,64 +95,63 @@ static const CGFloat margin = 15;
     [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodGET URLString:cn_API_Classify(@"/servingApi/servingPage") Param:params CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
         CNLiveServiceModel * model = [CNLiveServiceModel mj_objectWithKeyValues:responseObject[@"data"]];
         CNLiveSearchHotsModel *categoryModel = nil;
+        NSMutableArray *dataArray = [NSMutableArray array];
         if (model.categories&&[model.categories isKindOfClass:[NSArray class]] && model.categories.count>0) {
             CGFloat cellheight = 160;
             if (model.categories.count <= 4) {
                 cellheight = 80;
             }
-            categoryModel = [CNLiveServicePresent dealDataSource:model.categories title:@"" cellHeight:cellheight itemSize:CGSizeMake((SCREEN_WIDTH-4*margin-3*margin)/4.0, 70)showNum:8];
+            categoryModel = [CNLiveServicePresent dealDataSource:model.categories title:@"" subtitle:@"" cellHeight:cellheight itemSize:CGSizeMake((SCREEN_WIDTH-4*margin-3*margin)/4.0, 70)showNum:8];
+            if (categoryModel) {
+                [dataArray addObject:categoryModel];
+            }
         }
         CNLiveSearchHotsModel *serviceModel = nil;
-        CNLiveSearchHotsModel *mediaModel = nil;
-        CNLiveSearchHotsModel *chineseModel = nil;
         if (model.allList && model.allList.count > 0) {
             for (NSDictionary *dic in model.allList) {
-                if ([dic[@"name"] isEqualToString:@"中国服务号"]) {
+                @autoreleasepool {
+                    CGFloat cellheight = 0;
+                    NSInteger showNum = 0;
+                    NSString *title = dic[@"name"];
+                    NSString *subTitle = @"";
+                    CGSize itemSize = CGSizeMake(0, 0);
                     NSArray *lists = dic[@"list"];
-                    if (lists &&[lists isKindOfClass:[NSArray class]] && lists.count > 0) {
-                        CGFloat cellheight = 160;
-                        if (lists.count <= 2) {
-                            cellheight = 90;
-                        }
-                        serviceModel = [CNLiveServicePresent dealDataSource:lists title:dic[@"name"] cellHeight:cellheight itemSize:CGSizeMake((KScreenWidth - 3*margin -10)/2, 60) showNum:4];
+                    NSString *showTitle = dic[@"category"][@"showTitle"];
+                    if (![showTitle isKindOfClass:[NSNull class]] && !showTitle.boolValue) {
+                        title = @"";
                     }
-                }
-                
-                if ([dic[@"name"] isEqualToString:@"中国媒体号"]) {
-                    NSArray *lists = dic[@"list"];
-                    if (lists &&[lists isKindOfClass:[NSArray class]] && lists.count > 0) {
-                        CGFloat cellheight = 190;
-                        if (lists.count <= 4) {
-                            cellheight = 105;
-                        }
-                        mediaModel = [CNLiveServicePresent dealDataSource:lists title:dic[@"name"] cellHeight:cellheight itemSize:CGSizeMake((SCREEN_WIDTH-4*margin-3*margin)/4.0, 70) showNum:8];
+                    if ([dic[@"name"] isEqualToString:@"中国服务号"]) {
+                            cellheight = 160;
+                            if (lists.count <= 2) {
+                                cellheight = 90;
+                            }
+                            showNum = 4;
+                            itemSize = CGSizeMake((KScreenWidth - 3*margin -10)/2, 60);
+                    }else if ([dic[@"name"] isEqualToString:@"中国媒体号"] || [dic[@"name"] isEqualToString:@"中国网中国号"]) {
+                            cellheight = 190;
+                            if (lists.count <= 4) {
+                                cellheight = 105;
+                            }
+                            showNum = 8;
+                            itemSize = CGSizeMake((SCREEN_WIDTH-4*margin-3*margin)/4.0, 70);
+                    }else{
+                        cellheight = 105;
+                        showNum = 4;
+                        itemSize = CGSizeMake((SCREEN_WIDTH-4*margin-3*margin)/4.0, 70);
+                        subTitle = dic[@"category"][@"subTitle"];
                     }
-                }
-                if ([dic[@"name"] isEqualToString:@"中国网中国号"]) {
-                    NSArray *lists = dic[@"list"];
                     if (lists &&[lists isKindOfClass:[NSArray class]] && lists.count > 0) {
-                        CGFloat cellheight = 190;
-                        if (lists.count <= 4) {
-                            cellheight = 105;
-                        }
-                        chineseModel = [CNLiveServicePresent dealDataSource:lists title:dic[@"name"] cellHeight:cellheight itemSize:CGSizeMake((SCREEN_WIDTH-4*margin-3*margin)/4.0, 70) showNum:8];
+                        serviceModel = [CNLiveServicePresent dealDataSource:dic[@"list"] title:title subtitle:subTitle cellHeight:cellheight itemSize:itemSize showNum:showNum];
+                    }
+                    if (serviceModel) {
+                        [dataArray addObject:serviceModel];
                     }
                 }
+                
             }
         }
-        NSMutableArray *dataArray = [NSMutableArray array];
-        if (categoryModel) {
-            [dataArray addObject:categoryModel];
-        }
-        if (serviceModel) {
-            [dataArray addObject:serviceModel];
-        }
-        if (mediaModel) {
-            [dataArray addObject:mediaModel];
-        }
-        if (chineseModel) {
-            [dataArray addObject:chineseModel];
-        }
+        
+       
             if (model) {
                 !result?:result(dataArray.copy,model.hots);
             }else{
@@ -162,7 +161,7 @@ static const CGFloat margin = 15;
     }];
 }
-+ (CNLiveSearchHotsModel *) dealDataSource:(NSArray *)array title:(NSString *)title cellHeight:(CGFloat)cellHeight itemSize:(CGSize) size showNum:(NSInteger)num{
++ (CNLiveSearchHotsModel *) dealDataSource:(NSArray *)array title:(NSString *)title subtitle:(NSString *)subTitle cellHeight:(CGFloat)cellHeight itemSize:(CGSize) size showNum:(NSInteger)num{
     NSMutableArray *categories = [NSMutableArray array];
     NSMutableArray *squreArray = [NSMutableArray array];
     for (int i = 0; i< array.count ;i++ ) {
@@ -177,6 +176,7 @@ static const CGFloat margin = 15;
         if (num != 0 && (i != 0 ||  array.count == 1) &&((i + 1)%num == 0 || i == array.count - 1)) {
             NSDictionary *category = @{
                 @"title":title,
+                @"subTitle":subTitle,
                 @"lists":categories.copy,
                 @"cellHeight":@(cellHeight),
                 @"layout":@{
@@ -192,6 +192,7 @@ static const CGFloat margin = 15;
     if (categories && num !=0 && categories.count == 0) {
         NSDictionary *category = @{
             @"title":title,
+            @"subTitle":subTitle,
             @"lists":squreArray.copy,
             @"cellHeight":@(cellHeight),
             @"layout":@{
@@ -204,6 +205,7 @@ static const CGFloat margin = 15;
     }
     NSDictionary *category = @{
         @"title":title,
+        @"subTitle":subTitle,
         @"lists":categories.copy,
         @"cellHeight":@(cellHeight),
         @"layout":@{
@@ -63,7 +63,7 @@ static NSString *CNServiceOrLookID = @&quot;CNLiveServiceOrLookCell&quot;;
 }
 #pragma mark - UICollectionViewDataSource
 - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section{
-    if ([self.model.title isEqualToString:@""]) {
+    if ([self.model.title isEqualToString:@""] && [self.model.subTitle isEqualToString:@""]) {
         return self.dataSource.count + 2;
     }
     return self.dataSource.count;
@@ -110,7 +110,7 @@ static NSString *CNServiceOrLookID = @&quot;CNLiveServiceOrLookCell&quot;;
     if ([_model.title isEqual:@"中国服务号"]) {
         return UIEdgeInsetsMake(10, 5, 10, 5);
     }
-    if ([_model.title isEqual:@""]) {
+    if ([_model.title isEqual:@""] || ![_model.subTitle isEqualToString:@""]) {
         return UIEdgeInsetsMake(5, 0, 5, 0);
     }
     if ([_model.title isEqual:@"大家都在用"]) {
@@ -47,7 +47,7 @@ static NSString *CNCycleCellID   =  @&quot;CNCycleCellID&quot;;
 {
     _model = model;
     self.dataSource = model.lists;
-    if ([model.title isEqualToString:@"中国媒体号"]||[model.title isEqualToString:@"中国网中国号"]) {
+    if ([model.title isEqualToString:@"中国媒体号"]||[model.title isEqualToString:@"中国网中国号"] || (model.subTitle && ![model.subTitle isEqualToString:@""])) {
         self.collectionView.backgroundColor = CNLiveColorWithHexString(@"#F9FAFB");
         self.collectionView.layer.cornerRadius = 5.66;
     }else
@@ -9,6 +9,7 @@
 #import "CNLiveCycleView.h"
 @interface CNLiveServiceChinasCell()
+@property (nonatomic, strong) UILabel *subTitle;
 @property (nonatomic, strong) CNLiveCycleView *cycleView;
 @end
@@ -17,6 +18,7 @@
 {
     self = [super initWithFrame:frame];
     if (self) {
+        [self.contentView addSubview:self.subTitle];
         [self.contentView addSubview:self.cycleView];
         [self makeSubViewsLayout];
     }
@@ -24,6 +26,12 @@
 }
 - (void)makeSubViewsLayout
 {
+    [self.subTitle mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.equalTo(self);
+        make.left.equalTo(self.contentView).offset(15);
+        make.right.equalTo(self.contentView).offset(-15);
+        make.height.offset(20);
+    }];
     [self.cycleView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.bottom.equalTo(self.contentView);
         make.left.equalTo(self.contentView).offset(15);
@@ -34,16 +42,44 @@
 - (void)setModel:(CNLiveSearchHotsModel *)model
 {
     _model = model;
+    if (model.subTitle && ![model.subTitle isEqualToString:@""]) {
+        self.subTitle.hidden = NO;
+        self.subTitle.text = model.subTitle;
+        [self.cycleView mas_remakeConstraints:^(MASConstraintMaker *make) {
+            make.top.equalTo(self.subTitle.mas_bottom);
+            make.bottom.equalTo(self);
+            make.left.equalTo(self.contentView).offset(15);
+            make.right.equalTo(self.contentView).offset(-15);
+        }];
+    }else{
+        self.subTitle.hidden = YES;
+        [self.cycleView mas_remakeConstraints:^(MASConstraintMaker *make) {
+            make.top.bottom.equalTo(self);
+            make.left.equalTo(self.contentView).offset(15);
+            make.right.equalTo(self.contentView).offset(-15);
+        }];
+    }
     _cycleView.model = model;
     _cycleView.localizationImageNamesGroup = model.lists;
 }
+- (UILabel *)subTitle
+{
+    if (!_subTitle) {
+        _subTitle = [[UILabel alloc] init];
+        _subTitle.font = UIFontMake(14);
+        _subTitle.textColor = UIColorHex(#333333);
+        _subTitle.backgroundColor = UIColorHex(#FCFDFD);
+    }
+    return _subTitle;
+}
 - (CNLiveCycleView *)cycleView
 {
     if (!_cycleView) {
         _cycleView = [[CNLiveCycleView alloc] initWithFrame:CGRectZero];
         _cycleView.autoScroll = NO;
         _cycleView.showPageControl = YES;
+        
         _cycleView.pageControlStyle = SDCycleScrollViewPageContolStyleAnimated;
         _cycleView.pageControlAliment = SDCycleScrollViewPageContolAlimentCenter;
         _cycleView.hidesForSinglePage = YES;