feat: 动态java方法注册

feat: 文章详情WebView预加载
2023-10-11 19:41:28 +08:00 · 2023-10-11 15:52:35 +08:00
1974 changed files with 15011 additions and 33347 deletions
--- a/.gitignore
+++ b/.gitignore
@ -9,6 +9,4 @@ build/
 release-app/
 test-app/
 scripts/apk-channel/
-app/src/test/java/com/gh/gamecenter
-app/src/main/assets-debug/
-app/src/main/assets-release/
+app/src/test/java/com/gh/gamecenter
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -61,7 +61,7 @@ android_build:
  script:
    - export GRADLE_USER_HOME=/home/gitlab-runner/ci-build-cache/$CI_PROJECT_PATH/.gradle
    - chmod +x ./gradlew
-    - ./scripts/jenkins_build.sh $CI_COMMIT_REF_NAME $BEFORE_COMMIT_SHA $CI_COMMIT_SHA
+    - ./scripts/jenkins_build.sh -c
  #设置打包后的产物，用于job之间共享
  artifacts:
      paths:
@ -71,7 +71,7 @@ android_build:
    exit_codes: 137
  only:
    - dev
-    - dev-5.33.0
+    - dev-5.32.0

 # 代码检查
 sonarqube_analysis:
@ -102,7 +102,7 @@ sonarqube_analysis:
     exit_codes: 137
   only:
     - dev
-     - dev-5.33.0
+     - dev-5.32.0

 ## 发送简易检测结果报告
 send_sonar_report:
@ -120,11 +120,11 @@ send_sonar_report:
     exit_codes: 137
   only:
     - dev
-     - dev-5.33.0
+     - dev-5.32.0

 oss-upload&send-email:
    tags:
-        - sysadm-devops
+        - rancher-k8s
    stage: oss-upload&send-email
    image: hub.shanqu.cc/devops/android-apk-oss-upload:latest
    variables:
@ -132,9 +132,9 @@ oss-upload&send-email:
        VAULT_ADDR: https://vault.shanqu.cc                         # 固定值
        VAULT_SECRET_PATH: prod/devops/android-apk-oss-upload       # 固定值
        VAULT_ROLE: android-apk-oss-upload                          # 固定值
-        ENDPOINT: "tos-cn-guangzhou.ivolces.com"                    # 固定值
-        BUCKET: "sysadm-public"                                     # 固定值
-        FILE_PATH: "app/build/tmp/"                                 # APK 存放路径
+        ENDPOINT: "oss-cn-shenzhen-internal.aliyuncs.com"           # 固定值
+        BUCKET: "shanqu"                                            # 固定值
+        FILE_PATH: "app/build/tmp/"                         # APK 存放路径
        Email_To_List: $EMAIL_TO_LIST                               # 邮件接受人列表
        Email_Title: "光环助手 $CI_COMMIT_BRANCH"                    # 邮件标题
        PIPELINE_ID: $CI_PIPELINE_ID                                # 流水线id
@ -149,7 +149,7 @@ oss-upload&send-email:
        ### 开启上传 ###
        - /usr/local/bin/python /upload.py
        ### 发送邮件
-        - /usr/local/bin/python /ci-android-mail-jira-comment.py
+        - /usr/local/bin/python /ci-android-mail.py
    only:
        - dev
-        - dev-5.33.0
+        - dev-5.32.0
--- a/.gitmodules
+++ b/.gitmodules
@ -11,6 +11,3 @@
 [submodule "ndownload"]
 	path = ndownload
 	url = ../../../android/ndownload.git
-[submodule "vasdk"]
-	path = vasdk
-	url = ../../../sdg/android/vasdk.git
--- a/app/build.gradle
+++ b/app/build.gradle
@ -23,8 +23,6 @@ android {
    }

    compileOptions {
-        coreLibraryDesugaringEnabled true
-
        sourceCompatibility JavaVersion.VERSION_1_8
        targetCompatibility JavaVersion.VERSION_1_8
    }
@ -75,7 +73,7 @@ android {
        versionName rootProject.ext.versionName
        applicationId rootProject.ext.applicationId

-        proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt', 'proguard-fresco.txt', rootProject.ext.va_proguard_rules
+        proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt', 'proguard-fresco.txt'

        String CORE_EVENT_GAME_CATEGORY = ""

@ -97,10 +95,8 @@ android {
        buildConfigField "int", "ACTIVATE_REPORTING_RATIO", "${ACTIVATE_REPORTING_RATIO}"

        // All third-party appid/appkey
-        buildConfigField "boolean", "IS_GAT_APP", "false"
        buildConfigField "String", "API_HOST", "\"${API_HOST}\""
        buildConfigField "String", "NEW_API_HOST", "\"${NEW_API_HOST}\""
-        buildConfigField "String", "LOG_HUB_PROJECT", "\"${LOG_HUB_PROJECT}\""
        buildConfigField "String", "VAPI_HOST", "\"${VAPI_HOST}\""
        buildConfigField "String", "WECHAT_APPID", "\"${WECHAT_APPID}\""
        buildConfigField "String", "WECHAT_SECRET", "\"${WECHAT_SECRET}\""
@ -161,18 +157,9 @@ android {
        }
    }

-    flavorDimensions("env", "region")
+    flavorDimensions("env")

    sourceSets {
-
-        debug {
-            assets.srcDirs += 'src/main/assets-debug'
-        }
-
-        release {
-            assets.srcDirs += 'src/main/assets-release'
-        }
-
        publish {
            java.srcDirs = ['src/main/java', "src/default/java"]
        }
@ -188,15 +175,6 @@ android {
        gdt {
            java.srcDirs = ['src/main/java', 'src/gdt/java']
        }
-        gat {
-            java.srcDirs = ['src/main/java', 'src/gat/java']
-        }
-        cn {
-            java.srcDirs = ['src/main/java', 'src/cn/java']
-        }
-        sm {
-            java.srcDirs = ['src/main/java', 'src/sm/java']
-        }
    }

    productFlavors {
@ -210,8 +188,7 @@ android {
            buildConfigField "String", "DEV_VAPI_HOST", "\"${DEV_VAPI_HOST}\""
            buildConfigField "String", "QUICK_LOGIN_APPID", "\"${DEV_QUICK_LOGIN_APPID}\""
            buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${DEV_QUICK_LOGIN_APPKEY}\""
-            buildConfigField "String", "DEV_CSJ_APPID", "\"${DEV_CSJ_APPID}\""
-            buildConfigField "String", "CSJ_APPID", "\"${CSJ_APPID}\""
+            buildConfigField "String", "CSJ_APPID", "\"${DEV_CSJ_APPID}\""
        }

        // publish， 发布时候使用的 flavor，接口仅包含正式环境
@ -223,7 +200,6 @@ android {
            buildConfigField "String", "DEV_VAPI_HOST", "\"${VAPI_HOST}\""
            buildConfigField "String", "QUICK_LOGIN_APPID", "\"${QUICK_LOGIN_APPID}\""
            buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${QUICK_LOGIN_APPKEY}\""
-            buildConfigField "String", "DEV_CSJ_APPID", "\"${CSJ_APPID}\""
            buildConfigField "String", "CSJ_APPID", "\"${CSJ_APPID}\""
        }

@ -235,7 +211,6 @@ android {
            buildConfigField "String", "DEV_VAPI_HOST", "\"${VAPI_HOST}\""
            buildConfigField "String", "QUICK_LOGIN_APPID", "\"${QUICK_LOGIN_APPID}\""
            buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${QUICK_LOGIN_APPKEY}\""
-            buildConfigField "String", "DEV_CSJ_APPID", "\"${CSJ_APPID}\""
            buildConfigField "String", "CSJ_APPID", "\"${CSJ_APPID}\""

            manifestPlaceholders.put("APPLOG_SCHEME", "rangersapplog.byAx6uYt".toLowerCase())
@ -249,7 +224,6 @@ android {
            buildConfigField "String", "DEV_VAPI_HOST", "\"${VAPI_HOST}\""
            buildConfigField "String", "QUICK_LOGIN_APPID", "\"${QUICK_LOGIN_APPID}\""
            buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${QUICK_LOGIN_APPKEY}\""
-            buildConfigField "String", "DEV_CSJ_APPID", "\"${CSJ_APPID}\""
            buildConfigField "String", "CSJ_APPID", "\"${CSJ_APPID}\""
        }

@ -261,40 +235,8 @@ android {
            buildConfigField "String", "DEV_VAPI_HOST", "\"${VAPI_HOST}\""
            buildConfigField "String", "QUICK_LOGIN_APPID", "\"${QUICK_LOGIN_APPID}\""
            buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${QUICK_LOGIN_APPKEY}\""
-            buildConfigField "String", "DEV_CSJ_APPID", "\"${CSJ_APPID}\""
            buildConfigField "String", "CSJ_APPID", "\"${CSJ_APPID}\""
        }
-
-        sm {
-            dimension "env"
-
-            buildConfigField "String", "DEV_API_HOST", "\"${API_HOST}\""
-            buildConfigField "String", "NEW_DEV_API_HOST", "\"${NEW_API_HOST}\""
-            buildConfigField "String", "DEV_VAPI_HOST", "\"${VAPI_HOST}\""
-            buildConfigField "String", "QUICK_LOGIN_APPID", "\"${QUICK_LOGIN_APPID}\""
-            buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${QUICK_LOGIN_APPKEY}\""
-            buildConfigField "String", "DEV_CSJ_APPID", "\"${CSJ_APPID}\""
-            buildConfigField "String", "CSJ_APPID", "\"${CSJ_APPID}\""
-        }
-
-        // 港澳台
-        gat {
-            dimension "region"
-
-            applicationId rootProject.ext.applicationIdGat
-
-            // 支持繁体
-            resConfigs "zh", "zh-rTW"
-
-            buildConfigField "boolean", "IS_GAT_APP", "true"
-            buildConfigField "String", "LOG_HUB_PROJECT", "\"${LOG_HUB_PROJECT_GAT}\""
-            buildConfigField "String", "API_HOST", "\"${API_HOST_GAT}\""
-            buildConfigField "String", "NEW_API_HOST", "\"${NEW_API_HOST_GAT}\""
-        }
-
-        cn {
-            dimension "region"
-        }
    }
 }

@ -311,7 +253,6 @@ dependencies {
    teaImplementation fileTree(include: ['*.jar', '*.aar'], dir: 'src/tea/libs')
    kuaishouImplementation fileTree(include: ['*.jar', '*.aar'], dir: 'src/kuaishou/libs')
    gdtImplementation fileTree(include: ['*.jar', '*.aar'], dir: 'src/gdt/libs')
-    smImplementation fileTree(include: ['*.jar', '*.aar'], dir: 'src/sm/libs')
    testImplementation 'junit:junit:4.12'

    debugImplementation "com.squareup.leakcanary:leakcanary-android:${leakcanary}"
@ -331,8 +272,7 @@ dependencies {

    implementation "com.kyleduo.switchbutton:library:${switchButton}"

-    implementation "com.tencent.vasdolly:helper:${apkChannelPackage}"
-    implementation "com.tencent.vasdolly:writer:${apkChannelPackage}"
+    implementation "com.leon.channel:helper:${apkChannelPackage}"

    implementation "com.j256.ormlite:ormlite-android:${ormlite}"
    implementation "com.j256.ormlite:ormlite-core:${ormlite}"
@ -377,14 +317,12 @@ dependencies {

    implementation "com.lg:shortcut:${shortcut}"

-    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:${desugarJdkLibs}"
-
    kapt "com.alibaba:arouter-compiler:$arouterVersion"

    implementation project(':ndownload')
-    implementation project(':vspace-bridge')
+    implementation project(':vspace-bridge:vspace')

-    implementation(project(':module_common')) {
+    implementation (project(':module_common')) {
        exclude group: 'androidx.swiperefreshlayout'
    }
    implementation(project(':module_login')) {
@ -421,16 +359,6 @@ dependencies {
    implementation(project(':feature:qq_game')) {
        exclude group: 'androidx.swiperefreshlayout'
    }
-    internalImplementation(project(':module_internal_test'))
-    implementation(project(":va-lib"))
-    implementation(project(':va-main')) {
-        exclude group: 'androidx.swiperefreshlayout'
-    }
-    debugImplementation "com.bytedance.tools.codelocator:codelocator-core:2.0.3"
-    compileOnly project(":va-core")
-    compileOnly project(":va-plugin-host-lib")
-    implementation project(":va-plugin-host")
-    implementation project(":va-archive")
 }

 File propFile = file('sign.properties')
--- a/app/proguard-rules.txt
+++ b/app/proguard-rules.txt
@ -88,14 +88,7 @@
 -keep class com.qq.gdt.action.** {*;}
 -keep public class com.tencent.turingfd.sdk.**

-### 神马 SDK
-dontwarn com.gism.**
-
 -keepclasseswithmembers class * {
 native <methods>;
 }

-keepclassmembernames class com.contrarywind.view.WheelView {
-    private int itemsVisible;
-}
-
--- a/app/src/default/java/com/gh/gamecenter/provider/FlavorProviderImp.kt
+++ b/app/src/default/java/com/gh/gamecenter/provider/FlavorProviderImp.kt
@ -8,7 +8,7 @@ import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.utils.PackageFlavorHelper
 import com.gh.gamecenter.core.provider.IFlavorProvider
 import com.gh.gamecenter.core.utils.SPUtils
-import com.tencent.vasdolly.helper.ChannelReaderUtil
+import com.leon.channel.helper.ChannelReaderUtil

 class FlavorProviderImp : IFlavorProvider {
    override fun getChannelStr(application: Application): String {
--- a/app/src/gdt/java/com/gh/gamecenter/GdtHelper.kt
+++ b/app/src/gdt/java/com/gh/gamecenter/GdtHelper.kt
@ -5,7 +5,6 @@ import com.lightgame.utils.Utils
 import com.qq.gdt.action.ActionParam
 import com.qq.gdt.action.ActionType
 import com.qq.gdt.action.GDTAction
-import com.qq.gdt.action.PrivateController
 import org.json.JSONObject

 object GdtHelper {
@ -17,12 +16,6 @@ object GdtHelper {

    @JvmStatic
    fun init(application: Application, channel: String) {
-        GDTAction.setPrivateController(object : PrivateController() {
-            override fun isCanUsePhoneState(): Boolean {
-                return false
-            }
-        })
-
        if (channel == "KS_GDT_GHZS_MC01") {
            GDTAction.init(application, KS_USER_ACTION_SET_ID, KS_APP_SECRET_ID, channel)
        } else {
--- a/app/src/gdt/libs/GDTActionSDK.min.1.8.7.aar
+++ b/app/src/gdt/libs/GDTActionSDK.min.1.8.7.aar
--- a/app/src/internal/java/com/gh/vspace/ExternalGameUsage.kt
+++ b/app/src/internal/java/com/gh/vspace/ExternalGameUsage.kt
@ -1,85 +0,0 @@
-package com.gh.vspace
-
-import android.content.Intent
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.annotation.Keep
-import com.gh.gamecenter.R
-import com.gh.gamecenter.core.utils.ToastUtils
-import com.gh.gamecenter.databinding.LayoutPersonalOtherItemBinding
-import com.gh.vspace.installexternalgames.InstallExternalGameActivity
-import com.lg.vspace.VaApp
-import com.lg.vspace.plugin.host.PluginHelper
-import com.lightgame.utils.Utils
-import com.lightgame.utils.toast.ToastHelper
-import com.lody.virtual.client.core.VirtualCore
-import java.io.File
-
-@Keep
-class ExternalGameUsage : ITestCase {
-
-    private fun buttonTemplate(viewParent: ViewGroup, id: Int, fn: (LayoutPersonalOtherItemBinding) -> Unit) {
-        val context = viewParent.context
-        viewParent.findViewById<View>(id) ?: run {
-            val binding = LayoutPersonalOtherItemBinding.inflate(LayoutInflater.from(context)).apply {
-                root.id = id
-                fn(this)
-            }
-            viewParent.addView(binding.root, 0)
-        }
-    }
-
-    override fun addInstallExternalGameButton(viewParent: ViewGroup) {
-        val context = viewParent.context
-        buttonTemplate(viewParent, R.id.install_game_from_external) {
-            it.titleTv.text = context.getString(R.string.title_install_external_game)
-            it.iconIv.setImageResource(R.drawable.ic_personal_my_game)
-            it.root.setOnClickListener {
-                VHelper.connectService {
-                    context.startActivity(
-                        InstallExternalGameActivity.getIntent(context).apply { flags = flags or Intent.FLAG_ACTIVITY_NEW_TASK })
-                }
-            }
-        }
-    }
-
-    override fun addInstallPluginButton(viewParent: ViewGroup) {
-        buttonTemplate(viewParent, R.id.install_plugin) {
-            it.titleTv.text = "安装64位插件"
-            it.root.setOnClickListener {
-                val file = File("/data/local/tmp/gh-plugins/artifacts.zip")
-                if (file.exists()) {
-                    Utils.log(VHelper.LOG_TAG, "有本地更新文件: 64位插件")
-                    PluginHelper.getInstance().updatePlugin(file, VHelper.getCwBaseLogParams())
-                } else {
-                    ToastUtils.showToast("data/local/tmp没有push文件")
-                }
-            }
-        }
-    }
-
-    override fun addInstallPlugin32Button(viewParent: ViewGroup) {
-        buttonTemplate(viewParent, R.id.install_plugin_32) {
-            it.titleTv.text = "安装32位插件"
-            it.root.setOnClickListener {
-                val file = File("/data/local/tmp/gh-plugins/artifacts32.zip")
-                if (file.exists()) {
-                    Utils.log(VHelper.LOG_TAG, "有本地更新文件: 32位插件")
-                    VirtualCore.get().updatePlugin(file.absolutePath, "artifacts32.zip",
-                        VHelper.getCwBaseLogParams().let {
-                            val bundle = Bundle()
-                            for ((key, value) in it) {
-                                bundle.putString(key, value)
-                            }
-                            bundle
-                        })
-
-                } else {
-                    ToastUtils.showToast("data/local/tmp没有push文件")
-                }
-            }
-        }
-    }
-}
--- a/app/src/internal/java/com/gh/vspace/installexternalgames/Constants.java
+++ b/app/src/internal/java/com/gh/vspace/installexternalgames/Constants.java
@ -1,5 +0,0 @@
-package com.gh.vspace.installexternalgames;
-
-public class Constants {
-    public static final String TAG = "从SD卡安装";
-}
--- a/app/src/internal/java/com/gh/vspace/installexternalgames/ExternalGameAdapter.kt
+++ b/app/src/internal/java/com/gh/vspace/installexternalgames/ExternalGameAdapter.kt
@ -1,52 +0,0 @@
-package com.gh.vspace.installexternalgames
-
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import com.gh.gamecenter.common.utils.goneIf
-import com.gh.gamecenter.common.utils.toBinding
-
-class ExternalGameAdapter(private val games: List<ExternalGameUiState>, private val onItemClickListener: OnItemClickListener) :
-    RecyclerView.Adapter<ExternalGameViewHolder>() {
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ExternalGameViewHolder {
-        return ExternalGameViewHolder(parent.toBinding())
-    }
-
-    override fun getItemCount(): Int {
-        return games.size
-    }
-
-    override fun onBindViewHolder(holder: ExternalGameViewHolder, position: Int) {
-        val item = games[position]
-        holder.apkInfo.text = item.externalGameEntity.let { item ->
-            """
-            应用程序名：${item.appName}
-            版本号：${item.apkVersion}
-            包名: ${item.apkPackageName}
-            路径:${item.apkPath}
-            """.trimIndent()
-        }
-
-        holder.update.setOnClickListener {
-            onItemClickListener.onItemClick(item, OnItemClickListener.ClickType.CLICK_INSTALL)
-        }
-
-        holder.install.goneIf(item.isInstalled) {
-            holder.install.setOnClickListener {
-                onItemClickListener.onItemClick(item, OnItemClickListener.ClickType.CLICK_INSTALL)
-            }
-        }
-        holder.uninstall.goneIf(!item.isInstalled) {
-            holder.uninstall.setOnClickListener {
-                onItemClickListener.onItemClick(
-                    item,
-                    OnItemClickListener.ClickType.CLICK_UNINSTALL
-                )
-            }
-        }
-        holder.start.goneIf(!item.isInstalled) {
-            holder.start.setOnClickListener {
-                onItemClickListener.onItemClick(item, OnItemClickListener.ClickType.CLICK_START)
-            }
-        }
-    }
-}
--- a/app/src/internal/java/com/gh/vspace/installexternalgames/ExternalGameEntity.kt
+++ b/app/src/internal/java/com/gh/vspace/installexternalgames/ExternalGameEntity.kt
@ -1,11 +0,0 @@
-package com.gh.vspace.installexternalgames
-
-data class ExternalGameEntity(
-    val cpuAbi: Set<String>,
-    val apkPath: String,
-    val apkFileName: String,
-    val appName: String,
-    val apkVersion: String,
-    val apkPackageName: String,
-    val lastModified: Long,
-)
--- a/app/src/internal/java/com/gh/vspace/installexternalgames/ExternalGameUiState.kt
+++ b/app/src/internal/java/com/gh/vspace/installexternalgames/ExternalGameUiState.kt
@ -1,6 +0,0 @@
-package com.gh.vspace.installexternalgames
-
-data class ExternalGameUiState(
-    val externalGameEntity: ExternalGameEntity,
-    val isInstalled: Boolean
-)
--- a/app/src/internal/java/com/gh/vspace/installexternalgames/ExternalGameViewHolder.kt
+++ b/app/src/internal/java/com/gh/vspace/installexternalgames/ExternalGameViewHolder.kt
@ -1,12 +0,0 @@
-package com.gh.vspace.installexternalgames
-
-import androidx.recyclerview.widget.RecyclerView
-import com.gh.gamecenter.databinding.LayoutExternalGameItemBinding
-
-class ExternalGameViewHolder(binding: LayoutExternalGameItemBinding) : RecyclerView.ViewHolder(binding.root) {
-    val apkInfo = binding.apkFileInfo
-    val install = binding.btnInstall
-    val uninstall = binding.btnUninstall
-    val start = binding.btnStart
-    val update = binding.btnUpdate
-}
--- a/app/src/internal/java/com/gh/vspace/installexternalgames/InstallExternalGameActivity.kt
+++ b/app/src/internal/java/com/gh/vspace/installexternalgames/InstallExternalGameActivity.kt
@ -1,14 +0,0 @@
-package com.gh.vspace.installexternalgames
-
-import android.content.Context
-import android.content.Intent
-import android.os.Bundle
-import com.gh.gamecenter.common.base.activity.ToolBarActivity
-
-class InstallExternalGameActivity : ToolBarActivity() {
-    companion object {
-        fun getIntent(context: Context): Intent {
-            return getTargetIntent(context, InstallExternalGameActivity::class.java, InstallExternalGameFragment::class.java, Bundle())
-        }
-    }
-}
--- a/app/src/internal/java/com/gh/vspace/installexternalgames/InstallExternalGameFragment.kt
+++ b/app/src/internal/java/com/gh/vspace/installexternalgames/InstallExternalGameFragment.kt
@ -1,165 +0,0 @@
-package com.gh.vspace.installexternalgames
-
-import android.app.Dialog
-import android.os.Bundle
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.gh.common.util.DialogUtils
-import com.gh.gamecenter.R
-import com.gh.gamecenter.common.base.fragment.ToolbarFragment
-import com.gh.gamecenter.common.exposure.meta.MetaUtil
-import com.gh.gamecenter.common.utils.dip2px
-import com.gh.gamecenter.common.utils.toColor
-import com.gh.gamecenter.common.utils.viewModelProvider
-import com.gh.gamecenter.common.view.divider.HorizontalDividerItemDecoration
-import com.gh.gamecenter.core.AppExecutor
-import com.gh.gamecenter.databinding.FragmentInstallExternalGamesBinding
-import com.gh.vspace.VHelper
-import com.halo.assistant.HaloApp
-import com.lg.vspace.VirtualAppManager
-import com.lightgame.download.DownloadEntity
-import io.reactivex.Single
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.disposables.Disposable
-import io.reactivex.schedulers.Schedulers
-
-class InstallExternalGameFragment : ToolbarFragment(), OnItemClickListener {
-
-    private val mViewModel: InstallExternalGameViewModel by lazy { viewModelProvider() }
-
-    private lateinit var mBinding: FragmentInstallExternalGamesBinding
-
-    private val games = mutableListOf<ExternalGameUiState>()
-    private var adapter = ExternalGameAdapter(games, this)
-
-    private var uninstallDisposable: Disposable? = null
-
-    override fun getLayoutId() = 0
-
-    override fun getInflatedLayout() =
-        FragmentInstallExternalGamesBinding.inflate(layoutInflater).apply { mBinding = this }.root
-
-    private lateinit var dialog: Dialog
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setNavigationTitle(getString(com.gh.gamecenter.R.string.title_install_external_game))
-        initView()
-        mViewModel.gamesList.observe(this) {
-            if (dialog.isShowing) {
-                dialog.dismiss()
-            }
-            games.clear()
-            games.addAll(
-                it.map {
-                    ExternalGameUiState(it, VHelper.isInstalled(it.apkPackageName))
-                }
-            )
-            adapter.notifyDataSetChanged()
-        }
-        mViewModel.scanPaths()
-
-
-    }
-
-    private fun initView() {
-        dialog = DialogUtils.showWaitDialog(requireContext(), "")
-        mBinding.externalGamesList.let {
-            it.adapter = adapter
-            it.layoutManager = LinearLayoutManager(requireContext())
-            val itemDecoration = HorizontalDividerItemDecoration.Builder(requireContext())
-                .size(2F.dip2px())
-                .color(R.color.ui_divider.toColor(requireContext()))
-                .build()
-            if (it.itemDecorationCount != 0) {
-                it.removeItemDecorationAt(0)
-            }
-            it.addItemDecoration(itemDecoration)
-
-        }
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        if (dialog.isShowing) {
-            dialog.dismiss()
-        }
-        if (uninstallDisposable?.isDisposed != true) {
-            uninstallDisposable?.dispose()
-        }
-    }
-
-
-    override fun onItemClick(externalGameUiState: ExternalGameUiState, clickType: OnItemClickListener.ClickType) {
-        when (clickType) {
-            OnItemClickListener.ClickType.CLICK_INSTALL -> {
-                install(externalGameUiState)
-            }
-            OnItemClickListener.ClickType.CLICK_UNINSTALL -> {
-                uninstall(externalGameUiState)
-            }
-            OnItemClickListener.ClickType.CLICK_START -> {
-                start(externalGameUiState)
-            }
-        }
-    }
-
-    private fun install(externalGameUiState: ExternalGameUiState) {
-        val bit =
-            externalGameUiState.externalGameEntity.cpuAbi.let { if (it.size == 1 && it.contains("armeabi-v7a")) "32" else "64" }
-
-        VHelper.install(requireContext(), DownloadEntity().apply {
-            externalGameUiState.externalGameEntity.apply {
-                packageName = apkPackageName
-                path = apkPath
-            }
-        }, true)
-
-
-        if (VHelper.showDialogIfVSpaceIsNeeded(
-                requireContext(),
-                "",
-                externalGameUiState.externalGameEntity.appName,
-                "",
-                bit = bit
-            )
-        ) return
-        dialog.show()
-        externalGameUiState.externalGameEntity.let {
-            val intent = VirtualAppManager.getInstallIntent(context, it.apkPath, it.apkPackageName)
-            requireActivity().startActivity(intent)
-        }
-    }
-
-    private fun uninstall(externalGameUiState: ExternalGameUiState) {
-        dialog.show()
-        uninstallDisposable = Single.create<Void> {
-            VHelper.uninstall(externalGameUiState.externalGameEntity.apkPackageName)
-        }.subscribeOn(Schedulers.from(AppExecutor.lightWeightIoExecutor)).observeOn(AndroidSchedulers.mainThread())
-            .subscribe { t1, t2 ->
-                if (dialog.isShowing) {
-                    dialog.dismiss()
-                }
-            }
-    }
-
-
-    private fun start(externalGameUiState: ExternalGameUiState) {
-        val intent = VirtualAppManager.get().getStartGameIntent(
-            externalGameUiState.externalGameEntity.apkPackageName,
-            "",
-            externalGameUiState.externalGameEntity.appName,
-            "",
-            MetaUtil.getBase64EncodedAndroidId(),
-            HaloApp.getInstance().gid,
-            com.gh.gamecenter.BuildConfig.VERSION_NAME,
-            HaloApp.getInstance().channel,
-            "",
-            "",
-            com.lg.core.BuildConfig.VERSION_NAME,
-            HaloApp.getInstance().oaid
-        )
-        requireActivity().startActivity(intent)
-    }
-
-
-}
--- a/app/src/internal/java/com/gh/vspace/installexternalgames/InstallExternalGameViewModel.kt
+++ b/app/src/internal/java/com/gh/vspace/installexternalgames/InstallExternalGameViewModel.kt
@ -1,64 +0,0 @@
-package com.gh.vspace.installexternalgames
-
-import android.app.Application
-import android.content.pm.PackageManager
-import android.os.Environment
-import androidx.lifecycle.AndroidViewModel
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import com.gh.gamecenter.core.runOnIoThread
-import com.gh.vspace.VHelper
-import com.lg.vspace.helper.compat.NativeLibraryHelperCompat
-import com.lightgame.utils.Utils
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.disposables.Disposable
-
-class InstallExternalGameViewModel(application: Application) : AndroidViewModel(application) {
-    private val _gamesList = MutableLiveData<List<ExternalGameEntity>>(listOf())
-    val gamesList: LiveData<List<ExternalGameEntity>> = _gamesList
-    private val pkgManger = getApplication<Application>().packageManager
-    private var disposable: Disposable = VHelper.callSite.observeOn(AndroidSchedulers.mainThread()).subscribe {
-        scanPaths()
-    }
-
-    fun scanPaths() {
-        runOnIoThread {
-            _gamesList.postValue(Environment.getExternalStorageDirectory().walk().maxDepth(1)
-                .filter { it.isHidden.not() }
-                .filter { it.isFile }
-                .onEach {
-                    Utils.log(Constants.TAG, "获得文件: ${it.name}")
-                }
-                .filter { it.extension == "apk" }
-                .map {
-                    val packageInfo = pkgManger.getPackageArchiveInfo(
-                        it.absolutePath,
-                        PackageManager.GET_META_DATA or PackageManager.GET_ACTIVITIES
-                    )
-                    packageInfo?.let { packageInfo ->
-                        val applicationInfo = packageInfo.applicationInfo
-                        applicationInfo.publicSourceDir = it.absolutePath
-                        applicationInfo.sourceDir = it.absolutePath
-                        ExternalGameEntity(
-                            cpuAbi = NativeLibraryHelperCompat.getPackageAbiList(it.absolutePath),
-                            apkPath = it.absolutePath,
-                            apkFileName = it.name,
-                            apkPackageName = packageInfo.packageName,
-                            apkVersion = packageInfo.versionName,
-                            appName = pkgManger.getApplicationLabel(applicationInfo).toString(),
-                            lastModified = it.lastModified()
-                        )
-                    }
-                }.filterNotNull()
-                .toList().sortedByDescending { it.lastModified }
-            )
-        }
-    }
-
-
-    override fun onCleared() {
-        super.onCleared()
-        disposable.dispose()
-    }
-
-}
--- a/app/src/internal/java/com/gh/vspace/installexternalgames/OnItemClickListener.kt
+++ b/app/src/internal/java/com/gh/vspace/installexternalgames/OnItemClickListener.kt
@ -1,11 +0,0 @@
-package com.gh.vspace.installexternalgames
-
-interface OnItemClickListener {
-
-    enum class ClickType {
-        CLICK_INSTALL, CLICK_UNINSTALL, CLICK_START
-    }
-
-    fun onItemClick(externalGameUiState: ExternalGameUiState, clickType: ClickType)
-
-}
--- a/app/src/internal/res/layout/fragment_install_external_games.xml
+++ b/app/src/internal/res/layout/fragment_install_external_games.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/external_games_list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/internal/res/layout/layout_external_game_item.xml
+++ b/app/src/internal/res/layout/layout_external_game_item.xml
@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/apk_file_info"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textSize="20sp"
-        tools:text="文件名：\n路径：" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <Button
-            android:id="@+id/btn_install"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/text_install"
-            android:visibility="gone"
-            tools:visibility="visible" />
-
-        <Button
-            android:id="@+id/btn_update"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/text_update"
-            android:visibility="visible"
-            tools:visibility="visible" />
-
-        <Button
-            android:id="@+id/btn_uninstall"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/text_uninstall"
-            android:visibility="gone"
-            tools:visibility="visible" />
-
-        <Button
-            android:id="@+id/btn_start"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/text_start"
-            android:visibility="gone"
-            tools:visibility="visible" />
-    </LinearLayout>
-</LinearLayout>
--- a/app/src/internal/res/values-zh-rTW/strings.xml
+++ b/app/src/internal/res/values-zh-rTW/strings.xml
@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="title_install_external_game">從SD卡安裝</string>
-    <string name="text_install">安裝</string>
-    <string name="text_uninstall">卸載</string>
-    <string name="text_start">啟動</string>
-</resources>
--- a/app/src/internal/res/values/ids.xml
+++ b/app/src/internal/res/values/ids.xml
@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <item name="install_game_from_external" type="id" />
-    <item name="install_plugin" type="id" />
-    <item name="install_plugin_32" type="id" />
-</resources>
--- a/app/src/internal/res/values/strings.xml
+++ b/app/src/internal/res/values/strings.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="title_install_external_game">从SD卡安装</string>
-    <string name="text_install">安装</string>
-    <string name="text_update">更新</string>
-    <string name="text_uninstall">卸载</string>
-    <string name="text_start">启动</string>
-</resources>
--- a/app/src/kuaishou/libs/monitorsdk-1.0.13.aar
+++ b/app/src/kuaishou/libs/monitorsdk-1.0.13.aar
--- a/app/src/kuaishou/libs/monitorsdk-1.0.15.aar
+++ b/app/src/kuaishou/libs/monitorsdk-1.0.15.aar
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -78,36 +78,11 @@
        androidx.constraintlayout.compose,
        androidx.compose.ui.test.manifest,
        com.bytedance.sdk.openadsdk,
-        com.bykv.vk.openvk,
-        com.bytedance.tools,
        androidx.compose.ui.tooling.preview,
        com.tencent.qqmini,
        com.tencent.qqmini.minigame.external,
        com.tencent.qqmini.minigame.opensdk,
-        com.tencent.qqmini.union.ad,
-        com.lg.vspace,
-        io.lg.va.common,
-        com.va.floating,
-        com.lg.cloud,
-        com.lg.archive,
-        com.lg.vclient,
-        com.va.realname,
-        com.lg.vspace.flavor,
-        com.lg.update,
-        com.lg.login,
-        com.lg.accelerator,
-        com.lody.virtual,
-        com.lg.core,
-        com.lg.ads,
-        com.lg.common,
-        com.lg.vspace.network,
-        com.lody.virtual.lib.res,
-        com.va.host,
-        com.lg.vspace.plugin.host,
-        com.lg.plugin.constant,
-        com.bytedance.tools.codelocator,
-        org.chickenhook.restrictionbypass,
-        com.lody.virtual.sandhook,com.lg.vspace.common" />
+        com.tencent.qqmini.union.ad" />

    <!-- 去掉 SDK 一些流氓权限 -->
    <uses-permission
@ -122,9 +97,6 @@
        android:name="android.permission.GET_TASKS"
        tools:node="remove" />

-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"
-        tools:node="remove"/>
-
    <supports-screens
        android:anyDensity="true"
        android:largeScreens="true"
@ -502,14 +474,6 @@
            android:name="com.gh.gamecenter.gamedetail.fuli.kaifu.ServersCalendarActivity"
            android:screenOrientation="portrait" />

-        <activity
-            android:name=".gamedetail.fuli.kaifu.ServersCalendarManagementActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".gamedetail.fuli.kaifu.ServersSubscribedGameListActivity"
-            android:screenOrientation="portrait" />
-
        <activity
            android:name=".qa.answer.draft.AnswerDraftActivity"
            android:screenOrientation="portrait" />
@ -790,15 +754,7 @@
            android:screenOrientation="portrait" />

        <activity
-            android:name="com.gh.gamecenter.gamecollection.hotlist.GameCollectionListDetailActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name="com.gh.gamecenter.UserAuthActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name="com.gh.gamecenter.SplashAdActivity"
+            android:name="com.gh.gamecenter.qgame.QGameSubjectActivity"
            android:screenOrientation="portrait" />


@ -812,8 +768,7 @@
            android:name="androidx.core.content.FileProvider"
            android:authorities="${applicationId}"
            android:exported="false"
-            android:grantUriPermissions="true"
-            tools:replace="android:authorities">
+            android:grantUriPermissions="true">
            <meta-data
                android:name="android.support.FILE_PROVIDER_PATHS"
                android:resource="@xml/provider_paths" />
@ -857,8 +812,6 @@
        <!--                tools:node="remove" />-->
        <!--        </provider>-->

-        <service android:name = "com.gh.gamecenter.install.InstallService" />
-
        <receiver
            android:name="com.gh.gamecenter.receiver.DownloadReceiver"
            android:exported="false">
--- a/app/src/main/assets/lottie/video.json
+++ b/app/src/main/assets/lottie/video.json
--- a/app/src/main/assets/rich_editor.js
+++ b/app/src/main/assets/rich_editor.js
@ -352,9 +352,9 @@ RE.ImageClickListener = function() {
         var img = imgs[i];
         var imageClassName = img.className;
         if (imageClassName == "image-link"|| img.className == "poster") continue;
-         window.imagelistener.imageArr(img.src);
+         window.NativeCallBack.invokeMethod("imageArr", img.src);
         img.onclick = function() {
-             window.imagelistener.imageClick(this.src);
+            window.NativeCallBack.invokeMethod("imageClick", this.src);
         }
    }
 }
--- a/app/src/main/java/com/gh/ad/AdDelegateHelper.kt
+++ b/app/src/main/java/com/gh/ad/AdDelegateHelper.kt
@ -17,7 +17,6 @@ import com.gh.common.exposure.ExposureManager
 import com.gh.common.util.DirectUtils.directToLinkPage
 import com.gh.common.util.LogUtils
 import com.gh.common.util.NewFlatLogUtils.logOpenScreenAdSkip
-import com.gh.common.util.PackageUtils
 import com.gh.gamecenter.BuildConfig
 import com.gh.gamecenter.MainActivity
 import com.gh.gamecenter.R
@ -66,8 +65,7 @@ object AdDelegateHelper {

    private const val AD_SDK_CSJ = "穿山甲"
    private const val AD_SDK_BEIZI = "倍孜"
-    const val AD_TYPE_SDK = "third_party_ads" // 第三方 SDK 广告
-    const val AD_TYPE_OWNER = "owner_ads" // 自有广告
+    private const val AD_TYPE_SDK = "third_party_ads" // 第三方 SDK 广告

    private const val KEY_CACHE_CONFIG = "cache_config" // 放在 SP 里的广告缓存（避免接口加载问题）

@ -75,9 +73,6 @@ object AdDelegateHelper {
        HaloApp.getInstance().getSharedPreferences("AdConfig", Context.MODE_PRIVATE)
    }

-    var isShowingSplashAd = false // 是否正在显示开屏广告
-    var gameSearchKeyword = ""
-
    fun initAdSdk(context: Context) {
        // 初始化 Beizi
        if (mBeiziAdImpl == null) {
@ -90,8 +85,7 @@ object AdDelegateHelper {
        if (mCsjAdImpl == null) {
            mCsjAdImpl =
                ARouter.getInstance().build(RouteConsts.provider.csjAd).navigation() as? ICsjAdProvider
-            val csjAppId = if (EnvHelper.isDevEnv) BuildConfig.DEV_CSJ_APPID else BuildConfig.CSJ_APPID
-            mCsjAdImpl?.initSDK(context, csjAppId, HaloApp.getInstance().oaid)
+            mCsjAdImpl?.initSDK(context, BuildConfig.CSJ_APPID, HaloApp.getInstance().oaid)
            // 监听亮色/暗色模式切换
            DarkModeUtils.registerModeChangeListener {
                val topActivity = CurrentActivityHolder.getCurrentActivity() ?: return@registerModeChangeListener
@ -104,21 +98,19 @@ object AdDelegateHelper {
     * 请求接口获取广告相关配置
     */
    @SuppressLint("CheckResult")
-    fun requestAdConfig(isFromRetry: Boolean, keyword: String = "", callback: (() -> Unit)? = null) {
+    fun requestAdConfig(isFromRetry: Boolean) {
        // mAdConfigList 不为空不需要重试
        if (isFromRetry && mAdConfigList != null) {
            return
        }
-        val paramsMap = if (keyword.isNotEmpty()) mapOf("keyword" to keyword) else mapOf()
+
        RetrofitManager.getInstance()
            .newApi
-            .getAdConfig(paramsMap)
+            .adConfig
            .subscribeOn(Schedulers.io())
            .subscribe(object : BiResponse<List<AdConfig>>() {
                override fun onSuccess(data: List<AdConfig>) {
-                    gameSearchKeyword = keyword
                    handleAdConfig(data)
-                    callback?.invoke()

                    // 缓存数据到 SP 供接口请求失败用
                    SPUtils.setString(mAdConfigSp, KEY_CACHE_CONFIG, data.toJson())
@ -132,8 +124,6 @@ object AdDelegateHelper {
                    if (cachedConfig != null) {
                        handleAdConfig(cachedConfig)
                    }
-
-                    callback?.invoke()
                }
            })
    }
@ -156,18 +146,10 @@ object AdDelegateHelper {
     * 处理广告配置
     */
    fun handleAdConfig(configList: List<AdConfig>) {
-        mGameSearchAdList.clear()
-        mSplashAd = null
-        mDownloadManagerAd = null
-        mVGameLaunchAd = null
        for (config in configList) {
            // 处理返回的数据
            when (config.location) {
-                "halo_launch" -> {
-                    config.ownerAd?.startAd?.let { it.id = config.ownerAd.id }
-                    mSplashAd = config
-                }
-
+                "halo_launch" -> mSplashAd = config
                "download_manager" -> mDownloadManagerAd = config
                "game_search" -> config.let { mGameSearchAdList.add(it) }
                "helper_launch" -> mVGameLaunchAd = config
@ -177,104 +159,9 @@ object AdDelegateHelper {

    /**
     * 是否需要显示开屏广告
-     * @param isHotLaunch 是否为热启动
     */
-    fun shouldShowStartUpAd(isHotLaunch: Boolean): Boolean {
+    fun shouldShowStartUpAd(): Boolean {
        return mSplashAd != null
-                && !isShowingSplashAd
-                && (!isHotLaunch || shouldShowStartUpAdWhenHotLaunch())
-                && !isMatchAdFreeRule(mSplashAd)
-                && isMatchStartUpAdDisplayRule()
-    }
-
-    /**
-     * 热启动是否需要显示开屏广告
-     */
-    private fun shouldShowStartUpAdWhenHotLaunch() = mSplashAd?.displayRule?.hotStartSplashAd?.type == AD_TYPE_SDK
-
-    /**
-     * 是否需要显示下载管理广告
-     */
-    fun shouldShowDownloadManagerAd(): Boolean {
-        return mDownloadManagerAd != null && !isMatchAdFreeRule(mDownloadManagerAd) && isMatchDownloadManagerAdDisplayRule()
-    }
-
-    fun shouldShowHelperLaunchAd(): Boolean {
-        return mVGameLaunchAd != null && !isMatchAdFreeRule(mVGameLaunchAd) && isMatchAdDisplayRule(mVGameLaunchAd, Constants.SP_LAST_HELPER_LAUNCH_AD_SHOW_TIME)
-    }
-
-    /**
-     * 是否需要显示游戏搜索广告
-     */
-    fun shouldShowGameSearchAd(adConfig: AdConfig): Boolean {
-        return !isMatchAdFreeRule(adConfig) && isMatchGameSearchAdDisplayRule(adConfig)
-    }
-
-    /**
-     * 是否在免广告时长内
-     */
-    private fun isMatchAdFreeRule(adConfig: AdConfig?): Boolean {
-        adConfig?.displayRule?.run {
-            if (adFreeDuration > 0) {
-                val ghInstalledDurationInHours = (System.currentTimeMillis() - PackageUtils.getInstalledTime(
-                    HaloApp.getInstance(),
-                    BuildConfig.APPLICATION_ID
-                )).toFloat() / 1000 / 3600
-                return ghInstalledDurationInHours < adFreeDuration
-            } else {
-                return false
-            }
-        }
-        return false
-    }
-
-    /**
-     * 是否大于开屏广告展示间隔时长
-     */
-    private fun isMatchStartUpAdDisplayRule(): Boolean {
-        mSplashAd?.displayRule?.run {
-            if (adDisplayInterval > 0) {
-                val lastShowTime = SPUtils.getLong(Constants.SP_LAST_SPLASH_AD_SHOW_TIME, 0L)
-                val durationInMinutes = (System.currentTimeMillis() - lastShowTime).toFloat() / 1000 / 60
-                return durationInMinutes > adDisplayInterval
-            } else {
-                return true
-            }
-        }
-        return true
-    }
-
-    /**
-     * 是否大于广告管理展示间隔时长
-     */
-    private fun isMatchDownloadManagerAdDisplayRule(): Boolean = isMatchAdDisplayRule(mDownloadManagerAd, Constants.SP_LAST_DOWNLOAD_MANAGER_AD_SHOW_TIME)
-    private fun isMatchAdDisplayRule(adConfig: AdConfig?, spKey: String): Boolean {
-        adConfig?.displayRule?.run {
-            if (adDisplayInterval > 0) {
-                val lastShowTime = SPUtils.getLong(spKey, 0L)
-                val durationInMinutes = (System.currentTimeMillis() - lastShowTime).toFloat() / 1000 / 60
-                return durationInMinutes > adDisplayInterval
-            } else {
-                return true
-            }
-        }
-        return true
-    }
-
-    /**
-     * 是否大于游戏搜索展示间隔时长
-     */
-    private fun isMatchGameSearchAdDisplayRule(adConfig: AdConfig?): Boolean {
-        adConfig?.displayRule?.run {
-            if (adDisplayInterval > 0) {
-                val lastShowTime = SPUtils.getLong(Constants.SP_LAST_GAME_SEARCH_AD_SHOW_TIME + adConfig.position, 0L)
-                val durationInMinutes = (System.currentTimeMillis() - lastShowTime).toFloat() / 1000 / 60
-                return durationInMinutes > adDisplayInterval
-            } else {
-                return true
-            }
-        }
-        return true
    }

    /**
@ -298,125 +185,50 @@ object AdDelegateHelper {
        sdkStartAdContainer: ViewGroup,
        adsViewGroup: FrameLayout,
        handler: BaseActivity.BaseHandler,
-        isHotLaunch: Boolean,
-        hideAction: () -> Unit
-    ) {
-        val hideCallback = {
-            isShowingSplashAd = false
-            hideAction.invoke()
-        }
-        if (mSplashAd != null) {
-            when (if (isHotLaunch) mSplashAd!!.displayRule.hotStartSplashAd?.type else mSplashAd!!.displayRule.adSource) {
-                AD_TYPE_SDK -> {
-                    isShowingSplashAd = true
-                    requestThirdPartySplashAd(
-                        activity,
-                        adViewWidthInPx,
-                        adViewHeightInPx,
-                        adViewWidthInDp,
-                        adViewHeightInDp,
-                        startAdContainer,
-                        sdkStartAdContainer,
-                        adsViewGroup,
-                        handler,
-                        isHotLaunch,
-                        hideCallback
-                    )
-                }
-
-                AD_TYPE_OWNER -> {
-                    isShowingSplashAd = true
-                    requestStandardSplashAd(
-                        activity,
-                        adViewWidthInPx,
-                        adViewHeightInPx,
-                        adViewWidthInDp,
-                        adViewHeightInDp,
-                        startAdContainer,
-                        sdkStartAdContainer,
-                        adsViewGroup,
-                        handler,
-                        isHotLaunch,
-                        hideCallback
-                    )
-                }
-            }
-        } else {
-            hideCallback.invoke()
-        }
-    }
-
-    /**
-     * 获取第三方开屏广告
-     */
-    private fun requestThirdPartySplashAd(
-        activity: Activity,
-        adViewWidthInPx: Int,
-        adViewHeightInPx: Int,
-        adViewWidthInDp: Float,
-        adViewHeightInDp: Float,
-        startAdContainer: ViewGroup,
-        sdkStartAdContainer: ViewGroup,
-        adsViewGroup: FrameLayout,
-        handler: BaseActivity.BaseHandler,
-        isHotLaunch: Boolean,
        hideCallback: () -> Unit
    ) {
-        val timeout = if (isHotLaunch) {
-            ((mSplashAd!!.displayRule.hotStartSplashAd?.timeout ?: 3.5F) * 1000).toInt()
-        } else {
-            (mSplashAd!!.displayRule.timeout * 1000).toInt()
-        }
-        // 第三方开屏广告回调，失败时根据接口配置选项决定是否显示自有开屏广告
-        val sdkSplashCallback: (isSuccess: Boolean) -> Unit = { isSuccess ->
-            if (isSuccess) {
-                hideCallback.invoke()
-                SPUtils.setLong(Constants.SP_LAST_SPLASH_AD_SHOW_TIME, System.currentTimeMillis())
-            } else {
-                if (mSplashAd?.displayRule?.adSource == AD_TYPE_SDK && mSplashAd?.displayRule?.onFailedAction == "show" && !isHotLaunch) {
-                    sdkStartAdContainer.visibility = View.GONE
-                    requestStandardSplashAd(
+        if (mSplashAd != null) {
+            if (mSplashAd!!.displayRule.adSource == AD_TYPE_SDK) {
+                // 第三方开屏广告回调，失败时根据接口配置选项决定是否显示自有开屏广告
+                val sdkSplashCallback: (isSuccess: Boolean) -> Unit = { isSuccess ->
+                    if (isSuccess) {
+                        hideCallback.invoke()
+                    } else {
+                        if (mSplashAd?.displayRule?.onFailedAction == "show") {
+                            sdkStartAdContainer.visibility = View.GONE
+                            requestStandardSplashAd(mSplashAd!!.ownerAd, startAdContainer, handler, hideCallback)
+                        } else {
+                            hideCallback.invoke()
+                        }
+                    }
+                }
+
+                // 第三方广告的数据为空，按加载失败处理
+                if (mSplashAd?.thirdPartyAd == null) {
+                    sdkSplashCallback.invoke(false)
+                    return
+                }
+
+                if (mSplashAd?.thirdPartyAd?.sourceName == AD_SDK_BEIZI) {
+                    sdkStartAdContainer.visibility = View.VISIBLE
+                    requestBeiziSplashAd(sdkStartAdContainer, adsViewGroup, adViewWidthInPx, adViewHeightInPx, sdkSplashCallback)
+                } else if (mSplashAd?.thirdPartyAd?.sourceName == AD_SDK_CSJ) {
+                    sdkStartAdContainer.visibility = View.VISIBLE
+                    requestCsjSplashAd(
                        activity,
+                        mSplashAd?.thirdPartyAd?.slotId ?: "unknown",
                        adViewWidthInPx,
                        adViewHeightInPx,
                        adViewWidthInDp,
                        adViewHeightInDp,
-                        startAdContainer,
                        sdkStartAdContainer,
-                        adsViewGroup,
-                        handler,
-                        isHotLaunch,
-                        hideCallback
+                        sdkSplashCallback
                    )
-                } else {
-                    hideCallback.invoke()
                }
+            } else {
+                requestStandardSplashAd(mSplashAd!!.ownerAd, startAdContainer, handler, hideCallback)
            }
        }
-
-        // 第三方广告的数据为空，按加载失败处理
-        if (mSplashAd?.thirdPartyAd == null) {
-            sdkSplashCallback.invoke(false)
-            return
-        }
-
-        if (mSplashAd?.thirdPartyAd?.sourceName == AD_SDK_BEIZI) {
-            sdkStartAdContainer.visibility = View.VISIBLE
-            requestBeiziSplashAd(sdkStartAdContainer, adsViewGroup, adViewWidthInPx, adViewHeightInPx, timeout.toLong(), sdkSplashCallback)
-        } else if (mSplashAd?.thirdPartyAd?.sourceName == AD_SDK_CSJ) {
-            sdkStartAdContainer.visibility = View.VISIBLE
-            requestCsjSplashAd(
-                activity,
-                mSplashAd?.thirdPartyAd?.slotId ?: "unknown",
-                adViewWidthInPx,
-                adViewHeightInPx,
-                adViewWidthInDp,
-                adViewHeightInDp,
-                sdkStartAdContainer,
-                timeout,
-                sdkSplashCallback
-            )
-        }
    }

    /**
@ -430,7 +242,6 @@ object AdDelegateHelper {
        adViewWidthInDp: Float,
        adViewHeightInDp: Float,
        startAdContainer: ViewGroup,
-        timeout: Int,
        callback: (isSuccess: Boolean) -> Unit,
    ) {
        if (mCsjAdImpl == null) {
@ -444,7 +255,6 @@ object AdDelegateHelper {
                adViewWidthInDp,
                adViewHeightInDp,
                startAdContainer,
-                timeout,
                callback,
            )
        }
@ -458,13 +268,12 @@ object AdDelegateHelper {
        adsFl: FrameLayout,
        adViewWidthInPx: Int,
        adViewHeightInPx: Int,
-        timeout: Long,
        callback: (isSuccess: Boolean) -> Unit,
    ) {
        if (mBeiziAdImpl == null) {
            callback.invoke(false)
        } else {
-            mBeiziAdImpl?.requestSplashAd(startAdContainer, adsFl, adViewWidthInPx, adViewHeightInPx, timeout, callback)
+            mBeiziAdImpl?.requestSplashAd(startAdContainer, adsFl, adViewWidthInPx, adViewHeightInPx, callback)
        }
    }

@ -472,41 +281,13 @@ object AdDelegateHelper {
     * 显示自有的开屏广告
     */
    private fun requestStandardSplashAd(
-        activity: Activity,
-        adViewWidthInPx: Int,
-        adViewHeightInPx: Int,
-        adViewWidthInDp: Float,
-        adViewHeightInDp: Float,
+        splashAd: StartupAdEntity?,
        startAdContainer: ViewGroup,
-        sdkStartAdContainer: ViewGroup,
-        adsViewGroup: FrameLayout,
        handler: BaseActivity.BaseHandler,
-        isHotLaunch: Boolean,
        hideCallback: () -> Unit
    ) {
-        val splashAd = mSplashAd?.ownerAd?.startAd
-        val onEmptyCallback = {
-            if (mSplashAd?.displayRule?.adSource == AD_TYPE_OWNER && mSplashAd?.displayRule?.onFailedAction == "show" && mSplashAd?.thirdPartyAd != null) {
-                // 自有广告为空时，显示第三方广告
-                requestThirdPartySplashAd(
-                    activity,
-                    adViewWidthInPx,
-                    adViewHeightInPx,
-                    adViewWidthInDp,
-                    adViewHeightInDp,
-                    startAdContainer,
-                    sdkStartAdContainer,
-                    adsViewGroup,
-                    handler,
-                    isHotLaunch,
-                    hideCallback
-                )
-            } else {
-                hideCallback.invoke()
-            }
-        }
        if (splashAd == null) {
-            onEmptyCallback.invoke()
+            hideCallback.invoke()
            return
        }

@ -519,7 +300,7 @@ object AdDelegateHelper {
                ) {
                    showStandardSplashAd(splashAd, startAdContainer, handler, hideCallback)
                } else {
-                    onEmptyCallback.invoke()
+                    hideCallback.invoke()
                }

                "everyday" -> {
@ -530,7 +311,7 @@ object AdDelegateHelper {
                    ) {
                        showStandardSplashAd(splashAd, startAdContainer, handler, hideCallback)
                    } else {
-                        onEmptyCallback.invoke()
+                        hideCallback.invoke()
                    }
                }

@ -551,9 +332,7 @@ object AdDelegateHelper {
        val jumpBtn: View = startAdContainer.findViewById(R.id.jumpBtn)
        val jumpDetailBtn: TextView = startAdContainer.findViewById(R.id.jumpDetailBtn)
        val adImage: SimpleDraweeView = startAdContainer.findViewById(R.id.adImage)
-        val icpContainer: View? = startAdContainer.findViewById(R.id.startAdIcpContainer)
        startAdContainer.visibility = View.VISIBLE
-        icpContainer?.visibility = View.VISIBLE
        jumpDetailBtn.text = ad.desc
        jumpDetailBtn.setDrawableEnd(
            AppCompatResources.getDrawable(
@ -593,14 +372,13 @@ object AdDelegateHelper {
        } else {
            LogUtils.logStartAd("start_ads", ad)
        }
-        SPUtils.setLong(Constants.SP_LAST_SPLASH_AD_SHOW_TIME, System.currentTimeMillis())
        handler.sendEmptyMessageDelayed(MainActivity.COUNTDOWN_AD, 1000)
    }

    /**
-     * 获取第三方信息流广告
+     * 获取信息流广告
     */
-    fun requestThirdPartyFlowAd(
+    fun requestFlowAd(
        fragment: Fragment,
        slotId: String,
        adContainerView: ViewGroup,
@ -611,9 +389,9 @@ object AdDelegateHelper {
    }

    /**
-     * 获取第三方 Banner 广告
+     * 获取 Banner 广告
     */
-    fun requestThirdPartyBannerAd(
+    fun requestBannerAd(
        fragment: Fragment,
        containerView: ViewGroup,
        ad: AdConfig.ThirdPartyAd,
--- a/app/src/main/java/com/gh/ad/LaunchAdImpl.kt
+++ b/app/src/main/java/com/gh/ad/LaunchAdImpl.kt
@ -1,44 +0,0 @@
-package com.gh.ad
-
-import android.content.Context
-import android.view.View
-import android.view.ViewGroup
-
-import androidx.fragment.app.Fragment
-
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.common.utils.goneIf
-import com.gh.gamecenter.core.utils.DisplayUtils
-import com.gh.gamecenter.core.utils.SPUtils
-import com.lg.vspace.ui.launcher.ILaunchAd
-
-@Route(path = RouteConsts.provider.vaAd, name = "畅玩启动页广告")
-class LaunchAdImpl : ILaunchAd {
-    override fun init(context: Context?) {
-    }
-
-    override fun requestAd(fragment: Fragment, container: ViewGroup, maskView: View) {
-        if (AdDelegateHelper.shouldShowHelperLaunchAd()) {
-            val launchAd = AdDelegateHelper.vGameLaunchAd
-            val showThirdPartyAd = launchAd?.displayRule?.adSource == AdDelegateHelper.AD_TYPE_SDK
-            val thirdPartyAd = launchAd?.thirdPartyAd
-            if (showThirdPartyAd && thirdPartyAd != null) {
-                AdDelegateHelper.requestThirdPartyBannerAd(
-                    fragment,
-                    container,
-                    thirdPartyAd,
-                    DisplayUtils.getScreenWidthInDp(fragment.requireActivity()),
-                ) { isSuccess ->
-                    maskView.goneIf(!isSuccess)
-                    if (isSuccess) {
-                        SPUtils.setLong(Constants.SP_LAST_HELPER_LAUNCH_AD_SHOW_TIME, System.currentTimeMillis())
-                    }
-                }
-            }
-        }
-    }
-
-
-}
--- a/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt
+++ b/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt
@ -233,7 +233,7 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
        mKeyboardHeightProvider = KeyboardHeightProvider(this)
        mRichEditor.post { mKeyboardHeightProvider?.start() }
        mRichEditor.enableForceDark(DarkModeUtils.isDarkModeOn(this))
-        mRichEditor.setEditorBackgroundColor(R.color.ui_surface.toColor(this))
+        mRichEditor.setEditorBackgroundColor(R.color.background_white.toColor(this))
        mRichEditor.setEditorFontColor(if (mIsDarkModeOn) Color.parseColor("#C2C2C2") else Color.parseColor("#4A4A4A"))
        // 防止个别手机在Js里无法获取粘贴内容
        mRichEditor.addJavascriptInterface(OnPasteListener(), "onPasteListener")
@ -797,9 +797,9 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct

    override fun onDarkModeChanged() {
        super.onDarkModeChanged()
-        updateStatusBarColor(R.color.ui_surface, R.color.ui_surface)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
        mRichEditor.enableForceDark(DarkModeUtils.isDarkModeOn(this))
-        mRichEditor.setEditorBackgroundColor(R.color.ui_surface.toColor(this))
+        mRichEditor.setEditorBackgroundColor(R.color.background_white.toColor(this))
        mRichEditor.setEditorFontColor(if (mIsDarkModeOn) Color.parseColor("#C2C2C2") else Color.parseColor("#4A4A4A"))
    }

--- a/app/src/main/java/com/gh/base/BaseRichEditorViewModel.kt
+++ b/app/src/main/java/com/gh/base/BaseRichEditorViewModel.kt
@ -28,7 +28,6 @@ import com.gh.gamecenter.retrofit.service.ApiService
 import com.gh.gamecenter.video.upload.OnUploadListener
 import com.gh.gamecenter.video.upload.UploadManager
 import com.google.gson.JsonObject
-import com.lightgame.download.FileUtils
 import com.lightgame.utils.Utils
 import com.zhihu.matisse.Matisse
 import com.zhihu.matisse.internal.utils.PathUtils
@ -39,10 +38,6 @@ import okhttp3.ResponseBody
 import retrofit2.HttpException
 import java.io.File
 import java.io.FileOutputStream
-import java.util.*
-import kotlin.collections.ArrayList
-import kotlin.collections.HashMap
-import kotlin.collections.LinkedHashMap
 import kotlin.collections.set

 // TODO: 移动到module_bbs模块
@ -129,17 +124,8 @@ abstract class BaseRichEditorViewModel(application: Application) : AndroidViewMo
                    }
                    val map = LinkedHashMap<String, String>()
                    for (key in imageUrlMap.keys) {
-                        val localFileUri = FILE_HOST + key.decodeURI()
-
-                        // 文件格式为 HEIC 时，使用经 OSS 转码的图片作为预览图片
-                        if (FileUtils.getFileMimeType(getApplication(), key.decodeURI())?.lowercase(Locale.CHINA)?.contains("heic") == true) {
-                            val transformedImgUrl = ImageUtils.getTransformedUrl(imageUrlMap[key], 5000) ?: ""
-                            map[MD5Utils.getUrlMD5(key)] = transformedImgUrl
-                            mapImages[transformedImgUrl.decodeURI()] = imageUrlMap[key] ?: ""
-                        } else {
-                            map[MD5Utils.getUrlMD5(key)] = localFileUri
-                            mapImages[TextUtils.htmlEncode(key).decodeURI()] = imageUrlMap[key] ?: ""
-                        }
+                        map[MD5Utils.getUrlMD5(key)] = FILE_HOST + key.decodeURI()
+                        mapImages[TextUtils.htmlEncode(key).decodeURI()] = imageUrlMap[key] ?: ""
                    }
                    chooseImagesUploadSuccess.value = map
                }
--- a/app/src/main/java/com/gh/base/GlobalActivityLifecycleObserver.kt
+++ b/app/src/main/java/com/gh/base/GlobalActivityLifecycleObserver.kt
@ -4,27 +4,20 @@ import android.app.Activity
 import android.app.Application
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.gh.ad.AdDelegateHelper
 import com.gh.common.util.FloatingBackViewManager
 import com.gh.common.xapk.XapkInstaller
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.SingletonWebActivity
 import com.gh.gamecenter.SkipActivity
-import com.gh.gamecenter.SplashAdActivity
 import com.gh.gamecenter.SplashScreenActivity
 import com.gh.gamecenter.authorization.AuthorizationActivity
 import com.gh.gamecenter.common.base.GlobalActivityManager
 import com.gh.gamecenter.common.utils.PackageFlavorHelper
-import com.gh.gamecenter.feedback.view.suggest.SuggestionActivity
-import com.gh.gamecenter.login.view.LoginActivity
 import com.gh.vspace.VHelper
 import com.halo.assistant.HaloApp
-import com.lg.vspace.ui.launcher.LaunchActivity

 // TODO：移动到对应的模块
 class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
-    private var isFromBackgroundToForeground = false // 是否后台回到前台
-    private var activityCount = 0

    override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
        // do nothing
@ -32,20 +25,6 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {

    override fun onActivityStarted(activity: Activity) {
        GlobalActivityManager.currentActivity = activity
-        activityCount ++
-        if (activityCount == 1 && isFromBackgroundToForeground) {
-            if (AdDelegateHelper.shouldShowStartUpAd(true)
-                && !HaloApp.getInstance().isSkippingThirdParty
-                && activity !is SplashScreenActivity
-                && activity !is SkipActivity
-                && activity !is AuthorizationActivity
-                && activity !is SplashAdActivity
-                && activity !is SuggestionActivity
-            ) {
-                activity.startActivity(SplashAdActivity.getIntent(activity))
-            }
-            isFromBackgroundToForeground = false
-        }
    }

    override fun onActivityResumed(activity: Activity) {
@ -77,8 +56,6 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
        }

        if (activity is AppCompatActivity
-            && activity !is LaunchActivity
-            && activity !is LoginActivity
            && activity !is SplashScreenActivity
            && activity !is SkipActivity
            && activity !is AuthorizationActivity
@ -97,8 +74,7 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
    }

    override fun onActivityStopped(activity: Activity) {
-        activityCount --
-        isFromBackgroundToForeground = activityCount <= 0
+        // do nothing
    }

    override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {
--- a/app/src/main/java/com/gh/common/DefaultJsApi.kt
+++ b/app/src/main/java/com/gh/common/DefaultJsApi.kt
@ -69,14 +69,9 @@ class DefaultJsApi(
    val entrance: String = "",
    private var mFragment: Fragment? = null,
    private var mBbsId: String? = "",
-    private var mOriginUrl: String? = "",
-    private val mForumName: String? = ""
+    private var mOriginUrl: String?= "",
 ) {

-    companion object {
-        private const val SOURCE_ENTRANCE = "webView"
-    }
-
    private var mLoginHandler: CompletionHandler<Any>? = null
    private var mDownloadWatcher: DataWatcher? = null // 下载观察者
    private var mDownloadUrlSet: HashSet<String>? = null // 下载的 url 集合
@ -220,7 +215,7 @@ class DefaultJsApi(
        runOnUiThread {
            // 若畅玩列表中安装了，优先启动畅玩游戏
            if (VHelper.isInstalled(packageName)) {
-                VHelper.validateVSpaceBeforeAction(context, packageName, null) {
+                if (!VHelper.showDialogIfVSpaceIsNeeded(context, "", "", "", "")) {
                    VHelper.launch(context, packageName)
                }
            } else {
@ -235,14 +230,7 @@ class DefaultJsApi(

        val context = CurrentActivityHolder.getCurrentActivity()

-        context?.startActivity(
-            ImageViewerActivity.getIntent(
-                context,
-                imageEvent.imageList,
-                imageEvent.position,
-                "浏览器"
-            )
-        )
+        context?.startActivity(ImageViewerActivity.getIntent(context, imageEvent.imageList, imageEvent.position, "浏览器"))
    }

    @JavascriptInterface
@ -291,18 +279,11 @@ class DefaultJsApi(

    /**
     * 打开论坛搜索页
-     * 如果用户是从 webView跳转到论坛搜索页，则sourceEntrance为空
     */
    @JavascriptInterface
    fun openForumSearch(msg: Any) {
        runOnUiThread {
-            DirectUtils.directToForumOrUserSearch(
-                context,
-                mBbsId ?: "",
-                entrance.ifBlank { "内部网页" },
-                SOURCE_ENTRANCE,
-                mForumName ?: ""
-            )
+            DirectUtils.directToForumOrUserSearch(context, mBbsId ?: "", entrance.ifBlank { "内部网页" })
        }
    }

@ -404,7 +385,7 @@ class DefaultJsApi(

    @JavascriptInterface
    fun showQaFeedbackDialog(msg: Any) {
-        val mHelpAndFeedbackHelp =
+         val mHelpAndFeedbackHelp =
            ARouter.getInstance().build(RouteConsts.provider.helpAndFeedback).navigation() as? IHelpAndFeedbackProvider
        mHelpAndFeedbackHelp?.showQaFeedbackDialogFragment(context as AppCompatActivity, msg.toString())
    }
@ -550,9 +531,10 @@ class DefaultJsApi(
    @JavascriptInterface
    fun installDownloadedGame(event: Any) {
        val url = event.toString()
+        val vUrl = VHelper.getVUrl(url)

-        val downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(url, null)
-            ?: DownloadManager.getInstance().getDownloadEntitySnapshot(url, null)
+        val downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(url, null, false)
+            ?: DownloadManager.getInstance().getDownloadEntitySnapshot(vUrl, null, false)

        NewFlatLogUtils.logGameInstall(
            gameId = downloadEntity?.gameId ?: "",
@ -567,7 +549,7 @@ class DefaultJsApi(
        )

        downloadEntity?.let {
-            PackageInstaller.install(context, it, showUnzipToast = false, ignoreAsVGame = false)
+            PackageInstaller.install(context, it, showUnzipToast = false)
        }
    }

@ -768,7 +750,6 @@ class DefaultJsApi(
        var status: String = "" // DOWNLOADING, PAUSED, DOWNLOADED, ERROR, UNKNOWN
    ) {
        companion object {
-
            fun fromDownloadEntity(downloadEntity: DownloadEntity): SimpleDownloadEntity {
                val status: String = when (downloadEntity.status) {
                    add,
--- a/app/src/main/java/com/gh/common/DefaultUrlHandler.kt
+++ b/app/src/main/java/com/gh/common/DefaultUrlHandler.kt
@ -51,8 +51,8 @@ import java.nio.charset.Charset
 object DefaultUrlHandler {

    @JvmStatic
-    fun interceptUrl(context: Context, url: String, entrance: String, sourceEntrance: String = ""): Boolean {
-        return interceptUrl(context, url, null, entrance, false, sourceEntrance)
+    fun interceptUrl(context: Context, url: String, entrance: String): Boolean {
+        return interceptUrl(context, url, null, entrance, false)
    }

    /**
@ -66,8 +66,7 @@ object DefaultUrlHandler {
    fun interceptUrl(context: Context, url: String,
                     traceEvent: ExposureEvent? = null,
                     entrance: String,
-                     bringAppToFront: Boolean = false,
-                     sourceEntrance: String = ""): Boolean {
+                     bringAppToFront: Boolean = false): Boolean {
        val uri = Uri.parse(url)
        if ("ghzhushou" == uri.scheme) {
            Utils.log("url = $url")
@ -136,7 +135,7 @@ object DefaultUrlHandler {
                    }

                }
-                "question" -> DirectUtils.directToQuestionDetail(context, id, entrance, "文章链接", sourceEntrance)
+                "question" -> DirectUtils.directToQuestionDetail(context, id, entrance, "文章链接")

                "real_name" -> DirectUtils.directToRealName(context)

@ -179,7 +178,7 @@ object DefaultUrlHandler {
                    if ("articles" == type) {
                        DirectUtils.directToCommunityArticle(
                            context, typeId, communityId,
-                            entrance, "文章链接", sourceEntrance
+                            entrance, "文章链接"
                        )
                    }
                }
@ -247,18 +246,17 @@ object DefaultUrlHandler {
                        act,
                        paginationType,
                        fieldId,
-                        sectionName,
-                        sourceEntrance = sourceEntrance
+                        sectionName
                    )
                }
                EntranceConsts.HOST_VIDEO_DETAIL -> {
-                    DirectUtils.directToVideoDetail(context, id, entrance, path, sourceEntrance)
+                    DirectUtils.directToVideoDetail(context, id, entrance, path)
                }
                EntranceConsts.HOST_VIDEO_SINGLE -> {
                    val referer = uri.getQueryParameter("referer") ?: ""
                    DirectUtils.directToVideoDetail(
                        context, id, VideoDetailContainerViewModel.Location.SINGLE_VIDEO.value,
-                        false, "", entrance, "", if (TextUtils.isEmpty(referer)) "" else referer, sourceEntrance
+                        false, "", entrance, "", if (TextUtils.isEmpty(referer)) "" else referer
                    )
                }
                EntranceConsts.HOST_VIDEO_STREAMING_HOME -> {
@ -327,7 +325,7 @@ object DefaultUrlHandler {
                            val linkData = Base64.decode(dataString, Base64.DEFAULT)
                            val linkDataString = String(linkData, Charset.defaultCharset())
                            val le = gson.fromJson(linkDataString, LinkEntity::class.java)
-                            directToLinkPage(context, le, entrance, sourceEntrance, "")
+                            directToLinkPage(context, le, entrance, "")
                        }
                    } catch (e: Exception) {
                        e.printStackTrace()
@ -566,7 +564,7 @@ object DefaultUrlHandler {
        }

        // 处理内部页面逻辑
-        if (transformNormalScheme(context, url, entrance, sourceEntrance)) {
+        if (transformNormalScheme(context, url, entrance)) {
            return true
        }

@ -575,14 +573,14 @@ object DefaultUrlHandler {
    }

    @JvmStatic
-    fun transformNormalScheme(context: Context, url: String, entrance: String, sourceEntrance: String): Boolean {
-        val b = transformNewNormalScheme(context, url, entrance, sourceEntrance)
+    fun transformNormalScheme(context: Context, url: String, entrance: String): Boolean {
+        val b = transformNewNormalScheme(context, url, entrance)
        if (b) return b
-        return transformOldNormalScheme(context, url, entrance, sourceEntrance)
+        return transformOldNormalScheme(context, url, entrance)
    }

    @JvmStatic
-    fun transformOldNormalScheme(context: Context, url: String, entrance: String, sourceEntrance: String): Boolean {
+    fun transformOldNormalScheme(context: Context, url: String, entrance: String): Boolean {
        val uri = Uri.parse(url)
        if (uri.host == "www.ghzs666.com"
            || uri.host == "www.ghzs.com"
@ -607,7 +605,7 @@ object DefaultUrlHandler {
                        val questionId = split("/")[2]
                        val answerId = uri.getQueryParameter("answer")
                        if (answerId.isNullOrEmpty()) {
-                            DirectUtils.directToQuestionDetail(context, questionId, entrance, "", sourceEntrance)
+                            DirectUtils.directToQuestionDetail(context, questionId, entrance, "")
                        } else {
                            DirectUtils.directToAnswerDetail(context, answerId, entrance, "")
                        }
@ -637,7 +635,7 @@ object DefaultUrlHandler {
                        if ("articles" == type || "article" == type) {
                            DirectUtils.directToCommunityArticle(
                                context, typeId, communityId,
-                                entrance, "文章链接", sourceEntrance
+                                entrance, "文章链接"
                            )
                        }
                    }
@ -668,7 +666,7 @@ object DefaultUrlHandler {
    }

    @JvmStatic
-    fun transformNewNormalScheme(context: Context, url: String, entrance: String, sourceEntrance: String): Boolean {
+    fun transformNewNormalScheme(context: Context, url: String, entrance: String): Boolean {
        val uri = Uri.parse(url)
        if (uri.host == "www.ghzs666.com"
            || uri.host == "www.ghzs.com"
@ -686,7 +684,7 @@ object DefaultUrlHandler {
                        val articleId = splits[2].substring(7)
                        DirectUtils.directToCommunityArticle(
                            context, articleId, "",
-                            entrance, "文章链接", sourceEntrance
+                            entrance, "文章链接"
                        )
                    }
                    //https://m.ghzs666.com/article/文章ID
@ -706,7 +704,7 @@ object DefaultUrlHandler {
                    //https://m.ghzs666.com/bbs/video-视频ID
                    splits.size >= 3 && splits[1] == "bbs" && splits[2].startsWith("video-") -> {
                        val videoId = splits[2].substring(6)
-                        DirectUtils.directToVideoDetail(context, videoId, entrance, sourceEntrance)
+                        DirectUtils.directToVideoDetail(context, videoId, entrance)
                    }
                    else -> return false
                }
--- a/app/src/main/java/com/gh/common/browse/BrowseTimer.kt
+++ b/app/src/main/java/com/gh/common/browse/BrowseTimer.kt
@ -1,351 +0,0 @@
-package com.gh.common.browse
-
-import android.os.Handler
-import android.os.Looper
-import android.os.Message
-import androidx.lifecycle.*
-import androidx.lifecycle.Lifecycle.Event
-
-/**
- * 浏览时长计时器核心接口类，用于页面浏览时长相关埋点上报
- */
-interface IBrowseTimerCore {
-    /**
-     * 开始计时
-     */
-    fun start()
-
-    /**
-     * 结束计时
-     */
-    fun stop()
-}
-
-/**
- * 浏览时长计时器核心实现类
- */
-class BrowseTimerCore internal constructor() : IBrowseTimerCore {
-
-    /**
-     * 延迟执行的时间
-     */
-    var delayInMills: Long = 3000L
-
-    /**
-     * 开始计时函数回调
-     */
-    var onStart: (() -> Unit)? = null
-
-    /**
-     * 结束计时函数回调
-     */
-    var onResult: ((Long) -> Unit)? = null
-
-    /**
-     * 开始计时的时间点
-     */
-    private var startTimeInMills: Long = 0L
-
-    /**
-     * Handler操作类
-     */
-    private val handler = object : Handler(Looper.getMainLooper()) {
-        override fun handleMessage(msg: Message) {
-            if (msg.what == MESSAGE_START) {
-                dispatchOnStart()
-            }
-        }
-    }
-
-    /**
-     * 延迟执行开始计时
-     * @see delayInMills
-     * @see onStart
-     */
-    override fun start() {
-        if (delayInMills <= 0) {
-            dispatchOnStart()
-        } else {
-            handler.sendEmptyMessageDelayed(MESSAGE_START, delayInMills)
-        }
-    }
-
-    /**
-     * 结束计时，统计浏览时长并回调结束计时函数
-     * @see onResult
-     */
-    override fun stop() {
-        handler.removeMessages(MESSAGE_START)
-        if (startTimeInMills > 0L) {
-            onResult?.invoke(System.currentTimeMillis() - startTimeInMills)
-            startTimeInMills = 0L
-        }
-    }
-
-    /**
-     * 开始计时，回调开始计时函数
-     */
-    private fun dispatchOnStart() {
-        startTimeInMills = System.currentTimeMillis()
-        onStart?.invoke()
-    }
-
-    companion object {
-        private const val MESSAGE_START = 1
-    }
-}
-
-/**
- * 无数据浏览计时器接口类
- */
-interface IBrowseTimer : IBrowseTimerCore {
-
-    fun withDelayInMills(delayInMills: Long): IBrowseTimer
-
-    fun withStart(onStart: () -> Unit): IBrowseTimer
-
-    fun withResult(onResult: (Long) -> Unit): IBrowseTimer
-}
-
-/**
- * 无数据的浏览计时器实现类
- */
-class BrowseTimer : IBrowseTimer {
-
-    private val core = BrowseTimerCore()
-
-    private var isStarted: Boolean = false
-
-    override fun withDelayInMills(delayInMills: Long): IBrowseTimer {
-        core.delayInMills = delayInMills
-        return this
-    }
-
-    override fun withStart(onStart: () -> Unit): IBrowseTimer {
-        core.onStart = onStart
-        return this
-    }
-
-    override fun withResult(onResult: (Long) -> Unit): IBrowseTimer {
-        core.onResult = onResult
-        return this
-    }
-
-    override fun start() {
-        if (isStarted) return
-
-        isStarted = true
-        core.start()
-    }
-
-    override fun stop() {
-        if (!isStarted) return
-
-        core.stop()
-        isStarted = false
-    }
-
-}
-
-/**
- * 支持Lifecycle的无数据的浏览计时器
- */
-class LifecycleBoundBrowseTimer internal constructor(
-    private val base: IBrowseTimer,
-    private val onStateChanged: (IBrowseTimer, Event) -> Unit
-) : IBrowseTimer, LifecycleEventObserver {
-    override fun withDelayInMills(delayInMills: Long): IBrowseTimer {
-        return base.withDelayInMills(delayInMills)
-    }
-
-    override fun withStart(onStart: () -> Unit): IBrowseTimer {
-        return base.withStart(onStart)
-    }
-
-    override fun withResult(onResult: (Long) -> Unit): IBrowseTimer {
-        return base.withResult(onResult)
-    }
-
-    override fun start() {
-        base.start()
-    }
-
-    override fun stop() {
-        base.stop()
-    }
-
-    override fun onStateChanged(source: LifecycleOwner, event: Event) {
-        onStateChanged.invoke(this, event)
-    }
-
-}
-
-fun IBrowseTimer.withLifecycle(
-    owner: LifecycleOwner,
-    onStateChanged: (IBrowseTimer, Event) -> Unit = { timer, event ->
-        when(event) {
-            Event.ON_START -> timer.start()
-            Event.ON_STOP -> timer.stop()
-            else -> {}
-        }
-    }
-): LifecycleBoundBrowseTimer = LifecycleBoundBrowseTimer(this, onStateChanged).apply {
-    owner.lifecycle.addObserver(this)
-}
-
-/**
- * 带数据的浏览计时器接口类
- */
-interface IValueBrowseTimer<T> : IBrowseTimerCore {
-
-    fun withDelayInMills(delayInMills: Long): IValueBrowseTimer<T>
-
-    fun withStart(onStart: (T?) -> Unit): IValueBrowseTimer<T>
-
-    fun withResult(onResult: (T?, Long) -> Unit): IValueBrowseTimer<T>
-
-    fun dispatchValue(value: T?)
-}
-
-/**
- * 带数据的浏览计时器实现类
- */
-class ValueBrowseTimer<T> : IValueBrowseTimer<T> {
-
-    private val core = BrowseTimerCore()
-
-    private var isDispatchValue: Boolean = false
-
-    private var isStarted: Boolean = false
-
-    private var value: T? = null
-
-    override fun withDelayInMills(delayInMills: Long): IValueBrowseTimer<T> {
-        core.delayInMills = delayInMills
-        return this
-    }
-
-    override fun withStart(onStart: (T?) -> Unit): IValueBrowseTimer<T> {
-        core.onStart = { onStart.invoke(value) }
-        return this
-    }
-
-    override fun withResult(onResult: (T?, Long) -> Unit): IValueBrowseTimer<T> {
-        core.onResult = { onResult.invoke(value, it) }
-        return this
-    }
-
-    override fun start() {
-        if (isStarted) return
-
-        isStarted = true
-
-        if (isDispatchValue) {
-            core.start()
-        }
-    }
-
-    override fun stop() {
-        if (!isStarted) return
-
-        core.stop()
-        isStarted = false
-    }
-
-    override fun dispatchValue(value: T?) {
-        this.value = value
-
-        if (isStarted && !isDispatchValue) {
-            core.start()
-        }
-        isDispatchValue = true
-    }
-
-}
-
-/**
- * 支持LiveData的带数据的浏览计时器
- */
-class ObserverBoundValueBrowseTimer<T> internal constructor(private val base: IValueBrowseTimer<T>) : IValueBrowseTimer<T>, Observer<T> {
-    override fun withDelayInMills(delayInMills: Long): IValueBrowseTimer<T> {
-        return base.withDelayInMills(delayInMills)
-    }
-
-    override fun withResult(onResult: (T?, Long) -> Unit): IValueBrowseTimer<T> {
-        return base.withResult(onResult)
-    }
-
-    override fun withStart(onStart: (T?) -> Unit): IValueBrowseTimer<T> {
-        return base.withStart(onStart)
-    }
-
-    override fun start() {
-        base.start()
-    }
-
-    override fun stop() {
-        base.stop()
-    }
-
-    override fun dispatchValue(value: T?) {
-        base.dispatchValue(value)
-    }
-
-    override fun onChanged(t: T) {
-        dispatchValue(t)
-    }
-}
-
-
-/**
- * 支持Lifecycle的带数据的浏览计时器
- */
-class LifecycleBoundValueBrowseTimer<T> internal constructor(
-    private val base: IValueBrowseTimer<T>,
-    private val onStateChanged: (IValueBrowseTimer<T>, Event) -> Unit
-) : IValueBrowseTimer<T>, LifecycleEventObserver {
-    override fun withDelayInMills(delayInMills: Long): IValueBrowseTimer<T> {
-        return base.withDelayInMills(delayInMills)
-    }
-
-    override fun withResult(onResult: (T?, Long) -> Unit): IValueBrowseTimer<T> {
-        return base.withResult(onResult)
-    }
-
-    override fun withStart(onStart: (T?) -> Unit): IValueBrowseTimer<T> {
-        return base.withStart(onStart)
-    }
-
-    override fun start() {
-        base.start()
-    }
-
-    override fun stop() {
-        base.stop()
-    }
-
-    override fun dispatchValue(value: T?) {
-        base.dispatchValue(value)
-    }
-
-    override fun onStateChanged(source: LifecycleOwner, event: Event) {
-        onStateChanged.invoke(this, event)
-    }
-
-}
-
-fun <T> IValueBrowseTimer<T>.asObserver(): ObserverBoundValueBrowseTimer<T> = ObserverBoundValueBrowseTimer(this)
-
-fun <T> IValueBrowseTimer<T>.withLifecycle(
-    owner: LifecycleOwner,
-    onStateChanged: (IValueBrowseTimer<T>, Event) -> Unit = { timer, event ->
-        when(event) {
-            Event.ON_START -> timer.start()
-            Event.ON_STOP -> timer.stop()
-            else -> {}
-        }
-    }
-): LifecycleBoundValueBrowseTimer<T> = LifecycleBoundValueBrowseTimer(this, onStateChanged).apply {
-    owner.lifecycle.addObserver(this)
-}
-
--- a/app/src/main/java/com/gh/common/chain/BrowserInstallHandler.kt
+++ b/app/src/main/java/com/gh/common/chain/BrowserInstallHandler.kt
@ -1,21 +1,23 @@
 package com.gh.common.chain

 import android.content.Context
+import com.gh.common.xapk.XapkInstaller
 import com.gh.download.server.BrowserInstallHelper
+import com.gh.gamecenter.core.utils.EmptyCallback
 import com.gh.gamecenter.feature.entity.GameEntity

-class BrowserInstallHandler : DownloadChainHandler() {
+class BrowserInstallHandler : ChainHandler() {

-    override fun handleRequest(context: Context, gameEntity: GameEntity, asVGame: Boolean) {
+    override fun handleRequest(context: Context, gameEntity: GameEntity) {
        BrowserInstallHelper.showBrowserInstallHintDialog(
            context,
            gameEntity,
-            asVGame || gameEntity.isSplitXApk()
+            gameEntity.isVGame() || gameEntity.isSplitXApk()
        ) {
            if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity, asVGame)
+                getNext()?.handleRequest(context, gameEntity)
            } else {
-                processEndCallback?.invoke(asVGame, null)
+                processEndCallback?.invoke(null)
            }
        }
    }
--- a/app/src/main/java/com/gh/common/chain/CertificationHandler.kt
+++ b/app/src/main/java/com/gh/common/chain/CertificationHandler.kt
@ -4,14 +4,14 @@ import android.content.Context
 import com.gh.common.dialog.CertificationDialog
 import com.gh.gamecenter.feature.entity.GameEntity

-class CertificationHandler : DownloadChainHandler() {
+class CertificationHandler : ChainHandler() {

-    override fun handleRequest(context: Context, gameEntity: GameEntity, asVGame: Boolean) {
+    override fun handleRequest(context: Context, gameEntity: GameEntity) {
        CertificationDialog.showCertificationDialog(context, gameEntity) {
            if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity, asVGame)
+                getNext()?.handleRequest(context, gameEntity)
            } else {
-                processEndCallback?.invoke(asVGame, null)
+                processEndCallback?.invoke(null)
            }
        }
    }
--- a/app/src/main/java/com/gh/common/chain/DownloadChainBuilder.kt
+++ b/app/src/main/java/com/gh/common/chain/DownloadChainBuilder.kt
@ -1,22 +1,22 @@
 package com.gh.common.chain

-class DownloadChainBuilder {
+class ChainBuilder {

-    private val handlers: MutableList<DownloadChainHandler> = ArrayList()
+    private val handlers: MutableList<ChainHandler> = ArrayList()

-    private var processEndCallback: ((asVGame: Boolean, Any?) -> Unit)? = null
+    private var processEndCallback: ((Any?) -> Unit)? = null

-    fun setProcessEndCallback(callback: (asVGame: Boolean, Any?) -> Unit): DownloadChainBuilder {
+    fun setProcessEndCallback(callback: (Any?) -> Unit): ChainBuilder {
        processEndCallback = callback
        return this
    }

-    fun addHandler(handler: DownloadChainHandler): DownloadChainBuilder {
+    fun addHandler(handler: ChainHandler): ChainBuilder {
        handlers.add(handler)
        return this
    }

-    fun buildHandlerChain(): DownloadChainHandler? {
+    fun buildHandlerChain(): ChainHandler? {
        for (i in handlers.indices) {
            handlers[i].processEndCallback = processEndCallback
            if (i + 1 < handlers.size) {
--- a/app/src/main/java/com/gh/common/chain/ChainHandler.kt
+++ b/app/src/main/java/com/gh/common/chain/ChainHandler.kt
@ -0,0 +1,24 @@
+package com.gh.common.chain
+
+import android.content.Context
+import com.gh.gamecenter.feature.entity.GameEntity
+
+abstract class ChainHandler {
+    private var next: ChainHandler? = null
+    var processEndCallback: ((Any?) -> Unit)? = null
+
+    fun setNext(next: ChainHandler?) {
+        this.next = next
+    }
+
+    fun getNext(): ChainHandler? {
+        return next
+    }
+
+    fun hasNext(): Boolean {
+        return next != null
+    }
+
+    abstract fun handleRequest(context: Context, gameEntity: GameEntity)
+
+}
--- a/app/src/main/java/com/gh/common/chain/CheckDownloadHandler.kt
+++ b/app/src/main/java/com/gh/common/chain/CheckDownloadHandler.kt
@ -5,15 +5,15 @@ import com.gh.common.util.DialogUtils
 import com.gh.gamecenter.common.utils.safelyGetInRelease
 import com.gh.gamecenter.feature.entity.GameEntity

-class CheckDownloadHandler : DownloadChainHandler() {
+class CheckDownloadHandler : ChainHandler() {

-    override fun handleRequest(context: Context, gameEntity: GameEntity, asVGame: Boolean) {
+    override fun handleRequest(context: Context, gameEntity: GameEntity) {
        val apk = gameEntity.getApk().safelyGetInRelease(0) ?: return
        DialogUtils.checkDownload(context, apk.size, gameEntity.id, gameEntity.name, gameEntity.categoryChinese) { isSubscribe: Boolean ->
            if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity, asVGame)
+                getNext()?.handleRequest(context, gameEntity)
            } else {
-                processEndCallback?.invoke(asVGame, isSubscribe)
+                processEndCallback?.invoke(isSubscribe)
            }
        }

--- a/app/src/main/java/com/gh/common/chain/CheckStoragePermissionHandler.kt
+++ b/app/src/main/java/com/gh/common/chain/CheckStoragePermissionHandler.kt
@ -4,20 +4,19 @@ import android.content.Context
 import com.gh.gamecenter.common.utils.PermissionHelper
 import com.gh.gamecenter.feature.entity.GameEntity

-class CheckStoragePermissionHandler : DownloadChainHandler() {
+class CheckStoragePermissionHandler : ChainHandler() {

-    override fun handleRequest(context: Context, gameEntity: GameEntity, asVGame: Boolean) {
+    override fun handleRequest(context: Context, gameEntity: GameEntity) {
        PermissionHelper.checkStoragePermissionBeforeAction(
            context,
            gameEntity.id,
            gameEntity.name ?: "",
-            gameEntity.categoryChinese,
-            gameEntity.getApk().firstOrNull()?.format,
+            gameEntity.categoryChinese
        ) {
            if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity, asVGame)
+                getNext()?.handleRequest(context, gameEntity)
            } else {
-                processEndCallback?.invoke(asVGame, null)
+                processEndCallback?.invoke(null)
            }
        }
    }
--- a/app/src/main/java/com/gh/common/chain/DownloadChainHandler.kt
+++ b/app/src/main/java/com/gh/common/chain/DownloadChainHandler.kt
@ -1,40 +0,0 @@
-package com.gh.common.chain
-
-import android.content.Context
-import com.gh.gamecenter.feature.entity.GameEntity
-
-abstract class DownloadChainHandler {
-    private var next: DownloadChainHandler? = null
-
-    // asVGame: 当前下载是否以畅玩游戏来进行
-    var processEndCallback: ((asVGame: Boolean, Any?) -> Unit)? = null
-
-    /**
-     * 设置下一个处理者
-     */
-    fun setNext(next: DownloadChainHandler?) {
-        this.next = next
-    }
-
-    /**
-     * 获取下一个处理者
-     */
-    fun getNext(): DownloadChainHandler? {
-        return next
-    }
-
-    /**
-     * 是否存在下一个处理者
-     */
-    fun hasNext(): Boolean {
-        return next != null
-    }
-
-    /**
-     * 处理请求
-     * @param gameEntity 游戏实体
-     * @param asVGame 是否作为畅玩游戏进行
-     */
-    abstract fun handleRequest(context: Context, gameEntity: GameEntity, asVGame: Boolean)
-
-}
--- a/app/src/main/java/com/gh/common/chain/DownloadDialogHelperHandler.kt
+++ b/app/src/main/java/com/gh/common/chain/DownloadDialogHelperHandler.kt
@ -3,18 +3,21 @@ package com.gh.common.chain
 import android.content.Context
 import com.gh.common.util.DownloadDialogHelper
 import com.gh.gamecenter.common.utils.safelyGetInRelease
+import com.gh.gamecenter.core.utils.EmptyCallback
 import com.gh.gamecenter.feature.entity.GameEntity

-class DownloadDialogHelperHandler : DownloadChainHandler() {
+class DownloadDialogHelperHandler : ChainHandler() {

-    override fun handleRequest(context: Context, gameEntity: GameEntity, asVGame: Boolean) {
+    override fun handleRequest(context: Context, gameEntity: GameEntity) {
        val apk = gameEntity.getApk().safelyGetInRelease(0) ?: return
-        DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk) {
-            if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity, asVGame)
-            } else {
-                processEndCallback?.invoke(asVGame, null)
+        DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk, object : EmptyCallback {
+            override fun onCallback() {
+                if (hasNext()) {
+                    getNext()?.handleRequest(context, gameEntity)
+                } else {
+                    processEndCallback?.invoke(null)
+                }
            }
-        }
+        })
    }
 }
--- a/app/src/main/java/com/gh/common/chain/GamePermissionHandler.kt
+++ b/app/src/main/java/com/gh/common/chain/GamePermissionHandler.kt
@ -5,14 +5,14 @@ import androidx.appcompat.app.AppCompatActivity
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.gamedetail.dialog.GamePermissionDialogFragment

-class GamePermissionHandler : DownloadChainHandler() {
+class GamePermissionHandler : ChainHandler() {

-    override fun handleRequest(context: Context, gameEntity: GameEntity, asVGame: Boolean) {
+    override fun handleRequest(context: Context, gameEntity: GameEntity) {
        GamePermissionDialogFragment.show((context as AppCompatActivity), gameEntity, gameEntity.info) {
            if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity, asVGame)
+                getNext()?.handleRequest(context, gameEntity)
            } else {
-                processEndCallback?.invoke(asVGame, null)
+                processEndCallback?.invoke(null)
            }
        }
    }
--- a/app/src/main/java/com/gh/common/chain/LandPageAddressHandler.kt
+++ b/app/src/main/java/com/gh/common/chain/LandPageAddressHandler.kt
@ -1,31 +1,22 @@
 package com.gh.common.chain

-import android.app.Activity
 import android.content.Context
 import com.gh.common.util.DialogUtils
 import com.gh.common.util.DirectUtils
-import com.gh.common.util.TempCertificationUtils
 import com.gh.gamecenter.feature.entity.GameEntity

-class LandPageAddressHandler : DownloadChainHandler() {
+class LandPageAddressHandler : ChainHandler() {

-    override fun handleRequest(context: Context, gameEntity: GameEntity, asVGame: Boolean) {
+    override fun handleRequest(context: Context, gameEntity: GameEntity) {
        if (gameEntity.isLandPageAddressDialog()) {
-            TempCertificationUtils.checkCertificationBeforeAction(gameEntity) {
-                if (context is Activity && context.isFinishing) {
-                    // 当前 context 已经无效，不需要再传递执行下去了
-                    return@checkCertificationBeforeAction
-                }
-
-                DialogUtils.showLandPageAddressDialog(context, gameEntity) {// 跳转第三方落地页
-                    DirectUtils.directToExternalBrowser(context, gameEntity.landPageAddressDialog!!.link!!)
-                }
+            DialogUtils.showLandPageAddressDialog(context, gameEntity) {// 跳转第三方落地页
+                DirectUtils.directToExternalBrowser(context, gameEntity.landPageAddressDialog!!.link!!)
            }
        } else {
            if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity, asVGame)
+                getNext()?.handleRequest(context, gameEntity)
            } else {
-                processEndCallback?.invoke(asVGame, null)
+                processEndCallback?.invoke(null)
            }
        }
    }
--- a/app/src/main/java/com/gh/common/chain/OverseaDownloadHandler.kt
+++ b/app/src/main/java/com/gh/common/chain/OverseaDownloadHandler.kt
@ -1,34 +1,25 @@
 package com.gh.common.chain

-import android.app.Activity
 import android.content.Context
 import com.gh.common.util.DialogUtils
-import com.gh.common.util.TempCertificationUtils
 import com.gh.gamecenter.feature.entity.GameEntity

-class OverseaDownloadHandler : DownloadChainHandler() {
+class OverseaDownloadHandler : ChainHandler() {

-    override fun handleRequest(context: Context, gameEntity: GameEntity, asVGame: Boolean) {
+    override fun handleRequest(context: Context, gameEntity: GameEntity) {
        if (gameEntity.isOverseaAddressDialog()) {
-            TempCertificationUtils.checkCertificationBeforeAction(gameEntity) {
-                if (context is Activity && context.isFinishing) {
-                    // 当前 context 已经无效，不需要再传递执行下去了
-                    return@checkCertificationBeforeAction
-                }
-
-                DialogUtils.showOverseaDownloadDialog(context, gameEntity) {// 跳转海外下载地址弹窗
-                    if (hasNext()) {
-                        getNext()?.handleRequest(context, gameEntity, asVGame)
-                    } else {
-                        processEndCallback?.invoke(asVGame, null)
-                    }
+            DialogUtils.showOverseaDownloadDialog(context, gameEntity) {// 跳转海外下载地址弹窗
+                if (hasNext()) {
+                    getNext()?.handleRequest(context, gameEntity)
+                } else {
+                    processEndCallback?.invoke(null)
                }
            }
        } else {
            if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity, asVGame)
+                getNext()?.handleRequest(context, gameEntity)
            } else {
-                processEndCallback?.invoke(asVGame, null)
+                processEndCallback?.invoke(null)
            }
        }
    }
--- a/app/src/main/java/com/gh/common/chain/PackageCheckHandler.kt
+++ b/app/src/main/java/com/gh/common/chain/PackageCheckHandler.kt
@ -5,14 +5,14 @@ import androidx.appcompat.app.AppCompatActivity
 import com.gh.common.dialog.PackageCheckDialogFragment
 import com.gh.gamecenter.feature.entity.GameEntity

-class PackageCheckHandler : DownloadChainHandler() {
+class PackageCheckHandler : ChainHandler() {

-    override fun handleRequest(context: Context, gameEntity: GameEntity, asVGame: Boolean) {
+    override fun handleRequest(context: Context, gameEntity: GameEntity) {
        PackageCheckDialogFragment.show((context as AppCompatActivity), gameEntity) {
            if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity, asVGame)
+                getNext()?.handleRequest(context, gameEntity)
            } else {
-                processEndCallback?.invoke(asVGame, null)
+                processEndCallback?.invoke(null)
            }
        }
    }
--- a/app/src/main/java/com/gh/common/chain/UnsupportedFeatureHandler.kt
+++ b/app/src/main/java/com/gh/common/chain/UnsupportedFeatureHandler.kt
@ -4,20 +4,18 @@ import android.content.Context
 import com.gh.gamecenter.common.utils.DialogHelper
 import com.gh.gamecenter.feature.entity.GameEntity

-class UnsupportedFeatureHandler : DownloadChainHandler() {
+class UnsupportedFeatureHandler : ChainHandler() {

    override fun handleRequest(
-        context: Context,
-        gameEntity: GameEntity,
-        asVGame: Boolean
+        context: Context, gameEntity: GameEntity
    ) {
        if (shouldShowUnsupportedFeatureDialog()) {
            DialogHelper.showUnsupportedFeatureDialog(context)
        } else {
            if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity, asVGame)
+                getNext()?.handleRequest(context, gameEntity)
            } else {
-                processEndCallback?.invoke(asVGame, null)
+                processEndCallback?.invoke(null)
            }
        }
    }
--- a/app/src/main/java/com/gh/common/chain/UpdateNewSimulatorHandler.kt
+++ b/app/src/main/java/com/gh/common/chain/UpdateNewSimulatorHandler.kt
@ -5,27 +5,31 @@ import com.gh.common.simulator.NewSimulatorGameManager
 import com.gh.common.simulator.SimulatorGameManager
 import com.gh.gamecenter.feature.entity.GameEntity

-class UpdateNewSimulatorHandler: DownloadChainHandler() {
+class UpdateNewSimulatorHandler: ChainHandler() {

-    override fun handleRequest(context: Context, gameEntity: GameEntity, asVGame: Boolean) {
+    override fun handleRequest(context: Context, gameEntity: GameEntity) {
        if (SimulatorGameManager.isSimulatorGame(gameEntity)) {
            if (NewSimulatorGameManager.shouldShowUpdateNewSimulatorAlert(context)) {
                NewSimulatorGameManager.showUpdateNewsSimulator(context, gameEntity) {
                    if (hasNext()) {
-                        getNext()?.handleRequest(context, gameEntity, asVGame)
+                        getNext()?.handleRequest(context, gameEntity)
                    } else {
-                        processEndCallback?.invoke(asVGame, null)
+                        processEndCallback?.invoke(null)
                    }
                }
-            } else {
+            }
+            else{
                if (hasNext()) {
-                    getNext()?.handleRequest(context, gameEntity, asVGame)
+                    getNext()?.handleRequest(context, gameEntity)
                }
            }
-        } else {
+        }
+        else{
            if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity, asVGame)
+                getNext()?.handleRequest(context, gameEntity)
            }
        }
+
+
    }
 }
--- a/app/src/main/java/com/gh/common/chain/ValidateVSpaceHandler.kt
+++ b/app/src/main/java/com/gh/common/chain/ValidateVSpaceHandler.kt
@ -4,23 +4,15 @@ import android.content.Context
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.vspace.VHelper

-class ValidateVSpaceHandler : DownloadChainHandler() {
+class ValidateVSpaceHandler : ChainHandler() {

-    override fun handleRequest(context: Context, gameEntity: GameEntity, asVGame: Boolean) {
-        val closure = {
+    override fun handleRequest(context: Context, gameEntity: GameEntity) {
+        VHelper.validateVSpaceBeforeAction(context, gameEntity) {
            if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity, asVGame)
+                getNext()?.handleRequest(context, gameEntity)
            } else {
-                processEndCallback?.invoke(asVGame, null)
+                processEndCallback?.invoke(null)
            }
        }
-
-        if (asVGame) {
-            VHelper.validateVSpaceBeforeAction(context,gameEntity.getUniquePackageName(), gameEntity) {
-                closure.invoke()
-            }
-        } else {
-            closure.invoke()
-        }
    }
 }
--- a/app/src/main/java/com/gh/common/chain/VersionNumberHandler.kt
+++ b/app/src/main/java/com/gh/common/chain/VersionNumberHandler.kt
@ -7,14 +7,14 @@ import com.gh.gamecenter.common.utils.SensorsBridge
 import com.gh.gamecenter.common.utils.toResString
 import com.gh.gamecenter.feature.entity.GameEntity

-class VersionNumberHandler : DownloadChainHandler() {
+class VersionNumberHandler : ChainHandler() {

-    override fun handleRequest(context: Context, gameEntity: GameEntity, asVGame: Boolean) {
+    override fun handleRequest(context: Context, gameEntity: GameEntity) {
        val confirmCallback = {
            if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity, asVGame)
+                getNext()?.handleRequest(context, gameEntity)
            } else {
-                processEndCallback?.invoke(asVGame, null)
+                processEndCallback?.invoke(null)
            }
        }
        if (!gameEntity.isShowVersionNumber()) {
--- a/app/src/main/java/com/gh/common/constant/Config.java
+++ b/app/src/main/java/com/gh/common/constant/Config.java
@ -8,6 +8,7 @@ import android.text.TextUtils;

 import androidx.annotation.Nullable;

+import com.gh.common.util.AdHelper;
 import com.gh.common.util.PackageHelper;
 import com.gh.common.util.PackageUtils;
 import com.gh.gamecenter.BuildConfig;
@ -21,18 +22,14 @@ import com.gh.gamecenter.common.utils.EnvHelper;
 import com.gh.gamecenter.core.utils.GsonUtils;
 import com.gh.gamecenter.core.utils.SPUtils;
 import com.gh.gamecenter.core.utils.UrlFilterUtils;
-import com.gh.gamecenter.entity.AppEntity;
 import com.gh.gamecenter.entity.GameGuidePopupEntity;
 import com.gh.gamecenter.entity.NewApiSettingsEntity;
 import com.gh.gamecenter.entity.NewSettingsEntity;
-import com.gh.gamecenter.entity.VNewSetting;
 import com.gh.gamecenter.entity.VSetting;
 import com.gh.gamecenter.feature.entity.NewsEntity;
 import com.gh.gamecenter.feature.entity.SettingsEntity;
 import com.gh.gamecenter.feature.entity.SimulatorEntity;
-import com.gh.gamecenter.feature.utils.ContentBlockedHelper;
 import com.gh.gamecenter.retrofit.RetrofitManager;
-import com.gh.gamecenter.retrofit.service.VApiService;
 import com.gh.vspace.VHelper;
 import com.halo.assistant.HaloApp;
 import com.lightgame.utils.Utils;
@ -45,12 +42,8 @@ import java.io.IOException;
 import java.util.List;
 import java.util.Locale;

-import io.reactivex.Single;
-import io.reactivex.SingleSource;
 import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.functions.Function;
 import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subjects.BehaviorSubject;
 import okhttp3.ResponseBody;

 public class Config {
@ -79,10 +72,6 @@ public class Config {
    private static NewApiSettingsEntity.NightMode mNightModeSetting;
    private static SimulatorEntity mNewSimulatorEntity;
    private static VSetting mVSetting;
-    private static VNewSetting mVNewSetting;
-
-    private static AppEntity mNew32UpdateEntity;
-    public static BehaviorSubject<VNewSetting> vNewSettingSubject = BehaviorSubject.create();
    private static GameGuidePopupEntity mGameGuidePopupEntity;
    private static SharedPreferences mDefaultSharedPreferences;

@ -316,27 +305,6 @@ public class Config {
        return mVSetting;
    }

-    @Nullable
-    public static VNewSetting getVNewSettingEntity() {
-        if (mVNewSetting == null) {
-            try {
-                String json = SPUtils.getString(Constants.SP_V_NEW_SETTINGS);
-                if (!TextUtils.isEmpty(json)) {
-                    mVNewSetting = GsonUtils.fromJson(json, VNewSetting.class);
-                    vNewSettingSubject.onNext(mVNewSetting);
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-        return mVNewSetting;
-    }
-
-    @Nullable
-    public static AppEntity getNew32UpdateEntity() {
-        return mNew32UpdateEntity;
-    }
-
    /**
     * 请求网络数据，尝试刷新畅玩相关配置
     */
@ -357,36 +325,6 @@ public class Config {
                });
    }

-    @SuppressLint("CheckResult")
-    public static void getNewSetting() {
-        VApiService vApi = RetrofitManager.getInstance().getVApi();
-        vApi.getNewSettings(BuildConfig.VERSION_NAME, Build.VERSION.SDK_INT).flatMap(new Function<VNewSetting, SingleSource<AppEntity>>() {
-                    @Override
-                    public SingleSource<AppEntity> apply(VNewSetting data) throws Exception {
-                        mVNewSetting = data;
-                        vNewSettingSubject.onNext(mVNewSetting);
-                        SPUtils.setString(Constants.SP_V_NEW_SETTINGS, GsonUtils.toJson(data));
-                        if (data.getVa() != null && data.getVa().getArch32() != null) {
-                            String versionNameByPackageName = PackageUtils.getVersionNameByPackageName(data.getVa().getArch32().getPackageName());
-                            return vApi.getNewPackageUpdate(
-                                    BuildConfig.VERSION_NAME,
-                                    versionNameByPackageName != null ? versionNameByPackageName : "",
-                                    HaloApp.getInstance().getChannel()
-                            );
-                        }
-                        return Single.error(new IllegalStateException("VNewSetting entity is not expected"));
-                    }
-                })
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new BiResponse<AppEntity>() {
-                    @Override
-                    public void onSuccess(AppEntity data) {
-                        mNew32UpdateEntity = data;
-                    }
-                });
-    }
-
    @Nullable
    public static GameGuidePopupEntity getGameGuidePopupEntity() {
        return mGameGuidePopupEntity;
@ -465,7 +403,6 @@ public class Config {
                });

        refreshVSettingEntity();
-        getNewSetting();

        RetrofitManager.getInstance()
                .getApi().getGameGuidePopup(Build.MANUFACTURER, Build.VERSION.RELEASE, Build.MODEL, channel, BuildConfig.VERSION_NAME)
@ -523,11 +460,6 @@ public class Config {
                                DarkModeUtils.INSTANCE.initDarkMode();
                            }
                            SPUtils.setString(Constants.SP_NEW_API_SETTINGS, GsonUtils.toJson(data));
-
-                            // 刷新屏蔽字段
-                            if (mNewApiSettingsEntity.getGameShieldContents() != null) {
-                                ContentBlockedHelper.INSTANCE.init(mNewApiSettingsEntity.getGameShieldContents());
-                            }
                        }
                    });
        }
--- a/app/src/main/java/com/gh/common/databind/AddKaiFuBindingAdapter.kt
+++ b/app/src/main/java/com/gh/common/databind/AddKaiFuBindingAdapter.kt
@ -120,13 +120,13 @@ object AddKaiFuBindingAdapter {
    @BindingAdapter("kaiFuTextColor", "kaiFuTextPosition")
    fun kaiFuTextColor(view: EditText, dataMark: Int, position: Int) {
        if (dataMark == 1 && view.id == R.id.kaifu_add_time || dataMark == 2 && view.id == R.id.kaifu_add_first_name || dataMark == 3 && view.id == R.id.kaifu_add_server_name || dataMark == 4) {
-            view.setTextColor(ContextCompat.getColor(view.context, R.color.secondary_red))
-            view.setHintTextColor(ContextCompat.getColor(view.context, R.color.secondary_red))
+            view.setTextColor(ContextCompat.getColor(view.context, R.color.theme_red))
+            view.setHintTextColor(ContextCompat.getColor(view.context, R.color.theme_red))
        } else if (position == 0) {
            view.setTextColor(ContextCompat.getColor(view.context, R.color.hint))
            view.setHintTextColor(ContextCompat.getColor(view.context, R.color.hint))
        } else {
-            view.setTextColor(ContextCompat.getColor(view.context, R.color.text_primary))
+            view.setTextColor(ContextCompat.getColor(view.context, R.color.text_title))
            view.setHintTextColor(ContextCompat.getColor(view.context, R.color.hint))
        }
    }
--- a/app/src/main/java/com/gh/common/databind/BindingAdapters.java
+++ b/app/src/main/java/com/gh/common/databind/BindingAdapters.java
@ -3,21 +3,27 @@ package com.gh.common.databind;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
+import android.graphics.Typeface;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.TextUtils;
 import android.text.style.ForegroundColorSpan;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;

 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.ContextCompat;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;

+import com.facebook.drawee.view.SimpleDraweeView;
 import com.gh.common.chain.BrowserInstallHandler;
 import com.gh.common.chain.CertificationHandler;
-import com.gh.common.chain.DownloadChainBuilder;
-import com.gh.common.chain.DownloadChainHandler;
+import com.gh.common.chain.ChainBuilder;
+import com.gh.common.chain.ChainHandler;
 import com.gh.common.chain.CheckDownloadHandler;
 import com.gh.common.chain.CheckStoragePermissionHandler;
 import com.gh.common.chain.DownloadDialogHelperHandler;
@ -40,6 +46,7 @@ import com.gh.common.util.DialogUtils;
 import com.gh.common.util.GameUtils;
 import com.gh.common.util.GameViewUtils;
 import com.gh.common.util.LogUtils;
+import com.gh.common.util.NewsUtils;
 import com.gh.common.util.PackageInstaller;
 import com.gh.common.util.PackageLauncher;
 import com.gh.common.util.PackageUtils;
@ -50,16 +57,26 @@ import com.gh.download.server.BrowserInstallHelper;
 import com.gh.gamecenter.DownloadManagerActivity;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.WebActivity;
+import com.gh.gamecenter.common.baselist.LoadStatus;
+import com.gh.gamecenter.common.callback.OnViewClickListener;
 import com.gh.gamecenter.common.entity.LinkEntity;
+import com.gh.gamecenter.common.eventbus.EBReuse;
 import com.gh.gamecenter.common.utils.DarkModeUtils;
 import com.gh.gamecenter.common.utils.ExtensionsKt;
+import com.gh.gamecenter.common.utils.ImageUtils;
 import com.gh.gamecenter.common.utils.NewFlatLogUtils;
 import com.gh.gamecenter.common.utils.SensorsBridge;
+import com.gh.gamecenter.common.view.DrawableView;
+import com.gh.gamecenter.core.utils.DisplayUtils;
 import com.gh.gamecenter.core.utils.MtaHelper;
+import com.gh.gamecenter.core.utils.NumberUtils;
 import com.gh.gamecenter.core.utils.ToastUtils;
+import com.gh.gamecenter.databinding.KaifuDetailItemRowBinding;
 import com.gh.gamecenter.feature.entity.ApkEntity;
+import com.gh.gamecenter.feature.entity.CommunityVideoEntity;
 import com.gh.gamecenter.feature.entity.GameEntity;
 import com.gh.gamecenter.feature.entity.PluginLocation;
+import com.gh.gamecenter.feature.entity.ServerCalendarEntity;
 import com.gh.gamecenter.feature.entity.TagStyleEntity;
 import com.gh.gamecenter.feature.entity.TestEntity;
 import com.gh.gamecenter.feature.exposure.ExposureEvent;
@ -68,11 +85,14 @@ import com.gh.gamecenter.feature.view.DownloadButton;
 import com.gh.gamecenter.feature.view.GameIconView;
 import com.gh.gamecenter.gamedetail.dialog.GamePermissionDialogFragment;
 import com.gh.gamecenter.manager.PackagesManager;
+import com.gh.vspace.VDownloadManagerActivity;
 import com.gh.vspace.VHelper;
 import com.lightgame.download.DownloadEntity;
 import com.lightgame.download.FileUtils;
 import com.lightgame.utils.Utils;

+import org.greenrobot.eventbus.EventBus;
+
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
@ -80,8 +100,134 @@ import java.util.List;
 /**
 * Created by khy on 12/02/18.
 */
+
 public class BindingAdapters {

+    public static void loadIcon(SimpleDraweeView view, String imageUrl) {
+        ImageUtils.displayIcon(view, imageUrl);
+    }
+
+    public static void loadImage(SimpleDraweeView view, String imageUrl) {
+        ImageUtils.display(view, imageUrl);
+    }
+
+    public static void setTextSize(TextView view, int number) {
+        view.setTextSize(number);
+    }
+
+    public static void setTypeface(TextView view, String type) {
+        if (type == null) return;
+
+        switch (type) {
+            case "bold":
+                view.setTypeface(null, Typeface.BOLD);
+                break;
+            case "italic":
+                view.setTypeface(null, Typeface.ITALIC);
+                break;
+            case "bold_italic":
+                view.setTypeface(null, Typeface.BOLD_ITALIC);
+                break;
+            default:
+                view.setTypeface(null, Typeface.NORMAL);
+                break;
+        }
+    }
+
+    public static void addDetailKaiFuView(LinearLayout view, List<ServerCalendarEntity> list
+            , OnViewClickListener listener, Boolean isReadyPatch) {
+        if (list == null) return;
+        view.removeAllViews();
+        for (int i = 0; i < list.size() + 1; i++) { // 1 is Title
+            View inflate = LayoutInflater.from(view.getContext()).inflate(R.layout.kaifu_detail_item_row, null);
+            KaifuDetailItemRowBinding binding = KaifuDetailItemRowBinding.bind(inflate);
+            binding.getRoot().setBackgroundColor(isReadyPatch != null && isReadyPatch ? ExtensionsKt.toColor(R.color.theme) : ExtensionsKt.toColor(R.color.white));
+            binding.getRoot().setPadding(DisplayUtils.dip2px(1), DisplayUtils.dip2px(1), DisplayUtils.dip2px(1), i == list.size() ? DisplayUtils.dip2px(1) : 0);
+            ServerCalendarEntity serverEntity = list.get(i - 1);
+            binding.timeTv.setText(i == 0 ? "时间" : serverEntity.getFormatTime("HH:mm"));
+            binding.remarkTv.setText(i == 0 ? "备注" : serverEntity.getRemark());
+            binding.nameTv.setText(i == 0 ? "名字" : (TextUtils.isEmpty(serverEntity.getNote()) ? "-" : serverEntity.getNote()));
+            if (i != 0) {
+                binding.getRoot().setOnClickListener(v -> {
+                    listener.onClick(v, isReadyPatch != null && isReadyPatch ? serverEntity : null);
+                });
+
+                // 滑动冲突处理
+                binding.getRoot().setOnTouchListener((v, event) -> {
+                    if (list.size() > 5) {
+                        if (event.getAction() == MotionEvent.ACTION_DOWN) {
+                            EventBus.getDefault().post(new EBReuse("CalenderDown"));
+                        } else if (event.getAction() == MotionEvent.ACTION_UP || event.getAction() == MotionEvent.ACTION_CANCEL) {
+                            EventBus.getDefault().post(new EBReuse("CalenderCancel"));
+                        }
+                    }
+                    return false;
+                });
+            }
+            view.addView(inflate);
+        }
+    }
+
+    // 如果超过10000，则转换为1.0W
+    public static void transSimpleCount(TextView view, int count) {
+        view.setText(NumberUtils.transSimpleCount(count));
+    }
+
+    public static void textColorFromString(TextView tv, String hexString) {
+        if (TextUtils.isEmpty(hexString)) return;
+
+        try {
+            tv.setTextColor(Color.parseColor(hexString));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static void showHide(View view, Boolean show) {
+        if (show != null && show) {
+            view.setVisibility(View.VISIBLE);
+        } else {
+            view.setVisibility(View.GONE);
+        }
+    }
+
+    public static void goneIf(View view, Boolean gone) {
+        if (gone != null && gone) {
+            view.setVisibility(View.GONE);
+        } else {
+            view.setVisibility(View.VISIBLE);
+        }
+    }
+
+    /**
+     * lazy 的 paddingTop
+     */
+    public static void lazyPaddingLeft(View view, int paddingLeftInDp) {
+        view.setPadding(DisplayUtils.dip2px(paddingLeftInDp), view.getPaddingTop(), view.getPaddingRight(), view.getPaddingBottom());
+    }
+
+    /**
+     * lazy 的 paddingTop
+     */
+    public static void lazyPaddingTop(View view, int paddingTopInDp) {
+        view.setPadding(view.getPaddingLeft(), DisplayUtils.dip2px(paddingTopInDp), view.getPaddingRight(), view.getPaddingBottom());
+    }
+
+    /**
+     * lazy 的 paddingBottom
+     */
+    public static void lazyPaddingBottom(View view, int paddingBottomInDp) {
+        view.setPadding(view.getPaddingLeft(), view.getPaddingTop(), view.getPaddingRight(), DisplayUtils.dip2px(paddingBottomInDp));
+    }
+
+    public static void visibleInvisible(View view, Boolean show) {
+        if (show != null && show) {
+            view.setVisibility(View.VISIBLE);
+        } else {
+            view.setVisibility(View.INVISIBLE);
+        }
+    }
+
    public static void setMessageUnread(TextView view, int unreadCount) {
        if (unreadCount < 100) {
            view.setText(String.valueOf(unreadCount));
@ -90,19 +236,117 @@ public class BindingAdapters {
        }
    }

+    public static void setServerTypePadding(TextView view, String serverType) {
+        int paddRight = 0;
+        if (TextUtils.isEmpty(serverType)) {
+        } else {
+            if ("删档内测".equals(serverType) || "不删档内测".equals(serverType)) {
+                if ("删档内测".equals(serverType)) {
+                    paddRight = DisplayUtils.dip2px(view.getContext(), 50);
+                } else {
+                    paddRight = DisplayUtils.dip2px(view.getContext(), 60);
+                }
+            } else {
+                paddRight = DisplayUtils.dip2px(view.getContext(), 30);
+            }
+        }
+        view.setPadding(0, 0, paddRight, 0);
+    }
+
+    public static void setServerType(TextView view, String serverType) {
+        view.setText(serverType);
+        if ("删档内测".equals(serverType) || "不删档内测".equals(serverType)) {
+            view.setBackgroundResource(R.drawable.textview_server_tag);
+        } else {
+            view.setBackgroundResource(R.drawable.textview_orange_up);
+        }
+    }
+
    public static void setGame(View view, GameEntity gameEntity) {
        if (gameEntity != null && view instanceof GameIconView) {
            ((GameIconView) view).displayGameIcon(gameEntity);
        }
    }

-    public static void setDownloadButton(DownloadButton progressBar,
-                                         GameEntity gameEntity,
-                                         ExposureEvent traceEvent,
-                                         @Nullable View.OnClickListener clickCallBack,
-                                         @Nullable String entrance,
-                                         @Nullable String location) {
-        setDownloadButton(progressBar, gameEntity, traceEvent, clickCallBack, entrance, location, "其他");
+    public static void setGameIcon(View view, GameEntity gameEntity) {
+        if (gameEntity != null && view instanceof GameIconView) {
+            ((GameIconView) view).displayGameIcon(gameEntity.getIcon(), gameEntity.getIconSubscript(), gameEntity.getIconFloat());
+        }
+    }
+
+    public static void setArticleType(TextView view, String articleType) {
+        NewsUtils.setNewsType(view, articleType, 0, 0);
+    }
+
+    public static void setDetailDownloadText(TextView view, GameEntity gameEntity) {
+        if (gameEntity == null || gameEntity.getApk().isEmpty()) {
+            view.setBackgroundResource(R.drawable.game_item_btn_pause_style);
+            view.setTextColor(0xFF999999);
+            view.setClickable(false);
+        }
+    }
+
+    public static void setLiBaoBtn(TextView view, String status) {
+        if (TextUtils.isEmpty(status)) return;
+        switch (status) {
+            case "coming":
+                view.setText(R.string.libao_coming);
+                view.setBackgroundResource(R.drawable.textview_blue_style);
+                break;
+            case "ling":
+                view.setText(R.string.libao_ling);
+                view.setBackgroundResource(R.drawable.textview_green_style);
+                break;
+            case "tao":
+                view.setText(R.string.libao_tao);
+                view.setBackgroundResource(R.drawable.textview_orange_style);
+                break;
+            case "used_up":
+                view.setText(R.string.libao_used_up);
+                view.setBackgroundResource(R.drawable.textview_cancel_up);
+                break;
+            case "finish":
+                view.setText(R.string.libao_finish);
+                view.setBackgroundResource(R.drawable.textview_cancel_up);
+                break;
+            case "linged":
+                view.setText(R.string.libao_linged);
+                view.setBackgroundResource(R.drawable.libao_linged_style);
+                view.setTextColor(ContextCompat.getColorStateList(view.getContext(), R.color.libao_linged_selector));
+                break;
+            case "taoed":
+                view.setText(R.string.libao_taoed);
+                view.setBackgroundResource(R.drawable.libao_taoed_style);
+                view.setTextColor(ContextCompat.getColorStateList(view.getContext(), R.color.libao_taoed_selector));
+                break;
+            case "copy":
+                view.setText(R.string.libao_copy);
+                view.setBackgroundResource(R.drawable.textview_blue_style);
+                break;
+            case "repeatLing":
+                view.setText(R.string.libao_repeat_ling);
+                view.setBackgroundResource(R.drawable.textview_cancel_up);
+                break;
+            case "repeatLinged":
+                view.setText(R.string.libao_repeat_ling);
+                view.setBackgroundResource(R.drawable.textview_green_style);
+                break;
+            case "repeatTao":
+                view.setText(R.string.libao_repeat_tao);
+                view.setBackgroundResource(R.drawable.textview_cancel_up);
+                break;
+            case "repeatTaoed":
+                view.setText(R.string.libao_repeat_tao);
+                view.setBackgroundResource(R.drawable.textview_orange_style);
+                break;
+            case "unshelve":
+                view.setBackgroundResource(R.drawable.textview_cancel_style);
+                view.setText(R.string.libao_unshelve);
+                break;
+            default:
+                view.setBackgroundResource(R.drawable.textview_cancel_style);
+                view.setText("异常");
+        }
    }

    // 大图下的进度条
@ -111,8 +355,7 @@ public class BindingAdapters {
                                         ExposureEvent traceEvent,
                                         @Nullable View.OnClickListener clickCallBack,
                                         @Nullable String entrance,
-                                         @Nullable String location,
-                                         String sourceEntrance) {
+                                         @Nullable String location) {

        // 恢复DialogFragment
        restoreDialogFragment(progressBar);
@ -133,9 +376,13 @@ public class BindingAdapters {
            switch (progressBar.getButtonStyle()) {
                case DOWNLOADING_PLUGIN:
                case DOWNLOADING_NORMAL:
-                    Intent intent = DownloadManagerActivity.getDownloadMangerIntent(v.getContext(),
-                            gameEntity.getApk().get(0).getUrl(), entrance);
-                    v.getContext().startActivity(intent);
+                    if (gameEntity.isVGame()) {
+                        v.getContext().startActivity(VDownloadManagerActivity.getIntent(v.getContext(), true));
+                    } else {
+                        Intent intent = DownloadManagerActivity.getDownloadMangerIntent(v.getContext(),
+                                gameEntity.getApk().get(0).getUrl(), entrance);
+                        v.getContext().startActivity(intent);
+                    }
                    break;
                case NONE:
                    Utils.toast(v.getContext(), "该游戏已关闭下载");
@ -158,7 +405,7 @@ public class BindingAdapters {
                                }
                            }

-                            DownloadChainBuilder builder = new DownloadChainBuilder();
+                            ChainBuilder builder = new ChainBuilder();
                            builder.addHandler(new UnsupportedFeatureHandler());
                            builder.addHandler(new GamePermissionHandler());
                            builder.addHandler(new CheckStoragePermissionHandler());
@ -172,33 +419,22 @@ public class BindingAdapters {
                            builder.addHandler(new OverseaDownloadHandler());
                            builder.addHandler(new CheckDownloadHandler());

-                            builder.setProcessEndCallback((asVGame, isSubscribe) -> {
-                                download(v.getContext(),
-                                        progressBar,
-                                        gameEntity,
-                                        traceEvent,
-                                        asVGame,
-                                        (boolean) isSubscribe,
-                                        entrance,
-                                        location);
+                            builder.setProcessEndCallback(o -> {
+                                download(v.getContext(), progressBar, gameEntity, traceEvent, (boolean) o, entrance, location);
                                return null;
                            });
-                            final DownloadChainHandler chainHandler = builder.buildHandlerChain();
+                            final ChainHandler chainHandler = builder.buildHandlerChain();
                            if (chainHandler != null) {
-                                chainHandler.handleRequest(
-                                        v.getContext(),
-                                        gameEntity,
-                                        GameUtils.shouldPerformAsVGame(gameEntity)
-                                );
+                                chainHandler.handleRequest(v.getContext(), gameEntity);
                            }
                        } else {
-                            DownloadChainBuilder builder = new DownloadChainBuilder();
+                            ChainBuilder builder = new ChainBuilder();
                            builder.addHandler(new UnsupportedFeatureHandler());
                            builder.addHandler(new GamePermissionHandler());
                            builder.addHandler(new CertificationHandler());
                            builder.addHandler(new VersionNumberHandler());

-                            builder.setProcessEndCallback((asVGame, isSubscribe) -> {
+                            builder.setProcessEndCallback(o -> {
                                DownloadDialog.showDownloadDialog(
                                        v.getContext(),
                                        gameEntity,
@ -207,13 +443,9 @@ public class BindingAdapters {
                                        location + ":" + gameEntity.getName());
                                return null;
                            });
-                            final DownloadChainHandler chainHandler = builder.buildHandlerChain();
+                            final ChainHandler chainHandler = builder.buildHandlerChain();
                            if (chainHandler != null) {
-                                chainHandler.handleRequest(
-                                        v.getContext(),
-                                        gameEntity,
-                                        GameUtils.shouldPerformAsVGame(gameEntity)
-                                );
+                                chainHandler.handleRequest(v.getContext(), gameEntity);
                            }
                        }
                    }
@ -226,14 +458,7 @@ public class BindingAdapters {
                            if (downloadEntity != null) {
                                File file = new File(downloadEntity.getPath());
                                if (!file.exists()) {
-                                    download(v.getContext(),
-                                            progressBar,
-                                            gameEntity,
-                                            traceEvent,
-                                            false,
-                                            false,
-                                            entrance,
-                                            location);
+                                    download(v.getContext(), progressBar, gameEntity, traceEvent, false, entrance, location);
                                    return;
                                }

@ -242,7 +467,12 @@ public class BindingAdapters {
                            return;
                        }

-                        PackageLauncher.launch(v.getContext(), gameEntity, null);
+                        if (gameEntity.isVGame()) {
+                            VHelper.installOrLaunch((AppCompatActivity) v.getContext(), gameEntity, null);
+                            return;
+                        }
+
+                        PackageLauncher.launchApp(v.getContext(), gameEntity, gameEntity.getApk().get(0).getPackageName());
                    } else {
                        DownloadDialog.showDownloadDialog(
                                v.getContext(),
@ -270,19 +500,20 @@ public class BindingAdapters {

                        DownloadEntity downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity);

+                        if (gameEntity.isVGame()) {
+                            VHelper.installOrLaunch(v.getContext(), gameEntity, null);
+                            return;
+                        }
+
                        if (downloadEntity != null) {
-                            if (ExtensionsKt.isLocalDownloadInDualDownloadMode(downloadEntity)) {
-                                PackageInstaller.install(v.getContext(), downloadEntity);
-                            } else {
-                                VHelper.installOrLaunch(v.getContext(), gameEntity, null);
-                            }
+                            PackageInstaller.install(v.getContext(), downloadEntity);
                        }
                    }
                    break;
                case RESERVABLE:
                    GamePermissionDialogFragment.show((AppCompatActivity) v.getContext(), gameEntity, gameEntity.getInfo(), () -> {
                        CheckLoginUtils.checkLogin(progressBar.getContext(), "", () -> {
-                            ReservationHelper.reserve(v.getContext(), gameEntity, sourceEntrance, () -> {
+                            ReservationHelper.reserve(v.getContext(), gameEntity.getId(), gameEntity.getName(), () -> {
                                LogUtils.logReservation(gameEntity, traceEvent);
                                updateReservation(progressBar, gameEntity);
                            });
@ -361,7 +592,7 @@ public class BindingAdapters {
            }

        } else {
-            String status = GameUtils.getDownloadBtnText(progressBar.getContext(), gameEntity, true, false, PluginLocation.only_game);
+            String status = GameUtils.getDownloadBtnText(progressBar.getContext(), gameEntity, PluginLocation.only_game);
            switch (status) {
                case "插件化":
                    progressBar.setButtonStyle(DownloadButton.ButtonStyle.PLUGIN);
@ -433,6 +664,24 @@ public class BindingAdapters {
        }
    }

+    /*private static void download(DownloadProgressBar progressBar, GameEntity gameEntity, ExposureEvent traceEvent, @Nullable String entrance, @Nullable String location, View v) {
+        if (gameEntity.getApk().size() == 1) {
+            ApkEntity apk = gameEntity.getApk().get(0);
+            DownloadDialogHelper.findAvailableDialogAndShow(
+                    v.getContext(),
+                    gameEntity,
+                    apk,
+                    () -> {
+                        DialogUtils.checkDownload(v.getContext(), apk.getSize(),
+                                isSubscribe -> download(progressBar, gameEntity, traceEvent, isSubscribe, entrance, location));
+                    });
+        } else {
+            DownloadDialog.getInstance(v.getContext()).showPopupWindow(v, gameEntity,
+                    entrance, location + gameEntity.getName(), traceEvent);
+        }
+    }*/
+
+
    private static void updateReservation(DownloadButton progressBar, GameEntity gameEntity) {
        // 显示预约
        if (gameEntity.isReservable()) {
@ -452,35 +701,45 @@ public class BindingAdapters {
                                 DownloadButton progressBar,
                                 GameEntity gameEntity,
                                 ExposureEvent traceEvent,
-                                 boolean asVGame,
                                 boolean isSubscribe,
                                 String entrance,
                                 String location) {
        if (BrowserInstallHelper.shouldAutoSwitchAssistantInstall(gameEntity)) {
            ToastUtils.toast(context.getString(R.string.unsupported_browser_install_hint));
        }
-        String buttonText = progressBar.getText();
+        String str = progressBar.getText().toString();
+        String method;
+        if (str.contains("更新")) {
+            method = "更新";
+        } else if (str.contains("插件化")) {
+            method = "插件化";
+        } else {
+            method = progressBar.getContext().getString(R.string.download);
+        }
        ApkEntity apkEntity = gameEntity.getApk().get(0);
        String msg = FileUtils.isCanDownload(progressBar.getContext(), apkEntity.getSize());
        if (TextUtils.isEmpty(msg)) {
            DownloadManager.createDownload(progressBar.getContext(),
                    apkEntity,
                    gameEntity,
-                    asVGame,
-                    gameEntity.isDualBtnModeEnabled(),
+                    method,
                    entrance,
                    location + gameEntity.getName(),
                    isSubscribe,
                    traceEvent);

            progressBar.setProgress(0);
-            progressBar.setButtonStyle(buttonText.contains("插件化") ?
+            progressBar.setButtonStyle("插件化".equals(method) ?
                    DownloadButton.ButtonStyle.DOWNLOADING_PLUGIN : DownloadButton.ButtonStyle.DOWNLOADING_NORMAL);
        } else {
            Utils.toast(progressBar.getContext(), msg);
        }
    }

+    public static void setGameLabelList(LinearLayout layout, List<TagStyleEntity> tagStyle) {
+        GameViewUtils.setLabelList(layout.getContext(), layout, tagStyle);
+    }
+
    // 包含测试开服标签
    public static void setGameTags(LinearLayout layout, GameEntity gameEntity) {
        try {
@ -550,6 +809,12 @@ public class BindingAdapters {
        }
    }

+    public static void isRefreshing(SwipeRefreshLayout layout, LoadStatus status) {
+        if (status != LoadStatus.INIT_LOADING && status != LoadStatus.LIST_LOADING) {
+            layout.setRefreshing(false);
+        }
+    }
+
    public static void setGameName(TextView view, GameEntity game, boolean isShowPlatform, @Nullable Boolean isShowSuffix) {
        if (isShowSuffix == null) isShowSuffix = true; // 默认显示
        String gameName;
@ -571,6 +836,30 @@ public class BindingAdapters {

    }

+    public static void setCommunityImage(SimpleDraweeView imageView, List<String> images, List<CommunityVideoEntity> videos) {
+        if (videos.size() > 0) {
+            CommunityVideoEntity videoEntity = videos.get(0);
+            ImageUtils.display(imageView, videoEntity.getPoster());
+            imageView.setVisibility(View.VISIBLE);
+        } else if (images.size() > 0) {
+            imageView.setVisibility(View.VISIBLE);
+            ImageUtils.display(imageView, images.get(0));
+        } else {
+            imageView.setVisibility(View.GONE);
+        }
+    }
+
+    public static void setCommunityVideoDuration(TextView mVideoDuration, List<CommunityVideoEntity> videos) {
+        if (videos != null && videos.size() > 0) {
+            CommunityVideoEntity videoEntity = videos.get(0);
+            mVideoDuration.setBackground(DrawableView.getOvalDrawable(R.color.black_alpha_50, 999F));
+            mVideoDuration.setText(videoEntity.getDuration());
+            mVideoDuration.setVisibility(View.VISIBLE);
+        } else {
+            mVideoDuration.setVisibility(View.GONE);
+        }
+    }
+
    public static void setGameTags(TextView view, List<TagStyleEntity> tags, int maxTags) {
        if (tags == null) {
            view.setText("");
@ -598,4 +887,16 @@ public class BindingAdapters {
        }
        view.setText(span);
    }
+
+    public static void setVideoData(TextView view, int count) {
+        if (count > 0) {
+            ExtensionsKt.setDrawableStart(view, ContextCompat.getDrawable(view.getContext(), R.drawable.ic_video_data_up), null, null);
+            view.setTextColor(ContextCompat.getColor(view.getContext(), R.color.text_EA3333));
+            view.setText(count + "");
+        } else {
+            ExtensionsKt.removeDrawable(view);
+            view.setTextColor(ContextCompat.getColor(view.getContext(), R.color.text_subtitleDesc));
+            view.setText("-");
+        }
+    }
 }
--- a/app/src/main/java/com/gh/common/dialog/ApplyModeratorDialogFragment.kt
+++ b/app/src/main/java/com/gh/common/dialog/ApplyModeratorDialogFragment.kt
@ -49,7 +49,7 @@ class ApplyModeratorDialogFragment : BaseDialogFragment() {
                requireContext(),
                startText.length,
                startText.length + mGroupNumber.length,
-                R.color.text_theme,
+                R.color.theme_font,
                true
            ) {
                DirectUtils.directToQqGroup(
--- a/app/src/main/java/com/gh/common/dialog/CertificationDialog.kt
+++ b/app/src/main/java/com/gh/common/dialog/CertificationDialog.kt
@ -70,11 +70,11 @@ class CertificationDialog(
                actionRightTv.text = "去实名认证"
                noRemindAgainCb.visibility = View.GONE
                actionLeftTv.setOnClickListener {
-                    SensorsBridge.trackVerificationPopupClick(actionLeftTv.text.toString())
+                    SensorsBridge.trackEvent("VerificationPopupClick", "button_name", actionLeftTv.text.toString())
                    dismiss()
                }
                actionRightTv.setOnClickListener {
-                    SensorsBridge.trackVerificationPopupClick(actionRightTv.text.toString())
+                    SensorsBridge.trackEvent("VerificationPopupClick", "button_name", actionRightTv.text.toString())
                    if (UserManager.getInstance().isLoggedIn) {
                        gotoAuthPage()
                    } else {
@ -87,7 +87,7 @@ class CertificationDialog(
                actionRightTv.text = "继续下载"
                noRemindAgainCb.visibility = View.GONE
                actionLeftTv.setOnClickListener {
-                    SensorsBridge.trackVerificationPopupClick(actionLeftTv.text.toString())
+                    SensorsBridge.trackEvent("VerificationPopupClick", "button_name", actionLeftTv.text.toString())
                    if (UserManager.getInstance().isLoggedIn) {
                        gotoAuthPage()
                    } else {
@ -95,7 +95,7 @@ class CertificationDialog(
                    }
                }
                actionRightTv.setOnClickListener {
-                    SensorsBridge.trackVerificationPopupClick(actionRightTv.text.toString())
+                    SensorsBridge.trackEvent("VerificationPopupClick", "button_name", actionRightTv.text.toString())
                    listener.onConfirm()
                    dismiss()
                }
@ -105,7 +105,7 @@ class CertificationDialog(
                actionRightTv.text = "继续下载"
                noRemindAgainCb.visibility = View.VISIBLE
                actionLeftTv.setOnClickListener {
-                    SensorsBridge.trackVerificationPopupClick(actionLeftTv.text.toString())
+                    SensorsBridge.trackEvent("VerificationPopupClick", "button_name", actionLeftTv.text.toString())
                    if (noRemindAgainCb.isChecked) {
                        SPUtils.setBoolean(gameEntity.id, true)
                    }
@ -116,7 +116,7 @@ class CertificationDialog(
                    }
                }
                actionRightTv.setOnClickListener {
-                    SensorsBridge.trackVerificationPopupClick(actionRightTv.text.toString())
+                    SensorsBridge.trackEvent("VerificationPopupClick", "button_name", actionRightTv.text.toString())
                    if (noRemindAgainCb.isChecked) {
                        SPUtils.getBoolean(gameEntity.id, true)
                    }
@ -126,12 +126,14 @@ class CertificationDialog(
            }
        }

-        SensorsBridge.trackVerificationDialogShow(
-            gameId = gameEntity.id,
-            gameName = gameEntity.name ?: "",
-            gameType = gameEntity.categoryChinese,
-            articleType = "",
-            verificationType = "游戏实名"
+        SensorsBridge.trackEvent(
+            "VerificationDialogShow",
+            "game_id",
+            gameEntity.id,
+            "game_name",
+            gameEntity.name ?: "",
+            "game_type",
+            gameEntity.categoryChinese
        )
    }

@ -160,7 +162,6 @@ class CertificationDialog(
                    context,
                    ShellActivity.Type.REAL_NAME_INFO,
                ).apply {
-                    putExtra(EntranceConsts.KEY_SOURCE_ENTRANCE, "游戏实名")
                    putExtra(EntranceConsts.KEY_GAME_ID, gameEntity.id)
                }, object : Callback {
                    override fun onActivityResult(resultCode: Int, data: Intent?) {
--- a/app/src/main/java/com/gh/common/dialog/GameOffServiceDialogFragment.kt
+++ b/app/src/main/java/com/gh/common/dialog/GameOffServiceDialogFragment.kt
@ -60,7 +60,7 @@ class GameOffServiceDialogFragment : BaseDialogFragment() {
                        if (index == notEmptySite.size - 1) bottomMargin = 8F.dip2px()
                    }
                    siteTv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14F)
-                    siteTv.setTextColor(R.color.text_theme.toColor(requireContext()))
+                    siteTv.setTextColor(R.color.theme_font.toColor(requireContext()))
                    siteTv.text = site.text
                    siteTv.paintFlags = siteTv.paintFlags or Paint.UNDERLINE_TEXT_FLAG
                    siteTv.setOnClickListener {
--- a/app/src/main/java/com/gh/common/dialog/NewPrivacyPolicyDialogFragment.kt
+++ b/app/src/main/java/com/gh/common/dialog/NewPrivacyPolicyDialogFragment.kt
@ -76,7 +76,7 @@ class NewPrivacyPolicyDialogFragment : BaseDialogFragment() {
            contentText.setSpan(object : ClickableSpan() {
                override fun updateDrawState(ds: TextPaint) {
                    super.updateDrawState(ds)
-                    ds.color = ContextCompat.getColor(requireContext(), R.color.text_theme)
+                    ds.color = ContextCompat.getColor(requireContext(), R.color.theme_font)
                    ds.isUnderlineText = false
                }

--- a/app/src/main/java/com/gh/common/dialog/PackageCheckDialogFragment.kt
+++ b/app/src/main/java/com/gh/common/dialog/PackageCheckDialogFragment.kt
@ -125,7 +125,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
                    requireContext(),
                    0,
                    (link.title ?: "").length,
-                    R.color.text_theme,
+                    R.color.theme_font,
                    true
                ) {
                    LogUtils.uploadPackageCheck(
@ -391,10 +391,10 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
                    val isAllInstalled = checkDetectionsInstalled(mAllInstalledPackages, entity.packages)
                    if (isAllInstalled) {
                        holder.binding.statusTv.text = "已安装"
-                        holder.binding.statusTv.setTextColor(ContextCompat.getColor(context, R.color.text_theme))
+                        holder.binding.statusTv.setTextColor(ContextCompat.getColor(context, R.color.theme_font))
                    } else {
                        holder.binding.statusTv.text = "未安装"
-                        holder.binding.statusTv.setTextColor(ContextCompat.getColor(context, R.color.secondary_red))
+                        holder.binding.statusTv.setTextColor(ContextCompat.getColor(context, R.color.theme_red))
                    }
                    holder.binding.statusTv.visibility = View.VISIBLE
                } else {
--- a/app/src/main/java/com/gh/common/dialog/PrivacyPolicyDialogFragment.kt
+++ b/app/src/main/java/com/gh/common/dialog/PrivacyPolicyDialogFragment.kt
@ -59,7 +59,7 @@ class PrivacyPolicyDialogFragment : BaseDialogFragment() {
        skipText.setSpan(object : ClickableSpan() {
            override fun updateDrawState(ds: TextPaint) {
                super.updateDrawState(ds)
-                ds.color = ContextCompat.getColor(requireContext(), R.color.text_theme)
+                ds.color = ContextCompat.getColor(requireContext(), R.color.theme_font)
                ds.isUnderlineText = false
            }

@ -101,7 +101,7 @@ class PrivacyPolicyDialogFragment : BaseDialogFragment() {
        skipText.setSpan(object : ClickableSpan() {
            override fun updateDrawState(ds: TextPaint) {
                super.updateDrawState(ds)
-                ds.color = ContextCompat.getColor(requireContext(), R.color.text_theme)
+                ds.color = ContextCompat.getColor(requireContext(), R.color.theme_font)
                ds.isUnderlineText = false
            }

@ -115,7 +115,7 @@ class PrivacyPolicyDialogFragment : BaseDialogFragment() {
        skipText.setSpan(object : ClickableSpan() {
            override fun updateDrawState(ds: TextPaint) {
                super.updateDrawState(ds)
-                ds.color = ContextCompat.getColor(requireContext(), R.color.text_theme)
+                ds.color = ContextCompat.getColor(requireContext(), R.color.theme_font)
                ds.isUnderlineText = false
            }

--- a/app/src/main/java/com/gh/common/exposure/ExposureUtils.kt
+++ b/app/src/main/java/com/gh/common/exposure/ExposureUtils.kt
@ -96,9 +96,9 @@ object ExposureUtils {
    }

    @JvmStatic
-    fun getDownloadType(apkEntity: ApkEntity, gameId: String, asVGame: Boolean): DownloadType {
+    fun getDownloadType(apkEntity: ApkEntity, gameId: String, isVGame: Boolean): DownloadType {
        return when {
-            asVGame -> getVGameDownloadType(apkEntity, gameId)
+            isVGame -> getVGameDownloadType(apkEntity, gameId)
            PackageUtils.isInstalled(
                HaloApp.getInstance().application,
                apkEntity.packageName
@ -109,7 +109,7 @@ object ExposureUtils {

    private fun getVGameDownloadType(apkEntity: ApkEntity, gameId: String): DownloadType {
        return when {
-            PackagesManager.isCanUpdate(gameId, apkEntity.packageName, asVGame = true) -> DownloadType.FUN_UPDATE
+            PackagesManager.isCanUpdate(gameId, apkEntity.packageName) -> DownloadType.FUN_UPDATE
            else -> DownloadType.FUN_DOWNLOAD
        }
    }
--- a/app/src/main/java/com/gh/common/history/HistoryDatabase.kt
+++ b/app/src/main/java/com/gh/common/history/HistoryDatabase.kt
@ -19,7 +19,7 @@ import com.halo.assistant.HaloApp

@Database(
    entities = [AnswerEntity::class, ArticleEntity::class, NewsEntity::class, HistoryGameEntity::class, MyVideoEntity::class, GamesCollectionEntity::class],
-    version = 14,
+    version = 13,
    exportSchema = false
 )
@TypeConverters(
@ -41,8 +41,7 @@ import com.halo.assistant.HaloApp
    SimpleGameListConverter::class,
    TagInfoListConverter::class,
    ActivityLabelListConverter::class,
-    IconFloatConverter::class,
-    SectionConverter::class
+    IconFloatConverter::class
 )

 abstract class HistoryDatabase : RoomDatabase() {
@ -144,14 +143,6 @@ abstract class HistoryDatabase : RoomDatabase() {
            }
        }

-        val MIGRATION_13_14: Migration = object : Migration(13, 14) {
-            override fun migrate(database: SupportSQLiteDatabase) {
-                database.execSQL("Alter TABLE ArticleEntity add type TEXT NOT NULL DEFAULT 'community_article'")
-                database.execSQL("Alter TABLE ArticleEntity add sections TEXT NOT NULL DEFAULT ''")
-                database.execSQL("Alter TABLE ArticleEntity add tagActivityName TEXT NOT NULL DEFAULT ''")
-            }
-        }
-
        val instance by lazy {
            Room.databaseBuilder(
                HaloApp.getInstance().application,
@ -169,7 +160,6 @@ abstract class HistoryDatabase : RoomDatabase() {
                .addMigrations(MIGRATION_10_11)
                .addMigrations(MIGRATION_11_12)
                .addMigrations(MIGRATION_12_13)
-                .addMigrations(MIGRATION_13_14)
                .build()
        }
    }
--- a/app/src/main/java/com/gh/common/history/HistoryHelper.kt
+++ b/app/src/main/java/com/gh/common/history/HistoryHelper.kt
@ -6,7 +6,11 @@ import com.gh.gamecenter.common.utils.removeVideoContent
 import com.gh.gamecenter.common.utils.tryCatchInRelease
 import com.gh.gamecenter.core.runOnIoThread
 import com.gh.gamecenter.entity.*
-import com.gh.gamecenter.feature.entity.*
+import com.gh.gamecenter.feature.entity.AnswerEntity
+import com.gh.gamecenter.feature.entity.ArticleEntity
+import com.gh.gamecenter.feature.entity.GameEntity
+import com.gh.gamecenter.feature.entity.NewsEntity
+import com.gh.gamecenter.feature.entity.User
 import com.gh.gamecenter.qa.entity.AnswerDetailEntity
 import com.gh.gamecenter.qa.entity.ArticleDetailEntity

@ -105,7 +109,7 @@ object HistoryHelper {
    fun deleteArticleEntity(articleId: String) {
        runOnIoThread {
            tryCatchInRelease {
-                HistoryDatabase.instance.articleDao().deleteArticle(ArticleEntity(_id = articleId))
+                HistoryDatabase.instance.articleDao().deleteArticle(ArticleEntity(id = articleId))
            }
        }
    }
@ -166,9 +170,6 @@ object HistoryHelper {
        articleEntity.images = articleDetailEntity.images
        articleEntity.imagesInfo = articleDetailEntity.imagesInfo
        articleEntity.videos = articleDetailEntity.videos
-        articleEntity.tagActivityName = articleDetailEntity.tagActivityName
-        articleEntity.sections = articleDetailEntity.sections ?: emptyList()
-        articleEntity.type = "community_article"

        return articleEntity
    }
--- a/app/src/main/java/com/gh/common/prioritychain/AccelerateNotificationHandler.kt
+++ b/app/src/main/java/com/gh/common/prioritychain/AccelerateNotificationHandler.kt
@ -41,7 +41,6 @@ class AccelerateNotificationHandler(priority: Int) : PriorityChainHandler(priori
            if (gameEntityList == null) {
                processNext()
            } else {
-                updateStatus(STATUS_VALID)
                onProcess()
            }
        } else {
--- a/app/src/main/java/com/gh/common/prioritychain/FloatingWindowHandler.kt
+++ b/app/src/main/java/com/gh/common/prioritychain/FloatingWindowHandler.kt
@ -20,7 +20,7 @@ class FloatingWindowHandler(priority: Int) : PriorityChainHandler(priority) {
        mWindowList = windowList

        if (mFragment != null) {
-            doPreProcess()
+            preProcess()
        }
    }

@ -32,16 +32,15 @@ class FloatingWindowHandler(priority: Int) : PriorityChainHandler(priority) {
        mRecyclerView = recyclerView

        if (mWindowList != null) {
-            doPreProcess()
+            preProcess()
        }
    }

-    private fun doPreProcess() {
+    private fun preProcess() {
        Utils.log(TAG, "FloatingWindowHandler preProcess windowSize is -> ${mWindowList?.size}")

        if (getStatus() == STATUS_PENDING) {
            if (!mWindowList.isNullOrEmpty()) {
-                updateStatus(STATUS_VALID)
                onProcess()
            } else {
                processNext()
--- a/app/src/main/java/com/gh/common/prioritychain/HomePushHandler.kt
+++ b/app/src/main/java/com/gh/common/prioritychain/HomePushHandler.kt
@ -14,7 +14,6 @@ class HomePushHandler(priority: Int): PriorityChainHandler(priority) {

        if (getStatus() == STATUS_PENDING) {
            if (shouldShow && homeFragment != null) {
-                updateStatus(STATUS_VALID)
                onProcess()
            } else {
                processNext()
--- a/app/src/main/java/com/gh/common/prioritychain/PrivacyPolicyDialogHandler.kt
+++ b/app/src/main/java/com/gh/common/prioritychain/PrivacyPolicyDialogHandler.kt
@ -20,7 +20,6 @@ class PrivacyPolicyDialogHandler(priority: Int) : PriorityChainHandler(priority)
            if (privacyPolicyEntity == null) {
                processNext()
            } else {
-                updateStatus(STATUS_VALID)
                onProcess()
            }
        } else {
--- a/app/src/main/java/com/gh/common/prioritychain/ReserveDialogHandler.kt
+++ b/app/src/main/java/com/gh/common/prioritychain/ReserveDialogHandler.kt
@ -21,7 +21,6 @@ class ReserveDialogHandler(priority: Int) : PriorityChainHandler(priority) {
            if (reserveData.isNullOrEmpty()) {
                processNext()
            } else {
-                updateStatus(STATUS_VALID)
                onProcess()
            }
        } else {
--- a/app/src/main/java/com/gh/common/provider/AppProviderImpl.kt
+++ b/app/src/main/java/com/gh/common/provider/AppProviderImpl.kt
@ -8,7 +8,6 @@ import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IAppProvider
 import com.gh.gamecenter.core.provider.IFlavorProvider
 import com.halo.assistant.HaloApp
-import com.va.host.HostUtils

@Route(path = RouteConsts.provider.app, name = "Application暴露服务")
 class AppProviderImpl : IAppProvider {
@ -83,10 +82,4 @@ class AppProviderImpl : IAppProvider {
    override fun getIsBrandNewInstall(): Boolean {
        return HaloApp.getInstance().isBrandNewInstall
    }
-
-    override fun setSkippingThirdParty(isSkippingThirdParty: Boolean) {
-        HaloApp.getInstance().isSkippingThirdParty = isSkippingThirdParty
-    }
-
-    override fun getPluginVersion(): String = HostUtils.getPluginVersion()
 }
--- a/app/src/main/java/com/gh/common/provider/BuildConfigImpl.kt
+++ b/app/src/main/java/com/gh/common/provider/BuildConfigImpl.kt
@ -19,7 +19,6 @@ class BuildConfigImpl : IBuildConfigProvider {
    override fun getExposureVersion(): String = BuildConfig.EXPOSURE_VERSION

    override fun isDebug(): Boolean = BuildConfig.DEBUG
-    override fun isGATApp(): Boolean = BuildConfig.IS_GAT_APP

    override fun getApiHost(): String = BuildConfig.API_HOST

@ -32,5 +31,4 @@ class BuildConfigImpl : IBuildConfigProvider {
    override fun getVApiHost(): String = BuildConfig.VAPI_HOST

    override fun getVDevApiHost(): String = BuildConfig.DEV_VAPI_HOST
-    override fun getLogProducerProject(): String = BuildConfig.LOG_HUB_PROJECT
 }
--- a/app/src/main/java/com/gh/common/provider/DefaultUrlHandlerProviderImpl.kt
+++ b/app/src/main/java/com/gh/common/provider/DefaultUrlHandlerProviderImpl.kt
@ -13,10 +13,9 @@ class DefaultUrlHandlerProviderImpl : IDefaultUrlHandlerProvider {
        context: Context,
        url: String,
        entrance: String,
-        bringAppToFront: Boolean,
-        sourceEntrance: String
+        bringAppToFront: Boolean
    ): Boolean {
-        return DefaultUrlHandler.interceptUrl(context, url, null, entrance, bringAppToFront, sourceEntrance)
+        return DefaultUrlHandler.interceptUrl(context, url, null, entrance, bringAppToFront)
    }

    override fun init(context: Context?) {
--- a/app/src/main/java/com/gh/common/provider/DirectProviderImpl.kt
+++ b/app/src/main/java/com/gh/common/provider/DirectProviderImpl.kt
@ -83,14 +83,13 @@ class DirectProviderImpl : IDirectProvider {
        articleId: String?,
        communityId: String?,
        entrance: String?,
-        path: String?,
-        sourceEntrance: String
+        path: String?
    ) {
-        DirectUtils.directToCommunityArticle(context, articleId, communityId, entrance, path, sourceEntrance)
+        DirectUtils.directToCommunityArticle(context, articleId, communityId, entrance, path)
    }

-    override fun directToVideoDetail(context: Context, videoId: String, entrance: String?, path: String?, sourceEntrance: String) {
-        DirectUtils.directToVideoDetail(context, videoId, entrance, path, sourceEntrance)
+    override fun directToVideoDetail(context: Context, videoId: String, entrance: String?, path: String?) {
+        DirectUtils.directToVideoDetail(context, videoId, entrance, path)
    }

    override fun directToAmway(context: Context, fixedTopAmwayCommentId: String?, entrance: String?, path: String?) {
@ -121,10 +120,6 @@ class DirectProviderImpl : IDirectProvider {
        return DirectUtils.directToQGameHome(context)
    }

-    override fun directToExternalBrowser(context: Context, url: String) {
-        DirectUtils.directToExternalBrowser(context, url)
-    }
-
    override fun init(context: Context?) {
        // Do nothing
    }
--- a/app/src/main/java/com/gh/common/provider/DownloadButtonClickedProviderImpl.kt
+++ b/app/src/main/java/com/gh/common/provider/DownloadButtonClickedProviderImpl.kt
@ -3,7 +3,6 @@ package com.gh.common.provider
 import android.content.Context
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.common.util.NewFlatLogUtils
-import com.gh.gamecenter.R
 import com.gh.gamecenter.common.base.GlobalActivityManager
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.exposure.ExposureSource
@ -40,16 +39,13 @@ class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
                    gameId = boundedObject.id
                    gameName = boundedObject.name ?: ""
                    gameCategory = boundedObject.category ?: ""
-                    downloadStatus =
-                        if (boundedObject.isVGamePreferred()) {
-                            "畅玩"
-                        } else {
-                            if (boundedObject.downloadStatus == "demo") {
-                                "试玩"
-                            } else {
-                                "下载"
-                            }
-                        }
+                    downloadStatus = if (boundedObject.isVGame()) {
+                        "畅玩"
+                    } else if (boundedObject.downloadStatus == "demo") {
+                        "试玩"
+                    } else {
+                        "下载"
+                    }
                    gameTypeInChinese = boundedObject.categoryChinese
                    downloadStatusInChinese = boundedObject.downloadStatusChinese
                    gameSchemaType = boundedObject.gameBitChinese
@ -72,7 +68,7 @@ class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
                    gameId = boundedObject.gameId
                    gameName = boundedObject.name ?: ""
                    gameCategory = boundedObject.getGameCategory()
-                    downloadStatus = if (boundedObject.asVGame()) "畅玩" else "下载"
+                    downloadStatus = if (boundedObject.isVGame()) "畅玩" else "下载"
                    packageName = boundedObject.packageName
                    exposureSourceList = boundedObject.exposureTrace?.toObject<ExposureEvent>()?.source
                }
@ -97,18 +93,9 @@ class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
            }

            // 预约状态不上报
-            if (downloadButton.buttonStyle == DownloadButton.ButtonStyle.NORMAL
-                || downloadButton.buttonStyle == DownloadButton.ButtonStyle.PLUGIN) {
-
-                val text = downloadButton.text.ifEmpty {
-                    downloadButton.getTag(R.string.download) ?: ""
-                }.toString()
-
-                val downloadType = if (text.contains("畅玩")) {
-                    "畅玩下载"
-                } else {
-                    "本地下载"
-                }
+            if (downloadButton.buttonStyle != DownloadButton.ButtonStyle.RESERVABLE
+                && downloadButton.buttonStyle != DownloadButton.ButtonStyle.RESERVED
+            ) {

                // 上报神策点击事件
                SensorsBridge.trackEventWithExposureSource(
@ -120,7 +107,6 @@ class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
                    "download_status", downloadStatusInChinese,
                    "button_name", downloadButton.text,
                    "game_schema_type", gameSchemaType,
-                    "download_type", downloadType,
                    "page_name", GlobalActivityManager.getCurrentPageEntity().pageName,
                    "page_id", GlobalActivityManager.getCurrentPageEntity().pageId,
                    "page_business_id", GlobalActivityManager.getCurrentPageEntity().pageBusinessId,
--- a/app/src/main/java/com/gh/common/provider/GameSubstituteRepositoryProviderImpl.kt
+++ b/app/src/main/java/com/gh/common/provider/GameSubstituteRepositoryProviderImpl.kt
@ -9,8 +9,8 @@ import com.gh.gamecenter.core.provider.IGameSubstituteRepositoryProvider
@Route(path = RouteConsts.provider.gameSubstituteRepository, name = "GameSubstituteRepositoryHelper暴露服务")
 class GameSubstituteRepositoryProviderImpl : IGameSubstituteRepositoryProvider {

-    override fun updateHistoricInstalledGameSet() {
-        GameSubstituteRepositoryHelper.updateHistoricInstalledGameSet()
+    override fun updateSubstitutableGames() {
+        GameSubstituteRepositoryHelper.updateSubstitutableGames()
    }

    override fun init(context: Context?) {
--- a/app/src/main/java/com/gh/common/provider/PackageInstallerProviderImpl.kt
+++ b/app/src/main/java/com/gh/common/provider/PackageInstallerProviderImpl.kt
@ -11,7 +11,7 @@ import com.lightgame.download.DownloadEntity
 class PackageInstallerProviderImpl : IPackageInstallerProvider {

    override fun install(context: Context, downloadEntity: DownloadEntity, showUnzipToast: Boolean) {
-        PackageInstaller.install(context, downloadEntity, showUnzipToast, false)
+        PackageInstaller.install(context, downloadEntity, showUnzipToast)
    }

    override fun uninstall(context: Context, path: String) {
--- a/app/src/main/java/com/gh/common/provider/VHelperProviderImpl.kt
+++ b/app/src/main/java/com/gh/common/provider/VHelperProviderImpl.kt
@ -3,24 +3,23 @@ package com.gh.common.provider
 import android.content.Context
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.feature.entity.InstallGameEntity
-import com.gh.gamecenter.feature.provider.IVHelperProvider
+import com.gh.gamecenter.core.provider.IVHelperProvider
 import com.gh.vspace.VHelper

@Route(path = RouteConsts.provider.vhelper, name = "VHelper暴露服务")
 class VHelperProviderImpl: IVHelperProvider {
+    override fun getPlatformV(): String {
+        return VHelper.PLATFORM_V
+    }
+
+    override fun getVUrl(originUrl: String?): String {
+        return VHelper.getVUrl(originUrl)
+    }
+
    override fun isVGameOn(): Boolean {
        return VHelper.isVGameOn()
    }

-    override fun getAllInstalledVGameEntity(): ArrayList<InstallGameEntity> {
-        return VHelper.getAllInstalledVGameEntity()
-    }
-
-    override fun launch(context: Context, packageName: String, ignoreGApps: Boolean, showLoading: Boolean) {
-        VHelper.launch(context, packageName, ignoreGApps, showLoading)
-    }
-
    override fun init(context: Context?) {
        // Do nothing
    }
--- a/app/src/main/java/com/gh/common/provider/WebProviderImpl.kt
+++ b/app/src/main/java/com/gh/common/provider/WebProviderImpl.kt
@ -21,6 +21,10 @@ class WebProviderImpl : IWebProvider {
        return WebActivity.getBindWechatIntent(context)
    }

+    override fun getSecurityCertificationIntent(context: Context): Intent {
+        return WebActivity.getSecurityCertificationIntent(context)
+    }
+
    override fun getQAIntent(
        context: Context?,
        url: String?,
--- a/app/src/main/java/com/gh/common/simulator/NewSimulatorGameManager.kt
+++ b/app/src/main/java/com/gh/common/simulator/NewSimulatorGameManager.kt
@ -91,7 +91,7 @@ object NewSimulatorGameManager {
            },
            uiModificationCallback = { binding ->
                binding.contentTv.gravity = Gravity.START
-                binding.contentTv.setTextColor(R.color.text_secondary.toColor(context))
+                binding.contentTv.setTextColor(R.color.text_subtitle.toColor(context))
            },
            extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
        )
--- a/app/src/main/java/com/gh/common/simulator/SimulatorDownloadManager.kt
+++ b/app/src/main/java/com/gh/common/simulator/SimulatorDownloadManager.kt
@ -395,7 +395,7 @@ class SimulatorDownloadManager private constructor() {
                ToastUtils.showToast("该模拟器暂未提供下载")
            },
            uiModificationCallback = { binding ->
-                binding.confirmTv.setTextColor(R.color.text_instance.toColor(context))
+                binding.confirmTv.setTextColor(R.color.text_body.toColor(context))
            },
            extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
        )
@ -420,7 +420,7 @@ class SimulatorDownloadManager private constructor() {
                DownloadStatus.diskioerror,
                DownloadStatus.diskisfull -> {
                    DownloadManager.getInstance().addObserver(dataWatcher)
-                    uiExecutor.executeWithDelay(Runnable { DownloadManager.getInstance().resume(entity, false) }, 200)
+                    uiExecutor.executeWithDelay(Runnable { DownloadManager.getInstance().resume(entity, true) }, 200)
                    SensorsBridge.trackSimulatorDownloadDialogShow(
                        gameId = gameId,
                        gameName = gameName,
--- a/app/src/main/java/com/gh/common/util/AdHelper.kt
+++ b/app/src/main/java/com/gh/common/util/AdHelper.kt
@ -1,8 +1,15 @@
 package com.gh.common.util

 import com.gh.common.constant.Config
+import com.gh.gamecenter.common.retrofit.Response
+import com.gh.gamecenter.common.utils.ImageUtils
+import com.gh.gamecenter.common.utils.observableToMain
+import com.gh.gamecenter.core.utils.DisplayUtils
+import com.gh.gamecenter.entity.NewApiSettingsEntity
 import com.gh.gamecenter.entity.StartupAdEntity
 import com.gh.gamecenter.feature.entity.SettingsEntity
+import com.gh.gamecenter.retrofit.RetrofitManager
+import com.halo.assistant.HaloApp

 object AdHelper {

--- a/app/src/main/java/com/gh/common/util/ArchiveDownloadButtonHelper.kt
+++ b/app/src/main/java/com/gh/common/util/ArchiveDownloadButtonHelper.kt
@ -9,7 +9,6 @@ import androidx.fragment.app.Fragment
 import com.gh.download.simple.AutoUnregisteredSimpleDownloadListener
 import com.gh.download.simple.DownloadListener
 import com.gh.gamecenter.R
-import com.gh.gamecenter.cloudarchive.BaseCloudArchiveViewModel
 import com.gh.gamecenter.common.eventbus.EBReuse
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.core.runOnUiThread
@ -37,7 +36,6 @@ object ArchiveDownloadButtonHelper {
        entrance: String,
        fragment: Fragment,
        packageName: String,
-        viewModel: BaseCloudArchiveViewModel,
        archiveEntity: ArchiveEntity,
        downloadBtn: TextView,
        gameEntity: GameEntity?,
@ -50,6 +48,8 @@ object ArchiveDownloadButtonHelper {
        }
        downloadBtn.setOnClickListener {
            when {
+                // 检查是否已安装畅玩助手
+                !VHelper.isVSpaceInstalled(context) -> showVSpaceTipDialog(context, gameEntity)
                // 检查是否已安装游戏
                !VHelper.isInstalled(packageName) -> {
                    // 检查游戏是否在安装中
@ -60,23 +60,19 @@ object ArchiveDownloadButtonHelper {
                    }
                }
                // 检查本地是否已下载存档
-                VArchiveHelper.isArchiveDownloaded(archiveEntity.md5) -> viewModel.getArchiveConfigString {
-                    showApplyArchiveTipDialog(
-                        context,
-                        entrance,
-                        packageName,
-                        it,
-                        archiveEntity,
-                        gameEntity
-                    )
-                }
+                VArchiveHelper.isArchiveDownloaded(archiveEntity.md5) -> showApplyArchiveTipDialog(
+                    context,
+                    entrance,
+                    packageName,
+                    archiveEntity,
+                    gameEntity
+                )
                // 检查完毕下载存档
                else -> downloadArchive(
                    context,
                    entrance,
                    fragment,
                    packageName,
-                    viewModel,
                    archiveEntity,
                    downloadBtn,
                    gameEntity,
@ -129,7 +125,6 @@ object ArchiveDownloadButtonHelper {
        context: Context,
        entrance: String,
        packageName: String,
-        config: String,
        archiveEntity: ArchiveEntity,
        gameEntity: GameEntity?
    ) {
@ -140,7 +135,7 @@ object ArchiveDownloadButtonHelper {
                .subscribeOn(Schedulers.io())
                .subscribe()

-            VArchiveHelper.applyGameArchive(context, packageName, config, this) { packageName, isSuccess ->
+            VArchiveHelper.applyGameArchive(context, packageName, this) { packageName, isSuccess ->
                runOnUiThread {
                    if (isSuccess) {
                        VHelper.launch(context, packageName)
@ -166,7 +161,6 @@ object ArchiveDownloadButtonHelper {
        entrance: String,
        fragment: Fragment,
        packageName: String,
-        viewModel: BaseCloudArchiveViewModel,
        archiveEntity: ArchiveEntity,
        downloadBtn: TextView,
        gameEntity: GameEntity?,
@ -203,9 +197,7 @@ object ArchiveDownloadButtonHelper {
                    DownloadStatus.COMPLETED -> {
                        dismissArchiveLoadingDialog(archiveLoadingDialog)
                        downloadBtn.text = R.string.archive_apply.toResString()
-                        viewModel.getArchiveConfigString {
-                            showApplyArchiveTipDialog(context, entrance, packageName, it, archiveEntity, gameEntity)
-                        }
+                        showApplyArchiveTipDialog(context, entrance, packageName, archiveEntity, gameEntity)
                        downloadCompletedListener?.invoke()
                    }
                    else -> {
@ -259,46 +251,43 @@ object ArchiveDownloadButtonHelper {
        context: Context,
        entrance: String,
        packageName: String,
-        config: String,
        archiveEntity: ArchiveEntity,
        gameEntity: GameEntity?
    ) {
-        runOnUiThread {
-            DialogHelper.showDialog(
-                context,
-                R.string.archive_dialog_title.toResString(),
-                R.string.archive_apply_dialog_content.toResString(),
-                R.string.archive_apply.toResString(),
-                R.string.cancel.toResString(),
-                {
-                    applyArchive(context, entrance, packageName, config, archiveEntity, gameEntity)
-                    NewFlatLogUtils.logCloudArchiveApplyDialogRelated("cloud_save_overwrite_dialog_click", "使用")
-                    SensorsBridge.trackEvent(
-                        "CloudSaveOverwriteDialogClick",
-                        "game_id", gameEntity?.id ?: "",
-                        "game_name", gameEntity?.name ?: "",
-                        "button_name", "使用"
-                    )
-                },
-                {
-                    NewFlatLogUtils.logCloudArchiveApplyDialogRelated("cloud_save_overwrite_dialog_click", "取消")
-                    SensorsBridge.trackEvent(
-                        "CloudSaveOverwriteDialogClick",
-                        "game_id", gameEntity?.id ?: "",
-                        "game_name", gameEntity?.name ?: "",
-                        "button_name", "取消"
-                    )
-                },
-                extraConfig = DialogHelper.Config(centerTitle = true)
-            )
+        DialogHelper.showDialog(
+            context,
+            R.string.archive_dialog_title.toResString(),
+            R.string.archive_apply_dialog_content.toResString(),
+            R.string.archive_apply.toResString(),
+            R.string.cancel.toResString(),
+            {
+                applyArchive(context, entrance, packageName, archiveEntity, gameEntity)
+                NewFlatLogUtils.logCloudArchiveApplyDialogRelated("cloud_save_overwrite_dialog_click", "使用")
+                SensorsBridge.trackEvent(
+                    "CloudSaveOverwriteDialogClick",
+                    "game_id", gameEntity?.id ?: "",
+                    "game_name", gameEntity?.name ?: "",
+                    "button_name", "使用"
+                )
+            },
+            {
+                NewFlatLogUtils.logCloudArchiveApplyDialogRelated("cloud_save_overwrite_dialog_click", "取消")
+                SensorsBridge.trackEvent(
+                    "CloudSaveOverwriteDialogClick",
+                    "game_id", gameEntity?.id ?: "",
+                    "game_name", gameEntity?.name ?: "",
+                    "button_name", "取消"
+                )
+            },
+            extraConfig = DialogHelper.Config(centerTitle = true)
+        )

-            NewFlatLogUtils.logCloudArchiveApplyDialogRelated("cloud_save_overwrite_dialog_show")
-            SensorsBridge.trackEvent(
-                "CloudSaveOverwriteDialogShow",
-                "game_id", gameEntity?.id ?: "",
-                "game_name", gameEntity?.name ?: ""
-            )
-        }
+        NewFlatLogUtils.logCloudArchiveApplyDialogRelated("cloud_save_overwrite_dialog_show")
+        SensorsBridge.trackEvent(
+            "CloudSaveOverwriteDialogShow",
+            "game_id", gameEntity?.id ?: "",
+            "game_name", gameEntity?.name ?: ""
+        )
    }

    private fun dismissArchiveLoadingDialog(archiveLoadingDialog: Dialog) {
--- a/app/src/main/java/com/gh/common/util/BbsReportHelper.kt
+++ b/app/src/main/java/com/gh/common/util/BbsReportHelper.kt
@ -64,7 +64,7 @@ object BbsReportHelper {
                    this,
                    1f,
                    false,
-                    R.color.ui_background
+                    R.color.background
                )
            )
            binding.reasonRv.adapter = reportReasonAdapter
@ -94,7 +94,7 @@ object BbsReportHelper {
            binding.otherReasonEt.doOnTextChanged { text, start, before, count ->
                val tvCount: Int = text.toString().length
                if (tvCount >= 500) {
-                    binding.tvCount.setTextColor(R.color.secondary_red.toColor(binding.tvCount.context))
+                    binding.tvCount.setTextColor(R.color.theme_red.toColor(binding.tvCount.context))
                }
                binding.tvCount.text = "$tvCount/500"
            }
--- a/app/src/main/java/com/gh/common/util/CommentUtils.java
+++ b/app/src/main/java/com/gh/common/util/CommentUtils.java
@ -198,7 +198,7 @@ public class CommentUtils {
        LinearLayout container = new LinearLayout(context);
        container.setOrientation(LinearLayout.VERTICAL);
        container.setPadding(0, DisplayUtils.dip2px(context, 12), 0, DisplayUtils.dip2px(context, 12));
-        container.setBackgroundColor(ContextCompat.getColor(context, R.color.ui_surface));
+        container.setBackgroundColor(ContextCompat.getColor(context, R.color.background_white));

        for (final String s : arrReportType) {
            TextView reportTypeTv = new TextView(context);
@ -248,12 +248,12 @@ public class CommentUtils {
    public static void postVote(final Context context, final CommentEntity commentEntity,
                                final TextView commentLikeCountTv, final ImageView commentLikeIv,
                                final OnVoteListener listener) {
-        if (commentLikeCountTv.getCurrentTextColor() == ContextCompat.getColor(context, R.color.text_theme)) {
+        if (commentLikeCountTv.getCurrentTextColor() == ContextCompat.getColor(context, R.color.theme_font)) {
            ToastUtils.INSTANCE.showToast("已经点过赞啦！");
            return;
        }
        commentEntity.setVote(commentEntity.getVote() + 1);
-        commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.text_theme));
+        commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.theme_font));
        commentLikeIv.setImageResource(R.drawable.comment_vote_select);
        commentLikeCountTv.setText(NumberUtils.transSimpleCount(commentEntity.getVote()));
        commentLikeCountTv.setVisibility(View.VISIBLE);
@ -318,12 +318,12 @@ public class CommentUtils {
            entrance = "视频流-评论-点赞";
        }
        CheckLoginUtils.checkLogin(context, entrance, () -> {
-            if (commentLikeCountTv.getCurrentTextColor() == ContextCompat.getColor(context, R.color.text_theme)) {
+            if (commentLikeCountTv.getCurrentTextColor() == ContextCompat.getColor(context, R.color.theme_font)) {
                ToastUtils.INSTANCE.showToast("已经点过赞啦！");
                return;
            }
            commentEntity.setVote(commentEntity.getVote() + 1);
-            commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.text_theme));
+            commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.theme_font));
            commentLikeIv.setImageResource(R.drawable.comment_vote_select);
            commentLikeCountTv.setText(NumberUtils.transSimpleCount(commentEntity.getVote()));
            commentLikeCountTv.setVisibility(View.VISIBLE);
@ -444,7 +444,7 @@ public class CommentUtils {
                        public void onFailure(@Nullable HttpException e) {
                            super.onFailure(e);
                            commentEntity.setVote(commentEntity.getVote() + 1);
-                            commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.text_theme));
+                            commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.theme_font));
                            commentLikeIv.setImageResource(R.drawable.comment_vote_select);
                            commentLikeCountTv.setText(NumberUtils.transSimpleCount(commentEntity.getVote()));
                            commentLikeCountTv.setVisibility(View.VISIBLE);
@ -502,7 +502,7 @@ public class CommentUtils {
            holder.commentLikeCountTv.setVisibility(View.GONE);
        } else { // 检查是否已点赞
            if (userDataEntity != null && (userDataEntity.isCommentVoted())) {
-                holder.commentLikeCountTv.setTextColor(ContextCompat.getColor(mContext, R.color.text_theme));
+                holder.commentLikeCountTv.setTextColor(ContextCompat.getColor(mContext, R.color.theme_font));
                holder.commentLikeIv.setImageResource(R.drawable.comment_vote_select);
            }
            holder.commentLikeCountTv.setVisibility(View.VISIBLE);
--- a/app/src/main/java/com/gh/common/util/DataCollectionUtils.java
+++ b/app/src/main/java/com/gh/common/util/DataCollectionUtils.java
@ -5,7 +5,6 @@ import android.os.Build;

 import com.gh.gamecenter.common.constant.Constants;
 import com.gh.gamecenter.common.constant.EntranceConsts;
-import com.gh.gamecenter.common.exposure.meta.MetaUtil;
 import com.gh.gamecenter.common.utils.NetworkUtils;
 import com.gh.gamecenter.feature.entity.GameEntity;
 import com.gh.gamecenter.entity.NewsDetailEntity;
@ -55,7 +54,7 @@ public class DataCollectionUtils {
        map.put("location", downloadEntity.getLocation());
        map.put(EntranceConsts.KEY_ENTRANCE, downloadEntity.getEntrance());
        map.put("installed", downloadEntity.getInstalled());
-        map.put("network", MetaUtil.getMeta().getNetwork());
+        map.put("network", NetworkUtils.getConnectedType(context));
        DataCollectionManager.onEvent(context, "download", map);
    }

@ -119,7 +118,7 @@ public class DataCollectionUtils {
        map.put("key", args[0]);
        map.put("game_id", args[3]);
        map.put("game_name", args[4]);
-        map.put("netword", MetaUtil.getMeta().getNetwork());
+        map.put("netword", NetworkUtils.getConnectedType(context));
        map.put("type", "search");
        map.put("device_type", android.os.Build.MODEL);
        map.put("device_system", android.os.Build.VERSION.SDK_INT + "=" + android.os.Build.VERSION.RELEASE);
@ -137,7 +136,7 @@ public class DataCollectionUtils {
        map.put("key", args[0]);
        map.put("game_id", args[3]);
        map.put("game_name", args[4]);
-        map.put("netword", MetaUtil.getMeta().getNetwork());
+        map.put("netword", NetworkUtils.getConnectedType(context));
        map.put("type", "click");
        map.put("device_type", android.os.Build.MODEL);
        map.put("device_system", android.os.Build.VERSION.SDK_INT + "=" + android.os.Build.VERSION.RELEASE);
--- a/app/src/main/java/com/gh/common/util/DataUtils.java
+++ b/app/src/main/java/com/gh/common/util/DataUtils.java
@ -9,16 +9,15 @@ import android.preference.PreferenceManager;
 import android.text.TextUtils;
 import android.util.Log;

-import com.gh.ad.AdDelegateHelper;
-import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.common.base.GlobalActivityManager;
+import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.common.base.activity.BaseActivity;
 import com.gh.gamecenter.common.constant.Constants;
 import com.gh.gamecenter.common.eventbus.EBReuse;
 import com.gh.gamecenter.common.exposure.meta.MetaUtil;
 import com.gh.gamecenter.common.retrofit.BiResponse;
-import com.gh.gamecenter.common.utils.ExtensionsKt;
 import com.gh.gamecenter.common.utils.SensorsBridge;
+import com.gh.gamecenter.core.AppExecutor;
 import com.gh.gamecenter.core.utils.GsonUtils;
 import com.gh.gamecenter.core.utils.MtaHelper;
 import com.gh.gamecenter.core.utils.SPUtils;
@ -115,24 +114,19 @@ public class DataUtils {
                Utils.log("Gid", gid);
                PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().getApplication()).edit().putString(Constants.DEVICE_KEY, gid).apply();

-                // 默认用 APP 级已存储的 GID 来使用，不使用外部 GID
-                String savedGid = SPUtils.getString(Constants.GID);
-                if (!TextUtils.isEmpty(savedGid)) {
-                    gid = savedGid;
-                } else {
-                    SPUtils.setString(Constants.GID, gid);
-                }
-
+                String originalGid = HaloApp.getInstance().getGid();
                HaloApp.getInstance().setGid(gid);

-                // 更新广告配置
-                ExtensionsKt.doOnMainProcessOnly(HaloApp.getInstance(), () -> {
-                    AdDelegateHelper.INSTANCE.requestAdConfig(false, "", null);
-                });
+                // gid 变更时上报 gid 变更日志
+                if (!TextUtils.isEmpty(originalGid) && !originalGid.equals(gid)) {
+                    NewFlatLogUtils.logGidChanged(originalGid, gid);
+                }
+
+                SensorsBridge.setGid(gid);

                // 避免重复调用
-                if (!TextUtils.isEmpty(gid)) {
-                    GameSubstituteRepositoryHelper.updateHistoricInstalledGameSet();
+                if (!TextUtils.isEmpty(gid) && !gid.equals(originalGid)) {
+                    GameSubstituteRepositoryHelper.updateSubstitutableGames();
                }

                getDeviceCertification(gid);
@ -178,11 +172,9 @@ public class DataUtils {
                        if (idCardEntity != null) {
                            boolean isCertificated = !TextUtils.isEmpty(data.getIdCard().getId());
                            boolean isAdult = data.getIdCard().getMinor() == null || !data.getIdCard().getMinor();
-                            boolean isCertificating = data.getIdCard().getStatus() == 1;

                            values.put(GhContentProvider.KEY_IS_CERTIFICATED, isCertificated); // 是否认证
                            values.put(GhContentProvider.KEY_IS_ADULT, isAdult); // 是否成年
-                            values.put(GhContentProvider.KEY_IS_CERTIFICATING, isCertificating); // 是否认证中

                            if (!isCertificated) {
                                RealNameHelper.updateCertificationStatus(0);
@ -196,7 +188,6 @@ public class DataUtils {
                        } else {
                            values.put(GhContentProvider.KEY_IS_CERTIFICATED, false);
                            values.put(GhContentProvider.KEY_IS_ADULT, false);
-                            values.put(GhContentProvider.KEY_IS_CERTIFICATING, false);
                            RealNameHelper.updateCertificationStatus(0);
                        }

--- a/app/src/main/java/com/gh/common/util/DetailDownloadUtils.java
+++ b/app/src/main/java/com/gh/common/util/DetailDownloadUtils.java
@ -1,20 +1,16 @@
 package com.gh.common.util;

-import android.content.Context;
 import android.text.TextUtils;
 import android.view.View;
-import android.widget.TextView;

 import com.gh.common.constant.Config;
 import com.gh.common.filter.RegionSetting;
 import com.gh.common.filter.RegionSettingHelper;
 import com.gh.common.repository.ReservationRepository;
 import com.gh.common.simulator.SimulatorGameManager;
+import com.gh.gamecenter.feature.view.DownloadButton;
 import com.gh.common.xapk.XapkInstaller;
 import com.gh.common.xapk.XapkUnzipStatus;
-import com.gh.gamecenter.feature.entity.GameEntity;
-import com.gh.gamecenter.feature.entity.PluginLocation;
-import com.gh.gamecenter.feature.view.DownloadButton;
 import com.gh.download.DownloadManager;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.adapter.viewholder.DetailViewHolder;
@ -22,6 +18,7 @@ import com.gh.gamecenter.common.constant.Constants;
 import com.gh.gamecenter.common.entity.LinkEntity;
 import com.gh.gamecenter.common.utils.ExtensionsKt;
 import com.gh.gamecenter.core.utils.SPUtils;
+import com.gh.gamecenter.feature.entity.PluginLocation;
 import com.gh.gamecenter.manager.PackagesManager;
 import com.gh.vspace.VHelper;
 import com.lightgame.download.DownloadEntity;
@ -33,125 +30,163 @@ import java.util.Objects;
 * Created by khy on 27/06/17.
 * 详情下载工具类
 */
+
 public class DetailDownloadUtils {

-    public static void updateViewHolder(DetailViewHolder viewHolder) {
-        updateViewHolder(viewHolder, false);
-    }
+    public static void detailInitDownload(DetailViewHolder viewHolder, boolean isCheck) {
+        String downloadAddWord = viewHolder.gameEntity.getDownloadAddWord();

-    /**
-     * 更新底部下载区域
-     * @param viewHolder 下载区域的包裹
-     * @param ignoreDownloadEntity 忽略下载实体（往往用于下载异常时）
-     */
-    public static void updateViewHolder(DetailViewHolder viewHolder, boolean ignoreDownloadEntity) {
-        GameEntity gameEntity = viewHolder.getGameEntity();
-        String downloadAddWord = gameEntity.getDownloadAddWord();
-
-        // 隐藏下载按钮上的畅玩文案
        if (viewHolder.getOverlayTv() != null) {
            viewHolder.getOverlayTv().setVisibility(View.GONE);
        }

-        // 多版本下载箭头
-        if (viewHolder.getMultiVersionDownloadTv() != null) {
-            viewHolder.getMultiVersionDownloadTv().setVisibility(View.GONE);
+        if (viewHolder.mMultiVersionDownloadTv != null) {
+            viewHolder.mMultiVersionDownloadTv.setVisibility(View.GONE);
        }

-        // 根据预置的配置更新 ViewHolder 的状态 (譬如青少年模式、下载内容为空等)
-        if (updateViewHolderWithPredefinedConfig(viewHolder, gameEntity)) {
+        if (viewHolder.gameEntity != null && Config.isShowDownload(viewHolder.gameEntity.getId()) && !"光环助手".equals(viewHolder.gameEntity.getName())) {
+            viewHolder.downloadBottom.setVisibility(View.VISIBLE);
+        } else {
+            viewHolder.downloadBottom.setVisibility(View.GONE);
            return;
        }

-        // 游戏只包含单 APK 的情况
-        if (gameEntity.getApk().size() == 1) {
-            boolean showVGame = false; // 真下载按钮(DownloadButton)是否需要显示为畅玩，包括单按钮显示和双按钮显示
-            boolean showDualDownloadButton = false; // 是否显示双下载按钮
+        if (SPUtils.getBoolean(Constants.SP_TEENAGER_MODE)) {
+            viewHolder.mDownloadPb.setText("查看");
+            viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.TEENAGER_MODE);
+            return;
+        }

-            int gameDownloadMode = gameEntity.getGameDownloadButtonMode(); // 获取游戏的下载按钮模式
+        if (viewHolder.gameEntity.isSpecialDownload()) {
+            viewHolder.mDownloadPb.setText("查看下载资源");
+            viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.SPECIAL_DOWNLOAD);
+            return;
+        }

-            DownloadEntity downloadEntity = null;
-            if (!ignoreDownloadEntity) {
-                downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity);
-            }
-
-            // 不支持双下载按钮的情况时（新闻详情、礼包详情页），优选一个下载方式显示
-            if (!viewHolder.isSupportDualButton()) {
-                boolean performAsVGame = GameUtils.shouldPerformAsVGame(gameEntity);
-                if (performAsVGame) {
-                    gameDownloadMode = GameEntity.GAME_DOWNLOAD_BUTTON_MODE_VGAME;
+        if (viewHolder.gameEntity.isReservable()) {
+            if (!ReservationRepository.thisGameHasBeenReserved(viewHolder.gameEntity.getId())) {
+                if (TextUtils.isEmpty(downloadAddWord)) {
+                    viewHolder.mDownloadPb.setText(String.format("预约" + "《%s》", viewHolder.gameEntity.getName()));
                } else {
-                    gameDownloadMode = GameEntity.GAME_DOWNLOAD_BUTTON_MODE_DOWNLOAD;
+                    viewHolder.mDownloadPb.setText(String.format("预约" + "《%s》%s", viewHolder.gameEntity.getName(), downloadAddWord));
+                }
+                viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.RESERVABLE);
+            } else {
+                viewHolder.mDownloadPb.setText("已预约《" + viewHolder.gameEntity.getName() + "》");
+                viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.RESERVED);
+            }
+            return;
+        }
+
+        final RegionSetting.GameH5Download gameH5Download = RegionSettingHelper.getGameH5DownloadByGameId(viewHolder.gameEntity.getId());
+        if (gameH5Download != null) {
+            viewHolder.mDownloadPb.setText(TextUtils.isEmpty(viewHolder.gameEntity.getDownloadOffText()) ? "查看详情" : viewHolder.gameEntity.getDownloadOffText());
+            viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.NORMAL);
+            return;
+        }
+
+        if (viewHolder.gameEntity.isVGame() && !viewHolder.gameEntity.getApk().isEmpty()) {
+            String status = GameUtils.getDownloadBtnText(viewHolder.context, viewHolder.gameEntity, PluginLocation.only_game);
+            if (viewHolder.context.getString(R.string.launch).equals(status)) {
+                viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.LAUNCH_OR_OPEN);
+            } else if (viewHolder.context.getString(R.string.install).equals(status)) {
+                viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_NORMAL);
+            } else {
+                viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.NORMAL);
+            }
+
+            String downloadText;
+            if (viewHolder.context.getString(R.string.launch).equals(status) || viewHolder.context.getString(R.string.install).equals(status) || viewHolder.context.getString(R.string.download).equals(status)) {
+                downloadText = "";
+                if (viewHolder.getOverlayTv() != null) {
+                    viewHolder.getOverlayTv().setVisibility(View.VISIBLE);
+                }
+            } else if (viewHolder.context.getString(R.string.attempt).equals(status)) {
+                downloadText = status + getDownloadSizeText(viewHolder);
+            } else {
+                downloadText = status + (TextUtils.isEmpty(downloadAddWord) ? "" : downloadAddWord) + getDownloadSizeText(viewHolder);
+            }
+            viewHolder.mDownloadPb.setText(downloadText);
+
+            DownloadEntity downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(viewHolder.gameEntity);
+
+            // 在下载管理找不到下载实体，到畅玩数据库里找
+            if (downloadEntity == null && viewHolder.gameEntity.isVGame()) {
+                String packageName = viewHolder.gameEntity.getUniquePackageName();
+                if (!TextUtils.isEmpty(packageName)) {
+                    downloadEntity = VHelper.getVDownloadEntitySnapshot(viewHolder.gameEntity.getId(), packageName);
                }
            }

-            if (gameDownloadMode == GameEntity.GAME_DOWNLOAD_BUTTON_MODE_DOWNLOAD) {
-                showVGame = false;
-                if (viewHolder.getLocalDownloadContainer() != null) {
-                    viewHolder.getLocalDownloadContainer().setVisibility(View.GONE);
-                }
-            } else if (gameDownloadMode == GameEntity.GAME_DOWNLOAD_BUTTON_MODE_VGAME) {
-                showVGame = true;
-                if (viewHolder.getLocalDownloadContainer() != null) {
-                    viewHolder.getLocalDownloadContainer().setVisibility(View.GONE);
-                }
-            } else if (gameDownloadMode == GameEntity.GAME_DOWNLOAD_BUTTON_MODE_DUAL) {
-                showVGame = true;
-                showDualDownloadButton = true;
-                if (viewHolder.getLocalDownloadContainer() != null) {
-                    viewHolder.getLocalDownloadContainer().setVisibility(View.VISIBLE);
-                }
+            if (downloadEntity != null) {
+                viewHolder.downloadEntity = downloadEntity;
+                detailInvalidate(viewHolder);
+            }

-                // 畅玩未安装，且当前下载的默认类型为"普通下载"，且用户未安装时，禁用双按钮，禁用畅玩
-                if (!VHelper.isInstalled(gameEntity.getUniquePackageName())
-                        && !PackagesManager.isInstalled(gameEntity.getUniquePackageName())
-                        && downloadEntity != null
-                        && ExtensionsKt.isLocalDownloadInDualDownloadMode(downloadEntity)
-                ) {
-                    viewHolder.getDownloadPb().setVisibility(View.GONE);
-                    if (viewHolder.getOverlayTv() != null) {
-                        viewHolder.getOverlayTv().setVisibility(View.GONE);
-                    }
+            return;
+        }
+
+        if (viewHolder.gameEntity.getApk().isEmpty() || viewHolder.gameEntity.getDownloadOffStatus() != null) {
+            LinkEntity h5LinkEntity = viewHolder.gameEntity.getH5Link();
+
+            if (h5LinkEntity != null) {
+                if ("play".equals(h5LinkEntity.getType())) {
+                    String defaultString = String.format("开始玩" + "《%s》", viewHolder.gameEntity.getName());
+                    viewHolder.mDownloadPb.setText(TextUtils.isEmpty(h5LinkEntity.getText()) ? defaultString : h5LinkEntity.getText());
                } else {
-                    viewHolder.getDownloadPb().setVisibility(View.VISIBLE);
+                    viewHolder.mDownloadPb.setText(TextUtils.isEmpty(h5LinkEntity.getText()) ? "查看" : h5LinkEntity.getText());
+                }
+                viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.H5_GAME);
+            } else {
+                if ("dialog".equals(viewHolder.gameEntity.getDownloadOffStatus())) {
+                    viewHolder.mDownloadPb.setText(TextUtils.isEmpty(viewHolder.gameEntity.getDownloadOffText()) ? "查看详情" : viewHolder.gameEntity.getDownloadOffText());
+                    viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.NONE_WITH_HINT);
+                } else if ("updating".equals(viewHolder.gameEntity.getDownloadOffStatus())) {
+                    viewHolder.mDownloadPb.setText(TextUtils.isEmpty(viewHolder.gameEntity.getDownloadOffText()) ? "更新中" : viewHolder.gameEntity.getDownloadOffText());
+                    viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.UPDATING);
+                } else {
+                    viewHolder.mDownloadPb.setText(TextUtils.isEmpty(viewHolder.gameEntity.getDownloadOffText()) ? "暂无下载" : viewHolder.gameEntity.getDownloadOffText());
+                    viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.NONE);
                }
            }
-
-            // 更新默认的下载按钮
-            updateWithSingleApk(
-                    gameEntity,
-                    viewHolder,
-                    viewHolder.getDownloadPb(),
-                    downloadAddWord,
-                    showVGame,
-                    showDualDownloadButton,
-                    downloadEntity
-            );
-
-            if (showDualDownloadButton) {
-                // 双下载按钮时更新占位的下载按钮
-                updateWithSingleApk(
-                        gameEntity,
-                        viewHolder,
-                        viewHolder.getLocalDownloadButton(),
-                        downloadAddWord,
-                        false,
-                        true,
-                        downloadEntity
-                );
+        } else if (viewHolder.gameEntity.getApk().size() == 1) {
+            String status = GameUtils.getDownloadBtnText(viewHolder.context, viewHolder.gameEntity, PluginLocation.only_game);
+            if (viewHolder.context.getString(R.string.pluggable).equals(status)) {
+                viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.PLUGIN);
+            } else if (viewHolder.context.getString(R.string.launch).equals(status)) {
+                viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.LAUNCH_OR_OPEN);
+            } else if (viewHolder.context.getString(R.string.install).equals(status)) {
+                viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_NORMAL);
+            } else {
+                viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.NORMAL);
            }
+
+            String downloadText;
+            if (viewHolder.isNewsDetail) {
+                downloadText = status;
+            } else if (viewHolder.context.getString(R.string.pluggable).equals(status)) {
+                downloadText = "升级" + (TextUtils.isEmpty(downloadAddWord) ? "" : "至" + downloadAddWord) + getDownloadSizeText(viewHolder);
+            } else if (viewHolder.context.getString(R.string.launch).equals(status)) {
+                downloadText = status + (TextUtils.isEmpty(downloadAddWord) ? "" : "-" + downloadAddWord);
+            } else if (viewHolder.context.getString(R.string.attempt).equals(status)) {
+                downloadText = status + getDownloadSizeText(viewHolder);
+            } else if (viewHolder.context.getString(R.string.install).equals(status)) {
+                downloadText = viewHolder.context.getString(R.string.install);
+            } else {
+                downloadText = status + (TextUtils.isEmpty(downloadAddWord) ? "" : downloadAddWord) + getDownloadSizeText(viewHolder);
+            }
+            viewHolder.mDownloadPb.setText(downloadText);
        } else {
-            // 游戏包含多 APK 的情况
-            viewHolder.getMultiVersionDownloadTv().setText("选择下载你的版本" + (TextUtils.isEmpty(downloadAddWord) ? "" : "-" + downloadAddWord));
-            viewHolder.getMultiVersionDownloadTv().setVisibility(View.VISIBLE);
-            viewHolder.getDownloadPb().setText("");
-            viewHolder.getDownloadPb().setButtonStyle(DownloadButton.ButtonStyle.NORMAL);
-            DownloadEntity downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity);
+            viewHolder.mMultiVersionDownloadTv.setText("选择下载你的版本" + (TextUtils.isEmpty(downloadAddWord) ? "" : "-" + downloadAddWord));
+            viewHolder.mMultiVersionDownloadTv.setVisibility(View.VISIBLE);
+            viewHolder.mDownloadPb.setText("");
+            viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.NORMAL);
+            DownloadEntity downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(viewHolder.gameEntity);
            if (downloadEntity != null) {
                switch (downloadEntity.getStatus()) {
                    case downloading:
-                        viewHolder.getDownloadTips().setVisibility(View.VISIBLE);
-                        ExtensionsKt.setDownloadTipsAnimation(viewHolder.getDownloadTips(), true);
+                        viewHolder.mDownloadTips.setVisibility(View.VISIBLE);
+                        ExtensionsKt.setDownloadTipsAnimation(viewHolder.mDownloadTips, true);
                        break;
                    case done:
                    case pause:
@ -160,347 +195,73 @@ public class DetailDownloadUtils {
                    case subscribe:
                    case neterror:
                    case overflow:
-                        viewHolder.getDownloadTips().setVisibility(View.VISIBLE);
-                        ExtensionsKt.setDownloadTipsAnimation(viewHolder.getDownloadTips(), false);
+                        viewHolder.mDownloadTips.setVisibility(View.VISIBLE);
+                        ExtensionsKt.setDownloadTipsAnimation(viewHolder.mDownloadTips, false);
                        break;
                    default:
-                        viewHolder.getDownloadTips().setVisibility(View.GONE);
+                        viewHolder.mDownloadTips.setVisibility(View.GONE);
                        break;
                }
            } else {
-                viewHolder.getDownloadTips().setVisibility(View.GONE);
+                viewHolder.mDownloadTips.setVisibility(View.GONE);
            }
        }
-    }

-    /**
-     * 更新只有单个 APK 文件时候的下载按钮状态
-     *
-     * @param downloadButton         下载按钮，可能是真的下载按钮也可能只是占位下载按钮
-     * @param downloadAddWord        下载按钮的补充文案
-     * @param showAsVGame            是否显示为畅玩游戏
-     * @param showDualDownloadButton 是否正显示为双下载按钮
-     */
-
-    private static void updateWithSingleApk(GameEntity gameEntity,
-                                            DetailViewHolder viewHolder,
-                                            DownloadButton downloadButton,
-                                            String downloadAddWord,
-                                            boolean showAsVGame,
-                                            boolean showDualDownloadButton,
-                                            DownloadEntity downloadEntity) {
-        Context context = viewHolder.getContext();
-        TextView overlayTv = viewHolder.getOverlayTv();
-
-        String status = GameUtils.getDownloadBtnText(context, gameEntity, false, showAsVGame, PluginLocation.only_game);
-
-        if (showAsVGame) {
-            // 显示为畅玩游戏
-            if (context.getString(R.string.launch).equals(status)) {
-                downloadButton.setButtonStyle(DownloadButton.ButtonStyle.LAUNCH_OR_OPEN);
-            } else {
-                downloadButton.setButtonStyle(DownloadButton.ButtonStyle.NORMAL);
-            }
-
-            String btnText;
-            if (showDualDownloadButton
-                    && (context.getString(R.string.launch).equals(status) || context.getString(R.string.install).equals(status) || context.getString(R.string.smooth).equals(status) || context.getString(R.string.update).equals(status))) {
-                if (context.getString(R.string.smooth).equals(status)) {
-                    btnText = context.getString(R.string.download_v);
-                } else if (context.getString(R.string.update).equals(status)) {
-                    btnText = context.getString(R.string.update_v);
-                } else {
-                    btnText = context.getString(R.string.launch_v);
-                }
-
-                if (overlayTv != null && downloadButton.getVisibility() != View.GONE) {
-                    overlayTv.setVisibility(View.VISIBLE);
-                    overlayTv.setText(btnText);
-                    downloadButton.setText("");
-                }
-            } else {
-                btnText = status + (TextUtils.isEmpty(downloadAddWord) ? "" : downloadAddWord) + getDownloadSizeText(viewHolder);
-
-                if (overlayTv != null && downloadButton.getVisibility() != View.GONE) {
-                    if (context.getString(R.string.launch).equals(status)
-                            || context.getString(R.string.install).equals(status)) {
-                        overlayTv.setVisibility(View.VISIBLE);
-                        overlayTv.setText("启动（畅玩）");
-                    } else {
-                        overlayTv.setVisibility(View.GONE);
-                        downloadButton.setText(btnText);
-                    }
-                } else {
-                    if (overlayTv != null) {
-                        overlayTv.setVisibility(View.GONE);
-                    }
-                    downloadButton.setText(btnText);
-                }
-            }
+        if (isCheck && viewHolder.gameEntity.getApk().size() == 1) {
+            DownloadEntity downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(viewHolder.gameEntity);

            // 在下载管理找不到下载实体，到畅玩数据库里找
-            if (downloadEntity == null) {
-                String packageName = gameEntity.getUniquePackageName();
+            if (downloadEntity == null && viewHolder.gameEntity.isVGame()) {
+                String packageName = viewHolder.gameEntity.getUniquePackageName();
                if (!TextUtils.isEmpty(packageName)) {
-                    downloadEntity = VHelper.getVDownloadEntitySnapshot(gameEntity.getId(), packageName);
-                }
-            }
-        } else {
-            // 非畅玩，显示为普通游戏
-            if (context.getString(R.string.pluggable).equals(status)) {
-                downloadButton.setButtonStyle(DownloadButton.ButtonStyle.PLUGIN);
-            } else if (context.getString(R.string.launch).equals(status)) {
-                downloadButton.setButtonStyle(DownloadButton.ButtonStyle.LAUNCH_OR_OPEN);
-            } else if (context.getString(R.string.install).equals(status)) {
-                downloadButton.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_NORMAL);
-            } else {
-                downloadButton.setButtonStyle(DownloadButton.ButtonStyle.NORMAL);
-            }
-
-            if (showDualDownloadButton && viewHolder.getLocalDownloadSizeTv() != null) {
-                viewHolder.getLocalDownloadSizeTv().setVisibility(View.GONE);
-                String size = viewHolder.getGameEntity().getApk().get(0).getSize();
-                if (size != null) {
-                    String sizeWithoutDigit = size.replaceAll("(?<=\\d)\\.[0-9]+(?!\\d)", "");
-                    viewHolder.getLocalDownloadSizeTv().setText(sizeWithoutDigit);
-                }
-
-                // 若双下载按钮时，下载的游戏是以畅玩游戏下载的，把 downloadEntity 置空，避免把按钮更新到错误的状态
-                if (downloadEntity != null && ExtensionsKt.isVGameDownloadInDualDownloadMode(downloadEntity)) {
-                    downloadEntity = null;
+                    downloadEntity = VHelper.getVDownloadEntitySnapshot(viewHolder.gameEntity.getId(), packageName);
                }
            }

-            String btnText;
-            String extraBtnText;
-            if (viewHolder.isNewsDetail()) {
-                btnText = status;
-                extraBtnText = status;
-            } else if (context.getString(R.string.pluggable).equals(status)) {
-                btnText = "升级" + (TextUtils.isEmpty(downloadAddWord) ? "" : "至" + downloadAddWord) + getDownloadSizeText(viewHolder);
-                extraBtnText = "升级" + (TextUtils.isEmpty(downloadAddWord) ? "" : "至" + downloadAddWord);
-            } else if (context.getString(R.string.launch).equals(status)) {
-                btnText = status + (TextUtils.isEmpty(downloadAddWord) ? "" : "-" + downloadAddWord);
-                extraBtnText = context.getString(R.string.launch_local);
-            } else if (context.getString(R.string.attempt).equals(status)) {
-                btnText = status + getDownloadSizeText(viewHolder);
-                extraBtnText = status;
-                if (showDualDownloadButton
-                        && viewHolder.getLocalDownloadContainer() != null
-                        && viewHolder.getLocalDownloadContainer().getVisibility() == View.VISIBLE) {
-                    viewHolder.getLocalDownloadSizeTv().setVisibility(View.VISIBLE);
-                }
-            } else if (context.getString(R.string.install).equals(status)) {
-                btnText = context.getString(R.string.install);
-                extraBtnText = context.getString(R.string.install_local);
-            } else if (context.getString(R.string.update).equals(status)) {
-                btnText = context.getString(R.string.update);
-                extraBtnText = context.getString(R.string.update_local);
-                if (showDualDownloadButton
-                        && viewHolder.getLocalDownloadContainer() != null
-                        && viewHolder.getLocalDownloadContainer().getVisibility() == View.VISIBLE) {
-                    viewHolder.getLocalDownloadSizeTv().setVisibility(View.VISIBLE);
-                }
-            } else {
-                btnText = status + (TextUtils.isEmpty(downloadAddWord) ? "" : downloadAddWord) + getDownloadSizeText(viewHolder);
-                extraBtnText = context.getString(R.string.download_local);
-                if (showDualDownloadButton
-                        && viewHolder.getLocalDownloadContainer() != null
-                        && viewHolder.getLocalDownloadContainer().getVisibility() == View.VISIBLE) {
-                    viewHolder.getLocalDownloadSizeTv().setVisibility(View.VISIBLE);
-                }
-            }
-            downloadButton.setText(btnText);
-            if (viewHolder.getLocalDownloadTitleTv() != null) {
-                viewHolder.getLocalDownloadTitleTv().setText(extraBtnText);
+            if (downloadEntity != null) {
+                viewHolder.downloadEntity = downloadEntity;
+                detailInvalidate(viewHolder);
            }
        }
-
-        if (overlayTv != null && overlayTv.getVisibility() == View.VISIBLE) {
-            downloadButton.setTag(R.string.download, overlayTv.getText());
-        } else {
-            downloadButton.setTag(R.string.download, downloadButton.getText());
-        }
-
-        if (downloadEntity == null) return;
-
-        if (handleDownloadButtonAsXapk(downloadEntity, downloadButton)) {
-            return;
-        }
-
-        // 非完成状态显示下载按钮
-        if (downloadEntity.getStatus() != DownloadStatus.done) {
-            viewHolder.getDownloadPb().setVisibility(View.VISIBLE);
-        }
-
-        // 存在未完成的下载任务或不显示双按钮时，隐藏本地下载按钮
-        if (viewHolder.getLocalDownloadContainer() != null) {
-            if (downloadEntity.getStatus() != DownloadStatus.done) {
-                viewHolder.getLocalDownloadContainer().setVisibility(View.GONE);
-            } else if (showDualDownloadButton) {
-                viewHolder.getLocalDownloadContainer().setVisibility(View.VISIBLE);
-            } else {
-                viewHolder.getLocalDownloadContainer().setVisibility(View.GONE);
-            }
-        }
-
-        downloadButton.setProgress((int) (downloadEntity.getPercent() * 10));
-
-        if (overlayTv != null
-                && downloadEntity.getStatus() != DownloadStatus.done) {
-            overlayTv.setVisibility(View.GONE);
-        }
-
-        if (showAsVGame) {
-            updateVStyleDownloadButton(viewHolder, downloadButton, downloadEntity, status);
-        } else {
-            updateDefaultStyleDownloadButton(context, viewHolder, downloadButton, gameEntity, downloadEntity);
-        }
-    }
-
-    /**
-     * 根据预置的配置更新 ViewHolder 的状态
-     *
-     * @return 是否已经是最终状态，返回 true 表示已应用当前配置，返回 false 表示不应用当前配置
-     */
-    private static boolean updateViewHolderWithPredefinedConfig(DetailViewHolder viewHolder, GameEntity gameEntity) {
-        String downloadAddWord = gameEntity.getDownloadAddWord();
-
-        // 不满足条件的部分游戏隐藏下载按钮
-        if (Config.isShowDownload(gameEntity.getId())
-                && !"光环助手".equals(gameEntity.getName())) {
-            viewHolder.getDownloadBottom().setVisibility(View.VISIBLE);
-        } else {
-            viewHolder.getDownloadBottom().setVisibility(View.GONE);
-            return true;
-        }
-
-        // 青少年模式显示为查看
-        if (SPUtils.getBoolean(Constants.SP_TEENAGER_MODE)) {
-            viewHolder.getDownloadPb().setText("查看");
-            viewHolder.getDownloadPb().setButtonStyle(DownloadButton.ButtonStyle.TEENAGER_MODE);
-            return true;
-        }
-
-        // 预约
-        if (gameEntity.isReservable()) {
-            if (!ReservationRepository.thisGameHasBeenReserved(gameEntity.getId())) {
-                if (TextUtils.isEmpty(downloadAddWord)) {
-                    viewHolder.getDownloadPb().setText(String.format("预约" + "《%s》", gameEntity.getName()));
-                } else {
-                    viewHolder.getDownloadPb().setText(String.format("预约" + "《%s》%s", gameEntity.getName(), downloadAddWord));
-                }
-                viewHolder.getDownloadPb().setButtonStyle(DownloadButton.ButtonStyle.RESERVABLE);
-            } else {
-                viewHolder.getDownloadPb().setText("已预约《" + gameEntity.getName() + "》");
-                viewHolder.getDownloadPb().setButtonStyle(DownloadButton.ButtonStyle.RESERVED);
-            }
-            return true;
-        }
-
-        // 国际服 H5 弹窗
-        final RegionSetting.GameH5Download gameH5Download = RegionSettingHelper.getGameH5DownloadByGameId(gameEntity.getId());
-        if (gameH5Download != null) {
-            viewHolder.getDownloadPb().setText(TextUtils.isEmpty(gameEntity.getDownloadOffText()) ? "查看详情" : gameEntity.getDownloadOffText());
-            viewHolder.getDownloadPb().setButtonStyle(DownloadButton.ButtonStyle.NORMAL);
-            return true;
-        }
-
-        // 特殊下载
-        if (gameEntity.isSpecialDownload()) {
-            viewHolder.getDownloadPb().setText("查看下载资源");
-            viewHolder.getDownloadPb().setButtonStyle(DownloadButton.ButtonStyle.SPECIAL_DOWNLOAD);
-            return true;
-        }
-
-        // 处理不存在 APK 文件或游戏状态为关闭时的情况
-        if (gameEntity.getApk().isEmpty() || gameEntity.getDownloadOffStatus() != null) {
-            LinkEntity h5LinkEntity = gameEntity.getH5Link();
-
-            if (h5LinkEntity != null) {
-                if ("play".equals(h5LinkEntity.getType())) {
-                    String defaultString = String.format("开始玩" + "《%s》", gameEntity.getName());
-                    viewHolder.getDownloadPb().setText(TextUtils.isEmpty(h5LinkEntity.getText()) ? defaultString : h5LinkEntity.getText());
-                } else {
-                    viewHolder.getDownloadPb().setText(TextUtils.isEmpty(h5LinkEntity.getText()) ? "查看" : h5LinkEntity.getText());
-                }
-                viewHolder.getDownloadPb().setButtonStyle(DownloadButton.ButtonStyle.H5_GAME);
-            } else {
-                if ("dialog".equals(gameEntity.getDownloadOffStatus())) {
-                    viewHolder.getDownloadPb().setText(TextUtils.isEmpty(gameEntity.getDownloadOffText()) ? "查看详情" : gameEntity.getDownloadOffText());
-                    viewHolder.getDownloadPb().setButtonStyle(DownloadButton.ButtonStyle.NONE_WITH_HINT);
-                } else if ("updating".equals(gameEntity.getDownloadOffStatus())) {
-                    viewHolder.getDownloadPb().setText(TextUtils.isEmpty(gameEntity.getDownloadOffText()) ? "更新中" : gameEntity.getDownloadOffText());
-                    viewHolder.getDownloadPb().setButtonStyle(DownloadButton.ButtonStyle.UPDATING);
-                } else {
-                    viewHolder.getDownloadPb().setText(TextUtils.isEmpty(gameEntity.getDownloadOffText()) ? "暂无下载" : gameEntity.getDownloadOffText());
-                    viewHolder.getDownloadPb().setButtonStyle(DownloadButton.ButtonStyle.NONE);
-                }
-            }
-            return true;
-        }
-        return false;
    }

    private static String getDownloadSizeText(DetailViewHolder viewHolder) {
-        return String.format("（%s）", viewHolder.getGameEntity().getApk().get(0).getSize());
+        return String.format("（%s）", viewHolder.gameEntity.getApk().get(0).getSize());
    }

-    private static void updateVStyleDownloadButton(DetailViewHolder viewHolder,
-                                                   DownloadButton downloadButton,
-                                                   DownloadEntity downloadEntity,
-                                                   String status) {
-        switch (downloadEntity.getStatus()) {
-            case redirected:
-            case downloading:
-                downloadButton.setText("游戏加载中 " + downloadEntity.getPercent() + "%");
-                downloadButton.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_NORMAL);
-                break;
-            case waiting:
-                downloadButton.setText(R.string.waiting);
-                downloadButton.setButtonStyle(DownloadButton.ButtonStyle.WAITING);
-                break;
-            case overflow:
-            case timeout:
-            case neterror:
-            case subscribe:
-            case diskisfull:
-            case diskioerror:
-            case pause:
-                downloadButton.setText("继续加载 " + downloadEntity.getPercent() + "%");
-                downloadButton.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_NORMAL);
-                break;
-            case done:
-                if (!status.contains("更新")) {
-                    if (VHelper.isInstalled(downloadEntity.getPackageName())) {
-                        downloadButton.setButtonStyle(DownloadButton.ButtonStyle.LAUNCH_OR_OPEN);
-                    } else {
-                        downloadButton.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_NORMAL);
-                    }
+    public static void detailInvalidate(DetailViewHolder viewHolder) {
+        DownloadEntity downloadEntity = viewHolder.downloadEntity;
+        String xapkStatus = downloadEntity.getMeta().get(XapkInstaller.XAPK_UNZIP_STATUS);

-                    downloadButton.setText("");
-                }
-                break;
-            case cancel:
-            case hijack:
-            case notfound:
-            case uncertificated:
-            case unqualified:
-            case unavailable:
-            case banned:
-                updateViewHolder(viewHolder, true);
-                break;
-            default:
-                break;
+        if (XapkUnzipStatus.SUCCESS.name().equals(xapkStatus) && XapkInstaller.INSTANCE.isInstalling(downloadEntity.getPath())) {
+            viewHolder.mDownloadPb.setText("游戏安装中");
+            viewHolder.mDownloadPb.setProgress(100);
+            viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_NORMAL);
+            return;
+        }
+
+        if (XapkUnzipStatus.UNZIPPING.name().equals(xapkStatus)) {
+            String percent = downloadEntity.getMeta().get(XapkInstaller.XAPK_UNZIP_PERCENT);
+            viewHolder.mDownloadPb.setText("游戏解压中 " + percent + "%");
+            viewHolder.mDownloadPb.setProgress((int) (Float.valueOf(percent) * 10));
+            viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.XAPK_UNZIPPING);
+            return;
+        } else if (XapkUnzipStatus.FAILURE.name().equals(xapkStatus)) {
+            viewHolder.mDownloadPb.setText(R.string.install);
+            viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.XAPK_FAILURE);
+            return;
+        }
+
+        viewHolder.mDownloadPb.setProgress((int) (viewHolder.downloadEntity.getPercent() * 10));
+        if (viewHolder.getOverlayTv() != null) {
+            viewHolder.getOverlayTv().setVisibility(View.GONE);
+        }
+
+        if (viewHolder.gameEntity.isVGame()) {
+            updateVStyleButton(viewHolder);
+            return;
        }
-    }

-    private static void updateDefaultStyleDownloadButton(
-            Context context,
-            DetailViewHolder viewHolder,
-            DownloadButton downloadButton,
-            GameEntity gameEntity,
-            DownloadEntity downloadEntity) {
        switch (downloadEntity.getStatus()) {
            case timeout:
            case neterror:
@ -513,37 +274,55 @@ public class DetailDownloadUtils {
            case overflow:
                String downloadingText = "游戏加载中 " + downloadEntity.getPercent() + "%";
                String resumeText = "继续加载 " + downloadEntity.getPercent() + "%";
-                downloadButton.setText((downloadEntity.getStatus() == DownloadStatus.downloading || downloadEntity.getStatus() == DownloadStatus.redirected) ? downloadingText : resumeText);
+                viewHolder.mDownloadPb.setText((downloadEntity.getStatus() == DownloadStatus.downloading || downloadEntity.getStatus() == DownloadStatus.redirected) ? downloadingText : resumeText);
                if (downloadEntity.isPluggable() && PackagesManager.isInstalled(downloadEntity.getPackageName())) {
-                    downloadButton.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_PLUGIN);
+                    viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_PLUGIN);
                } else {
-                    downloadButton.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_NORMAL);
+                    viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_NORMAL);
                }
                break;
            case waiting:
-                downloadButton.setText(R.string.waiting);
-                downloadButton.setButtonStyle(DownloadButton.ButtonStyle.WAITING);
+                viewHolder.mDownloadPb.setText(R.string.waiting);
+                viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.WAITING);
                break;
            case done:
-                if (SimulatorGameManager.isSimulatorGame(gameEntity)) {
-                    boolean isInstalled = PackageUtils.isInstalledFromAllPackage(context, gameEntity.getSimulator().getApk().getPackageName());
-                    boolean isInstalledNewSimulator = SimulatorGameManager.isNewSimulatorInstalled(context);
+                if (SimulatorGameManager.isSimulatorGame(viewHolder.gameEntity)) {
+                    boolean isInstalled = PackageUtils.isInstalledFromAllPackage(viewHolder.context, viewHolder.gameEntity.getSimulator().getApk().getPackageName());
+                    boolean isInstalledNewSimulator = SimulatorGameManager.isNewSimulatorInstalled(viewHolder.context);
                    if (isInstalled || isInstalledNewSimulator) {
-                        downloadButton.setText(R.string.launch);
-                        downloadButton.setButtonStyle(DownloadButton.ButtonStyle.LAUNCH_OR_OPEN);
+                        viewHolder.mDownloadPb.setText(R.string.launch);
+                        viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.LAUNCH_OR_OPEN);
                    } else {
                        if (SPUtils.getBoolean(Constants.SP_USE_BROWSER_TO_INSTALL) && !Objects.equals(Constants.XAPK_APKS_FORMAT, downloadEntity.getFormat())) {
-                            downloadButton.setText(R.string.browser_install_install);
+                            viewHolder.mDownloadPb.setText(R.string.browser_install_install);
                        } else {
-                            downloadButton.setText(R.string.install);
+                            viewHolder.mDownloadPb.setText(R.string.install);
+                        }
+                        viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_NORMAL);
+                    }
+                } else if (viewHolder.gameEntity.isVGame()) {
+                    if (!viewHolder.mDownloadPb.getText().toString().contains("更新")) {
+                        if (VHelper.isInstalled(downloadEntity.getPackageName())) {
+                            viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.LAUNCH_OR_OPEN);
+                        } else {
+                            viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_NORMAL);
+                        }
+
+                        viewHolder.mDownloadPb.setText("");
+                        if (viewHolder.getOverlayTv() != null) {
+                            viewHolder.getOverlayTv().setVisibility(View.VISIBLE);
                        }
-                        downloadButton.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_NORMAL);
                    }
                } else {
                    if (SPUtils.getBoolean(Constants.SP_USE_BROWSER_TO_INSTALL) && !Objects.equals(Constants.XAPK_APKS_FORMAT, downloadEntity.getFormat())) {
-                        downloadButton.setText(R.string.browser_install_install);
+                        viewHolder.mDownloadPb.setText(R.string.browser_install_install);
                    } else {
-                        downloadButton.setText(R.string.install);
+                        viewHolder.mDownloadPb.setText(R.string.install);
+                    }
+                    if (downloadEntity.isPluggable() && PackagesManager.isInstalled(downloadEntity.getPackageName())) {
+                        viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_PLUGIN);
+                    } else {
+                        viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_NORMAL);
                    }
                }

@ -555,35 +334,50 @@ public class DetailDownloadUtils {
            case unqualified:
            case unavailable:
            case banned:
-                updateViewHolder(viewHolder, true);
+                detailInitDownload(viewHolder, false);
                break;
            default:
                break;
        }
    }

-    private static boolean handleDownloadButtonAsXapk(DownloadEntity downloadEntity, DownloadButton downloadButton) {
-        String xapkStatus = downloadEntity.getMeta().get(XapkInstaller.XAPK_UNZIP_STATUS);
+    private static void updateVStyleButton(DetailViewHolder viewHolder) {
+        switch (viewHolder.downloadEntity.getStatus()) {
+            case redirected:
+            case downloading:
+                viewHolder.mDownloadPb.setText("游戏加载中 " + viewHolder.downloadEntity.getPercent() + "%");
+                viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_NORMAL);
+                break;
+            case waiting:
+                viewHolder.mDownloadPb.setText(R.string.waiting);
+                viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_NORMAL);
+                break;
+            case overflow:
+            case timeout:
+            case neterror:
+            case subscribe:
+            case diskisfull:
+            case diskioerror:
+            case pause:
+                viewHolder.mDownloadPb.setText("继续加载 " + viewHolder.downloadEntity.getPercent() + "%");
+                viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_NORMAL);
+                break;
+            case done:
+                if (!viewHolder.mDownloadPb.getText().toString().contains("更新")) {
+                    if (VHelper.isInstalled(viewHolder.downloadEntity.getPackageName())) {
+                        viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.LAUNCH_OR_OPEN);
+                    } else {
+                        viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_NORMAL);
+                    }

-        if (XapkUnzipStatus.SUCCESS.name().equals(xapkStatus) && XapkInstaller.INSTANCE.isInstalling(downloadEntity.getPath())) {
-            downloadButton.setText("游戏安装中");
-            downloadButton.setProgress(100);
-            downloadButton.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_NORMAL);
-            return true;
+                    viewHolder.mDownloadPb.setText("");
+                    if (viewHolder.getOverlayTv() != null) {
+                        viewHolder.getOverlayTv().setVisibility(View.VISIBLE);
+                    }
+                }
+                break;
+            default:
+                break;
        }
-
-        if (XapkUnzipStatus.UNZIPPING.name().equals(xapkStatus)) {
-            String percent = downloadEntity.getMeta().get(XapkInstaller.XAPK_UNZIP_PERCENT);
-            downloadButton.setText("游戏解压中 " + percent + "%");
-            downloadButton.setProgress((int) (Float.valueOf(percent) * 10));
-            downloadButton.setButtonStyle(DownloadButton.ButtonStyle.XAPK_UNZIPPING);
-            return true;
-        } else if (XapkUnzipStatus.FAILURE.name().equals(xapkStatus)) {
-            downloadButton.setText(R.string.install);
-            downloadButton.setButtonStyle(DownloadButton.ButtonStyle.XAPK_FAILURE);
-            return true;
-        }
-
-        return false;
    }
 }
--- a/app/src/main/java/com/gh/common/util/DeviceTokenUtils.kt
+++ b/app/src/main/java/com/gh/common/util/DeviceTokenUtils.kt
@ -1,17 +1,23 @@
 package com.gh.common.util

 import android.content.Context
+import android.os.Environment
 import android.preference.PreferenceManager
-import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.exposure.meta.MetaUtil
+import com.gh.gamecenter.BuildConfig
 import com.gh.gamecenter.entity.TimeEntity
 import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.halo.assistant.HaloApp
+import com.lightgame.utils.Utils
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
+import java.io.File

 object DeviceTokenUtils {

+    const val DEVICE_ID = "uuid"
+
    // 同步服务器时间
    @JvmStatic
    @Synchronized
@ -33,29 +39,99 @@ object DeviceTokenUtils {
    }

    @JvmStatic
-    fun getLaunchType(): LunchType {
+    fun getLaunchType(readOnly: Boolean = false): LunchType {
        var lunchType: LunchType? = null
        val values = PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().application).all
        // 版本更新
        if (values.isNotEmpty()) {
            for (value in values) {
-                if (value.key.contains(Constants.SP_NEW_FIRST_LAUNCH_VERSION)) {
+                if (value.key.contains("isNewFirstLaunchV")) {
                    lunchType = LunchType.UPDATE
                    break
                }
            }
        }
+        // 再次重装
+        if (lunchType == null && !getDeviceId().isNullOrEmpty()) {
+            lunchType = LunchType.AGAIN
+        }
        // 首次安装
        if (lunchType == null) {
            lunchType = LunchType.FIRST
        }
+        // 保存deviceId
+        var deviceId = MetaUtil.getIMEI()
+        if (deviceId.isNullOrEmpty()) {
+            deviceId = Utils.getTime(HaloApp.getInstance().application).toString()
+        }
+
+        if (!readOnly) {
+            setDeviceId(deviceId)
+        }

        return lunchType
    }

+    private fun getDeviceFileList(): List<File> {
+        val sdCardDir = Environment.getExternalStorageDirectory()
+        val fileList: MutableList<File> = ArrayList()
+        fileList.add(File(sdCardDir.path + "/gh-uuid/$DEVICE_ID"))
+        fileList.add(File(sdCardDir.path + "/system/$DEVICE_ID"))
+        fileList.add(File(sdCardDir.path + "/data/$DEVICE_ID"))
+        return fileList
+    }
+
+
+    @Synchronized
+    private fun setDeviceId(deviceId: String) {
+        //将deviceId存到sp
+        val sp = PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().application)
+        val edit = sp.edit()
+        edit.putString(DEVICE_ID, deviceId)
+        edit.apply()
+        Utils.log("saveDeviceId", "保存成功SP")
+
+        //将deviceId存到SD卡
+        for (file in getDeviceFileList()) {
+            try {
+                val parentFile = file.parentFile
+                if (!parentFile.exists()) parentFile.mkdirs()
+                file.writeText(deviceId)
+                Utils.log("saveDeviceId", "保存成功SDCard目录为：${file.path}")
+            } catch (e: Exception) {
+                Utils.log("保存u${DEVICE_ID}到SDCard异常${file.path} " + e.toString())
+                e.printStackTrace()
+            }
+        }
+    }
+
+    private fun getDeviceId(): String? {
+        val sp = PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().application)
+        var deviceId = sp.getString(DEVICE_ID, null)
+        if (deviceId.isNullOrEmpty()) {
+            val fileList = getDeviceFileList()
+            for (file in fileList) {
+                if (file.exists()) {
+                    try {
+                        deviceId = file.readText()
+                        Utils.log("getDeviceId", "获取成功DataFile$DEVICE_ID")
+                        return deviceId
+                    } catch (e: Exception) {
+                        e.printStackTrace()
+                    }
+                }
+            }
+        }
+        if (BuildConfig.DEBUG) {
+            Utils.log("getDeviceId", "获取成功SP$DEVICE_ID")
+        }
+        return deviceId
+    }
+
 }

 enum class LunchType {
    FIRST,
-    UPDATE
+    UPDATE,
+    AGAIN
 }
--- a/app/src/main/java/com/gh/common/util/DialogUtils.java
+++ b/app/src/main/java/com/gh/common/util/DialogUtils.java
@ -4,6 +4,7 @@ import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
@ -11,9 +12,16 @@ import android.net.Uri;
 import android.os.CountDownTimer;
 import android.provider.Settings;
 import android.text.Html;
+import android.text.Spannable;
 import android.text.SpannableStringBuilder;
+import android.text.Spanned;
+import android.text.TextPaint;
 import android.text.TextUtils;
 import android.text.method.LinkMovementMethod;
+import android.text.style.ClickableSpan;
+import android.text.style.URLSpan;
+import android.text.style.UnderlineSpan;
+import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@ -26,9 +34,12 @@ import android.widget.LinearLayout;
 import android.widget.TextView;

 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;

+import com.facebook.drawee.generic.GenericDraweeHierarchy;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.gh.common.constant.Config;
 import com.gh.common.filter.RegionSetting;
@ -36,9 +47,11 @@ import com.gh.common.xapk.XapkDialogHelper;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.ShellActivity;
 import com.gh.gamecenter.adapter.ReportReasonAdapter;
+import com.gh.gamecenter.adapter.viewholder.PrivacyPolicyItemViewHolder;
 import com.gh.gamecenter.common.base.TrackableDialog;
 import com.gh.gamecenter.common.callback.CancelListener;
 import com.gh.gamecenter.common.callback.ConfirmListener;
+import com.gh.gamecenter.common.callback.SimpleCallback;
 import com.gh.gamecenter.common.databinding.DialogAlertDefaultBinding;
 import com.gh.gamecenter.common.entity.SimpleGameEntity;
 import com.gh.gamecenter.common.entity.SuggestType;
@ -47,7 +60,9 @@ import com.gh.gamecenter.common.utils.ExtensionsKt;
 import com.gh.gamecenter.common.utils.ImageUtils;
 import com.gh.gamecenter.common.utils.NetworkUtils;
 import com.gh.gamecenter.common.utils.SensorsBridge;
+import com.gh.gamecenter.common.view.CustomLinkMovementMethod;
 import com.gh.gamecenter.common.view.DrawableView;
+import com.gh.gamecenter.common.view.FixLinearLayoutManager;
 import com.gh.gamecenter.common.view.MaxHeightLinearLayout;
 import com.gh.gamecenter.common.view.MaxHeightNestedScrollView;
 import com.gh.gamecenter.common.view.VerticalItemDecoration;
@ -65,7 +80,10 @@ import com.gh.gamecenter.databinding.DialogRelievePhoneBinding;
 import com.gh.gamecenter.databinding.DialogReportReasonBinding;
 import com.gh.gamecenter.databinding.DialogWechatReserveSuccessBinding;
 import com.gh.gamecenter.databinding.ImprintContentItemBinding;
+import com.gh.gamecenter.databinding.PrivacyItemBinding;
 import com.gh.gamecenter.entity.BadgeEntity;
+import com.gh.gamecenter.entity.PermissionsEntity;
+import com.gh.gamecenter.entity.PrivacyPolicyEntity;
 import com.gh.gamecenter.entity.TrackableEntity;
 import com.gh.gamecenter.feature.entity.ApkEntity;
 import com.gh.gamecenter.feature.entity.Badge;
@ -73,6 +91,7 @@ import com.gh.gamecenter.feature.entity.GameEntity;
 import com.gh.gamecenter.feature.entity.SettingsEntity;
 import com.gh.gamecenter.help.HelpAndFeedbackBridge;
 import com.gh.gamecenter.setting.SettingBridge;
+import com.lightgame.adapter.BaseRecyclerAdapter;
 import com.lightgame.download.DownloadEntity;
 import com.lightgame.utils.AppManager;
 import com.lightgame.utils.Util_System_Keyboard;
@ -309,7 +328,180 @@ public class DialogUtils {
        return dialog;
    }

+    public static void showPrivacyPolicyDialog(Context context,
+                                               @NonNull PrivacyPolicyEntity entity,
+                                               SimpleCallback<Boolean> callback) {
+
+        final Context activityContext = checkDialogContext(context);
+
+        // 区分此 dialog 是点击 dialog 外部取消的还是点击返回取消的
+        AtomicBoolean isCanceledByClickOutsideOfDialog = new AtomicBoolean(true);
+
+        final Dialog dialog = new Dialog(activityContext, R.style.GhAlertDialog);
+        View contentView = LayoutInflater.from(activityContext).inflate(R.layout.dialog_privacy_policy, null);
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dialog.setContentView(contentView);
+
+        Window window = dialog.getWindow();
+        if (window != null) {
+            window.setBackgroundDrawableResource(android.R.color.transparent);
+            WindowManager.LayoutParams params = window.getAttributes();
+            params.horizontalMargin = 0;
+            params.width = context.getResources().getDisplayMetrics().widthPixels - DisplayUtils.dip2px(40);
+//            int height = context.getResources().getDisplayMetrics().heightPixels - DisplayUtils.dip2px(120);
+//            int maxHeight = DisplayUtils.dip2px(446);
+//            if (height > maxHeight) {
+//                params.height = maxHeight;
+//            } else {
+//                params.height = height;
+//            }
+            window.setAttributes(params);
+        }
+
+        TextView title = contentView.findViewById(R.id.title);
+        TextView bottomContent = contentView.findViewById(R.id.bottom_content);
+        TextView topContent = contentView.findViewById(R.id.top_content);
+        TextView allowButton = contentView.findViewById(R.id.allow_button);
+        TextView disallowButton = contentView.findViewById(R.id.disallow_button);
+        TextView linkContent = contentView.findViewById(R.id.link_content);
+        RecyclerView permissions = contentView.findViewById(R.id.permissions_content);
+
+        permissions.setLayoutManager(new FixLinearLayoutManager(context));
+        permissions.setAdapter(new BaseRecyclerAdapter(context) {
+            @NonNull
+            @Override
+            public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+                View view = mLayoutInflater.inflate(R.layout.privacy_item, parent, false);
+                return new PrivacyPolicyItemViewHolder(PrivacyItemBinding.bind(view));
+            }
+
+            @Override
+            public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+                if (holder instanceof PrivacyPolicyItemViewHolder) {
+                    PrivacyPolicyItemViewHolder viewHolder = (PrivacyPolicyItemViewHolder) holder;
+                    PrivacyItemBinding binding = viewHolder.getBinding();
+                    final PermissionsEntity permissionsEntity = entity.getPermissions().get(position);
+                    ImageUtils.display(binding.icon, permissionsEntity.getIcon());
+                    binding.name.setText(permissionsEntity.getName());
+                    binding.intro.setText(permissionsEntity.getIntro());
+                    GenericDraweeHierarchy hierarchy = binding.icon.getHierarchy();
+                    if (hierarchy != null) {
+                        if (position == 0) {
+                            hierarchy.setPlaceholderImage(R.drawable.permission_storage);
+                        } else if (position == 1) {
+                            hierarchy.setPlaceholderImage(R.drawable.permission_phone_state);
+                        }
+                    }
+                }
+            }
+
+            @Override
+            public int getItemCount() {
+                return entity.getPermissions().size();
+            }
+        });
+
+        SpannableStringBuilder skipText = new SpannableStringBuilder("查看完整版的隐私政策和用户协议");
+        skipText.setSpan(new ClickableSpan() {
+            @Override
+            public void updateDrawState(@NonNull TextPaint ds) {
+                super.updateDrawState(ds);
+                ds.setColor(ContextCompat.getColor(activityContext, R.color.theme_font));
+                ds.setUnderlineText(false);
+            }
+
+            @Override
+            public void onClick(@NonNull View widget) {
+//                MtaHelper.onEvent("隐私政策弹窗", "隐私政策弹窗", "点击隐私政策");
+                DirectUtils.directToExternalBrowser(context, context.getString(R.string.privacy_policy_url));
+            }
+        }, skipText.length() - 9, skipText.length() - 5, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+        skipText.setSpan(new ClickableSpan() {
+            @Override
+            public void updateDrawState(@NonNull TextPaint ds) {
+                super.updateDrawState(ds);
+                ds.setColor(ContextCompat.getColor(activityContext, R.color.theme_font));
+                ds.setUnderlineText(false);
+            }
+
+            @Override
+            public void onClick(@NonNull View widget) {
+//                MtaHelper.onEvent("隐私政策弹窗", "隐私政策弹窗", "点击用户协议");
+                DirectUtils.directToExternalBrowser(context, context.getString(R.string.disclaimer_url));
+            }
+        }, skipText.length() - 4, skipText.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+        /*skipText.setSpan(new ClickableSpan() {
+            @Override
+            public void updateDrawState(@NonNull TextPaint ds) {
+                super.updateDrawState(ds);
+                ds.setColor(ContextCompat.getColor(activityContext, R.color.theme_font));
+                ds.setUnderlineText(false);
+            }
+
+            @Override
+            public void onClick(@NonNull View widget) {
+//                MtaHelper.onEvent("隐私政策弹窗", "隐私政策弹窗", "点击第三方SDK接入说明");
+                activityContext.startActivity(WebActivity.getThirdPartySdkStatementIntent(activityContext));
+            }
+        }, skipText.length() - 10, skipText.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);*/
+
+        title.setText(entity.getTitle());
+        linkContent.setText(skipText);
+        linkContent.setMovementMethod(LinkMovementMethod.getInstance());
+        topContent.setText(entity.getTopContent());
+        bottomContent.setText(ExtensionsKt.fromHtml(entity.getBottomContent()));
+        bottomContent.setMovementMethod(CustomLinkMovementMethod.getInstance());
+
+        // Remove underline
+        Spannable sa = (Spannable) bottomContent.getText();
+        for (URLSpan u : sa.getSpans(0, sa.length(), URLSpan.class)) {
+            sa.setSpan(new UnderlineSpan() {
+                public void updateDrawState(TextPaint tp) {
+                    tp.setUnderlineText(false);
+                }
+            }, sa.getSpanStart(u), sa.getSpanEnd(u), 0);
+        }
+
+        allowButton.setOnClickListener(view -> {
+            dialog.dismiss();
+            callback.onCallback(true);
+//            MtaHelper.onEvent("隐私政策弹窗", "隐私政策弹窗", "点击同意");
+        });
+
+        disallowButton.setOnClickListener(v -> {
+            dialog.dismiss();
+            callback.onCallback(false);
+//            showPrivacyPolicyDisallowDialog(activityContext, entity, callback);
+//            MtaHelper.onEvent("隐私政策弹窗", "隐私政策弹窗", "不同意并退出App");
+        });
+
+        dialog.setOnCancelListener(cd -> {
+            if (isCanceledByClickOutsideOfDialog.get()) {
+//                MtaHelper.onEvent("隐私政策弹窗", "隐私政策弹窗", "点击空白");
+            }
+        });
+
+        dialog.setOnKeyListener((dialog1, keyCode, event) -> {
+            if (keyCode == KeyEvent.KEYCODE_BACK && event.getAction() == KeyEvent.ACTION_UP) {
+                isCanceledByClickOutsideOfDialog.set(false);
+//                MtaHelper.onEvent("隐私政策弹窗", "隐私政策弹窗", "点击返回");
+            }
+            return false;
+        });
+        // 用户未同意隐私策略不应该触发 MTA 事件
+//        MtaHelper.onEvent("隐私政策弹窗", "隐私政策弹窗", "出现弹窗");
+
+        try {
+            dialog.setCancelable(false);
+            dialog.show();
+        } catch (Exception ignored) {
+        }
+    }
+
    public static void showPrivacyPolicyDisallowDialog(Context context,
+                                                       @NonNull PrivacyPolicyEntity entity,
                                                       EmptyCallback callback) {
        final Context activityContext = checkDialogContext(context);

@ -355,8 +547,8 @@ public class DialogUtils {
        TextView negativeTv = contentView.findViewById(R.id.negative);
        TextView positiveTv = contentView.findViewById(R.id.positive);
        TextView content = contentView.findViewById(R.id.content);
-        positiveTv.setBackground(DrawableView.getOvalDrawable(R.color.ui_background, 999));
-        negativeTv.setBackground(DrawableView.getOvalDrawable(R.color.primary_theme, 999));
+        positiveTv.setBackground(DrawableView.getOvalDrawable(R.color.background, 999));
+        negativeTv.setBackground(DrawableView.getOvalDrawable(R.color.theme, 999));
        content.setText(Html.fromHtml(context.getString(R.string.video_upload_draft_dialog_content)));

        negativeTv.setOnClickListener(view -> {
@ -1059,10 +1251,10 @@ public class DialogUtils {

        DialogPackageParseErrorBinding binding = DialogPackageParseErrorBinding.inflate(LayoutInflater.from(context), null, false);
        Context finalContext = context;
-        SpannableStringBuilder builder = new SpanBuilder("您也可以点击提交反馈跟我们联系").click(context, 6, 10, R.color.text_theme, true, new Function0<Unit>() {
+        SpannableStringBuilder builder = new SpanBuilder("您也可以点击提交反馈跟我们联系").click(context, 6, 10, R.color.theme_font, true, new Function0<Unit>() {
            @Override
            public Unit invoke() {
-                SimpleGameEntity entity = new SimpleGameEntity(gameId, gameName, "", "");
+                SimpleGameEntity entity = new SimpleGameEntity(gameId, gameName, "");
                HelpAndFeedbackBridge.startSuggestionActivity(finalContext, SuggestType.GAME, "notfound", "模拟器安装包解析错误", entity);
                dialog.dismiss();
                return null;
@ -1118,7 +1310,7 @@ public class DialogUtils {
            return null;
        });
        binding.reasonRv.setLayoutManager(new LinearLayoutManager(context));
-        binding.reasonRv.addItemDecoration(new VerticalItemDecoration(context, 1F, false, R.color.ui_background));
+        binding.reasonRv.addItemDecoration(new VerticalItemDecoration(context, 1F, false, R.color.background));
        binding.reasonRv.setAdapter(reportReasonAdapter);

        binding.negativeBtn.setOnClickListener(v -> {
@ -1140,7 +1332,7 @@ public class DialogUtils {
        ExtensionsKt.setTextChangedListener(binding.otherReasonEt, (s, start, before, count) -> {
            int tvCount = s.length();
            if (tvCount >= 500) {
-                binding.tvCount.setTextColor(ContextCompat.getColor(finalContext, R.color.secondary_red));
+                binding.tvCount.setTextColor(ContextCompat.getColor(finalContext, R.color.theme_red));
            }
            binding.tvCount.setText(tvCount + "/500");
            return null;
--- a/app/src/main/java/com/gh/common/util/DirectUtils.kt
+++ b/app/src/main/java/com/gh/common/util/DirectUtils.kt
@ -37,7 +37,6 @@ import com.gh.gamecenter.core.runOnIoThread
 import com.gh.gamecenter.core.utils.ToastUtils
 import com.gh.gamecenter.discovery.DiscoveryActivity
 import com.gh.gamecenter.download.DownloadFragment.Companion.INDEX_UPDATE
-import com.gh.gamecenter.entity.GameCollectionListEntity
 import com.gh.gamecenter.entity.SubjectData
 import com.gh.gamecenter.entity.SubjectRecommendEntity
 import com.gh.gamecenter.entity.VideoLinkEntity
@ -59,12 +58,9 @@ import com.gh.gamecenter.game.commoncollection.detail.CommonCollectionDetailActi
 import com.gh.gamecenter.game.upload.GameSubmissionActivity
 import com.gh.gamecenter.gamecollection.detail.GameCollectionDetailActivity
 import com.gh.gamecenter.gamecollection.hotlist.GameCollectionHotListActivity
-import com.gh.gamecenter.gamecollection.hotlist.GameCollectionListDetailActivity
 import com.gh.gamecenter.gamecollection.square.GameCollectionSquareActivity
 import com.gh.gamecenter.gamedetail.GameDetailFragment
 import com.gh.gamecenter.gamedetail.fuli.kaifu.ServersCalendarActivity
-import com.gh.gamecenter.gamedetail.fuli.kaifu.ServersCalendarManagementActivity
-import com.gh.gamecenter.gamedetail.fuli.kaifu.ServersSubscribedGameListActivity
 import com.gh.gamecenter.gamedetail.history.HistoryApkListActivity
 import com.gh.gamecenter.gamedetail.rating.RatingReplyActivity
 import com.gh.gamecenter.help.HelpAndFeedbackBridge
@ -112,8 +108,8 @@ import kotlin.math.roundToInt
 object DirectUtils {

    @JvmStatic
-    fun directToLinkPage(context: Context, linkEntity: LinkEntity, entrance: String, path: String, sourceEntrance: String = "") {
-        directToLinkPage(context, linkEntity, entrance, path,  null, sourceEntrance)
+    fun directToLinkPage(context: Context, linkEntity: LinkEntity, entrance: String, path: String) {
+        directToLinkPage(context, linkEntity, entrance, path, null)
    }

    @JvmStatic
@ -122,10 +118,9 @@ object DirectUtils {
        linkEntity: LinkEntity,
        entrance: String,
        path: String,
-        exposureEvent: ExposureEvent? = null,
-        sourceEntrance: String = ""
+        exposureEvent: ExposureEvent? = null
    ) {
-        directToLinkPage(context, linkEntity, entrance, path, exposureEvent, null, sourceEntrance)
+        directToLinkPage(context, linkEntity, entrance, path, exposureEvent, null)
    }

    // 用于判断是否已经对接相关类型
@ -159,8 +154,7 @@ object DirectUtils {
        "bbs_video",
        "explore_column",
        "game_explore",
-        "column_test_v2",
-        "game_list_collection"
+        "column_test_v2"
    )

    fun directToLinkPage(
@ -170,7 +164,6 @@ object DirectUtils {
        path: String,
        exposureEvent: ExposureEvent? = null,
        unknownCallback: (() -> Unit)?,
-        sourceEntrance: String = ""
    ) {
        when (linkEntity.type) {
            "article", "news", "文章" -> {
@ -196,8 +189,6 @@ object DirectUtils {
                }
            }

-            "game_server_calendar" -> directToGameServerCalendar(context, linkEntity.link)
-
            "column", "游戏专题" -> directToSubject(
                context, linkEntity.link
                    ?: "", linkEntity.text, BaseActivity.mergeEntranceAndPath(entrance, path), exposureEvent
@ -205,7 +196,7 @@ object DirectUtils {

            "question", "社区问题" -> directToQuestionDetail(
                context, linkEntity.link
-                    ?: "", entrance, path, sourceEntrance
+                    ?: "", entrance, path
            )

            "answer", "社区回答" -> directToAnswerDetail(context, linkEntity.link ?: "", entrance, path)
@ -220,8 +211,7 @@ object DirectUtils {
                linkEntity.community!!,
                linkEntity.link!!,
                entrance,
-                path,
-                sourceEntrance,
+                path
            )

            "community_column", "社区专题" -> directToCommunityColumn(
@ -313,8 +303,7 @@ object DirectUtils {
                videoId = linkEntity.link!!,
                fromLocation = VideoDetailContainerViewModel.Location.VIDEO_CHOICENESS.value,
                entrance = entrance,
-                path = path,
-                sourceEntrance = sourceEntrance
+                path = path
            )

            "game_video" -> directToGameVideo(context, linkEntity.link ?: "", entrance, path)
@ -325,8 +314,6 @@ object DirectUtils {

            "qa", "qa_content", "Q&A" -> directToQa(context, linkEntity.text ?: "", linkEntity.link ?: "")

-            "qa_list" -> directToHelpAndFeedback(context)
-
            "qa_collection", "Q&A合集" -> directToQaCollection(
                context, linkEntity.text
                    ?: "", linkEntity.link
@ -457,14 +444,6 @@ object DirectUtils {

            "qq_mini_game_column" -> directToQGameHome(context)

-            "game_list_collection" -> directToGameCollectionListDetail(
-                context,
-                linkEntity.link ?: "",
-                linkEntity.text ?: "",
-                linkEntity.explain,
-                entrance
-            )
-
            "" -> {
                // do nothing
            }
@ -553,13 +532,12 @@ object DirectUtils {
     * 跳转至游戏日历表
     */
    @JvmStatic
-    fun directToGameServerCalendar(context: Context, gameId: String?, kaifuTime: Long = 0) {
+    fun directToGameServerCalendar(context: Context, gameId: String?) {
        val bundle = Bundle()
        bundle.putString(KEY_TO, ServersCalendarActivity::class.java.name)
        bundle.putParcelable(GameEntity::class.java.simpleName, GameEntity().apply {
            id = gameId ?: ""
        })
-        bundle.putLong(KEY_KAIFU_TIME, kaifuTime)
        bundle.putParcelable(GameDetailServer::class.java.simpleName, GameDetailServer())
        bundle.putParcelable(MeEntity::class.java.simpleName, MeEntity())
        jumpActivity(context, bundle)
@ -852,6 +830,27 @@ object DirectUtils {
        jumpActivity(context, bundle)
    }

+    /**
+     * 跳转到下载管理器并开始下载 [gameId] 和 [packageName] 用于唯一确定一个下载文件
+     */
+    @JvmStatic
+    fun directToDownloadManagerAndStartDownload(
+        context: Context,
+        gameId: String? = "",
+        packageName: String? = "",
+        entrance: String? = null
+    ) {
+        DownloadHelper.createABrandNewDownloadTaskQuietly(gameId, packageName) {
+            val bundle = Bundle()
+            bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
+            bundle.putString(KEY_TO, DownloadManagerActivity.TAG)
+            bundle.putString(KEY_GAMEID, gameId)
+            bundle.putString(KEY_PACKAGENAME, packageName)
+            bundle.putBoolean(KEY_AUTO_DOWNLOAD, true)
+            jumpActivity(context, bundle)
+        }
+    }
+
    @JvmStatic
    fun directToDownloadManagerAndStartUpdate(
        context: Context,
@ -865,7 +864,7 @@ object DirectUtils {
        bundle.putString(KEY_GAMEID, gameId)
        bundle.putString(KEY_PACKAGENAME, packageName)
        bundle.putInt(BaseFragment_TabLayout.PAGE_INDEX, INDEX_UPDATE)
-        jumpActivityCompat(context, bundle)
+        jumpActivity(context, bundle)
    }

    @JvmStatic
@ -890,14 +889,13 @@ object DirectUtils {
    }

    @JvmStatic
-    fun directToQuestionDetail(context: Context, id: String, entrance: String? = null, path: String? = null, sourceEntrance: String = "") {
+    fun directToQuestionDetail(context: Context, id: String, entrance: String? = null, path: String? = null) {
        if (id.isEmpty()) return
        val bundle = Bundle()
        bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
        bundle.putString(KEY_TO, NewQuestionDetailActivity::class.java.name)
        bundle.putString(KEY_PATH, path)
        bundle.putString(KEY_QUESTIONS_ID, id)
-        bundle.putString(KEY_SOURCE_ENTRANCE, sourceEntrance)
        jumpActivity(context, bundle)
    }

@ -927,9 +925,9 @@ object DirectUtils {
                browserIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
            }
            context.startActivity(browserIntent)
-        } catch (e: Exception) {
+        } catch (e: ActivityNotFoundException) {
            e.printStackTrace()
-            url.copyTextAndToast(context.getString(R.string.direct_to_external_browser_failed_toast))
+            Utils.toast(context, "跳转地址无效")
        }
    }

@ -1041,15 +1039,13 @@ object DirectUtils {
        articleId: String?,
        communityId: String?,
        entrance: String?,
-        path: String?,
-        sourceEntrance: String = ""
+        path: String?
    ) {
        val bundle = Bundle()
        bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
        bundle.putString(KEY_PATH, path)
        bundle.putString(KEY_TO, ArticleDetailActivity::class.java.name)
        bundle.putString(KEY_COMMUNITY_ARTICLE_ID, articleId)
-        bundle.putString(KEY_SOURCE_ENTRANCE, sourceEntrance)
        bundle.putParcelable(KEY_COMMUNITY_DATA, CommunityEntity(id = communityId!!))
        jumpActivity(context, bundle)
    }
@ -1060,8 +1056,7 @@ object DirectUtils {
        community: CommunityEntity?,
        articleId: String?,
        entrance: String?,
-        path: String?,
-        sourceEntrance: String = "",
+        path: String?
    ) {
        if (articleId.isNullOrEmpty()) return
        val bundle = Bundle()
@ -1069,7 +1064,6 @@ object DirectUtils {
        bundle.putString(KEY_PATH, path)
        bundle.putString(KEY_TO, ArticleDetailActivity::class.java.name)
        bundle.putString(KEY_COMMUNITY_ARTICLE_ID, articleId)
-        bundle.putString(KEY_SOURCE_ENTRANCE, sourceEntrance)
        bundle.putParcelable(KEY_COMMUNITY_DATA, community)
        jumpActivity(context, bundle)
    }
@ -1099,8 +1093,7 @@ object DirectUtils {
    fun directToVideoDetail(
        context: Context, videoId: String,
        entrance: String? = null,
-        path: String? = "",
-        sourceEntrance: String = ""
+        path: String? = ""
    ) {
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
            val bundle = Bundle()
@ -1108,7 +1101,6 @@ object DirectUtils {
            bundle.putString(KEY_TO, ForumVideoDetailActivity::class.java.name)
            bundle.putString(KEY_VIDEO_ID, videoId);
            bundle.putString(KEY_PATH, path)
-            bundle.putString(KEY_SOURCE_ENTRANCE, sourceEntrance)
            jumpActivity(context, bundle)
        } else {
            DialogHelper.showVideoUnsupportedDialog(context)
@ -1133,9 +1125,7 @@ object DirectUtils {
        act: String = "",
        paginationType: String = "",
        fieldId: String = "",
-        sectionName: String = "",
-        isHomeVideo: Boolean = false,
-        sourceEntrance: String = ""
+        sectionName: String = ""
    ) {
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
            val bundle = Bundle()
@ -1153,8 +1143,6 @@ object DirectUtils {
            bundle.putString(KEY_PAGINATION_TYPE, paginationType)
            bundle.putString(KEY_FIELD_ID, fieldId)
            bundle.putString(KEY_SECTION_NAME, sectionName)
-            bundle.putBoolean(KEY_IS_HOME_VIDEO, isHomeVideo)
-            SensorsBridge.trackAccessVideoStreaming(sourceEntrance)
            jumpActivity(context, bundle)
        } else {
            DialogHelper.showVideoUnsupportedDialog(context)
@ -1170,10 +1158,9 @@ object DirectUtils {
        gameId: String = "",
        entrance: String? = null,
        path: String? = "",
-        referer: String = "",
-        sourceEntrance: String = ""
+        referer: String = ""
    ) {
-        directToVideoDetail(context, videoId, entrance, path, sourceEntrance)
+        directToVideoDetail(context, videoId, entrance, path)
    }

    /**
@ -1955,8 +1942,7 @@ object DirectUtils {
        fromRatingKey: Boolean = false,
        diagnosis: String = "",
        forceLogin: Boolean = true,
-        requestCode: Int? = null,
-        isSmoothGame: Boolean = false
+        requestCode: Int? = null
    ) {
        val intent = HelpAndFeedbackBridge.getIntent(
            context,
@ -1969,8 +1955,7 @@ object DirectUtils {
            qaContentId,
            fromRatingKey,
            diagnosis,
-            forceLogin,
-            isSmoothGame
+            forceLogin
        )
        if (requestCode != null) {
            (context as Activity).startActivityForResult(intent, requestCode)
@ -1984,14 +1969,8 @@ object DirectUtils {
     * @param bbsId, 为空时搜索全范围的内容，不为空时搜索该 bbsId 对应的内容
     */
    @JvmStatic
-    fun directToForumOrUserSearch(
-        context: Context,
-        bbsId: String,
-        entrance: String,
-        sourceEntrance: String,
-        forumName: String
-    ) {
-        context.startActivity(ForumOrUserSearchActivity.getIntent(context, bbsId, entrance, sourceEntrance, forumName))
+    fun directToForumOrUserSearch(context: Context, bbsId: String, entrance: String) {
+        context.startActivity(ForumOrUserSearchActivity.getIntent(context, bbsId, entrance))
    }

    @JvmStatic
@ -2122,42 +2101,4 @@ object DirectUtils {
            .withInt(BaseActivity_TabLayout.PAGE_INDEX, defaultTabIndex)
            .navigation()
    }
-
-    // 跳转游戏单合集详情
-    @JvmStatic
-    fun directToGameCollectionListDetail(
-        context: Context,
-        collectionId: String,
-        collectionName: String,
-        explain: String,
-        entrance: String = ""
-    ) {
-        context.startActivity(
-            GameCollectionListDetailActivity.getIntent(
-                context,
-                GameCollectionListEntity(id = collectionId, name = collectionName, explain = explain),
-                entrance
-            )
-        )
-    }
-
-    /**
-     * 跳转到游戏订阅页面
-     * @param context 上下文
-     */
-    @JvmStatic
-    fun directToServersSubscribedGameList(context: Context) {
-        context.startActivity(ServersSubscribedGameListActivity.getIntent(context))
-    }
-
-    /**
-     * 跳转到开服订阅页面
-     * @param context 上下文
-     */
-    @JvmStatic
-    fun directToServersCalendarManagement(context: Context, entrance: String) {
-        CheckLoginUtils.checkLogin(context, entrance) {
-            context.startActivity(ServersCalendarManagementActivity.getIntent(context))
-        }
-    }
 }
--- a/app/src/main/java/com/gh/common/util/DownloadDialogHelper.kt
+++ b/app/src/main/java/com/gh/common/util/DownloadDialogHelper.kt
@ -42,7 +42,6 @@ object DownloadDialogHelper {
                        gameName = gameEntity.name ?: "",
                        gameType = gameEntity.categoryChinese
                    )
-                    callback.onCallback()
                },
                cancelClickCallback = {
                    SensorsBridge.trackGameDownloadDialogClick(
@ -51,6 +50,7 @@ object DownloadDialogHelper {
                        gameName = gameEntity.name ?: "",
                        gameType = gameEntity.categoryChinese
                    )
+                    callback.onCallback()
                },
                touchOutsideCallback = {
                    SensorsBridge.trackGameDownloadDialogClick(
--- a/app/src/main/java/com/gh/common/util/DownloadHelper.kt
+++ b/app/src/main/java/com/gh/common/util/DownloadHelper.kt
@ -0,0 +1,63 @@
+package com.gh.common.util
+
+import com.gh.common.filter.RegionSettingHelper
+import com.gh.download.DownloadManager
+import com.gh.gamecenter.common.constant.EntranceConsts
+import com.gh.gamecenter.feature.entity.GameEntity
+import com.gh.gamecenter.common.retrofit.Response
+import com.gh.gamecenter.feature.utils.ApkActiveUtils
+import com.gh.gamecenter.retrofit.RetrofitManager
+import com.halo.assistant.HaloApp
+import io.reactivex.schedulers.Schedulers
+import retrofit2.HttpException
+
+/**
+ * 不想写这个类的，但是与其在一个糟糕的类里插入同样的代码，我想独立写一个类相较而已还没那么糟糕
+ */
+object DownloadHelper {
+
+    /**
+     * 根据 game_id 和 packageName 悄悄地开启一个下载任务，如果可以的话
+     * @param block 成功添加下载任务后执行的代码块
+     */
+    fun createABrandNewDownloadTaskQuietly(gameId: String? = "", packageName: String? = "", block: () -> Unit) {
+        if (RegionSettingHelper.shouldThisGameBeFiltered(gameId)) {
+            return
+        }
+
+        RetrofitManager.getInstance()
+            .api
+            .getGameDigest(gameId)
+            .map(ApkActiveUtils.filterMapper)
+            .subscribeOn(Schedulers.io())
+            .subscribe(object : Response<GameEntity>() {
+                override fun onResponse(response: GameEntity?) {
+                    response?.let {
+                        if (response.getApk().size > 1) {
+                            for (apk in response.getApk()) {
+                                if (packageName == apk.packageName) {
+                                    DownloadManager.createDownload(
+                                        HaloApp.getInstance().application,
+                                        apk, response, "", EntranceConsts.ENTRANCE_RECOMMEND, "", false, null
+                                    )
+                                    block.invoke()
+                                }
+                            }
+                        } else if (response.getApk().size == 1) {
+                            DownloadManager.createDownload(
+                                HaloApp.getInstance().application,
+                                response, "", EntranceConsts.ENTRANCE_RECOMMEND, "", false, null
+                            )
+                            block.invoke()
+                        }
+                    }
+                }
+
+                override fun onFailure(e: HttpException?) {
+                    e?.printStackTrace()
+                    block.invoke()
+                }
+            })
+    }
+
+}
--- a/app/src/main/java/com/gh/common/util/DownloadItemUtils.kt
+++ b/app/src/main/java/com/gh/common/util/DownloadItemUtils.kt
@ -122,7 +122,7 @@ object DownloadItemUtils {
    fun updateItemWithReserveStatus(holder: GameViewHolder, gameEntity: GameEntity) {
        if ("download" == gameEntity.reserveStatus) {
            // 已上线
-            updateItem(holder.gameDownloadBtn.context, gameEntity, holder)
+            updateItem(holder.gameDownloadBtn.context, gameEntity, holder, false)
        } else if ("appointment" == gameEntity.reserveStatus) {
            // 已预约
            holder.gameDownloadBtn.text = "已预约"
@ -133,35 +133,25 @@ object DownloadItemUtils {
    }

    fun updateItem(
-        context: Context,
-        gameEntity: GameEntity,
-        holder: GameViewHolder,
-        hideDownloadBtnIfNoAvailableContent: Boolean
+        context: Context, gameEntity: GameEntity, holder: GameViewHolder,
+        isShowPlatform: Boolean, hideDownloadBtnIfNoAvailableContent: Boolean
    ) {
        updateItem(
-            context = context,
-            gameEntity = gameEntity,
-            holder = holder,
-            pluginLocation = PluginLocation.only_game,
-            hideDownloadBtnIfNoAvailableContent = hideDownloadBtnIfNoAvailableContent,
-            briefStyle = null
+            context,
+            gameEntity,
+            holder,
+            isShowPlatform,
+            PluginLocation.only_game,
+            hideDownloadBtnIfNoAvailableContent,
+            null
        )
    }

    fun updateItem(
-        context: Context,
-        gameEntity: GameEntity,
-        holder: GameViewHolder,
-        briefStyle: String?
+        context: Context, gameEntity: GameEntity, holder: GameViewHolder,
+        isShowPlatform: Boolean, briefStyle: String?
    ) {
-        updateItem(
-            context = context,
-            gameEntity = gameEntity,
-            holder = holder,
-            pluginLocation = PluginLocation.only_game,
-            hideDownloadBtnIfNoAvailableContent = false,
-            briefStyle = briefStyle
-        )
+        updateItem(context, gameEntity, holder, isShowPlatform, PluginLocation.only_game, false, briefStyle)
    }

    @JvmStatic
@ -170,6 +160,7 @@ object DownloadItemUtils {
        context: Context,
        gameEntity: GameEntity,
        holder: GameViewHolder,
+        isShowPlatform: Boolean,
        pluginLocation: PluginLocation? = PluginLocation.only_game,
        hideDownloadBtnIfNoAvailableContent: Boolean = false,
        briefStyle: String? = null,
@ -295,54 +286,12 @@ object DownloadItemUtils {
                }
            }
        } else if (gameEntity.getApk().size == 1) {
-            // 来自于下载管理的实体快照
-            val entityFromDownloadManager = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity)
-            // 是否正在下载中
-            val isDownloading = entityFromDownloadManager != null && entityFromDownloadManager.status != DownloadStatus.done
-            // 是否已安装至本地
-            val isInstalledLocally = PackagesManager.isInstalled(gameEntity.getUniquePackageName())
-            // 来自于畅玩安装列表的实体快照，若存在，代表游戏已下载并成功安装
-            val entityFromInstalledVGame = VHelper.getVDownloadEntitySnapshot(gameEntity.id, gameEntity.getUniquePackageName())
-            // 是否已安装至畅玩
-            val isInstalledToVSpace = entityFromInstalledVGame != null
-            // 是否处于待安装状态 (仅本地安装有这个状态)
-            val isPendingToInstall = if (entityFromDownloadManager?.status != DownloadStatus.done) {
-                false
-            } else {
-                entityFromDownloadManager.isLocalDownloadInDualDownloadMode()
-                        && (!isInstalledLocally || entityFromDownloadManager.isUpdate)
-            }
+            // 优先从下载管理获取 downloadEntity
+            var downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity)

-//            列表按钮显示的优先级
-//            1. 都未安装，且不存在下载任务，按后台配置显示的状态优先
-//            2. 存在未完成的下载任务时，下载任务优先
-//            3. 存在待安装任务时，待安装任务优先
-//            4. 存在一个已安装，已安装的显示优先
-//            5. 都已安装，按后台配置显示的状态优先
-            val isVGamePreferred = if (!isInstalledLocally && !isInstalledToVSpace && entityFromDownloadManager == null) {
-                gameEntity.isVGamePreferred()
-            } else if (isDownloading || isPendingToInstall) {
-                entityFromDownloadManager?.isVGameDownloadInDualDownloadMode() == true
-            } else if (isInstalledLocally && isInstalledToVSpace) {
-                gameEntity.isVGamePreferred()
-            } else if (isInstalledLocally) {
-                false
-            } else if (isInstalledToVSpace) {
-                true
-            } else {
-                gameEntity.isVGamePreferred()
-            }
-
-            val downloadEntity: DownloadEntity? = if (isDownloading) {
-                entityFromDownloadManager
-            } else if (isPendingToInstall) {
-                entityFromDownloadManager
-            } else {
-                if (isVGamePreferred) {
-                    entityFromInstalledVGame ?: entityFromDownloadManager
-                } else {
-                    entityFromDownloadManager
-                }
+            // 找不到时，若类型为畅玩，尝试从畅玩数据库的快照中获取 downloadEntity。若存在，代表游戏已下载并成功安装
+            if (downloadEntity == null && gameEntity.isVGame()) {
+                downloadEntity = VHelper.getVDownloadEntitySnapshot(gameEntity.id, gameEntity.getUniquePackageName())
            }

            if (downloadEntity != null) {
@ -351,12 +300,11 @@ object DownloadItemUtils {
                        DownloadStatus.done -> {
                            if (downloadEntity.isSimulatorGame() && gameEntity.simulator != null) {
                                GameUtils.setDownloadBtnStatus(context, gameEntity, downloadBtn, pluginLocation)
-                            } else if (isVGamePreferred) {
+                            } else if (downloadEntity.isVGame()) {
                                buttonStyle =
                                    if (PackagesManager.isCanUpdate(
                                            downloadEntity.gameId,
-                                            downloadEntity.packageName,
-                                            asVGame = true
+                                            downloadEntity.packageName
                                        )
                                    ) {
                                        setText(R.string.update)
@ -385,19 +333,8 @@ object DownloadItemUtils {
                                    return
                                }

-                                if (PackagesManager.isInstalled(downloadEntity.packageName) && !downloadEntity.isUpdate) {
-                                    // 双下载按钮快速安装时存在已下载的安装包过时，需要重新下载的情况
-                                    if (PackagesManager.isCanUpdate(downloadEntity.gameId, downloadEntity.packageName)) {
-                                        buttonStyle = DownloadButton.ButtonStyle.NORMAL
-                                        setText(R.string.update)
-                                    } else {
-                                        buttonStyle = DownloadButton.ButtonStyle.LAUNCH_OR_OPEN
-                                        setText(R.string.launch)
-                                    }
-                                } else {
-                                    buttonStyle = DownloadButton.ButtonStyle.INSTALL_NORMAL
-                                    setText(R.string.install)
-                                }
+                                buttonStyle = DownloadButton.ButtonStyle.INSTALL_NORMAL
+                                setText(R.string.install)
                            }
                            buttonStyle =
                                if (downloadEntity.isPluggable && PackagesManager.isInstalled(downloadEntity.packageName)) {
@ -624,10 +561,9 @@ object DownloadItemUtils {
        position: Int,
        adapter: RecyclerView.Adapter<out RecyclerView.ViewHolder?>?,
        entrance: String,
-        location: String,
-        sourceEntrance: String = "其他"
+        location: String
    ) {
-        setOnClickListener(context, downloadBtn, gameEntity, position, adapter, entrance, sourceEntrance, location, null)
+        setOnClickListener(context, downloadBtn, gameEntity, position, adapter, entrance, location, null)
    }

    @JvmStatic
@ -638,11 +574,10 @@ object DownloadItemUtils {
        position: Int,
        adapter: RecyclerView.Adapter<out RecyclerView.ViewHolder?>?,
        entrance: String,
-        sourceEntrance: String = "其他",
        location: String,
-        traceEvent: ExposureEvent?,
+        traceEvent: ExposureEvent?
    ) {
-        setOnClickListener(context, downloadBtn, gameEntity, position, adapter, entrance, sourceEntrance, location, traceEvent, null)
+        setOnClickListener(context, downloadBtn, gameEntity, position, adapter, entrance, location, traceEvent, null)
    }

    /**
@ -656,10 +591,9 @@ object DownloadItemUtils {
        position: Int,
        adapter: RecyclerView.Adapter<out RecyclerView.ViewHolder?>?,
        entrance: String,
-        sourceEntrance: String = "其他",
        location: String,
        traceEvent: ExposureEvent?,
-        clickCallback: EmptyCallback?,
+        clickCallback: EmptyCallback?
    ) {
        setOnClickListener(
            context,
@ -668,7 +602,6 @@ object DownloadItemUtils {
            position,
            adapter,
            entrance,
-            sourceEntrance,
            location,
            traceEvent,
            clickCallback,
@ -688,7 +621,6 @@ object DownloadItemUtils {
        position: Int,
        adapter: RecyclerView.Adapter<out RecyclerView.ViewHolder?>?,
        entrance: String,
-        sourceEntrance: String = "其他",
        location: String,
        traceEvent: ExposureEvent?,
        clickCallback: EmptyCallback?,
@ -783,19 +715,15 @@ object DownloadItemUtils {
                        "game_name",
                        gameEntity.name ?: "",
                        "game_id",
-                        gameEntity.id,
-                        "game_type",
-                        gameEntity.categoryChinese,
-                        "source_entrance",
-                        sourceEntrance
+                        gameEntity.id
                    )
                    allStateClickCallback?.onCallback()
                    CheckLoginUtils.checkLogin(context, entrance) {
                        clickCallback?.onCallback()
                        ReservationHelper.reserve(
                            context,
-                            gameEntity,
-                            sourceEntrance
+                            gameEntity.id,
+                            gameEntity.name ?: ""
                        ) {
                            LogUtils.logReservation(gameEntity, traceEvent)
                            adapter?.notifyItemChanged(position)
@ -899,7 +827,6 @@ object DownloadItemUtils {
                        gameEntity.id,
                        gameEntity.name ?: "",
                        gameEntity.categoryChinese,
-                        gameEntity.getApk().firstOrNull()?.format,
                        clickRunnable
                    )
                }
@ -909,21 +836,17 @@ object DownloadItemUtils {
                allStateClickCallback?.onCallback()
                clickCallback?.onCallback()

-                DownloadChainBuilder().apply {
+                ChainBuilder().apply {
                    addHandler(GamePermissionHandler())
                    addHandler(CheckStoragePermissionHandler())
                    addHandler(CertificationHandler())
                    addHandler(VersionNumberHandler())
                }
-                    .setProcessEndCallback { _, _ ->
+                    .setProcessEndCallback {
                        DownloadDialog.showDownloadDialog(view.context, gameEntity, traceEvent, entrance, location)
                    }
                    .buildHandlerChain()
-                    ?.handleRequest(
-                        context,
-                        gameEntity,
-                        GameUtils.shouldPerformAsVGame(gameEntity)
-                    )
+                    ?.handleRequest(context, gameEntity)
            }
        }
    }
@ -943,11 +866,8 @@ object DownloadItemUtils {
        val str = if (downloadBtn is DownloadButton) downloadBtn.text else context.getString(R.string.download)
        if (gameEntity.getApk().isEmpty()) return
        val apk = gameEntity.getApk().safelyGetInRelease(0) ?: return
-
-        val shouldPerformAsVGame = GameUtils.shouldPerformAsVGame(gameEntity)
-
        if (str == context.getString(R.string.download)) {
-            DownloadChainBuilder().apply {
+            ChainBuilder().apply {
                addHandler(UnsupportedFeatureHandler())
                addHandler(UpdateNewSimulatorHandler())
                addHandler(GamePermissionHandler())
@ -959,14 +879,14 @@ object DownloadItemUtils {
                addHandler(LandPageAddressHandler())
                addHandler(CheckDownloadHandler())
            }
-                .setProcessEndCallback { asVGame, isSubscribe ->
-                    download(context, gameEntity, downloadBtn, entrance, location, asVGame, isSubscribe as Boolean, traceEvent)
+                .setProcessEndCallback {
+                    download(context, gameEntity, downloadBtn, entrance, location, it as Boolean, traceEvent)
                }
                .buildHandlerChain()
-                ?.handleRequest(context, gameEntity, shouldPerformAsVGame)
+                ?.handleRequest(context, gameEntity)
            DataLogUtils.uploadGameLog(context, gameEntity.id, gameEntity.name, entrance)
        } else if (str == context.getString(R.string.attempt)) {
-            DownloadChainBuilder().apply {
+            ChainBuilder().apply {
                addHandler(UnsupportedFeatureHandler())
                addHandler(UpdateNewSimulatorHandler())
                addHandler(GamePermissionHandler())
@ -979,14 +899,14 @@ object DownloadItemUtils {
                addHandler(OverseaDownloadHandler())
                addHandler(CheckDownloadHandler())
            }
-                .setProcessEndCallback { asVGame, isSubscribe ->
-                    download(context, gameEntity, downloadBtn, entrance, location, asVGame, isSubscribe as Boolean, traceEvent)
+                .setProcessEndCallback {
+                    download(context, gameEntity, downloadBtn, entrance, location, it as Boolean, traceEvent)
                }
                .buildHandlerChain()
-                ?.handleRequest(context, gameEntity, shouldPerformAsVGame)
+                ?.handleRequest(context, gameEntity)
            DataLogUtils.uploadGameLog(context, gameEntity.id, gameEntity.name, entrance)
        } else if (str == context.getString(R.string.smooth)) {
-            DownloadChainBuilder().apply {
+            ChainBuilder().apply {
                addHandler(UnsupportedFeatureHandler())
                addHandler(GamePermissionHandler())
                addHandler(PackageCheckHandler())
@ -999,25 +919,25 @@ object DownloadItemUtils {
                addHandler(ValidateVSpaceHandler())
                addHandler(CheckDownloadHandler())
            }
-                .setProcessEndCallback { asVGame, isSubscribe ->
-                    download(context, gameEntity, downloadBtn, entrance, location, asVGame, isSubscribe as Boolean, traceEvent)
+                .setProcessEndCallback {
+                    download(context, gameEntity, downloadBtn, entrance, location, it as Boolean, traceEvent)
                }
                .buildHandlerChain()
-                ?.handleRequest(context, gameEntity, shouldPerformAsVGame)
+                ?.handleRequest(context, gameEntity)
        } else if (str.contains("化")) {
            if (gameEntity.pluggableCollection != null) {
                DownloadDialog.showDownloadDialog(context, gameEntity, traceEvent, entrance, location)
            } else {
-                DownloadChainBuilder().apply {
+                ChainBuilder().apply {
                    addHandler(DownloadDialogHelperHandler())
                    addHandler(CertificationHandler())
                    addHandler(CheckDownloadHandler())
                }
-                    .setProcessEndCallback { _, isSubscribe ->
-                        plugin(context, gameEntity, downloadBtn, entrance, location, isSubscribe as Boolean, traceEvent)
+                    .setProcessEndCallback {
+                        plugin(context, gameEntity, downloadBtn, entrance, location, it as Boolean, traceEvent)
                    }
                    .buildHandlerChain()
-                    ?.handleRequest(context, gameEntity, shouldPerformAsVGame)
+                    ?.handleRequest(context, gameEntity)
            }
        } else if (str == context.getString(R.string.install)) {
            val downloadEntity = SimulatorGameManager.findDownloadEntityByUrl(apk.url)
@ -1058,7 +978,11 @@ object DownloadItemUtils {
                }
            }

-            install(context, gameEntity, position, adapter, refreshCallback)
+            if (gameEntity.isVGame()) {
+                VHelper.installOrLaunch((context as AppCompatActivity), gameEntity)
+            } else {
+                install(context, gameEntity, position, adapter, refreshCallback)
+            }
        } else if (str == context.getString(R.string.launch)) {
            //启动模拟器游戏
            if (SimulatorGameManager.isSimulatorGame(gameEntity)) {
@ -1070,16 +994,7 @@ object DownloadItemUtils {
                if (downloadEntity != null) {
                    val file = File(downloadEntity.path)
                    if (!file.exists()) {
-                        download(
-                            context = context,
-                            gameEntity = gameEntity,
-                            downloadBtn = downloadBtn,
-                            entrance = entrance,
-                            location = location,
-                            asVGame = false,
-                            isSubscribe = false,
-                            traceEvent = traceEvent
-                        )
+                        download(context, gameEntity, downloadBtn, entrance, location, false, traceEvent)
                        return
                    }
                    NewFlatLogUtils.logSimulatorGameCardClick("启动")
@ -1088,17 +1003,21 @@ object DownloadItemUtils {
                return
            }

-            PackageLauncher.launch(context, gameEntity)
+            if (gameEntity.isVGame()) {
+                VHelper.installOrLaunch((context as AppCompatActivity), gameEntity)
+                return
+            }
+            PackageLauncher.launchApp(context, gameEntity, gameEntity.getApk()[0].packageName)
        } else if (str == context.getString(R.string.update)) {
-            if (shouldPerformAsVGame) {
+            if (gameEntity.isVGame()) {
                VHelper.updateOrReDownload(gameEntity)
                return
            }

-            DownloadChainBuilder()
+            ChainBuilder()
                .apply {
                    addHandler(LandPageAddressHandler())
-                }.setProcessEndCallback { asVGame, _ ->
+                }.setProcessEndCallback {
                    DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk) {
                        DialogUtils.checkDownload(
                            context,
@ -1107,16 +1026,21 @@ object DownloadItemUtils {
                            gameEntity.name,
                            gameEntity.categoryChinese
                        ) { isSubscribe: Boolean ->
-                            update(context, gameEntity, entrance, location, asVGame, isSubscribe, traceEvent)
+                            update(context, gameEntity, entrance, location, isSubscribe, traceEvent)
                        }
                    }
                }
                .buildHandlerChain()
-                ?.handleRequest(context, gameEntity, false)
+                ?.handleRequest(context, gameEntity)
        } else {
            var downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity)

-            // 尝试从 gameEntity 里找已绑定的 downloadEntity
+            // 找不到时，若类型为畅玩，尝试从畅玩数据库的快照中获取 downloadEntity。若存在，代表游戏已下载并成功安装
+            if (downloadEntity == null && gameEntity.isVGame()) {
+                downloadEntity = VHelper.getVDownloadEntitySnapshot(gameEntity.id, gameEntity.getUniquePackageName())
+            }
+
+            // 还是找不到时，尝试从 gameEntity 里找已绑定的 downloadEntity
            if (downloadEntity == null) {
                downloadEntity = gameEntity.getEntryMap().getOrDefault(gameEntity.getUniquePlatform(), null)
            }
@ -1132,7 +1056,7 @@ object DownloadItemUtils {
                }
                when (str) {
                    context.getString(R.string.resume) -> {
-                        DownloadManager.getInstance().resume(downloadEntity, false)
+                        DownloadManager.getInstance().resume(downloadEntity, true)
                    }

                    context.getString(R.string.waiting) -> {
@ -1154,7 +1078,6 @@ object DownloadItemUtils {
        downloadBtn: View?,
        entrance: String,
        location: String,
-        asVGame: Boolean,
        isSubscribe: Boolean,
        traceEvent: ExposureEvent?
    ) {
@ -1165,7 +1088,7 @@ object DownloadItemUtils {
            DownloadManager.createDownload(
                context,
                gameEntity,
-                asVGame,
+                context.getString(R.string.download),
                entrance,
                location,
                isSubscribe,
@ -1200,7 +1123,7 @@ object DownloadItemUtils {
    ) {
        val msg = FileUtils.isCanDownload(context, gameEntity.getApk()[0].size ?: "")
        if (TextUtils.isEmpty(msg)) {
-            DownloadManager.createDownload(context, gameEntity, false, entrance, location, isSubscribe, traceEvent)
+            DownloadManager.createDownload(context, gameEntity, "插件化", entrance, location, isSubscribe, traceEvent)
            ToastUtils.toast(gameEntity.name + "已加入下载队列")
            if (BrowserInstallHelper.shouldAutoSwitchAssistantInstall(gameEntity)) {
                val toast = context.getString(R.string.unsupported_browser_install_hint)
@ -1264,19 +1187,9 @@ object DownloadItemUtils {
        gameEntity: GameEntity,
        entrance: String,
        location: String,
-        asVGame: Boolean,
        isSubscribe: Boolean,
        traceEvent: ExposureEvent?
    ) {
-
-        // 执行更新操作前，先清理历史下载任务，避免冲突
-        if (gameEntity.getApk().size == 1 && !asVGame) {
-            val downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity)
-            if (downloadEntity != null) {
-                DownloadManager.getInstance().cancel(downloadEntity.url)
-            }
-        }
-
-        DownloadManager.createDownload(context, gameEntity, asVGame, entrance, location, isSubscribe, traceEvent)
+        DownloadManager.createDownload(context, gameEntity, "更新", entrance, location, isSubscribe, traceEvent)
    }
 }
--- a/app/src/main/java/com/gh/common/util/DownloadNotificationHelper.kt
+++ b/app/src/main/java/com/gh/common/util/DownloadNotificationHelper.kt
@ -15,7 +15,7 @@ import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.utils.getMetaExtra
 import com.gh.gamecenter.common.utils.isSimulatorGame
-import com.gh.gamecenter.common.utils.asVGame
+import com.gh.gamecenter.common.utils.isVGame
 import com.gh.gamecenter.common.utils.tryCatchInRelease
 import com.gh.gamecenter.core.AppExecutor
 import com.gh.gamecenter.core.utils.SpeedUtils
@ -57,65 +57,65 @@ object DownloadNotificationHelper {
            intent.putExtra(EntranceConsts.KEY_URL, entity.url)
            intent.putExtra(EntranceConsts.KEY_PATH, entity.path)
            intent.action = ACTION_INSTALL
-        } else if (entity.asVGame()) {
+        } else if (entity.isVGame()) {
            intent.action = ACTION_VDOWNLOAD
        } else {
            intent.action = ACTION_DOWNLOAD
        }
-        tryCatchInRelease {
-            val pendingIntent = PendingIntent.getBroadcast(
-                HaloApp.getInstance().application,
-                downloadNotificationId,
-                intent,
-                PendingIntent.FLAG_UPDATE_CURRENT
-            )
+        val pendingIntent = PendingIntent.getBroadcast(
+            HaloApp.getInstance().application,
+            downloadNotificationId,
+            intent,
+            PendingIntent.FLAG_UPDATE_CURRENT
+        )

-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                val channel =
-                    NotificationChannel(DOWNLOAD_CHANNEL_ID, DOWNLOAD_CHANNEL_ID, NotificationManager.IMPORTANCE_LOW)
-                notificationManager.createNotificationChannel(channel)
-            }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val channel =
+                NotificationChannel(DOWNLOAD_CHANNEL_ID, DOWNLOAD_CHANNEL_ID, NotificationManager.IMPORTANCE_LOW)
+            notificationManager.createNotificationChannel(channel)
+        }

-            val whenTime = 1000 * 60 * (System.currentTimeMillis() / 1000 / 60)
-            val builder = NotificationCompat.Builder(HaloApp.getInstance().application, DOWNLOAD_CHANNEL_ID)
-                .setContentTitle(entity.name)
-                .setSmallIcon(getNotificationIcon())
-                .setContentIntent(pendingIntent)
-                .setGroup(DOWNLOAD_GROUP_KEY)
-                .setWhen(whenTime)
-
-            if (xapkStatus == XapkUnzipStatus.FAILURE.name) {
-                builder.setContentText("《" + entity.name + "》解压失败，点击查看详情~")
-            } else {
-                when (entity.status) {
-                    DownloadStatus.downloading -> builder.setContentText(
-                        String.format(
-                            "%s(剩%s)",
-                            SpeedUtils.getSpeed(entity.speed),
-                            SpeedUtils.getRemainTime(entity.size, entity.progress, entity.speed * 1024)
-                        )
-                    )
-                    DownloadStatus.done -> builder.setContentText("下载完成，点击立即安装")
-                    DownloadStatus.waiting -> builder.setContentText("等待中")
-                    DownloadStatus.subscribe,
-                    DownloadStatus.timeout,
-                    DownloadStatus.diskisfull,
-                    DownloadStatus.diskioerror,
-                    DownloadStatus.neterror -> builder.setContentText("已暂停，连接WiFi自动下载")
-                    else -> builder.setContentText("暂停中")
-                }
-                builder.setProgress(PROGRESS_MAX, entity.percent.toInt(), false)
-            }
+        val whenTime = 1000 * 60 * (System.currentTimeMillis() / 1000 / 60)
+        val builder = NotificationCompat.Builder(HaloApp.getInstance().application, DOWNLOAD_CHANNEL_ID)
+            .setContentTitle(entity.name)
+            .setSmallIcon(getNotificationIcon())
+            .setContentIntent(pendingIntent)
+            .setGroup(DOWNLOAD_GROUP_KEY)
+            .setWhen(whenTime)

+        if (xapkStatus == XapkUnzipStatus.FAILURE.name) {
+            builder.setContentText("《" + entity.name + "》解压失败，点击查看详情~")
+        } else {
            when (entity.status) {
-                DownloadStatus.done -> {
-                    builder.setSortKey("A")
-                    builder.setOngoing(true) // 垃圾华为 sortKey 不起效 priority 也不起效，要将下载完成任务的通知置顶只能设置为 ongoing，喷了
-                }
-                DownloadStatus.downloading -> builder.setSortKey("B")
-                else -> builder.setSortKey("C")
+                DownloadStatus.downloading -> builder.setContentText(
+                    String.format(
+                        "%s(剩%s)",
+                        SpeedUtils.getSpeed(entity.speed),
+                        SpeedUtils.getRemainTime(entity.size, entity.progress, entity.speed * 1024)
+                    )
+                )
+                DownloadStatus.done -> builder.setContentText("下载完成，点击立即安装")
+                DownloadStatus.waiting -> builder.setContentText("等待中")
+                DownloadStatus.subscribe,
+                DownloadStatus.timeout,
+                DownloadStatus.diskisfull,
+                DownloadStatus.diskioerror,
+                DownloadStatus.neterror -> builder.setContentText("已暂停，连接WiFi自动下载")
+                else -> builder.setContentText("暂停中")
            }
+            builder.setProgress(PROGRESS_MAX, entity.percent.toInt(), false)
+        }

+        when (entity.status) {
+            DownloadStatus.done -> {
+                builder.setSortKey("A")
+                builder.setOngoing(true) // 垃圾华为 sortKey 不起效 priority 也不起效，要将下载完成任务的通知置顶只能设置为 ongoing，喷了
+            }
+            DownloadStatus.downloading -> builder.setSortKey("B")
+            else -> builder.setSortKey("C")
+        }
+
+        tryCatchInRelease {
            val notification = builder.build() // 可能会抛出异常
            notification.flags = notification.flags or Notification.FLAG_NO_CLEAR
            if (xapkStatus == XapkUnzipStatus.FAILURE.name) {
--- a/app/src/main/java/com/gh/common/util/DownloadObserver.kt
+++ b/app/src/main/java/com/gh/common/util/DownloadObserver.kt
@ -8,7 +8,6 @@ import com.gh.common.xapk.XapkInstaller
 import com.gh.download.DownloadDataHelper
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.R
-import com.gh.gamecenter.ShellActivity
 import com.gh.gamecenter.common.base.GlobalActivityManager.getCurrentPageEntity
 import com.gh.gamecenter.common.base.GlobalActivityManager.getLastPageEntity
 import com.gh.gamecenter.common.base.activity.BaseActivity
@ -18,11 +17,12 @@ import com.gh.gamecenter.common.entity.SimpleGameEntity
 import com.gh.gamecenter.common.entity.SuggestType
 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.common.utils.NewFlatLogUtils
+import com.gh.gamecenter.core.utils.*
 import com.gh.gamecenter.eventbus.EBDownloadStatus
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.entity.SimulatorEntity
@ -172,33 +172,6 @@ object DownloadObserver {
                        ToastUtils.toast("该游戏未接入防沉迷系统，暂不支持下载")
                    }

-                    // 删除任务
-                    downloadEntity.status = DownloadStatus.cancel
-                    downloadManager.cancel(downloadEntity.url)
-                } else if (DownloadStatus.isCertificating == downloadEntity.status) {
-                    // 未接入防沉迷系统
-                    val currentActivity = AppManager.getInstance().currentActivity()
-
-                    if (currentActivity != null) {
-                        DialogHelper.showDialog(
-                            context = currentActivity,
-                            title = "实名提示",
-                            content = "您当前的身份信息正在认证中，根据相关政策要求，该游戏需通过认证后才能进行下载",
-                            cancelText = "知道了",
-                            confirmText = "查看实名认证",
-                            cancelClickCallback = null,
-                            confirmClickCallback = {
-                                currentActivity.startActivity(
-                                    ShellActivity.getIntent(
-                                    currentActivity,
-                                    ShellActivity.Type.REAL_NAME_INFO,
-                                ))
-                            }
-                        )
-                    } else {
-                        ToastUtils.toast("您当前的身份信息正在认证中，根据相关政策要求，该游戏需通过认证后才能进行下载")
-                    }
-
                    // 删除任务
                    downloadEntity.status = DownloadStatus.cancel
                    downloadManager.cancel(downloadEntity.url)
@ -301,13 +274,13 @@ object DownloadObserver {
                    )

                    else -> {
-                        if (!downloadEntity.asVGame()) {
+                        if (!downloadEntity.isVGame()) {
                            Utils.toast(mApplication, downloadEntity.name + " - 下载完成")
                        }
                    }
                }
            } else {
-                if (!downloadEntity.asVGame()) {
+                if (!downloadEntity.isVGame()) {
                    Utils.toast(mApplication, downloadEntity.name + " - 下载完成")
                }
            }
@ -342,9 +315,11 @@ object DownloadObserver {
                            Utils.toast(mApplication, R.string.install_failure_hint)
                            downloadManager.cancel(downloadEntity.url)
                        } else {
-                            if (PackageUtils.isCanLaunchSetup(mApplication, downloadEntity.path)
-                                || downloadType == Constants.VGAME
-                                || downloadType == Constants.DUAL_DOWNLOAD_VGAME) {
+                            if (PackageUtils.isCanLaunchSetup(
+                                    mApplication,
+                                    downloadEntity.path
+                                ) || downloadType == Constants.SMOOTH_GAME
+                            ) {
                                downloadEntity.meta[Constants.MARK_ALREADY_TRIGGERED_INSTALLATION] = "YES"
                                tryWithDefaultCatch {
                                    NewFlatLogUtils.logGameInstall(
@ -358,7 +333,7 @@ object DownloadObserver {
                                        gameName = downloadEntity.name,
                                        action = "自动安装"
                                    )
-                                    PackageInstaller.install(mApplication, downloadEntity, false, ignoreAsVGame = false)
+                                    PackageInstaller.install(mApplication, downloadEntity, false)
                                }
                            } else {
                                // 弹出卸载提示框
@ -426,7 +401,7 @@ object DownloadObserver {
    private fun statDoneEvent(downloadEntity: DownloadEntity) {
        var type: ExposureUtils.DownloadType
        if (downloadEntity.isUpdate) {
-            if (downloadEntity.asVGame()) {
+            if (downloadEntity.isVGame()) {
                type = ExposureUtils.DownloadType.FUN_UPDATE
            } else {
                type = ExposureUtils.DownloadType.UPDATE
@ -435,7 +410,7 @@ object DownloadObserver {
                }
            }
        } else {
-            type = if (downloadEntity.asVGame()) {
+            type = if (downloadEntity.isVGame()) {
                ExposureUtils.DownloadType.FUN_DOWNLOAD
            } else {
                ExposureUtils.DownloadType.DOWNLOAD
@ -475,13 +450,12 @@ object DownloadObserver {
            type
        )

-        if (downloadEntity.asVGame()) {
+        if (downloadEntity.isVGame()) {
            SensorsBridge.trackEventWithExposureSource(
                "HaloFunGameDownloadDone",
                exposureEvent?.source,
                "game_name", downloadEntity.name,
                "game_id", downloadEntity.gameId,
-                "game_type", downloadEntity.categoryChinese,
                "game_schema_type", if (downloadEntity.getMetaExtra(VHelper.KEY_BIT) == "32") "32位" else "64位"
            )
        } else if (downloadEntity.gameId == Constants.HALO_FUN_GAME_ID) {
@ -490,34 +464,24 @@ object DownloadObserver {
                "space_schema_type",
                if (downloadEntity.packageName == VHelper.VSPACE_32BIT_PACKAGENAME) "32位" else "64位"
            )
-        } else if(downloadEntity.gameId == Constants.HALO_FUN_NEW_32_GAME_ID) {
-            SensorsBridge.trackEvent(
-                "HaloFunDownloadDone",
-                "space_schema_type",
-                "32位(新)"
-            )
        }

        if (downloadEntity.gameId != Constants.GHZS_GAME_ID
            && downloadEntity.getMetaExtra(Constants.EXTRA_DOWNLOAD_TYPE) != Constants.SIMULATOR_DOWNLOAD
-            && downloadEntity.gameId != Constants.HALO_FUN_GAME_ID
-            && downloadEntity.gameId != Constants.HALO_FUN_NEW_32_GAME_ID) {
+            && downloadEntity.gameId != Constants.HALO_FUN_GAME_ID) {
                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(VHelper.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 "本地下载",
+                    "last_page_business_id", getLastPageEntity().pageBusinessId
                )
        }

--- a/app/src/main/java/com/gh/common/util/ErrorHelper.kt
+++ b/app/src/main/java/com/gh/common/util/ErrorHelper.kt
@ -13,14 +13,12 @@ import com.gh.gamecenter.VerifyPhoneActivity
 import com.gh.gamecenter.WebActivity
 import com.gh.gamecenter.common.avoidcallback.AvoidOnResultManager
 import com.gh.gamecenter.common.avoidcallback.Callback
-import com.gh.gamecenter.common.callback.CancelListener
 import com.gh.gamecenter.common.callback.ConfirmListener
 import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.entity.ErrorEntity
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.common.utils.SensorsBridge
-import com.gh.gamecenter.feature.entity.GameEntity
+import com.gh.gamecenter.login.user.LoginTag
 import com.halo.assistant.fragment.user.UserInfoEditFragment
 import com.halo.assistant.fragment.user.VerifyPhoneFragment
 import com.lightgame.utils.AppManager
@ -42,12 +40,8 @@ object ErrorHelper {
        context: Context,
        errorString: String?,
        showHighPriorityHint: Boolean = false,
-        sourceEntrance: String = "",
-        articleType: String = "",
-        verificationType: String = "内容实名",
-        gameEntity: GameEntity? = null,
        realNameConfirmListener: ConfirmListener? = null,
-        customizedHandler: (code: Int) -> Boolean,
+        customizedHandler: (code: Int) -> Boolean
    ) {
        val errorEntity = errorString?.toObject<ErrorEntity>()

@ -65,17 +59,7 @@ object ErrorHelper {
            return
        }

-        handleError(
-            context,
-            showHighPriorityHint,
-            errorEntity,
-            "",
-            sourceEntrance,
-            articleType,
-            verificationType,
-            gameEntity,
-            realNameConfirmListener,
-        )
+        handleError(context, showHighPriorityHint, errorEntity, realNameConfirmListener)
    }

    /**
@ -87,12 +71,8 @@ object ErrorHelper {
        context: Context,
        errorString: String?,
        showHighPriorityHint: Boolean = false,
-        entrance: String = "",
-        sourceEntrance: String = "",
-        articleType: String = "",
-        verificationType: String = "内容实名",
-        gameEntity: GameEntity? = null,
-        realNameConfirmListener: ConfirmListener? = null
+        realNameConfirmListener: ConfirmListener? = null,
+        entrance: String = ""
    ) {
        val errorEntity = errorString?.toObject<ErrorEntity>()

@ -106,17 +86,7 @@ object ErrorHelper {
            return
        }

-        handleError(
-            context,
-            showHighPriorityHint,
-            errorEntity,
-            entrance,
-            sourceEntrance,
-            articleType,
-            verificationType,
-            gameEntity,
-            realNameConfirmListener
-        )
+        handleError(context, showHighPriorityHint, errorEntity, realNameConfirmListener, entrance)
    }

    /***
@ -140,12 +110,8 @@ object ErrorHelper {
        context: Context,
        showHighPriorityHint: Boolean = false,
        errorEntity: ErrorEntity,
-        entrance: String = "",
-        sourceEntrance: String = "",
-        articleType: String = "",
-        verificationType: String = "内容实名",
-        gameEntity: GameEntity? = null,
        realNameConfirmListener: ConfirmListener? = null,
+        entrance: String = ""
    ) {
        when (errorEntity.code) {
            403050,
@ -166,7 +132,6 @@ object ErrorHelper {

            403057,
            403068 -> handleErrorWithCommentBannedDialog(context, errorEntity)
-
            403200,
            403201,
            403202 -> handleErrorWithGameCollectionBannedDialog(context, errorEntity)
@ -213,17 +178,9 @@ object ErrorHelper {
                // 多设备登录同一帐号，不需要这里处理
            }

-            403209 -> handleRealNameError(
-                context,
-                errorEntity,
-                sourceEntrance,
-                articleType,
-                verificationType,
-                gameEntity,
-                realNameConfirmListener,
-            )
+            403209 -> handleRealNameError(context, errorEntity, realNameConfirmListener)

-            403210 -> handleVerifyPhoneError(context, errorEntity, entrance, articleType, realNameConfirmListener)
+            403210 -> handleVerifyPhoneError(context, errorEntity, realNameConfirmListener, entrance)

            // 禁言（发布内容）
            403402 -> Utils.toast(context, "您的账号存在违规，不允许发布内容")
@ -251,21 +208,8 @@ object ErrorHelper {
    private fun handleRealNameError(
        context: Context,
        errorEntity: ErrorEntity,
-        sourceEntrance: String = "",
-        articleType: String = "",
-        verificationType: String = "内容实名",
-        gameEntity: GameEntity? = null,
-        realNameConfirmListener: ConfirmListener?,
+        realNameConfirmListener: ConfirmListener?
    ) {
-
-        SensorsBridge.trackVerificationDialogShow(
-            gameId = gameEntity?.id ?: "",
-            gameName = gameEntity?.name ?: "",
-            gameType = gameEntity?.categoryChinese ?:"",
-            articleType = articleType,
-            verificationType = verificationType
-        )
-
        DialogHelper.showDialog(
            context,
            "实名提醒",
@ -292,7 +236,7 @@ object ErrorHelper {
                        )
                    }
                binding.hintTv.text = errorEntity.data?.text
-                binding.hintTv.setTextColor(R.color.text_theme.toColor(context))
+                binding.hintTv.setTextColor(R.color.theme_font.toColor(context))
                binding.hintTv.setOnClickListener {
                    errorEntity.data?.toLinkEntity()?.let { entity ->
                        DirectUtils.directToLinkPage(context, entity, "实名提醒弹窗", "")
@ -300,25 +244,23 @@ object ErrorHelper {
                }
            },
            confirmClickCallback = {
-                SensorsBridge.trackVerificationPopupClick("前往实名认证")
                val currentActivity = AppManager.getInstance().currentActivity() ?: return@showDialog
-                val intent = ShellActivity.getIntent(context, ShellActivity.Type.REAL_NAME_INFO)
-                    .putExtra(EntranceConsts.KEY_SOURCE_ENTRANCE, sourceEntrance)
                AvoidOnResultManager.getInstance(currentActivity as AppCompatActivity)
-                    .startForResult(intent, object : Callback {
-                        override fun onActivityResult(resultCode: Int, data: Intent?) {
-                            if (resultCode == Activity.RESULT_OK && data != null) {
-                                val isAuthSuccess =
-                                    data.getBooleanExtra(UserInfoEditFragment.AUTH_SUCCESS, false)
-                                if (isAuthSuccess) {
-                                    realNameConfirmListener?.onConfirm()
+                    .startForResult(
+                        ShellActivity.getIntent(
+                            context,
+                            ShellActivity.Type.REAL_NAME_INFO,
+                        ), object : Callback {
+                            override fun onActivityResult(resultCode: Int, data: Intent?) {
+                                if (resultCode == Activity.RESULT_OK && data != null) {
+                                    val isAuthSuccess =
+                                        data.getBooleanExtra(UserInfoEditFragment.AUTH_SUCCESS, false)
+                                    if (isAuthSuccess) {
+                                        realNameConfirmListener?.onConfirm()
+                                    }
                                }
                            }
-                        }
-                    })
-            },
-            cancelClickCallback = {
-                SensorsBridge.trackVerificationPopupClick("以后再说")
+                        })
            }
        )
    }
@ -326,15 +268,9 @@ object ErrorHelper {
    private fun handleVerifyPhoneError(
        context: Context,
        errorEntity: ErrorEntity,
-        entrance: String,
-        articleType: String,
        realNameConfirmListener: ConfirmListener?,
+        entrance: String
    ) {
-
-        SensorsBridge.trackMobileNumberVerificationDialog(
-            articleType = articleType
-        )
-
        DialogHelper.showDialog(
            context,
            "手机号验证",
@ -361,7 +297,7 @@ object ErrorHelper {
                        )
                    }
                binding.hintTv.text = errorEntity.data?.text
-                binding.hintTv.setTextColor(R.color.text_theme.toColor(context))
+                binding.hintTv.setTextColor(R.color.theme_font.toColor(context))
                binding.hintTv.setOnClickListener {
                    errorEntity.data?.toLinkEntity()?.let { entity ->
                        DirectUtils.directToLinkPage(context, entity, "手机号验证", "")
@ -384,12 +320,10 @@ object ErrorHelper {
                                }
                            }
                        })
-                SensorsBridge.trackMobileNumberVerificationPopupClick(buttonName = "前往手机号验证")
                NewFlatLogUtils.logPhoneNumberVerifyDialogClick(entrance, "前往手机号验证")
                NewFlatLogUtils.logPhoneNumberVerifyDialogShow("手机号验证弹窗-前往验证")
            },
            cancelClickCallback = {
-                SensorsBridge.trackMobileNumberVerificationPopupClick(buttonName = "以后再说")
                NewFlatLogUtils.logPhoneNumberVerifyDialogClick(entrance, "以后再说")
            }
        )
--- a/app/src/main/java/com/gh/common/util/GameActivityDownloadHelper.kt
+++ b/app/src/main/java/com/gh/common/util/GameActivityDownloadHelper.kt
@ -28,6 +28,7 @@ import com.gh.gamecenter.common.view.dsbridge.CompletionHandler
 import com.gh.gamecenter.core.AppExecutor
 import com.gh.gamecenter.core.runOnUiThread
 import com.gh.gamecenter.core.utils.EmptyCallback
+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.feature.entity.ApkEntity
@ -163,10 +164,12 @@ object GameActivityDownloadHelper {
    ) {
        if (!ReservationRepository.thisGameHasBeenReserved(gameEntity.id)) {
            CheckLoginUtils.checkLogin(context, entrance) {
-                ReservationHelper.reserve(context, gameEntity) {
-                    LogUtils.logReservation(gameEntity, traceEvent)
-                    clear()
-                }
+                ReservationHelper.reserve(context, gameEntity.id, gameEntity.name ?: "", object : EmptyCallback {
+                    override fun onCallback() {
+                        LogUtils.logReservation(gameEntity, traceEvent)
+                        clear()
+                    }
+                })
            }
        } else {
            ToastUtils.toast("游戏已成功预约")
@ -201,16 +204,10 @@ object GameActivityDownloadHelper {
    ) {
        val apk = getApk(gameEntity, event, true) ?: return
        val downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity)
-        val str = GameUtils.getDownloadBtnText(
-            context = context,
-            gameEntity = gameEntity,
-            isFromList = true,
-            fixedAsVGame = false,
-            pluginLocation = PluginLocation.only_game
-        )
-        if (downloadEntity != null
-            && str != context.getString(R.string.install)
-            && str != context.getString(R.string.launch)
+        val str = GameUtils.getDownloadBtnText(context, gameEntity, PluginLocation.only_game)
+        if (downloadEntity != null &&
+            str != context.getString(R.string.install) &&
+            str != context.getString(R.string.launch)
        ) {
            ToastUtils.toast("${gameEntity.name}已加入下载队列")
            if (BrowserInstallHelper.shouldAutoSwitchAssistantInstall(gameEntity)) {
@ -264,7 +261,7 @@ object GameActivityDownloadHelper {
        GamePermissionDialogFragment.show((context as AppCompatActivity), gameEntity, gameEntity.info) {
            CertificationDialog.showCertificationDialog(context, gameEntity) {
                DialogUtils.checkDownload(context, apk.size, gameEntity.id, gameEntity.name, gameEntity.categoryChinese) { isSubscribe: Boolean ->
-                    download(context, gameEntity, apk, false, isSubscribe, entrance, location, traceEvent)
+                    download(context, gameEntity, apk, isSubscribe, entrance, location, traceEvent)
                }
            }
        }
@ -280,7 +277,7 @@ object GameActivityDownloadHelper {
        location: String,
        traceEvent: ExposureEvent
    ) {
-        VHelper.validateVSpaceBeforeAction(context,gameEntity.getUniquePackageName(), gameEntity) {
+        VHelper.validateVSpaceBeforeAction(context, gameEntity) {
            GamePermissionDialogFragment.show((context as AppCompatActivity), gameEntity, gameEntity.info) {
                CertificationDialog.showCertificationDialog(context, gameEntity) {
                    DialogUtils.checkDownload(
@ -290,7 +287,7 @@ object GameActivityDownloadHelper {
                        gameEntity.name,
                        gameEntity.categoryChinese
                    ) { isSubscribe: Boolean ->
-                        download(context, gameEntity, apk, true, isSubscribe, entrance, location, traceEvent)
+                        download(context, gameEntity, apk, isSubscribe, entrance, location, traceEvent)
                    }
                }
            }
@ -357,10 +354,12 @@ object GameActivityDownloadHelper {
            }
        }

-        if (downloadEntity?.isVGameDownloadInDualDownloadMode() == true) {
+        if (gameEntity.isVGame()) {
            VHelper.installOrLaunch((context as AppCompatActivity), gameEntity)
        } else {
-            downloadEntity?.run { install(context, gameEntity, apk, this) }
+            downloadEntity?.run {
+                install(context, gameEntity, apk, this)
+            }
        }
    }

@ -384,16 +383,7 @@ object GameActivityDownloadHelper {
            if (simulatorDownloadEntity != null) {
                val file = File(simulatorDownloadEntity.path)
                if (!file.exists()) {
-                    download(
-                        context = context,
-                        gameEntity = gameEntity,
-                        apk = apk,
-                        asVGame = false,
-                        isSubscribe = false,
-                        entrance = entrance,
-                        location = location,
-                        traceEvent = traceEvent
-                    )
+                    download(context, gameEntity, apk, false, entrance, location, traceEvent)
                    return
                }
                NewFlatLogUtils.logSimulatorGameCardClick("启动")
@ -402,7 +392,15 @@ object GameActivityDownloadHelper {
            return
        }

-        PackageLauncher.launch(context, gameEntity)
+        if (gameEntity.isVGame()) {
+            VHelper.installOrLaunch((context as AppCompatActivity), gameEntity)
+            return
+        }
+
+        if (entrance.contains("我的游戏")) {
+            MtaHelper.onEvent("我的游戏_启动", "启动", gameEntity.name)
+        }
+        PackageLauncher.launchApp(context, gameEntity, gameEntity.getApk()[0].packageName)
    }

    // 处理更新状态
@ -465,7 +463,6 @@ object GameActivityDownloadHelper {
        context: Context,
        gameEntity: GameEntity,
        apk: ApkEntity,
-        asVGame: Boolean,
        isSubscribe: Boolean,
        entrance: String,
        location: String,
@ -473,7 +470,11 @@ object GameActivityDownloadHelper {
    ) {
        val msg = FileUtils.isCanDownload(context, apk.size)
        if (TextUtils.isEmpty(msg)) {
-            DownloadManager.createDownload(context, apk, gameEntity, asVGame, gameEntity.isDualBtnModeEnabled(), entrance, location, isSubscribe, traceEvent)
+            DownloadManager.createDownload(
+                context, apk, gameEntity, context.getString(
+                    R.string.download
+                ), entrance, location, isSubscribe, traceEvent
+            )
            ToastUtils.toast("${gameEntity.name}已加入下载队列")
            if (BrowserInstallHelper.shouldAutoSwitchAssistantInstall(gameEntity)) {
                val toast = context.getString(R.string.unsupported_browser_install_hint)
@ -498,7 +499,7 @@ object GameActivityDownloadHelper {
    ) {
        val msg = FileUtils.isCanDownload(context, apk.size)
        if (TextUtils.isEmpty(msg)) {
-            DownloadManager.createDownload(context, apk, gameEntity, false, false, entrance, location, isSubscribe, traceEvent)
+            DownloadManager.createDownload(context, apk, gameEntity, "插件化", entrance, location, isSubscribe, traceEvent)
            ToastUtils.toast("${gameEntity.name}已加入下载队列")
            if (BrowserInstallHelper.shouldAutoSwitchAssistantInstall(gameEntity)) {
                val toast = context.getString(R.string.unsupported_browser_install_hint)
@ -553,7 +554,7 @@ object GameActivityDownloadHelper {
        isSubscribe: Boolean,
        traceEvent: ExposureEvent?
    ) {
-        DownloadManager.createDownload(context, apk, gameEntity, false, false, entrance, location, isSubscribe, traceEvent)
+        DownloadManager.createDownload(context, apk, gameEntity, "更新", entrance, location, isSubscribe, traceEvent)
        ToastUtils.toast("${gameEntity.name}已加入下载队列")
        if (BrowserInstallHelper.shouldAutoSwitchAssistantInstall(gameEntity)) {
            val toast = context.getString(R.string.unsupported_browser_install_hint)
--- a/app/src/main/java/com/gh/common/util/GameSubstituteRepositoryHelper.kt
+++ b/app/src/main/java/com/gh/common/util/GameSubstituteRepositoryHelper.kt
@ -1,12 +1,12 @@
 package com.gh.common.util

 import android.annotation.SuppressLint
-import android.content.Context
 import android.text.TextUtils
 import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.common.utils.doOnMainProcessOnly
 import com.gh.gamecenter.common.utils.toJson
 import com.gh.gamecenter.common.utils.toObject
+import com.gh.gamecenter.core.utils.MtaHelper
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.entity.SubjectEntity
 import com.gh.gamecenter.login.user.UserManager
@ -18,19 +18,17 @@ import com.lightgame.utils.Utils
 import io.reactivex.schedulers.Schedulers

 /**
- * 补充游戏库管理类
+ * 首页补充游戏库辅助类
 */
 object GameSubstituteRepositoryHelper {

-    private const val SP_GAME_SUB = "sp_game_sub"
    private const val KEY_GAME_REPOSITORY = "game_substitute_repository"

+    private var mSubstitutableGameIdSet = hashSetOf<String>()
    private var mApi = RetrofitManager.getInstance().api
-    private var mHistoricInstalledGameIdSet = hashSetOf<String>() // 历史已安装过的游戏 ID 列表
    private var mApplicationContext = HaloApp.getInstance().application
-    private val mGameSubSp by lazy { mApplicationContext.getSharedPreferences(SP_GAME_SUB, Context.MODE_PRIVATE) }

-    private var mGameCollectionList: List<SubjectEntity> = arrayListOf() // 游戏补充库
+    var gameCollectionList: List<SubjectEntity> = arrayListOf()

    init {
        loadSavedRepository()
@ -52,13 +50,9 @@ object GameSubstituteRepositoryHelper {
            })
    }

-    /**
-     * 联网获取历史已安装过的游戏 ID 列表
-     * 包括根据用户 ID 获取的已玩游戏 ID 列表，以及根据 gid 获取的已下载游戏 ID 列表
-     */
    @JvmStatic
    @SuppressLint("CheckResult")
-    fun updateHistoricInstalledGameSet() {
+    fun updateSubstitutableGames() {
        mApplicationContext.doOnMainProcessOnly {
            val single = if (UserManager.getInstance().isLoggedIn) {
                mApi.getIdListOfPlayedGames(UserManager.getInstance().userId, Utils.getTime(mApplicationContext))
@ -67,22 +61,28 @@ object GameSubstituteRepositoryHelper {
            }
            single.subscribeOn(Schedulers.io()).subscribe(object : BiResponse<List<String>>() {
                override fun onSuccess(data: List<String>) {
-                    mHistoricInstalledGameIdSet = data.toHashSet()
+                    mSubstitutableGameIdSet = data.toHashSet()
                }
            })
        }
    }

+    /**
+     * 刷新内存中的游戏库（即从 SP 中再读一次）
+     */
+    @JvmStatic
+    fun refreshRepositoryFromLocal() = loadSavedRepository()
+
    private fun loadSavedRepository() {
-        mGameCollectionList = SPUtils.getString(mGameSubSp, KEY_GAME_REPOSITORY).toObject() ?: arrayListOf()
+        gameCollectionList = SPUtils.getString(KEY_GAME_REPOSITORY).toObject() ?: arrayListOf()
    }

    private fun updateGameRepository(subjects: List<SubjectEntity>?) {
        if (subjects == null) return

-        SPUtils.setString(mGameSubSp, KEY_GAME_REPOSITORY, subjects.toJson())
+        SPUtils.setString(KEY_GAME_REPOSITORY, subjects.toJson())

-        mGameCollectionList = subjects
+        gameCollectionList = subjects
    }

    /**
@ -90,12 +90,19 @@ object GameSubstituteRepositoryHelper {
     * @param collectionId 补充游戏库相应专题 ID
     * @param gameIdList 该专题里已经包含的游戏 ID 列表
     */
-    private fun getValidGame(collectionId: String?, gameIdList: HashSet<String>): GameEntity? {
+    private fun getOneUniqueGame(collectionId: String?, gameIdList: HashSet<String>): GameEntity? {
        collectionId?.let {
-            val collection = mGameCollectionList.find { it.id == collectionId }
+            val collection = gameCollectionList.find { it.id == collectionId }
            collection?.let {
-                val game = collection.data?.find { game -> isThisGameValid(game, gameIdList) }
+                val game = collection.data?.find { game -> isThisGameUnique(game, gameIdList) }
                game?.let {
+                    collection.data?.remove(game)
+//                    collection.data?.size?.let { remainingSize ->
+//                        // 记录被替换游戏的数量，10个以上的时候触发
+//                        if (remainingSize % 10 == 0) {
+//                            SentryHelper.onEvent("game_substitute", "substituted_size", "${50 - remainingSize}")
+//                        }
+//                    }
                    // 产品说要记录补充专题的曝光数，所以这个游戏附带了所在专题的名字
                    game.subjectName = collection.name
                    game.subjectId = collection.id
@ -108,17 +115,14 @@ object GameSubstituteRepositoryHelper {

    /**
     * 替换游戏，包括 已安装，历史下载，历史已安装等类型
-     * @param gameList 需要被替换数据的游戏列表
-     * @param displayingGameIdSet 页面正在显示的游戏 ID 列表，避免重复替换
-     * @param relatedCollectionId 关联的替换合集 ID
     */
    fun replaceGames(
        gameList: MutableList<GameEntity>,
-        displayingGameIdSet: HashSet<String>,
+        alreadyDisplayedGameIdSet: HashSet<String>,
        relatedCollectionId: String,
+        shouldLogReplaceEvent: Boolean
    ) {
-        // 需要被替换的游戏 position 列表
-        val positionOfGameToBeReplacedList = arrayListOf<Int>()
+        val positionOfTheGameToReplaceList = arrayListOf<Int>()

        // 标记需要替换的已安装游戏
        for ((index, game) in gameList.withIndex()) {
@ -128,29 +132,28 @@ object GameSubstituteRepositoryHelper {
                continue
            }

-            // 这个 position 的游戏是否需要被替换
-            var thisPositionNeedToBeReplaced = false
+            var isThisPositionLabeled = false

            // 从 游戏ID 判断当前游戏是否需要被替换
-            if (mHistoricInstalledGameIdSet.contains(game.id)) {
-                positionOfGameToBeReplacedList.add(index)
-                thisPositionNeedToBeReplaced = true
+            if (mSubstitutableGameIdSet.contains(game.id)) {
+                positionOfTheGameToReplaceList.add(index)
+                isThisPositionLabeled = true
            }

            // 检查是否已安装该游戏里同包名的 APK
-            if (!thisPositionNeedToBeReplaced) {
+            if (!isThisPositionLabeled) {
                for (apk in game.getApk()) {
                    if (PackageHelper.validLocalPackageNameSet.contains(apk.packageName)) {
                        // 将该位置的游戏标记为需要替换
-                        positionOfGameToBeReplacedList.add(index)
-                        thisPositionNeedToBeReplaced = true
+                        positionOfTheGameToReplaceList.add(index)
+                        isThisPositionLabeled = true
                        break
                    }
                }
            }

            // 若此游戏所包含的 apk 没有已安装，那么再检查是否已安装有预设相关包名
-            if (!thisPositionNeedToBeReplaced) {
+            if (!isThisPositionLabeled) {
                var relatedPackageList = arrayListOf<String>()
                for (entity in PackageHelper.relatedPackageList) {
                    if (entity.gameId == game.id) {
@ -161,45 +164,39 @@ object GameSubstituteRepositoryHelper {

                for (packageName in relatedPackageList) {
                    if (PackageHelper.validLocalPackageNameSet.contains(packageName)) {
-                        positionOfGameToBeReplacedList.add(index)
+                        positionOfTheGameToReplaceList.add(index)
                        break
                    }
                }
            }
        }

-        if (positionOfGameToBeReplacedList.isNotEmpty()) {
-            for (position in positionOfGameToBeReplacedList) {
-                val validGame = getValidGame(relatedCollectionId, displayingGameIdSet)
-                validGame?.let {
-                    gameList[position] = it
-                    displayingGameIdSet.add(it.id)
+        if (positionOfTheGameToReplaceList.isNotEmpty()) {
+            if (shouldLogReplaceEvent) {
+                MtaHelper.onEvent("首页_加载", "启动光环", "替换游戏")
+            }
+            for (position in positionOfTheGameToReplaceList) {
+                val replacingGame = getOneUniqueGame(relatedCollectionId, alreadyDisplayedGameIdSet)
+                replacingGame?.let {
+                    gameList[position] = replacingGame
                }
            }
        }
    }

-    /**
-     * 判断该游戏是否有效
-     * @param game 需要判断的游戏
-     * @param gameIdList 专题里已经包含的游戏 ID 列表
-     */
-    private fun isThisGameValid(
-        game: GameEntity,
-        gameIdList: HashSet<String>
-    ): Boolean {
-        // 该游戏是否在历史已安装列表中
-        if (mHistoricInstalledGameIdSet.contains(game.id)) return false
+    private fun isThisGameUnique(game: GameEntity, gameIdList: HashSet<String>): Boolean {
+        // 判断该游戏是否出现在已安装列表
+        if (mSubstitutableGameIdSet.contains(game.id)) return false

-        // 该游戏是否与专题里已包含的游戏存在关联关系
+        // 该补充游戏是否已经存在关联关系
        for (relatedId in game.relatedGameIds!!) {
            if (gameIdList.contains(relatedId)) {
                return false
            }
        }

-        // 检查本地是否已安装该游戏，已过滤部分框架服务的包名
        for (apk in game.getApk()) {
+            // 检查本地是否已安装该游戏，已过滤那部分框架服务的包名
            if (PackageHelper.validLocalPackageNameSet.contains(apk.packageName)) {
                return false
            }
--- a/app/src/main/java/com/gh/common/util/GameUtils.java
+++ b/app/src/main/java/com/gh/common/util/GameUtils.java
@ -0,0 +1,272 @@
+package com.gh.common.util;
+
+import android.content.Context;
+import android.text.TextUtils;
+
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
+
+import com.gh.common.constant.Config;
+import com.gh.common.simulator.SimulatorGameManager;
+import com.gh.gamecenter.common.constant.Constants;
+import com.gh.gamecenter.feature.view.DownloadButton;
+import com.gh.download.DownloadManager;
+import com.gh.gamecenter.R;
+import com.gh.gamecenter.core.AppExecutor;
+import com.gh.gamecenter.feature.entity.ApkEntity;
+import com.gh.gamecenter.feature.entity.ApkLink;
+import com.gh.gamecenter.feature.entity.GameCollectionEntity;
+import com.gh.gamecenter.feature.entity.GameEntity;
+import com.gh.gamecenter.entity.GameUpdateEntity;
+import com.gh.gamecenter.feature.entity.PluginLocation;
+import com.gh.gamecenter.feature.entity.SettingsEntity;
+import com.gh.gamecenter.manager.PackagesManager;
+import com.gh.vspace.VHelper;
+import com.lightgame.download.DownloadEntity;
+import com.lightgame.download.DownloadStatus;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class GameUtils {
+
+    /**
+     * 去除与重复sourceList相同的数据
+     */
+    public static List<GameEntity> removeDuplicateData(List<GameEntity> sourceList, List<GameEntity> rawList) {
+        if (sourceList == null || sourceList.isEmpty()
+                || rawList == null || rawList.isEmpty()) {
+            return rawList;
+        }
+        String id;
+        for (int i = 0; i < rawList.size(); i++) {
+            id = rawList.get(i).getId();
+            for (GameEntity gameEntity : sourceList) {
+                if (id.equals(gameEntity.getId())) {
+                    rawList.remove(i);
+                    i--;
+                    break;
+                }
+            }
+        }
+        return rawList;
+    }
+
+    /**
+     * 设置下载按钮状态
+     */
+    public static void setDownloadBtnStatus(Context context, GameEntity gameEntity, DownloadButton downloadBtn, PluginLocation pluginLocation) {
+        // getDownloadBtnText 里包括查询数据库、根据包名读取包体 meta 信息等
+        AppExecutor.getLightWeightIoExecutor().execute(() -> {
+            String status = getDownloadBtnText(context, gameEntity, pluginLocation);
+            AppExecutor.getUiExecutor().execute(() -> {
+                downloadBtn.setText(status);
+                if (context.getString(R.string.pluggable).equals(status)) {
+                    downloadBtn.setButtonStyle(DownloadButton.ButtonStyle.PLUGIN);
+                    String pluginDesc = gameEntity.getPluginDesc();
+                    if (pluginDesc.length() > 3) pluginDesc = pluginDesc.substring(0, 3);
+                    downloadBtn.setText((pluginDesc + "化"));
+                } else {
+                    downloadBtn.setButtonStyle(DownloadButton.ButtonStyle.NORMAL);
+                }
+            });
+        });
+    }
+
+    /**
+     * 获取下载按钮文案 (相对耗时，请优先在子线程调用)
+     */
+    @WorkerThread
+    public static String getDownloadBtnText(Context context, GameEntity gameEntity, PluginLocation pluginLocation) {
+        if (gameEntity.getApk().size() > 1) {
+            return "";
+        }
+
+        int doneCount = 0;      // 下载完成数量
+        int pluginCount = 0;    // 可插件化数量
+        int updateCount = 0;    // 可更新数量
+        int installCount = 0;   // 已安装数量
+
+        boolean isRelatedEmulatorInstalled = false; // 若该游戏是模拟器游戏时其对应的模拟器是否已经安装
+        boolean isInstalledNewSimulator = false;// 是否安装新模拟器
+        DownloadEntity downloadEntity = null;
+        Object gh_id;
+        apkFor:
+        for (ApkEntity apkEntity : gameEntity.getApk()) {
+
+            // filter by packageName
+            SettingsEntity settings = Config.getSettings();
+            if (settings != null && gameEntity.getApk().size() > 1) {
+                for (String pkgName : settings.getGameDownloadBlackList()) {
+                    if (pkgName.equals(apkEntity.getPackageName())) {
+                        continue apkFor;
+                    }
+                }
+            }
+
+            downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity);
+
+            // 在下载管理找不到下载实体，并且为畅玩游戏的时候到畅玩数据库里找
+            if (downloadEntity == null && gameEntity.isVGame()) {
+                downloadEntity = VHelper.getVDownloadEntitySnapshot(gameEntity.getId(), apkEntity.getPackageName());
+            }
+
+            if (downloadEntity != null) {
+                if (downloadEntity.getStatus().equals(DownloadStatus.done)) {
+                    doneCount++;
+                } else if (downloadEntity.isPluggable()) {
+                    pluginCount++;
+                } else if (downloadEntity.isUpdate()) {
+                    updateCount++;
+                }
+            }
+            if (PackagesManager.INSTANCE.isCanUpdate(gameEntity.getId(), apkEntity.getPackageName())) {
+                updateCount++;
+            }
+            if (PackagesManager.isInstalled(apkEntity.getPackageName())) {
+                gh_id = PackageUtils.getMetaData(context, apkEntity.getPackageName(), "gh_id");
+                if (!TextUtils.isEmpty(apkEntity.getGhVersion())
+                        && !PackageUtils.isSignedByGh(context, apkEntity.getPackageName())
+                        && apkEntity.isShowPlugin(pluginLocation)) {
+                    pluginCount++;
+                } else if (gh_id == null
+                        || gh_id.equals(gameEntity.getId())
+                        // 当使用镜像时，可能会存在镜像 gh_id 与当前游戏 id 不一样的情况，这时也让它通过，避免装完还是显示`下载`
+                        || gameEntity.shouldUseMirrorInfo()) {
+                    installCount++;
+                }
+            }
+            if (SimulatorGameManager.isSimulatorGame(gameEntity)) {
+                isInstalledNewSimulator = SimulatorGameManager.isNewSimulatorInstalled(context);
+                DownloadEntity simulatorDownloadEntity = SimulatorGameManager.findDownloadEntityByUrl(apkEntity.getUrl());
+                if (simulatorDownloadEntity != null && gameEntity.getSimulator() != null) {
+                    boolean isInstalled = PackageUtils.isInstalledFromAllPackage(context, gameEntity.getSimulator().getApk().getPackageName());
+                    if (isInstalled) {
+                        installCount++;
+                        isRelatedEmulatorInstalled = true;
+                    } else {
+                        doneCount++;
+                    }
+                }
+            }
+        }
+        if ((isRelatedEmulatorInstalled || isInstalledNewSimulator) && doneCount != 0) {
+            return context.getString(R.string.launch);
+        }
+
+        if (gameEntity.isVGame()) {
+            // 如果 doneCount 为 0 或者数据库为空
+            // 表明本地并没有此游戏的数据库数据，需要重新下载
+            if (doneCount == 0
+                    || downloadEntity == null
+                    || !VHelper.isInstalled(downloadEntity.getPackageName())) {
+                installCount = 0;
+            } else {
+                doneCount = 0;
+                installCount = 1;
+            }
+        }
+
+        if (doneCount != 0) {
+            return context.getString(R.string.install);
+        } else if (pluginCount != 0 && !SimulatorGameManager.isSimulatorGame(gameEntity)) {
+            return context.getString(R.string.pluggable);
+        } else if (updateCount != 0 && !SimulatorGameManager.isSimulatorGame(gameEntity)) {
+            return context.getString(R.string.update);
+        } else if (installCount != 0) {
+            return context.getString(R.string.launch);
+        } else if ("demo".equals(gameEntity.getDownloadStatus())) {
+            return context.getString(R.string.attempt);
+        } else {
+            if (gameEntity.isVGame()) {
+                return context.getString(R.string.smooth);
+            } else {
+                if (Constants.V_GAME.equals(gameEntity.getDownloadStatus())
+                        || Constants.V_GAME_32.equals(gameEntity.getDownloadStatus())) {
+                    GameEntity.GameCategory gameCategory = gameEntity.getGameCategory();
+                    if (gameCategory.equals(GameEntity.GameCategory.ONLINE_GAME)
+                            || gameCategory.equals(GameEntity.GameCategory.INTERNATIONAL_ONLINE_GAME)) {
+                        return context.getString(R.string.download);
+                    } else {
+                        return context.getString(R.string.attempt);
+                    }
+                } else {
+                    return context.getString(R.string.download);
+                }
+            }
+        }
+    }
+
+    /**
+     * 获取GameUpdateEntity(插件化)
+     */
+    public static GameUpdateEntity getGameUpdateEntity(GameEntity gameEntity, ApkEntity apkEntity) {
+        GameUpdateEntity gameUpdateEntity = new GameUpdateEntity();
+        gameUpdateEntity.setId(gameEntity.getId());
+        gameUpdateEntity.setIcon(gameEntity.getIcon());
+        gameUpdateEntity.setRawIcon(gameEntity.getRawIcon());
+        gameUpdateEntity.setIconSubscript(gameEntity.getIconSubscript());
+        gameUpdateEntity.setIconFloat(gameEntity.getIconFloat());
+        gameUpdateEntity.setName(gameEntity.getName());
+        gameUpdateEntity.setPackageName(apkEntity.getPackageName());
+        gameUpdateEntity.setSize(apkEntity.getSize());
+        gameUpdateEntity.setVersion(apkEntity.getVersion());
+        gameUpdateEntity.setGhVersion(apkEntity.getGhVersion());
+        gameUpdateEntity.setUrl(apkEntity.getUrl());
+        gameUpdateEntity.setPlatform(apkEntity.getPlatform());
+        gameUpdateEntity.setEtag(apkEntity.getEtag());
+        gameUpdateEntity.setPluggable(true);
+        gameUpdateEntity.setTagStyle(gameEntity.getTagStyle());
+        gameUpdateEntity.setBrief(gameEntity.getBrief());
+        gameUpdateEntity.setPlugin(apkEntity.getPlugin());
+        gameUpdateEntity.setDownload(gameEntity.getDownload());
+        gameUpdateEntity.setIndexPlugin(gameEntity.getIndexPlugin());
+        gameUpdateEntity.setPluginDesc(gameEntity.getPluginDesc());
+        gameUpdateEntity.setFormat(apkEntity.getFormat());
+        gameUpdateEntity.setCurrentVersion(PackageUtils.getVersionNameByPackageName(apkEntity.getPackageName()));
+        gameUpdateEntity.setCategory(gameEntity.getCategory());
+
+        GameCollectionEntity pluggableCollection = getPluggableCollectionFromGameEntity(gameEntity, apkEntity.getPackageName());
+        if (pluggableCollection != null) {
+            gameUpdateEntity.setPluggableCollection(pluggableCollection);
+        }
+        return gameUpdateEntity;
+    }
+
+    @Nullable
+    public static GameCollectionEntity getPluggableCollectionFromGameEntity(GameEntity gameEntity, String targetPkg) {
+        // 添加插件化包所在的合集
+        for (GameCollectionEntity collectionEntity : gameEntity.getCollection()) {
+            if (collectionEntity.getPackages().contains(targetPkg)) {
+                ArrayList<ApkEntity> saveApkEntity = new ArrayList<>();
+                for (String pkg : collectionEntity.getPackages()) {
+                    for (ApkEntity apk : gameEntity.getApk()) {
+                        if (pkg.equals(apk.getPackageName())) {
+                            saveApkEntity.add(apk);
+                            break;
+                        }
+                    }
+                }
+
+                ArrayList<ApkLink> apkLinks = gameEntity.getApkLink();
+                if (apkLinks != null) {
+                    for (ApkLink apkLink : apkLinks) {
+                        if (apkLink.getCollection().equals(collectionEntity.getId())) {
+                            ApkEntity element = new ApkEntity();
+                            element.setApkLink(apkLink);
+                            if (saveApkEntity.size() > apkLink.getSort()) {
+                                saveApkEntity.add(apkLink.getSort(), element);
+                            } else {
+                                saveApkEntity.add(element);
+                            }
+                        }
+                    }
+                }
+
+                collectionEntity.setSaveApkEntity(saveApkEntity);
+                return collectionEntity;
+            }
+        }
+        return null;
+    }
+}
--- a/app/src/main/java/com/gh/common/util/GameUtils.kt
+++ b/app/src/main/java/com/gh/common/util/GameUtils.kt
@ -1,343 +0,0 @@
-package com.gh.common.util
-
-import android.content.Context
-import android.text.TextUtils
-import androidx.annotation.WorkerThread
-import com.gh.common.constant.Config
-import com.gh.common.simulator.SimulatorGameManager.findDownloadEntityByUrl
-import com.gh.common.simulator.SimulatorGameManager.isNewSimulatorInstalled
-import com.gh.common.simulator.SimulatorGameManager.isSimulatorGame
-import com.gh.download.DownloadManager
-import com.gh.gamecenter.R
-import com.gh.gamecenter.common.utils.isLocalDownloadInDualDownloadMode
-import com.gh.gamecenter.common.utils.isVGameDownloadInDualDownloadMode
-import com.gh.gamecenter.core.AppExecutor.lightWeightIoExecutor
-import com.gh.gamecenter.core.AppExecutor.uiExecutor
-import com.gh.gamecenter.entity.GameUpdateEntity
-import com.gh.gamecenter.feature.entity.*
-import com.gh.gamecenter.feature.view.DownloadButton
-import com.gh.gamecenter.manager.PackagesManager
-import com.gh.gamecenter.manager.PackagesManager.isCanUpdate
-import com.gh.vspace.VHelper
-import com.lightgame.download.DownloadEntity
-import com.lightgame.download.DownloadStatus
-
-object GameUtils {
-    /**
-     * 去除与重复sourceList相同的数据
-     */
-    fun removeDuplicateData(sourceList: MutableList<GameEntity>?, rawList: MutableList<GameEntity>?): MutableList<GameEntity>? {
-        if (sourceList.isNullOrEmpty() || rawList.isNullOrEmpty()) {
-            return rawList
-        }
-        var id: String
-        var i = 0
-        while (i < rawList.size) {
-            id = rawList[i].id
-            for (gameEntity in sourceList) {
-                if (id == gameEntity.id) {
-                    rawList.removeAt(i)
-                    i--
-                    break
-                }
-            }
-            i++
-        }
-        return rawList
-    }
-
-    /**
-     * 设置下载按钮状态
-     */
-    fun setDownloadBtnStatus(
-        context: Context,
-        gameEntity: GameEntity,
-        downloadBtn: DownloadButton,
-        pluginLocation: PluginLocation?
-    ) {
-        // getDownloadBtnText 里包括查询数据库、根据包名读取包体 meta 信息等
-        lightWeightIoExecutor.execute {
-            val status = getDownloadBtnText(
-                context = context,
-                gameEntity = gameEntity,
-                isFromList = true,
-                fixedAsVGame = false,
-                pluginLocation = pluginLocation
-            )
-            uiExecutor.execute {
-                downloadBtn.text = status
-                if (context.getString(R.string.pluggable) == status) {
-                    downloadBtn.buttonStyle = DownloadButton.ButtonStyle.PLUGIN
-                    var pluginDesc = gameEntity.pluginDesc
-                    if (pluginDesc.length > 3) pluginDesc = pluginDesc.substring(0, 3)
-                    downloadBtn.text = pluginDesc + "化"
-                } else {
-                    downloadBtn.buttonStyle = DownloadButton.ButtonStyle.NORMAL
-                }
-            }
-        }
-    }
-
-    /**
-     * 获取下载按钮文案 (相对耗时，请优先在子线程调用)
-     *
-     * @param isFromList 调用方是否来源自普通列表 （普通列表根据优先级确定是显示成畅玩状态还是普通下载状态）
-     * @param fixedAsVGame 固定以畅玩游戏的类型来获取状态
-     */
-    @WorkerThread
-    @JvmStatic
-    fun getDownloadBtnText(context: Context,
-                           gameEntity: GameEntity,
-                           isFromList: Boolean,
-                           fixedAsVGame: Boolean,
-                           pluginLocation: PluginLocation?): String {
-        if (gameEntity.getApk().size > 1) {
-            return ""
-        }
-        var doneCount = 0 // 下载完成数量
-        var pluginCount = 0 // 可插件化数量
-        var updateCount = 0 // 可更新数量
-        var installCount = 0 // 已安装数量
-        var isRelatedEmulatorInstalled = false // 若该游戏是模拟器游戏时其对应的模拟器是否已经安装
-        var isInstalledNewSimulator = false // 是否安装新模拟器
-        var downloadEntity: DownloadEntity? = null
-        var performAsVGame = false // 是否使用了畅玩作为 downloadEntity
-        var gh_id: Any?
-        apkFor@ for (apkEntity in gameEntity.getApk()) {
-
-            val isInstalledLocally = PackagesManager.isInstalled(apkEntity.packageName)
-
-            // filter by packageName
-            val settings = Config.getSettings()
-            if (settings != null && gameEntity.getApk().size > 1) {
-                for (pkgName in settings.gameDownloadBlackList) {
-                    if (pkgName == apkEntity.packageName) {
-                        continue@apkFor
-                    }
-                }
-            }
-
-            downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity)
-
-            // 已安装的畅玩游戏实体
-            val vGameDownloadEntity = VHelper.getVDownloadEntitySnapshot(gameEntity.id, apkEntity.packageName)
-            performAsVGame = if (fixedAsVGame) {
-                true
-            } else if (isFromList) {
-                if (vGameDownloadEntity == null && isInstalledLocally) {
-                    false
-                } else {
-                    gameEntity.isVGamePreferred()
-                }
-            } else {
-                false
-            }
-
-            // 畅玩状态优先，且畅玩实体不为空时将 downloadEntity 置为畅玩实体
-            if (performAsVGame && vGameDownloadEntity != null) {
-                downloadEntity = vGameDownloadEntity
-            } else if (!performAsVGame && !isFromList && downloadEntity?.isVGameDownloadInDualDownloadMode() == true) {
-                // 下载的任务是由畅玩触发的，游戏详情页不需判定为需要安装
-                downloadEntity = null
-            } else if (performAsVGame && !isFromList && downloadEntity?.isLocalDownloadInDualDownloadMode() == true) {
-                // 下载的任务是由下载安装触发的，游戏详情页不需判定为需要安装
-                downloadEntity = null
-            }
-
-            if (downloadEntity != null) {
-                if (downloadEntity.status == DownloadStatus.done) {
-                    doneCount++
-                } else if (downloadEntity.isPluggable) {
-                    pluginCount++
-                } else if (downloadEntity.isUpdate) {
-                    updateCount++
-                }
-            }
-
-            if (isCanUpdate(gameEntity.id, apkEntity.packageName, performAsVGame)) {
-                updateCount++
-            }
-
-            if (isInstalledLocally) {
-                gh_id = PackageUtils.getMetaData(context, apkEntity.packageName, "gh_id")
-                if (!TextUtils.isEmpty(apkEntity.ghVersion)
-                    && !PackageUtils.isSignedByGh(context, apkEntity.packageName)
-                    && apkEntity.isShowPlugin(pluginLocation!!)
-                ) {
-                    pluginCount++
-                } else if (gh_id == null || gh_id == gameEntity.id || gameEntity.shouldUseMirrorInfo()) {
-                    installCount++
-                }
-            }
-
-            if (isSimulatorGame(gameEntity)) {
-                isInstalledNewSimulator = isNewSimulatorInstalled(context)
-                val simulatorDownloadEntity = findDownloadEntityByUrl(apkEntity.url)
-                if (simulatorDownloadEntity != null && gameEntity.simulator != null) {
-                    val isInstalled =
-                        PackageUtils.isInstalledFromAllPackage(context, gameEntity.simulator!!.apk!!.packageName)
-                    if (isInstalled) {
-                        installCount++
-                        isRelatedEmulatorInstalled = true
-                    } else {
-                        doneCount++
-                    }
-                }
-            }
-        }
-
-        if ((isRelatedEmulatorInstalled || isInstalledNewSimulator) && doneCount != 0) {
-            return context.getString(R.string.launch)
-        }
-
-        if (performAsVGame) {
-            // 如果 doneCount 为 0 或者数据库为空
-            // 表明本地并没有此游戏的数据库数据，需要重新下载
-            if (doneCount == 0 || downloadEntity == null || !VHelper.isInstalled(downloadEntity.packageName)) {
-                installCount = 0
-            } else {
-                doneCount = 0
-                installCount = 1
-            }
-        } else {
-            if (gameEntity.isDualBtnModeEnabled()) {
-                // 双下载按钮模式下，若非更新，排除已安装的情况来影响按钮状态
-                if (installCount != 0 && doneCount != 0 && downloadEntity?.isUpdate == false) {
-                    doneCount = 0
-                }
-            }
-        }
-
-        return if (doneCount != 0) {
-            context.getString(R.string.install)
-        } else if (pluginCount != 0 && !isSimulatorGame(gameEntity)) {
-            context.getString(R.string.pluggable)
-        } else if (updateCount != 0 && !isSimulatorGame(gameEntity)) {
-            context.getString(R.string.update)
-        } else if (installCount != 0) {
-            context.getString(R.string.launch)
-        } else if ("demo" == gameEntity.downloadStatus) {
-            context.getString(R.string.attempt)
-        } else {
-            if (performAsVGame) {
-                context.getString(R.string.smooth)
-            } else {
-//                if (Constants.V_GAME == gameEntity.downloadStatus || Constants.V_GAME_32 == gameEntity.downloadStatus) {
-//                    val gameCategory = gameEntity.getGameCategory()
-//                    if (gameCategory == GameEntity.GameCategory.ONLINE_GAME
-//                        || gameCategory == GameEntity.GameCategory.INTERNATIONAL_ONLINE_GAME) {
-//                        context.getString(R.string.download)
-//                    } else {
-//                        context.getString(R.string.attempt)
-//                    }
-//                } else {
-                context.getString(R.string.download)
-//                }
-            }
-        }
-    }
-
-    /**
-     * 获取GameUpdateEntity(插件化)
-     */
-    fun getGameUpdateEntity(gameEntity: GameEntity, apkEntity: ApkEntity): GameUpdateEntity {
-        val gameUpdateEntity = GameUpdateEntity()
-        gameUpdateEntity.id = gameEntity.id
-        gameUpdateEntity.icon = gameEntity.icon
-        gameUpdateEntity.rawIcon = gameEntity.rawIcon
-        gameUpdateEntity.iconSubscript = gameEntity.iconSubscript
-        gameUpdateEntity.iconFloat = gameEntity.iconFloat
-        gameUpdateEntity.name = gameEntity.name
-        gameUpdateEntity.packageName = apkEntity.packageName
-        gameUpdateEntity.size = apkEntity.size
-        gameUpdateEntity.version = apkEntity.version
-        gameUpdateEntity.ghVersion = apkEntity.ghVersion
-        gameUpdateEntity.url = apkEntity.url
-        gameUpdateEntity.platform = apkEntity.getPlatform()
-        gameUpdateEntity.etag = apkEntity.etag
-        gameUpdateEntity.isPluggable = true
-        gameUpdateEntity.tagStyle = gameEntity.tagStyle
-        gameUpdateEntity.brief = gameEntity.brief
-        gameUpdateEntity.plugin = apkEntity.plugin
-        gameUpdateEntity.download = gameEntity.download
-        gameUpdateEntity.indexPlugin = gameEntity.indexPlugin
-        gameUpdateEntity.pluginDesc = gameEntity.pluginDesc
-        gameUpdateEntity.format = apkEntity.format
-        gameUpdateEntity.currentVersion = PackageUtils.getVersionNameByPackageName(apkEntity.packageName)
-        gameUpdateEntity.category = gameEntity.category
-        val pluggableCollection = getPluggableCollectionFromGameEntity(gameEntity, apkEntity.packageName)
-        if (pluggableCollection != null) {
-            gameUpdateEntity.pluggableCollection = pluggableCollection
-        }
-        return gameUpdateEntity
-    }
-
-    @JvmStatic
-    fun getPluggableCollectionFromGameEntity(gameEntity: GameEntity, targetPkg: String?): GameCollectionEntity? {
-        // 添加插件化包所在的合集
-        for (collectionEntity in gameEntity.collection) {
-            if (collectionEntity.packages.contains(targetPkg)) {
-                val saveApkEntity = ArrayList<ApkEntity>()
-                for (pkg in collectionEntity.packages) {
-                    for (apk in gameEntity.getApk()) {
-                        if (pkg == apk.packageName) {
-                            saveApkEntity.add(apk)
-                            break
-                        }
-                    }
-                }
-                val apkLinks = gameEntity.apkLink
-                if (apkLinks != null) {
-                    for (apkLink in apkLinks) {
-                        if (apkLink.collection == collectionEntity.id) {
-                            val element = ApkEntity()
-                            element.apkLink = apkLink
-                            if (saveApkEntity.size > apkLink.sort) {
-                                saveApkEntity.add(apkLink.sort, element)
-                            } else {
-                                saveApkEntity.add(element)
-                            }
-                        }
-                    }
-                }
-                collectionEntity.saveApkEntity = saveApkEntity
-                return collectionEntity
-            }
-        }
-        return null
-    }
-
-    /**
-     * 是否以畅玩游戏的形式来处理
-     */
-    @JvmStatic
-    fun shouldPerformAsVGame(gameEntity: GameEntity): Boolean {
-        var performActionAsVGame = false
-
-        if (gameEntity.getApk().size != 1) {
-            performActionAsVGame = false
-        } else {
-            when (gameEntity.getGameDownloadButtonMode()) {
-                GameEntity.GAME_DOWNLOAD_BUTTON_MODE_VGAME -> performActionAsVGame = true
-                GameEntity.GAME_DOWNLOAD_BUTTON_MODE_DOWNLOAD -> performActionAsVGame = false
-                GameEntity.GAME_DOWNLOAD_BUTTON_MODE_DUAL -> {
-                    val packageName = gameEntity.getApk().first().packageName
-                    val isInstalledAtDevice = PackagesManager.isInstalled(packageName)
-                    val isInstalledAtVSpace = VHelper.getVDownloadEntitySnapshot(gameEntity.id, packageName) != null
-
-                    performActionAsVGame = if (isInstalledAtDevice && isInstalledAtVSpace) {
-                        gameEntity.isVGamePreferred()
-                    } else if (isInstalledAtDevice) {
-                        false
-                    } else if (isInstalledAtVSpace) {
-                        true
-                    } else {
-                        gameEntity.isVGamePreferred()
-                    }
-                }
-            }
-        }
-
-        return performActionAsVGame
-    }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
曾祥俊	49a610deee	feat: 动态java方法注册	2023-10-11 19:41:28 +08:00
曾祥俊	61f43d53b2	feat: 文章详情WebView预加载	2023-10-11 15:52:35 +08:00