优化缓存策略和返回的错误信息

朱林
1 parent 1166942e
Showing 4 changed files with 31 additions and 10 deletions
CNLiveNetworkingDemo/CNLiveNetworking/CNLiveNetworkManager.m
CNLiveNetworkingDemo/CNLiveNetworkingDemo.xcodeproj/project.xcworkspace/xcuserdata/android.xcuserdatad/UserInterfaceState.xcuserstate
CNLiveNetworkingDemo/CNLiveNetworkingDemo.xcodeproj/xcuserdata/android.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
CNLiveNetworkingDemo/CNLiveNetworkingDemo/ViewController.m
@@ -40,6 +40,10 @@ static NSURLRequestCachePolicy CachePolicy = NSURLRequestUseProtocolCachePolicy;
     });
+    manager.cachePolicy = NSURLRequestUseProtocolCachePolicy;
+    
+    manager.timeoutInterval = TimeoutInterval;
+    
     return manager;
 }
@@ -79,7 +83,14 @@ static NSURLRequestCachePolicy CachePolicy = NSURLRequestUseProtocolCachePolicy;
                                           URLString:(NSString *)URLString
                                          parameters:(NSDictionary *)parameters
                                             success:(void (^)(NSURLResponse * _Nullable, id _Nullable))success
-                                            failure:(void (^)(NSURLResponse * _Nullable, NSError * _Nullable))failure{
+                                            failure:(void (^)(NSURLResponse * _Nullable, NSError * _Nullable))failure
+{
+    
+    if (![URLString isKindOfClass:[NSString class]]) {
+        NSError *error = [NSError errorWithDomain:NSURLErrorDomain code:-1 userInfo:@{NSLocalizedDescriptionKey : @"please enter a valid url"}];
+        failure(nil, error);
+        return nil;
+    }
     NSString *newURLString;
     if ([method isEqualToString:@"GET"]) {
@@ -92,12 +103,7 @@ static NSURLRequestCachePolicy CachePolicy = NSURLRequestUseProtocolCachePolicy;
         newURLString = URLString;
     }
-    NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:[NSURL URLWithString:newURLString] cachePolicy:CachePolicy timeoutInterval:TimeoutInterval];
-    
-    //将缓存策略恢复默认
-    CachePolicy = NSURLRequestUseProtocolCachePolicy;
-    //将超时时间恢复默认
-    TimeoutInterval = 30;
+    NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:[NSURL URLWithString:newURLString] cachePolicy:self.cachePolicy timeoutInterval:self.timeoutInterval];
     request.HTTPMethod = method;
@@ -122,8 +128,18 @@ static NSURLRequestCachePolicy CachePolicy = NSURLRequestUseProtocolCachePolicy;
             if (error) {
                 failure(response,error);
             }else{
-                id jsonObj = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingMutableContainers error:nil];
-                success(response,jsonObj);
+                if ([response isKindOfClass:[NSHTTPURLResponse class]]) {
+                    NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)response;
+                    if (httpResponse.statusCode < 400) {
+                        id jsonObj = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingMutableContainers error:nil];
+                        success(httpResponse,jsonObj);
+                    } else {
+                         NSError *failureError = [NSError errorWithDomain:NSURLErrorDomain code:httpResponse.statusCode userInfo:httpResponse.allHeaderFields];
+                        failure(httpResponse,failureError);
+                    }
+                } else {
+                    failure(response,error);
+                }
             }
         });
     }];
+<?xml version="1.0" encoding="UTF-8"?>
+<Bucket
+   type = "1"
+   version = "2.0">
+</Bucket>
@@ -46,7 +46,7 @@
         NSDictionary * getPara = @{@"plat":@"a",
                                    @"appid":@"hdtv",
                                    @"version":@"5.3"};
-        NSString *gettUrl = @"http://intertv.cnlive.com/api/activity";
+        NSString *gettUrl = @"http://intertv.cnlive.com/api/activity11111111";
         CNLiveNetworkManager *manager = [CNLiveNetworkManager manager];
         manager.timeoutInterval = 20 ;