wangrui460
diff --git a/‎WRNavigationBar/WRNavigationBar.swift‎
Lines changed: 18 additions & 7 deletions b/‎WRNavigationBar/WRNavigationBar.swift‎
Lines changed: 18 additions & 7 deletions
diff --git a/‎WRNavigationBar_swift/WRNavigationBar_swift/WRNavigationBar/WRNavigationBar.swift‎
Lines changed: 18 additions & 7 deletions b/‎WRNavigationBar_swift/WRNavigationBar_swift/WRNavigationBar/WRNavigationBar.swift‎
Lines changed: 18 additions & 7 deletions
@@ -569,10 +569,8 @@ extension UIViewController: WRAwakeProtocol
 // let navBar = customNavBar as! UINavigationBar
 // navBar.wr_setBackgroundColor(color: newValue)
  }
- else
- {
- let isRootViewController = self.navigationController?.viewControllers.first == self
- if (pushToCurrentVCFinished == true || isRootViewController == true) && pushToNextVCFinished == false {
+ else {
+ if canUpdateNavBarBarTintColorOrBackgroundAlpha == true {
  navigationController?.setNeedsNavigationBarUpdate(barTintColor: newValue)
  }
  }
@@ -594,14 +592,23 @@ extension UIViewController: WRAwakeProtocol
 // let navBar = customNavBar as! UINavigationBar
 // navBar.wr_setBackgroundAlpha(alpha: newValue)
  }
- else
- {
- if pushToCurrentVCFinished == true && pushToNextVCFinished == false {
+ else {
+ if canUpdateNavBarBarTintColorOrBackgroundAlpha == true {
  navigationController?.setNeedsNavigationBarUpdate(barBackgroundAlpha: newValue)
  }
  }
  }
  }
+ private var canUpdateNavBarBarTintColorOrBackgroundAlpha:Bool {
+ get {
+ let isRootViewController = self.navigationController?.viewControllers.first == self
+ if (pushToCurrentVCFinished == true || isRootViewController == true) && pushToNextVCFinished == false {
+ return true
+ } else {
+ return false
+ }
+ }
+ }
 
  // navigationBar tintColor
  var navBarTintColor: UIColor {
@@ -735,6 +742,10 @@ extension UIViewController: WRAwakeProtocol
 
  @objc func wr_viewDidAppear(_ animated: Bool)
  {
+ 
+ if self.navigationController?.viewControllers.first != self {
+ self.pushToCurrentVCFinished = true
+ }
  if canUpdateNavigationBar() == true
  {
  if let navBarBgImage = navBarBackgroundImage {
 
@@ -569,10 +569,8 @@ extension UIViewController: WRAwakeProtocol
 // let navBar = customNavBar as! UINavigationBar
 // navBar.wr_setBackgroundColor(color: newValue)
  }
- else
- {
- let isRootViewController = self.navigationController?.viewControllers.first == self
- if (pushToCurrentVCFinished == true || isRootViewController == true) && pushToNextVCFinished == false {
+ else {
+ if canUpdateNavBarBarTintColorOrBackgroundAlpha == true {
  navigationController?.setNeedsNavigationBarUpdate(barTintColor: newValue)
  }
  }
@@ -594,14 +592,23 @@ extension UIViewController: WRAwakeProtocol
 // let navBar = customNavBar as! UINavigationBar
 // navBar.wr_setBackgroundAlpha(alpha: newValue)
  }
- else
- {
- if pushToCurrentVCFinished == true && pushToNextVCFinished == false {
+ else {
+ if canUpdateNavBarBarTintColorOrBackgroundAlpha == true {
  navigationController?.setNeedsNavigationBarUpdate(barBackgroundAlpha: newValue)
  }
  }
  }
  }
+ private var canUpdateNavBarBarTintColorOrBackgroundAlpha:Bool {
+ get {
+ let isRootViewController = self.navigationController?.viewControllers.first == self
+ if (pushToCurrentVCFinished == true || isRootViewController == true) && pushToNextVCFinished == false {
+ return true
+ } else {
+ return false
+ }
+ }
+ }
 
  // navigationBar tintColor
  var navBarTintColor: UIColor {
@@ -735,6 +742,10 @@ extension UIViewController: WRAwakeProtocol
 
  @objc func wr_viewDidAppear(_ animated: Bool)
  {
+ 
+ if self.navigationController?.viewControllers.first != self {
+ self.pushToCurrentVCFinished = true
+ }
  if canUpdateNavigationBar() == true
  {
  if let navBarBgImage = navBarBackgroundImage {
Original file line number	Diff line number	Diff line change
`@@ -569,10 +569,8 @@ extension UIViewController: WRAwakeProtocol`
`569`	`569`	`// let navBar = customNavBar as! UINavigationBar`
`570`	`570`	`// navBar.wr_setBackgroundColor(color: newValue)`
`571`	`571`	`}`
`572`		`- else`
`573`		`- {`
`574`		`- let isRootViewController = self.navigationController?.viewControllers.first == self`
`575`		`- if (pushToCurrentVCFinished == true \|\| isRootViewController == true) && pushToNextVCFinished == false {`
	`572`	`+ else {`
	`573`	`+ if canUpdateNavBarBarTintColorOrBackgroundAlpha == true {`
`576`	`574`	`navigationController?.setNeedsNavigationBarUpdate(barTintColor: newValue)`
`577`	`575`	`}`
`578`	`576`	`}`
`@@ -594,14 +592,23 @@ extension UIViewController: WRAwakeProtocol`
`594`	`592`	`// let navBar = customNavBar as! UINavigationBar`
`595`	`593`	`// navBar.wr_setBackgroundAlpha(alpha: newValue)`
`596`	`594`	`}`
`597`		`- else`
`598`		`- {`
`599`		`- if pushToCurrentVCFinished == true && pushToNextVCFinished == false {`
	`595`	`+ else {`
	`596`	`+ if canUpdateNavBarBarTintColorOrBackgroundAlpha == true {`
`600`	`597`	`navigationController?.setNeedsNavigationBarUpdate(barBackgroundAlpha: newValue)`
`601`	`598`	`}`
`602`	`599`	`}`
`603`	`600`	`}`
`604`	`601`	`}`
	`602`	`+ private var canUpdateNavBarBarTintColorOrBackgroundAlpha:Bool {`
	`603`	`+ get {`
	`604`	`+ let isRootViewController = self.navigationController?.viewControllers.first == self`
	`605`	`+ if (pushToCurrentVCFinished == true \|\| isRootViewController == true) && pushToNextVCFinished == false {`
	`606`	`+ return true`
	`607`	`+ } else {`
	`608`	`+ return false`
	`609`	`+ }`
	`610`	`+ }`
	`611`	`+ }`
`605`	`612`
`606`	`613`	`// navigationBar tintColor`
`607`	`614`	`var navBarTintColor: UIColor {`
`@@ -735,6 +742,10 @@ extension UIViewController: WRAwakeProtocol`
`735`	`742`
`736`	`743`	`@objc func wr_viewDidAppear(_ animated: Bool)`
`737`	`744`	`{`
	`745`	`+`
	`746`	`+ if self.navigationController?.viewControllers.first != self {`
	`747`	`+ self.pushToCurrentVCFinished = true`
	`748`	`+ }`
`738`	`749`	`if canUpdateNavigationBar() == true`
`739`	`750`	`{`
`740`	`751`	`if let navBarBgImage = navBarBackgroundImage {`