优化全文搜索

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

@@ -9,7 +9,6 @@ import android.graphics.drawable.ColorDrawable
 import android.net.Uri
 import android.os.Bundle
 import android.os.Handler
-import android.util.Log
 import android.view.*
 import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
 import androidx.core.view.get
@@ -57,14 +56,16 @@ import io.legado.app.ui.widget.dialog.TextDialog
 import io.legado.app.utils.*
 import kotlinx.android.synthetic.main.activity_book_read.*
 import kotlinx.android.synthetic.main.view_read_menu.*
-import kotlinx.coroutines.*
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.Dispatchers.Main
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.jetbrains.anko.sdk27.listeners.onClick
 import org.jetbrains.anko.startActivity
 import org.jetbrains.anko.startActivityForResult
 import org.jetbrains.anko.toast
-import java.lang.Runnable
 
 class ReadBookActivity : VMBaseActivity<ReadBookViewModel>(R.layout.activity_book_read),
     View.OnTouchListener,
@@ -494,6 +495,7 @@ class ReadBookActivity : VMBaseActivity<ReadBookViewModel>(R.layout.activity_boo
                 return true
             }
             R.id.menu_search_content -> {
+                viewModel.searchContentQuery = selectedText
                 openSearchActivity(selectedText)
                 return true
             }
@@ -686,7 +688,7 @@ class ReadBookActivity : VMBaseActivity<ReadBookViewModel>(R.layout.activity_boo
             startActivityForResult<SearchListActivity>(
                 requestCodeSearchResult,
                 Pair("bookUrl", it.bookUrl),
-                Pair("searchWord", searchWord)
+                Pair("searchWord", searchWord ?: viewModel.searchContentQuery)
             )
         }
     }
@@ -771,33 +773,50 @@ class ReadBookActivity : VMBaseActivity<ReadBookViewModel>(R.layout.activity_boo
                 requestCodeChapterList ->
                     data?.getIntExtra("index", ReadBook.durChapterIndex)?.let { index ->
                         if (index != ReadBook.durChapterIndex) {
-                                val pageIndex = data.getIntExtra("pageIndex", 0)
+                            val pageIndex = data.getIntExtra("pageIndex", 0)
-                                viewModel.openChapter(index, pageIndex)
+                            viewModel.openChapter(index, pageIndex)
-                            }
                         }
+                    }
                 requestCodeSearchResult ->
                     data?.getIntExtra("index", ReadBook.durChapterIndex)?.let { index ->
-                        launch(IO){
+                        launch(IO) {
                             val indexWithinChapter = data.getIntExtra("indexWithinChapter", 0)
-                            val query = data.getStringExtra("query")
+                            viewModel.searchContentQuery = data.getStringExtra("query") ?: ""
                             viewModel.openChapter(index)
                             // block until load correct chapter and pages
                             var pages = ReadBook.curTextChapter?.pages
-                            while (ReadBook.durChapterIndex != index || pages == null ){
+                            while (ReadBook.durChapterIndex != index || pages == null) {
                                 delay(100L)
                                 pages = ReadBook.curTextChapter?.pages
                             }
-                            val positions = ReadBook.searchResultPositions(pages, indexWithinChapter, query!!)
+                            val positions =
-                            while (ReadBook.durPageIndex != positions[0]){
+                                ReadBook.searchResultPositions(
+                                    pages,
+                                    indexWithinChapter,
+                                    viewModel.searchContentQuery
+                                )
+                            while (ReadBook.durPageIndex != positions[0]) {
                                 delay(100L)
                                 ReadBook.skipToPage(positions[0])
                             }
-                            withContext(Main){
+                            withContext(Main) {
-                                page_view.curPage.selectStartMoveIndex(0, positions[1], positions[2])
+                                page_view.curPage.selectStartMoveIndex(
+                                    0,
+                                    positions[1],
+                                    positions[2]
+                                )
                                 delay(20L)
-                                when (positions[3]){
+                                when (positions[3]) {
-                                    0 -> page_view.curPage.selectEndMoveIndex(0, positions[1], positions[2] + query.length - 1)
+                                    0 -> page_view.curPage.selectEndMoveIndex(
-                                    1 -> page_view.curPage.selectEndMoveIndex(0, positions[1] + 1, positions[4])
+                                        0,
+                                        positions[1],
+                                        positions[2] + viewModel.searchContentQuery.length - 1
+                                    )
+                                    1 -> page_view.curPage.selectEndMoveIndex(
+                                        0,
+                                        positions[1] + 1,
+                                        positions[4]
+                                    )
                                     //todo: consider change page, jump to scroll position
                                     -1 -> page_view.curPage.selectEndMoveIndex(1, 0, positions[4])
                                 }

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

@@ -23,6 +23,7 @@ import kotlinx.coroutines.withContext
 class ReadBookViewModel(application: Application) : BaseViewModel(application) {
 
     var isInitFinish = false
+    var searchContentQuery = ""
 
     fun initData(intent: Intent) {
         execute {

app/src/main/java/io/legado/app/ui/book/searchContent/SearchListActivity.kt

@@ -140,11 +140,8 @@ class SearchListActivity : VMBaseActivity<SearchListViewModel>(R.layout.activity
             launch(Dispatchers.Main) {
                 App.db.bookChapterDao().getChapterList(viewModel.bookUrl).map { chapter ->
                     val job = async(Dispatchers.IO) {
-                        if (isLocalBook || adapter.cacheFileNames.contains(
+                        if (isLocalBook
-                                BookHelp.formatChapterName(
+                            || adapter.cacheFileNames.contains(BookHelp.formatChapterName(chapter))
-                                    chapter
-                                )
-                            )
                         ) {
                             searchResults = searchChapter(newText, chapter)
                         }