feat: 优化代码

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

@@ -176,7 +176,7 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
         linePos = 0
     }
 
-    fun selectText(x: Float, y: Float): Boolean {
+    fun selectText(x: Float, y: Float, select: (lineIndex: Int, charIndex: Int) -> Unit) {
         for ((lineIndex, textLine) in textPage.textLines.withIndex()) {
             if (y > textLine.lineTop && y < textLine.lineBottom) {
                 for ((charIndex, textChar) in textLine.textChars.withIndex()) {
@@ -189,13 +189,12 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
                         selectCharEnd = charIndex
                         upSelectedStart(textChar.start, textLine.lineBottom)
                         upSelectedEnd(textChar.end, textLine.lineBottom)
-                        return true
+                        select(lineIndex, charIndex)
                     }
                 }
                 break
             }
         }
-        return false
     }
 
     fun selectStartMove(x: Float, y: Float) {
@@ -217,6 +216,15 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
         }
     }
 
+    fun selectStartMoveIndex(lineIndex: Int, charIndex: Int) {
+        selectLineStart = lineIndex
+        selectCharStart = charIndex
+        val textLine = textPage.textLines[lineIndex]
+        val textChar = textLine.textChars[charIndex]
+        upSelectedStart(textChar.start, textLine.lineBottom)
+        upSelectChars(textPage)
+    }
+
     fun selectEndMove(x: Float, y: Float) {
         for ((lineIndex, textLine) in textPage.textLines.withIndex()) {
             if (y > textLine.lineTop && y < textLine.lineBottom) {
@@ -225,10 +233,7 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
                         if (selectLineEnd != lineIndex || selectCharEnd != charIndex) {
                             selectLineEnd = lineIndex
                             selectCharEnd = charIndex
-                            upSelectedEnd(
+                            upSelectedEnd(textChar.end, textLine.lineBottom)
-                                textChar.end,
-                                textLine.lineBottom
-                            )
                             upSelectChars(textPage)
                         }
                         break
@@ -239,6 +244,15 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
         }
     }
 
+    fun selectEndMoveIndex(lineIndex: Int, charIndex: Int) {
+        selectLineEnd = lineIndex
+        selectCharEnd = charIndex
+        val textLine = textPage.textLines[lineIndex]
+        val textChar = textLine.textChars[charIndex]
+        upSelectedEnd(textChar.end, textLine.lineBottom)
+        upSelectChars(textPage)
+    }
+
     private fun upSelectChars(textPage: TextPage) {
         for ((lineIndex, textLine) in textPage.textLines.withIndex()) {
             for ((charIndex, textChar) in textLine.textChars.withIndex()) {

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

@@ -120,19 +120,27 @@ class ContentView(context: Context) : FrameLayout(context) {
         content_text_view.selectAble = selectAble
     }
 
-    fun selectText(e: MotionEvent): Boolean {
+    fun selectText(e: MotionEvent, select: (lineIndex: Int, charIndex: Int) -> Unit) {
         val y = e.y - headerHeight
-        return content_text_view.selectText(e.x, y)
+        return content_text_view.selectText(e.x, y, select)
     }
 
     fun selectStartMove(x: Float, y: Float) {
         content_text_view.selectStartMove(x, y - headerHeight)
     }
 
+    fun selectStartMoveIndex(lineIndex: Int, charIndex: Int) {
+        content_text_view.selectStartMoveIndex(lineIndex, charIndex)
+    }
+
     fun selectEndMove(x: Float, y: Float) {
         content_text_view.selectEndMove(x, y - headerHeight)
     }
 
+    fun selectEndMoveIndex(lineIndex: Int, charIndex: Int) {
+        content_text_view.selectEndMoveIndex(lineIndex, charIndex)
+    }
+
     fun cancelSelect() {
         content_text_view.cancelSelect()
     }

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

@@ -1,6 +1,5 @@
 package io.legado.app.ui.book.read.page.delegate
 
-import android.util.Log
 import android.view.MotionEvent
 import io.legado.app.ui.book.read.page.PageView
 import kotlin.math.abs
@@ -11,7 +10,7 @@ abstract class HorizontalPageDelegate(pageView: PageView) : PageDelegate(pageVie
         when (event.action) {
             MotionEvent.ACTION_MOVE -> {
                 if (isTextSelected) {
-                    Log.e("selected", "--------------------------")
+                    selectText(event)
                 } else {
                     scroll(event)
                 }
@@ -51,4 +50,18 @@ abstract class HorizontalPageDelegate(pageView: PageView) : PageDelegate(pageVie
             setTouchPoint(event.x, event.y)
         }
     }
+
+    private fun selectText(event: MotionEvent) {
+        curPage.selectText(event) { lineIndex, charIndex ->
+            if (lineIndex > firstLineIndex
+                || (lineIndex == firstLineIndex && charIndex > firstCharIndex)
+            ) {
+                curPage.selectStartMoveIndex(firstLineIndex, firstCharIndex)
+                curPage.selectEndMoveIndex(lineIndex, charIndex)
+            } else {
+                curPage.selectEndMoveIndex(firstLineIndex, firstCharIndex)
+                curPage.selectStartMoveIndex(lineIndex, charIndex)
+            }
+        }
+    }
 }

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

@@ -67,6 +67,9 @@ abstract class PageDelegate(protected val pageView: PageView) :
     var isTextSelected = false
     var selectedOnDown = false
 
+    var firstLineIndex: Int = 0
+    var firstCharIndex: Int = 0
+
     open fun setStartPoint(x: Float, y: Float, invalidate: Boolean = true) {
         startX = x
         startY = y
@@ -283,7 +286,11 @@ abstract class PageDelegate(protected val pageView: PageView) :
      * 长按选择
      */
     override fun onLongPress(e: MotionEvent) {
-        isTextSelected = curPage.selectText(e)
+        curPage.selectText(e) { lineIndex, charIndex ->
+            isTextSelected = true
+            firstLineIndex = lineIndex
+            firstCharIndex = charIndex
+        }
     }
 
     /**