feat: 优化代码

pull/133/head
kunfei 5 years ago
parent 52c366da4f
commit f6b3fb1b49
  1. 4
      app/src/main/java/io/legado/app/ui/book/read/page/PageView.kt
  2. 2
      app/src/main/java/io/legado/app/ui/book/read/page/delegate/HorizontalPageDelegate.kt
  3. 8
      app/src/main/java/io/legado/app/ui/book/read/page/delegate/PageDelegate.kt
  4. 2
      app/src/main/java/io/legado/app/ui/book/read/page/delegate/ScrollPageDelegate.kt

@ -117,7 +117,7 @@ class PageView(context: Context, attrs: AttributeSet) :
callBack.screenOffTimerStart() callBack.screenOffTimerStart()
} }
fun moveToPrevPage(noAnim: Boolean = true) { fun moveToPrevPage(noAnim: Boolean = false) {
if (noAnim) { if (noAnim) {
fillPage(PageDelegate.Direction.PREV) fillPage(PageDelegate.Direction.PREV)
} else { } else {
@ -125,7 +125,7 @@ class PageView(context: Context, attrs: AttributeSet) :
} }
} }
fun moveToNextPage(noAnim: Boolean = true) { fun moveToNextPage(noAnim: Boolean = false) {
if (noAnim) { if (noAnim) {
fillPage(PageDelegate.Direction.NEXT) fillPage(PageDelegate.Direction.NEXT)
} else { } else {

@ -54,6 +54,7 @@ abstract class HorizontalPageDelegate(pageView: PageView) : PageDelegate(pageVie
} }
override fun nextPageByAnim() { override fun nextPageByAnim() {
super.nextPageByAnim()
if (!hasNext()) return if (!hasNext()) return
setDirection(Direction.NEXT) setDirection(Direction.NEXT)
setTouchPoint(viewWidth.toFloat(), 0f) setTouchPoint(viewWidth.toFloat(), 0f)
@ -61,6 +62,7 @@ abstract class HorizontalPageDelegate(pageView: PageView) : PageDelegate(pageVie
} }
override fun prevPageByAnim() { override fun prevPageByAnim() {
super.prevPageByAnim()
if (!hasPrev()) return if (!hasPrev()) return
setDirection(Direction.PREV) setDirection(Direction.PREV)
setTouchPoint(0f, 0f) setTouchPoint(0f, 0f)

@ -161,9 +161,13 @@ abstract class PageDelegate(protected val pageView: PageView) :
open fun onScroll() {}//移动contentView, slidePage open fun onScroll() {}//移动contentView, slidePage
abstract fun nextPageByAnim() open fun nextPageByAnim() {
abort()
}
abstract fun prevPageByAnim() open fun prevPageByAnim() {
abort()
}
@CallSuper @CallSuper
open fun setDirection(direction: Direction) { open fun setDirection(direction: Direction) {

@ -61,10 +61,12 @@ class ScrollPageDelegate(pageView: PageView) : PageDelegate(pageView) {
} }
override fun nextPageByAnim() { override fun nextPageByAnim() {
super.nextPageByAnim()
startScroll(0, 0, 0, -ChapterProvider.visibleHeight) startScroll(0, 0, 0, -ChapterProvider.visibleHeight)
} }
override fun prevPageByAnim() { override fun prevPageByAnim() {
super.prevPageByAnim()
startScroll(0, 0, 0, ChapterProvider.visibleHeight) startScroll(0, 0, 0, ChapterProvider.visibleHeight)
} }
} }
Loading…
Cancel
Save