iOS Team / CNLiveCServiceModule · Commits

Commit bf168e8c22070942afdd58d30dcb3231614808b6

Authored by yanglingyu
1 parent b590b2a2

no message

Inline Side-by-side
Showing 6 changed files with 12 additions and 12 deletions
CNLiveCServiceModule.podspec
  View file @bf168e8
... ... @@ -8,7 +8,7 @@
8 8  
9 9 Pod::Spec.new do |s|
10 10 s.name = 'CNLiveCServiceModule'
11   - s.version = '0.0.27'
  11 + s.version = '0.0.28'
12 12 s.summary = '我的服务内容'
13 13  
14 14 # This description is used to generate tags and improve search results.
... ...
CNLiveCServiceModule/Classes/View/CNLiveChineServiceCell.m
  View file @bf168e8
... ... @@ -50,7 +50,7 @@
50 50 _model = model;
51 51 [self.logoView sd_setImageWithURL:[NSURL URLWithString:model.icon]];
52 52 self.titleLabel.text = model.title;
53   - _titleLabel.font = UIFontCNMake(13);
  53 + _titleLabel.font = UIFontCNMake(12);
54 54 self.subTitle.text = model.desc;
55 55 _subTitle.font = UIFontCNMake(10);
56 56 }
... ... @@ -67,7 +67,7 @@
67 67 {
68 68 if (!_titleLabel) {
69 69 _titleLabel = [[UILabel alloc] init];
70   - _titleLabel.font = UIFontCNMake(13);
  70 + _titleLabel.font = UIFontCNMake(12);
71 71 _titleLabel.textColor = CNLiveColorWithHexString(@"#4A4A4A");
72 72 _titleLabel.textAlignment = NSTextAlignmentLeft;
73 73 }
... ...
CNLiveCServiceModule/Classes/View/CNLiveCycleCell.m
  View file @bf168e8
... ... @@ -87,12 +87,12 @@ 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(13);
  90 + cell.titleLabel.font = UIFontCNMake(12);
91 91 [cell.titleLabel sizeToFit];
92 92 }else{
93 93 [cell.logoView setImage:[UIImage loadCServiceBundle:@"service_more"]];
94 94 cell.titleLabel.text = @"更多服务";
95   - cell.titleLabel.font = UIFontCNMake(13);
  95 + cell.titleLabel.font = UIFontCNMake(12);
96 96 [cell.titleLabel sizeToFit];
97 97 }
98 98  
... ...
CNLiveCServiceModule/Classes/View/CNLiveGoodsOrVideoHeaderView.m
  View file @bf168e8
... ... @@ -59,8 +59,8 @@
59 59 - (void)setPageModel:(CNliveServicePageModel *)pageModel
60 60 {
61 61 _titlelabel.font = UIFontBoldMake(17);
62   - _subTitle.font = UIFontCNMake(12);
63   - _moreBtn.titleLabel.font = UIFontCNMake(12);
  62 + _subTitle.font = UIFontMake(12);
  63 + _moreBtn.titleLabel.font = UIFontMake(12);
64 64 _pageModel = pageModel;
65 65 self.titlelabel.text = pageModel.blockName;
66 66 [self.titlelabel sizeToFit];
... ... @@ -117,7 +117,7 @@
117 117 {
118 118 if (!_subTitle) {
119 119 _subTitle = [[UILabel alloc] init];
120   - _subTitle.font = UIFontCNMake(12);
  120 + _subTitle.font = UIFontMake(12);
121 121 _subTitle.textColor = CNLiveColorWithHexString(@"#333333");
122 122 }
123 123 return _subTitle;
... ... @@ -129,7 +129,7 @@
129 129 [_moreBtn setImage:[UIImage loadCServiceBundle:@"object_more"] forState:UIControlStateNormal];
130 130 [_moreBtn setTitle:@"更多" forState:UIControlStateNormal];
131 131 [_moreBtn setTitleColor:CNLiveColorWithHexString(@"#999695") forState:UIControlStateNormal];
132   - _moreBtn.titleLabel.font = UIFontCNMake(12);
  132 + _moreBtn.titleLabel.font = UIFontMake(12);
133 133 _moreBtn.imagePosition = QMUIButtonImagePositionRight;
134 134 [_moreBtn addTarget:self action:@selector(moreButtonClick) forControlEvents:UIControlEventTouchUpInside];
135 135 }
... ...
CNLiveCServiceModule/Classes/View/CNLiveSearchHistoryCell.m
  View file @bf168e8
... ... @@ -41,7 +41,7 @@
41 41 {
42 42 if (!_history) {
43 43 _history = [[UILabel alloc] init];
44   - _history.font = UIFontCNMake(13);
  44 + _history.font = UIFontCNMake(12);
45 45 _history.textColor = CNLiveColorWithHexString(@"#4A4A4A");
46 46 _history.textAlignment = NSTextAlignmentCenter;
47 47 }
... ...
CNLiveCServiceModule/Classes/View/CNLiveSearchHotsCell.m
  View file @bf168e8
... ... @@ -38,7 +38,7 @@
38 38 #pragma mark - Setting&&Getting
39 39 - (void)setModel:(CNLiveSearchModel *)model
40 40 {
41   - _titleLabel.font = UIFontCNMake(13);
  41 + _titleLabel.font = UIFontCNMake(12);
42 42 _model = model;
43 43 [self.logoView sd_setImageWithURL:[NSURL URLWithString:model.icon]];
44 44 self.titleLabel.text = model.title;
... ... @@ -58,7 +58,7 @@
58 58 if (!_titleLabel) {
59 59 _titleLabel = [[UILabel alloc] init];
60 60 _titleLabel.lineBreakMode = NSLineBreakByTruncatingMiddle;
61   - _titleLabel.font = UIFontCNMake(13);
  61 + _titleLabel.font = UIFontCNMake(12);
62 62 _titleLabel.textColor = CNLiveColorWithHexString(@"#4A4A4A");
63 63 _titleLabel.textAlignment = NSTextAlignmentCenter;
64 64 }
... ...