diff --git a/ManagerDemo.xcworkspace/xcuserdata/xmfish.xcuserdatad/UserInterfaceState.xcuserstate b/ManagerDemo.xcworkspace/xcuserdata/xmfish.xcuserdatad/UserInterfaceState.xcuserstate index 968960e..e963dcc 100644 Binary files a/ManagerDemo.xcworkspace/xcuserdata/xmfish.xcuserdatad/UserInterfaceState.xcuserstate and b/ManagerDemo.xcworkspace/xcuserdata/xmfish.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/ManagerDemo/Common/DaiDaiTongApi/DaiDaiTongApi.m b/ManagerDemo/Common/DaiDaiTongApi/DaiDaiTongApi.m index 86671da..61906c8 100644 --- a/ManagerDemo/Common/DaiDaiTongApi/DaiDaiTongApi.m +++ b/ManagerDemo/Common/DaiDaiTongApi/DaiDaiTongApi.m @@ -61,6 +61,8 @@ [dic setObject:@"15e6c60bbdfa5d62dc7baab09cca5d19d1f32d11" forKey:@"token"]; [dic setObject:@"2.5.0" forKey:@"ver"]; [dic setObject:@"IOS" forKey:@"vjson"]; + [dic setObject:@"8201408070536905" forKey:@"userId"]; + [dic setObject:@"15e6c60bbdfa5d62dc7baab09cca5d19d1f32d11" forKey:@"token"]; return [self operationWithPath:path params:dic httpMethod:@"POST" ssl:YES]; } -(MKNetworkOperation*)getApiWithParam:(NSDictionary *)param withApiType:(NSString *)apiType completionBlock:(CompletionBlock)completionBlock failedBlock:(FailedBlock)failedBlock diff --git a/ManagerDemo/Common/DaiDaiTongApi/DaiDaiTongTestApi.m b/ManagerDemo/Common/DaiDaiTongApi/DaiDaiTongTestApi.m index 8048bab..1b50b5b 100644 --- a/ManagerDemo/Common/DaiDaiTongApi/DaiDaiTongTestApi.m +++ b/ManagerDemo/Common/DaiDaiTongApi/DaiDaiTongTestApi.m @@ -38,6 +38,9 @@ if ([ManagerUser shareInstance].token.length > 0) { [dic setObject:[ManagerUser shareInstance].token forKey:@"token"]; } + if ([ManagerUser shareInstance].userId.length > 0) { + [dic setObject:[ManagerUser shareInstance].userId forKey:@"userid"]; + } NSError *parseError = nil; NSData *jsonData = [NSJSONSerialization dataWithJSONObject:dic options:NSJSONWritingPrettyPrinted error:&parseError]; NSString* tempStr = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding]; diff --git a/ManagerDemo/MainView/LoginView/InputPassWordViewController.m b/ManagerDemo/MainView/LoginView/InputPassWordViewController.m index da80244..51cf249 100644 --- a/ManagerDemo/MainView/LoginView/InputPassWordViewController.m +++ b/ManagerDemo/MainView/LoginView/InputPassWordViewController.m @@ -56,17 +56,32 @@ - (IBAction)login:(id)sender { if (_passwordTextField.text.length>0 && _phoneNum.length>0) { - DaiDaiTongApi* daiDaiTongApi = [DaiDaiTongApi shareInstance]; - [daiDaiTongApi loginWithPhone:_phoneNum withPassWord:_passwordTextField.text withCompletionBlock:^(id jsonRes) { - if ([[jsonRes objectForKey:@"succ"] integerValue] != 1) { +// DaiDaiTongApi* daiDaiTongApi = [DaiDaiTongApi shareInstance]; +// [daiDaiTongApi loginWithPhone:_phoneNum withPassWord:_passwordTextField.text withCompletionBlock:^(id jsonRes) { +// if ([[jsonRes objectForKey:@"succ"] integerValue] != 1) { +// }else{ +// } +// [ManagerUser shareInstance].isLogin = YES; +// [self.navigationController dismissViewControllerAnimated:YES completion:nil]; +// +// } failedBlock:^(NSError *error) { +// [MBProgressHUD errorHudWithView:nil label:@"网络出错" hidesAfter:1.0]; +// }]; + + [MBProgressHUD hudWithView:self.view label:@"安全加载中"]; + DaiDaiTongTestApi* daiDaiTongTestApi = [DaiDaiTongTestApi shareInstance]; + [daiDaiTongTestApi getApiWithParam:[NSDictionary dictionaryWithObjectsAndKeys:_phoneNum,@"phoneNum",_passwordTextField.text, @"loginPsw", nil] withApiType:@"loginByPsw" completionBlock:^(id jsonRes) { + if (!([[jsonRes objectForKey:@"resultflag"] integerValue] == 0)) { + [MBProgressHUD errorHudWithView:self.view label:[jsonRes objectForKey:@"resultMsg"] hidesAfter:0.5]; }else{ + [ManagerUser shareInstance].isLogin = YES; + [ManagerUser shareInstance].userId = [jsonRes objectForKey:@"userid"]; + [MBProgressHUD hideAllHUDsForView:self.view animated:YES]; + [self.navigationController dismissViewControllerAnimated:YES completion:nil]; } - [ManagerUser shareInstance].isLogin = YES; - [self.navigationController dismissViewControllerAnimated:YES completion:nil]; - } failedBlock:^(NSError *error) { - DLog(@"失败"); - [MBProgressHUD errorHudWithView:nil label:@"网络出错" hidesAfter:1.0]; + + [MBProgressHUD errorHudWithView:self.view label:@"网络出错" hidesAfter:0.5]; }]; } } diff --git a/ManagerDemo/MainView/LoginView/SetPassWordViewController.h b/ManagerDemo/MainView/LoginView/SetPassWordViewController.h index ca2d52e..4100657 100644 --- a/ManagerDemo/MainView/LoginView/SetPassWordViewController.h +++ b/ManagerDemo/MainView/LoginView/SetPassWordViewController.h @@ -8,6 +8,10 @@ #import "ViewController.h" -@interface SetPassWordViewController : ViewController +@interface SetPassWordViewController : ViewController +@property (weak, nonatomic) IBOutlet UITextField *passWordTextField; +@property (weak, nonatomic) IBOutlet UITextField *surePassWordTextField; +- (IBAction)completeBtnClick:(id)sender; +@property (weak, nonatomic) IBOutlet UIButton *completeBtn; @end diff --git a/ManagerDemo/MainView/LoginView/SetPassWordViewController.m b/ManagerDemo/MainView/LoginView/SetPassWordViewController.m index 957e678..83b4d46 100644 --- a/ManagerDemo/MainView/LoginView/SetPassWordViewController.m +++ b/ManagerDemo/MainView/LoginView/SetPassWordViewController.m @@ -27,6 +27,66 @@ { [super viewDidLoad]; // Do any additional setup after loading the view from its nib. + self.navigationItem.title = @"设置登录密码"; + _passWordTextField.leftViewMode = UITextFieldViewModeAlways; + _passWordTextField.layer.masksToBounds=YES; + _passWordTextField.layer.borderColor = [[UIColor lightGrayColor]CGColor]; + _passWordTextField.layer.borderWidth= 1.0f; + _passWordTextField.clearButtonMode = UITextFieldViewModeWhileEditing; + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(textFieldTextDidChange:) name:UITextFieldTextDidChangeNotification object:_passWordTextField]; + _passWordTextField.delegate = self; + + _surePassWordTextField.leftViewMode = UITextFieldViewModeAlways; + _surePassWordTextField.layer.masksToBounds=YES; + _surePassWordTextField.layer.borderColor = [[UIColor lightGrayColor]CGColor]; + _surePassWordTextField.layer.borderWidth= 1.0f; + _surePassWordTextField.clearButtonMode = UITextFieldViewModeWhileEditing; + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(textFieldTextDidChange:) name:UITextFieldTextDidChangeNotification object:_surePassWordTextField]; + _surePassWordTextField.delegate = self; + + _completeBtn.enabled = NO; + [_completeBtn setBackgroundImage:[ManagerUtil buttonImageFromColor:[UIColor lightGrayColor] withFrame:_completeBtn.frame] forState:UIControlStateDisabled]; +} + + +-(void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event +{ + + [super touchesMoved:touches withEvent:event]; + [_surePassWordTextField resignFirstResponder]; + [_passWordTextField resignFirstResponder]; + +} +#pragma mark UITextFieldDelegate +-(BOOL)textFieldShouldBeginEditing:(UITextField *)textField +{ + textField.layer.borderColor = [[UIColor orangeColor]CGColor]; + return YES; +} +- (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string +{ + + if (range.location >= 12) + return NO; // return NO to not change text + + return YES; +} +-(void)textFieldTextDidChange:(NSNotification *)sender +{ + + if ([_passWordTextField.text isEqualToString:@""] || [_surePassWordTextField.text isEqualToString:@""] ) { + _completeBtn.enabled = NO; + + }else{ + _completeBtn.enabled = YES; + + } + +} +-(BOOL)textFieldShouldEndEditing:(UITextField *)textField +{ + + return YES; } - (void)didReceiveMemoryWarning @@ -35,4 +95,28 @@ // Dispose of any resources that can be recreated. } +- (IBAction)completeBtnClick:(id)sender { + + if (![_passWordTextField.text isEqualToString:_surePassWordTextField.text]) { + [MBProgressHUD errorHudWithView:self.view label:@"两次密码不同" hidesAfter:0.5]; + } + if (_passWordTextField.text.length<6 || _passWordTextField.text.length>11) { + [MBProgressHUD errorHudWithView:self.view label:@"密码不规范" hidesAfter:0.5]; + } + [MBProgressHUD hudWithView:self.view label:@"安全加载中"]; + DaiDaiTongTestApi* daiDaiTongTestApi = [DaiDaiTongTestApi shareInstance]; + [daiDaiTongTestApi getApiWithParam:[NSDictionary dictionaryWithObjectsAndKeys:_passWordTextField.text,@"loginPsw", nil] withApiType:@"setLoginPsw" completionBlock:^(id jsonRes) { + if (!([[jsonRes objectForKey:@"resultflag"] integerValue] == 0)) { + [MBProgressHUD errorHudWithView:self.view label:[jsonRes objectForKey:@"resultMsg"] hidesAfter:0.5]; + }else{ + [self.navigationController dismissViewControllerAnimated:YES completion:^{ + + }]; + } + } failedBlock:^(NSError *error) { + + [MBProgressHUD errorHudWithView:self.view label:@"网络出错" hidesAfter:0.5]; + }]; + +} @end diff --git a/ManagerDemo/MainView/LoginView/SetPassWordViewController.xib b/ManagerDemo/MainView/LoginView/SetPassWordViewController.xib index 028dc8c..ed323a6 100644 --- a/ManagerDemo/MainView/LoginView/SetPassWordViewController.xib +++ b/ManagerDemo/MainView/LoginView/SetPassWordViewController.xib @@ -6,6 +6,9 @@ + + + @@ -14,12 +17,37 @@ - + - + + + + + + + + + diff --git a/ManagerDemo/MainViewControll/MainViewController.m b/ManagerDemo/MainViewControll/MainViewController.m index e76aa41..d2ee1a2 100644 --- a/ManagerDemo/MainViewControll/MainViewController.m +++ b/ManagerDemo/MainViewControll/MainViewController.m @@ -35,7 +35,6 @@ _myMoreNavigationController = [[UINavigationController alloc] initWithRootViewController:[[MoreViewController alloc] init]]; if (IOS7_OR_LATER) { [_homeNavigationController setTabBarItem:[[UITabBarItem alloc] initWithTitle:@"首页" image:[UIImage imageNamed:@"icon_dock_home"] selectedImage:[UIImage imageNamed:@"icon_dock_home_actived"]]]; -// [_homeNavigationController.tabBarItem setBadgeValue:@"新"]; [_produciListNavigationController setTabBarItem:[[UITabBarItem alloc] initWithTitle:@"产品列表" image:[UIImage imageNamed:@"icon_dock_session"] selectedImage:[UIImage imageNamed:@"icon_dock_session_actived"]]]; @@ -56,8 +55,8 @@ [super viewDidLoad]; // Do any additional setup after loading the view from its nib. - [ManagerUser shareInstance].userId = @"8201408070536905"; - [ManagerUser shareInstance].token = @"15e6c60bbdfa5d62dc7baab09cca5d19d1f32d11"; +// [ManagerUser shareInstance].userId = @"8201408070536905"; +// [ManagerUser shareInstance].token = @"15e6c60bbdfa5d62dc7baab09cca5d19d1f32d11"; }