修改支持GIF

iamqk · Sep 4, 2022 · 6cc928e · 6cc928e
1 parent 319db51
commit 6cc928e
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 20 deletions.
diff --git a/Pod/Classes/MWGridViewController.m b/Pod/Classes/MWGridViewController.m
@@ -162,7 +162,7 @@ - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cell
     cell.selectionMode = _selectionMode;
     cell.isSelected = [_browser photoIsSelectedAtIndex:indexPath.row];
     cell.index = indexPath.row;
-    UIImage *img = [_browser imageForPhoto:photo];
+    id img = [_browser imageForPhoto:photo];
     if (img) {
         [cell displayImage];
     } else {

diff --git a/Pod/Classes/MWPhoto.h b/Pod/Classes/MWPhoto.h
@@ -20,6 +20,10 @@
 @property (nonatomic, strong) NSURL *videoURL;
 @property (nonatomic) BOOL emptyImage;
 @property (nonatomic) BOOL isVideo;
+@property (nonatomic, readonly) UIImage *image;
+@property (nonatomic, readonly) NSData *data;
+@property (nonatomic, readonly) NSURL *photoURL;
+@property (nonatomic, readonly) NSString *filePath  __attribute__((deprecated("Use photoURL"))); // Depreciated
 
 + (MWPhoto *)photoWithImage:(UIImage *)image;
 + (MWPhoto *)photoWithURL:(NSURL *)url;

diff --git a/Pod/Classes/MWPhoto.m b/Pod/Classes/MWPhoto.m
@@ -12,6 +12,7 @@
 #import <AssetsLibrary/AssetsLibrary.h>
 #import "MWPhoto.h"
 #import "MWPhotoBrowser.h"
+#import "UIImage+GIF.h"
 
 @interface MWPhoto () {
 
@@ -34,6 +35,7 @@ - (void)imageLoadingComplete;
 @implementation MWPhoto
 
 @synthesize underlyingImage = _underlyingImage; // synth property from protocol
+@synthesize underlyingImageData = _underlyingImageData; // synth property from protocol
 
 #pragma mark - Class Methods
 
@@ -145,19 +147,24 @@ - (UIImage *)underlyingImage {
     return _underlyingImage;
 }
 
+- (NSData *)underlyingImageData {
+    return _underlyingImageData;
+}
+
 - (void)loadUnderlyingImageAndNotify {
     NSAssert([[NSThread currentThread] isMainThread], @"This method must be called on the main thread.");
     if (_loadingInProgress) return;
     _loadingInProgress = YES;
     @try {
-        if (self.underlyingImage) {
+        if (self.underlyingImage || self.underlyingImageData) {
             [self imageLoadingComplete];
         } else {
             [self performLoadUnderlyingImageAndNotify];
         }
     }
     @catch (NSException *exception) {
         self.underlyingImage = nil;
+        self.underlyingImageData = nil;
         _loadingInProgress = NO;
         [self imageLoadingComplete];
     }
@@ -169,10 +176,11 @@ - (void)loadUnderlyingImageAndNotify {
 - (void)performLoadUnderlyingImageAndNotify {
 
     // Get underlying image
-    if (_image) {
+    if (_image || _data) {
 
         // We have UIImage!
         self.underlyingImage = _image;
+        self.underlyingImageData = _data;
         [self imageLoadingComplete];
 
     } else if (_photoURL) {
@@ -251,7 +259,12 @@ - (void)_performLoadUnderlyingImageAndNotifyWithWebURL:(NSURL *)url {
                                                          MWLog(@"SDWebImage failed to download image: %@", error);
                                                      }
                                                      _webImageOperation = nil;
-                                                     self.underlyingImage = image;
+
+                                                    if ([[url.absoluteString lowercaseString] containsString:@"gif"]) {
+                                                        self.underlyingImageData = data;
+                                                    } else {
+                                                        self.underlyingImage = image;
+                                                    }
                                                      dispatch_async(dispatch_get_main_queue(), ^{
                                                          [self imageLoadingComplete];
                                                      });
@@ -268,6 +281,7 @@ - (void)_performLoadUnderlyingImageAndNotifyWithLocalFileURL:(NSURL *)url {
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
         @autoreleasepool {
             @try {
+                //TODO: FIXME need fix gif on local maybe
                 self.underlyingImage = [UIImage imageWithContentsOfFile:url.path];
                 if (!_underlyingImage) {
                     MWLog(@"Error loading photo from path: %@", url.path);
@@ -336,7 +350,7 @@ - (void)_performLoadUnderlyingImageAndNotifyWithAsset:(PHAsset *)asset targetSiz
 // Release if we can get it again from path or url
 - (void)unloadUnderlyingImage {
     _loadingInProgress = NO;
-	self.underlyingImage = nil;
+//	self.underlyingImage = nil;
 }
 
 - (void)imageLoadingComplete {

diff --git a/Pod/Classes/MWPhotoBrowser.m b/Pod/Classes/MWPhotoBrowser.m
@@ -708,12 +708,14 @@ - (void)setPhotoSelected:(BOOL)selected atIndex:(NSUInteger)index {
     }
 }
 
-- (UIImage *)imageForPhoto:(id<MWPhoto>)photo {
+- (id)imageForPhoto:(id<MWPhoto>)photo {
 	if (photo) {
 		// Get image or obtain in background
 		if ([photo underlyingImage]) {
 			return [photo underlyingImage];
-		} else {
+        } else if ([photo underlyingImageData]) {
+            return [photo underlyingImageData];
+        } else {
             [photo loadUnderlyingImageAndNotify];
 		}
 	}
@@ -752,7 +754,7 @@ - (void)handleMWPhotoLoadingDidEndNotification:(NSNotification *)notification {
     id <MWPhoto> photo = [notification object];
     MWZoomingScrollView *page = [self pageDisplayingPhoto:photo];
     if (page) {
-        if ([photo underlyingImage]) {
+        if ([photo underlyingImage] || [photo underlyingImageData]) {
             // Successful load
             [page displayImage];
             [self loadAdjacentPhotosIfNecessary:photo];

diff --git a/Pod/Classes/MWPhotoProtocol.h b/Pod/Classes/MWPhotoProtocol.h
@@ -31,6 +31,7 @@
 // in -loadUnderlyingImageAndNotify: which may be called by the photo browser if this
 // methods returns nil.
 @property (nonatomic, strong) UIImage *underlyingImage;
+@property (nonatomic, strong) NSData *underlyingImageData;
 
 // Called when the browser has determined the underlying images is not
 // already loaded into memory but needs it.
@@ -68,4 +69,4 @@
 // Cancel any background loading of image data
 - (void)cancelAnyLoading;
 
-@end
+@end
diff --git a/Pod/Classes/MWTapDetectingImageView.h b/Pod/Classes/MWTapDetectingImageView.h
@@ -7,10 +7,12 @@
 //
 
 #import <Foundation/Foundation.h>
+#import "FLAnimatedImageView+WebCache.h"
+
 
 @protocol MWTapDetectingImageViewDelegate;
 
-@interface MWTapDetectingImageView : UIImageView {}
+@interface MWTapDetectingImageView : FLAnimatedImageView {}
 
 @property (nonatomic, weak) id <MWTapDetectingImageViewDelegate> tapDelegate;
 
@@ -24,4 +26,4 @@
 - (void)imageView:(UIImageView *)imageView doubleTapDetected:(UITouch *)touch;
 - (void)imageView:(UIImageView *)imageView tripleTapDetected:(UITouch *)touch;
 
-@end
+@end
diff --git a/Pod/Classes/MWZoomingScrollView.m b/Pod/Classes/MWZoomingScrollView.m
@@ -92,6 +92,7 @@ - (void)prepareForReuse {
     self.playButton = nil;
     _photoImageView.hidden = NO;
     _photoImageView.image = nil;
+    _photoImageView.animatedImage = nil;
     _index = NSUIntegerMax;
 }
 
@@ -113,7 +114,7 @@ - (void)setPhoto:(id<MWPhoto>)photo {
         }
     }
     _photo = photo;
-    UIImage *img = [_photoBrowser imageForPhoto:_photo];
+    id img = [_photoBrowser imageForPhoto:_photo];
     if (img) {
         [self displayImage];
     } else {
@@ -124,7 +125,7 @@ - (void)setPhoto:(id<MWPhoto>)photo {
 
 // Get and display image
 - (void)displayImage {
-	if (_photo && _photoImageView.image == nil) {
+	if (_photo && _photoImageView.animatedImage == nil) {
 
 		// Reset
 		self.maximumZoomScale = 1;
@@ -133,20 +134,27 @@ - (void)displayImage {
 		self.contentSize = CGSizeMake(0, 0);
 
 		// Get image from browser as it handles ordering of fetching
-		UIImage *img = [_photoBrowser imageForPhoto:_photo];
+		id img = [_photoBrowser imageForPhoto:_photo];
 		if (img) {
 
 			// Hide indicator
 			[self hideLoadingIndicator];
 
+            CGRect photoImageViewFrame;
+
 			// Set image
-			_photoImageView.image = img;
+            if ([img isKindOfClass:[NSData class]]) {
+                FLAnimatedImage *image = [[FLAnimatedImage alloc] initWithAnimatedGIFData:img];
+                _photoImageView.animatedImage = image;
+                photoImageViewFrame.size = image.posterImage.size;
+            } else {
+                _photoImageView.image = img;
+                photoImageViewFrame.size = ((UIImage *)img).size;
+            }
 			_photoImageView.hidden = NO;
 
 			// Setup photo frame
-			CGRect photoImageViewFrame;
 			photoImageViewFrame.origin = CGPointZero;
-			photoImageViewFrame.size = img.size;
 			_photoImageView.frame = photoImageViewFrame;
 			self.contentSize = photoImageViewFrame.size;
 
@@ -167,6 +175,7 @@ - (void)displayImage {
 - (void)displayImageFailure {
     [self hideLoadingIndicator];
     _photoImageView.image = nil;
+    _photoImageView.animatedImage = nil;
 
     // Show if image is not empty
     if (![_photo respondsToSelector:@selector(emptyImage)] || !_photo.emptyImage) {
@@ -226,7 +235,7 @@ - (CGFloat)initialZoomScaleWithMinScale {
     if (_photoImageView && _photoBrowser.zoomPhotosToFill) {
         // Zoom image to fill if the aspect ratios are fairly similar
         CGSize boundsSize = self.bounds.size;
-        CGSize imageSize = _photoImageView.image.size;
+        CGSize imageSize = _photoImageView.animatedImage.size;
         CGFloat boundsAR = boundsSize.width / boundsSize.height;
         CGFloat imageAR = imageSize.width / imageSize.height;
         CGFloat xScale = boundsSize.width / imageSize.width;    // the scale needed to perfectly fit the image width-wise
@@ -249,14 +258,19 @@ - (void)setMaxMinZoomScalesForCurrentBounds {
     self.zoomScale = 1;
 
     // Bail if no image
-    if (_photoImageView.image == nil) return;
+    if (_photoImageView.animatedImage == nil && _photoImageView.image == nil) return;
 
     // Reset position
     _photoImageView.frame = CGRectMake(0, 0, _photoImageView.frame.size.width, _photoImageView.frame.size.height);
 
     // Sizes
     CGSize boundsSize = self.bounds.size;
-    CGSize imageSize = _photoImageView.image.size;
+    CGSize imageSize;
+    if (_photoImageView.animatedImage) {
+        imageSize = _photoImageView.animatedImage.size;
+    } else {
+        imageSize = _photoImageView.image.size;
+    }
 
     // Calculate Min
     CGFloat xScale = boundsSize.width / imageSize.width;    // the scale needed to perfectly fit the image width-wise