* 完成自定义转场的接口外露

BottomBar/BaseNavigationController.swift

@@ -10,6 +10,11 @@
 
 import UIKit
 
+enum pushOperation {
+ case normal
+ case bottomUp
+}
+
 class BaseNavigationController: UINavigationController, UINavigationControllerDelegate {
 
  var popInteractiveTransition: UIPercentDrivenInteractiveTransition?
@@ -39,9 +44,15 @@ class BaseNavigationController: UINavigationController, UINavigationControllerDe
  // 非手势交互转场
  func navigationController(_ navigationController: UINavigationController, animationControllerFor operation: UINavigationController.Operation, from fromVC: UIViewController, to toVC: UIViewController) -> UIViewControllerAnimatedTransitioning? {
  if operation == .push {
- return PushAnimatedTransitionAsFromBottomToTop.init()
+ if toVC.currentPushOperation == .bottomUp {
+ fromVC.isDelayShowBottomBar = false
+ return PushAnimatedTransitionAsFromBottomToTop.init()
+ }
  } else if (operation == .pop) {
- return PopAnimatedTransitioningAsFromTopToBottom.init()
+ if fromVC.currentPushOperation == .bottomUp {
+ toVC.isDelayShowBottomBar = true
+ return PopAnimatedTransitioningAsFromTopToBottom.init()
+ }
  }
  return nil
  }
@@ -136,3 +147,13 @@ extension BaseNavigationController: UIGestureRecognizerDelegate {
  }
 }
 
+extension UINavigationController {
+
+ func RTPushViewController(_ viewController: UIViewController, operation: pushOperation, animated: Bool) {
+
+ viewController.currentPushOperation = operation
+ self.pushViewController(viewController, animated: animated)
+ }
+}
+
+

BottomBar/BaseViewController.swift

@@ -13,7 +13,16 @@ class BaseViewController: UIViewController {
  override func viewDidLoad() {
  super.viewDidLoad()
  self.extendedLayoutIncludesOpaqueBars = true;
- self.automaticallyAdjustsScrollViewInsets = true;
  }
+
+ override func viewWillAppear(_ animated: Bool) {
+ super.viewWillAppear(animated)
+ }
+
+ override func viewDidAppear(_ animated: Bool) {
+ super.viewDidAppear(animated)
+
+ }
+
 
 }

BottomBar/MusicDetailVC.swift

@@ -24,6 +24,7 @@ class MusicDetailVC: BaseViewController {
  }
 
  override func viewWillAppear(_ animated: Bool) {
+ super.viewWillAppear(animated)
  if let tabBarController = self.tabBarController as? RootTabBarController {
  tabBarController.updateBottomStyle(.none)
  }

BottomBar/MusicViewController.swift

@@ -23,11 +23,11 @@ class MusicViewController: BaseViewController {
  override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
  let vc = MusicDetailVC()
  vc.modalPresentationStyle = .fullScreen
- self.navigationController?.pushViewController(vc, animated: true)
-// self.navigationController?.present(vc, animated: true, completion: nil)
+ self.navigationController?.RTPushViewController(vc, operation: .bottomUp, animated: true)
  }
 
  override func viewWillAppear(_ animated: Bool) {
+ super.viewWillAppear(animated)
  if let tabBarController = self.tabBarController as? RootTabBarController {
  tabBarController.updateBottomStyle(.all)
  }

BottomBar/Runtime.swift

@@ -13,6 +13,7 @@ extension UIViewController {
  // 嵌套结构体
  private struct AssociatedKeys {
  static var isDelayShowBottomBarKey = "isDelayShowBottomBarKey"
+ static var pushOperationKey = "pushOperationKey"
  }
 
  // 当前vc是否需要延迟做动画
@@ -24,4 +25,16 @@ extension UIViewController {
  objc_setAssociatedObject(self, &AssociatedKeys.isDelayShowBottomBarKey, newValue, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN_NONATOMIC)
  }
  }
+
+ var currentPushOperation: pushOperation {
+ get {
+ if let operation = objc_getAssociatedObject(self, &AssociatedKeys.pushOperationKey) as? pushOperation {
+ return operation
+ }
+ return .normal
+ }
+ set {
+ objc_setAssociatedObject(self, &AssociatedKeys.pushOperationKey, newValue, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN_NONATOMIC)
+ }
+ }
 }

BottomBar/VideoDetailVC.swift

@@ -17,6 +17,7 @@ class VideoDetailVC: BaseViewController {
  }
 
  override func viewWillAppear(_ animated: Bool) {
+ super.viewWillAppear(animated)
  if let tabBarController = self.tabBarController as? RootTabBarController {
  tabBarController.updateBottomStyle(.miniPlayViewOnly)
  }

BottomBar/VideoViewController.swift

@@ -21,6 +21,7 @@ class VideoViewController: BaseViewController {
  }
 
  override func viewWillAppear(_ animated: Bool) {
+ super.viewWillAppear(animated)
  if let tabBarController = self.tabBarController as? RootTabBarController {
  tabBarController.updateBottomStyle(.all)
  }