diff --git a/RefreshControl/Controllers/CustomTableViewController/XHPullRefreshTableViewController.m b/RefreshControl/Controllers/CustomTableViewController/XHPullRefreshTableViewController.m index 65ed14e..a71e2e6 100644 --- a/RefreshControl/Controllers/CustomTableViewController/XHPullRefreshTableViewController.m +++ b/RefreshControl/Controllers/CustomTableViewController/XHPullRefreshTableViewController.m @@ -74,9 +74,7 @@ - (id)init { - (void)viewDidAppear:(BOOL)animated { [super viewDidAppear:animated]; - if (self.pullDownRefreshed) { - [self setupRefreshControl]; - } + [self setupRefreshControl]; } - (void)viewDidLoad { diff --git a/RefreshControl/Controllers/SystemTableViewController/XHSysatemRefreshTableViewController.m b/RefreshControl/Controllers/SystemTableViewController/XHSysatemRefreshTableViewController.m index dc2d698..f93e9e1 100644 --- a/RefreshControl/Controllers/SystemTableViewController/XHSysatemRefreshTableViewController.m +++ b/RefreshControl/Controllers/SystemTableViewController/XHSysatemRefreshTableViewController.m @@ -78,9 +78,7 @@ - (id)init { - (void)viewDidAppear:(BOOL)animated { [super viewDidAppear:animated]; - if (self.pullDownRefreshed) { - [self setupRefreshControl]; - } + [self setupRefreshControl]; } - (void)viewDidLoad { diff --git a/RefreshControl/Manager/XHRefreshControl.m b/RefreshControl/Manager/XHRefreshControl.m index fe2c7f0..8c5a78e 100644 --- a/RefreshControl/Manager/XHRefreshControl.m +++ b/RefreshControl/Manager/XHRefreshControl.m @@ -21,7 +21,6 @@ #define kXHDefaultDisplayAutoLoadMoreRefreshedMessage @"点击显示下10条" - @interface XHRefreshControl () @property (nonatomic, weak) id delegate; @@ -129,8 +128,6 @@ - (void)endPullDownRefreshing { self.pullDownRefreshing = NO; self.refreshState = XHRefreshStateStopped; - - [self resetScrollViewContentInset]; } @@ -534,11 +531,7 @@ - (void)setup { [currentSuperView insertSubview:self.refreshActivityIndicatorContainerView belowSubview:self.scrollView]; break; case XHPullDownRefreshViewTypeCustom: { - UIView *customRefreshView = [self pullDownCustomRefreshView]; - customRefreshView.frame = CGRectMake(0, (self.refreshViewLayerType == XHRefreshViewLayerTypeOnScrollViews ? -kXHDefaultRefreshTotalPixels : self.originalTopInset), CGRectGetWidth([[UIScreen mainScreen] bounds]), kXHDefaultRefreshTotalPixels); - if (customRefreshView) { - [currentSuperView insertSubview:customRefreshView belowSubview:self.scrollView]; - } + [currentSuperView insertSubview:[self pullDownCustomRefreshView] belowSubview:self.scrollView]; break; } default: diff --git a/XHRefreshControlExample/XHRefreshControlExample/Controllers/PinterestDemoRefreshTableViewController/PinterestDemoRefreshTableViewController.m b/XHRefreshControlExample/XHRefreshControlExample/Controllers/PinterestDemoRefreshTableViewController/PinterestDemoRefreshTableViewController.m index 9e8436b..6ce9fd2 100644 --- a/XHRefreshControlExample/XHRefreshControlExample/Controllers/PinterestDemoRefreshTableViewController/PinterestDemoRefreshTableViewController.m +++ b/XHRefreshControlExample/XHRefreshControlExample/Controllers/PinterestDemoRefreshTableViewController/PinterestDemoRefreshTableViewController.m @@ -15,6 +15,14 @@ - (void)viewDidAppear:(BOOL)animated { [self startPullDownRefreshing]; } +- (instancetype)init { + self = [super init]; + if (self) { + //self.pullDownRefreshed = NO; + } + return self; +} + - (void)viewDidLoad { [super viewDidLoad]; // Do any additional setup after loading the view.