feat: 优化代码

pull/105/head
kunfei 5 years ago
parent e57a981406
commit cc135d50b3
  1. 22
      app/src/main/java/io/legado/app/ui/book/read/page/delegate/SimulationPageDelegate.kt

@ -64,16 +64,18 @@ class SimulationPageDelegate(pageView: PageView) : HorizontalPageDelegate(pageVi
private var nextBitmap: Bitmap? = null private var nextBitmap: Bitmap? = null
init { init {
mMaxLength = hypot(pageView.width.toDouble(), pageView.height.toDouble()).toFloat() mMaxLength = hypot(viewWidth.toDouble(), viewWidth.toDouble()).toFloat()
mPaint.style = Paint.Style.FILL mPaint.style = Paint.Style.FILL
//设置颜色数组 //设置颜色数组
createDrawable() createDrawable()
val cm = ColorMatrix() val cm = ColorMatrix(
val array = floatArrayOf( floatArrayOf(
1f, 0f, 0f, 0f, 0f, 0f, 1f, 0f, 0f, 0f, 1f, 0f, 0f, 0f, 0f,
0f, 0f, 1f, 0f, 0f, 0f, 0f, 0f, 1f, 0f 0f, 1f, 0f, 0f, 0f,
0f, 0f, 1f, 0f, 0f,
0f, 0f, 0f, 1f, 0f
)
) )
cm.set(array)
mColorMatrixFilter = ColorMatrixColorFilter(cm) mColorMatrixFilter = ColorMatrixColorFilter(cm)
touchX = 0.01f //不让x,y为0,否则在点计算时会有问题 touchX = 0.01f //不让x,y为0,否则在点计算时会有问题
@ -88,15 +90,13 @@ class SimulationPageDelegate(pageView: PageView) : HorizontalPageDelegate(pageVi
override fun setTouchPoint(x: Float, y: Float, invalidate: Boolean) { override fun setTouchPoint(x: Float, y: Float, invalidate: Boolean) {
super.setTouchPoint(x, y, invalidate) super.setTouchPoint(x, y, invalidate)
//触摸y中间位置吧y变成屏幕高度 //触摸y中间位置吧y变成屏幕高度
if ((startY > pageView.height / 3.0 if ((startY > viewHeight * 0.33 && startY < viewHeight * 0.66)
&& startY < pageView.height * 2 / 3.0)
|| mDirection == Direction.PREV || mDirection == Direction.PREV
) { ) {
touchY = pageView.height.toFloat() touchY = viewHeight.toFloat()
} }
if (startY > pageView.height / 3.0 if (startY > viewHeight * 0.33 && startY < viewHeight / 2.0
&& startY < pageView.height / 2.0
&& mDirection == Direction.NEXT && mDirection == Direction.NEXT
) { ) {
touchY = 1f touchY = 1f

Loading…
Cancel
Save