fix: 开屏广告点击问题 https://jira.shanqu.cc/browse/GHZS-5004

fix: 【光环助手】部分页面文字显示颜色没有适配深色模式 https://jira.shanqu.cc/browse/GHZS-4982

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

.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 -c
+    - ./scripts/jenkins_build.sh $CI_COMMIT_REF_NAME $BEFORE_COMMIT_SHA $CI_COMMIT_SHA
   #设置打包后的产物，用于job之间共享
   artifacts:
       paths:
@@ -71,8 +71,7 @@ android_build:
     exit_codes: 137
   only:
     - dev
-    - dev-5.29.0
-    - dev-5.30.0
+    - dev-5.33.0
 
 # 代码检查
 sonarqube_analysis:
@@ -103,8 +102,7 @@ sonarqube_analysis:
      exit_codes: 137
    only:
      - dev
-     - dev-5.29.0
-     - dev-5.30.0
+     - dev-5.33.0
 
 ## 发送简易检测结果报告
 send_sonar_report:
@@ -122,12 +120,11 @@ send_sonar_report:
      exit_codes: 137
    only:
      - dev
-     - dev-5.29.0
-     - dev-5.30.0
+     - dev-5.33.0
 
 oss-upload&send-email:
     tags:
-        - rancher-k8s
+        - sysadm-devops
     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: "oss-cn-shenzhen-internal.aliyuncs.com"           # 固定值
-        BUCKET: "shanqu"                                            # 固定值
-        FILE_PATH: "app/build/tmp/"                         # APK 存放路径
+        ENDPOINT: "tos-cn-guangzhou.ivolces.com"                    # 固定值
+        BUCKET: "sysadm-public"                                     # 固定值
+        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.py
+        - /usr/local/bin/python /ci-android-mail-jira-comment.py
     only:
         - dev
-        - dev-5.29.0
-        - dev-5.30.0
+        - dev-5.33.0

README.md

@@ -30,14 +30,7 @@
 
 ### git 版本管理
 
-本项目使用简化版的 git flow 来管理分支，细节请看 [光环安卓简单 git 规范](https://git.ghzs.com/halo/android/assistant-android/-/wikis/%E5%85%89%E7%8E%AF%E5%AE%89%E5%8D%93%E7%AE%80%E5%8D%95-git-%E8%A7%84%E8%8C%83)
-
-### API 环境配置
-
-本项目使用 Build Variants 来切换 API 环境
-
-* internal 为测试环境
-* publish 为正式环境
+本项目使用简化版的 git flow 来管理分支，细节请看 [光环安卓简单 git 规范](https://git.shanqu.cc/halo/android/assistant-android/-/wikis/%E5%85%89%E7%8E%AF%E5%AE%89%E5%8D%93%E7%AE%80%E5%8D%95-git-%E8%A7%84%E8%8C%83)
 
 ### 图片资源配置
 
@@ -53,14 +46,3 @@
 
 * 本项目使用了微信的 [AndResGuard](https://github.com/shwenzhang/AndResGuard) 作为资源混淆压缩方案，新增需要使用 `getIdentifier` 获取的资源文件时需要添加至白名单
 * 本项目默认使用 R8 作为混淆工具，往 proguard-rules.txt 添加 proguard 新配置项时请检查可用性(如语法等)
-
-### APK打包配置
-
-> 打内部测试包：`./scripts/test_build.sh`
-> 打邮件测试包：`./scripts/jenkins_build.sh`
-
-### TODO
-
-* 把原有 EventBus 的消息 Type 统一到一个文件内
-* 将实现细节从 View(Fragment、Activity) 剥离并以 MVVM 结构改造
-* 重构 MainActivity

app/build.gradle

@@ -23,6 +23,8 @@ android {
     }
 
     compileOptions {
+        coreLibraryDesugaringEnabled true
+
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
@@ -95,8 +97,10 @@ 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}\""
@@ -157,7 +161,7 @@ android {
         }
     }
 
-    flavorDimensions("env")
+    flavorDimensions("env", "region")
 
     sourceSets {
         publish {
@@ -175,6 +179,15 @@ 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 {
@@ -188,7 +201,8 @@ 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", "CSJ_APPID", "\"${DEV_CSJ_APPID}\""
+            buildConfigField "String", "DEV_CSJ_APPID", "\"${DEV_CSJ_APPID}\""
+            buildConfigField "String", "CSJ_APPID", "\"${CSJ_APPID}\""
         }
 
         // publish， 发布时候使用的 flavor，接口仅包含正式环境
@@ -200,6 +214,7 @@ 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}\""
         }
 
@@ -211,6 +226,7 @@ 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())
@@ -224,6 +240,7 @@ android {
             buildConfigField "String", "DEV_VAPI_HOST", "\"${VAPI_HOST}\""
             buildConfigField "String", "QUICK_LOGIN_APPID", "\"${QUICK_LOGIN_APPID}\""
             buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${QUICK_LOGIN_APPKEY}\""
+            buildConfigField "String", "DEV_CSJ_APPID", "\"${CSJ_APPID}\""
             buildConfigField "String", "CSJ_APPID", "\"${CSJ_APPID}\""
         }
 
@@ -235,8 +252,40 @@ 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"
+        }
     }
 }
 
@@ -253,6 +302,7 @@ 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}"
@@ -272,7 +322,8 @@ dependencies {
 
     implementation "com.kyleduo.switchbutton:library:${switchButton}"
 
-    implementation "com.leon.channel:helper:${apkChannelPackage}"
+    implementation "com.tencent.vasdolly:helper:${apkChannelPackage}"
+    implementation "com.tencent.vasdolly:writer:${apkChannelPackage}"
 
     implementation "com.j256.ormlite:ormlite-android:${ormlite}"
     implementation "com.j256.ormlite:ormlite-core:${ormlite}"
@@ -317,6 +368,8 @@ dependencies {
 
     implementation "com.lg:shortcut:${shortcut}"
 
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:${desugarJdkLibs}"
+
     kapt "com.alibaba:arouter-compiler:$arouterVersion"
 
     implementation project(':ndownload')
@@ -337,7 +390,10 @@ dependencies {
     implementation(project(':module_core_feature')) {
         exclude group: 'androidx.swiperefreshlayout'
     }
-    implementation(project(':module_feedback')) {
+//    implementation(project(':module_feedback')) {
+//        exclude group: 'androidx.swiperefreshlayout'
+//    }
+    implementation(project(':feature:new_feedback',)) {
         exclude group: 'androidx.swiperefreshlayout'
     }
     implementation(project(':module_sensors_data')) {
@@ -356,6 +412,7 @@ dependencies {
     implementation(project(':feature:qq_game')) {
         exclude group: 'androidx.swiperefreshlayout'
     }
+    internalImplementation(project(':module_internal_test'))
 }
 
 File propFile = file('sign.properties')

app/proguard-rules.txt

@@ -88,7 +88,14 @@
 -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;
+}
+

app/src/default/java/com/gh/gamecenter/provider/FlavorProviderImp.kt

@@ -8,7 +8,7 @@ import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.utils.PackageFlavorHelper
 import com.gh.gamecenter.core.provider.IFlavorProvider
 import com.gh.gamecenter.core.utils.SPUtils
-import com.leon.channel.helper.ChannelReaderUtil
+import com.tencent.vasdolly.helper.ChannelReaderUtil
 
 class FlavorProviderImp : IFlavorProvider {
     override fun getChannelStr(application: Application): String {

app/src/gdt/java/com/gh/gamecenter/GdtHelper.kt

@@ -5,6 +5,7 @@ import com.lightgame.utils.Utils
 import com.qq.gdt.action.ActionParam
 import com.qq.gdt.action.ActionType
 import com.qq.gdt.action.GDTAction
+import com.qq.gdt.action.PrivateController
 import org.json.JSONObject
 
 object GdtHelper {
@@ -16,6 +17,12 @@ object GdtHelper {
 
     @JvmStatic
     fun init(application: Application, channel: String) {
+        GDTAction.setPrivateController(object : PrivateController() {
+            override fun isCanUsePhoneState(): Boolean {
+                return false
+            }
+        })
+
         if (channel == "KS_GDT_GHZS_MC01") {
             GDTAction.init(application, KS_USER_ACTION_SET_ID, KS_APP_SECRET_ID, channel)
         } else {

app/src/internal/java/com/gh/vspace/ExternalGameUsage.kt

@@ -0,0 +1,32 @@
+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)
+        }
+    }
+}

app/src/internal/java/com/gh/vspace/installexternalgames/Constants.java

@@ -0,0 +1,5 @@
+package com.gh.vspace.installexternalgames;
+
+public class Constants {
+    public static final String TAG = "从SD卡安装";
+}

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

@@ -0,0 +1,47 @@
+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)
+            }
+        }
+    }
+}

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

@@ -0,0 +1,11 @@
+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,
+)

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

@@ -0,0 +1,6 @@
+package com.gh.vspace.installexternalgames
+
+data class ExternalGameUiState(
+    val externalGameEntity: ExternalGameEntity,
+    val isInstalled: Boolean
+)

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

@@ -0,0 +1,11 @@
+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
+}

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

@@ -0,0 +1,14 @@
+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())
+        }
+    }
+}

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

@@ -0,0 +1,153 @@
+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)
+    }
+
+
+}

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

@@ -0,0 +1,64 @@
+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()
+    }
+
+}

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

@@ -0,0 +1,11 @@
+package com.gh.vspace.installexternalgames
+
+interface OnItemClickListener {
+
+    enum class ClickType {
+        CLICK_INSTALL, CLICK_UNINSTALL, CLICK_START
+    }
+
+    fun onItemClick(externalGameUiState: ExternalGameUiState, clickType: ClickType)
+
+}

app/src/internal/res/layout/fragment_install_external_games.xml

@@ -0,0 +1,11 @@
+<?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>

app/src/internal/res/layout/layout_external_game_item.xml

@@ -0,0 +1,43 @@
+<?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>

app/src/internal/res/values-zh-rTW/strings.xml

@@ -0,0 +1,7 @@
+<?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>

app/src/internal/res/values/ids.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item name="install_game_from_external" type="id" />
+</resources>

app/src/internal/res/values/strings.xml

@@ -0,0 +1,7 @@
+<?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>

app/src/main/AndroidManifest.xml

@@ -78,6 +78,8 @@
         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,
@@ -97,6 +99,9 @@
         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"
@@ -275,7 +280,7 @@
         <activity
             android:name="com.gh.gamecenter.VoteActivity"
             android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateAlwaysHidden|adjustResize" />
+            android:windowSoftInputMode="stateAlwaysHidden|adjustPan" />
 
         <activity
             android:name="com.gh.gamecenter.WeiBoShareActivity"
@@ -474,6 +479,14 @@
             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" />
@@ -754,7 +767,15 @@
             android:screenOrientation="portrait" />
 
         <activity
-            android:name="com.gh.gamecenter.qgame.QGameSubjectActivity"
+            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" />
 
 
@@ -812,6 +833,8 @@
         <!--                tools:node="remove" />-->
         <!--        </provider>-->
 
+        <service android:name = "com.gh.gamecenter.install.InstallService" />
+
         <receiver
             android:name="com.gh.gamecenter.receiver.DownloadReceiver"
             android:exported="false">

app/src/main/assets/rich_editor.js

