feat: 从SD卡兼容所有文件管理权限

feat: 游戏详情-内容卡片 红点显示优化—客户端 https://jira.shanqu.cc/browse/GHZSCY-7890

See merge request halo/android/assistant-android!2190

app/build.gradle

@@ -113,6 +113,7 @@ android {
         buildConfigField "String", "WECHAT_SECRET", "\"${WECHAT_SECRET}\""
         buildConfigField "String", "TENCENT_APPID", "\"${TENCENT_APPID}\""
         buildConfigField "String", "WEIBO_APPKEY", "\"${WEIBO_APPKEY}\""
+        buildConfigField "String", "DSP_API_HOST","\"${DSP_API_HOST}\""
         // 一体包的32位畅玩游戏助手包名
         buildConfigField "String", "EXT_PACKAGE_NAME", "\"${rootProject.ext.EXT_PACKAGE_NAME}\""
     }
@@ -538,6 +539,8 @@ dependencies {
     if(!gradle.ext.excludeOptionalModules || gradle.ext.enableWechatPay){
         implementation(project(":feature:wechat_pay"))
     }
+
+    implementation "me.xdrop:fuzzywuzzy:${fuzzyVersion}"
 }
 
 File propFile = file('sign.properties')

app/src/internal/java/com/gh/vspace/installexternalgames/InstallExternalGameFragment.kt

@@ -3,9 +3,14 @@ package com.gh.vspace.installexternalgames
 import android.Manifest
 import android.app.Dialog
 import android.content.ComponentName
+import android.content.Intent
 import android.content.pm.PackageManager
+import android.os.Build
 import android.os.Bundle
+import android.os.Environment
+import android.provider.Settings
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.gh.common.util.DialogUtils
@@ -37,6 +42,9 @@ class InstallExternalGameFragment : ToolbarFragment(), OnItemClickListener {
 
     private var uninstallDisposable: Disposable? = null
 
+
+    private var shouldScan = false
+
     override fun getLayoutId() = 0
 
     override fun getInflatedLayout() =
@@ -74,7 +82,24 @@ class InstallExternalGameFragment : ToolbarFragment(), OnItemClickListener {
             adapter.notifyDataSetChanged()
         }
 
-        requestStoragePermission()
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            if (!Environment.isExternalStorageManager()) {
+                shouldScan = true
+                AlertDialog.Builder(requireContext()).setMessage("请在设置页面允许光环助手")
+                    .setNegativeButton("去") { dialog, which ->
+                        val intent = Intent(Settings.ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION)
+                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                        startActivity(intent)
+                    }.show()
+            } else {
+                mViewModel.scanPaths()
+            }
+        } else {
+            requestStoragePermission()
+        }
+
+
     }
 
     private fun requestStoragePermission() {
@@ -96,6 +121,12 @@ class InstallExternalGameFragment : ToolbarFragment(), OnItemClickListener {
         }
     }
 
+    override fun onStart() {
+        super.onStart()
+        if (shouldScan) {
+            mViewModel.scanPaths()
+        }
+    }
 
     private fun initView() {
         dialog = DialogUtils.showWaitDialog(requireContext(), "")
@@ -152,7 +183,7 @@ class InstallExternalGameFragment : ToolbarFragment(), OnItemClickListener {
         }, true)
 
         VHelper.newCwValidateVspaceBeforeAction(
-            requireContext(),null,
+            requireContext(), null,
         ) {
             dialog.show()
         }

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

@@ -180,12 +180,12 @@ object AdDelegateHelper {
                     config.ownerAd?.startAd?.let { it.id = config.ownerAd.id }
 
                     // HarmonyOS 2.2.0 版本不展示第三方开屏广告 (因为会引起奇怪的闪退)
-//                    if (MetaUtil.getRom().name == "HarmonyOS"
-//                        && MetaUtil.getRom().versionName == "2.2.0"
-//                        && config.displayRule.adSource == "third_party_ads") {
-//
-//                        return
-//                    }
+                    if (MetaUtil.getRom().name == "HarmonyOS"
+                        && MetaUtil.getRom().versionName == "2.2.0"
+                        && config.displayRule.adSource == "third_party_ads") {
+
+                        return
+                    }
 
                     mSplashAd = config
                 }

app/src/main/java/com/gh/common/DefaultJsApi.kt

@@ -39,6 +39,7 @@ import com.gh.gamecenter.common.utils.SensorsBridge.EVENT_NAME
 import com.gh.gamecenter.common.utils.SensorsBridge.KEY_IS_FIRST_TIME
 import com.gh.gamecenter.common.view.dsbridge.CompletionHandler
 import com.gh.gamecenter.core.AppExecutor
+import com.gh.gamecenter.core.provider.IAcceleratorProvider
 import com.gh.gamecenter.core.provider.IPushProvider
 import com.gh.gamecenter.core.runOnIoThread
 import com.gh.gamecenter.core.runOnUiThread
@@ -800,6 +801,14 @@ class DefaultJsApi(
         listener?.onStopGameAccelerate()
     }
 
+    @JavascriptInterface
+    fun getDurationRemainingTime(msg: Any, handler: CompletionHandler<Any>) {
+        TheRouter.get(IAcceleratorProvider::class.java)?.loadQyUserPermissionData {
+            val durationExpiredMinute = AcceleratorDataHolder.instance.vipEntity?.durationExpiredTime ?: 0L
+            handler.complete(durationExpiredMinute)
+        }
+    }
+
     @JavascriptInterface
     fun refreshToken(token: Any, handler: CompletionHandler<Any>) {
         val accessToken = token.toString()

app/src/main/java/com/gh/common/constant/Config.java

@@ -66,6 +66,8 @@ public class Config {
     public static final String WGAME_CPM_BUSIAPPID = BuildConfig.WGAME_CPM_BUSIAPPID;
     public static final String WGAME_CPM_API_HOST = EnvHelper.getWGameCPMHost();
 
+    public static final String DSP_API_HOST = EnvHelper.getDspHost();
+
     // Third-Party confs
     public static final String WECHAT_APPID = BuildConfig.WECHAT_APPID;
     public static final String WECHAT_SECRET = BuildConfig.WECHAT_SECRET;

app/src/main/java/com/gh/common/databind/BindingAdapters.java

@@ -13,11 +13,14 @@ import android.text.SpannableString;
 import android.text.TextUtils;
 import android.text.style.ForegroundColorSpan;
 import android.view.View;
+import android.view.ViewParent;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.constraintlayout.widget.ConstraintSet;
 
 import com.gh.common.chain.BrowserInstallHandler;
 import com.gh.common.chain.CheckDownloadHandler;
@@ -271,7 +274,9 @@ public class BindingAdapters {
                         SensorsBridge.trackInstallGameClick(
                                 gameEntity.getId(),
                                 gameEntity.getName() != null ? gameEntity.getName() : "",
-                                "主动安装"
+                                "主动安装",
+                                gameEntity.isDspGame(),
+                                gameEntity.getDspAdId()
                         );
 
                         DownloadEntity downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity);
@@ -531,19 +536,14 @@ public class BindingAdapters {
                 binding.tvSellingPoints.setVisibility(View.GONE);
             }
 
-            Context context = layout.getContext();
-            binding.gtcvTags.removeAllViews();
             ArrayList<TagStyleEntity> tagStyle = gameEntity.getTagStyle();
+            StringBuilder tagText = new StringBuilder();
             for (int i = 0; i < tagStyle.size(); i++) {
                 if (i < 3) {
-                    TextView textView = new TextView(layout.getContext());
-                    textView.setTextColor(ExtensionsKt.toColor(com.gh.gamecenter.common.R.color.text_tertiary, context));
-                    textView.setTextSize(10);
-                    textView.setText((i == 0 ? "" : "·") + tagStyle.get(i).getName());
-                    binding.gtcvTags.addView(textView);
+                    tagText.append(i == 0 ? "" : "·").append(tagStyle.get(i).getName());
                 }
             }
-
+            binding.gtcvTags.setText(tagText);
         } else {
             layout.setVisibility(View.VISIBLE);
             binding.getRoot().setVisibility(View.GONE);
@@ -570,6 +570,20 @@ public class BindingAdapters {
                     break;
             }
         }
+
+        ViewParent parent = binding.getRoot().getParent();
+        if (parent instanceof ConstraintLayout) {
+            ConstraintLayout constraintLayout = (ConstraintLayout) parent;
+            ConstraintSet constraintSet = new ConstraintSet();
+            constraintSet.clone(constraintLayout);
+            constraintSet.clear(R.id.gameDesSpace, ConstraintSet.BOTTOM);
+            if (subjectTag.equals(SUBJECT_TAG_SELLING_POINT)) {
+                constraintSet.connect(R.id.gameDesSpace, ConstraintSet.BOTTOM, R.id.layout_selling_points, ConstraintSet.TOP);
+            } else {
+                constraintSet.connect(R.id.gameDesSpace, ConstraintSet.BOTTOM, R.id.label_list, ConstraintSet.TOP);
+            }
+            constraintSet.applyTo(constraintLayout);
+        }
     }
 
     public static void setVideoDetailGameTags(LinearLayout layout, GameEntity gameEntity) {

app/src/main/java/com/gh/common/dialog/AccelerateExpirationDialogFragment.kt

@@ -0,0 +1,294 @@
+package com.gh.common.dialog
+
+import android.content.Context
+import android.os.Bundle
+import android.os.Parcelable
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.app.AppCompatActivity
+import com.gh.common.util.DirectUtils
+import com.gh.gamecenter.R
+import com.gh.gamecenter.common.HaloApp
+import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
+import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.utils.SensorsBridge
+import com.gh.gamecenter.common.utils.dip2px
+import com.gh.gamecenter.core.utils.CurrentActivityHolder
+import com.gh.gamecenter.core.utils.SPUtils
+import com.gh.gamecenter.databinding.DialogFragmentAccelerateExporationBinding
+import kotlinx.parcelize.Parcelize
+
+public class AccelerateExpirationDialogFragment : BaseDialogFragment() {
+
+    private lateinit var binding: DialogFragmentAccelerateExporationBinding
+
+    private var _reminder: ExpirationReminder? = null
+
+    override fun onBack(): Boolean {
+        return true
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        _reminder = arguments?.getParcelable(KEY_EXPIRATION_REMINDER)
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return DialogFragmentAccelerateExporationBinding.inflate(inflater, container, false)
+            .also {
+                binding = it
+            }.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        val reminder = _reminder ?: return
+        val (title, content) = when (reminder) {
+            is ExpirationReminder.UserExpired -> {
+                SensorsBridge.trackMonthlyPackageExpiresDialogShow(
+                    reminder.gameId, reminder.gameName, reminder.pkgName, reminder.sourceEntrance
+                )
+                getString(
+                    R.string.membership_expiration_reminder_title,
+                    "${reminder.days}"
+                ) to getString(R.string.membership_expiration_reminder_content)
+            }
+
+            is ExpirationReminder.InsufficientDuration -> {
+                SensorsBridge.trackInsufficientDurationDialogShow(
+                    reminder.gameId,
+                    reminder.gameName,
+                    reminder.pkgName,
+                    reminder.sourceEntrance
+                )
+                getString(
+                    R.string.duration_time_out_reminder_title,
+                    "${reminder.hours}"
+                ) to getString(R.string.duration_time_out_reminder_content)
+            }
+
+            is ExpirationReminder.DurationExpired -> {
+                SensorsBridge.trackTimedPackageExpiresDialogShow(
+                    reminder.gameId,
+                    reminder.gameName,
+                    reminder.pkgName,
+                    reminder.sourceEntrance
+                )
+                getString(
+                    R.string.duration_expiration_reminder_title,
+                    "${reminder.days}"
+                ) to getString(R.string.duration_expiration_reminder_content)
+            }
+
+            is ExpirationReminder.TimeRunsOut -> {
+                SensorsBridge.trackDurationExhaustedDialogShow()
+                getString(R.string.accelerator_member_expired_title) to getString(R.string.accelerator_member_expired_content)
+            }
+        }
+
+        binding.tvTitle.text = title
+        binding.tvContent.text = content
+        binding.tvCancel.setOnClickListener {
+            when (reminder) {
+                is ExpirationReminder.UserExpired -> {
+                    SensorsBridge.trackMonthlyPackageExpiresDialogClick(
+                        reminder.gameId, reminder.gameName, reminder.pkgName, reminder.sourceEntrance, BUTTON_NAME_KNOW
+                    )
+                }
+
+                is ExpirationReminder.InsufficientDuration -> {
+                    SensorsBridge.trackInsufficientDurationDialogClick(
+                        reminder.gameId, reminder.gameName, reminder.pkgName, reminder.sourceEntrance, BUTTON_NAME_KNOW
+                    )
+                }
+
+                is ExpirationReminder.DurationExpired -> {
+                    SensorsBridge.trackTimedPackageExpiresDialogClick(
+                        reminder.gameId, reminder.gameName, reminder.pkgName, reminder.sourceEntrance, BUTTON_NAME_KNOW
+                    )
+                }
+
+                is ExpirationReminder.TimeRunsOut -> {
+                    SensorsBridge.trackDurationExhaustedDialogClick(BUTTON_NAME_KNOW)
+                }
+            }
+            dismissAllowingStateLoss()
+        }
+        binding.tvSubmit.setOnClickListener {
+            when (reminder) {
+                is ExpirationReminder.UserExpired -> {
+                    SensorsBridge.trackMonthlyPackageExpiresDialogClick(
+                        reminder.gameId, reminder.gameName, reminder.pkgName, reminder.sourceEntrance, BUTTON_NAME_BUY
+                    )
+                }
+
+                is ExpirationReminder.InsufficientDuration -> {
+                    SensorsBridge.trackInsufficientDurationDialogClick(
+                        reminder.gameId, reminder.gameName, reminder.pkgName, reminder.sourceEntrance, BUTTON_NAME_BUY
+                    )
+                }
+
+                is ExpirationReminder.DurationExpired -> {
+                    SensorsBridge.trackTimedPackageExpiresDialogClick(
+                        reminder.gameId, reminder.gameName, reminder.pkgName, reminder.sourceEntrance, BUTTON_NAME_BUY
+                    )
+                }
+
+                is ExpirationReminder.TimeRunsOut -> {
+                    SensorsBridge.trackDurationExhaustedDialogClick(BUTTON_NAME_BUY)
+                }
+            }
+            SensorsBridge.trackMyAssetsPageShow(
+                reminder.pkgName,
+                reminder.gameId,
+                reminder.gameName,
+                reminder.dialogName
+            )
+            dismissAllowingStateLoss()
+
+            DirectUtils.navigateToMyAssetsPage(requireContext(), reminder.sourceEntrance)
+        }
+    }
+
+    override fun onStart() {
+        super.onStart()
+        val width = HaloApp.getInstance().resources.displayMetrics.widthPixels - 60F.dip2px()
+        val height = dialog?.window?.attributes?.height ?: ViewGroup.LayoutParams.WRAP_CONTENT
+        dialog?.window?.setLayout(width, height)
+    }
+
+    companion object {
+        const val KEY_EXPIRATION_REMINDER = "key_expiration_reminder"
+
+        private const val BUTTON_NAME_KNOW = "知道了"
+        private const val BUTTON_NAME_BUY = "前往购买"
+
+        fun checkDialogShown(context: Context, reminder: ExpirationReminder, callback: ((Boolean) -> Unit)? = null) {
+
+            when (reminder) {
+                is ExpirationReminder.UserExpired -> {
+                    val days = SPUtils.getLong(Constants.SP_ACCELERATOR_USER_REMAINING_REMIND)
+                    if (reminder.days != days) {
+                        SPUtils.setLong(Constants.SP_ACCELERATOR_USER_REMAINING_REMIND, reminder.days)
+                        show(context, reminder)
+                        callback?.invoke(true)
+                    } else {
+                        callback?.invoke(false)
+                    }
+                }
+
+                is ExpirationReminder.InsufficientDuration -> {
+                    val hours = SPUtils.getLong(Constants.SP_ACCELERATOR_DURATION_REMAINING_HOURS)
+                    if (reminder.hours != hours) {
+                        SPUtils.setLong(Constants.SP_ACCELERATOR_DURATION_REMAINING_HOURS, reminder.hours)
+                        show(context, reminder)
+                        callback?.invoke(true)
+                    } else {
+                        callback?.invoke(false)
+                    }
+                }
+
+                is ExpirationReminder.DurationExpired -> {
+                    val days = SPUtils.getLong(Constants.SP_ACCELERATOR_DURATION_REMAINING_DAYS)
+                    if (reminder.days != days) {
+                        SPUtils.setLong(Constants.SP_ACCELERATOR_DURATION_REMAINING_DAYS, reminder.days)
+                        show(context, reminder)
+                        callback?.invoke(true)
+                    } else {
+                        callback?.invoke(false)
+                    }
+                }
+
+                is ExpirationReminder.TimeRunsOut -> {
+                    val hasShow = SPUtils.getBoolean(Constants.SP_ACCELERATOR_MEMBERSHIP_EXPIRED)
+                    if (!hasShow) {
+                        SPUtils.setBoolean(Constants.SP_ACCELERATOR_MEMBERSHIP_EXPIRED, true)
+                        show(context, reminder)
+                        callback?.invoke(true)
+                    } else {
+                        callback?.invoke(false)
+                    }
+                }
+            }
+        }
+
+        fun show(context: Context, reminder: ExpirationReminder) {
+            if (context is AppCompatActivity) {
+                context.supportFragmentManager
+            } else {
+                (CurrentActivityHolder.getCurrentActivity() as? AppCompatActivity)?.supportFragmentManager
+            }?.let {
+                val fragment = AccelerateExpirationDialogFragment().apply {
+                    arguments = Bundle().apply {
+                        putParcelable(KEY_EXPIRATION_REMINDER, reminder)
+                    }
+                }
+                fragment.show(it, AcceleratorPermissionGuideDialogFragment::class.java.name)
+            }
+        }
+    }
+
+    sealed class ExpirationReminder(
+        val gameId: String,
+        val gameName: String,
+        val pkgName: String,
+        val sourceEntrance: String
+    ) :
+        Parcelable {
+
+        abstract val dialogName: String
+
+        @Parcelize
+        data class InsufficientDuration(
+            val hours: Long,
+            private val _gameId: String,
+            private val _gameName: String,
+            private val _pkgName: String,
+            private val _sourceEntrance: String,
+        ) :
+            ExpirationReminder(_gameId, _gameName, _pkgName, _sourceEntrance) {
+
+            override val dialogName: String
+                get() = "时长不足提示弹窗"
+        }
+
+        @Parcelize
+        data class DurationExpired(
+            val days: Long,
+            private val _gameId: String,
+            private val _gameName: String,
+            private val _pkgName: String,
+            private val _sourceEntrance: String,
+        ) :
+            ExpirationReminder(_gameId, _gameName, _pkgName, _sourceEntrance) {
+
+            override val dialogName: String
+                get() = "计时套餐临期提示弹窗"
+        }
+
+        @Parcelize
+        data class UserExpired(
+            val days: Long,
+            private val _gameId: String,
+            private val _gameName: String,
+            private val _pkgName: String,
+            private val _sourceEntrance: String,
+        ) :
+            ExpirationReminder(_gameId, _gameName, _pkgName, _sourceEntrance) {
+
+            override val dialogName: String
+                get() = "包月套餐临期提示弹窗"
+        }
+
+        @Parcelize
+        data class TimeRunsOut(
+            private val _sourceEntrance: String,
+        ) : ExpirationReminder("", "", "", _sourceEntrance) {
+
+            override val dialogName: String
+                get() = "时长耗尽提示弹窗"
+        }
+    }
+}

app/src/main/java/com/gh/common/dialog/AcceleratorPermissionGuideDialogFragment.kt

@@ -0,0 +1,68 @@
+package com.gh.common.dialog
+
+import android.content.Context
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.app.AppCompatActivity
+import com.gh.gamecenter.common.HaloApp
+import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
+import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.utils.dip2px
+import com.gh.gamecenter.core.utils.CurrentActivityHolder
+import com.gh.gamecenter.core.utils.SPUtils
+import com.gh.gamecenter.databinding.DialogFragmentAcceleratorPermissionGuideBinding
+
+class AcceleratorPermissionGuideDialogFragment : BaseDialogFragment() {
+
+    private lateinit var binding: DialogFragmentAcceleratorPermissionGuideBinding
+
+    private var callback: (() -> Unit)? = null
+
+    override fun onBack(): Boolean {
+        return true
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return DialogFragmentAcceleratorPermissionGuideBinding.inflate(inflater, container, false)
+            .also {
+                binding = it
+            }.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        SPUtils.setBoolean(Constants.SP_ACCELERATOR_PERMISSION_GUIDE_SHOW, true)
+        binding.tvSubmit.setOnClickListener {
+            dismiss()
+            callback?.invoke()
+        }
+    }
+
+    fun setOnCallback(block: () -> Unit) {
+        this.callback = block
+    }
+
+    override fun onStart() {
+        super.onStart()
+        val width = HaloApp.getInstance().resources.displayMetrics.widthPixels - 60F.dip2px()
+        val height = dialog?.window?.attributes?.height ?: ViewGroup.LayoutParams.WRAP_CONTENT
+        dialog?.window?.setLayout(width, height)
+    }
+
+    companion object {
+
+        fun show(context: Context, callback: () -> Unit) {
+            if (context is AppCompatActivity) {
+                context.supportFragmentManager
+            } else {
+                (CurrentActivityHolder.getCurrentActivity() as? AppCompatActivity)?.supportFragmentManager
+            }?.let {
+                val fragment = AcceleratorPermissionGuideDialogFragment()
+                fragment.setOnCallback(callback)
+                fragment.show(it, AcceleratorPermissionGuideDialogFragment::class.java.name)
+            }
+        }
+    }
+}

app/src/main/java/com/gh/common/exposure/ExposureListener.kt

@@ -19,7 +19,7 @@ class ExposureListener(var fragment: Fragment, var exposable: IExposable) : Recy
         ExposureThrottleBus(
             { commitExposure(it) },
             Consumer(Throwable::printStackTrace),
-            { commitWXCPMExposure(it) }
+            { commitExternalExposure(it) }
         )
     }
     var layoutManager: LayoutManager? = null
@@ -31,7 +31,7 @@ class ExposureListener(var fragment: Fragment, var exposable: IExposable) : Recy
                 override fun onFragmentPaused(fm: FragmentManager, f: Fragment) {
                     if (fragment == f) {
                         visibleState?.let { commitExposure(it) }
-                        visibleState?.let { commitWXCPMExposure(it) }
+                        visibleState?.let { commitExternalExposure(it) }
                         throttleBus.clear()
                     }
                 }
@@ -97,23 +97,33 @@ class ExposureListener(var fragment: Fragment, var exposable: IExposable) : Recy
     }
 
     /**
-     * 微信小游戏CPM曝光事件接口上报，由于普通曝光事件的上报通道存在节流特性，不符合CPM接口对于数据上报的实时性和准确性的要求，所以使用额外的通道进行上报
+     * 提交第三方的曝光事件 （微信小游戏CPM 和 DSP 游戏）
+     * 由于普通曝光事件的上报通道存在节流特性，不符合CPM接口对于数据上报的实时性和准确性的要求，所以使用额外的通道进行上报
      */
-    private fun commitWXCPMExposure(visibleState: ExposureThrottleBus.VisibleState) {
+    private fun commitExternalExposure(visibleState: ExposureThrottleBus.VisibleState) {
 
-        val eventList = arrayListOf<ExposureEvent>()
+        val cpmEventList = arrayListOf<ExposureEvent>()
+        val dspEventList = arrayListOf<ExposureEvent>()
 
         for (pos in visibleState.firstVisiblePosition..visibleState.lastVisiblePosition) {
             try {
                 exposable.getEventByPosition(pos)?.let {
-                    if (it.payload.miniGameType == Constants.WECHAT_MINI_GAME_CPM) {
-                        eventList.add(it)
+                    when (it.payload.miniGameType) {
+                        Constants.WECHAT_MINI_GAME_CPM -> cpmEventList.add(it)
+                        Constants.DSP_GAME -> dspEventList.add(it)
+                        else -> {
+                            // do nothing
+                        }
                     }
                 }
                 exposable.getEventListByPosition(pos)?.let { list ->
                     list.forEach {
-                        if (it.payload.miniGameType == Constants.WECHAT_MINI_GAME_CPM) {
-                            eventList.add(it)
+                        when (it.payload.miniGameType) {
+                            Constants.WECHAT_MINI_GAME_CPM -> cpmEventList.add(it)
+                            Constants.DSP_GAME -> dspEventList.add(it)
+                            else -> {
+                                // do nothing
+                            }
                         }
                     }
                 }
@@ -121,7 +131,8 @@ class ExposureListener(var fragment: Fragment, var exposable: IExposable) : Recy
                 // Just ignore the error.
             }
         }
-        ExposureManager.logCPM(eventList)
+        ExposureManager.logExternal(cpmEventList, dspEventList)
     }
 
+
 }

app/src/main/java/com/gh/common/exposure/ExposureManager.kt

@@ -6,7 +6,9 @@ import com.gh.gamecenter.common.loghub.TLogHubHelper
 import com.gh.gamecenter.common.utils.FixedSizeLinkedHashSet
 import com.gh.gamecenter.common.utils.toJson
 import com.gh.gamecenter.core.AppExecutor
+import com.gh.gamecenter.dsp.DspReportHelper
 import com.gh.gamecenter.feature.exposure.ExposureEvent
+import com.gh.gamecenter.feature.exposure.ExposureType
 import com.gh.gamecenter.feature.minigame.wechat.WGameSubjectCPMListReportHelper
 import com.lightgame.utils.Utils
 import com.volcengine.model.tls.LogItem
@@ -36,6 +38,10 @@ object ExposureManager {
         AppExecutor.logExecutor.execute {
             if (event.payload.miniGameType == Constants.WECHAT_MINI_GAME_CPM) {
                 WGameSubjectCPMListReportHelper.reportExposure(event)
+            } else if (event.payload.miniGameType == Constants.DSP_GAME) {
+                if (event.event == ExposureType.DOWNLOAD_COMPLETE) {
+                    DspReportHelper.report(event.payload.downloadUrl)
+                }
             }
             if (!exposureCache.contains(event.id)) {
                 exposureSet.add(event)
@@ -64,12 +70,18 @@ object ExposureManager {
     }
 
     /**
-     * Log a wechat mini game cpm collection of exposure event.
+     * Log a collection of exposure event for external use.
      */
-    fun logCPM(eventList: List<ExposureEvent>) {
+    fun logExternal(cpmEventList: List<ExposureEvent>, dspEventList: ArrayList<ExposureEvent>) {
         AppExecutor.logExecutor.execute {
-            if (eventList.isNotEmpty()) {
-                WGameSubjectCPMListReportHelper.reportExposure(eventList.toSet())
+            if (cpmEventList.isNotEmpty()) {
+                WGameSubjectCPMListReportHelper.reportExposure(cpmEventList.toSet())
+            }
+
+            if (dspEventList.isNotEmpty()) {
+                for (event in dspEventList) {
+                    DspReportHelper.report(event.payload.showUrl)
+                }
             }
         }
     }

app/src/main/java/com/gh/common/exposure/ExposureUtils.kt

@@ -89,6 +89,7 @@ object ExposureUtils {
         exposureEvent.payload.path = path
         exposureEvent.payload.speed = speed
         exposureEvent.payload.redirectedUrlList = redirectedUrlList
+        exposureEvent.payload.downloadUrl = gameEntity.downloadUrl
 
         ExposureManager.log(exposureEvent)
         ExposureManager.commitSavedExposureEvents(forcedUpload = true)

app/src/main/java/com/gh/common/prioritychain/CustomFloatingWindowHandler.kt

@@ -59,7 +59,7 @@ class CustomFloatingWindowHandler(priority: Int) : PriorityChainHandler(priority
     override fun onProcess(): Boolean {
         when (getStatus()) {
             STATUS_VALID -> {
-                _showFloatingAction.value = Event(data)
+                _showFloatingAction.postValue(Event(data))
                 return true
 //                    floatingWindowProvider.showFloatingWindowOnly(
 //                        mFragment!!,

app/src/main/java/com/gh/common/prioritychain/GlobalPriorityChainHelper.kt

@@ -64,7 +64,8 @@ object GlobalPriorityChainHelper : ISuperiorChain {
      * 预启动所有的优先级弹窗管理链
      */
     fun preStart(withSpecialDelay: Boolean) {
-        val launchRedirectHandler = LaunchRedirectHandler(-101)
+        val launchRedirectHandler = LaunchRedirectHandler(-102)
+        val membershipExpiredHandler = MembershipExpiredHandler(-101)
         val updateDialogHandler = UpdateDialogHandler(-100)
         val privacyPolicyDialogHandler = PrivacyPolicyDialogHandler(-99)
         val notificationPermissionDialogHandler = NotificationPermissionDialogHandler(0)
@@ -74,6 +75,7 @@ object GlobalPriorityChainHelper : ISuperiorChain {
         val resumeDownloadHandler = ResumeDownloadHudHandler(4)
 
         mainChain.addHandler(launchRedirectHandler)
+        mainChain.addHandler(membershipExpiredHandler)
         mainChain.addHandler(updateDialogHandler)
         mainChain.addHandler(privacyPolicyDialogHandler)
         mainChain.addHandler(welcomeDialogHandler)
@@ -83,6 +85,7 @@ object GlobalPriorityChainHelper : ISuperiorChain {
         mainChain.addHandler(resumeDownloadHandler)
 
         launchRedirectHandler.doPreProcess()
+        membershipExpiredHandler.doPreProcess()
         updateDialogHandler.doPreProcess()
 
         // 首次启动延迟 300ms，保证请求首次启动时已经获取到了 GID 、 OAID 等标记

app/src/main/java/com/gh/common/prioritychain/MembershipExpiredHandler.kt

@@ -0,0 +1,80 @@
+package com.gh.common.prioritychain
+
+import android.os.Bundle
+import androidx.fragment.app.FragmentActivity
+import com.gh.common.dialog.AccelerateExpirationDialogFragment
+import com.gh.gamecenter.common.constant.Constants.SP_ACCELERATOR_MEMBERSHIP_EXPIRED
+import com.gh.gamecenter.core.utils.CurrentActivityHolder
+import com.gh.gamecenter.core.utils.SPUtils
+import com.gh.gamecenter.login.user.UserRepository
+import com.halo.assistant.accelerator.repository.AcceleratorDataHolder
+
+class MembershipExpiredHandler(priority: Int) : PriorityChainHandler(priority) {
+
+    fun doPreProcess() {
+        UserRepository.getInstance().setAutoLoginListener {
+            val hasShow = SPUtils.getBoolean(SP_ACCELERATOR_MEMBERSHIP_EXPIRED)
+            val vipEntity = AcceleratorDataHolder.instance.vipEntity
+            if (getStatus() == STATUS_PENDING) {
+                if (vipEntity == null ||
+                    vipEntity.vipStatus ||
+                    vipEntity.isNewUser ||
+                    vipEntity.isVipRefundUser ||
+                    vipEntity.isDurationRefundUser ||
+                    hasShow
+                ) {
+                    processNext()
+                } else {
+                    updateStatus(STATUS_VALID)
+                    process()
+                }
+            } else {
+                if (vipEntity == null ||
+                    vipEntity.vipStatus ||
+                    vipEntity.isNewUser ||
+                    vipEntity.isVipRefundUser ||
+                    vipEntity.isDurationRefundUser ||
+                    hasShow
+                ) {
+                    updateStatus(STATUS_INVALID)
+                } else {
+                    updateStatus(STATUS_VALID)
+                }
+            }
+        }
+    }
+
+    override fun onProcess(): Boolean {
+        val currentActivity = CurrentActivityHolder.getCurrentActivity()
+        if (GlobalPriorityChainHelper.isThisActivityValid(currentActivity)) {
+            when (getStatus()) {
+                STATUS_VALID -> {
+                    val reminder = AccelerateExpirationDialogFragment.ExpirationReminder.TimeRunsOut("")
+                    SPUtils.setBoolean(SP_ACCELERATOR_MEMBERSHIP_EXPIRED, true)
+                    val dialogFragment = AccelerateExpirationDialogFragment().apply {
+                        arguments = Bundle().apply {
+                            putParcelable(
+                                AccelerateExpirationDialogFragment.KEY_EXPIRATION_REMINDER, reminder
+                            )
+                        }
+                    }
+                    dialogFragment.dialog?.setOnDismissListener {
+                        processNext()
+                    }
+                    dialogFragment.show(
+                        (currentActivity as FragmentActivity).supportFragmentManager,
+                        AccelerateExpirationDialogFragment::class.java.name
+                    )
+
+                    return true
+                }
+
+                STATUS_INVALID -> {
+                    processNext()
+                }
+            }
+        }
+
+        return false
+    }
+}

app/src/main/java/com/gh/common/provider/BuildConfigImpl.kt

@@ -31,4 +31,6 @@ class BuildConfigImpl : IBuildConfigProvider {
     override fun getWGameCPMBusiAppId(): String = BuildConfig.WGAME_CPM_BUSIAPPID
 
     override fun getLogProducerProject(): String = BuildConfig.LOG_HUB_PROJECT
+
+    override fun getDspApiHost(): String = BuildConfig.DSP_API_HOST
 }

app/src/main/java/com/gh/common/provider/DownloadButtonClickedProviderImpl.kt

@@ -119,8 +119,10 @@ class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
                 }
 
                 // 小游戏的启动不需要上报下载点击事件
-                // @see https://jira.shanqu.cc/browse/GHZSCY-7013
-                if (boundedObject is GameEntity && boundedObject.isMiniGame()) {
+                // @see https://jira.shanqu.cc/browse/GHZSCY-7013 & https://jira.shanqu.cc/browse/GHZSCY-7918
+                if (boundedObject is GameEntity
+                    && (boundedObject.isMiniGame() || boundedObject.isDspGame)
+                ) {
                     return
                 }
 

app/src/main/java/com/gh/common/provider/IAcceleratorDataHolderProviderImpl.kt

@@ -1,22 +1,58 @@
 package com.gh.common.provider
 
 import com.gh.common.util.PackageUtils
+import android.annotation.SuppressLint
+import com.gh.gamecenter.common.retrofit.BiResponse
+import com.gh.gamecenter.common.utils.singleToMain
 import com.gh.gamecenter.core.provider.IAcceleratorDataHolderProvider
+import com.gh.gamecenter.feature.entity.BaseEntity
 import com.gh.gamecenter.feature.entity.VipEntity
+import com.gh.gamecenter.login.retrofit.RetrofitManager
+import com.gh.gamecenter.login.user.UserManager
 import com.halo.assistant.accelerator.repository.AcceleratorDataHolder
 
 @com.therouter.inject.ServiceProvider
 class IAcceleratorDataHolderProviderImpl : IAcceleratorDataHolderProvider {
-    override fun setVipEntity(vip: Any) {
-        if (vip is VipEntity) {
-            AcceleratorDataHolder.instance.setVipEntity(vip)
-        }
-    }
+
+    override fun isPaidVip(): Boolean =
+        AcceleratorDataHolder.instance.isPaidVip
 
     override fun getGhVersionName(): String {
         return PackageUtils.getGhVersionName()
     }
 
+    /**
+     *   请注意，由于光环后端无法获取 奇游时长套餐 加速时长，这里的 vipStatus不准，
+     *   这里只做参考，具体的状态需要奇游sdk提供，如果奇游sdk返回失败，则以这条接口结果为准
+     */
+    @SuppressLint("CheckResult")
+    override fun loadVipEntityFromGh(userId: String, callBack: (Any?) -> Unit) {
+        RetrofitManager.getInstance().newApi.getVipStatus(
+            userId.ifBlank { UserManager.getInstance().userId },
+            "gjonline_vip",
+            true
+        )
+            .compose(singleToMain())
+            .subscribe(object : BiResponse<BaseEntity<VipEntity>>() {
+                override fun onSuccess(data: BaseEntity<VipEntity>) {
+                    callBack(data.data)
+                }
+
+                override fun onFailure(exception: Exception) {
+                    super.onFailure(exception)
+                    callBack(null)
+                }
+
+            })
+    }
+
+    override fun updateVipEntity(data: Any) {
+        if (data is VipEntity) {
+            AcceleratorDataHolder.instance.setVipEntity(data)
+        }
+    }
+
+
     override fun clear() {
         AcceleratorDataHolder.instance.clear()
     }

app/src/main/java/com/gh/common/provider/WechatPayResultProviderImpl.kt

@@ -5,7 +5,6 @@ import com.gh.gamecenter.common.utils.SensorsBridge
 import com.gh.gamecenter.common.utils.singleToMain
 import com.gh.gamecenter.core.provider.IWechatPayResultProvider
 import com.gh.gamecenter.feature.entity.OrderEntity
-import com.gh.gamecenter.feature.entity.VipEntity
 import com.gh.gamecenter.feature.eventbus.EBPayState
 import com.halo.assistant.accelerator.repository.AccelerationRepository
 import com.halo.assistant.accelerator.repository.AcceleratorDataHolder
@@ -25,14 +24,8 @@ class WechatPayResultProviderImpl : IWechatPayResultProvider {
                 // 支付成功
                 EventBus.getDefault().post(EBPayState.PaySuccess)
 
-                // 先刷新本地状态，支付成功，肯定是付费会员
-                AcceleratorDataHolder.instance.setVipEntity(
-                    VipEntity(
-                        _vipStatus = true,
-                        _isNewUser = false,
-                        _isTryVip = false
-                    )
-                )
+                // 先刷新本地状态，支付成功
+                AcceleratorDataHolder.instance.handleUserRechargeSuccess(orderEntity)
 
                 SensorsBridge.trackMemberRechargeResult(
                     AccelerationRepository.PAYMENT_TYPE_WECHAT,

app/src/main/java/com/gh/common/util/DetailDownloadUtils.java

@@ -55,6 +55,8 @@ public class DetailDownloadUtils {
         }
 
         viewHolder.setSpeedViewsVisible(false);
+        // 默认为显示状态
+        viewHolder.getDownloadPb().setVisibility(View.VISIBLE);
 
         // 根据预置的配置更新 ViewHolder 的状态 (譬如青少年模式、下载内容为空等)
         if (updateViewHolderWithPredefinedConfig(viewHolder, gameEntity)) {
@@ -100,9 +102,9 @@ public class DetailDownloadUtils {
                     viewHolder.getLocalDownloadContainer().setVisibility(View.VISIBLE);
                 }
 
-                // 畅玩未安装，且当前下载的默认类型为"普通下载"，且用户未安装时，禁用双按钮，禁用畅玩
-                if (!VHelper.isInstalled(gameEntity.getUniquePackageName())
-                        && !PackagesManager.isInstalled(gameEntity.getUniquePackageName())
+                // 1.畅玩未安装/当前游戏配置了加速，且当前下载的默认类型为"普通下载"，且用户未安装时，禁用双按钮，禁用畅玩
+                if ((!VHelper.isInstalled(gameEntity.getUniquePackageName())
+                        && !PackagesManager.isInstalled(gameEntity.getUniquePackageName()) || gameEntity.getCanSpeed())
                         && downloadEntity != null
                         && ExtensionsKt.isLocalDownloadInDualDownloadMode(downloadEntity)
                 ) {
@@ -110,8 +112,22 @@ public class DetailDownloadUtils {
                     if (viewHolder.getOverlayTv() != null) {
                         viewHolder.getOverlayTv().setVisibility(View.GONE);
                     }
+                    // 此时需要将 本地占位按钮样式改成单条样式
+                    if (viewHolder.getLocalDownloadContainer() != null) {
+                        viewHolder.getLocalDownloadContainer().setBackgroundResource(com.gh.gamecenter.common.R.drawable.bg_common_button_fill_gradient_blue);
+                    }
+                    if (viewHolder.getLocalDownloadTitleTv() != null) {
+                        viewHolder.getLocalDownloadTitleTv().setTextColor(ExtensionsKt.toColor(com.gh.gamecenter.common.R.color.text_aw_primary, viewHolder.getContext()));
+                    }
                 } else {
                     viewHolder.getDownloadPb().setVisibility(View.VISIBLE);
+                    // 将占位按钮样式恢复成左半边样式
+                    if (viewHolder.getLocalDownloadContainer() != null) {
+                        viewHolder.getLocalDownloadContainer().setBackgroundResource(com.gh.gamecenter.common.R.drawable.bg_common_button_light_fill_blue);
+                    }
+                    if (viewHolder.getLocalDownloadTitleTv() != null) {
+                        viewHolder.getLocalDownloadTitleTv().setTextColor(ExtensionsKt.toColor(com.gh.gamecenter.common.R.color.text_theme, viewHolder.getContext()));
+                    }
                 }
             }
 
@@ -138,12 +154,11 @@ public class DetailDownloadUtils {
                     showDualDownloadButton,
                     downloadEntity
             );
-
-            if(!showVGame){
-                String rawBtnText = GameUtils.getDownloadBtnText(viewHolder.getContext(), gameEntity, false, showVGame, PluginLocation.only_game);
-                viewHolder.checkIfShowSpeedUi(rawBtnText);
+            if (downloadEntity != null && downloadEntity.getStatus() != DownloadStatus.done) {
+                // 如果存在未完成的任务，则不显示加速按钮
+            } else {
+                viewHolder.checkIfShowSpeedUi(showVGame, showDualDownloadButton);
             }
-
         } else {
             // 游戏包含多 APK 的情况
             viewHolder.getMultiVersionDownloadTv().setText("选择下载你的版本" + (TextUtils.isEmpty(downloadAddWord) ? "" : "-" + downloadAddWord));
@@ -610,7 +625,7 @@ public class DetailDownloadUtils {
         return (int) Math.ceil(downloadEntity.getPercent());
     }
 
-    private static String convertSizeString(String sizeString) {
+    public static String convertSizeString(String sizeString) {
         String numberPart;
         String indicator;
 

app/src/main/java/com/gh/common/util/DirectUtils.kt

@@ -1130,9 +1130,15 @@ object DirectUtils {
 
     @JvmStatic
     fun directToWebView(context: Context, url: String, entrance: String? = null) {
+        directToWebView(context, url, entrance, null)
+    }
+
+    @JvmStatic
+    fun directToWebView(context: Context, url: String, entrance: String? = null, title: String? = null) {
         if (url.isEmpty()) return
         val bundle = Bundle()
         bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
+        bundle.putString(EntranceConsts.KEY_GAMENAME, title)
         if (url.contains("android_page_type=singleton")) {
             bundle.putString(KEY_TO, SingletonWebActivity::class.java.simpleName)
         } else {
@@ -1528,8 +1534,8 @@ object DirectUtils {
         if (categoryId.isEmpty()) return
         val bundle = Bundle()
         bundle.putString(KEY_TO, CategoryV2Activity::class.java.name)
-        bundle.putString(KEY_CATEGORY_ID, categoryId)
-        bundle.putString(KEY_CATEGORY_TITLE, categoryTitle)
+        bundle.putString(KEY_PAGE_ID, categoryId)
+        bundle.putString(KEY_PAGE_NAME, categoryTitle)
         bundle.putString(KEY_ENTRANCE, BaseActivity.mergeEntranceAndPath(entrance, path))
         if (exposureEvent != null) bundle.putParcelableArrayList(
             KEY_EXPOSURE_SOURCE_LIST,

app/src/main/java/com/gh/common/util/DownloadDialogHelper.kt

@@ -2,10 +2,9 @@ package com.gh.common.util
 
 import android.content.Context
 import android.os.Build
-import com.gh.gamecenter.R
 import com.gh.gamecenter.common.utils.DialogHelper
 import com.gh.gamecenter.common.utils.SensorsBridge
-import com.gh.gamecenter.common.utils.toResString
+import com.gh.gamecenter.common.utils.replaceLineBreakWithBr
 import com.gh.gamecenter.core.utils.EmptyCallback
 import com.gh.gamecenter.feature.entity.ApkEntity
 import com.gh.gamecenter.feature.entity.GameEntity
@@ -32,7 +31,7 @@ object DownloadDialogHelper {
             DialogHelper.showDialogWithHtmlContent(
                 context,
                 dialog.title,
-                dialog.content,
+                dialog.content.replaceLineBreakWithBr(),
                 "继续下载",
                 "取消",
                 confirmClickCallback = {
@@ -59,7 +58,8 @@ object DownloadDialogHelper {
                         gameName = gameEntity.name ?: "",
                         gameType = gameEntity.categoryChinese
                     )
-                }
+                },
+                extraConfig = DialogHelper.Config(centerTitle = true)
             )
         } else {
             callback.onCallback()

app/src/main/java/com/gh/common/util/DownloadItemUtils.kt

@@ -61,7 +61,7 @@ object DownloadItemUtils {
         gameEntity: GameEntity,
         downloadEntity: DownloadEntity,
         adapter: RecyclerView.Adapter<out RecyclerView.ViewHolder?>?,
-        index: Int
+        index: Int,
     ) {
         if (gameEntity.id != downloadEntity.gameId) {
             adapter?.notifyItemChanged(index)
@@ -139,7 +139,7 @@ object DownloadItemUtils {
         context: Context,
         gameEntity: GameEntity,
         holder: GameViewHolder,
-        hideDownloadBtnIfNoAvailableContent: Boolean
+        hideDownloadBtnIfNoAvailableContent: Boolean,
     ) {
         updateItem(
             context = context,
@@ -155,7 +155,7 @@ object DownloadItemUtils {
         context: Context,
         gameEntity: GameEntity,
         holder: GameViewHolder,
-        briefStyle: String?
+        briefStyle: String?,
     ) {
         updateItem(
             context = context,
@@ -177,7 +177,7 @@ object DownloadItemUtils {
         hideDownloadBtnIfNoAvailableContent: Boolean = false,
         briefStyle: String? = null,
         isShowRecommendStar: Boolean = false,
-        listener: DownloadButton.OnUpdateListener? = null
+        listener: DownloadButton.OnUpdateListener? = null,
     ) {
         holder.gameDownloadBtn.putObject(gameEntity)
 
@@ -223,7 +223,7 @@ object DownloadItemUtils {
         gameEntity: GameEntity,
         hideDownloadBtnIfNoAvailableContent: Boolean = false,
         pluginLocation: PluginLocation? = PluginLocation.only_game,
-        listener: DownloadButton.OnUpdateListener?
+        listener: DownloadButton.OnUpdateListener?,
     ) {
         // 控制是否显示下载按钮
         downloadBtn.goneIf(context.getString(R.string.app_name) == gameEntity.name)
@@ -452,7 +452,8 @@ object DownloadItemUtils {
                         DownloadStatus.subscribe,
                         DownloadStatus.diskisfull,
                         DownloadStatus.diskioerror,
-                        DownloadStatus.overflow -> {
+                        DownloadStatus.overflow,
+                            -> {
                             buttonStyle = DownloadButton.ButtonStyle.NORMAL
                             setText(com.gh.gamecenter.feature.R.string.resume)
                             listener?.completion(downloadBtn.text)
@@ -482,7 +483,7 @@ object DownloadItemUtils {
         holder: GameViewHolder,
         gameEntity: GameEntity,
         briefStyle: String?,
-        isShowRecommendStar: Boolean = false
+        isShowRecommendStar: Boolean = false,
     ) {
         updateItemViewStatus(holder, briefStyle, gameEntity.columnRecommend, isShowRecommendStar)
         val downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity)
@@ -507,7 +508,7 @@ object DownloadItemUtils {
         holder: GameViewHolder,
         gameEntity: GameEntity,
         briefStyle: String?,
-        isShowRecommendStar: Boolean = false
+        isShowRecommendStar: Boolean = false,
     ) {
         val entryMap = gameEntity.getEntryMap()
         var downloadEntity: DownloadEntity? = null
@@ -535,11 +536,12 @@ object DownloadItemUtils {
         context: Context,
         holder: GameViewHolder,
         downloadEntity: DownloadEntity,
-        isMultiVersion: Boolean = false
+        isMultiVersion: Boolean = false,
     ) {
         when (downloadEntity.status) {
             DownloadStatus.redirected,
-            DownloadStatus.downloading -> {
+            DownloadStatus.downloading,
+                -> {
                 if (isMultiVersion) {
                     holder.gameDownloadBtn.buttonStyle = DownloadButton.ButtonStyle.NORMAL
                     val darkMode =
@@ -556,7 +558,8 @@ object DownloadItemUtils {
                     )
                 } else {
                     holder.gameDownloadTips?.visibility = View.GONE
-                    holder.gameDownloadBtn.buttonStyle = DownloadButton.ButtonStyle.DOWNLOADING_NORMAL
+                    holder.gameDownloadBtn.buttonStyle =
+                        DownloadButton.ButtonStyle.DOWNLOADING_NORMAL
                     holder.gameDownloadBtn.progress = (downloadEntity.percent * 10).toInt()
                     holder.gameDownloadBtn.text = downloadEntity.percent.toString() + "%"
                 }
@@ -577,13 +580,15 @@ object DownloadItemUtils {
             DownloadStatus.diskioerror,
             DownloadStatus.diskisfull,
             DownloadStatus.subscribe,
-            DownloadStatus.overflow -> {
+            DownloadStatus.overflow,
+                -> {
                 if (isMultiVersion) {
                     holder.gameDownloadTips?.visibility = View.VISIBLE
                     holder.gameDownloadTips?.setDownloadTipsAnimation(false)
                 }
                 holder.gameDownloadBtn.buttonStyle = DownloadButton.ButtonStyle.NORMAL
-                holder.gameDownloadBtn.text = context.getString(com.gh.gamecenter.feature.R.string.resume)
+                holder.gameDownloadBtn.text =
+                    context.getString(com.gh.gamecenter.feature.R.string.resume)
             }
 
             DownloadStatus.done -> {
@@ -616,7 +621,7 @@ object DownloadItemUtils {
         holder: GameViewHolder,
         briefStyle: String?,
         recommendStyle: LinkEntity?,
-        isShowRecommendStar: Boolean = false
+        isShowRecommendStar: Boolean = false,
     ) {
         holder.gameDownloadTips?.visibility = View.GONE
         // 推荐指数优先，现暂时为游戏单详情列表游戏使用
@@ -675,7 +680,7 @@ object DownloadItemUtils {
         adapter: RecyclerView.Adapter<out RecyclerView.ViewHolder?>?,
         entrance: String,
         location: String,
-        sourceEntrance: String = "其他"
+        sourceEntrance: String = "其他",
     ) {
         setOnClickListener(
             context,
@@ -764,7 +769,7 @@ object DownloadItemUtils {
         traceEvent: ExposureEvent?,
         clickCallback: EmptyCallback?,
         refreshCallback: EmptyCallback?,
-        allStateClickCallback: EmptyCallback?
+        allStateClickCallback: EmptyCallback?,
     ) {
         // 为 downloadButton 添加游戏实体，供点击的时候上报用
         downloadBtn.putObject(gameEntity)
@@ -1000,7 +1005,7 @@ object DownloadItemUtils {
         entrance: String,
         location: String,
         traceEvent: ExposureEvent? = null,
-        refreshCallback: EmptyCallback? = null
+        refreshCallback: EmptyCallback? = null,
     ) {
         val str =
             if (downloadBtn is DownloadButton) downloadBtn.text else context.getString(com.gh.gamecenter.feature.R.string.download)
@@ -1109,15 +1114,17 @@ object DownloadItemUtils {
             val downloadEntity = SimulatorGameManager.findDownloadEntityByUrl(apk.url)
 
             com.gh.gamecenter.common.utils.NewFlatLogUtils.logGameInstall(
-                gameId = downloadEntity?.gameId ?: "",
-                gameName = downloadEntity?.name ?: "",
+                gameId = gameEntity.id,
+                gameName = gameEntity.name ?: "",
                 trigger = "主动安装"
             )
 
             SensorsBridge.trackInstallGameClick(
-                gameId = downloadEntity?.gameId ?: "",
-                gameName = downloadEntity?.name ?: "",
-                action = "主动安装"
+                gameId = gameEntity.id,
+                gameName = gameEntity.name ?: "",
+                action = "主动安装",
+                isDspGame = gameEntity.isDspGame,
+                dspAdId = gameEntity.dspAdId
             )
 
             if (gameEntity.simulator != null) {
@@ -1243,7 +1250,7 @@ object DownloadItemUtils {
         location: String,
         asVGame: Boolean,
         isSubscribe: Boolean,
-        traceEvent: ExposureEvent?
+        traceEvent: ExposureEvent?,
     ) {
         if (gameEntity.getApk().isEmpty()) return
 
@@ -1287,7 +1294,7 @@ object DownloadItemUtils {
         entrance: String,
         location: String,
         isSubscribe: Boolean,
-        traceEvent: ExposureEvent?
+        traceEvent: ExposureEvent?,
     ) {
         val msg = FileUtils.isCanDownload(context, gameEntity.getApk().firstOrNull()?.size ?: "")
         if (TextUtils.isEmpty(msg)) {
@@ -1314,7 +1321,7 @@ object DownloadItemUtils {
         gameEntity: GameEntity,
         position: Int,
         adapter: RecyclerView.Adapter<out RecyclerView.ViewHolder?>?,
-        refreshCallback: EmptyCallback?
+        refreshCallback: EmptyCallback?,
     ) {
         val apkEntity = gameEntity.getApk().firstOrNull()
         val downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity)
@@ -1357,7 +1364,7 @@ object DownloadItemUtils {
         location: String,
         asVGame: Boolean,
         isSubscribe: Boolean,
-        traceEvent: ExposureEvent?
+        traceEvent: ExposureEvent?,
     ) {
 
         // 执行更新操作前，先清理历史下载任务，避免冲突

app/src/main/java/com/gh/common/util/DownloadObserver.kt

@@ -21,9 +21,9 @@ import com.gh.gamecenter.common.eventbus.EBShowDialog
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.common.utils.NewFlatLogUtils
 import com.gh.gamecenter.core.utils.GsonUtils
-import com.gh.gamecenter.core.utils.MtaHelper
 import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.core.utils.ToastUtils
+import com.gh.gamecenter.dsp.DspReportHelper
 import com.gh.gamecenter.eventbus.EBDownloadStatus
 import com.gh.gamecenter.feature.entity.CustomPageTrackData
 import com.gh.gamecenter.feature.entity.GameEntity
@@ -282,11 +282,10 @@ object DownloadObserver {
 
     private fun performDownloadCompleteAction(
         downloadEntity: DownloadEntity,
-        downloadManager: DownloadManager
+        downloadManager: DownloadManager,
     ) {
         if (downloadEntity.name.contains(mApplication.getString(R.string.app_name))) {
             statDoneEvent(downloadEntity)
-            MtaHelper.onEvent("软件更新", "下载完成")
             // 会有 ActivityNotFoundException 异常，catch 掉不管了
             tryWithDefaultCatch {
                 if (Constants.SILENT_UPDATE != downloadEntity.getMetaExtra(Constants.EXTRA_DOWNLOAD_TYPE)) {
@@ -299,7 +298,9 @@ object DownloadObserver {
                     SensorsBridge.trackInstallGameClick(
                         gameName = downloadEntity.name,
                         gameId = downloadEntity.gameId,
-                        action = "自动安装"
+                        action = "自动安装",
+                        isDspGame = downloadEntity.getMetaExtra(Constants.DSP_GAME) == "true",
+                        dspAdId = downloadEntity.getMetaExtra(Constants.DSP_AD_ID)
                     )
 
                     // TODO 在 Android 11 上没有授权安装未知应用的权限前第一次调用这个方法系统会杀掉我们的进程...
@@ -396,7 +397,9 @@ object DownloadObserver {
                                     SensorsBridge.trackInstallGameClick(
                                         gameId = downloadEntity.gameId,
                                         gameName = downloadEntity.name,
-                                        action = "自动安装"
+                                        action = "自动安装",
+                                        isDspGame = downloadEntity.getMetaExtra(Constants.DSP_GAME) == "true",
+                                        dspAdId = downloadEntity.getMetaExtra(Constants.DSP_AD_ID)
                                     )
                                     PackageInstaller.install(mApplication, downloadEntity, false, ignoreAsVGame = false)
                                 }
@@ -505,7 +508,8 @@ object DownloadObserver {
                 gameVersion = downloadEntity.versionName ?: "",
                 isPlatformRecommend = isPlatformRecommend,
                 adIconActive = downloadEntity.meta[Constants.AD_ICON_ACTIVE].toBoolean(),
-                isAdData = downloadEntity.meta[Constants.IS_AD_DATA].toBoolean()
+                isAdData = downloadEntity.meta[Constants.IS_AD_DATA].toBoolean(),
+                downloadUrl = downloadEntity.meta[Constants.DOWNLOAD_URL]
             ),
             downloadEntity.platform,
             downloadEntity.exposureTrace,
@@ -561,27 +565,77 @@ object DownloadObserver {
             val pushMessageId = (HaloApp.get(Constants.PUSH_MESSAGE_ID, false) as? String) ?: ""
             val pushLinkId = (HaloApp.get(Constants.PUSH_LINK_ENTITY, false) as? LinkEntity)?.link ?: ""
             val isFromPush = pushMessageId.isNotEmpty()
-            SensorsBridge.trackEventWithExposureSource(
-                "DownloadProcessFinish",
-                exposureEvent?.source,
-                "game_id", downloadEntity.gameId,
-                "game_name", downloadEntity.meta[Constants.GAME_NAME] ?: "",
-                "game_type", downloadEntity.meta[Constants.GAME_CATEGORY_IN_CHINESE] ?: "",
-                "game_label", downloadEntity.tags.joinToString(","),
-                "game_schema_type", if (downloadEntity.getMetaExtra(Constants.KEY_BIT) == "32") "32位" else "64位",
-                "page_name", getCurrentPageEntity().pageName,
-                "page_id", getCurrentPageEntity().pageId,
-                "page_business_id", getCurrentPageEntity().pageBusinessId,
-                "last_page_name", getLastPageEntity().pageName,
-                "last_page_id", getLastPageEntity().pageId,
-                "last_page_business_id", getLastPageEntity().pageBusinessId,
-                "download_status", downloadEntity.meta[Constants.DOWNLOAD_STATUS_IN_CHINESE] ?: "",
-                "download_type", if (downloadEntity.asVGame()) "畅玩下载" else "本地下载",
-                "is_from_push_notifications", isFromPush,
-                "message_id", pushMessageId,
-                "link_id", pushLinkId,
-                *kvs
-            )
+
+            if (downloadEntity.getMetaExtra(Constants.DSP_GAME) != "true") {
+                SensorsBridge.trackEventWithExposureSource(
+                    "DownloadProcessFinish",
+                    exposureEvent?.source,
+                    "game_id",
+                    downloadEntity.gameId,
+                    "game_name",
+                    downloadEntity.meta[Constants.GAME_NAME] ?: "",
+                    "game_type",
+                    downloadEntity.meta[Constants.GAME_CATEGORY_IN_CHINESE] ?: "",
+                    "game_label",
+                    downloadEntity.tags.joinToString(","),
+                    "game_schema_type",
+                    if (downloadEntity.getMetaExtra(Constants.KEY_BIT) == "32") "32位" else "64位",
+                    "page_name",
+                    getCurrentPageEntity().pageName,
+                    "page_id",
+                    getCurrentPageEntity().pageId,
+                    "page_business_id",
+                    getCurrentPageEntity().pageBusinessId,
+                    "last_page_name",
+                    getLastPageEntity().pageName,
+                    "last_page_id",
+                    getLastPageEntity().pageId,
+                    "last_page_business_id",
+                    getLastPageEntity().pageBusinessId,
+                    "download_status",
+                    downloadEntity.meta[Constants.DOWNLOAD_STATUS_IN_CHINESE] ?: "",
+                    "download_type",
+                    if (downloadEntity.asVGame()) "畅玩下载" else "本地下载",
+                    "is_from_push_notifications",
+                    isFromPush,
+                    "message_id",
+                    pushMessageId,
+                    "link_id",
+                    pushLinkId,
+                    *kvs
+                )
+            } else {
+                val searchContent = downloadEntity.getMetaExtra(Constants.SEARCH_KEY)
+
+                SensorsBridge.trackEventWithExposureSource(
+                    "DspAdDownloadFinish",
+                    exposureEvent?.source,
+                    "ad_id", downloadEntity.getMetaExtra(Constants.DSP_AD_ID),
+                    "search_content", searchContent,
+                    "game_column_name", downloadEntity.getMetaExtra(Constants.SUBJECT_NAME),
+                    "game_column_id", downloadEntity.getMetaExtra(Constants.SUBJECT_ID),
+                    "game_id", downloadEntity.gameId,
+                    "game_name", downloadEntity.meta[Constants.GAME_NAME] ?: "",
+                    "game_type", downloadEntity.meta[Constants.GAME_CATEGORY_IN_CHINESE] ?: "",
+                    "game_label", downloadEntity.tags.joinToString(","),
+                    "game_schema_type", if (downloadEntity.getMetaExtra(Constants.KEY_BIT) == "32") "32位" else "64位",
+                    "page_name", getCurrentPageEntity().pageName,
+                    "page_id", getCurrentPageEntity().pageId,
+                    "page_business_id", getCurrentPageEntity().pageBusinessId,
+                    "last_page_name", getLastPageEntity().pageName,
+                    "last_page_id", getLastPageEntity().pageId,
+                    "last_page_business_id", getLastPageEntity().pageBusinessId,
+                    "download_status", downloadEntity.meta[Constants.DOWNLOAD_STATUS_IN_CHINESE] ?: "",
+                    "download_type", if (downloadEntity.asVGame()) "畅玩下载" else "本地下载",
+                    "is_from_push_notifications", isFromPush,
+                    "message_id", pushMessageId,
+                    "link_id", pushLinkId,
+                    "location", if (searchContent.isEmpty()) "自定义页面" else "游戏搜索结果列表",
+                    *kvs
+                )
+
+                DspReportHelper.report(downloadEntity.getMetaExtra(Constants.DOWNLOAD_URL))
+            }
         }
 
         DataCollectionUtils.uploadDownload(mApplication, downloadEntity, "完成")

app/src/main/java/com/gh/common/util/GameUtils.kt

@@ -111,7 +111,12 @@ object GameUtils {
         var gh_id: Any?
         apkFor@ for (apkEntity in gameEntity.getApk()) {
 
-            val isInstalledLocally = PackagesManager.isInstalled(apkEntity.packageName)
+            val isInstalledLocally =
+                if (gameEntity.isDspGame) {
+                    PackageHelper.validLocalPackageNameSet.contains(apkEntity.packageName)
+                } else {
+                    PackagesManager.isInstalled(apkEntity.packageName)
+                }
 
             // filter by packageName
             val settings = Config.getSettings()

app/src/main/java/com/gh/common/util/PackageChangeHelper.kt

@@ -2,21 +2,29 @@ package com.gh.common.util
 
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
+import com.gh.common.dialog.AccelerateExpirationDialogFragment
 import com.gh.download.DownloadManager
 import com.gh.download.PackageObserver
 import com.gh.gamecenter.DownloadManagerActivity
+import com.gh.gamecenter.R
 import com.gh.gamecenter.common.utils.NewFlatLogUtils
 import com.gh.gamecenter.common.utils.SensorsBridge
+import com.gh.gamecenter.core.provider.IAcceleratorProvider
 import com.gh.gamecenter.core.utils.CurrentActivityHolder
 import com.gh.gamecenter.eventbus.EBPackage
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.hud.HeadUpDisplayHelper
+import com.gh.gamecenter.hud.HeadUpDisplayLogHelper
 import com.gh.gamecenter.manager.PackagesManager
 import com.gh.gamecenter.packagehelper.PackageRepository
+import com.halo.assistant.HaloApp
+import com.halo.assistant.accelerator.repository.AcceleratorDataHolder
 
-import com.gh.gamecenter.R
-import com.gh.gamecenter.hud.HeadUpDisplayLogHelper
+import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.utils.getMetaExtra
+import com.gh.gamecenter.dsp.DspReportHelper
 import com.lightgame.utils.Utils
+import com.therouter.TheRouter
 import org.greenrobot.eventbus.EventBus
 
 object PackageChangeHelper : DefaultLifecycleObserver {
@@ -27,12 +35,13 @@ object PackageChangeHelper : DefaultLifecycleObserver {
     private const val UNINSTALL_PENDING = 2
     private const val UPDATE_PENDING = 3
 
-    // <包名，pending 类型，应用版本> Triple
-    private var pendingPackageTriple: Triple<String, Int, String>? = null
-    private var pendingGhId: String? = null
+    // <包名，pending 类型，应用版本，光环ID> 的 pending 集合
+    private var pendingPackageMap: HashMap<String, PackageEntity> = hashMapOf()
 
     private var pendingHUDShowed: Boolean = false
 
+    private var isLaunching = true
+
     /**
      * 添加一个等待中，待确定是否已成功安装的应用
      */
@@ -43,24 +52,21 @@ object PackageChangeHelper : DefaultLifecycleObserver {
             Utils.log(TAG, "添加了: $packageName 包名等待安装成功")
 
             pendingHUDShowed = false
-            pendingPackageTriple = Triple(packageName, INSTALL_PENDING, "")
+            pendingPackageMap[packageName] = PackageEntity(packageName, INSTALL_PENDING, "")
         } else {
             Utils.log(TAG, "添加了: $packageName 包名等待安装更新成功")
 
-            val ghId = PackageUtils.getGhId(packageName)
-
             // 记录光环插件相关信息，用于安装成功后的处理
-            if (ghId != null) {
-                pendingGhId = ghId.toString()
-            }
+            val ghId = PackageUtils.getGhId(packageName)?.toString() ?: ""
 
             pendingHUDShowed = false
-            pendingPackageTriple = Triple(packageName, UPDATE_PENDING, installData.version)
+            pendingPackageMap[packageName] =
+                PackageEntity(packageName, UPDATE_PENDING, installData.version, ghId)
         }
     }
 
     fun isInstallPendingPackage(packageName: String): Boolean {
-        return pendingPackageTriple?.first == packageName
+        return pendingPackageMap[packageName]?.packageName == packageName
     }
 
     /**
@@ -68,87 +74,159 @@ object PackageChangeHelper : DefaultLifecycleObserver {
      */
     fun addUninstallPendingPackage(packageName: String) {
         Utils.log(TAG, "添加了: $packageName 包名等待卸载成功")
-        pendingPackageTriple = Triple(packageName, UNINSTALL_PENDING, "")
+        pendingPackageMap[packageName] = PackageEntity(packageName, UNINSTALL_PENDING, "")
+    }
+
+    override fun onCreate(owner: LifecycleOwner) {
+        super.onCreate(owner)
+        isLaunching = true
     }
 
     override fun onResume(owner: LifecycleOwner) {
         super.onResume(owner)
 
-        if (pendingPackageTriple != null) {
-            val packageName = pendingPackageTriple?.first ?: return
-            val isInstallPending = pendingPackageTriple?.second == INSTALL_PENDING
-            val isUninstallPending = pendingPackageTriple?.second == UNINSTALL_PENDING
-            val isUpdatePending = pendingPackageTriple?.second == UPDATE_PENDING
+        if (pendingPackageMap.size > 0) {
+            calculateAndDispatchPackageChanges()
+        }
 
-            val pendingVersion = pendingPackageTriple?.third ?: ""
+        refreshVipStatus()
+    }
+
+    /**
+     * 应用从后台切到前台，如果是登录状态，需要刷新用户的vip状态
+     */
+    private fun refreshVipStatus() {
+        val iAcceleratorProvider = TheRouter.get(IAcceleratorProvider::class.java)
+        if (iAcceleratorProvider?.hasToken() == true &&
+            AcceleratorDataHolder.instance.enableRefresh &&
+            AcceleratorDataHolder.instance.vipEntity != null &&
+            !isLaunching
+        ) {
+            iAcceleratorProvider.loadQyUserPermissionData {
+                val vip = AcceleratorDataHolder.instance.vipEntity
+                if (vip != null && !vip.vipStatus && !vip.isNewUser && !vip.isVipRefundUser && !vip.isDurationRefundUser) {
+                    // 获取当前
+                    val currentActivity = CurrentActivityHolder.getCurrentActivity()
+                    val reminder = AccelerateExpirationDialogFragment.ExpirationReminder.TimeRunsOut("")
+                    if (currentActivity != null && HaloApp.getInstance().isRunningForeground) {
+                        AccelerateExpirationDialogFragment.checkDialogShown(currentActivity, reminder)
+                    }
+
+                }
+            }
+        }
+    }
+
+    /**
+     * 计算并分发包名的安装状态
+     */
+    private fun calculateAndDispatchPackageChanges() {
+        val completeList = arrayListOf<PackageEntity>()
+        val pendingHudPackageList = arrayListOf<String>()
+
+        for (packageEntity in pendingPackageMap.values) {
+            val packageName = packageEntity.packageName
+            val pendingVersion = packageEntity.version
+            val pendingGhId = packageEntity.ghId
 
             val installedVersionName = PackageUtils.getVersionNameByPackageName(packageName)
             val isInstalled = installedVersionName != null
 
-            if (isInstallPending) {
+            if (packageEntity.isInstallPending()) {
                 if (isInstalled) {
-                    pendingPackageTriple = null
-                    pendingGhId = null
+                    completeList += packageEntity
 
-                    PackageRepository.addInstalledGame(PackageRepository.packageFilterManager, packageName)
+                    PackageRepository.addInstalledGame(
+                        PackageRepository.packageFilterManager,
+                        packageName
+                    )
 
                     // 添加到额外的包名白名单，下次启动同时查询此包的安装情况
-                    PackageHelper.updateAdditionalWhiteListPackageName(packageName = packageName, isAdd = true)
+                    PackageHelper.updateAdditionalWhiteListPackageName(
+                        packageName = packageName,
+                        isAdd = true
+                    )
 
                     performInstallSuccessAction(packageName)
                 } else {
-                    // 任务不存在了，将等待更新安装结果的 triple 置为 null
-                    if (DownloadManager.getInstance().getDownloadEntitySnapshotByPackageName(packageName) == null) {
-                        pendingPackageTriple = null
+                    // 任务不存在了，将等待更新安装结果的 packageEntity 置为 null
+                    if (DownloadManager.getInstance()
+                            .getDownloadEntitySnapshotByPackageName(packageName) == null
+                    ) {
+                        completeList += packageEntity
                     } else {
-                        showHUDIfNeeded(packageName)
+                        pendingHudPackageList.add(packageName)
                     }
                 }
-            } else if (isUninstallPending && !isInstalled) {
-                pendingPackageTriple = null
-                pendingGhId = null
+            } else if (packageEntity.isUninstallPending() && !isInstalled) {
+                completeList += packageEntity
 
                 // 从额外的包名白名单移除，下次启动时不再查询此包的安装情况
-                PackageHelper.updateAdditionalWhiteListPackageName(packageName = packageName, isAdd = false)
+                PackageHelper.updateAdditionalWhiteListPackageName(
+                    packageName = packageName,
+                    isAdd = false
+                )
 
                 performUninstallSuccessAction(packageName)
-            } else if (isUpdatePending) {
+            } else if (packageEntity.isUpdatePending()) {
                 val isUpdateValid = if (installedVersionName != pendingVersion) {
                     true
                 } else {
-                    !pendingGhId.isNullOrEmpty() && pendingGhId != PackageUtils.getGhId(packageName).toString()
+                    pendingGhId.isNotEmpty()
+                            && pendingGhId != PackageUtils.getGhId(packageName).toString()
                 }
 
-                pendingPackageTriple = null
-                pendingGhId = null
-
                 if (isUpdateValid) {
                     performUninstallSuccessAction(packageName)
                     performInstallSuccessAction(packageName)
+
+                    completeList += packageEntity
                 } else {
-                    // 任务不存在了，将等待更新安装结果的 triple 置为 null
-                    if (DownloadManager.getInstance().getDownloadEntitySnapshotByPackageName(packageName) == null) {
-                        pendingPackageTriple = null
+                    // 任务不存在了，将等待更新安装结果的 packageEntity 置为 null
+                    if (DownloadManager.getInstance()
+                            .getDownloadEntitySnapshotByPackageName(packageName) == null
+                    ) {
+                        completeList += packageEntity
                     } else {
-                        showHUDIfNeeded(packageName)
+                        pendingHudPackageList.add(packageName)
                     }
                 }
 
                 // 添加到额外的包名白名单，下次启动同时查询此包的安装情况
-                PackageHelper.updateAdditionalWhiteListPackageName(packageName = packageName, isAdd = true)
+                PackageHelper.updateAdditionalWhiteListPackageName(
+                    packageName = packageName,
+                    isAdd = true
+                )
             }
         }
+
+        for (invalidPackage in completeList) {
+            pendingPackageMap.remove(invalidPackage.packageName)
+        }
+
+        if (pendingHudPackageList.isNotEmpty()) {
+            showHUDIfNeeded(pendingHudPackageList.last())
+        }
+    }
+
+    override fun onStop(owner: LifecycleOwner) {
+        super.onStop(owner)
+        isLaunching = false
     }
 
     private fun showHUDIfNeeded(packageName: String) {
         if (pendingHUDShowed) return
 
-        val downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshotByPackageName(packageName) ?: return
+        val downloadEntity =
+            DownloadManager.getInstance().getDownloadEntitySnapshotByPackageName(packageName)
+                ?: return
+        if (downloadEntity.gameId == Constants.GHZS_GAME_ID) return
         val activity = CurrentActivityHolder.getCurrentActivity() ?: return
         if (activity is DownloadManagerActivity) return
 
         pendingHUDShowed = true
-        HeadUpDisplayHelper.showHUD(activity,
+        HeadUpDisplayHelper.showHUD(
+            activity,
             downloadEntity.icon ?: "",
             activity.getString(R.string.hud_has_pending_install_game),
             activity.getString(R.string.hud_head_to_download_manager),
@@ -189,16 +267,26 @@ object PackageChangeHelper : DefaultLifecycleObserver {
     private fun performInstallSuccessAction(
         packageName: String,
         cachedGameEntity: GameEntity? = null,
-        withLog: Boolean = true
+        withLog: Boolean = true,
     ) {
         Utils.log(TAG, "安装了: $packageName 包名的程序")
-        val downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshotByPackageName(packageName)
-        val gameId = if (downloadEntity != null && downloadEntity.gameId != null) downloadEntity.gameId else ""
-        val gameName = if (downloadEntity != null && downloadEntity.name != null) downloadEntity.name else ""
+        val downloadEntity =
+            DownloadManager.getInstance().getDownloadEntitySnapshotByPackageName(packageName)
+        val gameId = downloadEntity?.gameId ?: ""
+        val gameName = downloadEntity?.name ?: ""
 
-        if (withLog) {
+        if (withLog && gameId.isNotEmpty()) {
             NewFlatLogUtils.logGameInstallComplete(gameId, gameName)
-            SensorsBridge.trackInstallGameFinish(gameId, gameName)
+            SensorsBridge.trackInstallGameFinish(
+                gameId,
+                gameName,
+                downloadEntity?.getMetaExtra(Constants.DSP_GAME) == "true",
+                downloadEntity?.getMetaExtra(Constants.DSP_AD_ID) ?: ""
+            )
+
+            if (downloadEntity?.getMetaExtra(Constants.DSP_GAME) == "true") {
+                DspReportHelper.report(downloadEntity.getMetaExtra(Constants.INSTALL_URL))
+            }
         }
 
         InstallUtils.getInstance().removeInstall(packageName)
@@ -237,4 +325,23 @@ object PackageChangeHelper : DefaultLifecycleObserver {
         EventBus.getDefault().post(uninstallEb)
     }
 
+    private class PackageEntity(
+        val packageName: String,
+        val type: Int,
+        val version: String,
+        val ghId: String = "",
+    ) {
+        fun isInstallPending(): Boolean {
+            return type == INSTALL_PENDING
+        }
+
+        fun isUninstallPending(): Boolean {
+            return type == UNINSTALL_PENDING
+        }
+
+        fun isUpdatePending(): Boolean {
+            return type == UPDATE_PENDING
+        }
+    }
+
 }

app/src/main/java/com/gh/common/util/ViewPagerFragmentHelper.kt

@@ -2,12 +2,10 @@ package com.gh.common.util
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
-import com.therouter.TheRouter
 import com.gh.common.iinterface.ISuperiorChain
 import com.gh.gamecenter.amway.AmwayFragment
 import com.gh.gamecenter.category2.CategoryV2Fragment
 import com.gh.gamecenter.common.constant.EntranceConsts
-import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.entity.LinkEntity
 import com.gh.gamecenter.common.provider.IHelpAndFeedbackProvider
 import com.gh.gamecenter.discovery.DiscoveryFragment
@@ -38,6 +36,7 @@ import com.gh.gamecenter.toolbox.ToolboxFragment
 import com.gh.gamecenter.video.detail.HomeVideoFragment
 import com.gh.gamecenter.wrapper.ToolbarWrapperFragment
 import com.halo.assistant.fragment.WebFragment
+import com.therouter.TheRouter
 
 /**
  * 通用跳转Fragment方法
@@ -148,6 +147,15 @@ object ViewPagerFragmentHelper {
                 bundle.putString(EntranceConsts.KEY_QUESTIONS_ID, linkEntity.link)
                 NewQuestionDetailFragment().with(bundle)
             }
+            // 专题合集详情页
+            TYPE_COLUMN_COLLECTION -> {
+                bundle.putString(EntranceConsts.KEY_COLLECTION_ID, linkEntity.link)
+                bundle.putInt(EntranceConsts.KEY_POSITION, 0)
+                bundle.putString(EntranceConsts.KEY_COLUMNNAME, linkEntity.text)
+                bundle.putBoolean(EntranceConsts.KEY_IS_COLUMN_COLLECTION, true)
+                bundle.putString(EntranceConsts.KEY_SUBJECT_TYPE, "tab")
+                ColumnCollectionDetailFragment().with(bundle)
+            }
             // 其他原来带Toolbar的Fragment
             else -> createToolbarWrapperFragment(bundle, linkEntity, isTabWrapper)
         }
@@ -177,15 +185,6 @@ object ViewPagerFragmentHelper {
                 bundle.putString(EntranceConsts.KEY_SUBJECT_TYPE, "detail")
                 bundle.putBoolean(EntranceConsts.KEY_SHOW_DOWNLOAD_MENU, !isTabWrapper)
             }
-            // 专题合集详情页
-            TYPE_COLUMN_COLLECTION -> {
-                className = ColumnCollectionDetailFragment::class.java.name
-                bundle.putString(EntranceConsts.KEY_COLLECTION_ID, entity.link)
-                bundle.putInt(EntranceConsts.KEY_POSITION, 0)
-                bundle.putString(EntranceConsts.KEY_COLUMNNAME, entity.text)
-                bundle.putBoolean(EntranceConsts.KEY_IS_COLUMN_COLLECTION, true)
-                bundle.putString(EntranceConsts.KEY_SUBJECT_TYPE, "tab")
-            }
             // 开服表
             TYPE_SERVER -> {
                 className = GameServersPublishFragment::class.java.name
@@ -200,8 +199,8 @@ object ViewPagerFragmentHelper {
             // 分类2.0
             TYPE_CATEGORY_V2 -> {
                 className = CategoryV2Fragment::class.java.name
-                bundle.putString(EntranceConsts.KEY_CATEGORY_ID, entity.link)
-                bundle.putString(EntranceConsts.KEY_CATEGORY_TITLE, entity.text)
+                bundle.putString(EntranceConsts.KEY_PAGE_ID, entity.link)
+                bundle.putString(EntranceConsts.KEY_PAGE_NAME, entity.text)
                 bundle.putBoolean(EntranceConsts.KEY_SHOW_DOWNLOAD_MENU, !isTabWrapper)
             }
             // 通用内容合集详情页

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

@@ -1,38 +1,48 @@
 package com.gh.common.view
 
+import android.annotation.SuppressLint
 import android.content.Context
-import android.graphics.Color
+import android.content.res.ColorStateList
+import android.graphics.Typeface
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.LinearLayout
+import android.widget.CompoundButton
 import android.widget.PopupWindow
-import android.widget.TextView
+import android.widget.RadioButton
 import androidx.annotation.ColorInt
-import androidx.core.content.ContextCompat
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.view.forEach
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import com.gh.gamecenter.R
-import com.gh.gamecenter.common.utils.dip2px
-import com.gh.gamecenter.common.utils.setDrawableEnd
-import com.gh.gamecenter.common.utils.toColor
+import com.gh.gamecenter.common.utils.*
+import com.gh.gamecenter.databinding.LayoutCategoryFilterBinding
+import com.gh.gamecenter.databinding.LayoutCategoryFilterSizeBinding
+import com.gh.gamecenter.databinding.PopCategoryFilterSizeBinding
+import com.gh.gamecenter.databinding.PopCategoryFilterTypeBinding
 import com.gh.gamecenter.entity.SubjectSettingEntity
-import com.google.android.flexbox.FlexboxLayout
 
 class CategoryFilterView @JvmOverloads constructor(
     context: Context,
     attrs: AttributeSet? = null,
     defStyleAttr: Int = 0
-) : LinearLayout(context, attrs, defStyleAttr) {
+) : ConstraintLayout(context, attrs, defStyleAttr) {
 
-    private var mTypeTv: TextView
-    private var mCatalogTv: TextView
-    private var mSizeTv: TextView
-    private var mTypeContainer: View
-    private var mCatalogContainer: View
-    private var mSizeContainer: View
+    private val binding: LayoutCategoryFilterBinding
 
-    private var mTypeFilterArray = arrayOf(SortType.RECOMMENDED, SortType.NEWEST, SortType.RATING)
-    private var sizeFilterArray: ArrayList<SubjectSettingEntity.Size>? = null
+    private val mTypeFilterArray = arrayOf(SortType.RECOMMENDED, SortType.NEWEST, SortType.RATING)
+    private val sizeFilterArray by lazy {
+        listOf(
+            SubjectSettingEntity.Size(min = -1, max = -1, text = "全部大小"),
+            SubjectSettingEntity.Size(min = -1, max = 100, text = "100M以下"),
+            SubjectSettingEntity.Size(min = 100, max = 300, text = "100-300M"),
+            SubjectSettingEntity.Size(min = 300, max = 500, text = "300-500M"),
+            SubjectSettingEntity.Size(min = 500, max = 1000, text = "500M-1G"),
+            SubjectSettingEntity.Size(min = 1000, max = -1, text = "1G以上")
+        )
+    }
 
     private var mOnCategoryFilterSetupListener: OnCategoryFilterSetupListener? = null
     private var mOnFilterClickListener: OnFilterClickListener? = null
@@ -41,29 +51,28 @@ class CategoryFilterView @JvmOverloads constructor(
     private var mSizePopupWindow: PopupWindow? = null
 
     init {
-        View.inflate(context, R.layout.layout_category_filter, this)
 
-        mTypeTv = findViewById(R.id.type_tv)
-        mCatalogTv = findViewById(R.id.catalog_tv)
-        mSizeTv = findViewById(R.id.size_tv)
-        mTypeContainer = findViewById(R.id.container_type)
-        mCatalogContainer = findViewById(R.id.container_category)
-        mSizeContainer = findViewById(R.id.container_size)
-        mTypeTv.text = mTypeFilterArray[0].value
+        val inflater = LayoutInflater.from(context)
+        binding = LayoutCategoryFilterBinding.inflate(inflater, this, true)
 
-        mTypeContainer.setOnClickListener {
+        binding.ivTypeArrow.setImageResource(R.drawable.ic_arrow_down)
+        binding.ivTypeArrow.imageTintList =
+            ColorStateList.valueOf(com.gh.gamecenter.common.R.color.text_neutral.toColor(context))
+
+        binding.ivSizeArrow.setImageResource(R.drawable.ic_arrow_down)
+        binding.ivSizeArrow.imageTintList =
+            ColorStateList.valueOf(com.gh.gamecenter.common.R.color.text_neutral.toColor(context))
+
+        binding.tvType.text = mTypeFilterArray[0].value
+
+        binding.llTypeContainer.setOnClickListener {
             mOnFilterClickListener?.onTypeClick()
-            showSelectTypePopupWindow(this, mTypeTv, mTypeTv.text.toString())
+            showSelectTypePopupWindow()
         }
 
-        mCatalogContainer.setOnClickListener {
-            mOnFilterClickListener?.onCategoryClick()
-            mOnCategoryFilterSetupListener?.onSetupSortCategory()
-        }
-
-        mSizeContainer.setOnClickListener {
+        binding.llSizeContainer.setOnClickListener {
             mOnFilterClickListener?.onSizeClick()
-            showSelectSizePopupWindow(this, mSizeTv, mSizeTv.text.toString())
+            showSelectSizePopupWindow()
         }
     }
 
@@ -76,154 +85,133 @@ class CategoryFilterView @JvmOverloads constructor(
     }
 
     fun resetSortSize() {
-        mSizeTv.text = "全部大小"
+        binding.tvType.text = R.string.size.toResString()
     }
 
-    private fun toggleHighlightedTextView(targetTextView: TextView, highlightIt: Boolean) {
-        if (highlightIt) {
-            targetTextView.background = ContextCompat.getDrawable(targetTextView.context, R.drawable.bg_tag_text)
-            targetTextView.setTextColor(Color.WHITE)
-        } else {
-            targetTextView.background = null
-            targetTextView.setTextColor(ContextCompat.getColor(targetTextView.context, com.gh.gamecenter.common.R.color.text_757575))
-        }
-    }
+    private fun showSelectTypePopupWindow() {
+        binding.tvType.setTextColor(com.gh.gamecenter.common.R.color.text_primary.toColor(context))
 
-    private fun showSelectTypePopupWindow(containerView: View, typeTv: TextView, typeText: String) {
-        typeTv.setTextColor(com.gh.gamecenter.common.R.color.text_theme.toColor(context))
-        typeTv.setDrawableEnd(R.drawable.ic_filter_arrow_up)
+        binding.ivTypeArrow.setImageResource(R.drawable.ic_arrow_up)
+        binding.ivTypeArrow.imageTintList =
+            ColorStateList.valueOf(com.gh.gamecenter.common.R.color.text_primary.toColor(context))
 
-        val inflater = LayoutInflater.from(typeTv.context)
-        val layout = inflater.inflate(R.layout.layout_filter_size, null)
-        val windowWidth = typeTv.context.resources.displayMetrics.widthPixels - 80F.dip2px()
+        val inflater = LayoutInflater.from(context)
+        val typeBinding = PopCategoryFilterTypeBinding.inflate(inflater, null, false)
+        val windowWidth = resources.displayMetrics.widthPixels - 80F.dip2px()
+        val windowHeight = mOnCategoryFilterSetupListener?.getPopHeight() ?: 0
         val popupWindow = PopupWindow(
-            layout,
+            typeBinding.root,
             windowWidth,
-            LayoutParams.WRAP_CONTENT
+            if (windowHeight == 0) ViewGroup.LayoutParams.WRAP_CONTENT else (windowHeight - height)
         ).apply { mTypePopupWindow = this }
 
-        val flexboxLayout = layout.findViewById<FlexboxLayout>(R.id.flexbox)
-        val backgroundView = layout.findViewById<View>(R.id.background)
 
-        backgroundView.setOnClickListener {
+        typeBinding.root.setOnClickListener {
             popupWindow.dismiss()
         }
 
-        for (type in mTypeFilterArray) {
-            val item = inflater.inflate(R.layout.item_filter_size, flexboxLayout, false)
+        val checkedId = when (binding.tvType.text.toString()) {
+            "最新" -> R.id.rb_newest
+            "评分" -> R.id.rb_score
+            else -> R.id.rb_popular
+        }
 
-            // 单列 3 个，强行设置宽度为屏幕的 1/3
-            val width = windowWidth / 3
-            val height = item.layoutParams.height
+        val checkButton = typeBinding.root.findViewById<RadioButton>(checkedId)
+        checkButton.setTypeface(checkButton.typeface, Typeface.BOLD)
+        checkButton.setTextColor(com.gh.gamecenter.common.R.color.text_primary.toColor(context))
+        checkButton.setDrawableEnd(R.drawable.ic_basic_checkmark_circle_fill)
 
-            item.layoutParams = ViewGroup.LayoutParams(width, height)
-            flexboxLayout.addView(item)
-
-            val tv = item.findViewById<TextView>(R.id.size_tv)
-            tv.text = type.value
-
-            toggleHighlightedTextView(tv, typeText == type.value)
-
-            tv.tag = type.value
-
-            item.setOnClickListener {
-                toggleHighlightedTextView(tv, true)
-                popupWindow.dismiss()
-                typeTv.text = type.value
+        val onCheckedChangeListener = CompoundButton.OnCheckedChangeListener { button, isChecked ->
+            if (isChecked) {
+                button.setTypeface(button.typeface, Typeface.BOLD)
+                button.setTextColor(com.gh.gamecenter.common.R.color.text_primary.toColor(context))
+                button.setDrawableEnd(R.drawable.ic_basic_checkmark_circle_fill)
 
+                val type = when (button.id) {
+                    R.id.rb_newest -> SortType.NEWEST
+                    R.id.rb_score -> SortType.RATING
+                    else -> SortType.RECOMMENDED
+                }
+                binding.tvType.text = type.value
                 mOnCategoryFilterSetupListener?.onSetupSortType(type)
+                popupWindow.dismiss()
+            } else {
+                button.setTypeface(button.typeface, Typeface.NORMAL)
+                button.setTextColor(com.gh.gamecenter.common.R.color.text_secondary.toColor(context))
+                button.setDrawableEnd(null)
+            }
+        }
+        typeBinding.rgFilter.forEach {
+            if (it is RadioButton) {
+                it.setOnCheckedChangeListener(onCheckedChangeListener)
             }
         }
 
         popupWindow.setOnDismissListener {
-            typeTv.setTextColor(com.gh.gamecenter.common.R.color.text_757575.toColor(context))
-            typeTv.setDrawableEnd(R.drawable.ic_filter_arrow_down)
+            binding.tvType.setTextColor(com.gh.gamecenter.common.R.color.text_tertiary.toColor(context))
+            binding.ivTypeArrow.setImageResource(R.drawable.ic_arrow_down)
+            binding.ivTypeArrow.imageTintList =
+                ColorStateList.valueOf(com.gh.gamecenter.common.R.color.text_neutral.toColor(context))
             mTypePopupWindow = null
         }
 
         popupWindow.isTouchable = true
         popupWindow.isFocusable = true
         popupWindow.animationStyle = 0
-        popupWindow.showAsDropDown(containerView, 0, 0)
+        popupWindow.showAsDropDown(this, 0, 0)
     }
 
-    private fun showSelectSizePopupWindow(containerView: View, sizeTv: TextView, sizeText: String) {
-        sizeTv.setTextColor(com.gh.gamecenter.common.R.color.text_theme.toColor(context))
-        sizeTv.setDrawableEnd(R.drawable.ic_filter_arrow_up)
+    private fun showSelectSizePopupWindow() {
+        binding.tvSize.setTextColor(com.gh.gamecenter.common.R.color.text_primary.toColor(context))
+        binding.ivSizeArrow.setImageResource(R.drawable.ic_arrow_up)
+        binding.ivSizeArrow.imageTintList =
+            ColorStateList.valueOf(com.gh.gamecenter.common.R.color.text_primary.toColor(context))
 
-        val inflater = LayoutInflater.from(sizeTv.context)
-        val layout = inflater.inflate(R.layout.layout_filter_size, null)
-        val windowWidth = sizeTv.context.resources.displayMetrics.widthPixels - 80F.dip2px()
+        val inflater = LayoutInflater.from(context)
+        val sizeBinding = PopCategoryFilterSizeBinding.inflate(inflater, null, false)
+        val windowWidth = context.resources.displayMetrics.widthPixels - 80F.dip2px()
+        val windowHeight = mOnCategoryFilterSetupListener?.getPopHeight() ?: 0
         val popupWindow = PopupWindow(
-            layout,
+            sizeBinding.root,
             windowWidth,
-            LayoutParams.WRAP_CONTENT
+            if (windowHeight == 0) ViewGroup.LayoutParams.WRAP_CONTENT else (windowHeight - height)
         ).apply { mSizePopupWindow = this }
 
-        val flexboxLayout = layout.findViewById<FlexboxLayout>(R.id.flexbox)
-        val backgroundView = layout.findViewById<View>(R.id.background)
-
-        sizeFilterArray = if (sizeFilterArray == null) {
-            getDefaultSizeFilterArray()
-        } else {
-            sizeFilterArray?.apply {
-                if (firstOrNull()?.text != "全部大小") {
-                    add(0, SubjectSettingEntity.Size(min = -1, max = -1, text = "全部大小"))
-                }
-            }
-        }
-
-        backgroundView.setOnClickListener {
+        sizeBinding.root.setOnClickListener {
             popupWindow.dismiss()
         }
-
-        for (size in sizeFilterArray!!) {
-            val item = inflater.inflate(R.layout.item_filter_size, flexboxLayout, false)
-
-            // 单列 3 个，强行设置宽度为屏幕的 1/3
-            val width = windowWidth / 3
-            val height = item.layoutParams.height
-
-            item.layoutParams = ViewGroup.LayoutParams(width, height)
-            flexboxLayout.addView(item)
-
-            val tv = item.findViewById<TextView>(R.id.size_tv)
-            tv.text = size.text
-
-            toggleHighlightedTextView(tv, sizeText == size.text)
-
-            tv.tag = size.text
-
-            item.setOnClickListener {
-                toggleHighlightedTextView(tv, true)
-                popupWindow.dismiss()
-                sizeTv.text = size.text
-
-                mOnCategoryFilterSetupListener?.onSetupSortSize(size)
-            }
+        sizeBinding.rvSize.setOnClickListener {
+            // do  nothing
         }
 
+        val sizeAdapter = CategoryFilterSizeAdapter {
+            if (it.min == INVALID_SIZE && it.max == INVALID_SIZE) {
+                binding.tvSize.text = R.string.size.toResString()
+            } else {
+                binding.tvSize.text = it.text
+            }
+            popupWindow.dismiss()
+            mOnCategoryFilterSetupListener?.onSetupSortSize(it)
+        }
+        sizeBinding.rvSize.layoutManager = GridLayoutManager(context, 3, RecyclerView.VERTICAL, false)
+        sizeBinding.rvSize.adapter = sizeAdapter
+        val selectedPosition =
+            sizeFilterArray.indexOfFirst { it.text?.contains(binding.tvSize.text.toString()) == true }
+
+        sizeAdapter.setData(sizeFilterArray, selectedPosition)
+
         popupWindow.setOnDismissListener {
-            sizeTv.setTextColor(com.gh.gamecenter.common.R.color.text_757575.toColor(context))
-            sizeTv.setDrawableEnd(R.drawable.ic_filter_arrow_down)
+            binding.tvSize.setTextColor(com.gh.gamecenter.common.R.color.text_tertiary.toColor(context))
+            binding.ivSizeArrow.setImageResource(R.drawable.ic_arrow_down)
+            binding.ivSizeArrow.imageTintList =
+                ColorStateList.valueOf(com.gh.gamecenter.common.R.color.text_neutral.toColor(context))
             mSizePopupWindow = null
         }
 
         popupWindow.isTouchable = true
         popupWindow.isFocusable = true
         popupWindow.animationStyle = 0
-        popupWindow.showAsDropDown(containerView, 0, 0)
-    }
-
-    private fun getDefaultSizeFilterArray(): ArrayList<SubjectSettingEntity.Size> {
-        return arrayListOf<SubjectSettingEntity.Size>().apply {
-            add(SubjectSettingEntity.Size(min = -1, max = -1, text = "全部大小"))
-            add(SubjectSettingEntity.Size(min = -1, max = 100, text = "100M以下"))
-            add(SubjectSettingEntity.Size(min = 100, max = 300, text = "100-300M"))
-            add(SubjectSettingEntity.Size(min = 300, max = 500, text = "300-500M"))
-            add(SubjectSettingEntity.Size(min = 500, max = 1000, text = "500M-1G"))
-            add(SubjectSettingEntity.Size(min = 1000, max = -1, text = "1G以上"))
-        }
+        popupWindow.showAsDropDown(this, 0, 0)
     }
 
     fun setRootBackgroundColor(@ColorInt color: Int) {
@@ -231,21 +219,23 @@ class CategoryFilterView @JvmOverloads constructor(
     }
 
     fun setItemTextColor(@ColorInt color: Int) {
-        mTypeTv.setTextColor(color)
-        mCatalogTv.setTextColor(color)
-        mSizeTv.setTextColor(color)
+        val colorInt = com.gh.gamecenter.common.R.color.text_neutral.toColor(context)
+        binding.tvType.setTextColor(color)
+        binding.tvSize.setTextColor(color)
+        binding.ivTypeArrow.imageTintList = ColorStateList.valueOf(colorInt)
+        binding.ivSizeArrow.imageTintList = ColorStateList.valueOf(colorInt)
     }
 
     fun updatePopupWindow() {
         when {
             mTypePopupWindow != null && mTypePopupWindow!!.isShowing -> {
                 mTypePopupWindow?.dismiss()
-                showSelectTypePopupWindow(this, mTypeTv, mTypeTv.text.toString())
+                showSelectTypePopupWindow()
             }
 
             mSizePopupWindow != null && mSizePopupWindow!!.isShowing -> {
                 mSizePopupWindow?.dismiss()
-                showSelectSizePopupWindow(this, mSizeTv, mSizeTv.text.toString())
+                showSelectSizePopupWindow()
             }
         }
     }
@@ -253,18 +243,69 @@ class CategoryFilterView @JvmOverloads constructor(
     interface OnCategoryFilterSetupListener {
         fun onSetupSortSize(sortSize: SubjectSettingEntity.Size)
         fun onSetupSortType(sortType: SortType)
-        fun onSetupSortCategory()
+        fun getPopHeight(): Int
     }
 
     interface OnFilterClickListener {
-        fun onCategoryClick()
         fun onTypeClick()
         fun onSizeClick()
     }
 
     enum class SortType(val value: String) {
-        RECOMMENDED("热门推荐"),
-        NEWEST("最新上线"),
-        RATING("最高评分")
+        RECOMMENDED("热门"),
+        NEWEST("最新"),
+        RATING("评分")
+    }
+
+    class CategoryFilterSizeAdapter(private val itemClick: (SubjectSettingEntity.Size) -> Unit) :
+        RecyclerView.Adapter<CategoryFilterSizeAdapter.SizeViewHolder>() {
+
+        private val dataList = arrayListOf<SubjectSettingEntity.Size>()
+        private var selectedPosition = 0
+
+        @SuppressLint("NotifyDataSetChanged")
+        fun setData(data: List<SubjectSettingEntity.Size>, position: Int) {
+            dataList.clear()
+            dataList.addAll(data)
+            selectedPosition = position
+            notifyDataSetChanged()
+        }
+
+        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SizeViewHolder {
+            return SizeViewHolder(parent.toBinding())
+        }
+
+        override fun getItemCount(): Int {
+            return dataList.size
+        }
+
+        override fun onBindViewHolder(holder: SizeViewHolder, position: Int) {
+            val item = dataList[position]
+            val context = holder.binding.root.context
+            if (selectedPosition == position) {
+                holder.binding.root.setTextColor(com.gh.gamecenter.common.R.color.text_theme.toColor(context))
+                holder.binding.root.setBackgroundResource(R.drawable.shape_category_filter_size_item_selected)
+            } else {
+                holder.binding.root.setTextColor(com.gh.gamecenter.common.R.color.text_secondary.toColor(context))
+                holder.binding.root.setBackgroundResource(R.drawable.shape_category_filter_size_item_normal)
+            }
+            holder.binding.root.text = item.text
+            holder.binding.root.setOnClickListener {
+                if (selectedPosition == holder.bindingAdapterPosition) {
+                    return@setOnClickListener
+                }
+                val lastPosition = selectedPosition
+                selectedPosition = holder.bindingAdapterPosition
+                notifyItemChanged(lastPosition)
+                notifyItemChanged(selectedPosition)
+                itemClick(item)
+            }
+        }
+
+        class SizeViewHolder(val binding: LayoutCategoryFilterSizeBinding) : RecyclerView.ViewHolder(binding.root)
+    }
+
+    companion object {
+        private const val INVALID_SIZE = -1
     }
 }

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

@@ -1,18 +1,23 @@
 package com.gh.common.view
 
 import android.content.Context
+import android.graphics.Typeface
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.CheckedTextView
 import android.widget.LinearLayout
 import android.widget.PopupWindow
 import android.widget.TextView
 import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.view.forEach
+import androidx.core.view.setPadding
 import com.gh.gamecenter.R
+import com.gh.gamecenter.common.utils.dip2px
+import com.gh.gamecenter.common.utils.goneIf
 import com.gh.gamecenter.common.utils.setDrawableEnd
 import com.gh.gamecenter.common.utils.toColor
-import com.gh.gamecenter.common.utils.toDrawable
 import com.gh.gamecenter.entity.SubjectSettingEntity
 import com.google.android.flexbox.FlexboxLayout
 
@@ -30,11 +35,15 @@ class ConfigFilterView @JvmOverloads constructor(
     var recommendedTv: TextView
     var updateTv: TextView //更新
     var container: View
+    private var dot1: View
+    private var dot2: View
+    private var dot3: View
 
-    var sizeFilterArray: ArrayList<SubjectSettingEntity.Size>? = null
+    private var sizeFilterArray: ArrayList<SubjectSettingEntity.Size>? = null
 
     private var mOnConfigFilterSetupListener: OnConfigFilterSetupListener? = null
     private var mSelectionTvList: ArrayList<TextView>
+    private var highlightedSortedType: SortType? = null
 
     init {
         View.inflate(context, R.layout.layout_config_filter, this)
@@ -45,6 +54,9 @@ class ConfigFilterView @JvmOverloads constructor(
         updateTv = findViewById(R.id.updateTv)
         recommendedTv = findViewById(R.id.recommended_tv)
         container = findViewById(R.id.config_controller)
+        dot1 = findViewById(R.id.dot1)
+        dot2 = findViewById(R.id.dot2)
+        dot3 = findViewById(R.id.dot3)
 
         mSelectionTvList = arrayListOf(newestTv, ratingTv, updateTv, recommendedTv)
 
@@ -54,24 +66,30 @@ class ConfigFilterView @JvmOverloads constructor(
         }
 
         ratingTv.setOnClickListener {
+            highlightedSortedType = SortType.RATING
             mOnConfigFilterSetupListener?.onSetupSortType(SortType.RATING)
             updateHighlightedTextView(ratingTv)
         }
 
         updateTv.setOnClickListener {
+            highlightedSortedType = SortType.UPDATE
             mOnConfigFilterSetupListener?.onSetupSortType(SortType.UPDATE)
             updateHighlightedTextView(updateTv)
         }
 
         newestTv.setOnClickListener {
+            highlightedSortedType = SortType.NEWEST
             mOnConfigFilterSetupListener?.onSetupSortType(SortType.NEWEST)
             updateHighlightedTextView(newestTv)
         }
 
         recommendedTv.setOnClickListener {
+            highlightedSortedType = SortType.RECOMMENDED
             mOnConfigFilterSetupListener?.onSetupSortType(SortType.RECOMMENDED)
             updateHighlightedTextView(recommendedTv)
         }
+
+        updateAllTextView(SortType.UPDATE)
     }
 
     private fun updateHighlightedTextView(highlightedTv: TextView) {
@@ -80,14 +98,17 @@ class ConfigFilterView @JvmOverloads constructor(
         }
     }
 
-    fun updateAllTextView(sortType: SortType) {
-        when (sortType) {
-            SortType.RECOMMENDED -> updateHighlightedTextView(recommendedTv)
-            SortType.NEWEST -> updateHighlightedTextView(newestTv)
-            SortType.RATING -> updateHighlightedTextView(ratingTv)
-            SortType.UPDATE -> updateHighlightedTextView(updateTv)
+    fun updateAllTextView(sortType: SortType? = highlightedSortedType) {
+        highlightedSortedType = sortType
+        sortType?.let {
+            when (it) {
+                SortType.RECOMMENDED -> updateHighlightedTextView(recommendedTv)
+                SortType.NEWEST -> updateHighlightedTextView(newestTv)
+                SortType.RATING -> updateHighlightedTextView(ratingTv)
+                SortType.UPDATE -> updateHighlightedTextView(updateTv)
+            }
+            mSizeTv.setTextColor(com.gh.gamecenter.common.R.color.text_tertiary.toColor(context))
         }
-        mSizeTv.setTextColor(com.gh.gamecenter.common.R.color.text_757575.toColor(context))
     }
 
     fun setOnConfigSetupListener(onConfigFilterSetupListener: OnConfigFilterSetupListener) {
@@ -96,11 +117,11 @@ class ConfigFilterView @JvmOverloads constructor(
 
     private fun toggleHighlightedTextView(targetTextView: TextView, highlightIt: Boolean) {
         if (highlightIt) {
-            targetTextView.background = R.drawable.bg_tag_text.toDrawable()
-            targetTextView.setTextColor(com.gh.gamecenter.common.R.color.text_white.toColor(context))
+            targetTextView.setTextColor(com.gh.gamecenter.common.R.color.text_secondary.toColor(context))
+            targetTextView.setTypeface(Typeface.DEFAULT, Typeface.BOLD)
         } else {
-            targetTextView.background = null
-            targetTextView.setTextColor(com.gh.gamecenter.common.R.color.text_757575.toColor(context))
+            targetTextView.setTextColor(com.gh.gamecenter.common.R.color.text_tertiary.toColor(context))
+            targetTextView.setTypeface(Typeface.DEFAULT, Typeface.NORMAL)
         }
     }
 
@@ -112,8 +133,8 @@ class ConfigFilterView @JvmOverloads constructor(
     }
 
     private fun showSelectionPopupWindow(containerView: View, sizeTv: TextView, sizeText: String) {
-        sizeTv.setTextColor(com.gh.gamecenter.common.R.color.text_theme.toColor(sizeTv.context))
-        sizeTv.setDrawableEnd(R.drawable.ic_filter_arrow_up)
+        sizeTv.setTextColor(com.gh.gamecenter.common.R.color.text_primary.toColor(sizeTv.context))
+        sizeTv.setDrawableEnd(R.drawable.ic_auxiliary_arrow_up_primary_8)
 
         val inflater = LayoutInflater.from(sizeTv.context)
         val layout = inflater.inflate(R.layout.layout_filter_size, null)
@@ -136,43 +157,39 @@ class ConfigFilterView @JvmOverloads constructor(
             }
         }
 
+        flexboxLayout.setOnClickListener {  }
         backgroundView.setOnClickListener {
             popupWindow.dismiss()
         }
 
         for (size in sizeFilterArray!!) {
-            val item = inflater.inflate(R.layout.item_filter_size, flexboxLayout, false)
+            val item = inflater.inflate(R.layout.item_config_filter_size, flexboxLayout, false)
 
             // 单列 4 个，强行设置宽度为屏幕的 1/4
-            val width = sizeTv.context.resources.displayMetrics.widthPixels / 4
+            val width = (sizeTv.context.resources.displayMetrics.widthPixels - 56F.dip2px()) / 4
             val height = item.layoutParams.height
 
             item.layoutParams = ViewGroup.LayoutParams(width, height)
             flexboxLayout.addView(item)
 
-            val tv = item.findViewById<TextView>(R.id.size_tv)
+            val tv = item.findViewById<CheckedTextView>(R.id.size_tv)
             tv.text = size.text
-
-            if (sizeText == size.text) {
-                toggleHighlightedTextView(tv, true)
-            } else {
-                toggleHighlightedTextView(tv, false)
-            }
-
+            tv.isChecked = sizeText == size.text
             tv.tag = size.text
 
-            item.setOnClickListener {
-                toggleHighlightedTextView(tv, true)
+            tv.setOnClickListener {
+                flexboxLayout.forEach { checkedTv ->
+                    (checkedTv as CheckedTextView).isChecked = checkedTv == tv
+                }
                 popupWindow.dismiss()
                 sizeTv.text = size.text
-
                 mOnConfigFilterSetupListener?.onSetupSortSize(size)
             }
         }
 
         popupWindow.setOnDismissListener {
-            sizeTv.setTextColor(com.gh.gamecenter.common.R.color.text_757575.toColor(sizeTv.context))
-            sizeTv.setDrawableEnd(R.drawable.ic_filter_arrow_down)
+            sizeTv.setTextColor(com.gh.gamecenter.common.R.color.text_tertiary.toColor(sizeTv.context))
+            sizeTv.setDrawableEnd(R.drawable.ic_auxiliary_arrow_down_8)
             mPopupWindow = null
         }
 
@@ -193,6 +210,49 @@ class ConfigFilterView @JvmOverloads constructor(
         }
     }
 
+    fun initSubjectFilterView(subjectSetting: SubjectSettingEntity) {
+        ratingTv.visibility = View.VISIBLE
+
+        if (subjectSetting.filterOptions.size > 1) {
+            // 重排序
+            subjectSetting.filterOptions.forEachIndexed { index, s ->
+                when (index) {
+                    0 -> updateTv.text = s
+                    1 -> recommendedTv.text = s
+                    2 -> newestTv.text = s
+                    3 -> ratingTv.text = s
+                }
+            }
+        } else {
+            updateTv.setPadding(0)
+            updateTv.setTypeface(Typeface.DEFAULT, Typeface.NORMAL)
+            updateTv.isClickable = false
+            updateTv.text = when (subjectSetting.filterOptions.first()) {
+                "推荐" -> "根据光环推荐排序"
+                "最新" -> "根据游戏上新排序"
+                "评分" -> "根据游戏评分排序"
+                "更新" -> "根据更新时间排序"
+                else -> subjectSetting.filterOptions.first()
+            }
+        }
+
+        // 隐藏相关选项
+        updateTv.goneIf(subjectSetting.filterOptions.isEmpty())
+        recommendedTv.goneIf(subjectSetting.filterOptions.size <= 1)
+        dot1.goneIf(subjectSetting.filterOptions.size <= 1)
+        newestTv.goneIf(subjectSetting.filterOptions.size <= 2)
+        dot2.goneIf(subjectSetting.filterOptions.size <= 2)
+        ratingTv.goneIf(subjectSetting.filterOptions.size <= 3)
+        dot3.goneIf(subjectSetting.filterOptions.size <= 3)
+        sizeFilterArray = subjectSetting.filterSizes
+
+        if (subjectSetting.filterOptions.size == 1) {
+            updateTv.setTextColor(com.gh.gamecenter.common.R.color.text_tertiary.toColor(context))
+            updateTv.setTypeface(Typeface.DEFAULT, Typeface.NORMAL)
+            highlightedSortedType = null
+        }
+    }
+
     interface OnConfigFilterSetupListener {
         fun onShowSortSize()
         fun onSetupSortSize(sortSize: SubjectSettingEntity.Size)

app/src/main/java/com/gh/download/DownloadManager.java

@@ -361,6 +361,17 @@ public class DownloadManager implements DownloadStatusListener {
             ExtensionsKt.addMetaExtra(downloadEntity, VHelper.KEY_REQUIRED_G_APPS, gameEntity.getGAppsSwitch());
         }
 
+        if (gameEntity.isDspGame()) {
+            ExtensionsKt.addMetaExtra(downloadEntity, Constants.DSP_GAME, "true");
+            ExtensionsKt.addMetaExtra(downloadEntity, Constants.SEARCH_KEY, gameEntity.getSearchKey());
+            ExtensionsKt.addMetaExtra(downloadEntity, Constants.SUBJECT_NAME, gameEntity.getSubjectName());
+            ExtensionsKt.addMetaExtra(downloadEntity, Constants.SUBJECT_ID, gameEntity.getSubjectId());
+
+            ExtensionsKt.addMetaExtra(downloadEntity, Constants.INSTALL_URL, gameEntity.getInstallUrl());
+            ExtensionsKt.addMetaExtra(downloadEntity, Constants.DOWNLOAD_URL, gameEntity.getDownloadUrl());
+            ExtensionsKt.addMetaExtra(downloadEntity, Constants.DSP_AD_ID, gameEntity.getDspAdId());
+        }
+
         ExtensionsKt.addMetaExtra(downloadEntity, Constants.KEY_BIT, apkEntity.getBit());
 
         // 记录是否为双下载按钮模式
@@ -480,13 +491,42 @@ public class DownloadManager implements DownloadStatusListener {
         };
 
         List<Object> kvs = new ArrayList<>(Arrays.asList(arrayKv));
+
         if (customPageTrackData != null) {
             kvs.addAll(Arrays.asList(customPageTrackData.toKV()));
         }
 
-        SensorsBridge.trackEventWithExposureSource("DownloadProcessBegin",
-                downloadExposureEvent.getSource(), kvs.toArray(new Object[0])
-        );
+        if (!gameEntity.isDspGame()) {
+            SensorsBridge.trackEventWithExposureSource(
+                    "DownloadProcessBegin",
+                    downloadExposureEvent.getSource(), kvs.toArray(new Object[0])
+            );
+        } else {
+            String searchKey = gameEntity.getSearchKey();
+            String loc;
+
+            if (TextUtils.isEmpty(searchKey)) {
+                loc = "自定义页面";
+            } else {
+                loc = "游戏搜索结果列表";
+            }
+
+            kvs.add("ad_id");
+            kvs.add(gameEntity.getDspAdId());
+            kvs.add("search_content");
+            kvs.add(searchKey);
+            kvs.add("game_column_name");
+            kvs.add(gameEntity.getSubjectName());
+            kvs.add("game_column_id");
+            kvs.add(gameEntity.getSubjectId());
+            kvs.add("location");
+            kvs.add(loc);
+
+            SensorsBridge.trackEventWithExposureSource(
+                    "DspAdDownloadBegin",
+                    downloadExposureEvent.getSource(), kvs.toArray(new Object[0])
+            );
+        }
 
         //TODO remove
         DownloadManager.getInstance().putStatus(downloadEntity.getUrl(), DownloadStatus.downloading);

app/src/main/java/com/gh/download/PackageObserver.kt

@@ -175,7 +175,9 @@ object PackageObserver {
                     SensorsBridge.trackInstallGameClick(
                         gameId = mDownloadEntity.gameId,
                         gameName = mDownloadEntity.name,
-                        action = "自动安装"
+                        action = "自动安装",
+                        isDspGame = mDownloadEntity.getMetaExtra(Constants.DSP_GAME) == "true",
+                        dspAdId = mDownloadEntity.getMetaExtra(Constants.DSP_AD_ID)
                     )
                     PackageInstaller.install(application, mDownloadEntity)
                 }

app/src/main/java/com/gh/gamecenter/MainActivity.java

@@ -944,7 +944,9 @@ public class MainActivity extends BaseActivity {
                                 SensorsBridge.trackInstallGameClick(
                                         finalDownloadEntity.getGameId(),
                                         finalDownloadEntity.getName(),
-                                        "主动安装"
+                                        "主动安装",
+                                        "true".equals(ExtensionsKt.getMetaExtra(finalDownloadEntity, Constants.DSP_GAME)),
+                                        ExtensionsKt.getMetaExtra(finalDownloadEntity, Constants.DSP_AD_ID)
                                 );
                                 PackageInstaller.install(MainActivity.this, finalDownloadEntity);
                             }, 200);
@@ -1065,7 +1067,9 @@ public class MainActivity extends BaseActivity {
                     SensorsBridge.trackInstallGameClick(
                             downloadEntity.getGameId(),
                             downloadEntity.getName(),
-                            "自动安装"
+                            "自动安装",
+                            "true".equals(ExtensionsKt.getMetaExtra(downloadEntity, Constants.DSP_GAME)),
+                            ExtensionsKt.getMetaExtra(downloadEntity, Constants.DSP_AD_ID)
                     );
                     PackageInstaller.install(this, downloadEntity, false, false);
                 }

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

@@ -23,6 +23,7 @@ import com.gh.common.simulator.NewSimulatorGameManager
 import com.gh.common.simulator.SimulatorDownloadManager
 import com.gh.common.simulator.SimulatorGameManager
 import com.gh.common.util.*
+import com.gh.common.util.GameUtils.getDownloadBtnText
 import com.gh.common.util.LogUtils
 import com.gh.common.xapk.XapkInstaller
 import com.gh.common.xapk.XapkUnzipStatus
@@ -44,6 +45,7 @@ import com.gh.gamecenter.core.utils.StringUtils
 import com.gh.gamecenter.core.utils.ToastUtils
 import com.gh.gamecenter.eventbus.EBScroll
 import com.gh.gamecenter.feature.entity.GameEntity
+import com.gh.gamecenter.feature.entity.PluginLocation
 import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.gh.gamecenter.feature.view.DownloadButton
 import com.gh.gamecenter.feature.view.DownloadButton.ButtonStyle
@@ -102,7 +104,13 @@ class DetailViewHolder(
     val speedContainer: ConstraintLayout?
     private val ivFreeVipTag: ImageView?
     private val gMoreZone: Group?
+    private val gUpdate: Group?
+    private val ivUpdate: ImageView?
+    private val tvSize: TextView?
+    private val vUpdate: View?
+    private val tvUpdate: TextView?
 
+    private var isShowVaUpdate = true
 
     // 注意 View 的命名
     init {
@@ -121,8 +129,14 @@ class DetailViewHolder(
         speedContainer = view.findViewById(R.id.cl_speed_container)
         ivFreeVipTag = view.findViewById(R.id.iv_free_vip_tag)
         gMoreZone = view.findViewById(R.id.g_more_zone)
+        gUpdate = view.findViewById(R.id.g_update)
+        ivUpdate = view.findViewById(R.id.iv_update)
+        tvSize = view.findViewById(R.id.tv_size)
+        vUpdate = view.findViewById(R.id.v_update)
+        tvUpdate = view.findViewById(R.id.tv_update)
 
         context = view.context
+        com.gh.gamecenter.common.R.color.text_aw_primary.toColor()
 
         var gameDownloadMode = gameEntity.getGameDownloadButtonMode()
 
@@ -181,8 +195,19 @@ class DetailViewHolder(
                         com.gh.gamecenter.feature.R.string.download_local
                     )
                 )
+
+                vUpdate?.setOnClickListener {
+                    if (isShowVaUpdate) {
+                        vGameDownloadListener.onClick(vUpdate)
+                    } else {
+                        localDownloadListener.onClick(vUpdate)
+                    }
+                }
             }
         }
+
+
+
         downloadPb.putWidgetBusinessName("游戏详情页")
         // "DownLoadbuttonClick" 埋点需要上报traceEvent信息
 
@@ -192,32 +217,90 @@ class DetailViewHolder(
     }
 
     private fun restoreDialogFragment() {
-        val gamePermissionDialogFragment = (context as AppCompatActivity).supportFragmentManager.findFragmentByTag(
+        val gamePermissionDialogFragment = (context.getActivity() as? AppCompatActivity)?.supportFragmentManager?.findFragmentByTag(
             GamePermissionDialogFragment::class.java.name
         ) as DialogFragment?
         gamePermissionDialogFragment?.dismissAllowingStateLoss()
     }
 
 
-    fun checkIfShowSpeedUi(rawBtnText: String) {
+    fun checkIfShowSpeedUi(showVGame: Boolean, showDualDownloadButton: Boolean) {
         acceleratorUiHelper?.let {
-            when {
-                rawBtnText == "启动" && gameEntity.canSpeed -> {
-                    downloadPb.goneIf(true)
-                    localDownloadButton?.goneIf(true)
-                    it.checkIfShowSpeedUi(true)
+            val showSpeedUi = when {
+                gameEntity.canSpeed && showDualDownloadButton -> {  // 双按钮
+                    val localText = getDownloadBtnText(context, gameEntity, false, false, PluginLocation.only_game);
+                    val downloadText =
+                        getDownloadBtnText(context, gameEntity, false, true, PluginLocation.only_game)
+                    when {
+                        localText.contains(com.gh.gamecenter.feature.R.string.update.toResString()) -> {  // 本地游戏需要更新
+                            localDownloadContainer?.goneIf(true)
+                            downloadPb.goneIf(true)
+                            overlayTv?.goneIf(true)
+
+                            gUpdate?.visibility = View.VISIBLE
+                            ivUpdate?.goneIf(true)
+                            tvSize?.goneIf(false)
+                            tvSize?.text =
+                                DetailDownloadUtils.convertSizeString(gameEntity.getApk().firstOrNull()?.size ?: "")
+                            tvUpdate?.setText(R.string.update)
+                            isShowVaUpdate = false
+                            true
+                        }
+
+                        localText.contains(com.gh.gamecenter.feature.R.string.launch.toResString()) && downloadText == "更新" -> {    // 畅玩游戏需要更新:显示 加速/更新
+                            localDownloadContainer?.goneIf(true)
+                            downloadPb.goneIf(true)
+                            overlayTv?.goneIf(true)
+
+                            gUpdate?.visibility = View.VISIBLE
+                            ivUpdate?.goneIf(false)
+                            tvSize?.goneIf(true)
+                            tvUpdate?.setText(R.string.update)
+                            isShowVaUpdate = true
+                            true
+                        }
+
+                        localText.contains(com.gh.gamecenter.feature.R.string.launch.toResString()) -> {  // 本地游戏为启动状态：显示 加速/畅玩
+                            localDownloadContainer?.goneIf(true)
+                            downloadPb.goneIf(true)
+                            overlayTv?.goneIf(true)
+
+                            gUpdate?.visibility = View.VISIBLE
+                            tvUpdate?.setText(R.string.v_play)
+                            tvSize?.goneIf(true)
+                            isShowVaUpdate = true
+                            true
+                        }
+
+                        else -> {
+                            gUpdate?.visibility = View.GONE
+                            tvSize?.goneIf(true)
+                            false
+                        }
+                    }
                 }
 
-                rawBtnText == "更新" && gameEntity.canSpeed -> {
-                    it.checkIfShowSpeedUi(true)
+                gameEntity.canSpeed && !showVGame -> {
+                    gUpdate?.visibility = View.GONE
+                    val downloadText = getDownloadBtnText(context, gameEntity, false, false, PluginLocation.only_game)
+                    when {
+                        downloadText.contains(com.gh.gamecenter.feature.R.string.launch.toResString()) -> {
+                            localDownloadContainer?.goneIf(true)
+                            downloadPb.goneIf(true)
+                            true
+                        }
+
+                        downloadText.contains(R.string.update.toResString()) -> true
+
+                        else -> false
+                    }
                 }
 
-                else -> {
-                    it.checkIfShowSpeedUi(false)
-                }
+                else -> false
             }
-        }
+            it.checkIfShowSpeedUi(showSpeedUi, showDualDownloadButton)
 
+        }
     }
 
     fun setSpeedViewsVisible(isVisible: Boolean) {
@@ -311,7 +394,9 @@ class DetailViewHolder(
                                 SensorsBridge.trackInstallGameClick(
                                     mGameEntity.id,
                                     mGameEntity.name ?: "",
-                                    "主动安装"
+                                    "主动安装",
+                                    mGameEntity.isDspGame,
+                                    mGameEntity.dspAdId
                                 )
                                 PackageInstaller.install(mViewHolder.context, mDownloadEntity)
                             }
@@ -436,7 +521,9 @@ class DetailViewHolder(
                     SensorsBridge.trackInstallGameClick(
                         gameId = mGameEntity.id,
                         gameName = mGameEntity.name ?: "",
-                        action = "主动安装"
+                        action = "主动安装",
+                        isDspGame = mGameEntity.isDspGame,
+                        dspAdId = mGameEntity.dspAdId
                     )
                     val url = mGameEntity.getApk().firstOrNull()?.url
                     val downloadEntity = SimulatorGameManager.findDownloadEntityByUrl(url)

app/src/main/java/com/gh/gamecenter/category2/CategoryDirectoryAdapter.kt

@@ -1,82 +1,89 @@
 package com.gh.gamecenter.category2
 
-import android.content.Context
+import android.annotation.SuppressLint
 import android.view.ViewGroup
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.gh.gamecenter.common.base.BaseRecyclerViewHolder
-import com.gh.gamecenter.common.utils.dip2px
+import androidx.recyclerview.widget.RecyclerView.ViewHolder
+import com.gh.gamecenter.common.utils.toBinding
 import com.gh.gamecenter.common.view.GridSpacingItemColorDecoration
-import com.gh.gamecenter.common.utils.toColor
 import com.gh.gamecenter.databinding.CategoryDirectoryItemBinding
 import com.gh.gamecenter.entity.CategoryEntity
-import com.lightgame.adapter.BaseRecyclerAdapter
 
 class CategoryDirectoryAdapter(
-    context: Context,
-    private val mViewModel: CategoryV2ViewModel,
-    private var mList: List<CategoryEntity>
-) : BaseRecyclerAdapter<CategoryDirectoryAdapter.CategoryDirectoryItemViewHolder>(context) {
+    private val listener: SearchCategoryPop.OnSearchCategoryListener
+) : RecyclerView.Adapter<CategoryDirectoryAdapter.CategoryDirectoryItemViewHolder>() {
 
-    val width = mContext.resources.displayMetrics.widthPixels * 260 / 360
+    private val data = arrayListOf<CategoryEntity>()
 
-    fun setListData(list: List<CategoryEntity>) {
-        mList = list
+    @SuppressLint("NotifyDataSetChanged")
+    fun setListData(newData: List<CategoryEntity>) {
+        data.clear()
+        data.addAll(newData)
         notifyDataSetChanged()
     }
 
-    override fun getItemCount() = mList.size
+    override fun getItemCount() = data.size
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) =
-        CategoryDirectoryItemViewHolder(CategoryDirectoryItemBinding.inflate(mLayoutInflater))
+        CategoryDirectoryItemViewHolder(listener, parent.toBinding())
 
     override fun onBindViewHolder(holder: CategoryDirectoryItemViewHolder, position: Int) {
-        holder.binding.run {
-            root.layoutParams = root.layoutParams?.apply {
-                width = mContext.resources.displayMetrics.widthPixels * 260 / 360
-            } ?: RecyclerView.LayoutParams(width, RecyclerView.LayoutParams.WRAP_CONTENT)
+        holder.onBind(position, data[position])
+    }
 
-            val padTop = if (position == 0) 16F.dip2px() else 24F.dip2px()
-            root.setPadding(16F.dip2px(), padTop, 16F.dip2px(), 0)
+    override fun onBindViewHolder(holder: CategoryDirectoryItemViewHolder, position: Int, payloads: MutableList<Any>) {
+        if (payloads.isEmpty()) {
+            super.onBindViewHolder(holder, position, payloads)
+        } else {
+            holder.notifyItemSelectedChanged()
+        }
 
-            val entity = mList[position]
-            title.text = entity.name
-            title.setTextColor(com.gh.gamecenter.common.R.color.text_primary.toColor(mContext))
+    }
 
-            subCategoryRv.run {
-                if (adapter is SubCategoryAdapter) {
-                    layoutManager = GridLayoutManager(mContext, 3)
-                    adapter = entity.data?.let {
-                        SubCategoryAdapter(
-                            mContext,
-                            mViewModel,
-                            it,
-                            position
-                        )
-                    }
-                } else {
-                    layoutManager = GridLayoutManager(mContext, 3)
-                    adapter = entity.data?.let {
-                        SubCategoryAdapter(
-                            mContext,
-                            mViewModel,
-                            it,
-                            position
-                        )
-                    }
-                    addItemDecoration(
-                        GridSpacingItemColorDecoration(
-                            mContext,
-                            6,
-                            6,
-                            com.gh.gamecenter.common.R.color.transparent
-                        )
-                    )
-                }
-            }
+    fun notifyItemSelectedChanged(parentId: String) {
+        val position = data.indexOfFirst { it.id == parentId }
+        if (position != -1) {
+            notifyItemChanged(position, "")
         }
     }
 
-    class CategoryDirectoryItemViewHolder(val binding: CategoryDirectoryItemBinding) :
-        BaseRecyclerViewHolder<Any>(binding.root)
+    class CategoryDirectoryItemViewHolder(
+        private val listener: SearchCategoryPop.OnSearchCategoryListener,
+        val binding: CategoryDirectoryItemBinding
+    ) :
+        ViewHolder(binding.root) {
+
+        private val childAdapter by lazy {
+            SubCategoryAdapter(listener)
+        }
+
+        fun onBind(position: Int, item: CategoryEntity) {
+
+            val context = binding.root.context
+            binding.title.text = item.name
+
+            if (binding.subCategoryRv.adapter == null) {
+                binding.subCategoryRv.layoutManager = object : GridLayoutManager(context, 4) {
+                    override fun canScrollVertically(): Boolean {
+                        return false
+                    }
+                }
+                binding.subCategoryRv.adapter = childAdapter
+                binding.subCategoryRv.addItemDecoration(
+                    GridSpacingItemColorDecoration(
+                        context,
+                        8,
+                        8,
+                        com.gh.gamecenter.common.R.color.transparent
+                    )
+                )
+            }
+            childAdapter.setData(position, item)
+        }
+
+        fun notifyItemSelectedChanged() {
+            childAdapter.notifyItemRangeChanged(0, childAdapter.itemCount, "")
+        }
+    }
 }

app/src/main/java/com/gh/gamecenter/category2/CategoryV2Activity.kt

@@ -37,8 +37,8 @@ class CategoryV2Activity : DownloadToolbarActivity() {
     companion object {
         fun getIntent(context: Context, catalogId: String, catalogTitle: String, entrance: String): Intent {
             val bundle = Bundle()
-            bundle.putString(EntranceConsts.KEY_CATEGORY_ID, catalogId)
-            bundle.putString(EntranceConsts.KEY_CATEGORY_TITLE, catalogTitle)
+            bundle.putString(EntranceConsts.KEY_PAGE_ID, catalogId)
+            bundle.putString(EntranceConsts.KEY_PAGE_NAME, catalogTitle)
             bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance)
             return getTargetIntent(context, CategoryV2Activity::class.java, CategoryV2Fragment::class.java, bundle)
         }

app/src/main/java/com/gh/gamecenter/category2/CategoryV2Adapter.kt

@@ -1,6 +1,7 @@
 package com.gh.gamecenter.category2
 
 import android.content.Context
+import android.graphics.Typeface
 import android.view.View
 import android.view.ViewGroup
 import com.gh.gamecenter.common.base.BaseRecyclerViewHolder
@@ -13,11 +14,13 @@ import com.lightgame.adapter.BaseRecyclerAdapter
 
 class CategoryV2Adapter(
     context: Context,
-    private val mFragment: CategoryV2Fragment,
     private val mViewModel: CategoryV2ViewModel,
     private val mList: List<SidebarsEntity.SidebarEntity>
 ) : BaseRecyclerAdapter<CategoryV2Adapter.CategoryV2ItemViewHolder>(context) {
 
+    var selectedPosition = 0
+        private set
+
     override fun getItemCount() = mList.size
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) =
@@ -28,25 +31,35 @@ class CategoryV2Adapter(
             val catalogEntity = mList[position]
             catalogName.text = catalogEntity.name
             recommendTag.goneIf(!catalogEntity.recommended)
-            if (catalogEntity.name == mViewModel.selectedCategoryName) {
+            if (position == selectedPosition) {
                 selectedTag.visibility = View.VISIBLE
-                catalogName.setTextColor(com.gh.gamecenter.common.R.color.text_theme.toColor(mContext))
+                catalogName.setTextColor(com.gh.gamecenter.common.R.color.text_primary.toColor(mContext))
+                catalogName.setTypeface(null, Typeface.BOLD)
                 root.setBackgroundColor(com.gh.gamecenter.common.R.color.ui_surface.toColor(mContext))
             } else {
                 selectedTag.visibility = View.GONE
-                catalogName.setTextColor(com.gh.gamecenter.common.R.color.text_primary.toColor(mContext))
+                catalogName.setTextColor(com.gh.gamecenter.common.R.color.text_tertiary.toColor(mContext))
+                catalogName.setTypeface(null, Typeface.NORMAL)
                 root.setBackgroundColor(com.gh.gamecenter.common.R.color.ui_background.toColor(mContext))
             }
             root.setOnClickListener {
-                if (catalogEntity.name != mViewModel.selectedCategoryName) {
-                    mViewModel.selectedCategoryName = catalogEntity.name
-                    mFragment.changeCategory(position)
+                if (position != selectedPosition) {
                     mViewModel.logClickSide()
-                    notifyDataSetChanged()
+                    mViewModel.selectSidebarsPosition(position)
                 }
             }
         }
     }
 
+    fun selectPosition(newPosition: Int) {
+        if (selectedPosition == newPosition) {
+            return
+        }
+        val oldSelection = selectedPosition
+        selectedPosition = newPosition
+        notifyItemChanged(oldSelection)
+        notifyItemChanged(newPosition)
+    }
+
     class CategoryV2ItemViewHolder(val binding: CategoryV2ItemBinding) : BaseRecyclerViewHolder<Any>(binding.root)
 }

app/src/main/java/com/gh/gamecenter/category2/CategoryV2Fragment.kt

@@ -1,14 +1,14 @@
 package com.gh.gamecenter.category2
 
+import android.content.res.ColorStateList
+import android.graphics.Typeface
 import android.os.Bundle
+import android.view.Gravity
 import android.view.MenuItem
 import android.view.View
-import android.view.ViewGroup
 import androidx.core.os.bundleOf
-import androidx.core.view.GravityCompat
-import androidx.drawerlayout.widget.DrawerLayout
-import androidx.lifecycle.Observer
-import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.core.widget.TextViewCompat
+import androidx.fragment.app.viewModels
 import com.gh.common.util.LogUtils
 import com.gh.gamecenter.R
 import com.gh.gamecenter.SearchActivity
@@ -22,35 +22,49 @@ import com.gh.gamecenter.common.view.FixLinearLayoutManager
 import com.gh.gamecenter.core.utils.PageSwitchDataHelper
 import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.databinding.FragmentCategoryBinding
-import com.gh.gamecenter.entity.CategoryEntity
 import com.gh.gamecenter.entity.SidebarsEntity
+import com.gh.gamecenter.livedata.EventObserver
 import com.gh.gamecenter.wrapper.SearchToolbarTabWrapperViewModel
 
 class CategoryV2Fragment : LazyFragment() {
 
     private var mBinding: FragmentCategoryBinding? = null
-    private var mViewModel: CategoryV2ViewModel? = null
+
+    private val viewModel by viewModels<CategoryV2ViewModel>()
+
     private var mHomeViewModel: SearchToolbarTabWrapperViewModel? = null
     private var mEntity: SidebarsEntity? = null
-    private var mSpecialCatalogFragment: SpecialCatalogFragment? = null
-    private var mCategoryV2ListFragment: CategoryV2ListFragment? = null
     private var mLastPageDataMap: HashMap<String, String>? = null
 
-    private var mCategoryId: String = ""
-    private var mCategoryTitle: String = ""
+    private var pageId: String = ""
+    private var pageName: String = ""
     private var mLastSelectedPosition = -1
 
+    private var searchCategoryPop: SearchCategoryPop? = null
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        pageId = arguments?.getString(EntranceConsts.KEY_PAGE_ID) ?: ""
+        pageName = arguments?.getString(EntranceConsts.KEY_PAGE_NAME) ?: ""
+        mLastPageDataMap = PageSwitchDataHelper.popLastPageData()
         savedInstanceState?.run {
             mLastSelectedPosition = getInt(EntranceConsts.KEY_LAST_SELECTED_POSITION)
         }
+
+        // 除了这里以外，下面还有一个判断是否为首页 tab 栏的赋值
+        var entrance = if (mEntrance.contains("首页")) "首页" else "板块"
+
+        val multiTabNavId = arguments?.getString(EntranceConsts.KEY_MULTI_TAB_NAV_ID, "") ?: ""
+        if (arguments?.getBoolean(EntranceConsts.KEY_IS_HOME) == true && multiTabNavId.isNotEmpty()) {
+            mHomeViewModel =
+                viewModelProviderFromParent(SearchToolbarTabWrapperViewModel.Factory(multiTabNavId, ""), multiTabNavId)
+            entrance = "首页Tab栏"
+        }
+        viewModel.init(entrance)
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
-        mViewModel?.run {
-            outState.putInt(EntranceConsts.KEY_LAST_SELECTED_POSITION, selectedCategoryPosition)
-        }
+        outState.putInt(EntranceConsts.KEY_LAST_SELECTED_POSITION, viewModel.selectedSidebarsPosition.value ?: 0)
         super.onSaveInstanceState(outState)
     }
 
@@ -61,100 +75,40 @@ class CategoryV2Fragment : LazyFragment() {
     }
 
     override fun onFragmentFirstVisible() {
-        mCategoryId = arguments?.getString(EntranceConsts.KEY_CATEGORY_ID) ?: ""
-        mCategoryTitle = arguments?.getString(EntranceConsts.KEY_CATEGORY_TITLE) ?: ""
-        mLastPageDataMap = PageSwitchDataHelper.popLastPageData()
-        mViewModel = viewModelProviderFromParent(CategoryV2ViewModel.Factory(mCategoryId, mCategoryTitle), mCategoryId)
 
-        // 除了这里以外，下面还有一个判断是否为首页 tab 栏的赋值
-        mViewModel?.entrance = if (mEntrance.contains("首页")) "首页" else "板块"
-
-        val multiTabNavId = arguments?.getString(EntranceConsts.KEY_MULTI_TAB_NAV_ID, "") ?: ""
-        if (arguments?.getBoolean(EntranceConsts.KEY_IS_HOME) == true && multiTabNavId.isNotEmpty()) {
-            mHomeViewModel = viewModelProviderFromParent(SearchToolbarTabWrapperViewModel.Factory(multiTabNavId, ""), multiTabNavId)
-            mViewModel?.entrance = "首页Tab栏"
-        }
-        mViewModel?.logAppearance()
+        viewModel.logAppearance()
 
         super.onFragmentFirstVisible()
+
+        viewModel.loadData(pageId, pageName)
     }
 
+
     override fun initRealView() {
         super.initRealView()
         initMenu(R.menu.menu_search)
-        setNavigationTitle(mCategoryTitle)
+        setNavigationTitle(pageName)
 
         mBinding?.run {
-            val width = resources.displayMetrics.widthPixels * 260 / 360
-            drawerLayout.setScrimColor(com.gh.gamecenter.common.R.color.black_alpha_30.toColor())
-            // 关闭手势滑动
-            drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED)
-            drawerLayout.addDrawerListener(object : DrawerLayout.DrawerListener {
-                override fun onDrawerStateChanged(newState: Int) {
-                }
-
-                override fun onDrawerSlide(drawerView: View, slideOffset: Float) {
-                }
-
-                override fun onDrawerClosed(drawerView: View) {
-                    showGuide()
-                }
-
-                override fun onDrawerOpened(drawerView: View) {
-                }
-
-            })
-            directoryContainer.layoutParams.width = width
-            directoryRv.layoutParams.width = width
-
-            // 嵌入在首页时特殊处理
-            if (arguments?.getBoolean(EntranceConsts.KEY_IS_HOME) == true) {
-                root.setBackgroundColor(com.gh.gamecenter.common.R.color.ui_surface.toColor(requireContext()))
-                root.setPadding(0, 8F.dip2px(), 0, 0)
-                directoryRv.isNestedScrollingEnabled = false
-                categoryRv.setBackgroundColor(com.gh.gamecenter.common.R.color.ui_background.toColor(requireContext()))
-            }
+            tvMoreCategory.setTextColor(com.gh.gamecenter.common.R.color.text_primary.toColor(requireContext()))
+            tvTagNumber.typeface =
+                Typeface.createFromAsset(requireContext().assets, Constants.DIN_FONT_PATH)
         }
 
-        mViewModel?.directoriesLiveData?.observeNonNull(viewLifecycleOwner) {
-            initDirectoryView(it)
-        }
-
-        mViewModel?.selectedCountLiveData?.observeNonNull(viewLifecycleOwner) {
-            mBinding?.run {
-                if (it == 0) {
-                    confirmTv.text = "确定"
-                } else {
-                    mViewModel?.run {
-                        if (selectedCategoryName != "全部") {
-                            selectedCategoryName = "全部"
-                            selectedCategoryPosition = if (mEntity?.hasSpecial == true) 1 else 0
-                            categoryRv.adapter?.notifyDataSetChanged()
-                            mCategoryV2ListFragment?.updateSubCategoryId("all")
-                        }
-                    }
-
-                    confirmTv.text = "确定(已选${it})"
-                }
-            }
-        }
-
-        mViewModel?.sidebarsLiveData?.observe(viewLifecycleOwner, Observer {
+        viewModel.sidebarsLiveData.observe(viewLifecycleOwner) { sidebars ->
             mBinding?.run {
                 reuseLoading.root.visibility = View.GONE
-                if (it != null) {
+                if (sidebars != null) {
                     reuseNoConnection.root.visibility = View.GONE
                     categoryContainer.visibility = View.VISIBLE
                     reuseNoneData.root.visibility = View.GONE
-                    mEntity = it
-                    (mEntity!!.sidebars as ArrayList).run {
+                    mEntity = sidebars
+                    (sidebars.sidebars as ArrayList).run {
                         val allEntity = SidebarsEntity.SidebarEntity(name = "全部", categoryId = "all")
-                        if (mEntity!!.hasSpecial) {
+                        add(0, allEntity)
+                        if (sidebars.hasSpecial) {
                             val specialEntity = SidebarsEntity.SidebarEntity(name = "精选")
-                            add(0, specialEntity)
-                            add(1, allEntity)
-                        } else {
-                            add(0, allEntity)
+                            add(1, specialEntity)
                         }
                     }
                     initView()
@@ -165,12 +119,70 @@ class CategoryV2Fragment : LazyFragment() {
                     reuseNoConnection.root.setOnClickListener {
                         reuseNoConnection.root.visibility = View.GONE
                         reuseLoading.root.visibility = View.VISIBLE
-                        mViewModel?.getSidebars()
-                        mViewModel?.getCategoryDirectories()
+                        viewModel.loadData(pageId, pageName)
                     }
                 }
             }
-        })
+        }
+
+        viewModel.directoriesLiveData.observe(viewLifecycleOwner) {
+            searchCategoryPop?.setData(it)
+        }
+
+        viewModel.selectedSubCategories.observe(viewLifecycleOwner) { selectedList ->
+            searchCategoryPop?.updateCategorySelected(selectedList)
+            updateMoreCategory(selectedList.size)
+        }
+
+        viewModel.selectedSidebarsPosition.observe(viewLifecycleOwner) {
+            mLastSelectedPosition = it
+            onSelectedPositionChanged(it)
+
+            val adapter = mBinding?.categoryRv?.adapter
+            if (adapter is CategoryV2Adapter) {
+                adapter.selectPosition(it)
+            }
+        }
+
+        viewModel.notifySubCategorySelected.observe(
+            viewLifecycleOwner,
+            EventObserver {
+                searchCategoryPop?.notifyItemSelectedChanged(it)
+            })
+    }
+
+    private fun createSearchPop(isAutoRequestFocus: Boolean): SearchCategoryPop {
+        val height = mBinding!!.root.height
+        return SearchCategoryPop.newInstance(requireContext(), height, isAutoRequestFocus, pageId, pageName).apply {
+            val data = viewModel.directoriesLiveData.value ?: listOf()
+            setData(data)
+            val selectedList = viewModel.selectedSubCategories.value
+            updateCategorySelected(selectedList)
+            setOnSearchCategoryListener(object : SearchCategoryPop.OnSearchCategoryListener {
+                override fun isEnableSelected(): Boolean {
+                    val size = viewModel.selectedSubCategories.value?.size ?: 0
+                    return size < 5
+                }
+
+                override fun onItemSelected(selected: CategoryV2ViewModel.SelectedTags) {
+                    viewModel.addSubCategorySelected(selected)
+                }
+
+                override fun onItemRemoved(parentId: String, subCategoryId: String) {
+                    viewModel.removeSubCategorySelected(parentId, subCategoryId, "全部游戏")
+                }
+
+                override fun onResetSelected() {
+                    viewModel.clearSelectedTag()
+                    viewModel.updateGameFiltered()
+                }
+
+                override fun onSubmit() {
+                    viewModel.logClickDetermine()
+                }
+
+            })
+        }
     }
 
     fun removeGuide() {
@@ -181,15 +193,7 @@ class CategoryV2Fragment : LazyFragment() {
     }
 
     private fun showGuide() {
-        if (!isAdded) return
         mBinding?.run {
-            val isShow = SPUtils.getBoolean(Constants.SP_SHOW_CATEGORY_GUIDE)
-            if (isShow) return
-
-            guideContainer.layoutParams = (guideContainer.layoutParams as ViewGroup.MarginLayoutParams).apply {
-                val screenWidth = resources.displayMetrics.widthPixels
-                leftMargin = screenWidth * 66F.dip2px() / 360F.dip2px()
-            }
             guideContainer.visibility = View.VISIBLE
 
             postDelayedRunnable({
@@ -204,7 +208,7 @@ class CategoryV2Fragment : LazyFragment() {
     override fun onMenuItemClick(menuItem: MenuItem?) {
         menuItem?.run {
             if (itemId == R.id.menu_search) {
-                LogUtils.uploadSearchGame("access_to_search", mCategoryTitle, "", "")
+                LogUtils.uploadSearchGame("access_to_search", pageName, "", "")
                 val intent = SearchActivity.getIntent(
                     requireContext(),
                     false,
@@ -217,63 +221,64 @@ class CategoryV2Fragment : LazyFragment() {
         }
     }
 
-    private fun initDirectoryView(list: List<CategoryEntity>) {
-        mBinding?.run {
-            mViewModel?.run {
-                if (directoryRv.adapter != null) {
-                    (directoryRv.adapter as? CategoryDirectoryAdapter)?.setListData(list)
-                } else {
-                    directoryRv.layoutManager = FixLinearLayoutManager(requireContext())
-                    directoryRv.adapter = CategoryDirectoryAdapter(
-                        requireContext(),
-                        this,
-                        list
-                    )
-                }
-            }
-
-            resetTv.setOnClickListener {
-                mViewModel?.logClickReset("全部类别")
-                confirmTv.text = "确定"
-                mViewModel?.resetDirectoryList()
-                mCategoryV2ListFragment?.changeCategoryTab()
-            }
-
-            confirmTv.setOnClickListener {
-                mViewModel?.logClickDetermine()
-                drawerLayout.closeDrawer(GravityCompat.START)
-            }
-        }
-    }
-
     private fun initView() {
-        if (mEntity?.sidebars?.isNullOrEmpty() == true || mViewModel == null) return
+        if (mEntity?.sidebars.isNullOrEmpty()) return
         initSelectedCategory()
         initCategoryRv()
-        initContentFragment()
+
+        mBinding?.run {
+
+            vSearchCategory.setOnClickListener {
+                SensorsBridge.logClassificationSearch(pageId, pageName)
+                removeGuide()
+                showSearchPop(true)
+            }
+
+            vMoreCategory.setOnClickListener {
+                removeGuide()
+                showSearchPop(false)
+            }
+        }
+
+        val isShow = SPUtils.getBoolean(Constants.SP_SHOW_CATEGORY_GUIDE)
+        if (!isShow) {
+            postDelayedRunnable({
+                showSearchPop(false)
+                searchCategoryPop?.setOnDismissListener {
+                    showGuide()
+                }
+            }, 200)
+        }
+
+    }
+
+    private fun showSearchPop(isAutoRequestFocus: Boolean) {
+        mBinding?.run {
+            val location = IntArray(2)
+            vSearchCategory.getLocationOnScreen(location)
+
+            val popTop = location[1] - 8F.dip2px()
+            searchCategoryPop = createSearchPop(isAutoRequestFocus)
+            searchCategoryPop?.showAtLocation(vSearchCategory, Gravity.TOP, 0, popTop)
+        }
     }
 
     private fun initSelectedCategory() {
-        mEntity?.run {
-            mViewModel?.run {
-                if (mLastSelectedPosition != -1) {
-                    selectedCategoryPosition = mLastSelectedPosition
-                    selectedCategoryName = sidebars[mLastSelectedPosition].name
-                } else {
-                    selectedCategoryPosition = 0
-                    selectedCategoryName = sidebars[0].name
-                }
-            }
+        if (mLastSelectedPosition != -1) {
+            viewModel.selectSidebarsPosition(mLastSelectedPosition)
+        } else {
+            // 默认选中第 0 个 位置
+            viewModel.selectSidebarsPosition(0)
         }
+
     }
 
     private fun initCategoryRv() {
         mEntity?.run {
-            mViewModel?.run {
+            viewModel.run {
                 mBinding?.categoryRv?.layoutManager = FixLinearLayoutManager(requireContext())
                 mBinding?.categoryRv?.adapter = CategoryV2Adapter(
                     requireContext(),
-                    this@CategoryV2Fragment,
                     this,
                     sidebars
                 )
@@ -281,226 +286,93 @@ class CategoryV2Fragment : LazyFragment() {
         }
     }
 
-    private fun initContentFragment() {
-        mEntity?.apply {
-            mViewModel?.apply {
-                if (hasSpecial && selectedCategoryPosition == 0) {
-                    initSpecialCatalogFragment()
-                } else {
-                    initCategoryV2ListFragment()
+    private fun onSelectedPositionChanged(position: Int) {
+        mEntity?.run {
+            viewModel.run {
+                clearSelectedTag()
+                childFragmentManager.fragments.find { it.isAdded }
+                val targetFragment =
+                    if (hasSpecial && position == 1) {
+                        val fragment = childFragmentManager.findFragmentByTag(SpecialCatalogFragment::class.java.name)
+                            ?: SpecialCatalogFragment()
+                        fragment.arguments = bundleOf(
+                            EntranceConsts.KEY_IS_CATEGORY_V2 to true,
+                            EntranceConsts.KEY_CATALOG_ID to pageId,
+                            EntranceConsts.KEY_CATALOG_TITLE to pageName,
+                            EntranceConsts.KEY_EXPOSURE_SOURCE_LIST to arguments?.getParcelableArrayList<ExposureSource>(
+                                EntranceConsts.KEY_EXPOSURE_SOURCE_LIST
+                            ),
+                            EntranceConsts.KEY_LAST_PAGE_DATA to mLastPageDataMap
+                        )
+                        fragment
 
-                    // 第一次点"全部"tab展开全部类别选择框
-                    // 加延迟是为了防止卡顿
-                    if (SPUtils.getBoolean(Constants.SP_FIRST_ENTER_CATEGORY_V2, true)) {
-                        SPUtils.setBoolean(Constants.SP_FIRST_ENTER_CATEGORY_V2, false)
-                        mBinding?.drawerLayout?.postDelayed({
-                            tryCatchInRelease { openDrawer() }
-                        }, 500L)
+                    } else {
+                        val fragment = (childFragmentManager.findFragmentByTag(CategoryV2ListFragment::class.java.name)
+                            ?: CategoryV2ListFragment())
+                        fragment.arguments = bundleOf(
+                            EntranceConsts.KEY_PAGE_ID to id,
+                            EntranceConsts.KEY_PAGE_NAME to pageName,
+                            EntranceConsts.KEY_EXPOSURE_SOURCE_LIST to arguments?.getParcelableArrayList<ExposureSource>(
+                                EntranceConsts.KEY_EXPOSURE_SOURCE_LIST
+                            ),
+                            EntranceConsts.KEY_LAST_PAGE_DATA to mLastPageDataMap
+                        )
+                        fragment
                     }
-                }
-            }
-        }
-    }
 
-    private fun initSpecialCatalogFragment() {
-        mEntity?.run {
-            mSpecialCatalogFragment = childFragmentManager
-                .findFragmentByTag(SpecialCatalogFragment::class.java.name)
-                    as? SpecialCatalogFragment ?: SpecialCatalogFragment()
-            mSpecialCatalogFragment?.arguments = bundleOf(
-                EntranceConsts.KEY_IS_CATEGORY_V2 to true,
-                EntranceConsts.KEY_CATALOG_ID to id,
-                EntranceConsts.KEY_CATALOG_TITLE to mCategoryTitle,
-                EntranceConsts.KEY_EXPOSURE_SOURCE_LIST to arguments?.getParcelableArrayList<ExposureSource>(
-                    EntranceConsts.KEY_EXPOSURE_SOURCE_LIST
-                ),
-                EntranceConsts.KEY_LAST_PAGE_DATA to mLastPageDataMap
-            )
-            childFragmentManager
-                .beginTransaction()
-                .replace(
-                    R.id.gamesContainer,
-                    mSpecialCatalogFragment!!,
-                    SpecialCatalogFragment::class.java.name
-                )
-                .commitAllowingStateLoss()
-        }
-    }
-
-    private fun initCategoryV2ListFragment() {
-        mEntity?.run {
-            mViewModel?.run {
-                mCategoryV2ListFragment = childFragmentManager
-                    .findFragmentByTag(CategoryV2ListFragment::class.java.name)
-                        as? CategoryV2ListFragment ?: CategoryV2ListFragment()
-                mCategoryV2ListFragment?.arguments = bundleOf(
-                    EntranceConsts.KEY_CATEGORY_ID to id,
-                    EntranceConsts.KEY_SUB_CATEGORY_ID to sidebars[selectedCategoryPosition].categoryId,
-                    EntranceConsts.KEY_CATEGORY_TITLE to mCategoryTitle,
-                    EntranceConsts.KEY_EXPOSURE_SOURCE_LIST to arguments?.getParcelableArrayList<ExposureSource>(
-                        EntranceConsts.KEY_EXPOSURE_SOURCE_LIST
-                    ),
-                    EntranceConsts.KEY_LAST_PAGE_DATA to mLastPageDataMap
-                )
                 childFragmentManager
                     .beginTransaction()
-                    .replace(
-                        R.id.gamesContainer,
-                        mCategoryV2ListFragment!!,
-                        CategoryV2ListFragment::class.java.name
-                    )
+                    .replace(R.id.gamesContainer, targetFragment, targetFragment::class.java.name)
                     .commitAllowingStateLoss()
             }
         }
     }
 
-    fun changeCategory(position: Int) {
-        mEntity?.run {
-            mViewModel?.run {
-                resetDirectoryList()
-
-                if (hasSpecial) {
-                    if (selectedCategoryPosition == 0) {
-                        mCategoryV2ListFragment = childFragmentManager
-                            .findFragmentByTag(CategoryV2ListFragment::class.java.name)
-                                as? CategoryV2ListFragment ?: CategoryV2ListFragment()
-                        mCategoryV2ListFragment?.arguments = bundleOf(
-                            EntranceConsts.KEY_CATEGORY_ID to id,
-                            EntranceConsts.KEY_SUB_CATEGORY_ID to sidebars[position].categoryId,
-                            EntranceConsts.KEY_CATALOG_TITLE to mCategoryTitle,
-                            EntranceConsts.KEY_EXPOSURE_SOURCE_LIST to arguments?.getParcelableArrayList<ExposureSource>(
-                                EntranceConsts.KEY_EXPOSURE_SOURCE_LIST
-                            ),
-                            EntranceConsts.KEY_LAST_PAGE_DATA to mLastPageDataMap
-                        )
-                        childFragmentManager
-                            .beginTransaction()
-                            .replace(
-                                R.id.gamesContainer,
-                                mCategoryV2ListFragment!!,
-                                CategoryV2ListFragment::class.java.name
-                            )
-                            .commitAllowingStateLoss()
-                    } else {
-                        if (position == 0) {
-                            removeGuide()
-
-                            mSpecialCatalogFragment = childFragmentManager
-                                .findFragmentByTag(SpecialCatalogFragment::class.java.name)
-                                    as? SpecialCatalogFragment ?: SpecialCatalogFragment()
-                            mSpecialCatalogFragment?.arguments = bundleOf(
-                                EntranceConsts.KEY_IS_CATEGORY_V2 to true,
-                                EntranceConsts.KEY_CATALOG_ID to id,
-                                EntranceConsts.KEY_CATALOG_TITLE to mCategoryTitle,
-                                EntranceConsts.KEY_EXPOSURE_SOURCE_LIST to arguments?.getParcelableArrayList<ExposureSource>(
-                                    EntranceConsts.KEY_EXPOSURE_SOURCE_LIST
-                                ),
-                                EntranceConsts.KEY_LAST_PAGE_DATA to mLastPageDataMap
-                            )
-                            childFragmentManager
-                                .beginTransaction()
-                                .replace(
-                                    R.id.gamesContainer,
-                                    mSpecialCatalogFragment!!,
-                                    SpecialCatalogFragment::class.java.name
-                                )
-                                .commitAllowingStateLoss()
-                        } else {
-                            if (mCategoryV2ListFragment?.isStateSaved == false) {
-                                mCategoryV2ListFragment?.arguments = bundleOf(
-                                    EntranceConsts.KEY_CATEGORY_ID to id,
-                                    EntranceConsts.KEY_SUB_CATEGORY_ID to sidebars[position].categoryId,
-                                    EntranceConsts.KEY_CATALOG_TITLE to mCategoryTitle,
-                                    EntranceConsts.KEY_EXPOSURE_SOURCE_LIST to arguments?.getParcelableArrayList<ExposureSource>(
-                                        EntranceConsts.KEY_EXPOSURE_SOURCE_LIST
-                                    ),
-                                    EntranceConsts.KEY_LAST_PAGE_DATA to mLastPageDataMap
-                                )
-                            }
-                            mCategoryV2ListFragment?.changeCategoryTab(sidebars[position].categoryId)
-                        }
-                    }
-
-                    // 第一次点"全部"tab展开全部类别选择框
-                    // 加延迟是为了防止卡顿
-                    if (position == 1 && SPUtils.getBoolean(Constants.SP_FIRST_ENTER_CATEGORY_V2, true)) {
-                        SPUtils.setBoolean(Constants.SP_FIRST_ENTER_CATEGORY_V2, false)
-                        mBinding?.drawerLayout?.postDelayed({
-                            tryCatchInRelease { openDrawer() }
-                        }, 200L)
-                    }
-                } else {
-                    if (mCategoryV2ListFragment?.isStateSaved == false) {
-                        mCategoryV2ListFragment?.arguments = bundleOf(
-                            EntranceConsts.KEY_CATEGORY_ID to id,
-                            EntranceConsts.KEY_SUB_CATEGORY_ID to sidebars[position].categoryId,
-                            EntranceConsts.KEY_CATALOG_TITLE to mCategoryTitle,
-                            EntranceConsts.KEY_EXPOSURE_SOURCE_LIST to arguments?.getParcelableArrayList<ExposureSource>(
-                                EntranceConsts.KEY_EXPOSURE_SOURCE_LIST
-                            ),
-                            EntranceConsts.KEY_LAST_PAGE_DATA to mLastPageDataMap
-                        )
-                    }
-                    mCategoryV2ListFragment?.changeCategoryTab(sidebars[position].categoryId)
-                }
-                selectedCategoryPosition = position
-            }
-        }
-    }
-
-    fun openDirectoryLayout() {
+    private fun updateMoreCategory(size: Int) {
         mBinding?.run {
-            var i = 0
-            mViewModel?.run {
-                mEntity?.run {
-                    val sidebar = sidebars[selectedCategoryPosition]
-                    if (sidebar.name != "全部") {
-                        directories.forEachIndexed { index, entity ->
-                            if (sidebar.type == "level_one") {
-                                if (sidebar.categoryId == entity.id) {
-                                    i = index
-                                    return@run
-                                }
-                            } else {
-                                if (sidebar.parentId == entity.id) {
-                                    i = index
-                                    return@run
-                                }
-                            }
-                        }
-                    } else if (sidebar.name == "全部" && selectedCategoryList.isNotEmpty()) {
-                        i = selectedCategoryList[0].primaryIndex
-                    }
+            if (size > 0) {
+                vMoreCategory.setBackgroundResource(R.drawable.bg_more_category_filtered)
+                TextViewCompat.setCompoundDrawableTintList(
+                    tvMoreCategory,
+                    ColorStateList.valueOf(com.gh.gamecenter.common.R.color.text_theme.toColor(requireContext()))
+                )
+                tvMoreCategory.setTextColor(com.gh.gamecenter.common.R.color.text_theme.toColor(requireContext()))
+                tvTagNumber.goneIf(false) {
+                    tvTagNumber.text = "$size"
                 }
+            } else {
+                vMoreCategory.setBackgroundResource(R.drawable.bg_more_category_default)
+                TextViewCompat.setCompoundDrawableTintList(
+                    tvMoreCategory,
+                    ColorStateList.valueOf(com.gh.gamecenter.common.R.color.text_primary.toColor(requireContext()))
+                )
+                tvMoreCategory.setTextColor(com.gh.gamecenter.common.R.color.text_primary.toColor(requireContext()))
+                tvTagNumber.goneIf(true)
             }
-            openDrawer()
-            (directoryRv.layoutManager as? LinearLayoutManager)?.scrollToPositionWithOffset(i, 0)
-        }
-    }
-
-    private fun openDrawer() {
-        mBinding?.drawerLayout?.openDrawer(GravityCompat.START)
-
-        mHomeViewModel?.let {
-            mBinding?.directoryContainer?.setPadding(
-                0,
-                0,
-                0,
-                requireContext().resources.getDimension(com.gh.gamecenter.common.R.dimen.main_bottom_tab_height).toInt() - it.appBarOffset
-            )
         }
     }
 
     override fun onDarkModeChanged() {
         super.onDarkModeChanged()
         getItemMenu(R.id.menu_search)?.setIcon(R.drawable.ic_column_search)
-        mBinding?.categoryRv?.adapter?.run {
-            mBinding?.categoryRv?.recycledViewPool?.clear()
-            notifyItemRangeChanged(0, itemCount)
-        }
-        mBinding?.directoryRv?.adapter?.run {
-            mBinding?.directoryRv?.recycledViewPool?.clear()
-            notifyItemRangeChanged(0, itemCount)
+        mBinding?.run {
+            categoryRv.adapter?.run {
+                categoryRv.recycledViewPool.clear()
+                notifyItemRangeChanged(0, itemCount, "")
+            }
+
+            val selectedTagsSize = viewModel.selectedSubCategories.value?.size ?: 0
+            updateMoreCategory(selectedTagsSize)
+
+            context?.let {
+                ivSearchCategory.imageTintList =
+                    ColorStateList.valueOf(com.gh.gamecenter.common.R.color.text_instance.toColor(it))
+            }
         }
     }
+
+    companion object {
+
+        private const val SPECIAL_CATEGORY_POSITION = 1
+    }
 }

app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListAdapter.kt

@@ -76,8 +76,15 @@ class CategoryV2ListAdapter(
             ItemViewType.GAME_NORMAL -> {
                 CategoryGameItemViewHolder(parent.toBinding())
             }
+
             else -> {
-                FooterViewHolder(mLayoutInflater.inflate(com.gh.gamecenter.common.R.layout.refresh_footerview, parent, false))
+                FooterViewHolder(
+                    mLayoutInflater.inflate(
+                        com.gh.gamecenter.common.R.layout.refresh_footerview,
+                        parent,
+                        false
+                    )
+                )
             }
         }
     }
@@ -94,20 +101,12 @@ class CategoryV2ListAdapter(
             holder.bindGameItem(gameEntity)
             holder.initServerType(gameEntity)
 
-            val categoryTitle = mCategoryViewModel.categoryTitle
-            val selectedCategoryName = mCategoryViewModel.selectedCategoryName
-            val builder = StringBuilder()
-            mCategoryViewModel.selectedCategoryList.run {
-                forEachIndexed { index, entity ->
-                    builder.append(entity.name)
-                    if (index != size - 1) {
-                        builder.append("_")
-                    }
-                }
-            }
-            val selectedSubCatalogName = builder.toString()
-            val sortType = mViewModel.sortType.value
-            val sortSize = mViewModel.sortSize.text
+            val categoryTitle = mCategoryViewModel.pageName
+            val selectedCategoryName = mCategoryViewModel.selectedSidebarsName
+            val selectedSubCatalogName =
+                mCategoryViewModel.selectedSubCategories.value?.joinToString("-") { it.category.name ?: "" }
+            val sortType = mViewModel.gameFiltered.sortType.value
+            val sortSize = mViewModel.gameFiltered.size.text
 
             val exposureSources = ArrayList<ExposureSource>()
             if (!mViewModel.exposureSourceList.isNullOrEmpty()) {
@@ -172,8 +171,13 @@ class CategoryV2ListAdapter(
             ) {
                 val trackEvent = JSONObject()
                 try {
-                    trackEvent.put("navigation_bar_name", mCategoryViewModel.selectedCategoryName)
-                    trackEvent.put("game_tag", mCategoryViewModel.selectedCategoryList.map { it.name })
+                    trackEvent.put("navigation_bar_name", mCategoryViewModel.selectedSidebarsName)
+                    trackEvent.put(
+                        "game_tag",
+                        (mCategoryViewModel.selectedSubCategories.value ?: listOf())
+                            .map {
+                                it.category.name
+                            })
                     trackEvent.put("game_status", gameEntity.category)
                     trackEvent.put(
                         "inclusion_size",
@@ -266,18 +270,24 @@ class CategoryV2ListAdapter(
                     binding.gameKaifuType.visibility = View.GONE
                     binding.gameKaifuType.text = ""
                 }
+
                 serverLabel != null -> {
                     binding.gameKaifuType.visibility = View.VISIBLE
                     binding.gameKaifuType.text = serverLabel.value
                     if (gameEntity.isUseDefaultServerStyle()) {
                         binding.gameKaifuType.background =
                             com.gh.gamecenter.feature.R.drawable.server_label_default_bg.toDrawable(binding.root.context)
-                        binding.gameKaifuType.setTextColor(com.gh.gamecenter.common.R.color.text_secondary.toColor(binding.root.context))
+                        binding.gameKaifuType.setTextColor(
+                            com.gh.gamecenter.common.R.color.text_secondary.toColor(
+                                binding.root.context
+                            )
+                        )
                     } else {
                         binding.gameKaifuType.background = DrawableView.getServerDrawable(serverLabel.color)
                         binding.gameKaifuType.setTextColor(com.gh.gamecenter.common.R.color.white.toColor(binding.root.context))
                     }
                 }
+
                 else -> binding.gameKaifuType.visibility = View.GONE
             }
 

app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListFragment.kt

@@ -2,9 +2,10 @@ package com.gh.gamecenter.category2
 
 import android.os.Bundle
 import android.view.View
-import android.view.ViewGroup
+import androidx.fragment.app.viewModels
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import com.ethanhua.skeleton.Skeleton
-import com.gh.gamecenter.common.constant.Constants
 import com.gh.common.exposure.ExposureListener
 import com.gh.common.util.DialogUtils
 import com.gh.common.view.CategoryFilterView
@@ -13,16 +14,17 @@ import com.gh.common.xapk.XapkUnzipStatus
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.baselist.ListFragment
+import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.constant.EntranceConsts
-import com.gh.gamecenter.common.utils.*
+import com.gh.gamecenter.common.utils.goneIf
+import com.gh.gamecenter.common.utils.observeNonNull
+import com.gh.gamecenter.common.utils.toColor
+import com.gh.gamecenter.common.utils.viewModelProvider
 import com.gh.gamecenter.databinding.FragmentCategoryListBinding
-import com.gh.gamecenter.databinding.LayoutSelectedCategoryBinding
-import com.gh.gamecenter.entity.CategoryEntity
-import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.entity.SubjectSettingEntity
 import com.gh.gamecenter.eventbus.EBDownloadStatus
 import com.gh.gamecenter.eventbus.EBPackage
-import com.google.android.flexbox.FlexboxLayout
+import com.gh.gamecenter.feature.entity.GameEntity
 import com.lightgame.download.DataWatcher
 import com.lightgame.download.DownloadEntity
 import org.greenrobot.eventbus.Subscribe
@@ -30,13 +32,18 @@ import org.greenrobot.eventbus.ThreadMode
 
 class CategoryV2ListFragment : ListFragment<GameEntity, CategoryV2ListViewModel>() {
 
-    private var mCategoryId: String = ""
-    private var mSubCategoryId: String = ""
-    private var mCategoryTitle: String = ""
+    private var pageId: String = ""
+    private var pageName: String = ""
+    private val parentViewModel by viewModels<CategoryV2ViewModel>(
+        ownerProducer = { parentFragment ?: this }
+    )
+
+    override fun isAutomaticLoad(): Boolean {
+        return false
+    }
+
     private var mAdapter: CategoryV2ListAdapter? = null
-    private var mSelectedViewList = ArrayList<View>()
     private var mBinding: FragmentCategoryListBinding? = null
-    private var mCategoryViewModel: CategoryV2ViewModel? = null
     private var mLastPageDataMap: HashMap<String, String>? = null
     private val mDataWatcher = object : DataWatcher() {
         override fun onDataChanged(downloadEntity: DownloadEntity) {
@@ -52,6 +59,12 @@ class CategoryV2ListFragment : ListFragment<GameEntity, CategoryV2ListViewModel>
         }
     }
 
+    private val selectedTagsAdapter by lazy {
+        SelectedTagsAdapter {
+            parentViewModel.removeSubCategorySelected(it.parentId, it.category.id, "游戏列表")
+        }
+    }
+
     override fun getLayoutId() = 0
 
     override fun getInflatedLayout() =
@@ -60,8 +73,7 @@ class CategoryV2ListFragment : ListFragment<GameEntity, CategoryV2ListViewModel>
     override fun provideListViewModel() =
         viewModelProvider<CategoryV2ListViewModel>(
             CategoryV2ListViewModel.Factory(
-                mCategoryId,
-                mSubCategoryId,
+                pageId,
                 arguments?.getParcelableArrayList(EntranceConsts.KEY_EXPOSURE_SOURCE_LIST)
             )
         )
@@ -70,12 +82,7 @@ class CategoryV2ListFragment : ListFragment<GameEntity, CategoryV2ListViewModel>
         ?: CategoryV2ListAdapter(
             requireContext(),
             mListViewModel ?: provideListViewModel(),
-            mCategoryViewModel ?: viewModelProviderFromParent(
-                CategoryV2ViewModel.Factory(
-                    mCategoryId,
-                    mCategoryTitle
-                ), mCategoryId
-            ),
+            parentViewModel,
             mEntrance,
             mLastPageDataMap
         ).apply { mAdapter = this }
@@ -83,12 +90,10 @@ class CategoryV2ListFragment : ListFragment<GameEntity, CategoryV2ListViewModel>
     override fun getItemDecoration() = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        mCategoryId = arguments?.getString(EntranceConsts.KEY_CATEGORY_ID) ?: ""
-        mSubCategoryId = arguments?.getString(EntranceConsts.KEY_SUB_CATEGORY_ID) ?: ""
-        mCategoryTitle = arguments?.getString(EntranceConsts.KEY_CATEGORY_TITLE) ?: ""
+        pageId = arguments?.getString(EntranceConsts.KEY_PAGE_ID) ?: ""
+        pageName = arguments?.getString(EntranceConsts.KEY_PAGE_NAME) ?: ""
         mLastPageDataMap = arguments?.getSerializable(EntranceConsts.KEY_LAST_PAGE_DATA) as? HashMap<String, String>
-        mCategoryViewModel =
-            viewModelProviderFromParent(CategoryV2ViewModel.Factory(mCategoryId, mCategoryTitle), mCategoryId)
+
         mEntrance = arguments?.getString(EntranceConsts.KEY_ENTRANCE) ?: Constants.ENTRANCE_UNKNOWN
 
         super.onCreate(savedInstanceState)
@@ -104,19 +109,8 @@ class CategoryV2ListFragment : ListFragment<GameEntity, CategoryV2ListViewModel>
 
         initFilterView()
 
-        mListViewModel?.refresh?.observeNonNull(viewLifecycleOwner) { onRefresh() }
-        mCategoryViewModel?.run {
-            categoryPositionLiveData.observeNonNull(viewLifecycleOwner) {
-                directories[it.first].data?.get(it.second)?.run {
-                    mBinding?.selectedCategoryContainer?.visibility = View.VISIBLE
-
-                    if (selected) {
-                        addCategory(this)
-                    } else {
-                        removeCategory(this)
-                    }
-                }
-            }
+        mListViewModel?.refresh?.observeNonNull(viewLifecycleOwner) {
+            onRefresh()
         }
 
         mListRv.addOnScrollListener(ExposureListener(this, provideListAdapter()))
@@ -132,19 +126,40 @@ class CategoryV2ListFragment : ListFragment<GameEntity, CategoryV2ListViewModel>
             .show()
 
         mBinding?.reuseNoneData?.reuseResetLoadTv?.setOnClickListener {
-            mCategoryViewModel?.run {
+            // 重试时，
+            // 清空所有筛选条件
+            with(parentViewModel) {
                 logClickReset("游戏列表")
-                resetDirectoryList()
+                clearSelectedTag()
+                // 移除大小限制
+                mBinding?.filterContainer?.resetSortSize()
+                val size = SubjectSettingEntity.Size()
+                updateGameFiltered(size)
+            }
+
+        }
+
+        with(parentViewModel) {
+            gameFiltered.observe(viewLifecycleOwner) {
+                mListViewModel.updateSortConfig(it)
+            }
+
+            selectedSubCategories.observe(viewLifecycleOwner) {
+                updateSelectedTags(it)
             }
-            resetSortSize()
-            changeCategoryTab()
-//            openDirectoryLayout()
         }
     }
 
-    private fun resetSortSize() {
-        mBinding?.filterContainer?.resetSortSize()
-        mListViewModel?.sortSize = SubjectSettingEntity.Size(min = -1, max = -1, text = "全部大小")
+    private fun updateSelectedTags(selectedTags: List<CategoryV2ViewModel.SelectedTags>) {
+        mBinding?.run {
+            flTagsContainer.goneIf(selectedTags.isEmpty()) {
+                if (rvTags.adapter == null) {
+                    rvTags.layoutManager = LinearLayoutManager(requireContext(), RecyclerView.HORIZONTAL, false)
+                    rvTags.adapter = selectedTagsAdapter
+                }
+                selectedTagsAdapter.submitList(selectedTags)
+            }
+        }
 
     }
 
@@ -154,22 +169,19 @@ class CategoryV2ListFragment : ListFragment<GameEntity, CategoryV2ListViewModel>
 
             setOnConfigSetupListener(object : CategoryFilterView.OnCategoryFilterSetupListener {
                 override fun onSetupSortSize(sortSize: SubjectSettingEntity.Size) {
-                    mListViewModel?.updateSortConfig(sortSize = sortSize)
+                    parentViewModel.updateGameFiltered(size = sortSize)
                 }
 
                 override fun onSetupSortType(sortType: CategoryFilterView.SortType) {
-                    mListViewModel?.updateSortConfig(sortType = sortType)
+                    parentViewModel.updateGameFiltered(sortType = sortType)
                 }
 
-                override fun onSetupSortCategory() {
-                    openDirectoryLayout()
+                override fun getPopHeight(): Int {
+                    return (mBinding?.root?.height ?: 0) - (mBinding?.flTagsContainer?.height ?: 0)
                 }
             })
 
             setOnFilterClickListener(object : CategoryFilterView.OnFilterClickListener {
-                override fun onCategoryClick() {
-                    removeGuide()
-                }
 
                 override fun onTypeClick() {
                     removeGuide()
@@ -183,101 +195,6 @@ class CategoryV2ListFragment : ListFragment<GameEntity, CategoryV2ListViewModel>
         }
     }
 
-    fun updateSubCategoryId(id: String) {
-        mSubCategoryId = id
-    }
-
-    fun changeCategoryTab(categoryId: String? = null) {
-        mSelectedViewList.clear()
-        mBinding?.selectedCategoryContainer?.run {
-            removeAllViews()
-            visibility = View.GONE
-        }
-        if (categoryId != null) mSubCategoryId = categoryId
-        mListViewModel?.updateSortConfig(categoryIds = mSubCategoryId)
-    }
-
-    private fun addCategory(entity: CategoryEntity) {
-        addCategoryView(entity)
-        mCategoryViewModel?.selectedCategoryList?.add(entity)
-        updateCategoryGame()
-    }
-
-    private fun removeCategory(entity: CategoryEntity) {
-        mCategoryViewModel?.selectedCategoryList?.run {
-            if (isEmpty()) return
-
-            removeCategoryView(entity.name ?: "")
-            remove(entity)
-            if (size == 0) {
-                mBinding?.selectedCategoryContainer?.visibility = View.GONE
-                mListViewModel?.updateSortConfig(categoryIds = mSubCategoryId)
-            } else {
-                updateCategoryGame()
-            }
-        }
-    }
-
-    private fun addCategoryView(entity: CategoryEntity) {
-        val binding = LayoutSelectedCategoryBinding.inflate(layoutInflater).apply {
-            val params =
-                FlexboxLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT)
-            params.setMargins(0, 8F.dip2px(), 8F.dip2px(), 0)
-            params.height = 24F.dip2px()
-            root.layoutParams = params
-
-            name.text = entity.name
-            root.setOnClickListener {
-                removeCategoryAndNotify(entity)
-            }
-        }
-
-        mSelectedViewList.add(binding.root)
-        mBinding?.selectedCategoryContainer?.addView(binding.root)
-    }
-
-    private fun removeCategoryView(categoryName: String) {
-        mCategoryViewModel?.selectedCategoryList?.run {
-            var i = 0
-            forEachIndexed { index, categoryEntity ->
-                if (categoryName == categoryEntity.name) {
-                    i = index
-                }
-            }
-
-            if (i < mSelectedViewList.size) {
-                mBinding?.selectedCategoryContainer?.removeView(mSelectedViewList[i])
-                mSelectedViewList.removeAt(i)
-            }
-        }
-    }
-
-    private fun removeCategoryAndNotify(entity: CategoryEntity) {
-        removeCategory(entity)
-        entity.selected = false
-        mCategoryViewModel?.run {
-            if (selectedCount > 0) {
-                selectedCount--
-                postSelectedCount()
-                postCategoryDirectoryList()
-                logClickClassificationDelete(entity.primaryIndex, entity.name ?: "", "游戏列表")
-            }
-        }
-    }
-
-    private fun updateCategoryGame() {
-        mCategoryViewModel?.selectedCategoryList?.run {
-            val categoryIds = StringBuilder()
-            forEachIndexed { index, s ->
-                categoryIds.append(s.id)
-                if (index != size - 1) {
-                    categoryIds.append("-")
-                }
-            }
-            mListViewModel?.updateSortConfig(categoryIds = categoryIds.toString())
-        }
-    }
-
     private fun removeGuide() {
         (parentFragment as? CategoryV2Fragment)?.removeGuide()
     }
@@ -328,10 +245,6 @@ class CategoryV2ListFragment : ListFragment<GameEntity, CategoryV2ListViewModel>
         }
     }
 
-    fun openDirectoryLayout() {
-        (parentFragment as? CategoryV2Fragment)?.openDirectoryLayout()
-    }
-
     override fun onDarkModeChanged() {
         super.onDarkModeChanged()
         mBinding?.filterContainer?.run {

app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListViewModel.kt

@@ -4,14 +4,13 @@ import android.app.Application
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
-import com.gh.gamecenter.common.entity.ExposureEntity
 import com.gh.common.exposure.ExposureUtils
-import com.gh.gamecenter.core.utils.UrlFilterUtils
 import com.gh.common.view.CategoryFilterView
 import com.gh.gamecenter.common.baselist.ListViewModel
+import com.gh.gamecenter.common.entity.ExposureEntity
 import com.gh.gamecenter.common.exposure.ExposureSource
+import com.gh.gamecenter.core.utils.UrlFilterUtils
 import com.gh.gamecenter.feature.entity.GameEntity
-import com.gh.gamecenter.entity.SubjectSettingEntity
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.halo.assistant.HaloApp
 import io.reactivex.Observable
@@ -20,14 +19,13 @@ import io.reactivex.Single
 class CategoryV2ListViewModel(
     application: Application,
     val categoryId: String,
-    var categoryIds: String,
     var exposureSourceList: List<ExposureSource>?
 ) : ListViewModel<GameEntity, GameEntity>(application) {
 
     val refresh = MutableLiveData<Boolean>()
 
-    var sortType = CategoryFilterView.SortType.RECOMMENDED
-    var sortSize = SubjectSettingEntity.Size()
+    var gameFiltered = CategoryV2ViewModel.GameFiltered()
+        private set
 
     override fun provideDataObservable(page: Int): Observable<List<GameEntity>>? = null
 
@@ -51,52 +49,36 @@ class CategoryV2ListViewModel(
     }
 
     fun updateSortConfig(
-        sortSize: SubjectSettingEntity.Size? = null,
-        sortType: CategoryFilterView.SortType? = null,
-        categoryIds: String? = null
+        gameFiltered: CategoryV2ViewModel.GameFiltered
     ) {
-        when {
-            sortSize != null && sortSize != this.sortSize -> {
-                this.sortSize = sortSize
-                refresh.postValue(true)
-            }
-
-            sortType != null && sortType != this.sortType -> {
-                this.sortType = sortType
-                refresh.postValue(true)
-            }
-
-            categoryIds != null && categoryIds != this.categoryIds -> {
-                this.categoryIds = categoryIds
-                refresh.postValue(true)
-            }
-        }
+        this.gameFiltered = gameFiltered
+        refresh.postValue(true)
     }
 
     private fun getFilter(): String? {
+
         return UrlFilterUtils.getFilterQuery(
-            "category_ids", categoryIds,
-            "min_size", sortSize.min.toString(),
-            "max_size", sortSize.max.toString()
+            "category_ids", gameFiltered.categoryIds.ifBlank { gameFiltered.sidebarCategoryId },
+            "min_size", gameFiltered.size.min.toString(),
+            "max_size", gameFiltered.size.max.toString()
         )
 
     }
 
     private fun getSortType(): String? {
-        return when (sortType) {
+        return when (gameFiltered.sortType) {
             CategoryFilterView.SortType.RECOMMENDED -> "download:-1"
             CategoryFilterView.SortType.NEWEST -> "publish:-1"
             CategoryFilterView.SortType.RATING -> "star:-1"
         }
     }
 
-    class Factory(val categoryId: String, val categoryIds: String, val exposureSourceList: List<ExposureSource>?) :
+    class Factory(val categoryId: String, val exposureSourceList: List<ExposureSource>?) :
         ViewModelProvider.NewInstanceFactory() {
         override fun <T : ViewModel> create(modelClass: Class<T>): T {
             return CategoryV2ListViewModel(
                 HaloApp.getInstance().application,
                 categoryId,
-                categoryIds,
                 exposureSourceList
             ) as T
         }

app/src/main/java/com/gh/gamecenter/category2/CategoryV2ViewModel.kt

@@ -1,160 +1,214 @@
 package com.gh.gamecenter.category2
 
-import android.annotation.SuppressLint
-import android.app.Application
-import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
 import com.gh.common.util.LogUtils
+import com.gh.common.view.CategoryFilterView
+import com.gh.gamecenter.common.retrofit.BiResponse
+import com.gh.gamecenter.common.utils.singleToMain
 import com.gh.gamecenter.entity.CategoryEntity
 import com.gh.gamecenter.entity.SidebarsEntity
-import com.gh.gamecenter.common.retrofit.BiResponse
+import com.gh.gamecenter.entity.SubjectSettingEntity
+import com.gh.gamecenter.livedata.Event
 import com.gh.gamecenter.retrofit.RetrofitManager
-import com.halo.assistant.HaloApp
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
+import io.reactivex.disposables.CompositeDisposable
 
-class CategoryV2ViewModel(
-    application: Application,
-    private val mCategoryId: String,
-    val categoryTitle: String
-) : AndroidViewModel(application) {
+class CategoryV2ViewModel : ViewModel() {
 
+    private val compositeDisposable = CompositeDisposable()
     private val api = RetrofitManager.getInstance().api
-    var sidebarsLiveData = MutableLiveData<SidebarsEntity>()
-    var directories = ArrayList<CategoryEntity>()
+    var sidebarsLiveData = MutableLiveData<SidebarsEntity?>()
     var directoriesLiveData = MutableLiveData<List<CategoryEntity>>()
-    var selectedCount = 0
-    var selectedCountLiveData = MutableLiveData<Int>()
-    var categoryPositionLiveData = MutableLiveData<Pair<Int, Int>>()
 
-    var selectedCategoryName: String = ""
-    var selectedCategoryPosition: Int = 0
-    var selectedCategoryList = ArrayList<CategoryEntity>()
     var entrance: String = ""
+    private var pageId = ""
+    var pageName = ""
+        private set
 
-    init {
-        getSidebars()
-        getCategoryDirectories()
+    fun init(entrance: String) {
+        this.entrance = entrance
     }
 
-    @SuppressLint("CheckResult")
-    fun getSidebars() {
-        api.getSidebars(mCategoryId)
-            .subscribeOn(Schedulers.io())
-            .observeOn(AndroidSchedulers.mainThread())
-            .subscribe(object : BiResponse<SidebarsEntity>() {
-                override fun onSuccess(data: SidebarsEntity) {
-                    sidebarsLiveData.postValue(data)
+    fun loadData(pageId: String, pageName: String) {
+        this.pageId = pageId
+        this.pageName = pageName
+
+        val sidebarsObservable = api.getSidebars(pageId)
+        val directoriesObservable = api.getCategoryDirectories(pageId)
+            .onErrorReturnItem(listOf())
+        sidebarsObservable.zipWith(directoriesObservable) { t1, t2 ->
+            t1 to t2
+        }.compose(singleToMain())
+            .subscribe(object : BiResponse<Pair<SidebarsEntity, List<CategoryEntity>>>() {
+                override fun onSuccess(data: Pair<SidebarsEntity, List<CategoryEntity>>) {
+                    val (sidebarsData, directories) = data
+                    directoriesLiveData.value = directories
+                    sidebarsLiveData.value = sidebarsData
                 }
 
                 override fun onFailure(exception: Exception) {
                     super.onFailure(exception)
                     sidebarsLiveData.postValue(null)
                 }
-            })
+
+            }).let(compositeDisposable::add)
     }
 
-    @SuppressLint("CheckResult")
-    fun getCategoryDirectories() {
-        api.getCategoryDirectories(mCategoryId)
-            .subscribeOn(Schedulers.io())
-            .observeOn(AndroidSchedulers.mainThread())
-            .subscribe(object : BiResponse<List<CategoryEntity>>() {
-                override fun onSuccess(data: List<CategoryEntity>) {
-                    directories = ArrayList(data)
-                    postCategoryDirectoryList()
+    fun clearSelectedTag() {
+        logClickReset("全部类别")
+        val filteredList = _selectedSubCategories.value
+        if (!filteredList.isNullOrEmpty()) {
+            _selectedSubCategories.value = mutableListOf()
+
+            val directories = directoriesLiveData.value ?: return
+            directories.forEach {
+                it.data?.forEach { child ->
+                    child.selected = false
                 }
-            })
-    }
-
-    fun postSelectedCount() {
-        selectedCountLiveData.postValue(selectedCount)
-    }
-
-    fun postCategoryPosition(primaryIndex: Int, subIndex: Int) {
-        categoryPositionLiveData.postValue(Pair(primaryIndex, subIndex))
-    }
-
-    fun postCategoryDirectoryList() {
-        directoriesLiveData.postValue(directories)
-    }
-
-    fun resetDirectoryList() {
-        selectedCount = 0
-        selectedCategoryList.clear()
-        directories.forEach {
-            it.data?.forEach { entity ->
-                entity.selected = false
             }
+            directoriesLiveData.value = directories
         }
-        postSelectedCount()
-        postCategoryDirectoryList()
     }
 
     fun logAppearance() {
-        LogUtils.logCategoryV2AppearanceEvent(entrance, categoryTitle)
+        LogUtils.logCategoryV2AppearanceEvent(entrance, pageName)
     }
 
     fun logClickSide() {
-        LogUtils.logCategoryV2ClickSideEvent(entrance, categoryTitle, selectedCategoryName, selectedCategoryPosition)
+        val sidebars = sidebarsLiveData.value?.sidebars
+        val selectedPosition = selectedSidebarsPosition.value ?: 0
+        val selectedCategoryName = sidebars?.getOrNull(selectedPosition)?.name ?: ""
+        LogUtils.logCategoryV2ClickSideEvent(entrance, pageName, selectedCategoryName, selectedPosition)
     }
 
-    fun logClickClassification(primaryIndex: Int, categoryName: String, position: Int) {
+    private fun logClickClassification(selected: SelectedTags) {
         LogUtils.logCategoryV2ClickClassificationEvent(
             entrance,
-            categoryTitle,
-            selectedCategoryName,
-            directories[primaryIndex].name,
-            categoryName,
-            primaryIndex,
-            position
+            pageName,
+            selectedSidebarsName,
+            selected.parentName,
+            selected.category.name ?: "",
+            selected.parentPosition,
+            selected.position
         )
     }
 
-    fun logClickClassificationDelete(primaryIndex: Int, categoryName: String, location: String) {
+    private fun logClickClassificationDelete(directoryName: String, categoryName: String, location: String) {
         LogUtils.logCategoryV2ClickClassificationDeleteEvent(
             entrance,
-            categoryTitle,
-            directories[primaryIndex].name,
+            pageName,
+            directoryName,
             categoryName,
             location
         )
     }
 
     fun logClickDetermine() {
-        val categoryName = StringBuilder()
-        selectedCategoryList.forEachIndexed { index, s ->
-            categoryName.append(s.name)
-            if (index != selectedCategoryList.size - 1) {
-                categoryName.append("+")
-            }
-        }
-        LogUtils.logCategoryV2ClickDetermineEvent(entrance, categoryTitle, categoryName.toString())
+        val categoryNames = selectedSubCategories.value?.joinToString("+") { it.category.name ?: "" }
+        LogUtils.logCategoryV2ClickDetermineEvent(entrance, pageName, categoryNames ?: "")
     }
 
     fun logClickReset(location: String) {
-        val categoryName = StringBuilder()
-        selectedCategoryList.forEachIndexed { index, s ->
-            categoryName.append(s.name)
-            if (index != selectedCategoryList.size - 1) {
-                categoryName.append("+")
-            }
-        }
-        LogUtils.logCategoryV2ClickResetEvent(entrance, categoryTitle, categoryName.toString(), location)
+        val categoryName = selectedSubCategories.value?.joinToString("+") { it.category.name ?: "" }
+        LogUtils.logCategoryV2ClickResetEvent(entrance, pageName, categoryName ?: "", location)
     }
 
-    class Factory(
-        private val categoryId: String,
-        private val categoryTitle: String
-    ) : ViewModelProvider.NewInstanceFactory() {
-        override fun <T : ViewModel> create(modelClass: Class<T>): T {
-            return CategoryV2ViewModel(
-                HaloApp.getInstance().application,
-                categoryId,
-                categoryTitle
-            ) as T
+    private val _notifySubCategorySelected = MutableLiveData<Event<String>>()
+    val notifySubCategorySelected: LiveData<Event<String>> = _notifySubCategorySelected
+
+    private val _selectedSubCategories = MutableLiveData<List<SelectedTags>>()
+    val selectedSubCategories: LiveData<List<SelectedTags>> = _selectedSubCategories
+    fun addSubCategorySelected(selected: SelectedTags) {
+        val list = _selectedSubCategories.value
+        val newData = if (list == null) {
+            mutableListOf(selected)
+        } else {
+            list + selected
+        }
+        selected.category.selected = true
+        _selectedSubCategories.value = newData
+
+        // 当搜索条件发生变化时，侧边栏默认选中 “全部”
+        selectSidebarsPosition(0, false)
+
+        updateGameFiltered()
+        _notifySubCategorySelected.value = Event(selected.parentId)
+        logClickClassification(selected)
+    }
+
+    fun removeSubCategorySelected(parentId: String, categoryId: String, location: String) {
+        val list = _selectedSubCategories.value ?: return
+        val position = list.indexOfFirst {
+            it.parentId == parentId && categoryId == it.category.id
+        }
+        if (position != -1) {
+            val item = list[position]
+
+            item.category.selected = false
+            _selectedSubCategories.value = list - item
+
+            updateGameFiltered()
+            _notifySubCategorySelected.value = Event(parentId)
+
+            logClickClassificationDelete(item.parentName, item.category.name ?: "", location)
+        }
+
+    }
+
+    private val _selectedSidebarsPosition = MutableLiveData<Int>()
+    val selectedSidebarsPosition: LiveData<Int> = _selectedSidebarsPosition
+    val selectedSidebarsName: String
+        get() = sidebarsLiveData.value?.sidebars?.getOrNull(selectedSidebarsPosition.value ?: 0)?.name ?: ""
+
+    fun selectSidebarsPosition(position: Int, triggerSearch: Boolean = true) {
+        val oldPosition = _selectedSidebarsPosition.value ?: INVALID_POSITION
+        if (position != oldPosition) {
+            _selectedSidebarsPosition.value = position
+            // 如果是点击搜索而被动切换到 “全部” tab，则这里不需要更新筛选条件
+            if (triggerSearch && position != 1) {
+                updateGameFiltered()
+            }
         }
     }
+
+    private val _gameFiltered = MutableLiveData<GameFiltered>()
+    val gameFiltered: LiveData<GameFiltered> = _gameFiltered
+    fun updateGameFiltered(
+        size: SubjectSettingEntity.Size? = null,
+        sortType: CategoryFilterView.SortType? = null
+    ) {
+        val oldFiltered = _gameFiltered.value
+        val newSize = size ?: oldFiltered?.size ?: SubjectSettingEntity.Size()
+        val newSortType = sortType ?: oldFiltered?.sortType ?: CategoryFilterView.SortType.RECOMMENDED
+        val selectedSidebarPosition = selectedSidebarsPosition.value ?: 0
+        val categoryIds = selectedSubCategories.value?.joinToString("-") { it.category.id } ?: ""
+        val sidebarCategoryId =
+            sidebarsLiveData.value?.sidebars?.getOrNull(selectedSidebarPosition)?.categoryId ?: "all"
+        _gameFiltered.value = GameFiltered(newSize, newSortType, categoryIds, sidebarCategoryId)
+    }
+
+    override fun onCleared() {
+        super.onCleared()
+        compositeDisposable.clear()
+    }
+
+    companion object {
+        private const val INVALID_POSITION = -1
+    }
+
+    data class SelectedTags(
+        val parentId: String,
+        val parentName: String,
+        val parentPosition: Int,
+        val category: CategoryEntity,
+        val position: Int
+    )
+
+    data class GameFiltered(
+        val size: SubjectSettingEntity.Size = SubjectSettingEntity.Size(),
+        val sortType: CategoryFilterView.SortType = CategoryFilterView.SortType.RECOMMENDED,
+        val categoryIds: String = "",
+        val sidebarCategoryId: String = "全部"
+    )
 }

app/src/main/java/com/gh/gamecenter/category2/SearchCategoryPop.kt

@@ -0,0 +1,292 @@
+package com.gh.gamecenter.category2
+
+import android.content.Context
+import android.graphics.Color
+import android.graphics.Typeface
+import android.graphics.drawable.ColorDrawable
+import android.os.Handler
+import android.os.Looper
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.WindowManager
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.blankj.utilcode.util.KeyboardUtils
+import com.gh.gamecenter.R
+import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.retrofit.BiResponse
+import com.gh.gamecenter.common.utils.SensorsBridge
+import com.gh.gamecenter.common.utils.goneIf
+import com.gh.gamecenter.common.utils.singleToMain
+import com.gh.gamecenter.common.utils.toResString
+import com.gh.gamecenter.common.view.BugFixedPopupWindow
+import com.gh.gamecenter.core.utils.ToastUtils
+import com.gh.gamecenter.databinding.PopSearchCategoryBinding
+import com.gh.gamecenter.entity.CategoryEntity
+import io.reactivex.Single
+import io.reactivex.disposables.CompositeDisposable
+import me.xdrop.fuzzywuzzy.FuzzySearch
+
+class SearchCategoryPop(
+    height: Int,
+    private val isAutoRequestFocus: Boolean,
+    private val pageId: String,
+    private val pageName: String,
+    private val binding: PopSearchCategoryBinding
+) : BugFixedPopupWindow(binding.root, ViewGroup.LayoutParams.MATCH_PARENT, height) {
+
+    private var listener: OnSearchCategoryListener? = null
+    private val handler = Handler(Looper.getMainLooper())
+    private var searchDataList: List<CategoryV2ViewModel.SelectedTags>? = null
+
+    private val compositeDisposable = CompositeDisposable()
+
+    private var isSearching = false
+
+    private val adapter by lazy {
+        CategoryDirectoryAdapter(object : OnSearchCategoryListener {
+            override fun isEnableSelected(): Boolean {
+                return listener?.isEnableSelected() ?: false
+            }
+
+            override fun onItemSelected(selected: CategoryV2ViewModel.SelectedTags) {
+                listener?.onItemSelected(selected)
+
+            }
+
+            override fun onItemRemoved(parentId: String, subCategoryId: String) {
+                listener?.onItemRemoved(parentId, subCategoryId)
+            }
+
+            override fun onResetSelected() {
+                listener?.onResetSelected()
+            }
+
+            override fun onSubmit() {
+                listener?.onSubmit()
+            }
+
+        })
+    }
+
+    private val resultAdapter by lazy {
+        SearchCategoryResultsAdapter {
+            SensorsBridge.logClassificationSearchReturnClick(
+                pageId,
+                pageName,
+                binding.searchView.searchKey,
+                it.category.name ?: ""
+            )
+            if (listener?.isEnableSelected() == true) {
+                clearSearchKey()
+                listener?.onItemSelected(it)
+            } else {
+                ToastUtils.toast(R.string.selected_category_tags_max_toast.toResString())
+            }
+
+        }
+    }
+
+    private val selectedTagAdapter by lazy {
+        SelectedTagsAdapter {
+            listener?.onItemRemoved(it.parentId, it.category.id)
+        }
+    }
+
+    init {
+        isOutsideTouchable = true
+        setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+        isFocusable = true
+        inputMethodMode = INPUT_METHOD_NEEDED
+        softInputMode = WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING
+
+        initView()
+
+    }
+
+    private fun initView() {
+        binding.rvCategory.layoutManager = LinearLayoutManager(binding.root.context)
+        binding.rvCategory.adapter = adapter
+
+        binding.tvSelectedNumber.typeface =
+            Typeface.createFromAsset(binding.root.context.assets, Constants.DIN_FONT_PATH)
+
+        binding.root.setOnClickListener {
+            dismiss()
+        }
+
+        binding.clContent.setOnClickListener {
+            // 不需要具体实现，只是为了拦截 root 的点击事件
+        }
+
+        binding.tvReset.setOnClickListener {
+            listener?.onResetSelected()
+        }
+
+        binding.vSubmit.setOnClickListener {
+            dismiss()
+            listener?.onSubmit()
+        }
+
+        binding.searchView.addTextChangedListener {
+            handler.removeCallbacksAndMessages(null)
+            val key = it?.toString() ?: ""
+            if (key.isEmpty()) {
+                changeToSearching(false)
+            } else {
+                handler.postDelayed({
+                    search(it?.toString() ?: "")
+                }, SEARCH_DELAY_DURATION)
+            }
+        }
+
+        if (!isAutoRequestFocus) {
+            binding.searchView.setEditTextOnFocusChangeListener { _, hasFocus ->
+                if (hasFocus) {
+                    SensorsBridge.logClassificationSearch(pageId, pageName)
+                }
+            }
+        }
+
+    }
+
+    fun setData(data: List<CategoryEntity>) {
+        searchDataList = data
+            .asSequence()
+            .mapIndexed { index, parent ->
+                parent.data?.mapIndexed { childIndex, child ->
+                    CategoryV2ViewModel.SelectedTags(parent.id, parent.name ?: "", index, child, childIndex)
+                } ?: listOf()
+            }
+            .flatten()
+            .toList()
+
+        adapter.setListData(data)
+    }
+
+    fun updateCategorySelected(selectedList: List<CategoryV2ViewModel.SelectedTags>?) {
+        val size = selectedList?.size ?: 0
+        binding.tvSelectedNumber.goneIf(size == 0) {
+            binding.tvSelectedNumber.text = "$size"
+        }
+
+        if (binding.rvSelected.adapter == null) {
+            binding.rvSelected.layoutManager =
+                LinearLayoutManager(binding.root.context, RecyclerView.HORIZONTAL, false)
+            binding.rvSelected.adapter = selectedTagAdapter
+        }
+        selectedTagAdapter.submitList(selectedList)
+        binding.rvSelected.goneIf(selectedList.isNullOrEmpty())
+
+        if (isSearching) {
+            search(binding.searchView.searchKey)
+        }
+    }
+
+    private fun search(key: String) {
+        Single.create {
+            val data = searchDataList?.filterNot { item -> item.category.selected } ?: emptyList()
+            val resultList = FuzzySearch.extractSorted(key, data, { item -> item.category.name ?: "" }, 1)
+                .map { item -> item.referent }
+            it.onSuccess(resultList)
+        }.compose(singleToMain())
+            .subscribe(object : BiResponse<List<CategoryV2ViewModel.SelectedTags>>() {
+                override fun onSuccess(data: List<CategoryV2ViewModel.SelectedTags>) {
+                    val hasResult = data.isNotEmpty()
+                    SensorsBridge.logClassificationSearchReturn(pageId, pageName, key, hasResult)
+                    changeToSearching(true, key, data)
+                }
+
+                override fun onFailure(exception: Exception) {
+                    SensorsBridge.logClassificationSearchReturn(pageId, pageName, key, false)
+                    changeToSearching(true, key)
+                }
+            }).let(compositeDisposable::add)
+    }
+
+    private fun clearSearchKey() {
+        binding.searchView.clear()
+    }
+
+    private fun changeToSearching(
+        isSearching: Boolean,
+        key: String = "",
+        results: List<CategoryV2ViewModel.SelectedTags>? = null
+    ) {
+        this.isSearching = isSearching
+        binding.rvCategory.goneIf(isSearching)
+        binding.rvResults.goneIf(results.isNullOrEmpty()) {
+            if (binding.rvResults.adapter == null) {
+                binding.rvResults.layoutManager = LinearLayoutManager(binding.rvResults.context)
+                binding.rvResults.adapter = resultAdapter
+            }
+        }
+        resultAdapter.setData(results ?: listOf(), key)
+        binding.reuseNoConnection.root.goneIf(!isSearching || !results.isNullOrEmpty()) {
+            binding.reuseNoConnection.reuseNoneDataTv.text = R.string.no_relevant_content_found.toResString()
+            binding.reuseNoConnection.reuseNoneDataDescTv.goneIf(false)
+            binding.reuseNoConnection.reuseNoneDataDescTv.text = R.string.try_a_different_search_term.toResString()
+        }
+    }
+
+    fun setOnSearchCategoryListener(listener: OnSearchCategoryListener) {
+        this.listener = listener
+    }
+
+    fun notifyItemSelectedChanged(parentId: String) {
+        adapter.notifyItemSelectedChanged(parentId)
+    }
+
+    override fun showAtLocation(parent: View?, gravity: Int, x: Int, y: Int) {
+        super.showAtLocation(parent, gravity, x, y)
+        if (isAutoRequestFocus) {
+            binding.searchView.requestFocus()
+            handler.removeCallbacksAndMessages(null)
+            // 在某些机型上延时一下才能弹起软键盘
+            handler.postDelayed({
+                KeyboardUtils.showSoftInput()
+            }, SHOW_SOFT_INPUT_DELAY)
+        }
+    }
+
+    override fun dismiss() {
+        super.dismiss()
+        clearSearchKey()
+        handler.removeCallbacksAndMessages(null)
+        compositeDisposable.clear()
+    }
+
+
+    companion object {
+
+        private const val SEARCH_DELAY_DURATION = 300L
+        private const val SHOW_SOFT_INPUT_DELAY = 200L
+
+        fun newInstance(
+            context: Context,
+            height: Int,
+            isAutoRequestFocus: Boolean,
+            pageId: String,
+            pageName: String
+        ): SearchCategoryPop {
+            val inflater = LayoutInflater.from(context)
+            val binding = PopSearchCategoryBinding.inflate(inflater)
+            return SearchCategoryPop(height, isAutoRequestFocus, pageId, pageName, binding)
+        }
+    }
+
+    interface OnSearchCategoryListener {
+
+        fun isEnableSelected(): Boolean
+
+        fun onItemSelected(selected: CategoryV2ViewModel.SelectedTags)
+
+        fun onItemRemoved(parentId: String, subCategoryId: String)
+
+        fun onResetSelected()
+
+        fun onSubmit()
+
+    }
+}

app/src/main/java/com/gh/gamecenter/category2/SearchCategoryResultsAdapter.kt

@@ -0,0 +1,57 @@
+package com.gh.gamecenter.category2
+
+import android.annotation.SuppressLint
+import android.text.Spannable
+import android.text.SpannableString
+import android.text.style.ForegroundColorSpan
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.gh.gamecenter.common.utils.toBinding
+import com.gh.gamecenter.common.utils.toColor
+import com.gh.gamecenter.databinding.RecyclerSearchCategoryResultBinding
+
+class SearchCategoryResultsAdapter(val clickListener: (CategoryV2ViewModel.SelectedTags) -> Unit) :
+    RecyclerView.Adapter<SearchCategoryResultsAdapter.ResultViewHolder>() {
+    private val dataList = arrayListOf<CategoryV2ViewModel.SelectedTags>()
+    private var key = ""
+
+    @SuppressLint("NotifyDataSetChanged")
+    fun setData(data: List<CategoryV2ViewModel.SelectedTags>, newKey: String) {
+        key = newKey
+        dataList.clear()
+        dataList.addAll(data)
+        notifyDataSetChanged()
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ResultViewHolder {
+        return ResultViewHolder(parent.toBinding())
+    }
+
+    override fun getItemCount() = dataList.size
+
+    override fun onBindViewHolder(holder: ResultViewHolder, position: Int) {
+        val item = dataList[position]
+        val text = item.category.name ?: ""
+        val spannableString = SpannableString(text)
+        val highlightColor = com.gh.gamecenter.common.R.color.text_theme.toColor(holder.itemView.context)
+        text.forEachIndexed { index, char ->
+            if (key.contains(char)) {
+                // 需要高亮
+                spannableString.setSpan(
+                    ForegroundColorSpan(highlightColor),
+                    index,
+                    index + 1,
+                    Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+                )
+            }
+        }
+        holder.binding.root.text = spannableString
+        holder.itemView.setOnClickListener {
+            clickListener(item)
+        }
+    }
+
+    class ResultViewHolder(val binding: RecyclerSearchCategoryResultBinding) : RecyclerView.ViewHolder(binding.root) {
+
+    }
+}

app/src/main/java/com/gh/gamecenter/category2/SelectedTagsAdapter.kt

@@ -0,0 +1,48 @@
+package com.gh.gamecenter.category2
+
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import com.gh.gamecenter.common.utils.toBinding
+import com.gh.gamecenter.databinding.RecyclerCategorySelectedTagBinding
+
+class SelectedTagsAdapter(val click: (CategoryV2ViewModel.SelectedTags) -> Unit) :
+    ListAdapter<CategoryV2ViewModel.SelectedTags, SelectedTagsAdapter.TagsViewHolder>(
+        createDiffUtil()
+    ) {
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TagsViewHolder {
+        return TagsViewHolder(parent.toBinding())
+    }
+
+    override fun onBindViewHolder(holder: TagsViewHolder, position: Int) {
+        val item = getItem(position)
+        holder.binding.root.setText(item.category.name ?: "")
+        holder.itemView.setOnClickListener {
+            click(item)
+        }
+    }
+
+    companion object {
+
+        private fun createDiffUtil() = object : DiffUtil.ItemCallback<CategoryV2ViewModel.SelectedTags>() {
+            override fun areItemsTheSame(
+                oldItem: CategoryV2ViewModel.SelectedTags,
+                newItem: CategoryV2ViewModel.SelectedTags
+            ): Boolean {
+                return oldItem.category.id == newItem.category.id
+            }
+
+            override fun areContentsTheSame(
+                oldItem: CategoryV2ViewModel.SelectedTags,
+                newItem: CategoryV2ViewModel.SelectedTags
+            ): Boolean {
+                return oldItem == newItem
+            }
+
+        }
+    }
+
+    class TagsViewHolder(val binding: RecyclerCategorySelectedTagBinding) : RecyclerView.ViewHolder(binding.root)
+}

app/src/main/java/com/gh/gamecenter/category2/SubCategoryAdapter.kt

@@ -1,84 +1,94 @@
 package com.gh.gamecenter.category2
 
-import android.content.Context
-import android.view.View
+import android.annotation.SuppressLint
 import android.view.ViewGroup
-import com.gh.gamecenter.common.base.BaseRecyclerViewHolder
-import com.gh.gamecenter.core.utils.ToastUtils
-import com.gh.gamecenter.common.utils.goneIf
-import com.gh.gamecenter.common.utils.toColor
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import com.gh.gamecenter.R
-import com.gh.gamecenter.common.utils.toDrawable
+import com.gh.gamecenter.common.utils.*
+import com.gh.gamecenter.core.utils.ToastUtils
 import com.gh.gamecenter.databinding.SubCategoryItemBinding
 import com.gh.gamecenter.entity.CategoryEntity
-import com.lightgame.adapter.BaseRecyclerAdapter
 
 class SubCategoryAdapter(
-    context: Context,
-    private val mViewModel: CategoryV2ViewModel,
-    private val mList: List<CategoryEntity>,
-    private val mPrimaryIndex: Int
-) : BaseRecyclerAdapter<SubCategoryAdapter.SubCategoryItemViewHolder>(context) {
+    private val listener: SearchCategoryPop.OnSearchCategoryListener,
+) : RecyclerView.Adapter<SubCategoryAdapter.SubCategoryItemViewHolder>() {
 
-    override fun getItemCount() = mList.size
+    private lateinit var itemData: CategoryEntity
+    private val data: List<CategoryEntity>
+        get() = itemData.data ?: emptyList()
+
+    private var directoryPosition = 0
+
+    @SuppressLint("NotifyDataSetChanged")
+    fun setData(directoryPosition: Int, newItem: CategoryEntity) {
+        this.directoryPosition = directoryPosition
+        itemData = newItem
+        notifyDataSetChanged()
+    }
+
+    override fun getItemCount() = data.size
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) =
-        SubCategoryItemViewHolder(SubCategoryItemBinding.inflate(mLayoutInflater))
+        SubCategoryItemViewHolder(parent.toBinding())
+
+    override fun onBindViewHolder(holder: SubCategoryItemViewHolder, position: Int, payloads: MutableList<Any>) {
+        if (payloads.isEmpty()) {
+            super.onBindViewHolder(holder, position, payloads)
+        } else {
+            val item = data[position]
+            updateSelectedState(item.selected, holder.binding)
+        }
+    }
 
     override fun onBindViewHolder(holder: SubCategoryItemViewHolder, position: Int) {
         holder.binding.run {
-            val categoryEntity = mList[position]
-            name.text = categoryEntity.name
+            val categoryEntity = data[position]
+            tvName.text = categoryEntity.name
             recommendIv.goneIf(categoryEntity.recommend == false)
 
-            if (categoryEntity.selected) {
-                selectedIv.visibility = View.VISIBLE
-                container.background = R.drawable.bg_category_selected.toDrawable(mContext)
-                name.setTextColor(com.gh.gamecenter.common.R.color.text_theme.toColor(mContext))
-            } else {
-                selectedIv.visibility = View.GONE
-                container.background = com.gh.gamecenter.common.R.drawable.bg_shape_space_radius_8.toDrawable(mContext)
-                name.setTextColor(com.gh.gamecenter.common.R.color.text_primary.toColor(mContext))
-            }
+            updateSelectedState(categoryEntity.selected, this)
 
             root.setOnClickListener {
                 when {
-                    mViewModel.selectedCount >= 5 && !categoryEntity.selected -> ToastUtils.toast("最多只能选择5个类别")
+                    !categoryEntity.selected && !listener.isEnableSelected() -> {
+                        ToastUtils.toast(R.string.selected_category_tags_max_toast.toResString())
+                    }
 
                     categoryEntity.selected -> {
-                        categoryEntity.selected = false
-                        selectedIv.visibility = View.GONE
-                        container.background = com.gh.gamecenter.common.R.drawable.bg_shape_space_radius_8.toDrawable(mContext)
-                        name.setTextColor(com.gh.gamecenter.common.R.color.text_primary.toColor(mContext))
-                        mViewModel.run {
-                            if (selectedCount > 0) {
-                                selectedCount--
-                                postSelectedCount()
-                                postCategoryPosition(mPrimaryIndex, position)
-                                logClickClassificationDelete(mPrimaryIndex, categoryEntity.name ?: "", "全部类别")
-                            }
-                        }
+
+                        listener.onItemRemoved(itemData.id, categoryEntity.id)
                     }
 
                     !categoryEntity.selected -> {
-                        categoryEntity.selected = true
-                        categoryEntity.primaryIndex = mPrimaryIndex
-                        selectedIv.visibility = View.VISIBLE
-                        container.background = R.drawable.bg_category_selected.toDrawable(mContext)
-                        name.setTextColor(com.gh.gamecenter.common.R.color.text_theme.toColor(mContext))
-                        mViewModel.run {
-                            if (selectedCount < 5) {
-                                selectedCount++
-                                logClickClassification(mPrimaryIndex, categoryEntity.name ?: "", position)
-                                postSelectedCount()
-                                postCategoryPosition(mPrimaryIndex, position)
-                            }
-                        }
+
+                        listener.onItemSelected(
+                            CategoryV2ViewModel.SelectedTags(
+                                itemData.id,
+                                itemData.name ?: "",
+                                directoryPosition,
+                                categoryEntity,
+                                position
+                            )
+                        )
                     }
                 }
             }
         }
     }
 
-    class SubCategoryItemViewHolder(val binding: SubCategoryItemBinding) : BaseRecyclerViewHolder<Any>(binding.root)
+    private fun updateSelectedState(isSelected: Boolean, binding: SubCategoryItemBinding) {
+        with(binding) {
+            val context = root.context
+            if (isSelected) {
+                container.background = R.drawable.bg_category_selected.toDrawable(context)
+                tvName.setTextColor(com.gh.gamecenter.common.R.color.text_theme.toColor(context))
+            } else {
+                container.background = com.gh.gamecenter.common.R.drawable.bg_shape_space_radius_8.toDrawable(context)
+                tvName.setTextColor(com.gh.gamecenter.common.R.color.text_secondary.toColor(context))
+            }
+        }
+    }
+
+    class SubCategoryItemViewHolder(val binding: SubCategoryItemBinding) : ViewHolder(binding.root)
 }

app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java

@@ -318,7 +318,9 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter<ViewHolder> {
                                         SensorsBridge.trackInstallGameClick(
                                                 downloadEntity.getGameId(),
                                                 downloadEntity.getName(),
-                                                "主动安装"
+                                                "主动安装",
+                                                false,
+                                                ""
                                         );
                                         PackageInstaller.install(mContext, downloadEntity);
                                     }
@@ -397,7 +399,9 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter<ViewHolder> {
                                                 SensorsBridge.trackInstallGameClick(
                                                         downloadEntity.getGameId(),
                                                         downloadEntity.getName(),
-                                                        "主动安装"
+                                                        "主动安装",
+                                                        "true".equals(ExtensionsKt.getMetaExtra(downloadEntity, Constants.DSP_GAME)),
+                                                        ExtensionsKt.getMetaExtra(downloadEntity, Constants.DSP_AD_ID)
                                                 );
                                                 PackageInstaller.install(mContext, downloadEntity);
                                             }

app/src/main/java/com/gh/gamecenter/download/UpdatableGameViewModel.kt

@@ -143,6 +143,8 @@ class UpdatableGameViewModel(
 
         // 按包名分
         for (update in updatableList) {
+            if (update.id == Constants.GHZS_GAME_ID) continue
+
             var list = packageNameAndUpdateListMap[update.packageName]
             if (list == null) {
                 list = arrayListOf()

app/src/main/java/com/gh/gamecenter/dsp/DspReportHelper.kt

@@ -0,0 +1,46 @@
+package com.gh.gamecenter.dsp
+
+import com.gh.gamecenter.common.utils.FixedSizeLinkedHashSet
+import com.gh.gamecenter.core.AppExecutor
+import com.lightgame.utils.Utils
+import okhttp3.OkHttpClient
+import okhttp3.Request
+
+object DspReportHelper {
+
+    private const val TAG = "DspReportHelper"
+    private val reportCache by lazy { FixedSizeLinkedHashSet<String>(100) }
+
+    fun report(url: String?) {
+        url ?: return
+
+        AppExecutor.logExecutor.execute {
+            if (reportCache.contains(url)) {
+                Utils.log(TAG, "遇到重复上报，自动过滤 （$url）")
+                return@execute
+            }
+
+            try {
+                val client = OkHttpClient()
+                val request = Request.Builder()
+                    .url(url)
+                    .build()
+
+                Utils.log(TAG, "Report is executing: $url")
+
+                val response = client.newCall(request).execute()
+                if (response.isSuccessful) {
+                    // Add the URL to the cache to prevent duplicate reports
+                    reportCache.add(url)
+
+                    Utils.log(TAG, "Report successful: ${response.body?.string()}")
+                } else {
+                    Utils.log(TAG, "Request failed with code: ${response.code}")
+                }
+            } catch (e: Exception) {
+                Utils.log(TAG, "Request failed: ${e.message}")
+            }
+        }
+    }
+
+}

app/src/main/java/com/gh/gamecenter/dsp/data/GameSubjectDSPRemoteDataSource.kt

@@ -0,0 +1,36 @@
+package com.gh.gamecenter.dsp.data
+
+import com.gh.gamecenter.common.exposure.meta.MetaUtil
+import com.gh.gamecenter.common.utils.toRequestBody
+import com.gh.gamecenter.feature.entity.GameEntity
+import com.gh.gamecenter.retrofit.RetrofitManager
+import com.gh.gamecenter.retrofit.service.DspApiService
+import io.reactivex.Single
+
+class GameSubjectDSPRemoteDataSource(private val api: DspApiService = RetrofitManager.getInstance().dspApiService) {
+
+    fun getDspGames(type: String, count: Int): Single<List<GameEntity>> {
+        val meta = MetaUtil.getMeta()
+        val request = mapOf(
+            "device" to mapOf(
+                "oaid" to (meta.oaid ?: ""),
+                "brand" to (meta.manufacturer ?: ""),
+                "model" to (meta.model ?: ""),
+                "osv" to (MetaUtil.getAndroidVersion()),
+            ),
+            "count" to count,
+            "scene" to 3,
+            "busid" to "guanghuan1205"
+        )
+        return api.fetch(request.toRequestBody())
+            .map {
+                val gameEntityList = mutableListOf<GameEntity>()
+                for (bidEntity in it.bidList) {
+                    val gameEntity = bidEntity.toGameEntity()
+                    gameEntityList.add(gameEntity)
+                }
+                gameEntityList
+            }
+    }
+
+}

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

@@ -2,16 +2,22 @@ package com.gh.gamecenter.entity
 
 import android.os.Parcelable
 import com.google.gson.annotations.SerializedName
+import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class CategoryEntity(
     @SerializedName("_id")
-    var id: String? = "",
+    private var _id: String? = null,
     var icon: String? = "",
     var name: String? = "",
     var recommend: Boolean? = false,
-    var data: List<CategoryEntity>? = null,
-    var selected: Boolean = false,
-    var primaryIndex: Int = -1
-) : Parcelable
+    var data: List<CategoryEntity>? = null
+) : Parcelable {
+
+    val id: String
+        get() = _id ?: ""
+
+    @IgnoredOnParcel
+    var selected: Boolean = false
+}

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

@@ -7,5 +7,8 @@ class GameColumnCollection(
     val id: String = "",
     val name: String = "",
     // 取值为 "1-1" 或 "1-2" 或 "top" 相应地代表 1行1个 或 1行2个 或 排行榜
-    val style: String = ""
+    val style: String = "",
+    val custom: Boolean = false, // 自定义设置
+    @SerializedName("custom_size")
+    val customSize: Int = 0 // 默认显示前X个专题
 )

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

@@ -3,6 +3,7 @@ package com.gh.gamecenter.entity
 import android.os.Parcelable
 import com.gh.common.filter.RegionSettingHelper
 import com.gh.gamecenter.feature.entity.GameEntity
+import com.gh.gamecenter.personalhome.home.UserHistoryViewModel
 import com.google.gson.annotations.SerializedName
 import kotlinx.parcelize.Parcelize
 
@@ -19,11 +20,20 @@ data class SearchSubjectEntity(
     val adIconActive: Boolean = false,
     // 本地字段，标记是否为微信小游戏CPM专题
     var isWGameSubjectCPM: Boolean = false,
-    val type: String = ""
+    // 本地字段，标记是否为DSP专题
+    var isDspSubject: Boolean = false,
+    val type: String = "",
+
+    @SerializedName("column_type")
+    val columnType: String = "", // DSP 专题类型 (DSP专题类型（apk：下载应用、mini_game：微信小程序/小游戏）
+    @SerializedName("show_download") // 下载/秒玩按钮（true：显示、false：不显示）（专题类型为apk，则为下载按钮；专题类型为mini_game，则为秒完按钮）
+    val showDownload: Boolean = false,
+    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"
     }
 
     fun getFilterGame() = RegionSettingHelper.filterGame(games)

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

@@ -7,7 +7,7 @@ import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-class SubjectData(
+data class SubjectData(
     // 入口必填
     var subjectId: String?,
     var subjectName: String?,
@@ -21,13 +21,28 @@ class SubjectData(
     var subjectStyle: String = "",
     var showDetailSubtitle: Boolean = false,
     var showDetailIconSubscript: Boolean = false,
+    var customLimit: String = "", // unlimited（无限制）、forbidden（禁止移出）
 
     var requireUpdateSetting: Boolean = false, // 多专题页面需要专题页面自行获取专题配置
     var isAdData: Boolean = false,
     var adId: String = "", // 广告ID(本地字段)，不为空时为广告专题
-    var codeId: String = "" // 广告CODE_ID(本地字段)，不为空时为广告专题
+    var codeId: String = "", // 广告CODE_ID(本地字段)，不为空时为广告专题
+    var tag: String = "" // 分类标签，埋点用
 ) : Parcelable, Cloneable {
 
+    @IgnoredOnParcel
+    val isForbidden
+        get() = customLimit == "forbidden"
+
+    @IgnoredOnParcel
+    val sortChinese
+        get() = when {
+            sort.contains("publish") -> "最新"
+            sort.contains("star") -> "评分"
+            sort.contains("update") -> "更新"
+            else -> "推荐"
+        }
+
     @IgnoredOnParcel
     val subjectStyleChinese: String
         get() = CustomPageItem.subjectTypeToComponentStyle[subjectStyle] ?: ""

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

@@ -117,7 +117,12 @@ data class SubjectEntity(
     @SerializedName("show_index_icon_subscript")
     val showIndexIconSubscript: Boolean = false,
     @SerializedName("welfare_info")
-    val welfareInfo: WelfareInfo? = null
+    val welfareInfo: WelfareInfo? = null,
+
+    @SerializedName("column_type")
+    private val _columnType: String? = null,
+    @SerializedName("size")
+    private val _size: Size? = null
 ) : Parcelable {
 
     @IgnoredOnParcel
@@ -150,10 +155,27 @@ data class SubjectEntity(
     val list: Int
         get() = max(min(_list ?: 0, data?.size ?: 0), 1)
 
+    val columnType: String
+        get() = _columnType ?: ""
+
+    val size: Size
+        get() = _size ?: Size()
+
+    var isDspSubject: Boolean = false
+
     companion object {
         const val SUBJECT_TAG_UPDATE = "update" // 更新时间
         const val SUBJECT_TAG_TYPE = "type" // 游戏标签
         const val SUBJECT_TAG_TEST = "test" // 开测时间
         const val SUBJECT_TAG_SELLING_POINT = "selling_points&type" // 卖点文案+游戏标签
     }
+
+    @Parcelize
+    data class Size(
+        @SerializedName("index")
+        private val _index: Int? = null
+    ) : Parcelable {
+        val index: Int
+            get() = _index ?: 0
+    }
 }

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

@@ -13,7 +13,7 @@ class SubjectSettingEntity(
     @SerializedName("type")
     var typeEntity: TypeEntity = TypeEntity(),
     var tag: String = "",
-    var filter: String = "", // rows: off/on
+    var filter: String = "", // off/on
     var order: Boolean = false, // 是否显示序号
 
     @SerializedName("brief_style")
@@ -34,6 +34,9 @@ class SubjectSettingEntity(
     private val _showDetailIconSubscript: Boolean? = null
 ) : Parcelable {
 
+    val isFilterEnabled: Boolean
+        get() = filter == "on"
+
     val showDetailSubtitle: Boolean
         get() = _showDetailSubtitle ?: false
 

app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListFragment.kt

@@ -23,7 +23,6 @@ import com.gh.gamecenter.eventbus.EBUserFollow
 import com.gh.gamecenter.feature.entity.AnswerEntity
 import com.gh.gamecenter.forum.home.ForumScrollCalculatorHelper
 import com.gh.gamecenter.video.detail.CustomManager
-import com.shuyu.gsyvideoplayer.video.base.GSYVideoView
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 
@@ -125,10 +124,6 @@ class ForumArticleAskListFragment : LazyListFragment<AnswerEntity, ForumArticleA
     override fun onFragmentPause() {
         super.onFragmentPause()
         pauseVideo()
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
         mScrollCalculatorHelper?.currentPlayer?.release()
     }
 
@@ -263,9 +258,7 @@ class ForumArticleAskListFragment : LazyListFragment<AnswerEntity, ForumArticleA
                     mBaseHandler.postDelayed({
                         tryCatchInRelease {
                             if (position != 0L) {
-                                if (currentPlayer?.currentState == GSYVideoView.CURRENT_STATE_PAUSE) {
-                                    currentPlayer?.startPlayLogic(true)
-                                }
+                                currentPlayer?.startPlayLogic(true)
                             } else {
                                 currentPlayer?.release()
                             }

app/src/main/java/com/gh/gamecenter/forum/home/ArticleItemVideoView.kt

@@ -160,12 +160,15 @@ class ArticleItemVideoView @JvmOverloads constructor(context: Context, attrs: At
     }
 
     //监控播放错误
-//    override fun onError(what: Int, extra: Int) {
-//        super.onError(what, extra)
+    override fun onError(what: Int, extra: Int) {
+        super.onError(what, extra)
 //        Utils.toast(context, "网络错误，视频播放失败")
 //        setViewShowState(mStartButton, View.INVISIBLE)
-////        errorContainer.visibility = View.VISIBLE
-//    }
+//        errorContainer.visibility = View.VISIBLE
+
+        // 部分设备由于MediaCodec实例达到上限导致 CodecException: Error 0xfffffff4，在此处尝试释放所有视频
+        CustomManager.clearAllVideo()
+    }
 
     override fun releaseVideos() {
         CustomManager.releaseAllVideos(getKey())

app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailFragment.kt

@@ -2,7 +2,7 @@ package com.gh.gamecenter.game.columncollection.detail
 
 import android.os.Bundle
 import android.view.View
-import androidx.lifecycle.ViewModelProviders
+import androidx.core.view.isVisible
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.base.GlobalActivityManager
 import com.gh.gamecenter.common.baselist.LazyListFragment
@@ -14,6 +14,8 @@ import com.gh.gamecenter.common.json.json
 import com.gh.gamecenter.common.utils.SensorsBridge
 import com.gh.gamecenter.common.utils.observeNonNull
 import com.gh.gamecenter.common.utils.toColor
+import com.gh.gamecenter.common.utils.viewModelProviderFromParent
+import com.gh.gamecenter.core.utils.DisplayUtils
 import com.gh.gamecenter.databinding.FragmentColumnCollectionDetailBinding
 import com.gh.gamecenter.entity.GameColumnCollection
 import com.gh.gamecenter.entity.SubjectData
@@ -23,6 +25,7 @@ class ColumnCollectionDetailFragment : LazyListFragment<LinkEntity, ColumnCollec
 
     private var mAdapter: ColumnCollectionDetailAdapter? = null
     private var mBinding: FragmentColumnCollectionDetailBinding? = null
+    private var mFragment: SubjectTabFragment? = null
 
     private var mTabIndex = -1
     private var mBasicExposureSourceList: ArrayList<ExposureSource>? = null
@@ -56,6 +59,11 @@ class ColumnCollectionDetailFragment : LazyListFragment<LinkEntity, ColumnCollec
     override fun onFragmentFirstVisible() {
         super.onFragmentFirstVisible()
 
+        if (mIsFromMainWrapper) {
+            DisplayUtils.setLightStatusBar(requireActivity(), !mIsDarkModeOn)
+            mBinding?.statusBar?.isVisible = true
+        }
+
         mListViewModel.getGameColumnCollection()
         mListViewModel.columnCollection.observeNonNull(this) {
             setNavigationTitle(it.name)
@@ -91,7 +99,7 @@ class ColumnCollectionDetailFragment : LazyListFragment<LinkEntity, ColumnCollec
     }
 
     override fun onChanged(list: MutableList<LinkEntity>?) {
-        if (list != null && list.isNotEmpty()) {
+        if (!list.isNullOrEmpty()) {
             showSubjectTab(list)
         }
     }
@@ -115,25 +123,28 @@ class ColumnCollectionDetailFragment : LazyListFragment<LinkEntity, ColumnCollec
                     isOrder = false,
                     requireUpdateSetting = true,
                     filter = "type:全部", // 默认显示大图
-                    subjectType = subjectType
+                    subjectType = subjectType,
+                    customLimit = link.customLimit
                 )
             )
         }
 
-        val fragment = childFragmentManager.findFragmentByTag(SubjectTabFragment::class.java.name)
+        mFragment = childFragmentManager.findFragmentByTag(SubjectTabFragment::class.java.name) as? SubjectTabFragment
             ?: SubjectTabFragment()
         val bundle = arguments
         mListViewModel.columnCollection.value?.let {
             bundle?.putString(EntranceConsts.KEY_COLUMN_COLLECTION_ID, it.id)
             bundle?.putString(EntranceConsts.KEY_COLUMN_COLLECTION_NAME, it.name)
             bundle?.putString(EntranceConsts.KEY_COLUMN_COLLECTION_STYLE, it.style)
+            bundle?.putBoolean(EntranceConsts.KEY_COLUMN_COLLECTION_CUSTOM, it.custom)
+            bundle?.putInt(EntranceConsts.KEY_COLUMN_COLLECTION_CUSTOM_SIZE, it.customSize)
         }
         bundle?.putParcelableArrayList(EntranceConsts.KEY_DATA, subjectDataList)
         bundle?.putBoolean(EntranceConsts.KEY_IS_COLUMN_COLLECTION, true)
 
-        fragment.arguments = bundle
+        mFragment!!.arguments = bundle
         mBinding?.placeholder?.visibility = View.VISIBLE
-        childFragmentManager.beginTransaction().replace(R.id.placeholder, fragment, SubjectTabFragment::class.java.name)
+        childFragmentManager.beginTransaction().replace(R.id.placeholder, mFragment!!, SubjectTabFragment::class.java.name)
             .commitAllowingStateLoss()
     }
 
@@ -167,9 +178,18 @@ class ColumnCollectionDetailFragment : LazyListFragment<LinkEntity, ColumnCollec
             arguments?.getString(EntranceConsts.KEY_COLLECTION_ID)
                 ?: ""
         )
-        return ViewModelProviders.of(this, factory).get(ColumnCollectionDetailViewModel::class.java)
+        return viewModelProviderFromParent(factory, arguments?.getString(EntranceConsts.KEY_COLLECTION_ID) ?: "")
     }
 
+    override fun onDarkModeChanged() {
+        super.onDarkModeChanged()
+        if (mIsFromMainWrapper) {
+            DisplayUtils.setLightStatusBar(requireActivity(), !mIsDarkModeOn)
+        }
+    }
+
+    override fun onBackPressed(): Boolean = mFragment?.onBackPressed() ?: false
+
     companion object {
         const val TYPE_QQ_MINI_GAME_COLUMN = "qq_mini_game_column"
         const val TYPE_WECHAT_MINI_GAME_COLUMN = "wechat_mini_game_column"

app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalSimpleItemViewHolder.kt

@@ -15,10 +15,10 @@ class GameHorizontalSimpleItemViewHolder(val binding: GameHorizontalSimpleItemBi
             view.text = name
             view.viewTreeObserver.addOnGlobalLayoutListener(object : ViewTreeObserver.OnGlobalLayoutListener {
                 override fun onGlobalLayout() {
-                    view.viewTreeObserver.removeOnGlobalLayoutListener(this);
-                    val newText = autoSplitText(view);
+                    view.viewTreeObserver.removeOnGlobalLayoutListener(this)
+                    val newText = autoSplitText(view)
                     if (!TextUtils.isEmpty(newText)) {
-                        view.text = newText;
+                        view.text = newText
                     }
                 }
             })

app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalSlideAdapter.kt

@@ -137,7 +137,6 @@ class GameHorizontalSlideAdapter(
         }
     }
 
-
     // notifyDataSetChanged 会出现页面抖动情况
     fun checkResetData(subjectEntity: SubjectEntity) {
         var dataIds = ""

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

@@ -37,7 +37,6 @@ import com.gh.gamecenter.gamedetail.detail.viewholder.GameDetailContentRecommend
 import com.gh.gamecenter.gamedetail.entity.*
 import com.gh.gamecenter.livedata.Event
 import com.gh.gamecenter.login.user.UserManager
-import com.gh.gamecenter.login.user.UserRepository
 import com.gh.gamecenter.manager.PackagesManager
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.gh.vspace.VHelper
@@ -105,7 +104,7 @@ class GameDetailViewModel(
     private var relatedGameList = arrayListOf<GameEntity>()
 
     // 内容卡片相关
-    private var contentCardList: List<ContentCardEntity>?= null
+    private var contentCardList: List<ContentCardEntity>? = null
     private val contentCardSp by lazy {
         HaloApp.getInstance().getSharedPreferences(SP_CONTENT_CARD, Context.MODE_PRIVATE)
     }
@@ -134,9 +133,9 @@ class GameDetailViewModel(
     private var isGameUpdatable = false
 
     private val compositeDisposable = CompositeDisposable()
-    
+
     private var userRelatedInfoReceivedCallback: (() -> Unit)? = null
-    
+
     init {
         loadData()
     }
@@ -193,13 +192,6 @@ class GameDetailViewModel(
                     game = response
                     gameLiveData.postValue(Resource.success(game))
                     loadGameDetailData()
-                    if (game?.canSpeed == true) {
-                        // 如果当前游戏支持加速，则刷新vip状态
-                        val userId = UserManager.getInstance().userId
-                        if (userId.isNotBlank()) {
-                            UserRepository.getInstance().refreshVipStatus(userId, true)
-                        }
-                    }
                 }
 
                 override fun onFailure(e: HttpException?) {
@@ -1124,6 +1116,14 @@ class GameDetailViewModel(
         compositeDisposable.clear()
     }
 
+    fun markContentCardRedDot(contentCardEntity: ContentCardEntity) {
+        SPUtils.setString(contentCardSp, RED_DOT_PREFIX + (gameId ?: "") + contentCardEntity.link.type, contentCardEntity.redDot.toString())
+    }
+
+    fun shouldShowContentCardRedDot(contentCardEntity: ContentCardEntity): Boolean {
+        return SPUtils.getString(contentCardSp, RED_DOT_PREFIX + (gameId ?: "") + contentCardEntity.link.type) != contentCardEntity.redDot.toString()
+    }
+
     class Factory(
         private val application: Application,
         private val gameId: String?,
@@ -1140,6 +1140,7 @@ class GameDetailViewModel(
     companion object {
         const val SP_CONTENT_CARD = "content_card"
         const val TAG = "GameDetailViewModel"
+        const val RED_DOT_PREFIX = "red_dot_"
 
         //[已领取/已淘号/再领/再淘]的礼包置底显示
         fun sortLibaoList(libaoList: ArrayList<LibaoEntity>?) {

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

@@ -635,7 +635,7 @@ class GameDetailWrapperFragment : BaseLazyFragment(), IScrollable {
         DialogHelper.showDialogWithHtmlContent(
             requireContext(),
             dialog.title,
-            dialog.content,
+            dialog.content.replaceLineBreakWithBr(),
             dialog.confirmButton.text.toString(),
             dialog.closeButtonText,
             {
@@ -669,7 +669,8 @@ class GameDetailWrapperFragment : BaseLazyFragment(), IScrollable {
                     "game_type", gameEntity?.categoryChinese ?: "",
                     "button_name", "关闭弹窗"
                 )
-            }
+            },
+            extraConfig = DialogHelper.Config(centerTitle = true)
         )
     }
 
@@ -1449,6 +1450,7 @@ class GameDetailWrapperFragment : BaseLazyFragment(), IScrollable {
      * 3. 当前游戏 APK 不为 1 个
      * 4. 当前游戏类型不为畅玩
      * 5. 当前游戏不是双下载时使用本地下载进行下载
+     * 6. 当前游戏支持加速
      */
     private fun isSpecialDownloadDialogAvailable(downloadEntity: DownloadEntity? = null): Boolean {
         if (Config.getNewApiSettingsEntity()?.install?.questionTip?.linkEntity == null) return false
@@ -1457,7 +1459,7 @@ class GameDetailWrapperFragment : BaseLazyFragment(), IScrollable {
         if (downloadEntity?.asVGame() == true) return false
         if (downloadEntity?.isSimulatorGame() == true) return false
         if (downloadEntity?.isLocalDownloadInDualDownloadMode() == true) return false
-
+        if (gameEntity?.canSpeed == true) return false
         return true
     }
 

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

@@ -3,8 +3,11 @@ package com.gh.gamecenter.gamedetail
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import com.gh.gamecenter.common.constant.Constants.SP_ACCELERATOR_MEMBERSHIP_EXPIRED
 import com.gh.gamecenter.common.retrofit.BiResponse
 import com.gh.gamecenter.common.utils.singleToMain
+import com.gh.gamecenter.core.provider.IAcceleratorProvider
+import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.feature.entity.BaseEntity
 import com.gh.gamecenter.feature.entity.TrialEntity
 import com.gh.gamecenter.feature.entity.VipEntity
@@ -13,6 +16,7 @@ import com.gh.gamecenter.login.user.UserManager
 import com.gh.gamecenter.login.user.UserRepository
 import com.halo.assistant.accelerator.AccelerationUseCase
 import com.halo.assistant.accelerator.repository.AcceleratorDataHolder
+import com.therouter.TheRouter
 import io.reactivex.disposables.CompositeDisposable
 
 class StartingAcceleratorViewModel : ViewModel() {
@@ -42,16 +46,15 @@ class StartingAcceleratorViewModel : ViewModel() {
             .subscribe(object : BiResponse<BaseEntity<TrialEntity>>() {
                 override fun onSuccess(data: BaseEntity<TrialEntity>) {
                     if (data.data?.result == true) {
-                        // 刷新vip状态
-                        // 这里先刷新内存数据
-                        AcceleratorDataHolder.instance.setVipEntity(
-                            VipEntity(
-                                _vipStatus = true,
-                                _isNewUser = false,
-                                _isTryVip = true
-                            )
+                        // 试用三小时下单成功
+                        val permissionEntity = VipEntity(
+                            _vipStatus = true,
+                            _isNewUser = false,
+                            _isTryVip = true,
                         )
-
+                        AcceleratorDataHolder.instance.setVipEntity(permissionEntity)
+                        TheRouter.get(IAcceleratorProvider::class.java)?.loadQyUserPermissionData()
+                        SPUtils.setBoolean(SP_ACCELERATOR_MEMBERSHIP_EXPIRED, false)
                         _rechargeTrailResult.value = Event(true)
                     } else {
                         _rechargeTrailResult.value = Event(false)
@@ -65,6 +68,33 @@ class StartingAcceleratorViewModel : ViewModel() {
             }).let(compositeDisposable::add)
     }
 
+    private val _vipEntity = MutableLiveData<Event<VipEntity?>>()
+    val vipEntity: LiveData<Event<VipEntity?>> = _vipEntity
+    fun loadVipStatus() {
+        val enableRefreshVipStatus = AcceleratorDataHolder.instance.enableRefresh
+        if (enableRefreshVipStatus) {
+            useCase.loadVipStatus()
+                .compose(singleToMain())
+                .subscribe(object : BiResponse<BaseEntity<VipEntity>>() {
+                    override fun onSuccess(data: BaseEntity<VipEntity>) {
+                        val vip = data.data
+                        if (vip != null) {
+                            AcceleratorDataHolder.instance.setVipEntity(vip)
+                        }
+                        _vipEntity.value = Event(vip)
+                    }
+
+                    override fun onFailure(exception: Exception) {
+                        super.onFailure(exception)
+                        _vipEntity.value = Event(null)
+                    }
+                }).let(compositeDisposable::add)
+        } else {
+            _vipEntity.value = Event(AcceleratorDataHolder.instance.vipEntity)
+        }
+
+    }
+
     override fun onCleared() {
         super.onCleared()
         compositeDisposable.clear()

app/src/main/java/com/gh/gamecenter/gamedetail/accelerator/GameDetailAcceleratorUiHelper.kt

@@ -15,7 +15,6 @@ import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.databinding.DetailDownloadItemBinding
 import com.gh.gamecenter.feature.entity.AcctGameInfo
 import com.gh.gamecenter.feature.entity.GameEntity
-import com.gh.gamecenter.feature.entity.VipEntity
 import com.gh.gamecenter.gamedetail.accelerator.chain.AcceleratorClient
 import com.gh.gamecenter.gamedetail.accelerator.chain.AcceleratorValidator
 import com.gh.gamecenter.gamedetail.accelerator.dialog.AcceleratorDialogFragment
@@ -56,6 +55,8 @@ class GameDetailAcceleratorUiHelper(private val binding: DetailDownloadItemBindi
 
     private var hasAnyAcctRecord = false
 
+    private var showDualDownloadButton: Boolean = false
+
     private val accelerationListener = object : OnAccelerateListener {
         override fun onStateChanged(state: AccelerateState) {
             when (state) {
@@ -77,7 +78,7 @@ class GameDetailAcceleratorUiHelper(private val binding: DetailDownloadItemBindi
     }
 
     private val onDataHolderListener = object : AcceleratorDataHolder.OnDataHolderListener {
-        override fun onVipStateChanged(vip: VipEntity) {
+        override fun onVipStateChanged() {
             showFreeTag()
         }
     }
@@ -132,13 +133,17 @@ class GameDetailAcceleratorUiHelper(private val binding: DetailDownloadItemBindi
 
         val isCurrentGameAccelerating = AcceleratorDataHolder.instance.isCurrentGameAccelerating(game.id)
 
-        when {
-            isCurrentGameAccelerating -> {// 如果当前游戏正处于加速状态，则需要隐藏当前下载按钮
-                binding.detailProgressbar.goneIf(true)
-            }
+        if (!showDualDownloadButton) {
+            when {
+                isCurrentGameAccelerating -> {// 如果当前游戏正处于加速状态，则需要隐藏当前下载按钮
+                    binding.detailProgressbar.goneIf(true)
+                }
 
-            binding.detailProgressbar.text == "更新" -> { // 游戏没有处于加速状态，如果 下载按钮为 “更新” 状态，则需要显示出来
-                binding.detailProgressbar.goneIf(false)
+                binding.detailProgressbar.text == "更新" -> { // 游戏没有处于加速状态，如果 下载按钮为 “更新” 状态，则需要显示出来
+                    binding.detailProgressbar.setBackgroundResource(com.gh.gamecenter.common.R.drawable.bg_common_button_light_fill_blue)
+                    binding.detailProgressbar.setTextColor(com.gh.gamecenter.common.R.color.text_theme.toColor(context))
+                    binding.detailProgressbar.goneIf(false)
+                }
             }
         }
 
@@ -153,14 +158,13 @@ class GameDetailAcceleratorUiHelper(private val binding: DetailDownloadItemBindi
         } ?: R.string.network_acceleration.toResString()
     }
 
-    fun checkIfShowSpeedUi(show: Boolean) {
+    fun checkIfShowSpeedUi(show: Boolean, showDualDownloadButton: Boolean) {
+        this.showDualDownloadButton = showDualDownloadButton
         if (!isInit) {
             return
         }
         showSpeedUi = show
         binding.clSpeedContainer.goneIf(!showSpeedUi) {
-            binding.detailProgressbar.setBackgroundResource(com.gh.gamecenter.common.R.drawable.bg_common_button_light_fill_blue)
-            binding.detailProgressbar.setTextColor(com.gh.gamecenter.common.R.color.text_theme.toColor(context))
             // 是否需要展示弹窗
             showGuideLayerIfNeed()
             updateSpeedUi()
@@ -224,7 +228,7 @@ class GameDetailAcceleratorUiHelper(private val binding: DetailDownloadItemBindi
                     game.id,
                     game.name ?: ""
                 )
-                guideView?.show(binding.clSpeedContainer, context, uiListener::onStartAccelerator)
+                guideView?.show(binding.clSpeed, context, uiListener::onStartAccelerator)
             }
         }
 
@@ -244,6 +248,7 @@ class GameDetailAcceleratorUiHelper(private val binding: DetailDownloadItemBindi
         if (isInvalidClick()) {
             return
         }
+
         val lastAcctGameInfo = last
 
         val memberType = AcceleratorDataHolder.instance.memberType
@@ -278,6 +283,7 @@ class GameDetailAcceleratorUiHelper(private val binding: DetailDownloadItemBindi
                 doStartAccelerating(context, game, gameInfo)
             }
         }
+
     }
 
     private fun showZoneList(context: Context, game: GameEntity) {
@@ -290,13 +296,14 @@ class GameDetailAcceleratorUiHelper(private val binding: DetailDownloadItemBindi
                 SOURCE_ENTRANCE_GAME_DETAIL
             )
         }
+
     }
 
     private var clickTime = 0L
 
     private fun doStartAccelerating(context: Context, game: GameEntity, zoneInfo: AcctGameInfo.ZoneInfo) {
 
-        val request = AcceleratorValidator.Request(isVip, isNewUser, game, SOURCE_ENTRANCE_GAME_DETAIL)
+        val request = AcceleratorValidator.Request(game, SOURCE_ENTRANCE_GAME_DETAIL)
         AcceleratorClient.newInstance()
             .execute(context, request, object : AcceleratorValidator.ValidateListener {
                 override fun finished(context: Context) {

app/src/main/java/com/gh/gamecenter/gamedetail/accelerator/chain/AcceleratorClient.kt

@@ -22,7 +22,7 @@ class AcceleratorClient(
             AcceleratorLoginInterceptor(),
             AcceleratorPackageCheckInterceptor(),
             AcceleratorRealNameInterceptor(),
-            AcceleratorVipInterceptor(),
+            AcceleratorPermissionGuideInterceptor(),
             AcceleratorStateInterceptor()
         )
     }

app/src/main/java/com/gh/gamecenter/gamedetail/accelerator/chain/AcceleratorPermissionGuideInterceptor.kt

@@ -0,0 +1,26 @@
+package com.gh.gamecenter.gamedetail.accelerator.chain
+
+import android.content.Context
+import com.gh.common.dialog.AcceleratorPermissionGuideDialogFragment
+import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.core.utils.SPUtils
+
+class AcceleratorPermissionGuideInterceptor : AcceleratorValidator.Interceptor {
+    override fun intercept(
+        context: Context,
+        chain: AcceleratorValidator.Chain,
+        listener: AcceleratorValidator.ValidateListener?
+    ) {
+        val hasShow = SPUtils.getBoolean(Constants.SP_ACCELERATOR_PERMISSION_GUIDE_SHOW)
+        val request = chain.request
+        if (hasShow) {
+            chain.proceed(context, request, listener)
+        } else {
+            AcceleratorPermissionGuideDialogFragment.show(context) {
+                if (chain.isValidContext(context)) {
+                    chain.proceed(context, request, listener)
+                }
+            }
+        }
+    }
+}

app/src/main/java/com/gh/gamecenter/gamedetail/accelerator/chain/AcceleratorValidator.kt

@@ -31,11 +31,9 @@ class AcceleratorValidator {
 
     @Parcelize
     data class Request(
-        val isVip: Boolean,
-        val isNewUser: Boolean,
         val game: GameEntity,
         val sourceEntrance: String
-    ):Parcelable
+    ) : Parcelable
 
 }
 

app/src/main/java/com/gh/gamecenter/gamedetail/accelerator/chain/AcceleratorVipInterceptor.kt

@@ -1,8 +1,14 @@
 package com.gh.gamecenter.gamedetail.accelerator.chain
 
 import android.content.Context
+import com.gh.common.dialog.AccelerateExpirationDialogFragment
+import com.gh.gamecenter.R
+import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.utils.toResString
+import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.gamedetail.accelerator.dialog.AcceleratorDialogFragment
 import com.gh.gamecenter.gamedetail.accelerator.dialog.AcceleratorDialogFragment.Companion.SPEED_ENABLE_VIP
+import com.halo.assistant.accelerator.repository.AcceleratorDataHolder
 
 class AcceleratorVipInterceptor : AcceleratorValidator.Interceptor {
 
@@ -12,20 +18,24 @@ class AcceleratorVipInterceptor : AcceleratorValidator.Interceptor {
         listener: AcceleratorValidator.ValidateListener?
     ) {
         val request = chain.request
-        val isVip = request.isVip
-        val isNewUser = request.isNewUser
-        if (isVip || isNewUser) {
+        val vip = AcceleratorDataHolder.instance.vipEntity
+        if (vip?.vipStatus == true || vip?.isNewUser == true) {
             chain.proceed(context, request, listener)
         } else {
-            val game = request.game
-            AcceleratorDialogFragment.show(
-                SPEED_ENABLE_VIP,
-                game.getUniquePackageName() ?: "",
-                game.id,
-                game.name ?: "",
-                request.sourceEntrance,
-                context
-            )
+            val reminder = AccelerateExpirationDialogFragment.ExpirationReminder.TimeRunsOut(request.sourceEntrance)
+            AccelerateExpirationDialogFragment.checkDialogShown(context, reminder) {
+                if (!it) {
+                    val game = request.game
+                    AcceleratorDialogFragment.show(
+                        SPEED_ENABLE_VIP,
+                        game.getUniquePackageName() ?: "",
+                        game.id,
+                        game.name ?: "",
+                        request.sourceEntrance,
+                        context
+                    )
+                }
+            }
         }
     }
 }

app/src/main/java/com/gh/gamecenter/gamedetail/accelerator/dialog/AcceleratorZoneDialogFragment.kt

@@ -86,9 +86,7 @@ class AcceleratorZoneDialogFragment : BaseBottomDialogFragment<DialogFragmentAcc
                 sourceEntrance
             )
 
-            val isVip = acceleratorDataHolder.isVip
-            val isNewUser = acceleratorDataHolder.isNewUser
-            val request = AcceleratorValidator.Request(isVip, isNewUser, game, sourceEntrance)
+            val request = AcceleratorValidator.Request(game, sourceEntrance)
             AcceleratorClient.newInstance()
                 .execute(it, request, object : AcceleratorValidator.ValidateListener {
                     override fun finished(context: Context) {

app/src/main/java/com/gh/gamecenter/gamedetail/accelerator/dialog/StartingAcceleratorDialogFragment.kt

@@ -10,30 +10,35 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.viewModels
+import com.gh.common.dialog.AccelerateExpirationDialogFragment
 import com.gh.common.util.PackageLauncher
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
+import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.utils.SensorsBridge
 import com.gh.gamecenter.core.callback.AccelerateState
 import com.gh.gamecenter.core.callback.OnAccelerateListener
 import com.gh.gamecenter.core.provider.IAcceleratorProvider
 import com.gh.gamecenter.core.utils.CurrentActivityHolder
+import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.core.utils.ToastUtils
 import com.gh.gamecenter.databinding.DialogFragmentStartingAcceleratorBinding
 import com.gh.gamecenter.feature.entity.AcctGameInfo
 import com.gh.gamecenter.feature.entity.AcctRecord
 import com.gh.gamecenter.feature.entity.GameEntity
+import com.gh.gamecenter.feature.entity.VipEntity
 import com.gh.gamecenter.gamedetail.StartingAcceleratorViewModel
 import com.gh.gamecenter.gamedetail.accelerator.GameDetailAcceleratorUiHelper.Companion.DISTRICT_SERVER_HAVA
 import com.gh.gamecenter.gamedetail.accelerator.GameDetailAcceleratorUiHelper.Companion.SOURCE_ENTRANCE_GAME_DETAIL
+import com.gh.gamecenter.gamedetail.accelerator.dialog.AcceleratorDialogFragment.Companion.SPEED_ENABLE_VIP
 import com.gh.gamecenter.gamedetail.accelerator.dialog.AcceleratorDialogFragment.Companion.SPEED_START_FAILURE
 import com.gh.gamecenter.livedata.EventObserver
-import com.gh.gamecenter.login.user.UserManager
-import com.gh.gamecenter.login.user.UserRepository
 import com.halo.assistant.accelerator.repository.AcceleratorDataHolder
 import com.therouter.TheRouter
 import io.reactivex.disposables.CompositeDisposable
+import java.util.*
+import kotlin.math.ceil
 import kotlin.math.max
 
 class StartingAcceleratorDialogFragment : BaseDialogFragment() {
@@ -91,14 +96,30 @@ class StartingAcceleratorDialogFragment : BaseDialogFragment() {
                                 // 加速失败，上传奇游加速器log
                                 unloadAcceleratorErrorLog(game)
                             }
-                        }
+                        } else {
+                            // 由于每次加速前，都会检测加速会员权限，所以一般不会出现这种场景，这里只是为了兼容特殊情况，弹出相应提示
+                            if (state.isPermissionExpired) {
+                                //  加速会员过期 ,如果之前没有弹出过耗尽提醒，则弹出提示
+                                val reminder =
+                                    AccelerateExpirationDialogFragment.ExpirationReminder.TimeRunsOut(sourceEntrance)
+                                AccelerateExpirationDialogFragment.checkDialogShown(requireContext(), reminder) {
+                                    if (!it) {
+                                        // 之前弹出过耗尽提醒弹窗，这里直接展示加速失败
+                                        AcceleratorDialogFragment.show(
+                                            SPEED_START_FAILURE,
+                                            game.getUniquePackageName() ?: "",
+                                            game.id,
+                                            game.name ?: "",
+                                            sourceEntrance,
+                                            requireContext()
+                                        )
+                                    }
+                                }
 
-                        if (state.isPermissionExpired) {
-                            //  加速会员过期，刷新本地vip状态
-                            val userId = UserManager.getInstance().userId
-                            UserRepository.getInstance().refreshVipStatus(userId, true)
-                            // 加速失败，上传奇游加速器log
-                            unloadAcceleratorErrorLog(game)
+                                iAcceleratorProvider?.loadQyUserPermissionData()
+                                // 加速失败，上传奇游加速器log
+                                unloadAcceleratorErrorLog(game)
+                            }
                         }
 
                         dismissAllowingStateLoss()
@@ -178,14 +199,6 @@ class StartingAcceleratorDialogFragment : BaseDialogFragment() {
 
         binding.tvProgress.text = getString(R.string.accelerating_with_progress, "0")
         iAcceleratorProvider?.bindAccRelatedListener("", accelerationListener)
-        val isVip = acceleratorDataHolder.isVip
-        val isNewUser = acceleratorDataHolder.isNewUser
-        if (isNewUser && !isVip) {
-            // 新用户，并且还不是vip
-            viewModel.rechargeTrial()
-        } else {
-            startGameAccelerate()
-        }
 
         viewModel.restartingAcceleratorAction.observe(viewLifecycleOwner, EventObserver {
             startGameAccelerate()
@@ -208,6 +221,162 @@ class StartingAcceleratorDialogFragment : BaseDialogFragment() {
             }
 
         })
+
+        viewModel.vipEntity.observe(viewLifecycleOwner, EventObserver {
+            if (it == null) {
+                // 获取用户vip数据失败，直接弹出加速失败
+                AcceleratorDialogFragment.show(
+                    SPEED_START_FAILURE,
+                    game.getUniquePackageName() ?: "",
+                    game.id,
+                    game.name ?: "",
+                    sourceEntrance,
+                    requireContext()
+                )
+                dismissAllowingStateLoss()
+                trackNetworkAccelerationStartupResult("失败(获取vip数据失败)")
+            } else {
+                // 获取用户vip数据成功
+                canUserEnableAcceleration(it) {
+                    startGameAccelerate()
+                }
+            }
+        })
+
+        viewModel.loadVipStatus()
+    }
+
+    private fun canUserEnableAcceleration(vipEntity: VipEntity, callback: () -> Unit) {
+        if (vipEntity.isNewUser) {
+            // 如果是新用户，下单试用套餐
+            viewModel.rechargeTrial()
+            return
+        }
+
+        val serviceTime = vipEntity.timestamp
+        val userRemainingDays = calculateCalendarDaysDiff(vipEntity.vipExpireTime, serviceTime)
+
+        //如果是试用会员 或者是 包月会员，并且还没有临期: 直接启动。
+        if (vipEntity.isTryVip || (vipEntity.vipStatus && userRemainingDays > 3)) {
+            callback()
+            return
+        }
+
+        // 包月会员不足三天
+        if (vipEntity.isMonthVip && userRemainingDays in 1..3) {
+            val reminder = AccelerateExpirationDialogFragment.ExpirationReminder.UserExpired(
+                userRemainingDays, game.id, game.name ?: "", game.getUniquePackageName() ?: "", sourceEntrance
+            )
+            AccelerateExpirationDialogFragment.checkDialogShown(requireContext(), reminder) {
+                if (it) {
+                    dismissAllowingStateLoss()
+                } else {
+                    callback()
+                }
+            }
+            return
+        }
+
+        // 检查时长套餐是否快要耗尽
+        val durationRemainingMinute = vipEntity.durationExpiredTime
+        if (vipEntity.isDurationVip && durationRemainingMinute < 0) {
+            // 用户是时长会员，但是剩余时长为 -1 ，说明后端拉取奇游剩余时长失败，此时无法判断用户的时长会员是否到期，直接开启加速
+            callback()
+            return
+        }
+
+        // 用户是时长会员，并且将要消耗完毕
+        val durationRemainingHours = ceil(durationRemainingMinute / 60.0).toLong()
+        if (vipEntity.isDurationVip && durationRemainingHours in 1..3) {
+            val reminder = AccelerateExpirationDialogFragment.ExpirationReminder.InsufficientDuration(
+                durationRemainingHours, game.id, game.name ?: "", game.getUniquePackageName() ?: "", sourceEntrance
+            )
+            AccelerateExpirationDialogFragment.checkDialogShown(requireContext(), reminder) {
+                if (it) {
+                    dismissAllowingStateLoss()
+                } else {
+                    callback()
+                }
+            }
+            return
+        }
+
+        // 检查时长套餐是否快要过期
+        val durationRemainingDays = calculateCalendarDaysDiff(vipEntity.durationVipExpiredTime, serviceTime)
+        if (vipEntity.isDurationVip && durationRemainingDays in 1..3) {
+            val reminder = AccelerateExpirationDialogFragment.ExpirationReminder.DurationExpired(
+                durationRemainingDays, game.id, game.name ?: "", game.getUniquePackageName() ?: "", sourceEntrance
+            )
+            AccelerateExpirationDialogFragment.checkDialogShown(requireContext(), reminder) {
+                if (it) {
+                    dismissAllowingStateLoss()
+                } else {
+                    callback()
+                }
+            }
+            return
+        }
+
+        // 检查会员是否到期
+        val hasShow = SPUtils.getBoolean(Constants.SP_ACCELERATOR_MEMBERSHIP_EXPIRED)
+        val showExpiredDialog = !vipEntity.vipStatus &&
+                !vipEntity.isNewUser &&
+                !vipEntity.isVipRefundUser &&
+                !vipEntity.isDurationRefundUser &&
+                !hasShow
+        if (showExpiredDialog) {
+            val reminder = AccelerateExpirationDialogFragment.ExpirationReminder.TimeRunsOut(sourceEntrance)
+            AccelerateExpirationDialogFragment.checkDialogShown(requireContext(), reminder) {
+                if (it) {
+                    dismissAllowingStateLoss()
+                } else {
+                    callback()
+                }
+            }
+            return
+        }
+
+        // 检查是否是会员
+        if (vipEntity.vipStatus) {
+            callback()
+        } else {
+            // 弹出去充值弹窗
+            AcceleratorDialogFragment.show(
+                SPEED_ENABLE_VIP,
+                game.getUniquePackageName() ?: "",
+                game.id,
+                game.name ?: "",
+                sourceEntrance,
+                requireContext()
+            )
+            dismissAllowingStateLoss()
+        }
+    }
+
+    private fun calculateCalendarDaysDiff(timeSeconds1: Long, timeSeconds2: Long): Long {
+        // 转换秒为毫秒
+        val millis1 = timeSeconds1 * 1000
+        val millis2 = timeSeconds2 * 1000
+
+        val calendar1 = Calendar.getInstance().apply {
+            timeInMillis = millis1
+            set(Calendar.HOUR_OF_DAY, 0)
+            set(Calendar.MINUTE, 0)
+            set(Calendar.SECOND, 0)
+            set(Calendar.MILLISECOND, 0)
+        }
+        val calendar2 = Calendar.getInstance().apply {
+            timeInMillis = millis2
+            set(Calendar.HOUR_OF_DAY, 0)
+            set(Calendar.MINUTE, 0)
+            set(Calendar.SECOND, 0)
+            set(Calendar.MILLISECOND, 0)
+        }
+
+        // 计算两个日期零点之间的差值（毫秒），再转换为天数
+        val diff = (calendar1.timeInMillis - calendar2.timeInMillis) / (1000 * 60 * 60 * 24)
+        // 当diff == 0 时，当天过期，此时剩余天数为 1 天
+        return if (diff >= 0) diff + 1 else -1
     }
 
 

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

@@ -86,7 +86,8 @@ class GameDetailFragment : LazyFragment(), IScrollable {
         GameDetailCoverAdapter(
             requireContext(),
             this@GameDetailFragment,
-            viewModel
+            viewModel,
+            scrollCalculatorHelper
         ) {
             binding.coverSfv.isVisible = shouldShowCoverFilter && it
         }
@@ -200,6 +201,7 @@ class GameDetailFragment : LazyFragment(), IScrollable {
                             "game_name" to gameEntity?.name
                             "sequence" to viewModel.coverTabSequence
                             "tab_name" to viewModel.coverTabName
+                            "game_type" to gameEntity?.categoryChinese
                         })
                         if (currentCoverEntity?.tabName == checkedText) return@setOnCheckedCallback
 
@@ -682,7 +684,7 @@ class GameDetailFragment : LazyFragment(), IScrollable {
                         null,
                         gameStatus = gameStatus
                     )
-                    GameFunctionDialogFragment.show(requireContext(), gameDetailInfoTag.infoTags)
+                    GameFunctionDialogFragment.show(requireContext(), gameEntity, gameDetailInfoTag.infoTags, gameDetailInfoTag.link)
                 }
             }
         }

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

@@ -23,6 +23,7 @@ import com.gh.gamecenter.databinding.ItemGameCoverVideoBinding
 import com.gh.gamecenter.gamedetail.GameDetailViewModel
 import com.gh.gamecenter.gamedetail.detail.GameDetailFragment
 import com.gh.gamecenter.gamedetail.entity.CoverEntity
+import com.gh.gamecenter.gamedetail.video.GameDetailScrollCalculatorHelper
 import com.gh.gamecenter.gamedetail.video.TopVideoView
 import com.lightgame.adapter.BaseRecyclerAdapter
 import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder
@@ -33,6 +34,7 @@ class GameDetailCoverAdapter(
     context: Context,
     private val fragment: GameDetailFragment,
     private val viewModel: GameDetailViewModel,
+    private val scrollCalculatorHelper: GameDetailScrollCalculatorHelper,
     private val showOrHideCoverFilter: ((Boolean) -> Unit)
 ) : BaseRecyclerAdapter<RecyclerView.ViewHolder>(context) {
 
@@ -108,6 +110,14 @@ class GameDetailCoverAdapter(
             .setAutoFullWithSize(true)
             .setDismissControlTime(5000)
             .setVideoAllCallBack(object : GSYSampleCallBack() {
+                override fun onClickStartIcon(url: String?, vararg objects: Any?) {
+                    scrollCalculatorHelper.currentPlayer = holder.binding.player
+                }
+
+                override fun onClickResume(url: String?, vararg objects: Any?) {
+                    scrollCalculatorHelper.currentPlayer = holder.binding.player
+                }
+
                 override fun onQuitFullscreen(url: String?, vararg objects: Any) {
                     orientationUtils.backToProtVideo()
                     holder.binding.player.uploadVideoStreamingPlaying("退出全屏")
@@ -117,6 +127,7 @@ class GameDetailCoverAdapter(
 
         holder.binding.player.viewModel = viewModel
         holder.binding.player.showOrHideCoverFilter = showOrHideCoverFilter
+        holder.binding.player.scrollCalculatorHelper = scrollCalculatorHelper
         holder.binding.player.video = topVideo
         holder.binding.player.updateThumb(topVideo.poster)
 

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

@@ -57,6 +57,7 @@ class GameDetailBriefItemViewHolder(
                     moduleType,
                     entity.name,
                     sequence,
+                    "简介文案",
                     gameStatus = gameStatus
                 )
                 GameDetailScrollableTextDialogFragment.show(
@@ -86,6 +87,9 @@ class GameDetailBriefItemViewHolder(
                         moduleType,
                         itemData?.linkGameBrief?.name,
                         sequence,
+                        "游戏标签",
+                        index + 1,
+                        linkText = gameTag.name,
                         gameStatus = gameStatus
                     )
                     context.startActivity(

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

@@ -82,6 +82,7 @@ class GameDetailComprehensivePanelItemViewHolder(
                     root.updateLayoutParams<MarginLayoutParams> {
                         topMargin = if (position == 0) 0 else 8F.dip2px()
                     }
+                    titleIv.goneIf(!data.showTitle)
                     titleTv.goneIf(!data.showTitle) {
                         titleTv.setTextColor(com.gh.gamecenter.common.R.color.text_primary.toColor(context))
                         titleTv.text = data.title
@@ -127,6 +128,7 @@ class GameDetailComprehensivePanelItemViewHolder(
                         topMargin = if (position == 0) 0 else 16F.dip2px()
                         bottomMargin = if (position == itemCount - 1) 0 else if (data.showTitle) 12F.dip2px() else 8F.dip2px()
                     }
+                    titleIv.goneIf(!data.showTitle)
                     titleTv.goneIf(!data.showTitle) {
                         titleTv.setTextColor(com.gh.gamecenter.common.R.color.text_primary.toColor(context))
                         titleTv.text = data.title
@@ -150,6 +152,7 @@ class GameDetailComprehensivePanelItemViewHolder(
                     root.updateLayoutParams<MarginLayoutParams> {
                         topMargin = if (position == 0) 0 else 12F.dip2px()
                     }
+                    titleIv.goneIf(!data.showTitle)
                     titleTv.goneIf(!data.showTitle) {
                         titleTv.setTextColor(com.gh.gamecenter.common.R.color.text_primary.toColor(context))
                         titleTv.text = data.title

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

@@ -2,10 +2,8 @@ package com.gh.gamecenter.gamedetail.detail.viewholder
 
 import androidx.lifecycle.LifecycleOwner
 import com.gh.gamecenter.databinding.ItemGameDetailContentCardDoubleBinding
-import com.gh.gamecenter.databinding.LayoutGameDetailContentCardBinding
 import com.gh.gamecenter.feature.view.DownloadButton
 import com.gh.gamecenter.gamedetail.GameDetailViewModel
-import com.gh.gamecenter.gamedetail.entity.ContentCardEntity
 import com.gh.gamecenter.gamedetail.entity.GameDetailData
 
 class GameDetailContentCardDoubleItemViewHolder(
@@ -19,51 +17,24 @@ class GameDetailContentCardDoubleItemViewHolder(
         super.bindView(data)
         data.linkContentCard?.let {
             val getGameStatus = { gameStatus }
-            bindContentCard(
+            GameDetailContentCardSingleItemViewHolder.bindContentCard(
                 lifecycleOwner,
                 viewModel,
                 it.first(),
+                data.cardBackground,
                 binding.firstCardContainer,
                 baseTrackData.apply { supSequence = 0 },
                 getGameStatus
             )
-            bindContentCard(
+            GameDetailContentCardSingleItemViewHolder.bindContentCard(
                 lifecycleOwner,
                 viewModel,
                 it[1],
+                null,
                 binding.secondCardContainer,
                 baseTrackData.apply { supSequence = 1 },
                 getGameStatus
             )
         }
     }
-
-    companion object {
-        fun bindContentCard(
-            lifecycleOwner: LifecycleOwner,
-            viewModel: GameDetailViewModel,
-            contentCardEntity: ContentCardEntity,
-            itemBinding: LayoutGameDetailContentCardBinding,
-            trackData: GameDetailModuleTrackData,
-            getGameStatus: () -> String
-        ) {
-            itemBinding.run {
-                GameDetailContentCardSingleItemViewHolder.bindContentCard(
-                    root.context,
-                    lifecycleOwner,
-                    viewModel,
-                    contentCardEntity,
-                    root,
-                    titleTv,
-                    iconIv,
-                    contentTv,
-                    contentBannerView,
-                    redDotTv,
-                    newIv,
-                    trackData,
-                    getGameStatus
-                )
-            }
-        }
-    }
 }

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

@@ -1,12 +1,9 @@
 package com.gh.gamecenter.gamedetail.detail.viewholder
 
 import android.content.Context
-import android.widget.ImageView
 import android.widget.TextView
-import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.view.isVisible
 import androidx.lifecycle.LifecycleOwner
-import com.facebook.drawee.view.SimpleDraweeView
 import com.gh.common.constant.Config
 import com.gh.common.util.DirectUtils
 import com.gh.common.util.NewFlatLogUtils
@@ -19,10 +16,12 @@ import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.common.view.TextBannerView
 import com.gh.gamecenter.core.utils.TimeUtils
 import com.gh.gamecenter.databinding.ItemGameDetailContentCardSingleBinding
+import com.gh.gamecenter.databinding.LayoutGameDetailContentCardBinding
 import com.gh.gamecenter.feature.entity.MeEntity
 import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.gh.gamecenter.feature.view.DownloadButton
 import com.gh.gamecenter.gamedetail.GameDetailViewModel
+import com.gh.gamecenter.gamedetail.entity.CardBackground
 import com.gh.gamecenter.gamedetail.entity.ContentCardEntity
 import com.gh.gamecenter.gamedetail.entity.ContentCardEntity.Companion.TYPE_ARCHIVE
 import com.gh.gamecenter.gamedetail.entity.ContentCardEntity.Companion.TYPE_BBS
@@ -51,148 +50,154 @@ class GameDetailContentCardSingleItemViewHolder(
         val contentCardEntity = data.linkContentCard?.first() ?: return
         binding.run {
             bindContentCard(
-                context,
                 lifecycleOwner,
                 viewModel,
                 contentCardEntity,
-                container,
-                titleTv,
-                iconIv,
-                contentTv,
-                contentBannerView,
-                redDotTv,
-                newIv,
+                data.cardBackground,
+                firstCardContainer,
                 baseTrackData.apply { supSequence = 0 }
             ) { gameStatus }
         }
     }
 
     companion object {
-
         fun bindContentCard(
-            context: Context,
             lifecycleOwner: LifecycleOwner,
             viewModel: GameDetailViewModel,
             contentCardEntity: ContentCardEntity,
-            containerView: ConstraintLayout,
-            titleTv: TextView,
-            iconIv: SimpleDraweeView,
-            contentTv: TextView,
-            contentBannerView: TextBannerView,
-            redDotTv: TextView,
-            newIv: ImageView,
+            cardBackground: CardBackground?,
+            itemBinding: LayoutGameDetailContentCardBinding,
             trackData: GameDetailModuleTrackData,
             getGameStatus: () -> String
         ) {
-            if (contentCardEntity.id == containerView.tag) {
-                if (contentBannerView.isVisible) contentBannerView.updateView()
-                containerView.background = com.gh.gamecenter.common.R.drawable.bg_shape_f8_radius_8.toDrawable(context)
-                titleTv.setTextColor(com.gh.gamecenter.common.R.color.text_primary.toColor(context))
-                contentTv.setTextColor(com.gh.gamecenter.common.R.color.text_tertiary.toColor(context))
-
-                return
-            }
-
-            containerView.tag = contentCardEntity.id
-            titleTv.text = contentCardEntity.title
-            ImageUtils.display(iconIv, contentCardEntity.icon)
-
-            val showContentTv =
-                contentCardEntity.showDes && (contentCardEntity.des.isNotEmpty() || contentCardEntity.link.type == TYPE_GIFT)
-            contentTv.visibleIf(showContentTv) {
-                contentTv.text =
-                    if (contentCardEntity.link.type == TYPE_GIFT && contentCardEntity.des.isEmpty()) "${contentCardEntity.libao?.total}个游戏礼包" else contentCardEntity.des
-                contentTv.setTextColor(com.gh.gamecenter.common.R.color.text_tertiary.toColor(context))
-            }
-
-            val showContentBannerView =
-                contentCardEntity.showDes && contentCardEntity.link.type == TYPE_SERVER && contentCardEntity.server != null && contentCardEntity.des.isEmpty()
-            contentBannerView.goneIf(!showContentBannerView) {
-                val server = contentCardEntity.server ?: return@goneIf
-                val nowTime = System.currentTimeMillis()
-                var timeDiff = 0L
-                var closestIndex = 0
-                val bannerTextDataList = server.calendar.mapIndexed { index, serverCalendarEntity ->
-                    val diff = abs(nowTime - serverCalendarEntity.getTime() * 1000L)
-                    if (diff < timeDiff || index == 0) {
-                        timeDiff = diff
-                        closestIndex = index
+            with(itemBinding) {
+                val context = root.context
+                if (contentCardEntity.id == root.tag) {
+                    if (contentBannerView.isVisible) contentBannerView.updateView()
+                    cardBackground?.colorTransparent?.let {
+                        root.setRoundedColorBackgroundByColorInt(
+                            it.RGBAToARGB().hexStringToIntColor(),
+                            8F
+                        )
+                    } ?: run {
+                        root.background = com.gh.gamecenter.common.R.drawable.bg_shape_f8_radius_8.toDrawable(context)
                     }
-                    val serverTime =
-                        if (TimeUtils.isToday(serverCalendarEntity.getTime()))
-                            serverCalendarEntity.getFormatTime("今天 HH:mm")
-                        else if (TimeUtils.isTomorrow(serverCalendarEntity.getTime()))
-                            serverCalendarEntity.getFormatTime("明天 HH:mm")
-                        else
-                            serverCalendarEntity.getFormatTime("MM-dd HH:mm")
-                    TextBannerView.BannerTextData("${serverTime ?: ""} ${serverCalendarEntity.type}")
+                    titleTv.setTextColor(com.gh.gamecenter.common.R.color.text_primary.toColor(context))
+                    contentTv.setTextColor(com.gh.gamecenter.common.R.color.text_tertiary.toColor(context))
+
+                    return@with
                 }
-                contentBannerView.setDataList(bannerTextDataList, closestIndex)
-                contentBannerView.startBannerLoop()
-            }
 
-            redDotTv.goneIf(!((contentCardEntity.link.type == TYPE_SERVER && contentCardEntity.server?.total != 0) || contentCardEntity.link.type == TYPE_GIFT)) {
-                if ((contentCardEntity.link.type == TYPE_SERVER) && (contentCardEntity.server?.calendar?.isNotEmpty() == true))
-                    redDotTv.text = contentCardEntity.server?.total.toString()
-                if ((contentCardEntity.link.type == TYPE_GIFT) && (contentCardEntity.libao != null))
-                    redDotTv.text = contentCardEntity.libao?.total.toString()
-            }
-
-            val showNewTag = contentCardEntity.link.type == TYPE_ARCHIVE && contentCardEntity.archive != null && contentCardEntity.showNewTag
-            newIv.goneIf(!showNewTag)
-
-            containerView.setOnClickListener {
-                NewFlatLogUtils.logGameDetailGameContentCardClick(
-                    contentCardEntity.title ?: "",
-                    viewModel.game?.name ?: "",
-                    viewModel.game?.id ?: "",
-                    contentCardEntity.link.type ?: "",
-                    contentCardEntity.link.link ?: "",
-                    contentCardEntity.link.text ?: ""
-                )
-                SensorsBridge.trackGameDetailModuleClick(
-                    gameId = trackData.gameId,
-                    gameName = trackData.gameName,
-                    gameType = trackData.gameType,
-                    contentType = "组件内容",
-                    moduleType = trackData.moduleType,
-                    moduleName = trackData.moduleName,
-                    sequence = trackData.sequence,
-                    linkText = contentCardEntity.link.text ?: "",
-                    linkType = contentCardEntity.link.type ?: "",
-                    linkId = contentCardEntity.id,
-                    gameStatus = getGameStatus()
-                )
-
-                val dialog = contentCardEntity.dialog
-                if (dialog != null) {// 展示内容卡片提示弹窗
-                    DialogHelper.showDialog(
-                        context = context,
-                        title = dialog.title ?: "",
-                        content = dialog.body ?: "",
-                        confirmText = context.getString(com.gh.gamecenter.common.R.string.confirm),
-                        cancelText = context.getString(com.gh.gamecenter.common.R.string.cancel),
-                        confirmClickCallback = {
-                            jumpToContentCardLink(context, contentCardEntity, viewModel)
-                        }
+                root.tag = contentCardEntity.id
+                cardBackground?.colorTransparent?.let {
+                    root.setRoundedColorBackgroundByColorInt(
+                        it.RGBAToARGB().hexStringToIntColor(),
+                        8F
                     )
-                } else {
-                    jumpToContentCardLink(context, contentCardEntity, viewModel)
                 }
-            }
+                titleTv.text = contentCardEntity.title
+                ImageUtils.display(iconIv, contentCardEntity.icon)
 
-            viewModel.contentCardClickedLiveData.observe(lifecycleOwner) {
-                if (it.peekContent() == contentCardEntity.link.type) {
-                    it.getContentWithHandled()?.let { containerView.performClick() }
+                val showContentTv =
+                    contentCardEntity.showDes && (contentCardEntity.des.isNotEmpty() || contentCardEntity.link.type == TYPE_GIFT)
+                contentTv.visibleIf(showContentTv) {
+                    contentTv.text =
+                        if (contentCardEntity.link.type == TYPE_GIFT && contentCardEntity.des.isEmpty()) "${contentCardEntity.libao?.total}个游戏礼包" else contentCardEntity.des
+                    contentTv.setTextColor(com.gh.gamecenter.common.R.color.text_tertiary.toColor(context))
+                }
+
+                val showContentBannerView =
+                    contentCardEntity.showDes && contentCardEntity.link.type == TYPE_SERVER && contentCardEntity.server != null && contentCardEntity.des.isEmpty()
+                contentBannerView.goneIf(!showContentBannerView) {
+                    val server = contentCardEntity.server ?: return@goneIf
+                    val nowTime = System.currentTimeMillis()
+                    var timeDiff = 0L
+                    var closestIndex = 0
+                    val bannerTextDataList = server.calendar.mapIndexed { index, serverCalendarEntity ->
+                        val diff = abs(nowTime - serverCalendarEntity.getTime() * 1000L)
+                        if (diff < timeDiff || index == 0) {
+                            timeDiff = diff
+                            closestIndex = index
+                        }
+                        val serverTime =
+                            if (TimeUtils.isToday(serverCalendarEntity.getTime()))
+                                serverCalendarEntity.getFormatTime("今天 HH:mm")
+                            else if (TimeUtils.isTomorrow(serverCalendarEntity.getTime()))
+                                serverCalendarEntity.getFormatTime("明天 HH:mm")
+                            else
+                                serverCalendarEntity.getFormatTime("MM-dd HH:mm")
+                        TextBannerView.BannerTextData("${serverTime ?: ""} ${serverCalendarEntity.type}")
+                    }
+                    contentBannerView.setDataList(bannerTextDataList, closestIndex)
+                    contentBannerView.startBannerLoop()
+                }
+
+                val showRedDot = contentCardEntity.redDot != 0 && viewModel.shouldShowContentCardRedDot(contentCardEntity)
+                redDotTv.goneIf(!showRedDot) {
+                    redDotTv.text = contentCardEntity.redDot.toString()
+                }
+
+                val showNewTag = contentCardEntity.link.type == TYPE_ARCHIVE && contentCardEntity.archive != null && contentCardEntity.showNewTag
+                newIv.goneIf(!showNewTag)
+
+                root.setOnClickListener {
+                    NewFlatLogUtils.logGameDetailGameContentCardClick(
+                        contentCardEntity.title ?: "",
+                        viewModel.game?.name ?: "",
+                        viewModel.game?.id ?: "",
+                        contentCardEntity.link.type ?: "",
+                        contentCardEntity.link.link ?: "",
+                        contentCardEntity.link.text ?: ""
+                    )
+                    SensorsBridge.trackGameDetailModuleClick(
+                        gameId = trackData.gameId,
+                        gameName = trackData.gameName,
+                        gameType = trackData.gameType,
+                        contentType = "组件内容",
+                        moduleType = trackData.moduleType,
+                        moduleName = trackData.moduleName,
+                        sequence = trackData.sequence,
+                        linkText = contentCardEntity.link.text ?: "",
+                        linkType = contentCardEntity.link.type ?: "",
+                        linkId = contentCardEntity.id,
+                        gameStatus = getGameStatus()
+                    )
+
+                    val dialog = contentCardEntity.dialog
+                    if (dialog != null) {// 展示内容卡片提示弹窗
+                        DialogHelper.showDialog(
+                            context = context,
+                            title = dialog.title ?: "",
+                            content = dialog.body ?: "",
+                            confirmText = context.getString(com.gh.gamecenter.common.R.string.confirm),
+                            cancelText = context.getString(com.gh.gamecenter.common.R.string.cancel),
+                            confirmClickCallback = {
+                                jumpToContentCardLink(context, contentCardEntity, viewModel, redDotTv)
+                            }
+                        )
+                    } else {
+                        jumpToContentCardLink(context, contentCardEntity, viewModel, redDotTv)
+                    }
+                }
+
+                viewModel.contentCardClickedLiveData.observe(lifecycleOwner) {
+                    if (it.peekContent() == contentCardEntity.link.type) {
+                        it.getContentWithHandled()?.let { root.performClick() }
+                    }
                 }
             }
         }
 
-        private fun jumpToContentCardLink(context: Context, contentCardEntity: ContentCardEntity, viewModel: GameDetailViewModel) {
+        fun jumpToContentCardLink(context: Context, contentCardEntity: ContentCardEntity, viewModel: GameDetailViewModel, redDotTv: TextView) {
             val path = "游戏详情->内容卡片"
             when (contentCardEntity.link.type) {
                 TYPE_GIFT,
                 TYPE_ARCHIVE -> {
+                    if (contentCardEntity.link.type == TYPE_GIFT) {
+                        viewModel.markContentCardRedDot(contentCardEntity)
+                        redDotTv.isVisible = false
+                    }
+
                     val type = if (contentCardEntity.link.type == TYPE_GIFT) GameDetailTabEntity.TYPE_GIFT else GameDetailTabEntity.TYPE_ARCHIVE
                     val tabList = viewModel.gameDetailTabListLiveData.value?.data
                     if (tabList?.find { it.type == type } != null) {
@@ -207,6 +212,8 @@ class GameDetailContentCardSingleItemViewHolder(
 
                 TYPE_SERVER -> {
                     if (viewModel.game != null && contentCardEntity.server != null) {
+                        viewModel.markContentCardRedDot(contentCardEntity)
+                        redDotTv.isVisible = false
                         context.startActivity(
                             ServersCalendarActivity.getIntent(
                                 context,

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

@@ -1,10 +1,15 @@
 package com.gh.gamecenter.gamedetail.detail.viewholder
 
 import androidx.lifecycle.LifecycleOwner
+import com.gh.common.util.NewFlatLogUtils
+import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.databinding.ItemGameDetailContentCardTripleBinding
+import com.gh.gamecenter.databinding.LayoutGameDetailContentCardSmallBinding
 import com.gh.gamecenter.feature.view.DownloadButton
 import com.gh.gamecenter.gamedetail.GameDetailViewModel
-import com.gh.gamecenter.gamedetail.detail.viewholder.GameDetailContentCardDoubleItemViewHolder.Companion.bindContentCard
+import com.gh.gamecenter.gamedetail.detail.viewholder.GameDetailContentCardSingleItemViewHolder.Companion.jumpToContentCardLink
+import com.gh.gamecenter.gamedetail.entity.ContentCardEntity
+import com.gh.gamecenter.gamedetail.entity.ContentCardEntity.Companion.TYPE_ARCHIVE
 import com.gh.gamecenter.gamedetail.entity.GameDetailData
 
 class GameDetailContentCardTripleItemViewHolder(
@@ -17,15 +22,16 @@ class GameDetailContentCardTripleItemViewHolder(
         super.bindView(data)
         data.linkContentCard?.let {
             val getGameStatus = { gameStatus }
-            bindContentCard(
+            GameDetailContentCardSingleItemViewHolder.bindContentCard(
                 lifecycleOwner,
                 viewModel,
                 it.first(),
+                data.cardBackground,
                 binding.firstCardContainer,
                 baseTrackData.apply { supSequence = 0 },
                 getGameStatus
             )
-            bindContentCard(
+            bindSmallContentCard(
                 lifecycleOwner,
                 viewModel,
                 it[1].apply { showDes = false },
@@ -33,7 +39,7 @@ class GameDetailContentCardTripleItemViewHolder(
                 baseTrackData.apply { supSequence = 1 },
                 getGameStatus
             )
-            bindContentCard(
+            bindSmallContentCard(
                 lifecycleOwner,
                 viewModel,
                 it[2].apply { showDes = false },
@@ -43,4 +49,83 @@ class GameDetailContentCardTripleItemViewHolder(
             )
         }
     }
+
+    companion object {
+        fun bindSmallContentCard(
+            lifecycleOwner: LifecycleOwner,
+            viewModel: GameDetailViewModel,
+            contentCardEntity: ContentCardEntity,
+            itemBinding: LayoutGameDetailContentCardSmallBinding,
+            trackData: GameDetailModuleTrackData,
+            getGameStatus: () -> String
+        ) {
+            with(itemBinding) {
+                val context = root.context
+                if (contentCardEntity.id == root.tag) {
+                    root.background = com.gh.gamecenter.common.R.drawable.bg_shape_f8_radius_8.toDrawable(context)
+                    titleTv.setTextColor(com.gh.gamecenter.common.R.color.text_primary.toColor(context))
+
+                    return@with
+                }
+
+                root.tag = contentCardEntity.id
+                titleTv.text = contentCardEntity.title
+                ImageUtils.display(iconIv, contentCardEntity.icon)
+
+                val showRedDot = contentCardEntity.redDot != 0 && viewModel.shouldShowContentCardRedDot(contentCardEntity)
+                redDotTv.goneIf(!showRedDot) {
+                    redDotTv.text = contentCardEntity.redDot.toString()
+                }
+
+                val showNewTag = contentCardEntity.link.type == TYPE_ARCHIVE && contentCardEntity.archive != null && contentCardEntity.showNewTag
+                newIv.goneIf(!showNewTag)
+
+                root.setOnClickListener {
+                    NewFlatLogUtils.logGameDetailGameContentCardClick(
+                        contentCardEntity.title ?: "",
+                        viewModel.game?.name ?: "",
+                        viewModel.game?.id ?: "",
+                        contentCardEntity.link.type ?: "",
+                        contentCardEntity.link.link ?: "",
+                        contentCardEntity.link.text ?: ""
+                    )
+                    SensorsBridge.trackGameDetailModuleClick(
+                        gameId = trackData.gameId,
+                        gameName = trackData.gameName,
+                        gameType = trackData.gameType,
+                        contentType = "组件内容",
+                        moduleType = trackData.moduleType,
+                        moduleName = trackData.moduleName,
+                        sequence = trackData.sequence,
+                        linkText = contentCardEntity.link.text ?: "",
+                        linkType = contentCardEntity.link.type ?: "",
+                        linkId = contentCardEntity.id,
+                        gameStatus = getGameStatus()
+                    )
+
+                    val dialog = contentCardEntity.dialog
+                    if (dialog != null) {// 展示内容卡片提示弹窗
+                        DialogHelper.showDialog(
+                            context = context,
+                            title = dialog.title ?: "",
+                            content = dialog.body ?: "",
+                            confirmText = context.getString(com.gh.gamecenter.common.R.string.confirm),
+                            cancelText = context.getString(com.gh.gamecenter.common.R.string.cancel),
+                            confirmClickCallback = {
+                                jumpToContentCardLink(context, contentCardEntity, viewModel, redDotTv)
+                            }
+                        )
+                    } else {
+                        jumpToContentCardLink(context, contentCardEntity, viewModel, redDotTv)
+                    }
+                }
+
+                viewModel.contentCardClickedLiveData.observe(lifecycleOwner) {
+                    if (it.peekContent() == contentCardEntity.link.type) {
+                        it.getContentWithHandled()?.let { root.performClick() }
+                    }
+                }
+            }
+        }
+    }
 }

app/src/main/java/com/gh/gamecenter/gamedetail/dialog/DspGameDetailDialogFragment.kt

@@ -0,0 +1,176 @@
+package com.gh.gamecenter.gamedetail.dialog
+
+import android.content.Context
+import android.os.Bundle
+import android.view.MotionEvent
+import android.view.View
+import androidx.appcompat.app.AppCompatActivity
+import com.gh.common.util.DetailDownloadUtils
+import com.gh.common.util.DirectUtils
+import com.gh.download.DownloadManager
+import com.gh.gamecenter.R
+import com.gh.gamecenter.adapter.viewholder.DetailViewHolder
+import com.gh.gamecenter.common.base.fragment.BaseBottomDialogFragment
+import com.gh.gamecenter.common.constant.EntranceConsts
+import com.gh.gamecenter.common.utils.SensorsBridge
+import com.gh.gamecenter.common.utils.goneIf
+import com.gh.gamecenter.core.utils.CurrentActivityHolder
+import com.gh.gamecenter.databinding.DialogFragmentDspGameDetailBinding
+import com.gh.gamecenter.eventbus.EBPackage
+import com.gh.gamecenter.feature.entity.GameEntity
+import com.lightgame.download.DataWatcher
+import com.lightgame.download.DownloadEntity
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+import org.json.JSONObject
+
+class DspGameDetailDialogFragment : BaseBottomDialogFragment<DialogFragmentDspGameDetailBinding>() {
+
+    private var gameEntity: GameEntity? = null
+
+    private val dataWatcher = object : DataWatcher() {
+        override fun onDataChanged(downloadEntity: DownloadEntity) {
+            updateDownloadStatus()
+        }
+
+        override fun onDataInit(downloadEntity: DownloadEntity) {
+            updateDownloadStatus()
+        }
+    }
+
+    private fun updateDownloadStatus() {
+        gameEntity?.let {
+            DetailDownloadUtils.updateViewHolder(
+                DetailViewHolder(
+                    mBinding.detailLlBottom,
+                    null,
+                    it,
+                    false,
+                    "",
+                    "",
+                    "",
+                    null,
+                    false,
+                    null,
+                    null
+                )
+            )
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        gameEntity = arguments?.getParcelable(EntranceConsts.KEY_GAME_ENTITY)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        gameEntity?.let {
+            val apk = it.getApk().firstOrNull()
+
+            mBinding.ivIcon.displayGameIcon(it)
+            mBinding.tvName.text = it.name
+            mBinding.tvVersion.text = getString(R.string.version_name, apk?.version ?: "")
+            mBinding.titleView.setOnRightClickListener { dismiss() }
+            mBinding.tvDeveloper.text = getString(R.string.developer_name, it.developer ?: "")
+
+            mBinding.tvPermissions.setOnClickListener {
+                logClickEvent("游戏详情-应用权限")
+                DirectUtils.directToWebView(
+                    context = requireContext(),
+                    url = gameEntity?.permissionsUrl ?: "",
+                    title = "应用权限")
+            }
+
+            mBinding.tvPrivacyPolicy.setOnClickListener {
+                logClickEvent("游戏详情-隐私政策")
+                DirectUtils.directToWebView(
+                    context = requireContext(),
+                    url = gameEntity?.privacyUrl ?: "",
+                    title = "隐私政策"
+                )
+            }
+
+            mBinding.detailProgressbar.goneIf(apk == null)
+            if (apk != null) {
+                mBinding.detailProgressbar.setOnTouchListener { _, motionEvent ->
+                    if (motionEvent.action == MotionEvent.ACTION_DOWN) {
+                        logClickEvent("游戏详情-按钮")
+                    }
+                    return@setOnTouchListener false
+                }
+
+                DetailDownloadUtils.updateViewHolder(
+                    DetailViewHolder(
+                        mBinding.detailLlBottom,
+                        null,
+                        it,
+                        false,
+                        "",
+                        "",
+                        "",
+                        null,
+                        false,
+                        null
+                    )
+                )
+            }
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        DownloadManager.getInstance().addObserver(dataWatcher)
+    }
+
+    override fun onPause() {
+        super.onPause()
+        DownloadManager.getInstance().removeObserver(dataWatcher)
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+
+        logClickEvent("游戏详情-关闭弹窗")
+    }
+
+    private fun logClickEvent(text: String) {
+        gameEntity?.let {
+            val dspLogMap = it.tempDspLogMap as? HashMap<String, String>
+
+            dspLogMap?.let {
+                dspLogMap["text"] = text
+                SensorsBridge.trackDspAdClick(JSONObject(dspLogMap as Map<*, *>?))
+            }
+        }
+    }
+
+    // 接受安装、卸载消息
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun onEventMainThread(busFour: EBPackage) {
+        if (gameEntity != null && gameEntity!!.getApk().size > 0) {
+            for (apk in gameEntity!!.getApk()) {
+                if (busFour.packageName == apk.packageName) {
+                    updateDownloadStatus()
+                }
+            }
+        }
+    }
+
+    companion object {
+        fun show(context: Context, gameEntity: GameEntity) {
+            if (context is AppCompatActivity) {
+                context.supportFragmentManager
+            } else {
+                (CurrentActivityHolder.getCurrentActivity() as? AppCompatActivity)?.supportFragmentManager
+            }?.let {
+                val fragment = DspGameDetailDialogFragment().apply {
+                    arguments = Bundle().apply {
+                        putParcelable(EntranceConsts.KEY_GAME_ENTITY, gameEntity)
+                    }
+                }
+                fragment.show(it, fragment::class.java.simpleName)
+            }
+        }
+    }
+}

app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameFunctionDialogFragment.kt

@@ -9,19 +9,29 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.LinearLayoutManager
+import com.gh.common.util.DirectUtils
 import com.gh.gamecenter.BuildConfig
 import com.gh.gamecenter.common.base.fragment.BaseBottomDialogFragment
+import com.gh.gamecenter.common.constant.EntranceConsts
+import com.gh.gamecenter.common.entity.LinkEntity
+import com.gh.gamecenter.common.utils.SensorsBridge
+import com.gh.gamecenter.common.utils.goneIf
 import com.gh.gamecenter.databinding.DialogGameDetailRecyclerViewBinding
+import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.gamedetail.entity.GameDetailInfoTag
 import com.lightgame.utils.AppManager
 
 class GameFunctionDialogFragment: BaseBottomDialogFragment<DialogGameDetailRecyclerViewBinding>() {
     private var infoTags: List<GameDetailInfoTag.InfoTag> = arrayListOf()
+    private var linkEntity: LinkEntity? = null
+    private var gameEntity: GameEntity? = null
     private val adapter by lazy { GameFunctionAdapter(requireContext(), infoTags) }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        gameEntity = arguments?.getParcelable(EntranceConsts.KEY_GAME_ENTITY)
         infoTags = arguments?.getParcelableArrayList(KEY_INFO_TAG) ?: arrayListOf()
+        linkEntity = arguments?.getParcelable(EntranceConsts.KEY_LINK)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -30,6 +40,28 @@ class GameFunctionDialogFragment: BaseBottomDialogFragment<DialogGameDetailRecyc
         mBinding.closeIv.setOnClickListener {
             dismissAllowingStateLoss()
         }
+        mBinding.subtitleTv.goneIf(linkEntity == null) {
+            mBinding.subtitleTv.text = linkEntity?.text
+            mBinding.subtitleTv.setOnClickListener { _ ->
+                linkEntity?.let {
+                    DirectUtils.directToLinkPage(requireContext(), it, "游戏详情-功能说明", "")
+                    SensorsBridge.trackGameDetailModuleClick(
+                        gameEntity?.id,
+                        gameEntity?.name,
+                        gameEntity?.categoryChinese,
+                        "组件内容",
+                        "功能标签",
+                        "功能标签",
+                        null,
+                        subModuleName = "跳转入口",
+                        linkType = it.type,
+                        linkId = it.link,
+                        linkText = it.text,
+                        gameStatus = null
+                    )
+                }
+            }
+        }
         mBinding.recyclerView.run {
             layoutManager = LinearLayoutManager(requireContext())
             adapter = this@GameFunctionDialogFragment.adapter
@@ -46,7 +78,7 @@ class GameFunctionDialogFragment: BaseBottomDialogFragment<DialogGameDetailRecyc
         const val KEY_INFO_TAG = "info_tag"
 
         @JvmStatic
-        fun show(context: Context?, infoTags: List<GameDetailInfoTag.InfoTag>) {
+        fun show(context: Context?, gameEntity: GameEntity?, infoTags: List<GameDetailInfoTag.InfoTag>, linkEntity: LinkEntity?) {
             val fragmentActivity: FragmentActivity = if (context is FragmentActivity) {
                 context
             } else if (BuildConfig.DEBUG) {
@@ -65,7 +97,9 @@ class GameFunctionDialogFragment: BaseBottomDialogFragment<DialogGameDetailRecyc
 
             val dialogFragment = GameFunctionDialogFragment()
             dialogFragment.arguments = bundleOf(
-                KEY_INFO_TAG to infoTags
+                EntranceConsts.KEY_GAME_ENTITY to gameEntity,
+                KEY_INFO_TAG to infoTags,
+                EntranceConsts.KEY_LINK to linkEntity
             )
             dialogFragment.show(fragmentActivity.supportFragmentManager, GameFunctionDialogFragment::class.java.name)
         }

app/src/main/java/com/gh/gamecenter/gamedetail/entity/ContentCardEntity.kt

@@ -31,6 +31,13 @@ class ContentCardEntity(
     var showNewTag: Boolean = false,
 ) {
 
+    val redDot
+        get() = when (link.type) {
+            TYPE_SERVER -> server?.total ?: 0
+            TYPE_GIFT -> libao?.total ?: 0
+            else -> 0
+        }
+
     @Keep
     class Dialog(
         @SerializedName("_id")

app/src/main/java/com/gh/gamecenter/gamedetail/entity/GameDetailData.kt

@@ -29,6 +29,8 @@ data class GameDetailData(
     val linkInfoTag: GameDetailInfoTag? = null,
     @SerializedName("link_content_card")
     val linkContentCard: List<ContentCardEntity>? = null,
+    @SerializedName("card_background")
+    val cardBackground: CardBackground? = null,
     @SerializedName("link_advertising")
     val linkAdvertising: GameDetailLink? = null,
     @SerializedName("link_comprehensive")
@@ -136,6 +138,13 @@ data class GameDetailData(
     }
 }
 
+data class CardBackground(
+    val color: String = "",
+    val transparent: String = "",
+    @SerializedName("color-transparent")
+    val colorTransparent: String = "", // RGBA格式
+)
+
 data class Order(
     @SerializedName("before_download")
     val beforeDownload: Int = -1, // 下载前排序
@@ -210,7 +219,9 @@ data class GameDetailInfoTag(
     @SerializedName("info_tags")
     val infoTags: List<InfoTag> = listOf(), // 功能标签
     @SerializedName("request_speed_status")
-    val requestSpeedStatus: String = "" // 求加速状态, on/off
+    val requestSpeedStatus: String = "", // 求加速状态, on/off
+    @SerializedName("plugin_tutorial_link")
+    val link: LinkEntity? = null, // 插件教程链接
 ) {
     @Parcelize
     data class InfoTag(

app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarActivity.kt

@@ -143,13 +143,11 @@ class ServersCalendarActivity : ToolBarActivity() {
                 setToolbarMenu(R.menu.menu_server_calendar_more)
                 mBinding.subscribe.visibility = View.GONE
                 mBinding.subscribeHint1.visibility = View.GONE
-                mBinding.subscribeHint2.visibility = View.GONE
                 mBinding.subscribe.setOnClickListener(null)
             } else {// 用户已登录并处于未订阅状态
                 clearMenu()
                 mBinding.subscribe.visibility = View.VISIBLE
                 mBinding.subscribeHint1.visibility = View.VISIBLE
-                mBinding.subscribeHint2.visibility = View.VISIBLE
                 mBinding.subscribe.setOnClickListener {
                     CheckLoginUtils.checkLogin(this, "游戏详情-开服日历表-开启订阅") {
                         mViewModel.subscribeServer()

app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarDetailNoDataDialog.kt

@@ -238,7 +238,7 @@ class ServersCalendarDetailNoDataDialog : BottomSheetDialogFragment() {
                 wechatRemindCheckIv.alpha = 1.0F
                 wechatRemind.setOnClickListener {
                     wechatRemindCheckIv.isChecked = !wechatRemindCheckIv.isChecked
-                    viewModel.wechatRemind = wechatRemindCheckIv.isChecked
+//                    viewModel.wechatRemind = wechatRemindCheckIv.isChecked
                     SPUtils.setBoolean(Constants.SP_SERVERS_CALENDAR_BY_WECHAT, wechatRemindCheckIv.isChecked)
                 }
 

app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarDetailNoDataViewModel.kt

@@ -30,14 +30,14 @@ class ServersCalendarDetailNoDataViewModel(
 
     var appRemind: Boolean = false
 
-    var wechatRemind: Boolean = false
+    val wechatRemind: Boolean = false
 
     val timeInSeconds: Int = (serverTimeInMills / 1000).toInt()
 
     fun initData(notifySetting: ServerCalendarNotifySetting?) {
         if (isDataInit) return
         appRemind = notifySetting?.byApp ?: SPUtils.getBoolean(Constants.SP_SERVERS_CALENDAR_BY_APP, true)
-        wechatRemind = notifySetting?.byWechat ?: SPUtils.getBoolean(Constants.SP_SERVERS_CALENDAR_BY_WECHAT, true)
+//        wechatRemind = notifySetting?.byWechat ?: SPUtils.getBoolean(Constants.SP_SERVERS_CALENDAR_BY_WECHAT, true)
         isDataInit = true
     }
 

app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarDetailsRemindDialog.kt

@@ -308,7 +308,7 @@ class ServersCalendarDetailsRemindDialog : BottomSheetDialogFragment() {
 
         viewBinding.wechatRemind.setOnClickListener {
             viewBinding.wechatRemindCheckIv.isChecked = !viewBinding.wechatRemindCheckIv.isChecked
-            viewModel.wechatRemind = viewBinding.wechatRemindCheckIv.isChecked
+//            viewModel.wechatRemind = viewBinding.wechatRemindCheckIv.isChecked
             SPUtils.setBoolean(Constants.SP_SERVERS_CALENDAR_BY_WECHAT, viewBinding.wechatRemindCheckIv.isChecked)
         }
 

app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarDetailsRemindViewModel.kt

@@ -36,7 +36,7 @@ class ServersCalendarDetailsRemindViewModel(
 
     var appRemind: Boolean = false
 
-    var wechatRemind: Boolean = false
+    val wechatRemind: Boolean = false
 
     val selectedNotifySeconds: Int get() = (selectedNotifyTime / 1000).toInt()
 
@@ -58,7 +58,7 @@ class ServersCalendarDetailsRemindViewModel(
         selectedAdvancedTime = ServersCalendarAdvancedTime.valueOf(notifySetting?.secondsAdvance)
         selectedNotifyTime = (notifySetting?.notifyTime ?: calendarEntity.getTime()) * 1000
         appRemind = notifySetting?.byApp ?: SPUtils.getBoolean(Constants.SP_SERVERS_CALENDAR_BY_APP, true)
-        wechatRemind = notifySetting?.byWechat ?: SPUtils.getBoolean(Constants.SP_SERVERS_CALENDAR_BY_WECHAT, true)
+//        wechatRemind = notifySetting?.byWechat ?: SPUtils.getBoolean(Constants.SP_SERVERS_CALENDAR_BY_WECHAT, true)
         isDataInit = true
     }
 

app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingCommentItemViewHolder.kt

@@ -30,7 +30,9 @@ import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.common.view.CustomLinkMovementMethod
 import com.gh.gamecenter.common.view.DrawableView
-import com.gh.gamecenter.core.utils.*
+import com.gh.gamecenter.core.utils.CenterImageSpan
+import com.gh.gamecenter.core.utils.NumberUtils
+import com.gh.gamecenter.core.utils.SpanBuilder
 import com.gh.gamecenter.databinding.RatingCommentItemBinding
 import com.gh.gamecenter.entity.RatingComment
 import com.gh.gamecenter.feature.entity.GameEntity
@@ -249,7 +251,7 @@ class RatingCommentItemViewHolder(val binding: RatingCommentItemBinding, val pat
             if (game.getApk().size > 0 && game.getApk()[0].version == commentData.gameVersion) {
                 version.text = "当前版本"
             } else {
-                version.text = ("版本：" + commentData.gameVersion)
+                version.text = commentData.gameVersion
             }
         }
     }

app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingDetailCommentItemViewHolder.kt

@@ -7,6 +7,7 @@ import android.text.Spanned
 import android.text.TextPaint
 import android.text.method.LinkMovementMethod
 import android.text.style.ClickableSpan
+import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
 import android.widget.LinearLayout
@@ -15,6 +16,7 @@ import android.widget.TextView
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.constraintlayout.widget.ConstraintSet
 import androidx.core.content.ContextCompat
+import androidx.core.view.updateLayoutParams
 import com.gh.common.util.*
 import com.gh.common.util.NewFlatLogUtils
 import com.gh.common.util.NewLogUtils
@@ -27,7 +29,8 @@ import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.common.view.DrawableView
-import com.gh.gamecenter.core.utils.*
+import com.gh.gamecenter.core.utils.NumberUtils
+import com.gh.gamecenter.core.utils.SpanBuilder
 import com.gh.gamecenter.databinding.ItemArticleDetailCommentBinding
 import com.gh.gamecenter.entity.RatingComment
 import com.gh.gamecenter.gamedetail.rating.edit.RatingEditActivity
@@ -165,7 +168,36 @@ class RatingDetailCommentItemViewHolder(val binding: ItemArticleDetailCommentBin
             if (game != null && game.getApk().size > 0 && game.getApk()[0].version == commentData.gameVersion) {
                 version.text = "当前版本"
             } else {
-                version.text = ("版本：" + commentData.gameVersion)
+                version.text = commentData.gameVersion
+            }
+            version.buttonDrawable = R.drawable.ic_version.toDrawable(context)
+            version.post {
+                ConstraintSet().apply {
+                    clone(bottomContainer)
+                    if ((version.layout?.lineCount ?: 1) > 1) {
+                        version.gravity = Gravity.TOP
+                        connect(version.id, ConstraintSet.START, device.id, ConstraintSet.START)
+                        connect(version.id, ConstraintSet.TOP, device.id, ConstraintSet.BOTTOM, 6F.dip2px())
+                        connect(version.id, ConstraintSet.BOTTOM, ConstraintSet.PARENT_ID, ConstraintSet.BOTTOM, 16F.dip2px())
+                        connect(device.id, ConstraintSet.BOTTOM, version.id, ConstraintSet.TOP)
+                        connect(device.id, ConstraintSet.TOP, ConstraintSet.PARENT_ID, ConstraintSet.TOP, 16F.dip2px())
+                        clear(device.id, ConstraintSet.END)
+                        clear(likeCountTv.id, ConstraintSet.TOP)
+                        connect(likeCountTv.id, ConstraintSet.BOTTOM, ConstraintSet.PARENT_ID, ConstraintSet.BOTTOM, 4F.dip2px())
+                        bottomContainer.updateLayoutParams<ConstraintLayout.LayoutParams> { height = ConstraintLayout.LayoutParams.WRAP_CONTENT }
+                    } else {
+                        version.gravity = Gravity.CENTER_VERTICAL
+                        connect(version.id, ConstraintSet.START, device.id, ConstraintSet.END)
+                        connect(version.id, ConstraintSet.TOP, ConstraintSet.PARENT_ID, ConstraintSet.TOP, 0)
+                        connect(version.id, ConstraintSet.BOTTOM, ConstraintSet.PARENT_ID, ConstraintSet.BOTTOM, 0)
+                        connect(device.id, ConstraintSet.BOTTOM, ConstraintSet.PARENT_ID, ConstraintSet.BOTTOM)
+                        connect(device.id, ConstraintSet.END, version.id, ConstraintSet.START)
+                        connect(device.id, ConstraintSet.TOP, ConstraintSet.PARENT_ID, ConstraintSet.TOP, 0)
+                        connect(likeCountTv.id, ConstraintSet.TOP, timeTv.id, ConstraintSet.TOP, 0)
+                        connect(likeCountTv.id, ConstraintSet.BOTTOM, timeTv.id, ConstraintSet.BOTTOM, 0)
+                        bottomContainer.updateLayoutParams<ConstraintLayout.LayoutParams> { height = 48F.dip2px() }
+                    }
+                }.applyTo(bottomContainer)
             }
 
             if (commentData.me.isCommented) {

app/src/main/java/com/gh/gamecenter/gamedetail/video/TopVideoView.kt

@@ -50,6 +50,7 @@ class TopVideoView @JvmOverloads constructor(context: Context, attrs: AttributeS
     private var mLastGetContentLengthTime = 0L
 
     var showOrHideCoverFilter: ((Boolean) -> Unit)? = null
+    var scrollCalculatorHelper: GameDetailScrollCalculatorHelper? = null
 
     init {
         post {
@@ -256,6 +257,7 @@ class TopVideoView @JvmOverloads constructor(context: Context, attrs: AttributeS
 
     // 不需要弹弹窗，直接播放
     override fun showWifiDialog() {
+        scrollCalculatorHelper?.currentPlayer = this
         startPlayLogic(false)
         //val trafficVideo = PreferenceManager.getDefaultSharedPreferences(context).getBoolean(SettingsFragment.TRAFFIC_VIDEO_SP_KEY, false)
         //if (trafficVideo) {

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

@@ -62,6 +62,7 @@ import com.gh.gamecenter.feature.exposure.ExposureType
 import com.gh.gamecenter.feature.minigame.MiniGameItemHelper
 import com.gh.gamecenter.feature.utils.SentryHelper
 import com.gh.gamecenter.game.commoncollection.detail.CustomCommonCollectionDetailActivity
+import com.gh.gamecenter.gamedetail.dialog.DspGameDetailDialogFragment
 import com.gh.gamecenter.gamedetail.rating.RatingReplyActivity
 import com.gh.gamecenter.home.PageConfigure
 import com.gh.gamecenter.home.custom.adapter.CustomPageAdapter
@@ -130,6 +131,7 @@ class CustomPageFragment : LazyFragment(), ISmartRefreshContent, IScrollable, IB
             }
         }
 
+
         override fun onDataInit(downloadEntity: DownloadEntity) {
             adapter.notifyDownload(downloadEntity)
         }
@@ -266,7 +268,11 @@ class CustomPageFragment : LazyFragment(), ISmartRefreshContent, IScrollable, IB
 
                     if (status == LoadStatus.INIT_LOADING) {
                         binding.reuseLoading.root.goneIf(false)
-                        binding.root.setBackgroundColor(com.gh.gamecenter.common.R.color.ui_surface.toColor(requireContext()))
+                        binding.root.setBackgroundColor(
+                            com.gh.gamecenter.common.R.color.ui_surface.toColor(
+                                requireContext()
+                            )
+                        )
                     } else {
                         binding.reuseLoading.root.goneIf(true)
                         binding.root.setBackgroundColor(Color.TRANSPARENT)
@@ -324,15 +330,27 @@ class CustomPageFragment : LazyFragment(), ISmartRefreshContent, IScrollable, IB
             }
 
             gameDetailDestination.observe(viewLifecycleOwner, EventObserver { (entrance, game) ->
-                if (game.isMiniGame()) {
-                    MiniGameItemHelper.launchMiniGame(game)
-                } else {
-                    GameDetailActivity.startGameDetailActivity(
-                        requireContext(),
-                        game.id,
-                        entrance,
-                        traceEvent = game.exposureEvent,
-                    )
+                when {
+                    game.isDspGame -> {
+                        if (game.interactionType == 2) {
+                            DspGameDetailDialogFragment.show(requireContext(), game)
+                        } else if (game.interactionType == 4) {
+                            MiniGameItemHelper.launchMiniGame(game)
+                        }
+                    }
+
+                    game.isMiniGame() -> {
+                        MiniGameItemHelper.launchMiniGame(game)
+                    }
+
+                    else -> {
+                        GameDetailActivity.startGameDetailActivity(
+                            requireContext(),
+                            game.id,
+                            entrance,
+                            traceEvent = game.exposureEvent,
+                        )
+                    }
                 }
 
             })
@@ -779,7 +797,11 @@ class CustomPageFragment : LazyFragment(), ISmartRefreshContent, IScrollable, IB
 
             adapter.notifyItemRangeChanged(0, adapter.itemCount)
             binding.gameList.setBackgroundColor(com.gh.gamecenter.common.R.color.ui_surface.toColor(requireContext()))
-            searchBarBinding?.searchTv?.setHintTextColor(com.gh.gamecenter.common.R.color.text_instance.toColor(requireContext()))
+            searchBarBinding?.searchTv?.setHintTextColor(
+                com.gh.gamecenter.common.R.color.text_instance.toColor(
+                    requireContext()
+                )
+            )
             onScrollChanged(true)
         }
     }
@@ -816,6 +838,7 @@ class CustomPageFragment : LazyFragment(), ISmartRefreshContent, IScrollable, IB
             RefreshState.TwoLevel -> {
                 setScrollEnabled(false)
             }
+
             RefreshState.None -> {
                 setScrollEnabled(true)
             }

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

@@ -86,6 +86,7 @@ class CustomPageViewModel(
         addSource(repository.wechatMiniGameCPMItemLiveData, ::notifyWechatMiniGameCPMSubjectItemChanged)
         addSource(repository.customRecentAcceleratorItemLiveData, ::notifyItemChanged)
         addSource(repository.pkDataListLiveData, ::notifyPKDataChanged)
+        addSource(repository.dspSubjectLiveData, ::notifyDspSubjectItemChanged)
     }
 
     val dataList: LiveData<List<CustomPageItem>> = _dataList
@@ -580,6 +581,43 @@ class CustomPageViewModel(
         _dataList.value = newData
     }
 
+    /**
+     *  通过 dsp 接口异步获取数据插入
+     */
+    private fun notifyDspSubjectItemChanged(result: Pair<String, List<GameEntity>>) {
+        val (subjectId, gameList) = result
+        val oldData = dataList.value ?: return
+        val index = oldData.indexOfFirst {
+            it is CustomDspPlaceholderItem && subjectId == it.data.id
+        }
+        if (index == -1) {
+            return
+        }
+        val subjectItem = (oldData[index] as CustomDspPlaceholderItem).apply {
+            data.data = gameList.toMutableList()
+            data.isDspSubject = true
+        }
+        val position = subjectItem.position
+        val componentPosition = subjectItem.componentPosition
+        val newData = oldData.toMutableList()
+        val customPageItemList = repository.convertColumnDetailSubjectItems(
+            position,
+            componentPosition,
+            subjectItem.link,
+            subjectItem.data
+        )
+        if (customPageItemList.isEmpty()) return
+        newData[index] = customPageItemList[0]
+        newData.addAll(index + 1, customPageItemList.subList(1, customPageItemList.size))
+        newData.forEachIndexed { pos, customPageItem ->
+            customPageItem.position = pos
+        }
+        repository.notifyPositionChanged(newData.size)
+        gamePositionAndPackageHelper.clear()
+        gamePositionAndPackageHelper.putAll(getPositionAndPackageMap(newData))
+        _dataList.value = newData
+    }
+
     private fun notifyPKDataChanged(pkList: List<PKEntity>) {
         if (pkList.isEmpty()) return
 

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

@@ -91,7 +91,8 @@ class CustomGamePluginAdapter(
         binding.gameRating.textSize =
             (if (gameEntity.commentCount > 3) 12 else 10).toFloat()
         BindingAdapters.setGameName(binding.gameName, gameEntity, true)
-        BindingAdapters.setGameTags(binding.labelList, gameEntity, "")
+        binding.gamePlayCount.visibility = View.GONE
+        BindingAdapters.setGameTagsWithSellingPoint(binding.labelList, binding.layoutSellingPoints, gameEntity, "")
         binding.gameRating.setDrawableStart(
             if (gameEntity.commentCount > 3) com.gh.gamecenter.feature.R.drawable.game_horizontal_rating.toDrawable() else null,
             null,

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

@@ -133,7 +133,8 @@ class CustomGameRefreshVerticalAdapter(
             with(ui) {
                 gameNameTv.setTextColor(com.gh.gamecenter.common.R.color.text_primary.toColor(context))
                 serverTypeTv.setTextColor(com.gh.gamecenter.common.R.color.primary_theme.toColor(context))
-                downloadTv.background = com.gh.gamecenter.common.R.drawable.download_button_normal_style.toDrawable(context)
+                downloadTv.background =
+                    com.gh.gamecenter.common.R.drawable.download_button_normal_style.toDrawable(context)
                 gameDesTv.setTextColor(com.gh.gamecenter.common.R.color.text_tertiary.toColor(context))
 
                 BindingAdapters.setGameName(
@@ -142,7 +143,7 @@ class CustomGameRefreshVerticalAdapter(
                     false
                 )
                 BindingAdapters.setGame(iconIv, gameEntity)
-                BindingAdapters.setGameTags(gameTagContainer, gameEntity, "")
+                BindingAdapters.setGameTagsWithSellingPoint(gameTagContainer, sellingPointsBinding, gameEntity, "")
                 GameItemViewHolder.initServerType(gameNameTv, serverTypeTv, gameEntity)
                 gameDesTv.text = gameEntity.decoratedDes
                 GameItemViewHolder.initGameSubtitleAndAdLabel(

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

@@ -468,6 +468,11 @@ class CustomPageAdapter(
             } else {
                 block(viewHolder)
             }
+        } else {
+            // 当 RecyclerView 中没有找到对应的 ViewHolder 时，尝试调用 notifyItemChanged 来通知更新
+            // 这可能是因为 ViewHolder 已经被回收或不在屏幕上。在这种情况下，我们仍然希望更新数据
+            // 但是这并不能保证些什么，因为 ViewHolder 可能已经被销毁
+            recyclerView?.adapter?.notifyItemChanged(position)
         }
     }
 

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

@@ -61,9 +61,7 @@ class CustomRecentAcceleratorAdapter(
                     SCENE_TYPE_NO_GUIDE_LAYER,
                     SOURCE_ENTRANCE_RECENTLY_PLAYED
                 )
-                val isVip = acceleratorDataHolder.isVip
-                val isNewUser = acceleratorDataHolder.isNewUser
-                val request = AcceleratorValidator.Request(isVip, isNewUser, game, SOURCE_ENTRANCE_RECENTLY_PLAYED)
+                val request = AcceleratorValidator.Request(game, SOURCE_ENTRANCE_RECENTLY_PLAYED)
                 AcceleratorClient.newInstance()
                     .execute(context, request, object : AcceleratorValidator.ValidateListener {
                         override fun finished(context: Context) {
@@ -78,6 +76,7 @@ class CustomRecentAcceleratorAdapter(
                         }
 
                     })
+
             }
         }
     }

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

@@ -6,26 +6,57 @@ import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.home.custom.CustomPageViewModel
 import com.gh.gamecenter.home.custom.model.CustomSubjectItem
 import com.gh.gamecenter.home.custom.tracker.SubjectTracker
+import com.lightgame.utils.Utils
 
 class SubjectEventHelper(viewModel: CustomPageViewModel) : CustomPageItemChildEventHelper(viewModel) {
 
     private val tracker = SubjectTracker(viewModel.pageLocation)
 
     fun navigateToGameDetailPage(position: Int, gameEntity: GameEntity) {
-        if (gameEntity.isMiniGame()) {
-            tracker.trackMiniGameClick(_item, gameEntity)
-        } else {
-            tracker.trackColumnClick(_item, gameEntity, "游戏")
+        when {
+            gameEntity.isDspGame -> {
+                val json = tracker.trackDspGameClick(_item, gameEntity, "广告内容", "自定义页面")
+
+                // Parse the JSON string into a JSONObject
+                if (json != null) {
+                    val map = mutableMapOf<String, String>()
+                    val keys = json.keys() // Returns an Iterator
+
+                    while (keys.hasNext()) {
+                        val key = keys.next()
+                        try {
+                            val value = json.get(key)
+                            map[key] = value.toString()
+                        } catch (e: Exception) {
+                            Utils.log("Error parsing JSON key: $key, value: ${json.get(key)}")
+                        }
+                    }
+
+                    gameEntity.tempDspLogMap = map.toMap() // Return an immutable copy
+                }
+            }
+            gameEntity.isMiniGame() -> {
+                tracker.trackMiniGameClick(_item, gameEntity)
+            }
+            else -> {
+                tracker.trackColumnClick(_item, gameEntity, "游戏")
+            }
         }
 
         viewModel.navigateToGameDetailPageByGame(_item, position, gameEntity)
     }
 
     fun onDownloadButtonClick(childPosition: Int, gameEntity: GameEntity) {
-        if (gameEntity.isMiniGame()) {
-            tracker.trackMiniGameClick(_item, gameEntity)
-        } else {
-            tracker.trackColumnClick(_item, gameEntity, "按钮")
+        when {
+            gameEntity.isDspGame -> {
+                tracker.trackDspGameClick(_item, gameEntity, "按钮", "自定义页面")
+            }
+            gameEntity.isMiniGame() -> {
+                tracker.trackMiniGameClick(_item, gameEntity)
+            }
+            else -> {
+                tracker.trackColumnClick(_item, gameEntity, "按钮")
+            }
         }
     }
 
@@ -34,7 +65,6 @@ class SubjectEventHelper(viewModel: CustomPageViewModel) : CustomPageItemChildEv
         (_item as? CustomSubjectItem)?.data?.let {
             viewModel.navigateSubjectPage(_item, it)
         }
-
     }
 
     fun onChangeABatch(subject: SubjectEntity) {
@@ -52,5 +82,4 @@ class SubjectEventHelper(viewModel: CustomPageViewModel) : CustomPageItemChildEv
         viewModel.navigateSubjectPage(_item, subject)
     }
 
-
 }

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

@@ -82,6 +82,8 @@ class CustomPageData(
         val linkQqGameRecentlyPlayed: LinkRecentlyPlayed? = null,
         @SerializedName("link_accelerator_recently_played")
         val linkAcceleratorRecentlyPlayed: LinkRecentlyPlayed? = null,
+        @SerializedName("link_dsp_game_column")
+        val linkDspGameColumn: SubjectEntity? = null,
         var linkPK: PKEntity? = null,
     ) {
         // 游戏专题

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

@@ -96,6 +96,7 @@ abstract class CustomPageItem(
         const val CUSTOM_LINK_TYPE_COMMON_COLLECTION = "common_collection"
         const val CUSTOM_LINK_TYPE_TOP_GAME_COMMENT = "top_game_comment"
         const val CUSTOM_LINK_TYPE_PK = "pk"
+        const val CUSTOM_LINK_TYPE_DSP_GAME_COLUMN = "dsp_game_column"
 
         // 游戏专题
         const val COMPONENTS_GAME_SUBJECT_TYPE_DOUBLE_CARD = "game_double_card"
@@ -479,7 +480,12 @@ data class CustomSplitSubjectItem(
         get() = (startChildPosition + step) >= (data.data?.size ?: 0)
 
     val exposureSource: List<ExposureSource>
-        get() = listOf(ExposureSource("专题", "${data.name ?: ""}+${componentStyle}+${data.id}"))
+        get() = listOf(
+            ExposureSource(
+                if (data.isDspSubject) "dsp广告专题" else "专题",
+                "${data.name ?: ""}+${componentStyle}+${data.id}"
+            )
+        )
 
     override fun doAreItemsTheSame(other: CustomPageItem): Boolean {
         return other is CustomSplitSubjectItem
@@ -906,6 +912,24 @@ data class CustomPKItem(
     }
 }
 
+data class CustomDspPlaceholderItem(
+    private val _link: LinkEntity,
+    val data: SubjectEntity,
+    private val _position: Int,
+    private val _componentPosition: Int
+) : CustomPageItem(_link, _position, _componentPosition) {
+
+    override val itemType: Int
+        get() = CUSTOM_PAGE_ITEM_TYPE_MINI_GAME_RECENT_PLAY
+
+    override fun doAreContentsTheSames(other: CustomPageItem): Boolean {
+        return other is CustomDspPlaceholderItem
+                && data == other.data
+                && position == other.position
+                && componentPosition == other.componentPosition
+    }
+}
+
 object CustomFooterItem : CustomPageItem(LinkEntity(), -1, -1) {
     override val itemType: Int
         get() = CUSTOM_PAGE_ITEM_TYPE_FOOTER

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

@@ -12,23 +12,19 @@ import com.gh.download.DownloadManager
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.entity.LinkEntity
 import com.gh.gamecenter.common.entity.PKEntity
+import com.gh.gamecenter.common.livedata.NonStickyMutableLiveData
+import com.gh.gamecenter.common.retrofit.BiResponse
 import com.gh.gamecenter.common.utils.TextHelper
 import com.gh.gamecenter.common.utils.dip2px
 import com.gh.gamecenter.common.utils.singleToMain
 import com.gh.gamecenter.common.utils.sp2px
 import com.gh.gamecenter.core.utils.DisplayUtils
-import com.gh.gamecenter.core.utils.TimeUtils
+import com.gh.gamecenter.dsp.data.GameSubjectDSPRemoteDataSource
 import com.gh.gamecenter.entity.DiscoveryCardEntity
 import com.gh.gamecenter.entity.GameUpdateEntity
 import com.gh.gamecenter.entity.PullDownPush
 import com.gh.gamecenter.entity.SubjectEntity
 import com.gh.gamecenter.feature.entity.*
-import com.gh.gamecenter.entity.SubjectEntity.Companion.SUBJECT_TAG_SELLING_POINT
-import com.gh.gamecenter.entity.SubjectEntity.Companion.SUBJECT_TAG_UPDATE
-import com.gh.gamecenter.feature.entity.FloatingWindowEntity
-import com.gh.gamecenter.feature.entity.GameEntity
-import com.gh.gamecenter.feature.entity.PluginLocation
-import com.gh.gamecenter.feature.entity.TagStyleEntity
 import com.gh.gamecenter.feature.utils.ApkActiveUtils
 import com.gh.gamecenter.gamedetail.rating.edit.RatingEditActivity
 import com.gh.gamecenter.home.custom.model.CustomPageItem.Companion.COMMON_CONTENT_COLLECTION_LAYOUT_BANNER
@@ -55,13 +51,14 @@ import com.gh.gamecenter.home.custom.model.CustomPageItem.Companion.COMPONENTS_S
 import com.gh.gamecenter.home.custom.model.CustomPageItem.Companion.COMPONENTS_SUBJECT_TYPE_GAME_TIMELINE_HORIZONTAL_SLIDE
 import com.gh.gamecenter.home.custom.model.CustomPageItem.Companion.COMPONENTS_SUBJECT_TYPE_GAME_VERTICAL_IMAGE_TEXT
 import com.gh.gamecenter.home.custom.model.CustomPageItem.Companion.COMPONENTS_SUBJECT_TYPE_GAME_VERTICAL_SLIDE
+import com.gh.gamecenter.home.custom.model.CustomPageItem.Companion.CUSTOM_LINK_TYPE_ACCELERATOR_RECENTLY_PLAYED
 import com.gh.gamecenter.home.custom.model.CustomPageItem.Companion.CUSTOM_LINK_TYPE_COLUMN
+import com.gh.gamecenter.home.custom.model.CustomPageItem.Companion.CUSTOM_LINK_TYPE_DSP_GAME_COLUMN
 import com.gh.gamecenter.home.custom.model.CustomPageItem.Companion.CUSTOM_LINK_TYPE_GAME
 import com.gh.gamecenter.home.custom.model.CustomPageItem.Companion.CUSTOM_LINK_TYPE_HALO_RECOMMEND
 import com.gh.gamecenter.home.custom.model.CustomPageItem.Companion.CUSTOM_LINK_TYPE_PK
 import com.gh.gamecenter.home.custom.model.CustomPageItem.Companion.CUSTOM_LINK_TYPE_QQ_GAME_RECENTLY_PLAYED
 import com.gh.gamecenter.home.custom.model.CustomPageItem.Companion.CUSTOM_LINK_TYPE_QQ_MINI_GAME_COLUMN_DETAIL
-import com.gh.gamecenter.home.custom.model.CustomPageItem.Companion.CUSTOM_LINK_TYPE_ACCELERATOR_RECENTLY_PLAYED
 import com.gh.gamecenter.home.custom.model.CustomPageItem.Companion.CUSTOM_LINK_TYPE_WECHAT_GAME_RECENTLY_PLAYED
 import com.gh.gamecenter.home.custom.model.CustomPageItem.Companion.CUSTOM_LINK_TYPE_WECHAT_MINI_GAME_COLUMN_DETAIL
 import com.gh.gamecenter.home.custom.model.CustomPageItem.Companion.CUSTOM_LINK_TYPE_WECHAT_WECHAT_GAME_CPM_COLUMN_DETAIL
@@ -75,17 +72,18 @@ import com.gh.gamecenter.wrapper.MainWrapperRepository
 import com.gh.vspace.VHelper
 import io.reactivex.Observable
 import io.reactivex.Single
+import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.schedulers.Schedulers
 import okhttp3.ResponseBody
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicInteger
 import java.util.regex.Pattern
 
-
 class CustomPageRepository private constructor(
     private val remoteDataSource: CustomPageRemoteDataSource,
     private val localDataSource: CustomPageLocalDataSource,
-    private val wGameSubjectCPMRemoteDataSource: WGameSubjectCPMRemoteDataSource
+    private val wGameSubjectCPMRemoteDataSource: WGameSubjectCPMRemoteDataSource,
 ) {
 
     private val pageInfo = PageInfo()
@@ -98,6 +96,8 @@ class CustomPageRepository private constructor(
         WGameSubjectCPMListRepository(wGameSubjectCPMRemoteDataSource)
     )
 
+    private val dspSubjectUseCase = GameSubjectDSPRemoteDataSource(RetrofitManager.getInstance().dspApiService)
+
     private var recentItem: CustomRecentGamesItem? = null
 
     private var recentQQItem: CustomRecentQqMiniGamesItem? = null
@@ -168,6 +168,9 @@ class CustomPageRepository private constructor(
 
     val pkDataListLiveData = MutableLiveData<List<PKEntity>>()
 
+    private val _dspGameList = NonStickyMutableLiveData<Pair<String, List<GameEntity>>>()
+    val dspSubjectLiveData: LiveData<Pair<String, List<GameEntity>>> = _dspGameList
+
     private var lastComponentType = ""
     private var lastSubjectId = ""
     private var gameChildPosition = 0
@@ -286,8 +289,6 @@ class CustomPageRepository private constructor(
                             // 如果当前item组件id不等于上一个item的组件id，则说明这是展开大图的第一个item
                             if (lastSubjectId != item.linkColumn?.id) {
                                 gameChildPosition = 0
-
-
                             }
                             // 如果当前item为展开大图，并且上一个item也是展开大图，但是组件id不同，则说明这是一个新的并且连续的展开大图组件
                             if (lastComponentType == item.link.type && lastSubjectId != item.linkColumn?.id) {
@@ -341,7 +342,6 @@ class CustomPageRepository private constructor(
                             pageInfo.positionIncrement()
                             pageInfo.componentPositionIncrement()
                         }
-
                     }
 
                     // 微信小游戏-最近在玩
@@ -373,6 +373,34 @@ class CustomPageRepository private constructor(
                         }
                     }
 
+                    // DSP 专题
+                    item.link.type == CUSTOM_LINK_TYPE_DSP_GAME_COLUMN -> {
+                        item.linkDspGameColumn?.let { subject ->
+                            list.add(
+                                CustomDspPlaceholderItem(
+                                    item.link,
+                                    subject,
+                                    pageInfo.position,
+                                    pageInfo.componentPosition
+                                )
+                            )
+                            dspSubjectUseCase.getDspGames(subject.columnType, subject.size.index)
+                                .subscribeOn(Schedulers.io())
+                                .observeOn(AndroidSchedulers.mainThread())
+                                .subscribe(object : BiResponse<List<GameEntity>>() {
+                                    override fun onSuccess(data: List<GameEntity>) {
+                                        for (game in data) {
+                                            game.subjectId = subject.id
+                                            game.subjectName = subject.name
+                                        }
+                                        _dspGameList.value = subject.id!! to data
+                                    }
+                                })
+                            pageInfo.positionIncrement()
+                            pageInfo.componentPositionIncrement()
+                        }
+                    }
+
                     item.linkColumnCollection != null -> {
                         // 专题合集
                         val linkColumnCollection = item.linkColumnCollection

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

@@ -1,7 +1,9 @@
 package com.gh.gamecenter.home.custom.tracker
 
+import com.gh.gamecenter.common.base.GlobalActivityManager
 import com.gh.gamecenter.common.entity.LinkEntity
 import com.gh.gamecenter.common.utils.SensorsBridge
+import com.gh.gamecenter.dsp.DspReportHelper
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.entity.PageLocation
 import com.gh.gamecenter.home.custom.model.CustomGameItem
@@ -9,6 +11,7 @@ import com.gh.gamecenter.home.custom.model.CustomPageItem
 import com.gh.gamecenter.home.custom.model.CustomSplitSubjectItem
 import com.gh.gamecenter.home.custom.model.CustomSubjectItem
 import com.gh.gamecenter.feature.minigame.MiniGameItemHelper
+import org.json.JSONObject
 
 class SubjectTracker(private val pageLocation: PageLocation) {
 
@@ -85,4 +88,45 @@ class SubjectTracker(private val pageLocation: PageLocation) {
             game?.name ?: ""
         )
     }
+
+    fun trackDspGameClick(
+        item: CustomPageItem,
+        game: GameEntity,
+        text: String,
+        location: String
+    ): JSONObject? {
+        val subject = (item as? CustomSplitSubjectItem)?.data
+            ?: (item as? CustomSubjectItem)?.data
+            ?: return null
+
+        // 先尝试上报 show 再上报 click，保证先 show 后 click (已在 report 方法中进行简单去重处理)
+        DspReportHelper.report(game.showUrl)
+        DspReportHelper.report(game.clickUrl)
+
+        val json = SensorsBridge.trackDspAdClick(
+            pageId = pageLocation.pageId,
+            pageBusinessId = GlobalActivityManager.getCurrentPageEntity().pageBusinessId,
+            lastPageId = GlobalActivityManager.getLastPageEntity().pageId,
+            lastPageName = GlobalActivityManager.getLastPageEntity().pageName,
+            lastPageBusinessId = GlobalActivityManager.getLastPageEntity().pageBusinessId,
+            location = location,
+            bottomTab = pageLocation.bottomTab,
+            severalTabPageName = pageLocation.severalTabPageName,
+            severalTabPageId = pageLocation.severalTabPageId,
+            position = pageLocation.tabPosition,
+            tabContent = pageLocation.tabContent,
+            customPageName = pageLocation.pageName,
+            customPageId = pageLocation.pageId,
+            gameColumnName = subject.name ?: "",
+            gameColumnId = subject.id ?: "",
+            searchContent = "",
+            adId = game.dspAdId ?: "",
+            interactionType = game.interactionType.toString(),
+            wechatAppid = game.miniGameAppId,
+            gameName = game.name ?: "",
+            text = text
+        )
+
+        return json
+    }
 }