From 088b74abf08f1b6c337dca8db5fff38f9f5559eb Mon Sep 17 00:00:00 2001 From: wangmchn Date: Fri, 29 Apr 2016 21:44:23 +0800 Subject: [PATCH] Fix bugs Signed-off-by: wangmchn --- WMPageController-Swift.podspec | 4 ++-- .../project.pbxproj | 1 + .../UserInterfaceState.xcuserstate | Bin 19145 -> 29315 bytes WMPageController-Swift/AppDelegate.swift | 2 +- .../PageController/PageController.swift | 20 +++++++++++++----- 5 files changed, 19 insertions(+), 8 deletions(-) diff --git a/WMPageController-Swift.podspec b/WMPageController-Swift.podspec index 986c309..f9c7bac 100755 --- a/WMPageController-Swift.podspec +++ b/WMPageController-Swift.podspec @@ -1,11 +1,11 @@ Pod::Spec.new do |s| s.name = "WMPageController-Swift" - s.version = "1.2.4" + s.version = "1.3.2" s.summary = "An easy solution to page controllers like NetEase News.(Swift Implementation)" s.homepage = "https://github.com/wangmchn/WMPageController-Swift" s.license = 'MIT (LICENSE)' s.author = { "wangmchn" => "wangmchn@163.com" } - s.source = { :git => "https://github.com/wangmchn/WMPageController-Swift.git", :tag => "1.2.4" } + s.source = { :git => "https://github.com/wangmchn/WMPageController-Swift.git", :tag => "1.3.2" } s.platform = :ios, '8.0' s.source_files = 'PageController', 'PageController/**/*.{swift}' diff --git a/WMPageController-Swift.xcodeproj/project.pbxproj b/WMPageController-Swift.xcodeproj/project.pbxproj index b06bd1e..5d8deca 100644 --- a/WMPageController-Swift.xcodeproj/project.pbxproj +++ b/WMPageController-Swift.xcodeproj/project.pbxproj @@ -697,6 +697,7 @@ 4D45BF6D1CC7BC12003F0151 /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; diff --git a/WMPageController-Swift.xcodeproj/project.xcworkspace/xcuserdata/Mark.xcuserdatad/UserInterfaceState.xcuserstate b/WMPageController-Swift.xcodeproj/project.xcworkspace/xcuserdata/Mark.xcuserdatad/UserInterfaceState.xcuserstate index 13027047bc314c58f76eb2c1c7d727c70cd2c57d..745d3ee92682f800a05bea88535a7450a246d1ae 100644 GIT binary patch literal 29315 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 X{J3w}Ehz*=xu4{2?x*|jahLudXYyMt delta 10356 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 diff --git a/WMPageController-Swift/AppDelegate.swift b/WMPageController-Swift/AppDelegate.swift index 7ef1074..6cb639e 100644 --- a/WMPageController-Swift/AppDelegate.swift +++ b/WMPageController-Swift/AppDelegate.swift @@ -18,7 +18,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { // Override point for customization after application launch. let pageController = customedPageController() window?.rootViewController = UINavigationController(rootViewController: pageController) - reloadPageController(pageController, afterDelay: 5.0) +// reloadPageController(pageController, afterDelay: 5.0) // updatePageController(pageController, title: "hahahahaha", afterDelay: 5.0) return true } diff --git a/WMPageController-Swift/PageController/PageController.swift b/WMPageController-Swift/PageController/PageController.swift index 16a8145..dadfc7f 100644 --- a/WMPageController-Swift/PageController/PageController.swift +++ b/WMPageController-Swift/PageController/PageController.swift @@ -140,6 +140,7 @@ public class PageController: UIViewController, UIScrollViewDelegate, MenuViewDel super.viewDidLoad() view.backgroundColor = .whiteColor() guard childControllersCount > 0 else { return } + calculateSize() addScrollView() addViewControllerAtIndex(_selectedIndex) @@ -306,13 +307,18 @@ public class PageController: UIViewController, UIScrollViewDelegate, MenuViewDel private func calculateSize() { var navBarHeight = (navigationController != nil) ? CGRectGetMaxY(navigationController!.navigationBar.frame) : 0 + let tabBar = tabBarController?.tabBar ?? (navigationController?.toolbar ?? nil) + let height = (tabBar != nil && tabBar?.hidden != true) ? CGRectGetHeight(tabBar!.frame) : 0 + var tabBarHeight = (hidesBottomBarWhenPushed == true) ? 0 : height + if edgesForExtendedLayout == UIRectEdge.None { navBarHeight = 0 + tabBarHeight = 0 } if viewFrame == CGRectZero { viewWidth = view.frame.size.width - viewHeight = view.frame.size.height - menuHeight - navBarHeight + viewHeight = view.frame.size.height - menuHeight - navBarHeight - tabBarHeight } else { viewWidth = viewFrame.size.width viewHeight = viewFrame.size.height - menuHeight @@ -342,7 +348,8 @@ public class PageController: UIViewController, UIScrollViewDelegate, MenuViewDel } private func addMenuView() { - let menuViewFrame = CGRect(x: viewX, y: viewY, width: viewWidth, height: menuHeight) + let menuY = showOnNavigationBar ? 0 : viewY + let menuViewFrame = CGRect(x: viewX, y: menuY, width: viewWidth, height: menuHeight) let menu = MenuView(frame: menuViewFrame) menu.delegate = self menu.dataSource = self @@ -429,7 +436,7 @@ public class PageController: UIViewController, UIScrollViewDelegate, MenuViewDel viewController.setValue(values?[index], forKey: optionalKeys[index]) } addChildViewController(viewController) - viewController.view.frame = childViewFrames[index] + viewController.view.frame = childViewFrames.count > 0 ? childViewFrames[index] : view.frame viewController.didMoveToParentViewController(self) contentView?.addSubview(viewController.view) willEnterController(viewController, atIndex: index) @@ -486,6 +493,8 @@ public class PageController: UIViewController, UIScrollViewDelegate, MenuViewDel private func adjustMenuViewFrame() { var realMenuHeight = menuHeight var menuX = viewX + var menuY = viewY + var rightWidth: CGFloat = 0.0 if showOnNavigationBar && (navigationController?.navigationBar != nil) { for subview in (navigationController?.navigationBar.subviews)! { @@ -506,15 +515,16 @@ public class PageController: UIViewController, UIScrollViewDelegate, MenuViewDel } let naviHeight = CGRectGetHeight(navigationController!.navigationBar.frame) realMenuHeight = menuHeight > naviHeight ? naviHeight : realMenuHeight + menuY = 0 } let menuWidth = viewWidth - menuX - rightWidth - menuView?.frame = CGRect(x: menuX, y: viewY, width: menuWidth, height: realMenuHeight) + menuView?.frame = CGRect(x: menuX, y: menuY, width: menuWidth, height: realMenuHeight) menuView?.resetFrames() } // MARK: - UIScrollView Delegate public func scrollViewDidScroll(scrollView: UIScrollView) { - if shouldNotScroll { return } + if shouldNotScroll || !hasInit { return } layoutChildViewControllers() guard startDragging else { return }