优化搜索相关代码

whp98 · Oct 11, 2023 · 936b6ba · 936b6ba
1 parent 128b8bc
commit 936b6ba
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 22 deletions.
diff --git a/app/src/main/kotlin/com/aistra/hail/ui/apps/AppsAdapter.kt b/app/src/main/kotlin/com/aistra/hail/ui/apps/AppsAdapter.kt
@@ -60,11 +60,9 @@ object AppsAdapter :
                         && ((HailData.filterFrozenApps && AppManager.isAppFrozen(it.packageName))
                         || (HailData.filterUnfrozenApps && !AppManager.isAppFrozen(it.packageName)))
 
-                        && (query.isNullOrEmpty()
-                        || it.packageName.contains(query, true)
-                        || it.loadLabel(pm).toString().contains(query, true)
-                        || PinyinSearch.searchPinyinAll(it.loadLabel(pm).toString(), query)
-                        || FuzzySearch.search(it.loadLabel(pm).toString(), query))
+                        && (FuzzySearch.search(it.packageName, query)
+                        || FuzzySearch.search(it.loadLabel(pm).toString(), query)
+                        || PinyinSearch.searchPinyinAll(it.loadLabel(pm).toString(), query))
             }.run {
                 when (HailData.sortBy) {
                     HailData.SORT_INSTALL -> sortedBy {

diff --git a/app/src/main/kotlin/com/aistra/hail/ui/home/PagerFragment.kt b/app/src/main/kotlin/com/aistra/hail/ui/home/PagerFragment.kt
@@ -117,11 +117,9 @@ class PagerFragment : MainFragment(), PagerAdapter.OnItemClickListener,
 
     private fun updateCurrentList() = HailData.checkedList.filter {
         if (query.isEmpty()) it.tagId == tag.second
-        else (it.packageName.contains(query, true)
-                || it.name.contains(query, true)
-                || PinyinSearch.searchPinyinAll(it.name.toString(), query)
+        else (FuzzySearch.search(it.packageName, query)
                 || FuzzySearch.search(it.name.toString(), query)
-                )
+                || PinyinSearch.searchPinyinAll(it.name.toString(), query))
     }.sortedWith(NameComparator).let {
         binding.empty.isVisible = it.isEmpty()
         pagerAdapter.submitList(it)

diff --git a/app/src/main/kotlin/com/aistra/hail/utils/FuzzySearch.kt b/app/src/main/kotlin/com/aistra/hail/utils/FuzzySearch.kt
@@ -7,21 +7,25 @@ object FuzzySearch {
     private val levenshteinDistance: LevenshteinDistance = LevenshteinDistance()
 
     /**
-     * 字符串差异在20个字符以下 且 距离小于搜索字符串长度 且 搜索字符全部包含在搜索字符串中 则显示在搜索结果中
+     * 两个字符串差异小于搜索字符串长度 且 搜索字符全部包含在搜索字符串中 则显示在搜索结果中
      * @param textToSearch 尝试匹配的字符串
      * @param query 用户输入字符串
      * */
     fun search(textToSearch: String?, query: String?): Boolean {
-        if (textToSearch == null || query == null) {
+        if (query.isNullOrEmpty()) {
+            return true
+        }
+        if (textToSearch.isNullOrEmpty()) {
             return false
         }
+        if (textToSearch.contains(query, true)) {
+            return true
+        }
         val textToSearchUpp = textToSearch.uppercase()
         val queryUpp = query.uppercase()
-        val d = levenshteinDistance.apply(textToSearchUpp, queryUpp)
+        val diff = levenshteinDistance.apply(textToSearchUpp, queryUpp)
         val lenTextToSearch = textToSearchUpp.length
-        val maxD = 20
-        // 字符串差异在20个字符以下 且 距离小于搜索字符串长度 且 搜索字符全部包含在搜索字符串中 则显示在搜索结果中
-        return d < maxD && d < lenTextToSearch && containsAllChars(textToSearchUpp, queryUpp)
+        return diff < lenTextToSearch && containsAllChars(textToSearchUpp, queryUpp)
     }
 
     fun containsAllChars(str1: String, str2: String): Boolean {
@@ -33,11 +37,11 @@ object FuzzySearch {
 
     @JvmStatic
     fun main(args: Array<String>) {
-        val testResult1 = search("支付宝","支")
+        val testResult1 = search("支付宝", "支")
         assert(testResult1)
-        val testResult2 = search("World Peace","wp")
+        val testResult2 = search("World Peace", "wp")
         assert(testResult2)
-        val testResult3 = search("World Peace","pee")
+        val testResult3 = search("World Peace", "pee")
         assert(testResult3)
     }
 }
diff --git a/app/src/main/kotlin/com/aistra/hail/utils/PinyinSearch.kt b/app/src/main/kotlin/com/aistra/hail/utils/PinyinSearch.kt
@@ -10,15 +10,18 @@ object PinyinSearch {
      * 分别使用首字母和全拼进行匹配，满足条件之一就返回true,
      * 如果当前语言不是中文就直接返回false
      * @param textToSearch 需要匹配的字符串
-     * @param textInput 用户输入
+     * @param query 用户输入
      * */
-    fun searchPinyinAll(textToSearch: String?, textInput: String): Boolean {
-        if (textToSearch==null){
+    fun searchPinyinAll(textToSearch: String?, query: String?): Boolean {
+        if (query.isNullOrEmpty()) {
+            return true
+        }
+        if (textToSearch.isNullOrEmpty()) {
             return false
         }
         val language = Locale.getDefault().language
         return if (language.equals(Locale.CHINESE.language)) {
-            searchCap(textToSearch, textInput) || searchAllSpell(textToSearch, textInput)
+            searchCap(textToSearch, query) || searchAllSpell(textToSearch, query)
         } else {
             false
         }