Fixing UIImageView category to work with AFImageRequestOperation refactoring
This commit is contained in:
parent
fd2f678ac1
commit
c466a24ae2
1 changed files with 19 additions and 16 deletions
|
|
@ -100,26 +100,29 @@ static char kAFImageRequestOperationObjectKey;
|
||||||
} else {
|
} else {
|
||||||
self.image = placeholderImage;
|
self.image = placeholderImage;
|
||||||
|
|
||||||
self.af_imageRequestOperation = [AFImageRequestOperation imageRequestOperationWithRequest:urlRequest imageProcessingBlock:nil cacheName:nil success:^(NSURLRequest *request, NSHTTPURLResponse *response, UIImage *image) {
|
AFImageRequestOperation *requestOperation = [[[AFImageRequestOperation alloc] initWithRequest:urlRequest] autorelease];
|
||||||
if (self.af_imageRequestOperation && ![self.af_imageRequestOperation isCancelled]) {
|
[requestOperation setCompletionBlockWithSuccess:^(AFHTTPRequestOperation *operation, id responseObject) {
|
||||||
if (success) {
|
if (success) {
|
||||||
success(request, response, image);
|
success(operation.request, operation.response, responseObject);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ([[request URL] isEqual:[[self.af_imageRequestOperation request] URL]]) {
|
if ([[urlRequest URL] isEqual:[[self.af_imageRequestOperation request] URL]]) {
|
||||||
self.image = image;
|
self.image = responseObject;
|
||||||
} else {
|
} else {
|
||||||
self.image = placeholderImage;
|
self.image = placeholderImage;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
} failure:^(NSURLRequest *request, NSHTTPURLResponse *response, NSError *error) {
|
|
||||||
self.af_imageRequestOperation = nil;
|
|
||||||
|
|
||||||
|
if ([urlRequest cachePolicy]) {
|
||||||
|
[[AFImageCache sharedImageCache] cacheImageData:operation.responseData forURL:[urlRequest URL] cacheName:nil];
|
||||||
|
}
|
||||||
|
} failure:^(AFHTTPRequestOperation *operation, NSError *error) {
|
||||||
if (failure) {
|
if (failure) {
|
||||||
failure(request, response, error);
|
failure(operation.request, operation.response, error);
|
||||||
}
|
}
|
||||||
}];
|
}];
|
||||||
|
|
||||||
|
self.af_imageRequestOperation = requestOperation;
|
||||||
|
|
||||||
[[[self class] af_sharedImageRequestOperationQueue] addOperation:self.af_imageRequestOperation];
|
[[[self class] af_sharedImageRequestOperationQueue] addOperation:self.af_imageRequestOperation];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue