调整import为@module模式

songwentong · Aug 31, 2015 · 771f3ce · 771f3ce
1 parent f968819
commit 771f3ce
Show file tree

Hide file tree

Showing 34 changed files with 120 additions and 32 deletions.
diff --git a/UIKit+WTRequestCenter/UIAlertView+WTRequestCenter.h b/UIKit+WTRequestCenter/UIAlertView+WTRequestCenter.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2014年 song. All rights reserved.
 //
 
-#import <UIKit/UIKit.h>
+@import UIKit;
 
 @interface UIAlertView (WTRequestCenter)
 +(void)showAlertWithMessage:(NSString*)message;

diff --git a/UIKit+WTRequestCenter/UIButton+WTRequestCenter.h b/UIKit+WTRequestCenter/UIButton+WTRequestCenter.h
@@ -20,7 +20,7 @@
  
  */
 
-#import <UIKit/UIKit.h>
+@import UIKit;
 @class WTURLRequestOperation;
 
 

diff --git a/UIKit+WTRequestCenter/UIColor+WTRequestCenter.h b/UIKit+WTRequestCenter/UIColor+WTRequestCenter.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2014年 song. All rights reserved.
 //
 
-#import <UIKit/UIKit.h>
+@import UIKit;
 
 @interface UIColor (WTRequestCenter)
 

diff --git a/UIKit+WTRequestCenter/UIDevice+WTRequestCenter.h b/UIKit+WTRequestCenter/UIDevice+WTRequestCenter.h
@@ -7,7 +7,7 @@
 //  site:https://github.com/swtlovewtt/WTRequestCenter
 //  install
 //  git clone https://github.com/swtlovewtt/WTRequestCenter
-#import <UIKit/UIKit.h>
+@import UIKit;
 
 @interface UIDevice (WTRequestCenter)
 

diff --git a/UIKit+WTRequestCenter/UIImage+WTRequestCenter.h b/UIKit+WTRequestCenter/UIImage+WTRequestCenter.h
@@ -1,4 +1,4 @@
-#import <UIKit/UIKit.h>
+@import UIKit;
 
 
 @interface UIImage (WTRequestCenter)

diff --git a/UIKit+WTRequestCenter/UIImage+WTRequestCenter.m b/UIKit+WTRequestCenter/UIImage+WTRequestCenter.m
@@ -4,8 +4,8 @@
 
 
 #import "UIImage+WTRequestCenter.h"
-#import <ImageIO/ImageIO.h>
-
+//#import <ImageIO/ImageIO.h>
+@import ImageIO;
 #if __has_feature(objc_arc)
 #define toCF (__bridge CFTypeRef)
 #define fromCF (__bridge id)

diff --git a/UIKit+WTRequestCenter/UIImageView+WTRequestCenter.h b/UIKit+WTRequestCenter/UIImageView+WTRequestCenter.h
@@ -21,7 +21,7 @@
  
  */
 
-#import <UIKit/UIKit.h>
+@import UIKit;
 #import "WTRequestCenter.h"
 /*
     方便的图片缓存功能

diff --git a/UIKit+WTRequestCenter/UIKit+WTRequestCenter.h b/UIKit+WTRequestCenter/UIKit+WTRequestCenter.h
@@ -23,7 +23,7 @@
  使用注意
  使用gif图的时候需要import一个ImageIO.framework
  */
-#import <UIKit/UIKit.h>
+@import UIKit;
 
 #ifndef WTRequestCenter_UIKit_WTRequestCenter_h
 #define WTRequestCenter_UIKit_WTRequestCenter_h

diff --git a/UIKit+WTRequestCenter/UIScreen+WTRequestCenter.h b/UIKit+WTRequestCenter/UIScreen+WTRequestCenter.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2014年 song. All rights reserved.
 //
 
-#import <UIKit/UIKit.h>
+@import UIKit;
 
 @interface UIScreen (WTRequestCenter)
 //屏幕宽度

diff --git a/UIKit+WTRequestCenter/UIWebView+WTRequestCenter.h b/UIKit+WTRequestCenter/UIWebView+WTRequestCenter.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2014年 song. All rights reserved.
 //
 
-#import <UIKit/UIKit.h>
+@import UIKit;
 #import "WTRequestCenter.h"
 @interface UIWebView (WTRequestCenter)
 

diff --git a/UIKit+WTRequestCenter/WTCycleScrollView.h b/UIKit+WTRequestCenter/WTCycleScrollView.h
@@ -5,7 +5,7 @@
 //  Created by SongWentong on 15/2/3.
 //  Copyright (c) 2015年 Spritekit. All rights reserved.
 //
