Merge pull request #85 from longbai/phasset

longbai · longbai · commit be17d9b849a0 · 2015-10-28T20:55:42.000+08:00
phasset
diff --git a/QiniuSDK.xcodeproj/project.pbxproj b/QiniuSDK.xcodeproj/project.pbxproj
@@ -10,6 +10,9 @@
 		22019FE04FB937FAB13FDFFD /* libPods-QiniuSDK iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 389DF9365782A14F70933C3E /* libPods-QiniuSDK iOS.a */; };
 		5F0FFE6A946BAEFF741BC23E /* libPods-QiniuSDK Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8924D07F6E137C6379C173D4 /* libPods-QiniuSDK Mac.a */; };
 		7277FD17389341BDCAD29727 /* libPods-QiniuSDK iOSTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D41D651AEAB89853C760E3A /* libPods-QiniuSDK iOSTests.a */; };
+		93CEF47E1BDE11FF00750FE8 /* QNPHAssetFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 93CEF47C1BDE11FF00750FE8 /* QNPHAssetFile.h */; settings = {ASSET_TAGS = (); }; };
+		93CEF47F1BDE11FF00750FE8 /* QNPHAssetFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 93CEF47D1BDE11FF00750FE8 /* QNPHAssetFile.m */; settings = {ASSET_TAGS = (); }; };
+		93CEF4801BDE11FF00750FE8 /* QNPHAssetFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 93CEF47D1BDE11FF00750FE8 /* QNPHAssetFile.m */; settings = {ASSET_TAGS = (); }; };
 		DF0A03231B3BABEC00E3778C /* libQiniuSDK Mac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DF2CDDFF19DAC05500CE01FB /* libQiniuSDK Mac.dylib */; };
 		DF0A03241B3BAC3900E3778C /* QNFormUploadTest.m in Sources */ = {isa = PBXBuildFile; fileRef = DF3C504619DD7BA6000F548F /* QNFormUploadTest.m */; };
 		DF0A03251B3BAC5700E3778C /* libQiniuSDK iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DF2CDE1A19DAC08400CE01FB /* libQiniuSDK iOS.a */; };
@@ -126,6 +129,8 @@
 		75127E9F1F2BA68C9D5B463F /* Pods-QiniuSDK iOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-QiniuSDK iOS.release.xcconfig"; path = "Pods/Target Support Files/Pods-QiniuSDK iOS/Pods-QiniuSDK iOS.release.xcconfig"; sourceTree = "<group>"; };
 		7EFD2A2AD31548D6BD3FD007 /* Pods-QiniuSDK MacTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-QiniuSDK MacTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-QiniuSDK MacTests/Pods-QiniuSDK MacTests.release.xcconfig"; sourceTree = "<group>"; };
 		8924D07F6E137C6379C173D4 /* libPods-QiniuSDK Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-QiniuSDK Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		93CEF47C1BDE11FF00750FE8 /* QNPHAssetFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QNPHAssetFile.h; sourceTree = "<group>"; };
+		93CEF47D1BDE11FF00750FE8 /* QNPHAssetFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QNPHAssetFile.m; sourceTree = "<group>"; };
 		948F5D59B2BD6CACC644FA14 /* Pods-QiniuSDK MacTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-QiniuSDK MacTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-QiniuSDK MacTests/Pods-QiniuSDK MacTests.debug.xcconfig"; sourceTree = "<group>"; };
 		9A0CE9E3B1F13E790C38CB75 /* Pods-QiniuSDK iOSTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-QiniuSDK iOSTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-QiniuSDK iOSTests/Pods-QiniuSDK iOSTests.release.xcconfig"; sourceTree = "<group>"; };
 		C24CE1990894CD3CA9A17042 /* Pods-QiniuSDK iOSTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-QiniuSDK iOSTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-QiniuSDK iOSTests/Pods-QiniuSDK iOSTests.debug.xcconfig"; sourceTree = "<group>"; };
@@ -340,6 +345,8 @@
 				DFF126F01B639F3B0005C39C /* QNFile.m */,
 				DFF126F41B63ABED0005C39C /* QNALAssetFile.h */,
 				DFF126F51B63ABED0005C39C /* QNALAssetFile.m */,
