1.3.3

bawn · Jan 4, 2017 · 00a20e8 · 00a20e8
1 parent 16f55af
commit 00a20e8
Show file tree

Hide file tree

Showing 9 changed files with 124 additions and 15 deletions.
diff --git a/LCNetwork.podspec b/LCNetwork.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "LCNetwork"
-  s.version          = "1.3.2"
+  s.version          = "1.3.3"
   s.summary          = "基于AFNetworking的网络库封装"
   s.homepage         = "https://github.com/bawn/LCNetwork"
   s.license          = 'MIT'

diff --git a/LCNetwork/LCBaseRequest.h b/LCNetwork/LCBaseRequest.h
@@ -33,6 +33,7 @@
 typedef void (^AFConstructingBlock)(id<AFMultipartFormData> formData);
 typedef void (^LCRequestCompletionBlock)(__kindof LCBaseRequest *request);
 typedef void (^LCRequestFailureBlock)(__kindof LCBaseRequest *request, NSError *error);
+typedef void (^LCRequestFinishedBlock)(__kindof LCBaseRequest *request, NSError *error);
 
 typedef NS_ENUM(NSInteger , LCRequestMethod) {
     LCRequestMethodGet = 0,
@@ -170,7 +171,8 @@ typedef NS_ENUM(NSInteger , LCRequestSerializerType) {
 
 @optional
 
-- (void)requestFinished:(LCBaseRequest *)request;
+- (void)requestSuccess:(LCBaseRequest *)request;
+- (void)requestFinished:(LCBaseRequest *)request error:(NSError *)error;
 - (void)requestFailed:(LCBaseRequest *)request error:(NSError *)error;
 - (void)requestProgress:(NSProgress *)progress;
 
@@ -215,6 +217,7 @@ typedef NS_ENUM(NSInteger , LCRequestSerializerType) {
 @property (nonatomic, strong, readonly) NSMutableArray *requestAccessories;
 @property (nonatomic, copy) void (^successCompletionBlock)(LCBaseRequest *);
 @property (nonatomic, copy) void (^failureCompletionBlock)(LCBaseRequest *, NSError *error);
+@property (nonatomic, copy) void (^finishedCompletionBlock)(LCBaseRequest *, NSError *error);
 @property (nonatomic, copy) void (^progressBlock)(NSProgress * progress);
 
 /**
@@ -248,6 +251,19 @@ typedef NS_ENUM(NSInteger , LCRequestSerializerType) {
                       failure:(LCRequestFailureBlock)failure;
 
 
+/**
+ block回调方式
+
+ @param success 成功回调
+ @param failure 失败回调
+ @param finished 请求完成后的回调
+ */
+- (void)startWithBlockSuccess:(LCRequestCompletionBlock)success
+                      failure:(LCRequestFailureBlock)failure
+                     finished:(LCRequestFinishedBlock)finished;
+
+
+
 /**
  *  block回调方式
  *
@@ -259,6 +275,21 @@ typedef NS_ENUM(NSInteger , LCRequestSerializerType) {
                        success:(LCRequestCompletionBlock)success
                        failure:(LCRequestFailureBlock)failure;
 
+
+/**
+ block回调方式
+
+ @param progress 进度回调
+ @param success 成功回调
+ @param failure 失败回调
+ @param finished 请求完成后的回调
+ */
+- (void)startWithBlockProgress:(void (^)(NSProgress *progress))progress
+                       success:(LCRequestCompletionBlock)success
+                       failure:(LCRequestFailureBlock)failure
+                      finished:(LCRequestFinishedBlock)finished;
+
+
 /**
  *  一般用于显示和隐藏 HUD
  *

diff --git a/LCNetwork/LCBaseRequest.m b/LCNetwork/LCBaseRequest.m
@@ -87,6 +87,26 @@ - (void)startWithBlockProgress:(void (^)(NSProgress *))progress
 }
 
 
+- (void)startWithBlockSuccess:(LCRequestCompletionBlock)success
+                      failure:(LCRequestFailureBlock)failure
+                     finished:(LCRequestFinishedBlock)finished{
+    self.successCompletionBlock = success;
+    self.failureCompletionBlock = failure;
+    self.finishedCompletionBlock = finished;
+    [self start];
+}
+
+- (void)startWithBlockProgress:(void (^)(NSProgress *))progress
+                       success:(LCRequestCompletionBlock)success
+                       failure:(LCRequestFailureBlock)failure
+                      finished:(LCRequestFinishedBlock)finished{
+    self.progressBlock = progress;
+    self.successCompletionBlock = success;
+    self.failureCompletionBlock = failure;
+    self.finishedCompletionBlock = finished;
+    [self start];
+}
+
 - (id)responseJSONObject{
     id responseJSONObject = nil;
     // 统一加工response
@@ -158,6 +178,7 @@ - (void)stop{
 - (void)clearCompletionBlock {
     self.successCompletionBlock = nil;
     self.failureCompletionBlock = nil;
+    self.finishedCompletionBlock = nil;
     self.progressBlock = nil;
 }
 

diff --git a/LCNetwork/LCBatchRequest.h b/LCNetwork/LCBatchRequest.h
@@ -46,6 +46,7 @@
 @property (nonatomic, strong, readonly) NSArray *requestArray;
 @property (nonatomic, copy) void (^successCompletionBlock)(LCBatchRequest *);
 @property (nonatomic, copy) void (^failureCompletionBlock)(LCBatchRequest *);
+@property (nonatomic, copy) void (^finishedCompletionBlock)(LCBatchRequest *);
 @property (nonatomic, weak) id<LCBatchRequestDelegate> delegate;
 
 
@@ -81,6 +82,17 @@ DEPRECATED_MSG_ATTRIBUTE("使用 - (void)startWithBlockSuccess:(void (^)(id requ
 - (void)startWithBlockSuccess:(void (^)(LCBatchRequest *request))success
                       failure:(void (^)(LCBatchRequest *request))failure;
 
+/**
+ *  block回调方式
+ *
+ *  @param success 成功回调
+ *  @param failure 失败回调
+ *  @param finished 请求完成后的回调
+ */
+- (void)startWithBlockSuccess:(void (^)(LCBatchRequest *request))success
+                      failure:(void (^)(LCBatchRequest *request))failure
+                     finished:(void (^)(LCBatchRequest *request))finished;
+
 
 
 - (void)clearCompletionBlock;

diff --git a/LCNetwork/LCBatchRequest.m b/LCNetwork/LCBatchRequest.m
@@ -88,25 +88,35 @@ - (void)requestDidStop{
 
 - (void)startWithCompletionBlockWithSuccess:(void (^)(LCBatchRequest *request))success
                                     failure:(void (^)(LCBatchRequest *request))failure {
-    [self setCompletionBlockWithSuccess:success failure:failure];
+    [self setCompletionBlockWithSuccess:success failure:failure finished:NULL];
     [self start];
 }
 
 - (void)startWithBlockSuccess:(void (^)(LCBatchRequest *request))success
                       failure:(void (^)(LCBatchRequest *request))failure{
-    [self setCompletionBlockWithSuccess:success failure:failure];
+    [self setCompletionBlockWithSuccess:success failure:failure finished:NULL];
+    [self start];
+}
+
+- (void)startWithBlockSuccess:(void (^)(LCBatchRequest *request))success
+                      failure:(void (^)(LCBatchRequest *request))failure
+                     finished:(void (^)(LCBatchRequest *request))finished{
+    [self setCompletionBlockWithSuccess:success failure:failure finished:finished];
     [self start];
 }
 
 - (void)setCompletionBlockWithSuccess:(void (^)(LCBatchRequest *batchRequest))success
-                              failure:(void (^)(LCBatchRequest *batchRequest))failure {
+                              failure:(void (^)(LCBatchRequest *batchRequest))failure
+                              finished:(void (^)(LCBatchRequest *batchRequest))finished{
     self.successCompletionBlock = success;
     self.failureCompletionBlock = failure;
+    self.finishedCompletionBlock = finished;
 }
 
 - (void)clearCompletionBlock {
     self.successCompletionBlock = nil;
     self.failureCompletionBlock = nil;
+    self.finishedCompletionBlock = nil;
 }
 
 
@@ -116,7 +126,8 @@ - (void)dealloc {
 
 #pragma mark - Network Request Delegate
 
-- (void)requestFinished:(LCBaseRequest *)request {
+
+- (void)requestSuccess:(LCBaseRequest *)request{
     _finishedCount++;
     if (_finishedCount == _requestArray.count) {
         [self toggleAccessoriesWillStopCallBack];
@@ -126,6 +137,9 @@ - (void)requestFinished:(LCBaseRequest *)request {
         if (_successCompletionBlock) {
             _successCompletionBlock(self);
         }
+        if (_finishedCompletionBlock) {
+            _finishedCompletionBlock(self);
+        }
         [self requestDidStop];
     }
 }
@@ -141,6 +155,9 @@ - (void)requestFailed:(LCBaseRequest *)request error:(NSError *)error{
     if (_failureCompletionBlock) {
         _failureCompletionBlock(self);
     }
+    if (_finishedCompletionBlock) {
+        _finishedCompletionBlock(self);
+    }
     [self requestDidStop];
 }
 

diff --git a/LCNetwork/LCChainRequest.m b/LCNetwork/LCChainRequest.m
@@ -115,7 +115,20 @@ - (void)dealloc{
 
 #pragma mark - Network Request Delegate
 
-- (void)requestFinished:(LCBaseRequest *)request {
+//- (void)requestFinished:(LCBaseRequest *)request {
+//    NSUInteger currentRequestIndex = _nextRequestIndex - 1;
+//    LCChainCallback callback = _requestCallbackArray[currentRequestIndex];
+//    callback(self, request);
+//    if ([self startNextRequest] == NO) {
+//        [self toggleAccessoriesWillStopCallBack];
+//        if ([_delegate respondsToSelector:@selector(chainRequestFinished:)]) {
+//            [_delegate chainRequestFinished:self];
+//        }
+//        [self requestDidStop];
+//    }
+//}
+
+- (void)requestSuccess:(LCBaseRequest *)request{
     NSUInteger currentRequestIndex = _nextRequestIndex - 1;
     LCChainCallback callback = _requestCallbackArray[currentRequestIndex];
     callback(self, request);

diff --git a/LCNetwork/LCNetworkAgent.m b/LCNetwork/LCNetworkAgent.m
@@ -215,14 +215,19 @@ - (void)handleRequestSuccess:(NSURLSessionDataTask *)sessionDataTask{
             [[[TMCache sharedCache] diskCache] setObject:request.responseJSONObject forKey:request.urlString];
         }
 
-        if (request.delegate != nil) {
-            [request.delegate requestFinished:request];
+        if (request.delegate != nil && [request.delegate respondsToSelector:@selector(requestSuccess:)]) {
+            [request.delegate requestSuccess:request];
+        }
+        if (request.delegate != nil && [request.delegate respondsToSelector:@selector(requestFinished:error:)]) {
+            [request.delegate requestFinished:request error:nil];
         }
         if (request.successCompletionBlock) {
             request.successCompletionBlock(request);
         }
+        if (request.finishedCompletionBlock) {
+            request.finishedCompletionBlock(request, nil);
+        }
         [request toggleAccessoriesDidStopCallBack];
-
     }
 
     [self removeOperation:sessionDataTask];
@@ -234,12 +239,18 @@ - (void)handleRequestFailure:(NSURLSessionDataTask *)sessionDataTask error:(NSEr
     LCBaseRequest *request = _requestsRecord[key];
     if (request) {
         [request toggleAccessoriesWillStopCallBack];
-        if (request.delegate != nil) {
+        if (request.delegate != nil && [request.delegate respondsToSelector:@selector(requestFailed:error:)]) {
             [request.delegate requestFailed:request error:error];
         }
+        if (request.delegate != nil && [request.delegate respondsToSelector:@selector(requestFinished:error:)]) {
+            [request.delegate requestFinished:request error:error];
+        }
         if (request.failureCompletionBlock) {
             request.failureCompletionBlock(request, error);
         }
+        if (request.finishedCompletionBlock) {
+            request.finishedCompletionBlock(request, error);
+        }
         [request toggleAccessoriesDidStopCallBack];
     }
     [self removeOperation:sessionDataTask];

diff --git a/LCNetwork/LCQueueRequest.m b/LCNetwork/LCQueueRequest.m
@@ -83,7 +83,7 @@ - (void)allComplete:(void (^)())block{
 
 #pragma mark - Network Request Delegate
 
-- (void)requestFinished:(LCBaseRequest *)request {
+- (void)requestSuccess:(LCBaseRequest *)request {
     dispatch_group_leave(queueRequest_request_operation_completion_group());
     [[LCQueueRequestAgent sharedInstance] removeRequest:self];    
 }

diff --git a/LCNetworkDemo/LCNetworkDemo.xcodeproj/project.pbxproj b/LCNetworkDemo/LCNetworkDemo.xcodeproj/project.pbxproj
@@ -278,7 +278,7 @@
 		7A83F2961B3C00D500DA3282 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0710;
+				LastUpgradeCheck = 0820;
 				ORGANIZATIONNAME = beike;
 				TargetAttributes = {
 					7A83F29D1B3C00D500DA3282 = {
@@ -455,8 +455,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -479,7 +481,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -499,8 +501,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -516,7 +520,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;