no message

zhangxiaowen
1 parent 346ff412
Showing 2 changed files with 14 additions and 12 deletions
CNLiveSettingModule/Classes/UpdateTel/CNLiveUpdateTelController.m
CNLiveSettingModule/Classes/UpdateTel/CNLiveUpdateTelView.m
@@ -16,6 +16,7 @@
 #import "CNUserInfoManager.h"
 #import "NSString+CNLiveExtension.h"
 #import "CNLiveCategory.h"
+#import "CNLiveBaseKit.h"
 #import "CNLiveSettingNavigationBar.h"
 #import "CNLiveUpdateTelView.h"
@@ -148,11 +149,11 @@ static const NSInteger timeValue = 1.5;
 - (YYLabel *)connection {
     if (!_connection) {
         _connection = [[YYLabel alloc] init];
-        [_connection setFont:UIFontMake(12)];
         _connection.numberOfLines = 0;
         NSString *str = @"若当前号码已不用或丢失,请点击联系客服";
         NSMutableAttributedString *text = [[NSMutableAttributedString alloc] initWithString:str];
         text.color = [UIColor colorWithRed:34/255.0 green:34/255.0 blue:34/255.0 alpha:1.0];
+        text.font = UIFontCNMake(12.0);
         [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) {
             NSString *phoneStr = @"010-65832485";
@@ -15,6 +15,7 @@
 #import "NSString+CNLiveExtension.h"
 #import "CNUserInfoManager.h"
 #import "CNLiveCategory.h"
+#import "CNLiveBaseKit.h"
 #define TIMECOUNT 60;
@@ -97,7 +98,7 @@ static const NSInteger timeValue = 1.5;
         make.top.equalTo(self.lineView.mas_bottom).offset(0);
         make.left.equalTo(self).offset(margin);
         make.height.mas_equalTo(50);
-        make.width.mas_equalTo(45);
+//        make.width.mas_equalTo(60);
     }];
     [self.verification mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerY.equalTo(self.numberLabel);
@@ -108,12 +109,12 @@ static const NSInteger timeValue = 1.5;
     [self.telTF mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerY.equalTo(self.numberLabel);
         make.left.equalTo(self.numberLabel.mas_right).offset(20);
-        make.right.equalTo(self.verification.mas_left).offset(-10);
+//        make.right.equalTo(self.verification.mas_left).offset(-10);
     }];
     [self.codeLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.equalTo(self.numberLabel.mas_bottom).offset(0);
         make.left.equalTo(self.numberLabel);
-        make.width.mas_equalTo(45);
+//        make.width.mas_equalTo(50);
         make.height.mas_equalTo(50);
     }];
@@ -185,7 +186,7 @@ static const NSInteger timeValue = 1.5;
     if (!_countryName) {
         _countryName = [[UILabel alloc] init];
         _countryName.textColor = [UIColor colorWithRed:26/255.0 green:26/255.0 blue:26/255.0 alpha:1.0];
-        _countryName.font = [UIFont systemFontOfSize:14];
+        _countryName.font = UIFontCNMake(14.0);
         _countryName.text = @"中国大陆";
         _countryName.textAlignment = NSTextAlignmentLeft;
     }
@@ -217,7 +218,7 @@ static const NSInteger timeValue = 1.5;
     if (!_countryCode) {
         _countryCode = [[UILabel alloc] init];
         _countryCode.textColor = [UIColor colorWithRed:26/255.0 green:26/255.0 blue:26/255.0 alpha:1.0];
-        _countryCode.font = [UIFont systemFontOfSize:14];
+        _countryCode.font = UIFontCNMake(14.0);
         _countryCode.text = @"+86";
         _countryCode.textAlignment = NSTextAlignmentLeft;
         _countryCode.userInteractionEnabled = YES;
@@ -231,7 +232,7 @@ static const NSInteger timeValue = 1.5;
     if (!_numberLabel) {
         _numberLabel = [[UILabel alloc] init];
         _numberLabel.textColor = [UIColor colorWithRed:26/255.0 green:26/255.0 blue:26/255.0 alpha:1.0];
-        _numberLabel.font = [UIFont systemFontOfSize:14];
+        _numberLabel.font = UIFontCNMake(14.0);
         _numberLabel.text = @"手机号";
         _numberLabel.textAlignment = NSTextAlignmentLeft;
     }
@@ -242,7 +243,7 @@ static const NSInteger timeValue = 1.5;
     if (!_codeLabel) {
         _codeLabel = [[UILabel alloc] init];
         _codeLabel.textColor = [UIColor colorWithRed:26/255.0 green:26/255.0 blue:26/255.0 alpha:1.0];
-        _codeLabel.font = [UIFont systemFontOfSize:14];
+        _codeLabel.font = UIFontCNMake(14.0);
         _codeLabel.text = @"验证码";
         _codeLabel.textAlignment = NSTextAlignmentLeft;
     }
@@ -253,7 +254,7 @@ static const NSInteger timeValue = 1.5;
     if (!_telTF) {
         _telTF = [[UITextField alloc] init];
         _telTF.textColor = [UIColor colorWithRed:34/255.0 green:34/255.0 blue:34/255.0 alpha:1.0];
-        _telTF.font = [UIFont systemFontOfSize:14];
+        _telTF.font = UIFontCNMake(14.0);
         _telTF.placeholder = @"请输入新手机号";
         _telTF.delegate = self;
         _telTF.keyboardType = UIKeyboardTypeNumberPad;
@@ -267,7 +268,7 @@ static const NSInteger timeValue = 1.5;
     if (!_codeTF) {
         _codeTF = [[UITextField alloc] init];
         _codeTF.textColor = [UIColor colorWithRed:34/255.0 green:34/255.0 blue:34/255.0 alpha:1.0];
-        _codeTF.font = [UIFont systemFontOfSize:14];
+        _codeTF.font = UIFontCNMake(14.0);
         _codeTF.placeholder = @"请输入验证码";
         _codeTF.delegate = self;
         _codeTF.keyboardType = UIKeyboardTypeNumberPad;
@@ -282,7 +283,7 @@ static const NSInteger timeValue = 1.5;
         _verification = [UIButton buttonWithType:UIButtonTypeCustom];
         [_verification setTitle:@"获取验证码" forState:UIControlStateNormal];
         [_verification setTitleColor:[UIColor colorWithRed:195/255.0 green:195/255.0 blue:195/255.0 alpha:1.0] forState:UIControlStateNormal];
-        _verification.titleLabel.font = [UIFont systemFontOfSize:14];
+        _verification.titleLabel.font = [UIFont systemFontOfSize:14.0];
         _verification.backgroundColor = [UIColor colorWithRed:242/255.0 green:242/255.0 blue:242/255.0 alpha:1.0];
         _verification.layer.cornerRadius = 15;
         _verification.layer.masksToBounds = YES;
@@ -304,7 +305,7 @@ static const NSInteger timeValue = 1.5;
         _binding = [UIButton buttonWithType:UIButtonTypeCustom];
         [_binding setTitle:@"验证后绑定新手机号" forState:UIControlStateNormal];
         [_binding setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
-        _binding.titleLabel.font = [UIFont systemFontOfSize:15];
+        _binding.titleLabel.font = UIFontCNMake(15.0);
         _binding.backgroundColor = [UIColor colorWithRed:0/255.0 green:194/255.0 blue:0/255.0 alpha:1.0];
         _binding.layer.cornerRadius = 45/2.0;
         _binding.layer.masksToBounds = YES;