feat: 动态java方法注册

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

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

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

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

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

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

        String CORE_EVENT_GAME_CATEGORY = ""

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

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

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

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

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

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

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

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

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

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

    debugImplementation "com.squareup.leakcanary:leakcanary-android:${leakcanary}"
@ -319,6 +260,7 @@ dependencies {

 //    debugImplementation "com.gu.android:toolargetool:${toolargetool}" // 需要使用调试时才启用
    debugImplementation "com.github.nichbar:WhatTheStack:${whatTheStack}"
+//    debugImplementation "io.github.didi.dokit:dokitx:${dokit}"

    implementation "androidx.multidex:multidex:${multiDex}"
    implementation "androidx.fragment:fragment-ktx:${fragment}"
@ -330,8 +272,7 @@ dependencies {

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

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

    implementation "com.j256.ormlite:ormlite-android:${ormlite}"
    implementation "com.j256.ormlite:ormlite-core:${ormlite}"
@ -354,6 +295,8 @@ dependencies {
    })
    implementation "com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-exo_player2:$gsyVideo"

+//    implementation "androidx.work:work-runtime:${workManager}"
+
    implementation "com.llew.huawei:verifier:${verifier}"

    teaImplementation "com.bytedance.applog:RangersAppLog-Lite-cn:${bytedanceApplog}"
@ -366,18 +309,18 @@ dependencies {

    implementation "com.lg:easyfloat:${easyFloat}"

+    implementation "io.github.florent37:shapeofview:${shapeOfView}"
+
    implementation "com.lg:apksig:${apksig}"

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

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

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

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

    implementation (project(':module_common')) {
        exclude group: 'androidx.swiperefreshlayout'
@ -410,32 +353,12 @@ dependencies {
    implementation(project(':feature:pkg'))
    implementation(project(':feature:oaid'))
    implementation(project(':feature:floating-window'))
-//    implementation(project(':feature:csj_ad'))
+    implementation(project(':feature:csj_ad'))
 //    implementation(project(':feature:beizi_startup_ad'))
    implementation(project(':feature:xapk-installer'))
    implementation(project(':feature:qq_game')) {
        exclude group: 'androidx.swiperefreshlayout'
    }
-    internalImplementation(project(':module_internal_test'))
-
-//    def pushProperty = findProperty('BUILD_PUSH_TYPE')
-//    // 根据BUILD_PUSH_TYPE决定使用哪个推送SDK，目前默认使用极光推送
-//    def pushProject = (pushProperty == null || pushProperty == 'jg')
-//            ? project(':feature:jg_push') : project(':feature:acloud_push')
-//    implementation(pushProject) {
-//        exclude group: 'androidx.swiperefreshlayout'
-//    }
-
-    implementation(project(":va-lib"))
-    implementation(project(':va-main')) {
-        exclude group: 'androidx.swiperefreshlayout'
-    }
-    debugImplementation "com.bytedance.tools.codelocator:codelocator-core:2.0.3"
-    compileOnly project(":va-core")
-    compileOnly project(":va-plugin-host-lib")
-    implementation project(":va-plugin-host")
-    implementation project(":va-archive")
-
 }

 File propFile = file('sign.properties')
@ -506,13 +429,6 @@ andResGuard {
    // 打开这个开关会合并所有哈希值相同的资源，但请不要过度依赖这个功能去除去冗余资源
    mergeDuplicatedRes = true
    whiteList = [
-            "R.xml.jpush*",
-            "R.drawable.jpush*",
-            "R.layout.jpush*",
-            "R.layout.push*",
-            "R.string.jg*",
-            "R.style.MyDialogStyle",
-            "R.style.JPushTheme",
            "R.drawable.icon",
            "R.drawable.ic_bar_back",
            "R.drawable.toolbar_search_icon",
--- a/app/proguard-rules.txt
+++ b/app/proguard-rules.txt
@ -80,19 +80,15 @@
 ### EasyFloat
 -keep class com.lzf.easyfloat.* {*;}

+### dokit
+-keep class com.didichuxing.** {*;}
+
 ### 广点通SDK
 -dontwarn com.qq.gdt.action.**
 -keep class com.qq.gdt.action.** {*;}
 -keep public class com.tencent.turingfd.sdk.**

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

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

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

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

    @JvmStatic
    fun init(application: Application, channel: String) {
-        GDTAction.setPrivateController(object : PrivateController() {
-            override fun isCanUsePhoneState(): Boolean {
-                return false
-            }
-        })
-
        if (channel == "KS_GDT_GHZS_MC01") {
            GDTAction.init(application, KS_USER_ACTION_SET_ID, KS_APP_SECRET_ID, channel)
        } else {
--- a/app/src/gdt/java/com/gh/gamecenter/provider/FlavorProviderImp.kt
+++ b/app/src/gdt/java/com/gh/gamecenter/provider/FlavorProviderImp.kt
@ -8,7 +8,7 @@ import com.gh.gamecenter.core.provider.IFlavorProvider
 import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.core.utils.TimeUtils
 import com.halo.assistant.HaloApp
-import com.tencent.vasdolly.helper.ChannelReaderUtil
+import com.leon.channel.helper.ChannelReaderUtil

 class FlavorProviderImp : IFlavorProvider {

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

 class FlavorProviderImp : IFlavorProvider {

--- a/app/src/kuaishou/libs/monitorsdk-1.0.13.aar
+++ b/app/src/kuaishou/libs/monitorsdk-1.0.13.aar
--- a/app/src/kuaishou/libs/monitorsdk-1.0.15.aar
+++ b/app/src/kuaishou/libs/monitorsdk-1.0.15.aar
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -11,14 +11,6 @@
        <package android:name="com.lg.vspace" />
    </queries>

-    <!-- 华为/荣耀角标 -->
-    <uses-permission android:name="com.huawei.android.launcher.permission.CHANGE_BADGE "/>
-    <uses-permission android:name="com.hihonor.android.launcher.permission.CHANGE_BADGE" />
-    <!-- vivo角标 -->
-    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
-
-    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"
-        tools:ignore="ScopedStorage" />
    <!-- 允许应用程序访问网络连接 -->
    <uses-permission android:name="android.permission.INTERNET" />
    <!-- 允许应用程序写入外部存储，如SD卡上写文件 -->
@ -86,36 +78,11 @@
        androidx.constraintlayout.compose,
        androidx.compose.ui.test.manifest,
        com.bytedance.sdk.openadsdk,
-        com.bykv.vk.openvk,
-        com.bytedance.tools,
        androidx.compose.ui.tooling.preview,
        com.tencent.qqmini,
        com.tencent.qqmini.minigame.external,
        com.tencent.qqmini.minigame.opensdk,
-        com.tencent.qqmini.union.ad,
-        com.lg.vspace,
-        io.lg.va.common,
-        com.va.floating,
-        com.lg.cloud,
-        com.lg.archive,
-        com.lg.vclient,
-        com.va.realname,
-        com.lg.vspace.flavor,
-        com.lg.update,
-        com.lg.login,
-        com.lg.accelerator,
-        com.lody.virtual,
-        com.lg.core,
-        com.lg.ads,
-        com.lg.common,
-        com.lg.vspace.network,
-        com.lody.virtual.lib.res,
-        com.va.host,
-        com.lg.vspace.plugin.host,
-        com.lg.plugin.constant,
-        com.bytedance.tools.codelocator,
-        org.chickenhook.restrictionbypass,
-        com.lody.virtual.sandhook,com.lg.vspace.common" />
+        com.tencent.qqmini.union.ad" />

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

-    <uses-permission
-        android:name="android.permission.ACCESS_COARSE_LOCATION"
-        tools:node="remove" />
-
    <supports-screens
        android:anyDensity="true"
        android:largeScreens="true"
@ -149,12 +112,10 @@
        android:label="@string/app_name"
        android:largeHeap="true"
        android:networkSecurityConfig="@xml/network_security_config"
-        android:preserveLegacyExternalStorage="true"
-        android:requestLegacyExternalStorage="true"
        android:resizeableActivity="true"
        android:theme="@style/AppCompatTheme.APP"
        tools:replace="android:name,android:allowBackup"
-        tools:targetApi="r">
+        tools:targetApi="n">

        <meta-data
            android:name="EasyGoClient"
@ -227,7 +188,7 @@
            android:screenOrientation="portrait" />

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

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

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

        <activity
@ -346,6 +307,14 @@
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateHidden" />

+        <activity
+            android:name="com.gh.gamecenter.qa.answer.detail.AnswerDetailActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.qa.answer.edit.AnswerEditActivity"
+            android:screenOrientation="portrait" />
+
        <activity
            android:name="com.gh.gamecenter.InfoActivity"
            android:screenOrientation="portrait" />
@ -354,6 +323,10 @@
            android:name=".qa.questions.invite.QuestionsInviteActivity"
            android:screenOrientation="portrait" />

+        <activity
+            android:name="com.gh.gamecenter.qa.myqa.MyAskActivity"
+            android:screenOrientation="portrait" />
+
        <activity
            android:name="com.gh.gamecenter.qa.questions.edit.QuestionEditActivity"
            android:screenOrientation="portrait" />
@ -391,6 +364,10 @@
            android:name="com.gh.gamecenter.qa.article.edit.ArticleEditActivity"
            android:screenOrientation="portrait" />

+        <activity
+            android:name="com.gh.gamecenter.qa.article.MyArticleActivity"
+            android:screenOrientation="portrait" />
+
        <activity
            android:name="com.gh.gamecenter.qa.article.draft.ArticleDraftActivity"
            android:screenOrientation="portrait" />
@ -429,6 +406,10 @@
            android:name="com.gh.gamecenter.history.HistoryActivity"
            android:screenOrientation="portrait" />

+        <activity
+            android:name="com.gh.gamecenter.personalhome.rating.RatingActivity"
+            android:screenOrientation="portrait" />
+
        <activity
            android:name="com.gh.gamecenter.gamedetail.rating.logs.CommentLogsActivity"
            android:screenOrientation="portrait" />
@ -494,13 +475,8 @@
            android:screenOrientation="portrait" />

        <activity
-            android:name=".gamedetail.fuli.kaifu.ServersCalendarManagementActivity"
+            android:name=".qa.answer.draft.AnswerDraftActivity"
            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".gamedetail.fuli.kaifu.ServersSubscribedGameListActivity"
-            android:screenOrientation="portrait" />
-
        <activity
            android:name=".gamedetail.rating.RatingFoldActivity"
            android:screenOrientation="portrait" />
@ -512,6 +488,10 @@
            android:name=".video.poster.PosterEditActivity"
            android:screenOrientation="portrait" />

+        <activity
+            android:name=".video.poster.PosterClipActivity"
+            android:screenOrientation="portrait" />
+
        <activity
            android:name=".forum.detail.ForumDetailActivity"
            android:screenOrientation="portrait" />
@ -617,10 +597,6 @@
            android:name=".game.commoncollection.detail.CommonCollectionDetailActivity"
            android:screenOrientation="portrait" />

-        <activity
-            android:name=".game.commoncollection.detail.CustomCommonCollectionDetailActivity"
-            android:screenOrientation="portrait" />
-
        <activity
            android:name=".gamecollection.detail.GameCollectionDetailActivity"
            android:screenOrientation="portrait" />
@ -712,7 +688,7 @@
            android:screenOrientation="portrait" />

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

        <activity
@ -778,23 +754,9 @@
            android:screenOrientation="portrait" />

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

-        <activity
-            android:name="com.gh.gamecenter.UserAuthActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name="com.gh.gamecenter.SplashAdActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name="com.gh.gamecenter.wrapper.ToolbarWrapperActivity"
-            android:screenOrientation="portrait" />
-
-        <activity android:name=".forum.home.CommunityActivity"
-            android:screenOrientation="portrait"/>

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

-        <service android:name="com.gh.gamecenter.install.InstallService" />
-
        <receiver
            android:name="com.gh.gamecenter.receiver.DownloadReceiver"
            android:exported="false">
@ -870,8 +829,8 @@

        <activity
            android:name="com.gh.common.xapk.XapkInstallReceiver"
-            android:exported="false"
-            android:theme="@style/Theme.Transparent" />
+            android:theme="@style/Theme.Transparent"
+            android:exported="false" />

        <receiver
            android:name="com.gh.gamecenter.receiver.ActivitySkipReceiver"
@ -880,6 +839,7 @@
                <action android:name="com.gh.gamecenter.ACTIVITYSKIP" />
            </intent-filter>
        </receiver>
+
    </application>

 </manifest>
--- a/app/src/main/assets/editor.html
+++ b/app/src/main/assets/editor.html
@ -6,6 +6,8 @@
    <link rel="stylesheet" type="text/css" href="normalize.css">
    <link rel="stylesheet" type="text/css" href="style.css">
    <link rel="stylesheet" type="text/css" href="video-js.min.css">
+<!--    <link rel="stylesheet" href="https://static-web.ghzs.com/website-static/lib/video-js.min.css">--> <!--在web页面播放视频-->
+    <!--<link rel="stylesheet" type="text/css" href="https://resource.ghzs.com/css/halo_app.css">-->
 </head>

 <body style="overflow-x: hidden; word-break: break-all;">
@ -13,5 +15,8 @@
 <script type="text/javascript" src="zepto.min.js"></script>
 <script type="text/javascript" src="rich_editor.js"></script>
 <script type="text/javascript" src="video.min.js"></script>
+<!--<script src="https://static-web.ghzs.com/website-static/lib/video.min.js"></script>--> <!--在web页面播放视频-->
+<!--<script type="text/javascript" src="content.js"></script>-->
+<!--<script type="text/javascript" src="https://resource.ghzs.com/js/halo_app.js"></script>-->
 </body>
 </html>
--- a/app/src/main/assets/lottie/tab_mine.json
+++ b/app/src/main/assets/lottie/tab_mine.json
@ -1 +0,0 @@
-{"v":"5.12.2","fr":60,"ip":0,"op":40,"w":66,"h":66,"nm":"icon_tab_my","ddd":0,"assets":[{"id":"comp_0","nm":"icon","fr":60,"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"highlight","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33.134,34.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.667,"y":0.733},"o":{"x":0.333,"y":0},"t":0,"s":[{"i":[[0,-0.004],[0.493,0],[0,0.004],[-0.493,0]],"o":[[0,0.004],[-0.493,0],[0,-0.004],[0.493,0]],"v":[[0.893,1.488],[0,1.496],[-0.893,1.488],[0,1.483]],"c":true}]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0.267},"t":10,"s":[{"i":[[0,-1.018],[1.793,0],[0,1.018],[-1.793,0]],"o":[[0,1.018],[-1.793,0],[0,-1.018],[1.793,0]],"v":[[2.914,-0.344],[0,1.5],[-2.914,-0.344],[0,-1.5]],"c":true}]},{"i":{"x":0.333,"y":1},"o":{"x":0.667,"y":0},"t":18,"s":[{"i":[[0,-1.181],[1.407,0],[0,1.181],[-1.407,0]],"o":[[0,1.181],[-1.407,0],[0,-1.181],[1.407,0]],"v":[[2.226,-0.341],[0,1.74],[-2.211,-0.341],[0,-1.74]],"c":true}]},{"i":{"x":0.333,"y":1},"o":{"x":0.667,"y":0},"t":26,"s":[{"i":[[0,-0.905],[1.381,0],[0,0.905],[-1.381,0]],"o":[[0,0.905],[-1.381,0],[0,-0.905],[1.381,0]],"v":[[2.5,-0.306],[0,1.333],[-2.5,-0.306],[0,-1.333]],"c":true}]},{"t":32,"s":[{"i":[[0,-1.018],[1.381,0],[0,1.018],[-1.381,0]],"o":[[0,1.018],[-1.381,0],[0,-1.018],[1.381,0]],"v":[[2.5,-0.344],[0,1.5],[-2.5,-0.344],[0,-1.5]],"c":true}]}],"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"color","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"椭圆形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":60,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"body","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,34.204,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-3.866,0],[0,3.866],[3.866,0],[0,-3.866]],"o":[[3.866,0],[0,-3.866],[-3.866,0],[0,3.866]],"v":[[0,4.599],[7,-2.401],[0,-9.401],[-7,-2.401]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0.207,0.359],[2.438,0],[1.189,-2.104],[-0.361,-0.204],[-0.204,0.361],[-1.915,0],[-0.932,-1.613],[-0.359,0.207]],"o":[[-1.198,-2.072],[-2.462,0],[-0.204,0.361],[0.361,0.204],[0.925,-1.638],[1.897,0],[0.207,0.359],[0.359,-0.207]],"v":[[5.848,8.225],[0,4.849],[-5.88,8.282],[-5.596,9.304],[-4.574,9.02],[0,6.349],[4.549,8.976],[5.574,9.25]],"c":true},"ix":2},"nm":"路径 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"合并路径 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.267,0.639,1,0.5,0.241,0.596,1,1,0.216,0.553,1],"ix":9}},"s":{"a":0,"k":[-3.812,-4.384],"ix":5},"e":{"a":0,"k":[6.345,8.129],"ix":6},"t":1,"nm":"color","mn":"ADBE Vector Graphic - G-Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"Union","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":60,"st":0,"ct":1,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":0,"nm":"icon","refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,33,0],"ix":2,"l":2},"a":{"a":0,"k":[33,33,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":0,"s":[100,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":8,"s":[70,70,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":18,"s":[110,110,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":26,"s":[90,90,100]},{"t":32,"s":[100,100,100]}],"ix":6,"l":2}},"ao":0,"w":66,"h":66,"ip":0,"op":60,"st":0,"bm":0}],"markers":[],"props":{}}
--- a/app/src/main/assets/lottie/video.json
+++ b/app/src/main/assets/lottie/video.json
--- a/app/src/main/assets/rich_editor.js
+++ b/app/src/main/assets/rich_editor.js
@ -34,18 +34,18 @@ try {
 var script = document.createElement("script")
 document.body.appendChild(script)
 if (isDebug) {
-    script.src = "https://dev-and-static.ghzs66.com/web/js/halo.js" + "?timestamp=" + Math.round(new Date().getTime() / 1000)
+    script.src = "https://resource.ghzs.com/js/halo_app_test.js" + "?timestamp=" + Math.round(new Date().getTime() / 1000)
 } else {
-    script.src = "https://and-static.ghzs66.com/web/js/halo.js" + "?timestamp=" + Math.round(new Date().getTime() / 1000 / 1000)
+    script.src = "https://resource.ghzs.com/js/halo.js" + "?timestamp=" + Math.round(new Date().getTime() / 1000 / 1000)
 }

 var style = document.createElement("link")
 style.rel = "stylesheet"
 style.type = "text/css"
 if (isDebug) {
-    style.href = "https://dev-and-static.ghzs66.com/web/css/halo.css" + "?timestamp=" + Math.round(new Date().getTime() / 1000)
+    style.href = "https://resource.ghzs.com/css/halo_app_test.css" + "?timestamp=" + Math.round(new Date().getTime() / 1000)
 } else {
-    style.href = "https://and-static.ghzs66.com/web/css/halo.css" + "?timestamp=" + Math.round(new Date().getTime() / 1000 / 1000)
+    style.href = "https://resource.ghzs.com/css/halo.css" + "?timestamp=" + Math.round(new Date().getTime() / 1000 / 1000)
 }

 document.head.appendChild(style)
@ -352,9 +352,9 @@ RE.ImageClickListener = function() {
         var img = imgs[i];
         var imageClassName = img.className;
         if (imageClassName == "image-link"|| img.className == "poster") continue;
-         window.imagelistener.imageArr(img.src);
+         window.NativeCallBack.invokeMethod("imageArr", img.src);
         img.onclick = function() {
-             window.imagelistener.imageClick(this.src);
+            window.NativeCallBack.invokeMethod("imageClick", this.src);
         }
    }
 }
--- a/app/src/main/assets/tab_mine.gif
+++ b/app/src/main/assets/tab_mine.gif
--- a/app/src/main/java/com/gh/ad/AdDelegateHelper.kt
+++ b/app/src/main/java/com/gh/ad/AdDelegateHelper.kt
@ -4,7 +4,6 @@ import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
 import android.content.SharedPreferences
-import android.os.Message
 import android.text.TextUtils
 import android.view.View
 import android.view.ViewGroup
@ -18,7 +17,6 @@ import com.gh.common.exposure.ExposureManager
 import com.gh.common.util.DirectUtils.directToLinkPage
 import com.gh.common.util.LogUtils
 import com.gh.common.util.NewFlatLogUtils.logOpenScreenAdSkip
-import com.gh.common.util.PackageUtils
 import com.gh.gamecenter.BuildConfig
 import com.gh.gamecenter.MainActivity
 import com.gh.gamecenter.R
@ -55,7 +53,7 @@ object AdDelegateHelper {
    private var mCsjAdImpl: ICsjAdProvider? = null
    private var mBeiziAdImpl: IBeiziAdProvider? = null

-    private val mAdConfigList: ArrayList<AdConfig> by lazy { arrayListOf() }
+    private var mAdConfigList: ArrayList<AdConfig>? = null

    private var mSplashAd: AdConfig? = null
    private var mDownloadManagerAd: AdConfig? = null
@ -67,8 +65,7 @@ object AdDelegateHelper {

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

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

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

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

                    // 缓存数据到 SP 供接口请求失败用
                    SPUtils.setString(mAdConfigSp, KEY_CACHE_CONFIG, data.toJson())
@ -130,11 +121,9 @@ object AdDelegateHelper {

                    // 若接口请求失败时，从 SP 里获取上次缓存的数据
                    val cachedConfig: List<AdConfig>? = SPUtils.getString(mAdConfigSp, KEY_CACHE_CONFIG).toObject()
-                    if (cachedConfig != null && mAdConfigList.isEmpty()) {
+                    if (cachedConfig != null) {
                        handleAdConfig(cachedConfig)
                    }
-
-                    callback?.invoke()
                }
            })
    }
@ -157,20 +146,10 @@ object AdDelegateHelper {
     * 处理广告配置
     */
    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" -> {
-                    config.ownerAd?.startAd?.let { it.id = config.ownerAd.id }
-                    mSplashAd = config
-                }
-
+                "halo_launch" -> mSplashAd = config
                "download_manager" -> mDownloadManagerAd = config
                "game_search" -> config.let { mGameSearchAdList.add(it) }
                "helper_launch" -> mVGameLaunchAd = config
@ -180,106 +159,9 @@ object AdDelegateHelper {

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

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

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

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

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

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

@ -559,9 +332,7 @@ object AdDelegateHelper {
        val jumpBtn: View = startAdContainer.findViewById(R.id.jumpBtn)
        val jumpDetailBtn: TextView = startAdContainer.findViewById(R.id.jumpDetailBtn)
        val adImage: SimpleDraweeView = startAdContainer.findViewById(R.id.adImage)
-        val icpContainer: View? = startAdContainer.findViewById(R.id.startAdIcpContainer)
        startAdContainer.visibility = View.VISIBLE
-        icpContainer?.visibility = View.VISIBLE
        jumpDetailBtn.text = ad.desc
        jumpDetailBtn.setDrawableEnd(
            AppCompatResources.getDrawable(
@ -583,17 +354,6 @@ object AdDelegateHelper {
                (if (linkEntity.type != null) linkEntity.type else "")!!,
                (if (linkEntity.link != null) linkEntity.link else "")!!
            )
-            SensorsBridge.trackEvent(
-                "SplashAdOwnSkip",
-                "splash_ad_id",
-                ad.id,
-                "link_type",
-                linkEntity.type ?: "",
-                "link_id",
-                linkEntity.link ?: "",
-                "link_text",
-                linkEntity.text ?: ""
-            )
        }
        val sources: MutableList<ExposureSource> = ArrayList()
        sources.add(ExposureSource("开屏广告", ad.id))
@ -601,19 +361,7 @@ object AdDelegateHelper {
        ExposureManager.log(event)
        if (ad.button) {
            jumpDetailBtn.setOnClickListener { v: View ->
-                val linkEntity = ad.jump
-                directToLinkPage(v.context, linkEntity, "(启动广告)", "", event)
-                SensorsBridge.trackEvent(
-                    "SplashAdOwnClick",
-                    "splash_ad_id",
-                    ad.id,
-                    "link_type",
-                    linkEntity.type ?: "",
-                    "link_id",
-                    linkEntity.link ?: "",
-                    "link_text",
-                    linkEntity.text ?: ""
-                )
+                directToLinkPage(v.context, ad.jump, "(启动广告)", "", event)
                v.postDelayed({
                    handler.removeMessages(MainActivity.COUNTDOWN_AD)
                    hideCallback.invoke()
@ -624,17 +372,13 @@ object AdDelegateHelper {
        } else {
            LogUtils.logStartAd("start_ads", ad)
        }
-        SPUtils.setLong(Constants.SP_LAST_SPLASH_AD_SHOW_TIME, System.currentTimeMillis())
-        val msg = Message.obtain()
-        msg.what = MainActivity.COUNTDOWN_AD
-        msg.obj = ad
-        handler.sendMessageDelayed(msg, 1000)
+        handler.sendEmptyMessageDelayed(MainActivity.COUNTDOWN_AD, 1000)
    }

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

    /**
-     * 获取第三方 Banner 广告
+     * 获取 Banner 广告
     */
-    fun requestThirdPartyBannerAd(
+    fun requestBannerAd(
        fragment: Fragment,
        containerView: ViewGroup,
        ad: AdConfig.ThirdPartyAd,
--- a/app/src/main/java/com/gh/ad/LaunchAdImpl.kt
+++ b/app/src/main/java/com/gh/ad/LaunchAdImpl.kt
@ -1,44 +0,0 @@
-package com.gh.ad
-
-import android.content.Context
-import android.view.View
-import android.view.ViewGroup
-
-import androidx.fragment.app.Fragment
-
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.common.utils.goneIf
-import com.gh.gamecenter.core.utils.DisplayUtils
-import com.gh.gamecenter.core.utils.SPUtils
-import com.lg.vspace.ui.launcher.ILaunchAd
-
-@Route(path = RouteConsts.provider.vaAd, name = "畅玩启动页广告")
-class LaunchAdImpl : ILaunchAd {
-    override fun init(context: Context?) {
-    }
-
-    override fun requestAd(fragment: Fragment, container: ViewGroup, maskView: View) {
-        if (AdDelegateHelper.shouldShowHelperLaunchAd()) {
-            val launchAd = AdDelegateHelper.vGameLaunchAd
-            val showThirdPartyAd = launchAd?.displayRule?.adSource == AdDelegateHelper.AD_TYPE_SDK
-            val thirdPartyAd = launchAd?.thirdPartyAd
-            if (showThirdPartyAd && thirdPartyAd != null) {
-                AdDelegateHelper.requestThirdPartyBannerAd(
-                    fragment,
-                    container,
-                    thirdPartyAd,
-                    DisplayUtils.getScreenWidthInDp(fragment.requireActivity()),
-                ) { isSuccess ->
-                    maskView.goneIf(!isSuccess)
-                    if (isSuccess) {
-                        SPUtils.setLong(Constants.SP_LAST_HELPER_LAUNCH_AD_SHOW_TIME, System.currentTimeMillis())
-                    }
-                }
-            }
-        }
-    }
-
-
-}
--- a/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt
+++ b/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt
@ -44,7 +44,7 @@ import org.json.JSONObject
 import java.io.File

 // TODO: 移动到module_bbs模块
-abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> constructor() : ToolBarActivity(),
+abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarActivity(),
    KeyboardHeightObserver, UploadVideoListener {

    lateinit var mRichEditor: RichEditor
@ -233,7 +233,7 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> constructor(
        mKeyboardHeightProvider = KeyboardHeightProvider(this)
        mRichEditor.post { mKeyboardHeightProvider?.start() }
        mRichEditor.enableForceDark(DarkModeUtils.isDarkModeOn(this))
-        mRichEditor.setEditorBackgroundColor(R.color.ui_surface.toColor(this))
+        mRichEditor.setEditorBackgroundColor(R.color.background_white.toColor(this))
        mRichEditor.setEditorFontColor(if (mIsDarkModeOn) Color.parseColor("#C2C2C2") else Color.parseColor("#4A4A4A"))
        // 防止个别手机在Js里无法获取粘贴内容
        mRichEditor.addJavascriptInterface(OnPasteListener(), "onPasteListener")
@ -797,9 +797,9 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> constructor(

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

--- a/app/src/main/java/com/gh/base/BaseRichEditorViewModel.kt
+++ b/app/src/main/java/com/gh/base/BaseRichEditorViewModel.kt
@ -12,13 +12,13 @@ import androidx.lifecycle.MediatorLiveData
 import androidx.lifecycle.MutableLiveData
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment
-import com.gh.gamecenter.common.entity.ErrorEntity
-import com.gh.gamecenter.common.retrofit.BiResponse
 import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.core.runOnUiThread
 import com.gh.gamecenter.core.utils.MD5Utils
 import com.gh.gamecenter.core.utils.ToastUtils
+import com.gh.gamecenter.common.entity.ErrorEntity
+import com.gh.gamecenter.common.retrofit.BiResponse
 import com.gh.gamecenter.entity.ForumDetailEntity
 import com.gh.gamecenter.entity.LocalVideoEntity
 import com.gh.gamecenter.entity.QuoteCountEntity
@ -38,10 +38,6 @@ import okhttp3.ResponseBody
 import retrofit2.HttpException
 import java.io.File
 import java.io.FileOutputStream
-import java.util.*
-import kotlin.collections.ArrayList
-import kotlin.collections.HashMap
-import kotlin.collections.LinkedHashMap
 import kotlin.collections.set

 // TODO: 移动到module_bbs模块
@ -61,6 +57,7 @@ abstract class BaseRichEditorViewModel(application: Application) : AndroidViewMo
    val TITLE_MIN_LENGTH = 6
    val MIN_TEXT_LENGTH = 6
    val MAX_TEXT_LENGTH = 10000
+    val FILE_HOST = "file:///"
    var id = ""//视频标记
    var videoId = ""//更改封面视频id
    val quoteCountEntity = QuoteCountEntity()//数据上报用
@ -127,15 +124,8 @@ abstract class BaseRichEditorViewModel(application: Application) : AndroidViewMo
                    }
                    val map = LinkedHashMap<String, String>()
                    for (key in imageUrlMap.keys) {
-                        // 文件格式为 HEIC 时，使用经 OSS 转码的图片作为预览图片
-                        if (FileUtils.getFileMimeType(getApplication(), key.decodeURI())?.lowercase(Locale.CHINA)?.contains("heic") == true) {
-                            val transformedImgUrl = ImageUtils.getIdealImageUrl(imageUrlMap[key], 5000) ?: ""
-                            map[MD5Utils.getUrlMD5(key)] = transformedImgUrl
-                            mapImages[transformedImgUrl.decodeURI()] = imageUrlMap[key] ?: ""
-                        } else {
-                            map[MD5Utils.getUrlMD5(key)] = imageUrlMap[key] ?: ""
-                            mapImages[TextUtils.htmlEncode(key).decodeURI()] = imageUrlMap[key] ?: ""
-                        }
+                        map[MD5Utils.getUrlMD5(key)] = FILE_HOST + key.decodeURI()
+                        mapImages[TextUtils.htmlEncode(key).decodeURI()] = imageUrlMap[key] ?: ""
                    }
                    chooseImagesUploadSuccess.value = map
                }
--- a/app/src/main/java/com/gh/base/DownloadToolbarActivity.kt
+++ b/app/src/main/java/com/gh/base/DownloadToolbarActivity.kt
@ -46,7 +46,7 @@ abstract class DownloadToolbarActivity : ToolBarActivity() {

    override fun inflateMenu(res: Int) {
        super.inflateMenu(res)
-        if (!getBoolean(Constants.SP_TEENAGER_MODE) && showDownloadMenu()) {
+        if (showDownloadMenu()) {
            createDownloadMenu(res)
        }
    }
@ -60,7 +60,7 @@ abstract class DownloadToolbarActivity : ToolBarActivity() {
        }
        val downloadMenuView = mActionMenuView.menu.findItem(R.id.menu_download).actionView
        mDownloadCountHint = downloadMenuView?.findViewById(R.id.menu_download_count_hint)
-        mDownloadCountHint?.typeface = Typeface.createFromAsset(assets, Constants.DIN_FONT_PATH)
+        mDownloadCountHint?.typeface = Typeface.createFromAsset(assets, "fonts/d_din_bold_only_number.ttf")
    }

    override fun onMenuItemClick(item: MenuItem?): Boolean {
--- a/app/src/main/java/com/gh/base/GlobalActivityLifecycleObserver.kt
+++ b/app/src/main/java/com/gh/base/GlobalActivityLifecycleObserver.kt
@ -4,30 +4,20 @@ import android.app.Activity
 import android.app.Application
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.alibaba.android.arouter.launcher.ARouter
-import com.gh.ad.AdDelegateHelper
 import com.gh.common.util.FloatingBackViewManager
 import com.gh.common.xapk.XapkInstaller
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.SingletonWebActivity
 import com.gh.gamecenter.SkipActivity
-import com.gh.gamecenter.SplashAdActivity
 import com.gh.gamecenter.SplashScreenActivity
 import com.gh.gamecenter.authorization.AuthorizationActivity
 import com.gh.gamecenter.common.base.GlobalActivityManager
-import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.utils.PackageFlavorHelper
-import com.gh.gamecenter.core.provider.IPushProvider
-import com.gh.gamecenter.feedback.view.suggest.SuggestionActivity
-import com.gh.gamecenter.login.view.LoginActivity
 import com.gh.vspace.VHelper
 import com.halo.assistant.HaloApp
-import com.lg.vspace.ui.launcher.LaunchActivity

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

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

    override fun onActivityStarted(activity: Activity) {
        GlobalActivityManager.currentActivity = activity
-        activityCount ++
-        if (activityCount == 1 && isFromBackgroundToForeground) {
-            if (AdDelegateHelper.shouldShowStartUpAd(true)
-                && !HaloApp.getInstance().isSkippingThirdParty
-                && activity !is SplashScreenActivity
-                && activity !is SkipActivity
-                && activity !is AuthorizationActivity
-                && activity !is SplashAdActivity
-                && activity !is SuggestionActivity
-            ) {
-                activity.startActivity(SplashAdActivity.getIntent(activity))
-            }
-            isFromBackgroundToForeground = false
-        }
-
-        if (activityCount == 1) {
-            // 清除桌面角标
-            if (activity !is SplashScreenActivity && activity !is AuthorizationActivity) {
-                val pushProvider = ARouter.getInstance().build(RouteConsts.provider.push).navigation() as? IPushProvider
-                pushProvider?.cleanBadgeNumber(activity.applicationContext)
-            }
-        }
    }

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

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

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

    override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {
--- a/app/src/main/java/com/gh/common/DefaultJsApi.kt
+++ b/app/src/main/java/com/gh/common/DefaultJsApi.kt
@ -45,6 +45,7 @@ import com.gh.gamecenter.login.user.LoginTag
 import com.gh.gamecenter.login.user.UserManager
 import com.gh.gamecenter.login.user.UserRepository
 import com.gh.gamecenter.login.utils.LoginHelper
+import com.gh.gamecenter.login.utils.QuickLoginHelper
 import com.gh.gamecenter.login.view.LoginActivity
 import com.gh.gamecenter.personalhome.border.AvatarBorderActivity
 import com.gh.gamecenter.setting.SettingBridge
@ -68,14 +69,9 @@ class DefaultJsApi(
    val entrance: String = "",
    private var mFragment: Fragment? = null,
    private var mBbsId: String? = "",
-    private var mOriginUrl: String? = "",
-    private val mForumName: String? = ""
+    private var mOriginUrl: String?= "",
 ) {

-    companion object {
-        private const val SOURCE_ENTRANCE = "webView"
-    }
-
    private var mLoginHandler: CompletionHandler<Any>? = null
    private var mDownloadWatcher: DataWatcher? = null // 下载观察者
    private var mDownloadUrlSet: HashSet<String>? = null // 下载的 url 集合
@ -129,12 +125,12 @@ class DefaultJsApi(

    @JavascriptInterface
    fun login(msg: Any) {
-//        if (SPUtils.getBoolean(Constants.SP_HAS_GET_PHONE_INFO) || NetworkUtils.isOpenMobileData(context)) {
-//            QuickLoginHelper.startLogin(context, "浏览器")
-//        } else {
+        if (SPUtils.getBoolean(Constants.SP_HAS_GET_PHONE_INFO) || NetworkUtils.isOpenMobileData(context)) {
+            QuickLoginHelper.startLogin(context, "浏览器")
+        } else {
            val intent = LoginActivity.getIntent(context, "浏览器")
            context.startActivity(intent)
-//        }
+        }
    }

    @JavascriptInterface
@ -219,7 +215,7 @@ class DefaultJsApi(
        runOnUiThread {
            // 若畅玩列表中安装了，优先启动畅玩游戏
            if (VHelper.isInstalled(packageName)) {
-                VHelper.validateVSpaceBeforeAction(context, packageName, null) {
+                if (!VHelper.showDialogIfVSpaceIsNeeded(context, "", "", "", "")) {
                    VHelper.launch(context, packageName)
                }
            } else {
@ -234,14 +230,7 @@ class DefaultJsApi(

        val context = CurrentActivityHolder.getCurrentActivity()

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

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

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

@ -328,11 +310,6 @@ class DefaultJsApi(
        return HaloApp.getInstance().gid
    }

-    @JavascriptInterface
-    fun getOaid(msg: Any): String {
-        return HaloApp.getInstance().oaid
-    }
-
    @JavascriptInterface
    fun showIncompatibleVersionDialog(msg: Any) {
        DialogHelper.showUpgradeDialog(context)
@ -408,7 +385,7 @@ class DefaultJsApi(

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

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

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

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

@ -772,7 +750,6 @@ class DefaultJsApi(
        var status: String = "" // DOWNLOADING, PAUSED, DOWNLOADED, ERROR, UNKNOWN
    ) {
        companion object {
-
            fun fromDownloadEntity(downloadEntity: DownloadEntity): SimpleDownloadEntity {
                val status: String = when (downloadEntity.status) {
                    add,
--- a/app/src/main/java/com/gh/common/DefaultUrlHandler.kt
+++ b/app/src/main/java/com/gh/common/DefaultUrlHandler.kt
@ -15,6 +15,9 @@ import com.gh.common.util.DirectUtils.directToLegacyVideoDetail
 import com.gh.common.util.DirectUtils.directToLinkPage
 import com.gh.common.util.DirectUtils.directToQa
 import com.gh.common.util.PackageUtils
+import com.gh.gamecenter.LibaoDetailActivity
+import com.gh.gamecenter.MainActivity
+import com.gh.gamecenter.NewsDetailActivity
 import com.gh.gamecenter.WebActivity
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.constant.EntranceConsts
@ -31,12 +34,12 @@ import com.gh.gamecenter.core.utils.ToastUtils
 import com.gh.gamecenter.entity.ActivityLabelEntity
 import com.gh.gamecenter.entity.SubjectRecommendEntity
 import com.gh.gamecenter.entity.VideoLinkEntity
+import com.gh.gamecenter.eventbus.EBSkip
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.gh.gamecenter.feature.utils.PlatformUtils
+import com.gh.gamecenter.fragment.MainWrapperFragment
 import com.gh.gamecenter.gamecollection.publish.GameCollectionEditActivity
-import com.gh.gamecenter.libao.LibaoDetailActivity
-import com.gh.gamecenter.newsdetail.NewsDetailActivity
 import com.gh.gamecenter.qa.BbsType
 import com.gh.gamecenter.qa.video.publish.VideoPublishActivity
 import com.gh.gamecenter.subject.SubjectActivity
@ -48,8 +51,8 @@ import java.nio.charset.Charset
 object DefaultUrlHandler {

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

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

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

                "real_name" -> DirectUtils.directToRealName(context)

@ -176,7 +178,7 @@ object DefaultUrlHandler {
                    if ("articles" == type) {
                        DirectUtils.directToCommunityArticle(
                            context, typeId, communityId,
-                            entrance, "文章链接", sourceEntrance
+                            entrance, "文章链接"
                        )
                    }
                }
@ -244,22 +246,24 @@ object DefaultUrlHandler {
                        act,
                        paginationType,
                        fieldId,
-                        sectionName,
-                        sourceEntrance = sourceEntrance
+                        sectionName
                    )
                }
                EntranceConsts.HOST_VIDEO_DETAIL -> {
-                    DirectUtils.directToVideoDetail(context, id, entrance, path, sourceEntrance)
+                    DirectUtils.directToVideoDetail(context, id, entrance, path)
                }
                EntranceConsts.HOST_VIDEO_SINGLE -> {
                    val referer = uri.getQueryParameter("referer") ?: ""
                    DirectUtils.directToVideoDetail(
                        context, id, VideoDetailContainerViewModel.Location.SINGLE_VIDEO.value,
-                        false, "", entrance, "", if (TextUtils.isEmpty(referer)) "" else referer, sourceEntrance
+                        false, "", entrance, "", if (TextUtils.isEmpty(referer)) "" else referer
                    )
                }
                EntranceConsts.HOST_VIDEO_STREAMING_HOME -> {
-                    DirectUtils.directToHomeVideoTab(context)
+                    intent = Intent(context, MainActivity::class.java)
+                    intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
+                    intent.putExtra(MainActivity.SWITCH_TO_VIDEO, true)
+                    context.startActivity(intent)
                }
                EntranceConsts.HOST_VIDEO_STREAMING_DESC -> {
                    directToGameDetailVideoStreaming(context, id, entrance)
@ -321,7 +325,7 @@ object DefaultUrlHandler {
                            val linkData = Base64.decode(dataString, Base64.DEFAULT)
                            val linkDataString = String(linkData, Charset.defaultCharset())
                            val le = gson.fromJson(linkDataString, LinkEntity::class.java)
-                            directToLinkPage(context, le, entrance, sourceEntrance, "")
+                            directToLinkPage(context, le, entrance, "")
                        }
                    } catch (e: Exception) {
                        e.printStackTrace()
@ -360,8 +364,9 @@ object DefaultUrlHandler {
                }

                EntranceConsts.HOST_FORUM -> {
+                    val position = uri.getQueryParameter(EntranceConsts.KEY_POSITION)?.toInt()

-                    DirectUtils.directToHomeCommunityTab(context)
+                    DirectUtils.directToForum(context, position ?: 0)
                }

                EntranceConsts.HOST_UPLOAD_VIDEO_NEW -> {
@ -498,11 +503,13 @@ object DefaultUrlHandler {

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

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

@ -557,7 +564,7 @@ object DefaultUrlHandler {
        }

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

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

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

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

    @JvmStatic
-    fun transformNewNormalScheme(context: Context, url: String, entrance: String, sourceEntrance: String): Boolean {
+    fun transformNewNormalScheme(context: Context, url: String, entrance: String): Boolean {
        val uri = Uri.parse(url)
        if (uri.host == "www.ghzs666.com"
            || uri.host == "www.ghzs.com"
@ -678,7 +684,7 @@ object DefaultUrlHandler {
                        val articleId = splits[2].substring(7)
                        DirectUtils.directToCommunityArticle(
                            context, articleId, "",
-                            entrance, "文章链接", sourceEntrance
+                            entrance, "文章链接"
                        )
                    }
                    //https://m.ghzs666.com/article/文章ID
@ -698,7 +704,7 @@ object DefaultUrlHandler {
                    //https://m.ghzs666.com/bbs/video-视频ID
                    splits.size >= 3 && splits[1] == "bbs" && splits[2].startsWith("video-") -> {
                        val videoId = splits[2].substring(6)
-                        DirectUtils.directToVideoDetail(context, videoId, entrance, sourceEntrance)
+                        DirectUtils.directToVideoDetail(context, videoId, entrance)
                    }
                    else -> return false
                }
--- a/app/src/main/java/com/gh/common/FixedRateJobHelper.kt
+++ b/app/src/main/java/com/gh/common/FixedRateJobHelper.kt
@ -2,16 +2,17 @@ package com.gh.common

 import com.gh.common.exposure.ExposureManager
 import com.gh.common.filter.RegionSettingHelper
+import com.gh.common.util.AdHelper
 import com.gh.common.videolog.VideoRecordUtils
 import com.gh.download.DownloadDataHelper
 import com.gh.gamecenter.common.loghub.LoghubUtils
 import com.gh.gamecenter.common.retrofit.Response
+import com.gh.gamecenter.common.utils.doOnMainProcessOnly
 import com.gh.gamecenter.common.utils.tryCatchInRelease
 import com.gh.gamecenter.core.runOnUiThread
 import com.gh.gamecenter.entity.TimeEntity
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.halo.assistant.HaloApp
-import com.lightgame.utils.Utils
 import io.reactivex.schedulers.Schedulers
 import kotlin.concurrent.fixedRateTimer

@ -25,6 +26,7 @@ object FixedRateJobHelper {

    private const val DOWNLOAD_HEARTBEAT_PERIOD: Long = 60 * 1000L
    private const val DOWNLOAD_HEARTBEAT_SHEET_PERIOD: Long = 15 * 1000L
+    private const val STARTUP_AD: Long = 30 * 60 * 1000L

    private var mExecuteCount: Int = 0

@ -32,56 +34,58 @@ object FixedRateJobHelper {

    @JvmStatic
    fun begin() {
-        // 时间检查，每15秒检查一次
-        fixedRateTimer("Global-Fixed-Rate-Timer", initialDelay = 100, period = CHECKER_PERIOD) {
-            val elapsedTime = mExecuteCount * CHECKER_PERIOD
-            // 时间校对，10分钟一次
-            if (elapsedTime % TIME_PERIOD == 0L) {
-                RetrofitManager.getInstance().api.time
-                    .subscribeOn(Schedulers.io())
-                    .subscribe(object : Response<TimeEntity>() {
-                        override fun onResponse(response: TimeEntity?) {
-                            val serverTime = response?.time
-                            serverTime?.let {
-                                timeDeltaBetweenServerAndClient = it * 1000 - System.currentTimeMillis()
+        doOnMainProcessOnly {
+            // 时间检查，每15秒检查一次
+            fixedRateTimer("Global-Fixed-Rate-Timer", initialDelay = 100, period = CHECKER_PERIOD) {
+                val elapsedTime = mExecuteCount * CHECKER_PERIOD
+                // 时间校对，10分钟一次
+                if (elapsedTime % TIME_PERIOD == 0L) {
+                    RetrofitManager.getInstance().api.time
+                        .subscribeOn(Schedulers.io())
+                        .subscribe(object : Response<TimeEntity>() {
+                            override fun onResponse(response: TimeEntity?) {
+                                val serverTime = response?.time
+                                serverTime?.let {
+                                    timeDeltaBetweenServerAndClient = it * 1000 - System.currentTimeMillis()
+                                }
                            }
-                        }
-                    })
-            }
-
-            // 提交曝光数据
-            if (elapsedTime % EXPOSURE_PERIOD == 0L) {
-                ExposureManager.commitSavedExposureEvents(true)
-            }
-
-            // 分片检测下载进度
-            if (elapsedTime % DOWNLOAD_HEARTBEAT_SHEET_PERIOD == 0L) {
-                tryCatchInRelease {
-                    val upload = (mExecuteCount * CHECKER_PERIOD) % DOWNLOAD_HEARTBEAT_PERIOD == 0L
-                    DownloadDataHelper.uploadDownloadHeartbeat(upload)
+                        })
                }
-            }

-            // 提交普通 loghub 数据
-            if (elapsedTime % LOGHUB_PERIOD == 0L) {
-                runOnUiThread {
-                    LoghubUtils.commitSavedLoghubEvents(true)
+                // 提交曝光数据
+                if (elapsedTime % EXPOSURE_PERIOD == 0L) {
+                    ExposureManager.commitSavedExposureEvents(true)
                }
-            }

-            // 更新游戏屏蔽信息
-            if (elapsedTime % REGION_SETTING_PERIOD == 0L) {
-                if (HaloApp.getInstance().isRunningForeground) {
-                    RegionSettingHelper.getRegionSetting()
+                // 分片检测下载进度
+                if (elapsedTime % DOWNLOAD_HEARTBEAT_SHEET_PERIOD == 0L) {
+                    tryCatchInRelease {
+                        val upload = (mExecuteCount * CHECKER_PERIOD) % DOWNLOAD_HEARTBEAT_PERIOD == 0L
+                        DownloadDataHelper.uploadDownloadHeartbeat(upload)
+                    }
                }
-            }

-            // 提交视频浏览记录数据
-            if (elapsedTime % VIDEO_RECORD_PERIOD == 0L) {
-                VideoRecordUtils.commitVideoRecord()
-            }
+                // 提交普通 loghub 数据
+                if (elapsedTime % LOGHUB_PERIOD == 0L) {
+                    runOnUiThread {
+                        LoghubUtils.commitSavedLoghubEvents(true)
+                    }
+                }

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

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

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

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

-class DownloadChainBuilder {
+class ChainBuilder {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 import android.annotation.SuppressLint;
-import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.os.Build;
 import android.preference.PreferenceManager;
@ -9,6 +8,7 @@ import android.text.TextUtils;

 import androidx.annotation.Nullable;

+import com.gh.common.util.AdHelper;
 import com.gh.common.util.PackageHelper;
 import com.gh.common.util.PackageUtils;
 import com.gh.gamecenter.BuildConfig;
@ -22,34 +22,28 @@ import com.gh.gamecenter.common.utils.EnvHelper;
 import com.gh.gamecenter.core.utils.GsonUtils;
 import com.gh.gamecenter.core.utils.SPUtils;
 import com.gh.gamecenter.core.utils.UrlFilterUtils;
-import com.gh.gamecenter.entity.AppEntity;
 import com.gh.gamecenter.entity.GameGuidePopupEntity;
 import com.gh.gamecenter.entity.NewApiSettingsEntity;
 import com.gh.gamecenter.entity.NewSettingsEntity;
-import com.gh.gamecenter.entity.VNewSetting;
 import com.gh.gamecenter.entity.VSetting;
+import com.gh.gamecenter.feature.entity.NewsEntity;
 import com.gh.gamecenter.feature.entity.SettingsEntity;
 import com.gh.gamecenter.feature.entity.SimulatorEntity;
-import com.gh.gamecenter.feature.utils.ContentBlockedHelper;
-import com.gh.gamecenter.receiver.PackageChangeBroadcastReceiver;
 import com.gh.gamecenter.retrofit.RetrofitManager;
-import com.gh.gamecenter.retrofit.service.VApiService;
 import com.gh.vspace.VHelper;
 import com.halo.assistant.HaloApp;
+import com.lightgame.utils.Utils;

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

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

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

 public class Config {
@ -66,7 +60,8 @@ public class Config {
    public static final String WEIBO_APPKEY = BuildConfig.WEIBO_APPKEY;
    public static final String QUICK_LOGIN_APPID = BuildConfig.QUICK_LOGIN_APPID;
    public static final String QUICK_LOGIN_APPKEY = BuildConfig.QUICK_LOGIN_APPKEY;
-    public static final String URL_ARTICLE = "www.ghzs666.com/article/"; // ghzs/ghzs666 统一
+    // http://www.ghzs666.com/article/${articleId}.html
+    public static final String URL_ARTICLE = "http://www.ghzs666.com/article/"; // ghzs/ghzs666 统一

    private static final String SETTINGS_KEY = "settingsKey";

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

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

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

    /**
@ -103,11 +135,76 @@ public class Config {
        return mNewApiSettingsEntity.getInstall().getVpnRequired().getShouldShowVpnOption();
    }

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

-        PackageHelper.refreshList();
+        // 更新设置状态
+        mSettingsEntity.showArticleEntrance();
+        mSettingsEntity.showCommunityEntrance();
+
+        // 加载完设置后刷新下
+        PackageHelper.initList();
    }

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

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

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

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

+                        if (!getPreferences().getBoolean(Config.FIX_DOWNLOAD_KEY, false) && Config.isShow()) {
+                            getPreferences().edit().putBoolean(Config.FIX_DOWNLOAD_KEY, true).apply();
+                        }
                        if (!SPUtils.getBoolean(Constants.SP_TEENAGER_MODE)) {
                            EventBus.getDefault().post(new EBReuse("Refresh"));
                        }
@ -333,7 +403,6 @@ public class Config {
                });

        refreshVSettingEntity();
-        getNewSetting();

        RetrofitManager.getInstance()
                .getApi().getGameGuidePopup(Build.MANUFACTURER, Build.VERSION.RELEASE, Build.MODEL, channel, BuildConfig.VERSION_NAME)
@ -391,36 +460,8 @@ 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());
-                            }
-
-                            // 更新安装列表是否开启的配置
-//                            if (mNewApiSettingsEntity.getInstalledComplianceSwitch() != null) {
-//                                PackageHelper.INSTANCE.updateIsGetInstalledPackagesApiAgreedRequired(mNewApiSettingsEntity.getInstalledComplianceSwitch());
-//                            } else {
-//                                PackageHelper.INSTANCE.updateIsGetInstalledPackagesApiAgreedRequired(false);
-//                            }
-
-                            // 更新包名监听是否开启
-                            if (mNewApiSettingsEntity.isPackageObserveEnable()) {
-                                observePackageChange(mNewApiSettingsEntity.getPackageObserveActions());
-                            }
                        }
                    });
        }
    }
-
-    public static void observePackageChange(NewApiSettingsEntity.PackageObserveActions packageObserveActions) {
-        PackageChangeBroadcastReceiver receiver = new PackageChangeBroadcastReceiver(packageObserveActions);
-        IntentFilter intentFilter = new IntentFilter();
-        intentFilter.addAction(packageObserveActions.getAdd());
-        intentFilter.addAction(packageObserveActions.getRem());
-        intentFilter.addAction(packageObserveActions.getRep());
-        intentFilter.addDataScheme("package");
-        HaloApp.getInstance().registerReceiver(receiver, intentFilter);
-    }
-
 }
--- a/app/src/main/java/com/gh/common/databind/AddKaiFuBindingAdapter.kt
+++ b/app/src/main/java/com/gh/common/databind/AddKaiFuBindingAdapter.kt
@ -120,13 +120,13 @@ object AddKaiFuBindingAdapter {
    @BindingAdapter("kaiFuTextColor", "kaiFuTextPosition")
    fun kaiFuTextColor(view: EditText, dataMark: Int, position: Int) {
        if (dataMark == 1 && view.id == R.id.kaifu_add_time || dataMark == 2 && view.id == R.id.kaifu_add_first_name || dataMark == 3 && view.id == R.id.kaifu_add_server_name || dataMark == 4) {
-            view.setTextColor(ContextCompat.getColor(view.context, R.color.secondary_red))
-            view.setHintTextColor(ContextCompat.getColor(view.context, R.color.secondary_red))
+            view.setTextColor(ContextCompat.getColor(view.context, R.color.theme_red))
+            view.setHintTextColor(ContextCompat.getColor(view.context, R.color.theme_red))
        } else if (position == 0) {
            view.setTextColor(ContextCompat.getColor(view.context, R.color.hint))
            view.setHintTextColor(ContextCompat.getColor(view.context, R.color.hint))
        } else {
-            view.setTextColor(ContextCompat.getColor(view.context, R.color.text_primary))
+            view.setTextColor(ContextCompat.getColor(view.context, R.color.text_title))
            view.setHintTextColor(ContextCompat.getColor(view.context, R.color.hint))
        }
    }
--- a/app/src/main/java/com/gh/common/databind/BindingAdapters.java
+++ b/app/src/main/java/com/gh/common/databind/BindingAdapters.java
@ -3,20 +3,27 @@ package com.gh.common.databind;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
+import android.graphics.Typeface;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.TextUtils;
 import android.text.style.ForegroundColorSpan;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;

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

+import com.facebook.drawee.view.SimpleDraweeView;
 import com.gh.common.chain.BrowserInstallHandler;
-import com.gh.common.chain.DownloadChainBuilder;
-import com.gh.common.chain.DownloadChainHandler;
+import com.gh.common.chain.CertificationHandler;
+import com.gh.common.chain.ChainBuilder;
+import com.gh.common.chain.ChainHandler;
 import com.gh.common.chain.CheckDownloadHandler;
 import com.gh.common.chain.CheckStoragePermissionHandler;
 import com.gh.common.chain.DownloadDialogHelperHandler;
@ -39,6 +46,7 @@ import com.gh.common.util.DialogUtils;
 import com.gh.common.util.GameUtils;
 import com.gh.common.util.GameViewUtils;
 import com.gh.common.util.LogUtils;
+import com.gh.common.util.NewsUtils;
 import com.gh.common.util.PackageInstaller;
 import com.gh.common.util.PackageLauncher;
 import com.gh.common.util.PackageUtils;
@ -49,18 +57,26 @@ import com.gh.download.server.BrowserInstallHelper;
 import com.gh.gamecenter.DownloadManagerActivity;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.WebActivity;
+import com.gh.gamecenter.common.baselist.LoadStatus;
+import com.gh.gamecenter.common.callback.OnViewClickListener;
 import com.gh.gamecenter.common.entity.LinkEntity;
+import com.gh.gamecenter.common.eventbus.EBReuse;
 import com.gh.gamecenter.common.utils.DarkModeUtils;
 import com.gh.gamecenter.common.utils.ExtensionsKt;
-import com.gh.gamecenter.common.utils.FileUtils;
 import com.gh.gamecenter.common.utils.ImageUtils;
 import com.gh.gamecenter.common.utils.NewFlatLogUtils;
 import com.gh.gamecenter.common.utils.SensorsBridge;
+import com.gh.gamecenter.common.view.DrawableView;
+import com.gh.gamecenter.core.utils.DisplayUtils;
 import com.gh.gamecenter.core.utils.MtaHelper;
+import com.gh.gamecenter.core.utils.NumberUtils;
 import com.gh.gamecenter.core.utils.ToastUtils;
+import com.gh.gamecenter.databinding.KaifuDetailItemRowBinding;
 import com.gh.gamecenter.feature.entity.ApkEntity;
+import com.gh.gamecenter.feature.entity.CommunityVideoEntity;
 import com.gh.gamecenter.feature.entity.GameEntity;
 import com.gh.gamecenter.feature.entity.PluginLocation;
+import com.gh.gamecenter.feature.entity.ServerCalendarEntity;
 import com.gh.gamecenter.feature.entity.TagStyleEntity;
 import com.gh.gamecenter.feature.entity.TestEntity;
 import com.gh.gamecenter.feature.exposure.ExposureEvent;
@ -69,21 +85,149 @@ 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;

-import kotlin.collections.CollectionsKt;
-
 /**
 * 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));
@ -92,19 +236,117 @@ public class BindingAdapters {
        }
    }

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

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

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

        // 恢复DialogFragment
        restoreDialogFragment(progressBar);

        // 判断是否显示按钮
        if (gameEntity != null
+                && Config.isShowDownload(gameEntity.getId())
                && !"光环助手".equals(gameEntity.getName())) {
            progressBar.setVisibility(View.VISIBLE);
        } else {
@ -134,9 +376,13 @@ public class BindingAdapters {
            switch (progressBar.getButtonStyle()) {
                case DOWNLOADING_PLUGIN:
                case DOWNLOADING_NORMAL:
-                    Intent intent = DownloadManagerActivity.getDownloadMangerIntent(v.getContext(),
-                            gameEntity.getApk().isEmpty() ? "" : gameEntity.getApk().get(0).getUrl(), entrance);
-                    v.getContext().startActivity(intent);
+                    if (gameEntity.isVGame()) {
+                        v.getContext().startActivity(VDownloadManagerActivity.getIntent(v.getContext(), true));
+                    } else {
+                        Intent intent = DownloadManagerActivity.getDownloadMangerIntent(v.getContext(),
+                                gameEntity.getApk().get(0).getUrl(), entrance);
+                        v.getContext().startActivity(intent);
+                    }
                    break;
                case NONE:
                    Utils.toast(v.getContext(), "该游戏已关闭下载");
@ -159,7 +405,7 @@ public class BindingAdapters {
                                }
                            }

-                            DownloadChainBuilder builder = new DownloadChainBuilder();
+                            ChainBuilder builder = new ChainBuilder();
                            builder.addHandler(new UnsupportedFeatureHandler());
                            builder.addHandler(new GamePermissionHandler());
                            builder.addHandler(new CheckStoragePermissionHandler());
@ -167,37 +413,28 @@ public class BindingAdapters {
                            builder.addHandler(new BrowserInstallHandler());
                            builder.addHandler(new PackageCheckHandler());
                            builder.addHandler(new DownloadDialogHelperHandler());
+                            builder.addHandler(new CertificationHandler());
                            builder.addHandler(new VersionNumberHandler());
                            builder.addHandler(new LandPageAddressHandler());
                            builder.addHandler(new OverseaDownloadHandler());
                            builder.addHandler(new CheckDownloadHandler());

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

-                            builder.setProcessEndCallback((asVGame, isSubscribe) -> {
+                            builder.setProcessEndCallback(o -> {
                                DownloadDialog.showDownloadDialog(
                                        v.getContext(),
                                        gameEntity,
@ -206,13 +443,9 @@ public class BindingAdapters {
                                        location + ":" + gameEntity.getName());
                                return null;
                            });
-                            final DownloadChainHandler chainHandler = builder.buildHandlerChain();
+                            final ChainHandler chainHandler = builder.buildHandlerChain();
                            if (chainHandler != null) {
-                                chainHandler.handleRequest(
-                                        v.getContext(),
-                                        gameEntity,
-                                        GameUtils.shouldPerformAsVGame(gameEntity)
-                                );
+                                chainHandler.handleRequest(v.getContext(), gameEntity);
                            }
                        }
                    }
@ -221,18 +454,11 @@ public class BindingAdapters {
                    if (gameEntity.getApk().size() == 1) {
                        //启动模拟器游戏
                        if (SimulatorGameManager.isSimulatorGame(gameEntity)) {
-                            DownloadEntity downloadEntity = SimulatorGameManager.findDownloadEntityByUrl(gameEntity.getApk().isEmpty() ? "" : gameEntity.getApk().get(0).getUrl());
+                            DownloadEntity downloadEntity = SimulatorGameManager.findDownloadEntityByUrl(gameEntity.getApk().get(0).getUrl());
                            if (downloadEntity != null) {
                                File file = new File(downloadEntity.getPath());
                                if (!file.exists()) {
-                                    download(v.getContext(),
-                                            progressBar,
-                                            gameEntity,
-                                            traceEvent,
-                                            false,
-                                            false,
-                                            entrance,
-                                            location);
+                                    download(v.getContext(), progressBar, gameEntity, traceEvent, false, entrance, location);
                                    return;
                                }

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

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

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

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

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

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

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

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

-    public static void setGameName(TextView view, GameEntity game, boolean isShowPlatform) {
+    public static void isRefreshing(SwipeRefreshLayout layout, LoadStatus status) {
+        if (status != LoadStatus.INIT_LOADING && status != LoadStatus.LIST_LOADING) {
+            layout.setRefreshing(false);
+        }
+    }
+
+    public static void setGameName(TextView view, GameEntity game, boolean isShowPlatform, @Nullable Boolean isShowSuffix) {
+        if (isShowSuffix == null) isShowSuffix = true; // 默认显示
        String gameName;
        if (isShowPlatform && game.getApk().size() > 0) {
-            gameName = String.format("%s - %s", game.getName(),
+            gameName = String.format("%s - %s", !isShowSuffix ? game.getNameWithoutSuffix() : game.getName(),
                    PlatformUtils.getInstance(view.getContext()).getPlatformName(
                            game.getApk().get(0).getPlatform()));
            if (!gameName.equals((String) view.getTag(R.string.tag_game_name_id))) {
@ -560,7 +827,7 @@ public class BindingAdapters {
                view.setTag(R.string.tag_game_name_id, gameName);
            }
        } else {
-            gameName = game.getName();
+            gameName = !isShowSuffix ? game.getNameWithoutSuffix() : game.getName();
            if (gameName != null && !gameName.equals((String) view.getTag(R.string.tag_game_name_id))) {
                view.setText(gameName);
                view.setTag(R.string.tag_game_name_id, gameName);
@ -569,6 +836,30 @@ public class BindingAdapters {

    }

+    public static void setCommunityImage(SimpleDraweeView imageView, List<String> images, List<CommunityVideoEntity> videos) {
+        if (videos.size() > 0) {
+            CommunityVideoEntity videoEntity = videos.get(0);
+            ImageUtils.display(imageView, videoEntity.getPoster());
+            imageView.setVisibility(View.VISIBLE);
+        } else if (images.size() > 0) {
+            imageView.setVisibility(View.VISIBLE);
+            ImageUtils.display(imageView, images.get(0));
+        } else {
+            imageView.setVisibility(View.GONE);
+        }
+    }
+
+    public static void setCommunityVideoDuration(TextView mVideoDuration, List<CommunityVideoEntity> videos) {
+        if (videos != null && videos.size() > 0) {
+            CommunityVideoEntity videoEntity = videos.get(0);
+            mVideoDuration.setBackground(DrawableView.getOvalDrawable(R.color.black_alpha_50, 999F));
+            mVideoDuration.setText(videoEntity.getDuration());
+            mVideoDuration.setVisibility(View.VISIBLE);
+        } else {
+            mVideoDuration.setVisibility(View.GONE);
+        }
+    }
+
    public static void setGameTags(TextView view, List<TagStyleEntity> tags, int maxTags) {
        if (tags == null) {
            view.setText("");
@ -596,4 +887,16 @@ public class BindingAdapters {
        }
        view.setText(span);
    }
+
+    public static void setVideoData(TextView view, int count) {
+        if (count > 0) {
+            ExtensionsKt.setDrawableStart(view, ContextCompat.getDrawable(view.getContext(), R.drawable.ic_video_data_up), null, null);
+            view.setTextColor(ContextCompat.getColor(view.getContext(), R.color.text_EA3333));
+            view.setText(count + "");
+        } else {
+            ExtensionsKt.removeDrawable(view);
+            view.setTextColor(ContextCompat.getColor(view.getContext(), R.color.text_subtitleDesc));
+            view.setText("-");
+        }
+    }
 }
--- a/app/src/main/java/com/gh/common/dialog/ApplyModeratorDialogFragment.kt
+++ b/app/src/main/java/com/gh/common/dialog/ApplyModeratorDialogFragment.kt
@ -49,7 +49,7 @@ class ApplyModeratorDialogFragment : BaseDialogFragment() {
                requireContext(),
                startText.length,
                startText.length + mGroupNumber.length,
-                R.color.text_theme,
+                R.color.theme_font,
                true
            ) {
                DirectUtils.directToQqGroup(
--- a/app/src/main/java/com/gh/common/dialog/CertificationDialog.kt
+++ b/app/src/main/java/com/gh/common/dialog/CertificationDialog.kt
@ -0,0 +1,221 @@
+package com.gh.common.dialog
+
+import android.annotation.SuppressLint
+import android.app.Activity
+import android.app.Dialog
+import android.content.Context
+import android.content.Intent
+import android.graphics.Color
+import android.graphics.Paint
+import android.graphics.drawable.ColorDrawable
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.CheckBox
+import android.widget.TextView
+import androidx.appcompat.app.AppCompatActivity
+import com.gh.gamecenter.common.avoidcallback.AvoidOnResultManager
+import com.gh.gamecenter.common.avoidcallback.Callback
+import com.gh.gamecenter.common.constant.Constants
+import com.gh.common.util.*
+import com.gh.gamecenter.R
+import com.gh.gamecenter.ShellActivity
+import com.gh.gamecenter.common.callback.ConfirmListener
+import com.gh.gamecenter.common.constant.EntranceConsts
+import com.gh.gamecenter.common.utils.SensorsBridge
+import com.gh.gamecenter.core.utils.GsonUtils
+import com.gh.gamecenter.core.utils.SPUtils
+import com.gh.gamecenter.feature.entity.AuthDialogEntity
+import com.gh.gamecenter.feature.entity.AuthDialogLevel
+import com.gh.gamecenter.feature.entity.GameEntity
+import com.gh.gamecenter.login.user.UserManager
+import com.google.gson.reflect.TypeToken
+import com.halo.assistant.fragment.user.UserInfoEditFragment
+import com.lightgame.utils.AppManager
+
+class CertificationDialog(
+    context: Context,
+    private val authDialogEntity: AuthDialogEntity,
+    val gameEntity: GameEntity,
+    val listener: ConfirmListener
+) :
+    Dialog(context, R.style.GhAlertDialog) {
+
+    private lateinit var view: View
+    private lateinit var detailedDesTv: TextView
+    private lateinit var noRemindAgainCb: CheckBox
+    private lateinit var actionLeftTv: TextView
+    private lateinit var actionRightTv: TextView
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+        view = LayoutInflater.from(context).inflate(R.layout.dialog_sertification, null)
+        setContentView(view)
+        detailedDesTv = view.findViewById(R.id.detailedDesTv)
+        noRemindAgainCb = view.findViewById(R.id.noRemindAgainCb)
+        actionLeftTv = view.findViewById(R.id.actionLeftTv)
+        actionRightTv = view.findViewById(R.id.actionRightTv)
+
+        detailedDesTv.paint.flags = Paint.UNDERLINE_TEXT_FLAG
+        detailedDesTv.paint.isAntiAlias = true
+
+        detailedDesTv.setOnClickListener {
+            DirectUtils.directToWebView(context, authDialogEntity.link)
+        }
+
+        when (authDialogEntity.level) {
+            AuthDialogLevel.MUST_PASS.value -> {
+                actionLeftTv.text = "暂不下载"
+                actionRightTv.text = "去实名认证"
+                noRemindAgainCb.visibility = View.GONE
+                actionLeftTv.setOnClickListener {
+                    SensorsBridge.trackEvent("VerificationPopupClick", "button_name", actionLeftTv.text.toString())
+                    dismiss()
+                }
+                actionRightTv.setOnClickListener {
+                    SensorsBridge.trackEvent("VerificationPopupClick", "button_name", actionRightTv.text.toString())
+                    if (UserManager.getInstance().isLoggedIn) {
+                        gotoAuthPage()
+                    } else {
+                        gotoLoginPage()
+                    }
+                }
+            }
+            AuthDialogLevel.ALWAYS_HINT.value -> {
+                actionLeftTv.text = "去实名认证"
+                actionRightTv.text = "继续下载"
+                noRemindAgainCb.visibility = View.GONE
+                actionLeftTv.setOnClickListener {
+                    SensorsBridge.trackEvent("VerificationPopupClick", "button_name", actionLeftTv.text.toString())
+                    if (UserManager.getInstance().isLoggedIn) {
+                        gotoAuthPage()
+                    } else {
+                        gotoLoginPage()
+                    }
+                }
+                actionRightTv.setOnClickListener {
+                    SensorsBridge.trackEvent("VerificationPopupClick", "button_name", actionRightTv.text.toString())
+                    listener.onConfirm()
+                    dismiss()
+                }
+            }
+            AuthDialogLevel.OPTIONAL_HINT.value -> {
+                actionLeftTv.text = "去实名认证"
+                actionRightTv.text = "继续下载"
+                noRemindAgainCb.visibility = View.VISIBLE
+                actionLeftTv.setOnClickListener {
+                    SensorsBridge.trackEvent("VerificationPopupClick", "button_name", actionLeftTv.text.toString())
+                    if (noRemindAgainCb.isChecked) {
+                        SPUtils.setBoolean(gameEntity.id, true)
+                    }
+                    if (UserManager.getInstance().isLoggedIn) {
+                        gotoAuthPage()
+                    } else {
+                        gotoLoginPage()
+                    }
+                }
+                actionRightTv.setOnClickListener {
+                    SensorsBridge.trackEvent("VerificationPopupClick", "button_name", actionRightTv.text.toString())
+                    if (noRemindAgainCb.isChecked) {
+                        SPUtils.getBoolean(gameEntity.id, true)
+                    }
+                    listener.onConfirm()
+                    dismiss()
+                }
+            }
+        }
+
+        SensorsBridge.trackEvent(
+            "VerificationDialogShow",
+            "game_id",
+            gameEntity.id,
+            "game_name",
+            gameEntity.name ?: "",
+            "game_type",
+            gameEntity.categoryChinese
+        )
+    }
+
+    //跳转登录页面
+    private fun gotoLoginPage() {
+        val currentActivity = AppManager.getInstance().currentActivity() ?: return
+
+        CheckLoginUtils.checkLogin(
+            currentActivity as AppCompatActivity,
+            null, true, "实名认证弹窗"
+        ) {
+            if (UserManager.getInstance().isAuth) {
+                listener.onConfirm()
+                dismiss()
+            }
+        }
+    }
+
+    //跳转实名认证页面
+    private fun gotoAuthPage() {
+        val currentActivity = AppManager.getInstance().currentActivity() ?: return
+
+        AvoidOnResultManager.getInstance(currentActivity as AppCompatActivity)
+            .startForResult(
+                ShellActivity.getIntent(
+                    context,
+                    ShellActivity.Type.REAL_NAME_INFO,
+                ).apply {
+                    putExtra(EntranceConsts.KEY_GAME_ID, gameEntity.id)
+                }, object : Callback {
+                    override fun onActivityResult(resultCode: Int, data: Intent?) {
+                        if (resultCode == Activity.RESULT_OK && data != null) {
+                            val isAuthSuccess =
+                                data.getBooleanExtra(UserInfoEditFragment.AUTH_SUCCESS, false)
+                            if (isAuthSuccess) {
+                                listener.onConfirm()
+                                dismiss()
+                            }
+                        }
+                    }
+                })
+    }
+
+
+    companion object {
+        @JvmStatic
+        fun showCertificationDialog(context: Context, game: GameEntity, listener: ConfirmListener) {
+            //1.先判断是否登录 是执行2 否执行3
+            //2.判断是否实名认证 是终止 否执行3
+            //3.判断是否需要弹出认证弹窗接口
+            if (UserManager.getInstance().isLoggedIn) {
+                if (UserManager.getInstance().isAuth) {//已实名认证
+                    listener.onConfirm()
+                } else {
+                    authDialog(context, game, listener)
+                }
+            } else {
+                authDialog(context, game, listener)
+            }
+        }
+
+        @SuppressLint("CheckResult")
+        private fun authDialog(context: Context, game: GameEntity, listener: ConfirmListener) {
+            var authDialog: AuthDialogEntity? = null
+            if (game.authDialog != null) {
+                authDialog = game.authDialog
+            }
+            if (authDialog == null) {
+                val datas = SPUtils.getString(Constants.SP_AUTH_DIALOG)
+                val type = object : TypeToken<List<AuthDialogEntity>>() {}.type
+                val authDialogs = GsonUtils.gson.fromJson<List<AuthDialogEntity>>(datas, type)
+                if (!authDialogs.isNullOrEmpty()) {
+                    authDialog = authDialogs.find { it.gameCategory == game.category }
+                }
+            }
+            val isCloseAuthDialog = SPUtils.getBoolean(game.id, false)
+            if (authDialog != null && (authDialog.level != AuthDialogLevel.OPTIONAL_HINT.value || !isCloseAuthDialog)) {
+                val dialog = CertificationDialog(context, authDialog, game, listener)
+                dialog.show()
+            } else {
+                listener.onConfirm()
+            }
+        }
+    }
+}
--- a/app/src/main/java/com/gh/common/dialog/GameOffServiceDialogFragment.kt
+++ b/app/src/main/java/com/gh/common/dialog/GameOffServiceDialogFragment.kt
@ -23,7 +23,6 @@ class GameOffServiceDialogFragment : BaseDialogFragment() {

    private var mDialog: GameEntity.Dialog? = null
    private var mBinding: DialogGameOffServiceBinding? = null
-    private var mCallback: (() -> Unit)? = null

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
@ -45,7 +44,6 @@ class GameOffServiceDialogFragment : BaseDialogFragment() {
                titleTv.text = title
                contentTv.text = HtmlCompat.fromHtml(content, HtmlCompat.FROM_HTML_MODE_LEGACY)
                okTv.setOnClickListener {
-                    mCallback?.invoke()
                    dismissAllowingStateLoss()
                }

@ -62,10 +60,11 @@ class GameOffServiceDialogFragment : BaseDialogFragment() {
                        if (index == notEmptySite.size - 1) bottomMargin = 8F.dip2px()
                    }
                    siteTv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14F)
-                    siteTv.setTextColor(R.color.text_theme.toColor(requireContext()))
+                    siteTv.setTextColor(R.color.theme_font.toColor(requireContext()))
                    siteTv.text = site.text
                    siteTv.paintFlags = siteTv.paintFlags or Paint.UNDERLINE_TEXT_FLAG
                    siteTv.setOnClickListener {
+                        //                    MtaHelper.onEvent("游戏下载状态按钮", getKey(), site.text)
                        DirectUtils.directToWebView(requireContext(), site.url, "(关闭下载弹窗)")
                        dismissAllowingStateLoss()
                    }
@ -84,13 +83,11 @@ class GameOffServiceDialogFragment : BaseDialogFragment() {
        const val KEY_DIALOG = "dialog"

        @JvmStatic
-        fun getInstance(dialog: GameEntity.Dialog, callback: (() -> Unit)? = null) =
-            GameOffServiceDialogFragment().apply {
-                arguments = Bundle().apply {
-                    putParcelable(KEY_DIALOG, dialog)
-                }
-                mCallback = callback
+        fun getInstance(dialog: GameEntity.Dialog) = GameOffServiceDialogFragment().apply {
+            arguments = Bundle().apply {
+                putParcelable(KEY_DIALOG, dialog)
            }
+        }
    }

 }
--- a/app/src/main/java/com/gh/common/dialog/ManagerAllFilesPermissionDialogFragment.kt
+++ b/app/src/main/java/com/gh/common/dialog/ManagerAllFilesPermissionDialogFragment.kt
@ -1,68 +0,0 @@
-package com.gh.common.dialog
-
-import android.content.Intent
-import android.net.Uri
-import android.os.Build
-import android.os.Bundle
-import android.os.Environment
-import android.provider.Settings
-import android.view.Gravity
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.annotation.RequiresApi
-import androidx.appcompat.app.AppCompatActivity
-import com.gh.gamecenter.common.databinding.DialogAlertDefaultBinding
-import com.lightgame.dialog.BaseDialogFragment
-
-@RequiresApi(Build.VERSION_CODES.R)
-class ManagerAllFilesPermissionDialogFragment : BaseDialogFragment() {
-    private val mBinding by lazy { DialogAlertDefaultBinding.inflate(layoutInflater) }
-    private var mCallBack: (() -> Unit)? = null
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        return mBinding.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        mBinding.run {
-            titleTv.text = "请求权限"
-            titleTv.gravity = Gravity.CENTER
-            contentTv.text = "需要所有文件访问权限，请打开权限设置页面"
-
-            confirmTv.setOnClickListener {
-                val intent = Intent().apply {
-                    action = Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION
-                    data = Uri.fromParts("package", requireContext().packageName, null)
-                }
-                requireActivity().startActivityForResult(intent, REQUEST_CODE)
-            }
-            cancelTv.setOnClickListener {
-                dismissAllowingStateLoss()
-            }
-        }
-    }
-
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        super.onActivityResult(requestCode, resultCode, data)
-        if (requestCode == REQUEST_CODE && Environment.isExternalStorageManager()) {
-            mCallBack?.invoke()
-            dismissAllowingStateLoss()
-        }
-    }
-
-    companion object {
-        const val REQUEST_CODE = 1000
-
-        @JvmStatic
-        fun show(activity: AppCompatActivity, callback: () -> Unit) {
-            ManagerAllFilesPermissionDialogFragment().apply {
-                mCallBack = callback
-            }.show(
-                activity.supportFragmentManager,
-                ManagerAllFilesPermissionDialogFragment::class.java.name
-            )
-        }
-    }
-}
--- a/app/src/main/java/com/gh/common/dialog/NewPrivacyPolicyDialogFragment.kt
+++ b/app/src/main/java/com/gh/common/dialog/NewPrivacyPolicyDialogFragment.kt
@ -76,7 +76,7 @@ class NewPrivacyPolicyDialogFragment : BaseDialogFragment() {
            contentText.setSpan(object : ClickableSpan() {
                override fun updateDrawState(ds: TextPaint) {
                    super.updateDrawState(ds)
-                    ds.color = ContextCompat.getColor(requireContext(), R.color.text_theme)
+                    ds.color = ContextCompat.getColor(requireContext(), R.color.theme_font)
                    ds.isUnderlineText = false
                }

--- a/app/src/main/java/com/gh/common/dialog/PackageCheckDialogFragment.kt
+++ b/app/src/main/java/com/gh/common/dialog/PackageCheckDialogFragment.kt
@ -19,7 +19,6 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.gh.common.util.DirectUtils
 import com.gh.common.util.LogUtils
-import com.gh.common.util.PackageHelper
 import com.gh.common.util.PackageUtils
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.R
@ -60,7 +59,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
    private val mDuration = 3000
    private var mDisposable: Disposable? = null
    private var mAdapter: PackageCheckAdapter? = null
-    private var mAllInstalledPackages = PackageHelper.getInstalledPackages(HaloApp.getInstance().application, 0)
+    private var mAllInstalledPackages = PackageUtils.getInstalledPackages(HaloApp.getInstance().application, 0)
    var gameEntity: GameEntity? = null
    var callBack: ConfirmListener? = null

@ -126,7 +125,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
                    requireContext(),
                    0,
                    (link.title ?: "").length,
-                    R.color.text_theme,
+                    R.color.theme_font,
                    true
                ) {
                    LogUtils.uploadPackageCheck(
@ -326,7 +325,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() {

    override fun onResume() {
        super.onResume()
-        mAllInstalledPackages = PackageHelper.getInstalledPackages(HaloApp.getInstance().application, 0)
+        mAllInstalledPackages = PackageUtils.getInstalledPackages(HaloApp.getInstance().application, 0)
        gameEntity?.packageDialog?.let {
            if (isAllPackageInstalled(mAllInstalledPackages, it)) {
                callBack?.onConfirm()
@ -364,7 +363,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
    @Subscribe(threadMode = ThreadMode.MAIN)
    fun onEventMainThread(busFour: EBPackage) {
        if (busFour.isInstalledOrUninstalled()) {
-            mAllInstalledPackages = PackageHelper.getInstalledPackages(HaloApp.getInstance().application, 0)
+            mAllInstalledPackages = PackageUtils.getInstalledPackages(HaloApp.getInstance().application, 0)
            mAdapter?.notifyDataSetChanged()
        }
    }
@ -392,10 +391,10 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
                    val isAllInstalled = checkDetectionsInstalled(mAllInstalledPackages, entity.packages)
                    if (isAllInstalled) {
                        holder.binding.statusTv.text = "已安装"
-                        holder.binding.statusTv.setTextColor(ContextCompat.getColor(context, R.color.text_theme))
+                        holder.binding.statusTv.setTextColor(ContextCompat.getColor(context, R.color.theme_font))
                    } else {
                        holder.binding.statusTv.text = "未安装"
-                        holder.binding.statusTv.setTextColor(ContextCompat.getColor(context, R.color.secondary_red))
+                        holder.binding.statusTv.setTextColor(ContextCompat.getColor(context, R.color.theme_red))
                    }
                    holder.binding.statusTv.visibility = View.VISIBLE
                } else {
@ -417,7 +416,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
                return
            }

-            val allInstalledPackages = PackageHelper.getInstalledPackages(HaloApp.getInstance().application, 0)
+            val allInstalledPackages = PackageUtils.getInstalledPackages(HaloApp.getInstance().application, 0)
            if (isAllPackageInstalled(allInstalledPackages, packageDialogEntity)) {
                callBack.onConfirm()
                return
--- a/app/src/main/java/com/gh/common/dialog/PrivacyPolicyDialogFragment.kt
+++ b/app/src/main/java/com/gh/common/dialog/PrivacyPolicyDialogFragment.kt
@ -29,15 +29,6 @@ class PrivacyPolicyDialogFragment : BaseDialogFragment() {
    private var mCallBack: ((isSuccess: Boolean) -> Unit)? = null
    private val mBinding by lazy { DialogPrivacyProtocolBinding.inflate(layoutInflater) }

-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        if (savedInstanceState != null) {
-            dismiss()
-            return
-        }
-    }
-
    override fun onCreateView(
        inflater: LayoutInflater,
        container: ViewGroup?,
@ -68,7 +59,7 @@ class PrivacyPolicyDialogFragment : BaseDialogFragment() {
        skipText.setSpan(object : ClickableSpan() {
            override fun updateDrawState(ds: TextPaint) {
                super.updateDrawState(ds)
-                ds.color = ContextCompat.getColor(requireContext(), R.color.text_theme)
+                ds.color = ContextCompat.getColor(requireContext(), R.color.theme_font)
                ds.isUnderlineText = false
            }

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

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

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

-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        if (savedInstanceState != null) {
-            dismiss()
-            return
-        }
-    }
-
    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
        val binding: DialogReserveBinding = DialogReserveBinding.inflate(layoutInflater, null, false)

--- a/app/src/main/java/com/gh/common/exposure/ExposureUtils.kt
+++ b/app/src/main/java/com/gh/common/exposure/ExposureUtils.kt
@ -27,7 +27,7 @@ object ExposureUtils {
    ): ExposureEvent {
        val gameEntity = entity.copy()
        gameEntity.id = if (entity.id.contains(DownloadEntity.GAME_ID_DIVIDER)) {
-            entity.id.split(DownloadEntity.GAME_ID_DIVIDER).toTypedArray().firstOrNull() ?: ""
+            entity.id.split(DownloadEntity.GAME_ID_DIVIDER).toTypedArray()[0]
        } else {
            entity.id
        }
@ -96,9 +96,9 @@ object ExposureUtils {
    }

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

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

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

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

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

@ -71,6 +75,7 @@ object HistoryHelper {
        historyGame.iconFloat = gameEntity.iconFloat
        historyGame.name = gameEntity.name
        historyGame.tagStyle = gameEntity.tagStyle
+        historyGame.tag = gameEntity.getTag()
        historyGame.subtitle = gameEntity.subtitle
        historyGame.subtitleStyle = gameEntity.subtitleStyle
        return historyGame
@ -104,7 +109,7 @@ object HistoryHelper {
    fun deleteArticleEntity(articleId: String) {
        runOnIoThread {
            tryCatchInRelease {
-                HistoryDatabase.instance.articleDao().deleteArticle(ArticleEntity(_id = articleId))
+                HistoryDatabase.instance.articleDao().deleteArticle(ArticleEntity(id = articleId))
            }
        }
    }
@ -165,9 +170,6 @@ object HistoryHelper {
        articleEntity.images = articleDetailEntity.images
        articleEntity.imagesInfo = articleDetailEntity.imagesInfo
        articleEntity.videos = articleDetailEntity.videos
-        articleEntity.tagActivityName = articleDetailEntity.tagActivityName
-        articleEntity.sections = articleDetailEntity.sections ?: emptyList()
-        articleEntity.type = "community_article"

        return articleEntity
    }
--- a/app/src/main/java/com/gh/common/iinterface/IMultiTab.kt
+++ b/app/src/main/java/com/gh/common/iinterface/IMultiTab.kt
@ -1,10 +0,0 @@
-package com.gh.common.iinterface
-
-import com.gh.gamecenter.entity.MultiTabNav
-
-interface IMultiTab {
-    fun provideMultiTabId(): String
-    fun provideMultiTabName(): String
-    fun provideCurrentTabEntity(): MultiTabNav.LinkMultiTabNav?
-    fun provideLastSelectedPosition(): Int
-}
--- a/app/src/main/java/com/gh/common/iinterface/ISearchToolbarTab.kt
+++ b/app/src/main/java/com/gh/common/iinterface/ISearchToolbarTab.kt
@ -1,10 +0,0 @@
-package com.gh.common.iinterface
-
-import com.gh.gamecenter.entity.BottomTab
-
-interface ISearchToolbarTab {
-    fun onScrollChanged(totalHeight: Int, offset: Int, isDarkModeChanged: Boolean)
-    fun changeAppBarColor(color: Int, pageId: String)
-    fun setSearchStyle(searchStyle: BottomTab.SearchStyle)
-    fun getCurrentTabIndex(): Int?
-}
--- a/app/src/main/java/com/gh/common/iinterface/ISmartRefresh.kt
+++ b/app/src/main/java/com/gh/common/iinterface/ISmartRefresh.kt
@ -1,12 +0,0 @@
-package com.gh.common.iinterface
-
-import com.gh.common.prioritychain.PullDownPushHandler
-import com.gh.gamecenter.entity.PullDownPush
-
-interface ISmartRefresh {
-    fun setSmartRefreshEnabled(isEnable: Boolean)
-    fun finishTwoLevel(action: String)
-    fun finishRefresh()
-    fun popupPullDownPush(finishCallback: () -> Unit)
-    fun setPullDownPush(pullDownPush: PullDownPush?, pullDownPushHandler: PullDownPushHandler?)
-}
--- a/app/src/main/java/com/gh/common/iinterface/ISmartRefreshContent.kt
+++ b/app/src/main/java/com/gh/common/iinterface/ISmartRefreshContent.kt
@ -1,17 +0,0 @@
-package com.gh.common.iinterface
-
-interface ISmartRefreshContent {
-    /**
-     * 启用/关闭 页面滑动
-     * @param isScrollEnabled 是否启用
-     */
-    fun setScrollEnabled(isScrollEnabled: Boolean)
-
-    fun onRefresh()
-
-    /**
-     * 启用/关闭 SwipeRefreshLayout 的下拉刷新
-     * @param isSwipeRefreshEnabled 是否启用
-     */
-    fun setSwipeRefreshEnabled(isSwipeRefreshEnabled: Boolean)
-}
--- a/app/src/main/java/com/gh/common/iinterface/ISuperiorChain.kt
+++ b/app/src/main/java/com/gh/common/iinterface/ISuperiorChain.kt
@ -1,9 +0,0 @@
-package com.gh.common.iinterface
-
-import com.gh.common.prioritychain.PriorityChain
-
-interface ISuperiorChain {
-    fun registerInferiorChain(chain: PriorityChain)
-
-    fun unregisterInferiorChain(chain: PriorityChain)
-}
--- a/app/src/main/java/com/gh/common/prioritychain/AccelerateNotificationHandler.kt
+++ b/app/src/main/java/com/gh/common/prioritychain/AccelerateNotificationHandler.kt
@ -14,7 +14,7 @@ import com.gh.gamecenter.core.utils.DisplayUtils
 import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.databinding.PopupAccelerateNotificationBinding
 import com.gh.gamecenter.feature.entity.GameEntity
-import com.gh.gamecenter.wrapper.MainWrapperViewModel
+import com.gh.gamecenter.fragment.MainWrapperViewModel

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

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

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

    companion object {
--- a/app/src/main/java/com/gh/common/prioritychain/CustomFloatingWindowHandler.kt
+++ b/app/src/main/java/com/gh/common/prioritychain/CustomFloatingWindowHandler.kt
@ -1,82 +0,0 @@
-package com.gh.common.prioritychain
-
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import com.gh.gamecenter.floatingwindow.FloatingWindowEntity
-import com.gh.gamecenter.livedata.Event
-
-class CustomFloatingWindowHandler(priority: Int) : PriorityChainHandler(priority) {
-
-    private val data = arrayListOf<FloatingWindowEntity>()
-
-    private val _showFloatingAction = MutableLiveData<Event<ArrayList<FloatingWindowEntity>>>()
-    val showFloatingAction: LiveData<Event<ArrayList<FloatingWindowEntity>>> = _showFloatingAction
-
-    fun setData(newData: List<FloatingWindowEntity>) {
-        data.clear()
-        data.addAll(newData)
-        doPreProcess()
-    }
-
-    private fun doPreProcess() {
-//        debugOnly {
-//            data.clear()
-//            data.add(
-//                FloatingWindowEntity(
-//                    id = "audire",
-//                    image = "https://jira.shanqu.cc/secure/attachment/57822/57822_image-2023-12-01-17-53-04-492.png",
-//                    link = WelcomeDialogEntity(
-//                        id = null,
-//                        time = null,
-//                        packages = null,
-//                        floatingWindowId = null,
-//                        shouldShowExitAnimation = false
-//                    ),
-//                    pushType = "maiorum",
-//                    expandable = false,
-//                    expandedImage = "fermentum",
-//                    bigPopupNotice = "dignissim"
-//                )
-//            )
-//        }
-
-        if (getStatus() == STATUS_PENDING) {
-            if (data.isNotEmpty()) {
-                updateStatus(STATUS_VALID)
-                process()
-            } else {
-                processNext()
-            }
-        } else {
-            if (data.isNotEmpty()) {
-                updateStatus(STATUS_VALID)
-            } else {
-                updateStatus(STATUS_INVALID)
-            }
-        }
-    }
-
-    override fun onProcess(): Boolean {
-        when (getStatus()) {
-            STATUS_VALID -> {
-                _showFloatingAction.value = Event(data)
-                processNext()
-//                    floatingWindowProvider.showFloatingWindowOnly(
-//                        mFragment!!,
-//                        mRecyclerView!!,
-//                        mWindowList!!,
-//                    ) {
-//                        val welcomeDialog = WelcomeDialogFragment.getInstance(it, true, mFragment)
-//                        welcomeDialog.show(mFragment!!.childFragmentManager, "WelcomeDialog")
-//                    }
-            }
-
-            STATUS_INVALID -> {
-                processNext()
-            }
-        }
-
-        return false
-    }
-
-}
--- a/app/src/main/java/com/gh/common/prioritychain/FloatingWindowHandler.kt
+++ b/app/src/main/java/com/gh/common/prioritychain/FloatingWindowHandler.kt
@ -0,0 +1,86 @@
+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) {
+            preProcess()
+        }
+    }
+
+    fun setView(
+        fragment: BaseLazyFragment,
+        recyclerView: RecyclerView
+    ) {
+        mFragment = fragment
+        mRecyclerView = recyclerView
+
+        if (mWindowList != null) {
+            preProcess()
+        }
+    }
+
+    private fun preProcess() {
+        Utils.log(TAG, "FloatingWindowHandler preProcess windowSize is -> ${mWindowList?.size}")
+
+        if (getStatus() == STATUS_PENDING) {
+            if (!mWindowList.isNullOrEmpty()) {
+                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()
+            }
+        }
+    }
+
+}
--- a/app/src/main/java/com/gh/common/prioritychain/GlobalPriorityChainHelper.kt
+++ b/app/src/main/java/com/gh/common/prioritychain/GlobalPriorityChainHelper.kt
@ -1,263 +0,0 @@
-package com.gh.common.prioritychain
-
-import android.annotation.SuppressLint
-import android.app.Activity
-import android.app.Application.ActivityLifecycleCallbacks
-import android.os.Bundle
-import android.preference.PreferenceManager
-import androidx.fragment.app.FragmentActivity
-import com.gh.common.iinterface.ISuperiorChain
-import com.gh.common.util.CheckLoginUtils
-import com.gh.common.util.PackageUtils
-import com.gh.gamecenter.SplashAdActivity
-import com.gh.gamecenter.SplashScreenActivity
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.entity.SimpleGameEntity
-import com.gh.gamecenter.common.retrofit.BiResponse
-import com.gh.gamecenter.core.AppExecutor
-import com.gh.gamecenter.core.utils.SPUtils
-import com.gh.gamecenter.entity.DialogEntity
-import com.gh.gamecenter.feature.entity.WelcomeDialogEntity
-import com.gh.gamecenter.login.user.UserManager
-import com.gh.gamecenter.retrofit.RetrofitManager
-import com.halo.assistant.HaloApp
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
-
-/**
- * 全局的 APP 优先级弹窗链管理器
- *
- * 弹窗的优先级为
- * 启动跳转(-101) > 更新弹窗(-100) > 隐私政策弹窗(-99) > 消息通知权限弹窗(0) > 预约弹窗(1) > 启动弹窗(2)
- */
-object GlobalPriorityChainHelper : ISuperiorChain {
-
-    private val api = RetrofitManager.getInstance().api
-    private var inferiorChain: PriorityChain? = null
-    private val mainChain: PriorityChain by lazy { PriorityChain { inferiorChain?.start() } }
-
-    /**
-     * 当前 activity 是否使用于应用全局弹窗的弹出
-     * 排除启动页和其它非 FragmentActivity
-     */
-    fun isThisActivityValid(activity: Activity?): Boolean {
-        return activity is FragmentActivity
-                && !activity.isFinishing
-                && activity !is SplashScreenActivity
-                && activity !is SplashAdActivity
-    }
-
-    /**
-     * 预启动所有的优先级弹窗管理链
-     */
-    fun preStart(withSpecialDelay: Boolean) {
-        val launchRedirectHandler = LaunchRedirectHandler(-101)
-        val updateDialogHandler = UpdateDialogHandler(-100)
-        val privacyPolicyDialogHandler = PrivacyPolicyDialogHandler(-99)
-        val notificationPermissionDialogHandler = NotificationPermissionDialogHandler(0)
-        val reserveDialogHandler = ReserveDialogHandler(1)
-        val welcomeDialogHandler = WelcomeDialogHandler(2)
-
-        mainChain.addHandler(launchRedirectHandler)
-        mainChain.addHandler(updateDialogHandler)
-        mainChain.addHandler(privacyPolicyDialogHandler)
-        mainChain.addHandler(welcomeDialogHandler)
-        mainChain.addHandler(reserveDialogHandler)
-        mainChain.addHandler(notificationPermissionDialogHandler)
-
-        launchRedirectHandler.doPreProcess()
-        updateDialogHandler.doPreProcess()
-
-        // 首次启动延迟 300ms，保证请求首次启动时已经获取到了 GID 、 OAID 等标记
-        val requestDelay = if (withSpecialDelay) 300L else 0L
-        AppExecutor.uiExecutor.executeWithDelay({
-            requestOpeningDialogData(welcomeDialogHandler, privacyPolicyDialogHandler)
-            requestReserveDialogData(reserveDialogHandler)
-        }, requestDelay)
-    }
-
-    /**
-     * 启动优先级弹窗管理链的执行
-     */
-    fun start() {
-        if (mainChain.isHandlerQueueEmpty()) return
-
-        mainChain.start()
-
-        observeLifecycle()
-    }
-
-    private fun observeLifecycle() {
-        HaloApp.getInstance().registerActivityLifecycleCallbacks(object : ActivityLifecycleCallbacks {
-            override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
-                // do nothing
-            }
-
-            override fun onActivityStarted(activity: Activity) {
-                // do nothing
-            }
-
-            override fun onActivityResumed(activity: Activity) {
-                // 优先级弹窗管理链为空时取消注册，避免无用调用
-                if (mainChain.isHandlerQueueEmpty()) {
-                    HaloApp.getInstance().unregisterActivityLifecycleCallbacks(this)
-                } else {
-                    resume()
-                }
-            }
-
-            override fun onActivityPaused(activity: Activity) {
-                // do nothing
-            }
-
-            override fun onActivityStopped(activity: Activity) {
-                // do nothing
-            }
-
-            override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {
-                // do nothing
-            }
-
-            override fun onActivityDestroyed(activity: Activity) {
-                // do nothing
-            }
-        })
-    }
-
-    /**
-     * 恢复链的处理
-     */
-    fun resume() {
-        mainChain.resume()
-    }
-
-    /**
-     * 添加新的 handler 到优先级弹窗管理链 (插队！)
-     */
-    fun queueNewHandler(handler: PriorityChainHandler) {
-        if (mainChain.isHandlerQueueEmpty()) {
-            observeLifecycle()
-        }
-
-        mainChain.addHandler(handler)
-    }
-
-    /**
-     * 请求首页启动弹窗相关的数据并执行相关 handler 的 preProcess
-     */
-    @SuppressLint("CheckResult")
-    private fun requestOpeningDialogData(
-        welcomeDialogHandler: WelcomeDialogHandler,
-        privacyPolicyDialogHandler: PrivacyPolicyDialogHandler
-    ) {
-        val sp = PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance())
-
-        val lastId = SPUtils.getString(sp, Constants.SP_LAST_OPENING_ID, "")
-        val lastTime = SPUtils.getLong(sp, Constants.SP_LAST_OPENING_TIME, 0)
-        val openType = if (HaloApp.getInstance().isNewForThisVersion) "first" else "not_first_time"
-
-        api.getOpeningDialog(HaloApp.getInstance().channel, lastId, lastTime, openType)
-            .subscribeOn(Schedulers.io())
-            .subscribe(object : BiResponse<DialogEntity>() {
-                override fun onSuccess(data: DialogEntity) {
-                    var welcomeDialogEntity: WelcomeDialogEntity? = null
-                    var privacyPolicyDialogEntity: DialogEntity.PrivacyPolicyEntity? = null
-
-                    // 全新安装忽略隐私弹窗
-                    if (data.privacyPolicyDialog != null) {
-                        val id = data.privacyPolicyDialog.id
-                        val lastAcceptedId = SPUtils.getString(Constants.SP_LAST_ACCEPTED_PRIVACY_DIALOG_ID, "")
-                        if (HaloApp.getInstance().isBrandNewInstall) {
-                            SPUtils.setString(Constants.SP_LAST_ACCEPTED_PRIVACY_DIALOG_ID, id)
-                        } else {
-                            if (id != lastAcceptedId) {
-                                privacyPolicyDialogEntity = data.privacyPolicyDialog
-                            }
-                        }
-                    }
-
-//                    debugOnly {
-//                        privacyPolicyDialogEntity = DialogEntity.PrivacyPolicyEntity(
-//                            "5f6f5f3d9d9b4e0001c3b3a5",
-//                            "privacy_policy",
-//                            "ONCE",
-//                            "INFORM",
-//                            "隐私政策",
-//                            1601116800000)
-//                    }
-
-                    privacyPolicyDialogHandler.doPreProcess(privacyPolicyDialogEntity)
-
-                    // 类型为游戏时判断是否本地已安装该游戏，已安装不弹弹窗
-                    if (data.welcomeDialog != null) {
-                        welcomeDialogEntity = data.welcomeDialog
-
-                        if (data.welcomeDialog.type == "game") {
-                            if (data.welcomeDialog.packages != null) {
-                                for (packageName in data.welcomeDialog.packages!!) {
-                                    if (PackageUtils.isInstalled(HaloApp.getInstance(), packageName)) {
-                                        welcomeDialogEntity = null
-                                        break
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                    welcomeDialogHandler.doPreProcess(welcomeDialogEntity)
-                }
-
-                override fun onFailure(exception: Exception) {
-                    privacyPolicyDialogHandler.doPreProcess(null)
-                    welcomeDialogHandler.doPreProcess(null)
-                }
-            })
-    }
-
-    /**
-     * 请求预约弹窗相关的数据
-     */
-    @SuppressLint("CheckResult")
-    private fun requestReserveDialogData(reserveDialogHandler: ReserveDialogHandler) {
-//        debugOnly {
-//            reserveDialogHandler.doPreProcess(arrayListOf(SimpleGameEntity(
-//                "5f6f5f3d9d9b4e0001c3b3a5",
-//                "5f6f5f3d9d9b4e0001c3b3a5",
-//                "https://and-static.ghzs.com/image/game/icon/2022/11/18/63772b0d398daaa7c5067298.png",
-//                "5f6f5f3d9d9b4e0001c3b3a5",
-//            )))
-//            return
-//        }
-
-        if (CheckLoginUtils.isLogin()) {
-            api.getReserveDialog(UserManager.getInstance().userId)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(object : BiResponse<List<SimpleGameEntity>>() {
-                    override fun onSuccess(data: List<SimpleGameEntity>) {
-                        reserveDialogHandler.doPreProcess(data)
-                    }
-
-                    override fun onFailure(exception: Exception) {
-                        reserveDialogHandler.doPreProcess(null)
-                    }
-                })
-        } else {
-            reserveDialogHandler.doPreProcess(null)
-        }
-    }
-
-    override fun registerInferiorChain(chain: PriorityChain) {
-        inferiorChain = chain
-        if (mainChain.isHandlerQueueEmpty()) {
-            inferiorChain?.resume()
-        }
-    }
-
-    override fun unregisterInferiorChain(chain: PriorityChain) {
-        if (inferiorChain == chain) {
-            inferiorChain = null
-        }
-    }
-
-}
--- a/app/src/main/java/com/gh/common/prioritychain/HomePushHandler.kt
+++ b/app/src/main/java/com/gh/common/prioritychain/HomePushHandler.kt
@ -0,0 +1,44 @@
+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) {
+                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()
+            }
+        }
+    }
+
+}
--- a/app/src/main/java/com/gh/common/prioritychain/LaunchRedirectHandler.kt
+++ b/app/src/main/java/com/gh/common/prioritychain/LaunchRedirectHandler.kt
@ -1,86 +0,0 @@
-package com.gh.common.prioritychain
-
-import android.annotation.SuppressLint
-import com.gh.common.util.DirectUtils
-import com.gh.gamecenter.BuildConfig
-import com.gh.gamecenter.common.entity.LaunchRedirect
-import com.gh.gamecenter.common.entity.LaunchRedirectWrapper
-import com.gh.gamecenter.common.retrofit.BiResponse
-import com.gh.gamecenter.common.utils.singleToMain
-import com.gh.gamecenter.core.AppExecutor
-import com.gh.gamecenter.core.utils.CurrentActivityHolder
-import com.gh.gamecenter.retrofit.RetrofitManager
-import com.gh.gamecenter.wrapper.MainWrapperRepository
-import com.halo.assistant.HaloApp
-
-/**
- * 初次启动跳转
- */
-class LaunchRedirectHandler(priority: Int) : PriorityChainHandler(priority) {
-
-    private var launchData: LaunchRedirect? = null
-
-    @SuppressLint("CheckResult")
-    fun doPreProcess() {
-//        if (true) {
-        if (HaloApp.getInstance().isBrandNewInstall) {
-            RetrofitManager.getInstance().newApi
-                .getLaunchRedirect(BuildConfig.VERSION_NAME, HaloApp.getInstance().channel)
-                .compose(singleToMain())
-                .subscribe(object : BiResponse<LaunchRedirectWrapper>() {
-                    override fun onSuccess(data: LaunchRedirectWrapper) {
-                        launchData = data.launchRedirect
-
-                        if (launchData == null) {
-                            updateStatus(STATUS_INVALID)
-                            processNext()
-                            return
-                        }
-
-                        // 尝试提前设置 tab default 避免首页数据加载完成，tab 选中会闪烁
-                        if (launchData?.type == "bottom_tab") {
-                            MainWrapperRepository.getInstance().sendSelectTabEvent(launchData!!)
-                        }
-
-                        if (getStatus() == STATUS_PENDING) {
-                            updateStatus(STATUS_VALID)
-                            process()
-                        } else {
-                            updateStatus(STATUS_VALID)
-                        }
-                    }
-
-                    override fun onFailure(exception: Exception) {
-                        super.onFailure(exception)
-                        updateStatus(STATUS_INVALID)
-                        processNext()
-                    }
-                })
-        } else {
-            updateStatus(STATUS_INVALID)
-            processNext()
-        }
-    }
-
-    override fun onProcess(): Boolean {
-        val currentActivity = CurrentActivityHolder.getCurrentActivity()
-
-        if (GlobalPriorityChainHelper.isThisActivityValid(currentActivity)) {
-            if (getStatus() == STATUS_VALID) {
-                // 当 type 为 "bottom_tab" 时上面 doPreProcess 中已经处理过了，但再选中一次好像也没有什么问题，先不特殊处理这个 case 了
-                DirectUtils.directToLinkPage(currentActivity!!, launchData!!, "首次启动跳转", "")
-                // 跳转页面不管回调，延迟 500ms 后执行下一个 handler
-                AppExecutor.uiExecutor.executeWithDelay({
-                    processNext()
-                }, 500L)
-
-                return true
-            } else if (getStatus() == STATUS_INVALID) {
-                processNext()
-            }
-        }
-
-        return false
-    }
-
-}
--- a/app/src/main/java/com/gh/common/prioritychain/NotificationPermissionDialogHandler.kt
+++ b/app/src/main/java/com/gh/common/prioritychain/NotificationPermissionDialogHandler.kt
@ -6,18 +6,15 @@ import com.gh.gamecenter.login.user.UserManager

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-        this.status = status
+        mStatus = status
    }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 }
--- a/app/src/main/java/com/gh/common/prioritychain/PullDownPushHandler.kt
+++ b/app/src/main/java/com/gh/common/prioritychain/PullDownPushHandler.kt
@ -1,48 +0,0 @@
-package com.gh.common.prioritychain
-
-import com.gh.common.iinterface.ISmartRefresh
-
-class PullDownPushHandler(priority: Int): PriorityChainHandler(priority) {
-
-    private var mSmartRefreshFragment: ISmartRefresh? = null
-
-    /**
-     * 提前预处理显示弹窗的内容
-     */
-    fun doPreProcess(smartRefreshFragment: ISmartRefresh?, shouldShow: Boolean) {
-        mSmartRefreshFragment = smartRefreshFragment
-
-        if (getStatus() == STATUS_PENDING) {
-            if (shouldShow && smartRefreshFragment != null) {
-                updateStatus(STATUS_VALID)
-                process()
-            } else {
-                processNext()
-            }
-        } else {
-            if (shouldShow && smartRefreshFragment != null) {
-                updateStatus(STATUS_VALID)
-            } else {
-                updateStatus(STATUS_INVALID)
-            }
-        }
-    }
-
-    override fun onProcess(): Boolean {
-        when (getStatus()) {
-            STATUS_VALID -> {
-                mSmartRefreshFragment?.popupPullDownPush {
-                    processNext()
-                }
-
-                return true
-            }
-            STATUS_INVALID -> {
-                processNext()
-            }
-        }
-
-        return false
-    }
-
-}
--- a/app/src/main/java/com/gh/common/prioritychain/RequestInstalledListPermissionHandler.kt
+++ b/app/src/main/java/com/gh/common/prioritychain/RequestInstalledListPermissionHandler.kt
@ -1,28 +0,0 @@
-package com.gh.common.prioritychain
-
-import androidx.fragment.app.FragmentActivity
-import com.gh.common.util.PackageHelper
-import com.gh.gamecenter.common.base.GlobalActivityManager
-
-class RequestInstalledListPermissionHandler : PriorityChainHandler(-1000) {
-
-    init {
-        updateStatus(STATUS_VALID)
-    }
-
-    override fun onProcess(): Boolean {
-        val currentActivity = GlobalActivityManager.currentActivity ?: return false
-
-        if (currentActivity !is FragmentActivity) return false
-
-        PackageHelper.showGetInstallAppsListDialogAndRequestPermissionIfNeeded(
-            activity = currentActivity,
-            ignorePermanentlyDenied = true
-        ) {
-            processNext()
-        }
-
-        return true
-    }
-
-}
--- a/app/src/main/java/com/gh/common/prioritychain/ReserveDialogHandler.kt
+++ b/app/src/main/java/com/gh/common/prioritychain/ReserveDialogHandler.kt
@ -1,26 +1,27 @@
 package com.gh.common.prioritychain

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

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

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

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

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

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

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

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

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

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

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

-import androidx.fragment.app.FragmentActivity
+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.core.utils.CurrentActivityHolder
 import com.gh.gamecenter.feature.entity.WelcomeDialogEntity
+import com.gh.gamecenter.fragment.MainWrapperViewModel
 import com.gh.gamecenter.fragment.WelcomeDialogFragment
-import com.gh.gamecenter.wrapper.MainWrapperViewModel
 import com.halo.assistant.HaloApp

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

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

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

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

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

 }
--- a/app/src/main/java/com/gh/common/provider/AppProviderImpl.kt
+++ b/app/src/main/java/com/gh/common/provider/AppProviderImpl.kt
@ -8,7 +8,6 @@ import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IAppProvider
 import com.gh.gamecenter.core.provider.IFlavorProvider
 import com.halo.assistant.HaloApp
-import com.va.host.HostUtils

@Route(path = RouteConsts.provider.app, name = "Application暴露服务")
 class AppProviderImpl : IAppProvider {
@ -83,10 +82,4 @@ class AppProviderImpl : IAppProvider {
    override fun getIsBrandNewInstall(): Boolean {
        return HaloApp.getInstance().isBrandNewInstall
    }
-
-    override fun setSkippingThirdParty(isSkippingThirdParty: Boolean) {
-        HaloApp.getInstance().isSkippingThirdParty = isSkippingThirdParty
-    }
-
-    override fun getPluginVersion(): String = HostUtils.getPluginVersion()
 }
--- a/app/src/main/java/com/gh/common/provider/BindingAdaptersProviderImpl.kt
+++ b/app/src/main/java/com/gh/common/provider/BindingAdaptersProviderImpl.kt
@ -16,8 +16,9 @@ class BindingAdaptersProviderImpl : IBindingAdaptersProvider {
        view: TextView,
        game: GameEntity,
        isShowPlatform: Boolean,
+        isShowSuffix: Boolean
    ) {
-        BindingAdapters.setGameName(view, game, isShowPlatform)
+        BindingAdapters.setGameName(view, game, isShowPlatform, isShowSuffix)
    }

    override fun setGameTags(layout: LinearLayout, gameEntity: GameEntity) {
--- a/app/src/main/java/com/gh/common/provider/BuildConfigImpl.kt
+++ b/app/src/main/java/com/gh/common/provider/BuildConfigImpl.kt
@ -19,7 +19,6 @@ class BuildConfigImpl : IBuildConfigProvider {
    override fun getExposureVersion(): String = BuildConfig.EXPOSURE_VERSION

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

    override fun getApiHost(): String = BuildConfig.API_HOST

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

    override fun getVDevApiHost(): String = BuildConfig.DEV_VAPI_HOST
-    override fun getLogProducerProject(): String = BuildConfig.LOG_HUB_PROJECT
 }
--- a/app/src/main/java/com/gh/common/provider/ConfigProviderImpl.kt
+++ b/app/src/main/java/com/gh/common/provider/ConfigProviderImpl.kt
@ -100,6 +100,10 @@ class ConfigProviderImpl : IConfigProvider {
        return Config.getNightModeSetting()?.setting ?: false
    }

+    override fun isShowPlugin(gameId: String): Boolean {
+        return Config.isShowPlugin(gameId)
+    }
+
    override fun init(context: Context?) {
        // Do nothing
    }
--- a/app/src/main/java/com/gh/common/provider/DefaultUrlHandlerProviderImpl.kt
+++ b/app/src/main/java/com/gh/common/provider/DefaultUrlHandlerProviderImpl.kt
@ -13,10 +13,9 @@ class DefaultUrlHandlerProviderImpl : IDefaultUrlHandlerProvider {
        context: Context,
        url: String,
        entrance: String,
-        bringAppToFront: Boolean,
-        sourceEntrance: String
+        bringAppToFront: Boolean
    ): Boolean {
-        return DefaultUrlHandler.interceptUrl(context, url, null, entrance, bringAppToFront, sourceEntrance)
+        return DefaultUrlHandler.interceptUrl(context, url, null, entrance, bringAppToFront)
    }

    override fun init(context: Context?) {
--- a/app/src/main/java/com/gh/common/provider/DirectProviderImpl.kt
+++ b/app/src/main/java/com/gh/common/provider/DirectProviderImpl.kt
@ -22,6 +22,34 @@ class DirectProviderImpl : IDirectProvider {
        DirectUtils.directToQqConversation(context, qq)
    }

+    override fun directToCommodityDetail(context: Context, commodityId: String) {
+        DirectUtils.directToCommodityDetail(context, commodityId)
+    }
+
+    override fun directToEnergyRecord(context: Context) {
+        DirectUtils.directToEnergyRecord(context)
+    }
+
+    override fun directToEnergyRulePage(context: Context) {
+        DirectUtils.directToEnergyRulePage(context)
+    }
+
+    override fun directToInviteFriends(context: Context) {
+        DirectUtils.directToInviteFriends(context)
+    }
+
+    override fun directToExchangeRulePage(context: Context) {
+        DirectUtils.directToExchangeRulePage(context)
+    }
+
+    override fun directToExchangeCommodityPage(context: Context) {
+        DirectUtils.directToExchangeCommodityPage(context)
+    }
+
+    override fun directToLotteryParadisePage(context: Context) {
+        DirectUtils.directToLotteryParadisePage(context)
+    }
+
    override fun directDouyin(context: Context, userId: String) {
        DirectUtils.directDouyin(context, userId)
    }
@ -55,26 +83,41 @@ class DirectProviderImpl : IDirectProvider {
        articleId: String?,
        communityId: String?,
        entrance: String?,
-        path: String?,
-        sourceEntrance: String
+        path: String?
    ) {
-        DirectUtils.directToCommunityArticle(context, articleId, communityId, entrance, path, sourceEntrance)
+        DirectUtils.directToCommunityArticle(context, articleId, communityId, entrance, path)
    }

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

    override fun directToAmway(context: Context, fixedTopAmwayCommentId: String?, entrance: String?, path: String?) {
        DirectUtils.directToAmway(context, fixedTopAmwayCommentId, entrance, path)
    }

-    override fun directToQGame(context: Context) {
-        return DirectUtils.directToQGameHome(context)
+    override fun directToOrderCenter(context: Context) {
+        DirectUtils.directToOrderCenter(context)
    }

-    override fun directToExternalBrowser(context: Context, url: String) {
-        DirectUtils.directToExternalBrowser(context, url)
+    override fun directToOrderDetail(context: Context, orderId: String) {
+        DirectUtils.directToOrderDetail(context, orderId)
+    }
+
+    override fun directToEnergyRecord(context: Context, position: Int) {
+        DirectUtils.directToEnergyRecord(context, position)
+    }
+
+    override fun directToMyPrizePage(context: Context) {
+        DirectUtils.directToMyPrizePage(context)
+    }
+
+    override fun directToWinOrderDetail(context: Context, orderId: String, activityId: String) {
+        DirectUtils.directToWinOrderDetail(context, orderId, activityId)
+    }
+
+    override fun directToQGame(context: Context) {
+        return DirectUtils.directToQGameHome(context)
    }

    override fun init(context: Context?) {
--- a/app/src/main/java/com/gh/common/provider/DownloadButtonClickedProviderImpl.kt
+++ b/app/src/main/java/com/gh/common/provider/DownloadButtonClickedProviderImpl.kt
@ -3,13 +3,11 @@ 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.CustomPageTrackData
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.gh.gamecenter.feature.provider.IDownloadButtonClickedProvider
@ -30,7 +28,6 @@ class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
        var gameSchemaType = ""
        var packageName = ""
        var exposureSourceList: List<ExposureSource>? = null
-        var customPageTrackData: CustomPageTrackData? = null

        val boundedObject = downloadButton.getObject()

@ -42,22 +39,18 @@ class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
                    gameId = boundedObject.id
                    gameName = boundedObject.name ?: ""
                    gameCategory = boundedObject.category ?: ""
-                    downloadStatus =
-                        if (boundedObject.isVGamePreferred()) {
-                            "畅玩"
-                        } else {
-                            if (boundedObject.downloadStatus == "demo") {
-                                "试玩"
-                            } else {
-                                "下载"
-                            }
-                        }
+                    downloadStatus = if (boundedObject.isVGame()) {
+                        "畅玩"
+                    } else if (boundedObject.downloadStatus == "demo") {
+                        "试玩"
+                    } else {
+                        "下载"
+                    }
                    gameTypeInChinese = boundedObject.categoryChinese
                    downloadStatusInChinese = boundedObject.downloadStatusChinese
                    gameSchemaType = boundedObject.gameBitChinese
                    packageName = boundedObject.getUniquePackageName() ?: ""
                    exposureSourceList = boundedObject.exposureEvent?.source
-                    customPageTrackData = boundedObject.customPageTrackData
                }

                is GameUpdateEntity -> {
@ -75,7 +68,7 @@ class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
                    gameId = boundedObject.gameId
                    gameName = boundedObject.name ?: ""
                    gameCategory = boundedObject.getGameCategory()
-                    downloadStatus = if (boundedObject.asVGame()) "畅玩" else "下载"
+                    downloadStatus = if (boundedObject.isVGame()) "畅玩" else "下载"
                    packageName = boundedObject.packageName
                    exposureSourceList = boundedObject.exposureTrace?.toObject<ExposureEvent>()?.source
                }
@ -83,13 +76,11 @@ class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {

            // 上报 UI 状态为启动的点击事件 (样式为启动，或者文案包含启动都算能启动)
            if (downloadButton.buttonStyle == DownloadButton.ButtonStyle.LAUNCH_OR_OPEN
-                || downloadButton.text.contains("启动")
-            ) {
+                || downloadButton.text.contains("启动")) {

                // boundedObject 里找不到游戏类型时，尝试从已安装列表中获取
                if (gameCategory.isEmpty() && packageName.isNotEmpty()) {
-                    gameCategory =
-                        PackageRepository.gameInstalled.find { it.packageName == packageName }?.category ?: ""
+                    gameCategory = PackageRepository.gameInstalled.find { it.packageName == packageName }?.category ?: ""
                }

                NewFlatLogUtils.logGameLaunchButtonClicked(
@ -102,22 +93,11 @@ class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
            }

            // 预约状态不上报
-            if (downloadButton.buttonStyle == DownloadButton.ButtonStyle.NORMAL
-                || downloadButton.buttonStyle == DownloadButton.ButtonStyle.PLUGIN
+            if (downloadButton.buttonStyle != DownloadButton.ButtonStyle.RESERVABLE
+                && downloadButton.buttonStyle != DownloadButton.ButtonStyle.RESERVED
            ) {

-                val text = downloadButton.text.ifEmpty {
-                    downloadButton.getTag(R.string.download) ?: ""
-                }.toString()
-
-                val downloadType = if (text.contains("畅玩")) {
-                    "畅玩下载"
-                } else {
-                    "本地下载"
-                }
-
                // 上报神策点击事件
-                val customPageKV = customPageTrackData?.toKV() ?: arrayOf()
                SensorsBridge.trackEventWithExposureSource(
                    "DownLoadbuttonClick",
                    exposureSourceList,
@ -127,14 +107,12 @@ class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
                    "download_status", downloadStatusInChinese,
                    "button_name", downloadButton.text,
                    "game_schema_type", gameSchemaType,
-                    "download_type", downloadType,
                    "page_name", GlobalActivityManager.getCurrentPageEntity().pageName,
                    "page_id", GlobalActivityManager.getCurrentPageEntity().pageId,
                    "page_business_id", GlobalActivityManager.getCurrentPageEntity().pageBusinessId,
                    "last_page_name", GlobalActivityManager.getLastPageEntity().pageName,
                    "last_page_id", GlobalActivityManager.getLastPageEntity().pageId,
                    "last_page_business_id", GlobalActivityManager.getLastPageEntity().pageBusinessId,
-                    *customPageKV
                )
            }
        }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
曾祥俊	49a610deee	feat: 动态java方法注册	2023-10-11 19:41:28 +08:00
曾祥俊	61f43d53b2	feat: 文章详情WebView预加载	2023-10-11 15:52:35 +08:00
				`@ -1 +0,0 @@`
				{"v":"5.12.2","fr":60,"ip":0,"op":40,"w":66,"h":66,"nm":"icon_tab_my","ddd":0,"assets":[{"id":"comp_0","nm":"icon","fr":60,"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"highlight","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33.134,34.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.667,"y":0.733},"o":{"x":0.333,"y":0},"t":0,"s":[{"i":[[0,-0.004],[0.493,0],[0,0.004],[-0.493,0]],"o":[[0,0.004],[-0.493,0],[0,-0.004],[0.493,0]],"v":[[0.893,1.488],[0,1.496],[-0.893,1.488],[0,1.483]],"c":true}]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0.267},"t":10,"s":[{"i":[[0,-1.018],[1.793,0],[0,1.018],[-1.793,0]],"o":[[0,1.018],[-1.793,0],[0,-1.018],[1.793,0]],"v":[[2.914,-0.344],[0,1.5],[-2.914,-0.344],[0,-1.5]],"c":true}]},{"i":{"x":0.333,"y":1},"o":{"x":0.667,"y":0},"t":18,"s":[{"i":[[0,-1.181],[1.407,0],[0,1.181],[-1.407,0]],"o":[[0,1.181],[-1.407,0],[0,-1.181],[1.407,0]],"v":[[2.226,-0.341],[0,1.74],[-2.211,-0.341],[0,-1.74]],"c":true}]},{"i":{"x":0.333,"y":1},"o":{"x":0.667,"y":0},"t":26,"s":[{"i":[[0,-0.905],[1.381,0],[0,0.905],[-1.381,0]],"o":[[0,0.905],[-1.381,0],[0,-0.905],[1.381,0]],"v":[[2.5,-0.306],[0,1.333],[-2.5,-0.306],[0,-1.333]],"c":true}]},{"t":32,"s":[{"i":[[0,-1.018],[1.381,0],[0,1.018],[-1.381,0]],"o":[[0,1.018],[-1.381,0],[0,-1.018],[1.381,0]],"v":[[2.5,-0.344],[0,1.5],[-2.5,-0.344],[0,-1.5]],"c":true}]}],"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"color","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"椭圆形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":60,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"body","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,34.204,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-3.866,0],[0,3.866],[3.866,0],[0,-3.866]],"o":[[3.866,0],[0,-3.866],[-3.866,0],[0,3.866]],"v":[[0,4.599],[7,-2.401],[0,-9.401],[-7,-2.401]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0.207,0.359],[2.438,0],[1.189,-2.104],[-0.361,-0.204],[-0.204,0.361],[-1.915,0],[-0.932,-1.613],[-0.359,0.207]],"o":[[-1.198,-2.072],[-2.462,0],[-0.204,0.361],[0.361,0.204],[0.925,-1.638],[1.897,0],[0.207,0.359],[0.359,-0.207]],"v":[[5.848,8.225],[0,4.849],[-5.88,8.282],[-5.596,9.304],[-4.574,9.02],[0,6.349],[4.549,8.976],[5.574,9.25]],"c":true},"ix":2},"nm":"路径 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"合并路径 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.267,0.639,1,0.5,0.241,0.596,1,1,0.216,0.553,1],"ix":9}},"s":{"a":0,"k":[-3.812,-4.384],"ix":5},"e":{"a":0,"k":[6.345,8.129],"ix":6},"t":1,"nm":"color","mn":"ADBE Vector Graphic - G-Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"Union","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":60,"st":0,"ct":1,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":0,"nm":"icon","refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,33,0],"ix":2,"l":2},"a":{"a":0,"k":[33,33,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":0,"s":[100,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":8,"s":[70,70,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":18,"s":[110,110,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":26,"s":[90,90,100]},{"t":32,"s":[100,100,100]}],"ix":6,"l":2}},"ao":0,"w":66,"h":66,"ip":0,"op":60,"st":0,"bm":0}],"markers":[],"props":{}}