-#import <UIKit/UIKit.h>
+@import UIKit;
 @class WTCycleScrollView;
 //数据源
 @protocol WTCycleScrollViewDataSource <NSObject>

diff --git a/UIKit+WTRequestCenter/WTDataSaver.h b/UIKit+WTRequestCenter/WTDataSaver.h
@@ -15,7 +15,8 @@
                                         Mike
  */
 #import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
+@import UIKit;
+@import <#module#>
 @interface WTDataSaver : NSObject
 
 #pragma mark - 存数据 Save Data

diff --git a/UIKit+WTRequestCenter/WTImageViewer.h b/UIKit+WTRequestCenter/WTImageViewer.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2014年 song. All rights reserved.
 //
 
-#import <UIKit/UIKit.h>
+@import UIKit;
 @interface WTImageScrollView : UIScrollView
 {
 

diff --git a/UIKit+WTRequestCenter/WTNetworkActivityIndicatorManager.h b/UIKit+WTRequestCenter/WTNetworkActivityIndicatorManager.h
@@ -7,7 +7,7 @@
 
 
 #import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
+@import UIKit;
 
 
 //  网络访问指示器，enable设置为YES后网络访问在状态栏有提示

diff --git a/UIKit+WTRequestCenter/WTNumberLabel.h b/UIKit+WTRequestCenter/WTNumberLabel.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2015年 song. All rights reserved.
 //
 
-#import <UIKit/UIKit.h>
+@import UIKit;
 
 
 @class WTNumberLabel;

diff --git a/UIKit+WTRequestCenter/WTNumberLabel.m b/UIKit+WTRequestCenter/WTNumberLabel.m
@@ -7,7 +7,8 @@
 //
 
 #import "WTNumberLabel.h"
-#import <CoreGraphics/CoreGraphics.h>
+@import CoreGraphics;
+//#import <CoreGraphics/CoreGraphics.h>
 @interface WTNumberLabel()
 {
     NSTimer *_myTimer;

diff --git a/WTNetWork/WTNetWork.h b/WTNetWork/WTNetWork.h
@@ -32,7 +32,7 @@
 #import "WTURLRequestSerialization.h"
 #import "WTNetworkReachabilityManager.h"
 #if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 70000) || (defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 1090)
-
+#import "WTURLSessionManager.h"
 #endif
 
 #endif
diff --git a/WTNetWork/WTRequestCenter.m b/WTNetWork/WTRequestCenter.m
@@ -11,7 +11,7 @@
 #import "WTURLRequestSerialization.h"
 #import "WTNetworkReachabilityManager.h"
 #if TARGET_OS_IPHONE
-#import <UIKit/UIKit.h>
+@import UIKit;
 #endif
 //请求开始的消息
 NSString * const WTNetworkingOperationDidStartNotification = @"WT Networking Operation Did Start Notification";

diff --git a/WTNetWork/WTURLRequestSerialization.m b/WTNetWork/WTURLRequestSerialization.m
@@ -8,7 +8,7 @@
 
 #import "WTURLRequestSerialization.h"
 #if TARGET_OS_IPHONE
-#import <UIKit/UIKit.h>
+@import UIKit;
 #endif
 
 //超时时间

diff --git a/WTNetWork/WTURLSessionManager.h b/WTNetWork/WTURLSessionManager.h
@@ -0,0 +1,19 @@
+//
+//  WTURLSessionManager.h
+//  WTRequestCenter
+//
+//  Created by SongWentong on 8/31/15.
+//  Copyright (c) 2015 song. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface WTURLSessionManager : NSObject
+@property (readonly, nonatomic, strong) NSURLSession *session;
+
+
+-(instancetype)initWithSessionConfiguration:(NSURLSessionConfiguration *)configuration;
+
+- (NSURLSessionDataTask *)dataTaskWithRequest:(NSURLRequest *)request
+                            completionHandler:(void (^)(NSData *data, NSURLResponse *response, NSError *error))completionHandler;
+@end
diff --git a/WTNetWork/WTURLSessionManager.m b/WTNetWork/WTURLSessionManager.m
@@ -0,0 +1,54 @@
+//
+//  WTURLSessionManager.m
+//  WTRequestCenter
+//
+//  Created by SongWentong on 8/31/15.
+//  Copyright (c) 2015 song. All rights reserved.
+//
+
+#import "WTURLSessionManager.h"
+@interface WTURLSessionManager()
+
+@property (readwrite, nonatomic, strong) NSURLSession *session;
+
+@end
+@implementation WTURLSessionManager
+
+static NSOperationQueue *sessionCreationQueue = nil;
++(NSOperationQueue*)sessionCreationQueue{
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        sessionCreationQueue = [NSOperationQueue new];
+        [sessionCreationQueue setSuspended:NO];
+    });
+    return sessionCreationQueue;
+}
+
+
+-(instancetype)initWithSessionConfiguration:(NSURLSessionConfiguration *)configuration {
+    self = [super init];
+    if (self) {
+
+    }
+
+    if (!configuration) {
+        configuration = [NSURLSessionConfiguration defaultSessionConfiguration];
+    }
+    self.session = [NSURLSession sessionWithConfiguration:configuration delegate:nil delegateQueue:sessionCreationQueue];
+
+
+    return self;
+}
+
+- (NSURLSessionDataTask *)dataTaskWithRequest:(NSURLRequest *)request
+                            completionHandler:(void (^)(NSData *data, NSURLResponse *response, NSError *error))completionHandler
+{
+    __block NSURLSessionDataTask *dataTask = nil;
+//    [[WTURLSessionManager sessionCreationQueue] addOperationWithBlock:^{
+        dataTask = [self.session dataTaskWithRequest:request completionHandler:completionHandler];
+//    }];
+
+    return dataTask;
+}
+
+@end
diff --git a/WTRequestCenter.xcodeproj/project.pbxproj b/WTRequestCenter.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		27FB3FCC1B93FB1100F5CC7C /* WTURLSessionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 27FB3FCB1B93FB1100F5CC7C /* WTURLSessionManager.m */; };
 		A3B4A7C2199AF60C00A8BAF0 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = A3B4A7C1199AF60C00A8BAF0 /* [email protected] */; };
 		A3B4A7C9199AF92000A8BAF0 /* ImageIO.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A3B4A7C8199AF92000A8BAF0 /* ImageIO.framework */; };
 		A3B70F591988BDFA002776F4 /* image.jpg in Resources */ = {isa = PBXBuildFile; fileRef = A3B70F581988BDFA002776F4 /* image.jpg */; };
