@@ -34,13 +34,18 @@ - (void)setImageWithURL:(NSURL *)url forState:(UIControlState)state placeholderI
34
34
}
35
35
36
36
- (void )setImageWithURL : (NSURL *)url forState : (UIControlState)state placeholderImage : (UIImage *)placeholder options : (SDWebImageOptions)options completed : (SDWebImageCompletedBlock)completedBlock {
37
- [self cancelCurrentImageLoad ];
37
+ [self setImageWithURL: url forState: state placeholderImage: placeholder options: options progress: nil completed: completedBlock];
38
+ }
38
39
40
+ - (void )setImageWithURL : (NSURL *)url forState : (UIControlState)state placeholderImage : (UIImage *)placeholder options : (SDWebImageOptions)options progress : (SDWebImageDownloaderProgressBlock)progressBlock completed : (SDWebImageCompletedBlock)completedBlock
41
+ {
42
+ [self cancelCurrentImageLoad ];
43
+
39
44
[self setImage: placeholder forState: state];
40
-
45
+
41
46
if (url) {
42
47
__weak UIButton *wself = self;
43
- id <SDWebImageOperation> operation = [SDWebImageManager.sharedManager downloadWithURL: url options: options progress: nil completed: ^(UIImage *image, NSError *error, SDImageCacheType cacheType, BOOL finished) {
48
+ id <SDWebImageOperation> operation = [SDWebImageManager.sharedManager downloadWithURL: url options: options progress: progressBlock completed: ^(UIImage *image, NSError *error, SDImageCacheType cacheType, BOOL finished) {
44
49
if (!wself) return ;
45
50
dispatch_main_sync_safe (^{
46
51
__strong UIButton *sself = wself;
@@ -78,13 +83,18 @@ - (void)setBackgroundImageWithURL:(NSURL *)url forState:(UIControlState)state pl
78
83
}
79
84
80
85
- (void )setBackgroundImageWithURL : (NSURL *)url forState : (UIControlState)state placeholderImage : (UIImage *)placeholder options : (SDWebImageOptions)options completed : (SDWebImageCompletedBlock)completedBlock {
81
- [self cancelCurrentImageLoad ];
86
+ [self setBackgroundImageWithURL: url forState: state placeholderImage: placeholder options: options progress: nil completed: completedBlock];
87
+ }
82
88
89
+ - (void )setBackgroundImageWithURL : (NSURL *)url forState : (UIControlState)state placeholderImage : (UIImage *)placeholder options : (SDWebImageOptions)options progress : (SDWebImageDownloaderProgressBlock)progressBlock completed : (SDWebImageCompletedBlock)completedBlock
90
+ {
91
+ [self cancelCurrentImageLoad ];
92
+
83
93
[self setBackgroundImage: placeholder forState: state];
84
-
94
+
85
95
if (url) {
86
96
__weak UIButton *wself = self;
87
- id <SDWebImageOperation> operation = [SDWebImageManager.sharedManager downloadWithURL: url options: options progress: nil completed: ^(UIImage *image, NSError *error, SDImageCacheType cacheType, BOOL finished) {
97
+ id <SDWebImageOperation> operation = [SDWebImageManager.sharedManager downloadWithURL: url options: options progress: progressBlock completed: ^(UIImage *image, NSError *error, SDImageCacheType cacheType, BOOL finished) {
88
98
if (!wself) return ;
89
99
dispatch_main_sync_safe (^{
90
100
__strong UIButton *sself = wself;
@@ -101,7 +111,6 @@ - (void)setBackgroundImageWithURL:(NSURL *)url forState:(UIControlState)state pl
101
111
}
102
112
}
103
113
104
-
105
114
- (void )cancelCurrentImageLoad {
106
115
// Cancel in progress downloader from queue
107
116
id <SDWebImageOperation> operation = objc_getAssociatedObject (self, &operationKey);
0 commit comments