Merge pull request xhzengAIB#177 from hanchunlong/master

xhzengAIB · xhzengAIB · commit 083aa973722f · 2015-01-14T09:12:08.000Z
优化消息时间标签显示
diff --git a/MessageDisplayKit/Classes/Views/MessageContentViews/XHMessageTableViewCell.m b/MessageDisplayKit/Classes/Views/MessageContentViews/XHMessageTableViewCell.m
@@ -160,9 +160,28 @@ - (void)configureTimestamp:(BOOL)displayTimestamp atMessage:(id <XHMessageModel>
     self.displayTimestamp = displayTimestamp;
     self.timestampLabel.hidden = !self.displayTimestamp;
     if (displayTimestamp) {
-        self.timestampLabel.text = [NSDateFormatter localizedStringFromDate:message.timestamp
-                                                                  dateStyle:NSDateFormatterMediumStyle
-                                                                  timeStyle:NSDateFormatterShortStyle];
+        NSString *dateText = nil;
+        NSString *timeText = nil;
+        
+        NSDate *today = [NSDate date];
+        NSDateComponents *components = [[NSDateComponents alloc] init];
+        [components setDay:-1];
+        NSDate *yesterday = [[NSCalendar currentCalendar] dateByAddingComponents:components toDate:today options:0];
+        
+        NSDateComponents *dateComponents = [[NSCalendar currentCalendar] components:NSCalendarUnitYear|NSCalendarUnitMonth|NSCalendarUnitDay fromDate:message.timestamp];
+        NSDateComponents *todayComponents = [[NSCalendar currentCalendar] components:NSCalendarUnitYear|NSCalendarUnitMonth|NSCalendarUnitDay fromDate:today];
+        NSDateComponents *yesterdayComponents = [[NSCalendar currentCalendar] components:NSCalendarUnitYear|NSCalendarUnitMonth|NSCalendarUnitDay fromDate:yesterday];
+        
+        if (dateComponents.year == todayComponents.year && dateComponents.month == todayComponents.month && dateComponents.day == todayComponents.day) {
+            dateText = NSLocalizedString(@"Today", @"Today");
+        } else if (dateComponents.year == yesterdayComponents.year && dateComponents.month == yesterdayComponents.month && dateComponents.day == yesterdayComponents.day) {
+            dateText = NSLocalizedString(@"Yesterday", @"Yesterday");
+        } else {
+            dateText = [NSDateFormatter localizedStringFromDate:message.timestamp dateStyle:NSDateFormatterMediumStyle timeStyle:NSDateFormatterNoStyle];
+        }
+        timeText = [NSDateFormatter localizedStringFromDate:message.timestamp dateStyle:NSDateFormatterNoStyle timeStyle:NSDateFormatterShortStyle];
+        
+        self.timestampLabel.text = [NSString stringWithFormat:@"%@ %@",dateText,timeText];
     }
 }
 