+				93CEF47C1BDE11FF00750FE8 /* QNPHAssetFile.h */,
+				93CEF47D1BDE11FF00750FE8 /* QNPHAssetFile.m */,
 				DFBF636D1BCCE28200A771D8 /* QNSystem.m */,
 				DFBF63701BCCE2A600A771D8 /* QNSystem.h */,
 			);
@@ -416,6 +423,7 @@
 				DF482FD81B0DA8A2000DAD98 /* QNConfiguration.h in Headers */,
 				DF609A051A58E39D00AC7297 /* QNFormUpload.h in Headers */,
 				DFF525371A626A3700D02BA1 /* QNHttpDelegate.h in Headers */,
+				93CEF47E1BDE11FF00750FE8 /* QNPHAssetFile.h in Headers */,
 				DF2CDE6019DAC6A400CE01FB /* QNCrc32.h in Headers */,
 				DFF126F11B639F3B0005C39C /* QNFile.h in Headers */,
 				DFA9B63B19DF904000A15FD1 /* QNEtag.h in Headers */,
@@ -706,6 +714,7 @@
 				DF609A061A58E39D00AC7297 /* QNFormUpload.m in Sources */,
 				DF293C9F19DBC2AE00799011 /* QNUserAgent.m in Sources */,
 				DFA9B65919E0B53700A15FD1 /* QNFileRecorder.m in Sources */,
+				93CEF47F1BDE11FF00750FE8 /* QNPHAssetFile.m in Sources */,
 				DF2CDE6119DAC6A400CE01FB /* QNCrc32.m in Sources */,
 				DF293CA619DC05B800799011 /* QNHttpManager.m in Sources */,
 				DF293CAB19DC0E5300799011 /* QNResumeUpload.m in Sources */,
@@ -751,6 +760,7 @@
 				DF437CD51B2426270099587B /* GTM_Base64.m in Sources */,
 				DF482FDA1B0DA8A2000DAD98 /* QNConfiguration.m in Sources */,
 				DF609A081A58E39D00AC7297 /* QNFormUpload.m in Sources */,
+				93CEF4801BDE11FF00750FE8 /* QNPHAssetFile.m in Sources */,
 				DF293CA019DBC2AE00799011 /* QNUserAgent.m in Sources */,
 				DFA9B65A19E0B53700A15FD1 /* QNFileRecorder.m in Sources */,
 				DF2CDE6219DAC6A400CE01FB /* QNCrc32.m in Sources */,
