feat: 优化代码

app/src/main/java/io/legado/app/ui/book/read/page/delegate/CoverPageDelegate.kt

@@ -1,11 +1,12 @@
 package io.legado.app.ui.book.read.page.delegate
 
 import android.graphics.Canvas
+import android.graphics.Matrix
 import android.graphics.drawable.GradientDrawable
 import io.legado.app.ui.book.read.page.PageView
 
 class CoverPageDelegate(pageView: PageView) : HorizontalPageDelegate(pageView) {
-
+    private val bitmapMatrix = Matrix()
     private val shadowDrawableR: GradientDrawable
 
     init {
@@ -16,13 +17,6 @@ class CoverPageDelegate(pageView: PageView) : HorizontalPageDelegate(pageView) {
         shadowDrawableR.gradientType = GradientDrawable.LINEAR_GRADIENT
     }
 
-    override fun setStartPoint(x: Float, y: Float, invalidate: Boolean) {
-        curPage.x = 0.toFloat()
-        prevPage.x = -viewWidth.toFloat()
-        nextPage.x = 0.toFloat()
-        super.setStartPoint(x, y, invalidate)
-    }
-
     override fun onDraw(canvas: Canvas) {
         val offsetX = touchX - startX
 
@@ -33,10 +27,14 @@ class CoverPageDelegate(pageView: PageView) : HorizontalPageDelegate(pageView) {
         val distanceX = if (offsetX > 0) offsetX - viewWidth else offsetX + viewWidth
         if (!isRunning) return
         if (mDirection == Direction.PREV) {
-            prevPage.translationX = offsetX - viewWidth
+            bitmapMatrix.setTranslate(distanceX, 0.toFloat())
+            curBitmap?.let { canvas.drawBitmap(it, 0f, 0f, null) }
+            prevBitmap?.let { canvas.drawBitmap(it, bitmapMatrix, null) }
             addShadow(distanceX.toInt(), canvas)
         } else if (mDirection == Direction.NEXT) {
-            curPage.translationX = offsetX
+            bitmapMatrix.setTranslate(distanceX - viewWidth, 0.toFloat())
+            nextBitmap?.let { canvas.drawBitmap(it, 0f, 0f, null) }
+            curBitmap?.let { canvas.drawBitmap(it, bitmapMatrix, null) }
             addShadow(distanceX.toInt(), canvas)
         }
     }
@@ -52,8 +50,6 @@ class CoverPageDelegate(pageView: PageView) : HorizontalPageDelegate(pageView) {
     }
 
     override fun onAnimStop() {
-        curPage.x = 0.toFloat()
-        prevPage.x = -viewWidth.toFloat()
         if (!isCancel) {
             pageView.fillPage(mDirection)
         }

app/src/main/java/io/legado/app/ui/book/read/page/delegate/HorizontalPageDelegate.kt

@@ -1,11 +1,36 @@
 package io.legado.app.ui.book.read.page.delegate
 
+import android.graphics.Bitmap
 import android.view.MotionEvent
 import io.legado.app.ui.book.read.page.PageView
+import io.legado.app.utils.screenshot
 import kotlin.math.abs
 
 abstract class HorizontalPageDelegate(pageView: PageView) : PageDelegate(pageView) {
 
+    protected var curBitmap: Bitmap? = null
+    protected var prevBitmap: Bitmap? = null
+    protected var nextBitmap: Bitmap? = null
+
+    override fun setDirection(direction: Direction) {
+        super.setDirection(direction)
+        setBitmap()
+    }
+
+    private fun setBitmap() {
+        when (mDirection) {
+            Direction.PREV -> {
+                prevBitmap = prevPage.screenshot()
+                curBitmap = curPage.screenshot()
+            }
+            Direction.NEXT -> {
+                nextBitmap = nextPage.screenshot()
+                curBitmap = curPage.screenshot()
+            }
+            else -> Unit
+        }
+    }
+
     override fun onTouch(event: MotionEvent) {
         when (event.action) {
             MotionEvent.ACTION_DOWN -> {
@@ -69,4 +94,14 @@ abstract class HorizontalPageDelegate(pageView: PageView) : PageDelegate(pageVie
         onAnimStart()
     }
 
+    override fun onDestroy() {
+        super.onDestroy()
+        prevBitmap?.recycle()
+        prevBitmap = null
+        curBitmap?.recycle()
+        curBitmap = null
+        nextBitmap?.recycle()
+        nextBitmap = null
+    }
+
 }

app/src/main/java/io/legado/app/ui/book/read/page/delegate/SimulationPageDelegate.kt

@@ -4,7 +4,6 @@ import android.graphics.*
 import android.graphics.drawable.GradientDrawable
 import android.os.Build
 import io.legado.app.ui.book.read.page.PageView
-import io.legado.app.utils.screenshot
 import kotlin.math.*
 
 @Suppress("DEPRECATION")
@@ -73,10 +72,6 @@ class SimulationPageDelegate(pageView: PageView) : HorizontalPageDelegate(pageVi
 
     private val mPaint: Paint = Paint().apply { style = Paint.Style.FILL }
 
-    private var curBitmap: Bitmap? = null
-    private var prevBitmap: Bitmap? = null
-    private var nextBitmap: Bitmap? = null
-
     init {
         //设置颜色数组
         val color = intArrayOf(0x333333, -0x4fcccccd)
@@ -118,16 +113,6 @@ class SimulationPageDelegate(pageView: PageView) : HorizontalPageDelegate(pageVi
         mMaxLength = hypot(viewWidth.toDouble(), viewHeight.toDouble()).toFloat()
     }
 
-    override fun onDestroy() {
-        super.onDestroy()
-        prevBitmap?.recycle()
-        prevBitmap = null
-        curBitmap?.recycle()
-        curBitmap = null
-        nextBitmap?.recycle()
-        nextBitmap = null
-    }
-
     override fun setStartPoint(x: Float, y: Float, invalidate: Boolean) {
         super.setStartPoint(x, y, invalidate)
         calcCornerXY(x, y)
@@ -152,7 +137,6 @@ class SimulationPageDelegate(pageView: PageView) : HorizontalPageDelegate(pageVi
 
     override fun setDirection(direction: Direction) {
         super.setDirection(direction)
-        setBitmap()
         when (direction) {
             Direction.PREV ->
                 //上一页滑动不出现对角
@@ -169,20 +153,6 @@ class SimulationPageDelegate(pageView: PageView) : HorizontalPageDelegate(pageVi
         }
     }
 
-    private fun setBitmap() {
-        when (mDirection) {
-            Direction.PREV -> {
-                prevBitmap = prevPage.screenshot()
-                curBitmap = curPage.screenshot()
-            }
-            Direction.NEXT -> {
-                nextBitmap = nextPage.screenshot()
-                curBitmap = curPage.screenshot()
-            }
-            else -> Unit
-        }
-    }
-
     override fun onAnimStart() {
         var dx: Float
         val dy: Float

app/src/main/java/io/legado/app/ui/book/read/page/delegate/SlidePageDelegate.kt

@@ -1,16 +1,12 @@
 package io.legado.app.ui.book.read.page.delegate
 
 import android.graphics.Canvas
+import android.graphics.Matrix
 import io.legado.app.ui.book.read.page.PageView
 
 class SlidePageDelegate(pageView: PageView) : HorizontalPageDelegate(pageView) {
 
-    override fun setStartPoint(x: Float, y: Float, invalidate: Boolean) {
-        curPage.x = 0f
-        prevPage.x = -viewWidth.toFloat()
-        nextPage.x = viewWidth.toFloat()
-        super.setStartPoint(x, y, invalidate)
-    }
+    private val bitmapMatrix = Matrix()
 
     override fun onAnimStart() {
         val distanceX: Float
@@ -41,21 +37,22 @@ class SlidePageDelegate(pageView: PageView) : HorizontalPageDelegate(pageView) {
         if ((mDirection == Direction.NEXT && offsetX > 0)
             || (mDirection == Direction.PREV && offsetX < 0)
         ) return
-
+        val distanceX = if (offsetX > 0) offsetX - viewWidth else offsetX + viewWidth
         if (!isRunning) return
         if (mDirection == Direction.PREV) {
-            curPage.translationX = offsetX
-            prevPage.translationX = offsetX - viewWidth
+            bitmapMatrix.setTranslate(distanceX + viewWidth, 0.toFloat())
+            curBitmap?.let { canvas.drawBitmap(it, bitmapMatrix, null) }
+            bitmapMatrix.setTranslate(distanceX, 0.toFloat())
+            prevBitmap?.let { canvas.drawBitmap(it, bitmapMatrix, null) }
         } else if (mDirection == Direction.NEXT) {
-            curPage.translationX = offsetX
-            nextPage.translationX = offsetX + viewWidth
+            bitmapMatrix.setTranslate(distanceX, 0.toFloat())
+            nextBitmap?.let { canvas.drawBitmap(it, bitmapMatrix, null) }
+            bitmapMatrix.setTranslate(distanceX - viewWidth, 0.toFloat())
+            curBitmap?.let { canvas.drawBitmap(it, bitmapMatrix, null) }
         }
     }
 
     override fun onAnimStop() {
-        curPage.x = 0f
-        prevPage.x = -viewWidth.toFloat()
-        nextPage.x = viewWidth.toFloat()
         if (!isCancel) {
             pageView.fillPage(mDirection)
         }