讨论详情页面-加载更多评论时的指示框坐标bug

wanghengheng · wanghengheng · commit 2171cc2d82fe · 2015-03-10T17:38:36.000+08:00
讨论详情页面下拉刷新坐标动荡的bug
冒泡详情不能刷新的bug（之前只能刷新评论）
diff --git a/Coding_iOS/Controllers/TopicDetailViewController.m b/Coding_iOS/Controllers/TopicDetailViewController.m
@@ -84,7 +84,7 @@ - (void)viewDidLoad
     self.myTableView.contentInset = contentInsets;
     self.myTableView.scrollIndicatorInsets = contentInsets;
     
-    [_myTableView addInfiniteScrollingWithActionHandler:^{
+    [self.myTableView addInfiniteScrollingWithActionHandler:^{
         [weakSelf refreshMore];
     }];
     if (_curTopic && _curTopic.project) {
@@ -146,6 +146,7 @@ - (void)messageInputView:(UIMessageInputView *)inputView heightToBottomChenged:(
         
         self.myTableView.contentInset = contentInsets;
         self.myTableView.scrollIndicatorInsets = contentInsets;
+        [self.myTableView updateInfiniteScrollingPosition];
         
         if ([_commentSender isKindOfClass:[UIView class]] && !self.myTableView.isDragging && heightToBottom > 60) {
             UIView *senderView = _commentSender;
@@ -172,24 +173,22 @@ - (void)refreshTopic{
     }
     __weak typeof(self) weakSelf = self;
     [[Coding_NetAPIManager sharedManager] request_ProjectTopic_WithObj:_curTopic andBlock:^(id data, NSError *error) {
-        [self.refreshControl endRefreshing];
         if (data) {
+            if (weakSelf.curTopic.contentHeight > 1) {
+                ((ProjectTopic *)data).contentHeight = weakSelf.curTopic.contentHeight;
+            }
             weakSelf.curTopic = data;
-            
             weakSelf.myMsgInputView.curProject = weakSelf.curTopic.project;
             weakSelf.myMsgInputView.commentOfId = weakSelf.curTopic.id;
             weakSelf.myMsgInputView.toUser = nil;
             [weakSelf configNavBtn];
-            
-            [weakSelf.myTableView reloadData];
             [weakSelf refreshComments];
         }
     }];
 }
 
 - (void)refreshMore{
     if (_curTopic.isLoading || !_curTopic.canLoadMore) {
-        [self.myTableView.infiniteScrollingView stopAnimating];
         return;
     }
     _curTopic.willLoadMore = YES;
@@ -203,9 +202,9 @@ - (void)sendRequest{
         [weakSelf.myTableView.infiniteScrollingView stopAnimating];
         if (data) {
             [weakSelf.curTopic configWithComments:data];
-            [weakSelf.myTableView reloadData];
             weakSelf.myTableView.showsInfiniteScrolling = weakSelf.curTopic.canLoadMore;
         }
+        [weakSelf.myTableView reloadData];
     }];
 }
 
diff --git a/Coding_iOS/Controllers/TweetDetailViewController.m b/Coding_iOS/Controllers/TweetDetailViewController.m
@@ -168,23 +168,19 @@ - (void)refreshTweet{
     __weak typeof(self) weakSelf = self;
     [[Coding_NetAPIManager sharedManager] request_Tweet_Detail_WithObj:_curTweet andBlock:^(id data, NSError *error) {
         if (data) {
+            if (weakSelf.curTweet.contentHeight > 1) {
+                ((Tweet *)data).contentHeight = weakSelf.curTweet.contentHeight;
+            }
             weakSelf.curTweet = data;
             weakSelf.myMsgInputView.commentOfId = weakSelf.curTweet.id;
             weakSelf.myMsgInputView.toUser = nil;
-
-            [weakSelf.myTableView reloadData];
-            if (weakSelf.curTweet.comments.integerValue > weakSelf.curTweet.comment_list.count) {
-                [weakSelf refreshComments];//加载等多评论
-            }else{
-                [weakSelf.refreshControl endRefreshing];
-            }
+            [weakSelf refreshComments];
         }
     }];
 }
 
 - (void)refreshComments{
     if (_curTweet.isLoading) {
-        [_refreshControl endRefreshing];
         return;
     }
     __weak typeof(self) weakSelf = self;
diff --git a/Coding_iOS/Vendor/SVPullToRefresh/UIScrollView+SVInfiniteScrolling.h b/Coding_iOS/Vendor/SVPullToRefresh/UIScrollView+SVInfiniteScrolling.h
@@ -15,6 +15,7 @@
 
 - (void)addInfiniteScrollingWithActionHandler:(void (^)(void))actionHandler;
 - (void)triggerInfiniteScrolling;
+- (void)updateInfiniteScrollingPosition;
 
 @property (nonatomic, strong, readonly) SVInfiniteScrollingView *infiniteScrollingView;
 @property (nonatomic, assign) BOOL showsInfiniteScrolling;
diff --git a/Coding_iOS/Vendor/SVPullToRefresh/UIScrollView+SVInfiniteScrolling.m b/Coding_iOS/Vendor/SVPullToRefresh/UIScrollView+SVInfiniteScrolling.m
@@ -71,6 +71,15 @@ - (void)triggerInfiniteScrolling {
     [self.infiniteScrollingView startAnimating];
 }
 
+- (void)updateInfiniteScrollingPosition{
+    if (self.infiniteScrollingView) {
+        self.infiniteScrollingView.originalBottomInset = self.contentInset.bottom;
+        if (self.showsInfiniteScrolling) {
+            [self.infiniteScrollingView setScrollViewContentInsetForInfiniteScrolling];
+        }
+    }
+}
+
 - (void)setInfiniteScrollingView:(SVInfiniteScrollingView *)infiniteScrollingView {
     [self willChangeValueForKey:@"UIScrollViewInfiniteScrollingView"];
     objc_setAssociatedObject(self, &UIScrollViewInfiniteScrollingView,
diff --git a/Coding_iOS/Views/Cell/TopicContentCell.m b/Coding_iOS/Views/Cell/TopicContentCell.m
@@ -166,7 +166,7 @@ - (void)webViewDidFinishLoad:(UIWebView *)webView{
     [_activityIndicator stopAnimating];
     CGFloat scrollHeight = webView.scrollView.contentSize.height;
     if (ABS(scrollHeight - _curTopic.contentHeight) > 1) {
-        NSLog(@"ABS(scrollHeight - _tweet.contentHeight)=========\n scrollHeight: %.2f", ABS(scrollHeight - _curTopic.contentHeight));
+        NSLog(@"ABS(scrollHeight - _tweet.contentHeight): %.2f", ABS(scrollHeight - _curTopic.contentHeight));
         webView.scalesPageToFit = YES;
         _curTopic.contentHeight = scrollHeight;
         if (_cellHeightChangedBlock) {
