feat: 动态java方法注册

feat: 文章详情WebView预加载
2023-10-11 19:41:28 +08:00 · 2023-10-11 15:52:35 +08:00
2134 changed files with 15185 additions and 53402 deletions
--- 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,8 +71,7 @@ android_build:
    exit_codes: 137
  only:
    - dev
-    - dev-5.33.0
-    - feat/GHZS-3956
+    - dev-5.32.0

 # 代码检查
 sonarqube_analysis:
@ -103,8 +102,7 @@ sonarqube_analysis:
     exit_codes: 137
   only:
     - dev
-     - dev-5.33.0
-     - feat/GHZS-3956
+     - dev-5.32.0

 ## 发送简易检测结果报告
 send_sonar_report:
@ -122,12 +120,11 @@ send_sonar_report:
     exit_codes: 137
   only:
     - dev
-     - dev-5.33.0
-     - feat/GHZS-3956
+     - 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:
@ -135,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
@ -152,8 +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
-        - feat/GHZS-3956
+        - dev-5.32.0
--- a/app/build.gradle
+++ b/app/build.gradle
@ -95,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}\""
@ -159,7 +157,7 @@ android {
        }
    }

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

    sourceSets {
        publish {
@ -177,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 {
@ -199,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，接口仅包含正式环境
@ -212,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}\""
        }

@ -224,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())
@ -238,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}\""
        }

@ -250,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"
-        }
    }
 }

@ -300,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}"
@ -407,7 +359,6 @@ dependencies {
    implementation(project(':feature:qq_game')) {
        exclude group: 'androidx.swiperefreshlayout'
    }
-    internalImplementation(project(':module_internal_test'))
 }

 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/internal/java/com/gh/vspace/ExternalGameUsage.kt
+++ b/app/src/internal/java/com/gh/vspace/ExternalGameUsage.kt
@ -1,32 +0,0 @@
-package com.gh.vspace
-
-import android.content.Intent
-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.databinding.LayoutPersonalOtherItemBinding
-import com.gh.vspace.installexternalgames.InstallExternalGameActivity
-
-@Keep
-class ExternalGameUsage : IExternalGamesUsage {
-    override fun addInstallExternalGameButton(viewParent: ViewGroup) {
-        val context = viewParent.context
-        viewParent.findViewById<View>(R.id.install_game_from_external) ?: run {
-            val binding = LayoutPersonalOtherItemBinding.inflate(LayoutInflater.from(context)).apply {
-                root.id = R.id.install_game_from_external
-                titleTv.text = context.getString(R.string.title_install_external_game)
-                iconIv.setImageResource(R.drawable.ic_personal_my_game)
-                root.setOnClickListener {
-                    VHelper.connectService {
-                        context.startActivity(
-                            InstallExternalGameActivity.getIntent(context)
-                                .apply { flags = flags or Intent.FLAG_ACTIVITY_NEW_TASK })
-                    }
-                }
-            }
-            viewParent.addView(binding.root, 0)
-        }
-    }
-}
--- 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,47 +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.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,11 +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
-}
--- 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,153 +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 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" }
-        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,
-            "",
-            ""
-        )
-        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,43 +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_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,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <item name="install_game_from_external" type="id" />
-</resources>
--- a/app/src/internal/res/values/strings.xml
+++ b/app/src/internal/res/values/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/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,8 +78,6 @@
        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,
@ -99,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"
@ -193,7 +188,7 @@
            android:screenOrientation="portrait" />

        <activity
-            android:name="com.gh.gamecenter.newsdetail.NewsDetailActivity"
+            android:name="com.gh.gamecenter.NewsDetailActivity"
            android:screenOrientation="portrait" />

        <activity
@ -248,7 +243,7 @@
            android:windowSoftInputMode="stateHidden" />

        <activity
-            android:name="com.gh.gamecenter.libao.LibaoDetailActivity"
+            android:name="com.gh.gamecenter.LibaoDetailActivity"
            android:screenOrientation="portrait" />

        <activity
@ -479,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" />
@ -701,7 +688,7 @@
            android:screenOrientation="portrait" />

        <activity
-            android:name="com.gh.gamecenter.toolbox.ToolBoxActivity"
+            android:name="com.gh.gamecenter.toolbox.ToolBoxBlockActivity"
            android:screenOrientation="portrait" />

        <activity
@ -767,19 +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:screenOrientation="portrait" />
-
-        <activity
-            android:name="com.gh.gamecenter.wrapper.ToolbarWrapperActivity"
+            android:name="com.gh.gamecenter.qgame.QGameSubjectActivity"
            android:screenOrientation="portrait" />


