From a450b78ba4f8a91a3d4aa1a9300800e0d79d2993 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A5=9D=E5=8F=91=E5=86=AC?= Date: Sun, 5 Jun 2022 12:44:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E6=89=8B=E6=9C=BA=E5=8F=B7?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ifish/Utinitys/Define.h | 13 ++- .../pushSetControllrs/ChangeMobleController.m | 77 ++++++------- .../ChangeModelDoneController.m | 109 ++++++++++-------- 3 files changed, 103 insertions(+), 96 deletions(-) diff --git a/Ifish/Utinitys/Define.h b/Ifish/Utinitys/Define.h index 16f4cde..c307936 100644 --- a/Ifish/Utinitys/Define.h +++ b/Ifish/Utinitys/Define.h @@ -144,13 +144,13 @@ alpha:1.0] static NSString* DOMAIN_NAME =@"app.ifish7.cn"; //正式环境 -//#define SOCKETPORT [Define sharedDefine].server -//#define JIEKOUPORT [[Define sharedDefine] getRealSever] -//#define JIEKOUPORTHTTP [[Define sharedDefine] getRealSever] +#define SOCKETPORT [Define sharedDefine].server +#define JIEKOUPORT [[Define sharedDefine] getRealSever] +#define JIEKOUPORTHTTP [[Define sharedDefine] getRealSever] //测试环境 -#define SOCKETPORT @"139.196.24.156" -#define JIEKOUPORT @"http://139.196.24.156:7080" -#define JIEKOUPORTHTTP @"https://app.ifish7.com" +//#define SOCKETPORT @"139.196.24.156" +//#define JIEKOUPORT @"http://139.196.24.156:7080" +//#define JIEKOUPORTHTTP @"https://app.ifish7.com" //云 @"https://app.ifish7.com" //云图片头像等地址 @"http://app.ifish7.com" //#define JIEKOUPORTHTTP @"https://app.ifish7.com" @@ -198,6 +198,7 @@ alpha:1.0] #define kUserMoreUserData [NSString stringWithFormat:@"%@/api/users/moreUserData/",JIEKOUPORT] // 用户信息修改接口 #define kUpdateSafeUser [NSString stringWithFormat:@"%@/api/users/v3/updateInfo.do",JIEKOUPORT] +#define kUpdatePhoneNumber [NSString stringWithFormat:@"%@/api/updateUser/updateUser.do",JIEKOUPORT] // 头像上传接口 //#define kUploadFile [NSString stringWithFormat:@"%@/api/updateUser/uploadFile.do",JIEKOUPORT] #define kSafeUploadFile [NSString stringWithFormat:@"%@/api/updateUser/uploadFile.do",JIEKOUPORT] diff --git a/Ifish/controllers/IfishTabControllers/我的/mineControllers/pushSetControllrs/ChangeMobleController.m b/Ifish/controllers/IfishTabControllers/我的/mineControllers/pushSetControllrs/ChangeMobleController.m index a2739fb..2a5af08 100644 --- a/Ifish/controllers/IfishTabControllers/我的/mineControllers/pushSetControllrs/ChangeMobleController.m +++ b/Ifish/controllers/IfishTabControllers/我的/mineControllers/pushSetControllrs/ChangeMobleController.m @@ -105,35 +105,14 @@ }); dispatch_resume(_timer); - [self getVerifycode]; + [self getAliVeriy]; } -#pragma mark - 获取验证码新（SMS） +#pragma mark - 获取验证码阿里 + --(void)getVerifycode{ - - UserModel*model=[[DataCenter defaultDtacenter]valueForKey:@"UserLogIn"]; - -// BOOL isMacth=[dataContorl valiMobile:model.phoneNumber]; -// -// if (!isMacth) { -// -// [self.view makeToast:@"请输入正确手机号"]; -// -// return; -// } -// -// NSString *zone = [dataContorl areaCode:model.phoneNumber]; - //self.areaCode = zone; - - [IFISHHTTPTOOL getverifyWithTimerButton:_timerbutton addphoneNumber:model.phoneNumber zone:self.areaCode result:^(NSError *err) { - - - }]; - -} -(void)getAliVeriy{ @@ -186,25 +165,39 @@ UserModel*model=[[DataCenter defaultDtacenter]valueForKey:@"UserLogIn"]; return; } - [SMSSDK commitVerificationCode:self.sureTextFiled.text phoneNumber:model.phoneNumber zone:self.areaCode result:^(NSError *error) { + if ([self.sureTextFiled.text isEqualToString:_verifyData]) + { - { - if (!error) - { - - NSLog(@"验证成功"); - ChangeModelDoneController *done=[[ChangeModelDoneController alloc]init]; - [self.navigationController pushViewController:done animated:YES]; - - } - else - { - NSLog(@"错误信息:%@",error); - NSString *str =@"验证码验证失败"; - [self.view makeToast:str]; - } - } - }]; + NSLog(@"验证成功"); + ChangeModelDoneController *done=[[ChangeModelDoneController alloc]init]; + [self.navigationController pushViewController:done animated:YES]; + + } + else + { + + NSString *str =@"验证码验证失败"; + [self.view makeToast:str]; + } +// [SMSSDK commitVerificationCode:self.sureTextFiled.text phoneNumber:model.phoneNumber zone:self.areaCode result:^(NSError *error) { +// +// { +// if (!error) +// { +// +// NSLog(@"验证成功"); +// ChangeModelDoneController *done=[[ChangeModelDoneController alloc]init]; +// [self.navigationController pushViewController:done animated:YES]; +// +// } +// else +// { +// NSLog(@"错误信息:%@",error); +// NSString *str =@"验证码验证失败"; +// [self.view makeToast:str]; +// } +// } +// }]; } diff --git a/Ifish/controllers/IfishTabControllers/我的/mineControllers/pushSetControllrs/ChangeModelDoneController.m b/Ifish/controllers/IfishTabControllers/我的/mineControllers/pushSetControllrs/ChangeModelDoneController.m index 8fe6435..3d6a5ef 100644 --- a/Ifish/controllers/IfishTabControllers/我的/mineControllers/pushSetControllrs/ChangeModelDoneController.m +++ b/Ifish/controllers/IfishTabControllers/我的/mineControllers/pushSetControllrs/ChangeModelDoneController.m @@ -95,25 +95,25 @@ extern BOOL firstLogIn; }); dispatch_resume(_timer); - [self getVerifycode]; + [self getAliVerify:_timer]; } #pragma mark - 获取验证码新（SMS） --(void)getVerifycode{ - - if ([self.xinModelNumber.text isEqualToString:@""]) { - - [self.view makeToast:@"请输入正确手机号"]; - return; - } - - [IFISHHTTPTOOL getverifyWithTimerButton:_timerbtn addphoneNumber:self.xinModelNumber.text zone:self.areaCode result:^(NSError *err) { - - }]; - -} +//-(void)getVerifycode{ +// +// if ([self.xinModelNumber.text isEqualToString:@""]) { +// +// [self.view makeToast:@"请输入正确手机号"]; +// return; +// } +// +// [IFISHHTTPTOOL getverifyWithTimerButton:_timerbtn addphoneNumber:self.xinModelNumber.text zone:self.areaCode result:^(NSError *err) { +// +// }]; +// +//} #define mark - 获取阿里验证码 已去 -(void)getAliVerify:(dispatch_source_t)timer{ @@ -140,7 +140,7 @@ extern BOOL firstLogIn; NSLog(@"_verifyData%@",_verifyData); if ([reDic[@"result"] isEqualToString:@"100"]) { - [self.view makeToast:@"更换成功"]; + UserModel*userModel=[[DataCenter defaultDtacenter]valueForKey:@"UserLogIn"]; userModel.phoneNumber=self.xinModelNumber.text; @@ -207,43 +207,56 @@ extern BOOL firstLogIn; - (IBAction)doneBtn:(id)sender { -// BOOL isMacth=[dataContorl valiMobile:self.xinModelNumber.text]; -// -// if ((!isMacth)|(self.yanzhengfeild.text.length ==0)){ -// -// [self.view makeToast:@"请输入正确手机号和验证码"]; -// -// return; -// } - - [SMSSDK commitVerificationCode:self.yanzhengfeild.text phoneNumber:self.xinModelNumber.text zone:self.areaCode result:^(NSError *error) { - - { - if (!error) - { + UserModel*model=[[DataCenter defaultDtacenter]valueForKey:@"UserLogIn"]; + if ([self.yanzhengfeild.text isEqualToString:_verifyData]) + { + NSDictionary*para=@{@"phoneNumber":self.xinModelNumber.text, + @"userId":model.userId}; + [AFHttpTool requestWihtMethod:RequestMethodTypePost + url:kUpdatePhoneNumber + params:para success:^(id response) + { + if (response) { + NSDictionary *reDic=[NSJSONSerialization JSONObjectWithData:response options:NSJSONReadingMutableContainers error:nil]; - NSLog(@"验证成功"); - if (firstLogIn) { - - [self.navigationController popToRootViewControllerAnimated:YES]; - }else{ - - //[self.navigationController popToViewController:[self.navigationController.viewControllers objectAtIndex:1] animated:YES]; - - [self.navigationController popToRootViewControllerAnimated:YES]; - } + if ([reDic[@"result"] isEqualToString:@"100"]) { + + [self.view makeToast:@"修改成功"]; + NSLog(@"验证成功"); + + + dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.35 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ + if (firstLogIn) { + + [self.navigationController popToRootViewControllerAnimated:YES]; + }else{ + + + + [self.navigationController popToRootViewControllerAnimated:YES]; + } + }); + - + }else { + [self.view makeToast:@"失败"]; + } } - else - { - NSLog(@"错误信息:%@",error); - NSString *str =@"验证码验证失败"; - [self.view makeToast:str]; - } - } - } ]; + } failure:^(NSError *err) { + + }]; + + + + } + else + { + + NSString *str =@"验证码验证失败"; + [self.view makeToast:str]; + } +