Merge branch 'master' of https://github.com/CaiJingLong/flutter_photo_manager into master

Author: CaiJingLong

ios/Classes/core/PHAsset+PHAsset_getTitle.h

@@ -9,10 +9,17 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+
 @interface PHAsset (PHAsset_getTitle)
 
 - (NSString*)title;
 
+- (BOOL)isAdjust;
+
+- (PHAssetResource *)getAdjustResource;
+
+- (void)requestAdjustedData:(void (^)(NSData *_Nullable result))block;
+
 @end
 
 NS_ASSUME_NONNULL_END

ios/Classes/core/PHAsset+PHAsset_getTitle.m

@@ -38,4 +38,114 @@ - (NSString *)title {
     }
 }
 
+- (BOOL)isAdjust {
+  NSArray<PHAssetResource *> *resources =
+      [PHAssetResource assetResourcesForAsset:self];
+  if (resources.count == 1) {
+    return NO;
+  }
+
+  if (self.mediaType == PHAssetMediaTypeImage) {
+    return [self imageIsAdjust:resources];
+  } else if (self.mediaType == PHAssetMediaTypeVideo) {
+    return [self videoIsAdjust:resources];
+  }
+
+  return NO;
+}
+
+- (BOOL)imageIsAdjust:(NSArray<PHAssetResource *> *)resources {
+  int count = 0;
+  for (PHAssetResource *res in resources) {
+    if (res.type == PHAssetResourceTypePhoto ||
+        res.type == PHAssetResourceTypeFullSizePhoto) {
+      count++;
+    }
+  }
+
+  return count > 1;
+}
+
+- (BOOL)videoIsAdjust:(NSArray<PHAssetResource *> *)resources {
+  int count = 0;
+  for (PHAssetResource *res in resources) {
+    if (res.type == PHAssetResourceTypeVideo ||
+        res.type == PHAssetResourceTypeFullSizeVideo) {
+      count++;
+    }
+  }
+
+  return count > 1;
+}
+
+- (PHAssetResource *)getAdjustResource {
+  NSArray<PHAssetResource *> *resources =
+      [PHAssetResource assetResourcesForAsset:self];
+  if (resources.count == 0) {
+    return nil;
+  }
+
+  if (resources.count == 1) {
+    return resources[0];
+  }
+
+  if (![self isAdjust]) {
+    for (PHAssetResource *res in resources) {
+      if (self.mediaType == PHAssetMediaTypeImage ||
+          res.type == PHAssetResourceTypeFullSizePhoto ||
+          res.type == PHAssetResourceTypePhoto) {
+        return res;
+      }
+
+      if (self.mediaType == PHAssetMediaTypeVideo ||
+          res.type == PHAssetResourceTypeFullSizeVideo ||
+          res.type == PHAssetResourceTypeVideo) {
+        return res;
+      }
+    }
+
+    return nil;
+  }
+
+  for (PHAssetResource *res in resources) {
+    if (self.mediaType == PHAssetMediaTypeImage ||
+        res.type == PHAssetResourceTypeFullSizePhoto) {
+      return res;
+    }
+
+    if (self.mediaType == PHAssetMediaTypeVideo ||
+        res.type == PHAssetResourceTypeFullSizeVideo) {
+      return res;
+    }
+  }
+
+  return nil;
+}
+
+- (void)requestAdjustedData:(void (^)(NSData *_Nullable))block {
+  PHAssetResource *res = [self getAdjustResource];
+
+  PHAssetResourceManager *manager = PHAssetResourceManager.defaultManager;
+  PHAssetResourceRequestOptions *opt = [PHAssetResourceRequestOptions new];
+
+  __block double pro = 0;
+
+  opt.networkAccessAllowed = YES;
+  opt.progressHandler = ^(double progress) {
+    pro = progress;
+  };
+
+  [manager requestDataForAssetResource:res
+                               options:opt
+                   dataReceivedHandler:^(NSData *_Nonnull data) {
+                     if (pro != 1) {
+                       return;
+                     }
+                     block(data);
+                   }
+                     completionHandler:^(NSError *_Nullable error){
+
+                     }];
+}
+
 @end

ios/Classes/core/PMManager.m

@@ -592,22 +592,7 @@ - (BOOL)isImage:(PHAssetResource *)resource {
 
 - (void)fetchOriginImageFile:(PHAsset *)asset
                resultHandler:(ResultHandler *)handler {
-  NSArray<PHAssetResource *> *resources =
-          [PHAssetResource assetResourcesForAsset:asset];
-  // find asset
-  NSLog(@"The asset has %lu resources.", (unsigned long) resources.count);
-  PHAssetResource *imageResource;
-
-  if (resources.firstObject && [self isImage:resources.firstObject]) {
-    imageResource = resources.firstObject;
-  } else {
-    for (PHAssetResource *resource in resources) {
-      if ([self isImage:resource]) {
-        imageResource = resource;
-        break;
-      }
-    }
-  }
+  PHAssetResource *imageResource = [asset getAdjustResource];
 
   if (!imageResource) {
     [handler reply:nil];