|
|
@ -109,11 +109,7 @@ class ScrollPageDelegate(pageView: PageView) : PageDelegate(pageView) { |
|
|
|
curPage?.dispatchTouchEvent(e2) |
|
|
|
curPage?.dispatchTouchEvent(e2) |
|
|
|
} |
|
|
|
} |
|
|
|
if (isMoved) { |
|
|
|
if (isMoved) { |
|
|
|
isCancel = if (pageView.isScrollDelegate) { |
|
|
|
isCancel = if (direction == Direction.NEXT) distanceY < 0 else distanceY > 0 |
|
|
|
if (direction == Direction.NEXT) distanceY < 0 else distanceY > 0 |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
if (direction == Direction.NEXT) distanceX < 0 else distanceX > 0 |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
isRunning = true |
|
|
|
isRunning = true |
|
|
|
//设置触摸点 |
|
|
|
//设置触摸点 |
|
|
|
setTouchPoint(e2.x, e2.y) |
|
|
|
setTouchPoint(e2.x, e2.y) |
|
|
|