optimize get image from PHAssert & fix read PHAssert data exception

Author: YangSen-qn

QiniuDemo/Podfile

@@ -1,7 +1,7 @@
 source 'https://github.com/CocoaPods/Specs.git'
 
 target "QiniuDemo" do
-  platform :ios, "7.0"
+  platform :ios, "10.0"
 
 #  pod 'Qiniu', '~> 8.1.1'
   pod 'Qiniu',:path => '../'

QiniuDemo/QiniuDemo.xcodeproj/project.pbxproj

@@ -553,6 +553,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.qiniu.QiniuDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				STRIP_SWIFT_SYMBOLS = YES;
 				SUPPORTS_MACCATALYST = YES;
 			};
 			name = Debug;
@@ -569,6 +570,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.qiniu.QiniuDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				STRIP_SWIFT_SYMBOLS = YES;
 				SUPPORTS_MACCATALYST = YES;
 			};
 			name = Release;

QiniuDemo/QiniuDemo/ViewController.m

@@ -124,27 +124,27 @@ - (void)uploadImageToQNFilePath:(NSString *)filePath {
 //    }
 //                option:uploadOption];
 
-    long long fileSize = [[[NSFileManager defaultManager] attributesOfItemAtPath:filePath error:nil] fileSize];
-    NSInputStream *stream = [NSInputStream inputStreamWithFileAtPath:filePath];
-    [upManager putInputStream:stream sourceId:filePath.lastPathComponent size:fileSize fileName:filePath.lastPathComponent key:key token:self.token complete:^(QNResponseInfo *info, NSString *key, NSDictionary *resp) {
-        NSLog(@"info ===== %@", info);
-        NSLog(@"resp ===== %@", resp);
-
-        [weakSelf changeUploadState:UploadStatePrepare];
-        [weakSelf alertMessage:info.message];
-    } option:uploadOption];
-    
-//    NSURL *url = [NSURL fileURLWithPath:filePath];
-//    PHFetchResult *fetchResult = [PHAsset fetchAssetsWithALAssetURLs:@[url] options:nil];
-//    PHAsset *asset = [self getPHAssert];
-//    [upManager putPHAsset:asset key:key token:self.token complete:^(QNResponseInfo *info, NSString *key, NSDictionary *resp) {
+//    long long fileSize = [[[NSFileManager defaultManager] attributesOfItemAtPath:filePath error:nil] fileSize];
+//    NSInputStream *stream = [NSInputStream inputStreamWithFileAtPath:filePath];
+//    [upManager putInputStream:stream sourceId:filePath.lastPathComponent size:fileSize fileName:filePath.lastPathComponent key:key token:self.token complete:^(QNResponseInfo *info, NSString *key, NSDictionary *resp) {
 //        NSLog(@"info ===== %@", info);
 //        NSLog(@"resp ===== %@", resp);
 //
 //        [weakSelf changeUploadState:UploadStatePrepare];
 //        [weakSelf alertMessage:info.message];
-//    }
-//                option:uploadOption];
+//    } option:uploadOption];
+    
+    NSURL *url = [NSURL fileURLWithPath:filePath];
+    PHFetchResult *fetchResult = [PHAsset fetchAssetsWithALAssetURLs:@[url] options:nil];
+    PHAsset *asset = [self getPHAssert];
+    [upManager putPHAsset:asset key:key token:self.token complete:^(QNResponseInfo *info, NSString *key, NSDictionary *resp) {
+        NSLog(@"info ===== %@", info);
+        NSLog(@"resp ===== %@", resp);
+
+        [weakSelf changeUploadState:UploadStatePrepare];
+        [weakSelf alertMessage:info.message];
+    }
+                option:uploadOption];
 }
 
 - (PHAsset *)getPHAssert {

QiniuSDK/Utils/QNPHAssetFile.m

@@ -89,11 +89,14 @@ - (NSData *)read:(long)offset
     NSData *data = nil;
     @try {
         [_lock lock];
-        if (_assetData != nil) {
-            data = [_assetData subdataWithRange:NSMakeRange(offset, (unsigned int)size)];
-        } else {
+        if (_assetData != nil && offset < _assetData.length) {
+            NSInteger realSize = MIN(size, _assetData.length - offset);
+            data = [_assetData subdataWithRange:NSMakeRange(offset, realSize)];
+        } else if (_file != nil && offset < _fileSize) {
             [_file seekToFileOffset:offset];
             data = [_file readDataOfLength:size];
+        } else {
+            data = [NSData data];
         }
     } @catch (NSException *exception) {
         *error = [NSError errorWithDomain:NSCocoaErrorDomain code:kQNFileError userInfo:@{NSLocalizedDescriptionKey : exception.reason}];
@@ -157,11 +160,30 @@ - (void)getImageInfo {
     options.networkAccessAllowed = NO;
     options.synchronous = YES;
 
-    [[PHImageManager defaultManager] requestImageDataForAsset:self.phAsset options:options resultHandler:^(NSData *imageData, NSString *dataUTI, UIImageOrientation orientation, NSDictionary *info) {
-        self.assetData = imageData;
-        self.fileSize = imageData.length;
-        self.hasRealFilePath = NO;
-    }];
+#if TARGET_OS_MACCATALYST
+    if (@available(macOS 10.15, *)) {
+        [[PHImageManager defaultManager] requestImageDataAndOrientationForAsset:self.phAsset options:options resultHandler:^(NSData *imageData, NSString *dataUTI, CGImagePropertyOrientation orientation, NSDictionary *info) {
+            self.assetData = imageData;
+            self.fileSize = imageData.length;
+            self.hasRealFilePath = NO;
+        }];
+    }
+#else
+    if (@available(iOS 13, *)) {
+        [[PHImageManager defaultManager] requestImageDataAndOrientationForAsset:self.phAsset options:options resultHandler:^(NSData *imageData, NSString *dataUTI, CGImagePropertyOrientation orientation, NSDictionary *info) {
+            self.assetData = imageData;
+            self.fileSize = imageData.length;
+            self.hasRealFilePath = NO;
+        }];
+    } else {
+        [[PHImageManager defaultManager] requestImageDataForAsset:self.phAsset options:options resultHandler:^(NSData *imageData, NSString *dataUTI, UIImageOrientation orientation, NSDictionary *info) {
+            self.assetData = imageData;
+            self.fileSize = imageData.length;
+            self.hasRealFilePath = NO;
+        }];
+    }
+#endif
+    
 }
 
 - (void)getVideoInfo {

QiniuSDK/Utils/QNPHAssetResource.m

@@ -62,11 +62,16 @@ - (NSData *)read:(long)offset
     NSData *data = nil;
     @try {
         [_lock lock];
-        NSRange subRange = NSMakeRange(offset, size);
         if (!self.assetData) {
             self.assetData = [self fetchDataFromAsset:self.phAssetResource error:error];
         }
-        data = [self.assetData subdataWithRange:subRange];
+        
+        if (_assetData != nil && offset < _assetData.length) {
+            NSInteger realSize = MIN(size, _assetData.length - offset);
+            data = [_assetData subdataWithRange:NSMakeRange(offset, realSize)];
+        } else {
+            data = [NSData data];
+        }
     } @catch (NSException *exception) {
         *error = [NSError errorWithDomain:NSCocoaErrorDomain code:kQNFileError userInfo:@{NSLocalizedDescriptionKey : exception.reason}];
         NSLog(@"read file failed reason: %@ \n%@", exception.reason, exception.callStackSymbols);