|
|
@ -65,6 +65,7 @@ abstract class PageDelegate(protected val pageView: PageView) : |
|
|
|
var isRunning = false |
|
|
|
var isRunning = false |
|
|
|
var isStarted = false |
|
|
|
var isStarted = false |
|
|
|
var isTextSelected = false |
|
|
|
var isTextSelected = false |
|
|
|
|
|
|
|
var selectedOnDown = false |
|
|
|
|
|
|
|
|
|
|
|
open fun setStartPoint(x: Float, y: Float, invalidate: Boolean = true) { |
|
|
|
open fun setStartPoint(x: Float, y: Float, invalidate: Boolean = true) { |
|
|
|
startX = x |
|
|
|
startX = x |
|
|
@ -210,8 +211,8 @@ abstract class PageDelegate(protected val pageView: PageView) : |
|
|
|
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) { |
|
|
|
if (isTextSelected) { |
|
|
|
if (selectedOnDown) { |
|
|
|
isTextSelected = false |
|
|
|
selectedOnDown = false |
|
|
|
} |
|
|
|
} |
|
|
|
if (!noNext) onAnimStart() |
|
|
|
if (!noNext) onAnimStart() |
|
|
|
} |
|
|
|
} |
|
|
@ -224,6 +225,8 @@ abstract class PageDelegate(protected val pageView: PageView) : |
|
|
|
override fun onDown(e: MotionEvent): Boolean { |
|
|
|
override fun onDown(e: MotionEvent): Boolean { |
|
|
|
if (isTextSelected) { |
|
|
|
if (isTextSelected) { |
|
|
|
curPage.cancelSelect() |
|
|
|
curPage.cancelSelect() |
|
|
|
|
|
|
|
isTextSelected = false |
|
|
|
|
|
|
|
selectedOnDown = true |
|
|
|
} |
|
|
|
} |
|
|
|
//是否移动 |
|
|
|
//是否移动 |
|
|
|
isMoved = false |
|
|
|
isMoved = false |
|
|
@ -244,8 +247,8 @@ abstract class PageDelegate(protected val pageView: PageView) : |
|
|
|
* 单击 |
|
|
|
* 单击 |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
override fun onSingleTapUp(e: MotionEvent): Boolean { |
|
|
|
override fun onSingleTapUp(e: MotionEvent): Boolean { |
|
|
|
if (isTextSelected) { |
|
|
|
if (selectedOnDown) { |
|
|
|
isTextSelected = false |
|
|
|
selectedOnDown = false |
|
|
|
return true |
|
|
|
return true |
|
|
|
} |
|
|
|
} |
|
|
|
val x = e.x |
|
|
|
val x = e.x |
|
|
|