iOS Team / CNLiveCServiceModule · Commits

Commit 48241763b7a14a54be51dc1d42d7aa574a4926d8

Authored by yanglingyu
1 parent 4113c7fa

大字体

Inline Side-by-side
Showing 3 changed files with 11 additions and 3 deletions
CNLiveCServiceModule.podspec
  View file @4824176
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 8
9 Pod::Spec.new do |s| 9 Pod::Spec.new do |s|
10 s.name = 'CNLiveCServiceModule' 10 s.name = 'CNLiveCServiceModule'
11 - s.version = '0.0.21' 11 + s.version = '0.0.22'
12 s.summary = '我的服务内容' 12 s.summary = '我的服务内容'
13 13
14 # This description is used to generate tags and improve search results. 14 # This description is used to generate tags and improve search results.
CNLiveCServiceModule/Classes/Present/CNLiveServicePresent.m
  View file @4824176
@@ -255,7 +255,14 @@ static const CGFloat margin = 15; @@ -255,7 +255,14 @@ static const CGFloat margin = 15;
255 }else if (type.integerValue == 9){ 255 }else if (type.integerValue == 9){
256 [mDic setObject:@(90) forKey:@"cellHeight"]; 256 [mDic setObject:@(90) forKey:@"cellHeight"];
257 }else if (type.integerValue == 30){ 257 }else if (type.integerValue == 30){
258 - [mDic setObject:@(170) forKey:@"cellHeight"]; 258 + [mDic setObject:@(96+70 *RATIO) forKey:@"cellHeight"];
  259 + if ([contents isKindOfClass:[NSArray class]] && contents.count>0) {
  260 + NSString *modelType = contents[0][@"model"];
  261 + if (modelType &&[modelType isKindOfClass:[NSString class]] && [modelType isEqualToString:@"product"]) {
  262 + [mDic setObject:@(96 + 50*RATIO) forKey:@"cellHeight"];
  263 + }
  264 + }
  265 +
259 } 266 }
260 267
261 if ((type.integerValue == 36||type.integerValue == 38||type.integerValue == 1||type.integerValue == 9||type.integerValue == 30) && contents&&[contents isKindOfClass:[NSArray class]] && contents.count>0){ 268 if ((type.integerValue == 36||type.integerValue == 38||type.integerValue == 1||type.integerValue == 9||type.integerValue == 30) && contents&&[contents isKindOfClass:[NSArray class]] && contents.count>0){
CNLiveCServiceModule/Classes/View/CNLiveServiceEpiCell.m
  View file @4824176
@@ -97,6 +97,7 @@ static NSString *CNServiceOrLookID = @"CNLiveServiceOrLookCell"; @@ -97,6 +97,7 @@ static NSString *CNServiceOrLookID = @"CNLiveServiceOrLookCell";
97 #pragma mark - Setting&&Getting 97 #pragma mark - Setting&&Getting
98 - (void)setModel:(CNliveServicePageModel *)model 98 - (void)setModel:(CNliveServicePageModel *)model
99 { 99 {
  100 + _titleLabel.font = UIFontBoldCNMake(17);
100 _model = model; 101 _model = model;
101 [self.leftImageView sd_setImageWithURL:[NSURL URLWithString:model.background]]; 102 [self.leftImageView sd_setImageWithURL:[NSURL URLWithString:model.background]];
102 CnLivePageContentModel *pageModel = [CnLivePageContentModel mj_objectWithKeyValues:model.rightLists[0]]; 103 CnLivePageContentModel *pageModel = [CnLivePageContentModel mj_objectWithKeyValues:model.rightLists[0]];
@@ -137,7 +138,7 @@ static NSString *CNServiceOrLookID = @"CNLiveServiceOrLookCell"; @@ -137,7 +138,7 @@ static NSString *CNServiceOrLookID = @"CNLiveServiceOrLookCell";
137 { 138 {
138 if (!_titleLabel) { 139 if (!_titleLabel) {
139 _titleLabel = [[UILabel alloc] init]; 140 _titleLabel = [[UILabel alloc] init];
140 - _titleLabel.font = UIFontBoldMake(17); 141 + _titleLabel.font = UIFontBoldCNMake(17);
141 _titleLabel.textColor = CNLiveColorWithHexString(@"#EB5039"); 142 _titleLabel.textColor = CNLiveColorWithHexString(@"#EB5039");
142 } 143 }
143 return _titleLabel; 144 return _titleLabel;