Merge branch 'fix/GHZSCY-6470' into 'dev'

fix: 搜索配置顺序显示问题 https://jira.shanqu.cc/browse/GHZSCY-6470 See merge request halo/android/assistant-android!1825
2024-08-12 10:03:06 +08:00
parent 6c61a62799 98b877671a
commit e9bcd0a0d6
1 changed files with 6 additions and 4 deletions
--- a/app/src/main/java/com/gh/gamecenter/search/SearchGameResultViewModel.kt
+++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameResultViewModel.kt
@ -80,10 +80,12 @@ class SearchGameResultViewModel(
            .subscribe({ mutableList ->
                mSearchSubjects.addAll(mutableList)
                mSearchSubjects.forEach {
-                    itemDataList.add(
-                        if (it.location <= 0 || it.location >= itemDataList.size) itemDataList.size else it.location - 1,
-                        SearchItemData(subject = it)
-                    )
+                    val item = SearchItemData(subject = it)
+                    if (it.location <= 0 || it.location > itemDataList.size) {
+                        itemDataList.add(item)
+                    } else {
+                        itemDataList.add(it.location - 1, item)
+                    }
                }
                // 处理初始化列表且游戏列表size为0的情况
                handleLoadStatusWhenGameListIsEmpty(list, itemDataList)