@ -837,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/tab_mine.json
+++ b/app/src/main/assets/lottie/tab_mine.json
@ -1 +0,0 @@
-{"v":"5.12.2","fr":60,"ip":0,"op":40,"w":66,"h":66,"nm":"icon_tab_my","ddd":0,"assets":[{"id":"comp_0","nm":"icon","fr":60,"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"highlight","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33.134,34.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.667,"y":0.733},"o":{"x":0.333,"y":0},"t":0,"s":[{"i":[[0,-0.004],[0.493,0],[0,0.004],[-0.493,0]],"o":[[0,0.004],[-0.493,0],[0,-0.004],[0.493,0]],"v":[[0.893,1.488],[0,1.496],[-0.893,1.488],[0,1.483]],"c":true}]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0.267},"t":10,"s":[{"i":[[0,-1.018],[1.793,0],[0,1.018],[-1.793,0]],"o":[[0,1.018],[-1.793,0],[0,-1.018],[1.793,0]],"v":[[2.914,-0.344],[0,1.5],[-2.914,-0.344],[0,-1.5]],"c":true}]},{"i":{"x":0.333,"y":1},"o":{"x":0.667,"y":0},"t":18,"s":[{"i":[[0,-1.181],[1.407,0],[0,1.181],[-1.407,0]],"o":[[0,1.181],[-1.407,0],[0,-1.181],[1.407,0]],"v":[[2.226,-0.341],[0,1.74],[-2.211,-0.341],[0,-1.74]],"c":true}]},{"i":{"x":0.333,"y":1},"o":{"x":0.667,"y":0},"t":26,"s":[{"i":[[0,-0.905],[1.381,0],[0,0.905],[-1.381,0]],"o":[[0,0.905],[-1.381,0],[0,-0.905],[1.381,0]],"v":[[2.5,-0.306],[0,1.333],[-2.5,-0.306],[0,-1.333]],"c":true}]},{"t":32,"s":[{"i":[[0,-1.018],[1.381,0],[0,1.018],[-1.381,0]],"o":[[0,1.018],[-1.381,0],[0,-1.018],[1.381,0]],"v":[[2.5,-0.344],[0,1.5],[-2.5,-0.344],[0,-1.5]],"c":true}]}],"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"color","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"椭圆形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":60,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"body","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,34.204,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-3.866,0],[0,3.866],[3.866,0],[0,-3.866]],"o":[[3.866,0],[0,-3.866],[-3.866,0],[0,3.866]],"v":[[0,4.599],[7,-2.401],[0,-9.401],[-7,-2.401]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0.207,0.359],[2.438,0],[1.189,-2.104],[-0.361,-0.204],[-0.204,0.361],[-1.915,0],[-0.932,-1.613],[-0.359,0.207]],"o":[[-1.198,-2.072],[-2.462,0],[-0.204,0.361],[0.361,0.204],[0.925,-1.638],[1.897,0],[0.207,0.359],[0.359,-0.207]],"v":[[5.848,8.225],[0,4.849],[-5.88,8.282],[-5.596,9.304],[-4.574,9.02],[0,6.349],[4.549,8.976],[5.574,9.25]],"c":true},"ix":2},"nm":"路径 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"合并路径 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.267,0.639,1,0.5,0.241,0.596,1,1,0.216,0.553,1],"ix":9}},"s":{"a":0,"k":[-3.812,-4.384],"ix":5},"e":{"a":0,"k":[6.345,8.129],"ix":6},"t":1,"nm":"color","mn":"ADBE Vector Graphic - G-Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"Union","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":60,"st":0,"ct":1,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":0,"nm":"icon","refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,33,0],"ix":2,"l":2},"a":{"a":0,"k":[33,33,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":0,"s":[100,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":8,"s":[70,70,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":18,"s":[110,110,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":26,"s":[90,90,100]},{"t":32,"s":[100,100,100]}],"ix":6,"l":2}},"ao":0,"w":66,"h":66,"ip":0,"op":60,"st":0,"bm":0}],"markers":[],"props":{}}
--- 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/assets/tab_mine.gif
+++ b/app/src/main/assets/tab_mine.gif
--- 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,99 +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 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 {
-        mDownloadManagerAd?.displayRule?.run {
-            if (adDisplayInterval > 0) {
-                val lastShowTime = SPUtils.getLong(Constants.SP_LAST_DOWNLOAD_MANAGER_AD_SHOW_TIME, 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
    }

    /**
@ -293,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
-            )
-        }
    }

    /**
@ -425,7 +242,6 @@ object AdDelegateHelper {
        adViewWidthInDp: Float,
        adViewHeightInDp: Float,
        startAdContainer: ViewGroup,
-        timeout: Int,
        callback: (isSuccess: Boolean) -> Unit,
    ) {
        if (mCsjAdImpl == null) {
@ -439,7 +255,6 @@ object AdDelegateHelper {
                adViewWidthInDp,
                adViewHeightInDp,
                startAdContainer,
-                timeout,
                callback,
            )
        }
@ -453,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)
        }
    }

@ -467,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
        }

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

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

@ -546,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(
@ -588,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,
@ -606,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/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,24 +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.core.utils.CurrentActivityHolder.getCurrentActivity
 import com.gh.vspace.VHelper
 import com.halo.assistant.HaloApp

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

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

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

    override fun onActivityResumed(activity: Activity) {
@ -91,7 +74,7 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
    }

    override fun onActivityStopped(activity: Activity) {
-        mIsFromBackgroundToForeground = getCurrentActivity() == null
+        // 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 集合
@ -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
@ -15,7 +15,9 @@ import com.gh.common.util.DirectUtils.directToLegacyVideoDetail
 import com.gh.common.util.DirectUtils.directToLinkPage
 import com.gh.common.util.DirectUtils.directToQa
 import com.gh.common.util.PackageUtils
+import com.gh.gamecenter.LibaoDetailActivity
 import com.gh.gamecenter.MainActivity
+import com.gh.gamecenter.NewsDetailActivity
 import com.gh.gamecenter.WebActivity
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.constant.EntranceConsts
@ -36,14 +38,12 @@ import com.gh.gamecenter.eventbus.EBSkip
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.gh.gamecenter.feature.utils.PlatformUtils
+import com.gh.gamecenter.fragment.MainWrapperFragment
 import com.gh.gamecenter.gamecollection.publish.GameCollectionEditActivity
-import com.gh.gamecenter.libao.LibaoDetailActivity
-import com.gh.gamecenter.newsdetail.NewsDetailActivity
 import com.gh.gamecenter.qa.BbsType
 import com.gh.gamecenter.qa.video.publish.VideoPublishActivity
 import com.gh.gamecenter.subject.SubjectActivity
 import com.gh.gamecenter.video.detail.VideoDetailContainerViewModel
-import com.gh.gamecenter.wrapper.MainWrapperFragment
 import com.lightgame.utils.Utils
 import org.greenrobot.eventbus.EventBus
 import java.nio.charset.Charset
@ -503,13 +503,13 @@ object DefaultUrlHandler {

                EntranceConsts.HOST_GAME_LIBRARY -> {
                    DirectUtils.directToMainActivity(context)
-                    EventBus.getDefault().post(EBSkip(MainActivity.EB_SKIP_MAIN, MainWrapperFragment.TYPE_GAME_LIBRARY))
+                    EventBus.getDefault().post(EBSkip(MainActivity.EB_SKIP_MAIN, MainWrapperFragment.INDEX_GAME))
                }

                EntranceConsts.HOST_HOME_GAME_COLLECTION_SQUARE -> {
                    DirectUtils.directToMainActivity(context)
                    EventBus.getDefault()
-                        .post(EBSkip(MainActivity.EB_SKIP_MAIN, MainWrapperFragment.TYPE_HOME))
+                        .post(EBSkip(MainActivity.EB_SKIP_MAIN, MainWrapperFragment.INDEX_HOME))
                    EventBus.getDefault().post(EBReuse(host))
                }

--- 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
@ -0,0 +1,18 @@
+package com.gh.common.chain
+
+import android.content.Context
+import com.gh.common.dialog.CertificationDialog
+import com.gh.gamecenter.feature.entity.GameEntity
+
+class CertificationHandler : ChainHandler() {
+
+    override fun handleRequest(context: Context, gameEntity: GameEntity) {
+        CertificationDialog.showCertificationDialog(context, gameEntity) {
+            if (hasNext()) {
+                getNext()?.handleRequest(context, gameEntity)
+            } else {
+                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
@ -3,23 +3,20 @@ package com.gh.common.chain
 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) {
-                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
@ -2,27 +2,24 @@ package com.gh.common.chain

 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) {
-                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) {
-                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;
@ -25,18 +26,20 @@ import com.gh.gamecenter.entity.GameGuidePopupEntity;
 import com.gh.gamecenter.entity.NewApiSettingsEntity;
 import com.gh.gamecenter.entity.NewSettingsEntity;
 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.vspace.VHelper;
 import com.halo.assistant.HaloApp;
+import com.lightgame.utils.Utils;

 import org.greenrobot.eventbus.EventBus;
 import org.json.JSONException;
 import org.json.JSONObject;

 import java.io.IOException;
+import java.util.List;
 import java.util.Locale;

 import io.reactivex.android.schedulers.AndroidSchedulers;
@ -72,10 +75,51 @@ public class Config {
    private static GameGuidePopupEntity mGameGuidePopupEntity;
    private static SharedPreferences mDefaultSharedPreferences;

+    public static final String FIX_DOWNLOAD_KEY = "isFixDownload";
+    public static final String FIX_PLUGIN_KEY = "isFixPlugin";
+
    public static final int VIDEO_PAGE_SIZE = 21; // 视频列表大多都是一行3个

    public static boolean isShow() {
-        return !SPUtils.getBoolean(Constants.SP_TEENAGER_MODE);
+        if (SPUtils.getBoolean(Constants.SP_TEENAGER_MODE)) return false;
+
+        if (getPreferences().getBoolean(FIX_DOWNLOAD_KEY, false)) return true;
+
+        if (!isExistDownloadFilter()) return false;
+
+        for (SettingsEntity.Download entity : getSettings().getDownload()) {
+            if ("all".equals(entity.getGame())) {
+                if (entity.getPluginfy() && "normal".equals(entity.getPolicy()) && filterTime(entity.getTime())) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+
+    public static boolean isShowDownload(String gameId) {
+
+        if (getPreferences().getBoolean(FIX_DOWNLOAD_KEY, false)) return true;
+
+        if (TextUtils.isEmpty(gameId) || !isExistDownloadFilter())
+            return false;
+
+        for (SettingsEntity.Download entity : getSettings().getDownload()) {
+            if (gameId.equals(entity.getGame())) {
+                if ("normal".equals(entity.getPolicy()) && filterTime(entity.getTime())) {
+                    return true;
+                } else {
+                    return false;
+                }
+            } else if ("all".equals(entity.getGame())) {
+                if ("normal".equals(entity.getPolicy()) && filterTime(entity.getTime())) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
    }

    /**
@ -91,10 +135,74 @@ public class Config {
        return mNewApiSettingsEntity.getInstall().getVpnRequired().getShouldShowVpnOption();
    }

+    public static boolean isShowPlugin(String gameId) {
+        SharedPreferences preferences = getPreferences();
+        boolean isFixPlugin = preferences.getBoolean(FIX_PLUGIN_KEY, false);
+        if (isFixPlugin) return true;
+
+        if (TextUtils.isEmpty(gameId) || !isExistDownloadFilter())
+            return false;
+
+        for (SettingsEntity.Download entity : getSettings().getDownload()) {
+            if (gameId.equals(entity.getGame())) {
+                if (entity.getPluginfy() && filterTime(entity.getTime())) {
+                    return true;
+                } else {
+                    return false;
+                }
+            }
+
+            if ("all".equals(entity.getGame())) {
+                if (entity.getPluginfy() && filterTime(entity.getTime())) {
+                    preferences.edit().putBoolean(FIX_PLUGIN_KEY, true).apply();
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    public static boolean isShowPlugin() {
+        SharedPreferences preferences = getPreferences();
+        boolean isFixPlugin = preferences.getBoolean(FIX_PLUGIN_KEY, false);
+        if (isFixPlugin) return true;
+
+        if (!isExistDownloadFilter())
+            return false;
+
+        for (SettingsEntity.Download entity : getSettings().getDownload()) {
+            if ("all".equals(entity.getGame())) {
+                if (entity.getPluginfy() && filterTime(entity.getTime())) {
+                    preferences.edit().putBoolean(FIX_PLUGIN_KEY, true).apply();
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    private static boolean filterTime(SettingsEntity.Download.TimeEntity timeEntity) {
+        long end = timeEntity.getEnd();
+        long start = timeEntity.getStart();
+        long curTime = Utils.getTime(HaloApp.getInstance().getApplication());
+
+        if ((start == 0 || curTime >= start) && (end == 0 || curTime <= end)) {
+            return true;
+        }
+
+        return false;
+    }
+
    public static void setSettings(SettingsEntity settingsEntity) {
        getPreferences().edit().putString(SETTINGS_KEY, GsonUtils.toJson(settingsEntity)).apply();
        mSettingsEntity = settingsEntity;

+        // 更新设置状态
+        mSettingsEntity.showArticleEntrance();
+        mSettingsEntity.showCommunityEntrance();
+
        // 加载完设置后刷新下
        PackageHelper.initList();
    }
@ -222,6 +330,27 @@ public class Config {
        return mGameGuidePopupEntity;
    }

+    private static boolean isExistDownloadFilter() {
+        if (getSettings() == null || getSettings().getDownload() == null || getSettings().getDownload().size() == 0) {
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    public static void filterPluginArticle(List<NewsEntity> list) {
+        if (isShowPlugin() || list == null) return;
+
+        for (int i = 0; i < list.size(); i++) {
+            NewsEntity newsEntity = list.get(i);
+            String title = newsEntity.getTitle();
+            if (!TextUtils.isEmpty(title) && title.contains("插件")) {
+                list.remove(i);
+                i--;
+            }
+        }
+    }
+
    public static SharedPreferences getPreferences() {
        if (mDefaultSharedPreferences == null) {
            mDefaultSharedPreferences = PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().getApplication());
@ -252,6 +381,9 @@ public class Config {
                                GsonUtils.toJson(response.getSuggestion()));
                        edit.apply();

+                        if (!getPreferences().getBoolean(Config.FIX_DOWNLOAD_KEY, false) && Config.isShow()) {
+                            getPreferences().edit().putBoolean(Config.FIX_DOWNLOAD_KEY, true).apply();
+                        }
                        if (!SPUtils.getBoolean(Constants.SP_TEENAGER_MODE)) {
                            EventBus.getDefault().post(new EBReuse("Refresh"));
                        }
@ -328,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,20 +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.DownloadChainBuilder;
-import com.gh.common.chain.DownloadChainHandler;
+import com.gh.common.chain.CertificationHandler;
+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;
@ -39,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;
@ -49,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;
@ -67,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;
@ -79,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));
@ -89,12 +236,119 @@ 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 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("异常");
+        }
+    }
+
    // 大图下的进度条
    public static void setDownloadButton(DownloadButton progressBar,
                                         GameEntity gameEntity,
@ -108,6 +362,7 @@ public class BindingAdapters {

        // 判断是否显示按钮
        if (gameEntity != null
+                && Config.isShowDownload(gameEntity.getId())
                && !"光环助手".equals(gameEntity.getName())) {
            progressBar.setVisibility(View.VISIBLE);
        } else {
@ -121,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(), "该游戏已关闭下载");
@ -146,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());
@ -154,37 +413,28 @@ public class BindingAdapters {
                            builder.addHandler(new BrowserInstallHandler());
                            builder.addHandler(new PackageCheckHandler());
                            builder.addHandler(new DownloadDialogHelperHandler());
+                            builder.addHandler(new CertificationHandler());
                            builder.addHandler(new VersionNumberHandler());
                            builder.addHandler(new LandPageAddressHandler());
                            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,
@ -193,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);
                            }
                        }
                    }
@ -212,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;
                                }

@ -228,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(),
@ -256,12 +500,13 @@ 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;
@ -347,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);
@ -419,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()) {
@ -438,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 {
@ -536,10 +809,17 @@ public class BindingAdapters {
        }
    }

-    public static void setGameName(TextView view, GameEntity game, boolean isShowPlatform) {
+    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;
        if (isShowPlatform && game.getApk().size() > 0) {
-            gameName = String.format("%s - %s", game.getName(),
+            gameName = String.format("%s - %s", !isShowSuffix ? game.getNameWithoutSuffix() : game.getName(),
                    PlatformUtils.getInstance(view.getContext()).getPlatformName(
                            game.getApk().get(0).getPlatform()));
            if (!gameName.equals((String) view.getTag(R.string.tag_game_name_id))) {
@ -547,7 +827,7 @@ public class BindingAdapters {
                view.setTag(R.string.tag_game_name_id, gameName);
            }
        } else {
-            gameName = game.getName();
+            gameName = !isShowSuffix ? game.getNameWithoutSuffix() : game.getName();
            if (gameName != null && !gameName.equals((String) view.getTag(R.string.tag_game_name_id))) {
                view.setText(gameName);
                view.setTag(R.string.tag_game_name_id, gameName);
@ -556,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("");
@ -583,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
@ -0,0 +1,221 @@
+package com.gh.common.dialog
+
+import android.annotation.SuppressLint
+import android.app.Activity
+import android.app.Dialog
+import android.content.Context
+import android.content.Intent
+import android.graphics.Color
+import android.graphics.Paint
+import android.graphics.drawable.ColorDrawable
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.CheckBox
+import android.widget.TextView
+import androidx.appcompat.app.AppCompatActivity
+import com.gh.gamecenter.common.avoidcallback.AvoidOnResultManager
+import com.gh.gamecenter.common.avoidcallback.Callback
+import com.gh.gamecenter.common.constant.Constants
+import com.gh.common.util.*
+import com.gh.gamecenter.R
+import com.gh.gamecenter.ShellActivity
+import com.gh.gamecenter.common.callback.ConfirmListener
+import com.gh.gamecenter.common.constant.EntranceConsts
+import com.gh.gamecenter.common.utils.SensorsBridge
+import com.gh.gamecenter.core.utils.GsonUtils
+import com.gh.gamecenter.core.utils.SPUtils
+import com.gh.gamecenter.feature.entity.AuthDialogEntity
+import com.gh.gamecenter.feature.entity.AuthDialogLevel
+import com.gh.gamecenter.feature.entity.GameEntity
+import com.gh.gamecenter.login.user.UserManager
+import com.google.gson.reflect.TypeToken
+import com.halo.assistant.fragment.user.UserInfoEditFragment
+import com.lightgame.utils.AppManager
+
+class CertificationDialog(
+    context: Context,
+    private val authDialogEntity: AuthDialogEntity,
+    val gameEntity: GameEntity,
+    val listener: ConfirmListener
+) :
+    Dialog(context, R.style.GhAlertDialog) {
+
+    private lateinit var view: View
+    private lateinit var detailedDesTv: TextView
+    private lateinit var noRemindAgainCb: CheckBox
+    private lateinit var actionLeftTv: TextView
+    private lateinit var actionRightTv: TextView
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+        view = LayoutInflater.from(context).inflate(R.layout.dialog_sertification, null)
+        setContentView(view)
+        detailedDesTv = view.findViewById(R.id.detailedDesTv)
+        noRemindAgainCb = view.findViewById(R.id.noRemindAgainCb)
+        actionLeftTv = view.findViewById(R.id.actionLeftTv)
+        actionRightTv = view.findViewById(R.id.actionRightTv)
+
+        detailedDesTv.paint.flags = Paint.UNDERLINE_TEXT_FLAG
+        detailedDesTv.paint.isAntiAlias = true
+
+        detailedDesTv.setOnClickListener {
+            DirectUtils.directToWebView(context, authDialogEntity.link)
+        }
+
+        when (authDialogEntity.level) {
+            AuthDialogLevel.MUST_PASS.value -> {
+                actionLeftTv.text = "暂不下载"
+                actionRightTv.text = "去实名认证"
+                noRemindAgainCb.visibility = View.GONE
+                actionLeftTv.setOnClickListener {
+                    SensorsBridge.trackEvent("VerificationPopupClick", "button_name", actionLeftTv.text.toString())
+                    dismiss()
+                }
+                actionRightTv.setOnClickListener {
+                    SensorsBridge.trackEvent("VerificationPopupClick", "button_name", actionRightTv.text.toString())
+                    if (UserManager.getInstance().isLoggedIn) {
+                        gotoAuthPage()
+                    } else {
+                        gotoLoginPage()
+                    }
+                }
+            }
+            AuthDialogLevel.ALWAYS_HINT.value -> {
+                actionLeftTv.text = "去实名认证"
+                actionRightTv.text = "继续下载"
+                noRemindAgainCb.visibility = View.GONE
+                actionLeftTv.setOnClickListener {
+                    SensorsBridge.trackEvent("VerificationPopupClick", "button_name", actionLeftTv.text.toString())
+                    if (UserManager.getInstance().isLoggedIn) {
+                        gotoAuthPage()
+                    } else {
+                        gotoLoginPage()
+                    }
+                }
+                actionRightTv.setOnClickListener {
+                    SensorsBridge.trackEvent("VerificationPopupClick", "button_name", actionRightTv.text.toString())
+                    listener.onConfirm()
+                    dismiss()
+                }
+            }
+            AuthDialogLevel.OPTIONAL_HINT.value -> {
+                actionLeftTv.text = "去实名认证"
+                actionRightTv.text = "继续下载"
+                noRemindAgainCb.visibility = View.VISIBLE
+                actionLeftTv.setOnClickListener {
+                    SensorsBridge.trackEvent("VerificationPopupClick", "button_name", actionLeftTv.text.toString())
+                    if (noRemindAgainCb.isChecked) {
+                        SPUtils.setBoolean(gameEntity.id, true)
+                    }
+                    if (UserManager.getInstance().isLoggedIn) {
+                        gotoAuthPage()
+                    } else {
+                        gotoLoginPage()
+                    }
+                }
+                actionRightTv.setOnClickListener {
+                    SensorsBridge.trackEvent("VerificationPopupClick", "button_name", actionRightTv.text.toString())
+                    if (noRemindAgainCb.isChecked) {
+                        SPUtils.getBoolean(gameEntity.id, true)
+                    }
+                    listener.onConfirm()
+                    dismiss()
+                }
+            }
+        }
+
+        SensorsBridge.trackEvent(
+            "VerificationDialogShow",
+            "game_id",
+            gameEntity.id,
+            "game_name",
+            gameEntity.name ?: "",
+            "game_type",
+            gameEntity.categoryChinese
+        )
+    }
+
+    //跳转登录页面
+    private fun gotoLoginPage() {
+        val currentActivity = AppManager.getInstance().currentActivity() ?: return
+
+        CheckLoginUtils.checkLogin(
+            currentActivity as AppCompatActivity,
+            null, true, "实名认证弹窗"
+        ) {
+            if (UserManager.getInstance().isAuth) {
+                listener.onConfirm()
+                dismiss()
+            }
+        }
+    }
+
+    //跳转实名认证页面
+    private fun gotoAuthPage() {
+        val currentActivity = AppManager.getInstance().currentActivity() ?: return
+
+        AvoidOnResultManager.getInstance(currentActivity as AppCompatActivity)
+            .startForResult(
+                ShellActivity.getIntent(
+                    context,
+                    ShellActivity.Type.REAL_NAME_INFO,
+                ).apply {
+                    putExtra(EntranceConsts.KEY_GAME_ID, gameEntity.id)
+                }, 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) {
+                                listener.onConfirm()
+                                dismiss()
+                            }
+                        }
+                    }
+                })
+    }
+
+
+    companion object {
+        @JvmStatic
+        fun showCertificationDialog(context: Context, game: GameEntity, listener: ConfirmListener) {
+            //1.先判断是否登录 是执行2 否执行3
+            //2.判断是否实名认证 是终止 否执行3
+            //3.判断是否需要弹出认证弹窗接口
+            if (UserManager.getInstance().isLoggedIn) {
+                if (UserManager.getInstance().isAuth) {//已实名认证
+                    listener.onConfirm()
+                } else {
+                    authDialog(context, game, listener)
+                }
+            } else {
+                authDialog(context, game, listener)
+            }
+        }
+
+        @SuppressLint("CheckResult")
+        private fun authDialog(context: Context, game: GameEntity, listener: ConfirmListener) {
+            var authDialog: AuthDialogEntity? = null
+            if (game.authDialog != null) {
+                authDialog = game.authDialog
+            }
+            if (authDialog == null) {
+                val datas = SPUtils.getString(Constants.SP_AUTH_DIALOG)
+                val type = object : TypeToken<List<AuthDialogEntity>>() {}.type
+                val authDialogs = GsonUtils.gson.fromJson<List<AuthDialogEntity>>(datas, type)
+                if (!authDialogs.isNullOrEmpty()) {
+                    authDialog = authDialogs.find { it.gameCategory == game.category }
+                }
+            }
+            val isCloseAuthDialog = SPUtils.getBoolean(game.id, false)
+            if (authDialog != null && (authDialog.level != AuthDialogLevel.OPTIONAL_HINT.value || !isCloseAuthDialog)) {
+                val dialog = CertificationDialog(context, authDialog, game, listener)
+                dialog.show()
+            } else {
+                listener.onConfirm()
+            }
+        }
+    }
+}
--- 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
@ -29,15 +29,6 @@ class PrivacyPolicyDialogFragment : BaseDialogFragment() {
    private var mCallBack: ((isSuccess: Boolean) -> Unit)? = null
    private val mBinding by lazy { DialogPrivacyProtocolBinding.inflate(layoutInflater) }

-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        if (savedInstanceState != null) {
-            dismiss()
-            return
-        }
-    }
-
    override fun onCreateView(
        inflater: LayoutInflater,
        container: ViewGroup?,
@ -68,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
            }

@ -110,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
            }

@ -124,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/dialog/ReserveDialog.kt
+++ b/app/src/main/java/com/gh/common/dialog/ReserveDialog.kt
@ -24,15 +24,6 @@ class ReserveDialog : BaseDialogFragment() {
    private lateinit var mReserveList: List<SimpleGameEntity>
    private var mDismissListener: (() -> Unit)? = null

-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        if (savedInstanceState != null) {
-            dismiss()
-            return
-        }
-    }
-
    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
        val binding: DialogReserveBinding = DialogReserveBinding.inflate(layoutInflater, null, 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/HistoryHelper.kt
+++ b/app/src/main/java/com/gh/common/history/HistoryHelper.kt
@ -75,6 +75,7 @@ object HistoryHelper {
        historyGame.iconFloat = gameEntity.iconFloat
        historyGame.name = gameEntity.name
        historyGame.tagStyle = gameEntity.tagStyle
+        historyGame.tag = gameEntity.getTag()
        historyGame.subtitle = gameEntity.subtitle
        historyGame.subtitleStyle = gameEntity.subtitleStyle
        return historyGame
--- a/app/src/main/java/com/gh/common/iinterface/ISmartRefresh.kt
+++ b/app/src/main/java/com/gh/common/iinterface/ISmartRefresh.kt
@ -1,11 +0,0 @@
-package com.gh.common.iinterface
-
-import com.gh.gamecenter.entity.PullDownPush
-
-interface ISmartRefresh {
-    fun setSmartRefreshEnabled(isEnable: Boolean)
-    fun finishTwoLevel(action: String)
-    fun finishRefresh()
-    fun popupPullDownPush(finishCallback: () -> Unit)
-    fun setPullDownPush(pullDownPush: PullDownPush?)
-}
--- a/app/src/main/java/com/gh/common/iinterface/ISmartRefreshContent.kt
+++ b/app/src/main/java/com/gh/common/iinterface/ISmartRefreshContent.kt
@ -1,21 +0,0 @@
-package com.gh.common.iinterface
-
-import android.view.View
-
-interface ISmartRefreshContent {
-    /**
-     * 启用/关闭 页面滑动
-     * @param isScrollEnabled 是否启用
-     */
-    fun setScrollEnabled(isScrollEnabled: Boolean)
-
-    fun onRefresh()
-
-    /**
-     * 启用/关闭 SwipeRefreshLayout 的下拉刷新
-     * @param isSwipeRefreshEnabled 是否启用
-     */
-    fun setSwipeRefreshEnabled(isSwipeRefreshEnabled: Boolean)
-
-    fun provideSlideBackgroundView(): View?
-}
--- a/app/src/main/java/com/gh/common/iinterface/ISuperiorChain.kt
+++ b/app/src/main/java/com/gh/common/iinterface/ISuperiorChain.kt
@ -1,9 +0,0 @@
-package com.gh.common.iinterface
-
-import com.gh.common.prioritychain.PriorityChain
-
-interface ISuperiorChain {
-    fun registerInferiorChain(chain: PriorityChain)
-
-    fun unregisterInferiorChain(chain: PriorityChain)
-}
--- a/app/src/main/java/com/gh/common/prioritychain/AccelerateNotificationHandler.kt
+++ b/app/src/main/java/com/gh/common/prioritychain/AccelerateNotificationHandler.kt
@ -14,7 +14,7 @@ import com.gh.gamecenter.core.utils.DisplayUtils
 import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.databinding.PopupAccelerateNotificationBinding
 import com.gh.gamecenter.feature.entity.GameEntity
-import com.gh.gamecenter.wrapper.MainWrapperViewModel
+import com.gh.gamecenter.fragment.MainWrapperViewModel

 class AccelerateNotificationHandler(priority: Int) : PriorityChainHandler(priority) {

@ -41,8 +41,7 @@ class AccelerateNotificationHandler(priority: Int) : PriorityChainHandler(priori
            if (gameEntityList == null) {
                processNext()
            } else {
-                updateStatus(STATUS_VALID)
-                process()
+                onProcess()
            }
        } else {
            if (gameEntityList == null) {
@ -53,7 +52,7 @@ class AccelerateNotificationHandler(priority: Int) : PriorityChainHandler(priori
        }
    }

-    override fun onProcess() : Boolean {
+    override fun onProcess() {
        when (getStatus()) {
            STATUS_VALID -> {
                val accelerateSet =
@ -64,7 +63,6 @@ class AccelerateNotificationHandler(priority: Int) : PriorityChainHandler(priori
                    }
                    accelerateSet.add(mGameList!![0].messageId)
                    SPUtils.setStringSet(Constants.SP_ACCELERATE_NOTIFICATION_POP_UP_SET, accelerateSet)
-                    return true
                } else {
                    processNext()
                }
@ -74,8 +72,6 @@ class AccelerateNotificationHandler(priority: Int) : PriorityChainHandler(priori
                processNext()
            }
        }
-
-        return false
    }

    companion object {
--- a/app/src/main/java/com/gh/common/prioritychain/CustomFloatingWindowHandler.kt
+++ b/app/src/main/java/com/gh/common/prioritychain/CustomFloatingWindowHandler.kt
@ -1,82 +0,0 @@
-package com.gh.common.prioritychain
-
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import com.gh.gamecenter.floatingwindow.FloatingWindowEntity
-import com.gh.gamecenter.livedata.Event
-
-class CustomFloatingWindowHandler(priority: Int) : PriorityChainHandler(priority) {
-
-    private val data = arrayListOf<FloatingWindowEntity>()
-
-    private val _showFloatingAction = MutableLiveData<Event<ArrayList<FloatingWindowEntity>>>()
-    val showFloatingAction: LiveData<Event<ArrayList<FloatingWindowEntity>>> = _showFloatingAction
-
-    fun setData(newData: List<FloatingWindowEntity>) {
-        data.clear()
-        data.addAll(newData)
-        doPreProcess()
-    }
-
-    private fun doPreProcess() {
-//        debugOnly {
-//            data.clear()
-//            data.add(
-//                FloatingWindowEntity(
-//                    id = "audire",
-//                    image = "https://jira.shanqu.cc/secure/attachment/57822/57822_image-2023-12-01-17-53-04-492.png",
-//                    link = WelcomeDialogEntity(
-//                        id = null,
-//                        time = null,
-//                        packages = null,
-//                        floatingWindowId = null,
-//                        shouldShowExitAnimation = false
-//                    ),
-//                    pushType = "maiorum",
-//                    expandable = false,
-//                    expandedImage = "fermentum",
-//                    bigPopupNotice = "dignissim"
-//                )
-//            )
-//        }
-
-        if (getStatus() == STATUS_PENDING) {
-            if (data.isNotEmpty()) {
-                updateStatus(STATUS_VALID)
-                process()
-            } else {
-                processNext()
-            }
-        } else {
-            if (data.isNotEmpty()) {
-                updateStatus(STATUS_VALID)
-            } else {
-                updateStatus(STATUS_INVALID)
-            }
-        }
-    }
-
-    override fun onProcess(): Boolean {
-        when (getStatus()) {
-            STATUS_VALID -> {
-                _showFloatingAction.value = Event(data)
-                processNext()
-//                    floatingWindowProvider.showFloatingWindowOnly(
-//                        mFragment!!,
-//                        mRecyclerView!!,
-//                        mWindowList!!,
-//                    ) {
-//                        val welcomeDialog = WelcomeDialogFragment.getInstance(it, true, mFragment)
-//                        welcomeDialog.show(mFragment!!.childFragmentManager, "WelcomeDialog")
-//                    }
-            }
-
-            STATUS_INVALID -> {
-                processNext()
-            }
-        }
-
-        return false
-    }
-
-}
--- 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,17 +32,16 @@ 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)
-                process()
+                onProcess()
            } else {
                processNext()
            }
@ -55,7 +54,7 @@ class FloatingWindowHandler(priority: Int) : PriorityChainHandler(priority) {
        }
    }

-    override fun onProcess(): Boolean {
+    override fun onProcess() {
        when (getStatus()) {
            STATUS_VALID -> {
                val floatingWindowProvider =
@ -65,7 +64,7 @@ class FloatingWindowHandler(priority: Int) : PriorityChainHandler(priority) {
                // 强校验所有条件均通过才能显示
                if (floatingWindowProvider == null || mFragment == null || mFragment?.isAdded == false || mRecyclerView == null) {
                    processNext()
-                    return false
+                    return
                }

                floatingWindowProvider.showFloatingWindowOnly(
@ -82,8 +81,6 @@ class FloatingWindowHandler(priority: Int) : PriorityChainHandler(priority) {
                processNext()
            }
        }
-
-        return false
    }

 }
--- a/app/src/main/java/com/gh/common/prioritychain/GlobalPriorityChainHelper.kt
+++ b/app/src/main/java/com/gh/common/prioritychain/GlobalPriorityChainHelper.kt
@ -1,244 +0,0 @@
-package com.gh.common.prioritychain
-
-import android.annotation.SuppressLint
-import android.app.Activity
-import android.app.Application.ActivityLifecycleCallbacks
-import android.os.Bundle
-import android.preference.PreferenceManager
-import androidx.fragment.app.FragmentActivity
-import com.gh.common.iinterface.ISuperiorChain
-import com.gh.common.util.CheckLoginUtils
-import com.gh.common.util.PackageUtils
-import com.gh.gamecenter.SplashScreenActivity
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.entity.SimpleGameEntity
-import com.gh.gamecenter.common.retrofit.BiResponse
-import com.gh.gamecenter.common.utils.debugOnly
-import com.gh.gamecenter.core.utils.SPUtils
-import com.gh.gamecenter.entity.DialogEntity
-import com.gh.gamecenter.feature.entity.WelcomeDialogEntity
-import com.gh.gamecenter.login.user.UserManager
-import com.gh.gamecenter.retrofit.RetrofitManager
-import com.halo.assistant.HaloApp
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
-
-/**
- * 全局的 APP 优先级弹窗链管理器
- *
- * 弹窗的优先级为
- * 启动跳转(-101) > 更新弹窗(-100) > 隐私政策弹窗(-99) > 消息通知权限弹窗(0) > 预约弹窗(1) > 启动弹窗(2)
- */
-object GlobalPriorityChainHelper : ISuperiorChain {
-
-    private val api = RetrofitManager.getInstance().api
-    private var inferiorChain: PriorityChain? = null
-    private val mainChain: PriorityChain by lazy { PriorityChain { inferiorChain?.start() } }
-
-    /**
-     * 当前 activity 是否使用于应用全局弹窗的弹出
-     * 排除启动页和其它非 FragmentActivity
-     */
-    fun isThisActivityValid(activity: Activity?): Boolean {
-        return activity is FragmentActivity
-                && !activity.isFinishing
-                && activity !is SplashScreenActivity
-    }
-
-    /**
-     * 预启动所有的优先级弹窗管理链
-     */
-    fun preStart() {
-        val launchRedirectHandler = LaunchRedirectHandler(-101)
-        val updateDialogHandler = UpdateDialogHandler(-100)
-        val privacyPolicyDialogHandler = PrivacyPolicyDialogHandler(-99)
-        val notificationPermissionDialogHandler = NotificationPermissionDialogHandler(0)
-        val reserveDialogHandler = ReserveDialogHandler(1)
-        val welcomeDialogHandler = WelcomeDialogHandler(2)
-
-        mainChain.addHandler(launchRedirectHandler)
-        mainChain.addHandler(updateDialogHandler)
-        mainChain.addHandler(privacyPolicyDialogHandler)
-        mainChain.addHandler(welcomeDialogHandler)
-        mainChain.addHandler(reserveDialogHandler)
-        mainChain.addHandler(notificationPermissionDialogHandler)
-
-        launchRedirectHandler.doPreProcess()
-        updateDialogHandler.doPreProcess()
-        requestOpeningDialogData(welcomeDialogHandler, privacyPolicyDialogHandler)
-        requestReserveDialogData(reserveDialogHandler)
-    }
-
-    /**
-     * 启动优先级弹窗管理链的执行
-     */
-    fun start() {
-        if (mainChain.isHandlerQueueEmpty()) return
-
-        mainChain.start()
-
-        observeLifecycle()
-    }
-
-    private fun observeLifecycle() {
-        HaloApp.getInstance().registerActivityLifecycleCallbacks(object : ActivityLifecycleCallbacks {
-            override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
-                // do nothing
-            }
-
-            override fun onActivityStarted(activity: Activity) {
-                // do nothing
-            }
-
-            override fun onActivityResumed(activity: Activity) {
-                // 优先级弹窗管理链为空时取消注册，避免无用调用
-                if (mainChain.isHandlerQueueEmpty()) {
-                    HaloApp.getInstance().unregisterActivityLifecycleCallbacks(this)
-                } else {
-                    resume()
-                }
-            }
-
-            override fun onActivityPaused(activity: Activity) {
-                // do nothing
-            }
-
-            override fun onActivityStopped(activity: Activity) {
-                // do nothing
-            }
-
-            override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {
-                // do nothing
-            }
-
-            override fun onActivityDestroyed(activity: Activity) {
-                // do nothing
-            }
-        })
-    }
-
-    /**
-     * 恢复链的处理
-     */
-    fun resume() {
-        mainChain.resume()
-    }
-
-    /**
-     * 请求首页启动弹窗相关的数据并执行相关 handler 的 preProcess
-     */
-    @SuppressLint("CheckResult")
-    private fun requestOpeningDialogData(
-        welcomeDialogHandler: WelcomeDialogHandler,
-        privacyPolicyDialogHandler: PrivacyPolicyDialogHandler
-    ) {
-        val sp = PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance())
-
-        val lastId = SPUtils.getString(sp, Constants.SP_LAST_OPENING_ID, "")
-        val lastTime = SPUtils.getLong(sp, Constants.SP_LAST_OPENING_TIME, 0)
-        val openType = if (HaloApp.getInstance().isNewForThisVersion) "first" else "not_first_time"
-
-        api.getOpeningDialog(HaloApp.getInstance().channel, lastId, lastTime, openType)
-            .subscribeOn(Schedulers.io())
-            .subscribe(object : BiResponse<DialogEntity>() {
-                override fun onSuccess(data: DialogEntity) {
-                    var welcomeDialogEntity: WelcomeDialogEntity? = null
-                    var privacyPolicyDialogEntity: DialogEntity.PrivacyPolicyEntity? = null
-
-                    // 全新安装忽略隐私弹窗
-                    if (data.privacyPolicyDialog != null) {
-                        val id = data.privacyPolicyDialog.id
-                        val lastAcceptedId = SPUtils.getString(Constants.SP_LAST_ACCEPTED_PRIVACY_DIALOG_ID, "")
-                        if (HaloApp.getInstance().isBrandNewInstall) {
-                            SPUtils.setString(Constants.SP_LAST_ACCEPTED_PRIVACY_DIALOG_ID, id)
-                        } else {
-                            if (id != lastAcceptedId) {
-                                privacyPolicyDialogEntity = data.privacyPolicyDialog
-                            }
-                        }
-                    }
-
-//                    debugOnly {
-//                        privacyPolicyDialogEntity = DialogEntity.PrivacyPolicyEntity(
-//                            "5f6f5f3d9d9b4e0001c3b3a5",
-//                            "privacy_policy",
-//                            "ONCE",
-//                            "INFORM",
-//                            "隐私政策",
-//                            1601116800000)
-//                    }
-
-                    privacyPolicyDialogHandler.doPreProcess(privacyPolicyDialogEntity)
-
-                    // 类型为游戏时判断是否本地已安装该游戏，已安装不弹弹窗
-                    if (data.welcomeDialog != null) {
-                        welcomeDialogEntity = data.welcomeDialog
-
-                        if (data.welcomeDialog.type == "game") {
-                            if (data.welcomeDialog.packages != null) {
-                                for (packageName in data.welcomeDialog.packages!!) {
-                                    if (PackageUtils.isInstalled(HaloApp.getInstance(), packageName)) {
-                                        welcomeDialogEntity = null
-                                        break
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                    welcomeDialogHandler.doPreProcess(welcomeDialogEntity)
-                }
-
-                override fun onFailure(exception: Exception) {
-                    privacyPolicyDialogHandler.doPreProcess(null)
-                }
-            })
-    }
-
-    /**
-     * 请求预约弹窗相关的数据
-     */
-    @SuppressLint("CheckResult")
-    private fun requestReserveDialogData(reserveDialogHandler: ReserveDialogHandler) {
-//        debugOnly {
-//            reserveDialogHandler.doPreProcess(arrayListOf(SimpleGameEntity(
-//                "5f6f5f3d9d9b4e0001c3b3a5",
-//                "5f6f5f3d9d9b4e0001c3b3a5",
-//                "https://and-static.ghzs.com/image/game/icon/2022/11/18/63772b0d398daaa7c5067298.png",
-//                "5f6f5f3d9d9b4e0001c3b3a5",
-//            )))
-//            return
-//        }
-
-        if (CheckLoginUtils.isLogin()) {
-            api.getReserveDialog(UserManager.getInstance().userId)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(object : BiResponse<List<SimpleGameEntity>>() {
-                    override fun onSuccess(data: List<SimpleGameEntity>) {
-                        reserveDialogHandler.doPreProcess(data)
-                    }
-
-                    override fun onFailure(exception: Exception) {
-                        reserveDialogHandler.doPreProcess(null)
-                    }
-                })
-        } else {
-            reserveDialogHandler.doPreProcess(null)
-        }
-    }
-
-    override fun registerInferiorChain(chain: PriorityChain) {
-        inferiorChain = chain
-        if (mainChain.isHandlerQueueEmpty()) {
-            inferiorChain?.resume()
-        }
-    }
-
-    override fun unregisterInferiorChain(chain: PriorityChain) {
-        if (inferiorChain == chain) {
-            inferiorChain = null
-        }
-    }
-
-}
--- a/app/src/main/java/com/gh/common/prioritychain/HomePushHandler.kt
+++ b/app/src/main/java/com/gh/common/prioritychain/HomePushHandler.kt
@ -1,26 +1,25 @@
 package com.gh.common.prioritychain

-import com.gh.common.iinterface.ISmartRefresh
+import com.gh.gamecenter.fragment.HomeSearchToolWrapperFragment

 class HomePushHandler(priority: Int): PriorityChainHandler(priority) {

-    private var mSmartRefreshFragment: ISmartRefresh? = null
+    private var mHomeFragment: HomeSearchToolWrapperFragment? = null

    /**
     * 提前预处理显示弹窗的内容
     */
-    fun doPreProcess(smartRefreshFragment: ISmartRefresh?, shouldShow: Boolean) {
-        mSmartRefreshFragment = smartRefreshFragment
+    fun doPreProcess(homeFragment: HomeSearchToolWrapperFragment?, shouldShow: Boolean) {
+        mHomeFragment = homeFragment

        if (getStatus() == STATUS_PENDING) {
-            if (shouldShow && smartRefreshFragment != null) {
-                updateStatus(STATUS_VALID)
-                process()
+            if (shouldShow && homeFragment != null) {
+                onProcess()
            } else {
                processNext()
            }
        } else {
-            if (shouldShow && smartRefreshFragment != null) {
+            if (shouldShow && homeFragment != null) {
                updateStatus(STATUS_VALID)
            } else {
                updateStatus(STATUS_INVALID)
@ -28,21 +27,18 @@ class HomePushHandler(priority: Int): PriorityChainHandler(priority) {
        }
    }

-    override fun onProcess(): Boolean {
+    override fun onProcess() {
        when (getStatus()) {
            STATUS_VALID -> {
-                mSmartRefreshFragment?.popupPullDownPush {
+                // 目前首页下拉二楼是首页最后一个弹窗类的东西，还没实现回调，如果有其它要在它后面弹出的，需要自行在它的实现结果后添加回调
+                mHomeFragment?.popUpHomePushIfNeeded {
                    processNext()
                }
-
-                return true
            }
            STATUS_INVALID -> {
                processNext()
            }
        }
-
-        return false
    }

 }
--- a/app/src/main/java/com/gh/common/prioritychain/LaunchRedirectHandler.kt
+++ b/app/src/main/java/com/gh/common/prioritychain/LaunchRedirectHandler.kt
@ -1,86 +0,0 @@
-package com.gh.common.prioritychain
-
-import android.annotation.SuppressLint
-import com.gh.common.util.DirectUtils
-import com.gh.gamecenter.BuildConfig
-import com.gh.gamecenter.common.entity.LaunchRedirect
-import com.gh.gamecenter.common.entity.LaunchRedirectWrapper
-import com.gh.gamecenter.common.retrofit.BiResponse
-import com.gh.gamecenter.common.utils.singleToMain
-import com.gh.gamecenter.core.AppExecutor
-import com.gh.gamecenter.core.utils.CurrentActivityHolder
-import com.gh.gamecenter.retrofit.RetrofitManager
-import com.gh.gamecenter.wrapper.MainWrapperRepository
-import com.halo.assistant.HaloApp
-
-/**
- * 初次启动跳转
- */
-class LaunchRedirectHandler(priority: Int) : PriorityChainHandler(priority) {
-
-    private var launchData: LaunchRedirect? = null
-
-    @SuppressLint("CheckResult")
-    fun doPreProcess() {
-//        if (true) {
-        if (HaloApp.getInstance().isBrandNewInstall) {
-            RetrofitManager.getInstance().newApi
-                .getLaunchRedirect(BuildConfig.VERSION_NAME, HaloApp.getInstance().channel)
-                .compose(singleToMain())
-                .subscribe(object : BiResponse<LaunchRedirectWrapper>() {
-                    override fun onSuccess(data: LaunchRedirectWrapper) {
-                        launchData = data.launchRedirect
-
-                        if (launchData == null) {
-                            updateStatus(STATUS_INVALID)
-                            processNext()
-                            return
-                        }
-
-                        // 尝试提前设置 tab default 避免首页数据加载完成，tab 选中会闪烁
-                        if (launchData?.type == "bottom_tab") {
-                            MainWrapperRepository.getInstance().sendMainSelectTabEvent(launchData!!)
-                        }
-
-                        if (getStatus() == STATUS_PENDING) {
-                            updateStatus(STATUS_VALID)
-                            process()
-                        } else {
-                            updateStatus(STATUS_VALID)
-                        }
-                    }
-
-                    override fun onFailure(exception: Exception) {
-                        super.onFailure(exception)
-                        updateStatus(STATUS_INVALID)
-                        processNext()
-                    }
-                })
-        } else {
-            updateStatus(STATUS_INVALID)
-            processNext()
-        }
-    }
-
-    override fun onProcess(): Boolean {
-        val currentActivity = CurrentActivityHolder.getCurrentActivity()
-
-        if (GlobalPriorityChainHelper.isThisActivityValid(currentActivity)) {
-            if (getStatus() == STATUS_VALID) {
-                // 当 type 为 "bottom_tab" 时上面 doPreProcess 中已经处理过了，但再选中一次好像也没有什么问题，先不特殊处理这个 case 了
-                DirectUtils.directToLinkPage(currentActivity!!, launchData!!, "首次启动跳转", "")
-                // 跳转页面不管回调，延迟 500ms 后执行下一个 handler
-                AppExecutor.uiExecutor.executeWithDelay({
-                    processNext()
-                }, 500L)
-
-                return true
-            } else if (getStatus() == STATUS_INVALID) {
-                processNext()
-            }
-        }
-
-        return false
-    }
-
-}
--- a/app/src/main/java/com/gh/common/prioritychain/NotificationPermissionDialogHandler.kt
+++ b/app/src/main/java/com/gh/common/prioritychain/NotificationPermissionDialogHandler.kt
@ -6,18 +6,15 @@ import com.gh.gamecenter.login.user.UserManager

 class NotificationPermissionDialogHandler(priority: Int) : PriorityChainHandler(priority) {

-    override fun onProcess(): Boolean {
+    override fun onProcess() {
        // 仅登录后再启动光环时请求一次权限
        if (UserManager.getInstance().isLoggedIn) {
            NotificationHelper.showNotificationHintDialog(NotificationUgc.LOGIN) {
                processNext()
            }
-            return true
        } else {
            processNext()
        }
-
-        return false
    }

 }
--- a/app/src/main/java/com/gh/common/prioritychain/PriorityChain.kt
+++ b/app/src/main/java/com/gh/common/prioritychain/PriorityChain.kt
@ -1,54 +1,22 @@
 package com.gh.common.prioritychain

-import com.lightgame.utils.Utils
 import java.util.*
 import java.util.concurrent.PriorityBlockingQueue

-class PriorityChain(private val completeCallback: (() -> Unit)? = null) {
+class PriorityChain {

-    private val handlerQueue: Queue<PriorityChainHandler> = PriorityBlockingQueue()
+    private val mHandlerQueue: Queue<PriorityChainHandler> = PriorityBlockingQueue()

-    /**
-     * 添加 handler 到队列中
-     */
    fun addHandler(handler: PriorityChainHandler) {
-        handlerQueue.add(handler.also {
+        mHandlerQueue.add(handler.also {
            it.setPriorityChain(this)
        })
    }

-    /**
-     * 启动队列中的 handler
-     */
    fun start() {
-        handlerQueue.peek()?.let {
-            it.injectQueue(handlerQueue)
-            it.process()
-        }
+        mHandlerQueue.poll()?.process(mHandlerQueue)
    }

-    /**
-     * 恢复队列中的 handler
-     */
-    fun resume() {
-        val handler = handlerQueue.peek()
-
-        if (handler?.getStatus() == PriorityChainHandler.STATUS_HANDLING) {
-            Utils.log(PriorityChainHandler.TAG, "${handler.javaClass.simpleName} 处于执行中状态，不用恢复")
-        } else {
-            handler?.injectQueue(handlerQueue)
-            handler?.process()
-        }
-    }
-
-    /**
-     * 队列是否为空
-     */
-    fun isHandlerQueueEmpty() = handlerQueue.isEmpty()
-
-
-    fun onHandleComplete() {
-        completeCallback?.invoke()
-    }
+    fun isHandlerQueueEmpty() = mHandlerQueue.isEmpty()

 }
--- a/app/src/main/java/com/gh/common/prioritychain/PriorityChainHandler.kt
+++ b/app/src/main/java/com/gh/common/prioritychain/PriorityChainHandler.kt
@ -5,76 +5,54 @@ import java.util.*

 abstract class PriorityChainHandler(private val mPriority: Int) : Comparable<PriorityChainHandler> {

-    private var status = STATUS_UNKNOWN
-    private var queue: Queue<PriorityChainHandler>? = null
+    private var mStatus = STATUS_UNKNOWN
+    private var mQueue: Queue<PriorityChainHandler>? = null

-    private var priorityChain: PriorityChain? = null
+    private var mPriorityChain: PriorityChain? = null

    /**
     * 获取当前 handler 的状态
     * - 等待结果返回 （STATUS_PENDING）
     * - 无需执行 （STATUS_INVALID）
     * - 可执行 （STATUS_VALID）
-     * - 执行中 （STATUS_HANDLING）
     * - 未知 （STATUS_UNKNOWN）
     */
-    fun getStatus(): Int = status
+    fun getStatus(): Int = mStatus

    fun updateStatus(status: Int) {
-        Utils.log(TAG, "${javaClass.simpleName} updateStatus ${this.status} $status")
+        Utils.log(TAG, "${javaClass.simpleName} updateStatus $status")

-        this.status = status
+        mStatus = status
    }

    fun setPriorityChain(priorityChain: PriorityChain) {
-        this.priorityChain = priorityChain
+        mPriorityChain = priorityChain
    }

-    fun injectQueue(queue: Queue<PriorityChainHandler>) {
-        this.queue = queue
-    }
-
-    fun process() {
-        Utils.log(TAG, "${javaClass.simpleName} process $status")
+    fun process(queue: Queue<PriorityChainHandler>) {
+        Utils.log(TAG, "${javaClass.simpleName} process $mStatus")

+        mQueue = queue
        // 若当前 handler 未经处理，将其状态改为 pending
-        if (status == STATUS_UNKNOWN) {
+        if (mStatus == STATUS_UNKNOWN) {
            updateStatus(STATUS_PENDING)
        }

-        if (status == STATUS_HANDLING) {
-            Utils.log(TAG, "${javaClass.simpleName} 已经处于执行中状态，不用再次执行")
-            return
-        }
-
-        val isHandling = onProcess()
-
-        if (isHandling) {
-            updateStatus(STATUS_HANDLING)
-        }
+        onProcess()
    }

    /**
     * 执行相关功能的地方
-     * @return 是否满足执行条件并处于执行中状态
     */
-    abstract fun onProcess(): Boolean
+    abstract fun onProcess()

    /**
     * 分发给下一个 handler 处理
     */
    fun processNext() {
-        Utils.log(TAG, "${javaClass.simpleName} processNext $status")
+        Utils.log(TAG, "${javaClass.simpleName} processNext $mStatus")

-        queue?.remove(this)
-        if (queue?.isEmpty() == true) {
-            priorityChain?.onHandleComplete()
-        } else {
-            queue?.peek()?.let {
-                it.injectQueue(queue!!)
-                it.process()
-            }
-        }
+        mQueue?.poll()?.process(mQueue!!)
    }

    override fun compareTo(other: PriorityChainHandler): Int {
@ -86,7 +64,6 @@ abstract class PriorityChainHandler(private val mPriority: Int) : Comparable<Pri
        internal const val STATUS_INVALID = 1
        internal const val STATUS_VALID = 2
        internal const val STATUS_UNKNOWN = 3
-        internal const val STATUS_HANDLING = 4

        const val TAG = "PriorityChainHandler"
    }
--- a/app/src/main/java/com/gh/common/prioritychain/PrivacyPolicyDialogHandler.kt
+++ b/app/src/main/java/com/gh/common/prioritychain/PrivacyPolicyDialogHandler.kt
@ -2,25 +2,25 @@ package com.gh.common.prioritychain

 import androidx.fragment.app.FragmentActivity
 import com.gh.common.dialog.PrivacyPolicyDialogFragment
-import com.gh.gamecenter.core.utils.CurrentActivityHolder
 import com.gh.gamecenter.entity.DialogEntity

 class PrivacyPolicyDialogHandler(priority: Int) : PriorityChainHandler(priority) {

+    private var mActivity: FragmentActivity? = null
    private var mPrivacyPolicyEntity: DialogEntity.PrivacyPolicyEntity? = null

    /**
     * 提前预处理显示弹窗的内容
     */
-    fun doPreProcess(privacyPolicyEntity: DialogEntity.PrivacyPolicyEntity?) {
+    fun doPreProcess(fragmentActivity: FragmentActivity, privacyPolicyEntity: DialogEntity.PrivacyPolicyEntity?) {
+        mActivity = fragmentActivity
        mPrivacyPolicyEntity = privacyPolicyEntity

        if (getStatus() == STATUS_PENDING) {
            if (privacyPolicyEntity == null) {
                processNext()
            } else {
-                updateStatus(STATUS_VALID)
-                process()
+                onProcess()
            }
        } else {
            if (privacyPolicyEntity == null) {
@ -31,26 +31,17 @@ class PrivacyPolicyDialogHandler(priority: Int) : PriorityChainHandler(priority)
        }
    }

-    override fun onProcess(): Boolean {
-        val currentActivity = CurrentActivityHolder.getCurrentActivity()
-
-        if (GlobalPriorityChainHelper.isThisActivityValid(currentActivity)) {
-            when (getStatus()) {
-                STATUS_VALID -> {
-                    PrivacyPolicyDialogFragment.show(currentActivity as FragmentActivity, mPrivacyPolicyEntity) { _: Boolean? ->
-                        processNext()
-                    }
-
-                    return true
-                }
-
-                STATUS_INVALID -> {
+    override fun onProcess() {
+        when(getStatus()) {
+            STATUS_VALID -> {
+                PrivacyPolicyDialogFragment.show(mActivity!!, mPrivacyPolicyEntity) { _: Boolean? ->
                    processNext()
                }
            }
+            STATUS_INVALID -> {
+                processNext()
+            }
        }
-
-        return false
    }

 }
--- a/app/src/main/java/com/gh/common/prioritychain/ReserveDialogHandler.kt
+++ b/app/src/main/java/com/gh/common/prioritychain/ReserveDialogHandler.kt
@ -1,26 +1,27 @@
 package com.gh.common.prioritychain

-import androidx.fragment.app.FragmentActivity
+import androidx.fragment.app.Fragment
 import com.gh.common.dialog.ReserveDialog
 import com.gh.gamecenter.common.entity.SimpleGameEntity
-import com.gh.gamecenter.core.utils.CurrentActivityHolder
+import com.gh.gamecenter.message.MessageUnreadRepository

 class ReserveDialogHandler(priority: Int) : PriorityChainHandler(priority) {

+    private var mFragment: Fragment? = null
    private var mReserveData: List<SimpleGameEntity>? = null

    /**
     * 提前预处理显示弹窗的内容
     */
-    fun doPreProcess(reserveData: List<SimpleGameEntity>?) {
+    fun doPreProcess(fragment: Fragment, reserveData: List<SimpleGameEntity>?) {
+        mFragment = fragment
        mReserveData = reserveData

        if (getStatus() == STATUS_PENDING) {
            if (reserveData.isNullOrEmpty()) {
                processNext()
            } else {
-                updateStatus(STATUS_VALID)
-                process()
+                onProcess()
            }
        } else {
            if (reserveData.isNullOrEmpty()) {
@ -31,28 +32,21 @@ class ReserveDialogHandler(priority: Int) : PriorityChainHandler(priority) {
        }
    }

-    override fun onProcess(): Boolean {
-        val currentActivity = CurrentActivityHolder.getCurrentActivity()
-
-        if (GlobalPriorityChainHelper.isThisActivityValid(currentActivity)) {
-            when (getStatus()) {
-                STATUS_VALID -> {
-                    val reserveDialog = ReserveDialog.getInstance(mReserveData!!)
-                    reserveDialog.setOnDismissListener {
-                        processNext()
-                    }
-                    reserveDialog.show((currentActivity as FragmentActivity).supportFragmentManager, "reserveDialog")
-
-                    return true
-                }
-
-                STATUS_INVALID -> {
+    override fun onProcess() {
+        when (getStatus()) {
+            STATUS_VALID -> {
+                val reserveDialog = ReserveDialog.getInstance(mReserveData!!)
+                reserveDialog.setOnDismissListener {
+                    MessageUnreadRepository.loadMessageUnreadData()
                    processNext()
                }
+                reserveDialog.show(mFragment!!.childFragmentManager, "reserveDialog")
+            }
+
+            STATUS_INVALID -> {
+                processNext()
            }
        }
-
-        return false
    }

 }
--- a/app/src/main/java/com/gh/common/prioritychain/UpdateDialogHandler.kt
+++ b/app/src/main/java/com/gh/common/prioritychain/UpdateDialogHandler.kt
@ -1,47 +1,17 @@
 package com.gh.common.prioritychain

-import androidx.fragment.app.FragmentActivity
-import com.gh.gamecenter.core.utils.CurrentActivityHolder
-import com.gh.gamecenter.update.UpdateHelper
+import android.content.Context
+import com.gh.gamecenter.manager.UpdateManager

-class UpdateDialogHandler(priority: Int) : PriorityChainHandler(priority) {
+class UpdateDialogHandler(context: Context, priority: Int) : PriorityChainHandler(priority) {

-    fun doPreProcess() {
-        UpdateHelper.getUpdate(false) {
-            if (getStatus() == STATUS_PENDING) {
-                if (UpdateHelper.isUpdateValid(false)) {
-                    updateStatus(STATUS_VALID)
-                    process()
-                } else {
-                    updateStatus(STATUS_INVALID)
-                    processNext()
-                }
-            } else {
-                if (UpdateHelper.isUpdateValid(false)) {
-                    updateStatus(STATUS_VALID)
-                } else {
-                    updateStatus(STATUS_INVALID)
-                }
-            }
+    private val mUpdateManager = UpdateManager.getInstance(context)
+
+    override fun onProcess() {
+        mUpdateManager.checkUpdate(true, null)
+        mUpdateManager.setDismissCallback {
+            processNext()
        }
    }

-    override fun onProcess(): Boolean {
-        val currentActivity = CurrentActivityHolder.getCurrentActivity()
-
-        if (GlobalPriorityChainHelper.isThisActivityValid(currentActivity)) {
-            if (getStatus() == STATUS_VALID) {
-                UpdateHelper.showUpdateDialog(currentActivity as FragmentActivity) {
-                    processNext()
-                }
-
-                return true
-            } else if (getStatus() == STATUS_INVALID) {
-                processNext()
-            }
-        }
-
-        return false
-    }
-
 }
--- a/app/src/main/java/com/gh/common/prioritychain/WelcomeDialogHandler.kt
+++ b/app/src/main/java/com/gh/common/prioritychain/WelcomeDialogHandler.kt
@ -1,31 +1,32 @@
 package com.gh.common.prioritychain

 import android.graphics.Bitmap
-import androidx.fragment.app.FragmentActivity
+import androidx.fragment.app.Fragment
 import com.gh.gamecenter.common.callback.BiCallback
 import com.gh.gamecenter.common.utils.ImageUtils
-import com.gh.gamecenter.core.utils.CurrentActivityHolder
 import com.gh.gamecenter.feature.entity.WelcomeDialogEntity
+import com.gh.gamecenter.fragment.MainWrapperViewModel
 import com.gh.gamecenter.fragment.WelcomeDialogFragment
-import com.gh.gamecenter.wrapper.MainWrapperViewModel
 import com.halo.assistant.HaloApp

-class WelcomeDialogHandler(priority: Int) : PriorityChainHandler(priority) {
+class WelcomeDialogHandler(priority: Int): PriorityChainHandler(priority) {

-    private var welcomeDialogEntity: WelcomeDialogEntity? = null
+    private var mFragment: Fragment? = null
+    private var mWelcomeDialogEntity: WelcomeDialogEntity? = null

-    fun doPreProcess(welcomeDialogEntity: WelcomeDialogEntity?) {
-        this.welcomeDialogEntity = welcomeDialogEntity
+    fun doPreProcess(fragment: Fragment, welcomeDialogEntity: WelcomeDialogEntity?) {
+        mFragment = fragment
+        mWelcomeDialogEntity = welcomeDialogEntity

        val preLoadClosure = {
            // 判断启动本次应用是否已经弹窗，不是的话弹启动弹窗
            if (HaloApp.get(MainWrapperViewModel.SHOULD_SHOW_OPENING_DIALOG, false) == null) {
                HaloApp.put(MainWrapperViewModel.SHOULD_SHOW_OPENING_DIALOG, false)
-                ImageUtils.getBitmap(this.welcomeDialogEntity!!.icon, object : BiCallback<Bitmap, Boolean> {
+                ImageUtils.getBitmap(mWelcomeDialogEntity!!.icon, object : BiCallback<Bitmap, Boolean> {
                    override fun onFirst(first: Bitmap) {
                        if (getStatus() == STATUS_PENDING) {
                            updateStatus(STATUS_VALID)
-                            process()
+                            onProcess()
                        } else {
                            updateStatus(STATUS_VALID)
                        }
@ -55,28 +56,24 @@ class WelcomeDialogHandler(priority: Int) : PriorityChainHandler(priority) {
        }
    }

-    override fun onProcess(): Boolean {
-        val currentActivity = CurrentActivityHolder.getCurrentActivity()
-
-        if (GlobalPriorityChainHelper.isThisActivityValid(currentActivity)) {
-            when (getStatus()) {
-                STATUS_VALID -> {
-                    val welcomeDialog = WelcomeDialogFragment.getInstance(welcomeDialogEntity)
+    override fun onProcess() {
+        when (getStatus()) {
+            STATUS_VALID -> {
+                if (mFragment == null || !mFragment!!.isAdded) {
+                    updateStatus(STATUS_INVALID)
+                    processNext()
+                } else {
+                    val welcomeDialog = WelcomeDialogFragment.getInstance(mWelcomeDialogEntity)
                    welcomeDialog.setOnDismissListener {
                        processNext()
                    }
-                    welcomeDialog.show((currentActivity as FragmentActivity).supportFragmentManager, "WelcomeDialog")
-
-                    return true
-                }
-
-                STATUS_INVALID -> {
-                    processNext()
+                    welcomeDialog.show(mFragment!!.childFragmentManager, "WelcomeDialog")
                }
            }
+            STATUS_INVALID -> {
+                processNext()
+            }
        }
-
-        return false
    }

 }
--- a/app/src/main/java/com/gh/common/provider/AppProviderImpl.kt
+++ b/app/src/main/java/com/gh/common/provider/AppProviderImpl.kt
@ -82,8 +82,4 @@ class AppProviderImpl : IAppProvider {
    override fun getIsBrandNewInstall(): Boolean {
        return HaloApp.getInstance().isBrandNewInstall
    }
-
-    override fun setSkippingThirdParty(isSkippingThirdParty: Boolean) {
-        HaloApp.getInstance().isSkippingThirdParty = isSkippingThirdParty
-    }
 }
--- a/app/src/main/java/com/gh/common/provider/BindingAdaptersProviderImpl.kt
+++ b/app/src/main/java/com/gh/common/provider/BindingAdaptersProviderImpl.kt
@ -16,8 +16,9 @@ class BindingAdaptersProviderImpl : IBindingAdaptersProvider {
        view: TextView,
        game: GameEntity,
        isShowPlatform: Boolean,
+        isShowSuffix: Boolean
    ) {
-        BindingAdapters.setGameName(view, game, isShowPlatform)
+        BindingAdapters.setGameName(view, game, isShowPlatform, isShowSuffix)
    }

    override fun setGameTags(layout: LinearLayout, gameEntity: GameEntity) {
--- 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/ConfigProviderImpl.kt
+++ b/app/src/main/java/com/gh/common/provider/ConfigProviderImpl.kt
@ -100,6 +100,10 @@ class ConfigProviderImpl : IConfigProvider {
        return Config.getNightModeSetting()?.setting ?: false
    }

+    override fun isShowPlugin(gameId: String): Boolean {
+        return Config.isShowPlugin(gameId)
+    }
+
    override fun init(context: Context?) {
        // Do nothing
    }
--- a/app/src/main/java/com/gh/common/provider/DirectProviderImpl.kt
+++ b/app/src/main/java/com/gh/common/provider/DirectProviderImpl.kt
@ -120,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/MainProviderImpl.kt
+++ b/app/src/main/java/com/gh/common/provider/MainProviderImpl.kt
@ -8,8 +8,8 @@ import com.gh.gamecenter.core.provider.IMainProvider

@Route(path = RouteConsts.provider.mainActivity, name = "MainActivity暴露服务")
 class MainProviderImpl : IMainProvider {
-    override fun skipToMainActivity(context: Context, type: String) {
-        MainActivity.skipToMainActivity(context, type)
+    override fun skipToMainActivity(context: Context, position: Int) {
+        MainActivity.skipToMainActivity(context, position)
    }

    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/UpdateManagerProviderImpl.kt
+++ b/app/src/main/java/com/gh/common/provider/UpdateManagerProviderImpl.kt
@ -1,30 +1,16 @@
 package com.gh.common.provider

 import android.content.Context
-import androidx.fragment.app.FragmentActivity
+import android.os.Handler
 import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.common.util.DialogUtils
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IUpdateManagerProvider
-import com.gh.gamecenter.core.utils.ToastUtils
-import com.gh.gamecenter.update.UpdateHelper
+import com.gh.gamecenter.manager.UpdateManager

@Route(path = RouteConsts.provider.updateManager, name = "UpdateManager暴露服务")
 class UpdateManagerProviderImpl: IUpdateManagerProvider {
-    override fun checkUpdate(activity: FragmentActivity, ignoreSuppressOption: Boolean) {
-        val dialog = DialogUtils.showWaitDialog(activity, "检查更新中...")
-
-        UpdateHelper.getUpdate(ignoreSuppressOption) {
-            dialog.dismiss()
-
-            if (UpdateHelper.isUpdateValid(ignoreSuppressOption)) {
-                UpdateHelper.showUpdateDialog(activity) {
-                    // Do nothing
-                }
-            } else {
-                ToastUtils.toast("您的光环助手已是最新版本")
-            }
-        }
+    override fun checkUpdate(context: Context, isAutoCheck: Boolean, handler: Handler?) {
+        UpdateManager.getInstance(context).checkUpdate(isAutoCheck, handler)
    }

    override fun init(context: Context?) {
--- 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?,
@ -62,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,
@ -131,7 +125,6 @@ object ArchiveDownloadButtonHelper {
        context: Context,
        entrance: String,
        packageName: String,
-        config: String,
        archiveEntity: ArchiveEntity,
        gameEntity: GameEntity?
    ) {
@ -142,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)
@ -168,7 +161,6 @@ object ArchiveDownloadButtonHelper {
        entrance: String,
        fragment: Fragment,
        packageName: String,
-        viewModel: BaseCloudArchiveViewModel,
        archiveEntity: ArchiveEntity,
        downloadBtn: TextView,
        gameEntity: GameEntity?,
@ -205,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 -> {
@ -261,7 +251,6 @@ object ArchiveDownloadButtonHelper {
        context: Context,
        entrance: String,
        packageName: String,
-        config: String,
        archiveEntity: ArchiveEntity,
        gameEntity: GameEntity?
    ) {
@ -272,7 +261,7 @@ object ArchiveDownloadButtonHelper {
            R.string.archive_apply.toResString(),
            R.string.cancel.toResString(),
            {
-                applyArchive(context, entrance, packageName, config, archiveEntity, gameEntity)
+                applyArchive(context, entrance, packageName, archiveEntity, gameEntity)
                NewFlatLogUtils.logCloudArchiveApplyDialogRelated("cloud_save_overwrite_dialog_click", "使用")
                SensorsBridge.trackEvent(
                    "CloudSaveOverwriteDialogClick",
--- 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,25 +114,18 @@ 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);

+                // gid 变更时上报 gid 变更日志
+                if (!TextUtils.isEmpty(originalGid) && !originalGid.equals(gid)) {
+                    NewFlatLogUtils.logGidChanged(originalGid, gid);
+                }
+
                SensorsBridge.setGid(gid);

-                // 更新广告配置
-                ExtensionsKt.doOnMainProcessOnly(HaloApp.getInstance(), () -> {
-                    AdDelegateHelper.INSTANCE.requestAdConfig(false, "", null);
-                });
-
                // 避免重复调用
-                if (!TextUtils.isEmpty(gid)) {
+                if (!TextUtils.isEmpty(gid) && !gid.equals(originalGid)) {
                    GameSubstituteRepositoryHelper.updateSubstitutableGames();
                }

--- 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,346 +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 (!"光环助手".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:
@ -512,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);
                    }
                }

@ -554,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/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,9 @@ 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.*
+import com.gh.gamecenter.entity.SubjectData
+import com.gh.gamecenter.entity.SubjectRecommendEntity
+import com.gh.gamecenter.entity.VideoLinkEntity
 import com.gh.gamecenter.eventbus.EBSkip
 import com.gh.gamecenter.feature.entity.GameDetailServer
 import com.gh.gamecenter.feature.entity.GameEntity
@ -50,23 +52,19 @@ import com.gh.gamecenter.feature.provider.IConcernInfoProvider
 import com.gh.gamecenter.forum.detail.ForumDetailActivity
 import com.gh.gamecenter.forum.home.CommunityHomeFragment
 import com.gh.gamecenter.forum.search.ForumOrUserSearchActivity
+import com.gh.gamecenter.fragment.MainWrapperFragment
 import com.gh.gamecenter.game.columncollection.detail.ColumnCollectionDetailActivity
 import com.gh.gamecenter.game.commoncollection.detail.CommonCollectionDetailActivity
 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
-import com.gh.gamecenter.libao.LibaoDetailActivity
 import com.gh.gamecenter.login.user.UserManager
-import com.gh.gamecenter.newsdetail.NewsDetailActivity
 import com.gh.gamecenter.personalhome.UserHomeActivity
 import com.gh.gamecenter.personalhome.background.PersonalityBackgroundActivity
 import com.gh.gamecenter.personalhome.border.AvatarBorderActivity
@ -86,15 +84,12 @@ import com.gh.gamecenter.servers.gametest2.GameServerTestV2Activity
 import com.gh.gamecenter.setting.SettingBridge
 import com.gh.gamecenter.subject.SubjectActivity
 import com.gh.gamecenter.tag.TagsActivity
-import com.gh.gamecenter.toolbox.ToolBoxActivity
+import com.gh.gamecenter.toolbox.ToolBoxBlockActivity
 import com.gh.gamecenter.video.data.VideoDataActivity
 import com.gh.gamecenter.video.detail.VideoDetailActivity
 import com.gh.gamecenter.video.detail.VideoDetailContainerViewModel
 import com.gh.gamecenter.video.game.GameVideoActivity
 import com.gh.gamecenter.video.videomanager.VideoManagerActivity
-import com.gh.gamecenter.wrapper.MainWrapperFragment
-import com.gh.gamecenter.wrapper.MainWrapperRepository
-import com.gh.gamecenter.wrapper.ToolbarWrapperActivity
 import com.gh.vspace.VDownloadManagerActivity
 import com.halo.assistant.HaloApp
 import com.halo.assistant.fragment.WebFragment
@ -159,10 +154,7 @@ object DirectUtils {
        "bbs_video",
        "explore_column",
        "game_explore",
-        "column_test_v2",
-        "game_list_collection",
-        "multi_tab_nav",
-        "custom_page"
+        "column_test_v2"
    )

    fun directToLinkPage(
@ -197,8 +189,6 @@ object DirectUtils {
                }
            }

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

@ -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
@ -397,7 +384,7 @@ object DirectUtils {

            "video_tab" -> directToVideoTab(context)

-            "toolkit" -> context.startActivity(ToolBoxActivity.getIntent(context, entrance))
+            "toolkit" -> context.startActivity(ToolBoxBlockActivity.getIntent(context, entrance))

            "column_test" -> context.startActivity(
                GameServerTestActivity.getIntent(
@ -457,30 +444,6 @@ object DirectUtils {

            "qq_mini_game_column" -> directToQGameHome(context)

-            "game_list_collection" -> directToGameCollectionListDetail(
-                context,
-                linkEntity.link ?: "",
-                linkEntity.text ?: "",
-                linkEntity.explain,
-                entrance
-            )
-
-            "multi_tab_nav" -> context.startActivity(ToolbarWrapperActivity.getMultiTabNavIntent(context, linkEntity.link ?: "", linkEntity.text ?: ""))
-
-            "custom_page" -> context.startActivity(ToolbarWrapperActivity.getCustomPageIntent(context, linkEntity.link ?: "", linkEntity.text ?: ""))
-
-            // 选中首页底部 tab
-            "bottom_tab" -> {
-                val intent = Intent(context, MainActivity::class.java).apply {
-                    flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
-                }
-                context.startActivity(intent)
-
-                if (linkEntity is LaunchRedirect) {
-                    MainWrapperRepository.getInstance().sendMainSelectTabEvent(linkEntity)
-                }
-            }
-
            "" -> {
                // do nothing
            }
@ -535,9 +498,7 @@ object DirectUtils {
        columnName: String = "",
        blockId: String = "",
        blockName: String = "",
-        style: String = "",
-        exposureEvent: ExposureEvent? = null,
-        showSubjectTab: Boolean = false
+        exposureEvent: ExposureEvent? = null
    ) {
        if (id.isEmpty()) return
        val bundle = Bundle()
@ -547,9 +508,7 @@ object DirectUtils {
        bundle.putString(KEY_COLUMNNAME, columnName)
        bundle.putString(KEY_BLOCK_ID, blockId)
        bundle.putString(KEY_BLOCK_NAME, blockName)
-        bundle.putString(KEY_COLUMN_COLLECTION_STYLE, style)
        bundle.putInt(KEY_POSITION, position)
-        bundle.putBoolean(KEY_SHOW_SUBJECT_TAB, showSubjectTab)
        if (exposureEvent != null) {
            bundle.putParcelableArrayList(EntranceConsts.KEY_EXPOSURE_SOURCE_LIST, ArrayList(exposureEvent.source))
        }
@ -573,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)
@ -872,25 +830,25 @@ object DirectUtils {
        jumpActivity(context, bundle)
    }

+    /**
+     * 跳转到下载管理器并开始下载 [gameId] 和 [packageName] 用于唯一确定一个下载文件
+     */
    @JvmStatic
-    fun directToDownloadManager(
+    fun directToDownloadManagerAndStartDownload(
        context: Context,
-        entrance: String = "",
-        bottomTab: String = "",
-        gameColumnId: String = "",
-        gameColumnName: String = "",
-        customPageId: String = "",
-        customPageName: String = ""
+        gameId: String? = "",
+        packageName: String? = "",
+        entrance: String? = null
    ) {
-        val bundle = Bundle()
-        bundle.putString(KEY_ENTRANCE, entrance)
-        bundle.putString(KEY_TO, DownloadManagerActivity.TAG)
-        bundle.putString(KEY_BOTTOM_TAB_NAME, bottomTab)
-        bundle.putString(KEY_GAME_COLUMN_ID, gameColumnId)
-        bundle.putString(KEY_GAME_COLUMN_NAME, gameColumnName)
-        bundle.putString(KEY_CUSTOM_PAGE_ID, customPageId)
-        bundle.putString(KEY_CUSTOM_PAGE_NAME, customPageName)
-        jumpActivity(context, bundle)
+        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
@ -906,14 +864,14 @@ 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
    fun directToToolbox(context: Context, gameId: String, toolboxUrl: String, entrance: String = ENTRANCE_BROWSER) {
        val bundle = Bundle()
        bundle.putString(KEY_ENTRANCE, entrance)
-        bundle.putString(KEY_TO, ToolBoxActivity::class.java.name)
+        bundle.putString(KEY_TO, ToolBoxBlockActivity::class.java.name)
        bundle.putString(KEY_GAMEID, gameId)
        bundle.putString(KEY_URL, toolboxUrl)
        jumpActivity(context, bundle)
@ -967,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, "跳转地址无效")
        }
    }

@ -1058,7 +1016,21 @@ object DirectUtils {
     */
    @JvmStatic
    fun directToCommunity(context: Context, community: CommunityEntity?) {
+//        if (MainActivity::class.java.name != RunningUtils.getTopActivity(context)) {
+//            val intent = Intent(context, MainActivity::class.java)
+//            intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
+//            context.startActivity(intent)
+//
+//            UserManager.getInstance().setCommunityData(community)
+//
+//            // 这里换个线程操作是为了做一点延时
+//            AppExecutor.ioExecutor.execute {
+//                EventBus.getDefault().post(EBSkip(MainActivity.EB_SKIP_MAIN, MainWrapperFragment.INDEX_BBS))
+//                EventBus.getDefault().post(EBReuse(CommunityFragment.EB_RETRY_PAGE))
+//            }
+//        } else {
        directForumDetail(context, community?.id)
+//        }
    }

    @JvmStatic
@ -1153,8 +1125,7 @@ object DirectUtils {
        act: String = "",
        paginationType: String = "",
        fieldId: String = "",
-        sectionName: String = "",
-        isHomeVideo: Boolean = false
+        sectionName: String = ""
    ) {
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
            val bundle = Bundle()
@ -1172,7 +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)
            jumpActivity(context, bundle)
        } else {
            DialogHelper.showVideoUnsupportedDialog(context)
@ -1502,10 +1472,10 @@ object DirectUtils {

            // 这里换个线程操作是为了做一点延时
            runOnIoThread {
-                EventBus.getDefault().post(EBSkip(MainActivity.EB_SKIP_MAIN, MainWrapperFragment.TYPE_HOME))
+                EventBus.getDefault().post(EBSkip(MainActivity.EB_SKIP_MAIN, MainWrapperFragment.INDEX_HOME))
            }
        } else {
-            jumpActivity(context, Bundle().apply { putString(KEY_TYPE, MainWrapperFragment.TYPE_HOME) })
+            jumpActivity(context, Bundle().apply { putInt(KEY_POSITION, MainWrapperFragment.INDEX_HOME) })
        }
    }

@ -1523,12 +1493,12 @@ object DirectUtils {

            // 这里换个线程操作是为了做一点延时
            runOnIoThread {
-                EventBus.getDefault().post(EBSkip(MainActivity.EB_SKIP_MAIN, MainWrapperFragment.TYPE_COMMUNITY_HOME))
+                EventBus.getDefault().post(EBSkip(MainActivity.EB_SKIP_MAIN, MainWrapperFragment.INDEX_BBS))
                EventBus.getDefault().post(EBSkip(CommunityHomeFragment.EB_TAB, position))
            }
        } else {
            jumpActivity(context, Bundle().apply {
-                putString(KEY_TYPE, MainWrapperFragment.TYPE_COMMUNITY_HOME)
+                putInt(KEY_POSITION, MainWrapperFragment.INDEX_BBS)
                putInt(KEY_SUB_POSITION, position)
            })
        }
@ -1546,10 +1516,10 @@ object DirectUtils {

            // 这里换个线程操作是为了做一点延时
            runOnIoThread {
-                EventBus.getDefault().post(EBSkip(MainActivity.EB_SKIP_MAIN, MainWrapperFragment.TYPE_VIDEO_STREAM))
+                EventBus.getDefault().post(EBSkip(MainActivity.EB_SKIP_MAIN, MainWrapperFragment.INDEX_VIDEO))
            }
        } else {
-            jumpActivity(context, Bundle().apply { putString(KEY_TYPE, MainWrapperFragment.TYPE_VIDEO_STREAM) })
+            jumpActivity(context, Bundle().apply { putInt(KEY_POSITION, MainWrapperFragment.INDEX_VIDEO) })
        }
    }

@ -1565,10 +1535,10 @@ object DirectUtils {

            // 这里换个线程操作是为了做一点延时
            runOnIoThread {
-                EventBus.getDefault().post(EBSkip(MainActivity.EB_SKIP_MAIN, MainWrapperFragment.TYPE_MY_HALO))
+                EventBus.getDefault().post(EBSkip(MainActivity.EB_SKIP_MAIN, MainWrapperFragment.INDEX_PERSONAL))
            }
        } else {
-            jumpActivity(context, Bundle().apply { putString(KEY_TYPE, MainWrapperFragment.TYPE_MY_HALO) })
+            jumpActivity(context, Bundle().apply { putInt(KEY_POSITION, MainWrapperFragment.INDEX_PERSONAL) })
        }
    }

@ -1972,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,
@ -1986,8 +1955,7 @@ object DirectUtils {
            qaContentId,
            fromRatingKey,
            diagnosis,
-            forceLogin,
-            isSmoothGame
+            forceLogin
        )
        if (requestCode != null) {
            (context as Activity).startActivityForResult(intent, requestCode)
@ -2001,34 +1969,8 @@ object DirectUtils {
     * @param bbsId, 为空时搜索全范围的内容，不为空时搜索该 bbsId 对应的内容
     */
    @JvmStatic
-    fun directToForumOrUserSearch(
-        context: Context,
-        bbsId: String,
-        entrance: String,
-        sourceEntrance: String,
-        forumName: String,
-        bottomTab: String = "",
-        multiTabId: String = "",
-        multiTabName: String = "",
-        customPageId: String = "",
-        customPageName: String = "",
-        searchBoxPattern: String = ""
-    ) {
-        context.startActivity(
-            ForumOrUserSearchActivity.getIntent(
-                context,
-                bbsId,
-                entrance,
-                sourceEntrance,
-                forumName,
-                bottomTab,
-                multiTabId,
-                multiTabName,
-                customPageId,
-                customPageName,
-                searchBoxPattern
-            )
-        )
+    fun directToForumOrUserSearch(context: Context, bbsId: String, entrance: String) {
+        context.startActivity(ForumOrUserSearchActivity.getIntent(context, bbsId, entrance))
    }

    @JvmStatic
@ -2102,27 +2044,9 @@ object DirectUtils {
    fun directToQGameSearch(
        context: Context,
        hint: String,
-        sourceEntrance: String,
-        bottomTab: String = "",
-        multiTabId: String = "",
-        multiTabName: String = "",
-        customPageId: String = "",
-        customPageName: String = "",
-        searchBoxPattern: String = ""
+        sourceEntrance: String
    ) {
-        context.startActivity(
-            QGameSearchActivity.getIntent(
-                context,
-                hint,
-                sourceEntrance,
-                bottomTab,
-                multiTabId,
-                multiTabName,
-                customPageId,
-                customPageName,
-                searchBoxPattern
-            )
-        )
+        context.startActivity(QGameSearchActivity.getIntent(context, hint, sourceEntrance))
    }

    @SuppressLint("CheckResult")
@ -2177,98 +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))
-        }
-    }
-
-    fun directToSearch(
-        context: Context,
-        searchType: String,
-        searchHint: String,
-        entrance: String,
-        sourceEntrance: String,
-        bottomTab: String = "",
-        multiTabId: String = "",
-        multiTabName: String = "",
-        customPageId: String = "",
-        customPageName: String = "",
-        searchBoxPattern: String = ""
-    ) {
-        when (searchType) {
-            "halo_game" -> context.startActivity(
-                SearchActivity.getIntent(
-                    context,
-                    false,
-                    searchHint,
-                    entrance,
-                    sourceEntrance,
-                    bottomTab,
-                    multiTabId,
-                    multiTabName,
-                    customPageId,
-                    customPageName,
-                    searchBoxPattern
-                )
-            )
-            "qq_mini_game" -> directToQGameSearch(
-                context,
-                searchHint,
-                sourceEntrance,
-                bottomTab,
-                multiTabId,
-                multiTabName,
-                customPageId,
-                customPageName,
-                searchBoxPattern
-            )
-            "bbs" -> directToForumOrUserSearch(
-                context,
-                "",
-                entrance,
-                sourceEntrance,
-                "",
-                bottomTab,
-                multiTabId,
-                multiTabName,
-                customPageId,
-                customPageName,
-                searchBoxPattern
-            )
-        }
-    }
 }
--- 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,
@ -219,7 +210,7 @@ object DownloadItemUtils {
        pluginLocation: PluginLocation? = PluginLocation.only_game
    ) {
        // 控制是否显示下载按钮
-        downloadBtn.goneIf(context.getString(R.string.app_name) == gameEntity.name)
+        downloadBtn.goneIf(!Config.isShowDownload(gameEntity.id) || context.getString(R.string.app_name) == gameEntity.name)
        // 青少年模式或者需要特殊处理显示查看
        if (SPUtils.getBoolean(Constants.SP_TEENAGER_MODE) || gameEntity.isSpecialDownload()) {
            downloadBtn.text = "查看"
@ -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)) {
@ -890,7 +827,6 @@ object DownloadItemUtils {
                        gameEntity.id,
                        gameEntity.name ?: "",
                        gameEntity.categoryChinese,
-                        gameEntity.getApk().firstOrNull()?.format,
                        clickRunnable
                    )
                }
@ -900,20 +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)
            }
        }
    }
@ -933,52 +866,52 @@ 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())
                addHandler(BrowserInstallHandler())
                addHandler(PackageCheckHandler())
                addHandler(DownloadDialogHelperHandler())
+                addHandler(CertificationHandler())
                addHandler(OverseaDownloadHandler())
                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())
                addHandler(BrowserInstallHandler())
                addHandler(PackageCheckHandler())
                addHandler(DownloadDialogHelperHandler())
+                addHandler(CertificationHandler())
                addHandler(VersionNumberHandler())
                addHandler(LandPageAddressHandler())
                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())
                addHandler(DownloadDialogHelperHandler())
+                addHandler(CertificationHandler())
                addHandler(VersionNumberHandler())
                addHandler(LandPageAddressHandler())
                addHandler(OverseaDownloadHandler())
@ -986,24 +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)
@ -1044,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)) {
@ -1056,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("启动")
@ -1074,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,
@ -1093,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)
            }
@ -1118,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) -> {
@ -1140,7 +1078,6 @@ object DownloadItemUtils {
        downloadBtn: View?,
        entrance: String,
        location: String,
-        asVGame: Boolean,
        isSubscribe: Boolean,
        traceEvent: ExposureEvent?
    ) {
@ -1151,7 +1088,7 @@ object DownloadItemUtils {
            DownloadManager.createDownload(
                context,
                gameEntity,
-                asVGame,
+                context.getString(R.string.download),
                entrance,
                location,
                isSubscribe,
@ -1186,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)
@ -1250,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/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
				`@ -1 +0,0 @@`
				{"v":"5.12.2","fr":60,"ip":0,"op":40,"w":66,"h":66,"nm":"icon_tab_my","ddd":0,"assets":[{"id":"comp_0","nm":"icon","fr":60,"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"highlight","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33.134,34.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.667,"y":0.733},"o":{"x":0.333,"y":0},"t":0,"s":[{"i":[[0,-0.004],[0.493,0],[0,0.004],[-0.493,0]],"o":[[0,0.004],[-0.493,0],[0,-0.004],[0.493,0]],"v":[[0.893,1.488],[0,1.496],[-0.893,1.488],[0,1.483]],"c":true}]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0.267},"t":10,"s":[{"i":[[0,-1.018],[1.793,0],[0,1.018],[-1.793,0]],"o":[[0,1.018],[-1.793,0],[0,-1.018],[1.793,0]],"v":[[2.914,-0.344],[0,1.5],[-2.914,-0.344],[0,-1.5]],"c":true}]},{"i":{"x":0.333,"y":1},"o":{"x":0.667,"y":0},"t":18,"s":[{"i":[[0,-1.181],[1.407,0],[0,1.181],[-1.407,0]],"o":[[0,1.181],[-1.407,0],[0,-1.181],[1.407,0]],"v":[[2.226,-0.341],[0,1.74],[-2.211,-0.341],[0,-1.74]],"c":true}]},{"i":{"x":0.333,"y":1},"o":{"x":0.667,"y":0},"t":26,"s":[{"i":[[0,-0.905],[1.381,0],[0,0.905],[-1.381,0]],"o":[[0,0.905],[-1.381,0],[0,-0.905],[1.381,0]],"v":[[2.5,-0.306],[0,1.333],[-2.5,-0.306],[0,-1.333]],"c":true}]},{"t":32,"s":[{"i":[[0,-1.018],[1.381,0],[0,1.018],[-1.381,0]],"o":[[0,1.018],[-1.381,0],[0,-1.018],[1.381,0]],"v":[[2.5,-0.344],[0,1.5],[-2.5,-0.344],[0,-1.5]],"c":true}]}],"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"color","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"椭圆形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":60,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"body","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,34.204,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-3.866,0],[0,3.866],[3.866,0],[0,-3.866]],"o":[[3.866,0],[0,-3.866],[-3.866,0],[0,3.866]],"v":[[0,4.599],[7,-2.401],[0,-9.401],[-7,-2.401]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0.207,0.359],[2.438,0],[1.189,-2.104],[-0.361,-0.204],[-0.204,0.361],[-1.915,0],[-0.932,-1.613],[-0.359,0.207]],"o":[[-1.198,-2.072],[-2.462,0],[-0.204,0.361],[0.361,0.204],[0.925,-1.638],[1.897,0],[0.207,0.359],[0.359,-0.207]],"v":[[5.848,8.225],[0,4.849],[-5.88,8.282],[-5.596,9.304],[-4.574,9.02],[0,6.349],[4.549,8.976],[5.574,9.25]],"c":true},"ix":2},"nm":"路径 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"合并路径 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.267,0.639,1,0.5,0.241,0.596,1,1,0.216,0.553,1],"ix":9}},"s":{"a":0,"k":[-3.812,-4.384],"ix":5},"e":{"a":0,"k":[6.345,8.129],"ix":6},"t":1,"nm":"color","mn":"ADBE Vector Graphic - G-Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"Union","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":60,"st":0,"ct":1,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":0,"nm":"icon","refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,33,0],"ix":2,"l":2},"a":{"a":0,"k":[33,33,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":0,"s":[100,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":8,"s":[70,70,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":18,"s":[110,110,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":26,"s":[90,90,100]},{"t":32,"s":[100,100,100]}],"ix":6,"l":2}},"ao":0,"w":66,"h":66,"ip":0,"op":60,"st":0,"bm":0}],"markers":[],"props":{}}