Merge branch 'master' of https://github.com/gedoor/legado

app/src/main/assets/updateLog.md

@@ -5,6 +5,7 @@
 
 **2020/12/16**
 * 修复上版本因更新组件引起的一些bug
+* 搜索一点都不闪了
 
 **2020/12/15**
 * 修复一些引起崩溃的bug

app/src/main/java/io/legado/app/ui/book/search/SearchAdapter.kt

@@ -3,9 +3,10 @@ package io.legado.app.ui.book.search
 import android.content.Context
 import android.os.Bundle
 import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
 import io.legado.app.R
+import io.legado.app.base.adapter.DiffRecyclerAdapter
 import io.legado.app.base.adapter.ItemViewHolder
-import io.legado.app.base.adapter.RecyclerAdapter
 import io.legado.app.data.entities.SearchBook
 import io.legado.app.databinding.ItemSearchBinding
 import io.legado.app.utils.gone
@@ -13,7 +14,38 @@ import io.legado.app.utils.visible
 import org.jetbrains.anko.sdk27.listeners.onClick
 
 class SearchAdapter(context: Context, val callBack: CallBack) :
-    RecyclerAdapter<SearchBook, ItemSearchBinding>(context) {
+    DiffRecyclerAdapter<SearchBook, ItemSearchBinding>(context) {
+
+    override val diffItemCallback: DiffUtil.ItemCallback<SearchBook>
+        get() = object : DiffUtil.ItemCallback<SearchBook>() {
+
+            override fun areItemsTheSame(oldItem: SearchBook, newItem: SearchBook): Boolean {
+                return when {
+                    oldItem.name != newItem.name -> false
+                    oldItem.author != newItem.author -> false
+                    else -> true
+                }
+            }
+
+            override fun areContentsTheSame(oldItem: SearchBook, newItem: SearchBook): Boolean {
+                return false
+            }
+
+            override fun getChangePayload(oldItem: SearchBook, newItem: SearchBook): Any {
+                val payload = Bundle()
+                payload.putInt("origins", newItem.origins.size)
+                if (oldItem.coverUrl != newItem.coverUrl)
+                    payload.putString("cover", newItem.coverUrl)
+                if (oldItem.kind != newItem.kind)
+                    payload.putString("kind", newItem.kind)
+                if (oldItem.latestChapterTitle != newItem.latestChapterTitle)
+                    payload.putString("last", newItem.latestChapterTitle)
+                if (oldItem.intro != newItem.intro)
+                    payload.putString("intro", newItem.intro)
+                return payload
+            }
+
+        }
 
     override fun getViewBinding(parent: ViewGroup): ItemSearchBinding {
         return ItemSearchBinding.inflate(inflater, parent, false)
@@ -66,9 +98,6 @@ class SearchAdapter(context: Context, val callBack: CallBack) :
         with(binding) {
             bundle.keySet().map {
                 when (it) {
-                    "name" -> tvName.text = searchBook.name
-                    "author" -> tvAuthor.text =
-                        context.getString(R.string.author_show, searchBook.author)
                     "origins" -> bvOriginCount.setBadgeCount(searchBook.origins.size)
                     "last" -> upLasted(binding, searchBook.latestChapterTitle)
                     "intro" -> {

app/src/main/java/io/legado/app/ui/book/search/SearchViewModel.kt

@@ -62,12 +62,8 @@ class SearchViewModel(application: Application) : BaseViewModel(application),
     }
 
     override fun onSearchSuccess(searchBooks: ArrayList<SearchBook>) {
-        if (context.getPrefBoolean(PreferKey.precisionSearch)) {
+        val precision = context.getPrefBoolean(PreferKey.precisionSearch)
-            precisionSearch(this, searchBooks)
+        mergeItems(this, searchBooks, precision)
-        } else {
-            App.db.searchBookDao.insert(*searchBooks.toTypedArray())
-            mergeItems(this, searchBooks)
-        }
     }
 
     override fun onSearchFinish() {
@@ -80,98 +76,59 @@ class SearchViewModel(application: Application) : BaseViewModel(application),
         isLoading = false
     }
 
-    /**
-     * 精确搜索处理
-     */
-    private fun precisionSearch(scope: CoroutineScope, searchBooks: List<SearchBook>) {
-        val books = arrayListOf<SearchBook>()
-        searchBooks.forEach { searchBook ->
-            if (searchBook.name.contains(searchKey, true)
-                || searchBook.author.contains(searchKey, true)
-            ) books.add(searchBook)
-        }
-        App.db.searchBookDao.insert(*books.toTypedArray())
-        if (scope.isActive) {
-            mergeItems(scope, books)
-        }
-    }
-
     /**
      * 合并搜索结果并排序
      */
     @Synchronized
-    private fun mergeItems(scope: CoroutineScope, newDataS: List<SearchBook>) {
+    private fun mergeItems(scope: CoroutineScope, newDataS: List<SearchBook>, precision: Boolean) {
         if (newDataS.isNotEmpty()) {
-            val copyDataS = ArrayList(searchBooks)
+            val prevData = ArrayList(searchBooks)
-            val searchBooksAdd = ArrayList<SearchBook>()
+            val precisionData = arrayListOf<SearchBook>()
-            if (copyDataS.size == 0) {
+            prevData.forEach {
-                copyDataS.addAll(newDataS)
+                if (!scope.isActive) return
-            } else {
+                if (it.name == searchKey || it.author == searchKey) {
-                //存在
+                    precisionData.add(it)
-                newDataS.forEach { item ->
+                }
+            }
+            repeat(precisionData.size) {
+                if (!scope.isActive) return
+                prevData.removeAt(0)
+            }
+            newDataS.forEach { nBook ->
+                if (!scope.isActive) return
+                if (nBook.name == searchKey || nBook.author == searchKey) {
                     var hasSame = false
-                    for (searchBook in copyDataS) {
+                    precisionData.forEach { pBook ->
-                        if (item.name == searchBook.name
+                        if (!scope.isActive) return
-                            && item.author == searchBook.author
+                        if (pBook.name == nBook.name && pBook.author == nBook.author) {
-                        ) {
+                            pBook.addOrigin(nBook.origin)
                             hasSame = true
-                            searchBook.addOrigin(item.origin)
-                            break
                         }
                     }
                     if (!hasSame) {
-                        searchBooksAdd.add(item)
+                        precisionData.add(nBook)
                     }
-                }
+                } else if (!precision) {
-                //添加
+                    var hasSame = false
-                searchBooksAdd.forEach { item ->
+                    prevData.forEach { pBook ->
-                    if (searchKey == item.name) {
+                        if (!scope.isActive) return
-                        for ((index, searchBook) in copyDataS.withIndex()) {
+                        if (pBook.name == nBook.name && pBook.author == nBook.author) {
-                            if (searchKey != searchBook.name) {
+                            pBook.addOrigin(nBook.origin)
-                                copyDataS.add(index, item)
+                            hasSame = true
-                                break
-                            }
-                        }
-                    } else if (searchKey == item.author) {
-                        for ((index, searchBook) in copyDataS.withIndex()) {
-                            if (searchKey != searchBook.name && searchKey == searchBook.author) {
-                                copyDataS.add(index, item)
-                                break
-                            }
                         }
-                    } else {
-                        copyDataS.add(item)
                     }
-                }
+                    if (!hasSame) {
-            }
+                        prevData.add(nBook)
-            if (!scope.isActive) return
-            searchBooks.sortWith { o1, o2 ->
-                if (o1.name == searchKey && o2.name != searchKey) {
-                    1
-                } else if (o1.name != searchKey && o2.name == searchKey) {
-                    -1
-                } else if (o1.author == searchKey && o2.author != searchKey) {
-                    1
-                } else if (o1.author != searchKey && o2.author == searchKey) {
-                    -1
-                } else if (o1.name == o2.name) {
-                    when {
-                        o1.origins.size > o2.origins.size -> {
-                            1
-                        }
-                        o1.origins.size < o2.origins.size -> {
-                            -1
-                        }
-                        else -> {
-                            0
-                        }
                     }
-                } else {
-                    0
                 }
             }
             if (!scope.isActive) return
-            searchBooks = copyDataS
+            precisionData.sortByDescending { it.origins.size }
+            if (!scope.isActive) return
+            if (!precision) {
+                precisionData.addAll(prevData)
+            }
+            searchBooks = precisionData
             upAdapter()
         }
     }