优化

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

@@ -27,6 +27,7 @@ import io.legado.app.utils.getCompatColor
 import io.legado.app.utils.showDialogFragment
 import io.legado.app.utils.toastOnUi
 import java.util.concurrent.Executors
+import kotlin.math.max
 import kotlin.math.min
 
 /**
@@ -271,29 +272,19 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
      * 开始选择符移动
      */
     fun selectStartMove(x: Float, y: Float) {
-        touchRough(x, y) { relativeOffset, textPos, _, textLine, textColumn ->
+        touchRough(x, y) { _, textPos, _, _, _ ->
             if (selectStart.compare(textPos) == 0) {
                 return@touchRough
             }
             if (textPos.compare(selectEnd) <= 0) {
-                selectStart.upData(pos = textPos)
+                selectStartMoveIndex(textPos)
-                upSelectedStart(
-                    if (textPos.columnIndex < textLine.columns.size) textColumn.start else textColumn.end,
-                    textLine.lineBottom + relativeOffset,
-                    textLine.lineTop + relativeOffset
-                )
             } else {
                 reverseStartCursor = true
                 reverseEndCursor = false
                 selectEnd.columnIndex++
                 selectStartMoveIndex(selectEnd)
-                selectEnd.upData(textPos)
+                selectEndMoveIndex(textPos)
-                upSelectedEnd(
-                    if (textPos.columnIndex > -1) textColumn.end else textColumn.start,
-                    textLine.lineBottom + relativeOffset
-                )
             }
-            upSelectChars()
         }
     }
 
@@ -301,29 +292,19 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
      * 结束选择符移动
      */
     fun selectEndMove(x: Float, y: Float) {
-        touchRough(x, y) { relativeOffset, textPos, _, textLine, textColumn ->
+        touchRough(x, y) { _, textPos, _, _, _ ->
             if (textPos.compare(selectEnd) == 0) {
                 return@touchRough
             }
             if (textPos.compare(selectStart) >= 0) {
-                selectEnd.upData(textPos)
+                selectEndMoveIndex(textPos)
-                upSelectedEnd(
-                    if (textPos.columnIndex > -1) textColumn.end else textColumn.start,
-                    textLine.lineBottom + relativeOffset
-                )
             } else {
                 reverseEndCursor = true
                 reverseStartCursor = false
                 selectStart.columnIndex--
                 selectEndMoveIndex(selectStart)
-                selectStart.upData(textPos)
+                selectStartMoveIndex(textPos)
-                upSelectedStart(
-                    if (textPos.columnIndex < textLine.columns.size) textColumn.start else textColumn.end,
-                    textLine.lineBottom + relativeOffset,
-                    textLine.lineTop + relativeOffset
-                )
             }
-            upSelectChars()
         }
     }
 
@@ -494,7 +475,7 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
     ) {
         selectStart.relativePagePos = relativePagePos
         selectStart.lineIndex = lineIndex
-        selectStart.columnIndex = charIndex
+        selectStart.columnIndex = max(0, charIndex)
         val textLine = relativePage(relativePagePos).getLine(lineIndex)
         val textColumn = textLine.getColumn(charIndex)
         upSelectedStart(
@@ -519,8 +500,8 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
     ) {
         selectEnd.relativePagePos = relativePage
         selectEnd.lineIndex = lineIndex
-        selectEnd.columnIndex = charIndex
         val textLine = relativePage(relativePage).getLine(lineIndex)
+        selectEnd.columnIndex = min(charIndex, textLine.columns.lastIndex)
         val textColumn = textLine.getColumn(charIndex)
         upSelectedEnd(
             if (charIndex > -1) textColumn.end else textColumn.start,
@@ -549,12 +530,7 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
                     if (column is TextColumn) {
                         val compareStart = textPos.compare(selectStart)
                         val compareEnd = textPos.compare(selectEnd)
-                        column.selected = when {
+                        column.selected = compareStart >= 0 && compareEnd <= 0
-                            compareStart == 0 -> true
-                            compareEnd == 0 -> true
-                            compareStart > 0 && compareEnd < 0 -> true
-                            else -> false
-                        }
                         column.isSearchResult =
                             column.selected && callBack.isSelectingSearchResult
                         if (column.isSearchResult) {
@@ -620,10 +596,19 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
                     val compareEnd = textPos.compare(selectEnd)
                     if (column is TextColumn) {
                         when {
-                            compareStart == 0 -> {
+                            compareStart == -1 -> if (
-                                if (textPos.columnIndex < textLine.columns.size) {
+                                selectStart.columnIndex == textLine.columns.size
-                                    builder.append(column.charData)
+                                && charIndex == textLine.columns.lastIndex
-                                }
+                            ) {
+                                builder.append("\n")
+                            }
+
+                            compareEnd == 1 -> if (selectEnd.columnIndex == -1 && charIndex == 0) {
+                                builder.append("\n")
+                            }
+
+                            compareStart >= 0 && compareEnd <= 0 -> {
+                                builder.append(column.charData)
                                 if (
                                     textLine.isParagraphEnd
                                     && charIndex == textLine.columns.lastIndex
@@ -632,20 +617,6 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
                                     builder.append("\n")
                                 }
                             }
-
-                            compareEnd == 0 -> if (textPos.columnIndex > -1) {
-                                builder.append(column.charData)
-                            }
-
-                            compareStart > 0 && compareEnd < 0 -> {
-                                builder.append(column.charData)
-                                if (
-                                    textLine.isParagraphEnd
-                                    && charIndex == textLine.columns.lastIndex
-                                ) {
-                                    builder.append("\n")
-                                }
-                            }
                         }
                     }
                 }