网络请求库方法更新

毕珂
1 parent 4c55e845
Showing 7 changed files with 31 additions and 9 deletions
DSToolsModuleF.podspec
DSToolsModuleF/Frameworks/DSToolsModule.framework/DSToolsModule
DSToolsModuleF/Frameworks/DSToolsModule.framework/Headers/DSNetworkDisposeModel.h
DSToolsModuleF/Frameworks/DSToolsModule.framework/Headers/DSNetworkRequest.h
DSToolsModuleF/Frameworks/DSToolsModule.framework/Headers/DSToolsModuleManager.h
DSToolsModuleF/Frameworks/DSToolsModule.framework/Headers/DSToolsModuleProtocol.h
DSToolsModuleF/Frameworks/DSToolsModule.framework/Info.plist
 Pod::Spec.new do |s|
   s.name                   = "DSToolsModuleF"
-  s.version                = "0.0.26"
+  s.version                = "0.0.27"
   s.summary                = "DSToolsModuleF"
   s.homepage               = "http://bj.gitlab.cnlive.com/DSIOSTeam"
   s.authors                = { "DSIOSTeam" => "694092596@qq.com" }
@@ -8,7 +8,9 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
-//当请求网络成功,获取数据失败时显示提示信息 即 code!=200 && [message length] == 0
+//中投电商错误Domain
+FOUNDATION_EXPORT NSErrorDomain const CNCnliveDSErrorDomain;
+//当请求网络成功,获取数据失败时显示提示信息 即后台返回消息为空时
 UIKIT_EXTERN NSString * _Nonnull const kDSRequestDataFailureMessage;
 //网络请求失败时提示信息
 UIKIT_EXTERN NSString * _Nonnull const kDSRequestFailureMessage;
@@ -26,7 +28,7 @@ NS_ASSUME_NONNULL_BEGIN
  @param error 错误
  @param result 结果
  */
-+(void)disposeJson:(id)json error:(NSError *)error result:(void (^)(id jsonData, NSString * errorMessage))result;
++(void)disposeJson:(id)json error:(NSError *)error result:(void (^)(NSUInteger code, id _Nullable jsonData, NSError * _Nullable error))result;
 /**
  处理数据(有特殊错误提示)
@@ -36,7 +38,7 @@ NS_ASSUME_NONNULL_BEGIN
  @param specialErrorMessage 特殊的错误提示
  @param result 结果
  */
-+(void)disposeJson:(id)json error:(NSError *)error specialErrorMessage:(NSString * _Nullable)specialErrorMessage result:(void (^)(id jsonData, NSString * errorMessage))result;
++(void)disposeJson:(id)json error:(NSError *)error specialErrorMessage:(NSString * _Nullable)specialErrorMessage result:(void (^)(NSUInteger code, id _Nullable jsonData, NSError * _Nullable error))result;
 @end
@@ -18,6 +18,12 @@ typedef NS_ENUM(NSUInteger, DSNetworkStatus) {
     DSNetworkStatusWiFi,
 };
+typedef NS_ENUM(NSUInteger, DSNetworkRequestLogLevel) {
+    DSNetworkRequestLogLevelNone = 0,     //无log日志
+    DSNetworkRequestLogLevelRequestParams,//请求参数
+    DSNetworkRequestLogLevelRequestAll,   //请求参数+返回结果
+};
+
 @interface DSNetworkRequest : AFHTTPSessionManager
 #pragma mark - 单例
