找回密码方式改版

wanghengheng · wanghengheng · commit cbdb4d23563e · 2015-12-23T10:57:44.000+08:00
diff --git a/Coding_iOS/Controllers/Login/CannotLoginViewController.h b/Coding_iOS/Controllers/Login/CannotLoginViewController.h
@@ -7,15 +7,15 @@
 //
 
 #import "BaseViewController.h"
-typedef NS_ENUM(NSInteger, CannotLoginType) {
-    CannotLoginTypeResetPassword = 0,
-    CannotLoginTypeActivate,
-};
+#import "Coding_NetAPIManager.h"
 
+typedef NS_ENUM(NSInteger, CannotLoginMethodType) {
+    CannotLoginMethodEamil = 0,
+    CannotLoginMethodPhone
+};
 
 @interface CannotLoginViewController : BaseViewController
-@property (nonatomic, assign) CannotLoginType type;
 
-@property (strong, nonatomic) NSString *email, *j_captcha;
++ (instancetype)vcWithPurposeType:(PurposeType)purposeType methodType:(CannotLoginMethodType)methodType stepIndex:(NSUInteger)stepIndex userStr:(NSString *)userStr;
 
 @end
diff --git a/Coding_iOS/Controllers/Login/CannotLoginViewController.m b/Coding_iOS/Controllers/Login/CannotLoginViewController.m
diff --git a/Coding_iOS/Controllers/Login/LoginViewController.m b/Coding_iOS/Controllers/Login/LoginViewController.m
@@ -430,16 +430,15 @@ - (void)sendLogin{
 }
 
 - (IBAction)cannotLoginBtnClicked:(id)sender {
-    [[UIActionSheet bk_actionSheetCustomWithTitle:nil buttonTitles:@[@"&#25214;&#22238;&#23494;&#30721;", @"&#37325;&#21457;&#28608;&#27963;&#37038;&#20214;"] destructiveTitle:nil cancelTitle:@"&#21462;&#28040;" andDidDismissBlock:^(UIActionSheet *sheet, NSInteger index) {
+    [[UIActionSheet bk_actionSheetCustomWithTitle:nil buttonTitles:@[@"&#24536;&#35760;&#23494;&#30721;&#65311;", @"&#24050;&#27880;&#20876;&#65292;&#26410;&#35774;&#32622;&#23494;&#30721;&#65311;"] destructiveTitle:nil cancelTitle:@"&#21462;&#28040;" andDidDismissBlock:^(UIActionSheet *sheet, NSInteger index) {
         if (index <= 1) {
             [self goToCannotLoginWithIndex:index];
         }
     }] showInView:self.view];
 }
 
 - (void)goToCannotLoginWithIndex:(NSInteger)index{
-    CannotLoginViewController *vc = [[CannotLoginViewController alloc] init];
-    vc.type = index;
+    CannotLoginViewController *vc = [CannotLoginViewController vcWithPurposeType:(index == 0? PurposeToPasswordReset: PurposeToPasswordActivate) methodType:0 stepIndex:0 userStr:self.myLogin.email];
     [self.navigationController pushViewController:vc animated:YES];
 }
 
diff --git a/Coding_iOS/Controllers/Login/RegisterViewController.m b/Coding_iOS/Controllers/Login/RegisterViewController.m
@@ -285,8 +285,7 @@ - (void)gotoServiceTermsVC{
 }
 
 - (void)gotoCannotLoginVC{
-    CannotLoginViewController *vc = [[CannotLoginViewController alloc] init];
-    vc.type = CannotLoginTypeActivate;
+    CannotLoginViewController *vc = [CannotLoginViewController vcWithPurposeType:PurposeToPasswordActivate methodType:0 stepIndex:0 userStr:self.myRegister.email];
     [self.navigationController pushViewController:vc animated:YES];
 }
 
diff --git a/Coding_iOS/Models/Register.h b/Coding_iOS/Models/Register.h
@@ -12,5 +12,7 @@
 //&#35831;&#27714;
 @property (readwrite, nonatomic, strong) NSString *email, *global_key, *j_captcha;
 
++ (NSString *)channel;
+
 - (NSDictionary *)toParams;
 @end
diff --git a/Coding_iOS/Models/Register.m b/Coding_iOS/Models/Register.m
@@ -6,8 +6,6 @@
 //  Copyright (c) 2014&#24180; Coding. All rights reserved.
 //
 
-#define kRegisterChannel @"coding-ios"
-
 #import "Register.h"
 
 @implementation Register
@@ -25,6 +23,10 @@ - (NSDictionary *)toParams{
     return @{@"email" : self.email,
              @"global_key" : self.global_key,
              @"j_captcha" : _j_captcha? _j_captcha: @"",
-             @"channel" : kRegisterChannel};
+             @"channel" : [Register channel]};
+}
+
++ (NSString *)channel{
+    return @"coding-ios";
 }
 @end
diff --git a/Coding_iOS/Util/Manager/Coding_NetAPIManager.h b/Coding_iOS/Util/Manager/Coding_NetAPIManager.h
@@ -46,6 +46,12 @@ typedef NS_ENUM(NSUInteger, VerifyType){
     VerifyTypeTotp,
 };
 
+typedef NS_ENUM(NSInteger, PurposeType) {
+    PurposeToRegister = 0,
+    PurposeToPasswordActivate,
+    PurposeToPasswordReset
+};
+
 @interface Coding_NetAPIManager : NSObject
 + (instancetype)sharedManager;
 
@@ -59,8 +65,10 @@ typedef NS_ENUM(NSUInteger, VerifyType){
 - (void)request_Login_WithPath:(NSString *)path Params:(id)params andBlock:(void (^)(id data, NSError *error))block;
 - (void)request_Register_WithParams:(id)params andBlock:(void (^)(id data, NSError *error))block;
 - (void)request_CaptchaNeededWithPath:(NSString *)path andBlock:(void (^)(id data, NSError *error))block;
-- (void)request_SendMailToPath:(NSString *)path email:(NSString *)email j_captcha:(NSString *)j_captcha andBlock:(void (^)(id data, NSError *error))block;
 - (void)request_SetPasswordToPath:(NSString *)path params:(NSDictionary *)params andBlock:(void (^)(id data, NSError *error))block;
+- (void)request_GeneratePhoneCodeWithPhone:(NSString *)phone type:(PurposeType)type block:(void (^)(id data, NSError *error))block;
+- (void)request_SetPasswordWithPhone:(NSString *)phone code:(NSString *)code password:(NSString *)password captcha:(NSString *)captcha type:(PurposeType)type block:(void (^)(id data, NSError *error))block;
+- (void)request_SetPasswordWithEmail:(NSString *)email captcha:(NSString *)captcha type:(PurposeType)type block:(void (^)(id data, NSError *error))block;
 
 //Project
 - (void)request_Projects_WithObj:(Projects *)projects andBlock:(void (^)(Projects *data, NSError *error))block;
diff --git a/Coding_iOS/Util/Manager/Coding_NetAPIManager.m b/Coding_iOS/Util/Manager/Coding_NetAPIManager.m
@@ -12,6 +12,7 @@
 #import <NYXImagesKit/NYXImagesKit.h>
 #import <MMMarkdown/MMMarkdown.h>
 #import "MBProgressHUD+Add.h"
+#import "Register.h"
 
 @implementation Coding_NetAPIManager
 + (instancetype)sharedManager {
@@ -131,27 +132,87 @@ - (void)request_CaptchaNeededWithPath:(NSString *)path andBlock:(void (^)(id dat
     }];
 }
 
-- (void)request_SendMailToPath:(NSString *)path email:(NSString *)email j_captcha:(NSString *)j_captcha andBlock:(void (^)(id data, NSError *error))block{
-    [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:path withParams:@{@"email": email, @"j_captcha": j_captcha} withMethodType:Get andBlock:^(id data, NSError *error) {
+- (void)request_SetPasswordToPath:(NSString *)path params:(NSDictionary *)params andBlock:(void (^)(id data, NSError *error))block{
+    [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:path withParams:params withMethodType:Post andBlock:^(id data, NSError *error) {
         if (data) {
-            [MobClick event:kUmeng_Event_Request_ActionOfServer label:@"&#21457;&#28608;&#27963;or&#37325;&#32622;&#23494;&#30721;&#37038;&#20214;"];
+            [MobClick event:kUmeng_Event_Request_ActionOfServer label:@"&#28608;&#27963;or&#37325;&#32622;&#23494;&#30721;"];
 
             block(data, nil);
         }else{
             block(nil, error);
         }
     }];
 }
-
-- (void)request_SetPasswordToPath:(NSString *)path params:(NSDictionary *)params andBlock:(void (^)(id data, NSError *error))block{
+- (void)request_GeneratePhoneCodeWithPhone:(NSString *)phone type:(PurposeType)type block:(void (^)(id data, NSError *error))block{
+    NSString *path;
+    NSDictionary *params = @{@"phone": phone};
+    switch (type) {
+        case PurposeToRegister:
+            path = @"api/account/register/generate_phone_code";
+            break;
+        case PurposeToPasswordActivate:
+            path = @"api/account/activate/generate_phone_code";
+            break;
+        case PurposeToPasswordReset:
+            path = @"api/account/reset_password/generate_phone_code";
+            break;
+    }
+    
     [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:path withParams:params withMethodType:Post andBlock:^(id data, NSError *error) {
         if (data) {
-            [MobClick event:kUmeng_Event_Request_ActionOfServer label:@"&#28608;&#27963;or&#37325;&#32622;&#23494;&#30721;"];
-
-            block(data, nil);
-        }else{
-            block(nil, error);
+            [MobClick event:kUmeng_Event_Request_ActionOfServer label:@"&#29983;&#25104;&#25163;&#26426;&#39564;&#35777;&#30721;"];
+        }
+        block(data, error);
+    }];
+}
+- (void)request_SetPasswordWithPhone:(NSString *)phone code:(NSString *)code password:(NSString *)password captcha:(NSString *)captcha type:(PurposeType)type block:(void (^)(id data, NSError *error))block{
+    NSString *path = @"api/account/register/phone";
+    NSMutableDictionary *params = @{@"phone": phone,
+                                    @"code": code,
+                                    @"password": [password sha1Str]}.mutableCopy;
+    switch (type) {
+        case PurposeToRegister:{
+            path = @"api/account/register/phone";
+            params[@"channel"] = [Register channel];
+            break;
+        }
+        case PurposeToPasswordActivate:
+            path = @"api/account/activate/phone/set_password";
+            break;
+        case PurposeToPasswordReset:
+            path = @"api/phone/resetPassword";
+            break;
+    }
+    if (captcha.length > 0) {
+        params[@"j_captcha"] = captcha;
+    }
+    [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:path withParams:params withMethodType:Post andBlock:^(id data, NSError *error) {
+        if (data) {
+            [MobClick event:kUmeng_Event_Request_ActionOfServer label:@"&#35774;&#32622;or&#37325;&#32622;&#23494;&#30721;"];
+        }
+        block(data, error);
+    }];
+}
+- (void)request_SetPasswordWithEmail:(NSString *)email captcha:(NSString *)captcha type:(PurposeType)type block:(void (^)(id data, NSError *error))block{
+    NSString *path;
+    NSDictionary *params = @{@"email": email,
+                             @"j_captcha": captcha};
+    switch (type) {
+        case PurposeToPasswordActivate:
+            path = @"api/activate";
+            break;
+        case PurposeToPasswordReset:
+            path = @"api/resetPassword";
+            break;
+        default:
+            path = nil;
+            break;
+    }
+    [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:path withParams:params withMethodType:Get andBlock:^(id data, NSError *error) {
+        if (data) {
+            [MobClick event:kUmeng_Event_Request_ActionOfServer label:@"&#21457;&#28608;&#27963;or&#37325;&#32622;&#23494;&#30721;&#37038;&#20214;"];
         }
+        block(data, nil);
     }];
 }
 #pragma mark Project
diff --git a/Coding_iOS/Views/Cell/Input_OnlyText_Cell.h b/Coding_iOS/Views/Cell/Input_OnlyText_Cell.h
@@ -25,5 +25,5 @@
 @property (nonatomic,copy) void(^editDidEndBlock)(NSString*);
 
 - (void)setPlaceholder:(NSString *)phStr value:(NSString *)valueStr;
-
++ (NSString *)randomCellIdentifierOfPhoneCodeType;
 @end
diff --git a/Coding_iOS/Views/Cell/Input_OnlyText_Cell.m b/Coding_iOS/Views/Cell/Input_OnlyText_Cell.m
@@ -21,6 +21,9 @@ @interface Input_OnlyText_Cell ()
 @end
 
 @implementation Input_OnlyText_Cell
++ (NSString *)randomCellIdentifierOfPhoneCodeType{
+    return [NSString stringWithFormat:@"%@_%ld", kCellIdentifier_Input_OnlyText_Cell_PhoneCode, random()];
+}
 
 - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier
 {
@@ -64,8 +67,8 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
                     make.center.equalTo(self.captchaView);
                 }];
             }
-        }else if ([reuseIdentifier isEqualToString:kCellIdentifier_Input_OnlyText_Cell_PhoneCode]){
-            if (_verify_codeBtn) {
+        }else if ([reuseIdentifier rangeOfString:kCellIdentifier_Input_OnlyText_Cell_PhoneCode].location != NSNotFound){
+            if (!_verify_codeBtn) {
                 _verify_codeBtn = [[PhoneCodeButton alloc] initWithFrame:CGRectMake(kScreen_Width - 80 - kLoginPaddingLeftWidth, (44-25)/2, 80, 25)];
                 [self.contentView addSubview:_verify_codeBtn];
             }
@@ -133,7 +136,7 @@ - (void)layoutSubviews {
     }else if ([self.reuseIdentifier isEqualToString:kCellIdentifier_Input_OnlyText_Cell_Captcha]){
         rightElement = _captchaView;
         [self refreshCaptchaImage];
-    }else if ([self.reuseIdentifier isEqualToString:kCellIdentifier_Input_OnlyText_Cell_PhoneCode]){
+    }else if ([self.reuseIdentifier rangeOfString:kCellIdentifier_Input_OnlyText_Cell_PhoneCode].location != NSNotFound){
         rightElement = _verify_codeBtn;
     }
     
@@ -143,7 +146,8 @@ - (void)layoutSubviews {
     }];
     
     [_textField mas_updateConstraints:^(MASConstraintMaker *make) {
-        CGFloat offset = self.isForLoginVC? (CGRectGetMinX(self.clearBtn.frame) - kScreen_Width) : rightElement? (CGRectGetMinX(rightElement.frame) - kScreen_Width - 10): -kLoginPaddingLeftWidth;
+        CGFloat offset = rightElement? (CGRectGetMinX(rightElement.frame) - kScreen_Width - 10): -kLoginPaddingLeftWidth;
+        offset -= self.isForLoginVC? 30: 0;
         make.right.equalTo(self.contentView).offset(offset);
     }];
 }
diff --git a/Coding_iOS/Views/PhoneCodeButton.m b/Coding_iOS/Views/PhoneCodeButton.m
@@ -18,6 +18,17 @@ @implementation PhoneCodeButton
 - (instancetype)init{
     self = [super init];
     if (self) {
+        self.titleLabel.font = [UIFont systemFontOfSize:12];
+        self.enabled = YES;
+    }
+    return self;
+}
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        self.titleLabel.font = [UIFont systemFontOfSize:12];
         self.enabled = YES;
     }
     return self;
@@ -29,7 +40,7 @@ - (void)awakeFromNib{
 
 - (void)setEnabled:(BOOL)enabled{
     [super setEnabled:enabled];
-    UIColor *foreColor = [UIColor colorWithHexString:enabled? @"0x2FAEEA": @"0xCCCCCC"];
+    UIColor *foreColor = [UIColor colorWithHexString:enabled? @"0x3BBD79": @"0xCCCCCC"];
     [self doBorderWidth:1.0 color:foreColor cornerRadius:2.0];
     [self setTitleColor:foreColor forState:UIControlStateNormal];
     if (enabled) {

Original file line number	Diff line number	Diff line change
`@@ -430,16 +430,15 @@ - (void)sendLogin{`
`430`	`430`	`}`
`431`	`431`
`432`	`432`	`- (IBAction)cannotLoginBtnClicked:(id)sender {`
`433`		`- [[UIActionSheet bk_actionSheetCustomWithTitle:nil buttonTitles:@[@"找回密码", @"重发激活邮件"] destructiveTitle:nil cancelTitle:@"取消" andDidDismissBlock:^(UIActionSheet *sheet, NSInteger index) {`
	`433`	`+ [[UIActionSheet bk_actionSheetCustomWithTitle:nil buttonTitles:@[@"忘记密码？", @"已注册，未设置密码？"] destructiveTitle:nil cancelTitle:@"取消" andDidDismissBlock:^(UIActionSheet *sheet, NSInteger index) {`
`434`	`434`	`if (index <= 1) {`
`435`	`435`	`[self goToCannotLoginWithIndex:index];`
`436`	`436`	`}`
`437`	`437`	`}] showInView:self.view];`
`438`	`438`	`}`
`439`	`439`
`440`	`440`	`- (void)goToCannotLoginWithIndex:(NSInteger)index{`
`441`		`- CannotLoginViewController *vc = [[CannotLoginViewController alloc] init];`
`442`		`- vc.type = index;`
	`441`	`+ CannotLoginViewController *vc = [CannotLoginViewController vcWithPurposeType:(index == 0? PurposeToPasswordReset: PurposeToPasswordActivate) methodType:0 stepIndex:0 userStr:self.myLogin.email];`
`443`	`442`	`[self.navigationController pushViewController:vc animated:YES];`
`444`	`443`	`}`
`445`	`444`
Original file line number	Diff line number	Diff line change
`@@ -285,8 +285,7 @@ - (void)gotoServiceTermsVC{`
`285`	`285`	`}`
`286`	`286`
`287`	`287`	`- (void)gotoCannotLoginVC{`
`288`		`- CannotLoginViewController *vc = [[CannotLoginViewController alloc] init];`
`289`		`- vc.type = CannotLoginTypeActivate;`
	`288`	`+ CannotLoginViewController *vc = [CannotLoginViewController vcWithPurposeType:PurposeToPasswordActivate methodType:0 stepIndex:0 userStr:self.myRegister.email];`
`290`	`289`	`[self.navigationController pushViewController:vc animated:YES];`
`291`	`290`	`}`
`292`	`291`