@@ -66,6 +67,8 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		27FB3FCA1B93FB1100F5CC7C /* WTURLSessionManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WTURLSessionManager.h; path = WTNetWork/WTURLSessionManager.h; sourceTree = SOURCE_ROOT; };
+		27FB3FCB1B93FB1100F5CC7C /* WTURLSessionManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WTURLSessionManager.m; path = WTNetWork/WTURLSessionManager.m; sourceTree = SOURCE_ROOT; };
 		A3B4A7C1199AF60C00A8BAF0 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.gif; name = "[email protected]"; path = "WTRequestCenter/[email protected]"; sourceTree = "<group>"; };
 		A3B4A7C8199AF92000A8BAF0 /* ImageIO.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ImageIO.framework; path = System/Library/Frameworks/ImageIO.framework; sourceTree = SDKROOT; };
 		A3B70F581988BDFA002776F4 /* image.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = image.jpg; path = WTRequestCenter/image.jpg; sourceTree = "<group>"; };
@@ -320,6 +323,8 @@
 				E162A4741A6A167300CBC2C5 /* WTURLRequestSerialization.m */,
 				E1B954C31B60F2E700F206C5 /* WTNetworkReachabilityManager.h */,
 				E1B954C41B60F2E700F206C5 /* WTNetworkReachabilityManager.m */,
+				27FB3FCA1B93FB1100F5CC7C /* WTURLSessionManager.h */,
+				27FB3FCB1B93FB1100F5CC7C /* WTURLSessionManager.m */,
 			);
 			name = WTRequestCenter;
 			path = WTRequestCenter/WTRequestCenter;
@@ -440,6 +445,7 @@
 				E162A49F1A6A168900CBC2C5 /* WTImageViewer.m in Sources */,
 				E161B2881A8DA37A00A69C09 /* SingleRequestViewController.m in Sources */,
 				E19F0C2A1A0201460049C1A2 /* RulerView.m in Sources */,
+				27FB3FCC1B93FB1100F5CC7C /* WTURLSessionManager.m in Sources */,
 				E181F7761A81138700832D0B /* WTNumberLabel.m in Sources */,
 				E162A4991A6A168900CBC2C5 /* UIDevice+WTRequestCenter.m in Sources */,
 				E162A4A01A6A168900CBC2C5 /* WTNetworkActivityIndicatorManager.m in Sources */,

diff --git a/WTRequestCenter/AppDelegate.h b/WTRequestCenter/AppDelegate.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2014年 song. All rights reserved.
 //
 
