cooperku_kdanmobile 5 years ago
parent
commit
054bf0e787
1 changed files with 7 additions and 4 deletions
  1. 7 4
      src/main/java/com/kdanmobile/reader/screen/view/SearchView.kt

+ 7 - 4
src/main/java/com/kdanmobile/reader/screen/view/SearchView.kt

@@ -303,9 +303,8 @@ class SearchView: RelativeLayout, View.OnClickListener, LeftToolbarView {
                     pdfInfoHandler?.goToCurrentPage(page - 1)
                     pdfInfoHandler?.goToCurrentPage(page - 1)
                 }
                 }
             } else if (searchText.length >= 3) {
             } else if (searchText.length >= 3) {
-                val init = disposable == null
-                if (!init && (!isDone || startPage < 0)) return
-                if (startPage <= 0 || searchText != lastSearchText) {
+                if (!isDone) return
+                if (startPage == 0 || searchText != lastSearchText) {
                     searchStartPage = 0
                     searchStartPage = 0
                     searchResultNum = SEARCH_RESULT_INIT_NUMBER
                     searchResultNum = SEARCH_RESULT_INIT_NUMBER
                     if (list.size > 0) {
                     if (list.size > 0) {
@@ -443,7 +442,11 @@ class SearchView: RelativeLayout, View.OnClickListener, LeftToolbarView {
     }
     }
 
 
     override fun updateContent() {
     override fun updateContent() {
-        search(-1)
+        val init = disposable == null
+        if (init) {
+            isDone = true
+            search(0)
+        }
     }
     }
 
 
     override fun onScrollToContent(pageIndex: Int, notify: Boolean) {
     override fun onScrollToContent(pageIndex: Int, notify: Boolean) {