no message

zhangxiaowen
1 parent 31293f79
Showing 7 changed files with 84 additions and 61 deletions
CNLiveSettingModule.podspec
CNLiveSettingModule/Classes/Controller/CNLiveSettingController.m
CNLiveSettingModule/Classes/UpdateTel/CNLiveUpdateTelController.m
CNLiveSettingModule/Classes/UpdateTel/CNLiveUpdateTelView.h
CNLiveSettingModule/Classes/UpdateTel/CNLiveUpdateTelView.m
Example/CNLiveSettingModule.xcodeproj/project.pbxproj
Example/CNLiveSettingModule/CNLIVEAppDelegate.m
@@ -146,6 +146,9 @@ TODO: 网家家-设置模块.
   s.dependency 'CNLiveBusinessTools'
   s.dependency 'CNLiveCommonClass'
+  
+  # 切换城市
+  s.dependency 'CNLiveChooseCountry'
   s.static_framework = true
@@ -37,7 +37,6 @@
 @implementation CNLiveSettingController
 static const NSInteger timeValue = 1.5;
-
 #pragma mark - 加载数据
 - (void)loadData {
     NSArray *data = @[
@@ -112,8 +111,8 @@ static const NSInteger timeValue = 1.5;
                           @"height":@"51",
                           @"lineHeight":@"1"
                           }
-                      
-                      ];
+                     
+    ];
     for(NSDictionary *dic in data){
         [self.data addObject:[CNLiveSettingModel mj_objectWithKeyValues:dic]];
     }
@@ -7,7 +7,7 @@
 //
 #import "CNLiveUpdateTelController.h"
-//#import "CNSelectCountriesViewController.h"
+#import "CNLiveChooseCountryController.h"
 #import "YYKit.h"
 #import <Masonry/Masonry.h>
 #import "QMUIKit.h"
@@ -19,11 +19,7 @@
 #import "CNLiveSettingNavigationBar.h"
 #import "CNLiveUpdateTelView.h"
-//@interface CNLiveUpdateTelController ()<UITextFieldDelegate,SelectCountriesDelegate>{
-
-@interface CNLiveUpdateTelController()<UITextFieldDelegate, CNLiveSettingNavigationBarDelegate, CNLiveUpdateTelViewDelegate>{
-    NSString * _code;
-}
+@interface CNLiveUpdateTelController()<UITextFieldDelegate, CNLiveSettingNavigationBarDelegate, CNLiveUpdateTelViewDelegate, ChooseCountriesDelegate>
 @property (nonatomic, strong) CNLiveSettingNavigationBar *navigationBar;
 @property (nonatomic, strong) CNLiveUpdateTelView *updateTel;//背景
@@ -32,6 +28,7 @@
 @end
 @implementation CNLiveUpdateTelController
+static const NSInteger timeValue = 1.5;
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
@@ -42,8 +39,6 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
-
-    _code = @"86";
     self.view.backgroundColor = [UIColor colorWithRed:242/255.0 green:242/255.0 blue:242/255.0 alpha:1.0];
@@ -104,20 +99,20 @@
     // Dispose of any resources that can be recreated.
 }
-#pragma mark - SelectCountriesDelegate
-//- (void)selectViewController:(CNSelectCountriesViewController *)viewController countryName:(NSString *)name countryCode:(NSString *)code{
-//    _countryName.text = name;
-//    _countryCode.text = [NSString stringWithFormat:@"+%@",code];
-//    _codeStr = code;
-//    NSLog(@"%@---%@",name,code);
-//
-//}
+#pragma mark - ChooseCountriesDelegate
+- (void)chooseViewController:(CNLiveChooseCountryController *)controller countryName:(NSString *)name countryCode:(NSString *)code{
+    _updateTel.countryName.text = name;
+    _updateTel.countryCode.text = [NSString stringWithFormat:@"+%@",code];
+    _updateTel.codeNum = code;
+
+}
+#pragma mark - CNLiveUpdateTelViewDelegate
 - (void)selectCountry:(CNLiveUpdateTelView *)view{
-    //    CNSelectCountriesViewController *vc = [[CNSelectCountriesViewController alloc]init];
-    //    vc.delegate = self;
-    //    vc.hidesBottomBarWhenPushed = YES;
-    //    [self presentViewController:vc animated:YES completion:nil];
+    CNLiveChooseCountryController *vc = [[CNLiveChooseCountryController alloc]init];
+    vc.delegate = self;
+    vc.hidesBottomBarWhenPushed = YES;
+    [self presentViewController:vc animated:YES completion:nil];
 }
 - (void)bindingSuccess:(CNLiveUpdateTelView *)view{
@@ -125,7 +120,7 @@
 }
 - (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {
-    [self.updateTel.numberTF resignFirstResponder];
+    [self.updateTel.telTF resignFirstResponder];
 }
 #pragma mark - Lazy Loading
@@ -144,7 +139,7 @@
     if (!_updateTel) {
         _updateTel = [[CNLiveUpdateTelView alloc] init];
         _updateTel.delegate = self;
-        _updateTel.code = _code;
+        _updateTel.codeNum = @"86";
     }
     return _updateTel;
 }
