define refactor

Author: longbai

QiniuSDK/Common/QNPHAssetFile.h

@@ -10,7 +10,7 @@
 
 #import "QNFileDelegate.h"
 
-#if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 80000) || (defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 1090)
+#if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 80000)
 @class PHAsset;
 @interface QNPHAssetFile : NSObject<QNFileDelegate>
 /**

QiniuSDK/Common/QNPHAssetFile.m

@@ -8,7 +8,7 @@
 
 #import "QNPHAssetFile.h"
 
-#if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 80000) || (defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 1090)
+#if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 80000) 
 #import <Photos/Photos.h>
 
 enum {
@@ -176,6 +176,5 @@ - (NSData *)fetchDataFromAsset:(PHAsset *)asset
     return tmpData;
 }
 
-
 @end
 #endif

QiniuSDK/Storage/QNUploadManager.h

@@ -10,15 +10,12 @@
 
 #import "QNRecorderDelegate.h"
 
-#if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 80000) || (defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 1090)
-#import <Photos/Photos.h>
-#endif
 
 @class QNResponseInfo;
 @class QNUploadOption;
 @class QNConfiguration;
 @class ALAsset;
-
+@class PHAsset;
 
 
 /**
@@ -135,14 +132,10 @@ typedef void (^QNUpCompletionHandler)(QNResponseInfo *info, NSString *key, NSDic
  *    @param completionHandler 上传完成后的回调函数
  *    @param option            上传时传入的可选参数
  */
-#if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 80000) || (defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 1090)
 - (void) putPHAsset:(PHAsset *)asset
                 key:(NSString *)key
               token:(NSString *)token
            complete:(QNUpCompletionHandler)completionHandler
              option:(QNUploadOption *)option;
 
-
-#endif
-
 @end

QiniuSDK/Storage/QNUploadManager.m

@@ -13,13 +13,16 @@
 #import <UIKit/UIKit.h>
 #import "QNALAssetFile.h"
 #import <AssetsLibrary/AssetsLibrary.h>
+
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 80000
+#import "QNPHAssetFile.h"
+#import <Photos/Photos.h>
+#endif
+
 #else
 #import <CoreServices/CoreServices.h>
 #endif
 
-#if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 80000) || (defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 1090)
-#import "QNPHAssetFile.h"
-#endif
 
 #import "QNConfiguration.h"
 #import "QNHttpManager.h"
@@ -259,12 +262,12 @@ - (void) putALAsset:(ALAsset *)asset
 #endif
 }
 
-#if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 80000) || (defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 1090)
 - (void) putPHAsset:(PHAsset *)asset
                 key:(NSString *)key
               token:(NSString *)token
            complete:(QNUpCompletionHandler)completionHandler
              option:(QNUploadOption *)option {
+#if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 80000)
     if ([QNUploadManager checkAndNotifyError:key token:token input:asset complete:completionHandler]) {
         return;
     }
@@ -281,7 +284,7 @@ - (void) putPHAsset:(PHAsset *)asset
         }
         [self putFileInternal:file key:key token:token complete:completionHandler option:option];
     }
-}
 #endif
+}
 
 @end