修改自定义的时候，让自定义去控制位置

xhzengAIB · Aug 18, 2015 · f5b65f5 · f5b65f5
1 parent 5989313
commit f5b65f5
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 14 deletions.
diff --git 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
@@ -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
@@ -21,7 +21,6 @@
 
 #define kXHDefaultDisplayAutoLoadMoreRefreshedMessage @"点击显示下10条"
 
-
 @interface XHRefreshControl ()
 
 @property (nonatomic, weak) id <XHRefreshControlDelegate> 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/...rollers/PinterestDemoRefreshTableViewController/PinterestDemoRefreshTableViewController.m b/...rollers/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.