登录时，检查邮箱是否已激活

wanghengheng · wanghengheng · commit a9b1f1e9e1b1 · 2016-02-18T18:25:09.000+08:00
diff --git a/Coding_iOS/Controllers/Login/LoginViewController.m b/Coding_iOS/Controllers/Login/LoginViewController.m
@@ -413,6 +413,7 @@ - (void)sendLogin{
             if (data) {
                 [Login setPreUserEmail:self.myLogin.email];//&#35760;&#20303;&#30331;&#24405;&#36134;&#21495;
                 [((AppDelegate *)[UIApplication sharedApplication].delegate) setupTabViewController];
+                [self doSomethingAfterLogin];
             }else{
                 NSString *global_key = error.userInfo[@"msg"][@"two_factor_auth_code_not_empty"];
                 if (global_key.length > 0) {
@@ -430,6 +431,29 @@ - (void)sendLogin{
     }
 }
 
+- (void)doSomethingAfterLogin{
+    User *curUser = [Login curLoginUser];
+    if (curUser.email.length > 0 && !curUser.email_validation.boolValue) {
+        UIAlertView *alertView = [UIAlertView bk_alertViewWithTitle:@"&#28608;&#27963;&#37038;&#31665;" message:@"&#35813;&#37038;&#31665;&#23578;&#26410;&#28608;&#27963;&#65292;&#35831;&#23613;&#24555;&#21435;&#37038;&#31665;&#26597;&#25910;&#37038;&#20214;&#24182;&#28608;&#27963;&#36134;&#21495;&#12290;&#22914;&#26524;&#22312;&#25910;&#20214;&#31665;&#20013;&#27809;&#26377;&#30475;&#21040;&#65292;&#35831;&#30041;&#24847;&#19968;&#19979;&#22403;&#22334;&#37038;&#20214;&#31665;&#23376;&#65288;T_T&#65289;"];
+        [alertView bk_setCancelButtonWithTitle:@"&#21462;&#28040;" handler:nil];
+        [alertView bk_addButtonWithTitle:@"&#37325;&#21457;&#28608;&#27963;&#37038;&#20214;" handler:nil];
+        [alertView bk_setDidDismissBlock:^(UIAlertView *alert, NSInteger index) {
+            if (index == 1) {
+                [self sendActivateEmail];
+            }
+        }];
+        [alertView show];
+
+    }
+}
+- (void)sendActivateEmail{
+    [[Coding_NetAPIManager sharedManager] request_SendActivateEmail:[Login curLoginUser].email block:^(id data, NSError *error) {
+        if (data) {
+            [NSObject showHudTipStr:@"&#37038;&#20214;&#24050;&#21457;&#36865;"];
+        }
+    }];
+}
+
 - (IBAction)cannotLoginBtnClicked:(id)sender {
     CannotLoginViewController *vc = [CannotLoginViewController vcWithMethodType:0 stepIndex:0 userStr:(([self.myLogin.email isPhoneNo] || [self.myLogin.email isEmail])? self.myLogin.email: nil)];
     [self.navigationController pushViewController:vc animated:YES];
diff --git a/Coding_iOS/Controllers/MeSetting/SettingAccountViewController.m b/Coding_iOS/Controllers/MeSetting/SettingAccountViewController.m
@@ -78,7 +78,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
             if (self.myUser.email_validation.boolValue || self.myUser.email.length <= 0) {
                 TitleValueCell *cell = [tableView dequeueReusableCellWithIdentifier:kCellIdentifier_TitleValue forIndexPath:indexPath];
                 cell.selectionStyle = UITableViewCellSelectionStyleNone;
-                [cell setTitleStr:@"&#37038;&#31665;" valueStr:self.myUser.email ?: @"&#26410;&#32465;&#23450;"];
+                [cell setTitleStr:@"&#37038;&#31665;" valueStr:self.myUser.email.length > 0 ? self.myUser.email: @"&#26410;&#32465;&#23450;"];
                 [tableView addLineforPlainCell:cell forRowAtIndexPath:indexPath withLeftSpace:kPaddingLeftWidth];
                 return cell;
             }else{
@@ -89,7 +89,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
             }
         }else{
             TitleValueMoreCell *cell = [tableView dequeueReusableCellWithIdentifier:kCellIdentifier_TitleValueMore forIndexPath:indexPath];
-            [cell setTitleStr:@"&#25163;&#26426;&#21495;&#30721;" valueStr:self.myUser.phone ?: @"&#26410;&#32465;&#23450;"];
+            [cell setTitleStr:@"&#25163;&#26426;&#21495;&#30721;" valueStr:self.myUser.phone.length > 0 ? self.myUser.phone: @"&#26410;&#32465;&#23450;"];
             [tableView addLineforPlainCell:cell forRowAtIndexPath:indexPath withLeftSpace:kPaddingLeftWidth];
             return cell;
         }
diff --git a/Coding_iOS/Models/Login.m b/Coding_iOS/Models/Login.m
@@ -30,23 +30,12 @@ - (instancetype)init
 }
 
 - (NSString *)toPath{
-    NSString *path = @"https://coding.net/api/v2/account/login";
-//    if ([self.email isPhoneNo]) {
-//        path = @"api/account/login/phone";
-//    }else{
-//        path = @"api/login";
-//    }
-    return path;
+    return @"https://coding.net/api/v2/account/login";
 }
 - (NSDictionary *)toParams{
     NSMutableDictionary *params = @{@"account": self.email,
                                     @"password" : [self.password sha1Str],
                                     @"remember_me" : self.remember_me? @"true" : @"false",}.mutableCopy;
-//    if ([self.email isPhoneNo]) {
-//        params[@"phone"] = self.email;
-//    }else{
-//        params[@"email"] = self.email;
-//    }
     if (self.j_captcha.length > 0) {
         params[@"j_captcha"] = self.j_captcha;
     }
@@ -86,7 +75,6 @@ + (void)doLogin:(NSDictionary *)loginData{
 //        NSLog(@"cookies : %@", obj.description);
 //    }];
     
-    
     if (loginData) {
         NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
         [defaults setObject:[NSNumber numberWithBool:YES] forKey:kLoginStatus];
