iOS Team / CNLiveSettingModule · Commits

Commit 77452635c591ccf84b6f822a3425e4cb4e5902ee

Authored by zhangxiaowen
1 parent a7ca7b54

no message

Inline Side-by-side
Showing 4 changed files with 10 additions and 4 deletions
CNLiveSettingModule/Classes/BackgroundImage/CNLiveBackgroundImageController.m
  View file @7745263
@@ -20,6 +20,7 @@ @@ -20,6 +20,7 @@
20 #import "CNLiveSettingCell.h" 20 #import "CNLiveSettingCell.h"
21 #import "CNLiveServices.h" 21 #import "CNLiveServices.h"
22 #import "CNLiveSettingNavigationBar.h" 22 #import "CNLiveSettingNavigationBar.h"
  23 +#import "CNLiveBaseKit.h"
23 24
24 @interface CNLiveBackgroundImageController () 25 @interface CNLiveBackgroundImageController ()
25 <UITableViewDelegate, UITableViewDataSource, CNLiveSettingNavigationBarDelegate,UIImagePickerControllerDelegate,UINavigationControllerDelegate,TZImagePickerControllerDelegate>{ 26 <UITableViewDelegate, UITableViewDataSource, CNLiveSettingNavigationBarDelegate,UIImagePickerControllerDelegate,UINavigationControllerDelegate,TZImagePickerControllerDelegate>{
@@ -190,7 +191,7 @@ static const NSInteger timeValue = 1.5; @@ -190,7 +191,7 @@ static const NSInteger timeValue = 1.5;
190 _setting = [UIButton buttonWithType:UIButtonTypeCustom]; 191 _setting = [UIButton buttonWithType:UIButtonTypeCustom];
191 _setting.frame = CGRectMake(0, NavigationContentTop+150, SCREEN_WIDTH, 50); 192 _setting.frame = CGRectMake(0, NavigationContentTop+150, SCREEN_WIDTH, 50);
192 _setting.backgroundColor = [UIColor whiteColor]; 193 _setting.backgroundColor = [UIColor whiteColor];
193 - _setting.titleLabel.font = [UIFont systemFontOfSize:16.0]; 194 + _setting.titleLabel.font = UIFontCNMake(16.0);
194 [_setting setTitleColor:[UIColor blackColor] forState:UIControlStateNormal]; 195 [_setting setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
195 [_setting setTitle:@"将背景应用到所有聊天场景" forState:UIControlStateNormal]; 196 [_setting setTitle:@"将背景应用到所有聊天场景" forState:UIControlStateNormal];
196 _setting.adjustsImageWhenHighlighted = NO; 197 _setting.adjustsImageWhenHighlighted = NO;
CNLiveSettingModule/Classes/Controller/CNLiveSettingController.m
  View file @7745263
@@ -143,6 +143,7 @@ static const NSInteger timeValue = 1.5; @@ -143,6 +143,7 @@ static const NSInteger timeValue = 1.5;
143 - (void)viewWillAppear:(BOOL)animated{ 143 - (void)viewWillAppear:(BOOL)animated{
144 [super viewWillAppear:animated]; 144 [super viewWillAppear:animated];
145 self.navigationController.navigationBarHidden = YES; 145 self.navigationController.navigationBarHidden = YES;
  146 + [self.tableView reloadData];
146 } 147 }
147 148
148 - (void)viewDidLoad { 149 - (void)viewDidLoad {
CNLiveSettingModule/Classes/Privacy/CNLivePrivacyTableViewCell.m
  View file @7745263
@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
15 #import "CNLiveEnvironment.h" 15 #import "CNLiveEnvironment.h"
16 #import "CNUserInfoManager.h" 16 #import "CNUserInfoManager.h"
17 #import "CNLiveCategory.h" 17 #import "CNLiveCategory.h"
  18 +#import "CNLiveBaseKit.h"
18 19
19 #import "CNLivePrivacyModel.h" 20 #import "CNLivePrivacyModel.h"
20 21
@@ -133,7 +134,7 @@ static const NSInteger margin = 12; @@ -133,7 +134,7 @@ static const NSInteger margin = 12;
133 if (!_titleLabel) { 134 if (!_titleLabel) {
134 _titleLabel = [[UILabel alloc] init]; 135 _titleLabel = [[UILabel alloc] init];
135 _titleLabel.textColor = UIColorMake(40, 40, 40); 136 _titleLabel.textColor = UIColorMake(40, 40, 40);
136 - _titleLabel.font = [UIFont systemFontOfSize:16]; 137 + _titleLabel.font = UIFontCNMake(16.0);
137 } 138 }
138 return _titleLabel; 139 return _titleLabel;
139 } 140 }
CNLiveSettingModule/Classes/View/CNLiveSettingCell.m
  View file @7745263
@@ -47,6 +47,9 @@ static const NSInteger margin = 12; @@ -47,6 +47,9 @@ static const NSInteger margin = 12;
47 } 47 }
48 48
49 - (void)xw_layoutSubviews{ 49 - (void)xw_layoutSubviews{
  50 + _title.font = UIFontCNMake(16.0);
  51 + _content.font = UIFontCNMake(14.0);
  52 +
50 [_line mas_updateConstraints:^(MASConstraintMaker *make) { 53 [_line mas_updateConstraints:^(MASConstraintMaker *make) {
51 make.left.equalTo(self.contentView.mas_left).with.offset(0); 54 make.left.equalTo(self.contentView.mas_left).with.offset(0);
52 make.right.equalTo(self.contentView.mas_right).with.offset(0); 55 make.right.equalTo(self.contentView.mas_right).with.offset(0);
@@ -145,7 +148,7 @@ static const NSInteger margin = 12; @@ -145,7 +148,7 @@ static const NSInteger margin = 12;
145 _title = [[UILabel alloc] init]; 148 _title = [[UILabel alloc] init];
146 _title.numberOfLines = 1; 149 _title.numberOfLines = 1;
147 _title.textColor = [UIColor colorWithRed:51/255.0 green:51/255.0 blue:51/255.0 alpha:1.0]; 150 _title.textColor = [UIColor colorWithRed:51/255.0 green:51/255.0 blue:51/255.0 alpha:1.0];
148 - _title.font = [UIFont systemFontOfSize:16*RATIO]; 151 + _title.font = UIFontCNMake(16.0);
149 } 152 }
150 return _title; 153 return _title;
151 } 154 }
@@ -156,7 +159,7 @@ static const NSInteger margin = 12; @@ -156,7 +159,7 @@ static const NSInteger margin = 12;
156 _content.numberOfLines = 1; 159 _content.numberOfLines = 1;
157 _content.lineBreakMode = NSLineBreakByTruncatingTail; 160 _content.lineBreakMode = NSLineBreakByTruncatingTail;
158 _content.textColor = [UIColor colorWithRed:102/255.0 green:102/255.0 blue:102/255.0 alpha:1.0]; 161 _content.textColor = [UIColor colorWithRed:102/255.0 green:102/255.0 blue:102/255.0 alpha:1.0];
159 - _content.font = [UIFont systemFontOfSize:14*RATIO]; 162 + _content.font = UIFontCNMake(14.0);
160 } 163 }
161 return _content; 164 return _content;
162 } 165 }