From 1ff1ff84b17e105c97aa276355e79619cabdad35 Mon Sep 17 00:00:00 2001 From: wbzhan_macbook Date: Mon, 3 Jun 2019 09:41:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E7=89=88=E6=9C=AC=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=89=88-9.8.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .DS_Store | Bin 10244 -> 10244 bytes Ifish.xcodeproj/project.pbxproj | 4 - Ifish/Common/AppDelegate+AliPushConfig.m | 15 +- Ifish/Ifish-Prefix.pch | 1 - Ifish/Info.plist | 8 +- Ifish/Networking/UrlAdress.h | 44 ----- Ifish/Utinitys/Define.h | 35 +++- .../IfishHttpRequest/AFNOHeaderHttpTool.h | 12 +- .../IfishHttpRequest/AFNOHeaderHttpTool.m | 100 ++++++----- .../消息/IfishMessageViewController.m | 170 +++++++++--------- .../设备/IfishDeviceViewController.m | 21 +-- .../LogInViewController.m | 11 +- 12 files changed, 200 insertions(+), 221 deletions(-) delete mode 100644 Ifish/Networking/UrlAdress.h diff --git a/.DS_Store b/.DS_Store index 5c477ef60f5ec2bd83351dcad38a35fbd19930db..d5c3220019dcb06afca02e6373e1a643db49ef91 100644 GIT binary patch delta 27 jcmZn(XbIR*Bf_kh_j&S05v9qRLcB~$4x2ZKga`uwiy8?9 delta 27 jcmZn(XbIR*Bf_k5YU1RLB1)4rg?O1%4{Y8b5+V!$j$R3c diff --git a/Ifish.xcodeproj/project.pbxproj b/Ifish.xcodeproj/project.pbxproj index 69de7f4..c164bb8 100644 --- a/Ifish.xcodeproj/project.pbxproj +++ b/Ifish.xcodeproj/project.pbxproj @@ -2367,7 +2367,6 @@ 88F5EFD91D48D08100CC7CAF /* MyControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 88F5EF5C1D48D08100CC7CAF /* MyControl.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 88F5EFDA1D48D08100CC7CAF /* Reachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 88F5EF5F1D48D08100CC7CAF /* Reachability.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 88F740C01ECC28E800876AED /* ShopAddGoodsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 88F740BF1ECC28E800876AED /* ShopAddGoodsViewController.m */; }; - CB0F4E652294F37E0091C76D /* UrlAdress.h in Headers */ = {isa = PBXBuildFile; fileRef = CB0F4E642294F37E0091C76D /* UrlAdress.h */; }; CB0F4E8622951A130091C76D /* SVRadialGradientLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = CB0F4E7B22951A130091C76D /* SVRadialGradientLayer.m */; }; CB0F4E8722951A130091C76D /* SVIndefiniteAnimatedView.h in Headers */ = {isa = PBXBuildFile; fileRef = CB0F4E7C22951A130091C76D /* SVIndefiniteAnimatedView.h */; }; CB0F4E8822951A130091C76D /* SVProgressHUD.h in Headers */ = {isa = PBXBuildFile; fileRef = CB0F4E7D22951A130091C76D /* SVProgressHUD.h */; }; @@ -5764,7 +5763,6 @@ 88F5EF5F1D48D08100CC7CAF /* Reachability.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Reachability.m; sourceTree = ""; }; 88F740BE1ECC28E800876AED /* ShopAddGoodsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShopAddGoodsViewController.h; sourceTree = ""; }; 88F740BF1ECC28E800876AED /* ShopAddGoodsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ShopAddGoodsViewController.m; sourceTree = ""; }; - CB0F4E642294F37E0091C76D /* UrlAdress.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UrlAdress.h; sourceTree = ""; }; CB0F4E7B22951A130091C76D /* SVRadialGradientLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SVRadialGradientLayer.m; sourceTree = ""; }; CB0F4E7C22951A130091C76D /* SVIndefiniteAnimatedView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVIndefiniteAnimatedView.h; sourceTree = ""; }; CB0F4E7D22951A130091C76D /* SVProgressHUD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVProgressHUD.h; sourceTree = ""; }; @@ -12369,7 +12367,6 @@ CB0F4E622294F2B00091C76D /* Networking */ = { isa = PBXGroup; children = ( - CB0F4E642294F37E0091C76D /* UrlAdress.h */, ); path = Networking; sourceTree = ""; @@ -12599,7 +12596,6 @@ CBA6167F228F9AB100ED380D /* MASViewConstraint.h in Headers */, 3D1C5122221A9EE00096AE43 /* IfishRecVideoViewCell.h in Headers */, 3D1C5137221A9EE10096AE43 /* ifishdeviceListCell.h in Headers */, - CB0F4E652294F37E0091C76D /* UrlAdress.h in Headers */, 3D1C5038221A9EDE0096AE43 /* MD5Manager.h in Headers */, 3D1C5079221A9EDF0096AE43 /* RtspInterface.h in Headers */, 3D1C5085221A9EDF0096AE43 /* KTPhotoBrowserGlobal.h in Headers */, diff --git a/Ifish/Common/AppDelegate+AliPushConfig.m b/Ifish/Common/AppDelegate+AliPushConfig.m index 6aaafb4..3d43a99 100644 --- a/Ifish/Common/AppDelegate+AliPushConfig.m +++ b/Ifish/Common/AppDelegate+AliPushConfig.m @@ -164,13 +164,16 @@ static const void *NotificationCenterKey = &NotificationCenterKey; NSLog(@"注册成功 device_token = %@",device_Id); [FuncUserDefault setStr:device_Id key:kDeviceToken];//本机的devicetoken保存在本地 if (userId!=nil) { - NSArray *keys = @[@"deviceId",@"userId"]; - NSArray *values = @[device_Id,userId]; - - [[AFNOHeaderHttpTool sharedInstance] postRequestWihtUrl:Push_BindDevice_Url keys:keys values:values success:^(NSDictionary *successDic) { + NSDictionary *params = @{@"deviceId":device_Id, + @"userId":userId, + @"phoneType":@"iOS" + }; + [AFNOHeaderHttpTool requestWihtMethod:RequestTypePost url:Push_BindDevice_Url params:params success:^(id response) { + id resault=[NSJSONSerialization JSONObjectWithData:response options:NSJSONReadingMutableContainers error:nil]; + NSLog(@"result = %@",resault); //绑定成功 - [FuncUserDefault setBool:YES key:is_Bind_DeviceToken]; - } failure:^(NSDictionary *errorDic) { + [FuncUserDefault setBool:YES key:is_Bind_DeviceToken];//已经上送了本机的devicetoken + } failure:^(NSError *err) { }]; } diff --git a/Ifish/Ifish-Prefix.pch b/Ifish/Ifish-Prefix.pch index e51340b..a86cb96 100644 --- a/Ifish/Ifish-Prefix.pch +++ b/Ifish/Ifish-Prefix.pch @@ -26,7 +26,6 @@ #import #import "UIButton+button.h" #import "CommonMacros.h" -#import "UrlAdress.h" #import "FuncUserDefault.h" #import "CommonUtils.h" #define NTES_USE_CLEAR_BAR - (BOOL)useClearBar{return YES;} diff --git a/Ifish/Info.plist b/Ifish/Info.plist index 930cc61..9b63f3d 100644 --- a/Ifish/Info.plist +++ b/Ifish/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 4.9.7 + 4.9.8 CFBundleSignature ???? CFBundleURLTypes @@ -70,7 +70,7 @@ CFBundleVersion - 9.8.3 + 9.8.5 ITSAppUsesNonExemptEncryption LSApplicationCategoryType @@ -373,7 +373,7 @@ NSCameraUsageDescription - 爱鱼奇需要您的同意,才能使用相机 + 爱鱼奇需要您的同意,才能使用相机，以使用图片上传或扫一扫等功能 NSLocationAlwaysUsageDescription 为获取爱鱼奇智能硬件产品及用户的地址区域分布，以提供更好的特色服务，爱鱼奇将获取您的地址 NSLocationWhenInUseUsageDescription @@ -381,7 +381,7 @@ NSMicrophoneUsageDescription 爱鱼奇需要您的同意,才能访问麦克风 NSPhotoLibraryUsageDescription - 爱鱼奇需要您的同意,才能访问相册 + 爱鱼奇需要您的同意,才能访问相册，以使用更换头像等图片上传功能 UIApplicationExitsOnSuspend UIBackgroundModes diff --git a/Ifish/Networking/UrlAdress.h b/Ifish/Networking/UrlAdress.h deleted file mode 100644 index f269ee5..0000000 --- a/Ifish/Networking/UrlAdress.h +++ /dev/null @@ -1,44 +0,0 @@ -// -// UrlAdress.h -// Ifish -// -// Created by wbzhan on 2019/5/22. -// Copyright © 2019 lianlian. All rights reserved. -// - -#ifndef UrlAdress_h -#define UrlAdress_h - -#define App_Environment 1 //1.测试环境 2.正式环境 -#if(App_Environment==1)//测试 -//app接口域名 -#define Api_DomainName @"http://test.ifish7.com:7080" - -#elif (App_Environment==2)//正式 -//app接口域名 cv -#define Api_DomainName @"http://139.196.24.156:7080" - -#else//其他环境 -//app接口域名 -#define Api_DomainName @"http://139.196.24.156:7080" - -#endif - -//获取推送消息列表 -/** - pushID 本地缓存的最大的pushId，第一次无的时候则不传 - userId 用户id - firstResult 开始条数 - pageSize 每页数据数量 - @return <#return value description#> - */ -#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" -//用户消息已读 -#define Push_Message_Readed Api_DomainName @"/api/updateUser/userMessageIsRead.do" -//用户未读消息个数 -#define Push_Message_UnReadCount Api_DomainName @"/api/updateUser/userMessageNoReadCount.do" -#endif /* UrlAdress_h */ diff --git a/Ifish/Utinitys/Define.h b/Ifish/Utinitys/Define.h index e5d32b8..ca9a8e3 100644 --- a/Ifish/Utinitys/Define.h +++ b/Ifish/Utinitys/Define.h @@ -136,17 +136,20 @@ alpha:1.0] //#define SOCKETPORT @"app.ifish7.com" // 本地 @"192.168.61.128" -#define SOCKETPORT @"test.ifish7.com" +#define SOCKETPORT @"test.ifish7.com:9955" + +//#define JIEKOUPORT @"https://app.ifish7.com" +//#define JIEKOUPORT @"http://test.ifish7.com:7080" +#define JIEKOUPORT @"http://139.196.24.156:7080" +#define JIEKOUPORTHTTP @"https://app.ifish7.com" //云 @"https://app.ifish7.com" //云图片头像等地址 @"http://app.ifish7.com" -#define JIEKOUPORT @"https://app.ifish7.com" -#define JIEKOUPORTHTTP @"https://app.ifish7.com" +//#define JIEKOUPORTHTTP @"https://app.ifish7.com" //测试云 @"https://app.zhangxinyanv5.top" //测试云图片 @"http://app.zhangxinyanv5.top" -//#define JIEKOUPORT @"https://app.zhangxinyanv5.top" -//#define JIEKOUPORTHTTP @"https://app.zhangxinyanv5.top" + //本地 @"http://192.168.61.128:81" @@ -473,7 +476,23 @@ alpha:1.0] // #define getHotBarHistory [NSString stringWithFormat:@"%@/api/user/getDeviceHeaterPhsByDate.do",JIEKOUPORT] - - - +/*=====================add V4.9.8=======================================*/ +//获取推送消息列表 +/** + pushID 本地缓存的最大的pushId，第一次无的时候则不传 + userId 用户id + firstResult 开始条数 + pageSize 每页数据数量 + @return <#return value description#> + */ +#define Push_Message_Url JIEKOUPORT @"/api/pageList/pushListInf.do" +//删除消息 +#define Push_Message_Delete_Url JIEKOUPORT @"/api/updateUser/deleteMessages.do" +//绑定设备 +#define Push_BindDevice_Url JIEKOUPORT @"/api/updateUser/bindDevice.do" +//用户消息已读 +#define Push_Message_Readed JIEKOUPORT @"/api/updateUser/userMessageIsRead.do" +//用户未读消息个数 +#define Push_Message_UnReadCount JIEKOUPORT @"/api/updateUser/userMessageNoReadCount.do" +/*=====================add V4.9.8=======================================*/ #endif /* Define_h */ diff --git a/Ifish/Utinitys/IfishHttpRequest/AFNOHeaderHttpTool.h b/Ifish/Utinitys/IfishHttpRequest/AFNOHeaderHttpTool.h index 3f82593..f62488c 100644 --- a/Ifish/Utinitys/IfishHttpRequest/AFNOHeaderHttpTool.h +++ b/Ifish/Utinitys/IfishHttpRequest/AFNOHeaderHttpTool.h @@ -47,12 +47,12 @@ typedef NS_ENUM(NSInteger, RequestType){ #define RESPONSE_SUCCESS @"0" //服务器返回的数据成功信息1、成功，-1，异常，0，错误 @interface AFNOHeaderHttpTool : NSObject + (AFNOHeaderHttpTool *)sharedInstance; -//POST请求 --(void) postRequestWihtUrl:(NSString *)url - keys:(NSArray *)keys - values:(NSArray *)values - success:(WBCallBackSuccess)success - failure:(WBCallBackFailed)failure; +////POST请求 +//-(void) postRequestWihtUrl:(NSString *)url +// 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 34ec86c..ddf9693 100644 --- a/Ifish/Utinitys/IfishHttpRequest/AFNOHeaderHttpTool.m +++ b/Ifish/Utinitys/IfishHttpRequest/AFNOHeaderHttpTool.m @@ -78,57 +78,57 @@ //POST请求 --(void) postRequestWihtUrl:(NSString *)url - keys:(NSArray *)keys - values:(NSArray *)values - success:(WBCallBackSuccess)success - failure:(WBCallBackFailed)failure -{ - - NSURLSession *session = [NSURLSession sharedSession]; - NSMutableURLRequest *urlRequest = [self getUrlRequestWithPath:url keysArray:keys valuesArray:values]; - NSURLSessionDataTask *sessionDataTask = [session dataTaskWithRequest:urlRequest completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) { - if ([data length] >0 && - error == nil){ - [SVProgressHUD dismissWithDelay:0.3]; - 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]];//状态码 -// //返回数据正确 ，则解析到数据接收内容 -// if([resCode integerValue]==kReqSuccess) -// { - /** - 获取后台给定的正确码100，做逻辑处理 - */ - dispatch_async(dispatch_get_main_queue(), ^{ - //直接显示成功信息 - success(result); - }); -// }else{ -// /* -// 获取后台给定的其他错误码，做逻辑处理（暂无数据等） +//-(void) postRequestWihtUrl:(NSString *)url +// keys:(NSArray *)keys +// values:(NSArray *)values +// success:(WBCallBackSuccess)success +// failure:(WBCallBackFailed)failure +//{ +// +// NSURLSession *session = [NSURLSession sharedSession]; +// NSMutableURLRequest *urlRequest = [self getUrlRequestWithPath:url keysArray:keys valuesArray:values]; +// NSURLSessionDataTask *sessionDataTask = [session dataTaskWithRequest:urlRequest completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) { +// if ([data length] >0 && +// error == nil){ +// [SVProgressHUD dismissWithDelay:0.3]; +// 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]];//状态码 +//// //返回数据正确 ，则解析到数据接收内容 +//// if([resCode integerValue]==kReqSuccess) +//// { +// /** +// 获取后台给定的正确码100，做逻辑处理 // */ // dispatch_async(dispatch_get_main_queue(), ^{ -// failure(result); +// //直接显示成功信息 +// success(result); // }); -// } - }else{ - NSLog(@"json格式错误"); - } - }else if ([data length] == 0 && - error == nil){ - //请求数据长度为0（服务器返回数据内容问题） - [SVProgressHUD dismiss]; - }else if (error != nil){ - //反馈错误信息（网络连接失败（服务器关停）等信息） - if (error) { - [SVProgressHUD dismiss]; - } - } - }]; - [sessionDataTask resume]; -} +//// }else{ +//// /* +//// 获取后台给定的其他错误码，做逻辑处理（暂无数据等） +//// */ +//// dispatch_async(dispatch_get_main_queue(), ^{ +//// failure(result); +//// }); +//// } +// }else{ +// NSLog(@"json格式错误"); +// } +// }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 params:(NSDictionary *)params @@ -142,7 +142,7 @@ methodType url : (NSString *)url AFHTTPRequestOperationManager*manager=[AFHTTPRequestOperationManager manager]; //此类中接口 无安全校验 manager.responseSerializer=[AFHTTPResponseSerializer serializer]; - + manager.responseSerializer.acceptableContentTypes = [NSSet setWithObjects:@"application/json",@"text/json",@"text/javascript",@"text/html", nil];; //#ifdef ContentType // manager.responseSerializer.acceptableContentTypes = [NSSet setWithObject:ContentType]; //#endif @@ -171,10 +171,12 @@ methodType url : (NSString *)url [manager POST:url parameters:params success:^(AFHTTPRequestOperation* operation, NSDictionary* responseObj) { if (success) { + [SVProgressHUD dismiss]; success(responseObj); } } failure:^(AFHTTPRequestOperation* operation, NSError* error) { if (failure){ + [SVProgressHUD dismiss]; failure(error); } }]; diff --git a/Ifish/controllers/IfishTabControllers/消息/IfishMessageViewController.m b/Ifish/controllers/IfishTabControllers/消息/IfishMessageViewController.m index 9697a2c..1f8db73 100644 --- a/Ifish/controllers/IfishTabControllers/消息/IfishMessageViewController.m +++ b/Ifish/controllers/IfishTabControllers/消息/IfishMessageViewController.m @@ -268,20 +268,25 @@ extern BOOL launchedByNotification; [SVProgressHUD show]; self.pushId = @""; UserModel*userModel=[dataContorl getUserInfo]; - 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"]; + NSDictionary *params = @{@"pushId":self.pushId, + @"userId":userModel.userId, + @"firstResult":@(0), + @"pageSize":@(999) + }; + [AFNOHeaderHttpTool requestWihtMethod:RequestTypePost url:Push_Message_Url params:params success:^(id response) { + [SVProgressHUD dismiss]; + if (response) { + id resault=[NSJSONSerialization JSONObjectWithData:response options:NSJSONReadingMutableContainers error:nil]; + + NSString *totalCount = [resault objectForKey:@"total"]; + NSArray *dataArray = [resault objectForKey:@"data"]; if ([totalCount integerValue]>0) { NSMutableArray *newMessageArray = InitObject(NSMutableArray); NSMutableArray *oldMessageArray = InitObject(NSMutableArray); for (int i=0; i