@@ -21,13 +21,13 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong) UILabel *countryName;
 @property (nonatomic, strong) UILabel *countryCode;
-@property (nonatomic, strong) UITextField *numberTF;
+@property (nonatomic, strong) UITextField *telTF;
 @property (nonatomic, strong) UITextField *codeTF;
 @property (nonatomic, assign) BOOL gotVerificationCode;
 @property (nonatomic, assign) BOOL gotVerificationCodeIng;
-@property (nonatomic, copy, nullable) NSString *phoneNum;
-@property (nonatomic, copy) NSString *code;
+
+@property (nonatomic, copy) NSString *codeNum;
 @end
@@ -32,6 +32,8 @@
 @implementation CNLiveUpdateTelView
 static const NSInteger margin = 15;
+static const NSInteger timeValue = 1.5;
+
 #pragma mark - Init
 - (instancetype)initWithFrame:(CGRect)frame {
     self = [super initWithFrame:frame];
@@ -43,8 +45,8 @@ static const NSInteger margin = 15;
 }
 #pragma mark - Data
-- (void)setCode:(NSString *)code{
-    _code = code;
+- (void)setCodeNum:(NSString *)codeNum{
+    _codeNum = codeNum;
 }
 #pragma mark - UI
@@ -55,7 +57,7 @@ static const NSInteger margin = 15;
     [self addSubview:self.countryCode];
     [self addSubview:self.numberLabel];
-    [self addSubview:self.numberTF];
+    [self addSubview:self.telTF];
     [self addSubview:self.codeLabel];
     [self addSubview:self.codeTF];
@@ -102,7 +104,7 @@ static const NSInteger margin = 15;
         make.width.mas_equalTo(100);
         make.height.mas_equalTo(30);
     }];
-    [self.numberTF mas_makeConstraints:^(MASConstraintMaker *make) {
+    [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);
@@ -117,7 +119,7 @@ static const NSInteger margin = 15;
     [self.codeTF mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerY.equalTo(self.codeLabel);
         make.left.equalTo(self.codeLabel.mas_right).offset(20);
-        make.width.equalTo(self.numberTF);
+        make.width.equalTo(self.telTF);
     }];
     [self.bindingView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -246,18 +248,18 @@ static const NSInteger margin = 15;
     return _codeLabel;
 }
-- (UITextField *)numberTF {
-    if (!_numberTF) {
-        _numberTF = [[UITextField alloc] init];
-        _numberTF.textColor = [UIColor colorWithRed:34/255.0 green:34/255.0 blue:34/255.0 alpha:1.0];
-        _numberTF.font = [UIFont systemFontOfSize:14];
-        _numberTF.placeholder = @"请输入新手机号";
-        _numberTF.delegate = self;
-        _numberTF.keyboardType = UIKeyboardTypeNumberPad;
-        [_numberTF addTarget:self action:@selector(textFieldDidChange:) forControlEvents:UIControlEventEditingChanged];
-        _numberTF.tag = 10001;
+- (UITextField *)telTF {
+    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.placeholder = @"请输入新手机号";
+        _telTF.delegate = self;
+        _telTF.keyboardType = UIKeyboardTypeNumberPad;
+        [_telTF addTarget:self action:@selector(textFieldDidChange:) forControlEvents:UIControlEventEditingChanged];
+        _telTF.tag = 10001;
     }
-    return _numberTF;
+    return _telTF;
 }
 - (UITextField *)codeTF {
@@ -283,7 +285,7 @@ static const NSInteger margin = 15;
         _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;
-        [_verification addTarget:self action:@selector(verificationCodeBtnAction:) forControlEvents:UIControlEventTouchUpInside];
+        [_verification addTarget:self action:@selector(verificationDidClicked:) forControlEvents:UIControlEventTouchUpInside];
     }
     return _verification;
 }
@@ -336,8 +338,8 @@ static const NSInteger margin = 15;
     }
 }
