fix:分类新增搜索功能-0516运营验收-客户端 https://jira.shanqu.cc/browse/GHZSCY-8001

.gitlab-ci.yml

@@ -72,6 +72,7 @@ android_build:
   only:
     - dev
     - release
+    - fix/GHZSCY-8001
 
 # 代码检查
 sonarqube_analysis:
@@ -103,6 +104,7 @@ sonarqube_analysis:
    only:
      - dev
      - release
+     - fix/GHZSCY-8001
 
 ## 发送简易检测结果报告
 send_sonar_report:
@@ -121,6 +123,7 @@ send_sonar_report:
    only:
      - dev
      - release
+     - fix/GHZSCY-8001
 
 oss-upload&send-email:
     tags:
@@ -157,4 +160,5 @@ oss-upload&send-email:
     only:
         - dev
         - release
+        - fix/GHZSCY-8001
 

app/src/main/java/com/gh/ad/AdDelegateHelper.kt

@@ -5,7 +5,6 @@ import android.app.Activity
 import android.content.Context
 import android.content.SharedPreferences
 import android.graphics.drawable.Animatable
-import android.os.Build
 import android.os.Message
 import android.text.TextUtils
 import android.view.View
@@ -44,7 +43,6 @@ import com.gh.gamecenter.feature.exposure.ExposureType
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.halo.assistant.HaloApp
 import io.reactivex.schedulers.Schedulers
-import java.util.Locale
 
 /**
  * 广告实现代理类
@@ -122,12 +120,7 @@ object AdDelegateHelper {
         if (isFromRetry && mAdConfigList.isNotEmpty()) {
             return
         }
-
-        val paramsMap = if (keyword.isNotEmpty()) {
-            mapOf("keyword" to keyword, "android_sdk_version" to Build.VERSION.SDK_INT)
-        } else {
-            mapOf("android_sdk_version" to Build.VERSION.SDK_INT)
-        }
+        val paramsMap = if (keyword.isNotEmpty()) mapOf("keyword" to keyword) else mapOf()
         RetrofitManager.getInstance()
             .newApi
             .getAdConfig(paramsMap)
@@ -189,16 +182,11 @@ object AdDelegateHelper {
                     // HarmonyOS 2.2.0 版本不展示第三方开屏广告 (因为会引起奇怪的闪退)
                     if (MetaUtil.getRom().name == "HarmonyOS"
                         && MetaUtil.getRom().versionName == "2.2.0"
-                        && config.displayRule.adSource == AD_TYPE_SDK) {
+                        && config.displayRule.adSource == "third_party_ads") {
 
                         return
                     }
 
-                    // 华为系 Android 10 不展示第三方开屏广告 (因为会引起奇怪的闪退)
-                    if (isBuggyHuaweiDevice() && config.displayRule.adSource == AD_TYPE_SDK) {
-                        return
-                    }
-
                     mSplashAd = config
                 }
 
@@ -227,7 +215,6 @@ object AdDelegateHelper {
     private fun shouldShowStartUpAdWhenHotLaunch() = (mCsjAdImpl != null)
             && mSplashAd?.displayRule?.hotStartSplashAd?.type == AD_TYPE_SDK
             && mSplashAd?.hotStartThirdPartyAd != null
-            && !isBuggyHuaweiDevice()
 
     /**
      * 是否需要显示下载管理广告
@@ -796,16 +783,4 @@ object AdDelegateHelper {
         mCsjAdImpl?.cancelSplashAd(context)
     }
 
-    /**
-     * 是否为有问题的华为系 Android 10 设备
-     */
-    private fun isBuggyHuaweiDevice(): Boolean {
-        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.Q) {
-            val manufacturer = Build.MANUFACTURER.lowercase(Locale.CHINA) ?: ""
-            return manufacturer == "huawei" || manufacturer == "honor"
-        } else {
-            return false
-        }
-    }
-
 }

app/src/main/java/com/gh/common/view/ConfigFilterView.kt

@@ -20,7 +20,6 @@ import com.gh.gamecenter.common.utils.setDrawableEnd
 import com.gh.gamecenter.common.utils.toColor
 import com.gh.gamecenter.entity.SubjectSettingEntity
 import com.google.android.flexbox.FlexboxLayout
