revert log

app/src/main/java/io/legado/app/service/help/ReadBook.kt

@@ -339,9 +339,11 @@ object ReadBook {
             index = content.indexOf(query, index + 1);
             count += 1
         }
+        Log.d("h11128", "new index $index")
         val contentPosition = index
         var pageIndex = 0
         var length = pages[pageIndex].text.length
+        Log.d("h11128", "page size ${pages.size}")
         while (length < contentPosition){
             pageIndex += 1
             if (pageIndex >pages.size){
@@ -349,12 +351,16 @@ object ReadBook {
                 break
             }
             length += pages[pageIndex].text.length
+            Log.d("h11128", "to next page , add length change to $length")
         }
 
+        Log.d("h11128", "at pageindex $pageIndex")
+
         // calculate search result's lineIndex
         val currentPage = pages[pageIndex]
         var lineIndex = 0
         length = length - currentPage.text.length + currentPage.textLines[lineIndex].text.length
+        Log.d("h11128", "currentLine ${currentPage.textLines[lineIndex].text}")
         while (length < contentPosition){
             lineIndex += 1
             if (lineIndex >currentPage.textLines.size){
@@ -362,12 +368,17 @@ object ReadBook {
                 break
             }
             length += currentPage.textLines[lineIndex].text.length
+            Log.d("h11128", "currentLine ${currentPage.textLines[lineIndex].text}")
         }
 
         // charIndex
+        Log.d("h11128", "currentLine ${currentPage.textLines[lineIndex].text}")
+        Log.d("h11128", "currentLength $length")
         val currentLine = currentPage.textLines[lineIndex]
         length -= currentLine.text.length
+        Log.d("h11128", "currentLength $length")
         val charIndex = contentPosition - length
+        Log.d("h11128", "contentLength $contentPosition")
         return arrayOf(pageIndex, lineIndex, charIndex)
     }
 

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

@@ -780,13 +780,18 @@ class ReadBookActivity : VMBaseActivity<ReadBookViewModel>(R.layout.activity_boo
                             val indexWithinChapter = data.getIntExtra("indexWithinChapter", 0)
                             val query = data.getStringExtra("query")
                             viewModel.openChapter(index)
+
                             // block until load correct chapter and pages
                             var pages = ReadBook.curTextChapter?.pages
                             while (ReadBook.durChapterIndex != index || pages == null ){
                                 delay(100L)
                                 pages = ReadBook.curTextChapter?.pages
                             }
+                            Log.d("h11128", "Current chapter pages ${pages.size}")
                             val positions = ReadBook.searchResultPositions(pages, indexWithinChapter, query!!)
+                            Log.d("h11128", positions[0].toString())
+                            Log.d("h11128", positions[1].toString())
+                            Log.d("h11128", positions[2].toString())
                             //todo: show selected text
                             val job1 = async(Main){
                                 ReadBook.skipToPage(positions[0])

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

@@ -121,12 +121,15 @@ class SearchListFragment : VMBaseFragment<SearchListViewModel>(R.layout.fragment
                     val job = async(IO){
                         if (isLocalBook || adapter.cacheFileNames.contains(BookHelp.formatChapterName(chapter))) {
                             searchResults = searchChapter(newText, chapter)
+                            //Log.d("h11128", "find ${searchResults.size} results in chapter ${chapter.title}")
                         }
                     }
                     job.await()
                     if (searchResults.isNotEmpty()){
+                        //Log.d("h11128", "load ${searchResults.size} results in chapter ${chapter.title}")
                         searchResultList.addAll(searchResults)
                         tv_current_search_info.text = "搜索结果：$searchResultCounts"
+                        //Log.d("h11128", "searchResultList size ${searchResultList.size}")
                         adapter.addItems(searchResults)
                         searchResults = listOf<SearchResult>()
                     }
@@ -226,6 +229,7 @@ class SearchListFragment : VMBaseFragment<SearchListViewModel>(R.layout.fragment
         searchData.putExtra("contentPosition", searchResult.contentPosition)
         searchData.putExtra("query", searchResult.query)
         searchData.putExtra("indexWithinChapter", searchResult.indexWithinChapter)
+        Log.d("h11128","current chapter index ${searchResult.chapterIndex}")
         activity?.setResult(RESULT_OK, searchData)
         activity?.finish()