Merge branch 'feat/GHZSCY-8041-pr' into 'dev'

feat:游戏搜索结果列表的插入优化—客户端 https://jira.shanqu.cc/browse/GHZSCY-8041 See merge request halo/android/assistant-android!2216
2025-06-20 14:49:04 +08:00
parent 0f382baec1 03f6906b46
commit 2e93bcc173
15 changed files with 532 additions and 588 deletions
--- a/app/src/main/java/com/gh/gamecenter/dsp/data/GameSubjectDSPRemoteDataSource.kt
+++ b/app/src/main/java/com/gh/gamecenter/dsp/data/GameSubjectDSPRemoteDataSource.kt
@ -9,7 +9,7 @@ import io.reactivex.Single

 class GameSubjectDSPRemoteDataSource(private val api: DspApiService = RetrofitManager.getInstance().dspApiService) {

-    fun getDspGames(type: String, count: Int): Single<List<GameEntity>> {
+    fun getDspGames(count: Int): Single<List<GameEntity>> {
        val meta = MetaUtil.getMeta()
        val request = mapOf(
            "device" to mapOf(
--- a/app/src/main/java/com/gh/gamecenter/entity/SearchGameUnionEntity.kt
+++ b/app/src/main/java/com/gh/gamecenter/entity/SearchGameUnionEntity.kt
@ -0,0 +1,33 @@
+package com.gh.gamecenter.entity
+
+import com.gh.gamecenter.feature.entity.GameEntity
+import com.google.gson.annotations.SerializedName
+
+data class SearchGameUnionEntity(
+    @SerializedName("type")
+    private val _type: String? = null,
+    @SerializedName("link_game")
+    val linkGame: GameEntity? = null,
+    @SerializedName("link_wechat_game_cpm_column")
+    val linkWechatGameCpmColumn: SearchSubjectEntity? = null,
+    @SerializedName("link_dsp_game_column")
+    val linkDspGameColumn: SearchSubjectEntity? = null,
+    @SerializedName("link_wechat_game")
+    val linkWechatGame: GameEntity? = null,
+    @SerializedName("link_column")
+    val linkColum: SearchSubjectEntity? = null,
+    @SerializedName("link_ad_space")
+    val linkAdSpace: AdConfig? = null
+) {
+    val type: String
+        get() = _type ?: ""
+
+    companion object {
+        const val TYPE_GAME = "game"
+        const val TYPE_WECHAT_GAME_CPM_COLUMN = "wechat_game_cpm_column"
+        const val TYPE_DSP_GAME_COLUMN = "dsp_game_column"
+        const val TYPE_WECHAT_GAME = "wechat_game"
+        const val TYPE_COLUMN = "column"
+        const val TYPE_AD_SPACE = "ad_space"
+    }
+}
--- a/app/src/main/java/com/gh/gamecenter/entity/SearchSubjectEntity.kt
+++ b/app/src/main/java/com/gh/gamecenter/entity/SearchSubjectEntity.kt
@ -2,8 +2,9 @@ package com.gh.gamecenter.entity

 import android.os.Parcelable
 import com.gh.common.filter.RegionSettingHelper
+import com.gh.gamecenter.entity.SearchGameUnionEntity.Companion.TYPE_DSP_GAME_COLUMN
+import com.gh.gamecenter.entity.SearchGameUnionEntity.Companion.TYPE_WECHAT_GAME_CPM_COLUMN
 import com.gh.gamecenter.feature.entity.GameEntity
-import com.gh.gamecenter.personalhome.home.UserHistoryViewModel
 import com.google.gson.annotations.SerializedName
 import kotlinx.parcelize.Parcelize

@ -18,10 +19,6 @@ data class SearchSubjectEntity(
    val codeId: String = "", // 广告CODE_ID(本地字段)，不为空时为广告专题
    @SerializedName("ad_icon_active")
    val adIconActive: Boolean = false,
-    // 本地字段，标记是否为微信小游戏CPM专题
-    var isWGameSubjectCPM: Boolean = false,
-    // 本地字段，标记是否为DSP专题
-    var isDspSubject: Boolean = false,
    val type: String = "",

    @SerializedName("column_type")
@ -31,10 +28,11 @@ data class SearchSubjectEntity(
    val size: Int = -1, // 专题游戏数量
 ) : Parcelable {

-    companion object {
-        const val TYPE_WECHAT_GAME_CPM_COLUMN = "wechat_game_cpm_column"
-        const val TYPE_DSP_GAME_COLUMN = "dsp_game_column"
-    }
+    val isWGameSubjectCPM: Boolean
+        get() = type == TYPE_WECHAT_GAME_CPM_COLUMN
+
+    val isDspSubject: Boolean
+        get() = type == TYPE_DSP_GAME_COLUMN

    fun getFilterGame() = RegionSettingHelper.filterGame(games)
 }
--- a/app/src/main/java/com/gh/gamecenter/home/custom/model/CustomPageRepository.kt
+++ b/app/src/main/java/com/gh/gamecenter/home/custom/model/CustomPageRepository.kt
@ -384,7 +384,7 @@ class CustomPageRepository private constructor(
                                    pageInfo.componentPosition
                                )
                            )
-                            dspSubjectUseCase.getDspGames(subject.columnType, subject.size.index)
+                            dspSubjectUseCase.getDspGames(subject.size.index)
                                .subscribeOn(Schedulers.io())
                                .observeOn(AndroidSchedulers.mainThread())
                                .subscribe(object : BiResponse<List<GameEntity>>() {
--- a/app/src/main/java/com/gh/gamecenter/minigame/MiniGameSearchResultFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/minigame/MiniGameSearchResultFragment.kt
@ -4,7 +4,7 @@ import com.gh.gamecenter.SearchActivity.Companion.TRACK_SEARCH_TYPE_INPUT
 import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.utils.viewModelProvider
 import com.gh.gamecenter.search.SearchGameResultFragment
-import com.gh.gamecenter.search.SearchGameResultViewModel
+import com.gh.gamecenter.search.viewmodel.SearchGameResultViewModel
 import com.halo.assistant.HaloApp

 /**
@ -19,7 +19,6 @@ class MiniGameSearchResultFragment : SearchGameResultFragment() {
        val factory = SearchGameResultViewModel.Factory(
            HaloApp.getInstance().application,
            mKey,
-            true,
            MiniGameSearchResultRepository(),
            TRACK_SEARCH_TYPE_INPUT,
            activity?.intent?.getStringExtra(EntranceConsts.KEY_SOURCE_ENTRANCE) ?: ""
--- a/app/src/main/java/com/gh/gamecenter/minigame/MiniGameSearchResultRepository.kt
+++ b/app/src/main/java/com/gh/gamecenter/minigame/MiniGameSearchResultRepository.kt
@ -1,45 +1,25 @@
 package com.gh.gamecenter.minigame

-import com.gh.gamecenter.dsp.data.GameSubjectDSPRemoteDataSource
-import com.gh.gamecenter.entity.SearchSubjectEntity
-import com.gh.gamecenter.feature.entity.GameEntity
-import com.gh.gamecenter.minigame.wechat.WGameSubjectCPMRemoteDataSource
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.gh.gamecenter.retrofit.service.ApiService
 import com.gh.gamecenter.search.ISearchGameResultRepository
+import com.gh.gamecenter.search.SearchItemData
 import io.reactivex.Observable
-import io.reactivex.Single

 class MiniGameSearchResultRepository(
-    private val api: ApiService = RetrofitManager.getInstance().newApi,
-    private val mWGameSubjectCPMDataSource: WGameSubjectCPMRemoteDataSource = WGameSubjectCPMRemoteDataSource(),
-    private val mGameSubjectDSPDataSource: GameSubjectDSPRemoteDataSource = GameSubjectDSPRemoteDataSource(RetrofitManager.getInstance().dspApiService)
+    private val api: ApiService = RetrofitManager.getInstance().newApi
 ) : ISearchGameResultRepository {

    override fun getSearchGame(
        key: String?,
        page: Int
-    ): Observable<List<GameEntity>> {
+    ): Observable<List<SearchItemData>> {
        return api.getSearchMiniGameList(key, page, 20)
+            .map { data ->
+                data.map {
+                    SearchItemData(it, type = "")
+                }
+            }
    }

-    override fun getSearchMiniGameCPM(key: String?): Observable<List<GameEntity>> {
-        return Observable.just(emptyList())
-    }
-
-    override fun getSearchSubject(key: String?, page: Int): Observable<List<SearchSubjectEntity>> {
-        return Observable.just(emptyList())
-    }
-
-    override fun getWGameCPMGameList(size: Int): Single<MutableList<GameEntity>> {
-        return mWGameSubjectCPMDataSource.getUserRecommendCPMList(pageSize = size)
-    }
-
-    override fun getDspGameList(
-        columnType: String,
-        showDownload: Boolean,
-        size: Int,
-    ): Single<List<GameEntity>> {
-        return mGameSubjectDSPDataSource.getDspGames(columnType, size)
-    }
 }
--- a/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java
+++ b/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java
@ -77,6 +77,7 @@ import com.gh.gamecenter.entity.RatingReplyEntity;
 import com.gh.gamecenter.entity.RecommendPopupEntity;
 import com.gh.gamecenter.entity.ReserveModifyEntity;
 import com.gh.gamecenter.entity.ReserveReminderEntity;
+import com.gh.gamecenter.entity.SearchGameUnionEntity;
 import com.gh.gamecenter.entity.SearchSubjectEntity;
 import com.gh.gamecenter.entity.ServerPublishEntity;
 import com.gh.gamecenter.entity.ServerSubscriptionEntity;
@ -326,6 +327,18 @@ public interface ApiService {
    @GET
    Observable<List<GameEntity>> getSearchGame(@Url String url);

+    /**
+     * 搜索游戏(新：整合了 cpm dsp 广告位置排序问题)
+     */
+    @GET("./games:search?view=union")
+    Observable<List<SearchGameUnionEntity>> getSearchGameUnionData(
+            @Query("keyword") String keyword,
+            @Query("page") int page,
+            @Query("version") String version,
+            @Query("channel") String channel,
+            @Query("AD") String ad
+    );
+
    /**
     * 搜索CPM微信小游戏
     */
--- a/app/src/main/java/com/gh/gamecenter/search/ISearchGameResultRepository.kt
+++ b/app/src/main/java/com/gh/gamecenter/search/ISearchGameResultRepository.kt
@ -1,18 +1,7 @@
 package com.gh.gamecenter.search

-import com.gh.gamecenter.entity.SearchSubjectEntity
-import com.gh.gamecenter.feature.entity.GameEntity
 import io.reactivex.Observable
-import io.reactivex.Single

 interface ISearchGameResultRepository {
-    fun getSearchGame(key: String?, page: Int): Observable<List<GameEntity>>
-
-    fun getSearchMiniGameCPM(key: String?): Observable<List<GameEntity>>
-
-    fun getSearchSubject(key: String?, page: Int): Observable<List<SearchSubjectEntity>>
-
-    fun getWGameCPMGameList(size: Int): Single<MutableList<GameEntity>>
-
-    fun getDspGameList(columnType: String, showDownload: Boolean, size: Int): Single<List<GameEntity>>
+    fun getSearchGame(key: String?, page: Int): Observable<List<SearchItemData>>
 }
--- a/app/src/main/java/com/gh/gamecenter/search/SearchGameIndexFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameIndexFragment.kt
@ -31,6 +31,7 @@ import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.entity.SettingsEntity
 import com.gh.gamecenter.feature.exposure.addExposureHelper
 import com.gh.gamecenter.help.HelpAndFeedbackBridge
+import com.gh.gamecenter.search.viewmodel.SearchGameResultViewModel
 import com.halo.assistant.HaloApp
 import com.lightgame.download.DataWatcher
 import com.lightgame.download.DownloadEntity
@ -67,7 +68,6 @@ class SearchGameIndexFragment : ListFragment<GameEntity, SearchGameResultViewMod
            SearchGameResultViewModel.Factory(
                HaloApp.getInstance(),
                mKey,
-                false,
                SearchGameResultRepository(),
                mType,
                activity?.intent?.getStringExtra(EntranceConsts.KEY_SOURCE_ENTRANCE) ?: ""
@ -198,7 +198,6 @@ class SearchGameIndexFragment : ListFragment<GameEntity, SearchGameResultViewMod
        this.mType = type
        mAdapter?.key = key
        mListViewModel?.updateSearchKeyWithType(key, type)
-        mListViewModel?.clearSearchSubjects()
        mListViewModel?.load(LoadType.REFRESH)
    }

--- a/app/src/main/java/com/gh/gamecenter/search/SearchGameResultAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameResultAdapter.kt
@ -1,7 +1,6 @@
 package com.gh.gamecenter.search

 import android.content.Context
-import android.util.SparseArray
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@ -60,6 +59,7 @@ import com.gh.gamecenter.gamedetail.accelerator.dialog.StartingAcceleratorDialog
 import com.gh.gamecenter.gamedetail.entity.GameDetailTabEntity
 import com.gh.gamecenter.help.HelpAndFeedbackBridge
 import com.gh.gamecenter.minigame.MiniGameSearchResultFragment
+import com.gh.gamecenter.search.viewmodel.SearchGameResultViewModel
 import com.halo.assistant.accelerator.repository.AcceleratorDataHolder
 import com.lightgame.download.DownloadEntity
 import com.lightgame.utils.Util_System_Keyboard
--- a/app/src/main/java/com/gh/gamecenter/search/SearchGameResultFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameResultFragment.kt
@ -13,7 +13,6 @@ import android.view.animation.TranslateAnimation
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.viewModels
-import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.gh.common.exposure.DefaultExposureStateChangeListener
 import com.gh.common.util.*
@ -41,10 +40,10 @@ import com.gh.gamecenter.eventbus.EBPackage
 import com.gh.gamecenter.eventbus.EBStartupAcceleration
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.exposure.addExposureHelper
-import com.gh.gamecenter.feature.entity.VipEntity
 import com.gh.gamecenter.help.HelpAndFeedbackBridge
 import com.gh.gamecenter.livedata.EventObserver
 import com.gh.gamecenter.minigame.MiniGameSearchResultFragment
+import com.gh.gamecenter.search.viewmodel.SearchGameResultViewModel
 import com.gh.gamecenter.search.viewmodel.SearchTabViewModel
 import com.halo.assistant.HaloApp
 import com.halo.assistant.accelerator.repository.AcceleratorDataHolder
@ -126,7 +125,6 @@ open class SearchGameResultFragment : ListFragment<GameEntity, SearchGameResultV
            SearchGameResultViewModel.Factory(
                HaloApp.getInstance(),
                mKey,
-                true,
                SearchGameResultRepository(),
                mType,
                activity?.intent?.getStringExtra(EntranceConsts.KEY_SOURCE_ENTRANCE) ?: "",
@ -444,7 +442,6 @@ open class SearchGameResultFragment : ListFragment<GameEntity, SearchGameResultV
        this.mKey = key
        mAdapter?.key = key
        mAdapter?.clearAdIdSet()
-        mListViewModel?.clearSearchSubjects()
        mListViewModel?.load(LoadType.REFRESH)
    }

--- a/app/src/main/java/com/gh/gamecenter/search/SearchGameResultRepository.kt
+++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameResultRepository.kt
@ -1,88 +1,218 @@
 package com.gh.gamecenter.search

-import com.gh.common.constant.Config
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import com.gh.ad.AdDelegateHelper
+import com.gh.common.filter.RegionSettingHelper
 import com.gh.common.util.AdHelper
-import com.gh.gamecenter.BuildConfig
+import com.gh.common.util.PackageUtils
+import com.gh.gamecenter.common.retrofit.BiResponse
+import com.gh.gamecenter.common.utils.safelyGetInRelease
+import com.gh.gamecenter.common.utils.singleToMain
 import com.gh.gamecenter.dsp.data.GameSubjectDSPRemoteDataSource
+import com.gh.gamecenter.entity.AdConfig
+import com.gh.gamecenter.entity.SearchGameUnionEntity.Companion.TYPE_AD_SPACE
+import com.gh.gamecenter.entity.SearchGameUnionEntity.Companion.TYPE_COLUMN
+import com.gh.gamecenter.entity.SearchGameUnionEntity.Companion.TYPE_DSP_GAME_COLUMN
+import com.gh.gamecenter.entity.SearchGameUnionEntity.Companion.TYPE_GAME
+import com.gh.gamecenter.entity.SearchGameUnionEntity.Companion.TYPE_WECHAT_GAME
+import com.gh.gamecenter.entity.SearchGameUnionEntity.Companion.TYPE_WECHAT_GAME_CPM_COLUMN
 import com.gh.gamecenter.entity.SearchSubjectEntity
 import com.gh.gamecenter.feature.entity.GameEntity
-import com.gh.gamecenter.gamedetail.accelerator.AccelerationDataBase
+import com.gh.gamecenter.livedata.Event
 import com.gh.gamecenter.minigame.wechat.WGameSubjectCPMRemoteDataSource
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.gh.gamecenter.retrofit.service.ApiService
 import com.halo.assistant.HaloApp
 import io.reactivex.Observable
-import io.reactivex.Single
-import io.reactivex.android.schedulers.AndroidSchedulers
-import java.net.URLEncoder
-import java.util.concurrent.TimeUnit
+import io.reactivex.disposables.CompositeDisposable
+import java.util.*
+import java.util.concurrent.ConcurrentHashMap
+import kotlin.random.Random
+

 class SearchGameResultRepository(
    private val mApi: ApiService = RetrofitManager.getInstance().api,
    private val mNewApi: ApiService = RetrofitManager.getInstance().newApi,
    private val mWGameSubjectCPMDataSource: WGameSubjectCPMRemoteDataSource = WGameSubjectCPMRemoteDataSource(),
-    private val mGameSubjectDSPDataSource: GameSubjectDSPRemoteDataSource = GameSubjectDSPRemoteDataSource(RetrofitManager.getInstance().dspApiService)
+    private val mGameSubjectDSPDataSource: GameSubjectDSPRemoteDataSource = GameSubjectDSPRemoteDataSource(
+        RetrofitManager.getInstance().dspApiService
+    )
 ) : ISearchGameResultRepository {

-    private var currentSearchKey: String? = null
+    private val compositeDisposable = CompositeDisposable()

-    private var currentMiniGameCPMSearchList: MutableList<GameEntity>? = null
+    private val _dataUpdateEvent = MutableLiveData<Event<SearchItemData>>()
+    val dataUpdateEvent: LiveData<Event<SearchItemData>> = _dataUpdateEvent

-    override fun getSearchGame(
-        key: String?,
-        page: Int
-    ): Observable<List<GameEntity>> {
-        // 可能会有特殊字符，需要 encode 处理
-        val encodedKey = URLEncoder.encode(key, "utf-8")
-        return mApi.getSearchGame(
-            Config.API_HOST
-                    + "games:search?keyword=" + encodedKey
-                    + "&view=digest&page=" + page
-                    + "&channel=" + HaloApp.getInstance().channel
-                    + "&version=" + BuildConfig.VERSION_NAME
-                    + "&AD=" + AdHelper.getIdfaString()
-        )
-            .map { games ->
-                // 获取已加速成功过的区服
-                val gameCanSpeed = games.filter { it.canSpeed }
-                val gameIds = gameCanSpeed
-                    .map { it.id }
-                val acctGameList = AccelerationDataBase.instance.accelerationDao().queryAcctGameInfoByGameId(gameIds)
-                gameCanSpeed.forEach { game ->
-                    game.lastAcctGame = acctGameList.find { game.id == it.gameId }
-                }
-                games
-            }
-    }
+    private val adGameOneIdSet = Collections.newSetFromMap(ConcurrentHashMap<String, Boolean>())

-    override fun getSearchMiniGameCPM(key: String?): Observable<List<GameEntity>> {
-        val currentMiniGameCPMSearchList = currentMiniGameCPMSearchList
-        if (key == currentSearchKey && currentMiniGameCPMSearchList != null) {
-            return Observable.just(currentMiniGameCPMSearchList)
+    override fun getSearchGame(key: String?, page: Int): Observable<List<SearchItemData>> {
+        if (page == 1) {
+            adGameOneIdSet.clear()
        }
-        return mNewApi.getSearchWechatMiniCPMGame(key)
-            .timeout(5, TimeUnit.SECONDS)
-            .onErrorReturnItem(emptyList())
-            .observeOn(AndroidSchedulers.mainThread())
-            .doOnNext {
-                this.currentSearchKey = key
-                this.currentMiniGameCPMSearchList = it
+        val version = PackageUtils.getGhVersionName()
+        val channel = HaloApp.getInstance().channel
+        return mApi.getSearchGameUnionData(key, page, version, channel, AdHelper.getIdfaString())
+            .map { data ->
+                data.map {
+                    when (it.type) {
+                        TYPE_GAME -> SearchItemData(it.linkGame, type = it.type)
+                        TYPE_WECHAT_GAME_CPM_COLUMN -> {
+                            it.linkWechatGameCpmColumn?.let(::loadThirdPartyData)
+                            SearchItemData(type = it.type, placeHolderId = it.linkWechatGameCpmColumn?.columnId)
+                        }
+
+                        TYPE_DSP_GAME_COLUMN -> {
+                            it.linkDspGameColumn?.let(::loadThirdPartyData)
+                            SearchItemData(type = it.type, placeHolderId = it.linkDspGameColumn?.columnId)
+                        }
+
+                        TYPE_WECHAT_GAME -> SearchItemData(game = it.linkWechatGame, type = it.type)
+                        TYPE_COLUMN -> SearchItemData(subject = it.linkColum, type = it.type)
+                        TYPE_AD_SPACE -> {
+                            val adConfig = it.linkAdSpace
+                            if (adConfig != null) {
+                                val shouldShowAd = AdDelegateHelper.shouldShowGameSearchAd(adConfig)
+                                when {
+                                    shouldShowAd && showThirdPartyAd(adConfig) -> {
+                                        SearchItemData(
+                                            ad = adConfig.thirdPartyAd,
+                                            adConfig = it.linkAdSpace,
+                                            type = TYPE_AD_SPACE
+                                        )
+                                    }
+
+                                    shouldShowAd && showOwnerAd(adConfig) -> {
+                                        loadOwnerAdData(adConfig)
+                                        SearchItemData(type = it.type, placeHolderId = getAdPlaceHolderId(adConfig))
+                                    }
+
+                                    else -> SearchItemData(type = it.type, placeHolderId = INVALID_PLACEHOLDER_ID)
+                                }
+                            } else {
+                                SearchItemData(type = it.type, placeHolderId = INVALID_PLACEHOLDER_ID)
+                            }
+
+                        }
+
+                        else -> {
+                            // 无效数据
+                            SearchItemData(type = it.type, placeHolderId = INVALID_PLACEHOLDER_ID)
+                        }
+                    }
+                }
            }
    }

-    override fun getSearchSubject(key: String?, page: Int): Observable<List<SearchSubjectEntity>> {
-        return mApi.getSearchSubject(key, page)
+    private fun loadThirdPartyData(subject: SearchSubjectEntity) {
+        if (subject.isWGameSubjectCPM) {
+            mWGameSubjectCPMDataSource.getUserRecommendCPMList(pageSize = subject.size)
+        } else {
+            mGameSubjectDSPDataSource.getDspGames(subject.size)
+        }.compose(singleToMain())
+            .subscribe(object : BiResponse<List<GameEntity>>() {
+                override fun onSuccess(data: List<GameEntity>) {
+                    subject.games = data
+                    _dataUpdateEvent.value = Event(SearchItemData(type = subject.type, subject = subject))
+                }
+            }).let(compositeDisposable::add)
    }

-    override fun getWGameCPMGameList(size: Int,): Single<MutableList<GameEntity>> {
-        return mWGameSubjectCPMDataSource.getUserRecommendCPMList(pageSize = size)
+    private fun loadOwnerAdData(adConfig: AdConfig?) {
+        adConfig ?: return
+        val pageSize = adConfig.ownerAd?.adSource?.gamesIds?.size ?: 20
+        val codeId = adConfig.ownerAd?.id
+        val paramsMap = mapOf("page" to "1,$pageSize", "code_id" to codeId)
+        mNewApi.getAdGames(adConfig.id, paramsMap)
+            .map { data ->
+                data.forEach {
+                    it.run {
+                        adIconActive = adConfig.ownerAd?.adSource?.adIconActive ?: false
+                        adSpaceId = adConfig.id
+                        gameAdSourceId = adConfig.ownerAd?.id ?: ""
+                    }
+                }
+                data
+            }
+            .compose(singleToMain())
+            .subscribe(object : BiResponse<List<GameEntity>>() {
+                override fun onSuccess(data: List<GameEntity>) {
+                    val filterGameList = RegionSettingHelper.filterGame(data)
+                    handleOwnerAdGames(adConfig, filterGameList)
+                }
+
+                override fun onFailure(exception: Exception) {
+                    super.onFailure(exception)
+                    handleOwnerAdGames(adConfig, emptyList())
+                }
+
+            }).let(compositeDisposable::add)
    }

-    override fun getDspGameList(
-        columnType: String,
-        showDownload: Boolean,
-        size: Int,
-    ): Single<List<GameEntity>> {
-        return mGameSubjectDSPDataSource.getDspGames(columnType, size)
+    private fun handleOwnerAdGames(adConfig: AdConfig, games: List<GameEntity>) {
+        val showAdColumn = adConfig.ownerAd?.adSource?.displayStyle == "game_zone"
+        val showOnFailed = adConfig.displayRule.onFailedAction == "show"
+        when {
+            games.isNotEmpty() && showAdColumn -> {
+                SearchItemData(
+                    subject = SearchSubjectEntity(
+                        name = adConfig.ownerAd?.adSource?.title ?: "",
+                        games = games.take(AD_SUBJECT_GAME_MAX_COUNT),
+                        adId = adConfig.id,
+                        codeId = adConfig.ownerAd?.id ?: "",
+                        adIconActive = adConfig.ownerAd?.adSource?.adIconActive ?: false
+                    ),
+                    adConfig = adConfig,
+                    type = TYPE_AD_SPACE
+                )
+            }
+
+            games.isNotEmpty() -> {
+                var randomGame = games.safelyGetInRelease(Random.nextInt(games.size))
+                if (games.size > 1 && adGameOneIdSet.contains(randomGame?.id)) {
+                    // 存在重复游戏时重新获取随机游戏
+                    randomGame = games.safelyGetInRelease(Random.nextInt(games.size))
+                }
+                randomGame?.id?.let(adGameOneIdSet::add)
+                SearchItemData(game = randomGame, adConfig = adConfig, type = TYPE_AD_SPACE)
+            }
+
+            showOnFailed && adConfig.thirdPartyAd != null -> {
+                // 自有广告为空时，显示第三方广告
+                SearchItemData(ad = adConfig.thirdPartyAd, adConfig = adConfig, type = TYPE_AD_SPACE)
+            }
+
+            else -> null
+        }?.let {
+            _dataUpdateEvent.value = Event(it)
+        }
+
+    }
+
+    fun clear() {
+        compositeDisposable.clear()
+    }
+
+    companion object {
+        private const val AD_SUBJECT_GAME_MAX_COUNT = 8
+        private const val INVALID_PLACEHOLDER_ID = "Invalid"
+
+        fun getAdPlaceHolderId(adConfig: AdConfig?) = "${adConfig?.id}-${adConfig?.position}"
+
+        fun showThirdPartyAd(adConfig: AdConfig?) =
+            (adConfig?.displayRule?.adSource == AdDelegateHelper.AD_TYPE_SDK && adConfig.thirdPartyAd != null) ||
+                    (adConfig?.displayRule?.adSource == AdDelegateHelper.AD_TYPE_OWNER &&
+                            adConfig.ownerAd == null &&
+                            adConfig.thirdPartyAd != null &&
+                            adConfig.displayRule.onFailedAction == "show")
+
+        fun showOwnerAd(adConfig: AdConfig?) =
+            (adConfig?.displayRule?.adSource == AdDelegateHelper.AD_TYPE_OWNER &&
+                    adConfig.ownerAd != null) ||
+                    (adConfig?.displayRule?.adSource == AdDelegateHelper.AD_TYPE_SDK &&
+                            adConfig.thirdPartyAd == null &&
+                            adConfig.ownerAd != null &&
+                            adConfig.displayRule.onFailedAction == "show")
    }
 }
--- a/app/src/main/java/com/gh/gamecenter/search/SearchGameResultViewModel.kt
+++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameResultViewModel.kt
@ -1,469 +0,0 @@
-package com.gh.gamecenter.search
-
-import android.annotation.SuppressLint
-import android.app.Application
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
-import com.gh.ad.AdDelegateHelper
-import com.gh.common.filter.RegionSettingHelper
-import com.gh.common.util.PackageHelper
-import com.gh.gamecenter.SearchActivity
-import com.gh.gamecenter.common.base.GlobalActivityManager
-import com.gh.gamecenter.common.baselist.ListViewModel
-import com.gh.gamecenter.common.baselist.LoadParams
-import com.gh.gamecenter.common.baselist.LoadStatus
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.utils.SensorsBridge
-import com.gh.gamecenter.common.utils.safelyGetInRelease
-import com.gh.gamecenter.common.utils.singleToMain
-import com.gh.gamecenter.common.utils.toArrayList
-import com.gh.gamecenter.core.utils.SPUtils
-import com.gh.gamecenter.entity.AdConfig
-import com.gh.gamecenter.entity.SearchSubjectEntity
-import com.gh.gamecenter.feature.entity.GameEntity
-import com.gh.gamecenter.livedata.Event
-import com.gh.gamecenter.minigame.MiniGameSearchResultRepository
-import com.gh.gamecenter.retrofit.RetrofitManager
-import io.reactivex.Observable
-import io.reactivex.Single
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
-import java.util.concurrent.ConcurrentHashMap
-import kotlin.random.Random
-
-class SearchGameResultViewModel(
-    application: Application,
-    private var mSearchKey: String?,
-    private var mIsManuallySearch: Boolean,
-    private val repository: ISearchGameResultRepository,
-    private var mSearchType: String,
-    val sourceEntrance: String
-) : ListViewModel<GameEntity, SearchItemData>(application) {
-
-    private var mPage = 0
-    private var mSearchSubjects = arrayListOf<SearchSubjectEntity>()
-
-    // 游戏广告列表，需要先本地按插入 position 排序，避免后续问题
-    private var mGameSearchAdList: List<AdConfig>? = null
-    private var mAdPositionSet: HashSet<Int>? = null
-    private val mAdGameMap = ConcurrentHashMap<String, List<GameEntity>>()
-
-    private var mGameEntityList = arrayListOf<GameEntity>()
-
-    fun updateSearchKeyWithType(searchKey: String, searchType: String) {
-        mSearchKey = searchKey
-        mSearchType = searchType
-    }
-
-    fun clearSearchSubjects() {
-        mSearchSubjects.clear()
-    }
-
-    override fun mergeResultLiveData() {
-        mResultLiveData.addSource(mListLiveData) { list ->
-            mGameEntityList = ArrayList(list)
-            decorateListAndPost(list)
-        }
-    }
-
-    @SuppressLint("CheckResult")
-    private fun decorateListAndPost(list: MutableList<GameEntity>) {
-        val itemDataList = ArrayList<SearchItemData>()
-        val combineGameList = list.toMutableList()
-
-        refreshWrongInstallStatus()
-
-        repository.getSearchMiniGameCPM(mSearchKey)
-            .zipWith(repository.getSearchSubject(mSearchKey, mPage)) { cpmGameList, subjectList -> // CPM游戏搜索结果列表合并
-                for (cpmGame in cpmGameList) {
-                    if (cpmGame.location <= 0 || cpmGame.location > list.size) {
-                        combineGameList.add(cpmGame)
-                    } else {
-                        combineGameList.add(cpmGame.location - 1, cpmGame)
-                    }
-                }
-                itemDataList.addAll(
-                    combineGameList.mapIndexed { index, game ->
-                        SearchItemData(game = game, gamePosition = index, isFirst = index == 0)
-                    }
-                )
-                subjectList
-            }
-            .subscribeOn(Schedulers.io())
-            .observeOn(AndroidSchedulers.mainThread())
-            .subscribe({ mutableList ->
-                // 数据源来自于第三方的专题列表，包括 CPM 专题和 DSP 专题
-                val thirdPartySearchSubjectList = mutableListOf<SearchSubjectEntity>()
-
-                for (item in mutableList) {
-                    // 避免同一个位置重复的专题
-                    if (!mSearchSubjects.any {
-                        it.location == item.location && it.columnId == item.columnId
-                    }) {
-                        mSearchSubjects.add(item)
-                    }
-                }
-
-                mSearchSubjects.forEach {
-                    if (it.type == SearchSubjectEntity.TYPE_WECHAT_GAME_CPM_COLUMN) {
-                        thirdPartySearchSubjectList.add(it.apply { isWGameSubjectCPM = true })
-                    } else if (it.type == SearchSubjectEntity.TYPE_DSP_GAME_COLUMN) {
-                        thirdPartySearchSubjectList.add(it.apply { isDspSubject = true })
-                    }
-                    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)
-
-                if (mIsManuallySearch) {
-                    if (mSearchKey == AdDelegateHelper.gameSearchKeyword) {
-                        updateAdConfigAndDecorateList(itemDataList, list)
-                    } else {
-                        AdDelegateHelper.requestAdConfig(false, mSearchKey ?: "") {
-                            updateAdConfigAndDecorateList(itemDataList, list)
-                        }
-                    }
-                } else {
-                    postResultList(itemDataList, list)
-                }
-
-                if (thirdPartySearchSubjectList.isNotEmpty()) {
-                    decorateListWithThirdPartyData(thirdPartySearchSubjectList, itemDataList, list)
-                }
-            }, {
-                it.printStackTrace()
-                handleLoadStatusWhenGameListIsEmpty(list, itemDataList)
-                mResultLiveData.postValue(itemDataList)
-            })
-    }
-
-    /**
-     * 请求第三方接口数据来填充专题游戏数据，包含 DSP 专题和 CPM 专题
-     */
-    @SuppressLint("CheckResult")
-    private fun decorateListWithThirdPartyData(
-        subjects: List<SearchSubjectEntity>,
-        itemDataList: ArrayList<SearchItemData>,
-        list: MutableList<GameEntity>
-    ) {
-        val subjectList = subjects.filterNot { it.games.isNotEmpty() }
-        if (subjectList.isEmpty()) return
-        val subjectSingleList = subjectList.map { subject ->
-            if (subject.isWGameSubjectCPM) {
-                repository.getWGameCPMGameList(subject.size)
-                    .onErrorReturnItem(mutableListOf())
-                    .map { subject.columnId to it }
-            } else {
-                repository.getDspGameList(subject.columnType, subject.showDownload, subject.size)
-                    .onErrorReturnItem(mutableListOf())
-                    .map { subject.columnId to it }
-            }
-        }
-        Single.zip(subjectSingleList) { it.map { item -> item as Pair<String, MutableList<GameEntity>> } }
-            .map { dataList ->
-                for (index in itemDataList.indices) {
-                    val itemData = itemDataList[index]
-                    val subject = itemData.subject ?: continue
-                    if (subject.games.isNotEmpty()) continue
-                    val pair = dataList.firstOrNull { data ->
-                        data.first == subject.columnId
-                    } ?: continue
-                    val newItemData = SearchItemData(
-                        subject = subject.copy(games = pair.second)
-                    )
-                    itemDataList[index] = newItemData
-                }
-                itemDataList
-            }
-            .subscribeOn(Schedulers.io())
-            .observeOn(AndroidSchedulers.mainThread())
-            .subscribe({ dataList -> postResultList(dataList, list) }, {})
-    }
-
-    @SuppressLint("CheckResult")
-    private fun updateAdConfigAndDecorateList(itemDataList: ArrayList<SearchItemData>, list: MutableList<GameEntity>) {
-        mGameSearchAdList =
-            AdDelegateHelper.getGameSearchAdList().filter { AdDelegateHelper.shouldShowGameSearchAd(it) }.toArrayList()
-                .apply { sortBy { it.position } }
-
-        val adPositionSet = hashSetOf<Int>()
-        if (!mGameSearchAdList.isNullOrEmpty()) {
-            for (config in mGameSearchAdList!!) {
-                adPositionSet.add(config.position)
-            }
-        }
-        mAdPositionSet = adPositionSet
-
-        if (adPositionSet.isNotEmpty()) {
-            val ownerAdList = arrayListOf<AdConfig>()
-            val thirdPartyAdList = arrayListOf<AdConfig>()
-
-            // 位置已经排过序，若插入位置大于列表的 size 那么直接 break 放弃
-            for ((index, position) in adPositionSet.withIndex()) {
-                if (position < itemDataList.size + index + 1) {
-                    val adConfig = mGameSearchAdList!!.safelyGetInRelease(index)
-                    val showThirdPartyAd = adConfig?.displayRule?.adSource == AdDelegateHelper.AD_TYPE_SDK
-                    val showOwnerAd = adConfig?.displayRule?.adSource == AdDelegateHelper.AD_TYPE_OWNER
-                    val showOnFailed = adConfig?.displayRule?.onFailedAction == "show"
-                    if ((showThirdPartyAd && adConfig?.thirdPartyAd != null)
-                        || (showOwnerAd && adConfig?.ownerAd == null && adConfig?.thirdPartyAd != null && showOnFailed)
-                    ) {
-                        thirdPartyAdList.add(adConfig)
-                    } else if ((showOwnerAd && adConfig?.ownerAd != null)
-                        || (showThirdPartyAd && adConfig?.ownerAd != null && showOnFailed)
-                    ) {
-                        ownerAdList.add(adConfig)
-                    }
-                } else {
-                    break
-                }
-            }
-
-            if (ownerAdList.isNotEmpty()) {
-                // 存在自有广告时获取对应广告ID的游戏
-                val requestSingleList = arrayListOf<Single<List<GameEntity>>>()
-                ownerAdList.forEach {
-                    // 没有对应广告ID的游戏数据时才添加到请求列表
-                    if (mAdGameMap[it.id] == null) {
-                        requestSingleList.add(createAdGameListSingle(it))
-                    }
-                }
-                if (requestSingleList.isNotEmpty()) {
-                    Single.zip(requestSingleList) {}
-                        .compose(singleToMain())
-                        .subscribe({
-                            decorateListWithAd(itemDataList, list)
-                        }, {
-                            decorateListWithAd(itemDataList, list)
-                        })
-                } else {
-                    decorateListWithAd(itemDataList, list)
-                }
-            } else {
-                decorateListWithThirdPartyAdOnly(itemDataList, thirdPartyAdList, list)
-            }
-        } else {
-            postResultList(itemDataList, list)
-        }
-    }
-
-    fun refreshWrongInstallStatus() {
-        if (mGameEntityList.isNotEmpty()) {
-            PackageHelper.refreshWrongInstallStatus(mGameEntityList)
-        }
-    }
-
-    private fun decorateListWithThirdPartyAdOnly(
-        itemDataList: ArrayList<SearchItemData>,
-        thirdPartyAdList: List<AdConfig>,
-        list: List<GameEntity>
-    ) {
-        thirdPartyAdList.forEach {
-            itemDataList.add(it.position - 1, SearchItemData(ad = it.thirdPartyAd, adConfig = it))
-            SPUtils.setLong(Constants.SP_LAST_GAME_SEARCH_AD_SHOW_TIME + it.position, System.currentTimeMillis())
-        }
-        postResultList(itemDataList, list)
-    }
-
-    private fun decorateListWithAd(
-        itemDataList: ArrayList<SearchItemData>,
-        list: List<GameEntity>
-    ) {
-        val adGameOneIdSet = HashSet<String>() // 展示样式为单个游戏时记录游戏ID，避免重复
-        val decoratedItemDataSize = itemDataList.size
-        for ((index, position) in mAdPositionSet!!.withIndex()) {
-            if (position < decoratedItemDataSize + index + 1) {
-                val adConfig = mGameSearchAdList!!.safelyGetInRelease(index)
-                val showThirdPartyAd = adConfig?.displayRule?.adSource == AdDelegateHelper.AD_TYPE_SDK
-                val showOwnerAd = adConfig?.displayRule?.adSource == AdDelegateHelper.AD_TYPE_OWNER
-                val showOnFailed = adConfig?.displayRule?.onFailedAction == "show"
-                if ((showThirdPartyAd && adConfig?.thirdPartyAd != null)
-                    || (showOwnerAd && adConfig?.ownerAd == null && adConfig?.thirdPartyAd != null && showOnFailed)
-                ) {
-                    itemDataList.add(position - 1, SearchItemData(ad = adConfig.thirdPartyAd, adConfig = adConfig))
-                    SPUtils.setLong(
-                        Constants.SP_LAST_GAME_SEARCH_AD_SHOW_TIME + adConfig.position,
-                        System.currentTimeMillis()
-                    )
-                } else if ((showOwnerAd && adConfig?.ownerAd != null)
-                    || (showThirdPartyAd && adConfig?.ownerAd != null && showOnFailed)
-                ) {
-                    val gameList = mAdGameMap[adConfig.id]
-                    if (!gameList.isNullOrEmpty()) {
-                        if (adConfig.ownerAd.adSource?.displayStyle == "game_zone") {
-                            // 游戏专题
-                            itemDataList.add(
-                                position - 1,
-                                SearchItemData(
-                                    subject = SearchSubjectEntity(
-                                        name = adConfig.ownerAd.adSource?.title ?: "",
-                                        games = gameList.take(AD_SUBJECT_GAME_MAX_COUNT),
-                                        adId = adConfig.id,
-                                        codeId = adConfig.ownerAd.id,
-                                        adIconActive = adConfig.ownerAd.adSource?.adIconActive ?: false
-                                    ),
-                                    adConfig = adConfig
-                                )
-                            )
-                        } else {
-                            // 单个游戏
-                            var randomGameEntity = gameList.safelyGetInRelease(Random.nextInt(gameList.size))
-                            if (gameList.size != 1 && adGameOneIdSet.contains(randomGameEntity?.id)) {
-                                // 存在重复游戏时重新获取随机游戏
-                                randomGameEntity = gameList.safelyGetInRelease(Random.nextInt(gameList.size))
-                            }
-                            randomGameEntity?.id?.let { adGameOneIdSet.add(it) }
-
-                            itemDataList.add(
-                                position - 1,
-                                SearchItemData(game = randomGameEntity, adConfig = adConfig)
-                            )
-                        }
-                        SPUtils.setLong(
-                            Constants.SP_LAST_GAME_SEARCH_AD_SHOW_TIME + adConfig.position,
-                            System.currentTimeMillis()
-                        )
-                    } else if (showOnFailed && adConfig.thirdPartyAd != null) {
-                        // 自有广告为空时，显示第三方广告
-                        itemDataList.add(position - 1, SearchItemData(ad = adConfig.thirdPartyAd, adConfig = adConfig))
-                        SPUtils.setLong(
-                            Constants.SP_LAST_GAME_SEARCH_AD_SHOW_TIME + adConfig.position,
-                            System.currentTimeMillis()
-                        )
-                    }
-                }
-            } else {
-                break
-            }
-        }
-        postResultList(itemDataList, list)
-    }
-
-    @SuppressLint("CheckResult")
-    private fun createAdGameListSingle(adConfig: AdConfig) = Single.create { emitter ->
-        val pageSize = adConfig.ownerAd?.adSource?.gamesIds?.size ?: 20
-        val codeId = adConfig.ownerAd?.id
-        val paramsMap = mapOf("page" to "1,$pageSize", "code_id" to codeId)
-        RetrofitManager.getInstance().newApi.getAdGames(adConfig.id, paramsMap)
-            .compose(singleToMain())
-            .subscribe({ data ->
-                val filterGameList = RegionSettingHelper.filterGame(data)
-                filterGameList.forEach {
-                    it.run {
-                        adIconActive = adConfig.ownerAd?.adSource?.adIconActive ?: false
-                        adSpaceId = adConfig.id
-                        gameAdSourceId = adConfig.ownerAd?.id ?: ""
-                    }
-                }
-                mAdGameMap[adConfig.id] = filterGameList
-                emitter.onSuccess(filterGameList)
-            }, {
-                mAdGameMap[adConfig.id] = emptyList()
-                emitter.onSuccess(emptyList<GameEntity>())
-            })
-    }
-
-    private fun postResultList(resultList: ArrayList<SearchItemData>, list: List<GameEntity>) {
-        mResultLiveData.postValue(resultList.toMutableList())
-        if (mPage == 1) {
-            if (repository is MiniGameSearchResultRepository) {
-                SensorsBridge.trackMiniGameSearchResultReturn(
-                    GlobalActivityManager.getCurrentPageEntity().pageId,
-                    GlobalActivityManager.getCurrentPageEntity().pageName,
-                    sourceEntrance,
-                    mSearchKey ?: "",
-                    SearchActivity.toTrackSearchType(mSearchType),
-                    list.isNotEmpty()
-                )
-            } else {
-                SensorsBridge.trackGameSearchResultReturn(
-                    GlobalActivityManager.getCurrentPageEntity().pageId,
-                    GlobalActivityManager.getCurrentPageEntity().pageName,
-                    sourceEntrance,
-                    mSearchKey ?: "",
-                    SearchActivity.toTrackSearchType(mSearchType),
-                    list.isNotEmpty()
-                )
-            }
-
-        }
-    }
-
-    private fun handleLoadStatusWhenGameListIsEmpty(list: List<GameEntity>, itemDataList: ArrayList<SearchItemData>) {
-        if (mPage == 1 && list.isEmpty()) {
-            mLoadStatusLiveData.value = if (itemDataList.isEmpty()) LoadStatus.INIT_EMPTY else LoadStatus.INIT_OVER
-        }
-    }
-
-    override fun loadStatusControl(size: Int) {
-        if (mCurLoadParams.loadOffset == LoadParams.DEFAULT_OFFSET) { // 初始化列表
-            if (size == 0) {
-//              初始化列表size为0情况放到mergeResultLiveData方法处理
-            } else if (size == REQUEST_FAILURE_SIZE) {
-                mLoadStatusLiveData.setValue(LoadStatus.INIT_FAILED)
-            } else if (size < mOverLimitSize) { // 避免一个屏幕出现两次分页
-                mLoadStatusLiveData.setValue(LoadStatus.INIT_OVER)
-            } else {
-                mLoadStatusLiveData.setValue(LoadStatus.INIT_LOADED)
-            }
-        } else {
-            if (size == REQUEST_FAILURE_SIZE) {
-                mLoadStatusLiveData.setValue(LoadStatus.LIST_FAILED)
-            } else if (size == 0) {
-                mLoadStatusLiveData.setValue(LoadStatus.LIST_OVER)
-            } else {
-                mLoadStatusLiveData.setValue(LoadStatus.LIST_LOADED)
-            }
-        }
-
-        if (size == REQUEST_FAILURE_SIZE) {
-            mRetryParams = mCurLoadParams
-        } else {
-            mRetryParams = null
-            mCurLoadParams.loadOffset = mCurLoadParams.loadOffset + 1 // 页数 + 1
-        }
-    }
-
-    override fun provideDataObservable(page: Int): Observable<List<GameEntity>> {
-        mPage = page
-        return repository.getSearchGame(mSearchKey, page)
-    }
-
-    private val _refreshVipLoading = MutableLiveData<Event<Boolean>>()
-    val refreshVipLoading: LiveData<Event<Boolean>> = _refreshVipLoading
-    fun showRefreshVipLoading(show: Boolean) {
-        _refreshVipLoading.value = Event(show)
-    }
-
-    class Factory(
-        private val mApplication: Application,
-        private val mSearchKey: String?,
-        private val mIsManuallySearch: Boolean,
-        private val repository: ISearchGameResultRepository,
-        private val mSearchType: String,
-        private val mSourceEntrance: String
-    ) : ViewModelProvider.NewInstanceFactory() {
-        override fun <T : ViewModel> create(modelClass: Class<T>): T {
-            return SearchGameResultViewModel(
-                mApplication,
-                mSearchKey,
-                mIsManuallySearch,
-                repository,
-                mSearchType,
-                mSourceEntrance
-            ) as T
-        }
-    }
-
-    companion object {
-        const val AD_SUBJECT_GAME_MAX_COUNT = 8
-    }
-
-}
--- a/app/src/main/java/com/gh/gamecenter/search/SearchItemData.kt
+++ b/app/src/main/java/com/gh/gamecenter/search/SearchItemData.kt
@ -1,20 +1,40 @@
 package com.gh.gamecenter.search

 import com.gh.gamecenter.entity.AdConfig
+import com.gh.gamecenter.entity.SearchGameUnionEntity.Companion.TYPE_AD_SPACE
+import com.gh.gamecenter.entity.SearchGameUnionEntity.Companion.TYPE_DSP_GAME_COLUMN
+import com.gh.gamecenter.entity.SearchGameUnionEntity.Companion.TYPE_WECHAT_GAME_CPM_COLUMN
 import com.gh.gamecenter.entity.SearchSubjectEntity
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.exposure.ExposureEvent

-class SearchItemData(
+data class SearchItemData(
    val game: GameEntity? = null,
    val subject: SearchSubjectEntity? = null,
    val ad: AdConfig.ThirdPartyAd? = null,
    val adConfig: AdConfig? = null,
-    val gamePosition: Int = -1,
+    var gamePosition: Int = -1,
    var exposureEventList: ArrayList<ExposureEvent>? = null,
    private val isFirst: Boolean = false,
+    val type: String,
+    var placeHolderId: String? = null   // 如果当前itemBeam还未填充实际数据，仅做占位作用，placeHolderId会被赋值，作为实际数据填充的唯一标识，当实际数据填充后，placeHolderId置为空
 ) {

    val isShowFirstSetting: Boolean
        get() = isFirst && game?.firstSetting != null && !game.firstSetting?.firstPosition.isNullOrBlank()
+
+    val isPlaceHolder: Boolean
+        get() = placeHolderId != null
+
+    fun matchPlaceHolder(other: SearchItemData) =
+        if (type == other.type) {
+            when (type) {
+                TYPE_WECHAT_GAME_CPM_COLUMN, TYPE_DSP_GAME_COLUMN -> placeHolderId == other.subject?.columnId
+                TYPE_AD_SPACE -> placeHolderId == SearchGameResultRepository.getAdPlaceHolderId(other.adConfig)
+                else -> false
+            }
+        } else {
+            false
+        }
+
 }
--- a/app/src/main/java/com/gh/gamecenter/search/viewmodel/SearchGameResultViewModel.kt
+++ b/app/src/main/java/com/gh/gamecenter/search/viewmodel/SearchGameResultViewModel.kt
@ -0,0 +1,255 @@
+package com.gh.gamecenter.search.viewmodel
+
+import android.app.Application
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import com.gh.common.util.PackageHelper
+import com.gh.gamecenter.SearchActivity
+import com.gh.gamecenter.common.base.GlobalActivityManager
+import com.gh.gamecenter.common.baselist.ListViewModel
+import com.gh.gamecenter.common.baselist.LoadParams
+import com.gh.gamecenter.common.baselist.LoadStatus
+import com.gh.gamecenter.common.retrofit.Response
+import com.gh.gamecenter.common.utils.SensorsBridge
+import com.gh.gamecenter.common.utils.observableToMain
+import com.gh.gamecenter.core.provider.IHandleGameResponseProvider
+import com.gh.gamecenter.entity.SearchGameUnionEntity.Companion.TYPE_GAME
+import com.gh.gamecenter.entity.SearchGameUnionEntity.Companion.TYPE_WECHAT_GAME
+import com.gh.gamecenter.feature.entity.GameEntity
+import com.gh.gamecenter.livedata.Event
+import com.gh.gamecenter.livedata.EventObserver
+import com.gh.gamecenter.minigame.MiniGameSearchResultRepository
+import com.gh.gamecenter.search.ISearchGameResultRepository
+import com.gh.gamecenter.search.SearchGameResultRepository
+import com.gh.gamecenter.search.SearchItemData
+import com.therouter.TheRouter.get
+import io.reactivex.Observable
+import retrofit2.HttpException
+
+class SearchGameResultViewModel(
+    application: Application,
+    private var mSearchKey: String?,
+    private val repository: ISearchGameResultRepository,
+    private var mSearchType: String,
+    val sourceEntrance: String
+) : ListViewModel<SearchItemData, SearchItemData>(application) {
+
+    private var mPage = 0
+
+    private var gameList = arrayListOf<GameEntity>()
+
+    private val dataUpdateObserver = EventObserver<SearchItemData> {
+        notifyItemChanged(it)
+    }
+
+    private var originalDataList = arrayListOf<SearchItemData>()
+
+    init {
+        if (repository is SearchGameResultRepository) {
+            repository.dataUpdateEvent.observeForever(dataUpdateObserver)
+        }
+    }
+
+    fun updateSearchKeyWithType(searchKey: String, searchType: String) {
+        mSearchKey = searchKey
+        mSearchType = searchType
+    }
+
+    override fun loadData() {
+        if (mCurLoadParams == null) initLoadParams()
+
+        val loadParams = if (mRetryParams != null) mRetryParams else mCurLoadParams
+        val curStatus = mLoadStatusLiveData.value
+
+        if (curStatus != null && curStatus != LoadStatus.INIT_LOADED && curStatus != LoadStatus.LIST_LOADED && curStatus != LoadStatus.INIT) return
+
+        if (mCurLoadParams.loadOffset == LoadParams.DEFAULT_OFFSET) {
+            mLoadStatusLiveData.setValue(LoadStatus.INIT_LOADING)
+        } else {
+            mLoadStatusLiveData.setValue(LoadStatus.LIST_LOADING)
+        }
+        mPage = loadParams.loadOffset
+        repository.getSearchGame(mSearchKey, loadParams.loadOffset)
+            .compose(observableToMain())
+            .subscribe(object : Response<List<SearchItemData>>() {
+
+                override fun onResponse(response: List<SearchItemData>?) {
+                    handleSuccess(response ?: emptyList(), curStatus)
+                }
+
+                override fun onFailure(e: HttpException?) {
+                    e?.let(::handleFailure)
+                }
+            })
+
+    }
+
+    private fun handleSuccess(response: List<SearchItemData>, curStatus: LoadStatus?) {
+        if (mCurLoadParams.loadOffset == LoadParams.DEFAULT_OFFSET || curStatus == LoadStatus.INIT) {
+            originalDataList.clear()
+        }
+
+        // 针对游戏的一些操作(过滤隐藏游戏，过滤隐藏APK吗，增加下载数据)
+        val handleGameResponse = get(IHandleGameResponseProvider::class.java)
+        val gameList = handleGameResponse?.handleGameResponse(response, mEntrance) ?: response
+
+        originalDataList.addAll(gameList as List<SearchItemData>)
+        mListLiveData.postValue(originalDataList)
+        loadStatusControl(response.size)
+    }
+
+    private fun handleFailure(exception: Exception) {
+        if (exception is HttpException && exception.code() == 404) {
+            loadStatusControl(0)
+            mLoadStatusLiveData.value = LoadStatus.INIT_EXCEPTION
+            mLoadExceptionLiveData.postValue(exception)
+        } else {
+            loadStatusControl(REQUEST_FAILURE_SIZE)
+            if (exception is HttpException) {
+                mLoadExceptionLiveData.postValue(exception)
+            }
+        }
+    }
+
+    override fun mergeResultLiveData() {
+        mResultLiveData.addSource(mListLiveData) { list ->
+            val data = arrayListOf<SearchItemData>()
+            var gamePosition = 0
+            gameList.clear()
+            originalDataList.forEach {
+                if (it.type == TYPE_GAME || it.type == TYPE_WECHAT_GAME) {
+                    it.gamePosition = gamePosition
+                    gamePosition++
+                    it.game?.let(gameList::add)
+                }
+                if (!it.isPlaceHolder) {
+                    data.add(it)
+                }
+            }
+
+            refreshWrongInstallStatus()
+
+            if (data.isEmpty()) {
+                handleLoadStatusWhenGameListIsEmpty(data, list)
+            } else {
+                mResultLiveData.postValue(data)
+            }
+
+            if (mPage == 1) {
+                if (repository is MiniGameSearchResultRepository) {
+                    SensorsBridge.trackMiniGameSearchResultReturn(
+                        GlobalActivityManager.getCurrentPageEntity().pageId,
+                        GlobalActivityManager.getCurrentPageEntity().pageName,
+                        sourceEntrance,
+                        mSearchKey ?: "",
+                        SearchActivity.toTrackSearchType(mSearchType),
+                        list.isNotEmpty()
+                    )
+                } else {
+                    SensorsBridge.trackGameSearchResultReturn(
+                        GlobalActivityManager.getCurrentPageEntity().pageId,
+                        GlobalActivityManager.getCurrentPageEntity().pageName,
+                        sourceEntrance,
+                        mSearchKey ?: "",
+                        SearchActivity.toTrackSearchType(mSearchType),
+                        list.isNotEmpty()
+                    )
+                }
+            }
+        }
+    }
+
+    private fun notifyItemChanged(newItem: SearchItemData) {
+        val positionList = arrayListOf<Int>()
+        originalDataList.forEachIndexed { index, item ->
+            if (item.matchPlaceHolder(newItem)) {
+                positionList.add(index)
+            }
+
+        }
+        positionList.forEach {
+            originalDataList[it] = newItem
+        }
+
+        val displayItems = originalDataList.filterNot { it.isPlaceHolder }
+        mResultLiveData.postValue(displayItems)
+    }
+
+    fun refreshWrongInstallStatus() {
+        if (gameList.isNotEmpty()) {
+            PackageHelper.refreshWrongInstallStatus(gameList)
+        }
+    }
+
+
+    private fun handleLoadStatusWhenGameListIsEmpty(list: List<SearchItemData>, itemDataList: List<SearchItemData>) {
+        if (mPage == 1 && list.isEmpty()) {
+            mLoadStatusLiveData.value = if (itemDataList.isEmpty()) LoadStatus.INIT_EMPTY else LoadStatus.INIT_OVER
+        }
+    }
+
+    override fun loadStatusControl(size: Int) {
+        if (mCurLoadParams.loadOffset == LoadParams.DEFAULT_OFFSET) { // 初始化列表
+            if (size == 0) {
+//              初始化列表size为0情况放到mergeResultLiveData方法处理
+            } else if (size == REQUEST_FAILURE_SIZE) {
+                mLoadStatusLiveData.setValue(LoadStatus.INIT_FAILED)
+            } else if (size < mOverLimitSize) { // 避免一个屏幕出现两次分页
+                mLoadStatusLiveData.setValue(LoadStatus.INIT_OVER)
+            } else {
+                mLoadStatusLiveData.setValue(LoadStatus.INIT_LOADED)
+            }
+        } else {
+            if (size == REQUEST_FAILURE_SIZE) {
+                mLoadStatusLiveData.setValue(LoadStatus.LIST_FAILED)
+            } else if (size == 0) {
+                mLoadStatusLiveData.setValue(LoadStatus.LIST_OVER)
+            } else {
+                mLoadStatusLiveData.setValue(LoadStatus.LIST_LOADED)
+            }
+        }
+
+        if (size == REQUEST_FAILURE_SIZE) {
+            mRetryParams = mCurLoadParams
+        } else {
+            mRetryParams = null
+            mCurLoadParams.loadOffset = mCurLoadParams.loadOffset + 1 // 页数 + 1
+        }
+    }
+
+    override fun provideDataObservable(page: Int): Observable<List<SearchItemData>>? = null
+
+    private val _refreshVipLoading = MutableLiveData<Event<Boolean>>()
+    val refreshVipLoading: LiveData<Event<Boolean>> = _refreshVipLoading
+    fun showRefreshVipLoading(show: Boolean) {
+        _refreshVipLoading.value = Event(show)
+    }
+
+    override fun onCleared() {
+        super.onCleared()
+        if (repository is SearchGameResultRepository) {
+            repository.dataUpdateEvent.removeObserver(dataUpdateObserver)
+        }
+    }
+
+    class Factory(
+        private val mApplication: Application,
+        private val mSearchKey: String?,
+        private val repository: ISearchGameResultRepository,
+        private val mSearchType: String,
+        private val mSourceEntrance: String
+    ) : ViewModelProvider.NewInstanceFactory() {
+        override fun <T : ViewModel> create(modelClass: Class<T>): T {
+            return SearchGameResultViewModel(
+                mApplication,
+                mSearchKey,
+                repository,
+                mSearchType,
+                mSourceEntrance
+            ) as T
+        }
+    }
+
+}