@@ -28,6 +34,8 @@ typedef NS_ENUM(NSUInteger, DSNetworkStatus) {
 /// 用户id 用于储存缓存保存路径用户区分 请求头添加Uid
 @property (nonatomic,copy,nullable) NSString * userId;
+/// 请求日志级别
+@property (nonatomic,assign) DSNetworkRequestLogLevel logLevel;
 #pragma mark - 网络监测
@@ -85,7 +93,7 @@ typedef NS_ENUM(NSUInteger, DSNetworkStatus) {
  @param isCache 是否缓存
  @param disposeResult 结果
  */
--(void)postWithUrl:(nonnull NSString *)url params:(nullable NSDictionary *)params isCache:(BOOL)isCache disposeResult:(nullable void (^)(BOOL isCacheData, id _Nullable jsonData, NSString * _Nullable errorMessage))disposeResult;
+-(void)postWithUrl:(nonnull NSString *)url params:(nullable NSDictionary *)params isCache:(BOOL)isCache disposeResult:(nullable void (^)(BOOL isCacheData, NSUInteger code, id _Nullable jsonData, NSError * _Nullable error))disposeResult;
 /**
  POST请求(有特殊错误提示数据处理)
@@ -96,7 +104,7 @@ typedef NS_ENUM(NSUInteger, DSNetworkStatus) {
  @param specialErrorMessage 特殊的错误提示
  @param disposeResult 结果
  */
--(void)postWithUrl:(nonnull NSString *)url params:(nullable NSDictionary *)params isCache:(BOOL)isCache specialErrorMessage:(nullable NSString *)specialErrorMessage disposeResult:(nullable void (^)(BOOL isCacheData, id _Nullable jsonData, NSString * _Nullable errorMessage))disposeResult;
+-(void)postWithUrl:(nonnull NSString *)url params:(nullable NSDictionary *)params isCache:(BOOL)isCache specialErrorMessage:(nullable NSString *)specialErrorMessage disposeResult:(nullable void (^)(BOOL isCacheData, NSUInteger code, id _Nullable jsonData, NSError * _Nullable error))disposeResult;
 #pragma mark - GET
@@ -118,7 +126,7 @@ typedef NS_ENUM(NSUInteger, DSNetworkStatus) {
  @param isCache 是否缓存
  @param disposeResult 结果
  */
--(void)getWithUrl:(nonnull NSString *)url params:(nullable NSDictionary *)params isCache:(BOOL)isCache disposeResult:(nullable void (^)(BOOL isCacheData, id _Nullable jsonData, NSString * _Nullable errorMessage))disposeResult;
+-(void)getWithUrl:(nonnull NSString *)url params:(nullable NSDictionary *)params isCache:(BOOL)isCache disposeResult:(nullable void (^)(BOOL isCacheData, NSUInteger code, id _Nullable jsonData, NSError * _Nullable error))disposeResult;
 /**
  GET请求(有特殊错误提示数据处理)
@@ -129,7 +137,7 @@ typedef NS_ENUM(NSUInteger, DSNetworkStatus) {
  @param specialErrorMessage 特殊的错误提示
  @param disposeResult 结果
  */
--(void)getWithUrl:(nonnull NSString *)url params:(nullable NSDictionary *)params isCache:(BOOL)isCache specialErrorMessage:(nullable NSString *)specialErrorMessage disposeResult:(nullable void (^)(BOOL isCacheData, id _Nullable jsonData, NSString * _Nullable errorMessage))disposeResult;
+-(void)getWithUrl:(nonnull NSString *)url params:(nullable NSDictionary *)params isCache:(BOOL)isCache specialErrorMessage:(nullable NSString *)specialErrorMessage disposeResult:(nullable void (^)(BOOL isCacheData, NSUInteger code, id _Nullable jsonData, NSError * _Nullable error))disposeResult;
 #pragma mark - 取消网络请求
@@ -8,6 +8,7 @@
 #import <Foundation/Foundation.h>
 #import "DSToolsModuleProtocol.h"
+#import "DSNetworkRequest.h"
 NS_ASSUME_NONNULL_BEGIN
@@ -21,11 +22,22 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic,copy,nullable) NSString * userId;
 /// 七牛上传url域名 例https://XXX.XXX.XXX/
 @property (nonatomic,copy) NSString * qiniuUploadUrlDomain;
+/// 网络请求日志级别
+@property (nonatomic,assign) DSNetworkRequestLogLevel networkRequestLogLevel;
 #pragma mark - 单例
 +(instancetype)sharedManager;
+#pragma mark - 缓存
+
+/// 计算DSToolsModule中所有文件大小 单位字节b 包含DSFileManager DSNetwork
+-(CGFloat)calcDSToolsModuleCacheSize;
+
+/// 清空DSToolsModule中所有文件缓存
+/// @param completion 清空完成回调
+-(void)clearDSToolsModuleCacheCompletion:(nullable void (^)(void))completion;
+
 @end
 NS_ASSUME_NONNULL_END
@@ -31,7 +31,7 @@
 /// @param page 页数
 /// @param keywords 检索词(可以不传)
 /// @param result 结果
--(void)requestGetGaoDePOIWithLongitude:(double)longitude latitude:(double)latitude page:(NSUInteger)page keywords:(nullable NSString *)keywords result:(nullable void (^)(NSArray<DSMapSearchModel *> * dataArr, NSString * errorMessage))result;
+-(void)requestGetGaoDePOIWithLongitude:(double)longitude latitude:(double)latitude page:(NSUInteger)page keywords:(nullable NSString *)keywords result:(nullable void (^)(NSArray<DSMapSearchModel *> * _Nullable dataArr, NSString * _Nullable errorMessage))result;
 @end