-import splitties.views.leftPadding
 
 class ConfigFilterView @JvmOverloads constructor(
     context: Context,
@@ -214,10 +213,6 @@ class ConfigFilterView @JvmOverloads constructor(
     fun initSubjectFilterView(subjectSetting: SubjectSettingEntity) {
         ratingTv.visibility = View.VISIBLE
 
-        if (subjectSetting.typeEntity.layout == "hide") {
-            container.leftPadding = 8F.dip2px()
-        }
-
         if (subjectSetting.filterOptions.size > 1) {
             // 重排序
             subjectSetting.filterOptions.forEachIndexed { index, s ->

app/src/main/java/com/gh/gamecenter/adapter/viewholder/DetailViewHolder.kt

@@ -135,7 +135,7 @@ class DetailViewHolder(
         vUpdate = view.findViewById(R.id.v_update)
         tvUpdate = view.findViewById(R.id.tv_update)
 
-        context = view.context.getActivity() ?: view.context
+        context = view.context
         com.gh.gamecenter.common.R.color.text_aw_primary.toColor()
 
         var gameDownloadMode = gameEntity.getGameDownloadButtonMode()

app/src/main/java/com/gh/gamecenter/entity/SubjectEntity.kt

@@ -122,9 +122,7 @@ data class SubjectEntity(
     @SerializedName("column_type")
     private val _columnType: String? = null,
     @SerializedName("size")
-    private val _size: Size? = null,
-    @SerializedName("onlyFee")
-    private val _onlyFee: Boolean? = false,
+    private val _size: Size? = null
 ) : Parcelable {
 
     @IgnoredOnParcel
@@ -163,9 +161,6 @@ data class SubjectEntity(
     val size: Size
         get() = _size ?: Size()
 
-    val onlyFee: Boolean
-        get() = _onlyFee ?: false
-
     var isDspSubject: Boolean = false
 
     companion object {
@@ -178,13 +173,9 @@ data class SubjectEntity(
     @Parcelize
     data class Size(
         @SerializedName("index")
-        private val _index: Int? = null,
-        @SerializedName("limit")
-        private val _limit: Int? = null,
+        private val _index: Int? = null
     ) : Parcelable {
         val index: Int
             get() = _index ?: 0
-        val limit: Int
-            get() = _limit ?: -1
     }
 }

app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailWrapperFragment.kt

@@ -14,7 +14,6 @@ import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.view.menu.ActionMenuItemView
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.view.doOnNextLayout
 import androidx.core.view.isVisible
@@ -97,7 +96,6 @@ import io.reactivex.disposables.Disposable
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 import retrofit2.HttpException
-import splitties.views.horizontalPadding
 import java.util.*
 
 class GameDetailWrapperFragment : BaseLazyFragment(), IScrollable {
@@ -288,7 +286,7 @@ class GameDetailWrapperFragment : BaseLazyFragment(), IScrollable {
         initSkeleton()
 
         binding.reuseNoneData.reuseNoneDataTv.text = "页面不见了"
-        bodyBinding.tabIndicator.setIndicatorWidth(16)
+        bodyBinding.tabIndicator.setIndicatorWidth(12)
         bodyBinding.viewPager.offscreenPageLimit = 4
         binding.expandSpecialDownloadIv.enlargeTouchArea()
 
@@ -359,14 +357,8 @@ class GameDetailWrapperFragment : BaseLazyFragment(), IScrollable {
             }
             backBtn.setOnClickListener { requireActivity().finish() }
             moreMenuItem = actionMenuView.menu.findItem(R.id.menu_more)
-            downloadMenuItem = actionMenuView.menu.findItem(R.id.menu_download)?.apply {
-                actionView?.updateLayoutParams<LayoutParams> { width = 40F.dip2px() }
-            }
+            downloadMenuItem = actionMenuView.menu.findItem(R.id.menu_download)
             downloadMenuItem?.isVisible = Config.isShow()
-            actionMenuView.findViewById<ActionMenuItemView>(R.id.menu_more)?.run {
-                updateLayoutParams<LayoutParams> { width = 40F.dip2px() }
-                horizontalPadding = 8F.dip2px()
-            }
         }
 
         downloadMenuIcon = downloadMenuItem?.actionView?.findViewById(R.id.menu_download_iv)
@@ -918,7 +910,7 @@ class GameDetailWrapperFragment : BaseLazyFragment(), IScrollable {
             tab.customView = tabItemBinding.root
             updateTabStyle(tab, i == bodyBinding.viewPager.currentItem)
             tab.view.clipChildren = false
-            tab.view.setPadding(0, 0, if (i == tabEntityList.size - 1) 8F.dip2px() else 0, 0)
+            tab.view.setPadding(0, 0, 0, 0)
             tab.view.setOnTouchListener { _, event ->
                 if (event.action == MotionEvent.ACTION_DOWN) {
                     handleTabTouchEvent(tabEntity?.name ?: "")
@@ -945,7 +937,7 @@ class GameDetailWrapperFragment : BaseLazyFragment(), IScrollable {
         tab.customView?.findViewById<TextView>(R.id.tab_title)
             ?.setTypeface(if (isChecked) Typeface.DEFAULT_BOLD else Typeface.DEFAULT)
         tab.customView?.findViewById<TextView>(R.id.tab_title)?.setTextColor(
-            if (isChecked) com.gh.gamecenter.common.R.color.text_primary.toColor(requireContext()) else com.gh.gamecenter.common.R.color.text_secondary.toColor(
+            if (isChecked) com.gh.gamecenter.common.R.color.text_primary.toColor(requireContext()) else com.gh.gamecenter.common.R.color.text_tertiary.toColor(
                 requireContext()
             )
         )

app/src/main/java/com/gh/gamecenter/gamedetail/detail/GameDetailFragment.kt

@@ -922,10 +922,8 @@ class GameDetailFragment : LazyFragment(), IScrollable {
     }
 
     override fun scrollToTop() {
-        if (::binding.isInitialized) {
-            binding.gamedetailAppbar.setExpanded(true)
-            binding.detailRv.scrollToPosition(0)
-        }
+        binding.gamedetailAppbar.setExpanded(true)
+        binding.detailRv.scrollToPosition(0)
     }
 
     // 登录事件/礼包状态变更事件

app/src/main/java/com/gh/gamecenter/home/custom/CustomPageFragment.kt

@@ -246,9 +246,10 @@ class CustomPageFragment : LazyFragment(), ISmartRefreshContent, IScrollable, IB
                 setNavigationTitle(it.title)
             })
 
-            dataList.observe(viewLifecycleOwner) { (shouldScrollToTop, data) ->
-                adapter.submitList(data) {
+            dataList.observe(viewLifecycleOwner) {
+                adapter.submitList(it) {
                     if (shouldScrollToTop) {
+                        shouldScrollToTop = false
                         binding.gameList.scrollToPosition(0)
                     }
                 }

app/src/main/java/com/gh/gamecenter/home/custom/eventlistener/OnCustomPageEventListener.kt

@@ -29,7 +29,7 @@ interface OnCustomPageEventListener {
     /**
      * 换一批
      */
-    fun onChangeABatch(componentId: String, subjectEntity: SubjectEntity)
+    fun onChangeABatch(subjectEntity: SubjectEntity)
 
     fun onChangeAppBarColor(color: Int)
 
@@ -56,10 +56,7 @@ interface OnCustomPageEventListener {
     /**
      * 点击进入专题详情
      */
-    fun navigateSubjectDetailPage(
-        item: CustomSubjectCollectionItem,
-        subject: CustomPageData.LinkColumnCollection.CustomSubjectEntity
-    )
+    fun navigateSubjectDetailPage(item: CustomSubjectCollectionItem, subject: CustomPageData.LinkColumnCollection.CustomSubjectEntity)
 
 
     /**

app/src/main/java/com/gh/gamecenter/home/custom/eventlistener/SubjectEventHelper.kt

@@ -35,11 +35,9 @@ class SubjectEventHelper(viewModel: CustomPageViewModel) : CustomPageItemChildEv
                     gameEntity.tempDspLogMap = map.toMap() // Return an immutable copy
                 }
             }
-
             gameEntity.isMiniGame() -> {
                 tracker.trackMiniGameClick(_item, gameEntity)
             }
-
             else -> {
                 tracker.trackColumnClick(_item, gameEntity, "游戏")
             }
@@ -53,11 +51,9 @@ class SubjectEventHelper(viewModel: CustomPageViewModel) : CustomPageItemChildEv
             gameEntity.isDspGame -> {
                 tracker.trackDspGameClick(_item, gameEntity, "按钮", "自定义页面")
             }
-
             gameEntity.isMiniGame() -> {
                 tracker.trackMiniGameClick(_item, gameEntity)
             }
-
             else -> {
                 tracker.trackColumnClick(_item, gameEntity, "按钮")
             }
@@ -71,9 +67,9 @@ class SubjectEventHelper(viewModel: CustomPageViewModel) : CustomPageItemChildEv
         }
     }
 
-    fun onChangeABatch(componentId: String, subject: SubjectEntity) {
+    fun onChangeABatch(subject: SubjectEntity) {
         tracker.trackColumnClick(_item, null, "右上角", "换一批")
-        viewModel.onChangeABatch(componentId,subject)
+        viewModel.onChangeABatch(subject)
     }
 
     fun onMoreClick(link: LinkEntity) {

app/src/main/java/com/gh/gamecenter/home/custom/model/CustomItemDTO.kt

@@ -1,185 +0,0 @@
-package com.gh.gamecenter.home.custom.model
-
-import com.gh.gamecenter.common.entity.LinkEntity
-import com.gh.gamecenter.common.entity.PKEntity
-import com.gh.gamecenter.entity.AmwayCommentEntity
-import com.gh.gamecenter.entity.DiscoveryCardEntity
-import com.gh.gamecenter.entity.HomeItemTestV2Entity
-import com.gh.gamecenter.entity.SubjectEntity
-import com.gh.gamecenter.feature.entity.AcctRecord
-import com.gh.gamecenter.feature.entity.GameEntity
-import com.gh.gamecenter.home.custom.model.CustomPageItem.Companion.CUSTOM_LINK_TYPE_COLUMN_COLLECTION
-import com.gh.vspace.VGameItemData
-
-/**
- * 接口返回的原始数据模型，最终需要转化成 CustomPageItem 在ui层呈现
- */
-sealed class CustomItemDTO(
-    val componentId: String, // 当前组件的唯一标识，用于后续更新单个数据时，快速找到目标数据
-    val link: LinkEntity
-)
-
-// 游戏专题:展开大图样式专用
-class GameItemDTO(
-    private val _componentId: String,
-    private val _link: LinkEntity,
-    val data: GameEntity,
-    val linkColumn: SubjectEntity?,
-) : CustomItemDTO(_componentId, _link)
-
-//游戏专题
-data class SubjectItemDTO(
-    private val _componentId: String,
-    private val _link: LinkEntity,
-    var data: SubjectEntity
-) : CustomItemDTO(_componentId, _link) {
-
-    val scrollState = ScrollState()
-}
-
-// 专题合集/游戏单合集
-class CollectionItemDTO(
-    private val _componentId: String,
-    private val _link: LinkEntity,
-    val data: CustomPageData.LinkColumnCollection
-) : CustomItemDTO(_componentId, _link) {
-
-    val isSubjectCollection: Boolean  // 是否是专题合集（还有可能是游戏单合集）
-        get() = link.type == CUSTOM_LINK_TYPE_COLUMN_COLLECTION
-
-    var showPage: Int = 0
-    var loadPage: Int = 1
-    var isLoadedEnd: Boolean = false
-
-    val uiState = UIState()
-
-    /**
-     * 保存ui层状态
-     */
-    data class UIState(
-        var isBackToStart: Boolean = false
-    )
-}
-
-// 最近在玩
-data class RecentGamesItemDTO(
-    private val _componentId: String,
-    private val _link: LinkEntity,
-    var data: List<VGameItemData>
-) : CustomItemDTO(_componentId, _link)
-
-// 微信小游戏-最近在玩
-data class RecentWechatMiniGamesItemDTO(
-    private val _componentId: String,
-    private val _link: LinkEntity,
-    var data: List<GameEntity>
-) : CustomItemDTO(_componentId, _link)
-
-// qq小游戏-最近在玩
-data class RecentQqMiniGamesItemDTO(
-    private val _componentId: String,
-    private val _link: LinkEntity,
-    var data: List<GameEntity>,
-    val linkQqGameRecentlyPlayed: CustomPageData.LinkRecentlyPlayed
-) : CustomItemDTO(_componentId, _link)
-
-// 加速游戏最近在玩
-data class RecentAcceleratorGamesItemDTO(
-    private val _componentId: String,
-    private val _link: LinkEntity,
-    var data: List<AcctRecord>,
-    val moreLink: LinkEntity?
-) : CustomItemDTO(_componentId, _link)
-
-// qq小游戏专题
-data class QqMiniGamesItemDTO(
-    private val _componentId: String,
-    private val _link: LinkEntity,
-    val data: SubjectEntity
-) : CustomItemDTO(_componentId, _link) {
-
-    val scrollState = ScrollState()
-}
-
-// 微信小游戏专题
-data class WechatMiniGamesItemDTO(
-    private val _componentId: String,
-    private val _link: LinkEntity,
-    val data: SubjectEntity
-) : CustomItemDTO(_componentId, _link) {
-
-    val scrollState = ScrollState()
-}
-
-// 微信小游戏CPM专题组件
-data class WeChatMiniGamesCPMSubjectItemDTO(
-    private val _componentId: String,
-    private val _link: LinkEntity,
-    var data: SubjectEntity
-) : CustomItemDTO(_componentId, _link){
-
-    val scrollState = ScrollState()
-}
-
-// DSP专题组件
-data class DSPItemDTO(
-    private val _componentId: String,
-    private val _link: LinkEntity,
-    var data: SubjectEntity
-) : CustomItemDTO(_componentId, _link){
-
-    val scrollState = ScrollState()
-}
-
-// 插件化区域
-data class PluginItemDTO(
-    private val _componentId: String,
-    private val _link: LinkEntity,
-    var data: List<GameEntity>
-) : CustomItemDTO(_componentId, _link)
-
-// 新游开测
-data class GameTestV2ItemDTO(
-    private val _componentId: String,
-    private val _link: LinkEntity,
-    val data: HomeItemTestV2Entity
-) : CustomItemDTO(_componentId, _link)
-
-// 光环推荐
-data class DiscoverCardItemDTO(
-    private val _componentId: String,
-    private val _link: LinkEntity,
-    var data: DiscoveryCardEntity?
-) : CustomItemDTO(_componentId, _link)
-
-// 安利墙
-data class AmwayItemDTO(
-    private val _componentId: String,
-    private val _link: LinkEntity,
-    val data: List<AmwayCommentEntity>
-) : CustomItemDTO(_componentId, _link)
-
-// 内容卡片
-data class ContentCardItemDTO(
-    private val _componentId: String,
-    private val _link: LinkEntity,
-    val data: CustomPageData.ContentCard
-) : CustomItemDTO(_componentId, _link)
-
-// 通用内容合集
-data class CommonContentCollectionItemDTO(
-    private val _componentId: String,
-    private val _link: LinkEntity,
-    val data: CustomPageData.CommonContentCollection
-) : CustomItemDTO(_componentId, _link)
-
-// PK
-data class PKItemDTO(
-    private val _componentId: String,
-    private val _link: LinkEntity,
-    var data: PKEntity?
-) : CustomItemDTO(_componentId, _link)
-
-class ScrollState(
-    var scrolledOffset: Int = 0
-)

app/src/main/java/com/gh/gamecenter/home/custom/model/CustomPageCacheDataSource.kt

@@ -1,42 +0,0 @@
-package com.gh.gamecenter.home.custom.model
-
-import android.util.LruCache
-import com.gh.gamecenter.feature.entity.GameEntity
-import io.reactivex.Observable
-import io.reactivex.Single
-
-class CustomPageCacheDataSource {
-
-    // 计算内存缓存大小，这里取应用最大可用内存的1/8（单位：KB）
-    private fun calculateMemoryCacheSize(): Int {
-        val maxMemory = (Runtime.getRuntime().maxMemory() / 1024).toInt()
-        return maxMemory / 8
-    }
-
-    private val memoryCache: LruCache<String, List<GameEntity>> =
-        object : LruCache<String, List<GameEntity>>(calculateMemoryCacheSize()) {
-            override fun sizeOf(key: String, value: List<GameEntity>): Int {
-                return value.toTypedArray().size / 1024 // 单位：KB
-            }
-        }
-
-    fun getGameList(subjectId: String) = Observable.create {
-        val gameList = memoryCache.get(subjectId)
-        if (gameList.isNullOrEmpty()) {
-            it.onComplete()
-        } else {
-            it.onNext(gameList)
-        }
-
-    }
-
-    fun putGameList(subjectId: String?, data: List<GameEntity>) {
-        if (!subjectId.isNullOrBlank()) {
-            memoryCache.put(subjectId, data)
-        }
-    }
-
-    fun onClear() {
-        memoryCache.evictAll()
-    }
-}

app/src/main/java/com/gh/gamecenter/home/custom/model/CustomPageItem.kt

@@ -15,10 +15,10 @@ import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.gh.vspace.VGameItemData
 
 abstract class CustomPageItem(
+    // 当前模块在数据列表中的位置（注意：非ui页面的位置，而是数据列表中的位置，因为某条数据可能会拆分成多个item）
     val link: LinkEntity,
-    var position: Int,// 当前模块在数据列表中的位置（注意：非ui页面的位置，而是数据列表中的位置，因为某条数据可能会拆分成多个item）
-    val componentPosition: Int,
-    val componentId: String,
+    var position: Int,
+    val componentPosition: Int
 ) {
 
     abstract val itemType: Int
@@ -362,11 +362,9 @@ abstract class CustomPageItem(
 data class CustomSubjectItem(
     private val _link: LinkEntity,
     val data: SubjectEntity,
-    private val scrollState: ScrollState,
     private val _position: Int,
-    private val _componentPosition: Int,
-    private val _componentId: String,
-) : CustomPageItem(_link, _position, _componentPosition, _componentId) {
+    private val _componentPosition: Int
+) : CustomPageItem(_link, _position, _componentPosition) {
 
     override val itemType: Int
         get() = subjectTypeMap[data.type] ?: CUSTOM_PAGE_ITEM_TYPE_INVALID
@@ -381,11 +379,7 @@ data class CustomSubjectItem(
         get() = data.data ?: emptyList()
 
     // 临时变量，记录横向列表滚动的距离
-    var scrolledOffset: Int
-        get() = scrollState.scrolledOffset
-        set(value) {
-            scrollState.scrolledOffset = value
-        }
+    var scrolledOffset: Int = 0
 
     val exposureSource: List<ExposureSource>
         get() = listOf(ExposureSource("专题", "${data.name ?: ""}+$componentStyle+${data.id}"))
@@ -426,7 +420,7 @@ data class CustomSubjectItem(
                 if (latestDayBeforeTodayPair.first >= testDayOffset) {
                     latestDayBeforeTodayPair = Pair(testDayOffset, index)
                 }
-            } else {
+            } else if (testDayOffset > 0) {
                 if (testDayOffset <= latestDayAfterTodayPair.first) {
                     latestDayAfterTodayPair = Pair(testDayOffset, index)
                 }
@@ -446,12 +440,11 @@ data class CustomSubjectItem(
 data class CustomSplitSubjectItem(
     private val _link: LinkEntity,
     var data: SubjectEntity,
-    val step: Int,
-    val startChildPosition: Int,
     private val _position: Int,
     private val _componentPosition: Int,
-    private val _componentId: String,
-) : CustomPageItem(_link, _position, _componentPosition, _componentId) {
+    val step: Int,
+    val startChildPosition: Int
+) : CustomPageItem(_link, _position, _componentPosition) {
 
     var splitItemCount: Int = -1 // 游戏专题拆分出来的子项数量
 
@@ -516,9 +509,8 @@ data class CustomGameItem(
     val linkColumn: SubjectEntity?,
     val childPosition: Int,
     private val _position: Int, // 当前 item 在 ui 中的位置
-    private val _componentPosition: Int,  // 当前组件的位置
-    private val _componentId: String
-) : CustomPageItem(_link, _position, _componentPosition, _componentId) {
+    private val _componentPosition: Int  // 当前组件的位置
+) : CustomPageItem(_link, _position, _componentPosition) {
 
     override val itemType: Int
         get() = CUSTOM_PAGE_ITEM_TYPE_GAME_HOME_GAME_ITEM
@@ -554,11 +546,9 @@ data class CustomGameItem(
 data class CustomSubjectCollectionItem(
     private val _link: LinkEntity,
     val data: CustomPageData.LinkColumnCollection,
-    val uiState: CollectionItemDTO.UIState,
     private val _position: Int,
-    private val _componentPosition: Int,
-    private val _componentId: String
-) : CustomPageItem(_link, _position, _componentPosition, _componentId) {
+    private val _componentPosition: Int
+) : CustomPageItem(_link, _position, _componentPosition) {
 
     val isSubjectCollection: Boolean  // 是否是专题合集（还有可能是游戏单合集）
         get() = link.type == CUSTOM_LINK_TYPE_COLUMN_COLLECTION
@@ -582,14 +572,19 @@ data class CustomSubjectCollectionItem(
             emptyList()
         }
 
-    //当前显示的页码
+    // 临时变量：记录合集中，轮换刷新时当前显示的页码
     var showPage: Int = 0
 
-    var isBackToStart: Boolean
-        get() = uiState.isBackToStart
-        set(value) {
-            uiState.isBackToStart = value
-        }
+    // 临时变量：记录合集中，轮换刷新时当前加载的页码
+    var loadPage: Int = 1
+
+    // 临时变量，记录点击轮换刷新时，是否正在loading
+    var isLoading: Boolean = false
+
+    // 临时变量，数据是否已全部加载完毕
+    var isLoadedEnd: Boolean = false
+
+    var isBackToStart = true
 
     val showSubject: CustomPageData.LinkColumnCollection.CustomSubjectEntity?
         get() = data.data.getOrNull(showPage % data.data.size)
@@ -597,12 +592,14 @@ data class CustomSubjectCollectionItem(
     override fun doAreItemsTheSame(other: CustomPageItem): Boolean {
         return other is CustomSubjectCollectionItem
                 && data.id == other.data.id
-
     }
 
     override fun doAreContentsTheSames(other: CustomPageItem): Boolean {
         return other is CustomSubjectCollectionItem
                 && showPage == other.showPage
+                && isLoading == other.isLoading
+                && isLoadedEnd == other.isLoadedEnd
+                && showSubject == other.showSubject
     }
 }
 
@@ -611,9 +608,8 @@ data class CustomRecentGamesItem(
     private val _link: LinkEntity,
     val data: List<VGameItemData>,
     private val _position: Int,
-    private val _componentPosition: Int,
-    private val _componentId: String
-) : CustomPageItem(_link, _position, _componentPosition, _componentId) {
+    private val _componentPosition: Int
+) : CustomPageItem(_link, _position, _componentPosition) {
 
     override val itemType: Int
         get() = CUSTOM_PAGE_ITEM_TYPE_RECENT_PLAY
@@ -632,9 +628,8 @@ data class CustomRecentWeChatMiniGamesItem(
     private val _link: LinkEntity,
     val data: List<GameEntity>,
     private val _position: Int,
-    private val _componentPosition: Int,
-    private val _componentId: String
-) : CustomPageItem(_link, _position, _componentPosition, _componentId) {
+    private val _componentPosition: Int
+) : CustomPageItem(_link, _position, _componentPosition) {
 
     override val itemType: Int
         get() = CUSTOM_PAGE_ITEM_TYPE_MINI_GAME_RECENT_PLAY
@@ -652,9 +647,8 @@ data class CustomWeChatMiniGamesCPMSubjectItem(
     private val _link: LinkEntity,
     val data: SubjectEntity,
     private val _position: Int,
-    private val _componentPosition: Int,
-    private val _componentId: String
-) : CustomPageItem(_link, _position, _componentPosition, _componentId) {
+    private val _componentPosition: Int
+) : CustomPageItem(_link, _position, _componentPosition) {
 
     override val itemType: Int
         get() = CUSTOM_PAGE_ITEM_TYPE_MINI_GAME_RECENT_PLAY
@@ -673,9 +667,8 @@ data class CustomRecentQqMiniGamesItem(
     val data: List<GameEntity>,
     val linkQqGameRecentlyPlayed: CustomPageData.LinkRecentlyPlayed,
     private val _position: Int,
-    private val _componentPosition: Int,
-    private val _componentId: String
-) : CustomPageItem(_link, _position, _componentPosition, _componentId) {
+    private val _componentPosition: Int
+) : CustomPageItem(_link, _position, _componentPosition) {
 
     override val itemType: Int
         get() = CUSTOM_PAGE_ITEM_TYPE_MINI_GAME_RECENT_PLAY
@@ -697,9 +690,8 @@ data class CustomRecentAcceleratorItem(
     val data: List<AcctRecord>,
     val moreLink: LinkEntity?,
     private val _position: Int,
-    private val _componentPosition: Int,
-    private val _componentId: String
-) : CustomPageItem(_link, _position, _componentPosition, _componentId) {
+    private val _componentPosition: Int
+) : CustomPageItem(_link, _position, _componentPosition) {
 
     override val itemType: Int
         get() = CUSTOM_PAGE_ITEM_TYPE_ACCELERATOR_RECENT_PLAYED
@@ -721,9 +713,8 @@ data class CustomPluginItem(
     private val _link: LinkEntity,
     val data: List<GameEntity>,
     private val _position: Int,
-    private val _componentPosition: Int,
-    private val _componentId: String
-) : CustomPageItem(_link, _position, _componentPosition, _componentId) {
+    private val _componentPosition: Int
+) : CustomPageItem(_link, _position, _componentPosition) {
 
     override val itemType: Int
         get() = CUSTOM_PAGE_ITEM_TYPE_PLUGIN
@@ -744,9 +735,8 @@ data class CustomGameTestV2Item(
     private val _link: LinkEntity,
     val data: HomeItemTestV2Entity,
     private val _position: Int,
-    private val _componentPosition: Int,
-    private val _componentId: String
-) : CustomPageItem(_link, _position, _componentPosition, _componentId) {
+    private val _componentPosition: Int
+) : CustomPageItem(_link, _position, _componentPosition) {
 
     override val itemType: Int
         get() = CUSTOM_PAGE_ITEM_TYPE_NEW_GAME_TEST
@@ -764,9 +754,8 @@ data class CustomDiscoverCardItem(
     private val _link: LinkEntity,
     val data: DiscoveryCardEntity?,
     private val _position: Int,
-    private val _componentPosition: Int,
-    private val _componentId: String
-) : CustomPageItem(_link, _position, _componentPosition, _componentId) {
+    private val _componentPosition: Int
+) : CustomPageItem(_link, _position, _componentPosition) {
 
     val spanCount = 3
 
@@ -792,9 +781,8 @@ data class CustomAmwayItem(
     private val _link: LinkEntity,
     val data: List<AmwayCommentEntity>,
     private val _position: Int,
-    private val _componentPosition: Int,
-    private val _componentId: String
-) : CustomPageItem(_link, _position, _componentPosition, _componentId) {
+    private val _componentPosition: Int
+) : CustomPageItem(_link, _position, _componentPosition) {
 
     override val itemType: Int
         get() = CUSTOM_PAGE_ITEM_TYPE_AMWAY_WALL
@@ -812,9 +800,8 @@ data class CustomContentCardItem(
     private val _link: LinkEntity,
     val data: CustomPageData.ContentCard,
     private val _position: Int,
-    private val _componentPosition: Int,
-    private val _componentId: String
-) : CustomPageItem(_link, _position, _componentPosition, _componentId) {
+    private val _componentPosition: Int
+) : CustomPageItem(_link, _position, _componentPosition) {
 
     override val itemType: Int
         get() = CUSTOM_PAGE_ITEM_TYPE_CONTENT_CARD
@@ -835,9 +822,8 @@ data class CustomCommonContentCollectionItem(
     private val _link: LinkEntity,
     val data: CustomPageData.CommonContentCollection,
     private val _position: Int,
-    private val _componentPosition: Int,
-    private val _componentId: String
-) : CustomPageItem(_link, _position, _componentPosition, _componentId) {
+    private val _componentPosition: Int
+) : CustomPageItem(_link, _position, _componentPosition) {
 
     override val itemType: Int
         get() = if (data.layout == COMMON_CONTENT_COLLECTION_LAYOUT_BANNER) {
@@ -875,11 +861,10 @@ data class CustomCommonContentCollectionItem(
 data class CustomSplitCommonContentCollectionItem(
     private val _link: LinkEntity,
     val data: CustomPageData.CommonContentCollection,
-    val leftPosition: Int,
     private val _position: Int,
     private val _componentPosition: Int,
-    private val _componentId: String
-) : CustomPageItem(_link, _position, _componentPosition, _componentId) {
+    val leftPosition: Int,
+) : CustomPageItem(_link, _position, _componentPosition) {
 
     override val itemType
         get() = commonContentCollection[data.layout] ?: CUSTOM_PAGE_ITEM_TYPE_INVALID
@@ -912,9 +897,8 @@ data class CustomPKItem(
     private val _link: LinkEntity,
     val data: PKEntity?,
     private val _position: Int,
-    private val _componentPosition: Int,
-    private val _componentId: String
-) : CustomPageItem(_link, _position, _componentPosition, _componentId) {
+    private val _componentPosition: Int
+) : CustomPageItem(_link, _position, _componentPosition) {
 
     override val itemType: Int
         get() = CUSTOM_PAGE_ITEM_TYPE_PK
@@ -932,9 +916,8 @@ data class CustomDspPlaceholderItem(
     private val _link: LinkEntity,
     val data: SubjectEntity,
     private val _position: Int,
-    private val _componentPosition: Int,
-    private val _componentId: String
-) : CustomPageItem(_link, _position, _componentPosition, _componentId) {
+    private val _componentPosition: Int
+) : CustomPageItem(_link, _position, _componentPosition) {
 
     override val itemType: Int
         get() = CUSTOM_PAGE_ITEM_TYPE_MINI_GAME_RECENT_PLAY
@@ -947,9 +930,14 @@ data class CustomDspPlaceholderItem(
     }
 }
 
-object CustomFooterItem : CustomPageItem(LinkEntity(), -1, -1, "") {
+object CustomFooterItem : CustomPageItem(LinkEntity(), -1, -1) {
     override val itemType: Int
         get() = CUSTOM_PAGE_ITEM_TYPE_FOOTER
 }
 
+object CustomInvalidItem : CustomPageItem(LinkEntity(), -2, -2) {
+    override val itemType: Int
+        get() = CUSTOM_PAGE_ITEM_TYPE_INVALID
+}
+
 

app/src/main/java/com/gh/gamecenter/home/custom/model/CustomPageLocalDataSource.kt

@@ -1,10 +1,8 @@
 package com.gh.gamecenter.home.custom.model
 
 import android.content.Context
-import android.util.LruCache
 import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.feature.entity.FloatingWindowEntity
-import com.gh.gamecenter.feature.entity.GameEntity
 import com.halo.assistant.HaloApp
 import java.text.SimpleDateFormat
 import java.util.*

app/src/main/java/com/gh/gamecenter/home/custom/model/CustomPageRemoteDataSource.kt

@@ -56,17 +56,12 @@ class CustomPageRemoteDataSource(
         }
     }
 
-    fun loadColumnsCollectionContents(
-        collectionId: String,
-        page: Int
-    ): Single<MutableList<CustomPageData.LinkColumnCollection.CustomSubjectEntity>> =
-        newApi.getColumnsCollectionContents(collectionId, "component", page, 1)
-
-    fun loadGameCollectionContents(
-        collectionId: String,
-        page: Int
-    ): Single<MutableList<CustomPageData.LinkColumnCollection.CustomSubjectEntity>> =
-        newApi.getGameCollectionContents(collectionId, "component", page, 1)
+    fun loadCollectionContent(item: CustomSubjectCollectionItem): Single<List<CustomPageData.LinkColumnCollection.CustomSubjectEntity>> =
+        if (item.isSubjectCollection) {
+            newApi.getColumnsCollectionContents(item.data.id, "component", item.loadPage + 1, 1)
+        } else {
+            newApi.getGameCollectionContents(item.data.id, "component", item.loadPage + 1, 1)
+        }
 
     fun loadChangeSubjectGame(subjectEntity: SubjectEntity): Observable<List<GameEntity>> =
         if (subjectEntity.isQQColumn) {

app/src/main/java/com/gh/gamecenter/home/custom/model/CustomPageShareRepository.kt

@@ -2,13 +2,10 @@ package com.gh.gamecenter.home.custom.model
 
 import androidx.annotation.MainThread
 import androidx.lifecycle.LiveData
-import androidx.lifecycle.MediatorLiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.asLiveData
 import com.gh.common.filter.RegionSettingHelper
-import com.gh.common.util.HomePluggableHelper
 import com.gh.common.util.PackageUtils
-import com.gh.download.DownloadManager
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.constant.Constants.SP_HIDDEN_NOTIFICATIONS
 import com.gh.gamecenter.common.utils.observableToMain
@@ -20,9 +17,7 @@ import com.gh.gamecenter.entity.DiscoveryGameCardEntity
 import com.gh.gamecenter.entity.DiscoveryGameCardLabel
 import com.gh.gamecenter.feature.entity.AcctRecord
 import com.gh.gamecenter.feature.entity.GameEntity
-import com.gh.gamecenter.feature.entity.PluginLocation
 import com.gh.gamecenter.gamedetail.accelerator.AccelerationDataBase
-import com.gh.gamecenter.packagehelper.PackageRepository
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
@@ -39,30 +34,6 @@ class CustomPageShareRepository private constructor() {
 
     private val compositeDisposable = CompositeDisposable()
 
-    private val _pluginGames = MediatorLiveData<List<GameEntity>>().apply {
-        addSource(PackageRepository.gameUpdateLiveData) { updateList ->
-            val gameList = arrayListOf<GameEntity>()
-            updateList.forEach {
-                if (it.isPluggable && it.indexPlugin == "open" && it.isShowPlugin(PluginLocation.only_index)) {
-                    val game = it.transformGameEntity()
-                    if (HomePluggableHelper.showHomePluggable(game)) {
-                        game.setEntryMap(DownloadManager.getInstance().getEntryMap(game.name))
-                        gameList.add(game)
-                    }
-                }
-            }
-            // 下载七天排序
-            gameList.sortWith { o1, o2 -> o2.download - o1.download }
-            value = gameList
-        }
-    }
-
-    val pluginGames: LiveData<List<GameEntity>> = _pluginGames
-    fun temporarilyBlockGameInPluginItem(gameId: String) {
-        val gameList = _pluginGames.value ?: return
-        _pluginGames.value = gameList.filterNot { it.id == gameId }
-    }
-
     private val _discoverData = MutableLiveData<DiscoveryCardEntity>()
     val discoverData: LiveData<DiscoveryCardEntity> = _discoverData
 

app/src/main/java/com/gh/gamecenter/home/custom/viewholder/BaseCustomViewHolder.kt

@@ -26,7 +26,10 @@ import com.gh.gamecenter.home.custom.createExposureEvent
 import com.gh.gamecenter.home.custom.eventlistener.CustomPageItemChildEventHelper
 import com.gh.gamecenter.home.custom.eventlistener.GameSubjectCollectionEventHelper
 import com.gh.gamecenter.home.custom.eventlistener.SubjectEventHelper
-import com.gh.gamecenter.home.custom.model.*
+import com.gh.gamecenter.home.custom.model.CustomPageItem
+import com.gh.gamecenter.home.custom.model.CustomSplitSubjectItem
+import com.gh.gamecenter.home.custom.model.CustomSubjectCollectionItem
+import com.gh.gamecenter.home.custom.model.CustomSubjectItem
 import com.lightgame.download.DownloadEntity
 
 abstract class BaseCustomViewHolder(
@@ -95,14 +98,7 @@ abstract class BaseCustomViewHolder(
             titleBinding.root.goneIf(false)
             setSubjectTitle(
                 titleBinding,
-                CustomSubjectItem(
-                    item.link,
-                    item.data,
-                    ScrollState(),
-                    item.position,
-                    item.componentPosition,
-                    item.componentId
-                ),
+                CustomSubjectItem(item.link, item.data, item.position, item.componentPosition),
                 eventHelper,
                 titleType
             )
@@ -193,7 +189,7 @@ abstract class BaseCustomViewHolder(
                     when (subject.home) {
                         HOME_CHANGE -> {
                             // 点击换一批
-                            eventHelper.onChangeABatch(item.componentId, subject)
+                            eventHelper.onChangeABatch(subject)
                         }
 
                         HOME_MORE -> {

app/src/main/java/com/gh/gamecenter/home/custom/viewholder/CustomRefreshIconViewHolder.kt

@@ -88,7 +88,7 @@ class CustomRefreshIconViewHolder(
             } else {
                 _subjectEntity = subjectEntity
             }
-            println("kayn -->isBackToStart:${item.isBackToStart}")
+
             // 如果游戏全部被屏蔽，自动加载下一页
             if (subjectEntity.games.isEmpty()) {
                 childEventHelper.onRotateRefresh()

app/src/main/java/com/gh/gamecenter/minigame/MiniGameRecentlyPlayUseCase.kt

@@ -38,12 +38,19 @@ object MiniGameRecentlyPlayUseCase {
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe(object : BiResponse<List<GameEntity>>() {
                 override fun onSuccess(data: List<GameEntity>) {
-                    if (data.isNotEmpty()) {
-                        if (gameType == Constants.QQ_MINI_GAME) {
-                            _qqRecentGamesItemLiveData.value = data
-                        } else {
-                            _wechatRecentGamesItemLiveData.value = data
-                        }
+                    if (gameType == Constants.QQ_MINI_GAME) {
+                        _qqRecentGamesItemLiveData.value = data
+                    } else {
+                        _wechatRecentGamesItemLiveData.value = data
+                    }
+                }
+
+                override fun onFailure(exception: Exception) {
+                    super.onFailure(exception)
+                    if (gameType == Constants.QQ_MINI_GAME) {
+                        _qqRecentGamesItemLiveData.value = emptyList()
+                    } else {
+                        _wechatRecentGamesItemLiveData.value = emptyList()
                     }
                 }
             })
@@ -83,7 +90,10 @@ object MiniGameRecentlyPlayUseCase {
             _qqRecentGamesItemLiveData.value
         } else {
             _wechatRecentGamesItemLiveData.value
-        } ?: emptyList()
+        } ?: let {
+            loadRecentlyPlayedMiniGameList(gameType)// 最近在玩数据为空时，则调用接口获取数据
+            emptyList()
+        }
 
     fun clearRecentlyPlayedMiniGameList(gameType: String = "") {
         when (gameType) {

app/src/main/java/com/gh/gamecenter/minigame/qq/QGameSubjectListRepository.kt

@@ -9,19 +9,15 @@ import io.reactivex.Observable
 import io.reactivex.Single
 
 class QGameSubjectListRepository(
-    private val api: ApiService = RetrofitManager.getInstance().newApi,
+    private val api: ApiService = RetrofitManager.getInstance().newApi
 ) : ISubjectListRepository {
 
-    override fun getColumn(
-        column_id: String?,
-        page: Int,
-        sort: String?,
-        order: String?,
-        ad: String?,
-        columnCollectionId: String?,
-        minimumSize: Int,
-        onlyFee: Boolean,
-    ): Single<MutableList<GameEntity>> {
+    override fun getColumn(column_id: String?,
+                           page: Int,
+                           sort: String?,
+                           order: String?,
+                           ad: String?,
+                           columnCollectionId: String?): Single<MutableList<GameEntity>> {
         return api.getQGameColumn(column_id, order, page, 20)
     }
 

app/src/main/java/com/gh/gamecenter/minigame/wechat/WGameSubjectCPMListRepository.kt

@@ -10,17 +10,13 @@ class WGameSubjectCPMListRepository(
     private val dataSource: WGameSubjectCPMRemoteDataSource = WGameSubjectCPMRemoteDataSource()
 ) : ISubjectListRepository {
 
-    override fun getColumn(
-        column_id: String?,
-        page: Int,
-        sort: String?,
-        order: String?,
-        ad: String?,
-        columnCollectionId: String?,
-        minimumSize: Int,
-        onlyFee: Boolean
-    ): Single<MutableList<GameEntity>> {
-        return dataSource.getEditorRecommendCPMList(page = page, minimumSize = minimumSize, onlyFee = onlyFee)
+    override fun getColumn(column_id: String?,
+                           page: Int,
+                           sort: String?,
+                           order: String?,
+                           ad: String?,
+                           columnCollectionId: String?): Single<MutableList<GameEntity>> {
+        return dataSource.getEditorRecommendCPMList(page)
     }
 
     override fun getColumnSettings(column_id: String?): Observable<SubjectSettingEntity> {

app/src/main/java/com/gh/gamecenter/minigame/wechat/WGameSubjectCPMListUseCase.kt

@@ -6,7 +6,6 @@ import com.gh.gamecenter.common.livedata.NonStickyMutableLiveData
 import com.gh.gamecenter.common.retrofit.BiResponse
 import com.gh.gamecenter.feature.entity.GameEntity
 import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.schedulers.Schedulers
 
 /**
@@ -15,7 +14,11 @@ import io.reactivex.schedulers.Schedulers
 class WGameSubjectCPMListUseCase(
     private val repository: WGameSubjectCPMListRepository = WGameSubjectCPMListRepository()
 ) {
-    private val compositeDisposable = CompositeDisposable()
+
+    /**
+     * 微信专题CPM请求记录，用于避免重复请求，以专题ID作为Key
+     */
+    private val requestKeyList = mutableListOf<String>()
 
     /**
      * 微信小游戏CPM列表，这里的LiveData充当类似于EventBus的角色，因此使用NonStickyMutableLiveData
@@ -23,18 +26,21 @@ class WGameSubjectCPMListUseCase(
     private val _wechatMiniGameCPMListLiveData = NonStickyMutableLiveData<Pair<String, List<GameEntity>>>()
     val wechatMiniGameCPMListLiveData: LiveData<Pair<String, List<GameEntity>>> = _wechatMiniGameCPMListLiveData
 
-    fun getWechatMiniGameCPMList(componentId: String, minimumSize: Int, onlyFee: Boolean) {
-        repository.getColumn(null, 1, null, null, null, null, minimumSize, onlyFee)
+    @SuppressLint("CheckResult")
+    fun getWechatMiniGameCPMList(subjectId: String?) {
+        if (subjectId.isNullOrEmpty() || requestKeyList.contains(subjectId)) {
+            return
+        }
+
+        requestKeyList.add(subjectId)
+        repository.getColumn(null, 1, null, null, null, null)
             .subscribeOn(Schedulers.io())
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe(object : BiResponse<List<GameEntity>>() {
                 override fun onSuccess(data: List<GameEntity>) {
-                    _wechatMiniGameCPMListLiveData.value = componentId to data
+                    requestKeyList.remove(subjectId)
+                    _wechatMiniGameCPMListLiveData.value = subjectId to data
                 }
-            }).let(compositeDisposable::add)
-    }
-
-    fun onClear() {
-        compositeDisposable.clear()
+            })
     }
 }

app/src/main/java/com/gh/gamecenter/minigame/wechat/WGameSubjectCPMRemoteDataSource.kt

@@ -14,12 +14,7 @@ class WGameSubjectCPMRemoteDataSource(
     private val api: WGameCPMApiService = RetrofitManager.getInstance().wGameCPMApi
 ) {
 
-    fun getEditorRecommendCPMList(
-        page: Int,
-        pageSize: Int = 10,
-        minimumSize: Int,
-        onlyFee: Boolean
-    ): Single<MutableList<GameEntity>> {
+    fun getEditorRecommendCPMList(page: Int, pageSize: Int = 10): Single<MutableList<GameEntity>> {
         val meta = MetaUtil.getMeta()
         val request = mapOf(
             "head" to mapOf(
@@ -33,44 +28,38 @@ class WGameSubjectCPMRemoteDataSource(
             "body" to mapOf(
                 "page" to page - 1,
                 "pageSize" to pageSize,
-                "onlyFee" to if (onlyFee) 1 else 0,
             )
         )
         return api.getEditorRecommendList(request.toRequestBody())
             .map {
                 if (it.ret == 0) {
-                    // 数量不满足最小值时直接返回空
-                    if (onlyFee && minimumSize > 0 && it.appInfoList.size < minimumSize) {
-                        mutableListOf()
-                    } else {
-                        it.appInfoList.map { info ->
-                            GameEntity(
-                                mName = info.appName,
-                                mIcon = info.logo,
-                                mBrief = info.briefIntro,
-                                miniGameUid = info.appID,
-                                miniGameAppId = info.userName,
-                                miniGameCategory = Constants.WECHAT_MINI_GAME,
-                                profit = Constants.WECHAT_MINI_GAME_PROFIT_CPM,
-                                miniGameAppStatus = 2,
-                                miniGameAppPath = info.wechatAppPath,
-                                miniGameExtData = info.extData,
-                                miniGameRecommendId = info.recommendID,
-                                mTagStyle = arrayListOf(
-                                    TagStyleEntity(
-                                        name = info.categoryName,
-                                        color = TAG_COLOR,
-                                        background = TAG_BACKGROUND
-                                    ),
-                                    TagStyleEntity(
-                                        name = info.subcategoryName,
-                                        color = TAG_COLOR,
-                                        background = TAG_BACKGROUND
-                                    )
+                    it.appInfoList.map { info ->
+                        GameEntity(
+                            mName = info.appName,
+                            mIcon = info.logo,
+                            mBrief = info.briefIntro,
+                            miniGameUid = info.appID,
+                            miniGameAppId = info.userName,
+                            miniGameCategory = Constants.WECHAT_MINI_GAME,
+                            profit = Constants.WECHAT_MINI_GAME_PROFIT_CPM,
+                            miniGameAppStatus = 2,
+                            miniGameAppPath = info.wechatAppPath,
+                            miniGameExtData = info.extData,
+                            miniGameRecommendId = info.recommendID,
+                            mTagStyle = arrayListOf(
+                                TagStyleEntity(
+                                    name = info.categoryName,
+                                    color = TAG_COLOR,
+                                    background = TAG_BACKGROUND
+                                ),
+                                TagStyleEntity(
+                                    name = info.subcategoryName,
+                                    color = TAG_COLOR,
+                                    background = TAG_BACKGROUND
                                 )
                             )
-                        }.toMutableList()
-                    }
+                        )
+                    }.toMutableList()
                 } else {
                     mutableListOf()
                 }

app/src/main/java/com/gh/gamecenter/minigame/wechat/WGameSubjectListRepository.kt

@@ -9,19 +9,15 @@ import io.reactivex.Observable
 import io.reactivex.Single
 
 class WGameSubjectListRepository(
-    private val api: ApiService = RetrofitManager.getInstance().newApi,
+    private val api: ApiService = RetrofitManager.getInstance().newApi
 ) : ISubjectListRepository {
 
-    override fun getColumn(
-        column_id: String?,
-        page: Int,
-        sort: String?,
-        order: String?,
-        ad: String?,
-        columnCollectionId: String?,
-        minimumSize: Int,
-        onlyFee: Boolean,
-    ): Single<MutableList<GameEntity>> {
+    override fun getColumn(column_id: String?,
+                           page: Int,
+                           sort: String?,
+                           order: String?,
+                           ad: String?,
+                           columnCollectionId: String?): Single<MutableList<GameEntity>> {
         return api.getWGameColumn(column_id, order, page, 20)
     }
 

app/src/main/java/com/gh/gamecenter/packagehelper/PackageRepository.kt

@@ -9,17 +9,15 @@ import com.gh.common.filter.RegionSettingHelper
 import com.gh.common.util.GameUtils
 import com.gh.common.util.PackageHelper
 import com.gh.common.util.PackageUtils
+import com.gh.gamecenter.R
 import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.entity.InstalledPackagesAction
 import com.gh.gamecenter.common.exposure.meta.MetaUtil
 import com.gh.gamecenter.common.loghub.LoghubUtils
 import com.gh.gamecenter.common.retrofit.BiResponse
-import com.gh.gamecenter.common.retrofit.EmptyResponse
 import com.gh.gamecenter.common.retrofit.ObservableUtil
 import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.common.utils.secondOrNull
 import com.gh.gamecenter.common.utils.toArrayList
-import com.gh.gamecenter.common.utils.toRequestBody
 import com.gh.gamecenter.common.utils.tryCatchInRelease
 import com.gh.gamecenter.core.runOnIoThread
 import com.gh.gamecenter.core.utils.SPUtils
@@ -43,12 +41,10 @@ import io.reactivex.SingleObserver
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
 import io.reactivex.schedulers.Schedulers
-import okhttp3.ResponseBody
 import org.greenrobot.eventbus.EventBus
 import org.json.JSONException
 import org.json.JSONObject
 import java.util.*
-import kotlin.collections.HashSet
 
 /**
  * 该类存储的是已安装的所有游戏(助手后台已收录的)和所有更新(包括插件化)数据
@@ -628,20 +624,7 @@ object PackageRepository {
             pkgSet.add(iterator.next())
         }
 
-        postInstalledPackageList(pkgSet)
-
         PackagesManager.initInstallPkgSet(pkgSet)
     }
 
-    private fun postInstalledPackageList(pkgSet: HashSet<String>) {
-        val requestBody = InstalledPackagesAction(
-            action = "launch",
-            packages = pkgSet.toList()
-        ).toRequestBody()
-
-        RetrofitManager.getInstance().newApi.postInstalledPackages(HaloApp.getInstance().gid, requestBody)
-            .subscribeOn(Schedulers.io())
-            .subscribe(EmptyResponse<ResponseBody>())
-    }
-
 }

app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java

@@ -3521,11 +3521,4 @@ public interface ApiService {
     @Headers({"Content-Type: application/json", "Accept: application/json"})
     @POST("suggestions")
     Single<ResponseBody> uploadAcceleratorErrorLog(@Body RequestBody toRequestBody);
-
-    /**
-     * 上传设备已安装的游戏
-     */
-    @POST("/devices/{device_id}/installed_games")
-    Single<ResponseBody> postInstalledPackages(@Path("device_id") String deviceId, @Body RequestBody body);
-
 }

app/src/main/java/com/gh/gamecenter/subject/ISubjectListRepository.kt

@@ -13,9 +13,7 @@ interface ISubjectListRepository {
         sort: String?,
         order: String?,
         ad: String?,
-        columnCollectionId: String?,
-        minimumSize: Int,
-        onlyFee: Boolean
+        columnCollectionId: String?
     ): Single<MutableList<GameEntity>>
 
     fun getColumnSettings(column_id: String?): Observable<SubjectSettingEntity>

app/src/main/java/com/gh/gamecenter/subject/SubjectListRepository.kt

@@ -8,19 +8,10 @@ import io.reactivex.Observable
 import io.reactivex.Single
 
 class SubjectListRepository(
-    private val api: ApiService = RetrofitManager.getInstance().api,
+    private val api: ApiService = RetrofitManager.getInstance().api
 ) : ISubjectListRepository {
 
-    override fun getColumn(
-        column_id: String?,
-        page: Int,
-        sort: String?,
-        order: String?,
-        ad: String?,
-        columnCollectionId: String?,
-        minimumSize: Int,
-        onlyFee: Boolean,
-    ): Single<MutableList<GameEntity>> {
+    override fun getColumn(column_id: String?, page: Int, sort: String?, order: String?, ad: String?, columnCollectionId: String?): Single<MutableList<GameEntity>> {
         return api.getColumn(column_id, sort, order, ad, columnCollectionId, page)
     }
 

app/src/main/java/com/gh/gamecenter/subject/SubjectListViewModel.kt

@@ -49,9 +49,7 @@ open class SubjectListViewModel(
             subjectData.sort,
             subjectData.filter.ifEmpty { "type:全部" },
             AdHelper.getIdfaString(),
-            columnCollectionId,
-            -1,
-            false
+            columnCollectionId
         )
     }
 

app/src/main/java/com/gh/gamecenter/subject/tab/SubjectTabFragment.kt

@@ -134,7 +134,6 @@ class SubjectTabFragment : ToolbarFragment() {
         isSubject = subjectList.isEmpty()
         tabStyle = when {
             mIsFromMainWrapper && !isSubject -> TabStyle.COLUMN_COLLECTION_MAIN_WRAPPER
-            mIsFromTabWrapper && !isSubject -> TabStyle.COLUMN_COLLECTION_TAB_WRAPPER
             isSubject -> TabStyle.SUBJECT_NORMAL
             else -> TabStyle.COLUMN_COLLECTION_NORMAL
         }
@@ -371,19 +370,18 @@ class SubjectTabFragment : ToolbarFragment() {
     }
 
     private fun initTabLayout() {
-        if (isCustomEnabled && SPUtils.getBoolean(Constants.SP_SHOW_COLUMN_COLLECTION_CUSTOM_TAB_GUIDE, true)) {
-            binding.subjectTab.addOnTabSelectedListener(object : OnTabSelectedListener {
-                override fun onTabSelected(tab: TabLayout.Tab?) {
-                    showSettingGuideIfNeeded(this)
-                }
-                override fun onTabUnselected(tab: TabLayout.Tab?) {}
-                override fun onTabReselected(tab: TabLayout.Tab?) {
-                    showSettingGuideIfNeeded(this)
-                }
-            })
-        }
-
         if (tabStyle == TabStyle.COLUMN_COLLECTION_NORMAL) {
+            if (isCustomEnabled && SPUtils.getBoolean(Constants.SP_SHOW_COLUMN_COLLECTION_CUSTOM_TAB_GUIDE, true)) {
+                binding.subjectTab.addOnTabSelectedListener(object : OnTabSelectedListener {
+                    override fun onTabSelected(tab: TabLayout.Tab?) {
+                        showSettingGuideIfNeeded(this)
+                    }
+                    override fun onTabUnselected(tab: TabLayout.Tab?) {}
+                    override fun onTabReselected(tab: TabLayout.Tab?) {
+                        showSettingGuideIfNeeded(this)
+                    }
+                })
+            }
             binding.subjectTabIndicator.run {
                 setIndicatorWidth(12)
                 updateLayoutParams<ConstraintLayout.LayoutParams> {
@@ -422,13 +420,10 @@ class SubjectTabFragment : ToolbarFragment() {
                         }
                     }
                 } else {
-                    val leftPadding = if (i == 0) 16F.dip2px() else 8F.dip2px()
-                    val rightPadding = if (i == binding.subjectTab.tabCount - 1) 16F.dip2px() else 0
-                    tab.view.setPadding(leftPadding, 0, rightPadding, 0)
-                    tab.view.findViewById<View>(R.id.tab_title)?.let {
-                        it.post {
-                            tab.view.updateLayoutParams<ViewGroup.LayoutParams> { width = leftPadding + rightPadding + it.width }
-                        }
+                    when (i) {
+                        0 -> tab.view.setPadding(16F.dip2px(), 0, 0, 0)
+                        binding.subjectTab.tabCount - 1 -> tab.view.setPadding(8F.dip2px(), 0, 16F.dip2px(), 0)
+                        else -> tab.view.setPadding(8F.dip2px(), 0, 0, 0)
                     }
                 }
             }
@@ -486,7 +481,6 @@ class SubjectTabFragment : ToolbarFragment() {
             if (tabTitle is CheckedTextView) {
                 tabTitle.text = title
             }
-            view.layoutParams = ViewGroup.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, 32F.dip2px())
             return view
         }
     }
@@ -499,7 +493,6 @@ class SubjectTabFragment : ToolbarFragment() {
                 binding.subjectTab.setTabTextColors(com.gh.gamecenter.common.R.color.text_secondary.toColor(requireContext()), com.gh.gamecenter.common.R.color.text_primary.toColor(requireContext()))
             }
             TabStyle.COLUMN_COLLECTION_MAIN_WRAPPER -> updateTabStyle(binding.subjectViewpager.currentItem, 0F)
-            TabStyle.COLUMN_COLLECTION_TAB_WRAPPER,
             TabStyle.SUBJECT_NORMAL -> {
                 for (i in 0 until binding.subjectTab.tabCount) {
                     val tab = binding.subjectTab.getTabAt(i) ?: continue
@@ -835,14 +828,9 @@ class SubjectTabFragment : ToolbarFragment() {
         COLUMN_COLLECTION_MAIN_WRAPPER,
 
         /**
-         * 专题合集-二级页面样式
+         * 专题合集-常规样式
          */
         COLUMN_COLLECTION_NORMAL,
-
-        /**
-         * 专题合集-关联多Tab导航栏样式
-         */
-        COLUMN_COLLECTION_TAB_WRAPPER,
     }
 
     companion object {

app/src/main/java/com/gh/vspace/VDownloadManagerFragment.kt

@@ -25,7 +25,6 @@ import com.gh.gamecenter.history.IBatchDelete
 import com.gh.gamecenter.history.ManageOption
 import com.lightgame.download.DataWatcher
 import com.lightgame.download.DownloadEntity
-import com.lightgame.download.DownloadStatus
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
@@ -110,16 +109,7 @@ class VDownloadManagerFragment :
                         ToastUtils.showToast(it.message ?: "")
                     }
                     .collectLatest {
-                        when (mViewModel.type) {
-                            VDownloadManagerViewModel.TYPE_DOWNLOADED -> {
-                                refreshApks(it.map { it.packageName })
-                            }
-
-                            VDownloadManagerViewModel.TYPE_DOWNLOADING -> {
-                                refreshApks(DownloadManager.getInstance().allVDownloadTaskSnapshots.filter { it.status != DownloadStatus.done }
-                                    .map { it.packageName })
-                            }
-                        }
+                        onLoadRefresh()
                     }
             }
         }
@@ -135,9 +125,9 @@ class VDownloadManagerFragment :
 
     override fun isAutomaticLoad(): Boolean = false
 
-    private fun refreshApks(apks: List<String>) {
+    override fun onLoadRefresh() {
         mReuseNoData?.visibility = View.GONE
-        mViewModel.refresh(apks)
+        mViewModel.refresh()
     }
 
     override fun onDarkModeChanged() {

app/src/main/java/com/gh/vspace/VDownloadManagerViewModel.kt

@@ -29,19 +29,19 @@ class VDownloadManagerViewModel(application: Application) :
     var type = ""
     var isFromHomeRecent = false
 
-    private var loadPublishSubject: PublishSubject<List<String>> = PublishSubject.create()
+    var loadPublishSubject: PublishSubject<LoadType> = PublishSubject.create()
 
     val disposable: Disposable = loadPublishSubject.debounce(300, TimeUnit.MILLISECONDS)
-        .distinctUntilChanged { p1, p2 -> p1.sorted() == p2.sorted() }
+        .distinctUntilChanged()
         .observeOn(AndroidSchedulers.mainThread())
         .subscribe {
-            load(LoadType.REFRESH)
+            load(it)
         }
 
     val vGames = VHelper.vGameDao.getAllGames()
 
-    fun refresh(apks: List<String>) {
-        loadPublishSubject.onNext(apks)
+    fun refresh() {
+        loadPublishSubject.onNext(LoadType.REFRESH)
     }
 
     override fun mergeResultLiveData() {
@@ -180,13 +180,9 @@ class VDownloadManagerViewModel(application: Application) :
 
     fun pauseItems(idList: ArrayList<String>) {
         for (id in idList) {
-            mResultLiveData.value?.firstOrNull { id == it.id }?.getApk()?.firstOrNull()?.url?.let { url ->
-                DownloadManager.getInstance().getDownloadEntitySnapshot(url)
-                    ?.takeIf { it.status != DownloadStatus.done }
-                    ?.let {
-                        DownloadManager.getInstance().pause(url)
-                    }
-            }
+            val apkEntity =
+                mResultLiveData.value?.firstOrNull { id == it.id }?.getApk()?.firstOrNull()
+            DownloadManager.getInstance().pause(apkEntity?.url)
         }
     }
 

app/src/main/java/com/gh/vspace/VDownloadManagerWrapperFragment.kt

@@ -97,6 +97,12 @@ class VDownloadManagerWrapperFragment : BaseLazyTabFragment() {
     }
 
     fun onNewIntent(intent: Intent?) {
+        childFragmentManager.fragments.forEach {
+            if (it.isAdded && it is VDownloadManagerFragment) {
+                it.onLoadRefresh()
+            }
+        }
+
         intent?.getIntExtra(EntranceConsts.KEY_POSITION, 0)?.let {
             mViewPager.post { mViewPager.currentItem = it }
         }

app/src/main/res/layout/game_detail_tab_item.xml

@@ -14,7 +14,7 @@
         android:layout_width="wrap_content"
         android:layout_height="48dp"
         android:gravity="center"
-        android:textColor="@color/text_secondary"
+        android:textColor="@color/text_tertiary"
         android:textSize="@dimen/secondary_title_text_size"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"

app/src/main/res/layout/layout_game_detail_body.xml

@@ -33,15 +33,14 @@
 
             <FrameLayout
                 android:id="@+id/backContainer"
-                android:layout_width="40dp"
+                android:layout_width="48dp"
                 android:layout_height="48dp">
 
                 <ImageView
                     android:id="@+id/backBtn"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginStart="12dp"
+                    android:layout_gravity="center"
                     android:background="?attr/selectableItemBackgroundBorderless"
                     android:clickable="true"
                     android:focusable="true"
@@ -74,8 +73,8 @@
                 <com.gh.gamecenter.common.view.TabIndicatorView
                     android:id="@+id/tabIndicator"
                     android:layout_width="0dp"
-                    android:layout_height="4dp"
-                    android:layout_marginBottom="8dp"
+                    android:layout_height="@dimen/default_tab_indicator_height"
+                    android:layout_marginBottom="10dp"
                     app:indicatorColor="@color/primary_theme"
                     app:disableIndicatorScaling="true"
                     app:layout_constraintBottom_toBottomOf="parent"
@@ -98,7 +97,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_gravity="end"
-                android:layout_marginHorizontal="8dp"
                 android:minWidth="44dp" />
 
         </LinearLayout>

app/src/main/res/layout/tab_item_subject_tab.xml

@@ -1,13 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/tab_title"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
-    android:layout_height="32dp"
-    android:background="@drawable/subject_tab_background_selector"
-    android:gravity="center"
-    android:paddingStart="12dp"
-    android:paddingEnd="12dp"
-    android:text="人气榜"
-    android:textAlignment="center"
-    android:textColor="@color/text_tabbar_style"
-    android:textSize="12sp" />
+    android:layout_height="wrap_content"
+    android:gravity="center">
+
+    <CheckedTextView
+        android:id="@+id/tab_title"
+        android:layout_width="wrap_content"
+        android:layout_height="32dp"
+        android:background="@drawable/subject_tab_background_selector"
+        android:gravity="center"
+        android:paddingStart="12dp"
+        android:paddingEnd="12dp"
+        android:text="人气榜"
+        android:textAlignment="center"
+        android:textColor="@color/text_tabbar_style"
+        android:textSize="12sp" />
+
+</LinearLayout>

app/src/main/res/menu/menu_game_detail.xml

@@ -14,4 +14,10 @@
         android:title="@string/menu_more"
         app:showAsAction="always" />
 
+    <item
+        android:orderInCategory="-1"
+        android:title=""
+        app:actionLayout="@layout/layout_menu_inset"
+        app:showAsAction="always" />
+
 </menu>

dependencies.gradle

@@ -7,8 +7,8 @@ ext {
     targetSdkVersion = 30 // 升级targetSdkVersion到 34 时需要根据官方文档补全前台服务的权限类型。比如 NDownloadService，KeepAliveService
 
     // application info (每个大版本之间的 versionCode 增加 20)
-    versionCode = 1210
-    versionName = "5.43.0"
+    versionCode = 1190
+    versionName = "5.42.0"
     applicationId = "com.gh.gamecenter"
     applicationIdGat = "com.gh.gamecenter.intl"
 

module_common/src/main/java/com/gh/gamecenter/common/entity/InstalledPackagesAction.kt

@@ -1,10 +0,0 @@
-package com.gh.gamecenter.common.entity
-
-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
-
-@Parcelize
-class InstalledPackagesAction(
-    val action: String,
-    val packages: List<String>,
-): Parcelable