feat: 【光环助手】极光推送接入VA合并包 https://jira.shanqu.cc/browse/GHZSCY-5621

fix: 修复32位畅玩游戏助手被卸载的云存档交互崩溃 https://sentry.shanqu.cc/organizations/lightgame/issues/355607/?project=22
fix:去掉英文
2024-06-04 14:06:24 +08:00 · 2024-06-03 14:46:49 +08:00 · 2024-05-31 14:27:09 +08:00 · 2024-05-31 13:11:19 +08:00 · 2024-05-31 11:57:29 +08:00 · 2024-05-30 16:54:23 +08:00
2122 changed files with 39392 additions and 55682 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -78,7 +78,7 @@ sonarqube_analysis:
   tags:
     - offline-test
   stage: build&analyze
-   image: hub.shanqu.cc/library/sonar-scanner-cli:latest
+   image: sonarsource/sonar-scanner-cli:latest
   dependencies: []    #禁止传递来的artifact
   script:
     ## 获取项目的一级组和二级组和项目名作为projectKey，例如projectKey=platform-backend-eci-monitor
@ -127,9 +127,6 @@ oss-upload&send-email:
        - sysadm-devops
    stage: oss-upload&send-email
    image: hub.shanqu.cc/devops/android-apk-oss-upload:latest
-    id_tokens:
-      VAULT_ID_TOKEN:
-        aud: https://vault.shanqu.cc
    variables:
        GIT_STRATEGY: none
        VAULT_ADDR: https://vault.shanqu.cc                         # 固定值
@ -148,7 +145,6 @@ oss-upload&send-email:
          artifacts: true
    script:
        ### 绑定上传参数 ###
-
        - export OSS_PATH="release/dev/${CI_PROJECT_NAME}/$(date "+%Y/%m/%d")"
        ### 开启上传 ###
        - /usr/local/bin/python /upload.py
@ -156,4 +152,4 @@ oss-upload&send-email:
        - /usr/local/bin/python /ci-android-mail-jira-comment.py
    only:
        - dev
-        - release
+        - release
--- a/README.md
+++ b/README.md
@ -44,4 +44,5 @@

 ### 混淆配置

+* 本项目使用了微信的 [AndResGuard](https://github.com/shwenzhang/AndResGuard) 作为资源混淆压缩方案，新增需要使用 `getIdentifier` 获取的资源文件时需要添加至白名单
 * 本项目默认使用 R8 作为混淆工具，往 proguard-rules.txt 添加 proguard 新配置项时请检查可用性(如语法等)
--- a/app/build.gradle
+++ b/app/build.gradle
@ -3,6 +3,7 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android' // kotlin
 apply plugin: 'kotlin-parcelize'
 apply plugin: 'kotlin-kapt'
+apply plugin: 'AndResGuard'

 import groovy.xml.XmlUtil

@ -101,14 +102,10 @@ android {
        buildConfigField "String", "NEW_API_HOST", "\"${NEW_API_HOST}\""
        buildConfigField "String", "LOG_HUB_PROJECT", "\"${LOG_HUB_PROJECT}\""
        buildConfigField "String", "VAPI_HOST", "\"${VAPI_HOST}\""
-        buildConfigField "String", "WGAME_CPM_BUSIAPPID", "\"${WGAME_CPM_BUSIAPPID}\""
-        buildConfigField "String", "WGAME_CPM_API_HOST", "\"${WGAME_CPM_API_HOST}\""
        buildConfigField "String", "WECHAT_APPID", "\"${WECHAT_APPID}\""
        buildConfigField "String", "WECHAT_SECRET", "\"${WECHAT_SECRET}\""
        buildConfigField "String", "TENCENT_APPID", "\"${TENCENT_APPID}\""
        buildConfigField "String", "WEIBO_APPKEY", "\"${WEIBO_APPKEY}\""
-        // 一体包的32位畅玩游戏助手包名
-        buildConfigField "String", "EXT_PACKAGE_NAME", "\"${rootProject.ext.EXT_PACKAGE_NAME}\""
    }

    // gradle 2.2以上默认同时启用v1和v2（优先用于Android N）
@ -129,23 +126,6 @@ android {
        }
    }

-    packagingOptions {
-        // exclude 部分冗余的文件
-        exclude 'META-INF/gradle/incremental.annotation.processors'
-        exclude 'darwin/x86_64/liblz4-java.dylib'
-
-        exclude 'assets/libwbsafeedit_x86'
-        exclude 'assets/libwbsafeedit_x86_64'
-
-        exclude 'lib/armeabi-v7a/libRSSupport.so'
-        exclude 'lib/arm64-v8a/libRSSupport.so'
-        exclude 'lib/armeabi-v7a/librsjni.so'
-        exclude 'lib/arm64-v8a/librsjni.so'
-
-        resources.excludes += "com/j256/*"
-        resources.excludes += "org/apache/commons/codec/language/bm/*"
-    }
-
    buildTypes {
        debug {
            debuggable true
@ -232,9 +212,6 @@ android {
            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", "VA_VERSION_NAME", "\"${rootProject.ext.VA_VERSION}-debug\""
-            manifestPlaceholders.put("VA_VERSION_NAME", "${rootProject.ext.VA_VERSION}-debug")
        }

        // publish， 发布时候使用的 flavor，接口仅包含正式环境
@ -248,9 +225,6 @@ android {
            buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${QUICK_LOGIN_APPKEY}\""
            buildConfigField "String", "DEV_CSJ_APPID", "\"${CSJ_APPID}\""
            buildConfigField "String", "CSJ_APPID", "\"${CSJ_APPID}\""
-
-            buildConfigField "String", "VA_VERSION_NAME", "\"${rootProject.ext.VA_VERSION}\""
-            manifestPlaceholders.put("VA_VERSION_NAME", "${rootProject.ext.VA_VERSION}")
        }

        tea {
@ -264,10 +238,7 @@ android {
            buildConfigField "String", "DEV_CSJ_APPID", "\"${CSJ_APPID}\""
            buildConfigField "String", "CSJ_APPID", "\"${CSJ_APPID}\""

-            buildConfigField "String", "VA_VERSION_NAME", "\"${rootProject.ext.VA_VERSION}\""
-
            manifestPlaceholders.put("APPLOG_SCHEME", "rangersapplog.byAx6uYt".toLowerCase())
-            manifestPlaceholders.put("VA_VERSION_NAME", "${rootProject.ext.VA_VERSION}")
        }

        kuaishou {
@ -280,9 +251,6 @@ android {
            buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${QUICK_LOGIN_APPKEY}\""
            buildConfigField "String", "DEV_CSJ_APPID", "\"${CSJ_APPID}\""
            buildConfigField "String", "CSJ_APPID", "\"${CSJ_APPID}\""
-
-            buildConfigField "String", "VA_VERSION_NAME", "\"${rootProject.ext.VA_VERSION}\""
-            manifestPlaceholders.put("VA_VERSION_NAME", "${rootProject.ext.VA_VERSION}")
        }

        gdt {
@ -295,9 +263,6 @@ android {
            buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${QUICK_LOGIN_APPKEY}\""
            buildConfigField "String", "DEV_CSJ_APPID", "\"${CSJ_APPID}\""
            buildConfigField "String", "CSJ_APPID", "\"${CSJ_APPID}\""
-
-            buildConfigField "String", "VA_VERSION_NAME", "\"${rootProject.ext.VA_VERSION}\""
-            manifestPlaceholders.put("VA_VERSION_NAME", "${rootProject.ext.VA_VERSION}")
        }

        sm {
@ -310,9 +275,6 @@ android {
            buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${QUICK_LOGIN_APPKEY}\""
            buildConfigField "String", "DEV_CSJ_APPID", "\"${CSJ_APPID}\""
            buildConfigField "String", "CSJ_APPID", "\"${CSJ_APPID}\""
-
-            buildConfigField "String", "VA_VERSION_NAME", "\"${rootProject.ext.VA_VERSION}\""
-            manifestPlaceholders.put("VA_VERSION_NAME", "${rootProject.ext.VA_VERSION}")
        }

        // 港澳台
@ -342,21 +304,6 @@ repositories {
    }
 }

-// 删除不需要的 assets
-android.applicationVariants.configureEach { variant ->
-    variant.mergeAssets.doLast {
-        def assetDir = variant.mergeAssetsProvider.get().outputDir.get()
-        def unwantedAssets = ['2011394667', 'gdt_plugin/gdtadv2.jar']
-
-        unwantedAssets.each { assetPath ->
-            def file = new File([assetDir, assetPath].join(File.separator))
-            if (file.exists()) {
-                file.delete()
-            }
-        }
-    }
-}
-
 dependencies {

    implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
@ -365,6 +312,7 @@ dependencies {
    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}"
    debugImplementation "com.squareup.leakcanary:leakcanary-android-process:${leakcanary}"
@ -380,6 +328,8 @@ dependencies {
    implementation "androidx.viewpager2:viewpager2:${viewpager2}"
    kapt "androidx.room:room-compiler:${room}"

+    implementation "com.kyleduo.switchbutton:library:${switchButton}"
+
    implementation "com.tencent.vasdolly:helper:${apkChannelPackage}"
    implementation "com.tencent.vasdolly:writer:${apkChannelPackage}"

@ -402,14 +352,12 @@ dependencies {
        exclude module: "gsyvideoplayer-androidvideocache"
        exclude group: "tv.danmaku.ijk.media"
    })
-    implementation ("com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-exo_player2:$gsyVideo") {
-        exclude group: 'com.google.android.exoplayer', module: 'extension-rtmp'
-    }
+    implementation "com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-exo_player2:$gsyVideo"

    implementation "com.llew.huawei:verifier:${verifier}"

    teaImplementation "com.bytedance.applog:RangersAppLog-Lite-cn:${bytedanceApplog}"
-    teaImplementation "com.bytedance.ads:AppConvert:${bytedanceAppConvert}"
+    teaImplementation "com.bytedance.applog:RangersAppLog-All-convert:${bytedanceApplog}"

    implementation "net.lingala.zip4j:zip4j:${zip4j}"

@ -418,9 +366,7 @@ dependencies {

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

-    implementation("com.lg:apksig:${apksig}") {
-        exclude group: 'com.google.protobuf'
-    }
+    implementation "com.lg:apksig:${apksig}"

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

@ -431,96 +377,65 @@ dependencies {
    kapt "com.alibaba:arouter-compiler:$arouterVersion"

    implementation project(':ndownload')
-    implementation project(':vspace-bridge:vspace')
-    implementation(project(':feature:xapk-installer'))
+    implementation project(':vspace-bridge')

-    implementation(project(':module_common')) {
+    implementation (project(':module_common')) {
        exclude group: 'androidx.swiperefreshlayout'
    }
-
    implementation(project(':module_login')) {
        exclude group: 'androidx.swiperefreshlayout'
    }
-
-    implementation(project(':module_core_feature')) {
-        exclude group: 'androidx.swiperefreshlayout'
-    }
-
    implementation(project(':module_setting')) {
        exclude group: 'androidx.swiperefreshlayout'
    }
-
-    //    implementation(project(':module_setting_compose')) {
-    //        exclude group: 'androidx.swiperefreshlayout'
-    //    }
-
-    if (!gradle.ext.excludeOptionalModules || gradle.ext.enablePkg) {
-        implementation(project(':feature:pkg'))
+//    implementation(project(':module_setting_compose')) {
+//        exclude group: 'androidx.swiperefreshlayout'
+//    }
+    implementation(project(':module_core_feature')) {
+        exclude group: 'androidx.swiperefreshlayout'
    }
-
-    if (!gradle.ext.excludeOptionalModules || gradle.ext.enableFeedback) {
-        implementation(project(':feature:new_feedback')) {
-            exclude group: 'androidx.swiperefreshlayout'
-        }
+//    implementation(project(':module_feedback')) {
+//        exclude group: 'androidx.swiperefreshlayout'
+//    }
+    implementation(project(':feature:new_feedback',)) {
+        exclude group: 'androidx.swiperefreshlayout'
    }
-
-    if (!gradle.ext.excludeOptionalModules || gradle.ext.enableMessage) {
-        implementation(project(':module_message')) {
-            exclude group: 'androidx.swiperefreshlayout'
-        }
+    implementation(project(':module_sensors_data')) {
+        exclude group: 'androidx.swiperefreshlayout'
    }
-
-    if (!gradle.ext.excludeOptionalModules || gradle.ext.enableOaid) {
-        implementation(project(':feature:oaid'))
+    implementation(project(':module_message')) {
+        exclude group: 'androidx.swiperefreshlayout'
    }
-
-    if (!gradle.ext.excludeOptionalModules || gradle.ext.enableFloatingWindow) {
-        implementation(project(':feature:floating-window'))
+//    implementation(project(':feature:vpn'))
+    implementation(project(':feature:pkg'))
+    implementation(project(':feature:oaid'))
+    implementation(project(':feature:floating-window'))
+//    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'
    }
-
-    if (!gradle.ext.excludeOptionalModules || gradle.ext.enableSensorData) {
-        implementation(project(':module_sensors_data')) {
-            exclude group: 'androidx.swiperefreshlayout'
-        }
-    }
-
-    if (!gradle.ext.excludeOptionalModules || gradle.ext.enableCsjAd) {
-        implementation(project(':feature:csj_ad'))
-    }
-
-    if (!gradle.ext.excludeOptionalModules || gradle.ext.enableQQGame) {
-        implementation(project(':feature:qq_game')) {
-            exclude group: 'androidx.swiperefreshlayout'
-        }
-    }
-
-    if (!gradle.ext.excludeOptionalModules || gradle.ext.enablePush) {
-        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'
-        }
-    }
-
-    if (!gradle.ext.excludeOptionalModules || gradle.ext.enableSentry) {
-        implementation(project(':feature:sentry'))
-    }
-
-    implementation(project(':feature:media_select'))
-
-    implementation(project(":module_va_api"))
-    implementation(project(":va-archive-common"))
-    if (!gradle.ext.excludeOptionalModules || gradle.ext.enableVa) {
-        implementation(project(":module_va_impl"))
-    }
-    debugImplementation "com.bytedance.tools.codelocator:codelocator-core:2.0.3"
    internalImplementation(project(':module_internal_test'))

-    debugImplementation 'com.bytedance.android:shadowhook:1.0.9'
-    debugImplementation 'io.github.shiqos:wytrace:1.0.1'
+    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')
@ -580,6 +495,113 @@ if (propFile.exists()) {
 //    }.each { t -> t.dependsOn generateMetaJson }
 //}

+andResGuard {
+    mappingFile = null
+    use7zip = true
+    useSign = true
+    // 打开这个开关，会keep住所有资源的原始路径，只混淆资源的名字
+    keepRoot = false
+    // 设置这个值，会把arsc name列混淆成相同的名字，减少string常量池的大小
+    fixedResName = "arg"
+    // 打开这个开关会合并所有哈希值相同的资源，但请不要过度依赖这个功能去除去冗余资源
+    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",
+            "R.drawable.bg_notification_answer_style_1",
+            "R.drawable.bg_notification_answer_style_2",
+            "R.drawable.bg_notification_article_style_1",
+            "R.drawable.bg_notification_article_style_2",
+            "R.drawable.bg_notification_feedback_style_1",
+            "R.drawable.bg_notification_feedback_style_2",
+            "R.drawable.bg_notification_gift_style_1",
+            "R.drawable.bg_notification_gift_style_2",
+            "R.drawable.bg_notification_login_style_1",
+            "R.drawable.bg_notification_login_style_2",
+            "R.drawable.bg_notification_question_style_1",
+            "R.drawable.bg_notification_question_style_2",
+            "R.drawable.bg_notification_rating_style_1",
+            "R.drawable.bg_notification_rating_style_2",
+            "R.drawable.bg_notification_reserve_game_style_1",
+            "R.drawable.bg_notification_reserve_game_style_2",
+            "R.drawable.bg_notification_video_style_1",
+            "R.drawable.bg_notification_video_style_2",
+            "R.drawable.ic_recommend_activity",
+            "R.drawable.ic_recommend_discount",
+            "R.drawable.ic_recommend_function",
+            "R.drawable.ic_recommend_gift",
+            "R.drawable.ic_recommend_role",
+            "R.drawable.download_button_normal_style",
+            "R.drawable.ic_selector_selected",
+            "R.drawable.ic_selector_default",
+            "R.id.download_speed",
+            "R.id.download_percentage",
+            "R.id.comment",
+            "R.id.vote",
+            "R.id.watermark_hint",
+            "R.id.watermark_sb",
+            "R.id.bottomShareIv",
+            "R.id.bottomShareTv",
+            "R.id.recommendStarPref",
+            "R.id.recommendStar",
+            "R.id.iv_vmode_badge",
+            "R.id.tv_vmode",
+            "R.id.iv_vmode",
+            "R.drawable.help_search_delete",
+            "R.drawable.suggest_type_normal",
+            "R.drawable.suggest_type_crash",
+            "R.drawable.suggest_type_game_question",
+            "R.drawable.suggest_type_game_collect",
+            "R.drawable.suggest_type_function_suggest",
+            "R.drawable.suggest_type_article_collect",
+            "R.drawable.suggest_type_copyright",
+            "R.drawable.news_comment_detail_read",
+            "R.drawable.news_comment_detail_comment",
+            "R.drawable.news_comment_detail_share",
+            "R.drawable.ic_libao",
+            "R.drawable.ic_link",
+            "R.drawable.concern_message_icon",
+            "R.drawable.reuse_blank_hint",
+            "R.drawable.ic_concern",
+            "R.drawable.concern_down",
+            "R.drawable.concern_up",
+            "R.drawable.ic_libao_more",
+            "R.drawable.ic_libao_delete",
+            "R.drawable.ic_dialog_close",
+            "R.drawable.occupy2",
+            "R.drawable.kc_checkbox_unselect",
+            "R.drawable.kc_checkbox_select",
+            "R.drawable.ic_type_unselect",
+            "R.drawable.ic_type_selected",
+            "R.drawable.suggest_add_pic_icon",
+            "R.drawable.icon_pic_add",
+            "R.drawable.ask_search_input_delete",
+            "R.drawable.suggest_pic_delete",
+            "R.id.cardIv",
+            "R.id.cardMask",
+            "R.id.cardGradientMask",
+            "R.id.gameIconIv",
+            "R.id.titleContainer"
+    ]
+    compressFilePattern = [
+            "*.png",
+            "*.jpg",
+            "*.jpeg",
+            "*.gif",
+    ]
+    sevenzip {
+        artifact = 'io.github.leon406:SevenZip:1.2.22.5'
+    }
+}
+
 project.afterEvaluate {
    def variants = null
    try {
--- a/app/src/gdt/java/com/gh/gamecenter/GdtHelper.kt
+++ b/app/src/gdt/java/com/gh/gamecenter/GdtHelper.kt
@ -28,9 +28,6 @@ object GdtHelper {
        } else {
            GDTAction.init(application, USER_ACTION_SET_ID, APP_SECRET_ID, channel)
        }
-
-        GDTAction.start()
-
        Utils.log("init GdtHelper")
    }

--- a/app/src/gdt/libs/GDTActionSDK.min.1.8.8.aar
+++ b/app/src/gdt/libs/GDTActionSDK.min.1.8.8.aar
--- a/app/src/gdt/libs/GDTActionSDK.min.1.8.9.aar
+++ b/app/src/gdt/libs/GDTActionSDK.min.1.8.9.aar
--- a/app/src/internal/java/com/gh/vspace/ExternalGameUsage.kt
+++ b/app/src/internal/java/com/gh/vspace/ExternalGameUsage.kt
@ -1,6 +1,7 @@
 package com.gh.vspace

 import android.content.Intent
+import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@ -9,7 +10,11 @@ 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
@ -32,11 +37,43 @@ class ExternalGameUsage : ITestCase {
            it.titleTv.text = context.getString(R.string.title_install_external_game)
            it.iconIv.setImageResource(R.drawable.ic_personal_my_game)
            it.root.setOnClickListener {
-                context.startActivity(
-                    InstallExternalGameActivity.getIntent(context)
-                        .apply { flags = flags or Intent.FLAG_ACTIVITY_NEW_TASK })
+                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/InstallExternalGameFragment.kt
+++ b/app/src/internal/java/com/gh/vspace/installexternalgames/InstallExternalGameFragment.kt
@ -1,14 +1,10 @@
 package com.gh.vspace.installexternalgames

-import android.Manifest
 import android.app.Dialog
-import android.content.ComponentName
-import android.content.pm.PackageManager
 import android.os.Bundle
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.core.content.ContextCompat
 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
@ -44,19 +40,6 @@ class InstallExternalGameFragment : ToolbarFragment(), OnItemClickListener {

    private lateinit var dialog: Dialog

-
-    private val requestPermissionLauncher = registerForActivityResult<String, Boolean>(
-        ActivityResultContracts.RequestPermission()
-    ) { result ->
-        if (result == true) {
-            // grant
-            mViewModel.scanPaths()
-        } else {
-            // not grant
-        }
-    }
-
-
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        setNavigationTitle(getString(com.gh.gamecenter.R.string.title_install_external_game))
@ -73,30 +56,11 @@ class InstallExternalGameFragment : ToolbarFragment(), OnItemClickListener {
            )
            adapter.notifyDataSetChanged()
        }
+        mViewModel.scanPaths()
+

-        requestStoragePermission()
    }

-    private fun requestStoragePermission() {
-        when {
-            ContextCompat.checkSelfPermission(
-                requireContext(),
-                Manifest.permission.READ_EXTERNAL_STORAGE
-            ) == PackageManager.PERMISSION_GRANTED -> {
-                mViewModel.scanPaths()
-            }
-
-            shouldShowRequestPermissionRationale(Manifest.permission.READ_EXTERNAL_STORAGE) -> {
-                requestPermissionLauncher.launch(Manifest.permission.READ_EXTERNAL_STORAGE)
-            }
-
-            else -> {
-                requestPermissionLauncher.launch(Manifest.permission.READ_EXTERNAL_STORAGE)
-            }
-        }
-    }
-
-
    private fun initView() {
        dialog = DialogUtils.showWaitDialog(requireContext(), "")
        mBinding.externalGamesList.let {
@ -104,7 +68,7 @@ class InstallExternalGameFragment : ToolbarFragment(), OnItemClickListener {
            it.layoutManager = LinearLayoutManager(requireContext())
            val itemDecoration = HorizontalDividerItemDecoration.Builder(requireContext())
                .size(2F.dip2px())
-                .color(com.gh.gamecenter.common.R.color.ui_divider.toColor(requireContext()))
+                .color(R.color.ui_divider.toColor(requireContext()))
                .build()
            if (it.itemDecorationCount != 0) {
                it.removeItemDecorationAt(0)
@ -130,11 +94,9 @@ class InstallExternalGameFragment : ToolbarFragment(), OnItemClickListener {
            OnItemClickListener.ClickType.CLICK_INSTALL -> {
                install(externalGameUiState)
            }
-
            OnItemClickListener.ClickType.CLICK_UNINSTALL -> {
                uninstall(externalGameUiState)
            }
-
            OnItemClickListener.ClickType.CLICK_START -> {
                start(externalGameUiState)
            }
@ -142,8 +104,9 @@ class InstallExternalGameFragment : ToolbarFragment(), OnItemClickListener {
    }

    private fun install(externalGameUiState: ExternalGameUiState) {
+        val bit =
+            externalGameUiState.externalGameEntity.cpuAbi.let { if (it.size == 1 && it.contains("armeabi-v7a")) "32" else "64" }

-        VHelper.disableLaunchGameAfterInstallation()
        VHelper.install(requireContext(), DownloadEntity().apply {
            externalGameUiState.externalGameEntity.apply {
                packageName = apkPackageName
@ -151,12 +114,20 @@ class InstallExternalGameFragment : ToolbarFragment(), OnItemClickListener {
            }
        }, true)

-        VHelper.newCwValidateVspaceBeforeAction(
-            requireContext(),null,
-        ) {
-            dialog.show()
-        }

+        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) {
@ -184,15 +155,9 @@ class InstallExternalGameFragment : ToolbarFragment(), OnItemClickListener {
            HaloApp.getInstance().channel,
            "",
            "",
-            com.gh.gamecenter.BuildConfig.VA_VERSION_NAME,
+            com.lg.core.BuildConfig.VERSION_NAME,
            HaloApp.getInstance().oaid
        )
-        intent.setComponent(
-            ComponentName(
-                com.gh.gamecenter.BuildConfig.APPLICATION_ID,
-                VirtualAppManager.AIDL_SERVER_REMOTE_GUIDE_ACTIVITY
-            )
-        )
        requireActivity().startActivity(intent)
    }

--- a/app/src/internal/res/values-zh-rTW/strings.xml
+++ b/app/src/internal/res/values-zh-rTW/strings.xml
@ -2,7 +2,6 @@
 <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/internal/res/values/ids.xml
+++ b/app/src/internal/res/values/ids.xml
@ -1,4 +1,6 @@
 <?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/kuaishou/libs/channelsdk-0.2.2.aar
+++ b/app/src/kuaishou/libs/channelsdk-0.2.2.aar
--- a/app/src/kuaishou/libs/channelsdk-0.2.3.aar
+++ b/app/src/kuaishou/libs/channelsdk-0.2.3.aar
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -7,28 +7,17 @@
        <package android:name="com.gh.gamecenter" />
    </queries>

-    <queries>
-        <package android:name="com.gh.toolmap" />
-        <intent>
-            <action android:name="android.intent.action.VIEW"/>
-            <category android:name="android.intent.category.BROWSABLE"/>
-            <data android:scheme="ghtoolmap"/>
-        </intent>
-    </queries>
-
    <queries>
        <package android:name="com.lg.vspace" />
-        <package android:name="com.gh.gamecenter.addon" />
    </queries>

    <!-- 华为/荣耀角标 -->
-    <uses-permission android:name="com.huawei.android.launcher.permission.CHANGE_BADGE " />
+    <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"
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"
        tools:ignore="ScopedStorage" />
    <!-- 允许应用程序访问网络连接 -->
    <uses-permission android:name="android.permission.INTERNET" />
@ -50,7 +39,7 @@
    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
    <!-- 应用安装相关 -->
    <uses-permission android:name="com.android.permission.GET_INSTALLED_APPS" />
-    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
+
    <!-- 前台服务权限-->
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />

@ -65,9 +54,6 @@
    <!-- 如果有视频相关的广告且使用textureView播放，请务必添加，否则黑屏 -->
    <uses-permission android:name="android.permission.WAKE_LOCK" />

-    <!-- 悬浮窗 -->
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
-
    <uses-sdk tools:overrideLibrary="
        com.shuyu.gsyvideoplayer,
        com.shuyu.gsyvideoplayer.lib,
@ -129,10 +115,7 @@
        com.lg.plugin.constant,
        com.bytedance.tools.codelocator,
        org.chickenhook.restrictionbypass,
-        com.lody.virtual.sandhook,
-        com.lg.vspace.common,
-        com.lg.vspace.archive.common,
-        com.wy.lib.wytrace" />
+        com.lody.virtual.sandhook,com.lg.vspace.common" />

    <!-- 去掉 SDK 一些流氓权限 -->
    <uses-permission
@ -151,14 +134,6 @@
        android:name="android.permission.ACCESS_COARSE_LOCATION"
        tools:node="remove" />

-    <uses-permission
-        android:name="android.permission.ACCESS_BACKGROUND_LOCATION"
-        tools:node="remove" />
-
-    <uses-permission
-        android:name="android.permission.ACCESS_FINE_LOCATION"
-        tools:node="remove" />
-
    <supports-screens
        android:anyDensity="true"
        android:largeScreens="true"
@ -194,8 +169,6 @@
            android:name="io.sentry.breadcrumbs.system-events"
            android:value="false" />

-        <meta-data android:name="module_version" android:value="${VA_VERSION_NAME}" />
-
        <service android:name="com.gh.ndownload.NDownloadService" />

        <activity
@ -320,6 +293,10 @@
            android:name="com.gh.gamecenter.CleanApkActivity"
            android:screenOrientation="portrait" />

+        <activity
+            android:name="com.gh.gamecenter.SelectUserIconActivity"
+            android:screenOrientation="portrait" />
+
        <activity
            android:name="com.gh.gamecenter.CommentDetailActivity"
            android:screenOrientation="portrait"
@ -344,6 +321,14 @@
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateHidden" />

+        <activity
+            android:name=".category.CategoryDirectoryActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".category.CategoryListActivity"
+            android:screenOrientation="portrait" />
+
        <activity
            android:name="com.gh.gamecenter.UserInfoActivity"
            android:screenOrientation="portrait" />
@ -465,6 +450,9 @@
            android:name="com.gh.gamecenter.video.game.GameVideoActivity"
            android:screenOrientation="portrait" />

+        <activity
+            android:name="com.gh.gamecenter.qa.editor.LocalMediaActivity"
+            android:screenOrientation="portrait" />

        <activity
            android:name="com.gh.gamecenter.servers.GameServersActivity"
@ -497,6 +485,9 @@
            android:configChanges="orientation|screenSize|keyboardHidden"
            android:screenOrientation="portrait"
            android:theme="@style/TransparentStatusBarAndNavigationBar" />
+        <activity
+            android:name=".gamedetail.myrating.MyRatingActivity"
+            android:screenOrientation="portrait" />

        <activity
            android:name="com.gh.gamecenter.gamedetail.fuli.kaifu.ServersCalendarActivity"
@ -562,6 +553,14 @@
            android:name=".simulatorgame.SimulatorManagementActivity"
            android:screenOrientation="portrait" />

+        <activity
+            android:name=".catalog.CatalogActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".catalog.NewCatalogListActivity"
+            android:screenOrientation="portrait" />
+
        <activity
            android:name=".forum.search.ForumOrUserSearchActivity"
            android:screenOrientation="portrait" />
@ -582,6 +581,10 @@
            android:name=".personal.DeliveryInfoActivity"
            android:screenOrientation="portrait" />

+        <activity
+            android:name=".qa.editor.PreviewVideoActivity"
+            android:screenOrientation="portrait" />
+
        <activity
            android:name=".qa.video.publish.VideoPublishActivity"
            android:screenOrientation="portrait" />
@ -767,11 +770,11 @@
            android:screenOrientation="portrait" />

        <activity
-            android:name="com.gh.gamecenter.minigame.qq.QGameHomeWrapperActivity"
+            android:name="com.gh.gamecenter.qgame.QGameHomeWrapperActivity"
            android:screenOrientation="portrait" />

        <activity
-            android:name="com.gh.gamecenter.minigame.MiniGameSearchActivity"
+            android:name="com.gh.gamecenter.qgame.QGameSearchActivity"
            android:screenOrientation="portrait" />

        <activity
@ -790,24 +793,8 @@
            android:name="com.gh.gamecenter.wrapper.ToolbarWrapperActivity"
            android:screenOrientation="portrait" />

-        <activity
-            android:name=".forum.home.CommunityActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".forum.home.follow.FollowDynamicActivity"
-            android:theme="@style/Theme.Transparent" />
-
-        <activity
-            android:name=".forum.home.follow.AllFollowedActivity"
-            android:screenOrientation="portrait"
-            android:theme="@style/AppCompatTheme.APP" />
-
-        <activity
-            android:name=".search.SearchTabActivity"
-            android:configChanges="keyboardHidden"
-            android:screenOrientation="portrait"
-            android:theme="@style/AppCompatTheme.APP" />
+        <activity android:name=".forum.home.CommunityActivity"
+            android:screenOrientation="portrait"/>

        <!--        <activity-->
        <!--            android:name="${applicationId}.douyinapi.DouYinEntryActivity"-->
@ -866,8 +853,6 @@

        <service android:name="com.gh.gamecenter.install.InstallService" />

-        <service android:name="com.gh.download.suspendwindow.DownloadSuspendWindowService" />
-
        <receiver
            android:name="com.gh.gamecenter.receiver.DownloadReceiver"
            android:exported="false">
--- a/app/src/main/assets/lottie/draw_overlay_permission.json
+++ b/app/src/main/assets/lottie/draw_overlay_permission.json
--- a/app/src/main/assets/lottie/tab_forum.json
+++ b/app/src/main/assets/lottie/tab_forum.json
@ -0,0 +1 @@
+{"v":"5.6.9","fr":30,"ip":0,"op":20,"w":66,"h":66,"nm":"bottom bar tab/论坛/选中/E","ddd":0,"assets":[{"id":"comp_0","layers":[{"ddd":0,"ind":1,"ty":4,"nm":"白-修正","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},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":4,"s":[80,80,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":9,"s":[110,110,100]},{"t":13,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":1,"y":0},"t":0,"s":[{"i":[[0,-0.66],[0,0],[1.38,0],[0,1.38],[0,0],[-0.66,0],[0,0]],"o":[[0,0],[0,1.38],[-1.38,0],[0,0],[0,-0.66],[0,0],[0.66,0]],"v":[[2.5,-1.3],[2.5,0],[0,2.5],[-2.5,0],[-2.5,-1.3],[-1.3,-2.5],[1.3,-2.5]],"c":true}]},{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"t":4,"s":[{"i":[[0,-0.66],[0,0],[1.38,0],[0,1.38],[0,0],[-0.66,0],[0,0]],"o":[[0,0],[0,1.38],[-1.38,0],[0,0],[0,-0.66],[0,0],[0.66,0]],"v":[[2.5,-0.102],[2.5,0],[0,2.109],[-2.5,0],[-2.5,-0.102],[-1.3,-1.302],[1.3,-1.302]],"c":true}]},{"i":{"x":0.667,"y":1},"o":{"x":1,"y":0},"t":9,"s":[{"i":[[0,-0.66],[0,0],[1.38,0],[0,1.38],[0,0],[-0.66,0],[0,0]],"o":[[0,0],[0,1.38],[-1.38,0],[0,0],[0,-0.66],[0,0],[0.66,0]],"v":[[2.498,-1.845],[2.5,0],[0,2.734],[-2.5,0],[-2.502,-1.845],[-1.302,-3.045],[1.298,-3.045]],"c":true}]},{"t":13,"s":[{"i":[[0,-0.66],[0,0],[1.38,0],[0,1.38],[0,0],[-0.66,0],[0,0]],"o":[[0,0],[0,1.38],[-1.38,0],[0,0],[0,-0.66],[0,0],[0.66,0]],"v":[[2.5,-1.3],[2.5,0],[0,2.5],[-2.5,0],[-2.5,-1.3],[-1.3,-2.5],[1.3,-2.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":"填充 1","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":150,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"蓝","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,33.76,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.8,0.42],[-3.44,-0.79],[-0.09,-1.71],[0,0],[0,0],[1.98,-0.1],[0,0],[0,0],[0,0],[0.62,0.57],[0,0],[0,0],[0,0],[0,0],[0,0],[0.2,1.89],[0,0],[0,0],[0,0]],"o":[[3.44,-0.79],[1.74,0.41],[0,0],[0,0],[0,2],[0,0],[0,0],[0,0],[-0.69,0.52],[0,0],[0,0],[0,0],[0,0],[0,0],[-1.94,0],[0,0],[0,0],[0,0],[0,-1.8]],"v":[[-6.39,-8.971],[6.39,-8.971],[9.49,-5.471],[9.5,-5.271],[9.5,3.249],[5.95,6.989],[5.75,6.999],[3.25,6.999],[0.3,9.209],[-1.95,9.089],[-2.06,8.969],[-2.17,8.849],[-2.21,8.779],[-3.4,6.999],[-5.75,6.999],[-9.48,3.639],[-9.49,3.449],[-9.5,3.249],[-9.5,-5.271]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.266,0.638,1,0.5,0.242,0.595,1,1,0.217,0.552,1],"ix":9}},"s":{"a":0,"k":[-9.5,-9.561],"ix":5},"e":{"a":0,"k":[9.5,9.561],"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":"路径","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":150,"st":0,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":0,"nm":"预合成 1","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},"a":{"a":0,"k":[33,33,0],"ix":1},"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":4,"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":9,"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":13,"s":[90,90,100]},{"t":16,"s":[100,100,100]}],"ix":6}},"ao":0,"w":66,"h":66,"ip":0,"op":20,"st":0,"bm":0}],"markers":[]}
--- a/app/src/main/assets/lottie/tab_game.json
+++ b/app/src/main/assets/lottie/tab_game.json
--- a/app/src/main/assets/lottie/tab_video.json
+++ b/app/src/main/assets/lottie/tab_video.json
@ -0,0 +1 @@
+{"v":"5.5.9","fr":30,"ip":0,"op":20,"w":66,"h":66,"nm":"tab_video","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"形状图层 1","parent":2,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.771],"y":[0]},"t":0,"s":[0]},{"t":5,"s":[100]}],"ix":11},"r":{"a":0,"k":90,"ix":10},"p":{"a":0,"k":[-3.742,6.835,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[30.937,31.042,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"sr","sy":2,"d":1,"pt":{"a":0,"k":3,"ix":3},"p":{"a":0,"k":[0,0],"ix":4},"r":{"a":0,"k":0,"ix":5},"or":{"a":0,"k":29.286,"ix":7},"os":{"a":0,"k":75,"ix":9},"ix":1,"nm":"多边星形路径 1","mn":"ADBE Vector Shape - Star","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":13,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[-20.75,-13.25],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[102.743,88.578],"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":"多边星形 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.657],"y":[0]},"t":0,"s":[0]},{"t":8,"s":[100]}],"ix":2},"o":{"a":0,"k":-115,"ix":3},"m":1,"ix":2,"nm":"修剪路径 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":60,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"路径 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,33.004,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.508,0.508,0.333],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.488,0.488,0.333],"y":[0,0,0]},"t":4,"s":[80,80,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.502,0.502,0.333],"y":[0,0,0]},"t":9,"s":[110,110,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.534,0.534,0.333],"y":[0,0,0]},"t":13,"s":[95,95,100]},{"t":16,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[2.16,0.38],[3.22,-0.55],[0.38,-2.16],[-0.55,-3.22],[-2.16,-0.38],[-1.63,0],[-1.61,0.27],[-0.38,2.16],[0.55,3.22]],"o":[[-0.38,-2.16],[-3.22,-0.55],[-2.16,0.38],[-0.55,3.22],[0.38,2.16],[1.61,0.27],[1.63,0],[2.16,-0.38],[0.55,-3.22],[0,0]],"v":[[9.09,-4.86],[4.86,-9.09],[-4.86,-9.09],[-9.09,-4.86],[-9.09,4.86],[-4.86,9.09],[0,9.5],[4.86,9.09],[9.09,4.86],[9.09,-4.86]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.266,0.638,1,0.5,0.242,0.595,1,1,0.217,0.552,1],"ix":9}},"s":{"a":0,"k":[-5.174,-4.43],"ix":5},"e":{"a":0,"k":[8.612,8.214],"ix":6},"t":1,"nm":"Gradient Fill 3","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":"路径","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":60,"st":0,"bm":0}],"markers":[]}
--- a/app/src/main/java/com/gh/ad/AdDelegateHelper.kt
+++ b/app/src/main/java/com/gh/ad/AdDelegateHelper.kt
@ -28,7 +28,7 @@ import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.exposure.ExposureSource
 import com.gh.gamecenter.common.retrofit.BiResponse
 import com.gh.gamecenter.common.utils.*
-import com.gh.gamecenter.core.AppExecutor
+import com.gh.gamecenter.core.provider.IBeiziAdProvider
 import com.gh.gamecenter.core.provider.ICsjAdProvider
 import com.gh.gamecenter.core.utils.CurrentActivityHolder
 import com.gh.gamecenter.core.utils.SPUtils
@ -46,11 +46,14 @@ import io.reactivex.schedulers.Schedulers
 *
 * 由它来分发功能实现到具体的实现
 *
- * 以开屏广告为例，有两种实现（1. 自有的广告实现 2. 穿山甲的开屏广告实现 ）
+ * 以最复杂的开屏广告为例，有三种实现（1. 自有的广告实现 2. 穿山甲的开屏广告实现 3. Beizi 的开屏广告实现）
+ *
+ * 由于两个广告 SDK 有可能在一次启动中都被使用，所以会根据获取到的广告配置 config 来决定是否需要出是很好两个 SDK
 */
 object AdDelegateHelper {

    private var mCsjAdImpl: ICsjAdProvider? = null
+    private var mBeiziAdImpl: IBeiziAdProvider? = null

    private val mAdConfigList: ArrayList<AdConfig> by lazy { arrayListOf() }

@ -62,10 +65,8 @@ object AdDelegateHelper {
    val vGameLaunchAd: AdConfig?
        get() = mVGameLaunchAd

-    val splashAdDisplayInterval: Int
-        get() = mSplashAd?.ownerAd?.startAd?.displayInterval ?: 3
-
    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" // 自有广告

@ -79,19 +80,13 @@ object AdDelegateHelper {
    var gameSearchKeyword = ""

    fun initAdSdk(context: Context) {
-        if (AdPluginDownloadHelper.isCsjPluginDownloaded()) {
-            initAdSdkInternal(context)
-        } else {
-            // 首次启动，为了不影响首页加载，延迟 3 秒再下载广告插件并初始化
-            AppExecutor.uiExecutor.executeWithDelay({
-                AdPluginDownloadHelper.downloadPluginIfNeeded(isCsj = true) {
-                    initAdSdkInternal(context)
-                }
-            }, 3000L)
+        // 初始化 Beizi
+        if (mBeiziAdImpl == null) {
+            mBeiziAdImpl =
+                ARouter.getInstance().build(RouteConsts.provider.beiziAd).navigation() as? IBeiziAdProvider
+            mBeiziAdImpl?.initSDK(context)
        }
-    }

-    private fun initAdSdkInternal(context: Context) {
        // 初始化穿山甲
        if (mCsjAdImpl == null) {
            mCsjAdImpl =
@ -198,7 +193,7 @@ object AdDelegateHelper {
    /**
     * 热启动是否需要显示开屏广告(目前只展示第三方广告)
     */
-    private fun shouldShowStartUpAdWhenHotLaunch() = (mCsjAdImpl != null)
+    private fun shouldShowStartUpAdWhenHotLaunch() = (mCsjAdImpl != null || mBeiziAdImpl != null)
            && mSplashAd?.displayRule?.hotStartSplashAd?.type == AD_TYPE_SDK
            && mSplashAd?.hotStartThirdPartyAd != null

@ -241,7 +236,18 @@ object AdDelegateHelper {
    /**
     * 是否大于开屏广告展示间隔时长
     */
-    private fun isMatchStartUpAdDisplayRule(): Boolean = isMatchAdDisplayRule(mSplashAd, Constants.SP_LAST_SPLASH_AD_SHOW_TIME)
+    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
+    }

    /**
     * 是否大于广告管理展示间隔时长
@ -295,7 +301,6 @@ object AdDelegateHelper {
        adViewHeightInDp: Float,
        startAdContainer: ViewGroup,
        sdkStartAdContainer: ViewGroup,
-        sdkJumpBtn: TextView,
        adsViewGroup: FrameLayout,
        handler: BaseActivity.BaseHandler,
        isHotLaunch: Boolean,
@ -317,7 +322,6 @@ object AdDelegateHelper {
                        adViewHeightInDp,
                        startAdContainer,
                        sdkStartAdContainer,
-                        sdkJumpBtn,
                        adsViewGroup,
                        handler,
                        isHotLaunch,
@ -335,7 +339,6 @@ object AdDelegateHelper {
                        adViewHeightInDp,
                        startAdContainer,
                        sdkStartAdContainer,
-                        sdkJumpBtn,
                        adsViewGroup,
                        handler,
                        isHotLaunch,
@ -359,7 +362,6 @@ object AdDelegateHelper {
        adViewHeightInDp: Float,
        startAdContainer: ViewGroup,
        sdkStartAdContainer: ViewGroup,
-        sdkJumpBtn: TextView,
        adsViewGroup: FrameLayout,
        handler: BaseActivity.BaseHandler,
        isHotLaunch: Boolean,
@ -381,7 +383,6 @@ object AdDelegateHelper {
                        adViewHeightInDp,
                        startAdContainer,
                        sdkStartAdContainer,
-                        sdkJumpBtn,
                        adsViewGroup,
                        handler,
                        isHotLaunch,
@ -407,18 +408,20 @@ object AdDelegateHelper {
            ((mSplashAd?.displayRule?.timeout ?: 3.5F) * 1000).toInt()
        }

-        if (thirdPartyAd.sourceName == AD_SDK_CSJ) {
+        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,
-                sdkJumpBtn,
                timeout,
-                isHotLaunch,
                sdkSplashCallback
            )
        }
@ -429,70 +432,50 @@ object AdDelegateHelper {
     */
    private fun requestCsjSplashAd(
        activity: Activity,
+        slotId: String,
        adViewWidthInPx: Int,
        adViewHeightInPx: Int,
        adViewWidthInDp: Float,
        adViewHeightInDp: Float,
        startAdContainer: ViewGroup,
-        sdkJumpBtn: TextView,
        timeout: Int,
-        isHotLaunch: Boolean,
        callback: (isSuccess: Boolean) -> Unit,
    ) {
-        val thirdPartyAd = if (isHotLaunch) mSplashAd?.hotStartThirdPartyAd else mSplashAd?.thirdPartyAd
-        if (mCsjAdImpl == null || thirdPartyAd == null) {
+        if (mCsjAdImpl == null) {
            callback.invoke(false)
        } else {
-            sdkJumpBtn.setOnClickListener {
-                callback.invoke(true)
-                if (activity is BaseActivity) {
-                    activity.baseHandler.removeMessages(MainActivity.COUNTDOWN_SDK_AD)
-                }
-            }
-
-            val onAdShowAction = {
-                sdkJumpBtn.visibility = View.VISIBLE
-                if (activity is BaseActivity) {
-                    activity.baseHandler.sendEmptyMessageDelayed(MainActivity.COUNTDOWN_SDK_AD, 1000)
-                }
-                SensorsBridge.trackEvent("ThirdPartyAdShow",
-                    "ad_source", thirdPartyAd.sourceName,
-                    "ad_id", thirdPartyAd.slotId,
-                    "ad_format", mSplashAd?.typeChinese ?: "",
-                    "ad_placement", "光环启动",
-                    "launch_type", if (isHotLaunch) "热启动" else "冷启动",
-                    "ad_space_id", mSplashAd?.id ?: "",
-                    "ad_space_name", mSplashAd?.name ?: ""
-                )
-            }
-            val onAdClickAction = {
-                callback.invoke(true)
-                SensorsBridge.trackEvent("ThirdPartyAdClick",
-                    "ad_source", thirdPartyAd.sourceName,
-                    "ad_id", thirdPartyAd.slotId,
-                    "ad_format", mSplashAd?.typeChinese ?: "",
-                    "ad_placement", "光环启动",
-                    "launch_type", if (isHotLaunch) "热启动" else "冷启动",
-                    "ad_space_id", mSplashAd?.id ?: "",
-                    "ad_space_name", mSplashAd?.name ?: ""
-                )
-            }
            mCsjAdImpl?.requestSplashAd(
                activity,
-                thirdPartyAd.slotId,
+                slotId,
                adViewWidthInPx,
                adViewHeightInPx,
                adViewWidthInDp,
                adViewHeightInDp,
                startAdContainer,
                timeout,
-                onAdShowAction,
-                onAdClickAction,
                callback,
            )
        }
    }

+    /**
+     * 获取 Beizi 的开屏广告
+     */
+    private fun requestBeiziSplashAd(
+        startAdContainer: View,
+        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)
+        }
+    }
+
    /**
     * 显示自有的开屏广告
     */
@ -504,7 +487,6 @@ object AdDelegateHelper {
        adViewHeightInDp: Float,
        startAdContainer: ViewGroup,
        sdkStartAdContainer: ViewGroup,
-        sdkJumpBtn: TextView,
        adsViewGroup: FrameLayout,
        handler: BaseActivity.BaseHandler,
        isHotLaunch: Boolean,
@ -522,7 +504,6 @@ object AdDelegateHelper {
                    adViewHeightInDp,
                    startAdContainer,
                    sdkStartAdContainer,
-                    sdkJumpBtn,
                    adsViewGroup,
                    handler,
                    isHotLaunch,
@ -575,15 +556,12 @@ object AdDelegateHelper {
        handler: BaseActivity.BaseHandler,
        hideCallback: () -> Unit
    ) {
-        val jumpBtn = startAdContainer.findViewById<TextView>(R.id.jumpBtn)
+        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 adVideo = startAdContainer.findViewById<SplashAdVideoView>(R.id.ad_video)
        val icpContainer: View? = startAdContainer.findViewById(R.id.startAdIcpContainer)
        startAdContainer.visibility = View.VISIBLE
        icpContainer?.visibility = View.VISIBLE
-        jumpBtn.text = startAdContainer.context.getString(R.string.splash_jump, splashAdDisplayInterval)
-
        jumpDetailBtn.text = ad.desc
        jumpDetailBtn.setDrawableEnd(
            AppCompatResources.getDrawable(
@ -591,16 +569,7 @@ object AdDelegateHelper {
                R.drawable.ic_startup_ad_arrow
            ), null, null
        )
-
-        adImage.visibleIf(true)
        ImageUtils.display(adImage, ad.img)
-
-        if (ad.isImageType) {
-            adVideo.visibleIf(false)
-        } else {
-            adVideo.visibleIf(true)
-            adVideo.startPlay(ad.video.url)
-        }
        startAdContainer.setOnClickListener {
            // 拦截点击事件传递
        }
@ -670,11 +639,9 @@ object AdDelegateHelper {
        slotId: String,
        adContainerView: ViewGroup,
        expressViewWidth: Float,
-        onAdShowAction: () -> Unit,
-        onAdClickAction: () -> Unit,
        callback: (isSuccess: Boolean) -> Unit,
    ) {
-        mCsjAdImpl?.requestFlowAd(fragment, adContainerView, slotId, expressViewWidth, onAdShowAction, onAdClickAction, callback)
+        mCsjAdImpl?.requestFlowAd(fragment, adContainerView, slotId, expressViewWidth, callback)
    }

    /**
@ -685,8 +652,6 @@ object AdDelegateHelper {
        containerView: ViewGroup,
        ad: AdConfig.ThirdPartyAd,
        expressViewWidthInDp: Float,
-        onAdShowAction: () -> Unit,
-        onAdClickAction: () -> Unit,
        callback: (isSuccess: Boolean) -> Unit
    ) {

@ -709,28 +674,6 @@ object AdDelegateHelper {
            slotId,
            expressViewWidthInDp,
            expressViewHeightInDp,
-            onAdShowAction,
-            onAdClickAction,
-            callback
-        )
-    }
-
-    /**
-     * 获取第三方 全屏/插屏 广告
-     */
-    fun requestFullScreenAd(
-        fragment: Fragment,
-        ad: AdConfig.ThirdPartyAd,
-        onAdShowAction: () -> Unit,
-        onAdClickAction: () -> Unit,
-        callback: (isSuccess: Boolean) -> Unit
-    ) {
-        val slotId = ad.slotId
-        mCsjAdImpl?.requestFullScreenAd(
-            fragment,
-            slotId,
-            onAdShowAction,
-            onAdClickAction,
            callback
        )
    }
@ -739,6 +682,7 @@ object AdDelegateHelper {
     * 取消开屏广告
     */
    fun cancelSplashAd(context: Context) {
+        mBeiziAdImpl?.cancelSplashAd(context)
        mCsjAdImpl?.cancelSplashAd(context)
    }

--- a/app/src/main/java/com/gh/ad/AdPluginDownloadHelper.kt
+++ b/app/src/main/java/com/gh/ad/AdPluginDownloadHelper.kt
@ -1,149 +0,0 @@
-package com.gh.ad
-
-import com.gh.download.simple.DownloadMessageHandler
-import com.gh.download.simple.SimpleDownloadDatabase
-import com.gh.download.simple.SimpleDownloadManager
-import com.gh.gamecenter.core.runOnIoThread
-import com.gh.gamecenter.core.utils.PluginRedirectHelper
-import com.gh.gamecenter.core.utils.SPUtils
-import com.lg.download.DownloadError
-import com.lg.download.DownloadStatus
-import com.lg.download.httpclient.DefaultHttpClient
-import com.lg.download.listener.InnerDownloadListener
-import com.lg.ndownload.DownloadConfig
-import com.lg.ndownload.DownloadConfigBuilder
-import com.lg.ndownload.DownloadIoExecutor
-import com.lightgame.utils.Utils
-import java.lang.Exception
-import java.net.URLConnection
-
-object AdPluginDownloadHelper : InnerDownloadListener {
-
-    private const val CSJ_FILE_NAME = "2011394667"
-    private const val GDT_FILE_NAME = "gdt_plugin/gdtadv2.jar"
-
-    private const val CSJ_PLUGIN_URL = "https://and-static.ghzs66.com/android/static/2011394667"
-    private const val GDT_PLUGIN_URL = "https://and-static.ghzs66.com/android/static/gdtadv2.jar"
-
-    private var csjDownloadedCallback: (() -> Unit)? = null
-
-    /**
-     * 是否已经下载了广告插件
-     */
-    fun isCsjPluginDownloaded(): Boolean {
-        return SPUtils.getBoolean(CSJ_FILE_NAME, false)
-    }
-
-    /**
-     * 下载广告插件并初始化 （初始化限定穿山甲）
-     */
-    fun downloadPluginIfNeeded(isCsj: Boolean = false, isGdt: Boolean = false, csjCallback: (() -> Unit)? = null) {
-        val isCsjPluginDownloaded = SPUtils.getBoolean(CSJ_FILE_NAME, false)
-        val isGdtPluginDownloaded = SPUtils.getBoolean(GDT_FILE_NAME, false)
-
-        if (isCsj && isCsjPluginDownloaded) {
-            csjCallback?.invoke()
-            return
-        }
-
-        if (isGdt && isGdtPluginDownloaded) {
-            return
-        }
-
-        runOnIoThread {
-            csjDownloadedCallback = csjCallback
-
-            DownloadMessageHandler.init(SimpleDownloadDatabase.instance.downloadDao())
-
-            if (!isCsjPluginDownloaded && isCsj) {
-                val csjPluginConfig = DownloadConfigBuilder()
-                    .setUniqueId(CSJ_FILE_NAME)
-                    .setUrl(CSJ_PLUGIN_URL)
-                    .setFileName(CSJ_FILE_NAME)
-                    .setHttpClient(DefaultHttpClient())
-                    .setDownloadThreadSize(2)
-                    .setPathToStore(PluginRedirectHelper.getAssetDir())
-                    .setDownloadExecutor(DownloadIoExecutor.getInstance())
-                    .setDownloadListener(this).build()
-
-                SimpleDownloadManager.download(csjPluginConfig)
-            }
-
-            if (!isGdtPluginDownloaded && isGdt) {
-                val gdtPluginConfig = DownloadConfigBuilder()
-                    .setUniqueId(GDT_FILE_NAME)
-                    .setUrl(GDT_PLUGIN_URL)
-                    .setFileName(GDT_FILE_NAME)
-                    .setHttpClient(DefaultHttpClient())
-                    .setDownloadThreadSize(2)
-                    .setPathToStore(PluginRedirectHelper.getAssetDir())
-                    .setDownloadExecutor(DownloadIoExecutor.getInstance())
-                    .setDownloadListener(this).build()
-
-                SimpleDownloadManager.download(gdtPluginConfig)
-            }
-        }
-    }
-
-    override fun onError(id: String?, error: DownloadError?, exception: Exception?) {
-        Utils.log("下载广告插件失败 $id")
-        id?.let {
-            if (it == CSJ_FILE_NAME) {
-                csjDownloadedCallback = null
-            }
-            SimpleDownloadManager.cancel(it)
-        }
-    }
-
-    override fun onProgress(id: String?, progress: Float) {
-        Utils.log("下载广告插件进度 $id $progress")
-    }
-
-    override fun onProgressWithoutThrottle(id: String?, progress: Float) {
-        // do nothing
-    }
-
-    override fun onSizeReceived(id: String?, fileSize: Long) {
-        // do nothing
-    }
-
-    override fun onReadyToDownload(id: String?, actualThreadSize: Int) {
-        // do nothing
-    }
-
-    override fun onStatusChanged(id: String?, status: DownloadStatus?) {
-        // do nothing
-    }
-
-    override fun onDownloadComplete(id: String?, elapsedTime: Long) {
-        id?.let {
-            // id 即为插件名
-            SPUtils.setBoolean(it, true)
-            if (it == CSJ_FILE_NAME) {
-                csjDownloadedCallback?.invoke()
-                csjDownloadedCallback = null
-            }
-        }
-    }
-
-    override fun onSpeedChanged(id: String?, speed: Float) {
-        // do nothing
-    }
-
-    override fun onRedirectingUrl(
-        id: String?,
-        connection: URLConnection?,
-        config: DownloadConfig?
-    ) {
-        // do nothing
-    }
-
-    override fun onRedirectedUrl(
-        id: String?,
-        connection: URLConnection?,
-        redirectedUrl: String?
-    ) {
-        // do nothing
-    }
-
-}
--- a/app/src/main/java/com/gh/ad/LaunchAdImpl.kt
+++ b/app/src/main/java/com/gh/ad/LaunchAdImpl.kt
@ -3,105 +3,42 @@ package com.gh.ad
 import android.content.Context
 import android.view.View
 import android.view.ViewGroup
-import android.view.ViewStub
+
 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.provider.ILaunchAd
-import com.gh.gamecenter.common.utils.SensorsBridge
 import com.gh.gamecenter.common.utils.goneIf
 import com.gh.gamecenter.core.utils.DisplayUtils
 import com.gh.gamecenter.core.utils.SPUtils
-import com.gh.gamecenter.entity.AdConfig
+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, topViewStub: ViewStub, bottomViewStub: ViewStub, adClickAction: () -> Unit): View {
+    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) {
-                val onAdShowAction = {
-                    SensorsBridge.trackEvent("ThirdPartyAdShow",
-                        "ad_source", thirdPartyAd.sourceName,
-                        "ad_id", thirdPartyAd.slotId,
-                        "ad_format", launchAd.typeChinese,
-                        "ad_placement", AD_PLACEMENT,
-                        "ad_space_id", launchAd.id,
-                        "ad_space_name", launchAd.name
-                    )
-                }
-                val onAdClickAction = {
-                    SensorsBridge.trackEvent("ThirdPartyAdClick",
-                        "ad_source", thirdPartyAd.sourceName,
-                        "ad_id", thirdPartyAd.slotId,
-                        "ad_format", launchAd.typeChinese,
-                        "ad_placement", AD_PLACEMENT,
-                        "ad_space_id", launchAd.id,
-                        "ad_space_name", launchAd.name
-                    )
-                    adClickAction.invoke()
-                }
-
-                if (launchAd.type == AdConfig.TYPE_BANNER) {
-                    requestBannerAd(fragment, container, maskView, thirdPartyAd, onAdShowAction, onAdClickAction)
-                    return topViewStub.inflate()
-                } else if (launchAd.type == AdConfig.TYPE_INTERSTITIAL) {
-                    requestFullScreenAd(fragment, thirdPartyAd, onAdShowAction, onAdClickAction)
-                    return bottomViewStub.inflate()
+                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())
+                    }
                }
            }
        }
-        return bottomViewStub.inflate()
    }

-    private fun requestBannerAd(
-        fragment: Fragment,
-        container: ViewGroup,
-        maskView: View,
-        thirdPartyAd: AdConfig.ThirdPartyAd,
-        onAdShowAction: () -> Unit,
-        onAdClickAction: () -> Unit,
-    ) {
-        AdDelegateHelper.requestThirdPartyBannerAd(
-            fragment,
-            container,
-            thirdPartyAd,
-            DisplayUtils.getScreenWidthInDp(fragment.requireActivity()),
-            onAdShowAction,
-            onAdClickAction
-        ) { isSuccess ->
-            maskView.goneIf(!isSuccess)
-            if (isSuccess) {
-                SPUtils.setLong(Constants.SP_LAST_HELPER_LAUNCH_AD_SHOW_TIME, System.currentTimeMillis())
-            }
-        }
-    }

-    private fun requestFullScreenAd(
-        fragment: Fragment,
-        thirdPartyAd: AdConfig.ThirdPartyAd,
-        onAdShowAction: () -> Unit,
-        onAdClickAction: () -> Unit
-    ) {
-        AdDelegateHelper.requestFullScreenAd(
-            fragment,
-            thirdPartyAd,
-            onAdShowAction,
-            onAdClickAction
-        ) { isSuccess ->
-            if (isSuccess) {
-                SPUtils.setLong(Constants.SP_LAST_HELPER_LAUNCH_AD_SHOW_TIME, System.currentTimeMillis())
-            }
-        }
-    }
-
-    companion object {
-        private const val AD_PLACEMENT = "畅玩启动"
-    }
 }
--- a/app/src/main/java/com/gh/ad/SplashAdVideoView.kt
+++ b/app/src/main/java/com/gh/ad/SplashAdVideoView.kt
@ -1,78 +0,0 @@
-package com.gh.ad
-
-import android.app.Activity
-import android.content.Context
-import android.util.AttributeSet
-import android.view.WindowManager
-import com.gh.gamecenter.R
-import com.gh.gamecenter.video.detail.CustomManager
-import com.shuyu.gsyvideoplayer.utils.GSYVideoType
-import com.shuyu.gsyvideoplayer.utils.GSYVideoType.SCREEN_TYPE_FULL
-import com.shuyu.gsyvideoplayer.video.StandardGSYVideoPlayer
-import com.shuyu.gsyvideoplayer.video.base.GSYVideoViewBridge
-
-class SplashAdVideoView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null
-) :
-    StandardGSYVideoPlayer(context, attrs) {
-
-    fun startPlay(url: String) {
-        GSYVideoType.setShowType(SCREEN_TYPE_FULL)
-        GSYVideoType.setRenderType(GSYVideoType.SUFRACE)
-        CustomManager.getCustomManager(getKey()).isNeedMute = true
-
-        setUp(url, true, "")
-
-        setNeedAutoAdaptation(false)
-        startPlayLogic()
-    }
-
-    override fun getGSYVideoManager(): GSYVideoViewBridge {
-        CustomManager.getCustomManager(getKey()).initContext(context.applicationContext)
-        return CustomManager.getCustomManager(getKey())
-    }
-
-    private fun getKey() = "splash_ad"
-
-    /**
-     * 覆盖父类方法，防止在是视频 Preparing 阶段封面图被隐藏，导致白屏
-     */
-    override fun changeUiToPreparingShow() = Unit
-
-    override fun getLayoutId(): Int {
-        return R.layout.layout_splash_ad_video
-    }
-
-    override fun onAutoCompletion() {
-        setStateAndUi(CURRENT_STATE_AUTO_COMPLETE);
-
-        mSaveChangeViewTIme = 0
-        mCurrentPosition = 0
-
-        if (!mIfCurrentIsFullscreen) {
-            getGSYVideoManager().setLastListener(null)
-        }
-        mAudioManager.abandonAudioFocus(onAudioFocusChangeListener);
-        if (mContext is Activity) {
-            try {
-                (mContext as Activity).getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
-            } catch (e: Exception) {
-                e.printStackTrace()
-            }
-        }
-        releaseNetWorkState()
-
-        if (mVideoAllCallBack != null && isCurrentMediaListener()) {
-            mVideoAllCallBack.onAutoComplete(mOriginUrl, mTitle, this)
-        }
-        mHadPlay = false
-    }
-
-    fun clearAll() {
-        GSYVideoType.setShowType(GSYVideoType.SCREEN_TYPE_DEFAULT)
-        GSYVideoType.setRenderType(GSYVideoType.TEXTURE)
-        release()
-        CustomManager.removeManager(getKey())
-    }
-}
--- a/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt
+++ b/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt
@ -21,8 +21,6 @@ import com.gh.common.view.RichEditor
 import com.gh.gamecenter.CropImageActivity
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.base.activity.ToolBarActivity
-import com.gh.gamecenter.common.entity.LocalVideoEntity
-import com.gh.gamecenter.feature.selector.LocalMediaActivity
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.core.AppExecutor
 import com.gh.gamecenter.core.runOnIoThread
@ -32,7 +30,6 @@ import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.qa.editor.*
 import com.gh.gamecenter.feature.entity.AnswerEntity
 import com.gh.gamecenter.feature.entity.ArticleEntity
-import com.gh.gamecenter.feature.selector.ChooseType
 import com.gh.gamecenter.qa.entity.EditorInsertEntity
 import com.gh.gamecenter.video.poster.PosterEditActivity
 import com.gh.gamecenter.video.upload.UploadManager
@ -236,7 +233,7 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> constructor(
        mKeyboardHeightProvider = KeyboardHeightProvider(this)
        mRichEditor.post { mKeyboardHeightProvider?.start() }
        mRichEditor.enableForceDark(DarkModeUtils.isDarkModeOn(this))
-        mRichEditor.setEditorBackgroundColor(com.gh.gamecenter.common.R.color.ui_surface.toColor(this))
+        mRichEditor.setEditorBackgroundColor(R.color.ui_surface.toColor(this))
        mRichEditor.setEditorFontColor(if (mIsDarkModeOn) Color.parseColor("#C2C2C2") else Color.parseColor("#4A4A4A"))
        // 防止个别手机在Js里无法获取粘贴内容
        mRichEditor.addJavascriptInterface(OnPasteListener(), "onPasteListener")
@ -505,7 +502,7 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> constructor(
                startActivityForResult(
                    LocalMediaActivity.getIntent(
                        this@BaseRichEditorActivity,
-                        ChooseType.VIDEO,
+                        LocalMediaActivity.ChooseType.VIDEO,
                        maxChooseCount,
                        if (mtaEventName() == "提问帖") "发提问帖" else "发帖子"
                    ), INSERT_MEDIA_VIDEO_CODE
@ -534,7 +531,7 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> constructor(
                val maxChooseCount = if (imageCount + 10 <= MAX_IMAGE_COUNT) 10 else MAX_IMAGE_COUNT - imageCount
                val intent = LocalMediaActivity.getIntent(
                    this@BaseRichEditorActivity,
-                    ChooseType.IMAGE,
+                    LocalMediaActivity.ChooseType.IMAGE,
                    maxChooseCount,
                    if (mtaEventName() == "提问帖") "发提问帖" else "发帖子"
                )
@ -800,9 +797,9 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> constructor(

    override fun onDarkModeChanged() {
        super.onDarkModeChanged()
-        updateStatusBarColor(com.gh.gamecenter.common.R.color.ui_surface, com.gh.gamecenter.common.R.color.ui_surface)
+        updateStatusBarColor(R.color.ui_surface, R.color.ui_surface)
        mRichEditor.enableForceDark(DarkModeUtils.isDarkModeOn(this))
-        mRichEditor.setEditorBackgroundColor(com.gh.gamecenter.common.R.color.ui_surface.toColor(this))
+        mRichEditor.setEditorBackgroundColor(R.color.ui_surface.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
@ -10,6 +10,7 @@ import android.text.TextUtils
 import androidx.lifecycle.AndroidViewModel
 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
@ -19,7 +20,7 @@ import com.gh.gamecenter.core.runOnUiThread
 import com.gh.gamecenter.core.utils.MD5Utils
 import com.gh.gamecenter.core.utils.ToastUtils
 import com.gh.gamecenter.entity.ForumDetailEntity
-import com.gh.gamecenter.common.entity.LocalVideoEntity
+import com.gh.gamecenter.entity.LocalVideoEntity
 import com.gh.gamecenter.entity.QuoteCountEntity
 import com.gh.gamecenter.qa.BbsType
 import com.gh.gamecenter.retrofit.RetrofitManager
@ -38,6 +39,8 @@ 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

@ -83,7 +86,7 @@ abstract class BaseRichEditorViewModel(application: Application) : AndroidViewMo
                    val application: Application = getApplication()
                    Utils.toast(
                        getApplication(),
-                        application.getString(com.gh.gamecenter.common.R.string.pic_max_hint, count)
+                        application.getString(R.string.pic_max_hint, count)
                    )
                    continue
                }
--- a/app/src/main/java/com/gh/base/GlobalActivityLifecycleObserver.kt
+++ b/app/src/main/java/com/gh/base/GlobalActivityLifecycleObserver.kt
@ -16,18 +16,18 @@ 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.provider.IHelpAndFeedbackProvider
 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.gamecenter.va.VCore
-import com.gh.gamecenter.login.utils.QuickLoginHelper
 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,31 +35,28 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {

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

-        if (GlobalActivityManager.activityCount == 1) {
+        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)
            }
        }
-        if (QuickLoginHelper.isLoginAuthPage(activity)) {
-            QuickLoginHelper.addCustomViewToLoginAuthPage(activity)
-        }
    }

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

        if (activity is AppCompatActivity
-            && !VCore.getInstance().isLaunchActivity(activity)
+            && activity !is LaunchActivity
            && activity !is LoginActivity
            && activity !is SplashScreenActivity
            && activity !is SkipActivity
@ -111,8 +108,8 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
    }

    override fun onActivityStopped(activity: Activity) {
-        GlobalActivityManager.activityCount --
-        isFromBackgroundToForeground = GlobalActivityManager.activityCount <= 0
+        activityCount --
+        isFromBackgroundToForeground = activityCount <= 0
    }

    override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {
@ -120,16 +117,7 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
    }

    override fun onActivityDestroyed(activity: Activity) {
-        if (QuickLoginHelper.isLoginAuthPage(activity)) {
-            QuickLoginHelper.release()
-        }
-    }
-
-    private fun isSuggestionActivity(activity: Activity): Boolean {
-        val helpAndFeedbackProvider =
-            ARouter.getInstance().build(RouteConsts.provider.helpAndFeedback)
-                .navigation() as? IHelpAndFeedbackProvider
-        return helpAndFeedbackProvider?.isSuggestionActivity(activity) ?: false
+        // do nothing
    }

 }
--- a/app/src/main/java/com/gh/common/DefaultJsApi.kt
+++ b/app/src/main/java/com/gh/common/DefaultJsApi.kt
@ -32,13 +32,9 @@ import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.common.utils.NewFlatLogUtils
 import com.gh.gamecenter.common.view.dsbridge.CompletionHandler
 import com.gh.gamecenter.core.AppExecutor
-import com.gh.gamecenter.core.provider.IPushProvider
 import com.gh.gamecenter.core.runOnIoThread
 import com.gh.gamecenter.core.runOnUiThread
-import com.gh.gamecenter.core.utils.CurrentActivityHolder
-import com.gh.gamecenter.core.utils.DisplayUtils
-import com.gh.gamecenter.core.utils.SPUtils
-import com.gh.gamecenter.core.utils.ToastUtils
+import com.gh.gamecenter.core.utils.*
 import com.gh.gamecenter.entity.SensorsEvent
 import com.gh.gamecenter.eventbus.EBDownloadStatus
 import com.gh.gamecenter.eventbus.EBPackage
@ -49,7 +45,6 @@ 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
@ -74,7 +69,7 @@ class DefaultJsApi(
    private var mFragment: Fragment? = null,
    private var mBbsId: String? = "",
    private var mOriginUrl: String? = "",
-    private val mForumName: String? = "",
+    private val mForumName: String? = ""
 ) {

    companion object {
@ -94,11 +89,6 @@ class DefaultJsApi(
        }
    }

-    @JavascriptInterface
-    fun isEnableForceDark(msg: Any): Boolean {
-        return DarkModeUtils.isWebViewForceDarkEnabled
-    }
-
    @JavascriptInterface
    fun isGhzs(msg: Any): String {
        return "true"
@ -139,12 +129,12 @@ class DefaultJsApi(

    @JavascriptInterface
    fun login(msg: Any) {
-        if (NetworkUtils.isQuickLoginEnabled(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
@ -256,7 +246,7 @@ class DefaultJsApi(

    @JavascriptInterface
    fun isInstalled(event: Any): String {
-        val localInstalledPackageList = PackageHelper.getInstalledPackageNameList(HaloApp.getInstance().application, 0)
+        val localInstalledPackageList = PackageUtils.getAllPackageName(HaloApp.getInstance().application)
        val packageNameList: ArrayList<String> = event.toString().toObject() ?: ArrayList()

        for (packageName in packageNameList) {
@ -343,12 +333,6 @@ class DefaultJsApi(
        return HaloApp.getInstance().oaid
    }

-    @JavascriptInterface
-    fun getPushId(): String {
-        val pushProvider = ARouter.getInstance().build(RouteConsts.provider.push).navigation() as? IPushProvider
-        return pushProvider?.getRegistrationId(HaloApp.getInstance()) ?: "unknown"
-    }
-
    @JavascriptInterface
    fun showIncompatibleVersionDialog(msg: Any) {
        DialogHelper.showUpgradeDialog(context)
@ -555,7 +539,7 @@ class DefaultJsApi(

    @JavascriptInterface
    fun getInstallStatus(event: Any): String {
-        val localInstalledPackageList = PackageHelper.getInstalledPackageNameList(HaloApp.getInstance().application, 0)
+        val localInstalledPackageList = PackageUtils.getAllPackageName(HaloApp.getInstance().application)
        val packageNameList: ArrayList<String> = event.toString().toObject() ?: ArrayList()
        val installStatusMap: HashMap<String, Boolean> = hashMapOf()

--- a/app/src/main/java/com/gh/common/DefaultUrlHandler.kt
+++ b/app/src/main/java/com/gh/common/DefaultUrlHandler.kt
@ -268,6 +268,10 @@ object DefaultUrlHandler {
                    directToGameVideo(context, id, entrance, "")
                }

+                EntranceConsts.HOST_CATEGORY -> {
+                    val title = uri.getQueryParameter("title")
+                    DirectUtils.directCategoryDirectory(context, id, title ?: "", entrance, "")
+                }
                EntranceConsts.HOST_COLUMN_COLLECTION -> {
                    val name = uri.getQueryParameter("name")
                    DirectUtils.directToColumnCollection(context, id, -1, entrance, name ?: "")
@ -374,7 +378,7 @@ object DefaultUrlHandler {
                    val iconSubscript = uri.getQueryParameter("game_icon_subscript") ?: ""
                    val gameEntity =
                        if (forumType == BbsType.OFFICIAL_BBS.value && gameId.isNotEmpty() && gameName.isNotEmpty() && icon.isNotEmpty()) {
-                            GameEntity(_id = gameId, mName = gameName, mIcon = icon, mIconSubscript = iconSubscript)
+                            GameEntity(id = gameId, mName = gameName, mIcon = icon, mIconSubscript = iconSubscript)
                        } else null
                    val activityLabelEntity = if (activityId.isNotEmpty() && activityName.isNotEmpty()) {
                        ActivityLabelEntity(
--- a/app/src/main/java/com/gh/common/chain/DownloadChainBuilder.kt
+++ b/app/src/main/java/com/gh/common/chain/DownloadChainBuilder.kt
@ -6,8 +6,8 @@ class DownloadChainBuilder {

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

-    fun setProcessEndCallback(gameId: String, callback: (asVGame: Boolean, Any?) -> Unit): DownloadChainBuilder {
-        processEndCallback = VaPluginDownloadWrapper(gameId = gameId, callback = callback) // 其他需要添加行为的装饰者可以一直包装A(B(C(callback))), 执行顺序 A->B->C->callback
+    fun setProcessEndCallback(callback: (asVGame: Boolean, Any?) -> Unit): DownloadChainBuilder {
+        processEndCallback = callback
        return this
    }

--- a/app/src/main/java/com/gh/common/chain/VaPluginDownloadWrapper.kt
+++ b/app/src/main/java/com/gh/common/chain/VaPluginDownloadWrapper.kt
@ -1,12 +0,0 @@
-package com.gh.common.chain
-
-import com.gh.vspace.VHelper
-
-class VaPluginDownloadWrapper(val gameId: String, val callback: (Boolean, Any?) -> Unit) : (Boolean, Any?) -> Unit {
-    override fun invoke(asVGame: Boolean, any: Any?) {
-        callback.invoke(asVGame, any)
-        if (asVGame) {
-            VHelper.initVaPlugin(gameId)
-        }
-    }
-}
--- a/app/src/main/java/com/gh/common/chain/VersionNumberHandler.kt
+++ b/app/src/main/java/com/gh/common/chain/VersionNumberHandler.kt
@ -30,7 +30,7 @@ class VersionNumberHandler : DownloadChainHandler() {
                "温馨提示",
                gameEntity.getVersionNumberString(),
                "继续下载",
-                com.gh.gamecenter.common.R.string.cancel.toResString(),
+                R.string.cancel.toResString(),
                {
                    confirmCallback.invoke()
                    SensorsBridge.trackGameDemoDialogClick(
@ -42,7 +42,7 @@ class VersionNumberHandler : DownloadChainHandler() {
                },
                cancelClickCallback = {
                    SensorsBridge.trackGameDemoDialogClick(
-                        buttonName = com.gh.gamecenter.common.R.string.cancel.toResString(),
+                        buttonName = R.string.cancel.toResString(),
                        gameId = gameEntity.id,
                        gameName = gameEntity.name ?: "",
                        gameType = gameEntity.categoryChinese
--- a/app/src/main/java/com/gh/common/constant/Config.java
+++ b/app/src/main/java/com/gh/common/constant/Config.java
@ -7,7 +7,6 @@ import android.os.Build;
 import android.preference.PreferenceManager;
 import android.text.TextUtils;

-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;

 import com.gh.common.util.PackageHelper;
@ -16,17 +15,14 @@ import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.common.constant.CommonConsts;
 import com.gh.gamecenter.common.constant.Constants;
 import com.gh.gamecenter.common.eventbus.EBReuse;
-import com.gh.gamecenter.common.exposure.meta.MetaUtil;
 import com.gh.gamecenter.common.retrofit.BiResponse;
 import com.gh.gamecenter.common.retrofit.Response;
 import com.gh.gamecenter.common.utils.DarkModeUtils;
 import com.gh.gamecenter.common.utils.EnvHelper;
-import com.gh.gamecenter.core.AppExecutor;
 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.FloatWindowSettingEntity;
 import com.gh.gamecenter.entity.GameGuidePopupEntity;
 import com.gh.gamecenter.entity.NewApiSettingsEntity;
 import com.gh.gamecenter.entity.NewSettingsEntity;
@ -48,9 +44,9 @@ import org.json.JSONObject;
 import java.io.IOException;
 import java.util.Locale;

-import io.reactivex.Observable;
 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;
@ -63,9 +59,6 @@ public class Config {
    public static final String NEW_API_HOST = EnvHelper.getNewHost();
    public static final String VAPI_HOST = EnvHelper.getVHost();

-    public static final String WGAME_CPM_BUSIAPPID = BuildConfig.WGAME_CPM_BUSIAPPID;
-    public static final String WGAME_CPM_API_HOST = EnvHelper.getWGameCPMHost();
-
    // Third-Party confs
    public static final String WECHAT_APPID = BuildConfig.WECHAT_APPID;
    public static final String WECHAT_SECRET = BuildConfig.WECHAT_SECRET;
@ -84,12 +77,10 @@ public class Config {
    private static NewApiSettingsEntity.NightMode mNightModeSetting;
    private static SimulatorEntity mNewSimulatorEntity;
    private static VSetting mVSetting;
-    private volatile static VNewSetting mVNewSetting;
-
-    private static FloatWindowSettingEntity mFloatWindowSetting;
+    private static VNewSetting mVNewSetting;

    private static AppEntity mNew32UpdateEntity;
-    private static BehaviorSubject<VNewSetting> vNewSettingSubject = BehaviorSubject.create();
+    public static BehaviorSubject<VNewSetting> vNewSettingSubject = BehaviorSubject.create();
    private static GameGuidePopupEntity mGameGuidePopupEntity;
    private static SharedPreferences mDefaultSharedPreferences;

@ -99,11 +90,24 @@ public class Config {
        return !SPUtils.getBoolean(Constants.SP_TEENAGER_MODE);
    }

+    /**
+     * VPN 开关选项是否开启
+     */
+    public static boolean isVpnOptionEnabled() {
+        if (mNewApiSettingsEntity == null
+                || mNewApiSettingsEntity.getInstall() == null
+                || mNewApiSettingsEntity.getInstall().getVpnRequired() == null) {
+            return false;
+        }
+
+        return mNewApiSettingsEntity.getInstall().getVpnRequired().getShouldShowVpnOption();
+    }
+
    public static void setSettings(SettingsEntity settingsEntity) {
        getPreferences().edit().putString(SETTINGS_KEY, GsonUtils.toJson(settingsEntity)).apply();
        mSettingsEntity = settingsEntity;

-        PackageHelper.refreshPackageNameList();
+        PackageHelper.refreshList();
    }

    @Nullable
@ -219,31 +223,6 @@ public class Config {
        }
        return mVNewSetting;
    }
-    @Nullable
-    public static FloatWindowSettingEntity getFloatWindowSettingEntity() {
-        if (mFloatWindowSetting == null) {
-            try {
-                String json = SPUtils.getString(Constants.SP_FLOAT_WINDOW_SETTINGS);
-                if (!TextUtils.isEmpty(json)) {
-                    mFloatWindowSetting = GsonUtils.fromJson(json, FloatWindowSettingEntity.class);
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-        return mFloatWindowSetting;
-    }
-
-
-    @NonNull
-    public static Observable<VNewSetting> getVNewSettingObservable() {
-        if (mVNewSetting != null) {
-            return Observable.just(mVNewSetting);
-        } else {
-            return vNewSettingSubject.hide();
-        }
-    }
-

    @Nullable
    public static AppEntity getNew32UpdateEntity() {
@ -258,6 +237,7 @@ public class Config {
        RetrofitManager.getInstance()
                .getVApi().getSettings(BuildConfig.VERSION_NAME, Build.VERSION.SDK_INT)
                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
                .subscribe(new BiResponse<VSetting>() {
                    @Override
                    public void onSuccess(VSetting data) {
@ -290,6 +270,7 @@ public class Config {
                    }
                })
                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
                .subscribe(new BiResponse<AppEntity>() {
                    @Override
                    public void onSuccess(AppEntity data) {
@ -321,6 +302,7 @@ public class Config {
        RetrofitManager.getInstance()
                .getApi().getSettings(PackageUtils.getGhVersionName(), channel)
                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
                .subscribe(new Response<SettingsEntity>() {
                    @Override
                    public void onResponse(SettingsEntity response) {
@ -333,7 +315,7 @@ public class Config {
                        edit.apply();

                        if (!SPUtils.getBoolean(Constants.SP_TEENAGER_MODE)) {
-                            AppExecutor.getUiExecutor().execute(() -> EventBus.getDefault().post(new EBReuse("Refresh")));
+                            EventBus.getDefault().post(new EBReuse("Refresh"));
                        }
                    }
                });
@ -341,6 +323,7 @@ public class Config {
        RetrofitManager.getInstance()
                .getApi().getNewSettings(Build.MANUFACTURER, Build.MODEL, channel, Build.VERSION.SDK_INT, BuildConfig.VERSION_NAME)
                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
                .subscribe(new BiResponse<NewSettingsEntity>() {
                    @Override
                    public void onSuccess(NewSettingsEntity data) {
@ -351,11 +334,11 @@ public class Config {

        refreshVSettingEntity();
        getNewSetting();
-        getFloatWindowSetting();

        RetrofitManager.getInstance()
                .getApi().getGameGuidePopup(Build.MANUFACTURER, Build.VERSION.RELEASE, Build.MODEL, channel, BuildConfig.VERSION_NAME)
                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
                .subscribe(new BiResponse<GameGuidePopupEntity>() {
                    @Override
                    public void onSuccess(GameGuidePopupEntity data) {
@ -367,6 +350,7 @@ public class Config {
        if (manufacturer.equals("OPPO") || manufacturer.equals("VIVO")) {
            RetrofitManager.getInstance().getNewApi().getBrowserHintUrl(manufacturer)
                    .subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
                    .subscribe(new BiResponse<ResponseBody>() {
                        @Override
                        public void onSuccess(ResponseBody data) {
@ -390,13 +374,12 @@ public class Config {
            String filterString = UrlFilterUtils.getFilterQuery(
                    "manufacturer", Build.MANUFACTURER,
                    "model", Build.MODEL,
-                    "android_sdk_version", String.valueOf(Build.VERSION.SDK_INT),
-                    "rom", MetaUtil.INSTANCE.getRom().name() + " " + MetaUtil.INSTANCE.getRom().getVersionName()
-            );
+                    "android_sdk_version", String.valueOf(Build.VERSION.SDK_INT));

            RetrofitManager.getInstance()
                    .getNewApi().getNewSettings(PackageUtils.getGhVersionName(), channel, filterString)
                    .subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
                    .subscribe(new BiResponse<NewApiSettingsEntity>() {
                        @Override
                        public void onSuccess(NewApiSettingsEntity data) {
@ -405,7 +388,7 @@ public class Config {
                            mNewSimulatorEntity = data.getSimulator();
                            if (HaloApp.getInstance().isNewForThisVersion && mNightModeSetting != null && mNightModeSetting.getInstall()) {
                                DarkModeUtils.INSTANCE.updateFollowSystemDarkModeToSp(true);
-                                AppExecutor.getUiExecutor().execute(DarkModeUtils.INSTANCE::initDarkMode);
+                                DarkModeUtils.INSTANCE.initDarkMode();
                            }
                            SPUtils.setString(Constants.SP_NEW_API_SETTINGS, GsonUtils.toJson(data));

@ -415,35 +398,21 @@ public class Config {
                            }

                            // 更新安装列表是否开启的配置
-                            if (mNewApiSettingsEntity.getInstalledComplianceSwitch() != null) {
-                                PackageHelper.INSTANCE.updateIsGetInstalledPackagesApiAgreedRequired(mNewApiSettingsEntity.getInstalledComplianceSwitch());
-                            } else {
-                                PackageHelper.INSTANCE.updateIsGetInstalledPackagesApiAgreedRequired(false);
-                            }
+//                            if (mNewApiSettingsEntity.getInstalledComplianceSwitch() != null) {
+//                                PackageHelper.INSTANCE.updateIsGetInstalledPackagesApiAgreedRequired(mNewApiSettingsEntity.getInstalledComplianceSwitch());
+//                            } else {
+//                                PackageHelper.INSTANCE.updateIsGetInstalledPackagesApiAgreedRequired(false);
+//                            }

                            // 更新包名监听是否开启
                            if (mNewApiSettingsEntity.isPackageObserveEnable()) {
-                                AppExecutor.getUiExecutor().execute(() -> observePackageChange(mNewApiSettingsEntity.getPackageObserveActions()));
+                                observePackageChange(mNewApiSettingsEntity.getPackageObserveActions());
                            }
                        }
                    });
        }
    }

-    @SuppressLint("CheckResult")
-    private static void getFloatWindowSetting() {
-        RetrofitManager.getInstance().getNewApi()
-                .getFloatWindowSettings()
-                .subscribeOn(Schedulers.io())
-                .subscribe(new BiResponse<FloatWindowSettingEntity>() {
-                    @Override
-                    public void onSuccess(FloatWindowSettingEntity data) {
-                        mFloatWindowSetting = data;
-                        SPUtils.setString(Constants.SP_FLOAT_WINDOW_SETTINGS, GsonUtils.toJson(data));
-                    }
-                });
-    }
-
    public static void observePackageChange(NewApiSettingsEntity.PackageObserveActions packageObserveActions) {
        PackageChangeBroadcastReceiver receiver = new PackageChangeBroadcastReceiver(packageObserveActions);
        IntentFilter intentFilter = new IntentFilter();
--- a/app/src/main/java/com/gh/common/databind/AddKaiFuBindingAdapter.kt
+++ b/app/src/main/java/com/gh/common/databind/AddKaiFuBindingAdapter.kt
@ -120,14 +120,14 @@ 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, com.gh.gamecenter.common.R.color.secondary_red))
-            view.setHintTextColor(ContextCompat.getColor(view.context, com.gh.gamecenter.common.R.color.secondary_red))
+            view.setTextColor(ContextCompat.getColor(view.context, R.color.secondary_red))
+            view.setHintTextColor(ContextCompat.getColor(view.context, R.color.secondary_red))
        } else if (position == 0) {
-            view.setTextColor(ContextCompat.getColor(view.context, com.gh.gamecenter.common.R.color.hint))
-            view.setHintTextColor(ContextCompat.getColor(view.context, com.gh.gamecenter.common.R.color.hint))
+            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, com.gh.gamecenter.common.R.color.text_primary))
-            view.setHintTextColor(ContextCompat.getColor(view.context, com.gh.gamecenter.common.R.color.hint))
+            view.setTextColor(ContextCompat.getColor(view.context, R.color.text_primary))
+            view.setHintTextColor(ContextCompat.getColor(view.context, R.color.hint))
        }
    }

@ -176,7 +176,7 @@ object AddKaiFuBindingAdapter {
            popupWindow.isTouchable = true
            popupWindow.inputMethodMode = PopupWindow.INPUT_METHOD_NEEDED
            popupWindow.isOutsideTouchable = true
-            popupWindow.animationStyle = com.gh.gamecenter.common.R.style.popwindow_option_anim_style
+            popupWindow.animationStyle = R.style.popwindow_option_anim_style

            // 设置偏移
            windowPos[1] = windowPos[1] - 12F.dip2px()
--- a/app/src/main/java/com/gh/common/databind/BindingAdapters.java
+++ b/app/src/main/java/com/gh/common/databind/BindingAdapters.java
@ -27,6 +27,7 @@ import com.gh.common.chain.PackageCheckHandler;
 import com.gh.common.chain.UnsupportedFeatureHandler;
 import com.gh.common.chain.ValidateVSpaceHandler;
 import com.gh.common.chain.VersionNumberHandler;
+import com.gh.common.constant.Config;
 import com.gh.common.filter.RegionSetting;
 import com.gh.common.filter.RegionSettingHelper;
 import com.gh.common.history.HistoryHelper;
@ -52,6 +53,7 @@ import com.gh.gamecenter.common.entity.LinkEntity;
 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.core.utils.MtaHelper;
@ -170,7 +172,7 @@ public class BindingAdapters {
                            builder.addHandler(new OverseaDownloadHandler());
                            builder.addHandler(new CheckDownloadHandler());

-                            builder.setProcessEndCallback(gameEntity.getId(), (asVGame, isSubscribe) -> {
+                            builder.setProcessEndCallback((asVGame, isSubscribe) -> {
                                download(v.getContext(),
                                        progressBar,
                                        gameEntity,
@ -195,7 +197,7 @@ public class BindingAdapters {
                            builder.addHandler(new GamePermissionHandler());
                            builder.addHandler(new VersionNumberHandler());

-                            builder.setProcessEndCallback(gameEntity.getId(), (asVGame, isSubscribe) -> {
+                            builder.setProcessEndCallback((asVGame, isSubscribe) -> {
                                DownloadDialog.showDownloadDialog(
                                        v.getContext(),
                                        gameEntity,
@ -294,7 +296,7 @@ public class BindingAdapters {
                            });
                        });
                    } else {
-                        ReservationHelper.showCancelReservationDialog(progressBar.getContext(),gameEntity, () -> {
+                        ReservationHelper.showCancelReservationDialog(progressBar.getContext(), () -> {
                            ReservationHelper.cancelReservation(gameEntity, () -> {
                                updateReservation(progressBar, gameEntity);
                            });
@ -387,7 +389,7 @@ public class BindingAdapters {
                    case diskisfull:
                    case diskioerror:
                    case waiting:
-                        progressBar.setText(com.gh.gamecenter.feature.R.string.downloading);
+                        progressBar.setText(R.string.downloading);
                        if (downloadEntity.isPluggable() && PackagesManager.isInstalled(downloadEntity.getPackageName())) {
                            progressBar.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_PLUGIN);
                        } else {
@ -395,7 +397,7 @@ public class BindingAdapters {
                        }
                        break;
                    case done:
-                        progressBar.setText(com.gh.gamecenter.feature.R.string.install);
+                        progressBar.setText(R.string.install);
                        if (downloadEntity.isPluggable()
                                && PackagesManager.isInstalled(downloadEntity.getPackageName())) {
                            progressBar.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_PLUGIN);
@ -553,15 +555,15 @@ public class BindingAdapters {
            gameName = String.format("%s - %s", game.getName(),
                    PlatformUtils.getInstance(view.getContext()).getPlatformName(
                            game.getApk().get(0).getPlatform()));
-            if (!gameName.equals((String) view.getTag(com.gh.gamecenter.common.R.string.tag_game_name_id))) {
+            if (!gameName.equals((String) view.getTag(R.string.tag_game_name_id))) {
                view.setText(gameName);
-                view.setTag(com.gh.gamecenter.common.R.string.tag_game_name_id, gameName);
+                view.setTag(R.string.tag_game_name_id, gameName);
            }
        } else {
            gameName = game.getName();
-            if (gameName != null && !gameName.equals((String) view.getTag(com.gh.gamecenter.common.R.string.tag_game_name_id))) {
+            if (gameName != null && !gameName.equals((String) view.getTag(R.string.tag_game_name_id))) {
                view.setText(gameName);
-                view.setTag(com.gh.gamecenter.common.R.string.tag_game_name_id, gameName);
+                view.setTag(R.string.tag_game_name_id, gameName);
            }
        }

--- a/app/src/main/java/com/gh/common/dialog/ApplyModeratorDialogFragment.kt
+++ b/app/src/main/java/com/gh/common/dialog/ApplyModeratorDialogFragment.kt
@ -7,6 +7,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import com.gh.common.util.DirectUtils
+import com.gh.gamecenter.R
 import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
 import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.utils.dip2px
@ -48,7 +49,7 @@ class ApplyModeratorDialogFragment : BaseDialogFragment() {
                requireContext(),
                startText.length,
                startText.length + mGroupNumber.length,
-                com.gh.gamecenter.common.R.color.text_theme,
+                R.color.text_theme,
                true
            ) {
                DirectUtils.directToQqGroup(
--- a/app/src/main/java/com/gh/common/dialog/DeviceRemindDialog.kt
+++ b/app/src/main/java/com/gh/common/dialog/DeviceRemindDialog.kt
@ -40,7 +40,7 @@ import java.lang.ref.WeakReference
 * 设备提醒弹窗
 */
 class DeviceRemindDialog(context: Context, val entity: DeviceDialogEntity, val gameEntity: GameEntity) :
-    Dialog(context, com.gh.gamecenter.common.R.style.GhAlertDialog) {
+    Dialog(context, R.style.GhAlertDialog) {
    private val mBinding: DialogDeviceRemindBinding by lazy { DialogDeviceRemindBinding.inflate(layoutInflater) }
    private var currentPage = 0
    private var mSlideLooperInterval = 3000L
@ -136,13 +136,13 @@ class DeviceRemindDialog(context: Context, val entity: DeviceDialogEntity, val g
        val isFirst = SPUtils.getBoolean(Constants.SP_FIRST_DEVICE_REMIND, false)
        if (!isFirst) {
            mBinding.cancelTv.isEnabled = false
-            mBinding.cancelTv.background = ContextCompat.getDrawable(context, com.gh.gamecenter.common.R.drawable.button_round_f5f5f5)
+            mBinding.cancelTv.background = ContextCompat.getDrawable(context, R.drawable.button_round_f5f5f5)
            disposable = countDownTimer(3) { finish, time ->
                if (finish) {
                    mBinding.cancelTv.isEnabled = true
-                    mBinding.cancelTv.background = ContextCompat.getDrawable(context, com.gh.gamecenter.common.R.drawable.button_blue_oval)
+                    mBinding.cancelTv.background = ContextCompat.getDrawable(context, R.drawable.button_blue_oval)
                    mBinding.cancelTv.text = "我知道了"
-                    mBinding.cancelTv.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.white))
+                    mBinding.cancelTv.setTextColor(ContextCompat.getColor(context, R.color.white))
                } else {
                    mBinding.cancelTv.text = "我知道了(${time}S)"
                }
@ -153,8 +153,8 @@ class DeviceRemindDialog(context: Context, val entity: DeviceDialogEntity, val g
            mBinding.noRemindAgainCb.visibility = View.VISIBLE
            mBinding.cancelTv.text = "我知道了"
            mBinding.cancelTv.isEnabled = true
-            mBinding.cancelTv.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.white))
-            mBinding.cancelTv.background = ContextCompat.getDrawable(context, com.gh.gamecenter.common.R.drawable.button_blue_oval)
+            mBinding.cancelTv.setTextColor(ContextCompat.getColor(context, R.color.white))
+            mBinding.cancelTv.background = ContextCompat.getDrawable(context, R.drawable.button_blue_oval)
        }
        mBinding.cancelTv.setOnClickListener {
            SPUtils.setBoolean(Constants.SP_NO_REMIND_AGAIN, mBinding.noRemindAgainCb.isChecked)
--- a/app/src/main/java/com/gh/common/dialog/GameOffServiceDialogFragment.kt
+++ b/app/src/main/java/com/gh/common/dialog/GameOffServiceDialogFragment.kt
@ -14,6 +14,7 @@ import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
 import com.gh.common.util.DirectUtils
 import com.gh.gamecenter.common.utils.dip2px
 import com.gh.gamecenter.common.utils.toColor
+import com.gh.gamecenter.R
 import com.gh.gamecenter.databinding.DialogGameOffServiceBinding
 import com.gh.gamecenter.feature.entity.GameEntity

@ -61,7 +62,7 @@ class GameOffServiceDialogFragment : BaseDialogFragment() {
                        if (index == notEmptySite.size - 1) bottomMargin = 8F.dip2px()
                    }
                    siteTv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14F)
-                    siteTv.setTextColor(com.gh.gamecenter.common.R.color.text_theme.toColor(requireContext()))
+                    siteTv.setTextColor(R.color.text_theme.toColor(requireContext()))
                    siteTv.text = site.text
                    siteTv.paintFlags = siteTv.paintFlags or Paint.UNDERLINE_TEXT_FLAG
                    siteTv.setOnClickListener {
--- a/app/src/main/java/com/gh/common/dialog/InstallPermissionDialogFragment.kt
+++ b/app/src/main/java/com/gh/common/dialog/InstallPermissionDialogFragment.kt
@ -158,7 +158,7 @@ class InstallPermissionDialogFragment : BaseDialogFragment() {
            }
            if (isXapk) {
                val xapkUnzipVersions = Config.getSettings()?.permissionPopupAppliedVersions?.xapkUnzip
-                if (xapkUnzipVersions?.contains(Build.VERSION.SDK_INT.toString()) == false || XapkInstaller.systemHasFlaw) {
+                if (xapkUnzipVersions?.contains(Build.VERSION.SDK_INT.toString()) == false) {
                    callBack?.invoke(false)
                    return
                }
--- a/module_common/src/main/java/com/gh/gamecenter/common/dialog/ManageExternalStoragePermissionDialogFragment.kt
+++ b/module_common/src/main/java/com/gh/gamecenter/common/dialog/ManageExternalStoragePermissionDialogFragment.kt
@ -1,6 +1,5 @@
-package com.gh.gamecenter.common.dialog
+package com.gh.common.dialog

-import android.content.DialogInterface
 import android.content.Intent
 import android.net.Uri
 import android.os.Build
@ -12,18 +11,14 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.RequiresApi
-import androidx.fragment.app.FragmentActivity
-import com.alibaba.android.arouter.launcher.ARouter
-import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
-import com.gh.gamecenter.common.constant.RouteConsts
+import androidx.appcompat.app.AppCompatActivity
 import com.gh.gamecenter.common.databinding.DialogAlertDefaultBinding
-import com.gh.gamecenter.core.AppExecutor
-import com.gh.gamecenter.core.provider.IAppProvider
+import com.lightgame.dialog.BaseDialogFragment

@RequiresApi(Build.VERSION_CODES.R)
-class ManageExternalStoragePermissionDialogFragment : BaseDialogFragment() {
+class ManagerAllFilesPermissionDialogFragment : BaseDialogFragment() {
    private val mBinding by lazy { DialogAlertDefaultBinding.inflate(layoutInflater) }
-    private var mCallBack: ((Boolean) -> Unit)? = null
+    private var mCallBack: (() -> Unit)? = null

    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
        return mBinding.root
@ -37,8 +32,6 @@ class ManageExternalStoragePermissionDialogFragment : BaseDialogFragment() {
            contentTv.text = "需要所有文件访问权限，请打开权限设置页面"

            confirmTv.setOnClickListener {
-                val appProvider = ARouter.getInstance().build(RouteConsts.provider.app).navigation() as? IAppProvider?
-                appProvider?.setDisableSplashAdTemporarily(true)
                val intent = Intent().apply {
                    action = Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION
                    data = Uri.fromParts("package", requireContext().packageName, null)
@ -46,24 +39,15 @@ class ManageExternalStoragePermissionDialogFragment : BaseDialogFragment() {
                requireActivity().startActivityForResult(intent, REQUEST_CODE)
            }
            cancelTv.setOnClickListener {
-                mCallBack?.invoke(false)
                dismissAllowingStateLoss()
            }
        }
    }

-    override fun onDismiss(dialog: DialogInterface) {
-        super.onDismiss(dialog)
-        AppExecutor.uiExecutor.executeWithDelay({
-            val appProvider = ARouter.getInstance().build(RouteConsts.provider.app).navigation() as? IAppProvider?
-            appProvider?.setDisableSplashAdTemporarily(false)
-        }, 100)
-    }
-
    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
        super.onActivityResult(requestCode, resultCode, data)
        if (requestCode == REQUEST_CODE && Environment.isExternalStorageManager()) {
-            mCallBack?.invoke(true)
+            mCallBack?.invoke()
            dismissAllowingStateLoss()
        }
    }
@ -72,12 +56,12 @@ class ManageExternalStoragePermissionDialogFragment : BaseDialogFragment() {
        const val REQUEST_CODE = 1000

        @JvmStatic
-        fun show(activity: FragmentActivity, callback: (Boolean) -> Unit) {
-            ManageExternalStoragePermissionDialogFragment().apply {
+        fun show(activity: AppCompatActivity, callback: () -> Unit) {
+            ManagerAllFilesPermissionDialogFragment().apply {
                mCallBack = callback
            }.show(
                activity.supportFragmentManager,
-                ManageExternalStoragePermissionDialogFragment::class.java.name
+                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,12 +76,12 @@ class NewPrivacyPolicyDialogFragment : BaseDialogFragment() {
            contentText.setSpan(object : ClickableSpan() {
                override fun updateDrawState(ds: TextPaint) {
                    super.updateDrawState(ds)
-                    ds.color = ContextCompat.getColor(requireContext(), com.gh.gamecenter.common.R.color.text_theme)
+                    ds.color = ContextCompat.getColor(requireContext(), R.color.text_theme)
                    ds.isUnderlineText = false
                }

                override fun onClick(widget: View) {
-                    val privacyPolicyUrl = requireContext().getString(com.gh.gamecenter.common.R.string.privacy_policy_url)
+                    val privacyPolicyUrl = requireContext().getString(R.string.privacy_policy_url)
                    val childrenPrivacyPolicyUrl = requireContext().getString(R.string.children_policy_url)
                    val thirdPartySdkUrl = requireContext().getString(R.string.sdk_list_url)
                    val permissionListUrl = requireContext().getString(R.string.permission_and_usage_url)
--- a/app/src/main/java/com/gh/common/dialog/PackageCheckDialogFragment.kt
+++ b/app/src/main/java/com/gh/common/dialog/PackageCheckDialogFragment.kt
@ -22,6 +22,7 @@ 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
 import com.gh.gamecenter.common.base.BaseRecyclerViewHolder
 import com.gh.gamecenter.common.callback.ConfirmListener
 import com.gh.gamecenter.common.constant.Constants
@ -59,7 +60,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
    private val mDuration = 3000
    private var mDisposable: Disposable? = null
    private var mAdapter: PackageCheckAdapter? = null
-    private var mAllInstalledPackages = PackageHelper.getInstalledPackageNameList(HaloApp.getInstance().application, 0)
+    private var mAllInstalledPackages = PackageHelper.getInstalledPackages(HaloApp.getInstance().application, 0)
    var gameEntity: GameEntity? = null
    var callBack: ConfirmListener? = null

@ -125,7 +126,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
                    requireContext(),
                    0,
                    (link.title ?: "").length,
-                    com.gh.gamecenter.common.R.color.text_theme,
+                    R.color.text_theme,
                    true
                ) {
                    LogUtils.uploadPackageCheck(
@ -284,7 +285,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
            if (it >= mDuration) {
                mDisposable?.dispose()
                binding.downloadBtn.isEnabled = true
-                binding.downloadBtn.background = com.gh.gamecenter.common.R.drawable.bg_notification_open_btn_style_2.toDrawable()
+                binding.downloadBtn.background = R.drawable.bg_notification_open_btn_style_2.toDrawable()
            }
        }
        val animator = ValueAnimator.ofInt(0, 100)
@ -325,7 +326,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() {

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

-            val allInstalledPackages = PackageHelper.getInstalledPackageNameList(HaloApp.getInstance().application, 0)
+            val allInstalledPackages = PackageHelper.getInstalledPackages(HaloApp.getInstance().application, 0)
            if (isAllPackageInstalled(allInstalledPackages, packageDialogEntity)) {
                callBack.onConfirm()
                return
@ -453,12 +454,12 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
        }

        private fun checkDetectionsInstalled(
-            allInstalledPackages: List<String>,
+            allInstalledPackages: List<PackageInfo>,
            packages: ArrayList<String>
        ): Boolean {
            var isPackagesInstalled = false
            packages.forEach { packageName ->
-                val isInstalled = allInstalledPackages.find { it == packageName } != null
+                val isInstalled = allInstalledPackages.find { it.packageName == packageName } != null
                if (isInstalled) {
                    isPackagesInstalled = true
                    return@forEach
@ -469,7 +470,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() {


        fun isAllPackageInstalled(
-            allInstalledPackages: List<String>,
+            allInstalledPackages: List<PackageInfo>,
            packageDialogEntity: PackageDialogEntity
        ): Boolean {
            var isAllInstalled = true
--- a/app/src/main/java/com/gh/common/dialog/PrivacyPolicyDialogFragment.kt
+++ b/app/src/main/java/com/gh/common/dialog/PrivacyPolicyDialogFragment.kt
@ -12,6 +12,7 @@ import android.view.*
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentActivity
 import androidx.fragment.app.FragmentTransaction
+import com.gh.gamecenter.R
 import com.gh.gamecenter.WebActivity
 import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
 import com.gh.gamecenter.common.constant.Constants
@ -67,13 +68,13 @@ class PrivacyPolicyDialogFragment : BaseDialogFragment() {
        skipText.setSpan(object : ClickableSpan() {
            override fun updateDrawState(ds: TextPaint) {
                super.updateDrawState(ds)
-                ds.color = ContextCompat.getColor(requireContext(), com.gh.gamecenter.common.R.color.text_theme)
+                ds.color = ContextCompat.getColor(requireContext(), R.color.text_theme)
                ds.isUnderlineText = false
            }

            override fun onClick(widget: View) {
                val intent =
-                    WebActivity.getIntent(requireContext(), context!!.getString(com.gh.gamecenter.common.R.string.privacy_policy_url), true)
+                    WebActivity.getIntent(requireContext(), context!!.getString(R.string.privacy_policy_url), true)
                context?.startActivity(intent)
            }
        }, skipText.length - 6, skipText.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
@ -109,13 +110,13 @@ class PrivacyPolicyDialogFragment : BaseDialogFragment() {
        skipText.setSpan(object : ClickableSpan() {
            override fun updateDrawState(ds: TextPaint) {
                super.updateDrawState(ds)
-                ds.color = ContextCompat.getColor(requireContext(), com.gh.gamecenter.common.R.color.text_theme)
+                ds.color = ContextCompat.getColor(requireContext(), R.color.text_theme)
                ds.isUnderlineText = false
            }

            override fun onClick(widget: View) {
                val intent =
-                    WebActivity.getIntent(requireContext(), context!!.getString(com.gh.gamecenter.common.R.string.privacy_policy_url), true)
+                    WebActivity.getIntent(requireContext(), context!!.getString(R.string.privacy_policy_url), true)
                context?.startActivity(intent)
            }
        }, skipText.length - 9, skipText.length - 5, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
@ -123,12 +124,12 @@ class PrivacyPolicyDialogFragment : BaseDialogFragment() {
        skipText.setSpan(object : ClickableSpan() {
            override fun updateDrawState(ds: TextPaint) {
                super.updateDrawState(ds)
-                ds.color = ContextCompat.getColor(requireContext(), com.gh.gamecenter.common.R.color.text_theme)
+                ds.color = ContextCompat.getColor(requireContext(), R.color.text_theme)
                ds.isUnderlineText = false
            }

            override fun onClick(widget: View) {
-                val intent = WebActivity.getIntent(requireContext(), context!!.getString(com.gh.gamecenter.common.R.string.disclaimer_url), true)
+                val intent = WebActivity.getIntent(requireContext(), context!!.getString(R.string.disclaimer_url), true)
                context?.startActivity(intent)
            }
        }, skipText.length - 4, skipText.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
--- a/app/src/main/java/com/gh/common/dialog/ReserveDialog.kt
+++ b/app/src/main/java/com/gh/common/dialog/ReserveDialog.kt
@ -1,42 +1,27 @@
 package com.gh.common.dialog

-import android.content.Context
-import android.content.DialogInterface
-import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.gh.common.exposure.ExposureListener
-import com.gh.common.exposure.IExposable
-import com.gh.gamecenter.DownloadManagerActivity
-import com.gh.gamecenter.GameDetailActivity
-import com.gh.gamecenter.R
 import com.gh.gamecenter.common.base.BaseRecyclerViewHolder
 import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.exposure.ExposureSource
-import com.gh.gamecenter.common.utils.*
+import com.gh.gamecenter.common.utils.ImageUtils
+import com.gh.gamecenter.common.utils.fromHtml
+import com.gh.gamecenter.GameDetailActivity
+import com.gh.gamecenter.R
 import com.gh.gamecenter.common.view.FixLinearLayoutManager
-import com.gh.gamecenter.core.utils.DisplayUtils
-import com.gh.gamecenter.core.utils.SPUtils.getBoolean
 import com.gh.gamecenter.databinding.DialogReserveBinding
 import com.gh.gamecenter.databinding.DialogReserveItemBinding
-import com.gh.gamecenter.feature.entity.GameEntity
-import com.gh.gamecenter.feature.entity.ReserveOnlineEntity
-import com.gh.gamecenter.feature.exposure.ExposureEvent
+import com.gh.gamecenter.common.entity.SimpleGameEntity
 import com.gh.gamecenter.mygame.MyGameActivity
-import com.halo.assistant.HaloApp
 import com.lightgame.adapter.BaseRecyclerAdapter

 class ReserveDialog : BaseDialogFragment() {

-    private lateinit var reserveOnlineEntity: ReserveOnlineEntity
-    val games: List<GameEntity>
-        get() = reserveOnlineEntity.games
-
+    private lateinit var mReserveList: List<SimpleGameEntity>
    private var mDismissListener: (() -> Unit)? = null

    override fun onCreate(savedInstanceState: Bundle?) {
@ -51,162 +36,66 @@ class ReserveDialog : BaseDialogFragment() {
    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
        val binding: DialogReserveBinding = DialogReserveBinding.inflate(layoutInflater, null, false)

-        reserveOnlineEntity = arguments?.getParcelable(RESERVE_ONLINE) ?: ReserveOnlineEntity()
+        mReserveList = arguments?.getParcelableArrayList(RESERVE_LIST) ?: arrayListOf()

-        binding.tvTitle.text =
-            resources.getString(R.string.dialog_reserve_title, reserveOnlineEntity.gamesTotal).fromHtml()
-        binding.tvViewAllAppointment.setOnClickListener {
-            SensorsBridge.trackAppointmentGameOnlineDialogClick(buttonName = "查看全部预约")
-            val intent = MyGameActivity.getIntentWithConfig(requireContext(), MyGameActivity.RESERVATION_INDEX)
+        binding.title.text = resources.getString(R.string.dialog_reserve_title, mReserveList.size).fromHtml()
+        binding.more.visibility = if (mReserveList.size > 4) {
+            View.VISIBLE
+        } else View.GONE
+        binding.more.setOnClickListener {
+            val intent = MyGameActivity.getIntentWithConfig(requireContext(), 2)
            startActivity(intent)
-        }
-
-        val adapter = ReserveDialogAdapter(requireContext(), games)
-        binding.rvGames.layoutManager = FixLinearLayoutManager(context, RecyclerView.HORIZONTAL, false)
-        binding.rvGames.adapter = adapter
-
-        val exposureListener = ExposureListener(this, adapter)
-        binding.rvGames.addOnScrollListener(exposureListener)
-
-        binding.ivClose.setOnClickListener {
            dismissAllowingStateLoss()
        }
+        binding.recyclerView.layoutManager = if (mReserveList.size > 4) {
+            GridLayoutManager(context, 4)
+        } else {
+            FixLinearLayoutManager(context, RecyclerView.HORIZONTAL, false)
+        }
+        binding.recyclerView.adapter = object : BaseRecyclerAdapter<ReserveDialogItemViewHolder>(context) {
+            override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ReserveDialogItemViewHolder {
+                val inflate = mLayoutInflater.inflate(R.layout.dialog_reserve_item, parent, false)
+                return ReserveDialogItemViewHolder(DialogReserveItemBinding.bind(inflate))
+            }

-        checkHasAutoDownload(binding)
+            override fun getItemCount(): Int {
+                return if (mReserveList.size > 4) 4 else mReserveList.size
+            }
+
+            override fun onBindViewHolder(holder: ReserveDialogItemViewHolder, position: Int) {
+                val entity = mReserveList[position]
+                ImageUtils.display(holder.binding.icon, entity.icon)
+                holder.binding.gameNameTv.text = entity.name
+                holder.itemView.setOnClickListener {
+                    GameDetailActivity.startGameDetailActivity(mContext, entity.id, "(预约弹窗)")
+                    dismissAllowingStateLoss()
+                }
+            }
+        }

        dialog?.setCanceledOnTouchOutside(true)
        return binding.root
    }

-    private fun checkHasAutoDownload(binding: DialogReserveBinding) {
-        if (reserveOnlineEntity.wifiAutoDownloadTotal > 0) {
-            // 开启自动下载
-            binding.tvAutoDownloadTips.goneIf(false)
-            var firstAutoDownloadGameName =
-                reserveOnlineEntity.games.find { it.wifiAutoDownload && !it.isLandPageAddressDialog() }?.name
-
-            if(!firstAutoDownloadGameName.isNullOrBlank() && firstAutoDownloadGameName.length > GAME_NAME_SHOW_MAX_LENGTH){
-                firstAutoDownloadGameName = "${firstAutoDownloadGameName.take(GAME_NAME_SHOW_MAX_LENGTH-1)}..."
-            }
-            val isWifiOpen = NetworkUtils.isWifiConnected(HaloApp.getInstance())
-            binding.tvAutoDownloadTips.text =
-                if (isWifiOpen) {
-                    if (firstAutoDownloadGameName.isNullOrBlank()) {
-                        getString(
-                            R.string.reserve_reminder_auto_download,
-                            "${reserveOnlineEntity.wifiAutoDownloadTotal}"
-                        )
-                    } else {
-                        getString(
-                            R.string.reserve_reminder_auto_download_with_name,
-                            firstAutoDownloadGameName,
-                            "${reserveOnlineEntity.wifiAutoDownloadTotal}"
-                        )
-                    }
-                } else {
-                    if (firstAutoDownloadGameName.isNullOrBlank()) {
-                        getString(
-                            R.string.reserve_reminder_wait_for_wifi_to_auto_download,
-                            "${reserveOnlineEntity.wifiAutoDownloadTotal}"
-                        )
-                    } else {
-                        getString(
-                            R.string.reserve_reminder_wait_for_wifi_to_auto_download_with_name,
-                            firstAutoDownloadGameName,
-                            "${reserveOnlineEntity.wifiAutoDownloadTotal}"
-                        )
-                    }
-                }
-
-            binding.tvAutoDownloadTips.setOnClickListener {
-                SensorsBridge.trackAppointmentGameOnlineDialogClick(buttonName = "查看进度")
-                val intent = DownloadManagerActivity.getDownloadMangerIntent(requireContext(), "")
-                startActivity(intent)
-            }
-        } else {
-            binding.tvAutoDownloadTips.goneIf(true)
-        }
-    }
-

    fun setOnDismissListener(dismissListener: () -> Unit) {
        mDismissListener = dismissListener
    }

-    override fun onDismiss(dialog: DialogInterface) {
-        super.onDismiss(dialog)
-        SensorsBridge.trackAppointmentGameOnlineDialogClick(buttonName = "关闭弹窗")
-    }
-
-    override fun onStart() {
-        super.onStart()
-        dialog?.window?.let {
-            it.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
-            val params = it.attributes
-            params.width = DisplayUtils.dip2px(300F)
-            it.attributes = params
-        }
-    }
-
    override fun onDestroy() {
        super.onDestroy()
        mDismissListener?.invoke()
    }

    companion object {
-        const val RESERVE_ONLINE = "reserve_online"
-        private const val GAME_NAME_SHOW_MAX_LENGTH = 8
+        const val RESERVE_LIST = "reserve_list"

        @JvmStatic
-        fun getInstance(reserveOnlineEntity: ReserveOnlineEntity?) = ReserveDialog().apply {
-            arguments = Bundle().apply {
-                putParcelable(RESERVE_ONLINE, reserveOnlineEntity)
-            }
+        fun getInstance(reserveList: List<SimpleGameEntity>) = ReserveDialog().apply {
+            arguments = Bundle()
+            arguments?.putParcelableArrayList(RESERVE_LIST, ArrayList(reserveList))
        }
    }
 }

-class ReserveDialogAdapter(
-    context: Context,
-    private val games: List<GameEntity>
-) :
-    BaseRecyclerAdapter<ReserveDialogItemViewHolder>(context), IExposable {
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ReserveDialogItemViewHolder {
-        return ReserveDialogItemViewHolder(parent.toBinding())
-    }
-
-    override fun getItemCount(): Int {
-        return if (games.size > 8) 8 else games.size
-    }
-
-    override fun onBindViewHolder(holder: ReserveDialogItemViewHolder, position: Int) {
-        val entity = games[position]
-        holder.binding.icon.displayGameIcon(entity)
-        holder.binding.gameNameTv.text = entity.name
-        holder.itemView.setOnClickListener {
-            SensorsBridge.trackAppointmentGameOnlineDialogClick(
-                "游戏",
-                entity.id,
-                entity.name ?: "",
-                entity.categoryChinese,
-            )
-            GameDetailActivity.startGameDetailActivity(mContext, entity.id, "(预约弹窗)", entity.exposureEvent)
-        }
-        entity.exposureEvent = ExposureEvent.createEvent(
-            entity,
-            listOf(ExposureSource("预约上线弹窗", ""))
-        )
-    }
-
-    override fun getEventByPosition(pos: Int): ExposureEvent? {
-        return games.getOrNull(pos)?.exposureEvent
-    }
-
-    override fun getEventListByPosition(pos: Int): List<ExposureEvent>? {
-        return null
-    }
-
-}
-
 class ReserveDialogItemViewHolder(val binding: DialogReserveItemBinding) : BaseRecyclerViewHolder<Any>(binding.root)
--- a/app/src/main/java/com/gh/common/dialog/ReserveReminderPhoneNumberDialog.kt
+++ b/app/src/main/java/com/gh/common/dialog/ReserveReminderPhoneNumberDialog.kt
@ -1,278 +0,0 @@
-package com.gh.common.dialog
-
-import android.app.Dialog
-import android.content.Context
-import android.os.Bundle
-import android.text.InputFilter
-import android.view.LayoutInflater
-import androidx.core.widget.addTextChangedListener
-import com.gh.gamecenter.R
-import com.gh.gamecenter.common.retrofit.BiResponse
-import com.gh.gamecenter.common.retrofit.Response
-import com.gh.gamecenter.common.utils.singleToMain
-import com.gh.gamecenter.common.utils.toColor
-import com.gh.gamecenter.common.utils.toResString
-import com.gh.gamecenter.core.utils.ToastUtils
-import com.gh.gamecenter.databinding.DialogReserveReminderPhoneNumberBinding
-import com.gh.gamecenter.entity.ReserveModifyEntity
-import com.gh.gamecenter.entity.ValidateCodeResponse
-import com.halo.assistant.fragment.reserve.OnReserveReminderListener
-import com.halo.assistant.fragment.reserve.ReserveReminderRepository
-import io.reactivex.Observable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.disposables.Disposable
-import io.reactivex.schedulers.Schedulers
-import okhttp3.ResponseBody
-import org.json.JSONObject
-import retrofit2.HttpException
-import java.util.concurrent.TimeUnit
-
-
-class ReserveReminderPhoneNumberDialog(
-    context: Context,
-    themeResId: Int,
-    private val dialogType: Int,
-    private val phoneNumber: String,
-    private var serviceId: String,
-    private val gameId: String,
-    private val repository: ReserveReminderRepository,
-    private val listener: OnReserveReminderListener
-) :
-    Dialog(context, themeResId) {
-
-    private val compositeDisposable = CompositeDisposable()
-
-    private lateinit var binding: DialogReserveReminderPhoneNumberBinding
-
-    private var hasValidated = false
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        binding = DialogReserveReminderPhoneNumberBinding.inflate(LayoutInflater.from(context))
-        setContentView(binding.root)
-        initView()
-    }
-
-    private fun initView() {
-        binding.vClose.setOnClickListener {
-            dismiss()
-        }
-
-        setSubmitState(phoneNumber)
-        binding.etInput.addTextChangedListener {
-            val content = binding.etInput.text?.toString() ?: ""
-            if (dialogType == DIALOG_TYPE_BIND_PHONE || dialogType == DIALOG_TYPE_CHANGE_PHONE) {
-                setSubmitState(content)
-            } else {
-                val length = content.length
-                if (length == VALIDATE_CODE_LENGTH) {
-                    verifyPhoneNumber(content)
-                }
-            }
-
-        }
-
-        when (dialogType) {
-            DIALOG_TYPE_BIND_PHONE -> {
-                binding.tvTitle.setText(R.string.enable_sms_reminder)
-                binding.tvDescription.setText(R.string.enable_sms_reminder_description)
-                binding.etInput.setText(phoneNumber)
-                binding.etInput.setHint(com.gh.gamecenter.login.R.string.input_phone_hint)
-            }
-
-            DIALOG_TYPE_CHANGE_PHONE -> {
-                binding.tvTitle.setText(R.string.change_phone_number_2)
-                binding.tvDescription.setText(R.string.enable_sms_reminder_description)
-                binding.etInput.setText(phoneNumber)
-                binding.etInput.setHint(com.gh.gamecenter.login.R.string.input_phone_hint)
-            }
-
-            DIALOG_TYPE_VERIFY_PHONE -> {
-                startCountDown()
-                binding.tvTitle.setText(R.string.please_input_sms_verify_code)
-                if (phoneNumber.length == PHONE_NUMBER_LENGTH) {
-                    val phoneNumberWithMask = phoneNumber.substring(0, 3) + MASK + phoneNumber.substring(7)
-                    binding.tvDescription.text =
-                        context.getString(R.string.verify_code_send_with_phone_number, phoneNumberWithMask)
-                }
-                binding.tvSubmit.alpha = 1.0F
-                binding.etInput.filters = arrayOf<InputFilter>(InputFilter.LengthFilter(VALIDATE_CODE_LENGTH))
-                binding.etInput.setHint(R.string.please_input_verify_code)
-
-            }
-        }
-        binding.tvSubmit.setOnClickListener {
-            val text = binding.etInput.text?.toString() ?: ""
-            if (dialogType == DIALOG_TYPE_VERIFY_PHONE) {
-                resendValidateCode()
-            } else {
-                if (isEnableSubmit(text)) {
-                    when (dialogType) {
-                        DIALOG_TYPE_BIND_PHONE -> bindPhoneNumber(text)
-                        DIALOG_TYPE_CHANGE_PHONE -> bindPhoneNumber(text)
-                    }
-                } else {
-                    if (text != phoneNumber) {
-                        ToastUtils.toast(R.string.invalid_phone_number_format.toResString())
-                    }
-                }
-
-            }
-
-        }
-    }
-
-
-    private fun resendValidateCode() {
-        repository.sendVerifyCode(phoneNumber)
-            .compose(singleToMain())
-            .subscribe(object : BiResponse<ValidateCodeResponse>() {
-                override fun onSuccess(data: ValidateCodeResponse) {
-                    serviceId = data.serviceId
-                    startCountDown()
-                }
-
-            }).let(compositeDisposable::add)
-    }
-
-    private fun verifyPhoneNumber(content: String) {
-        repository.verifyPhoneNumber(phoneNumber, content, serviceId)
-            .compose(singleToMain())
-            .subscribe(object : BiResponse<ResponseBody>() {
-                override fun onSuccess(data: ResponseBody) {
-                    hasValidated = true
-                    listener.phoneNumberValidateSuccessfully()
-                    ToastUtils.toast(R.string.phone_number_validate_successfully.toResString())
-                    dismiss()
-
-                }
-
-                override fun onFailure(exception: Exception) {
-                    super.onFailure(exception)
-                    binding.etInput.text = null
-                    ToastUtils.toast(R.string.phone_number_validate_failure.toResString())
-                }
-            }).let(compositeDisposable::add)
-    }
-
-
-    private fun bindPhoneNumber(phone: String) {
-        repository.bindPhone(gameId, phone)
-            .compose(singleToMain())
-            .subscribe(object : BiResponse<ReserveModifyEntity>() {
-                override fun onSuccess(data: ReserveModifyEntity) {
-                    listener.bindPhoneSuccessfully(data.smsConfig.mobileValidated, phone)
-                    dismiss()
-                }
-
-                override fun onFailure(exception: Exception) {
-                    super.onFailure(exception)
-                    if (exception is HttpException) {
-                        try {
-                            val string = exception.response().errorBody()?.string()
-                            if (!string.isNullOrBlank()) {
-                                val json = JSONObject(string)
-                                val message = json.getJSONObject("toast").getString("sms_config.mobile")
-                                ToastUtils.showToast(message)
-                            }
-                        } catch (e: Exception) {
-                            // no implement
-                        }
-                    }
-
-                }
-            }).let(compositeDisposable::add)
-    }
-
-
-    private fun startCountDown() {
-        binding.tvSubmit.isEnabled = false
-        binding.tvSubmit.setBackgroundResource(com.gh.gamecenter.common.R.drawable.bg_common_button_light_fill_gray)
-        binding.tvSubmit.setTextColor(com.gh.gamecenter.common.R.color.text_tertiary.toColor(context))
-        Observable.interval(0, 1, TimeUnit.SECONDS)
-            .take(COUNT_DOWN_DURATION)
-            .map {
-                COUNT_DOWN_DURATION - it
-            }
-            .subscribeOn(Schedulers.io())
-            .observeOn(AndroidSchedulers.mainThread())
-            .subscribe(object : Response<Long>() {
-                override fun onSubscribe(d: Disposable) {
-                    compositeDisposable.add(d)
-                }
-
-
-                override fun onNext(time: Long) {
-                    binding.tvSubmit.text = context.getString(R.string.resend_with_time, "$time")
-                }
-
-                override fun onComplete() {
-                    binding.tvSubmit.isEnabled = true
-                    binding.tvSubmit.setBackgroundResource(com.gh.gamecenter.common.R.drawable.bg_common_button_fill_blue)
-                    binding.tvSubmit.setTextColor(com.gh.gamecenter.common.R.color.text_aw_primary.toColor(context))
-                    binding.tvSubmit.setText(R.string.resend)
-
-                }
-            })
-    }
-
-    override fun dismiss() {
-        compositeDisposable.clear()
-        if (dialogType == DIALOG_TYPE_VERIFY_PHONE && !hasValidated) {
-            ToastUtils.toast(R.string.phone_number_validate_cancel.toResString())
-        }
-        super.dismiss()
-    }
-
-    private fun isEnableSubmit(phone: String) =
-        PHONE_NUMBER_PATTERN.toRegex().matches(phone)
-                && if (dialogType == DIALOG_TYPE_CHANGE_PHONE) phone != phoneNumber else true
-
-    private fun setSubmitState(phone: String) {
-        val isEnable = isEnableSubmit(phone)
-        binding.tvSubmit.alpha = if (isEnable) {
-            TV_SUBMIT_ENABLE_ALPHA
-        } else {
-            TV_SUBMIT_UNABLE_ALPHA
-        }
-    }
-
-    companion object {
-
-        private const val PHONE_NUMBER_PATTERN = "^1\\d{10}$"
-        private const val MASK = "****"
-        private const val PHONE_NUMBER_LENGTH = 11
-        private const val VALIDATE_CODE_LENGTH = 6
-
-        const val DIALOG_TYPE_BIND_PHONE = 0
-        const val DIALOG_TYPE_CHANGE_PHONE = 1
-        const val DIALOG_TYPE_VERIFY_PHONE = 2
-
-        private const val COUNT_DOWN_DURATION = 60L
-
-        private const val TV_SUBMIT_ENABLE_ALPHA = 1F
-        private const val TV_SUBMIT_UNABLE_ALPHA = 0.4F
-
-        fun create(
-            context: Context,
-            dialogType: Int,
-            phoneNumber: String,
-            serviceId: String,
-            gameId: String,
-            repository: ReserveReminderRepository,
-            listener: OnReserveReminderListener
-        ) =
-            ReserveReminderPhoneNumberDialog(
-                context,
-                com.gh.gamecenter.common.R.style.DialogWindowTransparent,
-                dialogType,
-                phoneNumber,
-                serviceId,
-                gameId,
-                repository,
-                listener
-            )
-    }
-}
--- a/app/src/main/java/com/gh/common/dialog/ReserveSuccessReminderDialog.kt
+++ b/app/src/main/java/com/gh/common/dialog/ReserveSuccessReminderDialog.kt
@ -1,428 +0,0 @@
-package com.gh.common.dialog
-
-import android.app.Dialog
-import android.content.Context
-import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
-import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
-import android.text.TextUtils
-import android.view.*
-import android.view.ViewGroup.MarginLayoutParams
-import androidx.core.view.updateLayoutParams
-import com.gh.common.pop.EditBindPhoneInfoPop
-import com.gh.common.pop.EditBindWechatPop
-import com.gh.common.pop.RealNameTipsPop
-import com.gh.gamecenter.R
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.utils.dip2px
-import com.gh.gamecenter.common.utils.goneIf
-import com.gh.gamecenter.common.utils.toObject
-import com.gh.gamecenter.core.utils.DisplayUtils
-import com.gh.gamecenter.core.utils.SPUtils
-import com.gh.gamecenter.databinding.*
-import com.gh.gamecenter.entity.ReserveReminderEntity
-import com.gh.gamecenter.login.entity.UserInfoEntity
-import com.gh.gamecenter.login.user.UserManager
-import com.halo.assistant.HaloApp
-import com.halo.assistant.fragment.reserve.OnReserveReminderListener
-
-class ReserveSuccessReminderDialog(
-    context: Context,
-    themeResId: Int,
-    private val listener: OnReserveReminderListener
-) :
-    Dialog(context, themeResId), OnReserveSuccessListener {
-
-    private var reserveReminder = ReserveReminderEntity()
-
-    private val handler = Handler(Looper.getMainLooper())
-
-    private val handlers = arrayListOf<ReminderContentHandler>()
-
-    private lateinit var binding: DialogReserveSuccessWithSmsBinding
-
-    private val realNameQuestionPop by lazy {
-        RealNameTipsPop.create(context, listener)
-    }
-
-    private var hasAutoPopped = false
-    private var isInit = true
-
-    override fun onTouchEvent(event: MotionEvent): Boolean {
-        if (event.action == MotionEvent.ACTION_UP) {
-            if (realNameQuestionPop.isShowing) {
-                realNameQuestionPop.dismiss()
-                return true
-            } else if (handlers.any { it.hasPopShowing }) {
-                handlers.forEach {
-                    it.dismissPop()
-                }
-                return true
-            }
-        }
-        return super.onTouchEvent(event)
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        binding = DialogReserveSuccessWithSmsBinding.inflate(LayoutInflater.from(context))
-        setContentView(binding.root)
-
-        binding.ivClose.setOnClickListener {
-            dismiss()
-        }
-        binding.ivQuestion.setOnClickListener {
-            realNameQuestionPop.showAtLocation(binding.cbAutoDownload, Gravity.BOTTOM, 0, 4F.dip2px())
-        }
-
-    }
-
-    private fun initView() {
-        handlers.clear()
-        binding.flContentContainer.removeAllViews()
-
-        val smsConfig = reserveReminder.smsConfig
-        val wechatConfig = reserveReminder.wechatConfig
-        when {
-            reserveReminder.onlyShowWechatReminder && !wechatConfig.isReminderEnable -> { // 只显示微信：未开启
-                binding.tvContent.setText(R.string.reverse_success_without_reminder_tips)
-                arrayListOf(OnlyWechatReminderUnableHandler(16.dp, binding.flContentContainer, this))
-            }
-
-
-            reserveReminder.onlyShowWechatReminder && wechatConfig.isReminderEnable -> {   // 只显示微信:已开
-                binding.tvContent.setText(R.string.reverse_success_with_reminder_tips)
-                arrayListOf(
-                    WechatReminderEnableHandler(
-                        reserveReminder.wechatConfig.nickName,
-                        8.dp,
-                        binding.flContentContainer,
-                        this
-                    )
-                )
-            }
-
-            !smsConfig.notice && !wechatConfig.isReminderEnable -> {    // 短信，微信未开启
-                binding.tvContent.setText(R.string.reverse_success_without_reminder_tips)
-                arrayListOf(
-                    SmsReminderUnableHandler(16.dp, binding.flContentContainer, this),
-                    WechatReminderUnableHandler(8.dp, binding.flContentContainer, this)
-                )
-            }
-
-            smsConfig.notice && wechatConfig.isReminderEnable -> {// 短信，微信已开启
-                binding.tvContent.setText(R.string.reverse_success_with_reminder_tips)
-                arrayListOf(
-                    SmsReminderEnableHandler(reserveReminder.smsConfig, 8.dp, binding.flContentContainer, this),
-                    WechatReminderEnableHandler(
-                        reserveReminder.wechatConfig.nickName,
-                        8.dp,
-                        binding.flContentContainer,
-                        this
-                    )
-                )
-            }
-
-
-            smsConfig.notice && !wechatConfig.isReminderEnable -> {  // 短信开启，微信未开启
-                binding.tvContent.setText(R.string.reverse_success_with_reminder_tips)
-                arrayListOf(
-                    SmsReminderEnableHandler(smsConfig, 8.dp, binding.flContentContainer, this),
-                    WechatReminderUnableHandler(16.dp, binding.flContentContainer, this)
-                )
-            }
-
-
-            !smsConfig.notice && wechatConfig.isReminderEnable -> {   // 微信开启，短信未开启
-                binding.tvContent.setText(R.string.reverse_success_with_reminder_tips)
-                arrayListOf(
-                    WechatReminderEnableHandler(
-                        wechatConfig.nickName,
-                        8.dp,
-                        binding.flContentContainer,
-                        this
-                    ),
-                    SmsReminderUnableHandler(16.dp, binding.flContentContainer, this)
-                )
-            }
-
-            else -> {
-                binding.tvContent.setText(R.string.reverse_success_without_reminder_tips)
-                arrayListOf()
-            }
-        }.let {
-            handlers.clear()
-            handlers.addAll(it)
-        }
-        handlers.forEach {
-            binding.flContentContainer.addView(it.init())
-        }
-
-        if (isInit) {
-            isInit = false
-            binding.gAutoDownload.goneIf(!reserveReminder.isEnableAutoDownload)
-            if (reserveReminder.isEnableAutoDownload) {
-                binding.cbAutoDownload.isChecked = reserveReminder.wifiAutoDownload
-                checkIfShowRealNamePop()
-            }
-            binding.cbAutoDownload.setOnCheckedChangeListener { _, isChecked ->
-                listener.enableAutoDownload(isChecked)
-                checkIfShowRealNamePop()
-            }
-        }
-
-    }
-
-    private fun checkIfShowRealNamePop() {
-        if (hasAutoPopped) {
-            return
-        }
-        hasAutoPopped = true
-        handler.postDelayed({
-            val idCard = UserManager.getInstance().userInfoEntity?.idCard
-            if (idCard != null && idCard.status != 1 && idCard.minor != true) {
-                // 账号已实名
-                return@postDelayed
-            }
-
-            val deviceCertificationInfoString =
-                SPUtils.getString(Constants.SP_DEVICE_CERTIFICATION_PREFIX + HaloApp.getInstance().gid)
-            if (!TextUtils.isEmpty(deviceCertificationInfoString)) {
-                val deviceIdCard = deviceCertificationInfoString.toObject<UserInfoEntity>()?.idCard
-                if (deviceIdCard != null && deviceIdCard.status != 1 && deviceIdCard.minor != true) {
-                    // 设备已实名
-                    return@postDelayed
-                }
-            }
-            realNameQuestionPop.showAtLocation(binding.cbAutoDownload, Gravity.BOTTOM, 0, 0)
-        }, 16)
-    }
-
-    override fun updateSmsReminder(isEnable: Boolean) {
-        listener.updateSmsReminder(isEnable)
-    }
-
-    override fun updateWechatReminder() {
-        listener.updateWechatReminder()
-    }
-
-    override fun changePhoneNumber() {
-        listener.changedPhoneNumber()
-    }
-
-    override fun verifyPhoneNumber() {
-        listener.verifyPhoneNumber()
-    }
-
-    override fun changeWechatBinding() {
-        listener.changeWechatBinding()
-    }
-
-    override fun onStart() {
-        super.onStart()
-        window?.let {
-            it.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
-            val params = it.attributes
-            params.width = DisplayUtils.dip2px(300F)
-            it.attributes = params
-        }
-    }
-
-    fun updateReserveReminder(reserveReminder: ReserveReminderEntity) {
-        this.reserveReminder = reserveReminder
-        initView()
-    }
-
-    override fun dismiss() {
-        handler.removeCallbacksAndMessages(null)
-        super.dismiss()
-    }
-
-    companion object {
-        private val Int.dp: Int
-            get() = DisplayUtils.dip2px(this.toFloat())
-
-        fun create(context: Context, listener: OnReserveReminderListener) =
-            ReserveSuccessReminderDialog(
-                context,
-                com.gh.gamecenter.common.R.style.DialogWindowTransparent,
-                listener
-            ).apply {
-
-            }
-    }
-
-    abstract class ReminderContentHandler(
-        val topMargin: Int,
-        val parent: ViewGroup,
-        val listener: OnReserveSuccessListener
-    ) {
-
-        open val hasPopShowing: Boolean = false
-
-        fun init(): View {
-            val root = createView(LayoutInflater.from(parent.context))
-            root.updateLayoutParams<MarginLayoutParams> {
-                this.topMargin = this@ReminderContentHandler.topMargin
-            }
-            initView()
-            return root
-        }
-
-        protected abstract fun createView(inflater: LayoutInflater): View
-
-        protected abstract fun initView()
-
-        open fun dismissPop() = Unit
-    }
-
-    class SmsReminderUnableHandler(topMargin: Int, parent: ViewGroup, listener: OnReserveSuccessListener) :
-        ReminderContentHandler(topMargin, parent, listener) {
-
-        private lateinit var binding: LayoutReserveSmsReminderUnableBinding
-
-        override fun createView(inflater: LayoutInflater): View {
-            return LayoutReserveSmsReminderUnableBinding.inflate(inflater, parent, false)
-                .also {
-                    binding = it
-                }.root
-        }
-
-        override fun initView() {
-            binding.vSmsAdd.setOnClickListener {
-                listener.updateSmsReminder(true)
-            }
-        }
-
-    }
-
-    class WechatReminderUnableHandler(topMargin: Int, parent: ViewGroup, listener: OnReserveSuccessListener) :
-        ReminderContentHandler(topMargin, parent, listener) {
-
-        private lateinit var binding: LayoutReserveWechatReminderUnableBinding
-
-        override fun createView(inflater: LayoutInflater): View {
-            return LayoutReserveWechatReminderUnableBinding.inflate(inflater, parent, false)
-                .also {
-                    binding = it
-                }.root
-        }
-
-        override fun initView() {
-            binding.vWechatAdd.setOnClickListener {
-                listener.updateWechatReminder()
-            }
-        }
-
-    }
-
-    class SmsReminderEnableHandler(
-        private val smsConfig: ReserveReminderEntity.SmsConfig,
-        topMargin: Int,
-        parent: ViewGroup, listener:
-        OnReserveSuccessListener
-    ) :
-        ReminderContentHandler(topMargin, parent, listener) {
-
-        private lateinit var binding: LayoutReserveSmsReminderEnableBinding
-
-        override val hasPopShowing: Boolean
-            get() = editBindPhoneInfoPop.isShowing
-
-        override fun dismissPop() {
-            if (hasPopShowing) {
-                editBindPhoneInfoPop.dismiss()
-            }
-        }
-
-        private val editBindPhoneInfoPop by lazy {
-            EditBindPhoneInfoPop.create(parent.context, smsConfig.mobileValidated, listener)
-        }
-
-        override fun createView(inflater: LayoutInflater) =
-            LayoutReserveSmsReminderEnableBinding.inflate(inflater, parent, false)
-                .also {
-                    binding = it
-                }.root
-
-        override fun initView() {
-            binding.tvPhone.text = smsConfig.mobile
-            binding.vSmsEdit.setOnClickListener {
-                editBindPhoneInfoPop.showAsDropDown(
-                    binding.ivSmsEdit,
-                    (-104).dp,
-                    0,
-                )
-            }
-        }
-    }
-
-    class WechatReminderEnableHandler(
-        private val nickName: String,
-        topMargin: Int,
-        parent: ViewGroup,
-        listener: OnReserveSuccessListener
-    ) :
-        ReminderContentHandler(topMargin, parent, listener) {
-
-        private lateinit var binding: LayoutReserveWechatReminderEnableBinding
-
-        private val editWechatPop by lazy {
-            EditBindWechatPop.create(parent.context, listener)
-        }
-
-        override fun createView(inflater: LayoutInflater) =
-            LayoutReserveWechatReminderEnableBinding.inflate(inflater, parent, false)
-                .also {
-                    binding = it
-                }.root
-
-        override fun initView() {
-            binding.tvWechat.text = nickName
-            binding.vModifyWechat.setOnClickListener {
-                editWechatPop.showAsDropDown(
-                    binding.ivModifyWechat,
-                    (-104).dp,
-                    0
-                )
-            }
-        }
-
-    }
-
-    class OnlyWechatReminderUnableHandler(topMargin: Int, parent: ViewGroup, listener: OnReserveSuccessListener) :
-        ReminderContentHandler(topMargin, parent, listener) {
-
-        private lateinit var binding: LayoutReserveOnlyWechatUnableBinding
-
-        override fun createView(inflater: LayoutInflater) =
-            LayoutReserveOnlyWechatUnableBinding.inflate(inflater, parent, false)
-                .also {
-                    binding = it
-                }.root
-
-        override fun initView() {
-            binding.vSubmitBackground.setOnClickListener {
-                listener.updateWechatReminder()
-            }
-        }
-
-    }
-
-
-}
-
-interface OnReserveSuccessListener {
-
-    fun updateSmsReminder(isEnable: Boolean)
-
-    fun updateWechatReminder()
-
-    fun changePhoneNumber()
-
-    fun verifyPhoneNumber()
-
-    fun changeWechatBinding()
-}
--- a/app/src/main/java/com/gh/common/dialog/WechatBindingConflictDialogFragment.kt
+++ b/app/src/main/java/com/gh/common/dialog/WechatBindingConflictDialogFragment.kt
@ -1,63 +0,0 @@
-package com.gh.common.dialog
-
-import android.app.Dialog
-import android.content.Context
-import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.appcompat.app.AppCompatActivity
-import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
-import com.gh.gamecenter.core.utils.CurrentActivityHolder
-import com.gh.gamecenter.core.utils.DisplayUtils
-import com.gh.gamecenter.databinding.DialogWechatBindingConflictBinding
-
-class WechatBindingConflictDialogFragment : BaseDialogFragment() {
-
-    private lateinit var binding: DialogWechatBindingConflictBinding
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        return super.onCreateDialog(savedInstanceState).apply {
-            setCanceledOnTouchOutside(true)
-        }
-    }
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return DialogWechatBindingConflictBinding.inflate(inflater, container, false)
-            .also {
-                binding = it
-            }.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding.tvIKnow.setOnClickListener {
-            dismiss()
-        }
-    }
-
-    override fun onStart() {
-        super.onStart()
-        dialog?.window?.let {
-            it.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
-            val params = it.attributes
-            params.width = DisplayUtils.dip2px(300F)
-            it.attributes = params
-        }
-    }
-
-    companion object {
-
-        fun show(context: Context) {
-            if (context is AppCompatActivity) {
-                context.supportFragmentManager
-            } else {
-                (CurrentActivityHolder.getCurrentActivity() as? AppCompatActivity)?.supportFragmentManager
-            }?.let {
-                WechatBindingConflictDialogFragment().show(it, WechatBindingConflictDialogFragment::class.java.name)
-            }
-        }
-    }
-}
--- a/app/src/main/java/com/gh/common/dialog/WechatBindingFailedDialogFragment.kt
+++ b/app/src/main/java/com/gh/common/dialog/WechatBindingFailedDialogFragment.kt
@ -1,125 +0,0 @@
-package com.gh.common.dialog
-
-import android.app.Dialog
-import android.content.ClipData
-import android.content.ClipboardManager
-import android.content.Context
-import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.appcompat.app.AppCompatActivity
-import com.gh.gamecenter.R
-import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
-import com.gh.gamecenter.common.entity.ErrorEntity
-import com.gh.gamecenter.core.utils.CurrentActivityHolder
-import com.gh.gamecenter.core.utils.DisplayUtils
-import com.gh.gamecenter.databinding.DialogWechatBindingFailedBinding
-import com.gh.gamecenter.login.user.UserRepository
-import com.lightgame.utils.Utils
-
-class WechatBindingFailedDialogFragment : BaseDialogFragment() {
-
-    private lateinit var binding: DialogWechatBindingFailedBinding
-
-    private var currentUserId: String? = null
-    private lateinit var userConflict: ErrorEntity.Data.UserConflict
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        userConflict = arguments?.getParcelable(KEY_USER_CONFLICT) ?: ErrorEntity.Data.UserConflict()
-    }
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        return super.onCreateDialog(savedInstanceState).apply {
-            setCanceledOnTouchOutside(true)
-        }
-    }
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return DialogWechatBindingFailedBinding.inflate(inflater, container, false)
-            .also {
-                binding = it
-            }.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        UserRepository.getInstance().loginUserInfo.observe(viewLifecycleOwner) {
-            currentUserId = it.data.getShortUserId()
-            binding.tvCurrentName.text = it.data.name
-            binding.ivCurrentAvatar.displayAvatar(it.data.icon)
-            binding.tvUserId.text = getString(R.string.user_id, currentUserId)
-        }
-
-        binding.tvConflictName.text = userConflict.name
-        binding.ivConflictAvatar.displayAvatar(userConflict.icon)
-        binding.tvConflictUserId.text = getString(R.string.user_id, userConflict.seq)
-
-
-        binding.tvConflictProblem.setOnClickListener {
-            dismiss()
-            WechatBindingConflictDialogFragment.show(requireContext())
-        }
-
-        binding.tvIKnow.setOnClickListener {
-            dismiss()
-        }
-
-        binding.tvUserId.setOnLongClickListener {
-            currentUserId?.let {
-                copyTextToClipboard(it)
-                true
-            } ?: false
-        }
-
-        binding.tvConflictUserId.setOnLongClickListener {
-            copyTextToClipboard(userConflict.id)
-            true
-        }
-    }
-
-    private fun copyTextToClipboard(text: String) {
-        val clipboardManager = context?.getSystemService(Context.CLIPBOARD_SERVICE) as? ClipboardManager
-        if (clipboardManager != null) {
-            val clip = ClipData.newPlainText(COPY_ID_TEXT, text)
-            clipboardManager.setPrimaryClip(clip)
-            Utils.toast(requireContext(), R.string.copy_user_id_successfully)
-        }
-
-    }
-
-    override fun onStart() {
-        super.onStart()
-        dialog?.window?.let {
-            it.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
-            val params = it.attributes
-            params.width = DisplayUtils.dip2px(300F)
-            it.attributes = params
-        }
-    }
-
-    companion object {
-
-        private const val COPY_ID_TEXT = "user_id"
-        private const val KEY_USER_CONFLICT = "key_user_conflict"
-
-        fun show(context: Context, userConflict: ErrorEntity.Data.UserConflict?) {
-            if (context is AppCompatActivity) {
-                context.supportFragmentManager
-            } else {
-                (CurrentActivityHolder.getCurrentActivity() as? AppCompatActivity)?.supportFragmentManager
-            }?.let {
-                val fragment = WechatBindingFailedDialogFragment().apply {
-                    arguments = Bundle().apply {
-                        putParcelable(KEY_USER_CONFLICT, userConflict)
-                    }
-                }
-                fragment.show(it, WechatBindingFailedDialogFragment::class.java.name)
-            }
-        }
-    }
-}
--- a/app/src/main/java/com/gh/common/exposure/ExposureListener.kt
+++ b/app/src/main/java/com/gh/common/exposure/ExposureListener.kt
@ -6,7 +6,6 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.LayoutManager
 import androidx.recyclerview.widget.StaggeredGridLayoutManager
-import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.feature.exposure.ExposureEvent
 import io.reactivex.functions.Consumer

@ -17,9 +16,8 @@ class ExposureListener(var fragment: Fragment, var exposable: IExposable) : Recy

    val throttleBus: ExposureThrottleBus by lazy {
        ExposureThrottleBus(
-            { commitExposure(it) },
-            Consumer(Throwable::printStackTrace),
-            { commitWXCPMExposure(it) }
+            Consumer { commitExposure(it) },
+            Consumer(Throwable::printStackTrace)
        )
    }
    var layoutManager: LayoutManager? = null
@ -95,32 +93,4 @@ class ExposureListener(var fragment: Fragment, var exposable: IExposable) : Recy
        ExposureManager.log(eventList)
    }

-    /**
-     * 微信小游戏CPM曝光事件接口上报，由于普通曝光事件的上报通道存在节流特性，不符合CPM接口对于数据上报的实时性和准确性的要求，所以使用额外的通道进行上报
-     */
-    private fun commitWXCPMExposure(visibleState: ExposureThrottleBus.VisibleState) {
-
-        val eventList = arrayListOf<ExposureEvent>()
-
-        for (pos in visibleState.firstVisiblePosition..visibleState.lastVisiblePosition) {
-            try {
-                exposable.getEventByPosition(pos)?.let {
-                    if (it.payload.miniGameType == Constants.WECHAT_MINI_GAME_CPM) {
-                        eventList.add(it)
-                    }
-                }
-                exposable.getEventListByPosition(pos)?.let { list ->
-                    list.forEach {
-                        if (it.payload.miniGameType == Constants.WECHAT_MINI_GAME_CPM) {
-                            eventList.add(it)
-                        }
-                    }
-                }
-            } catch (ignore: Exception) {
-                // Just ignore the error.
-            }
-        }
-        ExposureManager.logCPM(eventList)
-    }
-
 }
--- a/app/src/main/java/com/gh/common/exposure/ExposureManager.kt
+++ b/app/src/main/java/com/gh/common/exposure/ExposureManager.kt
@ -1,15 +1,13 @@
 package com.gh.common.exposure

+import com.aliyun.sls.android.producer.Log
 import com.gh.gamecenter.BuildConfig
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.loghub.TLogHubHelper
+import com.gh.gamecenter.common.loghub.LoghubHelper
 import com.gh.gamecenter.common.utils.FixedSizeLinkedHashSet
 import com.gh.gamecenter.common.utils.toJson
 import com.gh.gamecenter.core.AppExecutor
 import com.gh.gamecenter.feature.exposure.ExposureEvent
-import com.gh.gamecenter.feature.minigame.wechat.WGameSubjectCPMListReportHelper
 import com.lightgame.utils.Utils
-import com.volcengine.model.tls.LogItem

 /**
 * A handful tool for committing logs to aliyun loghub.
@ -34,9 +32,6 @@ object ExposureManager {
     */
    fun log(event: ExposureEvent) {
        AppExecutor.logExecutor.execute {
-            if (event.payload.miniGameType == Constants.WECHAT_MINI_GAME_CPM) {
-                WGameSubjectCPMListReportHelper.reportExposure(event)
-            }
            if (!exposureCache.contains(event.id)) {
                exposureSet.add(event)
                exposureCache.add(event.id)
@ -63,17 +58,6 @@ object ExposureManager {
        }
    }

-    /**
-     * Log a wechat mini game cpm collection of exposure event.
-     */
-    fun logCPM(eventList: List<ExposureEvent>) {
-        AppExecutor.logExecutor.execute {
-            if (eventList.isNotEmpty()) {
-                WGameSubjectCPMListReportHelper.reportExposure(eventList.toSet())
-            }
-        }
-    }
-
    /**
     * @param forcedUpload Ignore all restrictions.
     */
@ -94,20 +78,19 @@ object ExposureManager {

    private fun uploadExposures(eventSet: HashSet<ExposureEvent>, forced: Boolean) {
        eventSet.forEach {
-            TLogHubHelper.sendLog(buildLog(it), LOG_STORE)
-//            LoghubHelper.uploadLog(buildLog(it), LOG_STORE, forced)
+            LoghubHelper.uploadLog(buildLog(it), LOG_STORE, forced)
 //            it.recycle()
        }
    }

-    private fun buildLog(event: ExposureEvent) = LogItem(System.currentTimeMillis()).apply {
-        addContent("__id", event.id)
-        addContent("payload", event.payload.toJson())
-        addContent("event", event.event.toString())
-        addContent("source", eliminateMultipleBrackets(event.source.toJson()))
-        addContent("meta", event.meta.toJson())
-        addContent("real_millisecond", event.timeInMillisecond.toString())
-        addContent(
+    private fun buildLog(event: ExposureEvent) = Log().apply {
+        putContent("id", event.id)
+        putContent("payload", event.payload.toJson())
+        putContent("event", event.event.toString())
+        putContent("source", eliminateMultipleBrackets(event.source.toJson()))
+        putContent("meta", event.meta.toJson())
+        putContent("real_millisecond", event.timeInMillisecond.toString())
+        putContent(
            "e-traces", if (event.eTrace != null) {
                eliminateMultipleBrackets(event.eTrace?.toJson() ?: "")
            } else ""
--- a/app/src/main/java/com/gh/common/exposure/ExposureThrottleBus.kt
+++ b/app/src/main/java/com/gh/common/exposure/ExposureThrottleBus.kt
@ -3,20 +3,16 @@ package com.gh.common.exposure
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.functions.Consumer
 import io.reactivex.schedulers.Schedulers
-import io.reactivex.subjects.BehaviorSubject
+import io.reactivex.subjects.PublishSubject
 import java.util.concurrent.TimeUnit

-class ExposureThrottleBus(
-    var onSuccess: Consumer<VisibleState>,
-    var onError: Consumer<Throwable>,
-    onPreSuccess: Consumer<VisibleState>
-) {
+class ExposureThrottleBus(var onSuccess: Consumer<VisibleState>, var onError: Consumer<Throwable>) {

    companion object {
        private const val THRESHOLD_TIME = 300L
    }

-    private val mPublishSubject: BehaviorSubject<VisibleState> = BehaviorSubject.create()
+    private val mPublishSubject: PublishSubject<VisibleState> = PublishSubject.create()
    private val mCompositeDisposable: CompositeDisposable = CompositeDisposable()

    init {
@ -28,7 +24,6 @@ class ExposureThrottleBus(
         */
        val disposable = mPublishSubject
            .distinctUntilChanged()
-            .doOnNext(onPreSuccess)
            .throttleWithTimeout(THRESHOLD_TIME, TimeUnit.MILLISECONDS)
            .subscribeOn(Schedulers.io())
            .subscribe(onSuccess, onError)
--- a/app/src/main/java/com/gh/common/exposure/ExposureUtils.kt
+++ b/app/src/main/java/com/gh/common/exposure/ExposureUtils.kt
@ -53,6 +53,7 @@ object ExposureUtils {
        return exposureEvent
    }

+    @JvmStatic
    fun logADownloadCompleteExposureEvent(
        entity: GameEntity,
        platform: String?,
@ -60,7 +61,6 @@ object ExposureUtils {
        speed: Long,
        host: String? = "unknown",
        path: String? = "unknown",
-        redirectedUrlList: String? = "unknown",
        downloadType: DownloadType
    ): ExposureEvent? {
        val gameEntity = entity.copy()
@ -88,7 +88,6 @@ object ExposureUtils {
        exposureEvent.payload.host = host
        exposureEvent.payload.path = path
        exposureEvent.payload.speed = speed
-        exposureEvent.payload.redirectedUrlList = redirectedUrlList

        ExposureManager.log(exposureEvent)
        ExposureManager.commitSavedExposureEvents(forcedUpload = true)
--- a/app/src/main/java/com/gh/common/iinterface/ISearchToolbarTab.kt
+++ b/app/src/main/java/com/gh/common/iinterface/ISearchToolbarTab.kt
@ -5,6 +5,6 @@ import com.gh.gamecenter.entity.BottomTab
 interface ISearchToolbarTab {
    fun onScrollChanged(totalHeight: Int, offset: Int, isDarkModeChanged: Boolean)
    fun changeAppBarColor(color: Int, pageId: String)
-    fun updateSearchStyle(searchStyle: BottomTab.SearchStyle)
+    fun setSearchStyle(searchStyle: BottomTab.SearchStyle)
    fun getCurrentTabIndex(): Int?
 }
--- a/app/src/main/java/com/gh/common/pop/BatchManagementPop.kt
+++ b/app/src/main/java/com/gh/common/pop/BatchManagementPop.kt
@ -1,44 +0,0 @@
-package com.gh.common.pop
-
-import android.content.Context
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.core.view.updateLayoutParams
-import com.gh.gamecenter.R
-import com.gh.gamecenter.common.databinding.LayoutPopupContainerBinding
-import com.gh.gamecenter.common.view.BugFixedPopupWindow
-import com.gh.gamecenter.core.utils.DisplayUtils
-import com.gh.gamecenter.databinding.LayoutAddKaifuPopupItemBinding
-
-class BatchManagementPop(
-    binding: LayoutPopupContainerBinding,
-    private val listener: OnBatchManagementListener
-) :
-    CommonPopupWindow(binding) {
-    override val viewDataList: List<ViewData>
-        get() = listOf(
-            ViewData(R.string.enable_automatic_downloading_in_batches) {
-                listener.enableAutoDownload()
-            },
-            ViewData(R.string.batch_management) {
-                listener.batchManage()
-            }
-        )
-
-    companion object {
-
-        fun create(context: Context, listener: OnBatchManagementListener): BatchManagementPop {
-            val binding = LayoutPopupContainerBinding.inflate(LayoutInflater.from(context))
-            return BatchManagementPop(binding, listener).apply {
-                initView()
-            }
-        }
-    }
-
-    interface OnBatchManagementListener {
-
-        fun enableAutoDownload()
-
-        fun batchManage()
-    }
-}
--- a/app/src/main/java/com/gh/common/pop/CancelReservePop.kt
+++ b/app/src/main/java/com/gh/common/pop/CancelReservePop.kt
@ -1,49 +0,0 @@
-package com.gh.common.pop
-
-import android.content.Context
-import android.view.LayoutInflater
-import com.gh.gamecenter.R
-import com.gh.gamecenter.common.databinding.LayoutPopupContainerBinding
-import com.gh.gamecenter.feature.entity.GameEntity
-
-class CancelReservePop(
-    private val game: GameEntity,
-    binding: LayoutPopupContainerBinding,
-    private val listener: OnCancelReserveListener
-
-) : CommonPopupWindow(binding) {
-
-    override val viewDataList: List<ViewData>
-        get() {
-            val list = arrayListOf<ViewData>()
-            if (game.wifiAutoDownloadEnable) {
-                list.add(ViewData(if (game.wifiAutoDownload) R.string.cancel_auto_download_with_wifi else R.string.enable_automatic_downloading_with_wifi) {
-                    listener.enableAutoDownload(!game.wifiAutoDownload)
-                })
-            }
-            list.add(ViewData(R.string.cancel_reserve, listener::cancelReserve))
-            return list
-        }
-
-    companion object {
-
-        fun create(
-            game: GameEntity,
-            context: Context,
-            listener: OnCancelReserveListener
-        ): CancelReservePop {
-            val inflater = LayoutInflater.from(context)
-            val binding = LayoutPopupContainerBinding.inflate(inflater)
-            return CancelReservePop(game, binding, listener).apply {
-                initView()
-            }
-        }
-    }
-
-    interface OnCancelReserveListener {
-
-        fun enableAutoDownload(isEnable: Boolean)
-
-        fun cancelReserve()
-    }
-}
--- a/app/src/main/java/com/gh/common/pop/CommonPopupWindow.kt
+++ b/app/src/main/java/com/gh/common/pop/CommonPopupWindow.kt
@ -1,47 +0,0 @@
-package com.gh.common.pop
-
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.core.view.updateLayoutParams
-import com.gh.gamecenter.common.databinding.LayoutPopupContainerBinding
-import com.gh.gamecenter.common.view.BugFixedPopupWindow
-import com.gh.gamecenter.core.utils.DisplayUtils
-import com.gh.gamecenter.databinding.LayoutAddKaifuPopupBinding
-import com.gh.gamecenter.databinding.LayoutAddKaifuPopupItemBinding
-import com.gh.gamecenter.databinding.LayoutPopupOptionItemBinding
-import com.gh.gamecenter.databinding.LayoutPopupReserveReminderOptionItemBinding
-
-abstract class CommonPopupWindow(
-    private val binding: LayoutPopupContainerBinding,
-) : BugFixedPopupWindow(binding.root, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT) {
-
-    private val inflater = LayoutInflater.from(binding.root.context)
-
-    abstract val viewDataList: List<ViewData>
-
-    fun initView() {
-        isFocusable = true
-        binding.container.updateLayoutParams<ViewGroup.LayoutParams> {
-            width = DisplayUtils.dip2px(128F)
-        }
-        viewDataList.forEach {
-            addItemView(it.textResId, it.click)
-        }
-    }
-
-    private fun addItemView(textResId: Int, click: () -> Unit) =
-        LayoutPopupReserveReminderOptionItemBinding.inflate(inflater, binding.container, false)
-            .also {
-                it.hintText.setText(textResId)
-                binding.container.addView(it.root)
-                it.root.setOnClickListener {
-                    dismiss()
-                    click()
-                }
-            }.root
-
-    data class ViewData(
-        val textResId: Int,
-        val click: () -> Unit
-    )
-}
--- a/app/src/main/java/com/gh/common/pop/EditBindPhoneInfoPop.kt
+++ b/app/src/main/java/com/gh/common/pop/EditBindPhoneInfoPop.kt
@ -1,70 +0,0 @@
-package com.gh.common.pop
-
-import android.content.Context
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.core.view.updateLayoutParams
-import com.gh.common.dialog.OnReserveSuccessListener
-import com.gh.gamecenter.R
-import com.gh.gamecenter.common.databinding.LayoutPopupContainerBinding
-import com.gh.gamecenter.common.view.BugFixedPopupWindow
-import com.gh.gamecenter.core.utils.DisplayUtils
-import com.gh.gamecenter.databinding.LayoutAddKaifuPopupItemBinding
-
-class EditBindPhoneInfoPop(
-    private val hasValidated: Boolean,
-    private val binding: LayoutPopupContainerBinding,
-    private val listener: OnReserveSuccessListener
-) : BugFixedPopupWindow(binding.root, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT) {
-
-    private val context
-        get() = binding.root.context
-
-    init {
-        initView()
-    }
-
-    private fun initView() {
-        isOutsideTouchable = false
-        isFocusable = true
-        binding.container.updateLayoutParams<ViewGroup.LayoutParams> {
-            width = DisplayUtils.dip2px(128F)
-        }
-        val inflater = LayoutInflater.from(context)
-        fun createItemView(textResId: Int) =
-            LayoutAddKaifuPopupItemBinding.inflate(inflater, binding.container, false)
-                .also {
-                    it.hintText.setText(textResId)
-                    binding.container.addView(it.root)
-                }.root
-
-        val tvChangePhoneNumber = createItemView(R.string.change_phone_number)
-        if(!hasValidated){
-            val tvVerifyPhoneNumber = createItemView(R.string.verify_phone_number)
-            tvVerifyPhoneNumber.setOnClickListener {
-                dismiss()
-                listener.verifyPhoneNumber()
-            }
-        }
-
-        val tvTurnOffSmsReminder = createItemView(R.string.turn_off_sms_reminders)
-
-        tvChangePhoneNumber.setOnClickListener {
-            dismiss()
-            listener.changePhoneNumber()
-        }
-
-        tvTurnOffSmsReminder.setOnClickListener {
-            dismiss()
-            listener.updateSmsReminder(false)
-        }
-    }
-
-    companion object {
-
-        fun create(context: Context, hasValidated: Boolean, listener: OnReserveSuccessListener): EditBindPhoneInfoPop {
-            val binding = LayoutPopupContainerBinding.inflate(LayoutInflater.from(context))
-            return EditBindPhoneInfoPop(hasValidated, binding, listener)
-        }
-    }
-}
--- a/app/src/main/java/com/gh/common/pop/EditBindWechatPop.kt
+++ b/app/src/main/java/com/gh/common/pop/EditBindWechatPop.kt
@ -1,26 +0,0 @@
-package com.gh.common.pop
-
-import android.content.Context
-import android.view.LayoutInflater
-import com.gh.common.dialog.OnReserveSuccessListener
-import com.gh.gamecenter.R
-import com.gh.gamecenter.common.databinding.LayoutPopupContainerBinding
-
-class EditBindWechatPop(
-    binding: LayoutPopupContainerBinding,
-    private val listener: OnReserveSuccessListener
-) : CommonPopupWindow(binding) {
-
-    override val viewDataList: List<ViewData>
-        get() = listOf(
-            ViewData(R.string.change_the_wechat_binding, listener::changeWechatBinding)
-        )
-
-    companion object {
-
-        fun create(context: Context, listener: OnReserveSuccessListener): EditBindWechatPop {
-            val inflater = LayoutInflater.from(context)
-            return EditBindWechatPop(LayoutPopupContainerBinding.inflate(inflater), listener).apply { initView() }
-        }
-    }
-}
--- a/app/src/main/java/com/gh/common/pop/RealNameTipsPop.kt
+++ b/app/src/main/java/com/gh/common/pop/RealNameTipsPop.kt
@ -1,69 +0,0 @@
-package com.gh.common.pop
-
-import android.content.Context
-import android.graphics.Color
-import android.text.SpannableString
-import android.text.TextPaint
-import android.text.method.LinkMovementMethod
-import android.text.style.ClickableSpan
-import android.text.style.ForegroundColorSpan
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.LinearLayout
-import androidx.core.text.set
-import com.gh.common.dialog.OnReserveSuccessListener
-import com.gh.gamecenter.R
-import com.gh.gamecenter.common.utils.toColor
-import com.gh.gamecenter.common.utils.toResString
-import com.gh.gamecenter.common.view.BugFixedPopupWindow
-import com.gh.gamecenter.core.utils.DisplayUtils
-import com.gh.gamecenter.databinding.PopRealNameTipsBinding
-import com.halo.assistant.fragment.reserve.OnReserveReminderListener
-
-class RealNameTipsPop(
-    private val binding: PopRealNameTipsBinding,
-    private val listener: OnReserveReminderListener
-) :
-    BugFixedPopupWindow(binding.root, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT) {
-
-    private val context: Context
-        get() = binding.root.context
-
-    init {
-        initView()
-    }
-
-    private fun initView() {
-
-        val text = R.string.reserve_real_name_description.toResString()
-        val spannableString = SpannableString(text)
-        val clickSpan = object : ClickableSpan() {
-            override fun updateDrawState(ds: TextPaint) {
-                ds.bgColor = Color.TRANSPARENT
-                ds.setColor(com.gh.gamecenter.common.R.color.text_theme.toColor(context))
-            }
-
-            override fun onClick(widget: View) {
-                dismiss()
-                listener.realName()
-            }
-        }
-        spannableString.set(start = text.length - 6, end = text.length, span = clickSpan)
-        binding.tvRealNameDescription.text = spannableString
-
-        binding.tvRealNameDescription.movementMethod = LinkMovementMethod.getInstance()
-        binding.tvRealNameDescription.setHighlightColor(Color.TRANSPARENT)
-    }
-
-    companion object {
-
-        @JvmStatic
-        fun create(context: Context, listener: OnReserveReminderListener): RealNameTipsPop {
-            val pop = RealNameTipsPop(PopRealNameTipsBinding.inflate(LayoutInflater.from(context)), listener)
-            pop.isFocusable = true
-            pop.isOutsideTouchable = false
-            return pop
-        }
-    }
-}
--- a/app/src/main/java/com/gh/common/pop/ReserveAllSelectPop.kt
+++ b/app/src/main/java/com/gh/common/pop/ReserveAllSelectPop.kt
@ -1,95 +0,0 @@
-package com.gh.common.pop
-
-import android.content.Context
-import android.view.Gravity
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import android.widget.CompoundButton
-import androidx.appcompat.app.AppCompatActivity
-import com.gh.gamecenter.R
-import com.gh.gamecenter.common.utils.dip2px
-import com.gh.gamecenter.common.view.BugFixedPopupWindow
-import com.gh.gamecenter.databinding.PopReserveAllSelectBinding
-import com.gh.gamecenter.mygame.MyReservationFragment
-
-class ReserveAllSelectPop(
-    val binding: PopReserveAllSelectBinding,
-    private val listener: OnReserveAllSelectListener
-) : BugFixedPopupWindow(binding.root, ViewGroup.LayoutParams.MATCH_PARENT, 56F.dip2px()) {
-
-    private var pageStatus: MyReservationFragment.ReservePageState =
-        MyReservationFragment.ReservePageState.EnableAutoDownload
-
-    private val onCheckedChangeListener = { _: CompoundButton, isChecked: Boolean ->
-        val count = listener.selectAll(isChecked)
-        updateSelectedCount(count)
-    }
-
-    init {
-        isOutsideTouchable = false
-        binding.cbAll.setOnCheckedChangeListener(onCheckedChangeListener)
-        binding.tvSubmit.setOnClickListener {
-            listener.submit()
-        }
-    }
-
-    fun show(state: MyReservationFragment.ReservePageState, context: Context) {
-        enableSubmit(false)
-        binding.tvSubmit.setText(
-            if (state == MyReservationFragment.ReservePageState.EnableAutoDownload) {
-                R.string.enable_automatic_downloading_with_wifi
-            } else {
-                R.string.cancel_reserve
-            }
-        )
-
-        // 清空上一次的状态
-        pageStatus = state
-        updateSelectedCount(0)
-
-        if (!isShowing) {
-            showAtLocation((context as AppCompatActivity).window.decorView, Gravity.BOTTOM, 0, 0)
-        }
-
-    }
-
-    fun updateSelectedCount(count: Int) {
-        if (count == 0) {
-            enableSubmit(false)
-
-            binding.cbAll.setOnCheckedChangeListener(null)
-            binding.cbAll.isChecked = false
-            binding.cbAll.setOnCheckedChangeListener(onCheckedChangeListener)
-        } else {
-            enableSubmit(true)
-            binding.tvNumber.text = binding.root.context.getString(R.string.count_with_parentheses, "$count")
-        }
-
-    }
-
-    private fun enableSubmit(isEnable: Boolean) {
-        binding.tvSubmit.isEnabled = isEnable
-        if (isEnable) {
-            binding.tvSubmit.alpha = 1F
-        } else {
-            binding.tvSubmit.alpha = 0.4F
-            binding.tvNumber.setText(null)
-
-        }
-    }
-
-    companion object {
-
-        fun create(context: Context, listener: OnReserveAllSelectListener): ReserveAllSelectPop {
-            val inflater = LayoutInflater.from(context)
-            return ReserveAllSelectPop(PopReserveAllSelectBinding.inflate(inflater), listener)
-        }
-    }
-
-    interface OnReserveAllSelectListener {
-
-        fun selectAll(isChecked: Boolean): Int
-
-        fun submit()
-    }
-}
--- a/app/src/main/java/com/gh/common/prioritychain/AccelerateNotificationHandler.kt
+++ b/app/src/main/java/com/gh/common/prioritychain/AccelerateNotificationHandler.kt
@ -1,12 +1,13 @@
 package com.gh.common.prioritychain

 import android.app.Activity
-import android.os.Handler
 import android.view.Gravity
 import android.view.LayoutInflater
 import android.widget.FrameLayout
 import com.gh.common.util.NewFlatLogUtils
 import com.gh.gamecenter.GameDetailActivity
+import com.gh.gamecenter.R
+import com.gh.gamecenter.common.base.fragment.BaseFragment
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.view.BugFixedPopupWindow
 import com.gh.gamecenter.core.utils.DisplayUtils
@ -18,7 +19,7 @@ import com.gh.gamecenter.wrapper.MainWrapperViewModel
 class AccelerateNotificationHandler(priority: Int) : PriorityChainHandler(priority) {

    private var mActivity: Activity? = null
-    private var mHandler: Handler? = null
+    private var mBaseHandler: BaseFragment.BaseHandler? = null
    private var mGameList: List<GameEntity>? = null
    private var mViewModel: MainWrapperViewModel? = null

@ -27,13 +28,13 @@ class AccelerateNotificationHandler(priority: Int) : PriorityChainHandler(priori
     */
    fun doPreProcess(
        activity: Activity,
-        handler: Handler,
+        baseHandler: BaseFragment.BaseHandler,
        gameEntityList: List<GameEntity>?,
        viewModel: MainWrapperViewModel
    ) {
        mActivity = activity
        mGameList = gameEntityList
-        mHandler = handler
+        mBaseHandler = baseHandler
        mViewModel = viewModel

        if (getStatus() == STATUS_PENDING) {
@ -58,7 +59,7 @@ class AccelerateNotificationHandler(priority: Int) : PriorityChainHandler(priori
                val accelerateSet =
                    HashSet(SPUtils.getStringSet(Constants.SP_ACCELERATE_NOTIFICATION_POP_UP_SET))
                if (!mGameList.isNullOrEmpty() && !accelerateSet.contains(mGameList!![0].messageId)) {
-                    showAccelerateNotificationPopupWindow(mActivity!!, mViewModel, mHandler, mGameList!![0]) {
+                    showAccelerateNotificationPopupWindow(mActivity!!, mViewModel, mBaseHandler, mGameList!![0]) {
                        processNext()
                    }
                    accelerateSet.add(mGameList!![0].messageId)
@ -81,7 +82,7 @@ class AccelerateNotificationHandler(priority: Int) : PriorityChainHandler(priori
        fun showAccelerateNotificationPopupWindow(
            activity: Activity,
            viewModel: MainWrapperViewModel?,
-            handler: Handler?,
+            baseHandler: BaseFragment.BaseHandler?,
            gameEntity: GameEntity?,
            dismissCallback: (() -> Unit)?
        ) {
@ -120,7 +121,7 @@ class AccelerateNotificationHandler(priority: Int) : PriorityChainHandler(priori
                isTouchable = true
                isFocusable = true
                isOutsideTouchable = true
-                animationStyle = com.gh.gamecenter.common.R.style.popup_window_ease_in_and_out_anim_style
+                animationStyle = R.style.popup_window_ease_in_and_out_anim_style
                showAtLocation(
                    activity.window.decorView,
                    Gravity.TOP,
@ -130,7 +131,7 @@ class AccelerateNotificationHandler(priority: Int) : PriorityChainHandler(priori
                setOnDismissListener {
                    dismissCallback?.invoke()
                }
-                handler?.postDelayed({ dismiss() }, 5000)
+                baseHandler?.postDelayed({ dismiss() }, 5000)
            }
        }
    }
--- a/app/src/main/java/com/gh/common/prioritychain/BottomTabGuideHandler.kt
+++ b/app/src/main/java/com/gh/common/prioritychain/BottomTabGuideHandler.kt
@ -1,168 +0,0 @@
-package com.gh.common.prioritychain
-
-import android.app.Activity
-import android.os.Handler
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.PopupWindow
-import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.core.view.updateLayoutParams
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.utils.dip2px
-import com.gh.gamecenter.common.view.BugFixedPopupWindow
-import com.gh.gamecenter.core.utils.SPUtils
-import com.gh.gamecenter.databinding.PopupBottomTabGuideBinding
-import com.gh.gamecenter.entity.BottomTab
-
-class BottomTabGuideHandler(priority: Int): PriorityChainHandler(priority) {
-    private var mActivity: Activity? = null
-    private var mHandler: Handler? = null
-    private var mViewPager: ViewGroup? = null
-    private var mGuide: BottomTab.Guide? = null
-    private var mTriangleTransX = 0F
-    private var mGuideTransX = 0F
-    private var mRestWidth = 0F
-    private var mIsCenterPosition = false
-    private var mIsRightPosition = false
-
-    private var mPopupWindow: PopupWindow? = null
-
-    fun doPreProcess(
-        shouldShow: Boolean,
-        activity: Activity? = null,
-        handler: Handler? = null,
-        viewPager: ViewGroup? = null,
-        guide: BottomTab.Guide? = null,
-        triangleTransX: Float = 0F,
-        guideTransX: Float = 0F,
-        restWidth: Float = 0F,
-        isCenterPosition: Boolean = false,
-        isRightPosition: Boolean = false
-    ) {
-        mActivity = activity
-        mHandler = handler
-        mViewPager = viewPager
-        mGuide = guide
-        mTriangleTransX = triangleTransX
-        mGuideTransX = guideTransX
-        mRestWidth = restWidth
-        mIsCenterPosition = isCenterPosition
-        mIsRightPosition = isRightPosition
-
-        if (getStatus() == STATUS_PENDING) {
-            if (shouldShow) {
-                updateStatus(STATUS_VALID)
-                process()
-            } else {
-                processNext()
-            }
-        } else {
-            if (shouldShow) {
-                updateStatus(STATUS_VALID)
-            } else {
-                updateStatus(STATUS_INVALID)
-            }
-        }
-    }
-
-    override fun onProcess(): Boolean {
-        when (getStatus()) {
-            STATUS_VALID -> {
-                if (mGuide == null || mActivity == null || mViewPager == null) {
-                    processNext()
-                    return false
-                }
-
-                val guideSet = HashSet(SPUtils.getStringSet(Constants.SP_BOTTOM_TAB_GUIDE_SET))
-                if (!guideSet.contains(mGuide?.bottomTabId + mGuide?.text)) {
-                    mPopupWindow = showBottomTabPopupWindow(
-                        mActivity!!,
-                        mHandler,
-                        mViewPager!!,
-                        mGuide!!,
-                        mTriangleTransX,
-                        mGuideTransX,
-                        mRestWidth,
-                        mIsCenterPosition,
-                        mIsRightPosition
-                    ) {
-                        processNext()
-                    }
-                    guideSet.add(mGuide?.bottomTabId + mGuide?.text)
-                    SPUtils.setStringSet(Constants.SP_BOTTOM_TAB_GUIDE_SET, guideSet)
-                    return true
-                } else {
-                    processNext()
-                }
-            }
-
-            STATUS_INVALID -> {
-                processNext()
-            }
-        }
-
-        return false
-    }
-
-    fun dismiss() {
-        if (mPopupWindow?.isShowing == true) {
-            mPopupWindow?.dismiss()
-        }
-    }
-
-    companion object {
-        const val KEY_BOTTOM_TAB_GUIDE_AUTO_DISMISS = 100
-        private const val AUTO_DISMISS_DELAY_TIME = 5000L
-
-        fun showBottomTabPopupWindow(
-            activity: Activity,
-            handler: Handler?,
-            viewPager: ViewGroup,
-            guide: BottomTab.Guide,
-            triangleTransX: Float,
-            guideTransX: Float,
-            restWidth: Float,
-            isCenterPosition: Boolean,
-            isRightPosition: Boolean,
-            dismissCallback: (() -> Unit)?
-        ): PopupWindow {
-            val binding = PopupBottomTabGuideBinding.inflate(LayoutInflater.from(activity))
-            binding.guideTv.text = guide.text
-            binding.guideTriangleIv.translationX = triangleTransX
-            binding.guideTv.translationX = guideTransX
-            binding.guideIconIv.translationX = guideTransX
-            binding.guideTv.updateLayoutParams<ConstraintLayout.LayoutParams> {
-                horizontalBias = if (isCenterPosition) 0.5F else if (isRightPosition) 1F else 0F
-            }
-
-            val popupWindow = BugFixedPopupWindow(
-                binding.root,
-                ConstraintLayout.LayoutParams.MATCH_PARENT,
-                ConstraintLayout.LayoutParams.WRAP_CONTENT
-            )
-            popupWindow.contentView.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED)
-            val measureWidth = popupWindow.contentView.measuredWidth
-            val measureHeight = popupWindow.contentView.measuredHeight
-            if (measureWidth > restWidth) {
-                binding.guideTv.translationX = 0F
-                binding.guideIconIv.translationX = 0F
-            }
-
-            return popupWindow.apply {
-                isFocusable = false
-                isOutsideTouchable = false
-                animationStyle = com.gh.gamecenter.common.R.style.popup_window_ease_in_and_out_anim_style
-                setOnDismissListener {
-                    dismissCallback?.invoke()
-                }
-                handler?.post {
-                    if (!activity.isFinishing) {
-                        showAsDropDown(viewPager, 0, 8F.dip2px() - measureHeight)
-                    }
-                    handler.sendEmptyMessageDelayed(KEY_BOTTOM_TAB_GUIDE_AUTO_DISMISS, AUTO_DISMISS_DELAY_TIME)
-                }
-            }
-        }
-    }
-}
--- a/app/src/main/java/com/gh/common/prioritychain/CommunityHomeGuideHandler.kt
+++ b/app/src/main/java/com/gh/common/prioritychain/CommunityHomeGuideHandler.kt
@ -1,52 +0,0 @@
-package com.gh.common.prioritychain
-
-import android.content.Context
-import android.view.LayoutInflater
-import android.widget.FrameLayout
-import com.airbnb.lottie.LottieAnimationView
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.core.utils.SPUtils
-import com.gh.gamecenter.databinding.LayoutCommunityHomeVideoGuideBinding
-
-class CommunityHomeGuideHandler(
-    priority: Int,
-    private val context: Context,
-    private val decorView: FrameLayout?,
-    private val videoLottie: LottieAnimationView?
-) : PriorityChainHandler(priority) {
-
-    init {
-        updateStatus(STATUS_VALID)
-    }
-
-    override fun onProcess(): Boolean {
-        return if (SPUtils.getBoolean(Constants.SP_SHOW_COMMUNITY_HOME_VIDEO_GUIDE, true)) {
-            showHomeVideoGuide(context, decorView, videoLottie)
-            processNext()
-            true
-        } else {
-            processNext()
-            false
-        }
-    }
-
-    companion object {
-        fun showHomeVideoGuide(context: Context, decorView: FrameLayout?, videoLottie: LottieAnimationView?) {
-            val guideLayoutBinding = LayoutCommunityHomeVideoGuideBinding.inflate(
-                LayoutInflater.from(context),
-                decorView,
-                true
-            )
-            guideLayoutBinding.root.setOnClickListener { view ->
-                decorView?.removeView(view)
-                SPUtils.setBoolean(Constants.SP_SHOW_COMMUNITY_HOME_VIDEO_GUIDE, false)
-
-                videoLottie?.playAnimation()
-                SPUtils.setLong(
-                    Constants.SP_COMMUNITY_HOME_VIDEO_LOTTIE_LAST_PLAY_TIME,
-                    System.currentTimeMillis()
-                )
-            }
-        }
-    }
-}
--- a/app/src/main/java/com/gh/common/prioritychain/CustomFloatingWindowHandler.kt
+++ b/app/src/main/java/com/gh/common/prioritychain/CustomFloatingWindowHandler.kt
@ -2,7 +2,7 @@ package com.gh.common.prioritychain

 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import com.gh.gamecenter.feature.entity.FloatingWindowEntity
+import com.gh.gamecenter.floatingwindow.FloatingWindowEntity
 import com.gh.gamecenter.livedata.Event

 class CustomFloatingWindowHandler(priority: Int) : PriorityChainHandler(priority) {
@ -60,7 +60,7 @@ class CustomFloatingWindowHandler(priority: Int) : PriorityChainHandler(priority
        when (getStatus()) {
            STATUS_VALID -> {
                _showFloatingAction.value = Event(data)
-                return true
+                processNext()
 //                    floatingWindowProvider.showFloatingWindowOnly(
 //                        mFragment!!,
 //                        mRecyclerView!!,
@ -79,9 +79,4 @@ class CustomFloatingWindowHandler(priority: Int) : PriorityChainHandler(priority
        return false
    }

-    fun dismiss() {
-        if (getStatus() == STATUS_HANDLING || getStatus() == STATUS_VALID) {
-            processNext()
-        }
-    }
 }
--- a/app/src/main/java/com/gh/common/prioritychain/GlobalPriorityChainHelper.kt
+++ b/app/src/main/java/com/gh/common/prioritychain/GlobalPriorityChainHelper.kt
@ -5,35 +5,23 @@ import android.app.Activity
 import android.app.Application.ActivityLifecycleCallbacks
 import android.os.Bundle
 import android.preference.PreferenceManager
-import android.text.TextUtils
-import androidx.annotation.WorkerThread
 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.download.DownloadManager
 import com.gh.gamecenter.SplashAdActivity
 import com.gh.gamecenter.SplashScreenActivity
 import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.exposure.ExposureSource
+import com.gh.gamecenter.common.entity.SimpleGameEntity
 import com.gh.gamecenter.common.retrofit.BiResponse
-import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.core.AppExecutor
-import com.gh.gamecenter.core.runOnIoThread
 import com.gh.gamecenter.core.utils.SPUtils
-import com.gh.gamecenter.core.utils.SPUtils.getBoolean
-import com.gh.gamecenter.core.utils.ToastUtils
 import com.gh.gamecenter.entity.DialogEntity
-import com.gh.gamecenter.feature.entity.GameEntity
-import com.gh.gamecenter.feature.entity.ReserveOnlineEntity
 import com.gh.gamecenter.feature.entity.WelcomeDialogEntity
-import com.gh.gamecenter.feature.exposure.ExposureEvent
-import com.gh.gamecenter.hud.PendingInstallHUDHandler
-import com.gh.gamecenter.hud.ResumeDownloadHudHandler
-import com.gh.gamecenter.login.entity.UserInfoEntity
 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

 /**
@ -45,7 +33,6 @@ import io.reactivex.schedulers.Schedulers
 object GlobalPriorityChainHelper : ISuperiorChain {

    private val api = RetrofitManager.getInstance().api
-    private val newApi = RetrofitManager.getInstance().newApi
    private var inferiorChain: PriorityChain? = null
    private val mainChain: PriorityChain by lazy { PriorityChain { inferiorChain?.start() } }

@ -70,8 +57,6 @@ object GlobalPriorityChainHelper : ISuperiorChain {
        val notificationPermissionDialogHandler = NotificationPermissionDialogHandler(0)
        val reserveDialogHandler = ReserveDialogHandler(1)
        val welcomeDialogHandler = WelcomeDialogHandler(2)
-        val pendingInstallHandler = PendingInstallHUDHandler(3)
-        val resumeDownloadHandler = ResumeDownloadHudHandler(4)

        mainChain.addHandler(launchRedirectHandler)
        mainChain.addHandler(updateDialogHandler)
@ -79,8 +64,6 @@ object GlobalPriorityChainHelper : ISuperiorChain {
        mainChain.addHandler(welcomeDialogHandler)
        mainChain.addHandler(reserveDialogHandler)
        mainChain.addHandler(notificationPermissionDialogHandler)
-        mainChain.addHandler(pendingInstallHandler)
-        mainChain.addHandler(resumeDownloadHandler)

        launchRedirectHandler.doPreProcess()
        updateDialogHandler.doPreProcess()
@ -234,7 +217,7 @@ object GlobalPriorityChainHelper : ISuperiorChain {
    /**
     * 请求预约弹窗相关的数据
     */
-
+    @SuppressLint("CheckResult")
    private fun requestReserveDialogData(reserveDialogHandler: ReserveDialogHandler) {
 //        debugOnly {
 //            reserveDialogHandler.doPreProcess(arrayListOf(SimpleGameEntity(
@ -247,145 +230,23 @@ object GlobalPriorityChainHelper : ISuperiorChain {
 //        }

        if (CheckLoginUtils.isLogin()) {
-            val isTeenagerMode = getBoolean(Constants.SP_TEENAGER_MODE)
-            loadReserveDialogOnlineData(isTeenagerMode, reserveDialogHandler)
+            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)
        }
    }

-    /**
-     * 由于用户预约的游戏个数没有限制，为避免一次加载游戏过多，这里采用先加载第一页，显示出dialog,后续数据在第二页返回
-     * 注意:当page = 2 时，后台会将后续所有数据一次性返回，所以递归到第三层时，就会结束
-     * @param isTeenagerMode 青少年模式关闭时才需要启动自动下载，所以当 isTeenagerMode == true 时，不需要加载后续数据，也不需要启动自动下载
-     */
-    @SuppressLint("CheckResult")
-    private fun loadReserveDialogOnlineData(isTeenagerMode: Boolean, handler: ReserveDialogHandler? = null) {
-        newApi.getReserveDialog()
-            .compose(singleToMain())
-            .subscribe(object : BiResponse<ReserveOnlineEntity>() {
-                override fun onSuccess(data: ReserveOnlineEntity) {
-                    handler?.doPreProcess(data)
-                    // 继续获取后续需要自动下载的游戏
-                    runOnIoThread {
-                        loadGamesWithAutoDownload(1, 20, isTeenagerMode)
-                    }
-                }
-
-                override fun onFailure(exception: Exception) {
-                    handler?.doPreProcess(null)
-                }
-            })
-    }
-
-    /**
-     * 由于这个方法本身就是在子线程调用的，这里不需要另外在做线程切换
-     */
-    @SuppressLint("CheckResult")
-    @WorkerThread
-    private fun loadGamesWithAutoDownload(page: Int, pageSize: Int, isTeenagerMode: Boolean) {
-        if (page >= 5) {
-            // 为防止死循环，这里设置最多请求到第5页(正常情况下，第一页就是全部数据)
-            return
-        }
-        val filter = "wifi_auto_download:true"
-        newApi.loadGamesWithAutoDownload(page, pageSize, filter)
-            .doOnSuccess(::trackAppointmentGameOnlineDialogShow)
-            .subscribe(object : BiResponse<List<GameEntity>>() {
-
-                override fun onSuccess(data: List<GameEntity>) {
-                    // 请注意，这是在子线程中
-                    if (data.isNotEmpty()) {
-                        loadGamesWithAutoDownload(page + 1, pageSize, isTeenagerMode)
-                        startAutoDownloadIfNeed(data, isTeenagerMode)
-                    }
-
-                }
-
-            })
-    }
-
-    @SuppressLint("CheckResult")
-    private fun startAutoDownloadIfNeed(games: List<GameEntity>, isTeenagerMode: Boolean) {
-        val autoDownloadGameIds = mutableSetOf<String>()
-        games.forEach {
-            autoDownloadGameIds.add(it.id)
-            if (it.wifiAutoDownload && !it.isLandPageAddressDialog() && !isTeenagerMode) {
-                // 开启了 wifi 自动下载，并且不能为第三方落地页跳转
-                val apk = when (it.getApk().size) {
-                    0 -> null
-                    1 -> it.getApk().first()
-                    else -> {
-                        // 自动下载，多版本默认：九游版
-                        it.getApk().find { apk -> "9u" == apk.getPlatform() && apk.isActive }
-                    }
-                }
-                if (apk != null) {
-                    val updateEntities = PackageUtils.getUpdateData(it, false)
-                    val isCanUpdate = if (updateEntities.size == 1) {
-                        true
-                    } else {
-                        // 多版本只需要判断九游版是否需要更新
-                        updateEntities.any { update -> "9u" == update.platform }
-                    }
-                    val isCanPluggable = PackageUtils.isCanPluggable(apk)
-                    if ((!PackageUtils.isInstalled(HaloApp.getInstance(), apk.packageName)
-                                || isCanUpdate
-                                || isCanPluggable)
-                        && DownloadManager.getInstance().getDownloadEntityByUrl(apk.url) == null
-                    ) {
-                        // 未下载/可更新/可插件化 且 之前没有下载记录
-                        val msg = FileUtils.isCanDownload(HaloApp.getInstance(), apk.size ?: "")
-                        if (msg.isNullOrBlank()) {
-                            val isWifiOpen = NetworkUtils.isWifiConnected(HaloApp.getInstance())
-                            val isSubscribe = !isWifiOpen
-                            DownloadManager.createDownload(
-                                HaloApp.getInstance(),
-                                apk,
-                                it,
-                                false,
-                                false,
-                                "",
-                                "",
-                                isSubscribe,
-                                ExposureEvent.createEvent(it, listOf(ExposureSource("预约上线弹窗-自动下载", "")))
-                            )
-                        } else {
-                            // 存储空间不足，直接跳出循环，放弃后续的所有游戏
-                            ToastUtils.showToast(msg)
-                            return@forEach
-                        }
-                    }
-                }
-            }
-        }
-        if (autoDownloadGameIds.isNotEmpty()) {
-            val body = hashMapOf(
-                "game_ids" to autoDownloadGameIds,
-                "type" to "wifi_auto_download"
-            )
-            newApi.logAutoDownload(body)
-                .subscribe({}, {})
-        }
-    }
-
-    private fun trackAppointmentGameOnlineDialogShow(games: List<GameEntity>) {
-        if (games.isNotEmpty()) {
-            val gameIds = arrayListOf<String>()
-            val gameNames = arrayListOf<String>()
-            val gameTypes = arrayListOf<String>()
-            games.forEach { game ->
-                gameIds.add(game.id)
-                gameNames.add(game.name ?: "")
-                gameTypes.add(game.categoryChinese)
-            }
-            val gameId = gameIds.joinToString()
-            val gameName = gameNames.joinToString()
-            val gameType = gameTypes.joinToString()
-            SensorsBridge.trackAppointmentGameOnlineDialogShow(gameId, gameName, gameType)
-        }
-    }
-
    override fun registerInferiorChain(chain: PriorityChain) {
        inferiorChain = chain
        if (mainChain.isHandlerQueueEmpty()) {
--- a/app/src/main/java/com/gh/common/prioritychain/MultiTabGuideHandler.kt
+++ b/app/src/main/java/com/gh/common/prioritychain/MultiTabGuideHandler.kt
@ -1,296 +0,0 @@
-package com.gh.common.prioritychain
-
-import android.app.Activity
-import android.os.Handler
-import android.view.LayoutInflater
-import android.view.View
-import android.widget.PopupWindow
-import androidx.constraintlayout.widget.ConstraintLayout
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.utils.dip2px
-import com.gh.gamecenter.common.utils.goneIf
-import com.gh.gamecenter.common.view.BugFixedPopupWindow
-import com.gh.gamecenter.common.view.NoDefaultMinWidthTabLayout
-import com.gh.gamecenter.core.utils.DisplayUtils
-import com.gh.gamecenter.core.utils.SPUtils
-import com.gh.gamecenter.databinding.PopupMultiTabGuideBinding
-import com.gh.gamecenter.entity.BottomTab
-import com.gh.gamecenter.wrapper.BaseTabWrapperFragment
-import com.gh.gamecenter.wrapper.MainWrapperFragment
-import com.google.android.material.tabs.TabLayout
-import com.google.android.material.tabs.TabLayout.TabView
-
-class MultiTabGuideHandler(priority: Int): PriorityChainHandler(priority) {
-    private var mActivity: Activity? = null
-    private var mHandler: Handler? = null
-    private var mGuide: BottomTab.Guide? = null
-    private var mTabLayout: TabLayout? = null
-    private var mTabView: TabView? = null
-    private var mIsSingleLineTab = false
-    private var mMainWrapperFragment: MainWrapperFragment? = null
-    private var mTabWrapperFragment: BaseTabWrapperFragment? = null
-
-    fun doPreProcess(
-        shouldShow: Boolean,
-        activity: Activity? = null,
-        handler: Handler? = null,
-        guide: BottomTab.Guide? = null,
-        tabLayout: TabLayout? = null,
-        tabView: TabLayout.TabView? = null,
-        isSingleLineTab: Boolean = false,
-        mainWrapperFragment: MainWrapperFragment? = null,
-        tabWrapperFragment: BaseTabWrapperFragment? = null
-    ) {
-        mActivity = activity
-        mHandler = handler
-        mGuide = guide
-        mTabLayout = tabLayout
-        mTabView = tabView
-        mIsSingleLineTab = isSingleLineTab
-        mMainWrapperFragment = mainWrapperFragment
-        mTabWrapperFragment = tabWrapperFragment
-
-        if (getStatus() == STATUS_PENDING) {
-            if (shouldShow) {
-                updateStatus(STATUS_VALID)
-                process()
-            } else {
-                processNext()
-            }
-        } else {
-            if (shouldShow) {
-                updateStatus(STATUS_VALID)
-            } else {
-                updateStatus(STATUS_INVALID)
-            }
-        }
-    }
-
-    override fun onProcess(): Boolean {
-        when (getStatus()) {
-            STATUS_VALID -> {
-                if (mGuide == null || mActivity == null || mTabView == null || mTabLayout == null) {
-                    processNext()
-                    return false
-                }
-
-                return showMultiTabGuide(
-                    true,
-                    mActivity!!,
-                    mHandler,
-                    mGuide!!,
-                    mTabLayout!!,
-                    mTabView!!,
-                    mIsSingleLineTab,
-                    mMainWrapperFragment,
-                    mTabWrapperFragment
-                ) {
-                    processNext()
-                }
-            }
-
-            STATUS_INVALID -> {
-                processNext()
-            }
-        }
-
-        return false
-    }
-
-    companion object {
-        private const val TAB_GUIDE_TRIANGLE_OFFSET_DP = 5F
-        private const val TAB_GUIDE_START_TRIANGLE_OFFSET_DP = 12F
-        private const val TAB_GUIDE_RIGHT_SIDE_ICON_RIGHT_RESERVED_OFFSET_DP = 51F + TAB_GUIDE_TRIANGLE_OFFSET_DP // 光宝在文案右侧时预留引导到屏幕右侧的距离
-        private const val TAB_GUIDE_RIGHT_SIDE_ICON_LEFT_RESERVED_OFFSET_DP = TAB_GUIDE_START_TRIANGLE_OFFSET_DP + TAB_GUIDE_TRIANGLE_OFFSET_DP // 光宝在文案作侧时预留引导到屏幕右侧的距离
-
-        fun showMultiTabGuide(
-            isImmediately: Boolean,
-            activity: Activity,
-            handler: Handler?,
-            guide: BottomTab.Guide,
-            tabLayout: TabLayout,
-            tabView: TabView,
-            isSingleLineTab: Boolean = false,
-            mainWrapperFragment: MainWrapperFragment? = null,
-            tabWrapperFragment: BaseTabWrapperFragment? = null,
-            dismissCallback: (() -> Unit)? = null
-        ): Boolean {
-            val guideSet = HashSet(SPUtils.getStringSet(Constants.SP_MULTI_TAB_NAV_GUIDE_SET))
-            val hasShownGuide = guideSet.contains(guide.multiTabId + guide.text)
-            val isCurrentBottomTab = mainWrapperFragment == null || guide.bottomTabId == mainWrapperFragment.currentTab?.id
-            if (!hasShownGuide && isCurrentBottomTab) {
-                val screenWidth = DisplayUtils.getScreenWidth(activity)
-                val outLocation = IntArray(2)
-                tabView.getLocationOnScreen(outLocation)
-                val tabViewCenterPosX = outLocation.first() + tabView.width / 2F
-                val iconLeftMaxPosX = if (isSingleLineTab) tabLayout.width else tabLayout.width - TAB_GUIDE_RIGHT_SIDE_ICON_LEFT_RESERVED_OFFSET_DP.dip2px()
-                val iconRightMaxPosX = if (isSingleLineTab) tabLayout.width else tabLayout.width - TAB_GUIDE_RIGHT_SIDE_ICON_RIGHT_RESERVED_OFFSET_DP.dip2px()
-                val isIconLeftValid = tabViewCenterPosX <= iconLeftMaxPosX
-                val isIconRightValid = tabViewCenterPosX <= iconRightMaxPosX
-                val isTabViewShowOnScreen = tabViewCenterPosX > 0 && (isIconLeftValid || isIconRightValid)
-                val isTabLayoutScrollStateIdle = (tabLayout as? NoDefaultMinWidthTabLayout)?.isScrollStateIdle == true
-                if (isTabViewShowOnScreen && isTabLayoutScrollStateIdle) {
-                    val trianglePosX = tabViewCenterPosX - TAB_GUIDE_TRIANGLE_OFFSET_DP.dip2px()
-                    val guideStartPosX = trianglePosX - TAB_GUIDE_START_TRIANGLE_OFFSET_DP.dip2px()
-                    val xoff = tabView.width / 2 - TAB_GUIDE_START_TRIANGLE_OFFSET_DP.dip2px() - TAB_GUIDE_TRIANGLE_OFFSET_DP.dip2px()
-                    val restGuideWidth = screenWidth - guideStartPosX
-
-                    showMultiTabPopupWindow(
-                        activity,
-                        handler,
-                        guide,
-                        tabView,
-                        xoff,
-                        screenWidth,
-                        restGuideWidth,
-                        isIconRightValid,
-                        dismissCallback
-                    )
-                    guideSet.add(guide.multiTabId + guide.text)
-                    SPUtils.setStringSet(Constants.SP_MULTI_TAB_NAV_GUIDE_SET, guideSet)
-
-                    return true
-                } else if (isImmediately) {
-                    (tabLayout as? NoDefaultMinWidthTabLayout)?.let {
-                        it.onScrollListener = object :
-                            NoDefaultMinWidthTabLayout.OnScrollListener() {
-                            override fun onScrollStateChanged(view: NoDefaultMinWidthTabLayout, scrollState: Int) {
-                                if (scrollState == SCROLL_STATE_IDLE) {
-                                    showMultiTabGuideIfTabViewShow(
-                                        activity,
-                                        handler,
-                                        guide,
-                                        it,
-                                        tabView,
-                                        isSingleLineTab,
-                                        mainWrapperFragment
-                                    )
-                                }
-                            }
-                        }
-                    }
-                }
-            } else if (isImmediately && !isCurrentBottomTab) {
-                tabWrapperFragment?.setResumeAndPauseListener {
-                    if (it) {
-                        handler?.post {
-                            (tabLayout as? NoDefaultMinWidthTabLayout)?.let { tl ->
-                                showMultiTabGuideIfBottomTabShow(
-                                    activity,
-                                    handler,
-                                    guide,
-                                    tl,
-                                    tabView,
-                                    isSingleLineTab,
-                                    mainWrapperFragment,
-                                    tabWrapperFragment
-                                )
-                            }
-                        }
-                    }
-                }
-            }
-
-            dismissCallback?.invoke()
-            return false
-        }
-
-        fun showMultiTabGuideIfTabViewShow(
-            activity: Activity,
-            handler: Handler?,
-            guide: BottomTab.Guide,
-            tabLayout: NoDefaultMinWidthTabLayout,
-            tabView: TabView,
-            isSingleLineTab: Boolean = false,
-            mainWrapperFragment: MainWrapperFragment?
-        ) {
-            if (showMultiTabGuide(
-                    false,
-                    activity,
-                    handler,
-                    guide,
-                    tabLayout,
-                    tabView,
-                    isSingleLineTab,
-                    mainWrapperFragment
-                )
-            ) {
-                tabLayout.onScrollListener = null
-            }
-        }
-
-        fun showMultiTabGuideIfBottomTabShow(
-            activity: Activity,
-            handler: Handler?,
-            guide: BottomTab.Guide,
-            tabLayout: NoDefaultMinWidthTabLayout,
-            tabView: TabView,
-            isSingleLineTab: Boolean = false,
-            mainWrapperFragment: MainWrapperFragment?,
-            tabWrapperFragment: BaseTabWrapperFragment?
-        ) {
-            if (showMultiTabGuide(
-                    false,
-                    activity,
-                    handler,
-                    guide,
-                    tabLayout,
-                    tabView,
-                    isSingleLineTab,
-                    mainWrapperFragment,
-                    tabWrapperFragment
-                )
-            ) {
-                tabWrapperFragment?.setResumeAndPauseListener(null)
-            }
-        }
-
-        fun showMultiTabPopupWindow(
-            activity: Activity,
-            handler: Handler?,
-            guide: BottomTab.Guide,
-            tabView: TabView,
-            xoff: Int,
-            screenWidth: Int,
-            restGuideWidth: Float,
-            isIconRight: Boolean,
-            dismissCallback: (() -> Unit)?
-        ): PopupWindow {
-            val binding = PopupMultiTabGuideBinding.inflate(LayoutInflater.from(activity))
-            binding.guideTv.text = guide.text
-            binding.guideTriangleIv.translationX = 12F.dip2px().toFloat()
-            binding.guideTv.setPadding(if (isIconRight) 8F.dip2px() else 52F.dip2px(), 0, if (isIconRight) 52F.dip2px() else 8F.dip2px(), 0)
-            binding.guideIconIv.goneIf(!isIconRight)
-            binding.guideIconFlipIv.goneIf(isIconRight)
-
-            val popupWindow = BugFixedPopupWindow(
-                binding.root,
-                ConstraintLayout.LayoutParams.WRAP_CONTENT,
-                ConstraintLayout.LayoutParams.WRAP_CONTENT
-            )
-            popupWindow.contentView.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED)
-            val measureWidth = popupWindow.contentView.measuredWidth
-            if (measureWidth >= screenWidth) {
-                popupWindow.width = screenWidth
-                binding.guideTriangleIv.translationX += screenWidth - restGuideWidth
-            } else if (measureWidth > restGuideWidth) {
-                binding.guideTriangleIv.translationX += measureWidth - restGuideWidth
-            }
-
-            return popupWindow.apply {
-                isTouchable = false
-                isFocusable = false
-                isOutsideTouchable = true
-                animationStyle = com.gh.gamecenter.common.R.style.popup_window_ease_in_and_out_anim_style
-                setOnDismissListener {
-                    dismissCallback?.invoke()
-                }
-                handler?.post {
-                    if (!activity.isFinishing) {
-                        showAsDropDown(tabView, xoff, (-25F).dip2px())
-                    }
-                }
-            }
-        }
-    }
-}
--- a/app/src/main/java/com/gh/common/prioritychain/ReserveDialogHandler.kt
+++ b/app/src/main/java/com/gh/common/prioritychain/ReserveDialogHandler.kt
@ -2,28 +2,28 @@ package com.gh.common.prioritychain

 import androidx.fragment.app.FragmentActivity
 import com.gh.common.dialog.ReserveDialog
+import com.gh.gamecenter.common.entity.SimpleGameEntity
 import com.gh.gamecenter.core.utils.CurrentActivityHolder
-import com.gh.gamecenter.feature.entity.ReserveOnlineEntity

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

-    private var mReserveData: ReserveOnlineEntity? = null
+    private var mReserveData: List<SimpleGameEntity>? = null

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

        if (getStatus() == STATUS_PENDING) {
-            if (reserveData?.games.isNullOrEmpty()) {
+            if (reserveData.isNullOrEmpty()) {
                processNext()
            } else {
                updateStatus(STATUS_VALID)
                process()
            }
        } else {
-            if (reserveData?.games.isNullOrEmpty()) {
+            if (reserveData.isNullOrEmpty()) {
                updateStatus(STATUS_INVALID)
            } else {
                updateStatus(STATUS_VALID)
@ -37,7 +37,7 @@ class ReserveDialogHandler(priority: Int) : PriorityChainHandler(priority) {
        if (GlobalPriorityChainHelper.isThisActivityValid(currentActivity)) {
            when (getStatus()) {
                STATUS_VALID -> {
-                    val reserveDialog = ReserveDialog.getInstance(mReserveData ?:ReserveOnlineEntity())
+                    val reserveDialog = ReserveDialog.getInstance(mReserveData!!)
                    reserveDialog.setOnDismissListener {
                        processNext()
                    }
--- a/app/src/main/java/com/gh/common/prioritychain/VideoHandler.kt
+++ b/app/src/main/java/com/gh/common/prioritychain/VideoHandler.kt
@ -1,16 +0,0 @@
-package com.gh.common.prioritychain
-
-import com.gh.gamecenter.home.video.ScrollCalculatorHelper
-
-class VideoHandler(priority: Int, val scrollCalculatorHelper: ScrollCalculatorHelper): PriorityChainHandler(priority) {
-
-    init {
-        updateStatus(STATUS_VALID)
-    }
-
-    override fun onProcess(): Boolean {
-        scrollCalculatorHelper.enableAndPlayIfValid()
-        return true
-    }
-
-}
--- a/app/src/main/java/com/gh/common/provider/AppProviderImpl.kt
+++ b/app/src/main/java/com/gh/common/provider/AppProviderImpl.kt
@ -7,8 +7,8 @@ import com.gh.gamecenter.R
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IAppProvider
 import com.gh.gamecenter.core.provider.IFlavorProvider
-import com.gh.gamecenter.va.VCore
 import com.halo.assistant.HaloApp
+import com.va.host.HostUtils

@Route(path = RouteConsts.provider.app, name = "Application暴露服务")
 class AppProviderImpl : IAppProvider {
@ -84,13 +84,9 @@ class AppProviderImpl : IAppProvider {
        return HaloApp.getInstance().isBrandNewInstall
    }

-    override fun setDisableSplashAdTemporarily(isDisable: Boolean) {
-        HaloApp.getInstance().isDisableSplashAdTemporarily = isDisable
+    override fun setSkippingThirdParty(isSkippingThirdParty: Boolean) {
+        HaloApp.getInstance().isSkippingThirdParty = isSkippingThirdParty
    }

-    override fun getPluginVersion(): String = VCore.getInstance().getPluginVersion()
-
-    override fun initImageLoaderIfNeeded() {
-        HaloApp.getInstance().initFresco()
-    }
+    override fun getPluginVersion(): String = HostUtils.getPluginVersion()
 }
--- a/app/src/main/java/com/gh/common/provider/BuildConfigImpl.kt
+++ b/app/src/main/java/com/gh/common/provider/BuildConfigImpl.kt
@ -32,10 +32,5 @@ class BuildConfigImpl : IBuildConfigProvider {
    override fun getVApiHost(): String = BuildConfig.VAPI_HOST

    override fun getVDevApiHost(): String = BuildConfig.DEV_VAPI_HOST
-
-    override fun getWGameCPMApiHost(): String = BuildConfig.WGAME_CPM_API_HOST
-
-    override fun getWGameCPMBusiAppId(): String = BuildConfig.WGAME_CPM_BUSIAPPID
-
    override fun getLogProducerProject(): String = BuildConfig.LOG_HUB_PROJECT
 }
--- a/app/src/main/java/com/gh/common/provider/ConcernArticleUtilsProviderImpl.kt
+++ b/app/src/main/java/com/gh/common/provider/ConcernArticleUtilsProviderImpl.kt
@ -1,102 +0,0 @@
-package com.gh.common.provider
-
-import android.content.Context
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.LinearLayout
-import android.widget.TextView
-import androidx.core.content.ContextCompat
-import androidx.viewbinding.ViewBinding
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.facebook.drawee.view.SimpleDraweeView
-import com.gh.common.util.ConcernContentUtils
-import com.gh.common.view.ImageContainerView
-import com.gh.gamecenter.ImageViewerActivity.Companion.getIntent
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.common.utils.toArrayList
-import com.gh.gamecenter.core.provider.IConcernArticleUtilsProvider
-import com.gh.gamecenter.databinding.RecyclerGameArticleBinding
-
-@Route(path = RouteConsts.provider.concernContentUtils, name = "ConcernContentUtils暴露服务")
-class ConcernArticleUtilsProviderImpl : IConcernArticleUtilsProvider {
-    override fun addContentPic(
-        context: Context,
-        linearLayout: LinearLayout,
-        list: List<String>,
-        entrance: String,
-        width: Int
-    ) {
-        ConcernContentUtils.addContentPic(context, linearLayout, list, entrance, width)
-    }
-
-    override fun createArticleBinding(parent: ViewGroup): ViewBinding {
-        val inflater = LayoutInflater.from(parent.context)
-        return RecyclerGameArticleBinding.inflate(inflater, parent, false)
-    }
-
-    override fun initArticleStyle(binding: ViewBinding) {
-        if (binding is RecyclerGameArticleBinding) {
-            val context = binding.root.context
-            binding.root
-                .setBackground(ContextCompat.getDrawable(context, com.gh.gamecenter.common.R.drawable.reuse_listview_item_style))
-            binding.tvGameName.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.text_primary))
-            binding.tvTime.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.text_tertiary))
-            binding.tvTitle.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.text_primary))
-            binding.tvDescription.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.text_secondary))
-            binding.tvComment.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.text_tertiary))
-            binding.tvShare.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.text_tertiary))
-        }
-    }
-
-    override fun getIvIcon(binding: ViewBinding): View =
-        (binding as RecyclerGameArticleBinding).ivIcon
-
-    override fun getTvGameName(binding: ViewBinding): TextView =
-        (binding as RecyclerGameArticleBinding).tvGameName
-
-    override fun getTvTime(binding: ViewBinding): TextView = (binding as RecyclerGameArticleBinding).tvTime
-
-    override fun getTvTitle(binding: ViewBinding): TextView = (binding as RecyclerGameArticleBinding).tvTitle
-
-    override fun getTvDescription(binding: ViewBinding): TextView =
-        (binding as RecyclerGameArticleBinding).tvDescription
-
-    override fun bindImgs(binding: ViewBinding, img: List<String>) {
-        if (binding is RecyclerGameArticleBinding) {
-            val images = img.map {
-                ImageContainerView.ImageContainerData.ImageInfo(it, 3, 2)
-            }
-            val imageContainerData =
-                ImageContainerView.ImageContainerData("", false, images, show = images.isNotEmpty())
-            binding.ivImagesContainer.bindData(imageContainerData,
-                object : ImageContainerView.OnImageContainerEventListener {
-                    override fun onImageClick(
-                        images: List<String>,
-                        position: Int,
-                        imageViewList: ArrayList<SimpleDraweeView>
-                    ) {
-                        val checkIntent = getIntent(
-                            binding.root.context,
-                            images.toArrayList(),
-                            position,
-                            imageViewList,
-                            ""
-                        )
-                        binding.root.context.startActivity(checkIntent)
-                    }
-
-                    override fun onVideoCLick(videoId: String) = Unit
-
-                })
-        }
-    }
-
-    override fun getTvComment(binding: ViewBinding): TextView = (binding as RecyclerGameArticleBinding).tvComment
-
-    override fun getTvShare(binding: ViewBinding): TextView = (binding as RecyclerGameArticleBinding).tvShare
-
-    override fun init(context: Context?) {
-        // Do nothing
-    }
-}
--- a/app/src/main/java/com/gh/common/provider/ConcernContentUtilsProviderImpl.kt
+++ b/app/src/main/java/com/gh/common/provider/ConcernContentUtilsProviderImpl.kt
@ -0,0 +1,26 @@
+package com.gh.common.provider
+
+import android.content.Context
+import android.widget.LinearLayout
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.ConcernContentUtils
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IConcernContentUtilsProvider
+
+@Route(path = RouteConsts.provider.concernContentUtils, name = "ConcernContentUtils暴露服务")
+class ConcernContentUtilsProviderImpl : IConcernContentUtilsProvider {
+    override fun addContentPic(
+        context: Context,
+        linearLayout: LinearLayout,
+        list: List<String>,
+        entrance: String,
+        width: Int
+    ) {
+        ConcernContentUtils.addContentPic(context, linearLayout, list, entrance, width)
+    }
+
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}
--- a/app/src/main/java/com/gh/common/provider/ConcernGiftPackUtilsProviderImpl.kt
+++ b/app/src/main/java/com/gh/common/provider/ConcernGiftPackUtilsProviderImpl.kt
@ -1,54 +0,0 @@
-package com.gh.common.provider
-
-import android.content.Context
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.TextView
-import androidx.viewbinding.ViewBinding
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.common.utils.goneIf
-import com.gh.gamecenter.common.utils.toColor
-import com.gh.gamecenter.core.provider.IConcernGiftPackUtilsProvider
-import com.gh.gamecenter.databinding.RecyclerGiftPackBinding
-
-@Route(path = RouteConsts.provider.concernGiftPackUtils, name = "ConcernGiftPackUtils暴露服务")
-class ConcernGiftPackUtilsProviderImpl : IConcernGiftPackUtilsProvider {
-    override fun createBinding(parent: ViewGroup): ViewBinding {
-        val inflater = LayoutInflater.from(parent.context)
-        return RecyclerGiftPackBinding.inflate(inflater, parent, false)
-            .also {
-                it.gCode.goneIf(true)
-            }
-    }
-
-    override fun initStyle(viewBinding: ViewBinding) {
-        with(viewBinding as RecyclerGiftPackBinding) {
-            val context = root.context
-            tvGameName.setTextColor(com.gh.gamecenter.common.R.color.text_primary.toColor(context))
-            tvTime.setTextColor(com.gh.gamecenter.common.R.color.text_tertiary.toColor(context))
-            tvGiftPackName.setTextColor(com.gh.gamecenter.common.R.color.text_primary.toColor(context))
-            tvGiftPackContent.setTextColor(com.gh.gamecenter.common.R.color.text_secondary.toColor(context))
-        }
-    }
-
-    override fun getIvGameIcon(viewBinding: ViewBinding) =
-        (viewBinding as RecyclerGiftPackBinding).ivIcon
-
-    override fun getTvGameName(viewBinding: ViewBinding) =
-        (viewBinding as RecyclerGiftPackBinding).tvGameName
-
-    override fun getTvTime(viewBinding: ViewBinding) =
-        (viewBinding as RecyclerGiftPackBinding).tvTime
-
-    override fun getTvGiftPackName(viewBinding: ViewBinding) =
-        (viewBinding as RecyclerGiftPackBinding).tvGiftPackName
-
-    override fun getTvGiftPackContent(viewBinding: ViewBinding) =
-        (viewBinding as RecyclerGiftPackBinding).tvGiftPackContent
-
-    override fun init(context: Context?) {
-        // Do Nothing
-    }
-}
--- a/app/src/main/java/com/gh/common/provider/ConcernShareNewsProviderImpl.kt
+++ b/app/src/main/java/com/gh/common/provider/ConcernShareNewsProviderImpl.kt
@ -1,19 +0,0 @@
-package com.gh.common.provider
-
-import android.content.Context
-import androidx.appcompat.app.AppCompatActivity
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.core.provider.IConcernShareNewsProvider
-import com.gh.gamecenter.newsdetail.NewsShareDialog
-
-@Route(path = RouteConsts.provider.concernShareNews, name = "ConcernShareNews暴露服务")
-class ConcernShareNewsProviderImpl : IConcernShareNewsProvider {
-    override fun share(activity: AppCompatActivity, shortId: String?, id: String?, gameIcon: String?, title: String?) {
-        NewsShareDialog.show(activity, shortId, id, gameIcon, title)
-    }
-
-    override fun init(context: Context?) {
-        // Do Nothing
-    }
-}
--- a/app/src/main/java/com/gh/common/provider/ConfigProviderImpl.kt
+++ b/app/src/main/java/com/gh/common/provider/ConfigProviderImpl.kt
@ -100,10 +100,6 @@ class ConfigProviderImpl : IConfigProvider {
        return Config.getNightModeSetting()?.setting ?: false
    }

-    override fun isJiguangSwitch(): Boolean {
-        return Config.getNewApiSettingsEntity()?.jiguangSwitch ?: false
-    }
-
    override fun init(context: Context?) {
        // Do nothing
    }
--- a/app/src/main/java/com/gh/common/provider/DirectProviderImpl.kt
+++ b/app/src/main/java/com/gh/common/provider/DirectProviderImpl.kt
@ -1,6 +1,5 @@
 package com.gh.common.provider

-import android.app.Activity
 import android.content.Context
 import android.os.Bundle
 import com.alibaba.android.arouter.facade.annotation.Route
@ -62,13 +61,7 @@ class DirectProviderImpl : IDirectProvider {
        DirectUtils.directToCommunityArticle(context, articleId, communityId, entrance, path, sourceEntrance)
    }

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

@ -76,23 +69,10 @@ class DirectProviderImpl : IDirectProvider {
        DirectUtils.directToAmway(context, fixedTopAmwayCommentId, entrance, path)
    }

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

-    override fun directToQQGameById(activity: Activity, qqAppId: String) {
-        DirectUtils.directToQQGameById(activity, qqAppId)
-    }
-
-    override fun directToWechatGameById(
-        activity: Activity,
-        wechatAppId: String,
-        wechatAppPath: String,
-        wechatAppExtData: String
-    ) {
-        DirectUtils.directToWechatGameById(activity, wechatAppId, wechatAppPath, wechatAppExtData)
-    }
-
    override fun directToExternalBrowser(context: Context, url: String) {
        DirectUtils.directToExternalBrowser(context, url)
    }
--- a/app/src/main/java/com/gh/common/provider/DownloadButtonClickedProviderImpl.kt
+++ b/app/src/main/java/com/gh/common/provider/DownloadButtonClickedProviderImpl.kt
@ -3,6 +3,7 @@ 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
@ -106,7 +107,7 @@ class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
            ) {

                val text = downloadButton.text.ifEmpty {
-                    downloadButton.getTag(com.gh.gamecenter.feature.R.string.download) ?: ""
+                    downloadButton.getTag(R.string.download) ?: ""
                }.toString()

                val downloadType = if (text.contains("畅玩")) {
--- a/app/src/main/java/com/gh/common/provider/EntranceUtilsProviderImpl.kt
+++ b/app/src/main/java/com/gh/common/provider/EntranceUtilsProviderImpl.kt
@ -1,16 +1,11 @@
 package com.gh.common.provider

 import android.content.Context
-import android.content.Intent
-import android.os.Build
 import android.os.Bundle
-import androidx.fragment.app.FragmentActivity
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.common.util.EntranceUtils
-import com.gh.gamecenter.common.avoidcallback.Callback
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IEntranceUtilsProvider
-import com.lightgame.utils.AppManager

@Route(path = RouteConsts.provider.entranceUtils, name = "EntranceUtils暴露服务")
 class EntranceUtilsProviderImpl : IEntranceUtilsProvider {
@ -22,19 +17,6 @@ class EntranceUtilsProviderImpl : IEntranceUtilsProvider {
        EntranceUtils.saveShortcut(activityName, bundle)
    }

-    override fun jumpActivityWithCallback(context: Context, bundle: Bundle, callback: () -> Unit) {
-        if (context is FragmentActivity && !context.supportFragmentManager.isDestroyed) {
-            EntranceUtils.jumpActivityCompat(context, bundle, null, object : Callback {
-                override fun onActivityResult(resultCode: Int, data: Intent?) {
-                    callback()
-                }
-            })
-        } else {
-            EntranceUtils.jumpActivityCompat(AppManager.getInstance().currentActivity(), bundle)
-        }
-
-    }
-
    override fun init(context: Context?) {
        // Do nothing
    }
--- a/app/src/main/java/com/gh/common/provider/MiniGameRecentlyPlayedProviderImpl.kt
+++ b/app/src/main/java/com/gh/common/provider/MiniGameRecentlyPlayedProviderImpl.kt
@ -1,23 +0,0 @@
-package com.gh.common.provider
-
-import android.content.Context
-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.core.provider.IMiniGameRecentlyPlayedProvider
-import com.gh.gamecenter.minigame.MiniGameRecentlyPlayUseCase
-
-@Route(path = RouteConsts.provider.miniGameRecentPlayed, name = "MiniGameRecentlyPlayed暴露服务")
-class MiniGameRecentlyPlayedProviderImpl : IMiniGameRecentlyPlayedProvider {
-    override fun clearMiniGameRecentlyPlayed(gameType: String) {
-        MiniGameRecentlyPlayUseCase.clearRecentlyPlayedMiniGameList(gameType)
-    }
-
-    override fun refreshQQMiniRecentPlayed() {
-        MiniGameRecentlyPlayUseCase.loadRecentlyPlayedMiniGameList(Constants.QQ_MINI_GAME)
-    }
-
-    override fun init(context: Context?) {
-        // no implement
-    }
-}
--- a/app/src/main/java/com/gh/common/provider/PackageHelperProviderImpl.kt
+++ b/app/src/main/java/com/gh/common/provider/PackageHelperProviderImpl.kt
@ -9,7 +9,7 @@ import com.gh.gamecenter.core.provider.IPackageHelperProvider
@Route(path = RouteConsts.provider.packageHelper, name = "PackageHelper暴露服务")
 class PackageHelperProviderImpl : IPackageHelperProvider {

-    override fun getLocalPackageNameSet(): Set<String> {
+    override fun getLocalPackageNameSet(): HashSet<String> {
        return PackageHelper.localPackageNameSet
    }

--- a/app/src/main/java/com/gh/common/provider/PackageUtilsProviderImpl.kt
+++ b/app/src/main/java/com/gh/common/provider/PackageUtilsProviderImpl.kt
@ -24,7 +24,7 @@ class PackageUtilsProviderImpl : IPackageUtilsProvider {
    }

    override fun getInstalledPackages(context: Context, flag: Int): List<PackageInfo> {
-        return PackageHelper.getInstalledPackageInfoList(context, flag)
+        return PackageHelper.getInstalledPackages(context, flag)
    }

    override fun getApkSignatureByPackageName(context: Context, packageName: String): Array<String> {
--- a/app/src/main/java/com/gh/common/provider/SearchTabUtilsProviderImpl.kt
+++ b/app/src/main/java/com/gh/common/provider/SearchTabUtilsProviderImpl.kt
@ -1,36 +0,0 @@
-package com.gh.common.provider
-
-import android.content.Context
-import androidx.fragment.app.Fragment
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.core.provider.ISearchTabUtilsProvider
-import com.gh.gamecenter.search.viewmodel.SearchTabViewModel
-
-@Route(path = RouteConsts.provider.searchTabUtils, name = "SearchTabUtils暴露服务")
-class SearchTabUtilsProviderImpl : ISearchTabUtilsProvider {
-
-    override fun obtainParentViewModel(fragment: Fragment): ViewModel {
-        val store = (fragment.parentFragment ?: fragment).viewModelStore
-        val factory = fragment.defaultViewModelProviderFactory
-        return ViewModelProvider(
-            store,
-            factory
-        ).get(SearchTabViewModel::class.java)
-    }
-
-    override fun getKeyAndTypeLiveData(viewModel: ViewModel?): LiveData<Pair<String, String>>? =
-        if (viewModel is SearchTabViewModel) {
-            viewModel.searchKeyAndType
-        } else {
-            null
-        }
-
-
-    override fun init(context: Context?) {
-       // no implement
-    }
-}
--- a/app/src/main/java/com/gh/common/provider/WechatHelperProviderImpl.kt
+++ b/app/src/main/java/com/gh/common/provider/WechatHelperProviderImpl.kt
@ -4,19 +4,16 @@ import android.content.Context
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.common.util.WechatBindHelper
 import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.common.entity.WechatConfigEntity
 import com.gh.gamecenter.core.provider.IWechatBindHelperProvider

@Route(path = RouteConsts.provider.wechatHelper, name = "WechatHelper暴露服务")
-class WechatHelperProviderImpl : IWechatBindHelperProvider<WechatConfigEntity> {
-
-    override fun getWechatConfig(callback: ((WechatConfigEntity) -> Unit)?) {
+class WechatHelperProviderImpl : IWechatBindHelperProvider {
+    override fun getWechatConfig(callback: (() -> Unit)?) {
        WechatBindHelper.getWechatConfig {
-            callback?.invoke(it)
+            callback?.invoke()
        }
    }

-
    override fun init(context: Context?) {
        // Do nothing
    }
--- a/app/src/main/java/com/gh/common/simulator/NewSimulatorGameManager.kt
+++ b/app/src/main/java/com/gh/common/simulator/NewSimulatorGameManager.kt
@ -11,6 +11,7 @@ import com.gh.common.constant.Config
 import com.gh.common.util.LogUtils
 import com.gh.common.util.NewFlatLogUtils
 import com.gh.gamecenter.BuildConfig
+import com.gh.gamecenter.R
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.core.utils.EmptyCallback
 import com.gh.gamecenter.core.utils.SPUtils
@ -90,7 +91,7 @@ object NewSimulatorGameManager {
            },
            uiModificationCallback = { binding ->
                binding.contentTv.gravity = Gravity.START
-                binding.contentTv.setTextColor(com.gh.gamecenter.common.R.color.text_secondary.toColor(context))
+                binding.contentTv.setTextColor(R.color.text_secondary.toColor(context))
            },
            extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
        )
--- a/app/src/main/java/com/gh/common/simulator/SimulatorDownloadManager.kt
+++ b/app/src/main/java/com/gh/common/simulator/SimulatorDownloadManager.kt
@ -339,8 +339,8 @@ class SimulatorDownloadManager private constructor() {
            Utils.toast(context, "当前使用移动数据进行下载")
        }

-        downloadDialog = TrackableDialog(context, com.gh.gamecenter.common.R.style.GhAlertDialog, "模拟器下载", "下载中弹窗")
-        downloadDialog?.window?.setBackgroundDrawableResource(com.gh.gamecenter.common.R.color.transparent)
+        downloadDialog = TrackableDialog(context, R.style.GhAlertDialog, "模拟器下载", "下载中弹窗")
+        downloadDialog?.window?.setBackgroundDrawableResource(R.color.transparent)

        val view = View.inflate(context, R.layout.download_simulator_dialog, null)

@ -392,7 +392,7 @@ class SimulatorDownloadManager private constructor() {
                ToastUtils.showToast("该模拟器暂未提供下载")
            },
            uiModificationCallback = { binding ->
-                binding.confirmTv.setTextColor(com.gh.gamecenter.common.R.color.text_instance.toColor(context))
+                binding.confirmTv.setTextColor(R.color.text_instance.toColor(context))
            },
            extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
        )
--- a/app/src/main/java/com/gh/common/util/ArchiveDownloadButtonHelper.kt
+++ b/app/src/main/java/com/gh/common/util/ArchiveDownloadButtonHelper.kt
@ -19,12 +19,11 @@ import com.gh.gamecenter.databinding.DialogArchiveLoadingBinding
 import com.gh.gamecenter.entity.ArchiveEntity
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.retrofit.RetrofitManager
-import com.gh.gamecenter.va.VCore
 import com.gh.vspace.VArchiveHelper
 import com.gh.vspace.VHelper
-import com.gh.vspace.VHelper.is32
 import com.lg.download.DownloadError
 import com.lg.download.DownloadStatus
+import com.lody.virtual.client.core.VirtualCore
 import io.reactivex.schedulers.Schedulers
 import org.greenrobot.eventbus.EventBus
 import splitties.systemservices.layoutInflater
@ -95,13 +94,13 @@ object ArchiveDownloadButtonHelper {
            R.string.archive_dialog_title.toResString(),
            R.string.archive_vspace_dialog_content.toResString(),
            R.string.archive_vspace_dialog_confirm.toResString(),
-            com.gh.gamecenter.common.R.string.cancel.toResString(),
+            R.string.cancel.toResString(),
            {
                NewFlatLogUtils.logCloudArchiveVSpaceDownloadDialogClick(R.string.archive_vspace_dialog_confirm.toResString())
                VHelper.showVSpaceDialog(context, gameEntity)
            },
            {
-                NewFlatLogUtils.logCloudArchiveVSpaceDownloadDialogClick(com.gh.gamecenter.common.R.string.cancel.toResString())
+                NewFlatLogUtils.logCloudArchiveVSpaceDownloadDialogClick(R.string.cancel.toResString())
            },
            extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
        )
@ -114,14 +113,14 @@ object ArchiveDownloadButtonHelper {
            R.string.archive_dialog_title.toResString(),
            R.string.archive_download_dialog_content.toResString(),
            R.string.archive_download_dialog_confirm.toResString(),
-            com.gh.gamecenter.common.R.string.cancel.toResString(),
+            R.string.cancel.toResString(),
            confirmClickCallback = {
                NewFlatLogUtils.logCloudArchiveGameDownloadDialogClick(R.string.archive_download_dialog_confirm.toResString())
                VHelper.disableLaunchGameAfterInstallation()
                EventBus.getDefault().post(EBReuse("download"))
            },
            cancelClickCallback = {
-                NewFlatLogUtils.logCloudArchiveGameDownloadDialogClick(com.gh.gamecenter.common.R.string.cancel.toResString())
+                NewFlatLogUtils.logCloudArchiveGameDownloadDialogClick(R.string.cancel.toResString())
            },
            extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
        )
@ -178,7 +177,7 @@ object ArchiveDownloadButtonHelper {
        VArchiveHelper.downloadArchive(archiveEntity)

        // 下载进度弹窗
-        val archiveLoadingDialog = Dialog(context, com.gh.gamecenter.common.R.style.DialogWindowTransparent)
+        val archiveLoadingDialog = Dialog(context, R.style.DialogWindowTransparent)
        val archiveLoadingBinding = DialogArchiveLoadingBinding.inflate(context.layoutInflater)
        showArchiveLoadingDialog(archiveLoadingDialog, archiveLoadingBinding.root)

@ -271,10 +270,9 @@ object ArchiveDownloadButtonHelper {
                R.string.archive_dialog_title.toResString(),
                R.string.archive_apply_dialog_content.toResString(),
                R.string.archive_apply.toResString(),
-                com.gh.gamecenter.common.R.string.cancel.toResString(),
+                R.string.cancel.toResString(),
                {
-                    if(gameEntity.is32() && VHelper.isInnerInstalled(packageName) && !VCore.getInstance().isExtPackageInstalled()) {
-                        // 32位的游戏 并且 32位畅玩没有安装 并且 一体化
+                    if(VHelper.isInnerInstalled(packageName) && !VirtualCore.get().isExtPackageInstalled) {
                        VHelper.newCwValidateVspaceBeforeAction(context, gameEntity) {}
                    } else {
                        applyArchive(context, entrance, packageName, config, archiveEntity, gameEntity)
--- a/app/src/main/java/com/gh/common/util/BbsReportHelper.kt
+++ b/app/src/main/java/com/gh/common/util/BbsReportHelper.kt
@ -41,7 +41,7 @@ object BbsReportHelper {
        CurrentActivityHolder.getCurrentActivity()?.apply {
            if (this.isFinishing) return@apply

-            val dialog = Dialog(this, com.gh.gamecenter.common.R.style.DialogWindowTransparent)
+            val dialog = Dialog(this, R.style.DialogWindowTransparent)
            val binding: DialogReportReasonBinding =
                DialogReportReasonBinding.inflate(LayoutInflater.from(this))
            val reportReasonAdapter = ReportReasonAdapter(
@ -64,7 +64,7 @@ object BbsReportHelper {
                    this,
                    1f,
                    false,
-                    com.gh.gamecenter.common.R.color.ui_background
+                    R.color.ui_background
                )
            )
            binding.reasonRv.adapter = reportReasonAdapter
@ -94,7 +94,7 @@ object BbsReportHelper {
            binding.otherReasonEt.doOnTextChanged { text, start, before, count ->
                val tvCount: Int = text.toString().length
                if (tvCount >= 500) {
-                    binding.tvCount.setTextColor(com.gh.gamecenter.common.R.color.secondary_red.toColor(binding.tvCount.context))
+                    binding.tvCount.setTextColor(R.color.secondary_red.toColor(binding.tvCount.context))
                }
                binding.tvCount.text = "$tvCount/500"
            }
--- a/app/src/main/java/com/gh/common/util/CheckLoginUtils.java
+++ b/app/src/main/java/com/gh/common/util/CheckLoginUtils.java
@ -1,21 +1,14 @@
 package com.gh.common.util;

-import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
 import android.text.TextUtils;

 import com.gh.gamecenter.common.constant.EntranceConsts;
-import com.gh.gamecenter.common.utils.NetworkUtils;
-import com.gh.gamecenter.core.utils.CurrentActivityHolder;
-import com.gh.gamecenter.login.user.UserManager;
-import com.gh.gamecenter.login.utils.QuickLoginHelper;
 import com.gh.gamecenter.login.view.LoginActivity;
+import com.gh.gamecenter.login.user.UserManager;
 import com.lightgame.utils.Utils;

-import kotlin.Unit;
-import kotlin.jvm.functions.Function0;
-

 /**
 * Created by khy on 28/06/17.
@ -29,15 +22,15 @@ public class CheckLoginUtils {
            LogUtils.login("dialog", null, entrance);
            LogUtils.login("activity", null, entrance);

-            if (NetworkUtils.isQuickLoginEnabled(context)) {
-                startQuickLogin(context, entrance, null);
-            } else {
-                // 有可能App未启动
-                Bundle bundle = new Bundle();
-                bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance);
-                bundle.putString(EntranceConsts.KEY_TO, LoginActivity.class.getName());
-                EntranceUtils.jumpActivity(context, bundle);
-            }
+//            if (SPUtils.getBoolean(Constants.SP_HAS_GET_PHONE_INFO) || NetworkUtils.isOpenMobileData(context)) {
+//                startQuickLogin(context, entrance);
+//            } else {
+            // 有可能App未启动
+            Bundle bundle = new Bundle();
+            bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance);
+            bundle.putString(EntranceConsts.KEY_TO, LoginActivity.class.getName());
+            EntranceUtils.jumpActivity(context, bundle);
+//            }
        } else {
            if (listener != null) {
                listener.onLogin();
@ -45,16 +38,16 @@ public class CheckLoginUtils {
        }
    }

-    private static void startQuickLogin(Context context, String entrance, Function0<Unit> callback) {
-        // 需要确保传入的 context 不为 application
-        if (!(context instanceof Activity)) {
-            context = CurrentActivityHolder.getCurrentActivity();
-        }
-
-        if (context != null) {
-            QuickLoginHelper.startLogin(context, entrance, callback);
-        }
-    }
+//    private static void startQuickLogin(Context context, String entrance) {
+//        // 需要确保传入的 context 不为 application
+//        if (!(context instanceof Activity)) {
+//            context = CurrentActivityHolder.getCurrentActivity();
+//        }
+//
+//        if (context != null) {
+//            QuickLoginHelper.startLogin(context, entrance);
+//        }
+//    }

    public static void checkLogin(final Context context, Bundle nextToBundle, boolean isTriggerNextStep, String entrance, OnLoginListener listener) {
        if (!isLogin()) {
@ -62,25 +55,15 @@ public class CheckLoginUtils {
            LogUtils.login("dialog", null, entrance);
            LogUtils.login("activity", null, entrance);

-            if (NetworkUtils.isQuickLoginEnabled(context)) {
-                startQuickLogin(context, entrance, () -> {
-                    if (isTriggerNextStep && listener != null && isLogin()) {
-                        listener.onLogin();
-                    }
-                    return null;
-                });
-            } else {
-                // 有可能App未启动
-                Bundle bundle = new Bundle();
-                bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance);
-                bundle.putString(EntranceConsts.KEY_TO, LoginActivity.class.getName());
-                EntranceUtils.jumpActivityCompat(context, bundle, nextToBundle, (resultCode, data) -> {
-                    if (isTriggerNextStep && listener != null && isLogin()) {
-                        listener.onLogin();
-                    }
-                });
-            }
-
+            // 有可能App未启动
+            Bundle bundle = new Bundle();
+            bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance);
+            bundle.putString(EntranceConsts.KEY_TO, LoginActivity.class.getName());
+            EntranceUtils.jumpActivity(context, nextToBundle, bundle, (resultCode, data) -> {
+                if (isTriggerNextStep && listener != null && isLogin()) {
+                    listener.onLogin();
+                }
+            });
        } else {
            if (listener != null) {
                listener.onLogin();
--- a/app/src/main/java/com/gh/common/util/CommentHelper.kt
+++ b/app/src/main/java/com/gh/common/util/CommentHelper.kt
@ -177,7 +177,7 @@ object CommentHelper {
        }

        val inflater = LayoutInflater.from(context)
-        val layout = inflater.inflate(com.gh.gamecenter.common.R.layout.layout_popup_container, null)
+        val layout = inflater.inflate(R.layout.layout_popup_container, null)
        val popupWindow = BugFixedPopupWindow(
            layout,
            LinearLayout.LayoutParams.WRAP_CONTENT,
--- a/app/src/main/java/com/gh/common/util/CommentUtils.java
+++ b/app/src/main/java/com/gh/common/util/CommentUtils.java
@ -117,7 +117,7 @@ public class CommentUtils {
    ) {
        Context context = anchor.getContext();
        LayoutInflater inflater = LayoutInflater.from(context);
-        View contentView = inflater.inflate(com.gh.gamecenter.common.R.layout.layout_popup_container, null);
+        View contentView = inflater.inflate(R.layout.layout_popup_container, null);
        PopupWindow popupWindow = new PopupWindow(
                contentView,
                ViewGroup.LayoutParams.WRAP_CONTENT,
@ -198,14 +198,14 @@ public class CommentUtils {
        LinearLayout container = new LinearLayout(context);
        container.setOrientation(LinearLayout.VERTICAL);
        container.setPadding(0, DisplayUtils.dip2px(context, 12), 0, DisplayUtils.dip2px(context, 12));
-        container.setBackgroundColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.ui_surface));
+        container.setBackgroundColor(ContextCompat.getColor(context, R.color.ui_surface));

        for (final String s : arrReportType) {
            TextView reportTypeTv = new TextView(context);
            reportTypeTv.setText(s);
            reportTypeTv.setTextSize(17);
-            reportTypeTv.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.title));
-            reportTypeTv.setBackgroundResource(com.gh.gamecenter.common.R.drawable.textview_white_style);
+            reportTypeTv.setTextColor(ContextCompat.getColor(context, R.color.title));
+            reportTypeTv.setBackgroundResource(R.drawable.textview_white_style);
            reportTypeTv.setLayoutParams(new LinearLayout.LayoutParams((widthPixels * 9) / 10,
                    LinearLayout.LayoutParams.WRAP_CONTENT));
            reportTypeTv.setPadding(DisplayUtils.dip2px(context, 20), DisplayUtils.dip2px(context, 12),
@ -248,12 +248,12 @@ public class CommentUtils {
    public static void postVote(final Context context, final CommentEntity commentEntity,
                                final TextView commentLikeCountTv, final ImageView commentLikeIv,
                                final OnVoteListener listener) {
-        if (commentLikeCountTv.getCurrentTextColor() == ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.text_theme)) {
+        if (commentLikeCountTv.getCurrentTextColor() == ContextCompat.getColor(context, R.color.text_theme)) {
            ToastUtils.INSTANCE.showToast("已经点过赞啦！");
            return;
        }
        commentEntity.setVote(commentEntity.getVote() + 1);
-        commentLikeCountTv.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.text_theme));
+        commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.text_theme));
        commentLikeIv.setImageResource(R.drawable.comment_vote_select);
        commentLikeCountTv.setText(NumberUtils.transSimpleCount(commentEntity.getVote()));
        commentLikeCountTv.setVisibility(View.VISIBLE);
@ -271,7 +271,7 @@ public class CommentUtils {
                    public void postFailed(Throwable e) {

                        commentEntity.setVote(commentEntity.getVote() - 1);
-                        commentLikeCountTv.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.hint));
+                        commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.hint));
                        commentLikeIv.setImageResource(R.drawable.comment_vote_unselect);
                        commentLikeCountTv.setText(NumberUtils.transSimpleCount(commentEntity.getVote()));
                        if (commentEntity.getVote() == 0) {
@ -318,12 +318,12 @@ public class CommentUtils {
            entrance = "视频流-评论-点赞";
        }
        CheckLoginUtils.checkLogin(context, entrance, () -> {
-            if (commentLikeCountTv.getCurrentTextColor() == ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.text_theme)) {
+            if (commentLikeCountTv.getCurrentTextColor() == ContextCompat.getColor(context, R.color.text_theme)) {
                ToastUtils.INSTANCE.showToast("已经点过赞啦！");
                return;
            }
            commentEntity.setVote(commentEntity.getVote() + 1);
-            commentLikeCountTv.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.text_theme));
+            commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.text_theme));
            commentLikeIv.setImageResource(R.drawable.comment_vote_select);
            commentLikeCountTv.setText(NumberUtils.transSimpleCount(commentEntity.getVote()));
            commentLikeCountTv.setVisibility(View.VISIBLE);
@ -340,7 +340,7 @@ public class CommentUtils {
                        @Override
                        public void postFailed(Throwable e) {
                            commentEntity.setVote(commentEntity.getVote() - 1);
-                            commentLikeCountTv.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.hint));
+                            commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.hint));
                            commentLikeIv.setImageResource(R.drawable.comment_vote_unselect);
                            commentLikeCountTv.setText(NumberUtils.transSimpleCount(commentEntity.getVote()));
                            if (commentEntity.getVote() == 0) {
@ -394,7 +394,7 @@ public class CommentUtils {
                        @Override
                        public void postFailed(Throwable e) {
                            commentEntity.setVote(commentEntity.getVote() - 1);
-                            commentLikeCountTv.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.hint));
+                            commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.hint));
                            commentLikeIv.setImageResource(R.drawable.comment_vote_unselect);
                            commentLikeCountTv.setText(NumberUtils.transSimpleCount(commentEntity.getVote()));
                            if (commentEntity.getVote() == 0) {
@ -444,7 +444,7 @@ public class CommentUtils {
                        public void onFailure(@Nullable HttpException e) {
                            super.onFailure(e);
                            commentEntity.setVote(commentEntity.getVote() + 1);
-                            commentLikeCountTv.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.text_theme));
+                            commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.text_theme));
                            commentLikeIv.setImageResource(R.drawable.comment_vote_select);
                            commentLikeCountTv.setText(NumberUtils.transSimpleCount(commentEntity.getVote()));
                            commentLikeCountTv.setVisibility(View.VISIBLE);
@ -487,7 +487,7 @@ public class CommentUtils {
    // 设置评论item 用户相关的view(点赞/头像/用户名)
    public static void setCommentUserView(Context mContext, CommentViewHolder holder, CommentEntity entity) {
        MeEntity userDataEntity = entity.getMe();
-        holder.commentLikeCountTv.setTextColor(ContextCompat.getColor(mContext, com.gh.gamecenter.common.R.color.hint));
+        holder.commentLikeCountTv.setTextColor(ContextCompat.getColor(mContext, R.color.hint));
        holder.commentLikeIv.setImageResource(R.drawable.comment_vote_unselect);

        if (userDataEntity == null || !userDataEntity.isCommentOwner()) {
@ -502,7 +502,7 @@ public class CommentUtils {
            holder.commentLikeCountTv.setVisibility(View.GONE);
        } else { // 检查是否已点赞
            if (userDataEntity != null && (userDataEntity.isCommentVoted())) {
-                holder.commentLikeCountTv.setTextColor(ContextCompat.getColor(mContext, com.gh.gamecenter.common.R.color.text_theme));
+                holder.commentLikeCountTv.setTextColor(ContextCompat.getColor(mContext, R.color.text_theme));
                holder.commentLikeIv.setImageResource(R.drawable.comment_vote_select);
            }
            holder.commentLikeCountTv.setVisibility(View.VISIBLE);
--- a/app/src/main/java/com/gh/common/util/ConcernContentUtils.java
+++ b/app/src/main/java/com/gh/common/util/ConcernContentUtils.java
@ -7,8 +7,8 @@ import android.widget.LinearLayout;
 import com.facebook.drawee.drawable.ScalingUtils;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.gh.gamecenter.ImageViewerActivity;
-import com.gh.gamecenter.common.utils.ImageUtils;
 import com.gh.gamecenter.core.utils.DisplayUtils;
+import com.gh.gamecenter.common.utils.ImageUtils;

 import java.util.ArrayList;
 import java.util.List;
@ -121,4 +121,5 @@ public class ConcernContentUtils {
        }
        return imageView;
    }
+
 }
--- a/app/src/main/java/com/gh/common/util/DataCollectionUtils.java
+++ b/app/src/main/java/com/gh/common/util/DataCollectionUtils.java
@ -1,14 +1,17 @@
 package com.gh.common.util;

 import android.content.Context;
+import android.os.Build;

 import com.gh.gamecenter.common.constant.Constants;
 import com.gh.gamecenter.common.constant.EntranceConsts;
 import com.gh.gamecenter.common.exposure.meta.MetaUtil;
+import com.gh.gamecenter.common.utils.NetworkUtils;
 import com.gh.gamecenter.feature.entity.GameEntity;
 import com.gh.gamecenter.entity.NewsDetailEntity;
 import com.gh.gamecenter.feature.utils.PlatformUtils;
 import com.gh.gamecenter.manager.DataCollectionManager;
+import com.gh.gamecenter.manager.PackagesManager;
 import com.lightgame.download.DownloadEntity;

 import java.util.HashMap;
@ -29,7 +32,7 @@ public class DataCollectionUtils {
        map.put("type", android.os.Build.MODEL);
        map.put("system", android.os.Build.VERSION.SDK_INT + "=" + android.os.Build.VERSION.RELEASE);
        // WIFI实时
-        DataCollectionManager.onEvent(context, "error", map, true);
+        DataCollectionManager.onEvent(context, "error", map, NetworkUtils.isWifiConnected(context));
    }

    // 上传下载数据（开始、完成）
--- a/app/src/main/java/com/gh/common/util/DataUtils.java
+++ b/app/src/main/java/com/gh/common/util/DataUtils.java
@ -9,18 +9,17 @@ import android.preference.PreferenceManager;
 import android.text.TextUtils;
 import android.util.Log;

-import com.alibaba.android.arouter.launcher.ARouter;
 import com.gh.ad.AdDelegateHelper;
 import com.gh.gamecenter.BuildConfig;
+import com.gh.gamecenter.common.base.GlobalActivityManager;
+import com.gh.gamecenter.common.base.activity.BaseActivity;
 import com.gh.gamecenter.common.constant.Constants;
-import com.gh.gamecenter.common.constant.RouteConsts;
 import com.gh.gamecenter.common.exposure.meta.MetaUtil;
 import com.gh.gamecenter.common.retrofit.BiResponse;
 import com.gh.gamecenter.core.AppExecutor;
-import com.gh.gamecenter.core.provider.ISentryProvider;
 import com.gh.gamecenter.core.utils.GsonUtils;
 import com.gh.gamecenter.core.utils.SPUtils;
-import com.gh.gamecenter.feature.utils.SentryHelper;
+import com.gh.gamecenter.core.utils.SentryHelper;
 import com.gh.gamecenter.login.entity.IdCardEntity;
 import com.gh.gamecenter.login.entity.UserInfoEntity;
 import com.gh.gamecenter.provider.GhContentProvider;
@ -32,6 +31,9 @@ import com.lightgame.config.CommonDebug;
 import com.lightgame.utils.Utils;

 import io.reactivex.schedulers.Schedulers;
+import io.sentry.Sentry;
+import io.sentry.android.core.SentryAndroid;
+import kotlin.Pair;

 /**
 * Created by LGT on 2016/6/15.
@ -55,10 +57,50 @@ public class DataUtils {
    }

    private static void initSentry(Context context, String channel) {
-        ISentryProvider sentryProvider = (ISentryProvider) ARouter.getInstance().build(RouteConsts.provider.sentry).navigation();
-        if (sentryProvider != null) {
-            sentryProvider.init(context, channel, BuildConfig.FLAVOR, BuildConfig.VERSION_NAME);
-        }
+        SentryAndroid.init(context, options -> {
+            // Sentry 疯狂报 ANR (很大一部分还是莫名奇妙的 ANR)严重影响到其它闪退日志的收集
+            // 这里将它局限到只有官网渠道的包才统计 ANR
+            if ("GH_206".equals(channel) || "GH_BETA".equals(channel) || com.gh.gamecenter.common.BuildConfig.BUILD_TIME != 0) {
+                options.setAnrEnabled(true);
+                options.setAnrTimeoutIntervalMillis(6000);
+            } else {
+                options.setAnrEnabled(false);
+            }
+
+            options.setDebug(BuildConfig.DEBUG);
+            options.setEnableAutoSessionTracking(true);
+            options.setEnvironment(BuildConfig.FLAVOR);
+            options.setEnableSystemEventBreadcrumbs(false);
+            options.setDsn("https://6b1caf0d17c1408e8680f3f73ff80bd0@sentry.shanqu.cc/22");
+
+            options.setBeforeSend((event, hint) -> {
+                if (BuildConfig.DEBUG) {
+                    return null;
+                } else {
+                    return event;
+                }
+            });
+
+            options.setBeforeBreadcrumb(((breadcrumb, hint) -> {
+                if ("ui.lifecycle".equals(breadcrumb.getCategory()) && "started".equals(breadcrumb.getData("state")) && GlobalActivityManager.INSTANCE.getCurrentActivity() instanceof BaseActivity) {
+                    Pair<String, String> businessId = ((BaseActivity) GlobalActivityManager.INSTANCE.getCurrentActivity()).getBusinessId();
+                    if (businessId != null) {
+                        breadcrumb.setData("businessId1", businessId.component1());
+                        breadcrumb.setData("businessId2", businessId.component2());
+                    }
+                }
+                return breadcrumb;
+            }));
+        });
+
+        Sentry.configureScope(scope -> {
+            if (com.gh.gamecenter.common.BuildConfig.BUILD_TIME != 0L) {
+                scope.setTag("alias", "内测版" + BuildConfig.VERSION_NAME);
+            } else {
+                scope.setTag("alias", "正式版" + BuildConfig.VERSION_NAME);
+                scope.setTag("channel", channel);
+            }
+        });
    }

    public static void getGid() {
--- a/app/src/main/java/com/gh/common/util/DetailDownloadUtils.java
+++ b/app/src/main/java/com/gh/common/util/DetailDownloadUtils.java
@ -5,6 +5,7 @@ import android.text.TextUtils;
 import android.view.View;
 import android.widget.TextView;

+import com.gh.common.constant.Config;
 import com.gh.common.filter.RegionSetting;
 import com.gh.common.filter.RegionSettingHelper;
 import com.gh.common.repository.ReservationRepository;
@ -18,7 +19,6 @@ import com.gh.gamecenter.common.constant.Constants;
 import com.gh.gamecenter.common.entity.LinkEntity;
 import com.gh.gamecenter.common.utils.ExtensionsKt;
 import com.gh.gamecenter.core.utils.SPUtils;
-import com.gh.gamecenter.core.utils.SpeedUtils;
 import com.gh.gamecenter.feature.entity.GameEntity;
 import com.gh.gamecenter.feature.entity.PluginLocation;
 import com.gh.gamecenter.feature.view.DownloadButton;
@ -48,6 +48,11 @@ public class DetailDownloadUtils {
        GameEntity gameEntity = viewHolder.getGameEntity();
        String downloadAddWord = gameEntity.getDownloadAddWord();

+        // 隐藏下载按钮上的畅玩文案
+        if (viewHolder.getOverlayTv() != null) {
+            viewHolder.getOverlayTv().setVisibility(View.GONE);
+        }
+
        // 多版本下载箭头
        if (viewHolder.getMultiVersionDownloadTv() != null) {
            viewHolder.getMultiVersionDownloadTv().setVisibility(View.GONE);
@ -112,6 +117,17 @@ public class DetailDownloadUtils {
                }
            }

+            // 更新默认的下载按钮
+            updateWithSingleApk(
+                    gameEntity,
+                    viewHolder,
+                    viewHolder.getDownloadPb(),
+                    downloadAddWord,
+                    showVGame,
+                    showDualDownloadButton,
+                    downloadEntity
+            );
+
            if (showDualDownloadButton) {
                // 双下载按钮时更新占位的下载按钮
                updateWithSingleApk(
@ -124,17 +140,6 @@ public class DetailDownloadUtils {
                        downloadEntity
                );
            }
-
-            // 更新默认的下载按钮
-            updateWithSingleApk(
-                    gameEntity,
-                    viewHolder,
-                    viewHolder.getDownloadPb(),
-                    downloadAddWord,
-                    showVGame,
-                    showDualDownloadButton,
-                    downloadEntity
-            );
        } else {
            // 游戏包含多 APK 的情况
            viewHolder.getMultiVersionDownloadTv().setText("选择下载你的版本" + (TextUtils.isEmpty(downloadAddWord) ? "" : "-" + downloadAddWord));
@ -187,53 +192,49 @@ public class DetailDownloadUtils {
        Context context = viewHolder.getContext();
        TextView overlayTv = viewHolder.getOverlayTv();

-        boolean containsAddWord = !TextUtils.isEmpty(downloadAddWord); // 是否存在下载补充文案
-
-        // 根据游戏实体获取下载按钮文案
-        String rawBtnText = GameUtils.getDownloadBtnText(context, gameEntity, false, showAsVGame, PluginLocation.only_game);
+        String status = GameUtils.getDownloadBtnText(context, gameEntity, false, showAsVGame, PluginLocation.only_game);

        if (showAsVGame) {
            // 显示为畅玩游戏
-            if (context.getString(com.gh.gamecenter.feature.R.string.launch).equals(rawBtnText)) {
+            if (context.getString(R.string.launch).equals(status)) {
                downloadButton.setButtonStyle(DownloadButton.ButtonStyle.LAUNCH_OR_OPEN);
            } else {
                downloadButton.setButtonStyle(DownloadButton.ButtonStyle.NORMAL);
            }

-            String decoratedBtnText;
-            // 双下载按钮时，显示特殊样式
+            String btnText;
            if (showDualDownloadButton
-                    && (context.getString(com.gh.gamecenter.feature.R.string.launch).equals(rawBtnText) || context.getString(com.gh.gamecenter.feature.R.string.install).equals(rawBtnText) || context.getString(com.gh.gamecenter.feature.R.string.smooth).equals(rawBtnText) || context.getString(com.gh.gamecenter.feature.R.string.update).equals(rawBtnText))) {
-                if (context.getString(com.gh.gamecenter.feature.R.string.smooth).equals(rawBtnText)) {
-                    decoratedBtnText = context.getString(com.gh.gamecenter.feature.R.string.download_v);
-                } else if (context.getString(com.gh.gamecenter.feature.R.string.update).equals(rawBtnText)) {
-                    decoratedBtnText = context.getString(com.gh.gamecenter.feature.R.string.update_v);
+                    && (context.getString(R.string.launch).equals(status) || context.getString(R.string.install).equals(status) || context.getString(R.string.smooth).equals(status) || context.getString(R.string.update).equals(status))) {
+                if (context.getString(R.string.smooth).equals(status)) {
+                    btnText = context.getString(R.string.download_v);
+                } else if (context.getString(R.string.update).equals(status)) {
+                    btnText = context.getString(R.string.update_v);
                } else {
-                    decoratedBtnText = context.getString(com.gh.gamecenter.feature.R.string.launch_v);
+                    btnText = context.getString(R.string.launch_v);
                }

                if (overlayTv != null && downloadButton.getVisibility() != View.GONE) {
                    overlayTv.setVisibility(View.VISIBLE);
-                    overlayTv.setText(decoratedBtnText);
+                    overlayTv.setText(btnText);
                    downloadButton.setText("");
                }
            } else {
-                decoratedBtnText = rawBtnText + (containsAddWord? "" : downloadAddWord) + getWrappedDownloadSizeText(viewHolder);
+                btnText = status + (TextUtils.isEmpty(downloadAddWord) ? "" : downloadAddWord) + getDownloadSizeText(viewHolder);

                if (overlayTv != null && downloadButton.getVisibility() != View.GONE) {
-                    if (context.getString(com.gh.gamecenter.feature.R.string.launch).equals(rawBtnText)
-                            || context.getString(com.gh.gamecenter.feature.R.string.install).equals(rawBtnText)) {
+                    if (context.getString(R.string.launch).equals(status)
+                            || context.getString(R.string.install).equals(status)) {
                        overlayTv.setVisibility(View.VISIBLE);
                        overlayTv.setText("启动（畅玩）");
                    } else {
                        overlayTv.setVisibility(View.GONE);
-                        downloadButton.setText(decoratedBtnText);
+                        downloadButton.setText(btnText);
                    }
                } else {
                    if (overlayTv != null) {
                        overlayTv.setVisibility(View.GONE);
                    }
-                    downloadButton.setText(decoratedBtnText);
+                    downloadButton.setText(btnText);
                }
            }

@ -246,11 +247,11 @@ public class DetailDownloadUtils {
            }
        } else {
            // 非畅玩，显示为普通游戏
-            if (context.getString(com.gh.gamecenter.feature.R.string.pluggable).equals(rawBtnText)) {
+            if (context.getString(R.string.pluggable).equals(status)) {
                downloadButton.setButtonStyle(DownloadButton.ButtonStyle.PLUGIN);
-            } else if (context.getString(com.gh.gamecenter.feature.R.string.launch).equals(rawBtnText)) {
+            } else if (context.getString(R.string.launch).equals(status)) {
                downloadButton.setButtonStyle(DownloadButton.ButtonStyle.LAUNCH_OR_OPEN);
-            } else if (context.getString(com.gh.gamecenter.feature.R.string.install).equals(rawBtnText)) {
+            } else if (context.getString(R.string.install).equals(status)) {
                downloadButton.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_NORMAL);
            } else {
                downloadButton.setButtonStyle(DownloadButton.ButtonStyle.NORMAL);
@ -270,85 +271,55 @@ public class DetailDownloadUtils {
                }
            }

-            String decoratedBtnText;
-            String localBtnText;
-            boolean useAlternativeTextStyle = false; // 是否使用带图标的文案，仅不包含补充文案时使用且
-
-            // 更新下载按钮文案
+            String btnText;
+            String extraBtnText;
            if (viewHolder.isNewsDetail()) {
-                decoratedBtnText = rawBtnText;
-                localBtnText = rawBtnText;
-            } else if (context.getString(com.gh.gamecenter.feature.R.string.pluggable).equals(rawBtnText)) {
-                decoratedBtnText = "升级" + (!containsAddWord ? "" : "至" + downloadAddWord) + getWrappedDownloadSizeText(viewHolder);
-                localBtnText = "升级" + (!containsAddWord ? "" : "至" + downloadAddWord);
-            } else if (context.getString(com.gh.gamecenter.feature.R.string.launch).equals(rawBtnText)) {
-                decoratedBtnText = rawBtnText + (!containsAddWord ? "" : "-" + downloadAddWord);
-                localBtnText = context.getString(com.gh.gamecenter.feature.R.string.launch_local);
-            } else if (context.getString(com.gh.gamecenter.feature.R.string.attempt).equals(rawBtnText)) {
-                decoratedBtnText = context.getString(com.gh.gamecenter.feature.R.string.attempt);
-                localBtnText = rawBtnText;
+                btnText = status;
+                extraBtnText = status;
+            } else if (context.getString(R.string.pluggable).equals(status)) {
+                btnText = "升级" + (TextUtils.isEmpty(downloadAddWord) ? "" : "至" + downloadAddWord) + getDownloadSizeText(viewHolder);
+                extraBtnText = "升级" + (TextUtils.isEmpty(downloadAddWord) ? "" : "至" + downloadAddWord);
+            } else if (context.getString(R.string.launch).equals(status)) {
+                btnText = status + (TextUtils.isEmpty(downloadAddWord) ? "" : "-" + downloadAddWord);
+                extraBtnText = context.getString(R.string.launch_local);
+            } else if (context.getString(R.string.attempt).equals(status)) {
+                btnText = status + getDownloadSizeText(viewHolder);
+                extraBtnText = status;
                if (showDualDownloadButton
                        && viewHolder.getLocalDownloadContainer() != null
                        && viewHolder.getLocalDownloadContainer().getVisibility() == View.VISIBLE) {
                    viewHolder.getLocalDownloadSizeTv().setVisibility(View.VISIBLE);
-                } else if (viewHolder.getOverlayTv() != null) {
-                    useAlternativeTextStyle = true;
                }
-            } else if (context.getString(com.gh.gamecenter.feature.R.string.install).equals(rawBtnText)) {
-                decoratedBtnText = context.getString(com.gh.gamecenter.feature.R.string.install);
-                localBtnText = context.getString(com.gh.gamecenter.feature.R.string.install_local);
-            } else if (context.getString(com.gh.gamecenter.feature.R.string.update).equals(rawBtnText)) {
-                decoratedBtnText = context.getString(com.gh.gamecenter.feature.R.string.update);
-                localBtnText = context.getString(com.gh.gamecenter.feature.R.string.update_local);
+            } else if (context.getString(R.string.install).equals(status)) {
+                btnText = context.getString(R.string.install);
+                extraBtnText = context.getString(R.string.install_local);
+            } else if (context.getString(R.string.update).equals(status)) {
+                btnText = context.getString(R.string.update);
+                extraBtnText = context.getString(R.string.update_local);
                if (showDualDownloadButton
                        && viewHolder.getLocalDownloadContainer() != null
                        && viewHolder.getLocalDownloadContainer().getVisibility() == View.VISIBLE) {
                    viewHolder.getLocalDownloadSizeTv().setVisibility(View.VISIBLE);
                }
            } else {
-                if (containsAddWord) {
-                    decoratedBtnText = rawBtnText + downloadAddWord + getWrappedDownloadSizeText(viewHolder);
-                } else {
-                    decoratedBtnText = rawBtnText;
-                }
-                localBtnText = context.getString(com.gh.gamecenter.feature.R.string.download_local);
+                btnText = status + (TextUtils.isEmpty(downloadAddWord) ? "" : downloadAddWord) + getDownloadSizeText(viewHolder);
+                extraBtnText = context.getString(R.string.download_local);
                if (showDualDownloadButton
                        && viewHolder.getLocalDownloadContainer() != null
                        && viewHolder.getLocalDownloadContainer().getVisibility() == View.VISIBLE) {
                    viewHolder.getLocalDownloadSizeTv().setVisibility(View.VISIBLE);
-                } else if (viewHolder.getOverlayTv() != null && !containsAddWord) {
-                    useAlternativeTextStyle = true;
                }
            }
-
-            if (useAlternativeTextStyle) {
-                downloadButton.setText("");
-                viewHolder.getOverlayTv().setText(decoratedBtnText);
-                viewHolder.getOverlayTv().setVisibility(View.VISIBLE);
-                viewHolder.getOverlayTv().setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_special_download, 0, 0, 0);
-                if (viewHolder.getExtraOverlayTv() != null) {
-                    viewHolder.getExtraOverlayTv().setVisibility(View.VISIBLE);
-                    viewHolder.getExtraOverlayTv().setText(gameEntity.getApk().get(0).getSize());
-                }
-            } else {
-                if (viewHolder.getOverlayTv() != null && !showDualDownloadButton) {
-                    viewHolder.getOverlayTv().setVisibility(View.GONE);
-                    if (viewHolder.getExtraOverlayTv() != null) {
-                        viewHolder.getExtraOverlayTv().setVisibility(View.GONE);
-                    }
-                }
-                downloadButton.setText(decoratedBtnText);
-            }
-
+            downloadButton.setText(btnText);
            if (viewHolder.getLocalDownloadTitleTv() != null) {
-                viewHolder.getLocalDownloadTitleTv().setText(localBtnText);
+                viewHolder.getLocalDownloadTitleTv().setText(extraBtnText);
            }
        }

        if (overlayTv != null && overlayTv.getVisibility() == View.VISIBLE) {
-            downloadButton.setTag(com.gh.gamecenter.feature.R.string.download, overlayTv.getText());
+            downloadButton.setTag(R.string.download, overlayTv.getText());
        } else {
-            downloadButton.setTag(com.gh.gamecenter.feature.R.string.download, downloadButton.getText());
+            downloadButton.setTag(R.string.download, downloadButton.getText());
        }

        if (downloadEntity == null) return;
@ -378,13 +349,10 @@ public class DetailDownloadUtils {
        if (overlayTv != null
                && downloadEntity.getStatus() != DownloadStatus.done) {
            overlayTv.setVisibility(View.GONE);
-            if (viewHolder.getExtraOverlayTv() != null) {
-                viewHolder.getExtraOverlayTv().setVisibility(View.GONE);
-            }
        }

        if (showAsVGame) {
-            updateVStyleDownloadButton(viewHolder, downloadButton, downloadEntity, rawBtnText);
+            updateVStyleDownloadButton(viewHolder, downloadButton, downloadEntity, status);
        } else {
            updateDefaultStyleDownloadButton(context, viewHolder, downloadButton, gameEntity, downloadEntity);
        }
@ -473,7 +441,7 @@ public class DetailDownloadUtils {
        return false;
    }

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

@ -484,11 +452,11 @@ public class DetailDownloadUtils {
        switch (downloadEntity.getStatus()) {
            case redirected:
            case downloading:
-                downloadButton.setText(SpeedUtils.getSpeed(downloadEntity.getSpeed()));
+                downloadButton.setText("游戏加载中 " + downloadEntity.getPercent() + "%");
                downloadButton.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_NORMAL);
                break;
            case waiting:
-                downloadButton.setText(com.gh.gamecenter.feature.R.string.waiting);
+                downloadButton.setText(R.string.waiting);
                downloadButton.setButtonStyle(DownloadButton.ButtonStyle.WAITING);
                break;
            case overflow:
@ -498,13 +466,11 @@ public class DetailDownloadUtils {
            case diskisfull:
            case diskioerror:
            case pause:
-                String pausedText = viewHolder.getContext().getString(com.gh.gamecenter.feature.R.string.paused);
-                downloadButton.setText(getValidProgress(downloadEntity) + "% " + pausedText);
+                downloadButton.setText("继续加载 " + downloadEntity.getPercent() + "%");
                downloadButton.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_NORMAL);
                break;
            case done:
-                String updateText = viewHolder.getContext().getString(com.gh.gamecenter.feature.R.string.update);
-                if (!status.contains(updateText)) {
+                if (!status.contains("更新")) {
                    if (VHelper.isInstalled(downloadEntity.getPackageName())) {
                        downloadButton.setButtonStyle(DownloadButton.ButtonStyle.LAUNCH_OR_OPEN);
                    } else {
@ -544,9 +510,8 @@ public class DetailDownloadUtils {
            case diskisfull:
            case diskioerror:
            case overflow:
-                String pausedText = context.getString(com.gh.gamecenter.feature.R.string.paused);
-                String downloadingText = SpeedUtils.getSpeed(downloadEntity.getSpeed());
-                String resumeText = getValidProgress(downloadEntity) + "% " + pausedText;
+                String downloadingText = "游戏加载中 " + downloadEntity.getPercent() + "%";
+                String resumeText = "继续加载 " + downloadEntity.getPercent() + "%";
                downloadButton.setText((downloadEntity.getStatus() == DownloadStatus.downloading || downloadEntity.getStatus() == DownloadStatus.redirected) ? downloadingText : resumeText);
                if (downloadEntity.isPluggable() && PackagesManager.isInstalled(downloadEntity.getPackageName())) {
                    downloadButton.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_PLUGIN);
@ -555,7 +520,7 @@ public class DetailDownloadUtils {
                }
                break;
            case waiting:
-                downloadButton.setText(com.gh.gamecenter.feature.R.string.waiting);
+                downloadButton.setText(R.string.waiting);
                downloadButton.setButtonStyle(DownloadButton.ButtonStyle.WAITING);
                break;
            case done:
@ -563,21 +528,21 @@ public class DetailDownloadUtils {
                    boolean isInstalled = PackageUtils.isInstalledFromAllPackage(context, gameEntity.getSimulator().getApk().getPackageName());
                    boolean isInstalledNewSimulator = SimulatorGameManager.isNewSimulatorInstalled(context);
                    if (isInstalled || isInstalledNewSimulator) {
-                        downloadButton.setText(com.gh.gamecenter.feature.R.string.launch);
+                        downloadButton.setText(R.string.launch);
                        downloadButton.setButtonStyle(DownloadButton.ButtonStyle.LAUNCH_OR_OPEN);
                    } else {
                        if (SPUtils.getBoolean(Constants.SP_USE_BROWSER_TO_INSTALL) && !Objects.equals(Constants.XAPK_APKS_FORMAT, downloadEntity.getFormat())) {
-                            downloadButton.setText(com.gh.gamecenter.feature.R.string.browser_install_install);
+                            downloadButton.setText(R.string.browser_install_install);
                        } else {
-                            downloadButton.setText(com.gh.gamecenter.feature.R.string.install);
+                            downloadButton.setText(R.string.install);
                        }
                        downloadButton.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_NORMAL);
                    }
                } else {
                    if (SPUtils.getBoolean(Constants.SP_USE_BROWSER_TO_INSTALL) && !Objects.equals(Constants.XAPK_APKS_FORMAT, downloadEntity.getFormat())) {
-                        downloadButton.setText(com.gh.gamecenter.feature.R.string.browser_install_install);
+                        downloadButton.setText(R.string.browser_install_install);
                    } else {
-                        downloadButton.setText(com.gh.gamecenter.feature.R.string.install);
+                        downloadButton.setText(R.string.install);
                    }
                }

@ -596,10 +561,6 @@ public class DetailDownloadUtils {
        }
    }

-    public static int getValidProgress(DownloadEntity downloadEntity) {
-        return (int) Math.ceil(downloadEntity.getPercent());
-    }
-
    private static boolean handleDownloadButtonAsXapk(DownloadEntity downloadEntity, DownloadButton downloadButton) {
        String xapkStatus = downloadEntity.getMeta().get(XapkInstaller.XAPK_UNZIP_STATUS);

@ -617,7 +578,7 @@ public class DetailDownloadUtils {
            downloadButton.setButtonStyle(DownloadButton.ButtonStyle.XAPK_UNZIPPING);
            return true;
        } else if (XapkUnzipStatus.FAILURE.name().equals(xapkStatus)) {
-            downloadButton.setText(com.gh.gamecenter.feature.R.string.install);
+            downloadButton.setText(R.string.install);
            downloadButton.setButtonStyle(DownloadButton.ButtonStyle.XAPK_FAILURE);
            return true;
        }
--- a/app/src/main/java/com/gh/common/util/DialogUtils.java
+++ b/app/src/main/java/com/gh/common/util/DialogUtils.java
@ -2,7 +2,6 @@ package com.gh.common.util;

 import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.Intent;
@ -67,7 +66,6 @@ import com.gh.gamecenter.databinding.DialogReportReasonBinding;
 import com.gh.gamecenter.databinding.DialogWechatReserveSuccessBinding;
 import com.gh.gamecenter.databinding.ImprintContentItemBinding;
 import com.gh.gamecenter.entity.BadgeEntity;
-import com.gh.gamecenter.entity.ReserveReminderEntity;
 import com.gh.gamecenter.entity.TrackableEntity;
 import com.gh.gamecenter.feature.entity.ApkEntity;
 import com.gh.gamecenter.feature.entity.Badge;
@ -75,7 +73,6 @@ import com.gh.gamecenter.feature.entity.GameEntity;
 import com.gh.gamecenter.feature.entity.SettingsEntity;
 import com.gh.gamecenter.help.HelpAndFeedbackBridge;
 import com.gh.gamecenter.setting.SettingBridge;
-import com.halo.assistant.fragment.reserve.ReserveReminderContainerFragment;
 import com.lightgame.download.DownloadEntity;
 import com.lightgame.utils.AppManager;
 import com.lightgame.utils.Util_System_Keyboard;
@ -94,13 +91,13 @@ public class DialogUtils {
        context = checkDialogContext(context);

        Dialog dialog = new Dialog(context);
-        View view = View.inflate(context, com.gh.gamecenter.common.R.layout.set_wait_dialog, null);
-        TextView message = view.findViewById(com.gh.gamecenter.common.R.id.set_wait_message);
+        View view = View.inflate(context, R.layout.set_wait_dialog, null);
+        TextView message = view.findViewById(R.id.set_wait_message);
        message.setText(msg);
        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
        dialog.setContentView(view);
        dialog.setCanceledOnTouchOutside(false);
-        dialog.getWindow().setBackgroundDrawableResource(com.gh.gamecenter.common.R.drawable.background_shape_white_radius_8);
+        dialog.getWindow().setBackgroundDrawableResource(R.drawable.background_shape_white_radius_8);
        WindowManager.LayoutParams layoutParams = dialog.getWindow().getAttributes();
        layoutParams.width = DisplayUtils.dip2px(160);
        dialog.getWindow().setAttributes(layoutParams);
@ -151,7 +148,6 @@ public class DialogUtils {
        }
        return false;
    }
-
    public static void showNoConnectionDownloadDialog(Context context, ConfirmListener listener, CancelListener cancelListener) {
        DialogHelper.showDialog(context, "下载提示", "网络异常，请检查手机网络状态", "知道了", "WiFi自动下载", listener::onConfirm, cancelListener::onCancel, false, "", "");
    }
@ -163,7 +159,7 @@ public class DialogUtils {

        NewFlatLogUtils.logDownloadMobileDataDialogShow(gameId, gameName);

-        final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.GhAlertDialog);
+        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);

        View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_download_traffic, null);
        View allowOnce = contentView.findViewById(R.id.allow_once);
@ -259,7 +255,7 @@ public class DialogUtils {
                                             final ConfirmListener cmListener) {
        context = checkDialogContext(context);

-        final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.GhAlertDialog);
+        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);

        View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_community, null);
        View contentContainer = contentView.findViewById(R.id.content_container);
@ -318,7 +314,7 @@ public class DialogUtils {
                                                       EmptyCallback callback) {
        final Context activityContext = checkDialogContext(context);

-        final Dialog dialog = new Dialog(activityContext, com.gh.gamecenter.common.R.style.DialogWindowTransparent);
+        final Dialog dialog = new Dialog(activityContext, R.style.DialogWindowTransparent);

        View contentView = LayoutInflater.from(activityContext).inflate(R.layout.dialog_disallow_privacy_policy, null);
        View backButton = contentView.findViewById(R.id.back_button);
@ -354,14 +350,14 @@ public class DialogUtils {
                                               final ConfirmListener cmListener) {
        context = checkDialogContext(context);

-        final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.GhAlertDialog);
+        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);

        View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_video_upload_draft, null);
        TextView negativeTv = contentView.findViewById(R.id.negative);
        TextView positiveTv = contentView.findViewById(R.id.positive);
        TextView content = contentView.findViewById(R.id.content);
-        positiveTv.setBackground(DrawableView.getOvalDrawable(com.gh.gamecenter.common.R.color.ui_background, 999));
-        negativeTv.setBackground(DrawableView.getOvalDrawable(com.gh.gamecenter.common.R.color.primary_theme, 999));
+        positiveTv.setBackground(DrawableView.getOvalDrawable(R.color.ui_background, 999));
+        negativeTv.setBackground(DrawableView.getOvalDrawable(R.color.primary_theme, 999));
        content.setText(Html.fromHtml(context.getString(R.string.video_upload_draft_dialog_content)));

        negativeTv.setOnClickListener(view -> {
@ -411,7 +407,7 @@ public class DialogUtils {
        context = checkDialogContext(context);

        final TrackableDialog dialog = new TrackableDialog(context,
-                com.gh.gamecenter.common.R.style.GhAlertDialog,
+                R.style.GhAlertDialog,
                trackableEntity.getEvent(),
                trackableEntity.getKey(),
                trackableEntity.getValue(),
@ -427,7 +423,7 @@ public class DialogUtils {
                window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
            }
        } else {
-            contentView = LayoutInflater.from(context).inflate(com.gh.gamecenter.common.R.layout.dialog_alert, null);
+            contentView = LayoutInflater.from(context).inflate(R.layout.dialog_alert, null);
        }

        TextView contentTv = contentView.findViewById(R.id.dialog_content);
@ -482,7 +478,7 @@ public class DialogUtils {
    public static Dialog showUsageStatsDialog(Context context, final ConfirmListener cmListener, final CancelListener clListener) {
        context = checkDialogContext(context);

-        final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.GhAlertDialog);
+        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);

        View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_usage_stats, null);
        TextView negativeTv = contentView.findViewById(R.id.dialog_negative);
@ -522,7 +518,7 @@ public class DialogUtils {
    public static void showDownloadMutexDialog(Context context) {
        context = checkDialogContext(context);

-        final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.GhAlertDialog);
+        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);

        View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_downlaod_mutex, null);
        TextView positive = contentView.findViewById(R.id.dialog_positive);
@ -562,7 +558,7 @@ public class DialogUtils {

        context = checkDialogContext(context);

-        final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.GhAlertDialog);
+        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);

        DialogAddressConfirmationBinding binding = DialogAddressConfirmationBinding.inflate(LayoutInflater.from(context), null, false);

@ -629,7 +625,7 @@ public class DialogUtils {
    public static void showLandPageAddressDialog(Context context, GameEntity gameEntity, @NonNull ConfirmListener listener) {
        context = checkDialogContext(context);

-        final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.GhAlertDialog);
+        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);

        DialogAddressConfirmationBinding binding = DialogAddressConfirmationBinding.inflate(LayoutInflater.from(context), null, false);

@ -637,19 +633,7 @@ public class DialogUtils {

        binding.gameIcon.displayGameIcon(gameEntity);
        binding.gameNameTv.setText(context.getString(R.string.dialog_land_page_address_hint, gameEntity.getName()));
-
-        AtomicBoolean dismissByButton = new AtomicBoolean(false);
-
-        binding.closeIv.setOnClickListener(v -> {
-            dismissByButton.set(true);
-            SensorsBridge.INSTANCE.trackJumpLandPageAddressDialogClick(
-                    "取消",
-                    gameEntity.getId(),
-                    gameEntity.getName() != null ? gameEntity.getName() : "",
-                    gameEntity.getCategoryChinese()
-            );
-            dialog.dismiss();
-        });
+        binding.closeIv.setOnClickListener(v -> dialog.dismiss());

        binding.urlTv.setText(gameEntity.getLandPageAddressDialog().getLink());

@ -659,28 +643,10 @@ public class DialogUtils {

        binding.downloadBtn.setText(downloadText);
        binding.downloadBtn.setOnClickListener(v -> {
-            dismissByButton.set(true);
-            SensorsBridge.INSTANCE.trackJumpLandPageAddressDialogClick(
-                    "前往第三方网站下载游戏",
-                    gameEntity.getId(),
-                    gameEntity.getName() != null ? gameEntity.getName() : "",
-                    gameEntity.getCategoryChinese()
-            );
            listener.onConfirm();
            dialog.dismiss();
        });

-        dialog.setOnDismissListener(dialog1 -> {
-            if (!dismissByButton.get()) {
-                SensorsBridge.INSTANCE.trackJumpLandPageAddressDialogClick(
-                        "关闭弹窗",
-                        gameEntity.getId(),
-                        gameEntity.getName() != null ? gameEntity.getName() : "",
-                        gameEntity.getCategoryChinese()
-                );
-            }
-        });
-
        Window window = dialog.getWindow();
        if (window != null) {
            window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
@ -689,18 +655,12 @@ public class DialogUtils {
        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
        dialog.setContentView(contentView);
        dialog.show();
-
-        SensorsBridge.INSTANCE.trackJumpLandPageAddressDialogShow(
-                gameEntity.getId(),
-                gameEntity.getName() != null ? gameEntity.getName() : "",
-                gameEntity.getCategoryChinese()
-        );
    }

    public static void showGameH5DownloadDialog(Context context, GameEntity gameEntity, RegionSetting.GameH5Download gameH5Download) {
        context = checkDialogContext(context);

-        final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.GhAlertDialog);
+        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);

        DialogAddressConfirmationBinding binding = DialogAddressConfirmationBinding.inflate(LayoutInflater.from(context), null, false);

@ -741,7 +701,7 @@ public class DialogUtils {
            params = window.getAttributes();
            params.width = (int) (context.getResources().getDisplayMetrics().widthPixels * 0.9);
            window.setAttributes(params);
-            window.setBackgroundDrawableResource(com.gh.gamecenter.common.R.drawable.textview_white_up);
+            window.setBackgroundDrawableResource(R.drawable.textview_white_up);
        }

        inflate.findViewById(R.id.imprint_close).setOnClickListener(v -> dialog.dismiss());
@ -771,7 +731,7 @@ public class DialogUtils {

        // close line
        View view = new View(context);
-        view.setBackgroundColor(context.getResources().getColor(com.gh.gamecenter.common.R.color.text_5d5d5d));
+        view.setBackgroundColor(context.getResources().getColor(R.color.text_5d5d5d));
        view.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, DisplayUtils.dip2px(1)));
        content.addView(view);
    }
@ -779,7 +739,7 @@ public class DialogUtils {
    public static void showKaifuRemindDialog(Context context, String content, String gameName) {
        context = checkDialogContext(context);

-        final Dialog dialog = new TrackableDialog(context, com.gh.gamecenter.common.R.style.GhAlertDialog, "开服说明弹窗", "弹窗", gameName, null, null, true);
+        final Dialog dialog = new TrackableDialog(context, R.style.GhAlertDialog, "开服说明弹窗", "弹窗", gameName, null, null, true);

        View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_kaifu_remind, null);

@ -809,7 +769,7 @@ public class DialogUtils {
    public static void showStopServerExplanationDialog(Context context, String content, String gameName) {
        context = checkDialogContext(context);

-        final Dialog dialog = new TrackableDialog(context, com.gh.gamecenter.common.R.style.GhAlertDialog, "评论说明弹窗", "弹窗", gameName, null, null, true);
+        final Dialog dialog = new TrackableDialog(context, R.style.GhAlertDialog, "评论说明弹窗", "弹窗", gameName, null, null, true);

        View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_stop_service_explanation, null);

@ -854,7 +814,7 @@ public class DialogUtils {

        final Dialog dialog = new TrackableDialog(
                context,
-                com.gh.gamecenter.common.R.style.GhAlertDialog,
+                R.style.GhAlertDialog,
                "礼仪考试",
                "礼仪考试弹窗",
                null, null, null,
@ -908,9 +868,9 @@ public class DialogUtils {
    public static void showNoticeDialog(Context context, String title, String content, @NonNull ConfirmListener listener) {
        context = checkDialogContext(context);

-        final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.DialogWindowTransparent);
+        final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);

-        View contentView = LayoutInflater.from(context).inflate(com.gh.gamecenter.common.R.layout.dialog_notice, null);
+        View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_notice, null);
        TextView titleTv = contentView.findViewById(R.id.dialog_title);
        TextView contentTv = contentView.findViewById(R.id.dialog_content);

@ -935,7 +895,7 @@ public class DialogUtils {
    public static void showViewBadgeDialog(Context context, Badge badge, ConfirmListener listener) {
        context = checkDialogContext(context);

-        final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.DialogWindowTransparent);
+        final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);

        View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_view_badge, null);
        TextView titleTv = contentView.findViewById(R.id.dialog_title);
@ -956,7 +916,7 @@ public class DialogUtils {
            });
        }

-        Animation animation = AnimationUtils.loadAnimation(context, com.gh.gamecenter.common.R.anim.anim_badge_light_bg);
+        Animation animation = AnimationUtils.loadAnimation(context, R.anim.anim_badge_light_bg);
        badgeLightBg.startAnimation(animation);

        contentView.findViewById(R.id.dialog_ok).setOnClickListener(v -> {
@ -973,7 +933,7 @@ public class DialogUtils {
    public static void showReceiveBadgeDialog(Context context, BadgeEntity badge, ConfirmListener listener) {
        context = checkDialogContext(context);

-        final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.DialogWindowTransparent);
+        final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);

        View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_receive_badge, null);
        TextView titleTv = contentView.findViewById(R.id.dialog_title);
@ -1003,7 +963,7 @@ public class DialogUtils {
            receiveTv.setText(R.string.apply_badge);
        }

-        Animation animation = AnimationUtils.loadAnimation(context, com.gh.gamecenter.common.R.anim.anim_badge_light_bg);
+        Animation animation = AnimationUtils.loadAnimation(context, R.anim.anim_badge_light_bg);
        badgeLightBg.startAnimation(animation);

        contentView.findViewById(R.id.dialog_ok).setOnClickListener(v -> {
@ -1020,7 +980,7 @@ public class DialogUtils {
    public static void showPassRegulationDialog(Context context, String icon) {
        context = checkDialogContext(context);

-        final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.DialogWindowTransparent);
+        final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);

        View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_pass_regulation, null);
        SimpleDraweeView userIcon = contentView.findViewById(R.id.dialog_icon);
@ -1039,7 +999,7 @@ public class DialogUtils {
    public static void showShortCutPermissionDialog(Context context) {
        context = checkDialogContext(context);

-        final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.DialogWindowTransparent);
+        final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);

        View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_shortcut_permission, null);

@ -1064,7 +1024,7 @@ public class DialogUtils {
            , String positive, String negative, final ConfirmListener cmListener, final CancelListener clListener) {
        context = checkDialogContext(context);

-        final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.GhAlertDialog);
+        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);

        View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_cancel_reservation, null);
        TextView contentTv = contentView.findViewById(R.id.dialog_content);
@ -1105,11 +1065,11 @@ public class DialogUtils {

    public static void showSimulatorParseErrorDialog(Context context, String gameId, String gameName, ConfirmListener confirmListener) {
        context = checkDialogContext(context);
-        final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.GhAlertDialog);
+        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);

        DialogPackageParseErrorBinding binding = DialogPackageParseErrorBinding.inflate(LayoutInflater.from(context), null, false);
        Context finalContext = context;
-        SpannableStringBuilder builder = new SpanBuilder("您也可以点击提交反馈跟我们联系").click(context, 6, 10, com.gh.gamecenter.common.R.color.text_theme, true, new Function0<Unit>() {
+        SpannableStringBuilder builder = new SpanBuilder("您也可以点击提交反馈跟我们联系").click(context, 6, 10, R.color.text_theme, true, new Function0<Unit>() {
            @Override
            public Unit invoke() {
                SimpleGameEntity entity = new SimpleGameEntity(gameId, gameName, "", "");
@ -1149,7 +1109,7 @@ public class DialogUtils {
    public static void showReportReasonDialog(Context context, ArrayList<String> items, String title, ReportReasonCallBack callBack) {
        context = checkDialogContext(context);

-        final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.DialogWindowTransparent);
+        final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
        DialogReportReasonBinding binding = DialogReportReasonBinding.inflate(LayoutInflater.from(context));

        if (!title.isEmpty()) {
@ -1168,7 +1128,7 @@ public class DialogUtils {
            return null;
        });
        binding.reasonRv.setLayoutManager(new LinearLayoutManager(context));
-        binding.reasonRv.addItemDecoration(new VerticalItemDecoration(context, 1F, false, com.gh.gamecenter.common.R.color.ui_background));
+        binding.reasonRv.addItemDecoration(new VerticalItemDecoration(context, 1F, false, R.color.ui_background));
        binding.reasonRv.setAdapter(reportReasonAdapter);

        binding.negativeBtn.setOnClickListener(v -> {
@ -1190,7 +1150,7 @@ public class DialogUtils {
        ExtensionsKt.setTextChangedListener(binding.otherReasonEt, (s, start, before, count) -> {
            int tvCount = s.length();
            if (tvCount >= 500) {
-                binding.tvCount.setTextColor(ContextCompat.getColor(finalContext, com.gh.gamecenter.common.R.color.secondary_red));
+                binding.tvCount.setTextColor(ContextCompat.getColor(finalContext, R.color.secondary_red));
            }
            binding.tvCount.setText(tvCount + "/500");
            return null;
@ -1204,7 +1164,7 @@ public class DialogUtils {
    public static Dialog showBindPhoneDialog(Context context, ConfirmListener listener) {
        context = checkDialogContext(context);

-        final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.DialogWindowTransparent);
+        final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
        DialogBindPhoneBinding binding = DialogBindPhoneBinding.inflate(LayoutInflater.from(context));

        binding.positiveTv.setOnClickListener(v -> {
@ -1225,10 +1185,10 @@ public class DialogUtils {
    public static void showReserveOrVoteSuccess2WechatBindDialog(Context context, Boolean isReserve, ConfirmListener confirmListener, CancelListener cancelListener) {
        context = checkDialogContext(context);

-        final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.DialogWindowTransparent);
+        final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
        DialogWechatReserveSuccessBinding binding = DialogWechatReserveSuccessBinding.inflate(LayoutInflater.from(context));
        binding.titleIv.setImageResource(isReserve ? R.drawable.bg_reserve_success : R.drawable.bg_vote_success);
-        binding.contentTv.setText(isReserve ? "游戏上线时，您将在消息中心收到通知。为了避免错过通知，建议您开启微信公众号提醒" : "版本上线时，您将在消息中心收到通知。为了避免错过通知，亦建议您开启微信公众号提醒");
+        binding.contentTv.setText(isReserve ? "游戏上线时，您将在消息中心收到通知。为了避免错过通知，建议您开启微信公众号提醒": "版本上线时，您将在消息中心收到通知。为了避免错过通知，亦建议您开启微信公众号提醒");
        binding.closeBtn.setOnClickListener(v -> {
            cancelListener.onCancel();
            dialog.dismiss();
@ -1252,7 +1212,7 @@ public class DialogUtils {
    public static void showReserveOrVoteSuccessDialog(Context context, Boolean isReserve) {
        context = checkDialogContext(context);

-        final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.DialogWindowTransparent);
+        final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
        DialogAlertDefaultBinding binding = DialogAlertDefaultBinding.inflate(LayoutInflater.from(context));
        binding.titleTv.setText(isReserve ? "游戏预约成功" : "版本投票成功");
        binding.contentTv.setText(isReserve ? "游戏上线时，您将在消息中心和微信公众号收到通知，不会错过任何预约的游戏" : "版本上线时，您将在消息中心和微信公众号收到通知，不会错过任何投票的版本");
@ -1273,14 +1233,10 @@ public class DialogUtils {
        }
    }

-    public static void showReserveReminderDialog(Context context, GameEntity gameEntity, ReserveReminderEntity reserveReminder) {
-        ReserveReminderContainerFragment.show(context, gameEntity, reserveReminder);
-    }
-
    public static void showRelievePhoneDialog(Context context) {
        context = checkDialogContext(context);

-        final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.DialogWindowTransparent);
+        final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
        DialogRelievePhoneBinding binding = DialogRelievePhoneBinding.inflate(LayoutInflater.from(context));

        Context finalContext = context;
--- a/app/src/main/java/com/gh/common/util/DirectUtils.kt
+++ b/app/src/main/java/com/gh/common/util/DirectUtils.kt
@ -10,9 +10,7 @@ import android.os.Build
 import android.os.Bundle
 import android.text.TextUtils
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.os.bundleOf
 import com.alibaba.android.arouter.launcher.ARouter
-import com.gh.ad.AdPluginDownloadHelper
 import com.gh.common.constant.Config
 import com.gh.common.exposure.ExposureManager.log
 import com.gh.common.exposure.ExposureTraceUtils.appendTrace
@ -20,6 +18,8 @@ import com.gh.common.util.EntranceUtils.jumpActivity
 import com.gh.common.util.EntranceUtils.jumpActivityCompat
 import com.gh.gamecenter.*
 import com.gh.gamecenter.amway.AmwayActivity
+import com.gh.gamecenter.catalog.CatalogActivity
+import com.gh.gamecenter.category.CategoryDirectoryActivity
 import com.gh.gamecenter.category2.CategoryV2Activity
 import com.gh.gamecenter.common.base.activity.BaseActivity
 import com.gh.gamecenter.common.base.activity.BaseActivity_TabLayout
@ -43,13 +43,11 @@ import com.gh.gamecenter.feature.entity.MeEntity
 import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.gh.gamecenter.feature.exposure.ExposureEvent.Companion.createEvent
 import com.gh.gamecenter.feature.exposure.ExposureType
-import com.gh.gamecenter.feature.minigame.MiniGameItemHelper
 import com.gh.gamecenter.feature.provider.IConcernInfoProvider
 import com.gh.gamecenter.forum.detail.ForumDetailActivity
 import com.gh.gamecenter.forum.home.CommunityActivity
 import com.gh.gamecenter.forum.search.ForumOrUserSearchActivity
 import com.gh.gamecenter.game.columncollection.detail.ColumnCollectionDetailActivity
-import com.gh.gamecenter.game.columncollection.detail.ColumnCollectionDetailFragment
 import com.gh.gamecenter.game.commoncollection.detail.CustomCommonCollectionDetailActivity
 import com.gh.gamecenter.game.upload.GameSubmissionActivity
 import com.gh.gamecenter.gamecollection.detail.GameCollectionDetailActivity
@ -65,9 +63,6 @@ import com.gh.gamecenter.gamedetail.rating.RatingReplyActivity
 import com.gh.gamecenter.help.HelpAndFeedbackBridge
 import com.gh.gamecenter.libao.LibaoDetailActivity
 import com.gh.gamecenter.login.user.UserManager
-import com.gh.gamecenter.minigame.MiniGameRecentlyPlayUseCase
-import com.gh.gamecenter.minigame.MiniGameSearchActivity
-import com.gh.gamecenter.minigame.qq.QGameHomeWrapperActivity
 import com.gh.gamecenter.newsdetail.NewsDetailActivity
 import com.gh.gamecenter.personalhome.UserHomeActivity
 import com.gh.gamecenter.personalhome.background.PersonalityBackgroundActivity
@ -78,8 +73,10 @@ import com.gh.gamecenter.qa.article.detail.ArticleDetailActivity
 import com.gh.gamecenter.qa.questions.newdetail.NewQuestionDetailActivity
 import com.gh.gamecenter.qa.subject.CommunitySubjectActivity
 import com.gh.gamecenter.qa.video.detail.ForumVideoDetailActivity
+import com.gh.gamecenter.qgame.QGameHomeWrapperActivity
+import com.gh.gamecenter.qgame.QGameSearchActivity
+import com.gh.gamecenter.qgame.QGameViewModel
 import com.gh.gamecenter.retrofit.RetrofitManager
-import com.gh.gamecenter.SearchActivity
 import com.gh.gamecenter.servers.GameServerTestActivity
 import com.gh.gamecenter.servers.GameServersActivity
 import com.gh.gamecenter.servers.gametest2.GameServerTestV2Activity
@ -98,8 +95,6 @@ import com.gh.vspace.VDownloadManagerActivity
 import com.halo.assistant.HaloApp
 import com.halo.assistant.fragment.WebFragment
 import com.lightgame.utils.Utils
-import com.tencent.mm.opensdk.modelbiz.WXLaunchMiniProgram
-import com.tencent.mm.opensdk.openapi.WXAPIFactory
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
 import retrofit2.HttpException
@ -113,14 +108,8 @@ import kotlin.math.roundToInt
 object DirectUtils {

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

    @JvmStatic
@ -151,12 +140,14 @@ object DirectUtils {
        "qqqun",
        "tag",
        "all_community_article",
+        "category",
        "block",
        "column_collection",
        "server",
        "top_game_comment",
        "wechat_bind",
        "video",
+        "catalog",
        "category_v2",
        "common_collection",
        "game_list",
@ -179,8 +170,7 @@ object DirectUtils {
        "bbs_section",
        "qa",
        "feedback",
-        "toolkit",
-        "float_window_game"
+        "toolkit"
    )

    fun directToLinkPage(
@ -253,7 +243,7 @@ object DirectUtils {
                path
            )

-            HOST_WEB, HOST_WEB_INURL, HOST_WEB_AL, HOST_QA_CONTENT -> {
+            HOST_WEB, HOST_WEB_INURL, HOST_WEB_AL -> {
                when {
                    linkEntity.link!!.contains("v.douyin") && PackageHelper.localPackageNameSet.contains("com.ss.android.ugc.aweme") -> {
                        directDouyin(context, "1402577827140941")
@ -284,6 +274,10 @@ object DirectUtils {
                )
            )

+            "category", "分类" -> directCategoryDirectory(context, linkEntity.link!!, linkEntity.text!!)
+
+            "catalog" -> directCatalog(context, linkEntity.link!!, linkEntity.text!!, entrance, path)
+
            "category_v2" -> directCategoryV2(
                context,
                linkEntity.link!!,
@ -349,9 +343,9 @@ object DirectUtils {

            "feedback" -> directToFeedback(context, linkEntity.name, false, "", false, false, entrance)

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

-            "qa_list" -> directToHelpAndFeedback(context, bundleOf(KEY_ENTRANCE to entrance))
+            "qa_list" -> directToHelpAndFeedback(context)

            "qa_collection", "Q&A合集" -> directToQaCollection(
                context, linkEntity.text
@ -476,30 +470,22 @@ object DirectUtils {
            "column_test_v2" -> context.startActivity(
                GameServerTestV2Activity.getIntent(
                    context,
-                    linkEntity.link ?: "none",
                    entrance,
                    exposureEvent
                )
            )

-            ColumnCollectionDetailFragment.TYPE_QQ_MINI_GAME_COLUMN -> directToQGameHome(context)
+            "qq_mini_game_column" -> directToQGameHome(context)

            // QQ游戏专题详情页
-            ViewPagerFragmentHelper.TYPE_QQ_MINI_GAME_COLUMN,
-            ViewPagerFragmentHelper.TYPE_WECHAT_GAME_COLUMN,
-            ViewPagerFragmentHelper.TYPE_WECHAT_GAME_CPM_COLUMN -> {
-                val subjectType = when (linkEntity.type) {
-                    ViewPagerFragmentHelper.TYPE_QQ_MINI_GAME_COLUMN -> SubjectData.SubjectType.QQ_GAME
-                    ViewPagerFragmentHelper.TYPE_WECHAT_GAME_CPM_COLUMN -> SubjectData.SubjectType.WECHAT_GAME_CPM
-                    else -> SubjectData.SubjectType.WECHAT_GAME
-                }
+            "qq_mini_game_column_detail" -> {
                directToSubject(
                    context = context,
                    id = linkEntity.link ?: "",
                    subjectName = linkEntity.text,
                    entrance = BaseActivity.mergeEntranceAndPath(entrance, path),
                    exposureEvent = exposureEvent,
-                    subjectType = subjectType
+                    isQQMiniGame = true
                )
            }

@ -550,26 +536,6 @@ object DirectUtils {
                }
            }

-            "wechat_game" -> linkEntity.link?.let {
-                MiniGameItemHelper.launchMiniGame(it, Constants.WECHAT_MINI_GAME)
-            }
-
-            "float_window_game" -> linkEntity.link?.let { link ->
-                if (PackageUtils.isInstalled(context, Constants.TOOL_MAP_PACKAGE_NAME)) {
-                    val intent = Intent(
-                        Intent.ACTION_VIEW,
-                        Uri.parse("ghtoolmap://floatWindow")
-                    ).also {
-                        it.addCategory(Intent.CATEGORY_DEFAULT)
-                        it.addCategory(Intent.CATEGORY_BROWSABLE)
-                        it.putExtra("gameId", linkEntity.link)
-                    }
-                    context.startActivity(intent)
-                } else {
-                    directToGameDetail(context, Config.getFloatWindowSettingEntity()?.gameId ?: "")
-                }
-            }
-
            "" -> {
                // do nothing
            }
@ -808,12 +774,7 @@ object DirectUtils {
            }
        }
        if (traceEvent != null) {
-            val clickEvent = createEvent(
-                GameEntity(id = id, name = name),
-                traceEvent.source,
-                appendTrace(traceEvent),
-                ExposureType.CLICK
-            )
+            val clickEvent = createEvent(GameEntity(id = id, name = name), traceEvent.source, appendTrace(traceEvent), ExposureType.CLICK)
            log(clickEvent)
            bundle.putParcelable(KEY_TRACE_EVENT, clickEvent)
        }
@ -876,12 +837,12 @@ object DirectUtils {
        subjectName: String? = "",
        entrance: String? = null,
        exposureEvent: ExposureEvent? = null,
-        subjectType: SubjectData.SubjectType = SubjectData.SubjectType.NORMAL
+        isQQMiniGame: Boolean = false,
    ) {
        if (id.isEmpty()) return
        val bundle = Bundle()
        val subjectData =
-            SubjectData(subjectId = id, subjectName = subjectName, isOrder = false, subjectType = subjectType)
+            SubjectData(subjectId = id, subjectName = subjectName, isOrder = false, isQQMiniGame = isQQMiniGame)
        bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
        bundle.putString(KEY_TO, SubjectActivity::class.java.name)
        bundle.putParcelable(EntranceConsts.KEY_SUBJECT_DATA, subjectData)
@ -938,16 +899,12 @@ object DirectUtils {
        qaContentId: String? = "",
        isPlugin: Boolean = false,
        isSmoothGame: Boolean = false,
-        gameId: String? = "",
-        gameName: String? = "",
        entrance: String? = null
    ) {
        val bundle = Bundle()
        bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
        bundle.putBoolean(KEY_PLUGIN, isPlugin)
        bundle.putBoolean(KEY_SMOOTH_GAME, isSmoothGame)
-        bundle.putString(KEY_GAME_ID, gameId)
-        bundle.putString(KEY_GAME_NAME, gameName)
        if (isPlugin) {
            bundle.putString(KEY_HIDE_SUGGEST_HINT, "【插件问题】")
        }
@ -1034,13 +991,7 @@ object DirectUtils {
    }

    @JvmStatic
-    fun directToQuestionDetail(
-        context: Context,
-        id: String,
-        entrance: String? = null,
-        path: String? = null,
-        sourceEntrance: String = ""
-    ) {
+    fun directToQuestionDetail(context: Context, id: String, entrance: String? = null, path: String? = null, sourceEntrance: String = "") {
        if (id.isEmpty()) return
        val bundle = Bundle()
        bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
@ -1436,6 +1387,47 @@ object DirectUtils {
        }
    }

+    /**
+     * 跳转分类
+     */
+    @JvmStatic
+    fun directCategoryDirectory(
+        context: Context,
+        categoryId: String,
+        categoryTitle: String,
+        entrance: String? = null,
+        path: String? = ""
+    ) {
+        if (categoryId.isEmpty()) return
+        val bundle = Bundle()
+        bundle.putString(KEY_TO, CategoryDirectoryActivity::class.java.name)
+        bundle.putString(KEY_CATEGORY_ID, categoryId)
+        bundle.putString(KEY_CATEGORY_TITLE, categoryTitle)
+        bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
+        bundle.putString(KEY_PATH, path)
+        jumpActivity(context, bundle)
+    }
+
+    /**
+     * 跳转新分类
+     */
+    @JvmStatic
+    fun directCatalog(
+        context: Context,
+        catalogId: String,
+        catalogTitle: String,
+        entrance: String? = null,
+        path: String? = "",
+    ) {
+        if (catalogId.isEmpty()) return
+        val bundle = Bundle()
+        bundle.putString(KEY_TO, CatalogActivity::class.java.name)
+        bundle.putString(KEY_CATALOG_ID, catalogId)
+        bundle.putString(KEY_CATALOG_TITLE, catalogTitle)
+        bundle.putString(KEY_ENTRANCE, BaseActivity.mergeEntranceAndPath(entrance, path))
+        jumpActivity(context, bundle)
+    }
+
    /**
     * 跳转新分类2.0
     */
@ -1943,7 +1935,7 @@ object DirectUtils {
    }

    @JvmStatic
-    fun directToMiniGameSearch(
+    fun directToQGameSearch(
        context: Context,
        hint: String,
        sourceEntrance: String,
@ -1955,7 +1947,7 @@ object DirectUtils {
        searchBoxPattern: String = ""
    ) {
        context.startActivity(
-            MiniGameSearchActivity.getIntent(
+            QGameSearchActivity.getIntent(
                context,
                hint,
                sourceEntrance,
@ -1971,10 +1963,11 @@ object DirectUtils {

    @SuppressLint("CheckResult")
    @JvmStatic
-    fun directToQQGameById(
+    fun directToQGameById(
        activity: Activity,
-        qqAppId: String
+        qqGameId: String
    ) {
+
        if (activity !is AppCompatActivity || activity.supportFragmentManager.isDestroyed) {
            ToastUtils.toast("启动QQ小游戏失败，请稍后再试")
            return
@ -1985,57 +1978,35 @@ object DirectUtils {
            return
        }

-        val qGameProvider = ARouter
-            .getInstance()
-            .build(RouteConsts.provider.qGame)
-            .navigation() as? IQGameProvider
-
-        if (qGameProvider == null) return
-
-        // 下载广点通广告插件，供 QQ 小游戏启动使用 （当次启动不保证能用，但是下一次就大概率就能了）
-        AdPluginDownloadHelper.downloadPluginIfNeeded(isGdt = true)
-
-        CheckLoginUtils.checkLogin(activity, null, true, "QQ小游戏-秒开") {
+        CheckLoginUtils.checkLogin(
+            activity, null, true, "QQ小游戏-秒开"
+        ) {
            val userToken = UserManager.getInstance().token
            val userId = UserManager.getInstance().userId
            val userName = UserManager.getInstance().userInfoEntity?.name ?: "unknown"

+            val qGameProvider = ARouter
+                .getInstance()
+                .build(RouteConsts.provider.qGame)
+                .navigation() as IQGameProvider<*>
            qGameProvider.setLoginInfo(activity, userId, userName, userToken)
-            qGameProvider.launchGame(activity, qqAppId) { _, _ ->
-                MiniGameRecentlyPlayUseCase.submitRecentPlayedQGame(qqAppId, userId)
+            qGameProvider.launchGame(activity, qqGameId) { _, _ ->
+                RetrofitManager
+                    .getInstance()
+                    .newApi
+                    .postQGamePlay(qqGameId, userId)
+                    .subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(
+                        {
+                            QGameViewModel.notifyQGameSubjectUpdate() // 通知QQ小游戏首页列表刷新
+                        },
+                        {}
+                    ) // 秒玩记录上报
            }
        }
    }

-    @SuppressLint("CheckResult")
-    fun directToWechatGameById(
-        activity: Activity,
-        wechatAppId: String,
-        wechatAppPath: String = "",
-        wechatAppExtData: String = ""
-    ) {
-
-        val wxApiProxy = WXAPIFactory.createWXAPI(
-            activity,
-            Config.WECHAT_APPID
-        )
-        if (!wxApiProxy.isWXAppInstalled) {
-            ToastUtils.toast("请安装微信客户端")
-            return
-        }
-
-        wxApiProxy.sendReq(
-            WXLaunchMiniProgram.Req().apply {
-                userName = wechatAppId
-                path = wechatAppPath.ifEmpty { Constants.WECHAT_MINI_GAME_PCS }
-                extData = wechatAppExtData
-                miniprogramType = WXLaunchMiniProgram.Req.MINIPTOGRAM_TYPE_RELEASE
-            }
-        )
-
-        MiniGameRecentlyPlayUseCase.submitRecentPlayedWGame(wechatAppId, HaloApp.getInstance().gid)
-    }
-
    @JvmStatic
    fun directToMessageCenter(defaultTabIndex: Int) {
        ARouter.getInstance().build(RouteConsts.activity.messageWrapperActivity)
@ -2111,7 +2082,7 @@ object DirectUtils {
                )
            )

-            BottomTab.SearchStyle.TYPE_MINI_GAME -> directToMiniGameSearch(
+            BottomTab.SearchStyle.TYPE_QQ_MINI_GAME -> directToQGameSearch(
                context,
                "请输入小游戏关键词",
                sourceEntrance,
--- a/app/src/main/java/com/gh/common/util/DownloadItemUtils.kt
+++ b/app/src/main/java/com/gh/common/util/DownloadItemUtils.kt
@ -27,8 +27,7 @@ import com.gh.download.server.BrowserInstallHelper
 import com.gh.gamecenter.R
 import com.gh.gamecenter.WebActivity
 import com.gh.gamecenter.adapter.viewholder.GameViewHolder
-import com.gh.gamecenter.common.base.GlobalActivityManager.getCurrentPageEntity
-import com.gh.gamecenter.common.base.GlobalActivityManager.getLastPageEntity
+import com.gh.gamecenter.common.base.GlobalActivityManager
 import com.gh.gamecenter.common.callback.CancelListener
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.constant.EntranceConsts
@ -39,7 +38,6 @@ import com.gh.gamecenter.core.utils.*
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.entity.PluginLocation
 import com.gh.gamecenter.feature.exposure.ExposureEvent
-import com.gh.gamecenter.feature.minigame.MiniGameItemHelper
 import com.gh.gamecenter.feature.view.DownloadButton
 import com.gh.gamecenter.gamedetail.dialog.GamePermissionDialogFragment
 import com.gh.gamecenter.manager.PackagesManager
@ -130,7 +128,6 @@ object DownloadItemUtils {
            holder.gameDownloadBtn.text = "已预约"
            holder.gameDownloadBtn.visibility = View.VISIBLE
            holder.gameDownloadBtn.buttonStyle = DownloadButton.ButtonStyle.RESERVED
-            holder.multiVersionDownloadTv.visibility = View.GONE
            updateItemViewStatus(holder, null, null)
        }
    }
@ -244,25 +241,26 @@ object DownloadItemUtils {
        if (RegionSettingHelper.getGameH5DownloadByGameId(gameEntity.id) != null) {
            downloadBtn.apply {
                isClickable = true
-                text = context.getString(com.gh.gamecenter.feature.R.string.check)
-                setBackgroundResource(com.gh.gamecenter.common.R.drawable.download_button_normal_style)
-                setTextColor(com.gh.gamecenter.common.R.color.white.toColor(context))
+                text = context.getString(R.string.check)
+                setBackgroundResource(R.drawable.download_button_normal_style)
+                setTextColor(R.color.white.toColor(context))
            }
            return
        }
-        if (gameEntity.isMiniGame()) {
-            if (gameEntity.isMiniGameOffShelve()) {
+        if (gameEntity.isQQMiniGame()) {
+            val isQQMiniGameOffShelve = gameEntity.qqMiniGameAppStatus == 1 // QQ小游戏是否下架
+            if (isQQMiniGameOffShelve) {
                downloadBtn.apply {
                    isClickable = false
-                    text = context.getString(com.gh.gamecenter.feature.R.string.off_shelve)
+                    text = context.getString(R.string.off_shelve)
                    buttonStyle = DownloadButton.ButtonStyle.NONE
                }
            } else {
                downloadBtn.apply {
                    isClickable = true
-                    setBackgroundResource(com.gh.gamecenter.common.R.drawable.download_button_normal_style)
-                    setTextColor(com.gh.gamecenter.common.R.color.white.toColor(context))
-                    text = context.getString(com.gh.gamecenter.feature.R.string.quick_play)
+                    setBackgroundResource(R.drawable.download_button_normal_style)
+                    setTextColor(R.color.white.toColor(context))
+                    text = context.getString(R.string.quick_play)
                }
            }
            return
@ -273,21 +271,21 @@ object DownloadItemUtils {
            downloadBtn.apply {
                if (h5LinkEntity != null) {
                    text = if ("play" == h5LinkEntity.type) {
-                        context.getString(com.gh.gamecenter.feature.R.string.start_playing)
+                        context.getString(R.string.start_playing)
                    } else {
-                        context.getString(com.gh.gamecenter.feature.R.string.check)
+                        context.getString(R.string.check)
                    }
                    isClickable = true
                    buttonStyle = DownloadButton.ButtonStyle.NORMAL
                } else {
                    if ("dialog" == offStatus) {
-                        text = context.getString(com.gh.gamecenter.feature.R.string.check)
+                        text = context.getString(R.string.check)
                        buttonStyle = DownloadButton.ButtonStyle.NORMAL
                    } else if ("updating" == offStatus) {
-                        text = context.getString(com.gh.gamecenter.feature.R.string.updating)
+                        text = context.getString(R.string.updating)
                        buttonStyle = DownloadButton.ButtonStyle.UPDATING
                    } else {
-                        text = context.getString(com.gh.gamecenter.feature.R.string.none)
+                        text = context.getString(R.string.none)
                        buttonStyle = DownloadButton.ButtonStyle.NONE
                        if (hideDownloadBtnIfNoAvailableContent) {
                            visibility = View.GONE
@ -300,13 +298,11 @@ object DownloadItemUtils {
            // 来自于下载管理的实体快照
            val entityFromDownloadManager = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity)
            // 是否正在下载中
-            val isDownloading =
-                entityFromDownloadManager != null && entityFromDownloadManager.status != DownloadStatus.done
+            val isDownloading = entityFromDownloadManager != null && entityFromDownloadManager.status != DownloadStatus.done
            // 是否已安装至本地
            val isInstalledLocally = PackagesManager.isInstalled(gameEntity.getUniquePackageName())
            // 来自于畅玩安装列表的实体快照，若存在，代表游戏已下载并成功安装
-            val entityFromInstalledVGame =
-                VHelper.getVDownloadEntitySnapshot(gameEntity.id, gameEntity.getUniquePackageName())
+            val entityFromInstalledVGame = VHelper.getVDownloadEntitySnapshot(gameEntity.id, gameEntity.getUniquePackageName())
            // 是否已安装至畅玩
            val isInstalledToVSpace = entityFromInstalledVGame != null
            // 是否处于待安装状态 (仅本地安装有这个状态)
@ -323,20 +319,19 @@ object DownloadItemUtils {
 //            3. 存在待安装任务时，待安装任务优先
 //            4. 存在一个已安装，已安装的显示优先
 //            5. 都已安装，按后台配置显示的状态优先
-            val isVGamePreferred =
-                if (!isInstalledLocally && !isInstalledToVSpace && entityFromDownloadManager == null) {
-                    gameEntity.isVGamePreferred()
-                } else if (isDownloading || isPendingToInstall) {
-                    entityFromDownloadManager?.isVGameDownloadInDualDownloadMode() == true
-                } else if (isInstalledLocally && isInstalledToVSpace) {
-                    gameEntity.isVGamePreferred()
-                } else if (isInstalledLocally) {
-                    false
-                } else if (isInstalledToVSpace) {
-                    true
-                } else {
-                    gameEntity.isVGamePreferred()
-                }
+            val isVGamePreferred = if (!isInstalledLocally && !isInstalledToVSpace && entityFromDownloadManager == null) {
+                gameEntity.isVGamePreferred()
+            } else if (isDownloading || isPendingToInstall) {
+                entityFromDownloadManager?.isVGameDownloadInDualDownloadMode() == true
+            } else if (isInstalledLocally && isInstalledToVSpace) {
+                gameEntity.isVGamePreferred()
+            } else if (isInstalledLocally) {
+                false
+            } else if (isInstalledToVSpace) {
+                true
+            } else {
+                gameEntity.isVGamePreferred()
+            }

            val downloadEntity: DownloadEntity? = if (isDownloading) {
                entityFromDownloadManager
@ -364,17 +359,17 @@ object DownloadItemUtils {
                                            asVGame = true
                                        )
                                    ) {
-                                        setText(com.gh.gamecenter.feature.R.string.update)
+                                        setText(R.string.update)
                                        DownloadButton.ButtonStyle.NORMAL
                                    } else {
-                                        setText(com.gh.gamecenter.feature.R.string.launch)
+                                        setText(R.string.launch)
                                        DownloadButton.ButtonStyle.LAUNCH_OR_OPEN
                                    }
                            } else {
                                val xapkStatus = downloadEntity.meta[XapkInstaller.XAPK_UNZIP_STATUS]
                                if (XapkUnzipStatus.SUCCESS.name == xapkStatus && isInstalling(downloadEntity.path)) {
                                    progress = 100
-                                    setText(com.gh.gamecenter.feature.R.string.installing)
+                                    setText(R.string.installing)
                                    buttonStyle = DownloadButton.ButtonStyle.INSTALL_NORMAL
                                    return
                                }
@ -385,27 +380,23 @@ object DownloadItemUtils {
                                    buttonStyle = DownloadButton.ButtonStyle.XAPK_UNZIPPING
                                    return
                                } else if (XapkUnzipStatus.FAILURE.name == xapkStatus) {
-                                    setText(com.gh.gamecenter.feature.R.string.install)
+                                    setText(R.string.install)
                                    buttonStyle = DownloadButton.ButtonStyle.INSTALL_NORMAL
                                    return
                                }

                                if (PackagesManager.isInstalled(downloadEntity.packageName) && !downloadEntity.isUpdate) {
                                    // 双下载按钮快速安装时存在已下载的安装包过时，需要重新下载的情况
-                                    if (PackagesManager.isCanUpdate(
-                                            downloadEntity.gameId,
-                                            downloadEntity.packageName
-                                        )
-                                    ) {
+                                    if (PackagesManager.isCanUpdate(downloadEntity.gameId, downloadEntity.packageName)) {
                                        buttonStyle = DownloadButton.ButtonStyle.NORMAL
-                                        setText(com.gh.gamecenter.feature.R.string.update)
+                                        setText(R.string.update)
                                    } else {
                                        buttonStyle = DownloadButton.ButtonStyle.LAUNCH_OR_OPEN
-                                        setText(com.gh.gamecenter.feature.R.string.launch)
+                                        setText(R.string.launch)
                                    }
                                } else {
                                    buttonStyle = DownloadButton.ButtonStyle.INSTALL_NORMAL
-                                    setText(com.gh.gamecenter.feature.R.string.install)
+                                    setText(R.string.install)
                                }
                            }
                            buttonStyle =
@ -424,7 +415,7 @@ object DownloadItemUtils {
                        DownloadStatus.diskioerror,
                        DownloadStatus.overflow -> {
                            buttonStyle = DownloadButton.ButtonStyle.NORMAL
-                            setText(com.gh.gamecenter.feature.R.string.resume)
+                            setText(R.string.resume)
                        }

                        DownloadStatus.cancel -> {
@ -510,13 +501,13 @@ object DownloadItemUtils {
            DownloadStatus.downloading -> {
                if (isMultiVersion) {
                    holder.gameDownloadBtn.buttonStyle = DownloadButton.ButtonStyle.NORMAL
-                    val darkMode = (holder.gameDownloadTips?.getTag(com.gh.gamecenter.common.R.string.is_dark_mode_on_id) as? Boolean) ?: false
+                    val darkMode = (holder.gameDownloadTips?.getTag(R.string.is_dark_mode_on_id) as? Boolean) ?: false
                    val isDarkModeChanged = DarkModeUtils.isDarkModeOn(context) != darkMode
                    if (holder.gameDownloadTips?.visibility == View.GONE || holder.gameDownloadTips?.isAnimating == false || isDarkModeChanged) {
                        holder.gameDownloadTips?.visibility = View.VISIBLE
                        holder.gameDownloadTips?.setDownloadTipsAnimation(true)
                    }
-                    holder.gameDownloadTips?.setTag(com.gh.gamecenter.common.R.string.is_dark_mode_on_id, DarkModeUtils.isDarkModeOn(context))
+                    holder.gameDownloadTips?.setTag(R.string.is_dark_mode_on_id, DarkModeUtils.isDarkModeOn(context))
                } else {
                    holder.gameDownloadTips?.visibility = View.GONE
                    holder.gameDownloadBtn.buttonStyle = DownloadButton.ButtonStyle.DOWNLOADING_NORMAL
@ -531,7 +522,7 @@ object DownloadItemUtils {
                    holder.gameDownloadTips?.setDownloadTipsAnimation(false)
                }
                holder.gameDownloadBtn.buttonStyle = DownloadButton.ButtonStyle.WAITING
-                holder.gameDownloadBtn.text = context.getString(com.gh.gamecenter.feature.R.string.waiting)
+                holder.gameDownloadBtn.text = context.getString(R.string.waiting)
            }

            DownloadStatus.pause,
@ -546,7 +537,7 @@ object DownloadItemUtils {
                    holder.gameDownloadTips?.setDownloadTipsAnimation(false)
                }
                holder.gameDownloadBtn.buttonStyle = DownloadButton.ButtonStyle.NORMAL
-                holder.gameDownloadBtn.text = context.getString(com.gh.gamecenter.feature.R.string.resume)
+                holder.gameDownloadBtn.text = context.getString(R.string.resume)
            }

            DownloadStatus.done -> {
@ -561,7 +552,7 @@ object DownloadItemUtils {
                    holder.gameDownloadBtn.text = "$percent%"
                    return
                } else if (XapkUnzipStatus.FAILURE.name == xapkStatus) {
-                    holder.gameDownloadBtn.setText(com.gh.gamecenter.feature.R.string.install)
+                    holder.gameDownloadBtn.setText(R.string.install)
                    holder.gameDownloadBtn.buttonStyle = DownloadButton.ButtonStyle.INSTALL_NORMAL
                    return
                }
@ -636,17 +627,7 @@ object DownloadItemUtils {
        location: String,
        sourceEntrance: String = "其他"
    ) {
-        setOnClickListener(
-            context,
-            downloadBtn,
-            gameEntity,
-            position,
-            adapter,
-            entrance,
-            sourceEntrance,
-            location,
-            null
-        )
+        setOnClickListener(context, downloadBtn, gameEntity, position, adapter, entrance, sourceEntrance, location, null)
    }

    @JvmStatic
@ -661,18 +642,7 @@ object DownloadItemUtils {
        location: String,
        traceEvent: ExposureEvent?,
    ) {
-        setOnClickListener(
-            context,
-            downloadBtn,
-            gameEntity,
-            position,
-            adapter,
-            entrance,
-            sourceEntrance,
-            location,
-            traceEvent,
-            null
-        )
+        setOnClickListener(context, downloadBtn, gameEntity, position, adapter, entrance, sourceEntrance, location, traceEvent, null)
    }

    /**
@ -728,7 +698,7 @@ object DownloadItemUtils {
        // 为 downloadButton 添加游戏实体，供点击的时候上报用
        downloadBtn.putObject(gameEntity)

-        val gamePermissionDialogFragment = (context as? AppCompatActivity)?.supportFragmentManager?.findFragmentByTag(
+        val gamePermissionDialogFragment = (context as AppCompatActivity).supportFragmentManager.findFragmentByTag(
            GamePermissionDialogFragment::class.java.name
        ) as GamePermissionDialogFragment?
        gamePermissionDialogFragment?.dismissAllowingStateLoss()
@ -810,18 +780,14 @@ object DownloadItemUtils {
                if (!ReservationRepository.thisGameHasBeenReserved(gameEntity.id)) {
                    SensorsBridge.trackEvent(
                        "AppointmentGame",
-                        "game_name", gameEntity.name ?: "",
-                        "game_id", gameEntity.id,
-                        "game_type", gameEntity.categoryChinese,
-                        "source_entrance", sourceEntrance,
-                        "page_name", getCurrentPageEntity().pageName,
-                        "page_id", getCurrentPageEntity().pageId,
-                        "page_business_id", getCurrentPageEntity().pageBusinessId,
-                        "last_page_name", getLastPageEntity().pageName,
-                        "last_page_id", getLastPageEntity().pageId,
-                        "last_page_business_id", getLastPageEntity().pageBusinessId,
-                        "source", gameEntity.exposureEvent?.source?.toString() ?: "",
-                        *gameEntity.customPageTrackData?.toKV() ?: arrayOf()
+                        "game_name",
+                        gameEntity.name ?: "",
+                        "game_id",
+                        gameEntity.id,
+                        "game_type",
+                        gameEntity.categoryChinese,
+                        "source_entrance",
+                        sourceEntrance
                    )
                    allStateClickCallback?.onCallback()
                    CheckLoginUtils.checkLogin(context, entrance) {
@ -847,7 +813,7 @@ object DownloadItemUtils {
                            }
                        }
                    } else {
-                        ReservationHelper.showCancelReservationDialog(context, gameEntity,{
+                        ReservationHelper.showCancelReservationDialog(context, {
                            NewFlatLogUtils.logMyGameCancelReserveDialogClick(
                                "确定取消",
                                gameEntity.id,
@ -878,11 +844,12 @@ object DownloadItemUtils {
            }
            return
        }
-        if (gameEntity.isMiniGame()) {
+        if (gameEntity.isQQMiniGame()) {
            downloadBtn.setOnClickListener {
-                MiniGameItemHelper.launchMiniGame(gameEntity)
-                clickCallback?.onCallback()
-                allStateClickCallback?.onCallback()
+                NewFlatLogUtils.logQGameClick(gameEntity.qqMiniGameAppId, gameEntity.name)
+                GlobalActivityManager.currentActivity?.let { activity ->
+                    DirectUtils.directToQGameById(activity, gameEntity.qqMiniGameAppId)
+                }
            }
            return
        }
@ -922,7 +889,7 @@ object DownloadItemUtils {
                }

                // 启动不需要请求存储权限
-                if (downloadBtn is DownloadButton && downloadBtn.text == context.getString(com.gh.gamecenter.feature.R.string.launch)) {
+                if (downloadBtn is DownloadButton && downloadBtn.text == context.getString(R.string.launch)) {
                    clickRunnable.onCallback()
                } else {
                    PermissionHelper.checkStoragePermissionBeforeAction(
@ -945,7 +912,7 @@ object DownloadItemUtils {
                    addHandler(CheckStoragePermissionHandler())
                    addHandler(VersionNumberHandler())
                }
-                    .setProcessEndCallback(gameEntity.id) { _, _ ->
+                    .setProcessEndCallback { _, _ ->
                        DownloadDialog.showDownloadDialog(view.context, gameEntity, traceEvent, entrance, location)
                    }
                    .buildHandlerChain()
@ -970,13 +937,13 @@ object DownloadItemUtils {
        traceEvent: ExposureEvent? = null,
        refreshCallback: EmptyCallback? = null
    ) {
-        val str = if (downloadBtn is DownloadButton) downloadBtn.text else context.getString(com.gh.gamecenter.feature.R.string.download)
+        val str = if (downloadBtn is DownloadButton) downloadBtn.text else context.getString(R.string.download)
        if (gameEntity.getApk().isEmpty()) return
        val apk = gameEntity.getApk().safelyGetInRelease(0) ?: return

        val shouldPerformAsVGame = GameUtils.shouldPerformAsVGame(gameEntity)

-        if (str == context.getString(com.gh.gamecenter.feature.R.string.download)) {
+        if (str == context.getString(R.string.download)) {
            DownloadChainBuilder().apply {
                addHandler(UnsupportedFeatureHandler())
                addHandler(UpdateNewSimulatorHandler())
@ -988,13 +955,13 @@ object DownloadItemUtils {
                addHandler(LandPageAddressHandler())
                addHandler(CheckDownloadHandler())
            }
-                .setProcessEndCallback(gameEntity.id) { asVGame, isSubscribe ->
+                .setProcessEndCallback { asVGame, isSubscribe ->
                    download(context, gameEntity, downloadBtn, entrance, location, asVGame, isSubscribe as Boolean, traceEvent)
                }
                .buildHandlerChain()
                ?.handleRequest(context, gameEntity, shouldPerformAsVGame)
            DataLogUtils.uploadGameLog(context, gameEntity.id, gameEntity.name, entrance)
-        } else if (str == context.getString(com.gh.gamecenter.feature.R.string.attempt)) {
+        } else if (str == context.getString(R.string.attempt)) {
            DownloadChainBuilder().apply {
                addHandler(UnsupportedFeatureHandler())
                addHandler(UpdateNewSimulatorHandler())
@ -1007,13 +974,13 @@ object DownloadItemUtils {
                addHandler(OverseaDownloadHandler())
                addHandler(CheckDownloadHandler())
            }
-                .setProcessEndCallback(gameEntity.id) { asVGame, isSubscribe ->
+                .setProcessEndCallback { asVGame, isSubscribe ->
                    download(context, gameEntity, downloadBtn, entrance, location, asVGame, isSubscribe as Boolean, traceEvent)
                }
                .buildHandlerChain()
                ?.handleRequest(context, gameEntity, shouldPerformAsVGame)
            DataLogUtils.uploadGameLog(context, gameEntity.id, gameEntity.name, entrance)
-        } else if (str == context.getString(com.gh.gamecenter.feature.R.string.smooth)) {
+        } else if (str == context.getString(R.string.smooth)) {
            DownloadChainBuilder().apply {
                addHandler(UnsupportedFeatureHandler())
                addHandler(GamePermissionHandler())
@ -1026,7 +993,7 @@ object DownloadItemUtils {
                addHandler(ValidateVSpaceHandler())
                addHandler(CheckDownloadHandler())
            }
-                .setProcessEndCallback(gameEntity.id) { asVGame, isSubscribe ->
+                .setProcessEndCallback { asVGame, isSubscribe ->
                    download(context, gameEntity, downloadBtn, entrance, location, asVGame, isSubscribe as Boolean, traceEvent)
                }
                .buildHandlerChain()
@ -1039,13 +1006,13 @@ object DownloadItemUtils {
                    addHandler(DownloadDialogHelperHandler())
                    addHandler(CheckDownloadHandler())
                }
-                    .setProcessEndCallback(gameEntity.id) { _, isSubscribe ->
+                    .setProcessEndCallback { _, isSubscribe ->
                        plugin(context, gameEntity, downloadBtn, entrance, location, isSubscribe as Boolean, traceEvent)
                    }
                    .buildHandlerChain()
                    ?.handleRequest(context, gameEntity, shouldPerformAsVGame)
            }
-        } else if (str == context.getString(com.gh.gamecenter.feature.R.string.install)) {
+        } else if (str == context.getString(R.string.install)) {
            val downloadEntity = SimulatorGameManager.findDownloadEntityByUrl(apk.url)

            com.gh.gamecenter.common.utils.NewFlatLogUtils.logGameInstall(
@ -1085,15 +1052,14 @@ object DownloadItemUtils {
            }

            install(context, gameEntity, position, adapter, refreshCallback)
-        } else if (str == context.getString(com.gh.gamecenter.feature.R.string.launch)) {
+        } else if (str == context.getString(R.string.launch)) {
            //启动模拟器游戏
            if (SimulatorGameManager.isSimulatorGame(gameEntity)) {
                if (NewSimulatorGameManager.shouldShowUpdateNewSimulatorAlert(context)) {
                    NewSimulatorGameManager.showUpdateNewsSimulator(context, gameEntity, null)
                    return
                }
-                val downloadEntity =
-                    SimulatorGameManager.findDownloadEntityByUrl(gameEntity.getApk().firstOrNull()?.url)
+                val downloadEntity = SimulatorGameManager.findDownloadEntityByUrl(gameEntity.getApk().firstOrNull()?.url)
                if (downloadEntity != null) {
                    val file = File(downloadEntity.path)
                    if (!file.exists()) {
@ -1116,7 +1082,7 @@ object DownloadItemUtils {
            }

            PackageLauncher.launch(context, gameEntity)
-        } else if (str == context.getString(com.gh.gamecenter.feature.R.string.update)) {
+        } else if (str == context.getString(R.string.update)) {
            if (shouldPerformAsVGame) {
                VHelper.updateOrReDownload(gameEntity)
                return
@ -1125,7 +1091,7 @@ object DownloadItemUtils {
            DownloadChainBuilder()
                .apply {
                    addHandler(LandPageAddressHandler())
-                }.setProcessEndCallback(gameEntity.id) { asVGame, _ ->
+                }.setProcessEndCallback { asVGame, _ ->
                    DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk) {
                        DialogUtils.checkDownload(
                            context,
@ -1158,11 +1124,11 @@ object DownloadItemUtils {
                    return
                }
                when (str) {
-                    context.getString(com.gh.gamecenter.feature.R.string.resume) -> {
+                    context.getString(R.string.resume) -> {
                        DownloadManager.getInstance().resume(downloadEntity, false)
                    }

-                    context.getString(com.gh.gamecenter.feature.R.string.waiting) -> {
+                    context.getString(R.string.waiting) -> {
                        Utils.toast(context, "最多只能同时下载三个任务，请稍等")
                    }

@ -1198,11 +1164,7 @@ object DownloadItemUtils {
                isSubscribe,
                traceEvent
            )
-            if (asVGame) {
-                ToastUtils.toast(gameEntity.name + "已加入加载队列")
-            } else {
-                ToastUtils.toast(gameEntity.name + "已加入下载队列")
-            }
+            ToastUtils.toast(gameEntity.name + "已加入下载队列")
            if (BrowserInstallHelper.shouldAutoSwitchAssistantInstall(gameEntity)) {
                val toast = context.getString(R.string.unsupported_browser_install_hint)
                AppExecutor.uiExecutor.executeWithDelay({
@ -1240,7 +1202,7 @@ object DownloadItemUtils {
                }, 1000)
            }
            if (downloadBtn is DownloadButton) {
-                downloadBtn.setText(com.gh.gamecenter.feature.R.string.downloading)
+                downloadBtn.setText(R.string.downloading)
                downloadBtn.buttonStyle = DownloadButton.ButtonStyle.DOWNLOADING_PLUGIN
            }
        } else {
@ -1262,7 +1224,7 @@ object DownloadItemUtils {
            val path = downloadEntity.path
            when {
                FileUtils.isEmptyFile(path) -> {
-                    Utils.toast(context, com.gh.gamecenter.common.R.string.install_failure_hint)
+                    Utils.toast(context, R.string.install_failure_hint)
                    DownloadManager.getInstance().cancel(downloadEntity.url)
                    gameEntity.getEntryMap().remove(apkEntity?.getPlatform())
                    adapter?.notifyItemChanged(position)
--- a/app/src/main/java/com/gh/common/util/DownloadNotificationHelper.kt
+++ b/app/src/main/java/com/gh/common/util/DownloadNotificationHelper.kt
@ -10,6 +10,7 @@ import android.os.Build
 import androidx.core.app.NotificationCompat
 import com.gh.common.xapk.XapkInstaller
 import com.gh.common.xapk.XapkUnzipStatus
+import com.gh.gamecenter.R
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.utils.getMetaExtra
@ -198,6 +199,6 @@ object DownloadNotificationHelper {
    }

    private fun getNotificationIcon(): Int {
-        return com.gh.gamecenter.common.R.mipmap.logo
+        return R.mipmap.logo
    }
 }
--- a/app/src/main/java/com/gh/common/util/DownloadObserver.kt
+++ b/app/src/main/java/com/gh/common/util/DownloadObserver.kt
@ -30,7 +30,6 @@ import com.gh.gamecenter.feature.entity.SimulatorEntity
 import com.gh.gamecenter.feature.utils.PlatformUtils
 import com.gh.gamecenter.help.HelpAndFeedbackBridge
 import com.gh.gamecenter.pkg.PkgHelper
-import com.gh.ndownload.NDownloadBridge
 import com.gh.vspace.VHelper
 import com.halo.assistant.HaloApp
 import com.lightgame.download.DataWatcher
@ -54,12 +53,6 @@ object DownloadObserver {

    private val mRetryableHashMap = hashMapOf<String, Boolean>()

-    /**
-     * 当下载任务是 预约上线提醒 触发的，则所有弹窗均不显示
-     */
-    private val DownloadEntity.isDownloadByReserveOnlineReminder: Boolean
-        get() = !meta?.get(Constants.IS_RESERVE_ONLINE_REMINDER).isNullOrBlank()
-
    // 如果在WIFI状态下,下载自动暂停,则再重试一遍
    @JvmStatic
    fun initObserver() {
@ -76,16 +69,11 @@ object DownloadObserver {
                    DownloadDataHelper.uploadDownloadEvent(downloadEntity)
                }

-                val status = downloadEntity.status
-
-                if (DownloadStatus.hijack == status) {
+                if (DownloadStatus.hijack == downloadEntity.status) {
                    // 链接被劫持
-                    if (downloadEntity.isDownloadByReserveOnlineReminder) {
-                        return
-                    }
                    processHijack(downloadEntity)
                    return
-                } else if (DownloadStatus.notfound == status) {
+                } else if (DownloadStatus.notfound == downloadEntity.status) {
                    // 404 Not Found
                    // 删除任务
                    downloadEntity.status = DownloadStatus.cancel
@ -99,9 +87,7 @@ object DownloadObserver {
                        gameName = downloadEntity.name,
                        gameType = downloadEntity.categoryChinese
                    )
-                    if (downloadEntity.isDownloadByReserveOnlineReminder) {
-                        return
-                    }
+
                    DialogHelper.showDialog(
                        currentActivity,
                        "下载失败",
@ -141,9 +127,10 @@ object DownloadObserver {
                        extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
                    )
                    return
-                } else if (DownloadStatus.neterror == status
-                    || DownloadStatus.diskioerror == status
-                    || DownloadStatus.timeout == status
+                } else if (DownloadStatus.neterror == downloadEntity.status
+                    || DownloadStatus.timeout == downloadEntity.status
+                    || DownloadStatus.diskioerror == downloadEntity.status
+                    || DownloadStatus.diskisfull == downloadEntity.status
                ) {
                    if (mRetryableHashMap[downloadEntity.url] == true
                        && NetworkUtils.isWifiConnected(HaloApp.getInstance().application)
@ -152,7 +139,9 @@ object DownloadObserver {
                        mRetryableHashMap[downloadEntity.url] = false
                        Utils.log(TAG, "下载重试->" + downloadEntity.toJson())
                    } else {
-                        if (DownloadStatus.diskioerror == status) {
+                        if (DownloadStatus.diskisfull == downloadEntity.status) {
+                            ToastUtils.toast("磁盘已满，请清理空间后重试下载")
+                        } else if (DownloadStatus.diskioerror == downloadEntity.status) {
                            ToastUtils.toast("磁盘 IO 异常，请稍后重试")
                        } else {
                            ToastUtils.toast("网络不稳定，下载任务已暂停")
@ -161,27 +150,21 @@ object DownloadObserver {
                        DataLogUtils.uploadNeterrorLog(mApplication, downloadEntity)
                        Utils.log(TAG, "下载自动暂停->" + downloadEntity.toJson())
                    }
-                } else if (DownloadStatus.diskisfull == status) {
-                    ToastUtils.toast("磁盘已满，请清理空间后重试下载")
-
-                    downloadManager.pause(downloadEntity.url)
-                } else if (DownloadStatus.redirected == status) {
+                } else if (DownloadStatus.redirected == downloadEntity.status) {
                    Utils.log(TAG, "重定向完毕")
                    DownloadDataHelper.uploadRedirectEvent(downloadEntity)
-                } else if (DownloadStatus.unqualified == status) {
+                } else if (DownloadStatus.unqualified == downloadEntity.status) {
                    // 未成年
-                    if (!downloadEntity.isDownloadByReserveOnlineReminder) {
-                        RealNameHelper.showRealNameUnqualifiedDialog(downloadEntity)
-                    }
+                    RealNameHelper.showRealNameUnqualifiedDialog(downloadEntity)

                    // 删除任务
                    downloadEntity.status = DownloadStatus.cancel
                    downloadManager.cancel(downloadEntity.url)
-                } else if (DownloadStatus.unavailable == status) {
+                } else if (DownloadStatus.unavailable == downloadEntity.status) {
                    // 未接入防沉迷系统
                    val currentActivity = AppManager.getInstance().currentActivity()

-                    if (currentActivity != null && !downloadEntity.isDownloadByReserveOnlineReminder) {
+                    if (currentActivity != null) {
                        DialogHelper.showDialog(
                            context = currentActivity,
                            title = "温馨提示",
@ -196,11 +179,11 @@ object DownloadObserver {
                    // 删除任务
                    downloadEntity.status = DownloadStatus.cancel
                    downloadManager.cancel(downloadEntity.url)
-                } else if (DownloadStatus.isCertificating == status) {
+                } else if (DownloadStatus.isCertificating == downloadEntity.status) {
                    // 未接入防沉迷系统
                    val currentActivity = AppManager.getInstance().currentActivity()

-                    if (currentActivity != null && !downloadEntity.isDownloadByReserveOnlineReminder) {
+                    if (currentActivity != null) {
                        DialogHelper.showDialog(
                            context = currentActivity,
                            title = "实名提示",
@ -224,34 +207,28 @@ object DownloadObserver {
                    // 删除任务
                    downloadEntity.status = DownloadStatus.cancel
                    downloadManager.cancel(downloadEntity.url)
-                } else if (DownloadStatus.uncertificated == status) {
+                } else if (DownloadStatus.uncertificated == downloadEntity.status) {
                    // 未实名
-                    if (!downloadEntity.isDownloadByReserveOnlineReminder) {
-                        RealNameHelper.showRealNameUncertificatedDialog(downloadEntity)
-                    }
+                    RealNameHelper.showRealNameUncertificatedDialog(downloadEntity)

                    // 删除任务
                    downloadEntity.status = DownloadStatus.cancel
                    downloadManager.cancel(downloadEntity.url)
-                } else if (DownloadStatus.banned == status) {
+                } else if (DownloadStatus.banned == downloadEntity.status) {
                    ToastUtils.showToast("网络异常")
                    // 删除任务
                    downloadEntity.status = DownloadStatus.cancel
                    downloadManager.cancel(downloadEntity.url)
                }

-                if (DownloadStatus.done == status) {
+                if (DownloadStatus.done == downloadEntity.status) {
                    if (mDoneDebouncePair?.first != downloadEntity.url) {
                        mDoneDebouncePair = Pair(downloadEntity.url, System.currentTimeMillis())
-                        // 清理临时变量
-                        downloadEntity.addMetaExtra(Constants.IS_RESERVE_ONLINE_REMINDER, "")
                        performDownloadCompleteAction(downloadEntity, downloadManager)
                    } else {
                        if (mDoneDebouncePair?.second == 0L
                            || System.currentTimeMillis() - (mDoneDebouncePair?.second ?: 0) > 500
                        ) {
-                            // 清理临时变量
-                            downloadEntity.addMetaExtra(Constants.IS_RESERVE_ONLINE_REMINDER, "")
                            performDownloadCompleteAction(downloadEntity, downloadManager)
                        }
                    }
@ -264,7 +241,7 @@ object DownloadObserver {
                DownloadNotificationHelper.addOrUpdateDownloadNotification(downloadEntity)

                // 如果已下载大小发生变化,表示成功恢复下载,则重置重试标记
-                if (status == DownloadStatus.downloading) {
+                if (downloadEntity.status == DownloadStatus.downloading) {
                    mRetryableHashMap[downloadEntity.url] = true
                }
            }
@ -372,7 +349,7 @@ object DownloadObserver {
                    val isAutoInstall = SPUtils.getBoolean(Constants.SP_AUTO_INSTALL, true)
                    if (downloadType != Constants.VSPACE_32_DOWNLOAD_ONLY && (downloadType == Constants.SIMULATOR_DOWNLOAD || isAutoInstall)) {
                        if (FileUtils.isEmptyFile(downloadEntity.path)) {
-                            Utils.toast(mApplication, com.gh.gamecenter.common.R.string.install_failure_hint)
+                            Utils.toast(mApplication, R.string.install_failure_hint)
                            downloadManager.cancel(downloadEntity.url)
                        } else {
                            if (PackageUtils.isCanLaunchSetup(mApplication, downloadEntity.path)
@ -494,7 +471,7 @@ object DownloadObserver {
            java.lang.Boolean.parseBoolean(downloadEntity.getMetaExtra(Constants.IS_PLATFORM_RECOMMEND))
        val exposureEvent = ExposureUtils.logADownloadCompleteExposureEvent(
            GameEntity(
-                _id = downloadEntity.gameId,
+                id = downloadEntity.gameId,
                mName = downloadEntity.name.removeSuffix(Constants.GAME_NAME_DECORATOR),
                gameVersion = downloadEntity.versionName ?: "",
                isPlatformRecommend = isPlatformRecommend,
@ -506,7 +483,6 @@ object DownloadObserver {
            downloadSpeed,
            downloadEntity.meta[DownloadEntity.DOWNLOAD_HOST_KEY] ?: "unknown",
            downloadEntity.meta[DownloadEntity.DOWNLOAD_PATH_KEY] ?: "unknown",
-            downloadEntity.meta[NDownloadBridge.REDIRECTED_URL_LIST] ?: "unknown",
            type
        )

@ -523,7 +499,7 @@ object DownloadObserver {
                "game_name", downloadEntity.name,
                "game_id", downloadEntity.gameId,
                "game_type", downloadEntity.categoryChinese,
-                "game_schema_type", if (downloadEntity.getMetaExtra(Constants.KEY_BIT) == "32") "32位" else "64位",
+                "game_schema_type", if (downloadEntity.getMetaExtra(VHelper.KEY_BIT) == "32") "32位" else "64位",
                *kvs
            )
        } else if (downloadEntity.gameId == Constants.HALO_FUN_GAME_ID) {
@ -532,7 +508,7 @@ object DownloadObserver {
                "space_schema_type",
                if (downloadEntity.packageName == VHelper.VSPACE_32BIT_PACKAGENAME) "32位" else "64位"
            )
-        } else if (downloadEntity.gameId == Constants.HALO_FUN_NEW_32_GAME_ID) {
+        } else if(downloadEntity.gameId == Constants.HALO_FUN_NEW_32_GAME_ID) {
            SensorsBridge.trackEvent(
                "HaloFunDownloadDone",
                "space_schema_type",
@ -558,7 +534,7 @@ object DownloadObserver {
                "game_name", downloadEntity.meta[Constants.GAME_NAME] ?: "",
                "game_type", downloadEntity.meta[Constants.GAME_CATEGORY_IN_CHINESE] ?: "",
                "game_label", downloadEntity.tags.joinToString(","),
-                "game_schema_type", if (downloadEntity.getMetaExtra(Constants.KEY_BIT) == "32") "32位" else "64位",
+                "game_schema_type", if (downloadEntity.getMetaExtra(VHelper.KEY_BIT) == "32") "32位" else "64位",
                "page_name", getCurrentPageEntity().pageName,
                "page_id", getCurrentPageEntity().pageId,
                "page_business_id", getCurrentPageEntity().pageBusinessId,
--- a/app/src/main/java/com/gh/common/util/EntranceUtils.java
+++ b/app/src/main/java/com/gh/common/util/EntranceUtils.java
@ -27,6 +27,7 @@ import com.gh.gamecenter.core.utils.ClassUtils;
 import com.gh.gamecenter.core.utils.GsonUtils;
 import com.gh.gamecenter.core.utils.SPUtils;
 import com.halo.assistant.HaloApp;
+import com.lightgame.utils.AppManager;
 import com.lightgame.utils.Utils;

 import org.json.JSONException;
@ -37,18 +38,7 @@ import java.util.Set;

 public class EntranceUtils {

-    public static void jumpActivity(Context context, Bundle bundle) {
-        jumpActivityCompat(context, bundle, null, null);
-    }
-
    public static void jumpActivityCompat(Context context, Bundle bundle) {
-        jumpActivityCompat(context, bundle, null,null);
-    }
-
-    public static void jumpActivityCompat(Context context,
-                                          Bundle bundle,
-                                          @Nullable Bundle nextToBundle,
-                                          @Nullable Callback callback) {
        bundle.putBoolean(KEY_REQUIRE_REDIRECT, true);

        if (HaloApp.getInstance().isRunningForeground || HaloApp.getInstance().isAlreadyUpAndRunning) {
@ -58,18 +48,6 @@ public class EntranceUtils {
            if (clazz == null) clazz = MainActivity.class;
            if (ToolbarFragment.class.isAssignableFrom(clazz)) { // 兼容ToolbarFragment
                ToolBarActivity.startFragmentNewTask(context, (Class<? extends ToolbarFragment>) clazz, bundle);
-            } else if (callback != null ) {
-                Intent intent1 = new Intent(context, clazz);
-                //TODO:添加FLAG_ACTIVITY_NEW_TASK会导致一跳转页面callback就被调用
-                //intent1.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                intent1.putExtras(bundle);
-                if (context instanceof AppCompatActivity) {
-                    AvoidOnResultManager.Companion.getInstance((AppCompatActivity) context)
-                            .startForResult(intent1, callback);
-                } else {
-                    // 不要回调，正常跳转
-                    context.startActivity(intent1);
-                }
            } else {
                Intent intent1 = new Intent(context, clazz);
                intent1.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@ -80,6 +58,57 @@ public class EntranceUtils {
                intent1.putExtras(bundle);
                context.startActivity(intent1);
            }
+        } else {
+            // 应用未在运行
+            context.startActivity(SplashScreenActivity.getSplashScreenIntent(context, bundle));
+        }
+    }
+
+    public static void jumpActivity(Context context, Bundle bundle) {
+        bundle.putBoolean(KEY_REQUIRE_REDIRECT, true);
+
+        if (AppManager.getInstance().findActivity(MainActivity.class) != null) {
+            // 应用正在运行，前台或后台，且MainActivity在栈中
+            String to = bundle.getString(KEY_TO);
+            Class<?> clazz = ClassUtils.forName(to);
+            if (clazz == null) clazz = MainActivity.class;
+            if (ToolbarFragment.class.isAssignableFrom(clazz)) { // 兼容ToolbarFragment
+                ToolBarActivity.startFragmentNewTask(context, (Class<? extends ToolbarFragment>) clazz, bundle);
+            } else {
+                Intent intent1 = new Intent(context, clazz);
+                intent1.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                // 如果 activity 名称有 singleton 的就添加 reorder_to_front 标签 (有点粗暴有点蠢，但暂时就先这样吧 :C )
+                if (clazz.getSimpleName().toLowerCase().contains("singleton")) {
+                    intent1.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+                }
+                intent1.putExtras(bundle);
+                context.startActivity(intent1);
+            }
+        } else {
+            // 应用未在运行
+            context.startActivity(SplashScreenActivity.getSplashScreenIntent(context, bundle));
+        }
+    }
+
+    public static void jumpActivity(Context context, Bundle nextToBundle, Bundle bundle, Callback callback) {
+        bundle.putBoolean(KEY_REQUIRE_REDIRECT, true);
+
+        if (AppManager.getInstance().findActivity(MainActivity.class) != null) {
+            // 应用正在运行，前台或后台，且MainActivity在栈中
+            String to = bundle.getString(KEY_TO);
+            Class<?> clazz = ClassUtils.forName(to);
+            if (clazz == null) clazz = MainActivity.class;
+            if (ToolbarFragment.class.isAssignableFrom(clazz)) { // 兼容ToolbarFragment
+                ToolBarActivity.startFragmentNewTask(context, (Class<? extends ToolbarFragment>) clazz, bundle);
+            } else {
+                Intent intent1 = new Intent(context, clazz);
+                //TODO:添加FLAG_ACTIVITY_NEW_TASK会导致一跳转页面callback就被调用
+                //intent1.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                intent1.putExtras(bundle);
+
+                AvoidOnResultManager.Companion.getInstance((AppCompatActivity) context)
+                        .startForResult(intent1, callback);
+            }
        } else {
            // 应用未在运行
            if (nextToBundle != null) {
--- a/app/src/main/java/com/gh/common/util/ErrorHelper.kt
+++ b/app/src/main/java/com/gh/common/util/ErrorHelper.kt
@ -7,13 +7,13 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import com.gh.common.constant.Config
-import com.gh.common.dialog.WechatBindingFailedDialogFragment
 import com.gh.gamecenter.R
 import com.gh.gamecenter.ShellActivity
 import com.gh.gamecenter.VerifyPhoneActivity
 import com.gh.gamecenter.WebActivity
 import com.gh.gamecenter.common.avoidcallback.AvoidOnResultManager
 import com.gh.gamecenter.common.avoidcallback.Callback
+import com.gh.gamecenter.common.callback.CancelListener
 import com.gh.gamecenter.common.callback.ConfirmListener
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.constant.EntranceConsts
@ -188,10 +188,10 @@ object ErrorHelper {
            403015 -> Utils.toast(context, "已经关注过了")
            404001 -> Utils.toast(context, "请求的资源不存在")
            403016 -> Utils.toast(context, "标签内容可能包含敏感信息，请修改后再提交")
-            403018 -> Utils.toast(context, com.gh.gamecenter.common.R.string.comment_failed_unable)
+            403018 -> Utils.toast(context, R.string.comment_failed_unable)
            403070 -> Utils.toast(context, "请勿重复提交~")
            403073 -> Utils.toast(context, "标题违规，请重新编辑")
-            403074 -> handleErrorWithRepeatWechatBinding(context, errorEntity)
+            403074 -> Utils.toast(context, "该微信号（${errorEntity.data?.nickname}）已绑定")
            403078 -> Utils.toast(context, "已点赞")
            403072 -> Utils.toast(context, R.string.comment_failed_userblocked)
            403082 -> Utils.toast(context, "作者已关闭评论")
@ -234,10 +234,6 @@ object ErrorHelper {
        }
    }

-    private fun handleErrorWithRepeatWechatBinding(context: Context, errorEntity: ErrorEntity) {
-        WechatBindingFailedDialogFragment.show(context, errorEntity.data?.userConflict)
-    }
-
    private fun handleAskFrequentlyError(context: Context, showHighPriorityHint: Boolean) {
        if (showHighPriorityHint) {
            DialogHelper.showDialog(
@ -265,7 +261,7 @@ object ErrorHelper {
        SensorsBridge.trackVerificationDialogShow(
            gameId = gameEntity?.id ?: "",
            gameName = gameEntity?.name ?: "",
-            gameType = gameEntity?.categoryChinese ?: "",
+            gameType = gameEntity?.categoryChinese ?:"",
            articleType = articleType,
            verificationType = verificationType
        )
@ -296,7 +292,7 @@ object ErrorHelper {
                        )
                    }
                binding.hintTv.text = errorEntity.data?.text
-                binding.hintTv.setTextColor(com.gh.gamecenter.common.R.color.text_theme.toColor(context))
+                binding.hintTv.setTextColor(R.color.text_theme.toColor(context))
                binding.hintTv.setOnClickListener {
                    errorEntity.data?.toLinkEntity()?.let { entity ->
                        DirectUtils.directToLinkPage(context, entity, "实名提醒弹窗", "")
@ -365,7 +361,7 @@ object ErrorHelper {
                        )
                    }
                binding.hintTv.text = errorEntity.data?.text
-                binding.hintTv.setTextColor(com.gh.gamecenter.common.R.color.text_theme.toColor(context))
+                binding.hintTv.setTextColor(R.color.text_theme.toColor(context))
                binding.hintTv.setOnClickListener {
                    errorEntity.data?.toLinkEntity()?.let { entity ->
                        DirectUtils.directToLinkPage(context, entity, "手机号验证", "")
--- a/app/src/main/java/com/gh/common/util/GameActivityDownloadHelper.kt
+++ b/app/src/main/java/com/gh/common/util/GameActivityDownloadHelper.kt
@ -207,8 +207,8 @@ object GameActivityDownloadHelper {
            pluginLocation = PluginLocation.only_game
        )
        if (downloadEntity != null
-            && str != context.getString(com.gh.gamecenter.feature.R.string.install)
-            && str != context.getString(com.gh.gamecenter.feature.R.string.launch)
+            && str != context.getString(R.string.install)
+            && str != context.getString(R.string.launch)
        ) {
            ToastUtils.toast("${gameEntity.name}已加入下载队列")
            if (BrowserInstallHelper.shouldAutoSwitchAssistantInstall(gameEntity)) {
@ -219,23 +219,22 @@ object GameActivityDownloadHelper {
            }
        } else {
            when {
-                str == context.getString(com.gh.gamecenter.feature.R.string.download) || str == context.getString(
-                    com.gh.gamecenter.feature.R.string.attempt) -> {
+                str == context.getString(R.string.download) || str == context.getString(R.string.attempt) -> {
                    handleDownloadStatus(context, gameEntity, apk, entrance, location, traceEvent)
                }
-                str == context.getString(com.gh.gamecenter.feature.R.string.smooth) -> {
+                str == context.getString(R.string.smooth) -> {
                    handleSmoothStatus(context, gameEntity, apk, entrance, location, traceEvent)
                }
                str.contains("化") -> {
                    handlePluginStatus(context, gameEntity, apk, entrance, location, traceEvent)
                }
-                str == context.getString(com.gh.gamecenter.feature.R.string.install) -> {
+                str == context.getString(R.string.install) -> {
                    handleInstallStatus(context, gameEntity, apk, downloadEntity)
                }
-                str == context.getString(com.gh.gamecenter.feature.R.string.launch) -> {
+                str == context.getString(R.string.launch) -> {
                    handleLaunchStatus(context, gameEntity, apk, entrance, location, traceEvent)
                }
-                str == context.getString(com.gh.gamecenter.feature.R.string.update) -> {
+                str == context.getString(R.string.update) -> {
                    handleUpdateStatus(context, gameEntity, apk, entrance, location, traceEvent)
                }
                else -> {
@ -526,7 +525,7 @@ object GameActivityDownloadHelper {
        val path = downloadEntity.path
        when {
            FileUtils.isEmptyFile(path) -> {
-                Utils.toast(context, com.gh.gamecenter.common.R.string.install_failure_hint)
+                Utils.toast(context, R.string.install_failure_hint)
                DownloadManager.getInstance().cancel(downloadEntity.url)
                gameEntity.getEntryMap().remove(apkEntity.getPlatform())
            }
--- a/app/src/main/java/com/gh/common/util/GameSubstituteRepositoryHelper.kt
+++ b/app/src/main/java/com/gh/common/util/GameSubstituteRepositoryHelper.kt
@ -7,7 +7,6 @@ import com.gh.gamecenter.common.utils.toObject
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.entity.SubjectEntity
 import com.gh.gamecenter.common.retrofit.Response
-import com.gh.gamecenter.manager.PackagesManager
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.halo.assistant.HaloApp
 import io.reactivex.schedulers.Schedulers
@ -112,14 +111,6 @@ object GameSubstituteRepositoryHelper {
                }
            }

-            // 检查是否已安装该游戏 id
-            if (PackagesManager.getInstalledDataByGameId(game.id) != null) {
-                // 将该位置的游戏标记为需要替换
-                positionOfGameToBeReplacedList.add(index)
-                thisPositionNeedToBeReplaced = true
-                break
-            }
-
            // 若此游戏所包含的 apk 没有已安装，那么再检查是否已安装有预设相关包名
            if (!thisPositionNeedToBeReplaced) {
                var relatedPackageList = arrayListOf<String>()
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
chenjuntao	e1e4355491	feat: 【光环助手】极光推送接入VA合并包 https://jira.shanqu.cc/browse/GHZSCY-5621	2024-06-04 14:06:24 +08:00
yangfei	843214e070	fix: 修复32位畅玩游戏助手被卸载的云存档交互崩溃 https://sentry.shanqu.cc/organizations/lightgame/issues/355607/?project=22	2024-06-03 14:46:49 +08:00
yangfei	3adfc797b8	fix:去掉英文	2024-05-31 14:27:09 +08:00
yangfei	87d434f4ad	fix: remove启动服务导致的崩溃，由于包渠道不会触发SensorLogService的业务逻辑，先不启动。	2024-05-31 13:11:19 +08:00
yangfei	777ce3fe35	fix: remove启动服务导致的崩溃，由于包渠道不会触发SensorLogService的业务逻辑，先不启动。	2024-05-31 11:57:29 +08:00
yangfei	22d19c35e1	fix: 获取网络状态报错 & 资源覆盖导致深色主题UI异常	2024-05-30 16:54:23 +08:00
yangfei	0780ba5941	fix：史宾格检测隐私政策前读取了系统属性	2024-05-30 11:17:23 +08:00
yangfei	0a3235db35	refactor: sync id with 光环助手5.35.5	2024-05-29 18:07:43 +08:00
yangfei	3e4d1e2bf0	refactor: sync id with 光环助手5.35.5	2024-05-29 18:04:27 +08:00
yangfei	d502453420	refactor: sync vasdk	2024-05-29 17:28:15 +08:00
yangfei	97ff960dde	refactor: 取消assumenosideeffects注释 & 修改版本号 & update git submodule	2024-05-29 16:27:38 +08:00
yangfei	4b0f4d1545	fix: 上传云存档弹窗时间1970年的问题	2024-05-29 14:56:20 +08:00
yangfei	d231e73f44	refactor: 删除插件文件，自动打包会下载	2024-05-29 14:15:05 +08:00
yangfei	8c1145c301	refactor: sync va commit id & upload plugin files.	2024-05-29 11:43:15 +08:00
yangfei	8246cae6af	refactor: sync commit id.	2024-05-28 17:22:15 +08:00
yangfei	2c02f601a5	refactor: 插件删除实名部分，实名在va实现	2024-05-28 16:00:25 +08:00
yangfei	18f213ec7d	refactor: upgrade va version	2024-05-27 21:01:37 +08:00
yangfei	9d7c533207	feat: merge va	2024-05-27 20:47:18 +08:00
				`@ -0,0 +1 @@`
				{"v":"5.6.9","fr":30,"ip":0,"op":20,"w":66,"h":66,"nm":"bottom bar tab/论坛/选中/E","ddd":0,"assets":[{"id":"comp_0","layers":[{"ddd":0,"ind":1,"ty":4,"nm":"白-修正","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},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":4,"s":[80,80,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":9,"s":[110,110,100]},{"t":13,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":1,"y":0},"t":0,"s":[{"i":[[0,-0.66],[0,0],[1.38,0],[0,1.38],[0,0],[-0.66,0],[0,0]],"o":[[0,0],[0,1.38],[-1.38,0],[0,0],[0,-0.66],[0,0],[0.66,0]],"v":[[2.5,-1.3],[2.5,0],[0,2.5],[-2.5,0],[-2.5,-1.3],[-1.3,-2.5],[1.3,-2.5]],"c":true}]},{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"t":4,"s":[{"i":[[0,-0.66],[0,0],[1.38,0],[0,1.38],[0,0],[-0.66,0],[0,0]],"o":[[0,0],[0,1.38],[-1.38,0],[0,0],[0,-0.66],[0,0],[0.66,0]],"v":[[2.5,-0.102],[2.5,0],[0,2.109],[-2.5,0],[-2.5,-0.102],[-1.3,-1.302],[1.3,-1.302]],"c":true}]},{"i":{"x":0.667,"y":1},"o":{"x":1,"y":0},"t":9,"s":[{"i":[[0,-0.66],[0,0],[1.38,0],[0,1.38],[0,0],[-0.66,0],[0,0]],"o":[[0,0],[0,1.38],[-1.38,0],[0,0],[0,-0.66],[0,0],[0.66,0]],"v":[[2.498,-1.845],[2.5,0],[0,2.734],[-2.5,0],[-2.502,-1.845],[-1.302,-3.045],[1.298,-3.045]],"c":true}]},{"t":13,"s":[{"i":[[0,-0.66],[0,0],[1.38,0],[0,1.38],[0,0],[-0.66,0],[0,0]],"o":[[0,0],[0,1.38],[-1.38,0],[0,0],[0,-0.66],[0,0],[0.66,0]],"v":[[2.5,-1.3],[2.5,0],[0,2.5],[-2.5,0],[-2.5,-1.3],[-1.3,-2.5],[1.3,-2.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":"填充 1","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":150,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"蓝","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,33.76,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.8,0.42],[-3.44,-0.79],[-0.09,-1.71],[0,0],[0,0],[1.98,-0.1],[0,0],[0,0],[0,0],[0.62,0.57],[0,0],[0,0],[0,0],[0,0],[0,0],[0.2,1.89],[0,0],[0,0],[0,0]],"o":[[3.44,-0.79],[1.74,0.41],[0,0],[0,0],[0,2],[0,0],[0,0],[0,0],[-0.69,0.52],[0,0],[0,0],[0,0],[0,0],[0,0],[-1.94,0],[0,0],[0,0],[0,0],[0,-1.8]],"v":[[-6.39,-8.971],[6.39,-8.971],[9.49,-5.471],[9.5,-5.271],[9.5,3.249],[5.95,6.989],[5.75,6.999],[3.25,6.999],[0.3,9.209],[-1.95,9.089],[-2.06,8.969],[-2.17,8.849],[-2.21,8.779],[-3.4,6.999],[-5.75,6.999],[-9.48,3.639],[-9.49,3.449],[-9.5,3.249],[-9.5,-5.271]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.266,0.638,1,0.5,0.242,0.595,1,1,0.217,0.552,1],"ix":9}},"s":{"a":0,"k":[-9.5,-9.561],"ix":5},"e":{"a":0,"k":[9.5,9.561],"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":"路径","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":150,"st":0,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":0,"nm":"预合成 1","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},"a":{"a":0,"k":[33,33,0],"ix":1},"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":4,"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":9,"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":13,"s":[90,90,100]},{"t":16,"s":[100,100,100]}],"ix":6}},"ao":0,"w":66,"h":66,"ip":0,"op":20,"st":0,"bm":0}],"markers":[]}
				`@ -0,0 +1 @@`
				{"v":"5.5.9","fr":30,"ip":0,"op":20,"w":66,"h":66,"nm":"tab_video","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"形状图层 1","parent":2,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.771],"y":[0]},"t":0,"s":[0]},{"t":5,"s":[100]}],"ix":11},"r":{"a":0,"k":90,"ix":10},"p":{"a":0,"k":[-3.742,6.835,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[30.937,31.042,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"sr","sy":2,"d":1,"pt":{"a":0,"k":3,"ix":3},"p":{"a":0,"k":[0,0],"ix":4},"r":{"a":0,"k":0,"ix":5},"or":{"a":0,"k":29.286,"ix":7},"os":{"a":0,"k":75,"ix":9},"ix":1,"nm":"多边星形路径 1","mn":"ADBE Vector Shape - Star","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":13,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[-20.75,-13.25],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[102.743,88.578],"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":"多边星形 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.657],"y":[0]},"t":0,"s":[0]},{"t":8,"s":[100]}],"ix":2},"o":{"a":0,"k":-115,"ix":3},"m":1,"ix":2,"nm":"修剪路径 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":60,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"路径 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,33.004,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.508,0.508,0.333],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.488,0.488,0.333],"y":[0,0,0]},"t":4,"s":[80,80,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.502,0.502,0.333],"y":[0,0,0]},"t":9,"s":[110,110,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.534,0.534,0.333],"y":[0,0,0]},"t":13,"s":[95,95,100]},{"t":16,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[2.16,0.38],[3.22,-0.55],[0.38,-2.16],[-0.55,-3.22],[-2.16,-0.38],[-1.63,0],[-1.61,0.27],[-0.38,2.16],[0.55,3.22]],"o":[[-0.38,-2.16],[-3.22,-0.55],[-2.16,0.38],[-0.55,3.22],[0.38,2.16],[1.61,0.27],[1.63,0],[2.16,-0.38],[0.55,-3.22],[0,0]],"v":[[9.09,-4.86],[4.86,-9.09],[-4.86,-9.09],[-9.09,-4.86],[-9.09,4.86],[-4.86,9.09],[0,9.5],[4.86,9.09],[9.09,4.86],[9.09,-4.86]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.266,0.638,1,0.5,0.242,0.595,1,1,0.217,0.552,1],"ix":9}},"s":{"a":0,"k":[-5.174,-4.43],"ix":5},"e":{"a":0,"k":[8.612,8.214],"ix":6},"t":1,"nm":"Gradient Fill 3","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":"路径","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":60,"st":0,"bm":0}],"markers":[]}