@@ -819,7 +829,8 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
@@ -854,7 +865,8 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 			};
diff --git a/QiniuSDK/Common/QNPHAssetFile.h b/QiniuSDK/Common/QNPHAssetFile.h
@@ -0,0 +1,27 @@
+//
+//  QNPHAssetFile.h
+//  Pods
+//
+//  Created by   何舒 on 15/10/21.
+//
+//
+
+#import <Foundation/Foundation.h>
+
+#import "QNFileDelegate.h"
+
+#if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 80000)
+@class PHAsset;
+@interface QNPHAssetFile : NSObject<QNFileDelegate>
+/**
+ *    打开指定文件
+ *
+ *    @param path      文件路径
+ *    @param error     输出的错误信息
+ *
+ *    @return 实例
+ */
+- (instancetype)init:(PHAsset *)phAsset
+               error:(NSError *__autoreleasing *)error;
+@end
+#endif
diff --git a/QiniuSDK/Common/QNPHAssetFile.m b/QiniuSDK/Common/QNPHAssetFile.m
@@ -0,0 +1,180 @@
+//
+//  QNPHAssetFile.m
+//  Pods
+//
+//  Created by   何舒 on 15/10/21.
+//
+//
+
+#import "QNPHAssetFile.h"
+
+#if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 80000) 
+#import <Photos/Photos.h>
+
+enum {
+    kAMASSETMETADATA_PENDINGREADS = 1,
+    kAMASSETMETADATA_ALLFINISHED = 0
+};
+
+#import "QNResponseInfo.h"
+
+@interface QNPHAssetFile ()
+{
+    BOOL _hasGotInfo;
+}
+
+@property (nonatomic) PHAsset * phAsset;
+
+@property (readonly) int64_t fileSize;
+
+@property (readonly) int64_t fileModifyTime;
+
+@property (nonatomic, strong) NSData *assetData;
+
+@property (nonatomic, strong) NSURL *assetURL;
+
+@end
+
+@implementation QNPHAssetFile
+
+- (instancetype)init:(PHAsset *)phAsset error:(NSError *__autoreleasing *)error
+{
+    if (self = [super init]) {
+        NSDate *createTime = phAsset.creationDate;
+        int64_t t = 0;
+        if (createTime != nil) {
+            t = [createTime timeIntervalSince1970];
+        }
+        _fileModifyTime = t;
+        _phAsset = phAsset;
+        [self getInfo];
+        
+    }
+    return self;
+}
+
+- (NSData *)read:(long)offset size:(long)size
+{
+    NSRange subRange = NSMakeRange(offset, size);
+    if (!self.assetData) {
+        self.assetData = [self fetchDataFromAsset:self.phAsset];
+    }
+    NSData *subData = [self.assetData subdataWithRange:subRange];
+    
+    return subData;
+}
+
+- (NSData *)readAll {
+    return [self read:0 size:(long)_fileSize];
+}
+
+- (void)close {
+}
+
+-(NSString *)path {
+    return self.assetURL.path;
+}
+
+- (int64_t)modifyTime {
+    return _fileModifyTime;
+}
+
+- (int64_t)size {
+    return _fileSize;
+}
+
+- (void)getInfo
+{
+    if (!_hasGotInfo) {
+        _hasGotInfo = YES;
+        
+        if (PHAssetMediaTypeImage == self.phAsset.mediaType) {
+            PHImageRequestOptions *request = [PHImageRequestOptions new];
+            request.version = PHImageRequestOptionsVersionCurrent;
+            request.deliveryMode = PHImageRequestOptionsDeliveryModeHighQualityFormat;
+            request.resizeMode = PHImageRequestOptionsResizeModeNone;
+            request.synchronous = YES;
+            
+            [[PHImageManager defaultManager] requestImageDataForAsset:self.phAsset
+                                                              options:request
+                                                        resultHandler:^(NSData *imageData, NSString *dataUTI, UIImageOrientation orientation, NSDictionary *info) {
+                                                            _fileSize = imageData.length;
+                                                            _assetURL = [NSURL URLWithString:self.phAsset.localIdentifier];
+                                                        }
+             ];
+        }
+        else if (PHAssetMediaTypeVideo == self.phAsset.mediaType) {
+            PHVideoRequestOptions *request = [PHVideoRequestOptions new];
+            request.deliveryMode = PHVideoRequestOptionsDeliveryModeAutomatic;
+            request.version = PHVideoRequestOptionsVersionCurrent;
+            
+            NSConditionLock* assetReadLock = [[NSConditionLock alloc] initWithCondition:kAMASSETMETADATA_PENDINGREADS];
+            [[PHImageManager defaultManager] requestPlayerItemForVideo:self.phAsset options:request resultHandler:^(AVPlayerItem *playerItem, NSDictionary *info) {
+                AVURLAsset *urlAsset = (AVURLAsset *)playerItem.asset;
+                NSNumber *fileSize = nil;
+                [urlAsset.URL getResourceValue:&fileSize forKey:NSURLFileSizeKey error:nil];
+                _fileSize = [fileSize unsignedLongLongValue];
+                _assetURL = urlAsset.URL;
+                
+                [assetReadLock lock];
+                [assetReadLock unlockWithCondition:kAMASSETMETADATA_ALLFINISHED];
+            }];
+            [assetReadLock lockWhenCondition:kAMASSETMETADATA_ALLFINISHED];
+            [assetReadLock unlock];
+            assetReadLock = nil;
+        }
+    }
+    
+}
+
+- (NSData *)fetchDataFromAsset:(PHAsset *)asset
+{
+    __block NSData *tmpData = [NSData data];
+    
+    // Image
+    if (asset.mediaType == PHAssetMediaTypeImage) {
+        PHImageRequestOptions *request = [PHImageRequestOptions new];
+        request.version = PHImageRequestOptionsVersionCurrent;
+        request.deliveryMode = PHImageRequestOptionsDeliveryModeHighQualityFormat;
+        request.resizeMode = PHImageRequestOptionsResizeModeNone;
+        request.synchronous = YES;
+        
+        [[PHImageManager defaultManager] requestImageDataForAsset:asset
+                                                          options:request
+                                                    resultHandler:
+         ^(NSData *imageData, NSString *dataUTI, UIImageOrientation orientation, NSDictionary *info) {
+             tmpData = [NSData dataWithData:imageData];
+         }];
+    }
+    // Video
+    else  {
+        
+        PHVideoRequestOptions *request = [PHVideoRequestOptions new];
+        request.deliveryMode = PHVideoRequestOptionsDeliveryModeAutomatic;
+        request.version = PHVideoRequestOptionsVersionCurrent;
+        
+        NSConditionLock *assetReadLock = [[NSConditionLock alloc] initWithCondition:kAMASSETMETADATA_PENDINGREADS];
+        
+        
+        [[PHImageManager defaultManager] requestAVAssetForVideo:asset
+                                                        options:request
+                                                  resultHandler:
+         ^(AVAsset * _Nullable asset, AVAudioMix * _Nullable audioMix, NSDictionary * _Nullable info) {
+             AVURLAsset *urlAsset = (AVURLAsset *)asset;
+             NSData *videoData = [NSData dataWithContentsOfURL:urlAsset.URL];
+             tmpData = [NSData dataWithData:videoData];
+             
+             [assetReadLock lock];
+             [assetReadLock unlockWithCondition:kAMASSETMETADATA_ALLFINISHED];
+         }];
+        
+        [assetReadLock lockWhenCondition:kAMASSETMETADATA_ALLFINISHED];
+        [assetReadLock unlock];
+        assetReadLock = nil;
+    }
+    
+    return tmpData;
+}
+
+@end
+#endif
diff --git a/QiniuSDK/Storage/QNUploadManager.h b/QiniuSDK/Storage/QNUploadManager.h
@@ -10,10 +10,14 @@
 
 #import "QNRecorderDelegate.h"
 
