From 04dcfbab2e73b8ce7f97036f17ff6a06ac3fb936 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=BE=E7=A5=A5=E4=BF=8A?= <zengxiangjun@ghzhushou.com>
Date: Fri, 11 Oct 2024 15:10:51 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9?=
 =?UTF-8?q?=E6=89=8B=E3=80=91=E6=90=9C=E7=B4=A2=E6=A6=9C=E5=8D=95=E7=9A=84?=
 =?UTF-8?q?=E7=A5=9E=E7=AD=96=E5=9F=8B=E7=82=B9=E9=97=AE=E9=A2=98=20https:?=
 =?UTF-8?q?//jira.shanqu.cc/browse/GHZSCY-6747?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/gh/gamecenter/SearchActivity.kt        | 4 +++-
 .../java/com/gh/gamecenter/search/SearchGameResultAdapter.kt | 2 +-
 .../com/gh/gamecenter/search/SearchGameResultFragment.kt     | 1 +
 .../com/gh/gamecenter/search/viewmodel/SearchTabViewModel.kt | 5 +++--
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/gh/gamecenter/SearchActivity.kt b/app/src/main/java/com/gh/gamecenter/SearchActivity.kt
index d66b78a275..595af14aa2 100644
--- a/app/src/main/java/com/gh/gamecenter/SearchActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/SearchActivity.kt
@@ -238,7 +238,7 @@ open class SearchActivity : BaseActivity() {
             GlobalActivityManager.getCurrentPageEntity().pageId,
             GlobalActivityManager.getCurrentPageEntity().pageName,
             key ?: "",
-            TRACK_SEARCH_TYPE_DEFAULT,
+            TRACK_SEARCH_TYPE_RANK,
             mSourceEntrance
         )
     }
@@ -433,12 +433,14 @@ open class SearchActivity : BaseActivity() {
         const val TRACK_SEARCH_TYPE_INPUT = "输入搜索"
         const val TRACK_SEARCH_TYPE_DEFAULT = "默认搜索"
         const val TRACK_SEARCH_TYPE_HISTORY = "历史搜索"
+        const val TRACK_SEARCH_TYPE_RANK = "榜单搜索"
 
         @JvmStatic
         fun toTrackSearchType(type: String) = when (type) {
             SearchType.AUTO.value -> TRACK_SEARCH_TYPE_AUTO
             SearchType.MANUAL.value -> TRACK_SEARCH_TYPE_INPUT
             SearchType.HISTORY.value -> TRACK_SEARCH_TYPE_HISTORY
+            SearchType.RANK.value -> TRACK_SEARCH_TYPE_RANK
             else -> TRACK_SEARCH_TYPE_DEFAULT
         }
 
diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameResultAdapter.kt b/app/src/main/java/com/gh/gamecenter/search/SearchGameResultAdapter.kt
index 9c424b7b79..85ae8618b3 100644
--- a/app/src/main/java/com/gh/gamecenter/search/SearchGameResultAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameResultAdapter.kt
@@ -58,7 +58,7 @@ class SearchGameResultAdapter(
     private val dao: ISearchHistoryDao,
     val listViewModel: SearchGameResultViewModel,
     val entrance: String,
-    val type: String,
+    var type: String,
     val sourceEntrance: String
 ) : ListAdapter<SearchItemData>(context), IExposable {
 
diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameResultFragment.kt b/app/src/main/java/com/gh/gamecenter/search/SearchGameResultFragment.kt
index b6a8d8909a..a118b2e191 100644
--- a/app/src/main/java/com/gh/gamecenter/search/SearchGameResultFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameResultFragment.kt
@@ -376,6 +376,7 @@ open class SearchGameResultFragment : ListFragment<GameEntity, SearchGameResultV
         this.mKey = key
         this.mType = type
         mAdapter?.key = key
+        mAdapter?.type = type
         mAdapter?.clearAdIdSet()
         mListViewModel?.updateSearchKeyWithType(key, type)
         mListViewModel?.clearSearchSubjects()
diff --git a/app/src/main/java/com/gh/gamecenter/search/viewmodel/SearchTabViewModel.kt b/app/src/main/java/com/gh/gamecenter/search/viewmodel/SearchTabViewModel.kt
index 5d4965aa12..dbc8ba8273 100644
--- a/app/src/main/java/com/gh/gamecenter/search/viewmodel/SearchTabViewModel.kt
+++ b/app/src/main/java/com/gh/gamecenter/search/viewmodel/SearchTabViewModel.kt
@@ -3,9 +3,9 @@ package com.gh.gamecenter.search.viewmodel
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import com.gh.gamecenter.SearchActivity
 import com.gh.gamecenter.common.base.GlobalActivityManager
 import com.gh.gamecenter.common.utils.SensorsBridge
-import io.reactivex.disposables.CompositeDisposable
 
 class SearchTabViewModel : ViewModel() {
 
@@ -21,7 +21,8 @@ class SearchTabViewModel : ViewModel() {
             GlobalActivityManager.getCurrentPageEntity().pageName,
             location,
             searchKeyAndType.value?.first ?: "",
-            searchKeyAndType.value?.second ?: "",
+            searchKeyAndType.value?.let {
+                SearchActivity.toTrackSearchType(it.second) } ?: "",
             text ?: "",
             position
         )