Add display origin photo view controller.

xhzengAIB · xhzengAIB · commit e5690ed392aa · 2014-05-09T23:22:37.000+08:00
fix xhzengAIB#53
diff --git a/Example/MessageDisplayExample/MessageDisplayExample/XHDemoWeChatMessageTableViewController.m b/Example/MessageDisplayExample/MessageDisplayExample/XHDemoWeChatMessageTableViewController.m
@@ -8,6 +8,7 @@
 
 #import "XHDemoWeChatMessageTableViewController.h"
 
+#import "XHDisplayPhotoViewController.h"
 #import "XHDisplayLocationViewController.h"
 
 @interface XHDemoWeChatMessageTableViewController ()
@@ -181,10 +182,15 @@ - (void)dealloc {
 #pragma mark - XHMessageTableViewCell delegate
 
 - (void)multiMediaMessageDidSelectedOnMessage:(id<XHMessageModel>)message atIndexPath:(NSIndexPath *)indexPath onMessageTableViewCell:(XHMessageTableViewCell *)messageTableViewCell {
+    UIViewController *disPlayViewController;
     switch (message.messageMediaType) {
-        case XHBubbleMessagePhoto:
+        case XHBubbleMessagePhoto: {
             DLog(@"message : %@", message.photo);
+            XHDisplayPhotoViewController *displayPhotoViewController = [[XHDisplayPhotoViewController alloc] init];
+            displayPhotoViewController.message = message;
+            disPlayViewController = displayPhotoViewController;
             break;
+        }
         case XHBubbleMessageVideo:
             DLog(@"message : %@", message.videoConverPhoto);
             break;
@@ -200,12 +206,15 @@ - (void)multiMediaMessageDidSelectedOnMessage:(id<XHMessageModel>)message atInde
             DLog(@"facePath : %@", message.localPositionPhoto);
             XHDisplayLocationViewController *displayLocationViewController = [[XHDisplayLocationViewController alloc] init];
             displayLocationViewController.message = message;
-            [self.navigationController pushViewController:displayLocationViewController animated:YES];
+            disPlayViewController = displayLocationViewController;
             break;
         }
         default:
             break;
     }
+    if (disPlayViewController) {
+        [self.navigationController pushViewController:disPlayViewController animated:YES];
+    }
 }
 
 - (void)didDoubleSelectedOnTextMessage:(id<XHMessageModel>)message atIndexPath:(NSIndexPath *)indexPath {
diff --git a/Example/MessageDisplayKitWorkSpace.xcworkspace/xcuserdata/qtone-1.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Example/MessageDisplayKitWorkSpace.xcworkspace/xcuserdata/qtone-1.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -138,11 +138,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../MessageDisplayKit/Classes/Controllers/XHMessageTableViewController/XHMessageTableViewController.m"
-            timestampString = "421253972.887511"
+            timestampString = "421341520.27141"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "425"
-            endingLineNumber = "425"
+            startingLineNumber = "427"
+            endingLineNumber = "427"
             landmarkName = "-dealloc"
             landmarkType = "5">
          </BreakpointContent>
diff --git a/MessageDisplayKit/Classes/Controllers/XHBaseViewController/XHBaseViewController.m b/MessageDisplayKit/Classes/Controllers/XHBaseViewController/XHBaseViewController.m
@@ -18,6 +18,7 @@ - (void)viewDidLoad
 {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
+    self.view.backgroundColor = [UIColor whiteColor];
 }
 
 - (void)didReceiveMemoryWarning
diff --git a/MessageDisplayKit/Classes/Controllers/XHDisplayLocationViewController/XHDisplayLocationViewController.m b/MessageDisplayKit/Classes/Controllers/XHDisplayLocationViewController/XHDisplayLocationViewController.m
@@ -54,7 +54,6 @@ - (void)viewDidLoad
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     self.title = NSLocalizedString(@"Location", @"地理位置");
-    self.view.backgroundColor = [UIColor whiteColor];
     
     [self.view addSubview:self.mapView];
 }
diff --git a/MessageDisplayKit/Classes/Controllers/XHDisplayPhotoViewController/XHDisplayPhotoViewController.h b/MessageDisplayKit/Classes/Controllers/XHDisplayPhotoViewController/XHDisplayPhotoViewController.h
@@ -8,7 +8,10 @@
 
 #import <UIKit/UIKit.h>
 #import "XHBaseViewController.h"
