mirrors
/
SDWebImage
mirror of https://github.com/SDWebImage/SDWebImage.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix race condition when use transition

This commit is contained in:
kinarobin 2020-07-16 17:33:08 +08:00 committed by DreamPiggy
parent 5a34f2d468
commit 4ed1ce29dc
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
SDWebImage/Core/UIView+WebCache.h
View File

@ -34,6 +34,7 @@ typedef void(^SDSetImageBlock)(UIImage * _Nullable image, NSData * _Nullable ima
/** /**
* Get the current image operation key. Operation key is used to identify the different queries for one view instance (like UIButton). * Get the current image operation key. Operation key is used to identify the different queries for one view instance (like UIButton).
* See more about this in `SDWebImageContextSetImageOperationKey`. * See more about this in `SDWebImageContextSetImageOperationKey`.
* If you cancel current image load, the key will be set to nil.
* @note You can use method `UIView+WebCacheOperation` to investigate different queries' operation. * @note You can use method `UIView+WebCacheOperation` to investigate different queries' operation.
*/ */
@property (nonatomic, strong, readonly, nullable) NSString *sd_latestOperationKey; @property (nonatomic, strong, readonly, nullable) NSString *sd_latestOperationKey;

19
SDWebImage/Core/UIView+WebCache.m
View File

@ -203,6 +203,7 @@ const int64_t SDWebImageProgressUnitCountUnknown = 1LL;
- (void)sd_cancelCurrentImageLoad { - (void)sd_cancelCurrentImageLoad {
[self sd_cancelImageLoadOperationWithKey:self.sd_latestOperationKey]; [self sd_cancelImageLoadOperationWithKey:self.sd_latestOperationKey];
self.sd_latestOperationKey = nil;
} }
- (void)sd_setImage:(UIImage *)image imageData:(NSData *)imageData basedOnClassOrViaCustomSetImageBlock:(SDSetImageBlock)setImageBlock cacheType:(SDImageCacheType)cacheType imageURL:(NSURL *)imageURL { - (void)sd_setImage:(UIImage *)image imageData:(NSData *)imageData basedOnClassOrViaCustomSetImageBlock:(SDSetImageBlock)setImageBlock cacheType:(SDImageCacheType)cacheType imageURL:(NSURL *)imageURL {
@ -228,14 +229,18 @@ const int64_t SDWebImageProgressUnitCountUnknown = 1LL;
} else if ([view isKindOfClass:[UIImageView class]]) { } else if ([view isKindOfClass:[UIImageView class]]) {
UIImageView *imageView = (UIImageView *)view; UIImageView *imageView = (UIImageView *)view;
finalSetImageBlock = ^(UIImage *setImage, NSData *setImageData, SDImageCacheType setCacheType, NSURL *setImageURL) { finalSetImageBlock = ^(UIImage *setImage, NSData *setImageData, SDImageCacheType setCacheType, NSURL *setImageURL) {
imageView.image = setImage; if (view.sd_latestOperationKey != nil) {
imageView.image = setImage;
}
}; };
} }
#if SD_UIKIT #if SD_UIKIT
else if ([view isKindOfClass:[UIButton class]]) { else if ([view isKindOfClass:[UIButton class]]) {
UIButton *button = (UIButton *)view; UIButton *button = (UIButton *)view;
finalSetImageBlock = ^(UIImage *setImage, NSData *setImageData, SDImageCacheType setCacheType, NSURL *setImageURL) { finalSetImageBlock = ^(UIImage *setImage, NSData *setImageData, SDImageCacheType setCacheType, NSURL *setImageURL) {
[button setImage:setImage forState:UIControlStateNormal]; if (view.sd_latestOperationKey != nil) {
[button setImage:setImage forState:UIControlStateNormal];
}
}; };
} }
#endif #endif
@ -243,7 +248,9 @@ const int64_t SDWebImageProgressUnitCountUnknown = 1LL;
else if ([view isKindOfClass:[NSButton class]]) { else if ([view isKindOfClass:[NSButton class]]) {
NSButton *button = (NSButton *)view; NSButton *button = (NSButton *)view;
finalSetImageBlock = ^(UIImage *setImage, NSData *setImageData, SDImageCacheType setCacheType, NSURL *setImageURL) { finalSetImageBlock = ^(UIImage *setImage, NSData *setImageData, SDImageCacheType setCacheType, NSURL *setImageURL) {
button.image = setImage; if (view.sd_latestOperationKey != nil) {
button.image = setImage;
}
}; };
} }
#endif #endif
@ -275,10 +282,10 @@ const int64_t SDWebImageProgressUnitCountUnknown = 1LL;
} completionHandler:^{ } completionHandler:^{
[NSAnimationContext runAnimationGroup:^(NSAnimationContext * _Nonnull context) { [NSAnimationContext runAnimationGroup:^(NSAnimationContext * _Nonnull context) {
context.duration = transition.duration; context.duration = transition.duration;
#pragma clang diagnostic push #pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wdeprecated-declarations"
CAMediaTimingFunction *timingFunction = transition.timingFunction; CAMediaTimingFunction *timingFunction = transition.timingFunction;
#pragma clang diagnostic pop #pragma clang diagnostic pop
if (!timingFunction) { if (!timingFunction) {
timingFunction = SDTimingFunctionFromAnimationOptions(transition.animationOptions); timingFunction = SDTimingFunctionFromAnimationOptions(transition.animationOptions);
} }

1
Tests/Tests/SDWebCacheCategoriesTests.m
View File

@ -208,6 +208,7 @@
[imageView sd_internalSetImageWithURL:originalImageURL placeholderImage:nil options:0 context:nil setImageBlock:nil progress:nil completed:nil]; [imageView sd_internalSetImageWithURL:originalImageURL placeholderImage:nil options:0 context:nil setImageBlock:nil progress:nil completed:nil];
[imageView sd_cancelCurrentImageLoad]; [imageView sd_cancelCurrentImageLoad];
NSString *operationKey = NSStringFromClass(UIView.class); NSString *operationKey = NSStringFromClass(UIView.class);
expect(imageView.sd_latestOperationKey).beNil();
expect([imageView sd_imageLoadOperationForKey:operationKey]).beNil(); expect([imageView sd_imageLoadOperationForKey:operationKey]).beNil();
} }