diff --git a/YHB_Prj/YHB_Prj/LoginViewController/LoginManager.h b/YHB_Prj/YHB_Prj/LoginViewController/LoginManager.h index 93f26f8..679b11b 100644 --- a/YHB_Prj/YHB_Prj/LoginViewController/LoginManager.h +++ b/YHB_Prj/YHB_Prj/LoginViewController/LoginManager.h @@ -7,7 +7,7 @@ // #import -#define LOGINRESULTBLOCK void(^)(BOOL ret) +#define LOGINRESULTBLOCK void(^)(NSString *msg) @class LoginMode; @class StoreMode; @interface LoginManager : NSObject diff --git a/YHB_Prj/YHB_Prj/LoginViewController/LoginManager.m b/YHB_Prj/YHB_Prj/LoginViewController/LoginManager.m index a95e922..bbcbf6e 100644 --- a/YHB_Prj/YHB_Prj/LoginViewController/LoginManager.m +++ b/YHB_Prj/YHB_Prj/LoginViewController/LoginManager.m @@ -70,31 +70,36 @@ - (void)login_request:(NSString *)aUserName pass:(NSString *)aPass [dict setValue:@"1" forKey:@"loginUserType"]; [NetManager requestWith:dict apiName:@"loginApp" method:@"POST" succ:^(NSDictionary *successDict) { - NSDictionary *resultDict = [successDict objectForKey:@"result"]; - if(resultDict) + NSString *msg = successDict[@"msg"]; + if ([msg isEqualToString:@"success"]) { - NSString *token = [resultDict objectForKey:@"token"]; - [self saveUserToken:token]; - NSString *uid = [resultDict objectForKey:@"uid"]; - BaseIntToNSString(uid); - [self saveUserId:uid]; - if(!self.logMode) + NSDictionary *resultDict = [successDict objectForKey:@"result"]; + if(resultDict) { - self.logMode = [[LoginMode alloc] init]; + NSString *token = [resultDict objectForKey:@"token"]; + [self saveUserToken:token]; + NSString *uid = [resultDict objectForKey:@"uid"]; + BaseIntToNSString(uid); + [self saveUserId:uid]; + if(!self.logMode) + { + self.logMode = [[LoginMode alloc] init]; + } + [self.logMode unPacketData:resultDict]; + [self setNetWorkParam:self.strUserId userToke:self.strUserToken]; + StoreMode *sm = [self.logMode.storeList objectAtIndex:0]; + [self setCurrentStoreName:sm.strStoreName]; + [self setNetWorkStoreId:sm.strId]; + [self iosAppGetStoreList]; + [[SCach shareInstance] setAsynValue:self.logMode key:@"loginMode" isMemeory:NO filePath:nil block:^(bool isResult) { + + }]; } - [self.logMode unPacketData:resultDict]; - [self setNetWorkParam:self.strUserId userToke:self.strUserToken]; - StoreMode *sm = [self.logMode.storeList objectAtIndex:0]; - [self setCurrentStoreName:sm.strStoreName]; - [self setNetWorkStoreId:sm.strId]; - [self iosAppGetStoreList]; - [[SCach shareInstance] setAsynValue:self.logMode key:@"loginMode" isMemeory:NO filePath:nil block:^(bool isResult) { - - }]; - } - aBlock(YES); + aBlock(@"success"); + }else aBlock(msg); + } failure:^(NSDictionary *failDict, NSError *error) { - aBlock(NO); + aBlock(@"登陆失败"); }]; } diff --git a/YHB_Prj/YHB_Prj/LoginViewController/LoginViewController.m b/YHB_Prj/YHB_Prj/LoginViewController/LoginViewController.m index bc78ab6..a0cc0ac 100644 --- a/YHB_Prj/YHB_Prj/LoginViewController/LoginViewController.m +++ b/YHB_Prj/YHB_Prj/LoginViewController/LoginViewController.m @@ -79,8 +79,8 @@ - (BOOL)textFieldShouldReturn:(UITextField *)textField{ - (void)loginBTItem:(UIButton *)aBT { LoginManager *login = [LoginManager shareLoginManager]; - [login login_request:self.strUserNick pass:self.strPasswork retblock:^(BOOL ret) { - if(ret == YES) + [login login_request:self.strUserNick pass:self.strPasswork retblock:^(NSString* msg) { + if([msg isEqualToString:@"success"]) { if(self.islogOut == NO) { @@ -94,6 +94,7 @@ - (void)loginBTItem:(UIButton *)aBT }]; } } + else [SVProgressHUD showErrorWithStatus:msg cover:YES offsetY:kMainScreenHeight/2.0]; }]; }