iOS Team / CNLiveCServiceModule · Commits

Commit 4113c7fa95bd4ff6d30af6c2ddb2ac9a5a4b509d

Authored by yanglingyu
1 parent 0775be41

大字体适配

Inline Side-by-side
Showing 7 changed files with 12 additions and 10 deletions
CNLiveCServiceModule.podspec
  View file @4113c7f
... ... @@ -8,7 +8,7 @@
8 8  
9 9 Pod::Spec.new do |s|
10 10 s.name = 'CNLiveCServiceModule'
11   - s.version = '0.0.20'
  11 + s.version = '0.0.21'
12 12 s.summary = '我的服务内容'
13 13  
14 14 # This description is used to generate tags and improve search results.
... ...
CNLiveCServiceModule/Classes/View/CNLiveCycleCell.m
  View file @4113c7f
... ... @@ -87,13 +87,13 @@ static NSString *CNServiceOrLookID = @"CNLiveServiceOrLookCell";
87 87 }else if (indexPath.row == self.dataSource.count){
88 88 [cell.logoView setImage:[UIImage loadCServiceBundle:@"service_mine"]];
89 89 cell.titleLabel.text = @"我的服务";
  90 + cell.titleLabel.font = UIFontCNMake(11);
90 91 [cell.titleLabel sizeToFit];
91   - [cell setNeedsLayout];
92 92 }else{
93 93 [cell.logoView setImage:[UIImage loadCServiceBundle:@"service_more"]];
94 94 cell.titleLabel.text = @"更多服务";
  95 + cell.titleLabel.font = UIFontCNMake(11);
95 96 [cell.titleLabel sizeToFit];
96   - [cell setNeedsLayout];
97 97 }
98 98  
99 99 return cell;
... ...
CNLiveCServiceModule/Classes/View/CNLiveSearchHeaderView.m
  View file @4113c7f
... ... @@ -42,12 +42,13 @@
42 42 #pragma mark - Setting&&Getting
43 43 - (void)setModel:(CNLiveSearchHotsModel *)model
44 44 {
  45 + _titlelabel.font = UIFontBoldCNMake(14);
45 46 self.lineView.hidden = YES;
46 47 if (_type == CNServiceHeaderTypeService || _type == CNServiceHeaderTypeCategoryId) {
47 48 _titlelabel.textColor = CNLiveColorWithHexString(@"#333333");
48   - _titlelabel.font = UIFontBoldMake(17);
  49 + _titlelabel.font = UIFontBoldCNMake(17);
49 50 }else{
50   - _titlelabel.font = UIFontBoldMake(14);
  51 + _titlelabel.font = UIFontBoldCNMake(14);
51 52 _titlelabel.textColor = CNLiveColorWithHexString(@"#999999");
52 53 }
53 54 self.backgroundColor = kWhiteColor;
... ... @@ -79,7 +80,7 @@
79 80 {
80 81 if (!_titlelabel) {
81 82 _titlelabel = [[UILabel alloc] init];
82   - _titlelabel.font = UIFontBoldMake(14);
  83 + _titlelabel.font = UIFontBoldCNMake(14);
83 84 _titlelabel.textColor = CNLiveColorWithHexString(@"#999999");
84 85 }
85 86 return _titlelabel;
... ...
CNLiveCServiceModule/Classes/View/CNLiveSearchHistoryCell.m
  View file @4113c7f
... ... @@ -41,7 +41,7 @@
41 41 {
42 42 if (!_history) {
43 43 _history = [[UILabel alloc] init];
44   - _history.font = UIFontCNMake(11);
  44 + _history.font = UIFontCNMake(13);
45 45 _history.textColor = CNLiveColorWithHexString(@"#4A4A4A");
46 46 _history.textAlignment = NSTextAlignmentCenter;
47 47 }
... ...
CNLiveCServiceModule/Classes/View/CNLiveSearchHotsCell.m
  View file @4113c7f
... ... @@ -58,7 +58,7 @@
58 58 if (!_titleLabel) {
59 59 _titleLabel = [[UILabel alloc] init];
60 60 _titleLabel.lineBreakMode = NSLineBreakByTruncatingMiddle;
61   - _titleLabel.font = UIFontCNMake(11);
  61 + _titleLabel.font = UIFontCNMake(13);
62 62 _titleLabel.textColor = CNLiveColorWithHexString(@"#4A4A4A");
63 63 _titleLabel.textAlignment = NSTextAlignmentCenter;
64 64 }
... ...
CNLiveCServiceModule/Classes/View/CNLiveVideoRecommendCell.m
  View file @4113c7f
... ... @@ -57,7 +57,7 @@
57 57 #pragma mark - Setting&&getting
58 58 - (void)setModel:(CnLivePageContentModel *)model
59 59 {
60   - _titleLabel.font = UIFontCNMake(11);
  60 + _titleLabel.font = UIFontCNMake(13);
61 61 _price.font = UIFontCNMake(11);
62 62 _oldPrice.font = UIFontCNMake(9);
63 63 _lookNum.titleLabel.font = UIFontCNMake(11);
... ... @@ -160,7 +160,7 @@
160 160 {
161 161 if (!_titleLabel) {
162 162 _titleLabel = [[UILabel alloc] init];
163   - _titleLabel.font = UIFontCNMake(11);
  163 + _titleLabel.font = UIFontCNMake(13);
164 164 _titleLabel.textColor = CNLiveColorWithHexString(@"#333333");
165 165 _titleLabel.textAlignment = NSTextAlignmentLeft;
166 166 }
... ...
CNLiveCServiceModule/Classes/ViewController/CNLiveServiceVC.m
  View file @4113c7f
... ... @@ -111,6 +111,7 @@ static NSString *CNGoodsOrVideoheaderID = @"CNLiveGoodsOrVideoHeaderView";
111 111 {
112 112 [super viewWillAppear:animated];
113 113 self.navigationController.navigationBarHidden = YES;
  114 + [self.listCollectionView reloadData];
114 115 }
115 116  
116 117 - (void)viewWillDisappear:(BOOL)animated
... ...