ray
/
huaxun
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1、包名更换 

2、验证码改成使用接口获取
master
公司电脑 1 year ago
parent
b5bc8dd66d
commit
c189bf1c01
5 changed files with 48 additions and 45 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      LekangGuard.xcodeproj/project.pbxproj
  2. BIN
      LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/UserInterfaceState.xcuserstate
  3. 12
      LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
  4. 71
      LekangGuard/Login/RegisterViewController.m
  5. 2
      LekangGuard/Managers/UIURL.h

8
LekangGuard.xcodeproj/project.pbxproj
Unescape View File

@ -3917,7 +3917,7 @@
"@executable_path/../../Frameworks", "@executable_path/../../Frameworks",
); );
MARKETING_VERSION = 1.0; MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.ecellsz.lekang.guard.LKNotificationSerExtension; PRODUCT_BUNDLE_IDENTIFIER = com.cct.studentcard.guard.LKNotificationSerExtension;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_EMIT_LOC_STRINGS = YES;
@ -3943,7 +3943,7 @@
"@executable_path/../../Frameworks", "@executable_path/../../Frameworks",
); );
MARKETING_VERSION = 1.0; MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.ecellsz.lekang.guard.LKNotificationSerExtension; PRODUCT_BUNDLE_IDENTIFIER = com.cct.studentcard.guard.LKNotificationSerExtension;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_EMIT_LOC_STRINGS = YES;
@ -4144,7 +4144,7 @@
); );
MARKETING_VERSION = 1.0; MARKETING_VERSION = 1.0;
ONLY_ACTIVE_ARCH = NO; ONLY_ACTIVE_ARCH = NO;
PRODUCT_BUNDLE_IDENTIFIER = com.ecellsz.lekang.guard; PRODUCT_BUNDLE_IDENTIFIER = com.cct.studentcard.guard;
PRODUCT_NAME = "ECell care"; PRODUCT_NAME = "ECell care";
SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_EMIT_LOC_STRINGS = YES;
TARGETED_DEVICE_FAMILY = 1; TARGETED_DEVICE_FAMILY = 1;
@ -4232,7 +4232,7 @@
); );
MARKETING_VERSION = 1.0; MARKETING_VERSION = 1.0;
ONLY_ACTIVE_ARCH = NO; ONLY_ACTIVE_ARCH = NO;
PRODUCT_BUNDLE_IDENTIFIER = com.ecellsz.lekang.guard; PRODUCT_BUNDLE_IDENTIFIER = com.cct.studentcard.guard;
PRODUCT_NAME = "ECell care"; PRODUCT_NAME = "ECell care";
SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_EMIT_LOC_STRINGS = YES;
TARGETED_DEVICE_FAMILY = 1; TARGETED_DEVICE_FAMILY = 1;

BIN
LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

12
LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
Unescape View File

@ -420,14 +420,14 @@
landmarkType = "7"> landmarkType = "7">
<Locations> <Locations>
<Location <Location
uuid = "90E6E9A1-FC8A-4989-9697-6C9BB5DC2840 - 755985be365093fa" uuid = "90E6E9A1-FC8A-4989-9697-6C9BB5DC2840 - 310d927cae23b30b"
shouldBeEnabled = "Yes" shouldBeEnabled = "Yes"
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
symbolName = "__46-[SelectCountryViewController GetCountryModel]_block_invoke" symbolName = "__46-[SelectCountryViewController GetCountryModel]_block_invoke"
moduleName = "ECell care" moduleName = "ECell care"
usesParentBreakpointCondition = "Yes" usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/ecell/Desktop/huaxun/LekangGuard/Login/SelectCountryViewController.m" urlString = "file:///Users/ecell/huaxun/LekangGuard/Login/SelectCountryViewController.m"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "32" startingLineNumber = "32"
@ -435,14 +435,14 @@
offsetFromSymbolStart = "76"> offsetFromSymbolStart = "76">
</Location> </Location>
<Location <Location
uuid = "90E6E9A1-FC8A-4989-9697-6C9BB5DC2840 - acfbde8badaf9e04" uuid = "90E6E9A1-FC8A-4989-9697-6C9BB5DC2840 - e8afc94935dcbeb7"
shouldBeEnabled = "Yes" shouldBeEnabled = "Yes"
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
symbolName = "__46-[SelectCountryViewController GetCountryModel]_block_invoke_2" symbolName = "__46-[SelectCountryViewController GetCountryModel]_block_invoke_2"
moduleName = "ECell care" moduleName = "ECell care"
usesParentBreakpointCondition = "Yes" usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/ecell/Desktop/huaxun/LekangGuard/Login/SelectCountryViewController.m" urlString = "file:///Users/ecell/huaxun/LekangGuard/Login/SelectCountryViewController.m"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "33" startingLineNumber = "33"
@ -606,8 +606,8 @@
filePath = "LekangGuard/Login/RegisterViewController.m" filePath = "LekangGuard/Login/RegisterViewController.m"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "256" startingLineNumber = "258"
endingLineNumber = "256" endingLineNumber = "258"
landmarkName = "-UserRegister" landmarkName = "-UserRegister"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>

