Commit 1deacbc6 authored by tanzhen's avatar tanzhen

优化一些细节

parent 3f2db868
...@@ -37,24 +37,24 @@ ...@@ -37,24 +37,24 @@
} else { } else {
self.model.cachedImage = nil; self.model.cachedImage = nil;
int32_t imageRequestID = [[TZImageManager manager] getPhotoWithAsset:model.asset photoWidth:self.tz_width completion:^(UIImage *photo, NSDictionary *info, BOOL isDegraded) { int32_t imageRequestID = [[TZImageManager manager] getPhotoWithAsset:model.asset photoWidth:self.tz_width completion:^(UIImage *photo, NSDictionary *info, BOOL isDegraded) {
if (self->_progressView) {
self.progressView.hidden = YES;
self.imageView.alpha = 1.0;
}
// Set the cell's thumbnail image if it's still showing the same asset. // Set the cell's thumbnail image if it's still showing the same asset.
if (!iOS8Later) { if (!iOS8Later) {
self.imageView.image = photo; return; self.imageView.image = photo;
self.model.cachedImage = photo;
[self hideProgressView];
return;
} }
if ([self.representedAssetIdentifier isEqualToString:[[TZImageManager manager] getAssetIdentifier:model.asset]]) { if ([self.representedAssetIdentifier isEqualToString:[[TZImageManager manager] getAssetIdentifier:model.asset]]) {
self.imageView.image = photo; self.imageView.image = photo;
self.model.cachedImage = photo;
} else { } else {
// NSLog(@"this cell is showing other asset"); // NSLog(@"this cell is showing other asset");
[[PHImageManager defaultManager] cancelImageRequest:self.imageRequestID]; [[PHImageManager defaultManager] cancelImageRequest:self.imageRequestID];
} }
if (!isDegraded) { if (!isDegraded) {
[self hideProgressView];
self.imageRequestID = 0; self.imageRequestID = 0;
} }
self.model.cachedImage = photo;
} progressHandler:nil networkAccessAllowed:NO]; } progressHandler:nil networkAccessAllowed:NO];
if (imageRequestID && self.imageRequestID && imageRequestID != self.imageRequestID) { if (imageRequestID && self.imageRequestID && imageRequestID != self.imageRequestID) {
[[PHImageManager defaultManager] cancelImageRequest:self.imageRequestID]; [[PHImageManager defaultManager] cancelImageRequest:self.imageRequestID];
...@@ -150,15 +150,19 @@ ...@@ -150,15 +150,19 @@
} }
- (void)hideProgressView { - (void)hideProgressView {
if (_progressView) {
self.progressView.hidden = YES; self.progressView.hidden = YES;
self.imageView.alpha = 1.0; self.imageView.alpha = 1.0;
}
} }
- (void)requestBigImage { - (void)requestBigImage {
if (_bigImageRequestID) {
[[PHImageManager defaultManager] cancelImageRequest:_bigImageRequestID];
}
_bigImageRequestID = [[TZImageManager manager] requestImageDataForAsset:_model.asset completion:^(NSData *imageData, NSString *dataUTI, UIImageOrientation orientation, NSDictionary *info) { _bigImageRequestID = [[TZImageManager manager] requestImageDataForAsset:_model.asset completion:^(NSData *imageData, NSString *dataUTI, UIImageOrientation orientation, NSDictionary *info) {
if (self.progressView) {
[self hideProgressView]; [self hideProgressView];
}
} progressHandler:^(double progress, NSError *error, BOOL *stop, NSDictionary *info) { } progressHandler:^(double progress, NSError *error, BOOL *stop, NSDictionary *info) {
if (self.model.isSelected) { if (self.model.isSelected) {
progress = progress > 0.02 ? progress : 0.02;; progress = progress > 0.02 ? progress : 0.02;;
...@@ -180,9 +184,7 @@ ...@@ -180,9 +184,7 @@
if (_bigImageRequestID) { if (_bigImageRequestID) {
[[PHImageManager defaultManager] cancelImageRequest:_bigImageRequestID]; [[PHImageManager defaultManager] cancelImageRequest:_bigImageRequestID];
} }
if (_progressView) {
[self hideProgressView]; [self hideProgressView];
}
} }
#pragma mark - Lazy load #pragma mark - Lazy load
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment