Merge pull request #86 from longbai/phasset

fixed avfoundation ref

Author: longbai

CHANGELOG.md

@@ -1,11 +1,12 @@
 #Changelog
 
-## 7.0.13 (2015-10-20)
+## 7.0.13 (2015-10-28)
 
 ### 增加
 * 支持 https 
 * 禁止0字节文件上传
 * ua加入idfv 便于网络诊断
+* 支持PHAsset
 
 ### 修正
 * QNHttpDelegate.h 头文件名大小写修正

QiniuSDK/Common/QNPHAssetFile.m

@@ -10,7 +10,7 @@
 
 #if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 80000) 
 #import <Photos/Photos.h>
-
+#import <AVFoundation/AVFoundation.h>
 enum {
     kAMASSETMETADATA_PENDINGREADS = 1,
     kAMASSETMETADATA_ALLFINISHED = 0
@@ -159,7 +159,7 @@ - (NSData *)fetchDataFromAsset:(PHAsset *)asset
         [[PHImageManager defaultManager] requestAVAssetForVideo:asset
                                                         options:request
                                                   resultHandler:
-         ^(AVAsset * _Nullable asset, AVAudioMix * _Nullable audioMix, NSDictionary * _Nullable info) {
+         ^(AVAsset* asset, AVAudioMix* audioMix, NSDictionary* info) {
              AVURLAsset *urlAsset = (AVURLAsset *)asset;
              NSData *videoData = [NSData dataWithContentsOfURL:urlAsset.URL];
              tmpData = [NSData dataWithData:videoData];