diff --git a/LekangGuard.xcodeproj/project.pbxproj b/LekangGuard.xcodeproj/project.pbxproj index d8c22ce..51918df 100644 --- a/LekangGuard.xcodeproj/project.pbxproj +++ b/LekangGuard.xcodeproj/project.pbxproj @@ -3917,7 +3917,7 @@ "@executable_path/../../Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.ecellsz.lekang.guard.LKNotificationSerExtension; + PRODUCT_BUNDLE_IDENTIFIER = com.cct.studentcard.guard.LKNotificationSerExtension; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_EMIT_LOC_STRINGS = YES; @@ -3943,7 +3943,7 @@ "@executable_path/../../Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.ecellsz.lekang.guard.LKNotificationSerExtension; + PRODUCT_BUNDLE_IDENTIFIER = com.cct.studentcard.guard.LKNotificationSerExtension; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_EMIT_LOC_STRINGS = YES; @@ -4144,7 +4144,7 @@ ); MARKETING_VERSION = 1.0; ONLY_ACTIVE_ARCH = NO; - PRODUCT_BUNDLE_IDENTIFIER = com.ecellsz.lekang.guard; + PRODUCT_BUNDLE_IDENTIFIER = com.cct.studentcard.guard; PRODUCT_NAME = "ECell care"; SWIFT_EMIT_LOC_STRINGS = YES; TARGETED_DEVICE_FAMILY = 1; @@ -4232,7 +4232,7 @@ ); MARKETING_VERSION = 1.0; ONLY_ACTIVE_ARCH = NO; - PRODUCT_BUNDLE_IDENTIFIER = com.ecellsz.lekang.guard; + PRODUCT_BUNDLE_IDENTIFIER = com.cct.studentcard.guard; PRODUCT_NAME = "ECell care"; SWIFT_EMIT_LOC_STRINGS = YES; TARGETED_DEVICE_FAMILY = 1; diff --git a/LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/UserInterfaceState.xcuserstate b/LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/UserInterfaceState.xcuserstate index 000081d..7844fb4 100644 Binary files a/LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/UserInterfaceState.xcuserstate and b/LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index fa00169..e7dd035 100644 --- a/LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -420,14 +420,14 @@ landmarkType = "7"> diff --git a/LekangGuard/Login/RegisterViewController.m b/LekangGuard/Login/RegisterViewController.m index f721eb2..9bf52b0 100644 --- a/LekangGuard/Login/RegisterViewController.m +++ b/LekangGuard/Login/RegisterViewController.m @@ -234,23 +234,25 @@ [UICommon MessageUpload:@"加载中"]; if (self.isViewType != 2) { - [SMSSDK commitVerificationCode:weakSelf.codeField.text phoneNumber:weakSelf.emailField.text zone:@"86" result:^(NSError *error) { - if (!error) - { - [self UserRegisterUp]; - } else - { - [UICommon HidenLoading]; - [UICommon MessageErrorText:@"验证码验证失败"]; - self.registerBtn.enabled = YES; - } - }]; +// [SMSSDK commitVerificationCode:weakSelf.codeField.text phoneNumber:weakSelf.emailField.text zone:@"86" result:^(NSError *error) { +// if (!error) +// { +// [self UserRegisterUp]; +// } else +// { +// [UICommon HidenLoading]; +// [UICommon MessageErrorText:@"验证码验证失败"]; +// self.registerBtn.enabled = YES; +// } +// }]; + [self UserRegisterUp]; } else { NSMutableDictionary *parameters = self.authInfo; [parameters setValue:self.emailField.text forKey:@"phone"]; [parameters setValue:self.passIField.text forKey:@"password"]; + [parameters setValue:self.codeField.text forKey:@"code"]; [[[APIManager sharedManager] APPOST:WechatLogin_URL parameters:parameters isJson:YES resultClass:LoginModel.class] subscribeNext:^(id _Nullable x) { [UICommon HidenLoading]; NSMutableDictionary *userDic = [NSMutableDictionary dictionary]; @@ -272,11 +274,13 @@ } } +/// 注册/忘记密码 - (void)UserRegisterUp { NSMutableDictionary *parameters = [NSMutableDictionary dictionary]; [parameters setValue:self.emailField.text forKey:@"phone"]; [parameters setValue:self.passIField.text forKey:@"password"]; + [parameters setValue:self.codeField.text forKey:@"code"]; [[[APIManager sharedManager] APPOST:self.isViewType == 0 ? Register_URL : UpdatePwd_URL parameters:parameters isJson:YES resultClass:nil] subscribeNext:^(id _Nullable x) { if (self.isViewType == 0) { @@ -314,30 +318,29 @@ return; } [UICommon MessageUpload:@"加载中"]; -// NSMutableDictionary *parameters = [NSMutableDictionary dictionary]; -// [parameters setValue:self.emailField.text forKey:@"email"]; -// [parameters setValue:self.isViewType == 0 ? @(1) : @(2) forKey:@"type"]; -// [[[APIManager sharedManager] APGET:EmailCode_URL parameters:parameters resultClass:nil] subscribeNext:^(id _Nullable x) { -// [UICommon MessageSuccessText:@"获取验证码成功"]; -// [self timeOutCount]; -// -// } error:^(NSError * _Nullable error) { -// NSDictionary *dic = error.userInfo; -// [UICommon MessageErrorText:dic[NSLocalizedDescriptionKey]]; -// }]; - [SMSSDK getVerificationCodeByMethod:SMSGetCodeMethodSMS phoneNumber:self.emailField.text zone:@"86" template:@"" result:^(NSError *error) { - [UICommon HidenLoading]; - if (!error) - { - [UICommon MessageSuccessText:@"获取验证码成功"]; - [self timeOutCount]; - } - else - { - NSDictionary *dic = error.userInfo; - [UICommon MessageErrorText:dic[NSLocalizedDescriptionKey]]; - } + NSMutableDictionary *parameters = [NSMutableDictionary dictionary]; + [parameters setValue:self.emailField.text forKey:@"phoneNum"]; + [[[APIManager sharedManager] APGET:EmailCode_URL parameters:parameters resultClass:nil] subscribeNext:^(id _Nullable x) { + [UICommon MessageSuccessText:@"获取验证码成功"]; + [self timeOutCount]; + + } error:^(NSError * _Nullable error) { + NSDictionary *dic = error.userInfo; + [UICommon MessageErrorText:dic[NSLocalizedDescriptionKey]]; }]; +// [SMSSDK getVerificationCodeByMethod:SMSGetCodeMethodSMS phoneNumber:self.emailField.text zone:@"86" template:@"" result:^(NSError *error) { +// [UICommon HidenLoading]; +// if (!error) +// { +// [UICommon MessageSuccessText:@"获取验证码成功"]; +// [self timeOutCount]; +// } +// else +// { +// NSDictionary *dic = error.userInfo; +// [UICommon MessageErrorText:dic[NSLocalizedDescriptionKey]]; +// } +// }]; } diff --git a/LekangGuard/Managers/UIURL.h b/LekangGuard/Managers/UIURL.h index 8c09bbf..c889a0f 100644 --- a/LekangGuard/Managers/UIURL.h +++ b/LekangGuard/Managers/UIURL.h @@ -14,7 +14,7 @@ #define Register_URL @"/user/send/register" /// 获取验证码 -#define EmailCode_URL @"/user/send/email" +#define EmailCode_URL @"/sms/smsCaptcha" /// 忘记密码 #define UpdatePwd_URL @"/user/send/updatePwd"