use define switch

Author: longbai

QiniuSDK/Http/QNSessionManager.h

@@ -1,11 +1,7 @@
 #import <Foundation/Foundation.h>
 #import "QNHttpDelegate.h"
 
-@class QNResponseInfo;
-
-typedef void (^QNInternalProgressBlock)(long long totalBytesWritten, long long totalBytesExpectedToWrite);
-typedef void (^QNCompleteBlock)(QNResponseInfo *info, NSDictionary *resp);
-typedef BOOL (^QNCancelBlock)(void);
+#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)
 
 @interface QNSessionManager : NSObject <QNHttpDelegate>
 
@@ -29,3 +25,5 @@ typedef BOOL (^QNCancelBlock)(void);
       withCancelBlock:(QNCancelBlock)cancelBlock;
 
 @end
+
+#endif

QiniuSDK/Http/QNSessionManager.m

@@ -14,6 +14,8 @@
 #import "QNResponseInfo.h"
 #import "QNDns.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)
+
 @interface QNSessionManager ()
 @property (nonatomic) AFHTTPSessionManager *httpManager;
 @end
@@ -135,3 +137,5 @@ - (void)         post:(NSString *)url
 }
 
 @end
+
+#endif

QiniuSDK/Storage/QNUploadManager.h

@@ -64,6 +64,20 @@ typedef NSString *(^QNRecorderKeyGenerator)(NSString *uploadKey, NSString *fileP
 - (instancetype)initWithRecorder:(id <QNRecorderDelegate> )recorder
             recorderKeyGenerator:(QNRecorderKeyGenerator)recorderKeyGenerator;
 
+/**
+ *    使用持久化记录接口以及持久化key生成函数的构造方法，默认情况下使用上传存储的key, 如果key为nil或者有特殊字符比如/，建议使用自己的生成函数
+ *
+ *    @param recorder             持久化记录接口实现
+ *    @param recorderKeyGenerator 持久化记录key生成函数
+ *    @param proxyDict            代理，NSURLSession 的代理，使用参考Apple的文档
+ *
+ *    @return 上传管理类实例
+ */
+- (instancetype)initWithRecorder:(id <QNRecorderDelegate> )recorder
+            recorderKeyGenerator:(QNRecorderKeyGenerator)recorderKeyGenerator
+                           proxy:(NSDictionary *)proxyDict;
+
+
 /**
  *    方便使用的单例方法
  *

QiniuSDK/Storage/QNUploadManager.m

@@ -10,6 +10,7 @@
 
 #import "QNConfig.h"
 #import "QNHttpManager.h"
+#import "QNSessionManager.h"
 #import "QNResponseInfo.h"
 #import "QNCrc32.h"
 #import "QNUploadManager.h"
@@ -19,7 +20,7 @@
 #import "QNAsyncRun.h"
 
 @interface QNUploadManager ()
-@property (nonatomic) QNHttpManager *httpManager;
+@property (nonatomic) id <QNHttpDelegate> httpManager;
 @property (nonatomic) id <QNRecorderDelegate> recorder;
 @property (nonatomic, strong) QNRecorderKeyGenerator recorderKeyGen;
 @end
@@ -36,8 +37,18 @@ - (instancetype)initWithRecorder:(id <QNRecorderDelegate> )recorder {
 
 - (instancetype)initWithRecorder:(id <QNRecorderDelegate> )recorder
             recorderKeyGenerator:(QNRecorderKeyGenerator)recorderKeyGenerator {
+	return [self initWithRecorder:recorder recorderKeyGenerator:recorderKeyGenerator proxy:nil];
+}
+
+- (instancetype)initWithRecorder:(id <QNRecorderDelegate> )recorder
+            recorderKeyGenerator:(QNRecorderKeyGenerator)recorderKeyGenerator
+                           proxy:(NSDictionary *)proxyDict {
 	if (self = [super init]) {
+#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)
+		_httpManager = [[QNSessionManager alloc] initWithProxy:proxyDict];
+#else
 		_httpManager = [[QNHttpManager alloc] init];
+#endif
 		_recorder = recorder;
 		_recorderKeyGen = recorderKeyGenerator;
 	}