root/ifish
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

微信登陆，bug修改

Browse Source
This commit is contained in:
kai60
2020-01-09 09:25:43 +08:00
parent 82590f8fba
commit bfb68dd81c
62 changed files with 5105 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ifish/Utinitys/Define.h
+7
View File
@@ -174,6 +174,7 @@ alpha:1.0]
// 用户注册接口 最新有请求头验证参数
#define kAddSafeUser [NSString stringWithFormat:@"%@/api/users/v3/register.do",JIEKOUPORT]
// 用户登录接口 无请求头验证参数
//#define kUserLogin [NSString stringWithFormat:@"%@/api/user/userLogin.do",JIEKOUPORT]
// 用户登录接口 最新有请求头验证参数
@@ -182,6 +183,12 @@ alpha:1.0]
// 用户登录接口 v4.2 重写登录接口 设备数据与用户信息分不同接口获取
//登录验证接口
#define kUserLoginValidation [NSString stringWithFormat:@"%@/api/users/loginValidation",JIEKOUPORT]
//微信登陆
#define kUserWechatLoginValidation [NSString stringWithFormat:@"%@/api/users/wechatLogin.do",JIEKOUPORT]
//绑定手机
#define kUserBindPhone [NSString stringWithFormat:@"%@/api/users/bindPhone.do",JIEKOUPORT]
#define kUserWechatValidation [NSString stringWithFormat:@"%@/api/users/wechatValidate.do",JIEKOUPORT]
//更多用户数据如设备信息
#define kUserMoreUserData [NSString stringWithFormat:@"%@/api/users/moreUserData/",JIEKOUPORT]
// 用户信息修改接口
Ifish/Utinitys/IfishHttpRequest/AFHttpTool.h
+1 -1
View File
@@ -117,7 +117,7 @@ typedef NS_ENUM(NSInteger, IfishGoodsListType){
longitude:(double)longitude
latitude:(double)latitude
success:(void (^)(id response))success
failure:(void (^)(NSError* err))failure;
failure:(void (^)(NSError* err))failure expara:(NSDictionary*)dic;
/*
*获取更多用户数据 get 请求
*/
Ifish/Utinitys/IfishHttpRequest/AFHttpTool.m
+33 -11
View File
@@ -378,20 +378,42 @@ methodType url : (NSString *)url
longitude:(double)longitude
latitude:(double)latitude
success:(void (^)(id))success
failure:(void (^)(NSError *))failure
failure:(void (^)(NSError *))failure expara:(NSDictionary *)dic
{
NSDictionary*para=@{@"version":@"1.0",
@"phoneNumber":phoneNumber,
@"userPassword":userPassword,
@"loginType":phoneType,
@"address":address,
@"longitude":[NSString stringWithFormat:@"%f",longitude],
@"latitude":[NSString stringWithFormat:@"%f",latitude]
};
NSDictionary*para=@{};
NSString*url;
RequestMethodType type=RequestMethodTypePost;
if (dic[@"code"])//微信登登陆授权
{
para=@{@"code":dic[@"code"]
};
url=kUserWechatLoginValidation;
//type=RequestMethodTypeGet;
}
else if (dic[@"unionId"])//微信unionId登陆
{
para=@{@"unionId":dic[@"unionId"]
};
url=kUserWechatValidation;
}
else
{
para=@{@"version":@"1.0",
@"phoneNumber":phoneNumber,
@"userPassword":userPassword,
@"loginType":phoneType,
@"address":address,
@"longitude":[NSString stringWithFormat:@"%f",longitude],
@"latitude":[NSString stringWithFormat:@"%f",latitude]
};
url=kUserLoginValidation;
}
//kUserSafeLogin
[AFHttpTool requestWihtMethod:RequestMethodTypePost
url:kUserLoginValidation
[AFHttpTool requestWihtMethod:type
url:url
params:para
success:success
failure:failure];
Ifish/Utinitys/IfishHttpRequest/IFISHHttpTool.m
+13 -3
View File
@@ -48,7 +48,12 @@
NSString*pasword=[userDefsult objectForKey:@"password"];
NSString*address=[userDefsult objectForKey:@"address"];
NSString*unionId=[userDefsult objectForKey:@"unionId"];
NSDictionary*para=nil;
if (!pasword.length&&unionId.length)
{
para=@{@"unionId":unionId};
}
double userlongitude=[userDefsult doubleForKey:@"userlongitude"];
double userlatitude=[userDefsult doubleForKey:@"userlatitude"];
@@ -67,7 +72,12 @@
[userDefsult setObject:@"0" forKey:@"isExit"];
NSString*passWordStr=[MyMD5 md5:pasword];
NSString*passWordStr;
if (pasword.length)
{
passWordStr=[MyMD5 md5:pasword];
}
//__weak typeof (self) weakSelf=self;
[AFHttpTool userLogInWithPhoneNumber:name password:passWordStr phoneType:@"ios" address:address
longitude:userlongitude
@@ -123,7 +133,7 @@
NSString *errstr = [NSString stringWithFormat:@"%@",err];
BLYLog(BuglyLogLevelWarn, errstr);
}];
} expara:para];
}
Ifish/Utinitys/IfishHttpRequest/IfishUserDataUnity.h
+1
View File
@@ -20,6 +20,7 @@
* 登陆验证成功 返回 自动登录
*/
-(void)userAutologinSuccsess:(NSDictionary *)dataDic;
-(void)setAppTabRoot;
@end
Ifish/Utinitys/IfishHttpRequest/IfishUserDataUnity.m
+41 -4
View File
@@ -13,6 +13,7 @@
#import "NSObject+LBLaunchImage.h"
#import "IfishLoadingWebViewController.h"
#import "IfishADTimerViewController.h"
#import "RegistViewController.h"
@implementation IfishUserDataUnity
+(IfishUserDataUnity*)shareDataInstance
@@ -39,9 +40,21 @@
[[DataCenter defaultDtacenter]setValue:userAsset forKey:@"IfishUserAsset"];
NSUserDefaults*userdefult=[NSUserDefaults standardUserDefaults];
if (password.length)
{
[userdefult setObject:password forKey:@"password"];
}
if (phoneNumber.length) {
[userdefult setObject:phoneNumber forKey:@"name"];
}
if (model.unionId.length) {
[userdefult setObject:model.unionId forKey:@"unionId"];
}
if (model.wechatImgUrl.length) {
[userdefult setObject:model.wechatImgUrl forKey:@"wechatImgUrl"];
}
[userdefult setObject:password forKey:@"password"];
[userdefult setObject:phoneNumber forKey:@"name"];
[userdefult setObject:@"0" forKey:@"isExit"];
[userdefult setObject:model.userId forKey:@"userId"];
@@ -55,7 +68,16 @@
NSLog(@"userDic:%@",userDic);
NSLog(@"登录成功");
[self setAppTabRoot];
BOOL skiped =[userdefult boolForKey:[CommonUtils getNotNilStr:model.unionId]];
if (!skiped&&[CommonUtils getNotNilStr:model.phoneNumber].length==0&&[CommonUtils getNotNilStr:model.unionId].length)
{
[self bindPhone];
}
else
{
[self setAppTabRoot];
}
}
@@ -66,7 +88,14 @@
NSDictionary *userDic=dataDic[@"userInfo"];
UserModel *model=[[UserModel alloc] initWithDict:userDic];
[[DataCenter defaultDtacenter]setValue:model forKey:@"UserLogIn"];
NSUserDefaults*userdefult=[NSUserDefaults standardUserDefaults];
if (model.unionId.length) {
[userdefult setObject:model.unionId forKey:@"unionId"];
}
if (model.wechatImgUrl.length) {
[userdefult setObject:model.wechatImgUrl forKey:@"wechatImgUrl"];
}
[userdefult synchronize];
//金币任务等级
NSDictionary *userAssetDic=dataDic[@"userAsset"];
IfishUserAsset *userAsset =[[IfishUserAsset alloc] initWithDict:userAssetDic];
@@ -153,5 +182,13 @@
[UIApplication sharedApplication].delegate.window.rootViewController=mianVC;
}
-(void)bindPhone
{
RegistViewController*revv=[[RegistViewController alloc]init];
revv.isBind=YES;
revv.isFromLogin=YES;
UINavigationController*nav=[[UINavigationController alloc]initWithRootViewController:revv];
[UIApplication sharedApplication].delegate.window.rootViewController=nav;
}
@end
Ifish/Utinitys/SocketSingleton/Socketsingleton.m
+2 -2
View File
@@ -105,7 +105,7 @@
-(void)onSocket:(AsyncSocket *)sock willDisconnectWithError:(NSError *)err{
NSLog(@"soket错误断开");
NSLog(@"存留数据%@",[sock unreadData]);
if (self.communiteDelegate) {
if (self.communiteDelegate&&[self.communiteDelegate respondsToSelector:@selector(ifishSocket:willDisconnectWithError:)]) {
[self.communiteDelegate ifishSocket:sock willDisconnectWithError:err];
}
@@ -116,7 +116,7 @@
- (BOOL)onSocketWillConnect:(AsyncSocket *)sock{
if (self.communiteDelegate) {
if (self.communiteDelegate&&[self.communiteDelegate respondsToSelector:@selector(ifishSocketWillConnect:)]) {
[self.communiteDelegate ifishSocketWillConnect:sock];
};
return YES;