diff --git a/Demo/TableViewPull/Classes/Controller/RootViewController/RootViewController.m b/Demo/TableViewPull/Classes/Controller/RootViewController/RootViewController.m index 7153dc3..c636b42 100755 --- a/Demo/TableViewPull/Classes/Controller/RootViewController/RootViewController.m +++ b/Demo/TableViewPull/Classes/Controller/RootViewController/RootViewController.m @@ -119,6 +119,12 @@ - (void)scrollViewDidEndDragging:(UIScrollView *)scrollView willDecelerate:(BOOL } +-(void)animationDidStop:(CAAnimation *)anim finished:(BOOL)flag { + if (!_reloading) { + [_refreshHeaderView egoRefreshScrollViewDataSourceDidFinishedLoading:self.tableView]; + } +} + #pragma mark - #pragma mark EGORefreshTableHeaderDelegate Methods @@ -126,7 +132,8 @@ - (void)scrollViewDidEndDragging:(UIScrollView *)scrollView willDecelerate:(BOOL - (void)egoRefreshTableHeaderDidTriggerRefresh:(EGORefreshTableHeaderView*)view{ [self reloadTableViewDataSource]; - [self performSelector:@selector(doneLoadingTableViewData) withObject:nil afterDelay:3.0]; + [self doneLoadingTableViewData]; + //[self performSelector:@selector(doneLoadingTableViewData) withObject:nil afterDelay:3.0]; } diff --git a/Demo/TableViewPull/Classes/View/RefreshTableHeaderView/EGORefreshTableHeaderView.m b/Demo/TableViewPull/Classes/View/RefreshTableHeaderView/EGORefreshTableHeaderView.m index 0def219..688991e 100755 --- a/Demo/TableViewPull/Classes/View/RefreshTableHeaderView/EGORefreshTableHeaderView.m +++ b/Demo/TableViewPull/Classes/View/RefreshTableHeaderView/EGORefreshTableHeaderView.m @@ -225,6 +225,8 @@ - (void)egoRefreshScrollViewDidEndDragging:(UIScrollView *)scrollView { [UIView beginAnimations:nil context:NULL]; [UIView setAnimationDuration:0.2]; scrollView.contentInset = UIEdgeInsetsMake(60.0f, 0.0f, 0.0f, 0.0f); + [UIView setAnimationDelegate:_delegate]; + [UIView setAnimationDidStopSelector:@selector(animationDidStop:finished:)]; [UIView commitAnimations]; } diff --git a/EGOTableViewPullRefresh/Classes/View/EGORefreshTableHeaderView.m b/EGOTableViewPullRefresh/Classes/View/EGORefreshTableHeaderView.m index 56b345b..f12caaf 100755 --- a/EGOTableViewPullRefresh/Classes/View/EGORefreshTableHeaderView.m +++ b/EGOTableViewPullRefresh/Classes/View/EGORefreshTableHeaderView.m @@ -228,6 +228,8 @@ - (void)egoRefreshScrollViewDidEndDragging:(UIScrollView *)scrollView { [UIView beginAnimations:nil context:NULL]; [UIView setAnimationDuration:0.2]; scrollView.contentInset = UIEdgeInsetsMake(60.0f, 0.0f, 0.0f, 0.0f); + [UIView setAnimationDelegate:_delegate]; + [UIView setAnimationDidStopSelector:@selector(animationDidStop:finished:)]; [UIView commitAnimations]; }