no message

iOS-Xiaowen
1 parent ad0dff04
Showing 27 changed files with 462 additions and 70 deletions
CNLiveBLoginModule/Assets/CNLiveBLoginModule.xcassets/login_binding_apple.imageset/Contents.json
CNLiveBLoginModule/Assets/CNLiveBLoginModule.xcassets/login_binding_apple.imageset/login_binding_apple@2x.png
CNLiveBLoginModule/Assets/CNLiveBLoginModule.xcassets/login_binding_apple.imageset/login_binding_apple@3x.png
CNLiveBLoginModule/Assets/CNLiveBLoginModule.xcassets/login_binding_logo.imageset/Contents.json
CNLiveBLoginModule/Assets/CNLiveBLoginModule.xcassets/login_binding_logo.imageset/login_binding_logo@2x.png
CNLiveBLoginModule/Assets/CNLiveBLoginModule.xcassets/login_binding_logo.imageset/login_binding_logo@3x.png
CNLiveBLoginModule/Assets/CNLiveBLoginModule.xcassets/login_binding_qq.imageset/Contents.json
CNLiveBLoginModule/Assets/CNLiveBLoginModule.xcassets/login_binding_qq.imageset/login_binding_qq@2x.png
CNLiveBLoginModule/Assets/CNLiveBLoginModule.xcassets/login_binding_qq.imageset/login_binding_qq@3x.png
CNLiveBLoginModule/Assets/CNLiveBLoginModule.xcassets/login_binding_ways.imageset/Contents.json
CNLiveBLoginModule/Assets/CNLiveBLoginModule.xcassets/login_binding_ways.imageset/login_binding_ways@2x.png
CNLiveBLoginModule/Assets/CNLiveBLoginModule.xcassets/login_binding_ways.imageset/login_binding_ways@3x.png
CNLiveBLoginModule/Assets/CNLiveBLoginModule.xcassets/login_binding_wechat.imageset/Contents.json
CNLiveBLoginModule/Assets/CNLiveBLoginModule.xcassets/login_binding_wechat.imageset/login_binding_wechat@2x.png
CNLiveBLoginModule/Assets/CNLiveBLoginModule.xcassets/login_binding_wechat.imageset/login_binding_wechat@3x.png
CNLiveBLoginModule/Assets/CNLiveBLoginModule.xcassets/login_binding_weibo.imageset/Contents.json
CNLiveBLoginModule/Assets/CNLiveBLoginModule.xcassets/login_binding_weibo.imageset/login_binding_weibo@2x.png
CNLiveBLoginModule/Assets/CNLiveBLoginModule.xcassets/login_binding_weibo.imageset/login_binding_weibo@3x.png
CNLiveBLoginModule/Assets/CNLiveBLoginModule.xcassets/login_down.imageset/Contents.json
CNLiveBLoginModule/Assets/CNLiveBLoginModule.xcassets/login_down.imageset/login_down@2x.png
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "login_binding_apple@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "login_binding_apple@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "login_binding_logo@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "login_binding_logo@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "login_binding_qq@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "login_binding_qq@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "login_binding_ways@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "login_binding_ways@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "login_binding_wechat@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "login_binding_wechat@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "login_binding_weibo@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "login_binding_weibo@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "login_down@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "login_down@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
@@ -152,6 +152,9 @@
         model.faceUrl = userInfo.faceUrl;
         model.thirdPartyId = userInfo.thirdPartyId;