+#import "XHMessageModel.h"
 
 @interface XHDisplayPhotoViewController : XHBaseViewController
 
+@property (nonatomic, strong) id <XHMessageModel> message;
+
 @end
diff --git a/MessageDisplayKit/Classes/Controllers/XHDisplayPhotoViewController/XHDisplayPhotoViewController.m b/MessageDisplayKit/Classes/Controllers/XHDisplayPhotoViewController/XHDisplayPhotoViewController.m
@@ -8,16 +8,40 @@
 
 #import "XHDisplayPhotoViewController.h"
 
+#import "UIView+XHNetworkImage.h"
+
 @interface XHDisplayPhotoViewController ()
 
+@property (nonatomic, weak) UIImageView *photoImageView;
+
 @end
 
 @implementation XHDisplayPhotoViewController
 
+- (UIImageView *)photoImageView {
+    if (!_photoImageView) {
+        UIImageView *photoImageView = [[UIImageView alloc] initWithFrame:self.view.frame];
+        [self.view addSubview:photoImageView];
+        _photoImageView = photoImageView;
+    }
+    return _photoImageView;
+}
+
+- (void)setMessage:(id<XHMessageModel>)message {
+    _message = message;
+    self.photoImageView.image = message.photo;
+    if (message.thumbnailUrl) {
+        [self.photoImageView setImageUrl:[message thumbnailUrl]];
+    }
+}
+
+#pragma mark - Left cycle
+
 - (void)viewDidLoad
 {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
+    self.title = NSLocalizedString(@"Photo", @"详细照片");
 }
 
 - (void)didReceiveMemoryWarning
diff --git a/MessageDisplayKit/Classes/Controllers/XHMessageTableViewController/XHMessageTableViewController.m b/MessageDisplayKit/Classes/Controllers/XHMessageTableViewController/XHMessageTableViewController.m
@@ -388,8 +388,10 @@ - (void)viewWillAppear:(BOOL)animated {
                                      forKeyPath:@"contentSize"
                                         options:NSKeyValueObservingOptionNew
                                         context:nil];
-    // 滚动到底部
-    [self scrollToBottomAnimated:NO];
+    if (!self.messages.count) {
+        // 滚动到底部
+        [self scrollToBottomAnimated:NO];
+    }
 }
 
 - (void)viewWillDisappear:(BOOL)animated {
diff --git a/MessageDisplayKit/Classes/Models/XHMessageModel.h b/MessageDisplayKit/Classes/Models/XHMessageModel.h
@@ -7,6 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import <CoreLocation/CoreLocation.h>
 #import "XHMessageBubbleFactory.h"
 
 @class XHMessage;
diff --git a/MessageDisplayKit/Resources/en.lproj/MessageDisplayKitString.strings b/MessageDisplayKit/Resources/en.lproj/MessageDisplayKitString.strings
@@ -10,3 +10,4 @@
 "favorites" = "favorites";
 "more" = "more";
 "Location" = "Location";
+"Photo" = "Photo";
diff --git a/MessageDisplayKit/Resources/zh-Hans.lproj/MessageDisplayKitString.strings b/MessageDisplayKit/Resources/zh-Hans.lproj/MessageDisplayKitString.strings
@@ -10,3 +10,5 @@
 "favorites" = "收藏";
 "more" = "更多";
 "Location" = "地理位置";
+"Photo" = "照片";
+"Photo" = "图片";

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ - (void)viewDidLoad`
`18`	`18`	`{`
`19`	`19`	`[super viewDidLoad];`
`20`	`20`	`// Do any additional setup after loading the view.`
	`21`	`+ self.view.backgroundColor = [UIColor whiteColor];`
`21`	`22`	`}`
`22`	`23`
`23`	`24`	`- (void)didReceiveMemoryWarning`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,6 @@ - (void)viewDidLoad`
`54`	`54`	`[super viewDidLoad];`
`55`	`55`	`// Do any additional setup after loading the view.`
`56`	`56`	`self.title = NSLocalizedString(@"Location", @"地理位置");`
`57`		`- self.view.backgroundColor = [UIColor whiteColor];`
`58`	`57`
`59`	`58`	`[self.view addSubview:self.mapView];`
`60`	`59`	`}`