...
|
...
|
@@ -11,9 +11,6 @@ |
|
|
#import "UIView+WebCacheOperation.h"
|
|
|
|
|
|
static char imageURLKey;
|
|
|
static char TAG_ACTIVITY_INDICATOR;
|
|
|
static char TAG_ACTIVITY_STYLE;
|
|
|
static char TAG_ACTIVITY_SHOW;
|
|
|
|
|
|
@implementation UIImageView (WebCache)
|
|
|
|
...
|
...
|
@@ -50,19 +47,13 @@ static char TAG_ACTIVITY_SHOW; |
|
|
self.image = placeholder;
|
|
|
});
|
|
|
}
|
|
|
|
|
|
// check if activityView is enabled or not
|
|
|
if ([self showActivityIndicatorView]) {
|
|
|
[self addActivityIndicator];
|
|
|
}
|
|
|
|
|
|
|
|
|
if (url) {
|
|
|
__weak UIImageView *wself = self;
|
|
|
id <SDWebImageOperation> operation = [SDWebImageManager.sharedManager downloadImageWithURL:url options:options progress:progressBlock completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, BOOL finished, NSURL *imageURL) {
|
|
|
if (!wself) return;
|
|
|
dispatch_main_sync_safe(^{
|
|
|
if (!wself) return;
|
|
|
[wself removeActivityIndicator];
|
|
|
if (image) {
|
|
|
wself.image = image;
|
|
|
[wself setNeedsLayout];
|
...
|
...
|
@@ -80,7 +71,6 @@ static char TAG_ACTIVITY_SHOW; |
|
|
[self sd_setImageLoadOperation:operation forKey:@"UIImageViewImageLoad"];
|
|
|
} else {
|
|
|
dispatch_main_async_safe(^{
|
|
|
[self removeActivityIndicator];
|
|
|
NSError *error = [NSError errorWithDomain:@"SDWebImageErrorDomain" code:-1 userInfo:@{NSLocalizedDescriptionKey : @"Trying to load a nil url"}];
|
|
|
if (completedBlock) {
|
|
|
completedBlock(nil, error, SDImageCacheTypeNone, url);
|
...
|
...
|
@@ -92,8 +82,8 @@ static char TAG_ACTIVITY_SHOW; |
|
|
- (void)sd_setImageWithPreviousCachedImageWithURL:(NSURL *)url andPlaceholderImage:(UIImage *)placeholder options:(SDWebImageOptions)options progress:(SDWebImageDownloaderProgressBlock)progressBlock completed:(SDWebImageCompletionBlock)completedBlock {
|
|
|
NSString *key = [[SDWebImageManager sharedManager] cacheKeyForURL:url];
|
|
|
UIImage *lastPreviousCachedImage = [[SDImageCache sharedImageCache] imageFromDiskCacheForKey:key];
|
|
|
|
|
|
[self sd_setImageWithURL:url placeholderImage:lastPreviousCachedImage ?: placeholder options:options progress:progressBlock completed:completedBlock];
|
|
|
|
|
|
[self sd_setImageWithURL:url placeholderImage:lastPreviousCachedImage ?: placeholder options:options progress:progressBlock completed:completedBlock];
|
|
|
}
|
|
|
|
|
|
- (NSURL *)sd_imageURL {
|
...
|
...
|
@@ -139,60 +129,4 @@ static char TAG_ACTIVITY_SHOW; |
|
|
[self sd_cancelImageLoadOperationWithKey:@"UIImageViewAnimationImages"];
|
|
|
}
|
|
|
|
|
|
- (UIActivityIndicatorView *)activityIndicator {
|
|
|
return (UIActivityIndicatorView *)objc_getAssociatedObject(self, &TAG_ACTIVITY_INDICATOR);
|
|
|
}
|
|
|
- (void)setActivityIndicator:(UIActivityIndicatorView *)activityIndicator {
|
|
|
objc_setAssociatedObject(self, &TAG_ACTIVITY_INDICATOR, activityIndicator, OBJC_ASSOCIATION_RETAIN);
|
|
|
}
|
|
|
|
|
|
- (void)setShowActivityIndicatorView:(BOOL)show{
|
|
|
objc_setAssociatedObject(self, &TAG_ACTIVITY_SHOW, [NSNumber numberWithBool:show], OBJC_ASSOCIATION_RETAIN);
|
|
|
}
|
|
|
- (BOOL)showActivityIndicatorView{
|
|
|
return [objc_getAssociatedObject(self, &TAG_ACTIVITY_SHOW) boolValue];
|
|
|
}
|
|
|
|
|
|
- (void)setIndicatorStyle:(UIActivityIndicatorViewStyle)style{
|
|
|
objc_setAssociatedObject(self, &TAG_ACTIVITY_STYLE, [NSNumber numberWithInt:style], OBJC_ASSOCIATION_RETAIN);
|
|
|
}
|
|
|
- (int)getIndicatorStyle{
|
|
|
return [objc_getAssociatedObject(self, &TAG_ACTIVITY_STYLE) intValue];
|
|
|
}
|
|
|
|
|
|
- (void)addActivityIndicator {
|
|
|
if (!self.activityIndicator) {
|
|
|
self.activityIndicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:[self getIndicatorStyle]];
|
|
|
self.activityIndicator.autoresizingMask = UIViewAutoresizingNone;
|
|
|
|
|
|
dispatch_async(dispatch_get_main_queue(), ^(void) {
|
|
|
[self addSubview:self.activityIndicator];
|
|
|
[self updateActivityIndicatorFrame];
|
|
|
});
|
|
|
}
|
|
|
|
|
|
dispatch_async(dispatch_get_main_queue(), ^(void) {
|
|
|
[self.activityIndicator startAnimating];
|
|
|
});
|
|
|
|
|
|
}
|
|
|
- (void)updateActivityIndicatorFrame {
|
|
|
if (self.activityIndicator) {
|
|
|
CGRect activityIndicatorBounds = self.activityIndicator.bounds;
|
|
|
float x = (self.frame.size.width - activityIndicatorBounds.size.width) / 2.0;
|
|
|
float y = (self.frame.size.height - activityIndicatorBounds.size.height) / 2.0;
|
|
|
self.activityIndicator.frame = CGRectMake(x, y, activityIndicatorBounds.size.width, activityIndicatorBounds.size.height);
|
|
|
}
|
|
|
}
|
|
|
- (void)removeActivityIndicator {
|
|
|
if (self.activityIndicator) {
|
|
|
[self.activityIndicator removeFromSuperview];
|
|
|
self.activityIndicator = nil;
|
|
|
}
|
|
|
}
|
|
|
- (void)layoutSubviews {
|
|
|
[super layoutSubviews];
|
|
|
[self updateActivityIndicatorFrame];
|
|
|
}
|
|
|
|
|
|
@end |
...
|
...
|
|