+        model.countryName = self.loginView.countryName;
+        model.countryCode = self.loginView.countryName;
+        
         switch (type) {
             case CNLiveSendAuthRespApple:
             {
@@ -84,14 +84,14 @@
 - (CNLiveBindingTelView *)bindingTelView {
     if (!_bindingTelView) {
-        _bindingTelView = [[CNLiveBindingTelView alloc] initWithFrame:CGRectMake(self.view.frame.size.width/8.0, NavigationContentTop, self.view.frame.size.width*3/4.0, 400) model:self.model];
+        _bindingTelView = [[CNLiveBindingTelView alloc] initWithFrame:CGRectMake(0, NavigationContentTop+20, self.view.frame.size.width, 400) model:self.model];
     }
     return _bindingTelView;
 }
 - (YYLabel *)protocol {
     if (!_protocol) {
-        _protocol = [[YYLabel alloc] initWithFrame:CGRectMake(0, self.view.frame.size.height-30-NavigationContentTop-SafeAreaInsetsConstantForDeviceWithNotch.bottom, self.view.frame.size.width, 30)];
+        _protocol = [[YYLabel alloc] initWithFrame:CGRectMake(0, self.view.frame.size.height-40-SafeAreaInsetsConstantForDeviceWithNotch.bottom, self.view.frame.size.width, 30)];
         _protocol.textAlignment = NSTextAlignmentCenter;
         _protocol.textColor = [UIColor colorWithRed:173/255.0 green:173/255.0 blue:173/255.0 alpha:1.0];
         _protocol.font = [UIFont systemFontOfSize:14.0];
@@ -107,7 +107,7 @@
             __strong typeof(weakSelf) strongSelf = weakSelf;
             if(!strongSelf) return;
             [strongSelf.view endEditing:YES];
-            [CNLiveUserAgreementManager jumpToAgreementH5WithType:CNLiveUserAgreementUser];
+            [CNLiveUserAgreementManager jumpToAgreementH5WithType:CNLiveUserAgreementAccountBinding];
         }];
         _protocol.attributedText = text;
@@ -17,6 +17,7 @@
 #import <CNLiveUserSystemSDK/CNLiveUserSystemTypeDef.h>
 #import "CNUserInfoManager.h"
 #import "CNLiveManager.h"
+#import "CNLiveChooseCountryController.h"
 #import "CNLiveLoginCountryView.h"
 #import "CNLiveLoginTextField.h"
@@ -24,82 +25,221 @@
 #import "CNLiveThreeLoginModel.h"
 #import "CNLiveLoginRequest.h"
-@interface CNLiveBindingTelView()<UITextFieldDelegate,CNLiveCountDownButtonDataSource, CNLiveCountDownButtonDelegate>
+@interface CNLiveBindingTelView()<UITextFieldDelegate,CNLiveCountDownButtonDataSource, CNLiveCountDownButtonDelegate,ChooseCountriesDelegate>
 {
     NSString *_countryCode;      // 国家Code
+    NSString *_countryName;      // 国家Code
     NSString *_verificationCode; // 验证码
 }
-@property (nonatomic, weak) CNLiveLoginTextField *account;
-@property (nonatomic, weak) CNLiveLoginTextField *code;
-@property (nonatomic, strong) CNLiveCountDownButton *countDown;
+@property (nonatomic, weak) QMUIButton *three;
+@property (nonatomic, weak) UIImageView *bindingImage;
+@property (nonatomic, weak) QMUIButton *netadd;
+@property (nonatomic, weak) UILabel *desc;
+@property (nonatomic, weak) UIView *line;
+@property (nonatomic, weak) UIView *countryBox;
+@property (nonatomic, weak) UIView *telBox;
+@property (nonatomic, weak) UIView *codeBox;
+
+@property (nonatomic, strong) CNLiveLoginTextField *telTF;
+@property (nonatomic, strong) CNLiveLoginTextField *codeTF;
+
+@property (nonatomic, strong) UILabel *country;
+@property (nonatomic, strong) UIButton *code;
+@property (nonatomic, strong) CNLiveCountDownButton *codeBtn;
+
 @property (nonatomic, weak) UIButton *binding;
+
 @property (nonatomic, strong) CNLiveThreeLoginModel *model;
+@property (nonatomic, assign) CNLiveSendAuthResp type;
 @end
 @implementation CNLiveBindingTelView
 #define XWKeyWindow [UIApplication sharedApplication].keyWindow
+static NSInteger const space = 10;
 static NSInteger const rowHeight = 40;
-static NSInteger const space = 40;
 static const NSInteger timeValue = 1.5;
 - (instancetype)initWithFrame:(CGRect)frame model:(CNLiveThreeLoginModel *)model {
     self = [super initWithFrame:frame];
     if (self) {
         self.userInteractionEnabled = YES;
-        _countryCode = @"86";
-        self.model = model;
         [self createSubviews:frame];
-        
+        _countryName = model.countryName;
+        _countryCode = model.countryCode;
+        self.model = model;
+        self.type = model.type;
+        [self addSubview:self.country];
+        [self addSubview:self.code];
+
+        [self addSubview:self.telTF];
+        [self addSubview:self.codeTF];
+        [self addSubview:self.codeBtn];
     }
     return self;
 }
+
+- (void)setType:(CNLiveSendAuthResp)type{
+    switch (type) {
+        case CNLiveSendAuthRespWX:
+        {
+            UIImage *image = [self getImageWithImageName:@"login_binding_wechat" bundleName:@"CNLiveBLoginModule" targetClass:[self class]];
+            [self.three setImage:image forState:UIControlStateNormal];
+            [self.three setTitle:@"微信" forState:UIControlStateNormal];
+            self.desc.text = @"确定后,此微信账号将与网家家账号绑定";
+        }
+            break;
+        case CNLiveSendAuthRespQQ:
+        {
+            UIImage *image = [self getImageWithImageName:@"login_binding_qq" bundleName:@"CNLiveBLoginModule" targetClass:[self class]];
+            [self.three setImage:image forState:UIControlStateNormal];
+            [self.three setTitle:@"QQ" forState:UIControlStateNormal];
+            self.desc.text = @"确定后,此QQ账号将与网家家账号绑定";
+        }
+            break;
+        case CNLiveSendAuthRespWB:
+        {
+            UIImage *image = [self getImageWithImageName:@"login_binding_weibo" bundleName:@"CNLiveBLoginModule" targetClass:[self class]];
+            [self.three setImage:image forState:UIControlStateNormal];
+            [self.three setTitle:@"微博" forState:UIControlStateNormal];
+            self.desc.text = @"确定后,此微博账号将与网家家账号绑定";
+        }
+            break;
+        case CNLiveSendAuthRespApple:
+        {
+            UIImage *image = [self getImageWithImageName:@"login_binding_apple" bundleName:@"CNLiveBLoginModule" targetClass:[self class]];
+            [self.three setImage:image forState:UIControlStateNormal];
+            [self.three setTitle:@"苹果" forState:UIControlStateNormal];
+            self.desc.text = @"确定后,此苹果账号将与网家家账号绑定";
+        }
+            break;
+            
+    }
+    
+}
+
+
 - (void)createSubviews:(CGRect)frame{
-    CNLiveLoginTextField *account = [[CNLiveLoginTextField alloc] initWithFrame:CGRectMake(0, 0, frame.size.width, rowHeight)];
-    account.keyboardType = UIKeyboardTypeNumberPad;
-    account.placeholder = @"请输入手机号";
-    account.textColor = [UIColor colorWithRed:51/255.0 green:51/255.0 blue:51/255.0 alpha:1.0];
-    account.placeholderColor = [UIColor colorWithRed:173/255.0 green:173/255.0 blue:173/255.0 alpha:1.0];
-    account.font = [UIFont systemFontOfSize:16];
-    account.textAlignment = NSTextAlignmentLeft;
-    [account addTarget:self action:@selector(textFieldDidChange:) forControlEvents:UIControlEventEditingChanged];
-    account.clearButtonMode = UITextFieldViewModeWhileEditing;
-    account.delegate = self;
-    [self addSubview:account];
-    self.account = account;
+    CGFloat width = SCREEN_WIDTH - (SCREEN_WIDTH == 320 ? 30 : 60);
+       
+    CGFloat btnLeft = (SCREEN_WIDTH == 320 ? 30 : 60)/2.0;
+    CGFloat btnTop = 20;
+    CGFloat btnWidth = width/3.0;
+    CGFloat btnHeight = 80;
+ 
+    QMUIButton *three = [QMUIButton buttonWithType:UIButtonTypeCustom];
+    three.frame = CGRectMake(btnLeft, btnTop, btnWidth, btnHeight);
+    [three setImage:[self getImageWithImageName:@"login_binding_logo" bundleName:@"CNLiveBLoginModule" targetClass:[self class]] forState:UIControlStateNormal];
+    three.imagePosition = QMUIButtonImagePositionTop;
+    three.spacingBetweenImageAndTitle = 10;
+    [three setTitleColor:[UIColor colorWithRed:102/255.0 green:102/255.0 blue:102/255.0 alpha:1.0]  forState:UIControlStateNormal];
+    three.titleLabel.font = [UIFont systemFontOfSize:13];
+    three.adjustsImageWhenHighlighted = NO;
+    three.userInteractionEnabled = NO;
+    [self addSubview:three];
+    self.three = three;
-    CNLiveLoginTextField *code = [[CNLiveLoginTextField alloc] initWithFrame:CGRectMake(account.left, account.bottom+space, frame.size.width/2.0, rowHeight)];
-    code.keyboardType = UIKeyboardTypeNumberPad;
-    code.placeholder = @"请输入验证码";
-    code.textColor = [UIColor colorWithRed:51/255.0 green:51/255.0 blue:51/255.0 alpha:1.0];
-    code.placeholderColor = [UIColor colorWithRed:173/255.0 green:173/255.0 blue:173/255.0 alpha:1.0];
-    code.font = [UIFont systemFontOfSize:16];
-    code.textAlignment = NSTextAlignmentLeft;
-    [code addTarget:self action:@selector(textFieldDidChange:) forControlEvents:UIControlEventEditingChanged];
-    code.clearButtonMode = UITextFieldViewModeWhileEditing;
-    code.delegate = self;
-    [self addSubview:code];
-    self.code = code;
+    UIImageView *bindingImage = [[UIImageView alloc]initWithFrame:CGRectMake(three.right, three.top, three.width,  three.height)];
+    UIImage *image1 = [self getImageWithImageName:@"login_binding_ways" bundleName:@"CNLiveBLoginModule" targetClass:[self class]];
+    bindingImage.image = image1;
+    bindingImage.contentMode = UIViewContentModeCenter;
+    [self addSubview:bindingImage];
+    self.bindingImage = bindingImage;
-    CNLiveCountDownButton *countDown = [CNLiveCountDownButton buttonWithType:UIButtonTypeCustom];
-    countDown.dataSource = self;
-    countDown.delegate = self;
-    countDown.frame = CGRectMake(frame.size.width-80, account.bottom+space+10, 80, rowHeight-10);
-    UIImage *image2 = [self getImageWithImageName:BusinessLive?@"login_get_code_b":@"login_get_code" bundleName:@"CNLiveBLoginModule" targetClass:[self class]];
-    [countDown setImage:image2 forState:UIControlStateNormal];
-    countDown.adjustsImageWhenHighlighted = NO;
-    [countDown setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
-    countDown.titleLabel.font = [UIFont systemFontOfSize:12.0];
-    countDown.layer.cornerRadius = 15;
-    countDown.layer.masksToBounds = YES;
-    [self addSubview:countDown];
-    self.countDown = countDown;
+    QMUIButton *netadd = [QMUIButton buttonWithType:UIButtonTypeCustom];
+    netadd.frame = CGRectMake(bindingImage.right, three.top, three.width, three.height);
+    [netadd setImage:[self getImageWithImageName:@"login_binding_logo" bundleName:@"CNLiveBLoginModule" targetClass:[self class]] forState:UIControlStateNormal];
+    [netadd setTitle:@"网家家企业版" forState:UIControlStateNormal];
+    [netadd setTitleColor:[UIColor colorWithRed:102/255.0 green:102/255.0 blue:102/255.0 alpha:1.0]  forState:UIControlStateNormal];
+    netadd.titleLabel.font = [UIFont systemFontOfSize:13];
+    netadd.imagePosition = QMUIButtonImagePositionTop;
+    netadd.spacingBetweenImageAndTitle = 10;
+    netadd.adjustsImageWhenHighlighted = NO;
+    netadd.userInteractionEnabled = NO;
+    [self addSubview:netadd];
+    self.netadd = netadd;
+    
+    UILabel *desc = [[UILabel alloc] initWithFrame:CGRectMake(0, three.bottom+10, SCREEN_WIDTH, btnHeight/2.0)];
+     desc.textColor = [UIColor colorWithRed:51/255.0 green:51/255.0 blue:51/255.0 alpha:1.0];
+    desc.font = [UIFont systemFontOfSize:15];
+    desc.textAlignment = NSTextAlignmentCenter;
+    [self addSubview:desc];
+    self.desc = desc;
+    
+    UIView *line = [[UIView alloc] initWithFrame:CGRectMake(0, desc.bottom+10, SCREEN_WIDTH, 0.5)];
+     line.backgroundColor = [UIColor colorWithRed:238/255.0 green:238/255.0 blue:238/255.0 alpha:1.0];
+    [self addSubview:line];
+    self.line = line;
+    
+    UIView *countryBox = [[UIView alloc]initWithFrame:CGRectMake(2*space, self.line.bottom + 2*space, SCREEN_WIDTH  - (4*space), 45)];
+    countryBox.layer.cornerRadius = 45/2.0;
+    countryBox.layer.masksToBounds = YES;
+    countryBox.layer.borderWidth = 0.5;
+    countryBox.layer.borderColor = [UIColor colorWithRed:204/255.0 green:204/255.0 blue:204/255.0  alpha:1.0].CGColor;
+    [self addSubview:countryBox];
+    self.countryBox = countryBox;
+    UIView *telBox = [[UIView alloc]initWithFrame:CGRectMake(_countryBox.left, _countryBox.bottom + space,  _countryBox.width,  _countryBox.height)];
+    telBox.layer.cornerRadius = 45/2.0;
+    telBox.layer.masksToBounds = YES;
+    telBox.layer.borderWidth = 0.5;
+    telBox.layer.borderColor = [UIColor colorWithRed:204/255.0 green:204/255.0 blue:204/255.0 alpha:1.0].CGColor;
+    [self addSubview:telBox];
+    self.telBox = telBox;
+    
+    UIView *codeBox = [[UIView alloc]initWithFrame:CGRectMake(_telBox.left, _telBox.bottom + space, _telBox.width,   _telBox.height)];
+    codeBox.layer.cornerRadius = 45/2.0;
+    codeBox.layer.masksToBounds = YES;
+    codeBox.layer.borderWidth = 0.5;
+    codeBox.layer.borderColor = [UIColor colorWithRed:204/255.0 green:204/255.0 blue:204/255.0 alpha:1.0].CGColor;
+    [self addSubview:codeBox];
+    self.codeBox = codeBox;
+    
+//    CNLiveLoginTextField *account = [[CNLiveLoginTextField alloc] initWithFrame:CGRectMake(0, self.codeBox.height+10, frame.size.width, rowHeight)];
+//    account.keyboardType = UIKeyboardTypeNumberPad;
+//    account.placeholder = @"请输入手机号";
+//    account.textColor = [UIColor colorWithRed:51/255.0 green:51/255.0 blue:51/255.0 alpha:1.0];
+//    account.placeholderColor = [UIColor colorWithRed:173/255.0 green:173/255.0 blue:173/255.0 alpha:1.0];
+//    account.font = [UIFont systemFontOfSize:16];
+//    account.textAlignment = NSTextAlignmentLeft;
+//    [account addTarget:self action:@selector(textFieldDidChange:) forControlEvents:UIControlEventEditingChanged];
+//    account.clearButtonMode = UITextFieldViewModeWhileEditing;
+//    account.delegate = self;
+//    [self addSubview:account];
+//    self.account = account;
+//
+//    CNLiveLoginTextField *code = [[CNLiveLoginTextField alloc] initWithFrame:CGRectMake(account.left, account.bottom+space, frame.size.width/2.0, rowHeight)];
+//    code.keyboardType = UIKeyboardTypeNumberPad;
+//    code.placeholder = @"请输入验证码";
+//    code.textColor = [UIColor colorWithRed:51/255.0 green:51/255.0 blue:51/255.0 alpha:1.0];
+//    code.placeholderColor = [UIColor colorWithRed:173/255.0 green:173/255.0 blue:173/255.0 alpha:1.0];
+//    code.font = [UIFont systemFontOfSize:16];
+//    code.textAlignment = NSTextAlignmentLeft;
+//    [code addTarget:self action:@selector(textFieldDidChange:) forControlEvents:UIControlEventEditingChanged];
+//    code.clearButtonMode = UITextFieldViewModeWhileEditing;
+//    code.delegate = self;
+//    [self addSubview:code];
+//    self.code = code;
+//
+//    CNLiveCountDownButton *countDown = [CNLiveCountDownButton buttonWithType:UIButtonTypeCustom];
+//    countDown.dataSource = self;
+//    countDown.delegate = self;
+//    countDown.frame = CGRectMake(frame.size.width-80, account.bottom+space+10, 80, rowHeight-10);
+//    UIImage *image2 = [self getImageWithImageName:BusinessLive?@"login_get_code_b":@"login_get_code" bundleName:@"CNLiveBLoginModule" targetClass:[self class]];
+//    [countDown setImage:image2 forState:UIControlStateNormal];
+//    countDown.adjustsImageWhenHighlighted = NO;
+//    [countDown setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+//    countDown.titleLabel.font = [UIFont systemFontOfSize:12.0];
+//    countDown.layer.cornerRadius = 15;
+//    countDown.layer.masksToBounds = YES;
+//    [self addSubview:countDown];
+//    self.countDown = countDown;
+//
     UIButton *binding = [UIButton buttonWithType:UIButtonTypeCustom];
-    binding.frame = CGRectMake(5, code.bottom+space, frame.size.width-10, rowHeight);
+    binding.frame = CGRectMake(2*space, self.codeBox.bottom+2*space, frame.size.width-4*space, rowHeight);
     [binding setTitle:@"确认手机绑定并同意协议" forState:UIControlStateNormal];
     [binding setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
     binding.titleLabel.font = [UIFont systemFontOfSize:15.0];
@@ -114,9 +254,25 @@ static const NSInteger timeValue = 1.5;
 }
+#pragma mark - CNLiveLoginCountryViewDelegate
+- (void)chooseViewController:(CNLiveChooseCountryController *)controller countryName:(NSString *)countryName countryCode:(NSString *)countryCode {
+    _countryName = countryName;
+    _country.text = countryName;
+    _countryCode = countryCode;
+    [_code setTitle:[NSString stringWithFormat:@"+%@",countryCode] forState:UIControlStateNormal];
+}
+#pragma mark - Action
+- (void)countryCodeDidClicked:(UIButton *)btn{
+    CNLiveChooseCountryController *vc = [[CNLiveChooseCountryController alloc]init];
+    vc.delegate = self;
+    vc.modalPresentationStyle = UIModalPresentationOverFullScreen;
+    vc.hidesBottomBarWhenPushed = YES;
+    [CNLivePageJumpManager presentViewController:vc];
+}
+
 #pragma mark - UITextFieldDelegate
 - (BOOL)textFieldShouldBeginEditing:(UITextField *)textField{
-    if ([textField isEqual:_account] || [textField isEqual:_code]) {
+    if ([textField isEqual:_telTF] || [textField isEqual:_codeTF]) {
         return YES;
     }
     else {
@@ -126,7 +282,7 @@ static const NSInteger timeValue = 1.5;
 }
 - (void)textFieldDidChange:(UITextField *)textField {
-    if (![_account.text isEqualToString:@""] && ![_code.text isEqualToString:@""]) {
+    if (![_telTF.text isEqualToString:@""] && ![_codeTF.text isEqualToString:@""]) {
         _binding.enabled = YES;
     }
@@ -138,7 +294,7 @@ static const NSInteger timeValue = 1.5;
 }
 - (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string {
-    if ([textField isEqual:_account]) {
+    if ([textField isEqual:_telTF]) {
         NSInteger maxTextLength  = 20;
         if(string.length == 0) {
             //判断是不是删除键
@@ -205,7 +361,80 @@ static const NSInteger timeValue = 1.5;
  // Drawing code
  }
  */
+#pragma mark - 懒加载
+- (UILabel *)country{
+    if (!_country) {
+        _country = [[UILabel alloc] initWithFrame:CGRectMake(3.5*space, _countryBox.top, SCREEN_WIDTH - (4*space)-70, _countryBox.height)];
+        _country.font = [UIFont systemFontOfSize:16.0];
+        _country.textColor = [UIColor colorWithRed:51/255.0 green:51/255.0 blue:51/255.0 alpha:1.0];
+        _country.text = _countryName;
+        _country.userInteractionEnabled = YES;
+    }
+    return _country;
+}
+- (UIButton *)code{
+    if (!_code) {
+        _code = [UIButton buttonWithType:UIButtonTypeCustom];
+        _code.frame = CGRectMake(SCREEN_WIDTH-3.5*space-70, _countryBox.top, 70, _countryBox.height);
+        [_code setTitle:[NSString stringWithFormat:@"+%@",_countryCode] forState:UIControlStateNormal];
+        [_code setTitleColor:[UIColor colorWithRed:49/255.0 green:49/255.0 blue:49/255.0 alpha:1.0] forState:UIControlStateNormal];
+        _code.titleLabel.font = [UIFont systemFontOfSize:16.0];
+        [_code setImage:[self getImageWithImageName:@"login_down" bundleName:@"CNLiveBLoginModule" targetClass:[self class]] forState:UIControlStateNormal];
+        _code.adjustsImageWhenHighlighted = NO;
+        //button图片的偏移量，距上左下右分别(0, 0, 0, 0)像素点
+        _code.imageEdgeInsets = UIEdgeInsetsMake(0, 60, 0, 0);
+        //button标题的偏移量，这个偏移量是相对于图片的
+        _code.titleEdgeInsets = UIEdgeInsetsMake(0, 0, 0, 10);
+        [_code addTarget:self action:@selector(countryCodeDidClicked:) forControlEvents:UIControlEventTouchUpInside];
+    }
+    return _code;
+    
+}
+- (CNLiveLoginTextField *)telTF {
+    if (!_telTF) {
+        _telTF = [[CNLiveLoginTextField alloc] initWithFrame:CGRectMake(3.5*space, _countryBox.bottom + space, SCREEN_WIDTH - (7*space), _countryBox.height)];
+        _telTF.placeholderColor = [UIColor colorWithRed:173/255.0 green:173/255.0 blue:173/255.0 alpha:1.0];
+        _telTF.textColor = [UIColor blackColor];
+        _telTF.keyboardType = UIKeyboardTypeNumberPad;
+        _telTF.placeholder = @"请输入手机号";
+        _telTF.font = UIFontMake(14);
+        _telTF.clearButtonMode = UITextFieldViewModeAlways;
+        _telTF.textAlignment = NSTextAlignmentLeft;
+        _telTF.delegate = self;
+    }
+    return _telTF;
+}
+
+- (CNLiveLoginTextField *)codeTF {
+    if (!_codeTF) {
+        _codeTF = [[CNLiveLoginTextField alloc] initWithFrame:CGRectMake(_telTF.left, _telTF.bottom + space, _telTF.width,  _telTF.height)];
+        _codeTF.keyboardType = UIKeyboardTypeNumberPad;
+        _codeTF.placeholder = @"请输入验证码";
+        _codeTF.textColor = [UIColor blackColor];
+        _codeTF.placeholderColor = [UIColor colorWithRed:173/255.0 green:173/255.0 blue:173/255.0 alpha:1.0];
+        _codeTF.font = UIFontMake(14);
+        _codeTF.textAlignment = NSTextAlignmentLeft;
+        _codeTF.delegate = self;
+    }
+    return _codeTF;
+}
+
+- (CNLiveCountDownButton *)codeBtn {
+    if (!_codeBtn) {
+        _codeBtn = [CNLiveCountDownButton buttonWithType:UIButtonTypeCustom];
+        _codeBtn.frame = CGRectMake(SCREEN_WIDTH-3.5*space-80, _codeTF.top+space/2.0, 80, _telTF.height-space);
+        _codeBtn.adjustsImageWhenHighlighted = NO;
+        [_codeBtn setTitleColor:[UIColor colorWithRed:72/255.0 green:168/255.0 blue:249/255.0 alpha:1.0] forState:UIControlStateNormal];
+        _codeBtn.titleLabel.font = [UIFont systemFontOfSize:15.0];
+        [_codeBtn setTitle:@"获取验证码" forState:UIControlStateNormal];
+        [_codeBtn setContentHorizontalAlignment:UIControlContentHorizontalAlignmentRight];
+        _codeBtn.backgroundColor = [UIColor whiteColor];
+        _codeBtn.delegate = self;
+        _codeBtn.dataSource = self;
+    }
+    return _codeBtn;
+}
 #pragma mark - CNLiveCountdownButton DataSource
 // 设置倒计时总秒数
 - (NSInteger)startCountDownNumOfCountDownButton:(CNLiveCountDownButton *)countdownButton {
@@ -216,7 +445,7 @@ static const NSInteger timeValue = 1.5;
 // 倒计时按钮点击
 - (void)countDownButtonDidClick:(CNLiveCountDownButton *)button {
     //获取验证码
-    if ([_account.text isEqualToString:@""]) {
+    if ([_telTF.text isEqualToString:@""]) {
         [QMUITips showWithText:@"请输入手机号"];
         return;
     }
@@ -224,17 +453,16 @@ static const NSInteger timeValue = 1.5;
         [QMUITips showError:@"无法连接网络" inView:XWKeyWindow hideAfterDelay:timeValue];
         return ;
     }
-    _code.text = @"";
+    _codeTF.text = @"";
     [_code becomeFirstResponder];
     button.userInteractionEnabled = NO;
     [QMUITips showLoadingInView:XWKeyWindow];
-    [CNLiveUserSystemCenter verificationCodeType:VerificationCodeTypeShortcutLogin mobile:_account.text countryCode:@"86" success:^(id result) {
+    [CNLiveUserSystemCenter verificationCodeType:VerificationCodeTypeShortcutLogin mobile:_telTF.text countryCode:@"86" success:^(id result) {
         [QMUITips hideAllToastInView:XWKeyWindow animated:YES];
         [QMUITips showWithText:@"验证码已发送"];
-//        button.backgroundColor = HexColor(0xdedede);
-        button.frame = CGRectMake(self.frame.size.width-110, self.account.bottom+space+10, 110, rowHeight-10);
+        button.frame = CGRectMake(self.frame.size.width-110-2*space, self.telTF.bottom+space+10, 110, rowHeight-10);
         [button setImage:nil forState:UIControlStateNormal];
         NSString *title = [NSString stringWithFormat:@"%d秒后重新发送", 60];
         [button setTitle:title forState:UIControlStateNormal];
@@ -258,7 +486,7 @@ static const NSInteger timeValue = 1.5;
 // 倒计时进行中
 - (void)countDownButtonDidCountDown:(CNLiveCountDownButton *)button countDownNum:(NSInteger)countDownNum {
     if(button.frame.size.width != 110){
-        button.frame = CGRectMake(self.frame.size.width-110, self.account.bottom+space+10, 110, rowHeight-10);
+        button.frame = CGRectMake(self.frame.size.width-110, self.telTF.bottom+space+10, 110, rowHeight-10);
     }
     NSString *title = [NSString stringWithFormat:@"%ld秒后重新发送", countDownNum];
     [button setTitle:title forState:UIControlStateNormal];
@@ -267,7 +495,7 @@ static const NSInteger timeValue = 1.5;
 // 倒计时结束
 - (void)countDownButtonDidEndCountDown:(CNLiveCountDownButton *)button {
-    button.frame = CGRectMake(self.frame.size.width-80, self.account.bottom+space+10, 80, rowHeight-10);
+    button.frame = CGRectMake(self.frame.size.width-80, self.telTF.bottom+space+10, 80, rowHeight-10);
     button.backgroundColor = [UIColor whiteColor];
     button.userInteractionEnabled = YES;
     [button setTitle:@"" forState:UIControlStateNormal];
@@ -277,11 +505,11 @@ static const NSInteger timeValue = 1.5;
 #pragma mark - Action
 - (void)bindingDidClicked:(UIButton *)btn{
-    if ([self.account.text isEqualToString:@""]) {
+    if ([self.telTF.text isEqualToString:@""]) {
         [QMUITips showWithText:@"请输入手机号" inView:XWKeyWindow hideAfterDelay:1.5];
         return;
     }
-    if ([self.code.text isEqualToString:@""]) {
+    if ([self.codeTF.text isEqualToString:@""]) {
         [QMUITips showWithText:@"请输入验证码" inView:XWKeyWindow hideAfterDelay:1.5];
         return;
     }
@@ -299,9 +527,9 @@ static const NSInteger timeValue = 1.5;
 // 绑定手机号请求登录
 - (void)thirdPartyLoginBindingTel{
     NSDictionary *params = @{
-                             @"mobile":self.account.text,
-                             @"countryCode":self.model.countryCode?self.model.countryCode:@"",
-                             @"verificationCode":self.code.text,
+                             @"mobile":self.telTF.text,
+                             @"countryCode":_countryCode,
+                             @"verificationCode":self.codeTF.text,
                              @"thirdPartyPlat":self.model.thirdPartyPlat?self.model.thirdPartyPlat:@"",
                              @"thirdPartyId":self.model.thirdPartyId?self.model.thirdPartyId:@"",
                              @"frmId":self.model.frmId?self.model.frmId:@"apple",
@@ -16,6 +16,9 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 @interface CNLiveLoginView : UIView
 @property (nonatomic, weak) id<CNLiveLoginViewDelegate> delegate;
+@property (nonatomic, copy) NSString *countryCode;
+@property (nonatomic, copy) NSString *countryName;
+@property (nonatomic, copy) NSString *verificationCode;
 @end
@@ -27,10 +27,10 @@
 //#import "XWLoginNotification.h"
 @interface CNLiveLoginView()<UITextFieldDelegate, CNLiveLoginCountryViewDelegate,CNLiveCountDownButtonDataSource, CNLiveCountDownButtonDelegate>
-{
-    NSString *_countryCode;      // 国家Code
-    NSString *_verificationCode; // 验证码
-}
+//{
+//    NSString *_countryCode;      // 国家Code
+//    NSString *_verificationCode; // 验证码
+//}
 @property (nonatomic, weak) UIImageView *logo;
 @property (nonatomic, weak) CNLiveLoginCountryView *country;
 @property (nonatomic, weak) CNLiveLoginTextField *account;
@@ -54,6 +54,7 @@ static const NSInteger timeValue = 1.5;
     self = [super initWithFrame:frame];
     if (self) {
         self.userInteractionEnabled = YES;
+        _countryName = @"中国大陆";
         _countryCode = @"86";
         [self createSubviews:frame];
@@ -227,6 +228,7 @@ static const NSInteger timeValue = 1.5;
 #pragma mark - CNLiveLoginCountryViewDelegate
 - (void)chooseCountryName:(NSString *)countryName countryCode:(NSString *)countryCode{
+    _countryName = countryName;
     [_account resignFirstResponder];
     [_code resignFirstResponder];
     if(![_countryCode isEqualToString:countryCode]){
@@ -12,6 +12,8 @@
 #import "CNLiveEnvironment.h"
 #import <CNLiveUserSystemSDK/CNLiveUserSystemCenter.h>
 #import <CNLiveRequestBastKit/CNLiveNetworking.h>
+#import "CNLiveBindingTelController.h"
+
 @implementation CNLIVEAppDelegate
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
@@ -26,8 +28,8 @@
     }
     [self networkParamAction];
-    CNLiveLoginController *vc = [[CNLiveLoginController alloc] init];
-    vc.isShowClose = NO;
+    CNLiveBindingTelController *vc = [[CNLiveBindingTelController alloc] init];
+//    vc.isShowClose = NO;
     UINavigationController *nav = [[UINavigationController alloc]initWithRootViewController:vc];
     self.window.rootViewController = nav;
     [self.window makeKeyAndVisible];