测试版9.8.3

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 = @{
+                NSArray *keys = @[@"deviceId",@"userId"];
-                                         @"deviceId":device_Id,
+                NSArray *values = @[device_Id,userId];
-                                         @"userId":userId
+
-                                         };
+                [[AFNOHeaderHttpTool sharedInstance] postRequestWihtUrl:Push_BindDevice_Url keys:keys values:values success:^(NSDictionary *successDic) {
-                [[AFNOHeaderHttpTool sharedInstance] postRequestWihtUrl:Push_BindDevice_Url params:reqDic success:^(NSDictionary *successDic) {
                     //绑定成功
                     [FuncUserDefault setBool:YES key:is_Bind_DeviceToken];
                 } failure:^(NSDictionary *errorDic) {

Ifish/Info.plist

@@ -70,7 +70,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.8.2</string>
+	<string>9.8.3</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>
@@ -373,7 +373,6 @@
 		<true/>
 	</dict>
 	<key>NSCameraUsageDescription</key>
-	<string>使用相机</string>
 	<string>爱鱼奇需要您的同意,才能使用相机</string>
 	<key>NSLocationAlwaysUsageDescription</key>
 	<string>为获取爱鱼奇智能硬件产品及用户的地址区域分布，以提供更好的特色服务，爱鱼奇将获取您的地址</string>

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"
 //用户消息已读

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"

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;
 /**

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; i<keys.count; i++) {
+        NSString *keyValue = [[NSString alloc]initWithFormat:@"%@",values[i]];
+        
+        NSString *  newValue = [keyValue stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
+        if(i==keys.count-1)
+        urlPath = [urlPath stringByAppendingString:[NSString stringWithFormat:@"%@=%@",keys[i],newValue]];
+        else
+        urlPath = [urlPath stringByAppendingString:[NSString stringWithFormat:@"%@=%@&",keys[i],newValue]];
+
+    }
+    return urlPath;
+}
+-(NSMutableURLRequest *)getUrlRequestWithPath:(NSString *)urlString keysArray:(NSArray *)keys valuesArray:(NSArray *)values{
+    
+//    urlString = [Api_DomainName stringByAppendingString:urlString];
+    NSString *newPath = @"";
+    if (keys==nil) {
+        newPath = urlString;
+    }else{
+        newPath = [self getRequestPath:urlString keysArray:keys valuesArray:values];
+    }
+    NSLog(@"requestUrl = %@",newPath);//请求地址
+    
+    NSURL *url = [NSURL URLWithString:urlString];
+    NSMutableURLRequest *urlRequest = [NSMutableURLRequest requestWithURL:url];
+    [urlRequest setTimeoutInterval:15];//超时时间15秒
+    [urlRequest setHTTPMethod:@"POST"];//请求方式post
+    NSString *bodyStr;
+    if (keys==nil) {
+        bodyStr = [newPath substringFromIndex:urlString.length];
+    }else
+        bodyStr = [newPath substringFromIndex:urlString.length+1];//请求体封装(有?的情况)
+    NSData *bodyData = [bodyStr dataUsingEncoding:NSUTF8StringEncoding];
+    urlRequest.HTTPBody = bodyData;
+    return urlRequest;
+}
+
+
+
 //POST请求
 -(void) postRequestWihtUrl:(NSString *)url
-                    params:(NSDictionary *)params
+                      keys:(NSArray *)keys
+                    values:(NSArray *)values
                    success:(WBCallBackSuccess)success
-                   failure:(WBCallBackFailed)failure{
+                   failure:(WBCallBackFailed)failure
-    AFHTTPRequestOperationManager*manager=[AFHTTPRequestOperationManager manager];
+{
-    //此类中接口 无安全校验
+    
-    manager.responseSerializer=[AFHTTPResponseSerializer serializer];
+    NSURLSession *session = [NSURLSession sharedSession];
-    //POST请求
+    NSMutableURLRequest *urlRequest = [self getUrlRequestWithPath:url keysArray:keys valuesArray:values];
-
+    NSURLSessionDataTask *sessionDataTask  = [session dataTaskWithRequest:urlRequest completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) {
-    [manager POST:url parameters:params
+        if ([data length] >0  &&
-          success:^(AFHTTPRequestOperation* operation, id responseObject) {
+            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) {
+        }else if ([data length] == 0 &&
-              //反馈错误信息（网络连接失败（服务器关停）等信息）
+                  error == nil){
-              if (error) {
+            //请求数据长度为0（服务器返回数据内容问题）
-                  [SVProgressHUD showInfoWithStatus:@"请求数据失败"];
+            [SVProgressHUD dismiss];
-              }
+        }else if (error != nil){
-              dispatch_async(dispatch_get_main_queue(), ^{
+            //反馈错误信息（网络连接失败（服务器关停）等信息）
-                  //错误信息展示（其他相关错误处理在具体的类里进行）
+            if (error) {
-                  failure([self getErrorDict:error]);
+               [SVProgressHUD dismiss];
-              });
+            }
-          }];
+        }
+    }];
+    [sessionDataTask resume];
 }
 +(void) requestWihtMethod:(RequestType)
 methodType url : (NSString *)url

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,
+    NSArray *keys = @[@"pushId",@"userId",@"firstResult",@"pageSize"];
-                             @"userId":userModel.userId,
+    NSArray *values = @[self.pushId,userModel.userId,@"0",@"999"];
-                             @"firstResult":@(0),
+
-                             @"pageSize":@(999)
+    [[AFNOHeaderHttpTool sharedInstance] postRequestWihtUrl:Push_Message_Url keys:keys values:values success:^(NSDictionary *successDic)  {
-                             };
+
-    [[AFNOHeaderHttpTool sharedInstance] postRequestWihtUrl:Push_Message_Url params:reqDic 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"];
+        NSArray *keys = @[@"userId",@"pushId"];
-        NSDictionary *reqDic = @{@"userId":userModel.userId,
+        NSArray *values = @[userModel.userId,self.pushId];
-                             @"pushId":model.pushId
+
-                             };
+        [[AFNOHeaderHttpTool sharedInstance] postRequestWihtUrl:Push_Message_Readed keys:keys values:values success:^(NSDictionary *successDic) {
-        [[AFNOHeaderHttpTool sharedInstance] postRequestWihtUrl:Push_Message_Readed params:reqDic 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,
+    NSArray *keys = @[@"userId",@"pushIds"];
-                             @"pushIds":[CommonUtils arrayToJSONString:deleteArray]
+    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) {

Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m

@@ -139,9 +139,10 @@ Assign NSInteger messageCount;//消息个数
 -(void)getMessageCount{
     
         UserModel*userModel=[dataContorl getUserInfo];
-        NSDictionary *reqDic = @{@"userId":userModel.userId
+    NSArray *keys = @[@"userId"];
-                                 };
+    NSArray *values = @[userModel.userId];
-        [[AFNOHeaderHttpTool sharedInstance] postRequestWihtUrl:Push_Message_UnReadCount params:reqDic success:^(NSDictionary *successDic) {
+
+    [[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];

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 = @{
+                    NSArray *keys = @[@"deviceId",@"userId"];
-                                             @"deviceId":[FuncUserDefault strForKey:kDeviceToken],
+                    NSArray *values = @[[FuncUserDefault strForKey:kDeviceToken],model.userId];
-                                             @"userId":model.userId
+                    
-                                             };
+                    [[AFNOHeaderHttpTool sharedInstance] postRequestWihtUrl:Push_BindDevice_Url keys:keys values:values success:^(NSDictionary *successDic){
-                    [[AFNOHeaderHttpTool sharedInstance] postRequestWihtUrl:Push_BindDevice_Url params:reqDic success:^(NSDictionary *successDic) {
                         //绑定成功
                         [FuncUserDefault setBool:YES key:is_Bind_DeviceToken];//已经上送了本机的devicetoken
                     } failure:^(NSDictionary *errorDic) {