bugfix - 注册登录

wanghengheng · wanghengheng · commit 8930f51433d5 · 2016-02-20T16:41:38.000+08:00
diff --git a/Coding_iOS/Controllers/Login/CannotLoginViewController.m b/Coding_iOS/Controllers/Login/CannotLoginViewController.m
@@ -222,6 +222,7 @@ - (void)phoneCodeBtnClicked:(PhoneCodeButton *)sender{
     sender.enabled = NO;
     [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:@"api/account/password/forget" withParams:@{@"account": _userStr} withMethodType:Post andBlock:^(id data, NSError *error) {
         if (data) {
+            [NSObject showHudTipStr:@"&#39564;&#35777;&#30721;&#21457;&#36865;&#25104;&#21151;"];
             [sender startUpTimer];
         }else{
             [sender invalidateTimer];
@@ -241,8 +242,8 @@ - (void)footerBtnClicked:(id)sender{
             }
             [self.footerBtn startQueryAnimate];
             NSMutableDictionary *params = @{@"account": _userStr,
-                                            @"password": _password,
-                                            @"confirm": _confirm_password,
+                                            @"password": [_password sha1Str],
+                                            @"confirm": [_confirm_password sha1Str],
                                             @"code": _phoneCode}.mutableCopy;
             params[@"j_captcha"] = _j_captcha;
             [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:@"api/account/password/reset" withParams:params withMethodType:Post andBlock:^(id data, NSError *error) {
@@ -253,12 +254,11 @@ - (void)footerBtnClicked:(id)sender{
                 }
             }];
         }else{
-            NSString *tipStr = @"&#37325;&#32622;&#23494;&#30721;&#37038;&#20214;&#24050;&#32463;&#21457;&#36865;&#65292;&#35831;&#23613;&#24555;&#21435;&#37038;&#31665;&#26597;&#30475;";
             [self.footerBtn startQueryAnimate];
             [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:@"api/account/password/forget" withParams:@{@"account": _userStr, @"j_captcha": _j_captcha} withMethodType:Post andBlock:^(id data, NSError *error) {
                 [self.footerBtn stopQueryAnimate];
                 if (data) {
-                    [NSObject showHudTipStr:tipStr];
+                    [NSObject showHudTipStr:@"&#37325;&#32622;&#23494;&#30721;&#37038;&#20214;&#24050;&#32463;&#21457;&#36865;&#65292;&#35831;&#23613;&#24555;&#21435;&#37038;&#31665;&#26597;&#30475;"];
                     [self.navigationController popToRootViewControllerAnimated:YES];
                 }
             }];
diff --git a/Coding_iOS/Controllers/Login/RegisterViewController.m b/Coding_iOS/Controllers/Login/RegisterViewController.m
@@ -323,6 +323,7 @@ - (void)phoneCodeBtnClicked:(PhoneCodeButton *)sender{
     sender.enabled = NO;
     [[Coding_NetAPIManager sharedManager] request_GeneratePhoneCodeWithPhone:_myRegister.phone type:PurposeToRegister block:^(id data, NSError *error) {
         if (data) {
+            [NSObject showHudTipStr:@"&#39564;&#35777;&#30721;&#21457;&#36865;&#25104;&#21151;"];
             [sender startUpTimer];
         }else{
             [sender invalidateTimer];
diff --git a/Coding_iOS/Controllers/MeSetting/SettingPhoneViewController.m b/Coding_iOS/Controllers/MeSetting/SettingPhoneViewController.m
@@ -101,6 +101,7 @@ - (void)phoneCodeBtnClicked:(PhoneCodeButton *)sender{
     sender.enabled = NO;
     [[Coding_NetAPIManager sharedManager] request_GeneratePhoneCodeToResetPhone:_phone block:^(id data, NSError *error) {
         if (data) {
+            [NSObject showHudTipStr:@"&#39564;&#35777;&#30721;&#21457;&#36865;&#25104;&#21151;"];
             [sender startUpTimer];
         }else{
             [sender invalidateTimer];
diff --git a/Coding_iOS/Models/Login.m b/Coding_iOS/Models/Login.m
@@ -30,7 +30,7 @@ - (instancetype)init
 }
 
 - (NSString *)toPath{
-    return @"https://coding.net/api/v2/account/login";
+    return @"api/v2/account/login";
 }
 - (NSDictionary *)toParams{
     NSMutableDictionary *params = @{@"account": self.email,
diff --git a/Coding_iOS/Util/Manager/Coding_NetAPIManager.m b/Coding_iOS/Util/Manager/Coding_NetAPIManager.m
@@ -312,9 +312,14 @@ - (void)request_ActivateBySetGlobal_key:(NSString *)global_key block:(void (^)(i
 - (void)request_SendActivateEmail:(NSString *)email block:(void (^)(id data, NSError *error))block{
     [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:@"api/account/register/email/send" withParams:@{@"email": email} withMethodType:Post andBlock:^(id data, NSError *error) {
         if (data) {
-            [MobClick event:kUmeng_Event_Request_ActionOfServer label:@"&#28608;&#27963;&#36134;&#21495;_&#37325;&#21457;&#28608;&#27963;&#37038;&#20214;"];
-            
-            block(data, nil);
+            if ([(NSNumber *)data[@"data"] boolValue]) {
+                [MobClick event:kUmeng_Event_Request_ActionOfServer label:@"&#28608;&#27963;&#36134;&#21495;_&#37325;&#21457;&#28608;&#27963;&#37038;&#20214;"];
+                
+                block(data, nil);
+            }else{
+                [NSObject showHudTipStr:@"&#21457;&#36865;&#22833;&#36133;"];
+                block(nil, nil);
+            }
         }else{
             block(nil, error);
         }

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ - (instancetype)init`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`- (NSString *)toPath{`
`33`		`- return @"https://coding.net/api/v2/account/login";`
	`33`	`+ return @"api/v2/account/login";`
`34`	`34`	`}`
`35`	`35`	`- (NSDictionary *)toParams{`
`36`	`36`	`NSMutableDictionary *params = @{@"account": self.email,`