Commit 4d355d3

committed

解决移动导航栏后右滑返回中途取消的bug

1 parent 2c0eaac commit 4d355d3Copy full SHA for 4d355d3

File tree

2 files changed

+35

-4

lines changed

WRNavigationBar_swift/WRNavigationBar_swift/Demos
- SixthViewController.swift
- ThirdViewController.swift

2 files changed

+35

-4

lines changed

`‎WRNavigationBar_swift/WRNavigationBar_swift/Demos/SixthViewController.swift‎`

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -52,8 +52,6 @@ extension SixthViewController`
`52`	`52`	`override func viewDidAppear(_ animated: Bool)`
`53`	`53`	`{`
`54`	`54`	`super.viewDidAppear(animated)`
`55`		`- // 必须在view完全加载好再调用这个方法,否则就会出现白块的状况`
`56`		`- scrollViewDidScroll(self.tableView)`
`57`	`55`	`tableView.delegate = self;`
`58`	`56`	`}`
`59`	`57`

`‎WRNavigationBar_swift/WRNavigationBar_swift/Demos/ThirdViewController.swift‎`

Lines changed: 35 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,6 @@ extension ThirdViewController`
`47`	`47`	`override func viewDidAppear(_ animated: Bool)`
`48`	`48`	`{`
`49`	`49`	`super.viewDidAppear(animated)`
`50`		`- // 必须在view完全加载好再调用这个方法,否则就会出现白块的状况`
`51`		`- scrollViewDidScroll(self.tableView)`
`52`	`50`	`tableView.delegate = self;`
`53`	`51`	`}`
`54`	`52`
`@@ -59,6 +57,41 @@ extension ThirdViewController`
`59`	`57`	`navigationController?.navigationBar.wr_setTranslationY(translationY: 0)`
`60`	`58`	`}`
`61`	`59`
	`60`	`+ func scrollViewDidEndDecelerating(_ scrollView: UIScrollView)`
	`61`	`+ {`
	`62`	`+ stopScroll(scrollView)`
	`63`	`+ }`
	`64`	`+`
	`65`	`+ func scrollViewDidEndDragging(_ scrollView: UIScrollView, willDecelerate decelerate: Bool)`
	`66`	`+ {`
	`67`	`+ if decelerate == false {`
	`68`	`+ stopScroll(scrollView)`
	`69`	`+ }`
	`70`	`+ }`
	`71`	`+`
	`72`	`+ func stopScroll(_ scrollView: UIScrollView)`
	`73`	`+ {`
	`74`	`+ let offsetY = scrollView.contentOffset.y`
	`75`	`+ // 向上滑动的距离`
	`76`	`+ let scrollUpHeight = offsetY - NAVBAR_TRANSLATION_POINT`
	`77`	`+ if (scrollUpHeight >= 22)`
	`78`	`+ { // 超过导航栏高度的一半,只显示状态栏`
	`79`	`+ UIView.animate(withDuration: 0.3, animations: { [weak self] in`
	`80`	`+ if let weakSelf = self {`
	`81`	`+ weakSelf.setNavigationBarTransformProgress(progress: 1)`
	`82`	`+ }`
	`83`	`+ })`
	`84`	`+ }`
	`85`	`+ else`
	`86`	`+ { // 没有超过导航栏高度的一半,导航栏全部显示`
	`87`	`+ UIView.animate(withDuration: 0.3, animations: { [weak self] in`
	`88`	`+ if let weakSelf = self {`
	`89`	`+ weakSelf.setNavigationBarTransformProgress(progress: 0)`
	`90`	`+ }`
	`91`	`+ })`
	`92`	`+ }`
	`93`	`+ }`
	`94`	`+`
`62`	`95`	`func scrollViewDidScroll(_ scrollView: UIScrollView)`
`63`	`96`	`{`
`64`	`97`	`let offsetY = scrollView.contentOffset.y`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 4d355d3

File tree

2 files changed

2 files changed

`‎WRNavigationBar_swift/WRNavigationBar_swift/Demos/SixthViewController.swift‎`

`‎WRNavigationBar_swift/WRNavigationBar_swift/Demos/ThirdViewController.swift‎`

0 commit comments