-#import <UIKit/UIKit.h>
+@import UIKit;
 
 @interface AppDelegate : UIResponder <UIApplicationDelegate>
 

diff --git a/WTRequestCenter/RulerView.h b/WTRequestCenter/RulerView.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2014年 song. All rights reserved.
 //
 
-#import <UIKit/UIKit.h>
+@import UIKit;
 
 @interface RulerView : UIView
 {

diff --git a/WTRequestCenter/SingleRequestViewController.h b/WTRequestCenter/SingleRequestViewController.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2015年 song. All rights reserved.
 //
 
-#import <UIKit/UIKit.h>
+@import UIKit;
 
 @interface SingleRequestViewController : UIViewController
 

diff --git a/WTRequestCenter/ViewController.h b/WTRequestCenter/ViewController.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2014年 song. All rights reserved.
 //
 
-#import <UIKit/UIKit.h>
+@import UIKit;
 @interface ViewController : UIViewController <UITableViewDataSource,UITableViewDelegate,UIViewControllerTransitioningDelegate,UIViewControllerAnimatedTransitioning>
 {
     UITableView *wtTableView;

diff --git a/WTRequestCenter/ViewController.m b/WTRequestCenter/ViewController.m
@@ -47,7 +47,14 @@ - (void)viewDidLoad
 
 
 
-
+    /*
+    WTURLSessionManager *manager = [[WTURLSessionManager alloc] initWithSessionConfiguration:nil];
+    NSURLRequest *request = [[WTURLRequestSerialization sharedRequestSerialization] requestWithMethod:@"GET" URLString:@"http://www.baidu.com" parameters:nil error:nil];
+    [[manager dataTaskWithRequest:request completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
+        NSLog(@"finish");
+    }] resume];
+    */
+
     _relerView = [[RulerView alloc] initWithFrame:self.view.bounds];
     _relerView.userInteractionEnabled = NO;
     [self.view addSubview:_relerView];

diff --git a/WTRequestCenter/WTImageViewController.h b/WTRequestCenter/WTImageViewController.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2014年 song. All rights reserved.
 //
 
-#import <UIKit/UIKit.h>
+@import UIKit;
 
 @interface WTImageViewController : UIViewController 
 {

diff --git a/WTRequestCenter/WTRequestCenter-Prefix.pch b/WTRequestCenter/WTRequestCenter-Prefix.pch
@@ -11,6 +11,6 @@
 #endif
 
 #ifdef __OBJC__
-//    #import <UIKit/UIKit.h>
+//    @import UIKit;
 //    #import <Foundation/Foundation.h>
 #endif
diff --git a/WTRequestCenter/WTRequestViewController.h b/WTRequestCenter/WTRequestViewController.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2014年 song. All rights reserved.
 //
 
-#import <UIKit/UIKit.h>
+@import UIKit;
 
 @interface WTRequestViewController : UIViewController
 @property (nonatomic,copy) NSIndexPath *indexPath;

diff --git a/WTRequestCenter/WTWebViewController.h b/WTRequestCenter/WTWebViewController.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2014年 song. All rights reserved.
 //
 
-#import <UIKit/UIKit.h>
+@import UIKit;
 
 @interface WTWebViewController : UIViewController
 

diff --git a/WTRequestCenter/main.m b/WTRequestCenter/main.m
@@ -6,7 +6,7 @@
 //  Copyright (c) 2014年 song. All rights reserved.
 //
 
-#import <UIKit/UIKit.h>
+@import UIKit;
 
 #import "AppDelegate.h"
 

diff --git a/WTRequestCenterTests/UIImageViewCacheTests.m b/WTRequestCenterTests/UIImageViewCacheTests.m
@@ -6,7 +6,7 @@
 //  Copyright (c) 2014年 song. All rights reserved.
 //
 
-#import <UIKit/UIKit.h>
+@import UIKit;
 #import <XCTest/XCTest.h>
 #import "WTRequestCenter.h"
 #import "UIKit+WTRequestCenter.h"

diff --git a/WTRequestCenterTests/WTRequestCenterTests.m b/WTRequestCenterTests/WTRequestCenterTests.m
@@ -7,7 +7,7 @@
 //
 
 #import <XCTest/XCTest.h>
-#import <UIKit/UIKit.h>
+@import UIKit;
 @interface WTRequestCenterTests : XCTestCase
 {
     UIApplication *app;
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,7 +20,7 @@ @@
      */
-    #import <UIKit/UIKit.h>
+    @import UIKit;
     @class WTURLRequestOperation;
@@ Expand Down @@