+
 @class QNResponseInfo;
 @class QNUploadOption;
 @class QNConfiguration;
 @class ALAsset;
+@class PHAsset;
+
+
 /**
  *    上传完成后的回调函数
  *
@@ -119,4 +123,19 @@ typedef void (^QNUpCompletionHandler)(QNResponseInfo *info, NSString *key, NSDic
            complete:(QNUpCompletionHandler)completionHandler
              option:(QNUploadOption *)option;
 
+/**
+ *    上传PHAsset文件(IOS8 andLater)
+ *
+ *    @param asset             PHAsset文件
+ *    @param key               上传到云存储的key，为nil时表示是由七牛生成
+ *    @param token             上传需要的token, 由服务器生成
+ *    @param completionHandler 上传完成后的回调函数
+ *    @param option            上传时传入的可选参数
+ */
+- (void) putPHAsset:(PHAsset *)asset
+                key:(NSString *)key
+              token:(NSString *)token
+           complete:(QNUpCompletionHandler)completionHandler
+             option:(QNUploadOption *)option;
+
 @end
diff --git a/QiniuSDK/Storage/QNUploadManager.m b/QiniuSDK/Storage/QNUploadManager.m
@@ -13,10 +13,17 @@
 #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
 
+
 #import "QNConfiguration.h"
 #import "QNHttpManager.h"
 #import "QNSessionManager.h"
@@ -63,7 +70,7 @@ - (instancetype)initWithConfiguration:(QNConfiguration *)config {
 		}
 		_config = config;
 #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)
-		if (hasNSURLSession()) {
+        if (hasNSURLSession()) {
 			_httpManager = [[QNSessionManager alloc] initWithProxy:config.proxy timeout:config.timeoutInterval urlConverter:config.converter dns:config.dns];
 		}
 		else {
@@ -255,4 +262,29 @@ - (void) putALAsset:(ALAsset *)asset
 #endif
 }
 
+- (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;
+    }
+    
+    @autoreleasepool {
+        NSError *error = nil;
+        __block QNPHAssetFile *file = [[QNPHAssetFile alloc] init:asset error:&error];
+        if (error) {
+            QNAsyncRunInMain( ^{
+                QNResponseInfo *info = [QNResponseInfo responseInfoWithFileError:error];
+                completionHandler(info, key, nil);
+            });
+            return;
+        }
+        [self putFileInternal:file key:key token:token complete:completionHandler option:option];
+    }
+#endif
+}
+
 @end