71
LekangGuard/Login/RegisterViewController.m
Unescape View File

@ -234,23 +234,25 @@
[UICommon MessageUpload:@"加载中"]; [UICommon MessageUpload:@"加载中"];
if (self.isViewType != 2) if (self.isViewType != 2)
{ {
[SMSSDK commitVerificationCode:weakSelf.codeField.text phoneNumber:weakSelf.emailField.text zone:@"86" result:^(NSError *error) { // [SMSSDK commitVerificationCode:weakSelf.codeField.text phoneNumber:weakSelf.emailField.text zone:@"86" result:^(NSError *error) {
if (!error) // if (!error)
{ // {
[self UserRegisterUp]; // [self UserRegisterUp];
} else // } else
{ // {
[UICommon HidenLoading]; // [UICommon HidenLoading];
[UICommon MessageErrorText:@"验证码验证失败"]; // [UICommon MessageErrorText:@"验证码验证失败"];
self.registerBtn.enabled = YES; // self.registerBtn.enabled = YES;
} // }
}]; // }];
[self UserRegisterUp];
} }
else else
{ {
NSMutableDictionary *parameters = self.authInfo; NSMutableDictionary *parameters = self.authInfo;
[parameters setValue:self.emailField.text forKey:@"phone"]; [parameters setValue:self.emailField.text forKey:@"phone"];
[parameters setValue:self.passIField.text forKey:@"password"]; [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) { [[[APIManager sharedManager] APPOST:WechatLogin_URL parameters:parameters isJson:YES resultClass:LoginModel.class] subscribeNext:^(id _Nullable x) {
[UICommon HidenLoading]; [UICommon HidenLoading];
NSMutableDictionary *userDic = [NSMutableDictionary dictionary]; NSMutableDictionary *userDic = [NSMutableDictionary dictionary];
@ -272,11 +274,13 @@
} }
} }
/// 注册/忘记密码
- (void)UserRegisterUp - (void)UserRegisterUp
{ {
NSMutableDictionary *parameters = [NSMutableDictionary dictionary]; NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
[parameters setValue:self.emailField.text forKey:@"phone"]; [parameters setValue:self.emailField.text forKey:@"phone"];
[parameters setValue:self.passIField.text forKey:@"password"]; [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) { [[[APIManager sharedManager] APPOST:self.isViewType == 0 ? Register_URL : UpdatePwd_URL parameters:parameters isJson:YES resultClass:nil] subscribeNext:^(id _Nullable x) {
if (self.isViewType == 0) if (self.isViewType == 0)
{ {
@ -314,30 +318,29 @@
return; return;
} }
[UICommon MessageUpload:@"加载中"]; [UICommon MessageUpload:@"加载中"];
// NSMutableDictionary *parameters = [NSMutableDictionary dictionary]; NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
// [parameters setValue:self.emailField.text forKey:@"email"]; [parameters setValue:self.emailField.text forKey:@"phoneNum"];
// [parameters setValue:self.isViewType == 0 ? @(1) : @(2) forKey:@"type"]; [[[APIManager sharedManager] APGET:EmailCode_URL parameters:parameters resultClass:nil] subscribeNext:^(id _Nullable x) {
// [[[APIManager sharedManager] APGET:EmailCode_URL parameters:parameters resultClass:nil] subscribeNext:^(id _Nullable x) { [UICommon MessageSuccessText:@"获取验证码成功"];
// [UICommon MessageSuccessText:@"获取验证码成功"]; [self timeOutCount];
// [self timeOutCount];
// } error:^(NSError * _Nullable error) {
// } error:^(NSError * _Nullable error) { NSDictionary *dic = error.userInfo;
// NSDictionary *dic = error.userInfo; [UICommon MessageErrorText:dic[NSLocalizedDescriptionKey]];
// [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]];
}
}]; }];
// [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]];
// }
// }];
} }

2
LekangGuard/Managers/UIURL.h
Unescape View File

@ -14,7 +14,7 @@
#define Register_URL @"/user/send/register" #define Register_URL @"/user/send/register"
/// 获取验证码 /// 获取验证码
#define EmailCode_URL @"/user/send/email" #define EmailCode_URL @"/sms/smsCaptcha"
/// 忘记密码 /// 忘记密码
#define UpdatePwd_URL @"/user/send/updatePwd" #define UpdatePwd_URL @"/user/send/updatePwd"

Write Preview
Loading…
Cancel
Save