-- (void)verificationCodeBtnAction:(UIButton *)sender {
-    if ([NSString isEmpty:self.numberTF.text] || [self.numberTF.text isWhitespaceAndNewlines]) {
+- (void)verificationDidClicked:(UIButton *)sender {
+    if ([NSString isEmpty:self.telTF.text] || [self.telTF.text isWhitespaceAndNewlines]) {
         QMUIAlertAction *sure = [QMUIAlertAction actionWithTitle:@"我知道了" style:QMUIAlertActionStyleDefault handler:^(__kindof QMUIAlertController *aAlertController, QMUIAlertAction *action) {
         }];
         QMUIAlertController *alertController = [QMUIAlertController alertControllerWithTitle:@"请输入正确的手机号码" message:@"" preferredStyle:QMUIAlertControllerStyleAlert];
@@ -349,33 +351,34 @@ static const NSInteger margin = 15;
         [alertController showWithAnimated:YES];
     }
-    else if ([self.numberTF.text isEqualToString:CNUserShareModel.mobile]) {
-        [QMUITips showWithText:@"您更新的手机号与旧手机号一致，请重新输入确认" inView:self hideAfterDelay:1.5];
+    else if ([self.telTF.text isEqualToString:CNUserShareModel.mobile]) {
+        [QMUITips showWithText:@"您更新的手机号与旧手机号一致，请重新输入确认" inView:[UIApplication sharedApplication].delegate.window hideAfterDelay:timeValue];
     }
     else {
         // 发送验证码
-        self.phoneNum = self.numberTF.text;
+        [self.telTF resignFirstResponder];
+        [self.codeTF becomeFirstResponder];
+
         self.verification.userInteractionEnabled = NO;
         self.verification.backgroundColor = [UIColor colorWithRed:242/255.0 green:242/255.0 blue:242/255.0 alpha:1.0];
         [self.verification setTitleColor:[UIColor colorWithRed:195/255.0 green:195/255.0 blue:195/255.0 alpha:1.0] forState:UIControlStateNormal];
         self.gotVerificationCodeIng = YES;
-        [CNLiveUserSystemCenter verificationCodeType:VerificationCodeTypeRegister mobile:self.numberTF.text countryCode:_code success:^(id result) {
+        [CNLiveUserSystemCenter verificationCodeType:VerificationCodeTypeRegister mobile:self.telTF.text countryCode:_codeNum success:^(id result) {
-            [QMUITips showWithText:@"短信发送成功" inView:self hideAfterDelay:1.5];
+            [QMUITips showSucceed:@"短信发送成功" inView:[UIApplication sharedApplication].delegate.window hideAfterDelay:timeValue];
             self.gotVerificationCode = YES;
             [self countDown];
         } failure:^(NSDictionary *errorDic) {
-
             NSString *errMsg;
             if ([[NSString stringWithFormat:@"%@",errorDic[@"errorCode"]] isEqualToString:@"408"]) {
                 errMsg = @"请填写正确的手机号";
             } else {
                 errMsg = errorDic[@"errorMessage"];
             }
-            [QMUITips showWithText:errMsg inView:self hideAfterDelay:1.5];
-            self.phoneNum = nil;
+            [QMUITips showError:errMsg inView:[UIApplication sharedApplication].delegate.window hideAfterDelay:timeValue];
+
             self.gotVerificationCode = NO;
             self.verification.userInteractionEnabled = YES;
             self.verification.backgroundColor = [UIColor colorWithRed:0/255.0 green:194/255.0 blue:0/255.0 alpha:1.0];
@@ -391,8 +394,8 @@ static const NSInteger margin = 15;
     if (self.gotVerificationCode) {
         if (self.codeTF.text.length == 6) {
             [QMUITips showLoadingInView:self];
-            [CNLiveUserSystemCenter updateMobileWithUid:CNUserShareModel.uid mobile:self.phoneNum countryCode:_code verificationCode:self.codeTF.text success:^(id result) {
-                CNUserShareModel.mobile = self.phoneNum;
+            [CNLiveUserSystemCenter updateMobileWithUid:CNUserShareModel.uid mobile:self.telTF.text countryCode:_codeNum verificationCode:self.codeTF.text success:^(id result) {
+                CNUserShareModel.mobile = self.telTF.text;
                 [CNUserInfoModel setLocalUserInfo:self.countryName.text withKey:@"countryname"];
                 [CNUserInfoModel setLocalUserInfo:self.countryCode.text withKey:@"countrycode"];
                 [QMUITips hideAllToastInView:self animated:YES];
@@ -402,7 +405,7 @@ static const NSInteger margin = 15;
             } failure:^(NSDictionary *errorDic) {
                 [QMUITips hideAllToastInView:self animated:YES];
-                [QMUITips showError:errorDic[@"errorMessage"] inView:self hideAfterDelay:1.5];
+                [QMUITips showError:errorDic[@"errorMessage"] inView:[UIApplication sharedApplication].delegate.window hideAfterDelay:timeValue];
             }];
@@ -421,7 +424,7 @@ static const NSInteger margin = 15;
     } else {
         NSString *alertText = @"请先获取验证码";
-        if (self.numberTF.text.length != 11) {
+        if (self.telTF.text.length != 11) {
             alertText = @"请先输入正确的手机号码";
         } else  {
             alertText = @"请先获取验证码";
@@ -443,7 +446,7 @@ static const NSInteger margin = 15;
 }
 - (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {
-    [self.numberTF resignFirstResponder];
+    [self.telTF resignFirstResponder];
 }
 #pragma mark - 倒计时
@@ -459,7 +462,7 @@ static const NSInteger margin = 15;
     dispatch_source_set_event_handler(timer, ^{
         dispatch_async(dispatch_get_main_queue(), ^{
             if (second == 0) {
-                [self setupTextFieldUI:self.numberTF];
+                [self setupTextFieldUI:self.telTF];
                 self.gotVerificationCodeIng = NO;
                 [self.verification setTitle:[NSString stringWithFormat:@"获取验证码"] forState:UIControlStateNormal];
                 second = TIMECOUNT;
@@ -352,6 +352,7 @@
 				"${BUILT_PRODUCTS_DIR}/CNLiveBaseTools/CNLiveBaseTools.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveBeeHive/CNLiveBeeHive.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveBusinessTools/CNLiveBusinessTools.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveChooseCountry/CNLiveChooseCountry.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCommonClass/CNLiveCommonClass.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
@@ -378,6 +379,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseTools.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBeeHive.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessTools.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveChooseCountry.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonClass.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",
@@ -9,6 +9,7 @@
 #import "CNLIVEAppDelegate.h"
 #import "CNLiveSettingController.h"
 #import "CNLiveEnvironment.h"
+#import "CNUserInfoManager.h"
 @implementation CNLIVEAppDelegate
@@ -21,6 +22,26 @@
     UINavigationController *nav = [[UINavigationController alloc]initWithRootViewController:vc];
     self.window.rootViewController = nav;//设置根视图控制器
     [self.window makeKeyAndVisible];
+    [CNUserInfoManager saveUserinfoDic:@{
+        @"bigFaceUrl":@"http://yweb0.cnliveimg.com/images/headImg/2019/1030/1572439148697.jpg",
+        @"countryCode":@"86",
+        @"email":@"",
+        @"extInfo":@"",
+        @"faceUrl":@"http://yweb0.cnliveimg.com/images/headImg/2019/1030/1572439148697_small.jpg",
+        @"gender":@"m",
+        @"hUid":@"",
+        @"isNewUser":@"0",
+        @"location":@"北京市海淀区",
+        @"mobile":@"17600922519",
+        @"nickName":@"金帝",
+        @"platformId":@"769_jetj7bq525",
+        @"qqUid":@"",
+        @"renrenUid":@"",
+        @"sinaUid":@"",
+        @"token":@"RkFYeLkl/u5S7tW8UcOkT3rfLTP/Ua8NIkdEsKlcolvl/yxTMNbAYXmmJyhKGpkj",
+        @"uid":@"10514405",
+        @"wxUid":@""
+    }];
     return YES;
 }