Merge remote-tracking branch 'origin/master'

wanghengheng · wanghengheng · commit 1570bb10ec13 · 2014-12-30T14:41:19.000+08:00
diff --git a/Coding_iOS/Controllers/FileViewController.m b/Coding_iOS/Controllers/FileViewController.m
@@ -50,7 +50,7 @@ - (void)loadView{
 }
 
 - (void)viewWillDisappear:(BOOL)animated{
-    [super viewDidDisappear:animated];
+    [super viewWillDisappear:animated];
     
     [self.navigationController setNavigationBarHidden:NO];
     [UIApplication sharedApplication].statusBarHidden = NO;
diff --git a/Coding_iOS/Views/CCell/MessageMediaItemCCell.m b/Coding_iOS/Views/CCell/MessageMediaItemCCell.m
@@ -44,9 +44,11 @@ - (void)setCurObj:(NSObject *)curObj{
         [_imgView setSize:[self sizeWithImage:curImage originalWidth:kMessageCell_ContentWidth maxHeight:kScreen_Height/2]];
     }else if ([_curObj isKindOfClass:[HtmlMediaItem class]]){
         HtmlMediaItem *curMediaItem = (HtmlMediaItem *)_curObj;
+        NSURL *currentImageURL = [curMediaItem.src urlImageWithCodePathResizeToView:_imgView];
         __weak typeof(self) weakSelf = self;
-        [self.imgView sd_setImageWithURL:[curMediaItem.src urlImageWithCodePathResizeToView:_imgView] placeholderImage:kPlaceholderCodingSquareWidth(150.0) completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, NSURL *imageURL) {
-            if (image) {
+        [self.imgView sd_setImageWithURL:currentImageURL placeholderImage:kPlaceholderCodingSquareWidth(150.0) completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, NSURL *imageURL) {
+            ESStrong(weakSelf, _self);
+            if (image && [imageURL.absoluteString isEqualToString:currentImageURL.absoluteString]) {
                 HtmlMediaItem *curBlockMediaItem = (HtmlMediaItem *)weakSelf.curObj;
                 CGSize imageSize = image.size;
                 if (![ImageSizeManager hasSrc:curBlockMediaItem.src]) {

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ - (void)loadView{`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`- (void)viewWillDisappear:(BOOL)animated{`
`53`		`- [super viewDidDisappear:animated];`
	`53`	`+ [super viewWillDisappear:animated];`
`54`	`54`
`55`	`55`	`[self.navigationController setNavigationBarHidden:NO];`
`56`	`56`	`[UIApplication sharedApplication].statusBarHidden = NO;`