@@ -205,14 +205,17 @@ RE.setOutdent = function() {
 
 RE.setJustifyLeft = function() {
     document.execCommand('justifyLeft', false, null);
+    RE.enabledEditingItems()
 }
 
 RE.setJustifyCenter = function() {
     document.execCommand('justifyCenter', false, null);
+    RE.enabledEditingItems()
 }
 
 RE.setJustifyRight = function() {
     document.execCommand('justifyRight', false, null);
+    RE.enabledEditingItems()
 }
 
 RE.setBlockquote = function() {
@@ -227,6 +230,16 @@ RE.insertImage = function(url) {
     RE.insertHTML(html);
 }
 
+// 设置分割线
+RE.insertHorizontalRule = function() {
+    document.execCommand('insertHorizontalRule', false, null);
+}
+
+// 设置编辑器默认换行符
+RE.setDefaultParagraphSeparator = function(separator) {
+    document.execCommand('defaultParagraphSeparator', false, separator);
+}
+
 // 替换成缩略图
 RE.replaceTbImage = function(imgRuleFlag, gifRuleFlag) {
     var imgs = document.getElementsByTagName("img");
@@ -574,6 +587,10 @@ document.addEventListener("selectionchange", function(e) {
    RE.sendElementNameToNative()
 });
 
+document.addEventListener("selectionchange", function(e) {
+   RE.enabledEditingItems(e)
+});
+
 RE.recursion = function(dom) {
     var parenDom = dom.parentElement
     if (parenDom && parenDom instanceof Element &&
@@ -616,7 +633,6 @@ RE.sendElementNameToNative = function() {
 // android function to open link
 function customLinkgo(self) {
   var datas = self.dataset.datas
-  // console.log(datas)
   window.OnLinkClickListener.onClick(datas)
 }
 

app/src/main/assets/style.css

@@ -30,7 +30,6 @@ body {
 }
 
 #editor {
-  display: table-cell;
   outline: 0px solid transparent;
   background-repeat: no-repeat;
   background-position: center;

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

@@ -17,12 +17,14 @@ 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
 import com.gh.gamecenter.common.base.activity.BaseActivity
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.common.exposure.ExposureSource
 import com.gh.gamecenter.common.retrofit.BiResponse
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.core.provider.IBeiziAdProvider
@@ -33,7 +35,6 @@ import com.gh.gamecenter.core.utils.TimeUtils.getToday
 import com.gh.gamecenter.entity.AdConfig
 import com.gh.gamecenter.entity.StartupAdEntity
 import com.gh.gamecenter.feature.exposure.ExposureEvent.Companion.createEvent
-import com.gh.gamecenter.feature.exposure.ExposureSource
 import com.gh.gamecenter.feature.exposure.ExposureType
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.halo.assistant.HaloApp
@@ -53,19 +54,20 @@ object AdDelegateHelper {
     private var mCsjAdImpl: ICsjAdProvider? = null
     private var mBeiziAdImpl: IBeiziAdProvider? = null
 
-    private var mAdConfigList: ArrayList<AdConfig>? = null
+    private val mAdConfigList: ArrayList<AdConfig> by lazy { arrayListOf() }
 
     private var mSplashAd: AdConfig? = null
     private var mDownloadManagerAd: AdConfig? = null
     private val mGameSearchAdList: ArrayList<AdConfig> by lazy { arrayListOf() }
     private var mVGameLaunchAd: AdConfig? = null
 
-    private var mIsCsjRequired: Boolean = false // 是否需要初始化穿山甲 SDK
-    private var mIsBeiziRequired: Boolean = false // 师傅需要初始化 Beizi SDK
+    val vGameLaunchAd: AdConfig?
+        get() = mVGameLaunchAd
 
     private const val AD_SDK_CSJ = "穿山甲"
     private const val AD_SDK_BEIZI = "倍孜"
-    private const val AD_TYPE_SDK = "third_party_ads" // 第三方 SDK 广告
+    const val AD_TYPE_SDK = "third_party_ads" // 第三方 SDK 广告
+    const val AD_TYPE_OWNER = "owner_ads" // 自有广告
 
     private const val KEY_CACHE_CONFIG = "cache_config" // 放在 SP 里的广告缓存（避免接口加载问题）
 
@@ -73,23 +75,50 @@ object AdDelegateHelper {
         HaloApp.getInstance().getSharedPreferences("AdConfig", Context.MODE_PRIVATE)
     }
 
+    var isShowingSplashAd = false // 是否正在显示开屏广告
+    var gameSearchKeyword = ""
+
+    fun initAdSdk(context: Context) {
+        // 初始化 Beizi
+        if (mBeiziAdImpl == null) {
+            mBeiziAdImpl =
+                ARouter.getInstance().build(RouteConsts.provider.beiziAd).navigation() as? IBeiziAdProvider
+            mBeiziAdImpl?.initSDK(context)
+        }
+
+        // 初始化穿山甲
+        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)
+            // 监听亮色/暗色模式切换
+            DarkModeUtils.registerModeChangeListener {
+                val topActivity = CurrentActivityHolder.getCurrentActivity() ?: return@registerModeChangeListener
+                updateThemeStatus(context, DarkModeUtils.isDarkModeOn(topActivity))
+            }
+        }
+    }
+
     /**
      * 请求接口获取广告相关配置
      */
     @SuppressLint("CheckResult")
-    fun requestAdConfig(context: Context, isFromRetry: Boolean) {
+    fun requestAdConfig(isFromRetry: Boolean, keyword: String = "", callback: (() -> Unit)? = null) {
         // mAdConfigList 不为空不需要重试
-        if (isFromRetry && mAdConfigList != null) {
+        if (isFromRetry && mAdConfigList.isNotEmpty()) {
             return
         }
-
+        val paramsMap = if (keyword.isNotEmpty()) mapOf("keyword" to keyword) else mapOf()
         RetrofitManager.getInstance()
             .newApi
-            .adConfig
+            .getAdConfig(paramsMap)
             .subscribeOn(Schedulers.io())
             .subscribe(object : BiResponse<List<AdConfig>>() {
                 override fun onSuccess(data: List<AdConfig>) {
-                    handleAdConfig(context, data)
+                    gameSearchKeyword = keyword
+                    handleAdConfig(data)
+                    callback?.invoke()
 
                     // 缓存数据到 SP 供接口请求失败用
                     SPUtils.setString(mAdConfigSp, KEY_CACHE_CONFIG, data.toJson())
@@ -100,9 +129,11 @@ object AdDelegateHelper {
 
                     // 若接口请求失败时，从 SP 里获取上次缓存的数据
                     val cachedConfig: List<AdConfig>? = SPUtils.getString(mAdConfigSp, KEY_CACHE_CONFIG).toObject()
-                    if (cachedConfig != null) {
-                        handleAdConfig(context, cachedConfig)
+                    if (cachedConfig != null && mAdConfigList.isEmpty()) {
+                        handleAdConfig(cachedConfig)
                     }
+
+                    callback?.invoke()
                 }
             })
     }
@@ -124,56 +155,123 @@ object AdDelegateHelper {
     /**
      * 处理广告配置
      */
-    fun handleAdConfig(context: Context, configList: List<AdConfig>) {
+    fun handleAdConfig(configList: List<AdConfig>) {
+        mAdConfigList.clear()
+        mGameSearchAdList.clear()
+        mSplashAd = null
+        mDownloadManagerAd = null
+        mVGameLaunchAd = null
         for (config in configList) {
+            mAdConfigList.add(config)
             // 处理返回的数据
             when (config.location) {
-                "halo_launch" -> mSplashAd = config
+                "halo_launch" -> {
+                    config.ownerAd?.startAd?.let { it.id = config.ownerAd.id }
+                    mSplashAd = config
+                }
+
                 "download_manager" -> mDownloadManagerAd = config
                 "game_search" -> config.let { mGameSearchAdList.add(it) }
                 "helper_launch" -> mVGameLaunchAd = config
             }
-
-            // 根据返回的值里判断是否含有 Beizi 的广告
-            if (!mIsBeiziRequired) {
-                if (config.thirdPartyAd?.sourceName == AD_SDK_BEIZI) {
-                    mIsBeiziRequired = true
-                }
-            }
-
-            // 根据返回的值里判断是否含有 穿山甲 的广告
-            if (!mIsCsjRequired) {
-                if (config.thirdPartyAd?.sourceName == AD_SDK_CSJ) {
-                    mIsCsjRequired = true
-                }
-            }
-        }
-
-        // 初始化 Beizi
-        if (mIsBeiziRequired && mBeiziAdImpl == null) {
-            mBeiziAdImpl =
-                ARouter.getInstance().build(RouteConsts.provider.beiziAd).navigation() as? IBeiziAdProvider
-            mBeiziAdImpl?.initSDK(context)
-        }
-
-        // 初始化穿山甲
-        if (mIsCsjRequired && mCsjAdImpl == null) {
-            mCsjAdImpl =
-                ARouter.getInstance().build(RouteConsts.provider.csjAd).navigation() as? ICsjAdProvider
-            mCsjAdImpl?.initSDK(context, BuildConfig.CSJ_APPID, HaloApp.getInstance().oaid)
-            // 监听亮色/暗色模式切换
-            DarkModeUtils.registerModeChangeListener {
-                val topActivity = CurrentActivityHolder.getCurrentActivity() ?: return@registerModeChangeListener
-                updateThemeStatus(context, DarkModeUtils.isDarkModeOn(topActivity))
-            }
         }
     }
 
     /**
      * 是否需要显示开屏广告
+     * @param isHotLaunch 是否为热启动
      */
-    fun shouldShowStartUpAd(): Boolean {
+    fun shouldShowStartUpAd(isHotLaunch: Boolean): 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
     }
 
     /**
@@ -197,49 +295,125 @@ object AdDelegateHelper {
         sdkStartAdContainer: ViewGroup,
         adsViewGroup: FrameLayout,
         handler: BaseActivity.BaseHandler,
-        hideCallback: () -> Unit
+        isHotLaunch: Boolean,
+        hideAction: () -> Unit
     ) {
+        val hideCallback = {
+            isShowingSplashAd = false
+            hideAction.invoke()
+        }
         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(
+            when (if (isHotLaunch) mSplashAd!!.displayRule.hotStartSplashAd?.type else mSplashAd!!.displayRule.adSource) {
+                AD_TYPE_SDK -> {
+                    isShowingSplashAd = true
+                    requestThirdPartySplashAd(
                         activity,
-                        mSplashAd?.thirdPartyAd?.slotId ?: "unknown",
                         adViewWidthInPx,
                         adViewHeightInPx,
                         adViewWidthInDp,
                         adViewHeightInDp,
+                        startAdContainer,
                         sdkStartAdContainer,
-                        sdkSplashCallback
+                        adsViewGroup,
+                        handler,
+                        isHotLaunch,
+                        hideCallback
+                    )
+                }
+
+                AD_TYPE_OWNER -> {
+                    isShowingSplashAd = true
+                    requestStandardSplashAd(
+                        activity,
+                        adViewWidthInPx,
+                        adViewHeightInPx,
+                        adViewWidthInDp,
+                        adViewHeightInDp,
+                        startAdContainer,
+                        sdkStartAdContainer,
+                        adsViewGroup,
+                        handler,
+                        isHotLaunch,
+                        hideCallback
                     )
                 }
-            } else {
-                requestStandardSplashAd(mSplashAd!!.ownerAd, startAdContainer, handler, 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 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(
+                        activity,
+                        adViewWidthInPx,
+                        adViewHeightInPx,
+                        adViewWidthInDp,
+                        adViewHeightInDp,
+                        startAdContainer,
+                        sdkStartAdContainer,
+                        adsViewGroup,
+                        handler,
+                        isHotLaunch,
+                        hideCallback
+                    )
+                } else {
+                    hideCallback.invoke()
+                }
+            }
+        }
+
+        // 第三方广告的数据为空，按加载失败处理
+        if (mSplashAd == null || mSplashAd?.thirdPartyAd == null) {
+            sdkSplashCallback.invoke(false)
+            return
+        }
+
+        val timeout = if (isHotLaunch) {
+            ((mSplashAd?.displayRule?.hotStartSplashAd?.timeout ?: 3.5F) * 1000).toInt()
+        } else {
+            ((mSplashAd?.displayRule?.timeout ?: 3.5F) * 1000).toInt()
+        }
+
+        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
+            )
         }
     }
 
@@ -254,6 +428,7 @@ object AdDelegateHelper {
         adViewWidthInDp: Float,
         adViewHeightInDp: Float,
         startAdContainer: ViewGroup,
+        timeout: Int,
         callback: (isSuccess: Boolean) -> Unit,
     ) {
         if (mCsjAdImpl == null) {
@@ -267,6 +442,7 @@ object AdDelegateHelper {
                 adViewWidthInDp,
                 adViewHeightInDp,
                 startAdContainer,
+                timeout,
                 callback,
             )
         }
@@ -280,12 +456,13 @@ 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, callback)
+            mBeiziAdImpl?.requestSplashAd(startAdContainer, adsFl, adViewWidthInPx, adViewHeightInPx, timeout, callback)
         }
     }
 
@@ -293,13 +470,41 @@ object AdDelegateHelper {
      * 显示自有的开屏广告
      */
     private fun requestStandardSplashAd(
-        splashAd: StartupAdEntity?,
+        activity: Activity,
+        adViewWidthInPx: Int,
+        adViewHeightInPx: Int,
+        adViewWidthInDp: Float,
+        adViewHeightInDp: Float,
         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) {
-            hideCallback.invoke()
+            onEmptyCallback.invoke()
             return
         }
 
@@ -312,7 +517,7 @@ object AdDelegateHelper {
                 ) {
                     showStandardSplashAd(splashAd, startAdContainer, handler, hideCallback)
                 } else {
-                    hideCallback.invoke()
+                    onEmptyCallback.invoke()
                 }
 
                 "everyday" -> {
@@ -323,7 +528,7 @@ object AdDelegateHelper {
                     ) {
                         showStandardSplashAd(splashAd, startAdContainer, handler, hideCallback)
                     } else {
-                        hideCallback.invoke()
+                        onEmptyCallback.invoke()
                     }
                 }
 
@@ -344,7 +549,9 @@ 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(
@@ -384,13 +591,14 @@ 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 requestFlowAd(
+    fun requestThirdPartyFlowAd(
         fragment: Fragment,
         slotId: String,
         adContainerView: ViewGroup,
@@ -401,9 +609,9 @@ object AdDelegateHelper {
     }
 
     /**
-     * 获取 Banner 广告
+     * 获取第三方 Banner 广告
      */
-    fun requestBannerAd(
+    fun requestThirdPartyBannerAd(
         fragment: Fragment,
         containerView: ViewGroup,
         ad: AdConfig.ThirdPartyAd,

app/src/main/java/com/gh/base/BaseRichEditorActivity.kt

@@ -57,11 +57,16 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
     private lateinit var mEditorFontItalic: CheckableImageView
     private lateinit var mEditorFontStrikeThrough: CheckableImageView
     private lateinit var mEditorFontUnderline: CheckableImageView
+    private lateinit var mEditorParagraphDivider: CheckableImageView
     private lateinit var mEditorParagraphH1: CheckableImageView
     private lateinit var mEditorParagraphH2: CheckableImageView
     private lateinit var mEditorParagraphH3: CheckableImageView
     private lateinit var mEditorParagraphH4: CheckableImageView
     private lateinit var mEditorParagraphQuote: CheckableImageView
+    private lateinit var mEditorAlignLeft: CheckableImageView
+    private lateinit var mEditorAlignCenter: CheckableImageView
+    private lateinit var mEditorAlignRight: CheckableImageView
+    private lateinit var mEditorAlignContainer: View
     private lateinit var mEditorFontContainer: View
     private lateinit var mEditorParagraphContainer: View
     private lateinit var mEditorLinkContainer: View
@@ -97,6 +102,7 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
                     mRichEditor.insertCustomStyleLink(insertData)
                 }
             }
+
             INSERT_ARTICLE_CODE -> {
                 val article =
                     data?.getParcelableExtra<ArticleEntity>(ArticleEntity::class.java.simpleName)
@@ -106,6 +112,7 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
                     mRichEditor.insertCustomStyleLink(insertData)
                 }
             }
+
             INSERT_GAME_CODE -> {
                 val game = data?.getParcelableExtra<GameEntity>(GameEntity::class.java.simpleName)
                 if (game != null) {
@@ -114,6 +121,7 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
                     mRichEditor.insertCustomStyleLink(insertData)
                 }
             }
+
             INSERT_GAME_COLLECTION_CODE -> {
                 val gameCollectionEntity =
                     data?.getParcelableExtra<GamesCollectionEntity>(GamesCollectionEntity::class.java.simpleName)
@@ -123,9 +131,11 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
                     mRichEditor.insertCustomStyleLink(insertData)
                 }
             }
+
             REQUEST_CODE_IMAGE -> {
                 if (data != null) mViewModel.uploadPic(data)
             }
+
             INSERT_MEDIA_VIDEO_CODE -> {
                 val localVideoList =
                     data?.getParcelableArrayListExtra<LocalVideoEntity>(LocalVideoEntity::class.java.name)
@@ -135,12 +145,14 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
                     uploadVideo(localVideoList)
                 }
             }
+
             REQUEST_CODE_IMAGE_CROP -> {
                 val imagePath = data?.getStringExtra(CropImageActivity.RESULT_CLIP_PATH)
                 if (!imagePath.isNullOrEmpty()) {
                     mViewModel.uploadPoster(imagePath)
                 }
             }
+
             INSERT_VIDEO_CODE -> {
                 val videoEntity = data?.getParcelableExtra<MyVideoEntity>(MyVideoEntity::class.java.simpleName)
                 if (videoEntity != null) {
@@ -194,7 +206,12 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
         mEditorParagraphH2 = findViewById(R.id.editor_paragraph_h2)
         mEditorParagraphH3 = findViewById(R.id.editor_paragraph_h3)
         mEditorParagraphH4 = findViewById(R.id.editor_paragraph_h4)
+        mEditorParagraphDivider = findViewById(R.id.editor_paragraph_divider)
         mEditorParagraphQuote = findViewById(R.id.editor_paragraph_quote)
+        mEditorAlignLeft = findViewById(R.id.editor_align_left)
+        mEditorAlignCenter = findViewById(R.id.editor_align_center)
+        mEditorAlignRight = findViewById(R.id.editor_align_right)
+        mEditorAlignContainer = findViewById(R.id.editor_align_container)
         mEditorFontContainer = findViewById(R.id.editor_font_container)
         mEditorParagraphContainer = findViewById(R.id.editor_paragraph_container)
         mEditorLinkContainer = findViewById(R.id.editor_link_container)
@@ -216,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.background_white.toColor(this))
+        mRichEditor.setEditorBackgroundColor(R.color.ui_surface.toColor(this))
         mRichEditor.setEditorFontColor(if (mIsDarkModeOn) Color.parseColor("#C2C2C2") else Color.parseColor("#4A4A4A"))
         // 防止个别手机在Js里无法获取粘贴内容
         mRichEditor.addJavascriptInterface(OnPasteListener(), "onPasteListener")
@@ -241,6 +258,13 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
                 mRichEditor.hasFocus()
             } else false
         }
+
+        mRichEditor.setOnDecorationChangeListener { _, types ->
+            mEditorAlignLeft.isChecked = types.contains(RichEditor.Type.JUSTIFYLEFT)
+            mEditorAlignCenter.isChecked = types.contains(RichEditor.Type.JUSTIFYCENTER)
+            mEditorAlignRight.isChecked = types.contains(RichEditor.Type.JUSTIFYRIGHT)
+        }
+
         mOriginalCb.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 mOriginalTipsContainer.alpha = 0f
@@ -325,6 +349,9 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
                 MtaHelper.onEvent(mtaEventName(), "文字样式", "文字样式-下滑线")
             }
         }
+        mEditorParagraphDivider.setOnClickListener {
+            mRichEditor.insertDivider()
+        }
         mEditorParagraphH1.setOnClickListener {
             if (mEditorParagraphH1.isChecked) {
                 mRichEditor.formatBlock()
@@ -370,6 +397,27 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
             }
             mEditorParagraphQuote.isChecked = !mEditorParagraphQuote.isChecked
         }
+        mEditorAlignLeft.setOnClickListener {
+            if (!mEditorAlignLeft.isChecked) {
+                mRichEditor.setAlignLeft()
+                MtaHelper.onEvent(mtaEventName(), "文本对齐选项", "文本对齐选项-靠左")
+                mEditorAlignLeft.isChecked = !mEditorAlignLeft.isChecked
+            }
+        }
+        mEditorAlignCenter.setOnClickListener {
+            if (!mEditorAlignCenter.isChecked) {
+                mRichEditor.setAlignCenter()
+                MtaHelper.onEvent(mtaEventName(), "文本对齐选项", "文本对齐选项-靠中")
+                mEditorAlignCenter.isChecked = !mEditorAlignCenter.isChecked
+            }
+        }
+        mEditorAlignRight.setOnClickListener {
+            if (!mEditorAlignRight.isChecked) {
+                mRichEditor.setAlignRight()
+                MtaHelper.onEvent(mtaEventName(), "文本对齐选项", "文本对齐选项-靠右")
+                mEditorAlignRight.isChecked = !mEditorAlignRight.isChecked
+            }
+        }
         findViewById<View>(R.id.editor_link_answer).setOnClickListener {
             MtaHelper.onEvent(mtaEventName(), "插入链接", "插入链接-回答")
             startActivityForResult(
@@ -449,25 +497,22 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
             return
         }
         try {
-            PermissionHelper.checkStoragePermissionBeforeAction(this,
-                object : EmptyCallback {
-                    override fun onCallback() {
-                        val maxChooseCount = if (videoCount + 3 <= MAX_MEDIA_COUNT) 3 else MAX_MEDIA_COUNT - videoCount
-                        startActivityForResult(
-                            LocalMediaActivity.getIntent(
-                                this@BaseRichEditorActivity,
-                                LocalMediaActivity.ChooseType.VIDEO,
-                                maxChooseCount,
-                                if (mtaEventName() == "提问帖") "发提问帖" else "发帖子"
-                            ), INSERT_MEDIA_VIDEO_CODE
-                        )
-                        NewLogUtils.logChooseMedia(
-                            "view_media",
-                            if (mtaEventName() == "提问帖") "提问帖" else "帖子",
-                            "视频"
-                        )
-                    }
-                })
+            PermissionHelper.checkStoragePermissionBeforeAction(this) {
+                val maxChooseCount = if (videoCount + 3 <= MAX_MEDIA_COUNT) 3 else MAX_MEDIA_COUNT - videoCount
+                startActivityForResult(
+                    LocalMediaActivity.getIntent(
+                        this@BaseRichEditorActivity,
+                        LocalMediaActivity.ChooseType.VIDEO,
+                        maxChooseCount,
+                        if (mtaEventName() == "提问帖") "发提问帖" else "发帖子"
+                    ), INSERT_MEDIA_VIDEO_CODE
+                )
+                NewLogUtils.logChooseMedia(
+                    "view_media",
+                    if (mtaEventName() == "提问帖") "提问帖" else "帖子",
+                    "视频"
+                )
+            }
         } catch (e: Exception) {
             toast(R.string.media_image_hint)
             e.printStackTrace()
@@ -482,18 +527,16 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
             return
         }
         try {
-            PermissionHelper.checkStoragePermissionBeforeAction(this, object : EmptyCallback {
-                override fun onCallback() {
-                    val maxChooseCount = if (imageCount + 10 <= MAX_IMAGE_COUNT) 10 else MAX_IMAGE_COUNT - imageCount
-                    val intent = LocalMediaActivity.getIntent(
-                        this@BaseRichEditorActivity,
-                        LocalMediaActivity.ChooseType.IMAGE,
-                        maxChooseCount,
-                        if (mtaEventName() == "提问帖") "发提问帖" else "发帖子"
-                    )
-                    startActivityForResult(intent, REQUEST_CODE_IMAGE)
-                }
-            })
+            PermissionHelper.checkStoragePermissionBeforeAction(this) {
+                val maxChooseCount = if (imageCount + 10 <= MAX_IMAGE_COUNT) 10 else MAX_IMAGE_COUNT - imageCount
+                val intent = LocalMediaActivity.getIntent(
+                    this@BaseRichEditorActivity,
+                    LocalMediaActivity.ChooseType.IMAGE,
+                    maxChooseCount,
+                    if (mtaEventName() == "提问帖") "发提问帖" else "发帖子"
+                )
+                startActivityForResult(intent, REQUEST_CODE_IMAGE)
+            }
         } catch (e: Exception) {
             toast(R.string.media_image_hint)
             e.printStackTrace()
@@ -516,6 +559,7 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
             mEditorFontContainer.visibility = if (mEditorFont.isChecked) View.VISIBLE else View.GONE
             mEditorParagraphContainer.visibility =
                 if (mEditorFont.isChecked) View.VISIBLE else View.GONE
+            mEditorAlignContainer.visibility = if (mEditorFont.isChecked) View.VISIBLE else View.GONE
             mEditorLinkContainer.visibility = View.GONE
             mTagsContainer.visibility = View.GONE
             mIsExtendedKeyboardShow = mEditorFont.isChecked
@@ -537,6 +581,7 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
                 if (mEditorLink.isChecked) View.VISIBLE else View.GONE
             mEditorLinkContainer.visibility = if (mEditorLink.isChecked) View.VISIBLE else View.GONE
             mEditorFontContainer.visibility = View.GONE
+            mEditorAlignContainer.visibility = View.GONE
             mEditorParagraphContainer.visibility = View.GONE
             mTagsContainer.visibility = View.GONE
             mIsExtendedKeyboardShow = mEditorLink.isChecked
@@ -752,9 +797,9 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
 
     override fun onDarkModeChanged() {
         super.onDarkModeChanged()
-        updateStatusBarColor(R.color.background_white, R.color.background_white)
+        updateStatusBarColor(R.color.ui_surface, R.color.ui_surface)
         mRichEditor.enableForceDark(DarkModeUtils.isDarkModeOn(this))
-        mRichEditor.setEditorBackgroundColor(R.color.background_white.toColor(this))
+        mRichEditor.setEditorBackgroundColor(R.color.ui_surface.toColor(this))
         mRichEditor.setEditorFontColor(if (mIsDarkModeOn) Color.parseColor("#C2C2C2") else Color.parseColor("#4A4A4A"))
     }
 
@@ -776,7 +821,7 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
         const val INSERT_VIDEO_CODE = 415
         const val MAX_INPUT_TEXT_NUM = 10000
         const val MAX_MEDIA_COUNT = 20
-        const val MAX_IMAGE_COUNT = 35
+        const val MAX_IMAGE_COUNT = 70
 
         const val REQUEST_CODE_IMAGE = 120
         const val INSERT_MEDIA_VIDEO_CODE = 121

app/src/main/java/com/gh/base/BaseRichEditorViewModel.kt

@@ -28,6 +28,7 @@ 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
@@ -38,6 +39,10 @@ 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模块
@@ -124,8 +129,17 @@ abstract class BaseRichEditorViewModel(application: Application) : AndroidViewMo
                     }
                     val map = LinkedHashMap<String, String>()
                     for (key in imageUrlMap.keys) {
-                        map[MD5Utils.getUrlMD5(key)] = FILE_HOST + key.decodeURI()
-                        mapImages[TextUtils.htmlEncode(key).decodeURI()] = imageUrlMap[key] ?: ""
+                        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] ?: ""
+                        }
                     }
                     chooseImagesUploadSuccess.value = map
                 }

app/src/main/java/com/gh/base/GlobalActivityLifecycleObserver.kt

@@ -4,11 +4,13 @@ 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
@@ -18,6 +20,8 @@ import com.halo.assistant.HaloApp
 
 // TODO：移动到对应的模块
 class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
+    private var isFromBackgroundToForeground = false // 是否后台回到前台
+    private var activityCount = 0
 
     override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
         // do nothing
@@ -25,6 +29,19 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
 
     override fun onActivityStarted(activity: Activity) {
         GlobalActivityManager.currentActivity = activity
+        activityCount ++
+        if (activityCount == 1 && isFromBackgroundToForeground) {
+            if (AdDelegateHelper.shouldShowStartUpAd(true)
+                && !HaloApp.getInstance().isSkippingThirdParty
+                && activity !is SplashScreenActivity
+                && activity !is SkipActivity
+                && activity !is AuthorizationActivity
+                && activity !is SplashAdActivity
+            ) {
+                activity.startActivity(SplashAdActivity.getIntent(activity))
+            }
+            isFromBackgroundToForeground = false
+        }
     }
 
     override fun onActivityResumed(activity: Activity) {
@@ -74,7 +91,8 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
     }
 
     override fun onActivityStopped(activity: Activity) {
-        // do nothing
+        activityCount --
+        isFromBackgroundToForeground = activityCount <= 0
     }
 
     override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {

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

@@ -24,10 +24,12 @@ import com.gh.gamecenter.common.callback.BiCallback
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.entity.NotificationUgc
+import com.gh.gamecenter.common.exposure.ExposureSource
 import com.gh.gamecenter.common.loghub.LoghubUtils
 import com.gh.gamecenter.common.provider.IHelpAndFeedbackProvider
 import com.gh.gamecenter.common.tracker.Tracker
 import com.gh.gamecenter.common.utils.*
+import com.gh.gamecenter.common.utils.NewFlatLogUtils
 import com.gh.gamecenter.common.view.dsbridge.CompletionHandler
 import com.gh.gamecenter.core.AppExecutor
 import com.gh.gamecenter.core.runOnIoThread
@@ -39,7 +41,6 @@ import com.gh.gamecenter.eventbus.EBPackage
 import com.gh.gamecenter.feature.entity.Badge
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.exposure.ExposureEvent
-import com.gh.gamecenter.feature.exposure.ExposureSource
 import com.gh.gamecenter.login.user.LoginTag
 import com.gh.gamecenter.login.user.UserManager
 import com.gh.gamecenter.login.user.UserRepository
@@ -68,9 +69,14 @@ class DefaultJsApi(
     val entrance: String = "",
     private var mFragment: Fragment? = null,
     private var mBbsId: String? = "",
-    private var mOriginUrl: String?= "",
+    private var mOriginUrl: String? = "",
+    private val mForumName: 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 集合
@@ -229,7 +235,14 @@ 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
@@ -278,11 +291,18 @@ class DefaultJsApi(
 
     /**
      * 打开论坛搜索页
+     * 如果用户是从 webView跳转到论坛搜索页，则sourceEntrance为空
      */
     @JavascriptInterface
     fun openForumSearch(msg: Any) {
         runOnUiThread {
-            DirectUtils.directToForumOrUserSearch(context, mBbsId ?: "", entrance.ifBlank { "内部网页" })
+            DirectUtils.directToForumOrUserSearch(
+                context,
+                mBbsId ?: "",
+                entrance.ifBlank { "内部网页" },
+                SOURCE_ENTRANCE,
+                mForumName ?: ""
+            )
         }
     }
 
@@ -384,7 +404,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())
     }
@@ -530,13 +550,24 @@ class DefaultJsApi(
     @JavascriptInterface
     fun installDownloadedGame(event: Any) {
         val url = event.toString()
-        val vUrl = VHelper.getVUrl(url)
 
-        val downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(url, null, false)
-            ?: DownloadManager.getInstance().getDownloadEntitySnapshot(vUrl, null, false)
+        val downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(url, null)
+            ?: DownloadManager.getInstance().getDownloadEntitySnapshot(url, null)
+
+        NewFlatLogUtils.logGameInstall(
+            gameId = downloadEntity?.gameId ?: "",
+            gameName = downloadEntity?.name ?: "",
+            trigger = "主动安装"
+        )
+
+        SensorsBridge.trackInstallGameClick(
+            gameId = downloadEntity?.gameId ?: "",
+            gameName = downloadEntity?.name ?: "",
+            action = "主动安装"
+        )
 
         downloadEntity?.let {
-            PackageInstaller.install(context, it, showUnzipToast = false)
+            PackageInstaller.install(context, it, showUnzipToast = false, ignoreAsVGame = false)
         }
     }
 
@@ -737,6 +768,7 @@ class DefaultJsApi(
         var status: String = "" // DOWNLOADING, PAUSED, DOWNLOADED, ERROR, UNKNOWN
     ) {
         companion object {
+
             fun fromDownloadEntity(downloadEntity: DownloadEntity): SimpleDownloadEntity {
                 val status: String = when (downloadEntity.status) {
                     add,

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

@@ -51,8 +51,8 @@ import java.nio.charset.Charset
 object DefaultUrlHandler {
 
     @JvmStatic
-    fun interceptUrl(context: Context, url: String, entrance: String): Boolean {
-        return interceptUrl(context, url, null, entrance, false)
+    fun interceptUrl(context: Context, url: String, entrance: String, sourceEntrance: String = ""): Boolean {
+        return interceptUrl(context, url, null, entrance, false, sourceEntrance)
     }
 
     /**
@@ -66,7 +66,8 @@ object DefaultUrlHandler {
     fun interceptUrl(context: Context, url: String,
                      traceEvent: ExposureEvent? = null,
                      entrance: String,
-                     bringAppToFront: Boolean = false): Boolean {
+                     bringAppToFront: Boolean = false,
+                     sourceEntrance: String = ""): Boolean {
         val uri = Uri.parse(url)
         if ("ghzhushou" == uri.scheme) {
             Utils.log("url = $url")
@@ -135,7 +136,7 @@ object DefaultUrlHandler {
                     }
 
                 }
-                "question" -> DirectUtils.directToQuestionDetail(context, id, entrance, "文章链接")
+                "question" -> DirectUtils.directToQuestionDetail(context, id, entrance, "文章链接", sourceEntrance)
 
                 "real_name" -> DirectUtils.directToRealName(context)
 
@@ -178,7 +179,7 @@ object DefaultUrlHandler {
                     if ("articles" == type) {
                         DirectUtils.directToCommunityArticle(
                             context, typeId, communityId,
-                            entrance, "文章链接"
+                            entrance, "文章链接", sourceEntrance
                         )
                     }
                 }
@@ -246,17 +247,18 @@ object DefaultUrlHandler {
                         act,
                         paginationType,
                         fieldId,
-                        sectionName
+                        sectionName,
+                        sourceEntrance = sourceEntrance
                     )
                 }
                 EntranceConsts.HOST_VIDEO_DETAIL -> {
-                    DirectUtils.directToVideoDetail(context, id, entrance, path)
+                    DirectUtils.directToVideoDetail(context, id, entrance, path, sourceEntrance)
                 }
                 EntranceConsts.HOST_VIDEO_SINGLE -> {
                     val referer = uri.getQueryParameter("referer") ?: ""
                     DirectUtils.directToVideoDetail(
                         context, id, VideoDetailContainerViewModel.Location.SINGLE_VIDEO.value,
-                        false, "", entrance, "", if (TextUtils.isEmpty(referer)) "" else referer
+                        false, "", entrance, "", if (TextUtils.isEmpty(referer)) "" else referer, sourceEntrance
                     )
                 }
                 EntranceConsts.HOST_VIDEO_STREAMING_HOME -> {
@@ -325,7 +327,7 @@ object DefaultUrlHandler {
                             val linkData = Base64.decode(dataString, Base64.DEFAULT)
                             val linkDataString = String(linkData, Charset.defaultCharset())
                             val le = gson.fromJson(linkDataString, LinkEntity::class.java)
-                            directToLinkPage(context, le, entrance, "")
+                            directToLinkPage(context, le, entrance, sourceEntrance, "")
                         }
                     } catch (e: Exception) {
                         e.printStackTrace()
@@ -350,7 +352,8 @@ object DefaultUrlHandler {
                 }
 
                 EntranceConsts.HOST_FORUM_DETAIL -> {
-                    DirectUtils.directForumDetail(context, id, entrance)
+                    val sectionId = uri.getQueryParameter("section_id") ?: ""
+                    DirectUtils.directForumDetailSection(context, id, sectionId, entrance)
                 }
 
                 EntranceConsts.HOST_GAME_RATING_DETAIL -> {
@@ -438,17 +441,17 @@ object DefaultUrlHandler {
                         directToFeedback(
                             context,
                             content,
-                            null,
                             isQaFeedback,
                             qaContentId,
+                            isPlugin = false,
+                            isSmoothGame = false,
                             EntranceConsts.ENTRANCE_BROWSER
                         )
                     }
                 }
 
                 EntranceConsts.HOST_HELP_AND_FEEDBACK -> {
-                    val position = uri.getQueryParameter("position") ?: ""
-                    DirectUtils.directToHelpAndFeedback(context, position.toInt())
+                    DirectUtils.directToHelpAndFeedback(context)
                 }
 
                 EntranceConsts.HOST_HELP_DETAIL -> {
@@ -489,12 +492,13 @@ object DefaultUrlHandler {
                     val activityName = uri.getQueryParameter("activity_name") ?: ""
                     val gameId = uri.getQueryParameter("game_id") ?: ""
                     context.startActivity(
-                        GameCollectionEditActivity.getIntent(
+                        GameCollectionEditActivity.getCreateIntent(
                             context,
                             activityId,
                             activityName,
                             gameId,
-                            entrance
+                            entrance,
+                            "其他"
                         )
                     )
                 }
@@ -562,7 +566,7 @@ object DefaultUrlHandler {
         }
 
         // 处理内部页面逻辑
-        if (transformNormalScheme(context, url, entrance)) {
+        if (transformNormalScheme(context, url, entrance, sourceEntrance)) {
             return true
         }
 
@@ -571,14 +575,14 @@ object DefaultUrlHandler {
     }
 
     @JvmStatic
-    fun transformNormalScheme(context: Context, url: String, entrance: String): Boolean {
-        val b = transformNewNormalScheme(context, url, entrance)
+    fun transformNormalScheme(context: Context, url: String, entrance: String, sourceEntrance: String): Boolean {
+        val b = transformNewNormalScheme(context, url, entrance, sourceEntrance)
         if (b) return b
-        return transformOldNormalScheme(context, url, entrance)
+        return transformOldNormalScheme(context, url, entrance, sourceEntrance)
     }
 
     @JvmStatic
-    fun transformOldNormalScheme(context: Context, url: String, entrance: String): Boolean {
+    fun transformOldNormalScheme(context: Context, url: String, entrance: String, sourceEntrance: String): Boolean {
         val uri = Uri.parse(url)
         if (uri.host == "www.ghzs666.com"
             || uri.host == "www.ghzs.com"
@@ -603,7 +607,7 @@ object DefaultUrlHandler {
                         val questionId = split("/")[2]
                         val answerId = uri.getQueryParameter("answer")
                         if (answerId.isNullOrEmpty()) {
-                            DirectUtils.directToQuestionDetail(context, questionId, entrance, "")
+                            DirectUtils.directToQuestionDetail(context, questionId, entrance, "", sourceEntrance)
                         } else {
                             DirectUtils.directToAnswerDetail(context, answerId, entrance, "")
                         }
@@ -633,7 +637,7 @@ object DefaultUrlHandler {
                         if ("articles" == type || "article" == type) {
                             DirectUtils.directToCommunityArticle(
                                 context, typeId, communityId,
-                                entrance, "文章链接"
+                                entrance, "文章链接", sourceEntrance
                             )
                         }
                     }
@@ -664,7 +668,7 @@ object DefaultUrlHandler {
     }
 
     @JvmStatic
-    fun transformNewNormalScheme(context: Context, url: String, entrance: String): Boolean {
+    fun transformNewNormalScheme(context: Context, url: String, entrance: String, sourceEntrance: String): Boolean {
         val uri = Uri.parse(url)
         if (uri.host == "www.ghzs666.com"
             || uri.host == "www.ghzs.com"
@@ -682,7 +686,7 @@ object DefaultUrlHandler {
                         val articleId = splits[2].substring(7)
                         DirectUtils.directToCommunityArticle(
                             context, articleId, "",
-                            entrance, "文章链接"
+                            entrance, "文章链接", sourceEntrance
                         )
                     }
                     //https://m.ghzs666.com/article/文章ID
@@ -702,7 +706,7 @@ object DefaultUrlHandler {
                     //https://m.ghzs666.com/bbs/video-视频ID
                     splits.size >= 3 && splits[1] == "bbs" && splits[2].startsWith("video-") -> {
                         val videoId = splits[2].substring(6)
-                        DirectUtils.directToVideoDetail(context, videoId, entrance)
+                        DirectUtils.directToVideoDetail(context, videoId, entrance, sourceEntrance)
                     }
                     else -> return false
                 }

app/src/main/java/com/gh/common/browse/BrowseTimer.kt

@@ -0,0 +1,351 @@
+package com.gh.common.browse
+
+import android.os.Handler
+import android.os.Looper
+import android.os.Message
+import androidx.lifecycle.*
+import androidx.lifecycle.Lifecycle.Event
+
+/**
+ * 浏览时长计时器核心接口类，用于页面浏览时长相关埋点上报
+ */
+interface IBrowseTimerCore {
+    /**
+     * 开始计时
+     */
+    fun start()
+
+    /**
+     * 结束计时
+     */
+    fun stop()
+}
+
+/**
+ * 浏览时长计时器核心实现类
+ */
+class BrowseTimerCore internal constructor() : IBrowseTimerCore {
+
+    /**
+     * 延迟执行的时间
+     */
+    var delayInMills: Long = 3000L
+
+    /**
+     * 开始计时函数回调
+     */
+    var onStart: (() -> Unit)? = null
+
+    /**
+     * 结束计时函数回调
+     */
+    var onResult: ((Long) -> Unit)? = null
+
+    /**
+     * 开始计时的时间点
+     */
+    private var startTimeInMills: Long = 0L
+
+    /**
+     * Handler操作类
+     */
+    private val handler = object : Handler(Looper.getMainLooper()) {
+        override fun handleMessage(msg: Message) {
+            if (msg.what == MESSAGE_START) {
+                dispatchOnStart()
+            }
+        }
+    }
+
+    /**
+     * 延迟执行开始计时
+     * @see delayInMills
+     * @see onStart
+     */
+    override fun start() {
+        if (delayInMills <= 0) {
+            dispatchOnStart()
+        } else {
+            handler.sendEmptyMessageDelayed(MESSAGE_START, delayInMills)
+        }
+    }
+
+    /**
+     * 结束计时，统计浏览时长并回调结束计时函数
+     * @see onResult
+     */
+    override fun stop() {
+        handler.removeMessages(MESSAGE_START)
+        if (startTimeInMills > 0L) {
+            onResult?.invoke(System.currentTimeMillis() - startTimeInMills)
+            startTimeInMills = 0L
+        }
+    }
+
+    /**
+     * 开始计时，回调开始计时函数
+     */
+    private fun dispatchOnStart() {
+        startTimeInMills = System.currentTimeMillis()
+        onStart?.invoke()
+    }
+
+    companion object {
+        private const val MESSAGE_START = 1
+    }
+}
+
+/**
+ * 无数据浏览计时器接口类
+ */
+interface IBrowseTimer : IBrowseTimerCore {
+
+    fun withDelayInMills(delayInMills: Long): IBrowseTimer
+
+    fun withStart(onStart: () -> Unit): IBrowseTimer
+
+    fun withResult(onResult: (Long) -> Unit): IBrowseTimer
+}
+
+/**
+ * 无数据的浏览计时器实现类
+ */
+class BrowseTimer : IBrowseTimer {
+
+    private val core = BrowseTimerCore()
+
+    private var isStarted: Boolean = false
+
+    override fun withDelayInMills(delayInMills: Long): IBrowseTimer {
+        core.delayInMills = delayInMills
+        return this
+    }
+
+    override fun withStart(onStart: () -> Unit): IBrowseTimer {
+        core.onStart = onStart
+        return this
+    }
+
+    override fun withResult(onResult: (Long) -> Unit): IBrowseTimer {
+        core.onResult = onResult
+        return this
+    }
+
+    override fun start() {
+        if (isStarted) return
+
+        isStarted = true
+        core.start()
+    }
+
+    override fun stop() {
+        if (!isStarted) return
+
+        core.stop()
+        isStarted = false
+    }
+
+}
+
+/**
+ * 支持Lifecycle的无数据的浏览计时器
+ */
+class LifecycleBoundBrowseTimer internal constructor(
+    private val base: IBrowseTimer,
+    private val onStateChanged: (IBrowseTimer, Event) -> Unit
+) : IBrowseTimer, LifecycleEventObserver {
+    override fun withDelayInMills(delayInMills: Long): IBrowseTimer {
+        return base.withDelayInMills(delayInMills)
+    }
+
+    override fun withStart(onStart: () -> Unit): IBrowseTimer {
+        return base.withStart(onStart)
+    }
+
+    override fun withResult(onResult: (Long) -> Unit): IBrowseTimer {
+        return base.withResult(onResult)
+    }
+
+    override fun start() {
+        base.start()
+    }
+
+    override fun stop() {
+        base.stop()
+    }
+
+    override fun onStateChanged(source: LifecycleOwner, event: Event) {
+        onStateChanged.invoke(this, event)
+    }
+
+}
+
+fun IBrowseTimer.withLifecycle(
+    owner: LifecycleOwner,
+    onStateChanged: (IBrowseTimer, Event) -> Unit = { timer, event ->
+        when(event) {
+            Event.ON_START -> timer.start()
+            Event.ON_STOP -> timer.stop()
+            else -> {}
+        }
+    }
+): LifecycleBoundBrowseTimer = LifecycleBoundBrowseTimer(this, onStateChanged).apply {
+    owner.lifecycle.addObserver(this)
+}
+
+/**
+ * 带数据的浏览计时器接口类
+ */
+interface IValueBrowseTimer<T> : IBrowseTimerCore {
+
+    fun withDelayInMills(delayInMills: Long): IValueBrowseTimer<T>
+
+    fun withStart(onStart: (T?) -> Unit): IValueBrowseTimer<T>
+
+    fun withResult(onResult: (T?, Long) -> Unit): IValueBrowseTimer<T>
+
+    fun dispatchValue(value: T?)
+}
+
+/**
+ * 带数据的浏览计时器实现类
+ */
+class ValueBrowseTimer<T> : IValueBrowseTimer<T> {
+
+    private val core = BrowseTimerCore()
+
+    private var isDispatchValue: Boolean = false
+
+    private var isStarted: Boolean = false
+
+    private var value: T? = null
+
+    override fun withDelayInMills(delayInMills: Long): IValueBrowseTimer<T> {
+        core.delayInMills = delayInMills
+        return this
+    }
+
+    override fun withStart(onStart: (T?) -> Unit): IValueBrowseTimer<T> {
+        core.onStart = { onStart.invoke(value) }
+        return this
+    }
+
+    override fun withResult(onResult: (T?, Long) -> Unit): IValueBrowseTimer<T> {
+        core.onResult = { onResult.invoke(value, it) }
+        return this
+    }
+
+    override fun start() {
+        if (isStarted) return
+
+        isStarted = true
+
+        if (isDispatchValue) {
+            core.start()
+        }
+    }
+
+    override fun stop() {
+        if (!isStarted) return
+
+        core.stop()
+        isStarted = false
+    }
+
+    override fun dispatchValue(value: T?) {
+        this.value = value
+
+        if (isStarted && !isDispatchValue) {
+            core.start()
+        }
+        isDispatchValue = true
+    }
+
+}
+
+/**
+ * 支持LiveData的带数据的浏览计时器
+ */
+class ObserverBoundValueBrowseTimer<T> internal constructor(private val base: IValueBrowseTimer<T>) : IValueBrowseTimer<T>, Observer<T> {
+    override fun withDelayInMills(delayInMills: Long): IValueBrowseTimer<T> {
+        return base.withDelayInMills(delayInMills)
+    }
+
+    override fun withResult(onResult: (T?, Long) -> Unit): IValueBrowseTimer<T> {
+        return base.withResult(onResult)
+    }
+
+    override fun withStart(onStart: (T?) -> Unit): IValueBrowseTimer<T> {
+        return base.withStart(onStart)
+    }
+
+    override fun start() {
+        base.start()
+    }
+
+    override fun stop() {
+        base.stop()
+    }
+
+    override fun dispatchValue(value: T?) {
+        base.dispatchValue(value)
+    }
+
+    override fun onChanged(t: T) {
+        dispatchValue(t)
+    }
+}
+
+
+/**
+ * 支持Lifecycle的带数据的浏览计时器
+ */
+class LifecycleBoundValueBrowseTimer<T> internal constructor(
+    private val base: IValueBrowseTimer<T>,
+    private val onStateChanged: (IValueBrowseTimer<T>, Event) -> Unit
+) : IValueBrowseTimer<T>, LifecycleEventObserver {
+    override fun withDelayInMills(delayInMills: Long): IValueBrowseTimer<T> {
+        return base.withDelayInMills(delayInMills)
+    }
+
+    override fun withResult(onResult: (T?, Long) -> Unit): IValueBrowseTimer<T> {
+        return base.withResult(onResult)
+    }
+
+    override fun withStart(onStart: (T?) -> Unit): IValueBrowseTimer<T> {
+        return base.withStart(onStart)
+    }
+
+    override fun start() {
+        base.start()
+    }
+
+    override fun stop() {
+        base.stop()
+    }
+
+    override fun dispatchValue(value: T?) {
+        base.dispatchValue(value)
+    }
+
+    override fun onStateChanged(source: LifecycleOwner, event: Event) {
+        onStateChanged.invoke(this, event)
+    }
+
+}
+
+fun <T> IValueBrowseTimer<T>.asObserver(): ObserverBoundValueBrowseTimer<T> = ObserverBoundValueBrowseTimer(this)
+
+fun <T> IValueBrowseTimer<T>.withLifecycle(
+    owner: LifecycleOwner,
+    onStateChanged: (IValueBrowseTimer<T>, Event) -> Unit = { timer, event ->
+        when(event) {
+            Event.ON_START -> timer.start()
+            Event.ON_STOP -> timer.stop()
+            else -> {}
+        }
+    }
+): LifecycleBoundValueBrowseTimer<T> = LifecycleBoundValueBrowseTimer(this, onStateChanged).apply {
+    owner.lifecycle.addObserver(this)
+}
+

app/src/main/java/com/gh/common/chain/BrowserInstallHandler.kt

@@ -1,22 +1,21 @@
 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 : ChainHandler() {
+class BrowserInstallHandler : DownloadChainHandler() {
 
-    override fun handleRequest(context: Context, gameEntity: GameEntity) {
+    override fun handleRequest(context: Context, gameEntity: GameEntity, asVGame: Boolean) {
         BrowserInstallHelper.showBrowserInstallHintDialog(
             context,
-            gameEntity.isVGame() || gameEntity.isSplitXApk()
+            gameEntity,
+            asVGame || gameEntity.isSplitXApk()
         ) {
             if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity)
+                getNext()?.handleRequest(context, gameEntity, asVGame)
             } else {
-                processEndCallback?.invoke(null)
+                processEndCallback?.invoke(asVGame, null)
             }
         }
     }

app/src/main/java/com/gh/common/chain/CertificationHandler.kt

@@ -4,14 +4,14 @@ import android.content.Context
 import com.gh.common.dialog.CertificationDialog
 import com.gh.gamecenter.feature.entity.GameEntity
 
-class CertificationHandler : ChainHandler() {
+class CertificationHandler : DownloadChainHandler() {
 
-    override fun handleRequest(context: Context, gameEntity: GameEntity) {
+    override fun handleRequest(context: Context, gameEntity: GameEntity, asVGame: Boolean) {
         CertificationDialog.showCertificationDialog(context, gameEntity) {
             if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity)
+                getNext()?.handleRequest(context, gameEntity, asVGame)
             } else {
-                processEndCallback?.invoke(null)
+                processEndCallback?.invoke(asVGame, null)
             }
         }
     }

app/src/main/java/com/gh/common/chain/ChainHandler.kt

@@ -1,24 +0,0 @@
-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)
-
-}

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

app/src/main/java/com/gh/common/chain/CheckStoragePermissionHandler.kt

@@ -2,20 +2,23 @@ package com.gh.common.chain
 
 import android.content.Context
 import com.gh.gamecenter.common.utils.PermissionHelper
-import com.gh.gamecenter.core.utils.EmptyCallback
 import com.gh.gamecenter.feature.entity.GameEntity
 
-class CheckStoragePermissionHandler : ChainHandler() {
+class CheckStoragePermissionHandler : DownloadChainHandler() {
 
-    override fun handleRequest(context: Context, gameEntity: GameEntity) {
-        PermissionHelper.checkStoragePermissionBeforeAction(context, object : EmptyCallback {
-            override fun onCallback() {
-                if (hasNext()) {
-                    getNext()?.handleRequest(context, gameEntity)
-                } else {
-                    processEndCallback?.invoke(null)
-                }
+    override fun handleRequest(context: Context, gameEntity: GameEntity, asVGame: Boolean) {
+        PermissionHelper.checkStoragePermissionBeforeAction(
+            context,
+            gameEntity.id,
+            gameEntity.name ?: "",
+            gameEntity.categoryChinese,
+            gameEntity.getApk().firstOrNull()?.format,
+        ) {
+            if (hasNext()) {
+                getNext()?.handleRequest(context, gameEntity, asVGame)
+            } else {
+                processEndCallback?.invoke(asVGame, null)
             }
-        })
+        }
     }
 }

app/src/main/java/com/gh/common/chain/DownloadChainBuilder.kt

@@ -1,22 +1,22 @@
 package com.gh.common.chain
 
-class ChainBuilder {
+class DownloadChainBuilder {
 
-    private val handlers: MutableList<ChainHandler> = ArrayList()
+    private val handlers: MutableList<DownloadChainHandler> = ArrayList()
 
-    private var processEndCallback: ((Any?) -> Unit)? = null
+    private var processEndCallback: ((asVGame: Boolean, Any?) -> Unit)? = null
 
-    fun setProcessEndCallback(callback: (Any?) -> Unit): ChainBuilder {
+    fun setProcessEndCallback(callback: (asVGame: Boolean, Any?) -> Unit): DownloadChainBuilder {
         processEndCallback = callback
         return this
     }
 
-    fun addHandler(handler: ChainHandler): ChainBuilder {
+    fun addHandler(handler: DownloadChainHandler): DownloadChainBuilder {
         handlers.add(handler)
         return this
     }
 
-    fun buildHandlerChain(): ChainHandler? {
+    fun buildHandlerChain(): DownloadChainHandler? {
         for (i in handlers.indices) {
             handlers[i].processEndCallback = processEndCallback
             if (i + 1 < handlers.size) {

app/src/main/java/com/gh/common/chain/DownloadChainHandler.kt

@@ -0,0 +1,40 @@
+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)
+
+}

app/src/main/java/com/gh/common/chain/DownloadDialogHelperHandler.kt

@@ -3,21 +3,18 @@ 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 : ChainHandler() {
+class DownloadDialogHelperHandler : DownloadChainHandler() {
 
-    override fun handleRequest(context: Context, gameEntity: GameEntity) {
+    override fun handleRequest(context: Context, gameEntity: GameEntity, asVGame: Boolean) {
         val apk = gameEntity.getApk().safelyGetInRelease(0) ?: return
-        DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk, object : EmptyCallback {
-            override fun onCallback() {
-                if (hasNext()) {
-                    getNext()?.handleRequest(context, gameEntity)
-                } else {
-                    processEndCallback?.invoke(null)
-                }
+        DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk) {
+            if (hasNext()) {
+                getNext()?.handleRequest(context, gameEntity, asVGame)
+            } else {
+                processEndCallback?.invoke(asVGame, null)
             }
-        })
+        }
     }
 }

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 : ChainHandler() {
+class GamePermissionHandler : DownloadChainHandler() {
 
-    override fun handleRequest(context: Context, gameEntity: GameEntity) {
+    override fun handleRequest(context: Context, gameEntity: GameEntity, asVGame: Boolean) {
         GamePermissionDialogFragment.show((context as AppCompatActivity), gameEntity, gameEntity.info) {
             if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity)
+                getNext()?.handleRequest(context, gameEntity, asVGame)
             } else {
-                processEndCallback?.invoke(null)
+                processEndCallback?.invoke(asVGame, null)
             }
         }
     }

app/src/main/java/com/gh/common/chain/LandPageAddressHandler.kt

@@ -1,22 +1,31 @@
 package com.gh.common.chain
 
+import android.app.Activity
 import android.content.Context
 import com.gh.common.util.DialogUtils
 import com.gh.common.util.DirectUtils
+import com.gh.common.util.TempCertificationUtils
 import com.gh.gamecenter.feature.entity.GameEntity
 
-class LandPageAddressHandler : ChainHandler() {
+class LandPageAddressHandler : DownloadChainHandler() {
 
-    override fun handleRequest(context: Context, gameEntity: GameEntity) {
+    override fun handleRequest(context: Context, gameEntity: GameEntity, asVGame: Boolean) {
         if (gameEntity.isLandPageAddressDialog()) {
-            DialogUtils.showLandPageAddressDialog(context, gameEntity) {// 跳转第三方落地页
-                DirectUtils.directToExternalBrowser(context, gameEntity.landPageAddressDialog!!.link!!)
+            TempCertificationUtils.checkCertificationBeforeAction(gameEntity) {
+                if (context is Activity && context.isFinishing) {
+                    // 当前 context 已经无效，不需要再传递执行下去了
+                    return@checkCertificationBeforeAction
+                }
+
+                DialogUtils.showLandPageAddressDialog(context, gameEntity) {// 跳转第三方落地页
+                    DirectUtils.directToExternalBrowser(context, gameEntity.landPageAddressDialog!!.link!!)
+                }
             }
         } else {
             if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity)
+                getNext()?.handleRequest(context, gameEntity, asVGame)
             } else {
-                processEndCallback?.invoke(null)
+                processEndCallback?.invoke(asVGame, null)
             }
         }
     }

app/src/main/java/com/gh/common/chain/OverseaDownloadHandler.kt

@@ -1,25 +1,34 @@
 package com.gh.common.chain
 
+import android.app.Activity
 import android.content.Context
 import com.gh.common.util.DialogUtils
+import com.gh.common.util.TempCertificationUtils
 import com.gh.gamecenter.feature.entity.GameEntity
 
-class OverseaDownloadHandler : ChainHandler() {
+class OverseaDownloadHandler : DownloadChainHandler() {
 
-    override fun handleRequest(context: Context, gameEntity: GameEntity) {
+    override fun handleRequest(context: Context, gameEntity: GameEntity, asVGame: Boolean) {
         if (gameEntity.isOverseaAddressDialog()) {
-            DialogUtils.showOverseaDownloadDialog(context, gameEntity) {// 跳转海外下载地址弹窗
-                if (hasNext()) {
-                    getNext()?.handleRequest(context, gameEntity)
-                } else {
-                    processEndCallback?.invoke(null)
+            TempCertificationUtils.checkCertificationBeforeAction(gameEntity) {
+                if (context is Activity && context.isFinishing) {
+                    // 当前 context 已经无效，不需要再传递执行下去了
+                    return@checkCertificationBeforeAction
+                }
+
+                DialogUtils.showOverseaDownloadDialog(context, gameEntity) {// 跳转海外下载地址弹窗
+                    if (hasNext()) {
+                        getNext()?.handleRequest(context, gameEntity, asVGame)
+                    } else {
+                        processEndCallback?.invoke(asVGame, null)
+                    }
                 }
             }
         } else {
             if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity)
+                getNext()?.handleRequest(context, gameEntity, asVGame)
             } else {
-                processEndCallback?.invoke(null)
+                processEndCallback?.invoke(asVGame, null)
             }
         }
     }

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 : ChainHandler() {
+class PackageCheckHandler : DownloadChainHandler() {
 
-    override fun handleRequest(context: Context, gameEntity: GameEntity) {
+    override fun handleRequest(context: Context, gameEntity: GameEntity, asVGame: Boolean) {
         PackageCheckDialogFragment.show((context as AppCompatActivity), gameEntity) {
             if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity)
+                getNext()?.handleRequest(context, gameEntity, asVGame)
             } else {
-                processEndCallback?.invoke(null)
+                processEndCallback?.invoke(asVGame, null)
             }
         }
     }

app/src/main/java/com/gh/common/chain/UnsupportedFeatureHandler.kt

@@ -4,18 +4,20 @@ import android.content.Context
 import com.gh.gamecenter.common.utils.DialogHelper
 import com.gh.gamecenter.feature.entity.GameEntity
 
-class UnsupportedFeatureHandler : ChainHandler() {
+class UnsupportedFeatureHandler : DownloadChainHandler() {
 
     override fun handleRequest(
-        context: Context, gameEntity: GameEntity
+        context: Context,
+        gameEntity: GameEntity,
+        asVGame: Boolean
     ) {
         if (shouldShowUnsupportedFeatureDialog()) {
             DialogHelper.showUnsupportedFeatureDialog(context)
         } else {
             if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity)
+                getNext()?.handleRequest(context, gameEntity, asVGame)
             } else {
-                processEndCallback?.invoke(null)
+                processEndCallback?.invoke(asVGame, null)
             }
         }
     }

app/src/main/java/com/gh/common/chain/UpdateNewSimulatorHandler.kt

@@ -5,31 +5,27 @@ import com.gh.common.simulator.NewSimulatorGameManager
 import com.gh.common.simulator.SimulatorGameManager
 import com.gh.gamecenter.feature.entity.GameEntity
 
-class UpdateNewSimulatorHandler: ChainHandler() {
+class UpdateNewSimulatorHandler: DownloadChainHandler() {
 
-    override fun handleRequest(context: Context, gameEntity: GameEntity) {
+    override fun handleRequest(context: Context, gameEntity: GameEntity, asVGame: Boolean) {
         if (SimulatorGameManager.isSimulatorGame(gameEntity)) {
             if (NewSimulatorGameManager.shouldShowUpdateNewSimulatorAlert(context)) {
-                NewSimulatorGameManager.showUpdateNewsSimulator(context) {
+                NewSimulatorGameManager.showUpdateNewsSimulator(context, gameEntity) {
                     if (hasNext()) {
-                        getNext()?.handleRequest(context, gameEntity)
+                        getNext()?.handleRequest(context, gameEntity, asVGame)
                     } else {
-                        processEndCallback?.invoke(null)
+                        processEndCallback?.invoke(asVGame, null)
                     }
                 }
-            }
-            else{
+            } else {
                 if (hasNext()) {
-                    getNext()?.handleRequest(context, gameEntity)
+                    getNext()?.handleRequest(context, gameEntity, asVGame)
                 }
             }
-        }
-        else{
+        } else {
             if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity)
+                getNext()?.handleRequest(context, gameEntity, asVGame)
             }
         }
-
-
     }
 }

app/src/main/java/com/gh/common/chain/ValidateVSpaceHandler.kt

@@ -4,15 +4,23 @@ import android.content.Context
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.vspace.VHelper
 
-class ValidateVSpaceHandler : ChainHandler() {
+class ValidateVSpaceHandler : DownloadChainHandler() {
 
-    override fun handleRequest(context: Context, gameEntity: GameEntity) {
-        VHelper.validateVSpaceBeforeAction(context, gameEntity) {
+    override fun handleRequest(context: Context, gameEntity: GameEntity, asVGame: Boolean) {
+        val closure = {
             if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity)
+                getNext()?.handleRequest(context, gameEntity, asVGame)
             } else {
-                processEndCallback?.invoke(null)
+                processEndCallback?.invoke(asVGame, null)
             }
         }
+
+        if (asVGame) {
+            VHelper.validateVSpaceBeforeAction(context, gameEntity) {
+                closure.invoke()
+            }
+        } else {
+            closure.invoke()
+        }
     }
 }

app/src/main/java/com/gh/common/chain/VersionNumberHandler.kt

@@ -3,29 +3,59 @@ package com.gh.common.chain
 import android.content.Context
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.utils.DialogHelper
+import com.gh.gamecenter.common.utils.SensorsBridge
 import com.gh.gamecenter.common.utils.toResString
 import com.gh.gamecenter.feature.entity.GameEntity
 
-class VersionNumberHandler : ChainHandler() {
+class VersionNumberHandler : DownloadChainHandler() {
 
-    override fun handleRequest(context: Context, gameEntity: GameEntity) {
+    override fun handleRequest(context: Context, gameEntity: GameEntity, asVGame: Boolean) {
         val confirmCallback = {
             if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity)
+                getNext()?.handleRequest(context, gameEntity, asVGame)
             } else {
-                processEndCallback?.invoke(null)
+                processEndCallback?.invoke(asVGame, null)
             }
         }
         if (!gameEntity.isShowVersionNumber()) {
             confirmCallback.invoke()
         } else {
+            SensorsBridge.trackGameDemoDialogShow(
+                gameId = gameEntity.id,
+                gameName = gameEntity.name ?: "",
+                gameType = gameEntity.categoryChinese
+            )
             DialogHelper.showGuideDialog(
                 context,
                 "温馨提示",
                 gameEntity.getVersionNumberString(),
                 "继续下载",
                 R.string.cancel.toResString(),
-                { confirmCallback.invoke() },
+                {
+                    confirmCallback.invoke()
+                    SensorsBridge.trackGameDemoDialogClick(
+                        buttonName = "继续下载",
+                        gameId = gameEntity.id,
+                        gameName = gameEntity.name ?: "",
+                        gameType = gameEntity.categoryChinese
+                    )
+                },
+                cancelClickCallback = {
+                    SensorsBridge.trackGameDemoDialogClick(
+                        buttonName = R.string.cancel.toResString(),
+                        gameId = gameEntity.id,
+                        gameName = gameEntity.name ?: "",
+                        gameType = gameEntity.categoryChinese
+                    )
+                },
+                touchOutsideCallback = {
+                    SensorsBridge.trackGameDemoDialogClick(
+                        buttonName = "关闭弹窗",
+                        gameId = gameEntity.id,
+                        gameName = gameEntity.name ?: "",
+                        gameType = gameEntity.categoryChinese
+                    )
+                },
                 extraConfig = DialogHelper.Config(titleIcon = R.drawable.ic_dialog_tips)
             )
         }

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

@@ -29,6 +29,7 @@ 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;
@@ -460,6 +461,11 @@ 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());
+                            }
                         }
                     });
         }

app/src/main/java/com/gh/common/databind/AddKaiFuBindingAdapter.kt

@@ -13,14 +13,14 @@ import android.widget.PopupWindow
 import androidx.core.content.ContextCompat
 import androidx.databinding.BindingAdapter
 import androidx.recyclerview.widget.LinearLayoutManager
+import com.gh.gamecenter.R
 import com.gh.gamecenter.common.callback.OnViewClickListener
+import com.gh.gamecenter.common.databinding.LayoutPopupContainerBinding
 import com.gh.gamecenter.common.utils.dip2px
 import com.gh.gamecenter.common.utils.toDrawable
 import com.gh.gamecenter.common.view.BugFixedPopupWindow
-import com.gh.gamecenter.R
 import com.gh.gamecenter.databinding.KaifuAddItemBinding
 import com.gh.gamecenter.databinding.LayoutAddKaifuPopupBinding
-import com.gh.gamecenter.databinding.LayoutPopupContainerBinding
 import com.gh.gamecenter.feature.entity.ServerCalendarEntity
 import com.gh.gamecenter.servers.add.AddKaiFuPopupAdapter
 import java.text.SimpleDateFormat
@@ -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.theme_red))
-            view.setHintTextColor(ContextCompat.getColor(view.context, R.color.theme_red))
+            view.setTextColor(ContextCompat.getColor(view.context, R.color.secondary_red))
+            view.setHintTextColor(ContextCompat.getColor(view.context, R.color.secondary_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_title))
+            view.setTextColor(ContextCompat.getColor(view.context, R.color.text_primary))
             view.setHintTextColor(ContextCompat.getColor(view.context, R.color.hint))
         }
     }

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

@@ -3,27 +3,21 @@ package com.gh.common.databind;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
-import android.graphics.Typeface;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.TextUtils;
 import android.text.style.ForegroundColorSpan;
-import android.view.LayoutInflater;
-import android.view.MotionEvent;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.content.ContextCompat;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
-import com.facebook.drawee.view.SimpleDraweeView;
 import com.gh.common.chain.BrowserInstallHandler;
 import com.gh.common.chain.CertificationHandler;
-import com.gh.common.chain.ChainBuilder;
-import com.gh.common.chain.ChainHandler;
+import com.gh.common.chain.DownloadChainBuilder;
+import com.gh.common.chain.DownloadChainHandler;
 import com.gh.common.chain.CheckDownloadHandler;
 import com.gh.common.chain.CheckStoragePermissionHandler;
 import com.gh.common.chain.DownloadDialogHelperHandler;
@@ -46,7 +40,6 @@ 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;
@@ -57,24 +50,16 @@ 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.view.DrawableView;
-import com.gh.gamecenter.core.utils.DisplayUtils;
+import com.gh.gamecenter.common.utils.NewFlatLogUtils;
+import com.gh.gamecenter.common.utils.SensorsBridge;
 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;
@@ -83,14 +68,11 @@ 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;
@@ -98,134 +80,8 @@ 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));
@@ -234,117 +90,19 @@ 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,
+                                         ExposureEvent traceEvent,
+                                         @Nullable View.OnClickListener clickCallBack,
+                                         @Nullable String entrance,
+                                         @Nullable String location) {
+        setDownloadButton(progressBar, gameEntity, traceEvent, clickCallBack, entrance, location, "其他");
     }
 
     // 大图下的进度条
@@ -353,7 +111,8 @@ public class BindingAdapters {
                                          ExposureEvent traceEvent,
                                          @Nullable View.OnClickListener clickCallBack,
                                          @Nullable String entrance,
-                                         @Nullable String location) {
+                                         @Nullable String location,
+                                         String sourceEntrance) {
 
         // 恢复DialogFragment
         restoreDialogFragment(progressBar);
@@ -374,13 +133,9 @@ public class BindingAdapters {
             switch (progressBar.getButtonStyle()) {
                 case DOWNLOADING_PLUGIN:
                 case DOWNLOADING_NORMAL:
-                    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);
-                    }
+                    Intent intent = DownloadManagerActivity.getDownloadMangerIntent(v.getContext(),
+                            gameEntity.getApk().get(0).getUrl(), entrance);
+                    v.getContext().startActivity(intent);
                     break;
                 case NONE:
                     Utils.toast(v.getContext(), "该游戏已关闭下载");
@@ -398,12 +153,12 @@ public class BindingAdapters {
                                 boolean isInstalled = PackageUtils.isInstalledFromAllPackage(v.getContext(), gameEntity.getSimulator().getApk().getPackageName());
                                 if (downloadEntity != null && SimulatorGameManager.isSimulatorGame(gameEntity) && !isInstalled) {
                                     SimulatorDownloadManager.getInstance().showDownloadDialog(v.getContext(), gameEntity.getSimulator(),
-                                            SimulatorDownloadManager.SimulatorLocation.LAUNCH, gameEntity.getId(), gameEntity.getName(), null);
+                                            SimulatorDownloadManager.SimulatorLocation.LAUNCH, gameEntity.getId(), gameEntity.getName(), gameEntity.getCategoryChinese(), null);
                                     return;
                                 }
                             }
 
-                            ChainBuilder builder = new ChainBuilder();
+                            DownloadChainBuilder builder = new DownloadChainBuilder();
                             builder.addHandler(new UnsupportedFeatureHandler());
                             builder.addHandler(new GamePermissionHandler());
                             builder.addHandler(new CheckStoragePermissionHandler());
@@ -417,22 +172,33 @@ public class BindingAdapters {
                             builder.addHandler(new OverseaDownloadHandler());
                             builder.addHandler(new CheckDownloadHandler());
 
-                            builder.setProcessEndCallback(o -> {
-                                download(v.getContext(), progressBar, gameEntity, traceEvent, (boolean) o, entrance, location);
+                            builder.setProcessEndCallback((asVGame, isSubscribe) -> {
+                                download(v.getContext(),
+                                        progressBar,
+                                        gameEntity,
+                                        traceEvent,
+                                        asVGame,
+                                        (boolean) isSubscribe,
+                                        entrance,
+                                        location);
                                 return null;
                             });
-                            final ChainHandler chainHandler = builder.buildHandlerChain();
+                            final DownloadChainHandler chainHandler = builder.buildHandlerChain();
                             if (chainHandler != null) {
-                                chainHandler.handleRequest(v.getContext(), gameEntity);
+                                chainHandler.handleRequest(
+                                        v.getContext(),
+                                        gameEntity,
+                                        GameUtils.shouldPerformAsVGame(gameEntity)
+                                );
                             }
                         } else {
-                            ChainBuilder builder = new ChainBuilder();
+                            DownloadChainBuilder builder = new DownloadChainBuilder();
                             builder.addHandler(new UnsupportedFeatureHandler());
                             builder.addHandler(new GamePermissionHandler());
                             builder.addHandler(new CertificationHandler());
                             builder.addHandler(new VersionNumberHandler());
 
-                            builder.setProcessEndCallback(o -> {
+                            builder.setProcessEndCallback((asVGame, isSubscribe) -> {
                                 DownloadDialog.showDownloadDialog(
                                         v.getContext(),
                                         gameEntity,
@@ -441,9 +207,13 @@ public class BindingAdapters {
                                         location + ":" + gameEntity.getName());
                                 return null;
                             });
-                            final ChainHandler chainHandler = builder.buildHandlerChain();
+                            final DownloadChainHandler chainHandler = builder.buildHandlerChain();
                             if (chainHandler != null) {
-                                chainHandler.handleRequest(v.getContext(), gameEntity);
+                                chainHandler.handleRequest(
+                                        v.getContext(),
+                                        gameEntity,
+                                        GameUtils.shouldPerformAsVGame(gameEntity)
+                                );
                             }
                         }
                     }
@@ -456,7 +226,14 @@ public class BindingAdapters {
                             if (downloadEntity != null) {
                                 File file = new File(downloadEntity.getPath());
                                 if (!file.exists()) {
-                                    download(v.getContext(), progressBar, gameEntity, traceEvent, false, entrance, location);
+                                    download(v.getContext(),
+                                            progressBar,
+                                            gameEntity,
+                                            traceEvent,
+                                            false,
+                                            false,
+                                            entrance,
+                                            location);
                                     return;
                                 }
 
@@ -465,12 +242,7 @@ public class BindingAdapters {
                             return;
                         }
 
-                        if (gameEntity.isVGame()) {
-                            VHelper.installOrLaunch((AppCompatActivity) v.getContext(), gameEntity, null);
-                            return;
-                        }
-
-                        PackageLauncher.launchApp(v.getContext(), gameEntity, gameEntity.getApk().get(0).getPackageName());
+                        PackageLauncher.launch(v.getContext(), gameEntity, null);
                     } else {
                         DownloadDialog.showDownloadDialog(
                                 v.getContext(),
@@ -483,22 +255,34 @@ public class BindingAdapters {
                 case INSTALL_PLUGIN:
                 case INSTALL_NORMAL:
                     if (gameEntity.getApk().size() == 1) {
+
+                        NewFlatLogUtils.INSTANCE.logGameInstall(
+                                gameEntity.getId(),
+                                gameEntity.getName() != null ? gameEntity.getName() : "",
+                                "主动安装"
+                        );
+
+                        SensorsBridge.trackInstallGameClick(
+                                gameEntity.getId(),
+                                gameEntity.getName() != null ? gameEntity.getName() : "",
+                                "主动安装"
+                        );
+
                         DownloadEntity downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity);
 
-                        if (gameEntity.isVGame()) {
-                            VHelper.installOrLaunch(v.getContext(), gameEntity, null);
-                            return;
-                        }
-
                         if (downloadEntity != null) {
-                            PackageInstaller.install(v.getContext(), downloadEntity);
+                            if (ExtensionsKt.isLocalDownloadInDualDownloadMode(downloadEntity)) {
+                                PackageInstaller.install(v.getContext(), downloadEntity);
+                            } else {
+                                VHelper.installOrLaunch(v.getContext(), gameEntity, null);
+                            }
                         }
                     }
                     break;
                 case RESERVABLE:
                     GamePermissionDialogFragment.show((AppCompatActivity) v.getContext(), gameEntity, gameEntity.getInfo(), () -> {
                         CheckLoginUtils.checkLogin(progressBar.getContext(), "", () -> {
-                            ReservationHelper.reserve(v.getContext(), gameEntity.getId(), gameEntity.getName(), () -> {
+                            ReservationHelper.reserve(v.getContext(), gameEntity, sourceEntrance, () -> {
                                 LogUtils.logReservation(gameEntity, traceEvent);
                                 updateReservation(progressBar, gameEntity);
                             });
@@ -577,7 +361,7 @@ public class BindingAdapters {
             }
 
         } else {
-            String status = GameUtils.getDownloadBtnText(progressBar.getContext(), gameEntity, PluginLocation.only_game);
+            String status = GameUtils.getDownloadBtnText(progressBar.getContext(), gameEntity, true, false, PluginLocation.only_game);
             switch (status) {
                 case "插件化":
                     progressBar.setButtonStyle(DownloadButton.ButtonStyle.PLUGIN);
@@ -649,24 +433,6 @@ 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()) {
@@ -686,45 +452,35 @@ 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 str = progressBar.getText().toString();
-        String method;
-        if (str.contains("更新")) {
-            method = "更新";
-        } else if (str.contains("插件化")) {
-            method = "插件化";
-        } else {
-            method = progressBar.getContext().getString(R.string.download);
-        }
+        String buttonText = progressBar.getText();
         ApkEntity apkEntity = gameEntity.getApk().get(0);
         String msg = FileUtils.isCanDownload(progressBar.getContext(), apkEntity.getSize());
         if (TextUtils.isEmpty(msg)) {
             DownloadManager.createDownload(progressBar.getContext(),
                     apkEntity,
                     gameEntity,
-                    method,
+                    asVGame,
+                    gameEntity.isDualBtnModeEnabled(),
                     entrance,
                     location + gameEntity.getName(),
                     isSubscribe,
                     traceEvent);
 
             progressBar.setProgress(0);
-            progressBar.setButtonStyle("插件化".equals(method) ?
+            progressBar.setButtonStyle(buttonText.contains("插件化") ?
                     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 {
@@ -794,12 +550,6 @@ public class BindingAdapters {
         }
     }
 
-    public static void isRefreshing(SwipeRefreshLayout layout, LoadStatus status) {
-        if (status != LoadStatus.INIT_LOADING && status != LoadStatus.LIST_LOADING) {
-            layout.setRefreshing(false);
-        }
-    }
-
     public static void setGameName(TextView view, GameEntity game, boolean isShowPlatform, @Nullable Boolean isShowSuffix) {
         if (isShowSuffix == null) isShowSuffix = true; // 默认显示
         String gameName;
@@ -821,30 +571,6 @@ 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("");
@@ -872,16 +598,4 @@ 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("-");
-        }
-    }
 }

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.theme_font,
+                R.color.text_theme,
                 true
             ) {
                 DirectUtils.directToQqGroup(

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

@@ -70,11 +70,11 @@ class CertificationDialog(
                 actionRightTv.text = "去实名认证"
                 noRemindAgainCb.visibility = View.GONE
                 actionLeftTv.setOnClickListener {
-                    SensorsBridge.trackEvent("VerificationPopupClick", "button_name", actionLeftTv.text.toString())
+                    SensorsBridge.trackVerificationPopupClick(actionLeftTv.text.toString())
                     dismiss()
                 }
                 actionRightTv.setOnClickListener {
-                    SensorsBridge.trackEvent("VerificationPopupClick", "button_name", actionRightTv.text.toString())
+                    SensorsBridge.trackVerificationPopupClick(actionRightTv.text.toString())
                     if (UserManager.getInstance().isLoggedIn) {
                         gotoAuthPage()
                     } else {
@@ -87,7 +87,7 @@ class CertificationDialog(
                 actionRightTv.text = "继续下载"
                 noRemindAgainCb.visibility = View.GONE
                 actionLeftTv.setOnClickListener {
-                    SensorsBridge.trackEvent("VerificationPopupClick", "button_name", actionLeftTv.text.toString())
+                    SensorsBridge.trackVerificationPopupClick(actionLeftTv.text.toString())
                     if (UserManager.getInstance().isLoggedIn) {
                         gotoAuthPage()
                     } else {
@@ -95,7 +95,7 @@ class CertificationDialog(
                     }
                 }
                 actionRightTv.setOnClickListener {
-                    SensorsBridge.trackEvent("VerificationPopupClick", "button_name", actionRightTv.text.toString())
+                    SensorsBridge.trackVerificationPopupClick(actionRightTv.text.toString())
                     listener.onConfirm()
                     dismiss()
                 }
@@ -105,7 +105,7 @@ class CertificationDialog(
                 actionRightTv.text = "继续下载"
                 noRemindAgainCb.visibility = View.VISIBLE
                 actionLeftTv.setOnClickListener {
-                    SensorsBridge.trackEvent("VerificationPopupClick", "button_name", actionLeftTv.text.toString())
+                    SensorsBridge.trackVerificationPopupClick(actionLeftTv.text.toString())
                     if (noRemindAgainCb.isChecked) {
                         SPUtils.setBoolean(gameEntity.id, true)
                     }
@@ -116,7 +116,7 @@ class CertificationDialog(
                     }
                 }
                 actionRightTv.setOnClickListener {
-                    SensorsBridge.trackEvent("VerificationPopupClick", "button_name", actionRightTv.text.toString())
+                    SensorsBridge.trackVerificationPopupClick(actionRightTv.text.toString())
                     if (noRemindAgainCb.isChecked) {
                         SPUtils.getBoolean(gameEntity.id, true)
                     }
@@ -126,14 +126,12 @@ class CertificationDialog(
             }
         }
 
-        SensorsBridge.trackEvent(
-            "VerificationDialogShow",
-            "game_id",
-            gameEntity.id,
-            "game_name",
-            gameEntity.name ?: "",
-            "game_type",
-            gameEntity.categoryChinese
+        SensorsBridge.trackVerificationDialogShow(
+            gameId = gameEntity.id,
+            gameName = gameEntity.name ?: "",
+            gameType = gameEntity.categoryChinese,
+            articleType = "",
+            verificationType = "游戏实名"
         )
     }
 
@@ -162,6 +160,7 @@ class CertificationDialog(
                     context,
                     ShellActivity.Type.REAL_NAME_INFO,
                 ).apply {
+                    putExtra(EntranceConsts.KEY_SOURCE_ENTRANCE, "游戏实名")
                     putExtra(EntranceConsts.KEY_GAME_ID, gameEntity.id)
                 }, object : Callback {
                     override fun onActivityResult(resultCode: Int, data: Intent?) {

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.theme_font.toColor(requireContext()))
+                    siteTv.setTextColor(R.color.text_theme.toColor(requireContext()))
                     siteTv.text = site.text
                     siteTv.paintFlags = siteTv.paintFlags or Paint.UNDERLINE_TEXT_FLAG
                     siteTv.setOnClickListener {

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

@@ -1,6 +1,7 @@
 package com.gh.common.dialog
 
 import android.app.Activity.RESULT_OK
+import android.content.DialogInterface
 import android.content.Intent
 import android.os.Build
 import android.os.Bundle
@@ -18,13 +19,10 @@ import com.gh.common.xapk.XapkInstaller
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
 import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.utils.PermissionHelper
+import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.common.utils.PermissionHelper.INSTALL_PERMISSION_CODE
-import com.gh.gamecenter.common.utils.getExtension
-import com.gh.gamecenter.common.utils.goneIf
 import com.gh.gamecenter.core.utils.SPUtils
 import com.lightgame.download.DownloadEntity
-import com.lightgame.utils.Utils
 import kotlin.random.Random
 
 class InstallPermissionDialogFragment : BaseDialogFragment() {
@@ -34,8 +32,11 @@ class InstallPermissionDialogFragment : BaseDialogFragment() {
     var url: String = ""
     var gameId: String = ""
     var gameName: String = ""
+    var gameType: String = ""
     var mCallBack: ((isFromPermissionGrantedCallback: Boolean) -> Unit)? = null
 
+    private var dismissByTouchInside = false
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         mView = inflater.inflate(R.layout.dialog_install_permission, null, false)
         return mView
@@ -55,6 +56,12 @@ class InstallPermissionDialogFragment : BaseDialogFragment() {
 
         if (isXapk) NewFlatLogUtils.logXApkInstallPermissionDialogShowed(gameId, gameName)
 
+        SensorsBridge.trackInstallPermissionDialogShow(
+            gameId = gameId,
+            gameName = gameName,
+            gameType = gameType
+        )
+
         val randomNumber = if (isXapk) 1 else Random.nextInt(2)
         closeTv.goneIf(randomNumber == 0)
         closeIv.goneIf(randomNumber != 0)
@@ -64,18 +71,38 @@ class InstallPermissionDialogFragment : BaseDialogFragment() {
         }
 
         closeTv.setOnClickListener {
+            dismissByTouchInside = true
             if (isXapk) {
                 NewFlatLogUtils.logXApkInstallPermissionDialogClick("尝试解压", false, gameId, gameName)
                 mCallBack?.invoke(false)
             }
+            SensorsBridge.trackInstallPermissionDialogClick(
+                buttonName = "尝试解压",
+                gameId = gameId,
+                gameName = gameName,
+                gameType = gameType
+            )
             dismiss()
         }
         closeIv.setOnClickListener {
+            dismissByTouchInside = true
             if (isXapk) NewFlatLogUtils.logXApkInstallPermissionDialogClick("关闭", false, gameId, gameName)
+            SensorsBridge.trackInstallPermissionDialogClick(
+                buttonName = "关闭",
+                gameId = gameId,
+                gameName = gameName,
+                gameType = gameType
+            )
             dismiss()
         }
         activateTv.setOnClickListener {
             NewFlatLogUtils.logXApkInstallPermissionDialogClick("立即开启", false, gameId, gameName)
+            SensorsBridge.trackInstallPermissionDialogClick(
+                buttonName = "立即开启",
+                gameId = gameId,
+                gameName = gameName,
+                gameType = gameType
+            )
             PermissionHelper.toInstallPermissionSetting(requireActivity())
             if (isXapk) {
                 SPUtils.setString(Constants.SP_XAPK_UNZIP_ACTIVITY, requireActivity().javaClass.name)
@@ -84,9 +111,23 @@ class InstallPermissionDialogFragment : BaseDialogFragment() {
         }
     }
 
+    override fun onDismiss(dialog: DialogInterface) {
+        if (!dismissByTouchInside) {
+            SensorsBridge.trackInstallPermissionDialogClick(
+                buttonName = "关闭弹窗",
+                gameId = gameId,
+                gameName = gameName,
+                gameType = gameType
+            )
+        }
+        super.onDismiss(dialog)
+    }
+
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         if (resultCode == RESULT_OK && requestCode == INSTALL_PERMISSION_CODE) {
+            dismissByTouchInside = true
+
             NewFlatLogUtils.logXApkInstallPermissionDialogClick("立即开启", true, gameId, gameName)
 
             if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.R) {
@@ -136,6 +177,7 @@ class InstallPermissionDialogFragment : BaseDialogFragment() {
                 installPermissionDialogFragment.url = downloadEntity.url
                 installPermissionDialogFragment.gameId = downloadEntity.gameId
                 installPermissionDialogFragment.gameName = downloadEntity.name
+                installPermissionDialogFragment.gameType = downloadEntity.categoryChinese
                 val transaction: FragmentTransaction = activity.supportFragmentManager.beginTransaction()
                 transaction.show(installPermissionDialogFragment)
                 transaction.commit()
@@ -146,6 +188,7 @@ class InstallPermissionDialogFragment : BaseDialogFragment() {
                     this.url = downloadEntity.url
                     this.gameId = downloadEntity.gameId
                     this.gameName = downloadEntity.name
+                    this.gameType = downloadEntity.categoryChinese
                 }
                 installPermissionDialogFragment.show(
                     activity.supportFragmentManager,

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.theme_font)
+                    ds.color = ContextCompat.getColor(requireContext(), R.color.text_theme)
                     ds.isUnderlineText = false
                 }
 

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

@@ -2,6 +2,7 @@ package com.gh.common.dialog
 
 import android.animation.ValueAnimator
 import android.content.Context
+import android.content.DialogInterface
 import android.content.pm.PackageInfo
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -11,6 +12,7 @@ import android.view.animation.LinearInterpolator
 import android.widget.LinearLayout
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
+import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentTransaction
 import androidx.lifecycle.Lifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -61,6 +63,8 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
     var gameEntity: GameEntity? = null
     var callBack: ConfirmListener? = null
 
+    private var mDismissByTouchInside = false
+
     private val dataWatcher = object : DataWatcher() {
         override fun onDataChanged(downloadEntity: DownloadEntity) {
             val packageName = downloadEntity.packageName
@@ -90,6 +94,11 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
         EventBus.getDefault().register(this)
         gameEntity?.let {
             LogUtils.uploadPackageCheck("pkg_check_pop_click", "出现弹窗", it, "", "", "", "")
+            SensorsBridge.trackPkgCheckDialogShow(
+                gameId = it.id,
+                gameName = it.name ?: "",
+                gameType = it.categoryChinese
+            )
         }
     }
 
@@ -116,7 +125,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
                     requireContext(),
                     0,
                     (link.title ?: "").length,
-                    R.color.theme_font,
+                    R.color.text_theme,
                     true
                 ) {
                     LogUtils.uploadPackageCheck(
@@ -128,6 +137,18 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
                         "",
                         ""
                     )
+                    SensorsBridge.trackPkgCheckDialogClick(
+                        buttonName = "点击链接",
+                        gameId = gameEntity?.id ?: "",
+                        gameName = gameEntity?.name ?: "",
+                        gameType = gameEntity?.categoryChinese ?: "",
+                        isNotPrompt = if (binding.noRemindAgainCb.isVisible) {
+                            binding.noRemindAgainCb.isChecked
+                        } else null,
+                        linkId = link.link ?: "",
+                        linkType = link.type ?: "",
+                        linkText = link.linkText ?: ""
+                    )
                     DirectUtils.directToLinkPage(requireContext(), link, "包名检测弹窗", "")
                 }.build()
                 spanBuilder.append(linkSpan)
@@ -176,6 +197,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
             }
             val isAllPackageInstalled = isAllPackageInstalled(mAllInstalledPackages, entity)
             if (isAllPackageInstalled) {
+                mDismissByTouchInside = true
                 callBack?.onConfirm()
                 dismissAllowingStateLoss()
             } else {
@@ -193,6 +215,15 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
                         "",
                         ""
                     )
+                    SensorsBridge.trackPkgCheckDialogClick(
+                        buttonName = "点击前往下载",
+                        gameId = gameEntity?.id ?: "",
+                        gameName = gameEntity?.name ?: "",
+                        gameType = gameEntity?.categoryChinese ?: "",
+                        isNotPrompt = if (binding.noRemindAgainCb.isVisible) {
+                            binding.noRemindAgainCb.isChecked
+                        } else null
+                    )
                     DirectUtils.directToLinkPage(requireContext(), packageLink, "包名检测弹窗", "")
                 }
             }
@@ -206,6 +237,19 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
                 saveRecord(entity)
                 LogUtils.uploadPackageCheck("pkg_check_pop_click", "不再提示", gameEntity, "", "", "", "")
             }
+
+            mDismissByTouchInside = true
+
+            SensorsBridge.trackPkgCheckDialogClick(
+                buttonName = binding.cancelTv.text.toString(),
+                gameId = gameEntity?.id ?: "",
+                gameName = gameEntity?.name ?: "",
+                gameType = gameEntity?.categoryChinese ?: "",
+                isNotPrompt = if (binding.noRemindAgainCb.isVisible) {
+                    binding.noRemindAgainCb.isChecked
+                } else null
+            )
+
             dismissAllowingStateLoss()
         }
     }
@@ -300,6 +344,21 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
         DownloadManager.getInstance().removeObserver(dataWatcher)
     }
 
+    override fun onDismiss(dialog: DialogInterface) {
+        if (!mDismissByTouchInside) {
+            SensorsBridge.trackPkgCheckDialogClick(
+                buttonName = "关闭弹窗",
+                gameId = gameEntity?.id ?: "",
+                gameName = gameEntity?.name ?: "",
+                gameType = gameEntity?.categoryChinese ?: "",
+                isNotPrompt = if (binding.noRemindAgainCb.isVisible) {
+                    binding.noRemindAgainCb.isChecked
+                } else null
+            )
+        }
+        super.onDismiss(dialog)
+    }
+
     //安装、卸载事件
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onEventMainThread(busFour: EBPackage) {
@@ -332,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.theme_font))
+                        holder.binding.statusTv.setTextColor(ContextCompat.getColor(context, R.color.text_theme))
                     } else {
                         holder.binding.statusTv.text = "未安装"
-                        holder.binding.statusTv.setTextColor(ContextCompat.getColor(context, R.color.theme_red))
+                        holder.binding.statusTv.setTextColor(ContextCompat.getColor(context, R.color.secondary_red))
                     }
                     holder.binding.statusTv.visibility = View.VISIBLE
                 } else {

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

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

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

@@ -62,17 +62,17 @@ object ExposureUtils {
         host: String? = "unknown",
         path: String? = "unknown",
         downloadType: DownloadType
-    ) {
+    ): ExposureEvent? {
         val gameEntity = entity.copy()
         gameEntity.platform = platform
         gameEntity.downloadCompleteType = downloadType.toString()
         val traceEvent = trace?.toObject<ExposureEvent>()
 
-        if (TextUtils.isEmpty(entity.id)) return
+        if (TextUtils.isEmpty(entity.id)) return null
 
         // 避免生成 trace 相同的下载完成事件，根据日志看下载完成的同一秒有可能生成两条
         if (mDownloadCompleteTraceEventIdSet.contains(traceEvent?.id)) {
-            return
+            return null
         }
 
         traceEvent?.payload?.gameId?.let { mDownloadCompleteTraceEventIdSet.add(it) }
@@ -91,12 +91,14 @@ object ExposureUtils {
 
         ExposureManager.log(exposureEvent)
         ExposureManager.commitSavedExposureEvents(forcedUpload = true)
+
+        return exposureEvent
     }
 
     @JvmStatic
-    fun getDownloadType(apkEntity: ApkEntity, gameId: String, isVGame: Boolean): DownloadType {
+    fun getDownloadType(apkEntity: ApkEntity, gameId: String, asVGame: Boolean): DownloadType {
         return when {
-            isVGame -> getVGameDownloadType(apkEntity, gameId)
+            asVGame -> getVGameDownloadType(apkEntity, gameId)
             PackageUtils.isInstalled(
                 HaloApp.getInstance().application,
                 apkEntity.packageName
@@ -107,7 +109,7 @@ object ExposureUtils {
 
     private fun getVGameDownloadType(apkEntity: ApkEntity, gameId: String): DownloadType {
         return when {
-            PackagesManager.isCanUpdate(gameId, apkEntity.packageName) -> DownloadType.FUN_UPDATE
+            PackagesManager.isCanUpdate(gameId, apkEntity.packageName, asVGame = true) -> DownloadType.FUN_UPDATE
             else -> DownloadType.FUN_DOWNLOAD
         }
     }

app/src/main/java/com/gh/common/history/HistoryDatabase.kt

@@ -19,7 +19,7 @@ import com.halo.assistant.HaloApp
 
 @Database(
     entities = [AnswerEntity::class, ArticleEntity::class, NewsEntity::class, HistoryGameEntity::class, MyVideoEntity::class, GamesCollectionEntity::class],
-    version = 13,
+    version = 14,
     exportSchema = false
 )
 @TypeConverters(
@@ -41,7 +41,8 @@ import com.halo.assistant.HaloApp
     SimpleGameListConverter::class,
     TagInfoListConverter::class,
     ActivityLabelListConverter::class,
-    IconFloatConverter::class
+    IconFloatConverter::class,
+    SectionConverter::class
 )
 
 abstract class HistoryDatabase : RoomDatabase() {
@@ -143,6 +144,14 @@ abstract class HistoryDatabase : RoomDatabase() {
             }
         }
 
+        val MIGRATION_13_14: Migration = object : Migration(13, 14) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.execSQL("Alter TABLE ArticleEntity add type TEXT NOT NULL DEFAULT 'community_article'")
+                database.execSQL("Alter TABLE ArticleEntity add sections TEXT NOT NULL DEFAULT ''")
+                database.execSQL("Alter TABLE ArticleEntity add tagActivityName TEXT NOT NULL DEFAULT ''")
+            }
+        }
+
         val instance by lazy {
             Room.databaseBuilder(
                 HaloApp.getInstance().application,
@@ -160,6 +169,7 @@ abstract class HistoryDatabase : RoomDatabase() {
                 .addMigrations(MIGRATION_10_11)
                 .addMigrations(MIGRATION_11_12)
                 .addMigrations(MIGRATION_12_13)
+                .addMigrations(MIGRATION_13_14)
                 .build()
         }
     }

app/src/main/java/com/gh/common/history/HistoryHelper.kt

@@ -6,11 +6,7 @@ import com.gh.gamecenter.common.utils.removeVideoContent
 import com.gh.gamecenter.common.utils.tryCatchInRelease
 import com.gh.gamecenter.core.runOnIoThread
 import com.gh.gamecenter.entity.*
-import com.gh.gamecenter.feature.entity.AnswerEntity
-import com.gh.gamecenter.feature.entity.ArticleEntity
-import com.gh.gamecenter.feature.entity.GameEntity
-import com.gh.gamecenter.feature.entity.NewsEntity
-import com.gh.gamecenter.feature.entity.User
+import com.gh.gamecenter.feature.entity.*
 import com.gh.gamecenter.qa.entity.AnswerDetailEntity
 import com.gh.gamecenter.qa.entity.ArticleDetailEntity
 
@@ -109,7 +105,7 @@ object HistoryHelper {
     fun deleteArticleEntity(articleId: String) {
         runOnIoThread {
             tryCatchInRelease {
-                HistoryDatabase.instance.articleDao().deleteArticle(ArticleEntity(id = articleId))
+                HistoryDatabase.instance.articleDao().deleteArticle(ArticleEntity(_id = articleId))
             }
         }
     }
@@ -170,6 +166,9 @@ object HistoryHelper {
         articleEntity.images = articleDetailEntity.images
         articleEntity.imagesInfo = articleDetailEntity.imagesInfo
         articleEntity.videos = articleDetailEntity.videos
+        articleEntity.tagActivityName = articleDetailEntity.tagActivityName
+        articleEntity.sections = articleDetailEntity.sections ?: emptyList()
+        articleEntity.type = "community_article"
 
         return articleEntity
     }

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

@@ -0,0 +1,135 @@
+package com.gh.common.prioritychain
+
+import android.app.Activity
+import android.view.Gravity
+import android.view.LayoutInflater
+import android.widget.FrameLayout
+import com.gh.common.util.NewFlatLogUtils
+import com.gh.gamecenter.GameDetailActivity
+import com.gh.gamecenter.R
+import com.gh.gamecenter.common.base.fragment.BaseFragment
+import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.view.BugFixedPopupWindow
+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.fragment.MainWrapperViewModel
+
+class AccelerateNotificationHandler(priority: Int) : PriorityChainHandler(priority) {
+
+    private var mActivity: Activity? = null
+    private var mBaseHandler: BaseFragment.BaseHandler? = null
+    private var mGameList: List<GameEntity>? = null
+    private var mViewModel: MainWrapperViewModel? = null
+
+    /**
+     * 提前预处理显示弹窗的内容
+     */
+    fun doPreProcess(
+        activity: Activity,
+        baseHandler: BaseFragment.BaseHandler,
+        gameEntityList: List<GameEntity>?,
+        viewModel: MainWrapperViewModel
+    ) {
+        mActivity = activity
+        mGameList = gameEntityList
+        mBaseHandler = baseHandler
+        mViewModel = viewModel
+
+        if (getStatus() == STATUS_PENDING) {
+            if (gameEntityList == null) {
+                processNext()
+            } else {
+                updateStatus(STATUS_VALID)
+                onProcess()
+            }
+        } else {
+            if (gameEntityList == null) {
+                updateStatus(STATUS_INVALID)
+            } else {
+                updateStatus(STATUS_VALID)
+            }
+        }
+    }
+
+    override fun onProcess() {
+        when (getStatus()) {
+            STATUS_VALID -> {
+                val accelerateSet =
+                    HashSet(SPUtils.getStringSet(Constants.SP_ACCELERATE_NOTIFICATION_POP_UP_SET))
+                if (!mGameList.isNullOrEmpty() && !accelerateSet.contains(mGameList!![0].messageId)) {
+                    showAccelerateNotificationPopupWindow(mActivity!!, mViewModel, mBaseHandler, mGameList!![0]) {
+                        processNext()
+                    }
+                    accelerateSet.add(mGameList!![0].messageId)
+                    SPUtils.setStringSet(Constants.SP_ACCELERATE_NOTIFICATION_POP_UP_SET, accelerateSet)
+                } else {
+                    processNext()
+                }
+            }
+
+            STATUS_INVALID -> {
+                processNext()
+            }
+        }
+    }
+
+    companion object {
+        fun showAccelerateNotificationPopupWindow(
+            activity: Activity,
+            viewModel: MainWrapperViewModel?,
+            baseHandler: BaseFragment.BaseHandler?,
+            gameEntity: GameEntity?,
+            dismissCallback: (() -> Unit)?
+        ) {
+            val binding: PopupAccelerateNotificationBinding =
+                PopupAccelerateNotificationBinding.inflate(LayoutInflater.from(activity))
+            if (gameEntity != null) {
+                binding.gameIconView.displayGameIcon(gameEntity)
+                binding.gameNameTv.text = gameEntity.name
+                binding.root.setOnClickListener {
+                    NewFlatLogUtils.logMessageInformClickPluginVersion(
+                        gameEntity.id,
+                        gameEntity.name!!
+                    )
+                    if (gameEntity.messageId.isNotEmpty()) {
+                        // 把对应系统消息设为已读
+                        viewModel?.postMessageRead(gameEntity.messageId)
+                    }
+                    GameDetailActivity.startGameDetailActivity(
+                        context = activity,
+                        gameId = gameEntity.id,
+                        entrance = "首页插件上架弹窗",
+                        defaultTab = -1,
+                        isSkipGameComment = false,
+                        scrollToLibao = false,
+                        openVideoStreaming = false,
+                        openPlatformWindow = true,
+                        traceEvent = null
+                    )
+                }
+            }
+            BugFixedPopupWindow(
+                binding.root,
+                FrameLayout.LayoutParams.MATCH_PARENT,
+                FrameLayout.LayoutParams.WRAP_CONTENT
+            ).apply {
+                isTouchable = true
+                isFocusable = true
+                isOutsideTouchable = true
+                animationStyle = R.style.popup_window_ease_in_and_out_anim_style
+                showAtLocation(
+                    activity.window.decorView,
+                    Gravity.TOP,
+                    0,
+                    DisplayUtils.getStatusBarHeight(activity.resources) + DisplayUtils.dip2px(42f)
+                )
+                setOnDismissListener {
+                    dismissCallback?.invoke()
+                }
+                baseHandler?.postDelayed({ dismiss() }, 5000)
+            }
+        }
+    }
+}

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

@@ -0,0 +1,87 @@
+package com.gh.common.prioritychain
+
+import androidx.recyclerview.widget.RecyclerView
+import com.alibaba.android.arouter.launcher.ARouter
+import com.gh.gamecenter.common.base.fragment.BaseLazyFragment
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IFloatingWindowProvider
+import com.gh.gamecenter.feature.entity.WelcomeDialogEntity
+import com.gh.gamecenter.floatingwindow.FloatingWindowEntity
+import com.gh.gamecenter.fragment.WelcomeDialogFragment
+import com.lightgame.utils.Utils
+
+class FloatingWindowHandler(priority: Int) : PriorityChainHandler(priority) {
+
+    private var mFragment: BaseLazyFragment? = null
+    private var mRecyclerView: RecyclerView? = null
+    private var mWindowList: ArrayList<FloatingWindowEntity>? = null
+
+    fun setData(windowList: ArrayList<FloatingWindowEntity>?) {
+        mWindowList = windowList
+
+        if (mFragment != null) {
+            doPreProcess()
+        }
+    }
+
+    fun setView(
+        fragment: BaseLazyFragment,
+        recyclerView: RecyclerView
+    ) {
+        mFragment = fragment
+        mRecyclerView = recyclerView
+
+        if (mWindowList != null) {
+            doPreProcess()
+        }
+    }
+
+    private fun doPreProcess() {
+        Utils.log(TAG, "FloatingWindowHandler preProcess windowSize is -> ${mWindowList?.size}")
+
+        if (getStatus() == STATUS_PENDING) {
+            if (!mWindowList.isNullOrEmpty()) {
+                updateStatus(STATUS_VALID)
+                onProcess()
+            } else {
+                processNext()
+            }
+        } else {
+            if (!mWindowList.isNullOrEmpty()) {
+                updateStatus(STATUS_VALID)
+            } else {
+                updateStatus(STATUS_INVALID)
+            }
+        }
+    }
+
+    override fun onProcess() {
+        when (getStatus()) {
+            STATUS_VALID -> {
+                val floatingWindowProvider =
+                    ARouter.getInstance().build(RouteConsts.provider.floatingwindow)
+                        .navigation() as? IFloatingWindowProvider<WelcomeDialogEntity>
+
+                // 强校验所有条件均通过才能显示
+                if (floatingWindowProvider == null || mFragment == null || mFragment?.isAdded == false || mRecyclerView == null) {
+                    processNext()
+                    return
+                }
+
+                floatingWindowProvider.showFloatingWindowOnly(
+                    mFragment!!,
+                    mRecyclerView!!,
+                    mWindowList!!,
+                ) {
+                    val welcomeDialog = WelcomeDialogFragment.getInstance(it, true, mFragment)
+                    welcomeDialog.show(mFragment!!.childFragmentManager, "WelcomeDialog")
+                }
+            }
+
+            STATUS_INVALID -> {
+                processNext()
+            }
+        }
+    }
+
+}

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

@@ -0,0 +1,45 @@
+package com.gh.common.prioritychain
+
+import com.gh.gamecenter.fragment.HomeSearchToolWrapperFragment
+
+class HomePushHandler(priority: Int): PriorityChainHandler(priority) {
+
+    private var mHomeFragment: HomeSearchToolWrapperFragment? = null
+
+    /**
+     * 提前预处理显示弹窗的内容
+     */
+    fun doPreProcess(homeFragment: HomeSearchToolWrapperFragment?, shouldShow: Boolean) {
+        mHomeFragment = homeFragment
+
+        if (getStatus() == STATUS_PENDING) {
+            if (shouldShow && homeFragment != null) {
+                updateStatus(STATUS_VALID)
+                onProcess()
+            } else {
+                processNext()
+            }
+        } else {
+            if (shouldShow && homeFragment != null) {
+                updateStatus(STATUS_VALID)
+            } else {
+                updateStatus(STATUS_INVALID)
+            }
+        }
+    }
+
+    override fun onProcess() {
+        when (getStatus()) {
+            STATUS_VALID -> {
+                // 目前首页下拉二楼是首页最后一个弹窗类的东西，还没实现回调，如果有其它要在它后面弹出的，需要自行在它的实现结果后添加回调
+                mHomeFragment?.popUpHomePushIfNeeded {
+                    processNext()
+                }
+            }
+            STATUS_INVALID -> {
+                processNext()
+            }
+        }
+    }
+
+}

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

@@ -0,0 +1,20 @@
+package com.gh.common.prioritychain
+
+import com.gh.gamecenter.common.entity.NotificationUgc
+import com.gh.gamecenter.common.utils.NotificationHelper
+import com.gh.gamecenter.login.user.UserManager
+
+class NotificationPermissionDialogHandler(priority: Int) : PriorityChainHandler(priority) {
+
+    override fun onProcess() {
+        // 仅登录后再启动光环时请求一次权限
+        if (UserManager.getInstance().isLoggedIn) {
+            NotificationHelper.showNotificationHintDialog(NotificationUgc.LOGIN) {
+                processNext()
+            }
+        } else {
+            processNext()
+        }
+    }
+
+}

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

@@ -0,0 +1,22 @@
+package com.gh.common.prioritychain
+
+import java.util.*
+import java.util.concurrent.PriorityBlockingQueue
+
+class PriorityChain {
+
+    private val mHandlerQueue: Queue<PriorityChainHandler> = PriorityBlockingQueue()
+
+    fun addHandler(handler: PriorityChainHandler) {
+        mHandlerQueue.add(handler.also {
+            it.setPriorityChain(this)
+        })
+    }
+
+    fun start() {
+        mHandlerQueue.poll()?.process(mHandlerQueue)
+    }
+
+    fun isHandlerQueueEmpty() = mHandlerQueue.isEmpty()
+
+}

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

@@ -0,0 +1,71 @@
+package com.gh.common.prioritychain
+
+import com.lightgame.utils.Utils
+import java.util.*
+
+abstract class PriorityChainHandler(private val mPriority: Int) : Comparable<PriorityChainHandler> {
+
+    private var mStatus = STATUS_UNKNOWN
+    private var mQueue: Queue<PriorityChainHandler>? = null
+
+    private var mPriorityChain: PriorityChain? = null
+
+    /**
+     * 获取当前 handler 的状态
+     * - 等待结果返回 （STATUS_PENDING）
+     * - 无需执行 （STATUS_INVALID）
+     * - 可执行 （STATUS_VALID）
+     * - 未知 （STATUS_UNKNOWN）
+     */
+    fun getStatus(): Int = mStatus
+
+    fun updateStatus(status: Int) {
+        Utils.log(TAG, "${javaClass.simpleName} updateStatus $status")
+
+        mStatus = status
+    }
+
+    fun setPriorityChain(priorityChain: PriorityChain) {
+        mPriorityChain = priorityChain
+    }
+
+    fun process(queue: Queue<PriorityChainHandler>) {
+        Utils.log(TAG, "${javaClass.simpleName} process $mStatus")
+
+        mQueue = queue
+        // 若当前 handler 未经处理，将其状态改为 pending
+        if (mStatus == STATUS_UNKNOWN) {
+            updateStatus(STATUS_PENDING)
+        }
+
+        onProcess()
+    }
+
+    /**
+     * 执行相关功能的地方
+     */
+    abstract fun onProcess()
+
+    /**
+     * 分发给下一个 handler 处理
+     */
+    fun processNext() {
+        Utils.log(TAG, "${javaClass.simpleName} processNext $mStatus")
+
+        mQueue?.poll()?.process(mQueue!!)
+    }
+
+    override fun compareTo(other: PriorityChainHandler): Int {
+        return (mPriority - other.mPriority)
+    }
+
+    companion object {
+        internal const val STATUS_PENDING = 0
+        internal const val STATUS_INVALID = 1
+        internal const val STATUS_VALID = 2
+        internal const val STATUS_UNKNOWN = 3
+
+        const val TAG = "PriorityChainHandler"
+    }
+
+}

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

@@ -0,0 +1,48 @@
+package com.gh.common.prioritychain
+
+import androidx.fragment.app.FragmentActivity
+import com.gh.common.dialog.PrivacyPolicyDialogFragment
+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(fragmentActivity: FragmentActivity, privacyPolicyEntity: DialogEntity.PrivacyPolicyEntity?) {
+        mActivity = fragmentActivity
+        mPrivacyPolicyEntity = privacyPolicyEntity
+
+        if (getStatus() == STATUS_PENDING) {
+            if (privacyPolicyEntity == null) {
+                processNext()
+            } else {
+                updateStatus(STATUS_VALID)
+                onProcess()
+            }
+        } else {
+            if (privacyPolicyEntity == null) {
+                updateStatus(STATUS_INVALID)
+            } else {
+                updateStatus(STATUS_VALID)
+            }
+        }
+    }
+
+    override fun onProcess() {
+        when(getStatus()) {
+            STATUS_VALID -> {
+                PrivacyPolicyDialogFragment.show(mActivity!!, mPrivacyPolicyEntity) { _: Boolean? ->
+                    processNext()
+                }
+            }
+            STATUS_INVALID -> {
+                processNext()
+            }
+        }
+    }
+
+}

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

@@ -0,0 +1,53 @@
+package com.gh.common.prioritychain
+
+import androidx.fragment.app.Fragment
+import com.gh.common.dialog.ReserveDialog
+import com.gh.gamecenter.common.entity.SimpleGameEntity
+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(fragment: Fragment, reserveData: List<SimpleGameEntity>?) {
+        mFragment = fragment
+        mReserveData = reserveData
+
+        if (getStatus() == STATUS_PENDING) {
+            if (reserveData.isNullOrEmpty()) {
+                processNext()
+            } else {
+                updateStatus(STATUS_VALID)
+                onProcess()
+            }
+        } else {
+            if (reserveData.isNullOrEmpty()) {
+                updateStatus(STATUS_INVALID)
+            } else {
+                updateStatus(STATUS_VALID)
+            }
+        }
+    }
+
+    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()
+            }
+        }
+    }
+
+}

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

@@ -0,0 +1,17 @@
+package com.gh.common.prioritychain
+
+import android.content.Context
+import com.gh.gamecenter.manager.UpdateManager
+
+class UpdateDialogHandler(context: Context, priority: Int) : PriorityChainHandler(priority) {
+
+    private val mUpdateManager = UpdateManager.getInstance(context)
+
+    override fun onProcess() {
+        mUpdateManager.checkUpdate(true, null)
+        mUpdateManager.setDismissCallback {
+            processNext()
+        }
+    }
+
+}

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

@@ -0,0 +1,79 @@
+package com.gh.common.prioritychain
+
+import android.graphics.Bitmap
+import androidx.fragment.app.Fragment
+import com.gh.gamecenter.common.callback.BiCallback
+import com.gh.gamecenter.common.utils.ImageUtils
+import com.gh.gamecenter.feature.entity.WelcomeDialogEntity
+import com.gh.gamecenter.fragment.MainWrapperViewModel
+import com.gh.gamecenter.fragment.WelcomeDialogFragment
+import com.halo.assistant.HaloApp
+
+class WelcomeDialogHandler(priority: Int): PriorityChainHandler(priority) {
+
+    private var mFragment: Fragment? = null
+    private var mWelcomeDialogEntity: WelcomeDialogEntity? = null
+
+    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(mWelcomeDialogEntity!!.icon, object : BiCallback<Bitmap, Boolean> {
+                    override fun onFirst(first: Bitmap) {
+                        if (getStatus() == STATUS_PENDING) {
+                            updateStatus(STATUS_VALID)
+                            onProcess()
+                        } else {
+                            updateStatus(STATUS_VALID)
+                        }
+                    }
+
+                    override fun onSecond(second: Boolean) {
+                        processNext()
+                    }
+                })
+            } else {
+                processNext()
+            }
+        }
+
+        if (getStatus() == STATUS_PENDING) {
+            if (welcomeDialogEntity == null) {
+                processNext()
+            } else {
+                preLoadClosure.invoke()
+            }
+        } else {
+            if (welcomeDialogEntity == null) {
+                updateStatus(STATUS_INVALID)
+            } else {
+                preLoadClosure.invoke()
+            }
+        }
+    }
+
+    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(mFragment!!.childFragmentManager, "WelcomeDialog")
+                }
+            }
+            STATUS_INVALID -> {
+                processNext()
+            }
+        }
+    }
+
+}

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

@@ -82,4 +82,8 @@ class AppProviderImpl : IAppProvider {
     override fun getIsBrandNewInstall(): Boolean {
         return HaloApp.getInstance().isBrandNewInstall
     }
+
+    override fun setSkippingThirdParty(isSkippingThirdParty: Boolean) {
+        HaloApp.getInstance().isSkippingThirdParty = isSkippingThirdParty
+    }
 }

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

@@ -19,6 +19,7 @@ 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
 
@@ -31,4 +32,5 @@ 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
 }

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

@@ -56,6 +56,22 @@ class ConfigProviderImpl : IConfigProvider {
         return Config.getSettings()?.image?.oss?.gifWaterMark ?: ""
     }
 
+    override fun getVideoSnapshotSuffix(): String {
+        return Config.getSettings()?.image?.oss?.snapshot ?: ""
+    }
+
+    override fun getImageCropSuffix(): String {
+        return Config.getSettings()?.image?.oss?.crop ?: ""
+    }
+
+    override fun getImageInfoSuffix(): String {
+        return Config.getSettings()?.image?.oss?.info ?: ""
+    }
+
+    override fun getImageResizeSuffix(): String {
+        return Config.getSettings()?.image?.oss?.resize ?: ""
+    }
+
     override fun getQQ(): String {
         return Config.getSettings()?.support?.qq ?: ""
     }

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

@@ -13,9 +13,10 @@ class DefaultUrlHandlerProviderImpl : IDefaultUrlHandlerProvider {
         context: Context,
         url: String,
         entrance: String,
-        bringAppToFront: Boolean
+        bringAppToFront: Boolean,
+        sourceEntrance: String
     ): Boolean {
-        return DefaultUrlHandler.interceptUrl(context, url, null, entrance, bringAppToFront)
+        return DefaultUrlHandler.interceptUrl(context, url, null, entrance, bringAppToFront, sourceEntrance)
     }
 
     override fun init(context: Context?) {

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

@@ -1,6 +1,7 @@
 package com.gh.common.provider
 
 import android.content.Context
+import android.os.Bundle
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.common.util.DirectUtils
 import com.gh.gamecenter.common.constant.RouteConsts
@@ -53,16 +54,16 @@ class DirectProviderImpl : IDirectProvider {
         DirectUtils.directDouyin(context, userId)
     }
 
-    override fun directToSuggestionFromDiagnosis(context: Context, diagnosis: String) {
-        DirectUtils.directToSuggestion(context, diagnosis = diagnosis)
+    override fun directToSuggestionFromDiagnosis(context: Context, content: String, diagnosis: String) {
+        DirectUtils.directToSuggestion(context, content = content, diagnosis = diagnosis)
     }
 
     override fun directToQa(context: Context, text: String?, id: String) {
         DirectUtils.directToQa(context, text, id)
     }
 
-    override fun directToHelpAndFeedback(context: Context, position: Int) {
-        DirectUtils.directToHelpAndFeedback(context, position)
+    override fun directToHelpAndFeedback(context: Context, bundle: Bundle?) {
+        DirectUtils.directToHelpAndFeedback(context, bundle)
     }
 
     override fun directToQqGroup(context: Context, groupNumber: String?): Boolean {
@@ -82,13 +83,14 @@ class DirectProviderImpl : IDirectProvider {
         articleId: String?,
         communityId: String?,
         entrance: String?,
-        path: String?
+        path: String?,
+        sourceEntrance: String
     ) {
-        DirectUtils.directToCommunityArticle(context, articleId, communityId, entrance, path)
+        DirectUtils.directToCommunityArticle(context, articleId, communityId, entrance, path, sourceEntrance)
     }
 
-    override fun directToVideoDetail(context: Context, videoId: String, entrance: String?, path: String?) {
-        DirectUtils.directToVideoDetail(context, videoId, entrance, path)
+    override fun directToVideoDetail(context: Context, videoId: String, entrance: String?, path: String?, sourceEntrance: String) {
+        DirectUtils.directToVideoDetail(context, videoId, entrance, path, sourceEntrance)
     }
 
     override fun directToAmway(context: Context, fixedTopAmwayCommentId: String?, entrance: String?, path: String?) {
@@ -119,6 +121,10 @@ 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
     }

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

@@ -3,11 +3,14 @@ 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
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.entity.GameUpdateEntity
 import com.gh.gamecenter.feature.entity.GameEntity
+import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.gh.gamecenter.feature.provider.IDownloadButtonClickedProvider
 import com.gh.gamecenter.feature.view.DownloadButton
 import com.gh.gamecenter.packagehelper.PackageRepository
@@ -25,6 +28,7 @@ class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
         var downloadStatusInChinese = ""
         var gameSchemaType = ""
         var packageName = ""
+        var exposureSourceList: List<ExposureSource>? = null
 
         val boundedObject = downloadButton.getObject()
 
@@ -36,17 +40,21 @@ class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
                     gameId = boundedObject.id
                     gameName = boundedObject.name ?: ""
                     gameCategory = boundedObject.category ?: ""
-                    downloadStatus = if (boundedObject.isVGame()) {
-                        "畅玩"
-                    } else if (boundedObject.downloadStatus == "demo") {
-                        "试玩"
-                    } else {
-                        "下载"
-                    }
+                    downloadStatus =
+                        if (boundedObject.isVGamePreferred()) {
+                            "畅玩"
+                        } else {
+                            if (boundedObject.downloadStatus == "demo") {
+                                "试玩"
+                            } else {
+                                "下载"
+                            }
+                        }
                     gameTypeInChinese = boundedObject.categoryChinese
                     downloadStatusInChinese = boundedObject.downloadStatusChinese
                     gameSchemaType = boundedObject.gameBitChinese
                     packageName = boundedObject.getUniquePackageName() ?: ""
+                    exposureSourceList = boundedObject.exposureEvent?.source
                 }
 
                 is GameUpdateEntity -> {
@@ -57,14 +65,16 @@ class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
                     gameTypeInChinese = boundedObject.categoryChinese
                     downloadStatusInChinese = boundedObject.downloadStatusChinese
                     packageName = boundedObject.packageName
+                    exposureSourceList = boundedObject.exposureEvent?.source
                 }
 
                 is DownloadEntity -> {
                     gameId = boundedObject.gameId
                     gameName = boundedObject.name ?: ""
                     gameCategory = boundedObject.getGameCategory()
-                    downloadStatus = if (boundedObject.isVGame()) "畅玩" else "下载"
+                    downloadStatus = if (boundedObject.asVGame()) "畅玩" else "下载"
                     packageName = boundedObject.packageName
+                    exposureSourceList = boundedObject.exposureTrace?.toObject<ExposureEvent>()?.source
                 }
             }
 
@@ -87,28 +97,38 @@ class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
             }
 
             // 预约状态不上报
-            if (downloadButton.buttonStyle != DownloadButton.ButtonStyle.RESERVABLE
-                && downloadButton.buttonStyle != DownloadButton.ButtonStyle.RESERVED
-            ) {
+            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 {
+                    "本地下载"
+                }
 
                 // 上报神策点击事件
-                SensorsBridge.trackEvent(
+                SensorsBridge.trackEventWithExposureSource(
                     "DownLoadbuttonClick",
+                    exposureSourceList,
                     "game_id", gameId,
                     "game_name", gameName,
                     "game_type", gameTypeInChinese,
                     "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,
                     "last_page_name", GlobalActivityManager.getLastPageEntity().pageName,
                     "last_page_id", GlobalActivityManager.getLastPageEntity().pageId,
-                    "last_page_business_id", GlobalActivityManager.getLastPageEntity().pageBusinessId
+                    "last_page_business_id", GlobalActivityManager.getLastPageEntity().pageBusinessId,
                 )
             }
-
         }
     }
 

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

@@ -9,8 +9,8 @@ import com.gh.gamecenter.core.provider.IGameSubstituteRepositoryProvider
 @Route(path = RouteConsts.provider.gameSubstituteRepository, name = "GameSubstituteRepositoryHelper暴露服务")
 class GameSubstituteRepositoryProviderImpl : IGameSubstituteRepositoryProvider {
 
-    override fun updateSubstitutableGames() {
-        GameSubstituteRepositoryHelper.updateSubstitutableGames()
+    override fun updateHistoricInstalledGameSet() {
+        GameSubstituteRepositoryHelper.updateHistoricInstalledGameSet()
     }
 
     override fun init(context: Context?) {

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

@@ -6,7 +6,6 @@ import com.gh.common.util.DirectUtils
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.entity.CommunityEntity
 import com.gh.gamecenter.common.entity.LinkEntity
-import com.gh.gamecenter.common.entity.SimpleGameEntity
 import com.gh.gamecenter.common.entity.SuggestType
 import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.gh.gamecenter.feature.provider.ILinkDirectUtilsProvider
@@ -48,17 +47,6 @@ class LinkDirectUtilsProviderImpl : ILinkDirectUtilsProvider {
         DirectUtils.directToSuggestion(context, type, suggestHintType, content, isQaFeedback, qaContentId)
     }
 
-    override fun directToSuggestion(
-        context: Context,
-        type: SuggestType,
-        suggestHintType: String?,
-        content: String?,
-        game: SimpleGameEntity,
-        platform: String
-    ) {
-        DirectUtils.directToSuggestion(context, type, suggestHintType, content, game, platform)
-    }
-
     override fun directToSuggestion(context: Context, type: SuggestType, hiddenHint: String) {
         DirectUtils.directToSuggestion(context, type, hiddenHint)
     }

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)
+        PackageInstaller.install(context, downloadEntity, showUnzipToast, false)
     }
 
     override fun uninstall(context: Context, path: String) {

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

@@ -3,23 +3,24 @@ 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.core.provider.IVHelperProvider
+import com.gh.gamecenter.feature.entity.InstallGameEntity
+import com.gh.gamecenter.feature.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
     }

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

@@ -21,10 +21,6 @@ class WebProviderImpl : IWebProvider {
         return WebActivity.getBindWechatIntent(context)
     }
 
-    override fun getSecurityCertificationIntent(context: Context): Intent {
-        return WebActivity.getSecurityCertificationIntent(context)
-    }
-
     override fun getQAIntent(
         context: Context?,
         url: String?,

app/src/main/java/com/gh/common/simulator/NewSimulatorGameManager.kt

@@ -41,7 +41,7 @@ object NewSimulatorGameManager {
     private const val KEY_USE_DEBUG_API = "USE_DEBUG_API"
     private const val KEY_META = "META"
 
-//    private const val GH_RETRO_EMU_APP_PACKAGE_NAME = "com.gh.retroemu"
+    //    private const val GH_RETRO_EMU_APP_PACKAGE_NAME = "com.gh.retroemu"
     private const val GH_RETRO_EMU_APP_LAUNCHER_ACTIVITY_NAME = "com.gh.retroemu.ui.SplashActivity"
 
 
@@ -61,10 +61,10 @@ object NewSimulatorGameManager {
     }
 
     /**
-    * 弹出更新弹框
-    */
+     * 弹出更新弹框
+     */
     @JvmStatic
-    fun showUpdateNewsSimulator(context: Context, callback: EmptyCallback? = null){
+    fun showUpdateNewsSimulator(context: Context, gameEntity: GameEntity, callback: EmptyCallback? = null) {
         NewFlatLogUtils.logSimulatorUpdateAlertShow()
         DialogHelper.showDialog(
             context,
@@ -76,7 +76,13 @@ object NewSimulatorGameManager {
                 NewFlatLogUtils.logSimulatorUpdateAlertClick("更新")
                 val simulator = Config.getNewSimulatorEntitySetting()
                 if (simulator != null) {
-                    SimulatorDownloadManager.getInstance().showDownloadingDialog(context, simulator)
+                    SimulatorDownloadManager.getInstance().showDownloadingDialog(
+                        context,
+                        simulator,
+                        gameEntity.id,
+                        gameEntity.name ?: "",
+                        gameEntity.categoryChinese
+                    )
                 }
             },
             cancelClickCallback = {
@@ -85,7 +91,7 @@ object NewSimulatorGameManager {
             },
             uiModificationCallback = { binding ->
                 binding.contentTv.gravity = Gravity.START
-                binding.contentTv.setTextColor(R.color.text_subtitle.toColor(context))
+                binding.contentTv.setTextColor(R.color.text_secondary.toColor(context))
             },
             extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
         )
@@ -127,7 +133,10 @@ object NewSimulatorGameManager {
                 )
 
                 val intent = Intent()
-                intent.setClassName(SimulatorGameManager.NEW_SIMULATOR_PACKAGE_NAME, GH_RETRO_EMU_APP_LAUNCHER_ACTIVITY_NAME)
+                intent.setClassName(
+                    SimulatorGameManager.NEW_SIMULATOR_PACKAGE_NAME,
+                    GH_RETRO_EMU_APP_LAUNCHER_ACTIVITY_NAME
+                )
                 intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
                 intent.data = gamePackageFileUri
                 gameEntity.getApk().safelyGetInRelease(0)?.let { apk ->
@@ -138,7 +147,10 @@ object NewSimulatorGameManager {
                 intent.putExtra(KEY_GAME_ICON, it)
                 intent.putExtra(KEY_GAME_PACKAGE_PATH, downloadEntity.path) // 游戏包文件路径，冗余参数)
                 intent.putExtra(KEY_GAME_PACKAGE_SDCARD_PATH, true)
-                intent.putExtra(KEY_GAME_PACKAGE_LAST_MODIFICATION, File(downloadEntity.path).lastModified()) // 游戏包文件修改时间
+                intent.putExtra(
+                    KEY_GAME_PACKAGE_LAST_MODIFICATION,
+                    File(downloadEntity.path).lastModified()
+                ) // 游戏包文件修改时间
                 intent.putExtra(KEY_GAME_EMU_SYSTEM, gameEntity.simulatorType) // 模拟器类型
                 intent.putExtra(KEY_GAME_ID, gameEntity.id)
                 // TODO 补充光环模拟器的游戏 id

app/src/main/java/com/gh/common/simulator/SimulatorDownloadManager.kt

@@ -14,6 +14,7 @@ import com.gh.common.util.PackageInstaller
 import com.gh.common.util.PackageUtils
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.R
+import com.gh.gamecenter.common.base.GlobalActivityManager
 import com.gh.gamecenter.common.base.TrackableDialog
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.utils.*
@@ -47,6 +48,7 @@ class SimulatorDownloadManager private constructor() {
     private var simulator: SimulatorEntity? = null
     private var gameId: String = ""
     private var gameName: String = ""
+    private var gameType: String = ""
     private var downloadType: String = ""
 
     private val dataWatcher = object : DataWatcher() {
@@ -99,33 +101,43 @@ class SimulatorDownloadManager private constructor() {
                             downloadDialog?.dismiss()
                         }
                     }
+
                     DownloadStatus.diskisfull == downloadEntity.status -> {
                         ToastUtils.showToast("存储空间已满，下载任务已暂停")
                     }
+
                     DownloadStatus.diskioerror == downloadEntity.status -> {
                         ToastUtils.showToast("下载 IO 出现异常，下载任务已暂停")
                     }
+
                     DownloadStatus.neterror == downloadEntity.status -> {
                         ToastUtils.showToast("网络不稳定，下载任务已暂停")
                     }
+
                     DownloadStatus.timeout == downloadEntity.status -> {
                         ToastUtils.showToast("网络不稳定，下载任务已暂停")
                     }
+
                     DownloadStatus.notfound == downloadEntity.status -> {
                         ToastUtils.showToast("下载链接异常，请稍后重试")
                     }
+
                     DownloadStatus.uncertificated == downloadEntity.status -> {
                         ToastUtils.showToast("请先进行实名认证")
                     }
+
                     DownloadStatus.unqualified == downloadEntity.status -> {
                         ToastUtils.showToast("未成年人暂不允许在此时间下载游戏")
                     }
+
                     DownloadStatus.unavailable == downloadEntity.status -> {
                         ToastUtils.showToast("该游戏未接入防沉迷系统，暂不支持下载")
                     }
+
                     DownloadStatus.banned == downloadEntity.status -> {
                         ToastUtils.showToast("网络异常")
                     }
+
                     DownloadStatus.hijack == downloadEntity.status -> {
                         ToastUtils.showToast("网络劫持，请稍后重试")
                     }
@@ -135,7 +147,7 @@ class SimulatorDownloadManager private constructor() {
     }
 
     fun showDownloadDialog(context: Context, simulator: SimulatorEntity?, location: SimulatorLocation) {
-        showDownloadDialog(context, simulator, location, "", "", null)
+        showDownloadDialog(context, simulator, location, "", "", "", null)
     }
 
     fun showDownloadDialog(
@@ -144,6 +156,7 @@ class SimulatorDownloadManager private constructor() {
         location: SimulatorLocation,
         gameId: String = "",
         gameName: String = "",
+        gameCategoryChinese: String = "",
         cancelCallback: (() -> Unit)? = null
     ) {
         if (context == null) return
@@ -152,6 +165,7 @@ class SimulatorDownloadManager private constructor() {
         this.simulator = simulator
         this.gameId = gameId
         this.gameName = gameName
+        this.gameType = gameCategoryChinese
 
         PermissionHelper.checkGetInstalledAppsListBeforeAction(context, object : EmptyCallback {
             override fun onCallback() {
@@ -183,7 +197,8 @@ class SimulatorDownloadManager private constructor() {
                     return
                 }
                 val title = if (shouldShowUpdate && isInstalled) "更新模拟器" else "安装模拟器"
-                val message = if (shouldShowUpdate && isInstalled) "检测到模拟器存在更高版本，是否前往更新" else "模拟器游戏需要先下载安装对应的模拟器，才可以运行"
+                val message =
+                    if (shouldShowUpdate && isInstalled) "检测到模拟器存在更高版本，是否前往更新" else "模拟器游戏需要先下载安装对应的模拟器，才可以运行"
                 val positiveText =
                     if (shouldShowUpdate && isInstalled) "更新（${simulator?.apk?.size}）" else "下载（${simulator?.apk?.size}）"
                 val negativeText = if (shouldShowUpdate && isInstalled) "下次再说" else "取消"
@@ -195,6 +210,25 @@ class SimulatorDownloadManager private constructor() {
                 if (shouldShowUpdate && isInstalled) {
                     NewFlatLogUtils.logSimulatorUpdateAlertShow()
                 }
+                if (shouldShowUpdate && isInstalled) {
+                    SensorsBridge.trackSimulatorUpdateDialogShow(
+                        gameId = gameId,
+                        gameName = gameName,
+                        gameType = gameCategoryChinese,
+                        lastPageId = GlobalActivityManager.getLastPageEntity().pageId,
+                        lastPageName = GlobalActivityManager.getLastPageEntity().pageName,
+                        lastPageBusinessId = GlobalActivityManager.getLastPageEntity().pageBusinessId
+                    )
+                } else {
+                    SensorsBridge.trackSimulatorInstallDialogShow(
+                        gameId = gameId,
+                        gameName = gameName,
+                        gameType = gameCategoryChinese,
+                        lastPageId = GlobalActivityManager.getLastPageEntity().pageId,
+                        lastPageName = GlobalActivityManager.getLastPageEntity().pageName,
+                        lastPageBusinessId = GlobalActivityManager.getLastPageEntity().pageBusinessId
+                    )
+                }
                 DialogHelper.showDialog(
                     context,
                     title,
@@ -207,16 +241,79 @@ class SimulatorDownloadManager private constructor() {
                             cancelCallback?.invoke()
                             NewFlatLogUtils.logSimulatorUpdateAlertClick("取消")
                             MtaHelper.onEvent(trackableEntity.event, trackableEntity.key, "点击下次再说")
+                            SensorsBridge.trackSimulatorUpdateDialogClick(
+                                buttonName = negativeText,
+                                gameId = gameId,
+                                gameName = gameName,
+                                gameType = gameCategoryChinese,
+                                lastPageId = GlobalActivityManager.getLastPageEntity().pageId,
+                                lastPageName = GlobalActivityManager.getLastPageEntity().pageName,
+                                lastPageBusinessId = GlobalActivityManager.getLastPageEntity().pageBusinessId
+                            )
+                        } else {
+                            SensorsBridge.trackSimulatorInstallDialogClick(
+                                buttonName = negativeText,
+                                gameId = gameId,
+                                gameName = gameName,
+                                gameType = gameCategoryChinese,
+                                lastPageId = GlobalActivityManager.getLastPageEntity().pageId,
+                                lastPageName = GlobalActivityManager.getLastPageEntity().pageName,
+                                lastPageBusinessId = GlobalActivityManager.getLastPageEntity().pageBusinessId
+                            )
                         }
                     },
                     confirmClickCallback = {
-                        showDownloadingDialog(context, simulator)
+                        showDownloadingDialog(context, simulator, gameId, gameName, gameCategoryChinese)
                         NewFlatLogUtils.logSimulatorUpdateAlertClick("更新")
                         MtaHelper.onEvent(
                             trackableEntity.event,
                             trackableEntity.key,
                             if (shouldShowUpdate && isInstalled) "点击更新" else "点击下载"
                         )
+                        if (shouldShowUpdate && isInstalled) {
+                            SensorsBridge.trackSimulatorUpdateDialogClick(
+                                buttonName = positiveText,
+                                gameId = gameId,
+                                gameName = gameName,
+                                gameType = gameCategoryChinese,
+                                lastPageId = GlobalActivityManager.getLastPageEntity().pageId,
+                                lastPageName = GlobalActivityManager.getLastPageEntity().pageName,
+                                lastPageBusinessId = GlobalActivityManager.getLastPageEntity().pageBusinessId
+                            )
+                        } else {
+                            SensorsBridge.trackSimulatorInstallDialogClick(
+                                buttonName = positiveText,
+                                gameId = gameId,
+                                gameName = gameName,
+                                gameType = gameCategoryChinese,
+                                lastPageId = GlobalActivityManager.getLastPageEntity().pageId,
+                                lastPageName = GlobalActivityManager.getLastPageEntity().pageName,
+                                lastPageBusinessId = GlobalActivityManager.getLastPageEntity().pageBusinessId
+                            )
+                        }
+                    },
+                    touchOutsideCallback = {
+                        if (shouldShowUpdate && isInstalled) {
+                            SensorsBridge.trackSimulatorUpdateDialogClick(
+                                buttonName = "关闭弹窗",
+                                gameId = gameId,
+                                gameName = gameName,
+                                gameType = gameCategoryChinese,
+                                lastPageId = GlobalActivityManager.getLastPageEntity().pageId,
+                                lastPageName = GlobalActivityManager.getLastPageEntity().pageName,
+                                lastPageBusinessId = GlobalActivityManager.getLastPageEntity().pageBusinessId
+                            )
+                        } else {
+                            SensorsBridge.trackSimulatorInstallDialogClick(
+                                buttonName = "关闭弹窗",
+                                gameId = gameId,
+                                gameName = gameName,
+                                gameType = gameCategoryChinese,
+                                lastPageId = GlobalActivityManager.getLastPageEntity().pageId,
+                                lastPageName = GlobalActivityManager.getLastPageEntity().pageName,
+                                lastPageBusinessId = GlobalActivityManager.getLastPageEntity().pageBusinessId
+                            )
+                        }
                     },
                     mtaEvent = trackableEntity.event, mtaKey = trackableEntity.key,
                     extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
@@ -228,7 +325,13 @@ class SimulatorDownloadManager private constructor() {
         })
     }
 
-    fun showDownloadingDialog(context: Context, simulator: SimulatorEntity?) {
+    fun showDownloadingDialog(
+        context: Context,
+        simulator: SimulatorEntity?,
+        gameId: String = "",
+        gameName: String = "",
+        gameCategoryChinese: String = "",
+    ) {
         mContextRef = WeakReference(context)
         val msg = FileUtils.isCanDownload(context, simulator?.apk?.size)
         if (!msg.isNullOrEmpty()) {
@@ -261,6 +364,11 @@ class SimulatorDownloadManager private constructor() {
         }
 
         downloadDialog?.setOnDismissListener {
+            SensorsBridge.trackSimulatorDownloadDialogClose(
+                gameId = gameId,
+                gameName = gameName,
+                gameType = gameCategoryChinese
+            )
             DownloadManager.getInstance().removeObserver(dataWatcher)
         }
 
@@ -273,7 +381,7 @@ class SimulatorDownloadManager private constructor() {
         params?.width = context.resources.displayMetrics.widthPixels - DisplayUtils.dip2px(60f)
         downloadDialog?.window?.attributes = params
 
-        download(simulator)
+        download(simulator, gameId, gameName, gameCategoryChinese)
     }
 
     private fun showNoneEmulatorDialog(context: Context) {
@@ -287,13 +395,18 @@ class SimulatorDownloadManager private constructor() {
                 ToastUtils.showToast("该模拟器暂未提供下载")
             },
             uiModificationCallback = { binding ->
-                binding.confirmTv.setTextColor(R.color.text_body.toColor(context))
+                binding.confirmTv.setTextColor(R.color.text_instance.toColor(context))
             },
             extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
         )
     }
 
-    private fun download(simulator: SimulatorEntity?) {
+    private fun download(
+        simulator: SimulatorEntity?,
+        gameId: String = "",
+        gameName: String = "",
+        gameCategoryChinese: String = ""
+    ) {
         val apkEntity = simulator?.apk ?: return
 
         val entity = DownloadManager.getInstance().getDownloadEntityByUrl(apkEntity.url)
@@ -307,19 +420,31 @@ class SimulatorDownloadManager private constructor() {
                 DownloadStatus.diskioerror,
                 DownloadStatus.diskisfull -> {
                     DownloadManager.getInstance().addObserver(dataWatcher)
-                    uiExecutor.executeWithDelay(Runnable { DownloadManager.getInstance().resume(entity, true) }, 200)
+                    uiExecutor.executeWithDelay(Runnable { DownloadManager.getInstance().resume(entity, false) }, 200)
+                    SensorsBridge.trackSimulatorDownloadDialogShow(
+                        gameId = gameId,
+                        gameName = gameName,
+                        gameType = gameCategoryChinese
+                    )
                     downloadDialog?.show()
                 }
+
                 DownloadStatus.done -> NDataChanger.notifyDataChanged(entity)
 
-                else -> createDownload(apkEntity, simulator)
+                else -> createDownload(apkEntity, simulator, gameId, gameName, gameCategoryChinese)
             }
         } else {
-            createDownload(apkEntity, simulator)
+            createDownload(apkEntity, simulator, gameId, gameName, gameCategoryChinese)
         }
     }
 
-    private fun createDownload(apkEntity: ApkEntity, simulator: SimulatorEntity) {
+    private fun createDownload(
+        apkEntity: ApkEntity,
+        simulator: SimulatorEntity,
+        gameId: String = "",
+        gameName: String = "",
+        gameCategoryChinese: String = ""
+    ) {
         DownloadManager.getInstance().addObserver(dataWatcher)
         val downloadId = PackageInstaller.createDownloadId(simulator.name)
         val downloadEntity = DownloadEntity()
@@ -351,6 +476,11 @@ class SimulatorDownloadManager private constructor() {
             downloadType,
             ""
         )
+        SensorsBridge.trackSimulatorDownloadDialogShow(
+            gameId = gameId,
+            gameName = gameName,
+            gameType = gameCategoryChinese
+        )
 
         downloadDialog?.show()
     }

app/src/main/java/com/gh/common/simulator/SimulatorGameManager.kt

@@ -150,7 +150,7 @@ object SimulatorGameManager {
                 SimulatorDownloadManager.getInstance().showDownloadDialog(
                     AppManager.getInstance().recentActiveActivity, simulator,
                     SimulatorDownloadManager.SimulatorLocation.LAUNCH, gameEntity.id, gameEntity.name
-                        ?: ""
+                        ?: "", gameEntity.categoryChinese
                 ) {
                     jumpToSimulator(downloadEntity, gameEntity)
                 }

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

@@ -1,15 +1,8 @@
 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 {
 

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

@@ -9,6 +9,7 @@ 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
@@ -36,6 +37,7 @@ object ArchiveDownloadButtonHelper {
         entrance: String,
         fragment: Fragment,
         packageName: String,
+        viewModel: BaseCloudArchiveViewModel,
         archiveEntity: ArchiveEntity,
         downloadBtn: TextView,
         gameEntity: GameEntity?,
@@ -60,19 +62,23 @@ object ArchiveDownloadButtonHelper {
                     }
                 }
                 // 检查本地是否已下载存档
-                VArchiveHelper.isArchiveDownloaded(archiveEntity.md5) -> showApplyArchiveTipDialog(
-                    context,
-                    entrance,
-                    packageName,
-                    archiveEntity,
-                    gameEntity
-                )
+                VArchiveHelper.isArchiveDownloaded(archiveEntity.md5) -> viewModel.getArchiveConfigString {
+                    showApplyArchiveTipDialog(
+                        context,
+                        entrance,
+                        packageName,
+                        it,
+                        archiveEntity,
+                        gameEntity
+                    )
+                }
                 // 检查完毕下载存档
                 else -> downloadArchive(
                     context,
                     entrance,
                     fragment,
                     packageName,
+                    viewModel,
                     archiveEntity,
                     downloadBtn,
                     gameEntity,
@@ -109,12 +115,12 @@ object ArchiveDownloadButtonHelper {
             R.string.archive_download_dialog_content.toResString(),
             R.string.archive_download_dialog_confirm.toResString(),
             R.string.cancel.toResString(),
-            {
+            confirmClickCallback = {
                 NewFlatLogUtils.logCloudArchiveGameDownloadDialogClick(R.string.archive_download_dialog_confirm.toResString())
                 VHelper.disableLaunchGameAfterInstallation()
                 EventBus.getDefault().post(EBReuse("download"))
             },
-            {
+            cancelClickCallback = {
                 NewFlatLogUtils.logCloudArchiveGameDownloadDialogClick(R.string.cancel.toResString())
             },
             extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
@@ -125,6 +131,7 @@ object ArchiveDownloadButtonHelper {
         context: Context,
         entrance: String,
         packageName: String,
+        config: String,
         archiveEntity: ArchiveEntity,
         gameEntity: GameEntity?
     ) {
@@ -135,7 +142,7 @@ object ArchiveDownloadButtonHelper {
                 .subscribeOn(Schedulers.io())
                 .subscribe()
 
-            VArchiveHelper.applyGameArchive(context, packageName, this) { packageName, isSuccess ->
+            VArchiveHelper.applyGameArchive(context, packageName, config, this) { packageName, isSuccess ->
                 runOnUiThread {
                     if (isSuccess) {
                         VHelper.launch(context, packageName)
@@ -161,6 +168,7 @@ object ArchiveDownloadButtonHelper {
         entrance: String,
         fragment: Fragment,
         packageName: String,
+        viewModel: BaseCloudArchiveViewModel,
         archiveEntity: ArchiveEntity,
         downloadBtn: TextView,
         gameEntity: GameEntity?,
@@ -197,7 +205,9 @@ object ArchiveDownloadButtonHelper {
                     DownloadStatus.COMPLETED -> {
                         dismissArchiveLoadingDialog(archiveLoadingDialog)
                         downloadBtn.text = R.string.archive_apply.toResString()
-                        showApplyArchiveTipDialog(context, entrance, packageName, archiveEntity, gameEntity)
+                        viewModel.getArchiveConfigString {
+                            showApplyArchiveTipDialog(context, entrance, packageName, it, archiveEntity, gameEntity)
+                        }
                         downloadCompletedListener?.invoke()
                     }
                     else -> {
@@ -251,43 +261,46 @@ object ArchiveDownloadButtonHelper {
         context: Context,
         entrance: String,
         packageName: String,
+        config: String,
         archiveEntity: ArchiveEntity,
         gameEntity: GameEntity?
     ) {
-        DialogHelper.showDialog(
-            context,
-            R.string.archive_dialog_title.toResString(),
-            R.string.archive_apply_dialog_content.toResString(),
-            R.string.archive_apply.toResString(),
-            R.string.cancel.toResString(),
-            {
-                applyArchive(context, entrance, packageName, archiveEntity, gameEntity)
-                NewFlatLogUtils.logCloudArchiveApplyDialogRelated("cloud_save_overwrite_dialog_click", "使用")
-                SensorsBridge.trackEvent(
-                    "CloudSaveOverwriteDialogClick",
-                    "game_id", gameEntity?.id ?: "",
-                    "game_name", gameEntity?.name ?: "",
-                    "button_name", "使用"
-                )
-            },
-            {
-                NewFlatLogUtils.logCloudArchiveApplyDialogRelated("cloud_save_overwrite_dialog_click", "取消")
-                SensorsBridge.trackEvent(
-                    "CloudSaveOverwriteDialogClick",
-                    "game_id", gameEntity?.id ?: "",
-                    "game_name", gameEntity?.name ?: "",
-                    "button_name", "取消"
-                )
-            },
-            extraConfig = DialogHelper.Config(centerTitle = true)
-        )
+        runOnUiThread {
+            DialogHelper.showDialog(
+                context,
+                R.string.archive_dialog_title.toResString(),
+                R.string.archive_apply_dialog_content.toResString(),
+                R.string.archive_apply.toResString(),
+                R.string.cancel.toResString(),
+                {
+                    applyArchive(context, entrance, packageName, config, archiveEntity, gameEntity)
+                    NewFlatLogUtils.logCloudArchiveApplyDialogRelated("cloud_save_overwrite_dialog_click", "使用")
+                    SensorsBridge.trackEvent(
+                        "CloudSaveOverwriteDialogClick",
+                        "game_id", gameEntity?.id ?: "",
+                        "game_name", gameEntity?.name ?: "",
+                        "button_name", "使用"
+                    )
+                },
+                {
+                    NewFlatLogUtils.logCloudArchiveApplyDialogRelated("cloud_save_overwrite_dialog_click", "取消")
+                    SensorsBridge.trackEvent(
+                        "CloudSaveOverwriteDialogClick",
+                        "game_id", gameEntity?.id ?: "",
+                        "game_name", gameEntity?.name ?: "",
+                        "button_name", "取消"
+                    )
+                },
+                extraConfig = DialogHelper.Config(centerTitle = true)
+            )
 
-        NewFlatLogUtils.logCloudArchiveApplyDialogRelated("cloud_save_overwrite_dialog_show")
-        SensorsBridge.trackEvent(
-            "CloudSaveOverwriteDialogShow",
-            "game_id", gameEntity?.id ?: "",
-            "game_name", gameEntity?.name ?: ""
-        )
+            NewFlatLogUtils.logCloudArchiveApplyDialogRelated("cloud_save_overwrite_dialog_show")
+            SensorsBridge.trackEvent(
+                "CloudSaveOverwriteDialogShow",
+                "game_id", gameEntity?.id ?: "",
+                "game_name", gameEntity?.name ?: ""
+            )
+        }
     }
 
     private fun dismissArchiveLoadingDialog(archiveLoadingDialog: Dialog) {

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

@@ -64,7 +64,7 @@ object BbsReportHelper {
                     this,
                     1f,
                     false,
-                    R.color.background
+                    R.color.ui_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.theme_red.toColor(binding.tvCount.context))
+                    binding.tvCount.setTextColor(R.color.secondary_red.toColor(binding.tvCount.context))
                 }
                 binding.tvCount.text = "$tvCount/500"
             }

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

@@ -177,6 +177,8 @@ public class CommentUtils {
                                     return null;
                                 },
                                 null,
+                                null,
+                                null,
                                 new DialogHelper.Config("", false, true, true, false, -1)
                         );
                         break;
@@ -196,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.background_white));
+        container.setBackgroundColor(ContextCompat.getColor(context, R.color.ui_surface));
 
         for (final String s : arrReportType) {
             TextView reportTypeTv = new TextView(context);
@@ -246,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.theme_font)) {
+        if (commentLikeCountTv.getCurrentTextColor() == ContextCompat.getColor(context, R.color.text_theme)) {
             ToastUtils.INSTANCE.showToast("已经点过赞啦！");
             return;
         }
         commentEntity.setVote(commentEntity.getVote() + 1);
-        commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.theme_font));
+        commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.text_theme));
         commentLikeIv.setImageResource(R.drawable.comment_vote_select);
         commentLikeCountTv.setText(NumberUtils.transSimpleCount(commentEntity.getVote()));
         commentLikeCountTv.setVisibility(View.VISIBLE);
@@ -316,12 +318,12 @@ public class CommentUtils {
             entrance = "视频流-评论-点赞";
         }
         CheckLoginUtils.checkLogin(context, entrance, () -> {
-            if (commentLikeCountTv.getCurrentTextColor() == ContextCompat.getColor(context, R.color.theme_font)) {
+            if (commentLikeCountTv.getCurrentTextColor() == ContextCompat.getColor(context, R.color.text_theme)) {
                 ToastUtils.INSTANCE.showToast("已经点过赞啦！");
                 return;
             }
             commentEntity.setVote(commentEntity.getVote() + 1);
-            commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.theme_font));
+            commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.text_theme));
             commentLikeIv.setImageResource(R.drawable.comment_vote_select);
             commentLikeCountTv.setText(NumberUtils.transSimpleCount(commentEntity.getVote()));
             commentLikeCountTv.setVisibility(View.VISIBLE);
@@ -442,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.theme_font));
+                            commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.text_theme));
                             commentLikeIv.setImageResource(R.drawable.comment_vote_select);
                             commentLikeCountTv.setText(NumberUtils.transSimpleCount(commentEntity.getVote()));
                             commentLikeCountTv.setVisibility(View.VISIBLE);
@@ -500,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.theme_font));
+                holder.commentLikeCountTv.setTextColor(ContextCompat.getColor(mContext, R.color.text_theme));
                 holder.commentLikeIv.setImageResource(R.drawable.comment_vote_select);
             }
             holder.commentLikeCountTv.setVisibility(View.VISIBLE);

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

@@ -5,6 +5,7 @@ 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;
@@ -54,7 +55,7 @@ public class DataCollectionUtils {
         map.put("location", downloadEntity.getLocation());
         map.put(EntranceConsts.KEY_ENTRANCE, downloadEntity.getEntrance());
         map.put("installed", downloadEntity.getInstalled());
-        map.put("network", NetworkUtils.getConnectedType(context));
+        map.put("network", MetaUtil.getMeta().getNetwork());
         DataCollectionManager.onEvent(context, "download", map);
     }
 
@@ -118,7 +119,7 @@ public class DataCollectionUtils {
         map.put("key", args[0]);
         map.put("game_id", args[3]);
         map.put("game_name", args[4]);
-        map.put("netword", NetworkUtils.getConnectedType(context));
+        map.put("netword", MetaUtil.getMeta().getNetwork());
         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);
@@ -136,7 +137,7 @@ public class DataCollectionUtils {
         map.put("key", args[0]);
         map.put("game_id", args[3]);
         map.put("game_name", args[4]);
-        map.put("netword", NetworkUtils.getConnectedType(context));
+        map.put("netword", MetaUtil.getMeta().getNetwork());
         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);

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

@@ -9,15 +9,15 @@ import android.preference.PreferenceManager;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.gh.gamecenter.common.base.GlobalActivityManager;
+import com.gh.ad.AdDelegateHelper;
 import com.gh.gamecenter.BuildConfig;
+import com.gh.gamecenter.common.base.GlobalActivityManager;
 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.SensorsBridge;
-import com.gh.gamecenter.core.AppExecutor;
+import com.gh.gamecenter.common.utils.ExtensionsKt;
 import com.gh.gamecenter.core.utils.GsonUtils;
 import com.gh.gamecenter.core.utils.MtaHelper;
 import com.gh.gamecenter.core.utils.SPUtils;
@@ -114,19 +114,24 @@ public class DataUtils {
                 Utils.log("Gid", gid);
                 PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().getApplication()).edit().putString(Constants.DEVICE_KEY, gid).apply();
 
-                String originalGid = HaloApp.getInstance().getGid();
-                HaloApp.getInstance().setGid(gid);
-
-                // gid 变更时上报 gid 变更日志
-                if (!TextUtils.isEmpty(originalGid) && !originalGid.equals(gid)) {
-                    NewFlatLogUtils.logGidChanged(originalGid, gid);
+                // 默认用 APP 级已存储的 GID 来使用，不使用外部 GID
+                String savedGid = SPUtils.getString(Constants.GID);
+                if (!TextUtils.isEmpty(savedGid)) {
+                    gid = savedGid;
+                } else {
+                    SPUtils.setString(Constants.GID, gid);
                 }
 
-                SensorsBridge.setGid(gid);
+                HaloApp.getInstance().setGid(gid);
+
+                // 更新广告配置
+                ExtensionsKt.doOnMainProcessOnly(HaloApp.getInstance(), () -> {
+                    AdDelegateHelper.INSTANCE.requestAdConfig(false, "", null);
+                });
 
                 // 避免重复调用
-                if (!TextUtils.isEmpty(gid) && !gid.equals(originalGid)) {
-                    GameSubstituteRepositoryHelper.updateSubstitutableGames();
+                if (!TextUtils.isEmpty(gid)) {
+                    GameSubstituteRepositoryHelper.updateHistoricInstalledGameSet();
                 }
 
                 getDeviceCertification(gid);
@@ -148,6 +153,10 @@ public class DataUtils {
             @Override
             public void onFailure(String s) {
                 MtaHelper.onEventWithBasicDeviceInfo("开发辅助", "GID 获取异常", s);
+                // 更新广告配置
+                ExtensionsKt.doOnMainProcessOnly(HaloApp.getInstance(), () -> {
+                    AdDelegateHelper.INSTANCE.requestAdConfig(false, "", null);
+                });
             }
         });
     }
@@ -172,9 +181,11 @@ public class DataUtils {
                         if (idCardEntity != null) {
                             boolean isCertificated = !TextUtils.isEmpty(data.getIdCard().getId());
                             boolean isAdult = data.getIdCard().getMinor() == null || !data.getIdCard().getMinor();
+                            boolean isCertificating = data.getIdCard().getStatus() == 1;
 
                             values.put(GhContentProvider.KEY_IS_CERTIFICATED, isCertificated); // 是否认证
                             values.put(GhContentProvider.KEY_IS_ADULT, isAdult); // 是否成年
+                            values.put(GhContentProvider.KEY_IS_CERTIFICATING, isCertificating); // 是否认证中
 
                             if (!isCertificated) {
                                 RealNameHelper.updateCertificationStatus(0);
@@ -188,6 +199,7 @@ public class DataUtils {
                         } else {
                             values.put(GhContentProvider.KEY_IS_CERTIFICATED, false);
                             values.put(GhContentProvider.KEY_IS_ADULT, false);
+                            values.put(GhContentProvider.KEY_IS_CERTIFICATING, false);
                             RealNameHelper.updateCertificationStatus(0);
                         }
 

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

@@ -1,16 +1,20 @@
 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;
@@ -18,7 +22,6 @@ 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;
@@ -30,163 +33,125 @@ import java.util.Objects;
  * Created by khy on 27/06/17.
  * 详情下载工具类
  */
-
 public class DetailDownloadUtils {
 
-    public static void detailInitDownload(DetailViewHolder viewHolder, boolean isCheck) {
-        String downloadAddWord = viewHolder.gameEntity.getDownloadAddWord();
+    public static void updateViewHolder(DetailViewHolder viewHolder) {
+        updateViewHolder(viewHolder, false);
+    }
 
+    /**
+     * 更新底部下载区域
+     * @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.mMultiVersionDownloadTv != null) {
-            viewHolder.mMultiVersionDownloadTv.setVisibility(View.GONE);
+        // 多版本下载箭头
+        if (viewHolder.getMultiVersionDownloadTv() != null) {
+            viewHolder.getMultiVersionDownloadTv().setVisibility(View.GONE);
         }
 
-        if (viewHolder.gameEntity != null && Config.isShowDownload(viewHolder.gameEntity.getId()) && !"光环助手".equals(viewHolder.gameEntity.getName())) {
-            viewHolder.downloadBottom.setVisibility(View.VISIBLE);
+        // 根据预置的配置更新 ViewHolder 的状态 (譬如青少年模式、下载内容为空等)
+        if (updateViewHolderWithPredefinedConfig(viewHolder, gameEntity)) {
+            return;
+        }
+
+        // 游戏只包含单 APK 的情况
+        if (gameEntity.getApk().size() == 1) {
+            boolean showVGame = false; // 真下载按钮(DownloadButton)是否需要显示为畅玩，包括单按钮显示和双按钮显示
+            boolean showDualDownloadButton = false; // 是否显示双下载按钮
+
+            int gameDownloadMode = gameEntity.getGameDownloadButtonMode(); // 获取游戏的下载按钮模式
+
+            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;
+                } else {
+                    gameDownloadMode = GameEntity.GAME_DOWNLOAD_BUTTON_MODE_DOWNLOAD;
+                }
+            }
+
+            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 (!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);
+                    }
+                } else {
+                    viewHolder.getDownloadPb().setVisibility(View.VISIBLE);
+                }
+            }
+
+            // 更新默认的下载按钮
+            updateWithSingleApk(
+                    gameEntity,
+                    viewHolder,
+                    viewHolder.getDownloadPb(),
+                    downloadAddWord,
+                    showVGame,
+                    showDualDownloadButton,
+                    downloadEntity
+            );
+
+            if (showDualDownloadButton) {
+                // 双下载按钮时更新占位的下载按钮
+                updateWithSingleApk(
+                        gameEntity,
+                        viewHolder,
+                        viewHolder.getLocalDownloadButton(),
+                        downloadAddWord,
+                        false,
+                        true,
+                        downloadEntity
+                );
+            }
         } else {
-            viewHolder.downloadBottom.setVisibility(View.GONE);
-            return;
-        }
-
-        if (SPUtils.getBoolean(Constants.SP_TEENAGER_MODE)) {
-            viewHolder.mDownloadPb.setText("查看");
-            viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.TEENAGER_MODE);
-            return;
-        }
-
-        if (viewHolder.gameEntity.isSpecialDownload()) {
-            viewHolder.mDownloadPb.setText("查看下载资源");
-            viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.SPECIAL_DOWNLOAD);
-            return;
-        }
-
-        if (viewHolder.gameEntity.isReservable()) {
-            if (!ReservationRepository.thisGameHasBeenReserved(viewHolder.gameEntity.getId())) {
-                if (TextUtils.isEmpty(downloadAddWord)) {
-                    viewHolder.mDownloadPb.setText(String.format("预约" + "《%s》", viewHolder.gameEntity.getName()));
-                } else {
-                    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 (downloadEntity != null) {
-                viewHolder.downloadEntity = downloadEntity;
-                detailInvalidate(viewHolder);
-            }
-
-            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.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);
-                }
-            }
-        } 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 {
-            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);
+            // 游戏包含多 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);
             if (downloadEntity != null) {
                 switch (downloadEntity.getStatus()) {
                     case downloading:
-                        viewHolder.mDownloadTips.setVisibility(View.VISIBLE);
-                        ExtensionsKt.setDownloadTipsAnimation(viewHolder.mDownloadTips, true);
+                        viewHolder.getDownloadTips().setVisibility(View.VISIBLE);
+                        ExtensionsKt.setDownloadTipsAnimation(viewHolder.getDownloadTips(), true);
                         break;
                     case done:
                     case pause:
@@ -195,73 +160,347 @@ public class DetailDownloadUtils {
                     case subscribe:
                     case neterror:
                     case overflow:
-                        viewHolder.mDownloadTips.setVisibility(View.VISIBLE);
-                        ExtensionsKt.setDownloadTipsAnimation(viewHolder.mDownloadTips, false);
+                        viewHolder.getDownloadTips().setVisibility(View.VISIBLE);
+                        ExtensionsKt.setDownloadTipsAnimation(viewHolder.getDownloadTips(), false);
                         break;
                     default:
-                        viewHolder.mDownloadTips.setVisibility(View.GONE);
+                        viewHolder.getDownloadTips().setVisibility(View.GONE);
                         break;
                 }
             } else {
-                viewHolder.mDownloadTips.setVisibility(View.GONE);
+                viewHolder.getDownloadTips().setVisibility(View.GONE);
             }
         }
+    }
 
-        if (isCheck && viewHolder.gameEntity.getApk().size() == 1) {
-            DownloadEntity downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(viewHolder.gameEntity);
+    /**
+     * 更新只有单个 APK 文件时候的下载按钮状态
+     *
+     * @param downloadButton         下载按钮，可能是真的下载按钮也可能只是占位下载按钮
+     * @param downloadAddWord        下载按钮的补充文案
+     * @param showAsVGame            是否显示为畅玩游戏
+     * @param showDualDownloadButton 是否正显示为双下载按钮
+     */
 
-            // 在下载管理找不到下载实体，到畅玩数据库里找
-            if (downloadEntity == null && viewHolder.gameEntity.isVGame()) {
-                String packageName = viewHolder.gameEntity.getUniquePackageName();
-                if (!TextUtils.isEmpty(packageName)) {
-                    downloadEntity = VHelper.getVDownloadEntitySnapshot(viewHolder.gameEntity.getId(), packageName);
+    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 (downloadEntity != null) {
-                viewHolder.downloadEntity = downloadEntity;
-                detailInvalidate(viewHolder);
+            // 在下载管理找不到下载实体，到畅玩数据库里找
+            if (downloadEntity == null) {
+                String packageName = 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;
+                }
+            }
+
+            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 (overlayTv != null && overlayTv.getVisibility() == View.VISIBLE) {
+            downloadButton.setTag(R.string.download, overlayTv.getText());
+        } else {
+            downloadButton.setTag(R.string.download, downloadButton.getText());
+        }
+
+        if (downloadEntity == null) return;
+
+        if (handleDownloadButtonAsXapk(downloadEntity, downloadButton)) {
+            return;
+        }
+
+        // 非完成状态显示下载按钮
+        if (downloadEntity.getStatus() != DownloadStatus.done) {
+            viewHolder.getDownloadPb().setVisibility(View.VISIBLE);
+        }
+
+        // 存在未完成的下载任务或不显示双按钮时，隐藏本地下载按钮
+        if (viewHolder.getLocalDownloadContainer() != null) {
+            if (downloadEntity.getStatus() != DownloadStatus.done) {
+                viewHolder.getLocalDownloadContainer().setVisibility(View.GONE);
+            } else if (showDualDownloadButton) {
+                viewHolder.getLocalDownloadContainer().setVisibility(View.VISIBLE);
+            } else {
+                viewHolder.getLocalDownloadContainer().setVisibility(View.GONE);
+            }
+        }
+
+        downloadButton.setProgress((int) (downloadEntity.getPercent() * 10));
+
+        if (overlayTv != null
+                && downloadEntity.getStatus() != DownloadStatus.done) {
+            overlayTv.setVisibility(View.GONE);
+        }
+
+        if (showAsVGame) {
+            updateVStyleDownloadButton(viewHolder, downloadButton, downloadEntity, status);
+        } else {
+            updateDefaultStyleDownloadButton(context, viewHolder, downloadButton, gameEntity, downloadEntity);
+        }
+    }
+
+    /**
+     * 根据预置的配置更新 ViewHolder 的状态
+     *
+     * @return 是否已经是最终状态，返回 true 表示已应用当前配置，返回 false 表示不应用当前配置
+     */
+    private static boolean updateViewHolderWithPredefinedConfig(DetailViewHolder viewHolder, GameEntity gameEntity) {
+        String downloadAddWord = gameEntity.getDownloadAddWord();
+
+        // 不满足条件的部分游戏隐藏下载按钮
+        if (Config.isShowDownload(gameEntity.getId())
+                && !"光环助手".equals(gameEntity.getName())) {
+            viewHolder.getDownloadBottom().setVisibility(View.VISIBLE);
+        } else {
+            viewHolder.getDownloadBottom().setVisibility(View.GONE);
+            return true;
+        }
+
+        // 青少年模式显示为查看
+        if (SPUtils.getBoolean(Constants.SP_TEENAGER_MODE)) {
+            viewHolder.getDownloadPb().setText("查看");
+            viewHolder.getDownloadPb().setButtonStyle(DownloadButton.ButtonStyle.TEENAGER_MODE);
+            return true;
+        }
+
+        // 预约
+        if (gameEntity.isReservable()) {
+            if (!ReservationRepository.thisGameHasBeenReserved(gameEntity.getId())) {
+                if (TextUtils.isEmpty(downloadAddWord)) {
+                    viewHolder.getDownloadPb().setText(String.format("预约" + "《%s》", gameEntity.getName()));
+                } else {
+                    viewHolder.getDownloadPb().setText(String.format("预约" + "《%s》%s", gameEntity.getName(), downloadAddWord));
+                }
+                viewHolder.getDownloadPb().setButtonStyle(DownloadButton.ButtonStyle.RESERVABLE);
+            } else {
+                viewHolder.getDownloadPb().setText("已预约《" + gameEntity.getName() + "》");
+                viewHolder.getDownloadPb().setButtonStyle(DownloadButton.ButtonStyle.RESERVED);
+            }
+            return true;
+        }
+
+        // 国际服 H5 弹窗
+        final RegionSetting.GameH5Download gameH5Download = RegionSettingHelper.getGameH5DownloadByGameId(gameEntity.getId());
+        if (gameH5Download != null) {
+            viewHolder.getDownloadPb().setText(TextUtils.isEmpty(gameEntity.getDownloadOffText()) ? "查看详情" : gameEntity.getDownloadOffText());
+            viewHolder.getDownloadPb().setButtonStyle(DownloadButton.ButtonStyle.NORMAL);
+            return true;
+        }
+
+        // 特殊下载
+        if (gameEntity.isSpecialDownload()) {
+            viewHolder.getDownloadPb().setText("查看下载资源");
+            viewHolder.getDownloadPb().setButtonStyle(DownloadButton.ButtonStyle.SPECIAL_DOWNLOAD);
+            return true;
+        }
+
+        // 处理不存在 APK 文件或游戏状态为关闭时的情况
+        if (gameEntity.getApk().isEmpty() || gameEntity.getDownloadOffStatus() != null) {
+            LinkEntity h5LinkEntity = gameEntity.getH5Link();
+
+            if (h5LinkEntity != null) {
+                if ("play".equals(h5LinkEntity.getType())) {
+                    String defaultString = String.format("开始玩" + "《%s》", gameEntity.getName());
+                    viewHolder.getDownloadPb().setText(TextUtils.isEmpty(h5LinkEntity.getText()) ? defaultString : h5LinkEntity.getText());
+                } else {
+                    viewHolder.getDownloadPb().setText(TextUtils.isEmpty(h5LinkEntity.getText()) ? "查看" : h5LinkEntity.getText());
+                }
+                viewHolder.getDownloadPb().setButtonStyle(DownloadButton.ButtonStyle.H5_GAME);
+            } else {
+                if ("dialog".equals(gameEntity.getDownloadOffStatus())) {
+                    viewHolder.getDownloadPb().setText(TextUtils.isEmpty(gameEntity.getDownloadOffText()) ? "查看详情" : gameEntity.getDownloadOffText());
+                    viewHolder.getDownloadPb().setButtonStyle(DownloadButton.ButtonStyle.NONE_WITH_HINT);
+                } else if ("updating".equals(gameEntity.getDownloadOffStatus())) {
+                    viewHolder.getDownloadPb().setText(TextUtils.isEmpty(gameEntity.getDownloadOffText()) ? "更新中" : gameEntity.getDownloadOffText());
+                    viewHolder.getDownloadPb().setButtonStyle(DownloadButton.ButtonStyle.UPDATING);
+                } else {
+                    viewHolder.getDownloadPb().setText(TextUtils.isEmpty(gameEntity.getDownloadOffText()) ? "暂无下载" : gameEntity.getDownloadOffText());
+                    viewHolder.getDownloadPb().setButtonStyle(DownloadButton.ButtonStyle.NONE);
+                }
+            }
+            return true;
+        }
+        return false;
     }
 
     private static String getDownloadSizeText(DetailViewHolder viewHolder) {
-        return String.format("（%s）", viewHolder.gameEntity.getApk().get(0).getSize());
+        return String.format("（%s）", viewHolder.getGameEntity().getApk().get(0).getSize());
     }
 
-    public static void detailInvalidate(DetailViewHolder viewHolder) {
-        DownloadEntity downloadEntity = viewHolder.downloadEntity;
-        String xapkStatus = downloadEntity.getMeta().get(XapkInstaller.XAPK_UNZIP_STATUS);
+    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);
+                    }
 
-        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;
+                    downloadButton.setText("");
+                }
+                break;
+            case cancel:
+            case hijack:
+            case notfound:
+            case uncertificated:
+            case unqualified:
+            case unavailable:
+            case banned:
+                updateViewHolder(viewHolder, true);
+                break;
+            default:
+                break;
         }
+    }
 
+    private static void updateDefaultStyleDownloadButton(
+            Context context,
+            DetailViewHolder viewHolder,
+            DownloadButton downloadButton,
+            GameEntity gameEntity,
+            DownloadEntity downloadEntity) {
         switch (downloadEntity.getStatus()) {
             case timeout:
             case neterror:
@@ -274,55 +513,37 @@ public class DetailDownloadUtils {
             case overflow:
                 String downloadingText = "游戏加载中 " + downloadEntity.getPercent() + "%";
                 String resumeText = "继续加载 " + downloadEntity.getPercent() + "%";
-                viewHolder.mDownloadPb.setText((downloadEntity.getStatus() == DownloadStatus.downloading || downloadEntity.getStatus() == DownloadStatus.redirected) ? downloadingText : resumeText);
+                downloadButton.setText((downloadEntity.getStatus() == DownloadStatus.downloading || downloadEntity.getStatus() == DownloadStatus.redirected) ? downloadingText : resumeText);
                 if (downloadEntity.isPluggable() && PackagesManager.isInstalled(downloadEntity.getPackageName())) {
-                    viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_PLUGIN);
+                    downloadButton.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_PLUGIN);
                 } else {
-                    viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_NORMAL);
+                    downloadButton.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_NORMAL);
                 }
                 break;
             case waiting:
-                viewHolder.mDownloadPb.setText(R.string.waiting);
-                viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.WAITING);
+                downloadButton.setText(R.string.waiting);
+                downloadButton.setButtonStyle(DownloadButton.ButtonStyle.WAITING);
                 break;
             case done:
-                if (SimulatorGameManager.isSimulatorGame(viewHolder.gameEntity)) {
-                    boolean isInstalled = PackageUtils.isInstalledFromAllPackage(viewHolder.context, viewHolder.gameEntity.getSimulator().getApk().getPackageName());
-                    boolean isInstalledNewSimulator = SimulatorGameManager.isNewSimulatorInstalled(viewHolder.context);
+                if (SimulatorGameManager.isSimulatorGame(gameEntity)) {
+                    boolean isInstalled = PackageUtils.isInstalledFromAllPackage(context, gameEntity.getSimulator().getApk().getPackageName());
+                    boolean isInstalledNewSimulator = SimulatorGameManager.isNewSimulatorInstalled(context);
                     if (isInstalled || isInstalledNewSimulator) {
-                        viewHolder.mDownloadPb.setText(R.string.launch);
-                        viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.LAUNCH_OR_OPEN);
+                        downloadButton.setText(R.string.launch);
+                        downloadButton.setButtonStyle(DownloadButton.ButtonStyle.LAUNCH_OR_OPEN);
                     } else {
                         if (SPUtils.getBoolean(Constants.SP_USE_BROWSER_TO_INSTALL) && !Objects.equals(Constants.XAPK_APKS_FORMAT, downloadEntity.getFormat())) {
-                            viewHolder.mDownloadPb.setText(R.string.browser_install_install);
+                            downloadButton.setText(R.string.browser_install_install);
                         } else {
-                            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.setText(R.string.install);
                         }
+                        downloadButton.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_NORMAL);
                     }
                 } else {
                     if (SPUtils.getBoolean(Constants.SP_USE_BROWSER_TO_INSTALL) && !Objects.equals(Constants.XAPK_APKS_FORMAT, downloadEntity.getFormat())) {
-                        viewHolder.mDownloadPb.setText(R.string.browser_install_install);
+                        downloadButton.setText(R.string.browser_install_install);
                     } else {
-                        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);
+                        downloadButton.setText(R.string.install);
                     }
                 }
 
@@ -334,50 +555,35 @@ public class DetailDownloadUtils {
             case unqualified:
             case unavailable:
             case banned:
-                detailInitDownload(viewHolder, false);
+                updateViewHolder(viewHolder, true);
                 break;
             default:
                 break;
         }
     }
 
-    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);
-                    }
+    private static boolean handleDownloadButtonAsXapk(DownloadEntity downloadEntity, DownloadButton downloadButton) {
+        String xapkStatus = downloadEntity.getMeta().get(XapkInstaller.XAPK_UNZIP_STATUS);
 
-                    viewHolder.mDownloadPb.setText("");
-                    if (viewHolder.getOverlayTv() != null) {
-                        viewHolder.getOverlayTv().setVisibility(View.VISIBLE);
-                    }
-                }
-                break;
-            default:
-                break;
+        if (XapkUnzipStatus.SUCCESS.name().equals(xapkStatus) && XapkInstaller.INSTANCE.isInstalling(downloadEntity.getPath())) {
+            downloadButton.setText("游戏安装中");
+            downloadButton.setProgress(100);
+            downloadButton.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_NORMAL);
+            return true;
         }
+
+        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;
     }
 }

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

@@ -1,23 +1,17 @@
 package com.gh.common.util
 
 import android.content.Context
-import android.os.Environment
 import android.preference.PreferenceManager
-import com.gh.gamecenter.common.exposure.meta.MetaUtil
-import com.gh.gamecenter.BuildConfig
+import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.entity.TimeEntity
 import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.halo.assistant.HaloApp
-import com.lightgame.utils.Utils
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
-import java.io.File
 
 object DeviceTokenUtils {
 
-    const val DEVICE_ID = "uuid"
-
     // 同步服务器时间
     @JvmStatic
     @Synchronized
@@ -39,99 +33,29 @@ object DeviceTokenUtils {
     }
 
     @JvmStatic
-    fun getLaunchType(readOnly: Boolean = false): LunchType {
+    fun getLaunchType(): LunchType {
         var lunchType: LunchType? = null
         val values = PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().application).all
         // 版本更新
         if (values.isNotEmpty()) {
             for (value in values) {
-                if (value.key.contains("isNewFirstLaunchV")) {
+                if (value.key.contains(Constants.SP_NEW_FIRST_LAUNCH_VERSION)) {
                     lunchType = LunchType.UPDATE
                     break
                 }
             }
         }
-        // 再次重装
-        if (lunchType == null && !getDeviceId().isNullOrEmpty()) {
-            lunchType = LunchType.AGAIN
-        }
         // 首次安装
         if (lunchType == null) {
             lunchType = LunchType.FIRST
         }
-        // 保存deviceId
-        var deviceId = MetaUtil.getIMEI()
-        if (deviceId.isNullOrEmpty()) {
-            deviceId = Utils.getTime(HaloApp.getInstance().application).toString()
-        }
-
-        if (!readOnly) {
-            setDeviceId(deviceId)
-        }
 
         return lunchType
     }
 
-    private fun getDeviceFileList(): List<File> {
-        val sdCardDir = Environment.getExternalStorageDirectory()
-        val fileList: MutableList<File> = ArrayList()
-        fileList.add(File(sdCardDir.path + "/gh-uuid/$DEVICE_ID"))
-        fileList.add(File(sdCardDir.path + "/system/$DEVICE_ID"))
-        fileList.add(File(sdCardDir.path + "/data/$DEVICE_ID"))
-        return fileList
-    }
-
-
-    @Synchronized
-    private fun setDeviceId(deviceId: String) {
-        //将deviceId存到sp
-        val sp = PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().application)
-        val edit = sp.edit()
-        edit.putString(DEVICE_ID, deviceId)
-        edit.apply()
-        Utils.log("saveDeviceId", "保存成功SP")
-
-        //将deviceId存到SD卡
-        for (file in getDeviceFileList()) {
-            try {
-                val parentFile = file.parentFile
-                if (!parentFile.exists()) parentFile.mkdirs()
-                file.writeText(deviceId)
-                Utils.log("saveDeviceId", "保存成功SDCard目录为：${file.path}")
-            } catch (e: Exception) {
-                Utils.log("保存u${DEVICE_ID}到SDCard异常${file.path} " + e.toString())
-                e.printStackTrace()
-            }
-        }
-    }
-
-    private fun getDeviceId(): String? {
-        val sp = PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().application)
-        var deviceId = sp.getString(DEVICE_ID, null)
-        if (deviceId.isNullOrEmpty()) {
-            val fileList = getDeviceFileList()
-            for (file in fileList) {
-                if (file.exists()) {
-                    try {
-                        deviceId = file.readText()
-                        Utils.log("getDeviceId", "获取成功DataFile$DEVICE_ID")
-                        return deviceId
-                    } catch (e: Exception) {
-                        e.printStackTrace()
-                    }
-                }
-            }
-        }
-        if (BuildConfig.DEBUG) {
-            Utils.log("getDeviceId", "获取成功SP$DEVICE_ID")
-        }
-        return deviceId
-    }
-
 }
 
 enum class LunchType {
     FIRST,
-    UPDATE,
-    AGAIN
+    UPDATE
 }

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

@@ -11,16 +11,9 @@ 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;
@@ -35,9 +28,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 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;
@@ -45,11 +36,9 @@ 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;
@@ -58,9 +47,7 @@ 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;
@@ -78,10 +65,7 @@ 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;
@@ -89,7 +73,6 @@ 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;
@@ -121,7 +104,7 @@ public class DialogUtils {
         return dialog;
     }
 
-    public static void checkDownload(Context context, String size, String gameId, String gameName, CheckDownloadCallBack callBack) {
+    public static void checkDownload(Context context, String size, String gameId, String gameName, String gameCategoryChinese, CheckDownloadCallBack callBack) {
         if (!NetworkUtils.isNetworkConnected(context)) {
             showNoConnectionDownloadDialog(context, () -> {
                     },
@@ -138,7 +121,8 @@ public class DialogUtils {
                     () -> callBack.onResponse(false),
                     () -> callBack.onResponse(true),
                     gameId,
-                    gameName);
+                    gameName,
+                    gameCategoryChinese);
         }
     }
 
@@ -167,7 +151,9 @@ public class DialogUtils {
         DialogHelper.showDialog(context, "下载提示", "网络异常，请检查手机网络状态", "知道了", "WiFi自动下载", listener::onConfirm, cancelListener::onCancel, false, "", "");
     }
 
-    public static void showDownloadDialog(Context context, ConfirmListener listener, CancelListener cancelListener, String gameId, String gameName) {
+    public static void showDownloadDialog(Context context, ConfirmListener listener, CancelListener cancelListener, String gameId, String gameName, String gameCategoryChinese) {
+        SensorsBridge.trackDownloadMobileDataDialogShow(gameId, gameName, gameCategoryChinese);
+
         context = checkDialogContext(context);
 
         NewFlatLogUtils.logDownloadMobileDataDialogShow(gameId, gameName);
@@ -182,6 +168,7 @@ public class DialogUtils {
         Context finalContext = context;
         allowOnce.setOnClickListener(v -> {
             NewFlatLogUtils.logDownloadMobileDataDialogClick(gameId, gameName, "允许一次");
+            SensorsBridge.trackDownloadMobileDataDialogClick("允许一次", gameId, gameName, gameCategoryChinese);
             AppExecutor.getUiExecutor().executeWithDelay(() -> {
                 Utils.toast(finalContext, "已使用移动网络下载，请注意流量消耗");
             }, 500);
@@ -191,12 +178,14 @@ public class DialogUtils {
         });
         wifiAuto.setOnClickListener(v -> {
             NewFlatLogUtils.logDownloadMobileDataDialogClick(gameId, gameName, "WiFi自动下载");
+            SensorsBridge.trackDownloadMobileDataDialogClick("WiFi自动下载", gameId, gameName, gameCategoryChinese);
             cancelListener.onCancel();
             dialog.dismiss();
 //            MtaHelper.onEvent("移动网络下载", NetworkUtils.getMobileNetworkType(finalContext), "连上WiFi后自动下载");
         });
         allowAlways.setOnClickListener(v -> {
             NewFlatLogUtils.logDownloadMobileDataDialogClick(gameId, gameName, "总是允许");
+            SensorsBridge.trackDownloadMobileDataDialogClick("总是允许", gameId, gameName, gameCategoryChinese);
             SPUtils.setBoolean(getTrafficDownloadHintKey(), false);
             AppExecutor.getUiExecutor().executeWithDelay(() -> {
                 // 显示了弹窗以后，即便下面这个 toast 放在 listener.onConfirm 后调用也是显示 listener.onConfirm 里的 toast
@@ -208,7 +197,10 @@ public class DialogUtils {
 //            MtaHelper.onEvent("移动网络下载", NetworkUtils.getMobileNetworkType(finalContext), "总是允许");
         });
 
-        dialog.setOnCancelListener(downloadDialog -> NewFlatLogUtils.logDownloadMobileDataDialogClick(gameId, gameName, "关闭弹窗"));
+        dialog.setOnCancelListener(downloadDialog -> {
+            NewFlatLogUtils.logDownloadMobileDataDialogClick(gameId, gameName, "关闭弹窗");
+            SensorsBridge.trackDownloadMobileDataDialogClick("关闭弹窗", gameId, gameName, gameCategoryChinese);
+        });
 
         dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
         dialog.setContentView(contentView);
@@ -317,180 +309,7 @@ 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);
 
@@ -536,8 +355,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.background, 999));
-        negativeTv.setBackground(DrawableView.getOvalDrawable(R.color.theme, 999));
+        positiveTv.setBackground(DrawableView.getOvalDrawable(R.color.ui_background, 999));
+        negativeTv.setBackground(DrawableView.getOvalDrawable(R.color.primary_theme, 999));
         content.setText(Html.fromHtml(context.getString(R.string.video_upload_draft_dialog_content)));
 
         negativeTv.setOnClickListener(view -> {
@@ -730,6 +549,12 @@ public class DialogUtils {
 
     // 海外下载地址弹窗
     public static void showOverseaDownloadDialog(Context context, GameEntity gameEntity, @NonNull ConfirmListener listener) {
+        SensorsBridge.trackOverseasAddressDialogShow(
+                gameEntity.getId(),
+                gameEntity.getName() != null ? gameEntity.getName() : "",
+                gameEntity.getCategoryChinese()
+        );
+
         context = checkDialogContext(context);
 
         final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
@@ -739,8 +564,19 @@ public class DialogUtils {
         View contentView = binding.getRoot();
 
         binding.gameIcon.displayGameIcon(gameEntity);
-        binding.gameNameTv.setText(context.getString(R.string.dialog_oversea_hint, gameEntity.getName()));
-        binding.closeIv.setOnClickListener(v -> dialog.dismiss());
+
+        AtomicBoolean dismissByTouchInside = new AtomicBoolean(false);
+
+        binding.closeIv.setOnClickListener(v -> {
+            dismissByTouchInside.set(true);
+            SensorsBridge.trackOverseasAddressDialogClick(
+                    "取消",
+                    gameEntity.getId(),
+                    gameEntity.getName() != null ? gameEntity.getName() : "",
+                    gameEntity.getCategoryChinese()
+            );
+            dialog.dismiss();
+        });
 
         if ("show&download".equals(gameEntity.getOverseasAddressDialog().getStatus())) {
             gameEntity.getApk().get(0).setUrl(gameEntity.getOverseasAddressDialog().getLink());
@@ -748,6 +584,13 @@ public class DialogUtils {
         binding.urlTv.setText(gameEntity.getOverseasAddressDialog().getLink());
         binding.downloadBtn.setText("下载（" + gameEntity.getApk().get(0).getSize() + "）");
         binding.downloadBtn.setOnClickListener(v -> {
+            dismissByTouchInside.set(true);
+            SensorsBridge.trackOverseasAddressDialogClick(
+                    "下载",
+                    gameEntity.getId(),
+                    gameEntity.getName() != null ? gameEntity.getName() : "",
+                    gameEntity.getCategoryChinese()
+            );
             listener.onConfirm();
             dialog.dismiss();
         });
@@ -757,6 +600,17 @@ public class DialogUtils {
             window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
         }
 
+        dialog.setOnDismissListener(dialog1 -> {
+            if (!dismissByTouchInside.get()) {
+                SensorsBridge.trackOverseasAddressDialogClick(
+                        "关闭弹窗",
+                        gameEntity.getId(),
+                        gameEntity.getName() != null ? gameEntity.getName() : "",
+                        gameEntity.getCategoryChinese()
+                );
+            }
+        });
+
         dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
         dialog.setContentView(contentView);
         dialog.show();
@@ -1205,11 +1059,11 @@ 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.theme_font, true, new Function0<Unit>() {
+        SpannableStringBuilder builder = new SpanBuilder("您也可以点击提交反馈跟我们联系").click(context, 6, 10, R.color.text_theme, true, new Function0<Unit>() {
             @Override
             public Unit invoke() {
-                SimpleGameEntity entity = new SimpleGameEntity(gameId, gameName, "");
-                HelpAndFeedbackBridge.startSuggestionActivity(finalContext, SuggestType.gameQuestion, "notfound", "模拟器安装包解析错误", entity, "-");
+                SimpleGameEntity entity = new SimpleGameEntity(gameId, gameName, "", "");
+                HelpAndFeedbackBridge.startSuggestionActivity(finalContext, SuggestType.GAME, "notfound", "模拟器安装包解析错误", entity);
                 dialog.dismiss();
                 return null;
             }
@@ -1264,7 +1118,7 @@ public class DialogUtils {
             return null;
         });
         binding.reasonRv.setLayoutManager(new LinearLayoutManager(context));
-        binding.reasonRv.addItemDecoration(new VerticalItemDecoration(context, 1F, false, R.color.background));
+        binding.reasonRv.addItemDecoration(new VerticalItemDecoration(context, 1F, false, R.color.ui_background));
         binding.reasonRv.setAdapter(reportReasonAdapter);
 
         binding.negativeBtn.setOnClickListener(v -> {
@@ -1286,7 +1140,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.theme_red));
+                binding.tvCount.setTextColor(ContextCompat.getColor(finalContext, R.color.secondary_red));
             }
             binding.tvCount.setText(tvCount + "/500");
             return null;

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

@@ -15,6 +15,7 @@ import com.gh.common.constant.Config
 import com.gh.common.exposure.ExposureManager.log
 import com.gh.common.exposure.ExposureTraceUtils.appendTrace
 import com.gh.common.util.EntranceUtils.jumpActivity
+import com.gh.common.util.EntranceUtils.jumpActivityCompat
 import com.gh.gamecenter.*
 import com.gh.gamecenter.amway.AmwayActivity
 import com.gh.gamecenter.catalog.CatalogActivity
@@ -24,7 +25,6 @@ import com.gh.gamecenter.common.base.activity.BaseActivity
 import com.gh.gamecenter.common.base.activity.BaseActivity_TabLayout
 import com.gh.gamecenter.common.base.activity.ToolBarActivity
 import com.gh.gamecenter.common.base.fragment.BaseFragment_TabLayout
-import com.gh.gamecenter.common.constant.CommonConsts
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.constant.EntranceConsts.*
@@ -37,7 +37,10 @@ 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.GameCollectionListEntity
+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
@@ -56,9 +59,12 @@ import com.gh.gamecenter.game.commoncollection.detail.CommonCollectionDetailActi
 import com.gh.gamecenter.game.upload.GameSubmissionActivity
 import com.gh.gamecenter.gamecollection.detail.GameCollectionDetailActivity
 import com.gh.gamecenter.gamecollection.hotlist.GameCollectionHotListActivity
+import com.gh.gamecenter.gamecollection.hotlist.GameCollectionListDetailActivity
 import com.gh.gamecenter.gamecollection.square.GameCollectionSquareActivity
 import com.gh.gamecenter.gamedetail.GameDetailFragment
 import com.gh.gamecenter.gamedetail.fuli.kaifu.ServersCalendarActivity
+import com.gh.gamecenter.gamedetail.fuli.kaifu.ServersCalendarManagementActivity
+import com.gh.gamecenter.gamedetail.fuli.kaifu.ServersSubscribedGameListActivity
 import com.gh.gamecenter.gamedetail.history.HistoryApkListActivity
 import com.gh.gamecenter.gamedetail.rating.RatingReplyActivity
 import com.gh.gamecenter.help.HelpAndFeedbackBridge
@@ -106,8 +112,8 @@ import kotlin.math.roundToInt
 object DirectUtils {
 
     @JvmStatic
-    fun directToLinkPage(context: Context, linkEntity: LinkEntity, entrance: String, path: String) {
-        directToLinkPage(context, linkEntity, entrance, path, null)
+    fun directToLinkPage(context: Context, linkEntity: LinkEntity, entrance: String, path: String, sourceEntrance: String = "") {
+        directToLinkPage(context, linkEntity, entrance, path,  null, sourceEntrance)
     }
 
     @JvmStatic
@@ -116,9 +122,10 @@ object DirectUtils {
         linkEntity: LinkEntity,
         entrance: String,
         path: String,
-        exposureEvent: ExposureEvent? = null
+        exposureEvent: ExposureEvent? = null,
+        sourceEntrance: String = ""
     ) {
-        directToLinkPage(context, linkEntity, entrance, path, exposureEvent, null)
+        directToLinkPage(context, linkEntity, entrance, path, exposureEvent, null, sourceEntrance)
     }
 
     // 用于判断是否已经对接相关类型
@@ -152,7 +159,8 @@ object DirectUtils {
         "bbs_video",
         "explore_column",
         "game_explore",
-        "column_test_v2"
+        "column_test_v2",
+        "game_list_collection"
     )
 
     fun directToLinkPage(
@@ -162,6 +170,7 @@ object DirectUtils {
         path: String,
         exposureEvent: ExposureEvent? = null,
         unknownCallback: (() -> Unit)?,
+        sourceEntrance: String = ""
     ) {
         when (linkEntity.type) {
             "article", "news", "文章" -> {
@@ -187,6 +196,8 @@ object DirectUtils {
                 }
             }
 
+            "game_server_calendar" -> directToGameServerCalendar(context, linkEntity.link)
+
             "column", "游戏专题" -> directToSubject(
                 context, linkEntity.link
                     ?: "", linkEntity.text, BaseActivity.mergeEntranceAndPath(entrance, path), exposureEvent
@@ -194,7 +205,7 @@ object DirectUtils {
 
             "question", "社区问题" -> directToQuestionDetail(
                 context, linkEntity.link
-                    ?: "", entrance, path
+                    ?: "", entrance, path, sourceEntrance
             )
 
             "answer", "社区回答" -> directToAnswerDetail(context, linkEntity.link ?: "", entrance, path)
@@ -209,7 +220,8 @@ object DirectUtils {
                 linkEntity.community!!,
                 linkEntity.link!!,
                 entrance,
-                path
+                path,
+                sourceEntrance,
             )
 
             "community_column", "社区专题" -> directToCommunityColumn(
@@ -225,6 +237,7 @@ object DirectUtils {
                     linkEntity.link!!.contains("v.douyin") && PackageHelper.localPackageNameSet.contains("com.ss.android.ugc.aweme") -> {
                         directDouyin(context, "1402577827140941")
                     }
+
                     else -> directToWebView(
                         context,
                         url = linkEntity.link!!,
@@ -278,7 +291,16 @@ object DirectUtils {
                 )
             }
 
-            "column_collection", "专题合集" -> directToColumnCollection(context, linkEntity.link!!, -1, entrance, "", exposureEvent)
+            "column_collection", "专题合集" -> directToColumnCollection(
+                context,
+                linkEntity.link!!,
+                -1,
+                entrance,
+                "",
+                linkEntity.blockId,
+                linkEntity.blockName,
+                exposureEvent
+            )
 
             "server", "game_server", "开服表" -> directToGameServers(context, entrance, path, exposureEvent)
 
@@ -291,24 +313,32 @@ object DirectUtils {
                 videoId = linkEntity.link!!,
                 fromLocation = VideoDetailContainerViewModel.Location.VIDEO_CHOICENESS.value,
                 entrance = entrance,
-                path = path
+                path = path,
+                sourceEntrance = sourceEntrance
             )
 
             "game_video" -> directToGameVideo(context, linkEntity.link ?: "", entrance, path)
 
             "libao", "礼包" -> directToGiftDetail(context, linkEntity.link ?: "", entrance)
 
-            "feedback" -> directToFeedback(context, linkEntity.name, linkEntity.text, false, "", entrance)
+            "feedback" -> directToFeedback(context, linkEntity.name, false, "", false, false, entrance)
 
             "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
                     ?: ""
             )
 
-            "anliwall", "安利墙" -> directToAmway(context, fixedTopAmwayCommentId = null, entrance = entrance, path = path)
+            "anliwall", "安利墙" -> directToAmway(
+                context,
+                fixedTopAmwayCommentId = null,
+                entrance = entrance,
+                path = path
+            )
 
             "game_detail_comment" -> directToGameDetail(context, linkEntity.link ?: "", entrance)
 
@@ -427,9 +457,18 @@ object DirectUtils {
 
             "qq_mini_game_column" -> directToQGameHome(context)
 
+            "game_list_collection" -> directToGameCollectionListDetail(
+                context,
+                linkEntity.link ?: "",
+                linkEntity.text ?: "",
+                linkEntity.explain,
+                entrance
+            )
+
             "" -> {
                 // do nothing
             }
+
             else -> {
                 if (unknownCallback != null) {
                     unknownCallback.invoke()
@@ -478,6 +517,8 @@ object DirectUtils {
         position: Int = -1,
         entrance: String,
         columnName: String = "",
+        blockId: String = "",
+        blockName: String = "",
         exposureEvent: ExposureEvent? = null
     ) {
         if (id.isEmpty()) return
@@ -486,9 +527,11 @@ object DirectUtils {
         bundle.putString(KEY_ENTRANCE, entrance)
         bundle.putString(KEY_COLLECTION_ID, id)
         bundle.putString(KEY_COLUMNNAME, columnName)
+        bundle.putString(KEY_BLOCK_ID, blockId)
+        bundle.putString(KEY_BLOCK_NAME, blockName)
         bundle.putInt(KEY_POSITION, position)
         if (exposureEvent != null) {
-            bundle.putParcelableArrayList(EntranceConsts.KEY_EXPOSURE_SOURCE_LIST ,ArrayList(exposureEvent.source))
+            bundle.putParcelableArrayList(EntranceConsts.KEY_EXPOSURE_SOURCE_LIST, ArrayList(exposureEvent.source))
         }
         jumpActivity(context, bundle)
     }
@@ -510,12 +553,13 @@ object DirectUtils {
      * 跳转至游戏日历表
      */
     @JvmStatic
-    fun directToGameServerCalendar(context: Context, gameId: String?) {
+    fun directToGameServerCalendar(context: Context, gameId: String?, kaifuTime: Long = 0) {
         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)
@@ -721,7 +765,8 @@ object DirectUtils {
     ) {
         if (id.isEmpty()) return
         val bundle = Bundle()
-        val subjectData = SubjectData(subjectId = id, subjectName = subjectName, isOrder = false, isQQMiniGame = isQQMiniGame)
+        val subjectData =
+            SubjectData(subjectId = id, subjectName = subjectName, isOrder = false, isQQMiniGame = isQQMiniGame)
         bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
         bundle.putString(KEY_TO, SubjectActivity::class.java.name)
         bundle.putParcelable(EntranceConsts.KEY_SUBJECT_DATA, subjectData)
@@ -735,72 +780,68 @@ object DirectUtils {
     // 反馈
     @JvmStatic
     fun directToFeedback(context: Context, content: String? = null, entrance: String? = null) {
-        directToFeedback(context, content, null, false, "", entrance)
+        directToFeedback(context, content, false, "", false, false, entrance)
     }
 
     @JvmStatic
     fun directToFeedback(
         context: Context,
         content: String? = null,
-        hintType: String? = null,
         isQaFeedback: Boolean = false,
         qaContentId: String? = "",
+        isPlugin: Boolean = false,
+        isSmoothGame: Boolean = false,
         entrance: String? = null
     ) {
         val bundle = Bundle()
         bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
-        val destination = RouteConsts.activity.suggestionActivity.toDestinationClass()
-        bundle.putString(KEY_TO, destination?.name ?: "")
+        bundle.putBoolean(KEY_PLUGIN, isPlugin)
+        bundle.putBoolean(KEY_SMOOTH_GAME, isSmoothGame)
+        if (isPlugin) {
+            bundle.putString(KEY_HIDE_SUGGEST_HINT, "【插件问题】")
+        }
+        if (isSmoothGame) {
+            bundle.putString(KEY_HIDE_SUGGEST_HINT, "【畅玩问题】")
+        }
         if (isQaFeedback) {
             bundle.putBoolean(KEY_IS_QA_FEEDBACK, true)
             bundle.putString(KEY_QA_CONTENT_ID, qaContentId)
-            bundle.putSerializable(KEY_SUGGESTTYPE, SuggestType.normal)
         } else {
             bundle.putString(KEY_CONTENT, content)
-            if (TextUtils.isEmpty(hintType)) {
-                bundle.putSerializable(KEY_SUGGESTTYPE, SuggestType.gameQuestion)
-                bundle.putString(KEY_SUGGEST_HINT_TYPE, KEY_PLUGIN)
-            } else {
-                bundle.putSerializable(KEY_SUGGESTTYPE, SuggestType.normal)
-                bundle.putString(KEY_SUGGEST_HINT_TYPE, hintType)
-            }
         }
-
-        jumpActivity(context, bundle)
+        context.startActivity(HelpAndFeedbackBridge.getSuggestionCategoryIntent(context, bundle))
     }
 
     /**
-     * 畅玩助手反馈跳转
+     * 跳转至使用帮助与反馈，请不要随意修改方法名
      */
     @JvmStatic
-    fun directToVGameFeedback(
+    fun directToHelpAndFeedback(
         context: Context,
         content: String? = null,
-        hintType: String? = null,
         isQaFeedback: Boolean = false,
         qaContentId: String? = "",
+        isPlugin: Boolean = false,
+        isSmoothGame: Boolean = false,
         entrance: String? = null
     ) {
         val bundle = Bundle()
         bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
-        val destination = RouteConsts.activity.suggestionActivity.toDestinationClass()
-        bundle.putString(KEY_TO, destination?.name ?: "")
+        bundle.putBoolean(KEY_PLUGIN, isPlugin)
+        bundle.putBoolean(KEY_SMOOTH_GAME, isSmoothGame)
+        if (isPlugin) {
+            bundle.putString(KEY_HIDE_SUGGEST_HINT, "【插件问题】")
+        }
+        if (isSmoothGame) {
+            bundle.putString(KEY_HIDE_SUGGEST_HINT, "【畅玩问题】")
+        }
         if (isQaFeedback) {
             bundle.putBoolean(KEY_IS_QA_FEEDBACK, true)
             bundle.putString(KEY_QA_CONTENT_ID, qaContentId)
-            bundle.putSerializable(KEY_SUGGESTTYPE, SuggestType.cwzsQuestion)
         } else {
             bundle.putString(KEY_CONTENT, content)
-            if (TextUtils.isEmpty(hintType)) {
-                bundle.putSerializable(KEY_SUGGESTTYPE, SuggestType.gameQuestion)
-                bundle.putString(KEY_SUGGEST_HINT_TYPE, KEY_PLUGIN)
-            } else {
-                bundle.putSerializable(KEY_SUGGESTTYPE, SuggestType.cwzsQuestion)
-                bundle.putString(KEY_SUGGEST_HINT_TYPE, hintType)
-            }
         }
-
-        EntranceUtils.jumpActivityCompat(context, bundle)
+        directToHelpAndFeedback(context, bundle)
     }
 
     @JvmStatic
@@ -811,27 +852,6 @@ object DirectUtils {
         jumpActivity(context, bundle)
     }
 
-    /**
-     * 跳转到下载管理器并开始下载 [gameId] 和 [packageName] 用于唯一确定一个下载文件
-     */
-    @JvmStatic
-    fun directToDownloadManagerAndStartDownload(
-        context: Context,
-        gameId: String? = "",
-        packageName: String? = "",
-        entrance: String? = null
-    ) {
-        DownloadHelper.createABrandNewDownloadTaskQuietly(gameId, packageName) {
-            val bundle = Bundle()
-            bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
-            bundle.putString(KEY_TO, DownloadManagerActivity.TAG)
-            bundle.putString(KEY_GAMEID, gameId)
-            bundle.putString(KEY_PACKAGENAME, packageName)
-            bundle.putBoolean(KEY_AUTO_DOWNLOAD, true)
-            jumpActivity(context, bundle)
-        }
-    }
-
     @JvmStatic
     fun directToDownloadManagerAndStartUpdate(
         context: Context,
@@ -845,7 +865,7 @@ object DirectUtils {
         bundle.putString(KEY_GAMEID, gameId)
         bundle.putString(KEY_PACKAGENAME, packageName)
         bundle.putInt(BaseFragment_TabLayout.PAGE_INDEX, INDEX_UPDATE)
-        jumpActivity(context, bundle)
+        jumpActivityCompat(context, bundle)
     }
 
     @JvmStatic
@@ -870,13 +890,14 @@ object DirectUtils {
     }
 
     @JvmStatic
-    fun directToQuestionDetail(context: Context, id: String, entrance: String? = null, path: String? = null) {
+    fun directToQuestionDetail(context: Context, id: String, entrance: String? = null, path: String? = null, sourceEntrance: String = "") {
         if (id.isEmpty()) return
         val bundle = Bundle()
         bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
         bundle.putString(KEY_TO, NewQuestionDetailActivity::class.java.name)
         bundle.putString(KEY_PATH, path)
         bundle.putString(KEY_QUESTIONS_ID, id)
+        bundle.putString(KEY_SOURCE_ENTRANCE, sourceEntrance)
         jumpActivity(context, bundle)
     }
 
@@ -906,9 +927,9 @@ object DirectUtils {
                 browserIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
             }
             context.startActivity(browserIntent)
-        } catch (e: ActivityNotFoundException) {
+        } catch (e: Exception) {
             e.printStackTrace()
-            Utils.toast(context, "跳转地址无效")
+            url.copyTextAndToast(context.getString(R.string.direct_to_external_browser_failed_toast))
         }
     }
 
@@ -1020,13 +1041,15 @@ object DirectUtils {
         articleId: String?,
         communityId: String?,
         entrance: String?,
-        path: String?
+        path: String?,
+        sourceEntrance: String = ""
     ) {
         val bundle = Bundle()
         bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
         bundle.putString(KEY_PATH, path)
         bundle.putString(KEY_TO, ArticleDetailActivity::class.java.name)
         bundle.putString(KEY_COMMUNITY_ARTICLE_ID, articleId)
+        bundle.putString(KEY_SOURCE_ENTRANCE, sourceEntrance)
         bundle.putParcelable(KEY_COMMUNITY_DATA, CommunityEntity(id = communityId!!))
         jumpActivity(context, bundle)
     }
@@ -1037,7 +1060,8 @@ object DirectUtils {
         community: CommunityEntity?,
         articleId: String?,
         entrance: String?,
-        path: String?
+        path: String?,
+        sourceEntrance: String = "",
     ) {
         if (articleId.isNullOrEmpty()) return
         val bundle = Bundle()
@@ -1045,6 +1069,7 @@ object DirectUtils {
         bundle.putString(KEY_PATH, path)
         bundle.putString(KEY_TO, ArticleDetailActivity::class.java.name)
         bundle.putString(KEY_COMMUNITY_ARTICLE_ID, articleId)
+        bundle.putString(KEY_SOURCE_ENTRANCE, sourceEntrance)
         bundle.putParcelable(KEY_COMMUNITY_DATA, community)
         jumpActivity(context, bundle)
     }
@@ -1074,7 +1099,8 @@ object DirectUtils {
     fun directToVideoDetail(
         context: Context, videoId: String,
         entrance: String? = null,
-        path: String? = ""
+        path: String? = "",
+        sourceEntrance: String = ""
     ) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
             val bundle = Bundle()
@@ -1082,6 +1108,7 @@ object DirectUtils {
             bundle.putString(KEY_TO, ForumVideoDetailActivity::class.java.name)
             bundle.putString(KEY_VIDEO_ID, videoId);
             bundle.putString(KEY_PATH, path)
+            bundle.putString(KEY_SOURCE_ENTRANCE, sourceEntrance)
             jumpActivity(context, bundle)
         } else {
             DialogHelper.showVideoUnsupportedDialog(context)
@@ -1106,7 +1133,9 @@ object DirectUtils {
         act: String = "",
         paginationType: String = "",
         fieldId: String = "",
-        sectionName: String = ""
+        sectionName: String = "",
+        isHomeVideo: Boolean = false,
+        sourceEntrance: String = ""
     ) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
             val bundle = Bundle()
@@ -1124,6 +1153,8 @@ object DirectUtils {
             bundle.putString(KEY_PAGINATION_TYPE, paginationType)
             bundle.putString(KEY_FIELD_ID, fieldId)
             bundle.putString(KEY_SECTION_NAME, sectionName)
+            bundle.putBoolean(KEY_IS_HOME_VIDEO, isHomeVideo)
+            SensorsBridge.trackAccessVideoStreaming(sourceEntrance)
             jumpActivity(context, bundle)
         } else {
             DialogHelper.showVideoUnsupportedDialog(context)
@@ -1139,9 +1170,10 @@ object DirectUtils {
         gameId: String = "",
         entrance: String? = null,
         path: String? = "",
-        referer: String = ""
+        referer: String = "",
+        sourceEntrance: String = ""
     ) {
-        directToVideoDetail(context, videoId, entrance, path)
+        directToVideoDetail(context, videoId, entrance, path, sourceEntrance)
     }
 
     /**
@@ -1430,7 +1462,7 @@ object DirectUtils {
     fun directForumDetailSection(
         context: Context,
         bbsId: String? = "",
-        sectionId: String = "",
+        sectionId: String? = "",
         entrance: String? = null
     ) {
         val bundle = Bundle()
@@ -1525,15 +1557,14 @@ object DirectUtils {
 
     /**
      * 跳转至使用帮助与反馈，请不要随意修改方法名
-     * @param position 使用帮助：[CommonConsts.TAB_MAIN],意见反馈：[CommonConsts.TAB_SUB]
      */
     @JvmStatic
-    fun directToHelpAndFeedback(context: Context, position: Int = CommonConsts.TAB_MAIN) {
+    fun directToHelpAndFeedback(context: Context, bundle: Bundle? = null) {
         val destination = RouteConsts.activity.helpAndFeedbackActivity.toDestinationClass()
-        val bundle = Bundle()
-        bundle.putString(KEY_TO, destination?.name ?: "")
-        bundle.putInt(BaseActivity_TabLayout.PAGE_INDEX, position)
-        jumpActivity(context, bundle)
+        val newBundle = Bundle()
+        newBundle.putString(KEY_TO, destination?.name ?: "")
+        bundle?.let { newBundle.putAll(it) }
+        jumpActivityCompat(context, newBundle)
     }
 
     /**
@@ -1914,17 +1945,18 @@ object DirectUtils {
     @JvmStatic
     fun directToSuggestion(
         context: Context,
-        type: SuggestType = SuggestType.normal,
+        type: SuggestType = SuggestType.APP,
         hiddenHint: String = "",
         suggestHintType: String? = null,
         content: String? = null,
-        platform: String = "",
         game: SimpleGameEntity? = null,
         isQaFeedback: Boolean = false,
         qaContentId: String = "",
         fromRatingKey: Boolean = false,
         diagnosis: String = "",
-        requestCode: Int? = null
+        forceLogin: Boolean = true,
+        requestCode: Int? = null,
+        isSmoothGame: Boolean = false
     ) {
         val intent = HelpAndFeedbackBridge.getIntent(
             context,
@@ -1932,12 +1964,13 @@ object DirectUtils {
             hiddenHint,
             suggestHintType,
             content,
-            platform,
             game,
             isQaFeedback,
             qaContentId,
             fromRatingKey,
-            diagnosis
+            diagnosis,
+            forceLogin,
+            isSmoothGame
         )
         if (requestCode != null) {
             (context as Activity).startActivityForResult(intent, requestCode)
@@ -1951,8 +1984,14 @@ object DirectUtils {
      * @param bbsId, 为空时搜索全范围的内容，不为空时搜索该 bbsId 对应的内容
      */
     @JvmStatic
-    fun directToForumOrUserSearch(context: Context, bbsId: String, entrance: String) {
-        context.startActivity(ForumOrUserSearchActivity.getIntent(context, bbsId, entrance))
+    fun directToForumOrUserSearch(
+        context: Context,
+        bbsId: String,
+        entrance: String,
+        sourceEntrance: String,
+        forumName: String
+    ) {
+        context.startActivity(ForumOrUserSearchActivity.getIntent(context, bbsId, entrance, sourceEntrance, forumName))
     }
 
     @JvmStatic
@@ -1980,12 +2019,19 @@ object DirectUtils {
     }
 
     @JvmStatic
-    fun directToSuggestion(context: Context, type: SuggestType, hiddenHint: String, requestCode: Int?) {
+    fun directToSuggestion(
+        context: Context,
+        type: SuggestType,
+        hiddenHint: String,
+        forceLogin: Boolean = true,
+        requestCode: Int?
+    ) {
         directToSuggestion(
             context = context,
             type = type,
             hiddenHint = hiddenHint,
             suggestHintType = null,
+            forceLogin = forceLogin,
             requestCode = requestCode,
         )
     }
@@ -2010,26 +2056,6 @@ object DirectUtils {
         )
     }
 
-    @JvmStatic
-    fun directToSuggestion(
-        context: Context,
-        type: SuggestType,
-        suggestHintType: String? = null,
-        content: String? = null,
-        game: SimpleGameEntity,
-        platform: String = ""
-    ) {
-        directToSuggestion(
-            context = context,
-            type = type,
-            hiddenHint = "",
-            suggestHintType = suggestHintType,
-            content = content,
-            game = game,
-            platform = platform
-        )
-    }
-
     @JvmStatic
     fun directToQGameHome(context: Context) {
         context.startActivity(QGameHomeWrapperActivity.getIntent(context))
@@ -2051,6 +2077,11 @@ object DirectUtils {
         qqGameId: String
     ) {
 
+        if (activity !is AppCompatActivity || activity.supportFragmentManager.isDestroyed) {
+            ToastUtils.toast("启动QQ小游戏失败，请稍后再试")
+            return
+        }
+
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
             ToastUtils.toast("该游戏仅支持安卓5.0及以上设备")
             return
@@ -2091,4 +2122,42 @@ 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))
+        }
+    }
 }

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

@@ -2,7 +2,10 @@ package com.gh.common.util
 
 import android.content.Context
 import android.os.Build
+import com.gh.gamecenter.R
 import com.gh.gamecenter.common.utils.DialogHelper
+import com.gh.gamecenter.common.utils.SensorsBridge
+import com.gh.gamecenter.common.utils.toResString
 import com.gh.gamecenter.core.utils.EmptyCallback
 import com.gh.gamecenter.feature.entity.ApkEntity
 import com.gh.gamecenter.feature.entity.GameEntity
@@ -21,7 +24,43 @@ object DownloadDialogHelper {
     ) {
         val dialog = retrieveAvailableDialog(gameEntity, apkEntity)
         if (dialog != null) {
-            showDownloadDialog(context, dialog, callback)
+            SensorsBridge.trackGameDownloadDialogShow(
+                gameId = gameEntity.id,
+                gameName = gameEntity.name ?: "",
+                gameType = gameEntity.categoryChinese
+            )
+            DialogHelper.showDialogWithHtmlContent(
+                context,
+                dialog.title,
+                dialog.content,
+                "继续下载",
+                "取消",
+                confirmClickCallback = {
+                    SensorsBridge.trackGameDownloadDialogClick(
+                        buttonName = "继续下载",
+                        gameId = gameEntity.id ,
+                        gameName = gameEntity.name ?: "",
+                        gameType = gameEntity.categoryChinese
+                    )
+                    callback.onCallback()
+                },
+                cancelClickCallback = {
+                    SensorsBridge.trackGameDownloadDialogClick(
+                        buttonName = "取消",
+                        gameId = gameEntity.id ,
+                        gameName = gameEntity.name ?: "",
+                        gameType = gameEntity.categoryChinese
+                    )
+                },
+                touchOutsideCallback = {
+                    SensorsBridge.trackGameDownloadDialogClick(
+                        buttonName = "关闭弹窗",
+                        gameId = gameEntity.id ,
+                        gameName = gameEntity.name ?: "",
+                        gameType = gameEntity.categoryChinese
+                    )
+                }
+            )
         } else {
             callback.onCallback()
         }
@@ -109,14 +148,4 @@ object DownloadDialogHelper {
         return null
     }
 
-    private fun showDownloadDialog(context: Context, dialog: GameEntity.Dialog, callback: EmptyCallback) {
-        DialogHelper.showDialogWithHtmlContent(
-            context,
-            dialog.title,
-            dialog.content,
-            "继续下载",
-            "取消",
-            { callback.onCallback() })
-    }
-
 }

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

@@ -1,63 +0,0 @@
-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()
-                }
-            })
-    }
-
-}