修复topLayoutGuide的bug

xhzengAIB · xhzengAIB · commit 8029bfdff1e9 · 2015-02-11T16:02:48.000+08:00
diff --git a/Example/MessageDisplayKitCoreDataExample/MessageDisplayKitCoreDataExample/XHDemoWeChatMessageTableViewController.m b/Example/MessageDisplayKitCoreDataExample/MessageDisplayKitCoreDataExample/XHDemoWeChatMessageTableViewController.m
@@ -407,7 +407,6 @@ - (void)loadMoreMessagesScrollTotop {
         WEAKSELF
         dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
             NSMutableArray *messages = [weakSelf getTestMessages];
-            sleep(3);
             dispatch_async(dispatch_get_main_queue(), ^{
                 [weakSelf insertOldMessages:messages];
                 weakSelf.loadingMoreMessage = NO;
diff --git a/Example/MessageDisplayKitStoryBoradExample/MessageDisplayKitStoryBoradExample/XHDemoWeChatMessageTableViewController.m b/Example/MessageDisplayKitStoryBoradExample/MessageDisplayKitStoryBoradExample/XHDemoWeChatMessageTableViewController.m
@@ -250,7 +250,6 @@ - (void)loadMoreMessagesScrollTotop {
         WEAKSELF
         dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
             NSMutableArray *messages = [weakSelf getTestMessages];
-            sleep(3);
             dispatch_async(dispatch_get_main_queue(), ^{
                 [weakSelf insertOldMessages:messages];
                 weakSelf.loadingMoreMessage = NO;
diff --git a/Example/MessageDisplayKitWeChatExample/MessageDisplayKitWeChatExample/Controllers/XHDemoWeChatMessageTableViewController/XHDemoWeChatMessageTableViewController.m b/Example/MessageDisplayKitWeChatExample/MessageDisplayKitWeChatExample/Controllers/XHDemoWeChatMessageTableViewController/XHDemoWeChatMessageTableViewController.m
@@ -307,7 +307,6 @@ - (void)loadMoreMessagesScrollTotop {
         WEAKSELF
         dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
             NSMutableArray *messages = [weakSelf getTestMessages];
-            sleep(2);
             dispatch_async(dispatch_get_main_queue(), ^{
                 [weakSelf insertOldMessages:messages];
                 weakSelf.loadingMoreMessage = NO;
diff --git a/Example/MessageDisplayKitWeChatExample/MessageDisplayKitWeChatExample/Controllers/XHProfileTableViewController/XHMoreExpressionShopsTableViewController/XHMoreExpressionShopsTableViewController.m b/Example/MessageDisplayKitWeChatExample/MessageDisplayKitWeChatExample/Controllers/XHProfileTableViewController/XHMoreExpressionShopsTableViewController/XHMoreExpressionShopsTableViewController.m
@@ -23,7 +23,6 @@ @implementation XHMoreExpressionShopsTableViewController
 - (void)loadDataSource {
     self.isDataLoading = YES;
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        sleep(1);
         NSMutableArray *dataSource = [NSMutableArray arrayWithArray:@[@"emotionShopOne", @"emotionShopOne", @"emotionShopOne", @"emotionShopOne", @"emotionShopTwo", @"emotionShopOther", @"emotionShopTwo", @"", @"emotionShopTwo", @"emotionShopOther", @"emotionShopOne", @"emotionShopOther", @"emotionShopTwo", @"emotionShopOne", @"emotionShopTwo"]];
 
         dispatch_async(dispatch_get_main_queue(), ^{
diff --git a/MessageDisplayKit/Classes/Controllers/XHMessageTableViewController/XHMessageTableViewController.m b/MessageDisplayKit/Classes/Controllers/XHMessageTableViewController/XHMessageTableViewController.m
@@ -510,6 +510,11 @@ - (void)initilzer {
     if ([self respondsToSelector:@selector(automaticallyAdjustsScrollViewInsets)]) {
         self.automaticallyAdjustsScrollViewInsets = NO;
     }
+    
+    if ([self respondsToSelector:@selector(edgesForExtendedLayout)]) {
+        self.edgesForExtendedLayout = UIRectEdgeNone;
+    }
+    
     // 默认设置用户滚动为NO
     _isUserScrolling = NO;
     
@@ -711,7 +716,6 @@ - (NSString *)getRecorderPath {
     NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
     dateFormatter.dateFormat = @"yy-MMMM-dd";
     recorderPath = [[NSString alloc] initWithFormat:@"%@/Documents/", NSHomeDirectory()];
-//    dateFormatter.dateFormat = @"hh-mm-ss";
     dateFormatter.dateFormat = @"yyyy-MM-dd-hh-mm-ss";
     recorderPath = [recorderPath stringByAppendingFormat:@"%@-MySound.caf", [dateFormatter stringFromDate:now]];
     return recorderPath;
@@ -804,7 +808,7 @@ - (UIEdgeInsets)tableViewInsetsWithBottomValue:(CGFloat)bottom {
     UIEdgeInsets insets = UIEdgeInsetsZero;
     
     if ([self respondsToSelector:@selector(topLayoutGuide)]) {
-        insets.top = 64;
+        insets.top = self.topLayoutGuide.length;
     }
     
     insets.bottom = bottom;
@@ -1143,7 +1147,7 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView {
     if ([self.delegate respondsToSelector:@selector(shouldLoadMoreMessagesScrollToTop)]) {
         BOOL shouldLoadMoreMessages = [self.delegate shouldLoadMoreMessagesScrollToTop];
         if (shouldLoadMoreMessages) {
-            if (scrollView.contentOffset.y >=0 && scrollView.contentOffset.y <= 44) {
+            if (scrollView.contentOffset.y >= 0 && scrollView.contentOffset.y <= 44) {
                 if (!self.loadingMoreMessage) {
                     if ([self.delegate respondsToSelector:@selector(loadMoreMessagesScrollTotop)]) {
                         [self.delegate loadMoreMessagesScrollTotop];
