feat: 优化代码

pull/117/head
kunfei 5 years ago
parent a0175af74e
commit 3424d7d8f4
  1. 3
      app/src/main/java/io/legado/app/ui/book/read/page/PageView.kt
  2. 5
      app/src/main/java/io/legado/app/ui/book/read/page/delegate/PageDelegate.kt
  3. 6
      app/src/main/java/io/legado/app/ui/book/read/page/delegate/ScrollPageDelegate.kt

@ -62,8 +62,9 @@ class PageView(context: Context, attrs: AttributeSet) :
@SuppressLint("ClickableViewAccessibility") @SuppressLint("ClickableViewAccessibility")
override fun onTouchEvent(event: MotionEvent): Boolean { override fun onTouchEvent(event: MotionEvent): Boolean {
pageDelegate?.onTouch(event)
callBack.screenOffTimerStart() callBack.screenOffTimerStart()
return pageDelegate?.onTouch(event) ?: super.onTouchEvent(event) return true
} }
fun onDestroy() { fun onDestroy() {

@ -204,8 +204,8 @@ abstract class PageDelegate(protected val pageView: PageView) :
* 触摸事件处理 * 触摸事件处理
*/ */
@CallSuper @CallSuper
open fun onTouch(event: MotionEvent): Boolean { open fun onTouch(event: MotionEvent) {
if (isStarted) return false if (isStarted) return
if (!detector.onTouchEvent(event)) { if (!detector.onTouchEvent(event)) {
//GestureDetector.onFling小幅移动不会触发,所以要自己判断 //GestureDetector.onFling小幅移动不会触发,所以要自己判断
if (event.action == MotionEvent.ACTION_UP && isMoved) { if (event.action == MotionEvent.ACTION_UP && isMoved) {
@ -215,7 +215,6 @@ abstract class PageDelegate(protected val pageView: PageView) :
if (!noNext) onAnimStart() if (!noNext) onAnimStart()
} }
} }
return true
} }
/** /**

@ -26,9 +26,11 @@ class ScrollPageDelegate(pageView: PageView) : PageDelegate(pageView) {
curPage.onScroll(touchY - lastY) curPage.onScroll(touchY - lastY)
} }
override fun onTouch(event: MotionEvent): Boolean { override fun onTouch(event: MotionEvent) {
when (event.action) { when (event.action) {
MotionEvent.ACTION_DOWN -> { MotionEvent.ACTION_DOWN -> {
lastY = event.y
setTouchPoint(event.x, event.y)
abort() abort()
mVelocity.clear() mVelocity.clear()
} }
@ -44,7 +46,7 @@ class ScrollPageDelegate(pageView: PageView) : PageDelegate(pageView) {
} }
} }
} }
return super.onTouch(event) super.onTouch(event)
} }
override fun onDestroy() { override fun onDestroy() {

Loading…
Cancel
Save