|
|
@ -179,23 +179,6 @@ abstract class PageDelegate(protected val pageView: PageView) { |
|
|
|
onScrollStart() |
|
|
|
onScrollStart() |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
|
|
* 触摸事件处理 |
|
|
|
|
|
|
|
*/ |
|
|
|
|
|
|
|
@CallSuper |
|
|
|
|
|
|
|
open fun onTouch(event: MotionEvent): Boolean { |
|
|
|
|
|
|
|
if (isStarted) return false |
|
|
|
|
|
|
|
curPage.dispatchTouchEvent(event) |
|
|
|
|
|
|
|
if (event.action == MotionEvent.ACTION_UP) { |
|
|
|
|
|
|
|
if (isMoved) { |
|
|
|
|
|
|
|
// 开启翻页效果 |
|
|
|
|
|
|
|
if (!noNext) onScrollStart() |
|
|
|
|
|
|
|
return true |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
return detector.onTouchEvent(event) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
abstract fun onScrollStart()//scroller start |
|
|
|
abstract fun onScrollStart()//scroller start |
|
|
|
|
|
|
|
|
|
|
|
abstract fun onDraw(canvas: Canvas)//绘制 |
|
|
|
abstract fun onDraw(canvas: Canvas)//绘制 |
|
|
@ -229,6 +212,16 @@ abstract class PageDelegate(protected val pageView: PageView) { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
|
|
* 触摸事件处理 |
|
|
|
|
|
|
|
*/ |
|
|
|
|
|
|
|
@CallSuper |
|
|
|
|
|
|
|
open fun onTouch(event: MotionEvent): Boolean { |
|
|
|
|
|
|
|
if (isStarted) return false |
|
|
|
|
|
|
|
curPage.dispatchTouchEvent(event) |
|
|
|
|
|
|
|
return detector.onTouchEvent(event) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* 触摸事件处理 |
|
|
|
* 触摸事件处理 |
|
|
|
*/ |
|
|
|
*/ |
|
|
@ -288,6 +281,16 @@ abstract class PageDelegate(protected val pageView: PageView) { |
|
|
|
): Boolean { |
|
|
|
): Boolean { |
|
|
|
return this@PageDelegate.onScroll(e1, e2, distanceX, distanceY) |
|
|
|
return this@PageDelegate.onScroll(e1, e2, distanceX, distanceY) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
override fun onFling( |
|
|
|
|
|
|
|
e1: MotionEvent?, |
|
|
|
|
|
|
|
e2: MotionEvent?, |
|
|
|
|
|
|
|
velocityX: Float, |
|
|
|
|
|
|
|
velocityY: Float |
|
|
|
|
|
|
|
): Boolean { |
|
|
|
|
|
|
|
if (!noNext) onScrollStart() |
|
|
|
|
|
|
|
return true |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
fun hasPrev(): Boolean { |
|
|
|
fun hasPrev(): Boolean { |
|
|
|