diff --git a/.DS_Store b/.DS_Store index bb9bf05..5c477ef 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Ifish/Common/AppDelegate+AliPushConfig.m b/Ifish/Common/AppDelegate+AliPushConfig.m index a54125c..6aaafb4 100644 --- a/Ifish/Common/AppDelegate+AliPushConfig.m +++ b/Ifish/Common/AppDelegate+AliPushConfig.m @@ -164,11 +164,10 @@ static const void *NotificationCenterKey = &NotificationCenterKey; NSLog(@"注册成功 device_token = %@",device_Id); [FuncUserDefault setStr:device_Id key:kDeviceToken];//本机的devicetoken保存在本地 if (userId!=nil) { - NSDictionary *reqDic = @{ - @"deviceId":device_Id, - @"userId":userId - }; - [[AFNOHeaderHttpTool sharedInstance] postRequestWihtUrl:Push_BindDevice_Url params:reqDic success:^(NSDictionary *successDic) { + NSArray *keys = @[@"deviceId",@"userId"]; + NSArray *values = @[device_Id,userId]; + + [[AFNOHeaderHttpTool sharedInstance] postRequestWihtUrl:Push_BindDevice_Url keys:keys values:values success:^(NSDictionary *successDic) { //绑定成功 [FuncUserDefault setBool:YES key:is_Bind_DeviceToken]; } failure:^(NSDictionary *errorDic) { diff --git a/Ifish/Info.plist b/Ifish/Info.plist index e17bb18..930cc61 100644 --- a/Ifish/Info.plist +++ b/Ifish/Info.plist @@ -70,7 +70,7 @@ CFBundleVersion - 9.8.2 + 9.8.3 ITSAppUsesNonExemptEncryption LSApplicationCategoryType @@ -373,7 +373,6 @@ NSCameraUsageDescription - 使用相机 爱鱼奇需要您的同意,才能使用相机 NSLocationAlwaysUsageDescription 为获取爱鱼奇智能硬件产品及用户的地址区域分布，以提供更好的特色服务，爱鱼奇将获取您的地址 diff --git a/Ifish/Networking/UrlAdress.h b/Ifish/Networking/UrlAdress.h index fd29196..f269ee5 100644 --- a/Ifish/Networking/UrlAdress.h +++ b/Ifish/Networking/UrlAdress.h @@ -12,7 +12,7 @@ #define App_Environment 1 //1.测试环境 2.正式环境 #if(App_Environment==1)//测试 //app接口域名 -#define Api_DomainName @"http://139.196.24.156:7080" +#define Api_DomainName @"http://test.ifish7.com:7080" #elif (App_Environment==2)//正式 //app接口域名 cv @@ -35,7 +35,6 @@ #define Push_Message_Url Api_DomainName @"/api/pageList/pushListInf.do" //删除消息 #define Push_Message_Delete_Url Api_DomainName @"/api/updateUser/deleteMessages.do" - //绑定设备 #define Push_BindDevice_Url Api_DomainName @"/api/updateUser/bindDevice.do" //用户消息已读 diff --git a/Ifish/Utinitys/Define.h b/Ifish/Utinitys/Define.h index 90f2b98..e5d32b8 100644 --- a/Ifish/Utinitys/Define.h +++ b/Ifish/Utinitys/Define.h @@ -133,10 +133,10 @@ alpha:1.0] // 测试云 @"www.zhangxinyanv5.top" //#define SOCKETPORT @"www.zhangxinyanv5.top" // 云 @"app.ifish7.com" -#define SOCKETPORT @"app.ifish7.com" +//#define SOCKETPORT @"app.ifish7.com" // 本地 @"192.168.61.128" -//#define SOCKETPORT @"192.168.61.128" +#define SOCKETPORT @"test.ifish7.com" //云 @"https://app.ifish7.com" //云图片头像等地址 @"http://app.ifish7.com" diff --git a/Ifish/Utinitys/IfishHttpRequest/AFNOHeaderHttpTool.h b/Ifish/Utinitys/IfishHttpRequest/AFNOHeaderHttpTool.h index 108615b..3f82593 100644 --- a/Ifish/Utinitys/IfishHttpRequest/AFNOHeaderHttpTool.h +++ b/Ifish/Utinitys/IfishHttpRequest/AFNOHeaderHttpTool.h @@ -49,7 +49,8 @@ typedef NS_ENUM(NSInteger, RequestType){ + (AFNOHeaderHttpTool *)sharedInstance; //POST请求 -(void) postRequestWihtUrl:(NSString *)url - params:(NSDictionary *)params + keys:(NSArray *)keys + values:(NSArray *)values success:(WBCallBackSuccess)success failure:(WBCallBackFailed)failure; /** diff --git a/Ifish/Utinitys/IfishHttpRequest/AFNOHeaderHttpTool.m b/Ifish/Utinitys/IfishHttpRequest/AFNOHeaderHttpTool.m index a09ed7c..34ec86c 100644 --- a/Ifish/Utinitys/IfishHttpRequest/AFNOHeaderHttpTool.m +++ b/Ifish/Utinitys/IfishHttpRequest/AFNOHeaderHttpTool.m @@ -36,20 +36,62 @@ }); return _instance; } +-(NSString *)getRequestPath:(NSString *)urlPath keysArray:(NSArray *)keys valuesArray:(NSArray *)values{ + urlPath = [urlPath stringByAppendingString:@"?"]; + for (int i=0; i0 && + error == nil){ [SVProgressHUD dismissWithDelay:0.3]; - id result=[NSJSONSerialization JSONObjectWithData:responseObject options:NSJSONReadingMutableContainers error:nil]; + id result=[NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingMutableContainers error:nil]; NSLog(@"获取数据 resalut = %@",result); if ([result isKindOfClass:[NSDictionary class]]) { // NSString *resCode = [NSString stringWithFormat:@"%@",[result objectForKey:RESPONSE_CODE]];//状态码 @@ -74,16 +116,18 @@ }else{ NSLog(@"json格式错误"); } - } failure:^(AFHTTPRequestOperation* operation, NSError* error) { - //反馈错误信息（网络连接失败（服务器关停）等信息） - if (error) { - [SVProgressHUD showInfoWithStatus:@"请求数据失败"]; - } - dispatch_async(dispatch_get_main_queue(), ^{ - //错误信息展示（其他相关错误处理在具体的类里进行） - failure([self getErrorDict:error]); - }); - }]; + }else if ([data length] == 0 && + error == nil){ + //请求数据长度为0（服务器返回数据内容问题） + [SVProgressHUD dismiss]; + }else if (error != nil){ + //反馈错误信息（网络连接失败（服务器关停）等信息） + if (error) { + [SVProgressHUD dismiss]; + } + } + }]; + [sessionDataTask resume]; } +(void) requestWihtMethod:(RequestType) methodType url : (NSString *)url diff --git a/Ifish/controllers/IfishTabControllers/消息/IfishMessageViewController.m b/Ifish/controllers/IfishTabControllers/消息/IfishMessageViewController.m index 16d27aa..9697a2c 100644 --- a/Ifish/controllers/IfishTabControllers/消息/IfishMessageViewController.m +++ b/Ifish/controllers/IfishTabControllers/消息/IfishMessageViewController.m @@ -268,13 +268,11 @@ extern BOOL launchedByNotification; [SVProgressHUD show]; self.pushId = @""; UserModel*userModel=[dataContorl getUserInfo]; - NSDictionary *reqDic = @{@"pushId":self.pushId, - @"userId":userModel.userId, - @"firstResult":@(0), - @"pageSize":@(999) - }; - [[AFNOHeaderHttpTool sharedInstance] postRequestWihtUrl:Push_Message_Url params:reqDic success:^(NSDictionary *successDic) { - + NSArray *keys = @[@"pushId",@"userId",@"firstResult",@"pageSize"]; + NSArray *values = @[self.pushId,userModel.userId,@"0",@"999"]; + + [[AFNOHeaderHttpTool sharedInstance] postRequestWihtUrl:Push_Message_Url keys:keys values:values success:^(NSDictionary *successDic) { + NSString *totalCount = [successDic objectForKey:@"total"]; NSArray *dataArray = [successDic objectForKey:@"data"]; if ([totalCount integerValue]>0) { @@ -307,12 +305,11 @@ extern BOOL launchedByNotification; PushmessageModel *model = [[self.dataSource objectAtIndex:indexPath.section] objectAtIndex:indexPath.row]; if([model.isRead integerValue]==1)//未读消息 { - NSMutableDictionary *deleteDic = InitObject(NSMutableDictionary); - [deleteDic setValue:model.pushId forKey:@"pushId"]; - NSDictionary *reqDic = @{@"userId":userModel.userId, - @"pushId":model.pushId - }; - [[AFNOHeaderHttpTool sharedInstance] postRequestWihtUrl:Push_Message_Readed params:reqDic success:^(NSDictionary *successDic) { + + NSArray *keys = @[@"userId",@"pushId"]; + NSArray *values = @[userModel.userId,self.pushId]; + + [[AFNOHeaderHttpTool sharedInstance] postRequestWihtUrl:Push_Message_Readed keys:keys values:values success:^(NSDictionary *successDic) { NSString *result = [successDic objectForKey:RESPONSE_CODE]; if ([result integerValue]==kReqSuccess) { @@ -332,11 +329,11 @@ extern BOOL launchedByNotification; PushmessageModel *model = [[self.dataSource objectAtIndex:indexPath.section] objectAtIndex:indexPath.row]; NSMutableDictionary *deleteDic = InitObject(NSMutableDictionary); [deleteDic setValue:model.pushId forKey:@"pushId"]; - NSDictionary *reqDic = @{@"userId":userModel.userId, - @"pushIds":[CommonUtils arrayToJSONString:@[deleteDic]] - }; + + NSArray *keys = @[@"userId",@"pushIds"]; + NSArray *values = @[userModel.userId,[CommonUtils arrayToJSONString:@[deleteDic]]]; [SVProgressHUD show]; - [[AFNOHeaderHttpTool sharedInstance] postRequestWihtUrl:Push_Message_Delete_Url params:reqDic success:^(NSDictionary *successDic) { + [[AFNOHeaderHttpTool sharedInstance] postRequestWihtUrl:Push_Message_Delete_Url keys:keys values:values success:^(NSDictionary *successDic) { NSString *result = [successDic objectForKey:RESPONSE_CODE]; if ([result integerValue]==kReqSuccess) { @@ -367,11 +364,10 @@ extern BOOL launchedByNotification; [deleteDic setValue:pushId forKey:@"pushId"]; [deleteArray addObject:deleteDic]; } - NSDictionary *reqDic = @{@"userId":userModel.userId, - @"pushIds":[CommonUtils arrayToJSONString:deleteArray] - }; + NSArray *keys = @[@"userId",@"pushIds"]; + NSArray *values = @[userModel.userId,[CommonUtils arrayToJSONString:deleteArray]]; [SVProgressHUD show]; - [[AFNOHeaderHttpTool sharedInstance] postRequestWihtUrl:Push_Message_Delete_Url params:reqDic success:^(NSDictionary *successDic) { + [[AFNOHeaderHttpTool sharedInstance] postRequestWihtUrl:Push_Message_Delete_Url keys:keys values:values success:^(NSDictionary *successDic) { NSString *result = [successDic objectForKey:RESPONSE_CODE]; if ([result integerValue]==kReqSuccess) { diff --git a/Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m b/Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m index 413a1c9..0ad2871 100644 --- a/Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m +++ b/Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m @@ -139,9 +139,10 @@ Assign NSInteger messageCount;//消息个数 -(void)getMessageCount{ UserModel*userModel=[dataContorl getUserInfo]; - NSDictionary *reqDic = @{@"userId":userModel.userId - }; - [[AFNOHeaderHttpTool sharedInstance] postRequestWihtUrl:Push_Message_UnReadCount params:reqDic success:^(NSDictionary *successDic) { + NSArray *keys = @[@"userId"]; + NSArray *values = @[userModel.userId]; + + [[AFNOHeaderHttpTool sharedInstance] postRequestWihtUrl:Push_Message_UnReadCount keys:keys values:values success:^(NSDictionary *successDic) { NSString *result = [successDic objectForKey:RESPONSE_CODE]; NSDictionary *dic = [successDic objectForKey:RESPONSE_DATA]; diff --git a/Ifish/controllers/logAddRegistController/LogInViewController.m b/Ifish/controllers/logAddRegistController/LogInViewController.m index 0cfe216..7b1e2c2 100644 --- a/Ifish/controllers/logAddRegistController/LogInViewController.m +++ b/Ifish/controllers/logAddRegistController/LogInViewController.m @@ -295,11 +295,10 @@ //登陆成功之后，验证当前页面devicetoken是否上送成功，如果还未上送，则重新上送devicetoken if (![[NSUserDefaults standardUserDefaults] boolForKey:is_Bind_DeviceToken]) { UserModel *model=[[UserModel alloc] initWithDict:DataDic]; - NSDictionary *reqDic = @{ - @"deviceId":[FuncUserDefault strForKey:kDeviceToken], - @"userId":model.userId - }; - [[AFNOHeaderHttpTool sharedInstance] postRequestWihtUrl:Push_BindDevice_Url params:reqDic success:^(NSDictionary *successDic) { + NSArray *keys = @[@"deviceId",@"userId"]; + NSArray *values = @[[FuncUserDefault strForKey:kDeviceToken],model.userId]; + + [[AFNOHeaderHttpTool sharedInstance] postRequestWihtUrl:Push_BindDevice_Url keys:keys values:values success:^(NSDictionary *successDic){ //绑定成功 [FuncUserDefault setBool:YES key:is_Bind_DeviceToken];//已经上送了本机的devicetoken } failure:^(NSDictionary *errorDic) {