Horis 1 год назад
Родитель
Сommit
3fa8960990
1 измененных файлов с 0 добавлено и 26 удалено
  1. 0 26
      app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt

+ 0 - 26
app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt

@@ -83,7 +83,6 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
     private var historyFlowJob: Job? = null
     private var booksFlowJob: Job? = null
     private var precisionSearchMenuItem: MenuItem? = null
-    private var isManualStopSearch = false
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         binding.llInputHelp.setBackgroundColor(backgroundColor)
@@ -181,7 +180,6 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
             override fun onQueryTextSubmit(query: String): Boolean {
                 searchView.clearFocus()
                 query.trim().let { searchKey ->
-                    isManualStopSearch = false
                     viewModel.saveSearchKey(searchKey)
                     viewModel.searchKey = ""
                     viewModel.search(searchKey)
@@ -236,14 +234,6 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
                 }
             }
         })
-        binding.recyclerView.addOnScrollListener(object : RecyclerView.OnScrollListener() {
-            override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
-                super.onScrolled(recyclerView, dx, dy)
-                if (!recyclerView.canScrollVertically(1)) {
-                    scrollToBottom()
-                }
-            }
-        })
     }
 
     private fun initOtherView() {
@@ -254,7 +244,6 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
                 .create()
         binding.fbStartStop.setOnClickListener {
             if (viewModel.isSearchLiveData.value == true) {
-                isManualStopSearch = true
                 viewModel.stop()
                 binding.refreshProgressBar.isAutoLoading = false
             } else {
@@ -306,21 +295,6 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
         }
     }
 
-    /**
-     * 滚动到底部事件
-     */
-    private fun scrollToBottom() {
-        if (isManualStopSearch) {
-            return
-        }
-        if (viewModel.isSearchLiveData.value == false
-            && viewModel.searchKey.isNotEmpty()
-            && viewModel.hasMore
-        ) {
-            viewModel.search("")
-        }
-    }
-
     /**
      * 打开关闭输入帮助
      */