contentTopInset 추가.

jangsy7883 · Jun 2, 2016 · 39512d6 · 39512d6
1 parent f4cfc96
commit 39512d6
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/JLFullScreenPageViewController.podspec b/JLFullScreenPageViewController.podspec
@@ -1,4 +1,4 @@
-@version = "1.0.28"
+@version = "1.0.29"
 Pod::Spec.new do |s|
   s.name         = "JLFullScreenPageViewController"
   s.version      = @version

diff --git a/JLFullScreenPageViewController/JLFullScreenPageViewController.h b/JLFullScreenPageViewController/JLFullScreenPageViewController.h
@@ -24,6 +24,8 @@ typedef NS_ENUM(NSInteger, JLFullScreenStyle)
 
 @property (nonatomic, assign) JLFullScreenStyle fullScreenStyle;
 
+@property (nonatomic, assign) CGFloat contentTopInset;
+
 @property (nonatomic, readonly, getter = isFullScreen) BOOL fullScreen;
 
 @property (nonatomic, assign, getter = isEnableNavigationBar) BOOL enableNavigationBar;

diff --git a/JLFullScreenPageViewController/JLFullScreenPageViewController.m b/JLFullScreenPageViewController/JLFullScreenPageViewController.m
@@ -72,6 +72,7 @@ - (void)viewDidLoad
 {
     [super viewDidLoad];
 
+    _contentTopInset = 0;
     _enableNavigationBar = YES;
     _enableTabBar = YES;
     _fullScreenStyle = JLFullScreenStyleAutomatic;
@@ -174,7 +175,7 @@ - (void)layoutContentInsetForScrollView:(UIScrollView*)scrollView atContentInset
     if ([scrollView isKindOfClass:[UIScrollView class]])
     {
         UIEdgeInsets contentInset = scrollView.contentInset;
-        contentInset.top = insetTop;
+        contentInset.top = insetTop - _contentTopInset;
         contentInset.bottom = (self.tabBarController.tabBar && self.tabBarController.tabBar.translucent == YES && _enableTabBar == NO) ? CGRectGetHeight(self.tabBarController.tabBar.frame) : 0;
         scrollView.contentInset = contentInset;
 

diff --git a/JLFullScreenPageViewController/JLPageViewController.m b/JLFullScreenPageViewController/JLPageViewController.m
@@ -155,19 +155,25 @@ - (void)reloadData
 
     if (viewController)
     {
+        typeof(self) __weak weakSelf = self;
+        NSArray *viewControllers = self.pageViewController.viewControllers;
+
         [self.pageViewController setViewControllers:@[viewController]
                                           direction:UIPageViewControllerNavigationDirectionForward
                                            animated:NO
-                                         completion:nil];
+                                         completion:^(BOOL finished)
+         {
+             typeof(weakSelf) __strong strongSelf = weakSelf;
+             [strongSelf pageViewController:strongSelf.pageViewController
+                         didFinishAnimating:NO
+                    previousViewControllers:viewControllers
+                        transitionCompleted:YES];
+         }];
 
         if ([self.delegate respondsToSelector:@selector(pageViewController:didScrollToCurrentPosition:)] )
         {
             [self.delegate pageViewController:self didScrollToCurrentPosition:_currentIndex];
         }
-        if ([self.delegate respondsToSelector:@selector(pageViewController:didChangeToCurrentIndex:fromIndex:)])
-        {
-            [self.delegate pageViewController:self didChangeToCurrentIndex:_currentIndex fromIndex:NSNotFound];
-        }
     }
 }