iOS Team / CNLiveSettingModule · Commits

Commit 9847ff13a6413bf9bc6e8627024537749aa561e7

Authored by zhangxiaowen
1 parent 346ff412

no message

Inline Side-by-side
Showing 2 changed files with 14 additions and 12 deletions
CNLiveSettingModule/Classes/UpdateTel/CNLiveUpdateTelController.m
  View file @9847ff1
... ... @@ -16,6 +16,7 @@
16 16 #import "CNUserInfoManager.h"
17 17 #import "NSString+CNLiveExtension.h"
18 18 #import "CNLiveCategory.h"
  19 +#import "CNLiveBaseKit.h"
19 20  
20 21 #import "CNLiveSettingNavigationBar.h"
21 22 #import "CNLiveUpdateTelView.h"
... ... @@ -148,11 +149,11 @@ static const NSInteger timeValue = 1.5;
148 149 - (YYLabel *)connection {
149 150 if (!_connection) {
150 151 _connection = [[YYLabel alloc] init];
151   - [_connection setFont:UIFontMake(12)];
152 152 _connection.numberOfLines = 0;
153 153 NSString *str = @"若当前号码已不用或丢失,请点击联系客服";
154 154 NSMutableAttributedString *text = [[NSMutableAttributedString alloc] initWithString:str];
155 155 text.color = [UIColor colorWithRed:34/255.0 green:34/255.0 blue:34/255.0 alpha:1.0];
  156 + text.font = UIFontCNMake(12.0);
156 157 [text setTextHighlightRange:NSMakeRange(text.length-4, 4) color:[UIColor colorWithRed:44/255.0 green:209/255.0 blue:201/255.0 alpha:1.0] backgroundColor:[UIColor colorWithRed:242/255.0 green:242/255.0 blue:242/255.0 alpha:1.0] tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) {
157 158  
158 159 NSString *phoneStr = @"010-65832485";
... ...
CNLiveSettingModule/Classes/UpdateTel/CNLiveUpdateTelView.m
  View file @9847ff1
... ... @@ -15,6 +15,7 @@
15 15 #import "NSString+CNLiveExtension.h"
16 16 #import "CNUserInfoManager.h"
17 17 #import "CNLiveCategory.h"
  18 +#import "CNLiveBaseKit.h"
18 19  
19 20 #define TIMECOUNT 60;
20 21  
... ... @@ -97,7 +98,7 @@ static const NSInteger timeValue = 1.5;
97 98 make.top.equalTo(self.lineView.mas_bottom).offset(0);
98 99 make.left.equalTo(self).offset(margin);
99 100 make.height.mas_equalTo(50);
100   - make.width.mas_equalTo(45);
  101 +// make.width.mas_equalTo(60);
101 102 }];
102 103 [self.verification mas_makeConstraints:^(MASConstraintMaker *make) {
103 104 make.centerY.equalTo(self.numberLabel);
... ... @@ -108,12 +109,12 @@ static const NSInteger timeValue = 1.5;
108 109 [self.telTF mas_makeConstraints:^(MASConstraintMaker *make) {
109 110 make.centerY.equalTo(self.numberLabel);
110 111 make.left.equalTo(self.numberLabel.mas_right).offset(20);
111   - make.right.equalTo(self.verification.mas_left).offset(-10);
  112 +// make.right.equalTo(self.verification.mas_left).offset(-10);
112 113 }];
113 114 [self.codeLabel mas_makeConstraints:^(MASConstraintMaker *make) {
114 115 make.top.equalTo(self.numberLabel.mas_bottom).offset(0);
115 116 make.left.equalTo(self.numberLabel);
116   - make.width.mas_equalTo(45);
  117 +// make.width.mas_equalTo(50);
117 118 make.height.mas_equalTo(50);
118 119  
119 120 }];
... ... @@ -185,7 +186,7 @@ static const NSInteger timeValue = 1.5;
185 186 if (!_countryName) {
186 187 _countryName = [[UILabel alloc] init];
187 188 _countryName.textColor = [UIColor colorWithRed:26/255.0 green:26/255.0 blue:26/255.0 alpha:1.0];
188   - _countryName.font = [UIFont systemFontOfSize:14];
  189 + _countryName.font = UIFontCNMake(14.0);
189 190 _countryName.text = @"中国大陆";
190 191 _countryName.textAlignment = NSTextAlignmentLeft;
191 192 }
... ... @@ -217,7 +218,7 @@ static const NSInteger timeValue = 1.5;
217 218 if (!_countryCode) {
218 219 _countryCode = [[UILabel alloc] init];
219 220 _countryCode.textColor = [UIColor colorWithRed:26/255.0 green:26/255.0 blue:26/255.0 alpha:1.0];
220   - _countryCode.font = [UIFont systemFontOfSize:14];
  221 + _countryCode.font = UIFontCNMake(14.0);
221 222 _countryCode.text = @"+86";
222 223 _countryCode.textAlignment = NSTextAlignmentLeft;
223 224 _countryCode.userInteractionEnabled = YES;
... ... @@ -231,7 +232,7 @@ static const NSInteger timeValue = 1.5;
231 232 if (!_numberLabel) {
232 233 _numberLabel = [[UILabel alloc] init];
233 234 _numberLabel.textColor = [UIColor colorWithRed:26/255.0 green:26/255.0 blue:26/255.0 alpha:1.0];
234   - _numberLabel.font = [UIFont systemFontOfSize:14];
  235 + _numberLabel.font = UIFontCNMake(14.0);
235 236 _numberLabel.text = @"手机号";
236 237 _numberLabel.textAlignment = NSTextAlignmentLeft;
237 238 }
... ... @@ -242,7 +243,7 @@ static const NSInteger timeValue = 1.5;
242 243 if (!_codeLabel) {
243 244 _codeLabel = [[UILabel alloc] init];
244 245 _codeLabel.textColor = [UIColor colorWithRed:26/255.0 green:26/255.0 blue:26/255.0 alpha:1.0];
245   - _codeLabel.font = [UIFont systemFontOfSize:14];
  246 + _codeLabel.font = UIFontCNMake(14.0);
246 247 _codeLabel.text = @"验证码";
247 248 _codeLabel.textAlignment = NSTextAlignmentLeft;
248 249 }
... ... @@ -253,7 +254,7 @@ static const NSInteger timeValue = 1.5;
253 254 if (!_telTF) {
254 255 _telTF = [[UITextField alloc] init];
255 256 _telTF.textColor = [UIColor colorWithRed:34/255.0 green:34/255.0 blue:34/255.0 alpha:1.0];
256   - _telTF.font = [UIFont systemFontOfSize:14];
  257 + _telTF.font = UIFontCNMake(14.0);
257 258 _telTF.placeholder = @"请输入新手机号";
258 259 _telTF.delegate = self;
259 260 _telTF.keyboardType = UIKeyboardTypeNumberPad;
... ... @@ -267,7 +268,7 @@ static const NSInteger timeValue = 1.5;
267 268 if (!_codeTF) {
268 269 _codeTF = [[UITextField alloc] init];
269 270 _codeTF.textColor = [UIColor colorWithRed:34/255.0 green:34/255.0 blue:34/255.0 alpha:1.0];
270   - _codeTF.font = [UIFont systemFontOfSize:14];
  271 + _codeTF.font = UIFontCNMake(14.0);
271 272 _codeTF.placeholder = @"请输入验证码";
272 273 _codeTF.delegate = self;
273 274 _codeTF.keyboardType = UIKeyboardTypeNumberPad;
... ... @@ -282,7 +283,7 @@ static const NSInteger timeValue = 1.5;
282 283 _verification = [UIButton buttonWithType:UIButtonTypeCustom];
283 284 [_verification setTitle:@"获取验证码" forState:UIControlStateNormal];
284 285 [_verification setTitleColor:[UIColor colorWithRed:195/255.0 green:195/255.0 blue:195/255.0 alpha:1.0] forState:UIControlStateNormal];
285   - _verification.titleLabel.font = [UIFont systemFontOfSize:14];
  286 + _verification.titleLabel.font = [UIFont systemFontOfSize:14.0];
286 287 _verification.backgroundColor = [UIColor colorWithRed:242/255.0 green:242/255.0 blue:242/255.0 alpha:1.0];
287 288 _verification.layer.cornerRadius = 15;
288 289 _verification.layer.masksToBounds = YES;
... ... @@ -304,7 +305,7 @@ static const NSInteger timeValue = 1.5;
304 305 _binding = [UIButton buttonWithType:UIButtonTypeCustom];
305 306 [_binding setTitle:@"验证后绑定新手机号" forState:UIControlStateNormal];
306 307 [_binding setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
307   - _binding.titleLabel.font = [UIFont systemFontOfSize:15];
  308 + _binding.titleLabel.font = UIFontCNMake(15.0);
308 309 _binding.backgroundColor = [UIColor colorWithRed:0/255.0 green:194/255.0 blue:0/255.0 alpha:1.0];
309 310 _binding.layer.cornerRadius = 45/2.0;
310 311 _binding.layer.masksToBounds = YES;
... ...