From f5b65f5e5b7ae173ab697a2ca257294991ac3f57 Mon Sep 17 00:00:00 2001 From: Jack_iMac Date: Tue, 18 Aug 2015 14:45:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E8=AE=A9=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E5=8E=BB=E6=8E=A7=E5=88=B6=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../XHPullRefreshTableViewController.m | 4 +--- .../XHSysatemRefreshTableViewController.m | 4 +--- RefreshControl/Manager/XHRefreshControl.m | 9 +-------- .../PinterestDemoRefreshTableViewController.m | 8 ++++++++ 4 files changed, 11 insertions(+), 14 deletions(-) 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.