diff --git a/SDWebImage/UIImageView+WebCache.h b/SDWebImage/UIImageView+WebCache.h index dabe4fcd..f84217e0 100644 --- a/SDWebImage/UIImageView+WebCache.h +++ b/SDWebImage/UIImageView+WebCache.h @@ -189,22 +189,4 @@ progress:(nullable SDImageLoaderProgressBlock)progressBlock completed:(nullable SDExternalCompletionBlock)completedBlock; -#if SD_UIKIT - -#pragma mark - Animation of multiple images - -/** - * Download an array of images and starts them in an animation loop - * - * @param arrayOfURLs An array of NSURL - */ -- (void)sd_setAnimationImagesWithURLs:(nonnull NSArray *)arrayOfURLs; - -/** - * Cancel the current animation images load - */ -- (void)sd_cancelCurrentAnimationImagesLoad; - -#endif - @end diff --git a/SDWebImage/UIImageView+WebCache.m b/SDWebImage/UIImageView+WebCache.m index 5d62e185..9d7f18e7 100644 --- a/SDWebImage/UIImageView+WebCache.m +++ b/SDWebImage/UIImageView+WebCache.m @@ -64,78 +64,4 @@ }]; } -#if SD_UIKIT - -#pragma mark - Animation of multiple images - -- (void)sd_setAnimationImagesWithURLs:(nonnull NSArray *)arrayOfURLs { - [self sd_cancelCurrentAnimationImagesLoad]; - NSPointerArray *operationsArray = [self sd_animationOperationArray]; - - [arrayOfURLs enumerateObjectsUsingBlock:^(NSURL *logoImageURL, NSUInteger idx, BOOL * _Nonnull stop) { - __weak __typeof(self) wself = self; - id operation = [[SDWebImageManager sharedManager] loadImageWithURL:logoImageURL options:0 progress:nil completed:^(UIImage *image, NSData *data, NSError *error, SDImageCacheType cacheType, BOOL finished, NSURL *imageURL) { - __strong typeof(wself) sself = wself; - if (!sself) return; - dispatch_main_async_safe(^{ - [sself stopAnimating]; - if (sself && image) { - NSMutableArray *currentImages = [[sself animationImages] mutableCopy]; - if (!currentImages) { - currentImages = [[NSMutableArray alloc] init]; - } - - // We know what index objects should be at when they are returned so - // we will put the object at the index, filling any empty indexes - // with the image that was returned too "early". These images will - // be overwritten. (does not require additional sorting datastructure) - while ([currentImages count] < idx) { - [currentImages addObject:image]; - } - - currentImages[idx] = image; - - sself.animationImages = currentImages; - [sself setNeedsLayout]; - } - [sself startAnimating]; - }); - }]; - @synchronized (self) { - [operationsArray addPointer:(__bridge void *)(operation)]; - } - }]; -} - -static char animationLoadOperationKey; - -// element is weak because operation instance is retained by SDWebImageManager's runningOperations property -// we should use lock to keep thread-safe because these method may not be acessed from main queue -- (NSPointerArray *)sd_animationOperationArray { - @synchronized(self) { - NSPointerArray *operationsArray = objc_getAssociatedObject(self, &animationLoadOperationKey); - if (operationsArray) { - return operationsArray; - } - operationsArray = [NSPointerArray weakObjectsPointerArray]; - objc_setAssociatedObject(self, &animationLoadOperationKey, operationsArray, OBJC_ASSOCIATION_RETAIN_NONATOMIC); - return operationsArray; - } -} - -- (void)sd_cancelCurrentAnimationImagesLoad { - NSPointerArray *operationsArray = [self sd_animationOperationArray]; - if (operationsArray) { - @synchronized (self) { - for (id operation in operationsArray) { - if ([operation conformsToProtocol:@protocol(SDWebImageOperation)]) { - [operation cancel]; - } - } - operationsArray.count = 0; - } - } -} -#endif - @end