diff --git a/ManagerDemo.xcodeproj/project.pbxproj b/ManagerDemo.xcodeproj/project.pbxproj index 969c007..d97f195 100644 --- a/ManagerDemo.xcodeproj/project.pbxproj +++ b/ManagerDemo.xcodeproj/project.pbxproj @@ -193,6 +193,8 @@ A9B9F14519AEF9BE001A1315 /* TableCellLineView.m in Sources */ = {isa = PBXBuildFile; fileRef = A9B9F14419AEF9BE001A1315 /* TableCellLineView.m */; }; A9B9F14C19AF1493001A1315 /* OtherProductInfoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A9B9F14A19AF1493001A1315 /* OtherProductInfoViewController.m */; }; A9B9F14D19AF1493001A1315 /* OtherProductInfoViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9B9F14B19AF1493001A1315 /* OtherProductInfoViewController.xib */; }; + A9BA324619D338C500B48A8F /* ModifyPassWordViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A9BA324419D338C500B48A8F /* ModifyPassWordViewController.m */; }; + A9BA324719D338C500B48A8F /* ModifyPassWordViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9BA324519D338C500B48A8F /* ModifyPassWordViewController.xib */; }; A9C053FE19AD706C002331A5 /* ToolBarView.m in Sources */ = {isa = PBXBuildFile; fileRef = A9C053FD19AD706C002331A5 /* ToolBarView.m */; }; A9C0540519ADBCB2002331A5 /* FundProductInfoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A9C0540319ADBCB2002331A5 /* FundProductInfoViewController.m */; }; A9C0540619ADBCB2002331A5 /* FundProductInfoViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9C0540419ADBCB2002331A5 /* FundProductInfoViewController.xib */; }; @@ -514,6 +516,9 @@ A9B9F14919AF1493001A1315 /* OtherProductInfoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OtherProductInfoViewController.h; sourceTree = ""; }; A9B9F14A19AF1493001A1315 /* OtherProductInfoViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OtherProductInfoViewController.m; sourceTree = ""; }; A9B9F14B19AF1493001A1315 /* OtherProductInfoViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = OtherProductInfoViewController.xib; sourceTree = ""; }; + A9BA324319D338C500B48A8F /* ModifyPassWordViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ModifyPassWordViewController.h; sourceTree = ""; }; + A9BA324419D338C500B48A8F /* ModifyPassWordViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ModifyPassWordViewController.m; sourceTree = ""; }; + A9BA324519D338C500B48A8F /* ModifyPassWordViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ModifyPassWordViewController.xib; sourceTree = ""; }; A9C053FC19AD706C002331A5 /* ToolBarView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ToolBarView.h; sourceTree = ""; }; A9C053FD19AD706C002331A5 /* ToolBarView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ToolBarView.m; sourceTree = ""; }; A9C0540219ADBCB2002331A5 /* FundProductInfoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FundProductInfoViewController.h; sourceTree = ""; }; @@ -1136,6 +1141,9 @@ A936792819D06A1B004F6EBE /* AuthenticationViewController.h */, A936792919D06A1B004F6EBE /* AuthenticationViewController.m */, A936792A19D06A1B004F6EBE /* AuthenticationViewController.xib */, + A9BA324319D338C500B48A8F /* ModifyPassWordViewController.h */, + A9BA324419D338C500B48A8F /* ModifyPassWordViewController.m */, + A9BA324519D338C500B48A8F /* ModifyPassWordViewController.xib */, ); path = LoginView; sourceTree = ""; @@ -1340,6 +1348,7 @@ A9233E64199CA44700DA80D8 /* more_icon_5@2x.png in Resources */, A93320CD19C02F0B0090D640 /* WYDAmountViewController.xib in Resources */, A919056A19B07AAF002575DF /* pie_chart_arrow@2x.png in Resources */, + A9BA324719D338C500B48A8F /* ModifyPassWordViewController.xib in Resources */, A99EBEBC19CBAFE3005E1AA0 /* Icon-114.png in Resources */, A9EAA052199879CC001A872A /* pie_chart_center@2x.png in Resources */, A9C69458199BD14D00B2CECE /* more_icon_10@2x.png in Resources */, @@ -1497,6 +1506,7 @@ A9C0540519ADBCB2002331A5 /* FundProductInfoViewController.m in Sources */, A94FE51E199C9C3C00626DE5 /* MoveSocialCellView.m in Sources */, A93F8806199A077F00875287 /* OtherListViewController.m in Sources */, + A9BA324619D338C500B48A8F /* ModifyPassWordViewController.m in Sources */, A99FDB0A19CAC16E00D2B3D3 /* SetPassWordViewController.m in Sources */, A9AF6C2E199483520076C0EE /* MainViewController.m in Sources */, A9EE5EE719C20CDA004E7A2C /* WYDAmountTableViewCell.m in Sources */, diff --git a/ManagerDemo.xcworkspace/xcuserdata/xmfish.xcuserdatad/UserInterfaceState.xcuserstate b/ManagerDemo.xcworkspace/xcuserdata/xmfish.xcuserdatad/UserInterfaceState.xcuserstate index 4b21457..5d77ce7 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/BaseView/BaseListViewController.m b/ManagerDemo/Common/BaseView/BaseListViewController.m index a844667..673f08f 100644 --- a/ManagerDemo/Common/BaseView/BaseListViewController.m +++ b/ManagerDemo/Common/BaseView/BaseListViewController.m @@ -70,30 +70,6 @@ } -(void)loadDataWithDic:(NSDictionary *)dic withType:(NSString *)typeStr WithcompletionBlock:(CompletionBlock)completionBlock failedBlock:(FailedBlock)failedBlock { -// DaiDaiTongApi* daiDaiTongApi = [DaiDaiTongApi shareInstance]; -// [daiDaiTongApi getListwithPageNum:_pageNum withType:typeStr withParam:dic withCompletionBlock:^(id jsonRes) { -// if ([[jsonRes objectForKey:@"succ"] integerValue] == 1) { -// if (_pageNum == 1) { -// [_infoArray removeAllObjects]; -// [self.tableView addFooterWithTarget:self action:@selector(footerRereshing)]; -// } -// if ([[jsonRes objectForKey:@"totalPages"] integerValue] <= [[jsonRes objectForKey:@"pageNum"] integerValue]) { -// [self.tableView removeFooter]; -// } -// completionBlock(jsonRes); -// [self.tableView reloadData]; -// }else{ -// [MBProgressHUD errorHudWithView:nil label:[jsonRes objectForKey:@"err_msg"] hidesAfter:0.5]; -// } -// [self headerEndRefreshing]; -// [self footerEndRefreshing]; -// -// } failedBlock:^(NSError *error) { -// [MBProgressHUD errorHudWithView:self.view label:@"网络出错" hidesAfter:1.0]; -// [self headerEndRefreshing]; -// [self footerEndRefreshing]; -// failedBlock(error); -// }]; DaiDaiTongTestApi* daiDaiTongTestApi = [DaiDaiTongTestApi shareInstance]; [daiDaiTongTestApi getApiWithParam:[NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithInteger:_pageNum],@"pageNum", nil] withApiType:typeStr completionBlock:^(id jsonRes) { diff --git a/ManagerDemo/MainView/LoginView/InputPassWordViewController.h b/ManagerDemo/MainView/LoginView/InputPassWordViewController.h index b4fba26..0fe386c 100644 --- a/ManagerDemo/MainView/LoginView/InputPassWordViewController.h +++ b/ManagerDemo/MainView/LoginView/InputPassWordViewController.h @@ -17,6 +17,7 @@ @property (strong, nonatomic)NSString* phoneNum; @property (weak, nonatomic) IBOutlet UITextField *passwordTextField; +- (IBAction)forgetBtnClick:(id)sender; @property (weak, nonatomic) IBOutlet UIButton *sureBtn; @property (weak, nonatomic) IBOutlet UIUnderlinedButton *forgetBtn; - (IBAction)login:(id)sender; diff --git a/ManagerDemo/MainView/LoginView/InputPassWordViewController.m b/ManagerDemo/MainView/LoginView/InputPassWordViewController.m index 713b8f4..32a82be 100644 --- a/ManagerDemo/MainView/LoginView/InputPassWordViewController.m +++ b/ManagerDemo/MainView/LoginView/InputPassWordViewController.m @@ -7,6 +7,7 @@ // #import "InputPassWordViewController.h" +#import "ModifyPassWordViewController.h" @interface InputPassWordViewController () @end @@ -74,4 +75,11 @@ }]; } } +- (IBAction)forgetBtnClick:(id)sender { + ModifyPassWordViewController* modifyPassWordViewController = [[ModifyPassWordViewController alloc] init]; + modifyPassWordViewController.type = 0; + modifyPassWordViewController.phoneNum = _phoneNum; + modifyPassWordViewController.hidesBottomBarWhenPushed = YES; + [self.navigationController pushViewController:modifyPassWordViewController animated:YES]; +} @end diff --git a/ManagerDemo/MainView/LoginView/InputPassWordViewController.xib b/ManagerDemo/MainView/LoginView/InputPassWordViewController.xib index 162fd8d..9e96a36 100644 --- a/ManagerDemo/MainView/LoginView/InputPassWordViewController.xib +++ b/ManagerDemo/MainView/LoginView/InputPassWordViewController.xib @@ -41,6 +41,9 @@ + + + diff --git a/ManagerDemo/MainView/LoginView/InputVerificationViewController.m b/ManagerDemo/MainView/LoginView/InputVerificationViewController.m index 21344da..05e231b 100644 --- a/ManagerDemo/MainView/LoginView/InputVerificationViewController.m +++ b/ManagerDemo/MainView/LoginView/InputVerificationViewController.m @@ -126,8 +126,9 @@ if ([[jsonRes objectForKey:@"resultflag"] integerValue] == 1) { [MBProgressHUD errorHudWithView:self.view label:[jsonRes objectForKey:@"resultMsg"] hidesAfter:0.5]; }else{ - [_timer fire]; } + _timer = [NSTimer scheduledTimerWithTimeInterval:1.0 target:self selector:@selector(reGetCodeTime) userInfo:nil repeats:YES]; + [_timer fire]; } failedBlock:^(NSError *error) { }]; diff --git a/ManagerDemo/MainView/LoginView/ModifyPassWordViewController.h b/ManagerDemo/MainView/LoginView/ModifyPassWordViewController.h new file mode 100644 index 0000000..f05efc0 --- /dev/null +++ b/ManagerDemo/MainView/LoginView/ModifyPassWordViewController.h @@ -0,0 +1,27 @@ +// +// ModifyPassWordViewController.h +// ManagerDemo +// +// Created by xmfish on 14-9-25. +// Copyright (c) 2014年 ash. All rights reserved. +// + +#import + +@interface ModifyPassWordViewController : UIViewController +{ + NSInteger _type; + NSString* _phoneNum; +} +@property (strong, nonatomic)NSString* phoneNum; +@property (weak, nonatomic) IBOutlet UITextField *nameTextFiel; +@property (weak, nonatomic) IBOutlet UITextField *phoneTextField; +@property (weak, nonatomic) IBOutlet UITextField *idCardTextField; +@property (weak, nonatomic) IBOutlet UIButton *cmsBtn; +- (IBAction)cmsBtnClick:(id)sender; +@property (weak, nonatomic) IBOutlet UIView *blackGroudView; +@property (weak, nonatomic) IBOutlet UITextField *cmsNumTextField; +- (IBAction)nextBtnClick:(id)sender; +@property (weak, nonatomic) IBOutlet UIButton *nextBtn; +@property(assign, nonatomic)NSInteger type; +@end diff --git a/ManagerDemo/MainView/LoginView/ModifyPassWordViewController.m b/ManagerDemo/MainView/LoginView/ModifyPassWordViewController.m new file mode 100644 index 0000000..0ee9bb7 --- /dev/null +++ b/ManagerDemo/MainView/LoginView/ModifyPassWordViewController.m @@ -0,0 +1,223 @@ +// +// ModifyPassWordViewController.m +// ManagerDemo +// +// Created by xmfish on 14-9-25. +// Copyright (c) 2014年 ash. All rights reserved. +// + +#import "ModifyPassWordViewController.h" +#import "SetPassWordViewController.h" +@interface ModifyPassWordViewController () +{ + BOOL _isRealName;//是否实名 + NSTimer *_timer; + NSInteger _timeSecond; +} +@end + +@implementation ModifyPassWordViewController + +- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil +{ + self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]; + if (self) { + // Custom initialization + } + return self; +} + +- (void)viewDidLoad +{ + [super viewDidLoad]; + // Do any additional setup after loading the view from its nib. + _isRealName = YES; + _timeSecond = 60; + _cmsBtn.enabled = NO; + [_cmsBtn setBackgroundImage:[ManagerUtil buttonImageFromColor:[UIColor lightGrayColor] withFrame:_cmsBtn.frame] forState:UIControlStateDisabled]; + + _nextBtn.enabled = NO; + [_nextBtn setBackgroundImage:[ManagerUtil buttonImageFromColor:[UIColor lightGrayColor] withFrame:_nextBtn.frame] forState:UIControlStateDisabled]; + + _nameTextFiel.layer.masksToBounds=YES; + _nameTextFiel.layer.borderColor = [[UIColor lightGrayColor]CGColor]; + _nameTextFiel.layer.borderWidth= 1.0f; + _nameTextFiel.delegate = self; + _nameTextFiel.clearButtonMode = UITextFieldViewModeWhileEditing; + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(textFieldTextDidChange:) name:UITextFieldTextDidChangeNotification object:_nameTextFiel]; + + _idCardTextField.layer.masksToBounds=YES; + _idCardTextField.layer.borderColor = [[UIColor lightGrayColor]CGColor]; + _idCardTextField.layer.borderWidth= 1.0f; + _idCardTextField.delegate = self; + _idCardTextField.clearButtonMode = UITextFieldViewModeWhileEditing; + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(textFieldTextDidChange:) name:UITextFieldTextDidChangeNotification object:_idCardTextField]; + + _cmsNumTextField.layer.masksToBounds=YES; + _cmsNumTextField.layer.borderColor = [[UIColor lightGrayColor]CGColor]; + _cmsNumTextField.layer.borderWidth= 1.0f; + _cmsNumTextField.delegate = self; + _cmsNumTextField.clearButtonMode = UITextFieldViewModeWhileEditing; + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(textFieldTextDidChange:) name:UITextFieldTextDidChangeNotification object:_cmsNumTextField]; + + _phoneTextField.text = _phoneNum; + + _timer = [NSTimer scheduledTimerWithTimeInterval:1.0 target:self selector:@selector(reGetCodeTime) userInfo:nil repeats:YES]; + [_timer invalidate]; + [self realNameCheck]; + +} +-(void)reGetCodeTime +{ + if (_timeSecond > 0 && !_cmsBtn.enabled) { + if (![_timer isValid]) { + [_timer fire]; + } + [_cmsBtn setTitle:[NSString stringWithFormat:@"%ld秒后重新获取",_timeSecond] forState:UIControlStateDisabled]; + _timeSecond--; + }else{ + _cmsBtn.enabled = YES; + _timeSecond = 60; + [_timer invalidate]; + } +} +-(void)realNameCheck +{ + DaiDaiTongTestApi* daiDaiTongTestApi = [DaiDaiTongTestApi shareInstance]; + [daiDaiTongTestApi getApiWithParam:[NSDictionary dictionaryWithObjectsAndKeys:_phoneNum,@"phoneNum", nil] withApiType:@"realNameCheck" completionBlock:^(id jsonRes) { + [MBProgressHUD hideAllHUDsForView:self.view animated:YES]; + if ([[jsonRes objectForKey:@"resultflag"] integerValue] == 0) { + }else if([[jsonRes objectForKey:@"resultflag"] integerValue] == 1){ + _nameTextFiel.hidden = YES; + _idCardTextField.hidden = YES; + CGRect frame = _blackGroudView.frame; + frame.origin.y -= 100; + _blackGroudView.frame = frame; + _isRealName = NO; + }else{ + [MBProgressHUD errorHudWithView:self.view label:[jsonRes objectForKey:@"resultMsg"] hidesAfter:0.5]; + } + } failedBlock:^(NSError *error) { + [MBProgressHUD errorHudWithView:self.view label:@"网络出错" hidesAfter:0.5]; + + }]; +} +-(void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event +{ + + [super touchesMoved:touches withEvent:event]; + [_phoneTextField resignFirstResponder]; + [_nameTextFiel resignFirstResponder]; + [_idCardTextField resignFirstResponder]; + [_cmsNumTextField resignFirstResponder]; +// if (_phoneLabel.hidden == NO) { +// _phoneLabel.hidden = YES; +// CGRect frame = _infoView.frame; +// frame.origin.y -= 40; +// [UIView animateWithDuration:0.5 delay:0 options:0 animations:^(){ +// _infoView.frame = frame; +// } completion:^(BOOL finished) +// { +// +// }]; +// } +} +#pragma mark UITextFieldDelegate +-(BOOL)textFieldShouldBeginEditing:(UITextField *)textField +{ + _nameTextFiel.layer.borderColor = [[UIColor lightGrayColor]CGColor]; + _idCardTextField.layer.borderColor = [[UIColor lightGrayColor]CGColor]; + _cmsNumTextField.layer.borderColor = [[UIColor lightGrayColor]CGColor]; + textField.layer.borderColor = [[UIColor orangeColor]CGColor]; + return YES; +} +- (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string +{ + if (_idCardTextField.text.length>=18 && _idCardTextField == textField) { + return NO; + } + return YES; +} +-(void)textFieldTextDidChange:(NSNotification *)sender +{ + + if (_isRealName) { + if (_nameTextFiel.text.length>0 && _idCardTextField.text.length>0) { + _cmsBtn.enabled = YES; + if (_cmsNumTextField.text.length>0) { + _nextBtn.enabled = YES; + }else{ + _nextBtn.enabled = NO; + } + }else{ + _cmsBtn.enabled = NO; + _nextBtn.enabled = NO; + } + } + +} +-(BOOL)textFieldShouldEndEditing:(UITextField *)textField +{ + + return YES; +} + +- (void)didReceiveMemoryWarning +{ + [super didReceiveMemoryWarning]; + // Dispose of any resources that can be recreated. +} + +- (IBAction)cmsBtnClick:(id)sender { + _cmsBtn.enabled = NO; + [MBProgressHUD hudWithView:self.view label:@"安全加载中"]; + DaiDaiTongTestApi* daiDaiTongTestApi = [DaiDaiTongTestApi shareInstance]; + NSDictionary* dic; + if (_isRealName) { + dic = [NSDictionary dictionaryWithObjectsAndKeys:_phoneNum,@"phoneNum",_idCardTextField.text,@"idcardNo", _nameTextFiel.text, @"realName", nil]; + }else{ + [NSDictionary dictionaryWithObjectsAndKeys:_phoneNum,@"phoneNum", nil]; + } + [daiDaiTongTestApi getApiWithParam:dic withApiType:@"getVerCode" completionBlock:^(id jsonRes) { + if ([[jsonRes objectForKey:@"resultflag"] integerValue] == 1) { + [MBProgressHUD errorHudWithView:self.view label:[jsonRes objectForKey:@"resultMsg"] hidesAfter:0.5]; + }else{ + [MBProgressHUD hideAllHUDsForView:self.view animated:YES]; + [_cmsNumTextField becomeFirstResponder]; + _nameTextFiel.enabled = NO; + _idCardTextField.enabled = NO; +// [ManagerUser shareInstance].token = [jsonRes objectForKey:@"token"]; + } + _timer = [NSTimer scheduledTimerWithTimeInterval:1.0 target:self selector:@selector(reGetCodeTime) userInfo:nil repeats:YES]; + [_timer fire]; + } failedBlock:^(NSError *error) { + [MBProgressHUD errorHudWithView:self.view label:@"网络出错" hidesAfter:0.5]; + _timer = [NSTimer scheduledTimerWithTimeInterval:1.0 target:self selector:@selector(reGetCodeTime) userInfo:nil repeats:YES]; + [_timer fire]; + }]; + +} +- (IBAction)nextBtnClick:(id)sender { + + [MBProgressHUD hudWithView:self.view label:@"安全加载中"]; + DaiDaiTongTestApi* daiDaiTongTestApi = [DaiDaiTongTestApi shareInstance]; + + [daiDaiTongTestApi getApiWithParam:[NSDictionary dictionaryWithObjectsAndKeys:_cmsNumTextField.text,@"verCode", nil] withApiType:@"getVerCode" completionBlock:^(id jsonRes) { + if ([[jsonRes objectForKey:@"resultflag"] integerValue] == 1) { + [MBProgressHUD errorHudWithView:self.view label:[jsonRes objectForKey:@"resultMsg"] hidesAfter:0.5]; + }else{ + [MBProgressHUD hideAllHUDsForView:self.view animated:YES]; + if (_type == 0) { + SetPassWordViewController* setPassWordViewController = [[SetPassWordViewController alloc] init]; + [self.navigationController pushViewController:setPassWordViewController animated:YES]; + }else{ + SetPassWordViewController* setPassWordViewController = [[SetPassWordViewController alloc] init]; + setPassWordViewController.type = 1; + [self.navigationController pushViewController:setPassWordViewController animated:YES]; + } + } + } failedBlock:^(NSError *error) { + [MBProgressHUD errorHudWithView:self.view label:@"网络出错" hidesAfter:0.5]; + }]; +} +@end diff --git a/ManagerDemo/MainView/LoginView/ModifyPassWordViewController.xib b/ManagerDemo/MainView/LoginView/ModifyPassWordViewController.xib new file mode 100644 index 0000000..db6e25e --- /dev/null +++ b/ManagerDemo/MainView/LoginView/ModifyPassWordViewController.xib @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ManagerDemo/MainView/LoginView/SetPassWordViewController.m b/ManagerDemo/MainView/LoginView/SetPassWordViewController.m index 2bc656e..b7da8c8 100644 --- a/ManagerDemo/MainView/LoginView/SetPassWordViewController.m +++ b/ManagerDemo/MainView/LoginView/SetPassWordViewController.m @@ -127,7 +127,7 @@ [self.navigationController dismissViewControllerAnimated:YES completion:^{ }]; - [self.navigationController popViewControllerAnimated:YES]; + [self.navigationController popToRootViewControllerAnimated:YES]; } } failedBlock:^(NSError *error) { @@ -143,7 +143,9 @@ [MBProgressHUD errorHudWithView:self.view label:[jsonRes objectForKey:@"resultMsg"] hidesAfter:0.5]; }else{ [[ManagerUser shareInstance] setTradePsw:_passWordTextField.text]; - [self.navigationController popViewControllerAnimated:YES]; + [self.navigationController dismissViewControllerAnimated:YES completion:^{ + }]; + [self.navigationController popToRootViewControllerAnimated:YES]; } } failedBlock:^(NSError *error) { diff --git a/ManagerDemo/MainView/MyView/AccountInfoViewController.h b/ManagerDemo/MainView/MyView/AccountInfoViewController.h index a82c214..0237110 100644 --- a/ManagerDemo/MainView/MyView/AccountInfoViewController.h +++ b/ManagerDemo/MainView/MyView/AccountInfoViewController.h @@ -9,6 +9,14 @@ #import "ViewController.h" @interface AccountInfoViewController : ViewController +{ + NSString* _phoneNum; + NSString* _name; + NSString* _idCard; +} +@property (strong, nonatomic)NSString* phoneNum; +@property (strong, nonatomic)NSString* name; +@property (strong, nonatomic)NSString* idCard; @property (weak, nonatomic) IBOutlet UITableView *tableView; @property (weak, nonatomic) IBOutlet UIButton *topBtn; @property (weak, nonatomic) IBOutlet UIButton *bottomBtn; diff --git a/ManagerDemo/MainView/MyView/AccountInfoViewController.m b/ManagerDemo/MainView/MyView/AccountInfoViewController.m index d1f44d8..7b252f1 100644 --- a/ManagerDemo/MainView/MyView/AccountInfoViewController.m +++ b/ManagerDemo/MainView/MyView/AccountInfoViewController.m @@ -8,6 +8,8 @@ #import "AccountInfoViewController.h" #import "SetPassWordViewController.h" +#import "ModifyPassWordViewController.h" +#import "AuthenticationViewController.h" @interface AccountInfoViewController () { NSDictionary* _infoDic; @@ -35,7 +37,7 @@ _tableView.dataSource = self; [_topBtn addTarget:self action:@selector(modifyLoginPassword:) forControlEvents:UIControlEventTouchUpInside]; [_bottomBtn addTarget:self action:@selector(modifyTransactionsPassword:) forControlEvents:UIControlEventTouchUpInside]; - [self loadData]; +// [self loadData]; } -(void)loadData { @@ -55,10 +57,7 @@ #pragma mark UITableViewDelegate -(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { - if (!_infoDic) { - return 0; - } - return 5; + return 4; } -(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { @@ -85,7 +84,7 @@ } -(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - if (indexPath.section == 3) { + if (indexPath.section == 2) { return 90; } return 44; @@ -111,7 +110,7 @@ { cell.imageView.image = [UIImage imageNamed:@"icon_person_take_image"]; cell.textLabel.text = @"账户"; - cell.detailTextLabel.text = [_infoDic objectForKey:@"cell"]; + cell.detailTextLabel.text = _phoneNum; cell.selectionStyle = UITableViewCellSelectionStyleNone; } break; @@ -121,25 +120,17 @@ if (indexPath.row == 0) { cell.imageView.image = [UIImage imageNamed:@"icon_color_name"]; cell.textLabel.text = @"实名认证"; - cell.detailTextLabel.text = [_infoDic objectForKey:@"realName"]; + cell.detailTextLabel.text = _name; }else{ cell.imageView.image = [UIImage imageNamed:@"icon_color_idcard"]; cell.textLabel.text = @"身份认证"; - cell.detailTextLabel.text = [_infoDic objectForKey:@"certNo"]; + cell.detailTextLabel.text = _idCard; } } break; + case 2: - { - cell.imageView.image = [UIImage imageNamed:@"icon_color_bank"]; - cell.textLabel.text = @"银行卡管理"; - cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; - cell.detailTextLabel.text = [NSString stringWithFormat:@"(%@)",[_infoDic objectForKey:@"cardNum"]]; - - } - break; - case 3: { _modifyInfoCell.selectionStyle = UITableViewCellSelectionStyleNone; [_topBtn setBackgroundImage:[ManagerUtil buttonImageFromColor:[UIColor lightGrayColor] withFrame:_topBtn.frame] forState:UIControlStateHighlighted]; @@ -148,7 +139,7 @@ return _modifyInfoCell; } break; - case 4: + case 3: { cell.selectionStyle = UITableViewCellSelectionStyleNone; cell.imageView.image = [UIImage imageNamed:@"hw_verifycard_info_icon"]; @@ -158,6 +149,15 @@ // [switchButton addTarget:self action:@selector(switchAction:) forControlEvents:UIControlEventValueChanged]; cell.accessoryView = switchButton; + } + break; + case 4: + { + cell.imageView.image = [UIImage imageNamed:@"icon_color_bank"]; + cell.textLabel.text = @"银行卡管理"; + cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; + cell.detailTextLabel.text = [NSString stringWithFormat:@"(%@)",[_infoDic objectForKey:@"cardNum"]]; + } break; default: @@ -171,14 +171,24 @@ } -(void)modifyLoginPassword:(id)sender { - SetPassWordViewController* setPassWordViewController = [[SetPassWordViewController alloc] init]; - [self.navigationController pushViewController:setPassWordViewController animated:YES]; + ModifyPassWordViewController* modifyPassWordViewController = [[ModifyPassWordViewController alloc] init]; + modifyPassWordViewController.type = 0; + modifyPassWordViewController.phoneNum = _phoneNum; + [self.navigationController pushViewController:modifyPassWordViewController animated:YES]; +// SetPassWordViewController* setPassWordViewController = [[SetPassWordViewController alloc] init]; +// [self.navigationController pushViewController:setPassWordViewController animated:YES]; } -(void)modifyTransactionsPassword:(id)sender { - SetPassWordViewController* setPassWordViewController = [[SetPassWordViewController alloc] init]; - setPassWordViewController.type = 1; - [self.navigationController pushViewController:setPassWordViewController animated:YES]; + ModifyPassWordViewController* modifyPassWordViewController = [[ModifyPassWordViewController alloc] init]; + modifyPassWordViewController.type = 1; + modifyPassWordViewController.phoneNum = _phoneNum; + [self.navigationController pushViewController:modifyPassWordViewController animated:YES]; +// AuthenticationViewController* authenticationViewController = [[AuthenticationViewController alloc] init]; +// [self.navigationController pushViewController:authenticationViewController animated:YES]; +// SetPassWordViewController* setPassWordViewController = [[SetPassWordViewController alloc] init]; +// setPassWordViewController.type = 1; +// [self.navigationController pushViewController:setPassWordViewController animated:YES]; } - (void)didReceiveMemoryWarning { diff --git a/ManagerDemo/MainView/MyView/DailyIncomeTableViewCell.xib b/ManagerDemo/MainView/MyView/DailyIncomeTableViewCell.xib index bf739ba..c3901d2 100644 --- a/ManagerDemo/MainView/MyView/DailyIncomeTableViewCell.xib +++ b/ManagerDemo/MainView/MyView/DailyIncomeTableViewCell.xib @@ -42,6 +42,7 @@ + diff --git a/ManagerDemo/MainView/MyView/DailyProfitViewController.h b/ManagerDemo/MainView/MyView/DailyProfitViewController.h index 11e5fb8..68d837b 100644 --- a/ManagerDemo/MainView/MyView/DailyProfitViewController.h +++ b/ManagerDemo/MainView/MyView/DailyProfitViewController.h @@ -11,6 +11,10 @@ @interface DailyProfitViewController : BaseListViewController { NSString* _profitDate; + float _totalProfit; + NSInteger _type; } +@property(assign, nonatomic)NSInteger type; +@property(assign, nonatomic)float totalProfit; @property(strong, nonatomic)NSString* profitDate; @end diff --git a/ManagerDemo/MainView/MyView/DailyProfitViewController.m b/ManagerDemo/MainView/MyView/DailyProfitViewController.m index 8e16b65..35582fb 100644 --- a/ManagerDemo/MainView/MyView/DailyProfitViewController.m +++ b/ManagerDemo/MainView/MyView/DailyProfitViewController.m @@ -22,6 +22,7 @@ self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]; if (self) { // Custom initialization + _type = 0; } return self; } @@ -31,21 +32,50 @@ [super viewDidLoad]; // Do any additional setup after loading the view. _topCell = [DatailProfitTopTableViewCell instance]; - self.navigationItem.title = @"每日收益"; + NSDate * senddate= [NSDate dateWithTimeIntervalSinceNow:-(24 * 60 * 60)]; + NSDateFormatter *dateformatter=[[NSDateFormatter alloc] init]; + [dateformatter setDateFormat:@"MM月dd日收益"]; + NSString * locationString=[dateformatter stringFromDate:senddate]; + + if (_type == 0) { + self.navigationItem.title = locationString; + }else{ + self.navigationItem.title = @"累计收益"; + } self.tableView.separatorStyle = UITableViewCellSeparatorStyleSingleLine; // [self headerBeginRefreshing]; } -(void)loadDataWithDic:(NSDictionary *)dic withType:(NSString *)typeStr WithcompletionBlock:(CompletionBlock)completionBlock failedBlock:(FailedBlock)failedBlock { - NSDictionary* tempDic = [[NSDictionary alloc] initWithObjectsAndKeys:_profitDate, @"profitDate", nil]; - [super loadDataWithDic:tempDic withType:@"profitDatedetail.do" WithcompletionBlock:^(id jsonRes){ - _topCell.profitLabel.text = [jsonRes objectForKey:@"dateProfit"]; - _topCell.timeLabel.text = [NSString stringWithFormat:@"%@收益(元)",[jsonRes objectForKey:@"profitShowDate"]]; - self.navigationItem.title = [NSString stringWithFormat:@"%@收益",[jsonRes objectForKey:@"profitShowDate"]]; - [_infoArray addObjectsFromArray:[jsonRes objectForKey:@"datas"]]; - }failedBlock:^(NSError *error){ + NSString* tempTypeStr = @"userTotalProfit"; + if (_type == 0) { + tempTypeStr = @"userLastDayProfit"; + } + [super loadDataWithDic:nil withType:tempTypeStr WithcompletionBlock:^(id jsonRes){ + + if ([[jsonRes objectForKey:@"resultflag"] integerValue] == 0) { + _topCell.profitLabel.text = [NSString stringWithFormat:@"%.2f",_totalProfit]; + + NSDate * senddate= [NSDate dateWithTimeIntervalSinceNow:-(24 * 60 * 60)]; + NSDateFormatter *dateformatter=[[NSDateFormatter alloc] init]; + [dateformatter setDateFormat:@"MM月dd日收益(元)"]; + NSString * locationString=[dateformatter stringFromDate:senddate]; + + if (_type == 0) { + _topCell.timeLabel.text = locationString; + }else{ + _topCell.timeLabel.text = @"稳赢贷累计收益"; + } + + [_infoArray addObjectsFromArray:[jsonRes objectForKey:@"userProfits"]]; + }else{ + [MBProgressHUD errorHudWithView:self.view label:[jsonRes objectForKey:@"resultMsg"] hidesAfter:0.5]; + } + }failedBlock:^(NSError *error){ + [MBProgressHUD errorHudWithView:self.view label:@"网络出错" hidesAfter:1.0]; }]; + } #pragma mark UITableViewDelegate -(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section @@ -81,9 +111,13 @@ if (indexPath.section == 0) { return _topCell; } - cell.nameLabel.text = [[_infoArray objectAtIndex:indexPath.section-1] objectForKey:@"name"]; - cell.timeLabel.text = [[_infoArray objectAtIndex:indexPath.section-1] objectForKey:@"date"]; - cell.profitLabel.text = [[_infoArray objectAtIndex:indexPath.section-1] objectForKey:@"profit"]; + cell.nameLabel.text = [[_infoArray objectAtIndex:indexPath.section-1] objectForKeyWithoutNull:@"proName"]; + NSDate * senddate= [NSDate dateWithTimeIntervalSince1970:[[[_infoArray objectAtIndex:indexPath.section-1] objectForKeyWithoutNull:@"profitDate"] doubleValue]/1000]; + NSDateFormatter *dateformatter=[[NSDateFormatter alloc] init]; + [dateformatter setDateFormat:@"yyyy-MM-dd"]; + NSString * locationString=[dateformatter stringFromDate:senddate]; + cell.timeLabel.text = locationString; + cell.profitLabel.text = [[_infoArray objectAtIndex:indexPath.section-1] objectForKeyWithoutNull:@"profitMoney"]; return cell; } -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath diff --git a/ManagerDemo/MainView/MyView/DatailProfitTopTableViewCell.xib b/ManagerDemo/MainView/MyView/DatailProfitTopTableViewCell.xib index 3cc5928..b806bdc 100644 --- a/ManagerDemo/MainView/MyView/DatailProfitTopTableViewCell.xib +++ b/ManagerDemo/MainView/MyView/DatailProfitTopTableViewCell.xib @@ -13,14 +13,14 @@ - + diff --git a/ManagerDemo/MainView/MyView/FundAmountViewController.xib b/ManagerDemo/MainView/MyView/FundAmountViewController.xib index ee4ca32..bc32850 100644 --- a/ManagerDemo/MainView/MyView/FundAmountViewController.xib +++ b/ManagerDemo/MainView/MyView/FundAmountViewController.xib @@ -31,7 +31,7 @@ -