iOS Team / CNLiveCServiceModule · Commits

Commit 6d71e73898da4559593a397d82ba2b48bd18f71a

Authored by yanglingyu
1 parent bb90d759

增加首页按钮宽度

Inline Side-by-side
Showing 2 changed files with 14 additions and 6 deletions
CNLiveCServiceModule/Classes/Present/CNLiveServicePresent.m
  View file @6d71e73
@@ -101,7 +101,7 @@ static const CGFloat margin = 15; @@ -101,7 +101,7 @@ static const CGFloat margin = 15;
101 if (model.categories.count <= 4) { 101 if (model.categories.count <= 4) {
102 cellheight = 80; 102 cellheight = 80;
103 } 103 }
104 - categoryModel = [CNLiveServicePresent dealDataSource:model.categories title:@"" subtitle:@"" cellHeight:cellheight itemSize:CGSizeMake((SCREEN_WIDTH-4*margin-3*margin)/4.0, 70)showNum:8]; 104 + categoryModel = [CNLiveServicePresent dealDataSource:model.categories title:@"" subtitle:@"" cellHeight:cellheight itemSize:CGSizeMake((SCREEN_WIDTH-2*margin)/4.0, 70)showNum:8];
105 if (categoryModel) { 105 if (categoryModel) {
106 [dataArray addObject:categoryModel]; 106 [dataArray addObject:categoryModel];
107 } 107 }
@@ -126,18 +126,18 @@ static const CGFloat margin = 15; @@ -126,18 +126,18 @@ static const CGFloat margin = 15;
126 cellheight = 90; 126 cellheight = 90;
127 } 127 }
128 showNum = 4; 128 showNum = 4;
129 - itemSize = CGSizeMake((KScreenWidth - 3*margin -10)/2, 60); 129 + itemSize = CGSizeMake((KScreenWidth - 3*margin)/2, 60);
130 }else if ([dic[@"name"] isEqualToString:@"中国媒体号"] || [dic[@"name"] isEqualToString:@"中国网中国号"]) { 130 }else if ([dic[@"name"] isEqualToString:@"中国媒体号"] || [dic[@"name"] isEqualToString:@"中国网中国号"]) {
131 cellheight = 190; 131 cellheight = 190;
132 if (lists.count <= 4) { 132 if (lists.count <= 4) {
133 cellheight = 105; 133 cellheight = 105;
134 } 134 }
135 showNum = 8; 135 showNum = 8;
136 - itemSize = CGSizeMake((SCREEN_WIDTH-4*margin-3*margin)/4.0, 70); 136 + itemSize = CGSizeMake((SCREEN_WIDTH-2*margin)/4.0, 70);
137 }else{ 137 }else{
138 cellheight = 125; 138 cellheight = 125;
139 showNum = 4; 139 showNum = 4;
140 - itemSize = CGSizeMake((SCREEN_WIDTH-4*margin-3*margin)/4.0, 70); 140 + itemSize = CGSizeMake((SCREEN_WIDTH-2*margin)/4.0, 70);
141 subTitle = dic[@"category"][@"subTitle"]; 141 subTitle = dic[@"category"][@"subTitle"];
142 } 142 }
143 if (lists &&[lists isKindOfClass:[NSArray class]] && lists.count > 0) { 143 if (lists &&[lists isKindOfClass:[NSArray class]] && lists.count > 0) {
CNLiveCServiceModule/Classes/View/CNLiveCycleCell.m
  View file @6d71e73
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 #import "CNLiveChineServiceCell.h" 13 #import "CNLiveChineServiceCell.h"
14 #import "CNLiveServiceOrLookCell.h" 14 #import "CNLiveServiceOrLookCell.h"
15 15
16 -@interface CNLiveCycleCell()<UICollectionViewDelegate,UICollectionViewDataSource> 16 +@interface CNLiveCycleCell()<UICollectionViewDelegate,UICollectionViewDataSource,UICollectionViewDelegateFlowLayout>
17 @property (nonatomic, strong) UICollectionView *listCollectionView; 17 @property (nonatomic, strong) UICollectionView *listCollectionView;
18 @property (nonatomic, strong) NSArray *dataSource; 18 @property (nonatomic, strong) NSArray *dataSource;
19 @end 19 @end
@@ -116,7 +116,15 @@ static NSString *CNServiceOrLookID = @&quot;CNLiveServiceOrLookCell&quot;; @@ -116,7 +116,15 @@ static NSString *CNServiceOrLookID = @&quot;CNLiveServiceOrLookCell&quot;;
116 if ([_model.title isEqual:@"大家都在用"]) { 116 if ([_model.title isEqual:@"大家都在用"]) {
117 return UIEdgeInsetsMake(15, 0, 0, 0); 117 return UIEdgeInsetsMake(15, 0, 0, 0);
118 } 118 }
119 - return UIEdgeInsetsMake(15, 15, 0, 15); 119 + return UIEdgeInsetsMake(15, 0, 0, 0);
  120 +
  121 +}
  122 +
  123 +- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout minimumInteritemSpacingForSectionAtIndex:(NSInteger)section{
  124 + if ([_model.title isEqual:@"中国服务号"]) {
  125 + return 5;
  126 + }
  127 + return 0;
120 } 128 }
121 #pragma mark - Setting&&Getting 129 #pragma mark - Setting&&Getting
122 -(void)setModel:(CNLiveSearchHotsModel *)model 130 -(void)setModel:(CNLiveSearchHotsModel *)model