fix: 最近在玩来源判断被覆盖的问题。

https://jira.shanqu.cc/browse/GHZSCY-5801

.gitlab-ci.yml

@@ -72,7 +72,6 @@ android_build:
   only:
     - dev
     - release
-    - feat/GHZSCY-6578
 
 # 代码检查
 sonarqube_analysis:
@@ -128,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                         # 固定值
@@ -149,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
@@ -157,5 +152,4 @@ oss-upload&send-email:
         - /usr/local/bin/python /ci-android-mail-jira-comment.py
     only:
         - dev
-        - release
-        - feat/GHZSCY-6578
+        - release

README.md

@@ -44,4 +44,5 @@
 
 ### 混淆配置
 
+* 本项目使用了微信的 [AndResGuard](https://github.com/shwenzhang/AndResGuard) 作为资源混淆压缩方案，新增需要使用 `getIdentifier` 获取的资源文件时需要添加至白名单
 * 本项目默认使用 R8 作为混淆工具，往 proguard-rules.txt 添加 proguard 新配置项时请检查可用性(如语法等)

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
 
@@ -105,8 +106,6 @@ android {
         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）
@@ -127,10 +126,6 @@ android {
         }
     }
 
-    packagingOptions {
-        exclude 'META-INF/gradle/incremental.annotation.processors'
-    }
-
     buildTypes {
         debug {
             debuggable true
@@ -217,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，接口仅包含正式环境
@@ -233,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 {
@@ -249,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 {
@@ -265,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 {
@@ -280,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 {
@@ -295,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}")
         }
 
         // 港澳台
@@ -335,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}"
@@ -379,7 +357,7 @@ dependencies {
     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}"
 
@@ -388,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}"
 
@@ -401,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')
@@ -550,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 {

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")
     }
 

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文件")
+                }
+            }
+        }
+    }
 }

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

@@ -1,12 +1,7 @@
 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
@@ -45,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))
@@ -74,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 {
@@ -131,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)
             }
@@ -143,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
@@ -152,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) {
@@ -185,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)
     }
 

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>

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>

app/src/main/AndroidManifest.xml

@@ -9,17 +9,15 @@
 
     <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" />
@@ -41,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" />
 
@@ -56,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,
@@ -120,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
@@ -142,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"
@@ -185,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
@@ -311,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"
@@ -335,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" />
@@ -456,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"
@@ -488,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"
@@ -553,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" />
@@ -573,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" />
@@ -758,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
@@ -781,18 +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=".forum.home.CommunityActivity"
+            android:screenOrientation="portrait"/>
 
         <!--        <activity-->
         <!--            android:name="${applicationId}.douyinapi.DouYinEntryActivity"-->
@@ -851,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">

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

@@ -28,6 +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.provider.IBeiziAdProvider
 import com.gh.gamecenter.core.provider.ICsjAdProvider
 import com.gh.gamecenter.core.utils.CurrentActivityHolder
 import com.gh.gamecenter.core.utils.SPUtils
@@ -45,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() }
 
@@ -61,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" // 自有广告
 
@@ -78,6 +80,13 @@ object AdDelegateHelper {
     var gameSearchKeyword = ""
 
     fun initAdSdk(context: Context) {
+        // 初始化 Beizi
+        if (mBeiziAdImpl == null) {
+            mBeiziAdImpl =
+                ARouter.getInstance().build(RouteConsts.provider.beiziAd).navigation() as? IBeiziAdProvider
+            mBeiziAdImpl?.initSDK(context)
+        }
+
         // 初始化穿山甲
         if (mCsjAdImpl == null) {
             mCsjAdImpl =
@@ -184,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
 
@@ -227,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
+    }
 
     /**
      * 是否大于广告管理展示间隔时长
@@ -281,7 +301,6 @@ object AdDelegateHelper {
         adViewHeightInDp: Float,
         startAdContainer: ViewGroup,
         sdkStartAdContainer: ViewGroup,
-        sdkJumpBtn: TextView,
         adsViewGroup: FrameLayout,
         handler: BaseActivity.BaseHandler,
         isHotLaunch: Boolean,
@@ -303,7 +322,6 @@ object AdDelegateHelper {
                         adViewHeightInDp,
                         startAdContainer,
                         sdkStartAdContainer,
-                        sdkJumpBtn,
                         adsViewGroup,
                         handler,
                         isHotLaunch,
@@ -321,7 +339,6 @@ object AdDelegateHelper {
                         adViewHeightInDp,
                         startAdContainer,
                         sdkStartAdContainer,
-                        sdkJumpBtn,
                         adsViewGroup,
                         handler,
                         isHotLaunch,
@@ -345,7 +362,6 @@ object AdDelegateHelper {
         adViewHeightInDp: Float,
         startAdContainer: ViewGroup,
         sdkStartAdContainer: ViewGroup,
-        sdkJumpBtn: TextView,
         adsViewGroup: FrameLayout,
         handler: BaseActivity.BaseHandler,
         isHotLaunch: Boolean,
@@ -367,7 +383,6 @@ object AdDelegateHelper {
                         adViewHeightInDp,
                         startAdContainer,
                         sdkStartAdContainer,
-                        sdkJumpBtn,
                         adsViewGroup,
                         handler,
                         isHotLaunch,
@@ -393,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
             )
         }
@@ -415,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)
+        }
+    }
+
     /**
      * 显示自有的开屏广告
      */
@@ -490,7 +487,6 @@ object AdDelegateHelper {
         adViewHeightInDp: Float,
         startAdContainer: ViewGroup,
         sdkStartAdContainer: ViewGroup,
-        sdkJumpBtn: TextView,
         adsViewGroup: FrameLayout,
         handler: BaseActivity.BaseHandler,
         isHotLaunch: Boolean,
@@ -508,7 +504,6 @@ object AdDelegateHelper {
                     adViewHeightInDp,
                     startAdContainer,
                     sdkStartAdContainer,
-                    sdkJumpBtn,
                     adsViewGroup,
                     handler,
                     isHotLaunch,
@@ -561,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(
@@ -577,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 {
             // 拦截点击事件传递
         }
@@ -656,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)
     }
 
     /**
@@ -671,8 +652,6 @@ object AdDelegateHelper {
         containerView: ViewGroup,
         ad: AdConfig.ThirdPartyAd,
         expressViewWidthInDp: Float,
-        onAdShowAction: () -> Unit,
-        onAdClickAction: () -> Unit,
         callback: (isSuccess: Boolean) -> Unit
     ) {
 
@@ -695,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
         )
     }
@@ -725,6 +682,7 @@ object AdDelegateHelper {
      * 取消开屏广告
      */
     fun cancelSplashAd(context: Context) {
+        mBeiziAdImpl?.cancelSplashAd(context)
         mCsjAdImpl?.cancelSplashAd(context)
     }
 

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 = "畅玩启动"
-    }
 }

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())
-    }
-}

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
@@ -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 "发帖子"
                 )

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

@@ -20,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
@@ -39,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
 

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
     }
 
 }

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
@@ -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)

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 ?: "")

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
     }
 

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)
-        }
-    }
-}

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,12 +15,10 @@ 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;
@@ -47,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;
@@ -80,10 +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 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;
 
@@ -93,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
@@ -214,16 +224,6 @@ public class Config {
         return mVNewSetting;
     }
 
-    @NonNull
-    public static Observable<VNewSetting> getVNewSettingObservable() {
-        if (mVNewSetting != null) {
-            return Observable.just(mVNewSetting);
-        } else {
-            return vNewSettingSubject.hide();
-        }
-    }
-
-
     @Nullable
     public static AppEntity getNew32UpdateEntity() {
         return mNew32UpdateEntity;
@@ -237,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) {
@@ -269,6 +270,7 @@ public class Config {
                     }
                 })
                 .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new BiResponse<AppEntity>() {
                     @Override
                     public void onSuccess(AppEntity data) {
@@ -300,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) {
@@ -312,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"));
                         }
                     }
                 });
@@ -320,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) {
@@ -334,6 +338,7 @@ public class Config {
         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) {
@@ -345,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) {
@@ -368,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) {
@@ -383,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));
 
@@ -393,15 +398,15 @@ 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());
                             }
                         }
                     });

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

@@ -172,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,
@@ -197,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,

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
                 }

app/src/main/java/com/gh/common/dialog/ManagerAllFilesPermissionDialogFragment.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
             )
         }
     }

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

@@ -60,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
 
@@ -326,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()
@@ -364,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()
         }
     }
@@ -417,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
@@ -454,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
@@ -470,7 +470,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
 
 
         fun isAllPackageInstalled(
-            allInstalledPackages: List<String>,
+            allInstalledPackages: List<PackageInfo>,
             packageDialogEntity: PackageDialogEntity
         ): Boolean {
             var isAllInstalled = true

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

@@ -6,16 +6,16 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-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.entity.SimpleGameEntity
 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.databinding.DialogReserveBinding
 import com.gh.gamecenter.databinding.DialogReserveItemBinding
+import com.gh.gamecenter.common.entity.SimpleGameEntity
 import com.gh.gamecenter.mygame.MyGameActivity
 import com.lightgame.adapter.BaseRecyclerAdapter
 
@@ -43,7 +43,7 @@ class ReserveDialog : BaseDialogFragment() {
             View.VISIBLE
         } else View.GONE
         binding.more.setOnClickListener {
-            val intent = MyGameActivity.getIntentWithConfig(requireContext(), MyGameActivity.RESERVATION_INDEX)
+            val intent = MyGameActivity.getIntentWithConfig(requireContext(), 2)
             startActivity(intent)
             dismissAllowingStateLoss()
         }

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

@@ -1,13 +1,13 @@
 package com.gh.common.exposure
 
+import com.aliyun.sls.android.producer.Log
 import com.gh.gamecenter.BuildConfig
-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.lightgame.utils.Utils
-import com.volcengine.model.tls.LogItem
 
 /**
  * A handful tool for committing logs to aliyun loghub.
@@ -78,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 ""

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

@@ -1,13 +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
@@ -19,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
 
@@ -28,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) {
@@ -59,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)
@@ -82,7 +82,7 @@ class AccelerateNotificationHandler(priority: Int) : PriorityChainHandler(priori
         fun showAccelerateNotificationPopupWindow(
             activity: Activity,
             viewModel: MainWrapperViewModel?,
-            handler: Handler?,
+            baseHandler: BaseFragment.BaseHandler?,
             gameEntity: GameEntity?,
             dismissCallback: (() -> Unit)?
         ) {
@@ -131,7 +131,7 @@ class AccelerateNotificationHandler(priority: Int) : PriorityChainHandler(priori
                 setOnDismissListener {
                     dismissCallback?.invoke()
                 }
-                handler?.postDelayed({ dismiss() }, 5000)
+                baseHandler?.postDelayed({ dismiss() }, 5000)
             }
         }
     }

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

@@ -1,169 +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.R
-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 = 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)
-                }
-            }
-        }
-    }
-}

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()
-                )
-            }
-        }
-    }
-}

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()
-        }
-    }
 }

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

@@ -18,8 +18,6 @@ import com.gh.gamecenter.core.AppExecutor
 import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.entity.DialogEntity
 import com.gh.gamecenter.feature.entity.WelcomeDialogEntity
-import com.gh.gamecenter.hud.PendingInstallHUDHandler
-import com.gh.gamecenter.hud.ResumeDownloadHudHandler
 import com.gh.gamecenter.login.user.UserManager
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.halo.assistant.HaloApp
@@ -59,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)
@@ -68,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()

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

@@ -1,297 +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.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.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 = R.style.popup_window_ease_in_and_out_anim_style
-                setOnDismissListener {
-                    dismissCallback?.invoke()
-                }
-                handler?.post {
-                    if (!activity.isFinishing) {
-                        showAsDropDown(tabView, xoff, (-25F).dip2px())
-                    }
-                }
-            }
-        }
-    }
-}

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
-    }
-
-}

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()
 }

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

@@ -32,6 +32,5 @@ class BuildConfigImpl : IBuildConfigProvider {
     override fun getVApiHost(): String = BuildConfig.VAPI_HOST
 
     override fun getVDevApiHost(): String = BuildConfig.DEV_VAPI_HOST
-
     override fun getLogProducerProject(): String = BuildConfig.LOG_HUB_PROJECT
 }

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

@@ -1,103 +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
-import com.gh.gamecenter.R
-
-@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, R.drawable.reuse_listview_item_style))
-            binding.tvGameName.setTextColor(ContextCompat.getColor(context, R.color.text_primary))
-            binding.tvTime.setTextColor(ContextCompat.getColor(context, R.color.text_tertiary))
-            binding.tvTitle.setTextColor(ContextCompat.getColor(context, R.color.text_primary))
-            binding.tvDescription.setTextColor(ContextCompat.getColor(context, R.color.text_secondary))
-            binding.tvComment.setTextColor(ContextCompat.getColor(context, R.color.text_tertiary))
-            binding.tvShare.setTextColor(ContextCompat.getColor(context, 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
-    }
-}

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
+    }
+}

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

@@ -1,55 +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.R
-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(R.color.text_primary.toColor(context))
-            tvTime.setTextColor(R.color.text_tertiary.toColor(context))
-            tvGiftPackName.setTextColor(R.color.text_primary.toColor(context))
-            tvGiftPackContent.setTextColor(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
-    }
-}

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
-    }
-}

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
     }

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
@@ -70,18 +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, qqAppId: String) {
-        DirectUtils.directToWechatGameById(activity, qqAppId)
-    }
-
     override fun directToExternalBrowser(context: Context, url: String) {
         DirectUtils.directToExternalBrowser(context, url)
     }

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
     }

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
-    }
-}

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> {

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

@@ -19,12 +19,12 @@ 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
@@ -273,7 +273,7 @@ object ArchiveDownloadButtonHelper {
                 R.string.archive_apply.toResString(),
                 R.string.cancel.toResString(),
                 {
-                    if(gameEntity.is32() && VHelper.isInnerInstalled(packageName) && !VCore.getInstance().isExtPackageInstalled()) {
+                    if(gameEntity.is32() && VHelper.isInnerInstalled(packageName) && !VirtualCore.get().isExtPackageInstalled) {
                         // 32位的游戏 并且 32位畅玩没有安装 并且 一体化
                         VHelper.newCwValidateVspaceBeforeAction(context, gameEntity) {}
                     } else {

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();

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;
     }
+
 }

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));
     }
 
     // 上传下载数据（开始、完成）

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() {

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(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(R.string.launch).equals(rawBtnText) || context.getString(R.string.install).equals(rawBtnText) || context.getString(R.string.smooth).equals(rawBtnText) || context.getString(R.string.update).equals(rawBtnText))) {
-                if (context.getString(R.string.smooth).equals(rawBtnText)) {
-                    decoratedBtnText = context.getString(R.string.download_v);
-                } else if (context.getString(R.string.update).equals(rawBtnText)) {
-                    decoratedBtnText = context.getString(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(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(R.string.launch).equals(rawBtnText)
-                            || context.getString(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(R.string.pluggable).equals(rawBtnText)) {
+            if (context.getString(R.string.pluggable).equals(status)) {
                 downloadButton.setButtonStyle(DownloadButton.ButtonStyle.PLUGIN);
-            } else if (context.getString(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(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,78 +271,48 @@ 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(R.string.pluggable).equals(rawBtnText)) {
-                decoratedBtnText = "升级" + (!containsAddWord ? "" : "至" + downloadAddWord) + getWrappedDownloadSizeText(viewHolder);
-                localBtnText = "升级" + (!containsAddWord ? "" : "至" + downloadAddWord);
-            } else if (context.getString(R.string.launch).equals(rawBtnText)) {
-                decoratedBtnText = rawBtnText + (!containsAddWord ? "" : "-" + downloadAddWord);
-                localBtnText = context.getString(R.string.launch_local);
-            } else if (context.getString(R.string.attempt).equals(rawBtnText)) {
-                decoratedBtnText = context.getString(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(R.string.install).equals(rawBtnText)) {
-                decoratedBtnText = context.getString(R.string.install);
-                localBtnText = context.getString(R.string.install_local);
-            } else if (context.getString(R.string.update).equals(rawBtnText)) {
-                decoratedBtnText = context.getString(R.string.update);
-                localBtnText = context.getString(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(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);
             }
         }
 
@@ -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,7 +452,7 @@ 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:
@@ -498,13 +466,11 @@ public class DetailDownloadUtils {
             case diskisfull:
             case diskioerror:
             case pause:
-                String pausedText = viewHolder.getContext().getString(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(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(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);
@@ -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);
 

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

@@ -633,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());
 
@@ -655,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));
@@ -685,12 +655,6 @@ 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) {

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

@@ -10,7 +10,6 @@ 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.common.constant.Config
 import com.gh.common.exposure.ExposureManager.log
@@ -19,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
@@ -42,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
@@ -64,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
@@ -77,6 +73,9 @@ 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.servers.GameServerTestActivity
 import com.gh.gamecenter.servers.GameServersActivity
@@ -96,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
@@ -111,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
@@ -149,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",
@@ -250,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")
@@ -281,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!!,
@@ -346,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
@@ -473,28 +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 -> {
-                val subjectType = if (linkEntity.type == ViewPagerFragmentHelper.TYPE_QQ_MINI_GAME_COLUMN) {
-                    SubjectData.SubjectType.QQ_GAME
-                } 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
                 )
             }
 
@@ -545,10 +536,6 @@ object DirectUtils {
                 }
             }
 
-            "wechat_game" -> linkEntity.link?.let {
-                MiniGameItemHelper.launchMiniGame(it, Constants.WECHAT_MINI_GAME)
-            }
-
             "" -> {
                 // do nothing
             }
@@ -787,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)
         }
@@ -855,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)
@@ -917,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, "【插件问题】")
         }
@@ -1013,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)
@@ -1415,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
      */
@@ -1922,7 +1935,7 @@ object DirectUtils {
     }
 
     @JvmStatic
-    fun directToMiniGameSearch(
+    fun directToQGameSearch(
         context: Context,
         hint: String,
         sourceEntrance: String,
@@ -1934,7 +1947,7 @@ object DirectUtils {
         searchBoxPattern: String = ""
     ) {
         context.startActivity(
-            MiniGameSearchActivity.getIntent(
+            QGameSearchActivity.getIntent(
                 context,
                 hint,
                 sourceEntrance,
@@ -1950,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
@@ -1974,40 +1988,25 @@ object DirectUtils {
             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)
+                .navigation() as IQGameProvider<*>
+            qGameProvider.setLoginInfo(activity, userId, userName, userToken)
+            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,
-    ) {
-
-        val wxApiProxy = WXAPIFactory.createWXAPI(
-            activity,
-            Config.WECHAT_APPID
-        )
-        if (!wxApiProxy.isWXAppInstalled) {
-            ToastUtils.toast("请安装微信客户端")
-            return
-        }
-
-        wxApiProxy.sendReq(
-            WXLaunchMiniProgram.Req().apply {
-                userName = wechatAppId
-                path = Constants.WECHAT_MINI_GAME_PCS
-                miniprogramType = WXLaunchMiniProgram.Req.MINIPTOGRAM_TYPE_RELEASE;
-            }
-        )
-
-        MiniGameRecentlyPlayUseCase.submitRecentPlayedWGame(wechatAppId, HaloApp.getInstance().gid)
-    }
-
     @JvmStatic
     fun directToMessageCenter(defaultTabIndex: Int) {
         ARouter.getInstance().build(RouteConsts.activity.messageWrapperActivity)
@@ -2083,7 +2082,7 @@ object DirectUtils {
                 )
             )
 
-            BottomTab.SearchStyle.TYPE_MINI_GAME -> directToMiniGameSearch(
+            BottomTab.SearchStyle.TYPE_QQ_MINI_GAME -> directToQGameSearch(
                 context,
                 "请输入小游戏关键词",
                 sourceEntrance,

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

@@ -27,6 +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
 import com.gh.gamecenter.common.callback.CancelListener
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.constant.EntranceConsts
@@ -37,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
@@ -247,8 +247,9 @@ object DownloadItemUtils {
             }
             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(R.string.off_shelve)
@@ -697,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()
@@ -843,11 +844,12 @@ object DownloadItemUtils {
             }
             return
         }
-        if (gameEntity.isMiniGame()) {
+        if (gameEntity.isQQMiniGame()) {
             downloadBtn.setOnClickListener {
-                MiniGameItemHelper.launchMiniGame(gameEntity.miniGameAppId, gameEntity.miniGameType)
-                clickCallback?.onCallback()
-                allStateClickCallback?.onCallback()
+                NewFlatLogUtils.logQGameClick(gameEntity.qqMiniGameAppId, gameEntity.name)
+                GlobalActivityManager.currentActivity?.let { activity ->
+                    DirectUtils.directToQGameById(activity, gameEntity.qqMiniGameAppId)
+                }
             }
             return
         }
@@ -910,7 +912,7 @@ object DownloadItemUtils {
                     addHandler(CheckStoragePermissionHandler())
                     addHandler(VersionNumberHandler())
                 }
-                    .setProcessEndCallback(gameEntity.id) { _, _ ->
+                    .setProcessEndCallback { _, _ ->
                         DownloadDialog.showDownloadDialog(view.context, gameEntity, traceEvent, entrance, location)
                     }
                     .buildHandlerChain()
@@ -953,7 +955,7 @@ 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()
@@ -972,7 +974,7 @@ 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()
@@ -991,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()
@@ -1004,7 +1006,7 @@ object DownloadItemUtils {
                     addHandler(DownloadDialogHelperHandler())
                     addHandler(CheckDownloadHandler())
                 }
-                    .setProcessEndCallback(gameEntity.id) { _, isSubscribe ->
+                    .setProcessEndCallback { _, isSubscribe ->
                         plugin(context, gameEntity, downloadBtn, entrance, location, isSubscribe as Boolean, traceEvent)
                     }
                     .buildHandlerChain()
@@ -1089,7 +1091,7 @@ object DownloadItemUtils {
             DownloadChainBuilder()
                 .apply {
                     addHandler(LandPageAddressHandler())
-                }.setProcessEndCallback(gameEntity.id) { asVGame, _ ->
+                }.setProcessEndCallback { asVGame, _ ->
                     DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk) {
                         DialogUtils.checkDownload(
                             context,
@@ -1162,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({

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

@@ -69,13 +69,11 @@ object DownloadObserver {
                     DownloadDataHelper.uploadDownloadEvent(downloadEntity)
                 }
 
-                val status = downloadEntity.status
-
-                if (DownloadStatus.hijack == status) {
+                if (DownloadStatus.hijack == downloadEntity.status) {
                     // 链接被劫持
                     processHijack(downloadEntity)
                     return
-                } else if (DownloadStatus.notfound == status) {
+                } else if (DownloadStatus.notfound == downloadEntity.status) {
                     // 404 Not Found
                     // 删除任务
                     downloadEntity.status = DownloadStatus.cancel
@@ -129,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)
@@ -140,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("网络不稳定，下载任务已暂停")
@@ -149,21 +150,17 @@ 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) {
                     // 未成年
                     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()
 
@@ -182,7 +179,7 @@ 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()
 
@@ -210,21 +207,21 @@ object DownloadObserver {
                     // 删除任务
                     downloadEntity.status = DownloadStatus.cancel
                     downloadManager.cancel(downloadEntity.url)
-                } else if (DownloadStatus.uncertificated == status) {
+                } else if (DownloadStatus.uncertificated == downloadEntity.status) {
                     // 未实名
                     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())
                         performDownloadCompleteAction(downloadEntity, downloadManager)
@@ -244,7 +241,7 @@ object DownloadObserver {
                 DownloadNotificationHelper.addOrUpdateDownloadNotification(downloadEntity)
 
                 // 如果已下载大小发生变化,表示成功恢复下载,则重置重试标记
-                if (status == DownloadStatus.downloading) {
+                if (downloadEntity.status == DownloadStatus.downloading) {
                     mRetryableHashMap[downloadEntity.url] = true
                 }
             }
@@ -502,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) {
@@ -537,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,

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) {

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>()

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

@@ -308,7 +308,7 @@ object GameUtils {
     }
 
     /**
-     * 是否默认以畅玩游戏的形式来处理
+     * 是否以畅玩游戏的形式来处理
      */
     @JvmStatic
     fun shouldPerformAsVGame(gameEntity: GameEntity): Boolean {

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

@@ -49,8 +49,13 @@ public class InstallUtils {
             @Override
             public void handleMessage(Message msg) {
                 if (msg.what == INSTALL_WHAT && packageManager != null) {
-                    List<String> packageNameList = PackageHelper.INSTANCE.getInstalledPackageNameList(context, 0);
-                    ArrayList<String> list = new ArrayList<>(packageNameList);
+                    ArrayList<String> list = new ArrayList<>();
+                    List<PackageInfo> packageInfos = PackageHelper.INSTANCE.getInstalledPackages(context, 0);
+                    for (PackageInfo packageInfo : packageInfos) {
+                        if ((packageInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 0) {
+                            list.add(packageInfo.packageName);
+                        }
+                    }
                     if (installMap != null && installMap.size() != 0) {
                         ArrayList<String> keys = new ArrayList<>();
                         for (String packageName : installMap.keySet()) {

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

@@ -768,10 +768,10 @@ public class LibaoUtils {
     }
 
     public static boolean isAppInstalled(Context context, String packageName) {
-        List<String> packageNameList = PackageHelper.INSTANCE.getInstalledPackageNameList(context, 0);
-        if (packageNameList != null) {
-            for (int i = 0; i < packageNameList.size(); i++) {
-                String pn = packageNameList.get(i);
+        List<PackageInfo> pinfo = PackageHelper.INSTANCE.getInstalledPackages(context, 0);
+        if (pinfo != null) {
+            for (int i = 0; i < pinfo.size(); i++) {
+                String pn = pinfo.get(i).packageName;
                 if (pn.equals(packageName)) {
                     return true;
                 }

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

@@ -734,6 +734,18 @@ public class LogUtils {
         LoghubUtils.log(object, LOG_STORE_EVENT, false);
     }
 
+    public static void logNewCatalogAppearanceEvent(String entrance, String key) {
+        logCatalogEvent("access_to_classification", entrance, key, -1, -1, -1, -1);
+    }
+
+    public static void logSubCatalogClickEvent(String entrance, String key, int seq1) {
+        logCatalogEvent("click_first_classification", entrance, key, seq1, -1, -1, -1);
+    }
+
+    public static void logSubCatalogContentClickEvent(String entrance, String key, int seq1, int seq2) {
+        logCatalogEvent("click_secondary_classification", entrance, key, seq1, seq2, -1, -1);
+    }
+
     public static void logSpecialCatalogContentClickEvent(String entrance, String key, int seq1, int seqContent) {
         logCatalogEvent("click_content", entrance, key, seq1, -1, seqContent, -1);
     }

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

@@ -30,9 +30,6 @@ object NewFlatLogUtils {
     private const val EVENT_LOGIN_FROM_GHZS_SHOW = "halo_fun_login_from_ghzs_show"
     private const val EVENT_LOGIN_FROM_GHZS_CLICK = "halo_fun_login_from_ghzs_click"
 
-    private const val EVENT_INSTALLED_LAUNCH_DIALOG_SHOW = "halo_fun_installed_launch_dialog_show"
-    private const val EVENT_INSTALLED_LAUNCH_DIALOG_CLICK = "halo_fun_installed_launch_dialog_click"
-
     private fun log(jsonObject: JSONObject, logStore: String = "event", uploadImmediately: Boolean = false) {
         Utils.log("NewFlatLogUtils", jsonObject.toString(4))
         LoghubUtils.log(jsonObject, logStore, uploadImmediately, true)
@@ -553,8 +550,6 @@ object NewFlatLogUtils {
     // 搜索-点击搜索榜单内容
     @JvmStatic
     fun logSearchClickRankDetail(
-        key: String,
-        rankType: String,
         rankName: String,
         rankSequence: String,
         linkId: String,
@@ -563,8 +558,6 @@ object NewFlatLogUtils {
     ) {
         val json = json {
             KEY_EVENT to "search_click_rank_detail"
-            "key" to key
-            "rank_type" to rankType
             "rank_name" to rankName
             "rank_sequence" to rankSequence
             "link_id" to linkId
@@ -2016,6 +2009,29 @@ object NewFlatLogUtils {
         log(json, "event", false)
     }
 
+    // vpn 弹窗显示
+    fun logVpnHintDialogShow(gameId: String, gameName: String) {
+        val json = json {
+            KEY_EVENT to "vpn_pre_access_dialog_show"
+            KEY_GAME_ID to gameId
+            KEY_GAME_NAME to gameName
+            parseAndPutMeta().invoke(this)
+        }
+        log(json, "event", false)
+    }
+
+    // vpn 弹窗点击
+    fun logVpnHintDialogClick(gameId: String, gameName: String, button: String) {
+        val json = json {
+            KEY_EVENT to "vpn_pre_access_dialog_click"
+            KEY_GAME_ID to gameId
+            KEY_GAME_NAME to gameName
+            "button" to button
+            parseAndPutMeta().invoke(this)
+        }
+        log(json, "event", false)
+    }
+
     // 谷歌框架弹窗显示
     fun logGAppsDialogShowed(gameId: String, gameName: String) {
         val json = json {
@@ -2586,6 +2602,17 @@ object NewFlatLogUtils {
         log(json)
     }
 
+    @JvmStatic
+    fun logQGameClick(qqGameId: String, qqGameName: String?) {
+        val json = json {
+            KEY_EVENT to "qq_game_click"
+            "qq_game_id" to qqGameId
+            "qq_game_name" to qqGameName ?: ""
+            parseAndPutMeta().invoke(this)
+        }
+        log(json)
+    }
+
     // 点击个人主页的认证文案事件
     @JvmStatic
     fun logClickAuthText(linkType: String, linkId: String, linkText: String, userId: String, text: String) {
@@ -2695,73 +2722,4 @@ object NewFlatLogUtils {
             parseAndPutMeta()(this)
         }.let(::log)
     }
-
-    fun logHaloFunInstalledLaunchDialogShow() {
-        json {
-            KEY_EVENT to EVENT_INSTALLED_LAUNCH_DIALOG_SHOW
-            parseAndPutMeta()(this)
-        }.let(::log)
-    }
-
-    fun logHaloFunInstalledLaunchDialogClick(
-        gameId: String,
-        gameName: String,
-        buttonType: String
-    ) {
-        json {
-            KEY_EVENT to EVENT_INSTALLED_LAUNCH_DIALOG_CLICK
-            "game_id" to gameId
-            "game_name" to gameName
-            "button_type" to buttonType
-            parseAndPutMeta()(this)
-        }.let(::log)
-    }
-
-    // 用户访问分流器
-    fun logByPassBrowsing(
-        source: String,
-        bypassName: String,
-        bypassId: String,
-        branchId: String,
-        branchName: String,
-        inProcessTime: Int,
-        bypassVisitTime: Int,
-        linkType: String,
-        linkId: String,
-        linkText: String,
-        bypassStatus: Int
-    ) {
-        json {
-            KEY_EVENT to "BypassBrowsing"
-            "source" to source
-            "bypass_name" to bypassName
-            "bypass_id" to bypassId
-            "branch_id" to branchId
-            "branch_name" to branchName
-            "inprocess_time" to inProcessTime
-            "bypass_visit_time" to bypassVisitTime
-            "link_type" to linkType
-            "link_id" to linkId
-            "link_text" to linkText
-            "bypass_status" to bypassStatus
-            parseAndPutMeta()(this)
-        }.let(::log)
-    }
-
-    // 分流失败
-    fun logFailByPass(
-        source: String,
-        bypassName: String,
-        bypassId: String,
-        defeatedReason: String
-    ) {
-        json {
-            KEY_EVENT to "FailBypass"
-            "source" to source
-            "bypass_name" to bypassName
-            "bypass_id" to bypassId
-            "defeated_reason" to defeatedReason
-            parseAndPutMeta()(this)
-        }.let(::log)
-    }
 }

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

@@ -4,18 +4,11 @@ import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
 import com.gh.download.DownloadManager
 import com.gh.download.PackageObserver
-import com.gh.gamecenter.DownloadManagerActivity
 import com.gh.gamecenter.common.utils.NewFlatLogUtils
 import com.gh.gamecenter.common.utils.SensorsBridge
-import com.gh.gamecenter.core.utils.CurrentActivityHolder
 import com.gh.gamecenter.eventbus.EBPackage
-import com.gh.gamecenter.feature.entity.GameEntity
-import com.gh.gamecenter.hud.HeadUpDisplayHelper
 import com.gh.gamecenter.manager.PackagesManager
 import com.gh.gamecenter.packagehelper.PackageRepository
-
-import com.gh.gamecenter.R
-import com.gh.gamecenter.hud.HeadUpDisplayLogHelper
 import com.lightgame.utils.Utils
 import org.greenrobot.eventbus.EventBus
 
@@ -28,10 +21,8 @@ object PackageChangeHelper : DefaultLifecycleObserver {
     private const val UPDATE_PENDING = 3
 
     // <包名，pending 类型，应用版本> Triple
-    private var pendingPackageTriple: Triple<String, Int, String>? = null
-    private var pendingGhId: String? = null
-
-    private var pendingHUDShowed: Boolean = false
+    private var pendingPackagePair: Triple<String, Int, String>? = null
+    private var pendingGhId: String ? = null
 
     /**
      * 添加一个等待中，待确定是否已成功安装的应用
@@ -41,9 +32,7 @@ object PackageChangeHelper : DefaultLifecycleObserver {
 
         if (installData == null) {
             Utils.log(TAG, "添加了: $packageName 包名等待安装成功")
-
-            pendingHUDShowed = false
-            pendingPackageTriple = Triple(packageName, INSTALL_PENDING, "")
+            pendingPackagePair = Triple(packageName, INSTALL_PENDING, "")
         } else {
             Utils.log(TAG, "添加了: $packageName 包名等待安装更新成功")
 
@@ -54,62 +43,42 @@ object PackageChangeHelper : DefaultLifecycleObserver {
                 pendingGhId = ghId.toString()
             }
 
-            pendingHUDShowed = false
-            pendingPackageTriple = Triple(packageName, UPDATE_PENDING, installData.version)
+            pendingPackagePair = Triple(packageName, UPDATE_PENDING, installData.version)
         }
     }
 
-    fun isInstallPendingPackage(packageName: String): Boolean {
-        return pendingPackageTriple?.first == packageName
-    }
-
     /**
      * 添加一个等待中，待确定是否已成功卸载的应用
      */
     fun addUninstallPendingPackage(packageName: String) {
         Utils.log(TAG, "添加了: $packageName 包名等待卸载成功")
-        pendingPackageTriple = Triple(packageName, UNINSTALL_PENDING, "")
+        pendingPackagePair = Triple(packageName, UNINSTALL_PENDING, "")
     }
 
     override fun onResume(owner: LifecycleOwner) {
         super.onResume(owner)
 
-        if (pendingPackageTriple != null) {
-            val packageName = pendingPackageTriple?.first ?: return
-            val isInstallPending = pendingPackageTriple?.second == INSTALL_PENDING
-            val isUninstallPending = pendingPackageTriple?.second == UNINSTALL_PENDING
-            val isUpdatePending = pendingPackageTriple?.second == UPDATE_PENDING
+        if (pendingPackagePair != null) {
+            val packageName = pendingPackagePair?.first ?: return
+            val isInstallPending = pendingPackagePair?.second == INSTALL_PENDING
+            val isUninstallPending = pendingPackagePair?.second == UNINSTALL_PENDING
+            val isUpdatePending = pendingPackagePair?.second == UPDATE_PENDING
 
-            val pendingVersion = pendingPackageTriple?.third ?: ""
+            val pendingVersion = pendingPackagePair?.third ?: ""
 
             val installedVersionName = PackageUtils.getVersionNameByPackageName(packageName)
             val isInstalled = installedVersionName != null
 
-            if (isInstallPending) {
-                if (isInstalled) {
-                    pendingPackageTriple = null
-                    pendingGhId = null
-
-                    PackageRepository.addInstalledGame(PackageRepository.packageFilterManager, packageName)
-
-                    // 添加到额外的包名白名单，下次启动同时查询此包的安装情况
-                    PackageHelper.updateAdditionalWhiteListPackageName(packageName = packageName, isAdd = true)
-
-                    performInstallSuccessAction(packageName)
-                } else {
-                    // 任务不存在了，将等待更新安装结果的 triple 置为 null
-                    if (DownloadManager.getInstance().getDownloadEntitySnapshotByPackageName(packageName) == null) {
-                        pendingPackageTriple = null
-                    } else {
-                        showHUDIfNeeded(packageName)
-                    }
-                }
-            } else if (isUninstallPending && !isInstalled) {
-                pendingPackageTriple = null
+            if (isInstallPending && isInstalled) {
+                pendingPackagePair = null
                 pendingGhId = null
 
-                // 从额外的包名白名单移除，下次启动时不再查询此包的安装情况
-                PackageHelper.updateAdditionalWhiteListPackageName(packageName = packageName, isAdd = false)
+                PackageRepository.addInstalledGame(packageName)
+
+                performInstallSuccessAction(packageName)
+            } else if (isUninstallPending && !isInstalled) {
+                pendingPackagePair = null
+                pendingGhId = null
 
                 performUninstallSuccessAction(packageName)
             } else if (isUpdatePending) {
@@ -119,78 +88,30 @@ object PackageChangeHelper : DefaultLifecycleObserver {
                     !pendingGhId.isNullOrEmpty() && pendingGhId != PackageUtils.getGhId(packageName).toString()
                 }
 
-                pendingPackageTriple = null
+                pendingPackagePair = null
                 pendingGhId = null
 
                 if (isUpdateValid) {
                     performUninstallSuccessAction(packageName)
                     performInstallSuccessAction(packageName)
-                } else {
-                    // 任务不存在了，将等待更新安装结果的 triple 置为 null
-                    if (DownloadManager.getInstance().getDownloadEntitySnapshotByPackageName(packageName) == null) {
-                        pendingPackageTriple = null
-                    } else {
-                        showHUDIfNeeded(packageName)
-                    }
                 }
-
-                // 添加到额外的包名白名单，下次启动同时查询此包的安装情况
-                PackageHelper.updateAdditionalWhiteListPackageName(packageName = packageName, isAdd = true)
             }
         }
     }
 
-    private fun showHUDIfNeeded(packageName: String) {
-        if (pendingHUDShowed) return
-
-        val downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshotByPackageName(packageName) ?: return
-        val activity = CurrentActivityHolder.getCurrentActivity() ?: return
-        if (activity is DownloadManagerActivity) return
-
-        pendingHUDShowed = true
-        HeadUpDisplayHelper.showHUD(activity,
-            downloadEntity.icon ?: "",
-            activity.getString(R.string.hud_has_pending_install_game),
-            activity.getString(R.string.hud_head_to_download_manager),
-            showingCallback = {
-                HeadUpDisplayLogHelper.trackInstallationShow(downloadEntity, "游戏下载")
-            },
-            clickedCallback = {
-                DirectUtils.directToDownloadManager(activity, "HUD")
-                HeadUpDisplayLogHelper.trackInstallationClick(downloadEntity, "游戏下载")
-            })
+    fun addInstall(packageName: String) {
+        performInstallSuccessAction(packageName)
     }
 
-    /**
-     * 对外暴露的方法，用于添加一个安装成功的应用
-     * @param packageName 包名
-     * @param cachedGameEntity 缓存的 GameEntity，用于快速更新状态
-     */
-    fun addInstall(packageName: String, cachedGameEntity: GameEntity? = null) {
-        performInstallSuccessAction(packageName, cachedGameEntity)
-    }
-
-    /**
-     * 对外暴露的方法，用于添加一个卸载成功的应用
-     * @param packageName 包名
-     * @param cachedGameEntity 缓存的 GameEntity，用于快速更新状态
-     */
-    fun addUpdate(packageName: String, cachedGameEntity: GameEntity? = null) {
+    fun addUpdate(packageName: String) {
         performUninstallSuccessAction(packageName)
-        performInstallSuccessAction(packageName, cachedGameEntity)
+        performInstallSuccessAction(packageName)
     }
 
     /**
      * 对应包名安装成功后的操作，继承至 PackageChangeBroadcastObserver
-     * @param packageName 包名
-     * @param cachedGameEntity 缓存的 GameEntity，用于快速更新状态
-     * @param withLog 是否需要记录日志
      */
-    private fun performInstallSuccessAction(
-        packageName: String,
-        cachedGameEntity: GameEntity? = null,
-        withLog: Boolean = true
-    ) {
+    private fun performInstallSuccessAction(packageName: String, withLog: Boolean = true) {
         Utils.log(TAG, "安装了: $packageName 包名的程序")
         val downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshotByPackageName(packageName)
         val gameId = if (downloadEntity != null && downloadEntity.gameId != null) downloadEntity.gameId else ""
@@ -207,7 +128,7 @@ object PackageChangeHelper : DefaultLifecycleObserver {
         val versionName = PackageUtils.getVersionNameByPackageName(packageName)
         val installEb = EBPackage(EBPackage.TYPE_INSTALLED, packageName, versionName)
 
-        PackageObserver.onPackageChanged(installEb, cachedGameEntity)
+        PackageObserver.onPackageChanged(installEb)
         EventBus.getDefault().post(installEb)
     }
 

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

@@ -2,29 +2,28 @@ package com.gh.common.util
 
 import android.annotation.SuppressLint
 import android.content.Context
+import android.content.pm.ApplicationInfo
 import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import android.content.pm.PermissionInfo
 import android.os.Build
-import android.os.Process
 import android.provider.Settings
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import com.gh.common.constant.Config
+import com.gh.common.prioritychain.GlobalPriorityChainHelper
+import com.gh.common.prioritychain.RequestInstalledListPermissionHandler
 import com.gh.gamecenter.common.retrofit.BiResponse
 import com.gh.gamecenter.common.utils.DialogHelper
 import com.gh.gamecenter.common.utils.PermissionHelper
+import com.gh.gamecenter.common.utils.PermissionHelper.isGetInstalledListPermissionDisabled
 import com.gh.gamecenter.common.utils.SensorsBridge
-import com.gh.gamecenter.common.utils.toJson
-import com.gh.gamecenter.common.utils.toObject
-import com.gh.gamecenter.core.GHThreadFactory
+import com.gh.gamecenter.core.runOnIoThread
 import com.gh.gamecenter.core.runOnUiThread
 import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.entity.WhitePackageListEntity
-import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.entity.SettingsEntity
-import com.gh.gamecenter.feature.utils.SentryHelper
 import com.gh.gamecenter.manager.PackagesManager
 import com.gh.gamecenter.packagehelper.PackageRepository
 import com.gh.gamecenter.retrofit.RetrofitManager
@@ -32,8 +31,9 @@ import com.halo.assistant.HaloApp
 import com.lightgame.utils.Utils
 import io.reactivex.schedulers.Schedulers
 import kotlinx.coroutines.*
-import java.util.HashMap
-import java.util.concurrent.Executors
+import java.io.BufferedReader
+import java.io.IOException
+import java.io.InputStreamReader
 import kotlin.collections.ArrayList
 import kotlin.collections.HashSet
 
@@ -41,16 +41,7 @@ object PackageHelper {
 
     private const val TAG = "PackageHelper"
 
-    private const val SP_GET_INSTALLED_PACKAGES_AGREED = "get_installed_packages_agreed" // 用户是否同意使用已安装应用列表 API
-
-    private const val SP_GET_INSTALLED_PACKAGES_BY_ALTERNATIVE_API =
-        "get_installed_packages_by_alternative_api" // 是否使用另类方式获取已安装应用列表
-
-    private const val SP_USER_USED_GET_INSTALLED_API_SWITCH_PACKAGE =
-        "user_used_get_installed_api_switch_package" // 用户是否使用过含有已安装应用列表获取开关的包
-
-    private const val SP_ADDITIONAL_WHITELIST_PACKAGE_NAME_LIST =
-        "additional_whitelist_package_name_list" // 额外的白名单包名列表 (曾经更正为已安装的包名列表)
+    private const val SP_GET_INSTALLED_API_AGREED = "get_installed_api_agreed"
 
     private const val UNKNOWN = -1
     private const val UNSUPPORTED = 0
@@ -59,50 +50,32 @@ object PackageHelper {
     private const val ENABLED = 2
     private const val DISABLED = 3
 
-    private var lastSuccessfullyGetInstalledPackagesTimeMills = 0L
-    private var cachedInstalledPackageInfoList: List<PackageInfo> = arrayListOf() // 缓存的已安装应用列表
-    private var cachedInstalledPackageNameList: List<String> = arrayListOf() // 缓存的已安装应用包名列表
-    private var additionalWhiteListPackageNameSet: HashSet<String> = hashSetOf()
+    private var lastInstalledPackageListTime = 0L
+    private var cachedInstalledPackagesList: List<PackageInfo> = arrayListOf()
 
-    private var isGetInstalledPackagesAgreed = false // 用户是否已经同意使用已安装应用列表
-    private var isGetInstalledPackagesAgreedRequired = UNKNOWN // 需要用户手动授权才获取已安装应用列表的功能的开关
+    private var isGetInstalledPackagesApiAgreed = true // 用户是否已经同意使用已安装应用列表 API
+    private var isGetInstalledPackagesApiAgreedRequired = DISABLED // 需要用户手动授权才获取已安装应用列表的功能的开关
     private var isGetInstalledPackagesPermissionSupported = UNKNOWN // 设备是否支持禁用获取已安装应用列表
 
-    private var useAlternativeWayToGetInstalledPackages = false
-
-    private var cachedPkgNameAndGameEntityMap = HashMap<String, GameEntity>() // 缓存的状态异常包名和游戏实体的映射 （用于免接口请求更新状态）
-
-    private val packageExecutor by lazy { Executors.newSingleThreadExecutor(GHThreadFactory("GH_PACKAGE_THREAD")) }
-
-    private var uploadUIDGapLog = true
-
-    // 光环运行的环境是否为默认的 UID (0)
-    private val isRunningOnDefaultUid by lazy {  Process.myUid() / 100000 == 0 }
-
     // 评论黑名单包名列表，避免用户安装了 Xposed Installer 这样的工具，也能在包含该安装包的游戏详情页评论
     private var _commentPackageNameBlackList = arrayListOf<String>()
-    val commentPackageNameBlackList: ArrayList<String>
-        get() = _commentPackageNameBlackList
+    val commentPackageNameBlackList: ArrayList<String> = _commentPackageNameBlackList
 
     // 关闭下载的包列表
     private var _downloadPackageNameBlackList = arrayListOf<String>()
-    val downloadPackageNameBlackList: ArrayList<String>
-        get() = _downloadPackageNameBlackList
+    val downloadPackageNameBlackList: ArrayList<String> = _downloadPackageNameBlackList
 
     // 本地已安装的包去掉关闭下载的包后的列表
     private var _validLocalPackageNameSet = hashSetOf<String>()
-    val validLocalPackageNameSet: HashSet<String>
-        get() = _validLocalPackageNameSet
+    val validLocalPackageNameSet: HashSet<String> = _validLocalPackageNameSet
 
     // 游戏包名匹配列表
     private var _relatedPackageList = arrayListOf<SettingsEntity.GameWithPackages>()
-    val relatedPackageList: ArrayList<SettingsEntity.GameWithPackages>
-        get() = _relatedPackageList
+    val relatedPackageList: ArrayList<SettingsEntity.GameWithPackages> = _relatedPackageList
 
     // 接口控制的已安装应用列表获取开关状态 (UI 显示)
     private var _installedPackageApiSwitchStatusLiveData = MutableLiveData<Boolean>()
-    val installedPackageApiSwitchStatusLiveData: LiveData<Boolean>
-        get() = _installedPackageApiSwitchStatusLiveData
+    val installedPackageApiSwitchStatusLiveData: LiveData<Boolean> = _installedPackageApiSwitchStatusLiveData
 
     // 本地已安装包的列表
     var localPackageNameSet = hashSetOf<String>()
@@ -116,61 +89,16 @@ object PackageHelper {
         }
 
     /**
-     * 检查是否需要忽略接口控制的已安装应用列表获取开关
-     * 用于覆盖安装首次启动时的检查 https://jira.shanqu.cc/browse/GHZSCY-5694
-     */
-    fun checkIfGetInstalledApiSwitchShouldBeIgnored(context: Context) {
-        val userHasUsedGetInstalledApiSwitchPackage =
-            SPUtils.getBoolean(SP_USER_USED_GET_INSTALLED_API_SWITCH_PACKAGE, false)
-        if (!userHasUsedGetInstalledApiSwitchPackage) {
-            val isSupportGetInstalledAppsPermission = isSupportGetInstalledAppsPermission(context)
-
-            if (!isSupportGetInstalledAppsPermission) {
-                if (isRunningOnDefaultUid) {
-                    // 设备不支持动态管理获取已安装应用列表，忽略接口控制，使用另类方式获取已安装应用列表
-                    updateUseAlternativeWayToGetInstalledPackages()
-                }
-                onGetInstalledPackagesAgreed()
-            } else if (!PermissionHelper.isGetInstalledListPermissionDisabled(context)) {
-                if (isRunningOnDefaultUid) {
-                    // 设备支持动态管理获取已安装应用列表但已经授权，忽略接口控制，使用另类方式获取已安装应用列表
-                    updateUseAlternativeWayToGetInstalledPackages()
-                }
-                onGetInstalledPackagesAgreed()
-            }
-
-            SPUtils.getBoolean(SP_USER_USED_GET_INSTALLED_API_SWITCH_PACKAGE, true)
-        }
-    }
-
-    /**
-     * 获取包名白名单列表（为了在没有已安装应用列表获取能力的时候也能正常判断更新、插件化）
-     * @param additionalWhiteList 额外的已安装白名单
+     * 获取已安装的白名单列表（为了在没有已安装应用列表获取能力的时候也能正常判断更新、插件化）
      */
     @SuppressLint("CheckResult")
-    fun getPackagesWhiteList(additionalWhiteList: HashSet<String>) {
+    fun getInstalledWhiteList() {
         RetrofitManager.getInstance().newApi.installWhitelist
             .subscribeOn(Schedulers.io())
             .subscribe(object : BiResponse<WhitePackageListEntity>() {
                 override fun onSuccess(data: WhitePackageListEntity) {
-                    val installedWhiteList = hashSetOf<String>()
-
-                    if (additionalWhiteList.isNotEmpty()) {
-                        installedWhiteList.addAll(additionalWhiteList)
-                    }
-
                     data.data?.let {
-                        installedWhiteList.addAll(it)
-                    }
-
-                    addInstalledButMissingPackages(installedWhiteList)
-                }
-
-                override fun onFailure(exception: Exception) {
-                    super.onFailure(exception)
-
-                    if (additionalWhiteList.isNotEmpty()) {
-                        addInstalledButMissingPackages(additionalWhiteList)
+                        addInstalledButMissingPackages(it)
                     }
                 }
             })
@@ -183,7 +111,7 @@ object PackageHelper {
     }
 
     @JvmStatic
-    fun refreshPackageNameList() {
+    fun refreshList() {
         Config.getSettings()?.gameCommentBlackList?.let { _commentPackageNameBlackList = ArrayList(it) }
         Config.getSettings()?.gameDownloadBlackList?.let { _downloadPackageNameBlackList = ArrayList(it) }
         Config.getSettings()?.gamePackageMatch?.let { _relatedPackageList = ArrayList(it) }
@@ -202,10 +130,12 @@ object PackageHelper {
     private fun getAllPackageName(context: Context): HashSet<String> {
         val set = HashSet<String>()
         return try {
-            val packageNameList = getInstalledPackageNameList(context, 0)
-            for (packageName in packageNameList) {
-                if (context.packageName != packageName) {
-                    set.add(packageName)
+            val packageInfos = getInstalledPackages(context, 0)
+            for (packageInfo in packageInfos) {
+                if (packageInfo.applicationInfo.flags and ApplicationInfo.FLAG_SYSTEM == 0) {
+                    if (context.packageName != packageInfo.packageName) {
+                        set.add(packageInfo.packageName)
+                    }
                 }
             }
             set
@@ -219,17 +149,17 @@ object PackageHelper {
      * 弃用已安装列表缓存
      */
     fun dumpInstalledListCache() {
-        lastSuccessfullyGetInstalledPackagesTimeMills = 0
+        lastInstalledPackageListTime = 0
     }
 
     /**
-     * 在超时后，若后台没有开启获取已安装应用列表的功能，回落到以接口不控制的方式获取已安装应用列表
+     * 在超时后，若后台没有开启获取已安装应用列表的功能，默认以接口不控制的方式获取已安装应用列表
      */
-    fun ignoreInstalledPackageApiSwitchAfterTimeout(timeout: Long) {
+    fun fallbackInstalledPackageApiSwitchAfterTimeout(timeout: Long) {
         CoroutineScope(SupervisorJob()).launch {
             delay(timeout)
-            if (isGetInstalledPackagesAgreedRequired == UNKNOWN && !isGetInstalledPackagesAgreed()) {
-                Utils.log(TAG, "后台没有开启获取已安装应用列表的功能，超时后回落到以接口不控制的方式获取已安装应用列表")
+            if (isGetInstalledPackagesApiAgreedRequired == UNKNOWN) {
+                Utils.log(TAG, "后台没有开启获取已安装应用列表的功能，超时后默认以接口不控制的方式获取已安装应用列表")
                 updateIsGetInstalledPackagesApiAgreedRequired(false)
             }
         }
@@ -239,44 +169,24 @@ object PackageHelper {
      *  更新已安装应用列表获取开关状态
      */
     fun updateIsGetInstalledPackagesApiAgreedRequired(isEnabled: Boolean) {
-        Utils.log(TAG, "updateIsGetInstalledPackagesApiAgreedRequired 入参为 $isEnabled")
-
-        // 状态不变，无需更新
-        if ((isEnabled == true && isGetInstalledPackagesAgreedRequired == ENABLED)
-            || (isEnabled == false && isGetInstalledPackagesAgreedRequired == DISABLED)
-        ) {
-            Utils.log(TAG, "isGetInstalledPackagesApiAgreedRequired 状态不变，无需更新")
-            return
-        }
-
-        // 若用户已经同意使用了，无需更新
-        if (isGetInstalledPackagesAgreed()) {
-            Utils.log(TAG, "用户已经同意使用了，无需再更新已安装应用列表获取开关状态")
+        // 若状态不为 unknown 或者用户已经同意使用了，无需再更新
+        if (isGetInstalledPackagesApiAgreedRequired != UNKNOWN || isGetInstalledPackagesApiAgreed()) {
+            Utils.log(TAG, "installedPackageApiSwitchStatus 不为 UNKNOWN，无需再更新")
             return
         }
 
         if (isEnabled) {
-            Utils.log(TAG, "开启获取已安装应用列表限制")
-
-            additionalWhiteListPackageNameSet =
-                SPUtils.getString(SP_ADDITIONAL_WHITELIST_PACKAGE_NAME_LIST).toObject() ?: hashSetOf()
-
-            Utils.log(TAG, "额外的白名单为 $additionalWhiteListPackageNameSet")
-
-            getPackagesWhiteList(additionalWhiteListPackageNameSet)
+            getInstalledWhiteList()
             _installedPackageApiSwitchStatusLiveData.postValue(true)
-            isGetInstalledPackagesAgreedRequired = ENABLED
+            isGetInstalledPackagesApiAgreedRequired = ENABLED
         } else {
-            Utils.log(TAG, "不开启获取已安装应用列表限制")
+            isGetInstalledPackagesApiAgreedRequired = DISABLED
 
-            isGetInstalledPackagesAgreedRequired = DISABLED
-
-            if (isRunningOnDefaultUid) {
-                // 启用另类获取已安装应用列表的 API
-                updateUseAlternativeWayToGetInstalledPackages()
+            if (isSupportGetInstalledAppsPermission(HaloApp.getInstance())) {
+                GlobalPriorityChainHelper.queueNewHandler(RequestInstalledListPermissionHandler())
+            } else {
+                agreeOnGetInstalledPackagesApi()
             }
-
-            onGetInstalledPackagesAgreed()
         }
     }
 
@@ -284,96 +194,66 @@ object PackageHelper {
      * 用户是否已经允许了调用获取已安装应用列表接口
      * 优先用内存的值，没有再从 SP 中获取并更新
      */
-    fun isGetInstalledPackagesAgreed(): Boolean {
-        return isGetInstalledPackagesAgreed
-                || (SPUtils.getBoolean(SP_GET_INSTALLED_PACKAGES_AGREED).also { isGetInstalledPackagesAgreed = it })
+    fun isGetInstalledPackagesApiAgreed(): Boolean {
+        return isGetInstalledPackagesApiAgreed
+                || (SPUtils.getBoolean(SP_GET_INSTALLED_API_AGREED).also { isGetInstalledPackagesApiAgreed = it })
+    }
+
+    fun isGetInstalledPackagesApiAgreedRequired(): Boolean {
+        return isGetInstalledPackagesApiAgreedRequired == ENABLED
     }
 
     /**
-     * 用户是否已经使用另类方式获取已安装应用列表
+     * 同意使用已安装应用列表 API
      */
-    private fun isUseAlternativeWayToGetInstalledPackages(): Boolean {
-        return useAlternativeWayToGetInstalledPackages
-                || (SPUtils.getBoolean(SP_GET_INSTALLED_PACKAGES_BY_ALTERNATIVE_API)
-            .also { useAlternativeWayToGetInstalledPackages = it })
-    }
+    private fun agreeOnGetInstalledPackagesApi() {
+        isGetInstalledPackagesApiAgreed = true
+        SPUtils.setBoolean(SP_GET_INSTALLED_API_AGREED, true)
 
-    private fun updateUseAlternativeWayToGetInstalledPackages() {
-        // 启用另类获取已安装应用列表的 API
-        useAlternativeWayToGetInstalledPackages = true
-        SPUtils.setBoolean(SP_GET_INSTALLED_PACKAGES_BY_ALTERNATIVE_API, true)
-    }
-
-    fun isGetInstalledPackagesAgreedRequired(): Boolean {
-        return isGetInstalledPackagesAgreedRequired == ENABLED
+        _installedPackageApiSwitchStatusLiveData.postValue(false)
     }
 
     /**
      * 获取已安装应用列表
      */
-    fun getInstalledPackageInfoList(context: Context?, flags: Int): List<PackageInfo> {
-        return getInstalledListInternal(context, flags, false).first
-    }
-
-    /**
-     * 获取已安装应用包名列表
-     */
-    fun getInstalledPackageNameList(context: Context?, flags: Int): List<String> {
-        return getInstalledListInternal(context, flags, true).second
-    }
-
-    private fun getInstalledListInternal(context: Context?,
-                                         flags: Int,
-                                         packageNameOnly: Boolean): Pair<List<PackageInfo>, List<String>> {
-        Utils.log(TAG, "即将获取已安装应用列表，仅获取包名 $packageNameOnly")
+    fun getInstalledPackages(context: Context?, flags: Int): List<PackageInfo> {
+        Utils.log(TAG, "即将获取已安装应用列表")
 
         // 用户未同意使用已安装应用列表 API，返回空列表
-        if (!isGetInstalledPackagesAgreed()) {
+        if (!isGetInstalledPackagesApiAgreed()) {
             Utils.log(TAG, "用户未同意使用已安装应用列表 API，返回空列表")
-            return Pair(cachedInstalledPackageInfoList, cachedInstalledPackageNameList)
+            return cachedInstalledPackagesList
         }
 
         // 简单 debounce 过于频繁的获取已安装应用列表调用
-        if (System.currentTimeMillis() - lastSuccessfullyGetInstalledPackagesTimeMills < 20 * 1000) {
-            // 时间间隔合适且对应的列表不为空，直接返回对应的缓存列表数据
-            if ((packageNameOnly && cachedInstalledPackageNameList.isNotEmpty())
-                || (!packageNameOnly && cachedInstalledPackageInfoList.isNotEmpty())
-            ) {
-                Utils.log(TAG, "使用了缓存的已安装应用列表")
-                return Pair(cachedInstalledPackageInfoList, cachedInstalledPackageNameList)
-            }
+        if (System.currentTimeMillis() - lastInstalledPackageListTime < 3000 && cachedInstalledPackagesList.isNotEmpty()) {
+            Utils.log(TAG, "使用了缓存的已安装应用列表")
+            return cachedInstalledPackagesList
         }
 
         var shouldGetNewInstalledPackagedList = false
 
         // 当前设备是否支持限制获取已安装应用列表的功能
         if (isSupportGetInstalledAppsPermission(context!!)) {
-            Utils.log(TAG, "当前设备支持动态管理获取已安装应用列表的功能")
+            Utils.log(TAG, "当前设备支持限制获取已安装应用列表的功能")
             // 当前设备是否支持禁用了获取已安装应用列表
-            if (!PermissionHelper.isGetInstalledListPermissionDisabled(context)) {
-                Utils.log(TAG, "当前设备支持动态管理但没有限制获取已安装应用列表的功能")
+            if (!isGetInstalledListPermissionDisabled(context)) {
+                Utils.log(TAG, "当前设备没有限制获取已安装应用列表的功能")
                 shouldGetNewInstalledPackagedList = true
             } else {
-                Utils.log(TAG, "当前设备支持动态管理且已限制获取已安装应用列表的功能")
+                Utils.log(TAG, "当前设备已限制获取已安装应用列表的功能")
             }
         } else {
-            Utils.log(TAG, "当前设备不支持动态管理获取已安装应用列表的功能")
+            Utils.log(TAG, "当前设备不支持限制获取已安装应用列表的功能")
             shouldGetNewInstalledPackagedList = true
         }
 
         if (shouldGetNewInstalledPackagedList) {
-            lastSuccessfullyGetInstalledPackagesTimeMills = System.currentTimeMillis()
-
-            if (packageNameOnly) {
-                cachedInstalledPackageNameList = getInstalledPackageNameListInternal(context, flags)
-                Utils.log(TAG, "获取已安装应用列表成功，数量为 ${cachedInstalledPackageNameList.size}")
-            } else {
-                cachedInstalledPackageInfoList = getInstalledPackageInfoListInternal(context, flags)
-                Utils.log(TAG, "获取已安装应用列表成功，数量为 ${cachedInstalledPackageInfoList.size}")
-            }
+            lastInstalledPackageListTime = System.currentTimeMillis()
+            cachedInstalledPackagesList = getInstalledPackagesInternal(context, flags)
         }
 
-        return Pair(cachedInstalledPackageInfoList, cachedInstalledPackageNameList)
+        return cachedInstalledPackagesList
     }
 
     /**
@@ -385,10 +265,18 @@ object PackageHelper {
         resultClosure: (Boolean) -> Unit
     ) {
 
+        val globalOnPermissionGrantedClosure = {
+            agreeOnGetInstalledPackagesApi()
+            // 进行包名初始化相关的操作
+            PackageRepository.initData()
+            refreshLocalPackageList()
+            refreshList()
+        }
+
         if (isSupportGetInstalledAppsPermission(activity)) {
-            // 若系统已经授予了获取应用列表的权限，直接执行授权成功回调
-            if (!PermissionHelper.isGetInstalledListPermissionDisabled(activity)) {
-                onGetInstalledPackagesAgreed()
+            // 若系统已经授予了获取应用列表的权限，直接进行授权成功回调
+            if (!isGetInstalledListPermissionDisabled(activity)) {
+                globalOnPermissionGrantedClosure.invoke()
                 resultClosure.invoke(true)
                 return
             }
@@ -400,7 +288,7 @@ object PackageHelper {
             ) { isGranted ->
                 if (isGranted) {
                     SensorsBridge.trackInstalledListPermissionsResult("成功")
-                    onGetInstalledPackagesAgreed()
+                    globalOnPermissionGrantedClosure.invoke()
                     resultClosure.invoke(true)
 
                     trackInstalledListAfterDelay()
@@ -427,7 +315,7 @@ object PackageHelper {
                 cancelText = "拒绝",
                 confirmClickCallback = {
                     SensorsBridge.trackInstalledListPermissionsCustomClick("开启")
-                    onGetInstalledPackagesAgreed()
+                    globalOnPermissionGrantedClosure.invoke()
                     resultClosure.invoke(true)
 
                     trackInstalledListAfterDelay()
@@ -444,28 +332,6 @@ object PackageHelper {
         }
     }
 
-    /**
-     * 执行用户授权获取已安装应用列表的操作
-     */
-    private fun onGetInstalledPackagesAgreed() {
-        isGetInstalledPackagesAgreed = true
-        SPUtils.setBoolean(SP_GET_INSTALLED_PACKAGES_AGREED, true)
-
-        _installedPackageApiSwitchStatusLiveData.postValue(false)
-
-        // 进行包名初始化相关的操作
-        initPackageRelatedData()
-    }
-
-    /**
-     * 进行包名初始化相关的操作
-     */
-    fun initPackageRelatedData() {
-        PackageRepository.initData()
-        refreshLocalPackageList()
-        refreshPackageNameList()
-    }
-
     /**
      * 延迟5秒后上报已安装应用列表
      */
@@ -480,11 +346,6 @@ object PackageHelper {
      * 是否支持动态获取已安装应用列表权限
      */
     fun isSupportGetInstalledAppsPermission(context: Context): Boolean {
-        if (isUseAlternativeWayToGetInstalledPackages()) {
-            // 已经使用另类获取已安装应用列表形式，强制判定为不支持动态获取已安装应用列表权限
-            return false
-        }
-
         // 若存在缓存，直接返回缓存结果。
         if (isGetInstalledPackagesPermissionSupported != UNKNOWN) {
             return isGetInstalledPackagesPermissionSupported != UNSUPPORTED
@@ -529,96 +390,61 @@ object PackageHelper {
         val installedPackageNameSet: HashSet<String> = hashSetOf()
 
         for (packageName in packageNameSet) {
-            val installedPkgNameExistInMemory = PackagesManager.isInstalled(packageName)
-            val packageNameInstalledOnDevice = PackageUtils.getVersionNameByPackageName(packageName) != null
-
-            if (!installedPkgNameExistInMemory && packageNameInstalledOnDevice) {
+            if (!PackagesManager.isInstalled(packageName)
+                && PackageUtils.getVersionNameByPackageName(packageName) != null
+            ) {
                 installedPackageNameSet.add(packageName)
             }
-
-            if (!packageNameInstalledOnDevice) {
-                additionalWhiteListPackageNameSet.remove(packageName)
-            }
         }
 
-        SPUtils.setString(SP_ADDITIONAL_WHITELIST_PACKAGE_NAME_LIST, additionalWhiteListPackageNameSet.toJson())
-
         Utils.log(TAG, "addInstalledButMissingPackages 需要请求接口获取的包数量为 ${installedPackageNameSet.size}")
 
         PackageRepository.addInstalledGames(
-            packageFilterManager = PackageRepository.packageFilterManager,
             pkgNameList = ArrayList(installedPackageNameSet),
             updateInstallStatus = true
         )
     }
 
-    /**
-     * 更新额外的白名单包名列表
-     * @param packageName 包名
-     * @param isAdd 是否添加
-     */
-    fun updateAdditionalWhiteListPackageName(packageName: String, isAdd: Boolean) {
-        val isUpdated = if (isAdd) {
-            additionalWhiteListPackageNameSet.add(packageName)
-        } else {
-            additionalWhiteListPackageNameSet.remove(packageName)
-        }
-
-        Utils.log(
-            TAG,
-            "updateAdditionalWhiteListPackageName 更新额外的白名单包名列表 $isAdd $packageName ，结果是 $isUpdated"
-        )
-
-        if (isUpdated) {
-            SPUtils.setString(SP_ADDITIONAL_WHITELIST_PACKAGE_NAME_LIST, additionalWhiteListPackageNameSet.toJson())
-        }
-    }
-
-    /**
-     * 刷新安装状态异常 （适用于仅存在包名信息的列表）
-     */
     fun refreshWrongInstallStatus(packageNameSet: MutableSet<String>) {
-        packageExecutor.execute {
+        runOnIoThread {
             Utils.log(TAG, "refreshWrongInstallStatus 检查安装状态异常的应用")
 
+            val installedButKeepingWrongStatusPackageNameSet: HashSet<String> = hashSetOf()
             val uninstalledButKeepingWrongStatusPackageNameSet: HashSet<String> = hashSetOf()
             val updatedButKeepingWrongStatusPackageNameSet: HashSet<String> = hashSetOf()
 
             for (packageName in packageNameSet) {
                 val installedVersionName = PackageUtils.getVersionNameByPackageName(packageName)
 
-                if (PackagesManager.isInstalled(packageName)
-                    && installedVersionName == null
+                if (!PackagesManager.isInstalled(packageName)
+                    && installedVersionName != null
                 ) {
+                    installedButKeepingWrongStatusPackageNameSet.add(packageName)
+                } else if (PackagesManager.isInstalled(packageName)
+                    && installedVersionName == null) {
                     uninstalledButKeepingWrongStatusPackageNameSet.add(packageName)
                 } else if (PackagesManager.isInstalled(packageName)
                     && installedVersionName != null
-                    && !PackagesManager.isInstalledWithSpecificVersion(packageName, installedVersionName)
-                ) {
+                    && !PackagesManager.isInstalledWithSpecificVersion(packageName, installedVersionName)) {
                     updatedButKeepingWrongStatusPackageNameSet.add(packageName)
                 }
             }
 
-            Utils.log(
-                TAG,
-                "refreshWrongInstallStatus 需要更新已更新状态的包数量为 ${updatedButKeepingWrongStatusPackageNameSet.size}"
-            )
-            Utils.log(
-                TAG,
-                "refreshWrongInstallStatus 需要移除已安装的包数量为 ${uninstalledButKeepingWrongStatusPackageNameSet.size}"
-            )
+            Utils.log(TAG, "refreshWrongInstallStatus 需要更新已安装状态的包数量为 ${installedButKeepingWrongStatusPackageNameSet.size}")
+            Utils.log(TAG, "refreshWrongInstallStatus 需要更新已更新状态的包数量为 ${updatedButKeepingWrongStatusPackageNameSet.size}")
+            Utils.log(TAG, "refreshWrongInstallStatus 需要移除已安装的包数量为 ${uninstalledButKeepingWrongStatusPackageNameSet.size}")
 
             runOnUiThread {
+                if (installedButKeepingWrongStatusPackageNameSet.isNotEmpty()) {
+                    for (packageName in installedButKeepingWrongStatusPackageNameSet) {
+                        PackageChangeHelper.addInstall(packageName)
+                    }
+                }
+
                 if (uninstalledButKeepingWrongStatusPackageNameSet.isNotEmpty()) {
                     for (packageName in uninstalledButKeepingWrongStatusPackageNameSet) {
                         PackageChangeHelper.addUninstall(packageName)
-                        additionalWhiteListPackageNameSet.remove(packageName)
                     }
-
-                    SPUtils.setString(
-                        SP_ADDITIONAL_WHITELIST_PACKAGE_NAME_LIST,
-                        additionalWhiteListPackageNameSet.toString()
-                    )
                 }
 
                 if (updatedButKeepingWrongStatusPackageNameSet.isNotEmpty()) {
@@ -631,197 +457,45 @@ object PackageHelper {
     }
 
     /**
-     * 刷新安装状态异常 （适用于存在游戏信息的列表）
+     * 在5.1系统手机使用PackageManager获取已安装应用容易发生Package manager has died异常
+     * https://stackoverflow.com/questions/13235793/transactiontoolargeeception-when-trying-tÏo-get-a-list-of-applications-installed/30062632#30062632
      */
-    fun refreshWrongInstallStatus(gameEntityList: ArrayList<GameEntity>) {
-        packageExecutor.execute {
-            Utils.log(TAG, "refreshWrongInstallStatus 检查安装状态异常的应用")
+    private fun getInstalledPackagesInternal(context: Context, flags: Int): List<PackageInfo> {
+        Utils.log(TAG, "调用系统 API 获取已安装应用列表")
 
-            val installedButKeepingWrongStatusPackageNameSet: HashSet<String> = hashSetOf()
-            val uninstalledButKeepingWrongStatusPackageNameSet: HashSet<String> = hashSetOf()
-            val updatedButKeepingWrongStatusPackageNameSet: HashSet<String> = hashSetOf()
-
-            for (game in gameEntityList) {
-                for (apk in game.getApk()) {
-                    val packageName = apk.packageName
-                    val installedVersionName = PackageUtils.getVersionNameByPackageName(packageName)
-
-                    if (!PackagesManager.isInstalled(packageName)
-                        && installedVersionName != null
-                    ) {
-                        cachedPkgNameAndGameEntityMap.put(packageName, game)
-                        installedButKeepingWrongStatusPackageNameSet.add(packageName)
-                    } else if (PackagesManager.isInstalled(packageName)
-                        && installedVersionName == null
-                    ) {
-                        uninstalledButKeepingWrongStatusPackageNameSet.add(packageName)
-                    } else if (PackagesManager.isInstalled(packageName)
-                        && installedVersionName != null
-                        && !PackagesManager.isInstalledWithSpecificVersion(packageName, installedVersionName)
-                        && !PackagesManager.isCanUpdate(game.id, packageName, false)
-                    ) {
-                        cachedPkgNameAndGameEntityMap.put(packageName, game)
-                        updatedButKeepingWrongStatusPackageNameSet.add(packageName)
-                    }
-                }
-            }
-
-            Utils.log(
-                TAG,
-                "refreshWrongInstallStatus 需要更新已安装状态的包数量为 ${installedButKeepingWrongStatusPackageNameSet.size}"
-            )
-            Utils.log(
-                TAG,
-                "refreshWrongInstallStatus 需要更新已更新状态的包数量为 ${updatedButKeepingWrongStatusPackageNameSet.size}"
-            )
-            Utils.log(
-                TAG,
-                "refreshWrongInstallStatus 需要移除已安装的包数量为 ${uninstalledButKeepingWrongStatusPackageNameSet.size}"
-            )
-
-            runOnUiThread {
-                if (installedButKeepingWrongStatusPackageNameSet.isNotEmpty()) {
-                    for (packageName in installedButKeepingWrongStatusPackageNameSet) {
-                        PackageChangeHelper.addInstall(packageName, cachedPkgNameAndGameEntityMap.remove(packageName))
-                        additionalWhiteListPackageNameSet.add(packageName)
-                    }
-
-                    SPUtils.setString(
-                        SP_ADDITIONAL_WHITELIST_PACKAGE_NAME_LIST,
-                        additionalWhiteListPackageNameSet.toString()
-                    )
-                }
-
-                if (uninstalledButKeepingWrongStatusPackageNameSet.isNotEmpty()) {
-                    for (packageName in uninstalledButKeepingWrongStatusPackageNameSet) {
-                        PackageChangeHelper.addUninstall(packageName)
-                        additionalWhiteListPackageNameSet.remove(packageName)
-                    }
-
-                    SPUtils.setString(
-                        SP_ADDITIONAL_WHITELIST_PACKAGE_NAME_LIST,
-                        additionalWhiteListPackageNameSet.toString()
-                    )
-                }
-
-                if (updatedButKeepingWrongStatusPackageNameSet.isNotEmpty()) {
-                    for (packageName in updatedButKeepingWrongStatusPackageNameSet) {
-                        PackageChangeHelper.addUpdate(packageName, cachedPkgNameAndGameEntityMap.remove(packageName))
-                    }
-                }
-            }
-        }
-    }
-
-    private fun getInstalledPackageInfoListInternal(
-        context: Context,
-        flags: Int
-    ): List<PackageInfo> {
-        return if (isUseAlternativeWayToGetInstalledPackages()) {
-            Utils.log(TAG, "调用另类系统 API 获取已安装应用列表")
-            getInstalledPackageByAlternative(context)
-        } else {
-            Utils.log(TAG, "调用默认系统 API 获取已安装应用列表")
-            getInstalledPackageByDefault(context, flags)
-        }
-    }
-
-    private fun getInstalledPackageNameListInternal(
-        context: Context,
-        flags: Int
-    ): List<String> {
-        if (isUseAlternativeWayToGetInstalledPackages()) {
-            Utils.log(TAG, "调用另类系统 API 获取已安装应用包名列表")
-            return getInstalledPackageNameByAlternative(context)
-        } else {
-            Utils.log(TAG, "调用默认系统 API 获取已安装应用包名列表")
-            val packageInfoList = getInstalledPackageByDefault(context, flags)
-            val packageList = arrayListOf<String>()
-            for (packageInfo in packageInfoList) {
-                if (context.packageName != packageInfo.packageName) {
-                    packageList.add(packageInfo.packageName)
-                }
-            }
-            return packageList
-        }
-    }
-
-    private fun getInstalledPackageByDefault(context: Context, flags: Int): List<PackageInfo> {
         val pm = context.packageManager
         try {
             return pm.getInstalledPackages(flags)
+        } catch (ignored: java.lang.Exception) {
+            //we don't care why it didn't succeed. We'll do it using an alternative way instead
+        }
+        // use fallback:
+        val process: Process
+        val result: MutableList<PackageInfo> = java.util.ArrayList()
+        var bufferedReader: BufferedReader? = null
+        try {
+            process = Runtime.getRuntime().exec("pm list packages")
+            bufferedReader = BufferedReader(InputStreamReader(process.inputStream))
+            var line: String
+            while ((bufferedReader.readLine().also { line = it }) != null) {
+                val packageName = line.substring(line.indexOf(':') + 1)
+                val packageInfo = pm.getPackageInfo(packageName, flags)
+                result.add(packageInfo)
+            }
+            process.waitFor()
         } catch (e: java.lang.Exception) {
             e.printStackTrace()
-        }
-
-        return arrayListOf()
-    }
-
-    private fun getInstalledPackageByAlternative(context: Context): ArrayList<PackageInfo> {
-        val packageManager = context.getPackageManager()
-        val packageList = arrayListOf<PackageInfo>()
-        var packagesArray: Array<String>? = null
-        var uid = android.os.Process.FIRST_APPLICATION_UID
-
-        while (uid <= android.os.Process.LAST_APPLICATION_UID) {
-            try {
-                packagesArray = packageManager.getPackagesForUid(uid)
-                if (packagesArray != null && packagesArray.isNotEmpty()) {
-                    for (packageName in packagesArray) {
-                        try {
-                            val packageInfo = packageManager.getPackageInfo(packageName, 0)
-                            if (packageInfo == null) {
-                                break
-                            }
-
-                            packageList.add(packageInfo)
-                        } catch (e: PackageManager.NameNotFoundException) {
-                            e.printStackTrace()
-                        }
-                    }
-                }
-            } catch (securityException: SecurityException) {
-                securityException.printStackTrace()
+            if (e is InterruptedException) {
+                Thread.currentThread().interrupt()
             }
-            uid++
-        }
-
-        return packageList
-    }
-
-    private fun getInstalledPackageNameByAlternative(context: Context): ArrayList<String> {
-        val packageManager = context.getPackageManager()
-        val packageList = arrayListOf<String>()
-        var packagesArray: Array<String>? = null
-        var uid = android.os.Process.FIRST_APPLICATION_UID
-
-        var lastValidUid = 0
-
-        while (uid <= android.os.Process.LAST_APPLICATION_UID) {
-            try {
-                packagesArray = packageManager.getPackagesForUid(uid)
-                if (packagesArray != null && packagesArray.isNotEmpty()) {
-                    lastValidUid = uid
-
-                    for (packageName in packagesArray) {
-                        packageList.add(packageName)
-                    }
-                }
-            } catch (securityException: SecurityException) {
-                securityException.printStackTrace()
+        } finally {
+            if (bufferedReader != null) try {
+                bufferedReader.close()
+            } catch (e: IOException) {
+                e.printStackTrace()
             }
-            uid++
         }
-
-        if (HaloApp.getInstance().isNewForThisVersion && uploadUIDGapLog) {
-            // 仅应用该版本第一次启动的第一次方法调用上报日志
-            uploadUIDGapLog = false
-
-            val uidGap = (android.os.Process.LAST_APPLICATION_UID - lastValidUid) / 100 * 100
-            SentryHelper.onEvent("UID_GAP", "gap", uidGap.toString())
-        }
-
-        return packageList
+        return result
     }
 
 }

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

@@ -6,6 +6,7 @@ import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Build
+import android.view.View
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.FileProvider
 import com.gh.common.dialog.InstallPermissionDialogFragment
@@ -19,18 +20,15 @@ import com.gh.gamecenter.core.utils.CurrentActivityHolder
 import com.gh.gamecenter.core.utils.MD5Utils
 import com.gh.gamecenter.core.utils.ToastUtils
 import com.gh.gamecenter.install.InstallService
+import com.gh.gamecenter.vpn.VpnHelper
 import com.gh.vspace.VHelper
 import com.halo.assistant.HaloApp
 import com.lightgame.download.DownloadEntity
-import com.lightgame.utils.AppManager
 import com.lightgame.utils.Utils
 import java.io.File
 
-// TODO 将弹窗改成以责任链模式来处理
 object PackageInstaller {
 
-    private val listeners = mutableListOf<OnInstallListener>()
-
     /**
      * 为了兼容java代码
      */
@@ -61,7 +59,7 @@ object PackageInstaller {
         val isDownloadAsVGame = downloadEntity.getMetaExtra(Constants.EXTRA_DOWNLOAD_TYPE) == Constants.VGAME
                 || downloadEntity.getMetaExtra(Constants.EXTRA_DOWNLOAD_TYPE) == Constants.DUAL_DOWNLOAD_VGAME
 
-        val currentActivity = AppManager.getInstance().currentActivity() ?: return
+        val currentActivity = CurrentActivityHolder.getCurrentActivity() ?: return
 
         if (!ignoreAsVGame && isDownloadAsVGame) {
             VHelper.install(currentActivity, downloadEntity)
@@ -126,14 +124,13 @@ object PackageInstaller {
             }
 
             if (PackageUtils.isCanLaunchSetup(context, pkgPath)) {
-                installWithPureModeHandled(
-                    context,
-                    pkgPath,
-                    downloadEntity?.packageName,
-                    downloadEntity?.gameId ?: "unknown",
-                    downloadEntity?.name ?: "unknown",
-                    downloadEntity?.categoryChinese ?: "unknown"
-                )
+                val currentActivity = CurrentActivityHolder.getCurrentActivity()
+
+                if (VpnHelper.shouldUseVpn() && currentActivity is AppCompatActivity) {
+                    turnOnVpnThenInstall(currentActivity, pkgPath, downloadEntity)
+                } else {
+                    install(context, pkgPath)
+                }
             } else {
                 if (isPluggin) {
                     DialogHelper.showPluginDialog(
@@ -163,26 +160,10 @@ object PackageInstaller {
         }
     }
 
-    /**
-     * 处理纯净模式后的安装
-     */
-    private fun installWithPureModeHandled(
-        context: Context,
-        pkgPath: String,
-        pkgName: String?,
-        gameId: String,
-        gameName: String,
-        gameType: String,
-    ) {
-        PureModeHelper.handlePureModeIfNeeded(context, gameId, gameName, gameType) {
-            install(context, pkgPath, pkgName)
-        }
-    }
-
     /**
      * 最终执行安装的方法
      */
-    private fun install(context: Context, pkgPath: String, pkgName: String?) {
+    private fun install(context: Context, pkgPath: String) {
         HaloApp.put(Constants.LAST_INSTALL_GAME, pkgPath)
 
         if (Build.VERSION.SDK_INT > Build.VERSION_CODES.TIRAMISU && Build.MANUFACTURER.lowercase().contains("xiaomi")) {
@@ -193,13 +174,10 @@ object PackageInstaller {
 
         val installIntent = getInstallIntent(context, pkgPath)
         context.startActivity(installIntent)
-
-        dispatchOnInstallListener(pkgPath, pkgName)
     }
 
     fun installMultiple(
         context: Context,
-        pkgName: String,
         pkgPath: String,
         sessionId: Int = -1
     ) {
@@ -222,24 +200,6 @@ object PackageInstaller {
         val pendingIntent = PendingIntent.getActivity(context, sessionId, intent, flags)
         // 提交数据流并执行安装
         session.commit(pendingIntent.intentSender)
-
-        dispatchOnInstallListener(pkgName, pkgPath)
-    }
-
-    fun registerOnInstallListener(listener: OnInstallListener) {
-        if (!listeners.contains(listener)) {
-            listeners.add(listener)
-        }
-    }
-
-    fun unregisterOnInstallListener(listener: OnInstallListener) {
-        listeners.remove(listener)
-    }
-
-    private fun dispatchOnInstallListener(pkgPath: String, pkgName: String?) {
-        for (listener in listeners) {
-            listener.onInstalling(pkgName, pkgPath)
-        }
     }
 
     /**
@@ -331,8 +291,82 @@ object PackageInstaller {
         return MD5Utils.getContentMD5(gameName + "_" + System.currentTimeMillis())
     }
 
-    interface OnInstallListener {
-        fun onInstalling(packageName: String?, packagePath: String)
+    /**
+     * 启动 VPN 然后安装应用 （若没有授权会先提醒授权 VPN ，若拒绝授权会回落到直接执行安装）
+     */
+    private fun turnOnVpnThenInstall(currentActivity: AppCompatActivity,
+                                     pkgPath: String,
+                                     downloadEntity: DownloadEntity?) {
+        if (VpnHelper.isVpnPermissionGranted(currentActivity) == true) {
+            VpnHelper.startVpn(currentActivity) { shouldShowVpnError ->
+                if (shouldShowVpnError) {
+                    ToastUtils.toast("安装防护功能启动失败")
+                }
+                install(currentActivity, pkgPath)
+            }
+        } else {
+            val isTheFirstTimeToShowVpnHintDialog = VpnHelper.isTheFistTimeToShowVpnHintDialog()
+
+            downloadEntity?.let {
+                NewFlatLogUtils.logVpnHintDialogShow(it.gameId, it.name)
+            }
+
+            // 将 VPN 提示弹窗标记为已读（已读后的下一次显示"不再提醒"按钮）
+            VpnHelper.setVpnHintDialogShowed()
+            if (!VpnHelper.shouldShowVpnHintDialog()) {
+                VpnHelper.startVpn(currentActivity) { shouldShowVpnError ->
+                    if (shouldShowVpnError) {
+                        ToastUtils.toast("安装防护功能启动失败")
+                    }
+                    install(currentActivity, pkgPath)
+                }
+            } else {
+                DialogHelper.showGuideDialog(
+                    context = currentActivity,
+                    title = "开启安装防护",
+                    content = "建议您开启安装防护功能，该功能有助于帮助您更快的完成安装，避免因提示和置换导致的重复下载等问题，安装防护功能需要获取您的VPN权限",
+                    confirmText = "立即授权开启防护",
+                    cancelText = "不再提醒",
+                    confirmClickCallback = {
+                        VpnHelper.ignoreVpnHintDialog()
+                        VpnHelper.startVpn(currentActivity) { shouldShowVpnError ->
+                            if (shouldShowVpnError) {
+                                ToastUtils.toast("安装防护功能启动失败")
+                            }
+                            install(currentActivity, pkgPath)
+                        }
+
+                        downloadEntity?.let {
+                            NewFlatLogUtils.logVpnHintDialogClick(it.gameId, it.name, "立即授权")
+                        }
+                    },
+                    cancelClickCallback = {
+                        VpnHelper.ignoreVpnFunction()
+                        install(currentActivity, pkgPath)
+                        downloadEntity?.let {
+                            NewFlatLogUtils.logVpnHintDialogClick(it.gameId, it.name, "不再提醒")
+                        }
+                    },
+                    extraConfig = DialogHelper.Config(
+                        showCloseIcon = true,
+                        showAlternativeCancelStyle = !isTheFirstTimeToShowVpnHintDialog
+                    ),
+                    uiModificationCallback = { binding ->
+                        binding.cancelTv.visibility = View.GONE
+                        binding.closeContainer.setOnClickListener {
+                            binding.markDismissByTouchInside()
+
+                            install(currentActivity, pkgPath)
+                            binding.dismiss()
+
+                            downloadEntity?.let {
+                                NewFlatLogUtils.logVpnHintDialogClick(it.gameId, it.name, "关闭按钮")
+                            }
+                        }
+                    }
+                )
+            }
+        }
     }
 
 }

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

@@ -14,7 +14,6 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.PowerManager;
 import android.text.TextUtils;
-import android.util.AndroidException;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -29,10 +28,10 @@ import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.common.constant.Constants;
 import com.gh.gamecenter.common.utils.ExtensionsKt;
 import com.gh.gamecenter.core.utils.MD5Utils;
+import com.gh.gamecenter.core.utils.SentryHelper;
 import com.gh.gamecenter.feature.entity.ApkEntity;
 import com.gh.gamecenter.feature.entity.GameEntity;
 import com.gh.gamecenter.entity.GameUpdateEntity;
-import com.gh.gamecenter.feature.utils.SentryHelper;
 import com.gh.gamecenter.manager.PackagesManager;
 import com.gh.vspace.VHelper;
 import com.gh.vspace.db.VGameEntity;
@@ -223,19 +222,8 @@ public class PackageUtils {
             if (metaDate != null) {
                 return metaDate.get(name);
             }
-        } catch (Exception e) {
-            e.printStackTrace();
-
-            if (e instanceof AndroidException) {
-                // 有些设备会出现 DeadSystemException
-                SentryHelper.INSTANCE.onEvent(
-                        "GET_META_DATA_ERROR",
-                        "packageName",
-                        packageName,
-                        "exception_digest",
-                        e.getLocalizedMessage()
-                );
-            }
+        } catch (NameNotFoundException e) {
+//            e.printStackTrace();
         }
         return null;
     }
@@ -639,19 +627,8 @@ public class PackageUtils {
         try {
             return HaloApp.getInstance().getApplication().getPackageManager().getPackageInfo(packageName,
                     PackageManager.COMPONENT_ENABLED_STATE_DEFAULT).versionName;
-        } catch (Exception e) {
-            e.printStackTrace();
-
-            if (e instanceof AndroidException) {
-                // 有些设备会出现 DeadSystemException
-                SentryHelper.INSTANCE.onEvent(
-                        "GET_VERSION_NAME_ERROR",
-                        "packageName",
-                        packageName,
-                        "exception_digest",
-                        e.getLocalizedMessage()
-                );
-            }
+        } catch (NameNotFoundException e) {
+            // do nothing
         }
         return null;
     }
@@ -663,18 +640,8 @@ public class PackageUtils {
         try {
             return HaloApp.getInstance().getApplication().getPackageManager().getPackageInfo(packageName,
                     PackageManager.COMPONENT_ENABLED_STATE_DEFAULT).versionCode;
-        } catch (Exception e) {
-            e.printStackTrace();
-            if (e instanceof AndroidException) {
-                // 有些设备会出现 DeadSystemException
-                SentryHelper.INSTANCE.onEvent(
-                        "GET_VERSION_CODE_ERROR",
-                        "packageName",
-                        packageName,
-                        "exception_digest",
-                        e.getLocalizedMessage()
-                );
-            }
+        } catch (NameNotFoundException e) {
+            // do nothing
         }
         return 0;
     }
@@ -687,49 +654,71 @@ public class PackageUtils {
         try {
             PackageManager packageManager = context.getApplicationContext().getPackageManager();
             return packageManager.getApplicationIcon(packageName);
-        } catch (Exception e) {
-            e.printStackTrace();
-            if (e instanceof AndroidException) {
-                // 有些设备会出现 DeadSystemException
-                SentryHelper.INSTANCE.onEvent(
-                        "GET_ICON_ERROR",
-                        "packageName",
-                        packageName,
-                        "exception_digest",
-                        e.getLocalizedMessage()
-                );
-            }
+        } catch (NameNotFoundException e) {
+            // do nothing
         }
         return null;
     }
 
     /*
-     * 获取所有已安装的软件的包名（包括系统应用）
+     * 获取所有已安装的软件的包名、版本(非系统应用)
      */
     public static ArrayList<String> getAllPackageName(Context context) {
         ArrayList<String> list = new ArrayList<>();
-        List<String> packageNameList = PackageHelper.INSTANCE.getInstalledPackageNameList(context, 0);
-        for (String packageName : packageNameList) {
-            if (!context.getPackageName().equals(packageName)) {
-                list.add(packageName);
+        List<PackageInfo> packageInfos = PackageHelper.INSTANCE.getInstalledPackages(context, 0);
+        for (PackageInfo packageInfo : packageInfos) {
+            if ((packageInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 0) {
+                if (!context.getPackageName().equals(packageInfo.packageName)) {
+                    list.add(packageInfo.packageName);
+                }
             }
         }
         return list;
     }
 
     public static ArrayList<String> getAllPackageNameIncludeGh(Context context) {
-        List<String> packageNameList = PackageHelper.INSTANCE.getInstalledPackageNameList(context, 0);
-        return new ArrayList<>(packageNameList);
+        ArrayList<String> list = new ArrayList<>();
+        List<PackageInfo> packageInfos = PackageHelper.INSTANCE.getInstalledPackages(context, 0);
+        for (PackageInfo packageInfo : packageInfos) {
+            if ((packageInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 0) {
+                list.add(packageInfo.packageName);
+            }
+        }
+        return list;
+    }
+
+    /*
+     * 获取所有已安装的软件的包名（包括系统应用）
+     */
+    public static ArrayList<String> getAllPackageNameIncludeSystemApps(Context context) {
+        ArrayList<String> list = new ArrayList<>();
+        List<PackageInfo> packageInfos = PackageHelper.INSTANCE.getInstalledPackages(context, 0);
+        for (PackageInfo packageInfo : packageInfos) {
+            list.add(packageInfo.packageName);
+        }
+        return list;
     }
 
     public static JSONArray getAppList(Context context) {
         JSONArray jsonArray = new JSONArray();
         try {
-            List<String> packageNameList = PackageHelper.INSTANCE.getInstalledPackageNameList(context, 0);
-            for (String packageName : packageNameList) {
-                JSONObject jsonObject = new JSONObject();
-                jsonObject.put("package", packageName);
-                jsonArray.put(jsonObject);
+            PackageManager pm = context.getPackageManager();
+            List<PackageInfo> packageInfos = PackageHelper.INSTANCE.getInstalledPackages(context, 0);
+            for (PackageInfo packageInfo : packageInfos) {
+                if ((packageInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 0) {
+                    JSONObject jsonObject = new JSONObject();
+                    // 这里的 pm.getApplicationLabel 有极小机率会返回 null 值 （明明方法标示了返回值 nonnull）
+                    // Attempt to invoke interface method 'java.lang.String java.lang.CharSequence.toString()' on a null object reference
+                    // 所以要是为空就 continue，忽略掉它
+                    if (pm.getApplicationLabel(packageInfo.applicationInfo) == null) {
+                        continue;
+                    }
+
+                    jsonObject.put("name", pm.getApplicationLabel(packageInfo.applicationInfo).toString());
+                    jsonObject.put("package", packageInfo.packageName);
+                    jsonObject.put("version", packageInfo.versionName);
+                    jsonArray.put(jsonObject);
+                }
             }
         } catch (JSONException e) {
             e.printStackTrace();
@@ -749,19 +738,8 @@ public class PackageUtils {
                 jsonObject.put("version", packageInfo.versionName);
             }
             return jsonObject;
-        } catch (Exception e) {
+        } catch (JSONException | NameNotFoundException e) {
             e.printStackTrace();
-            if (e instanceof AndroidException) {
-                // 有些设备会出现 DeadSystemException
-                SentryHelper.INSTANCE.onEvent(
-                        "GET_APP_BASIC_INFO_BY_PACKAGE_NAME",
-                        "packageName",
-                        packageName,
-                        "exception_digest",
-                        e.getLocalizedMessage()
-                );
-            }
-
             return jsonObject;
         }
     }

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

@@ -5,12 +5,12 @@ import android.os.Build;
 import android.text.TextUtils;
 
 import com.gh.gamecenter.R;
-import com.gh.gamecenter.common.exposure.meta.MetaUtil;
 import com.gh.gamecenter.common.retrofit.JSONObjectResponse;
 import com.gh.gamecenter.common.retrofit.Response;
 import com.gh.gamecenter.feature.entity.CommentEntity;
 import com.gh.gamecenter.retrofit.RetrofitManager;
 import com.lightgame.utils.Utils;
+import com.walkud.rom.checker.RomIdentifier;
 
 import org.json.JSONObject;
 
@@ -37,7 +37,7 @@ public class PostCommentUtils {
             device.put("model", Build.MODEL);
             device.put("manufacturer", Build.MANUFACTURER);
             device.put("android_version", android.os.Build.VERSION.RELEASE);
-            device.put("rom", MetaUtil.INSTANCE.getRom().name() + " " + MetaUtil.INSTANCE.getRom().getVersionName());
+            device.put("rom", RomIdentifier.getRom().name() + " " + RomIdentifier.getRom().getVersionName());
             content.put("device", device);
         } catch (Exception e) {
             e.printStackTrace();

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

@@ -1,342 +0,0 @@
-package com.gh.common.util
-
-import android.app.Activity
-import android.content.Context
-import android.content.Intent
-import android.provider.Settings
-import android.view.View
-import androidx.appcompat.app.AppCompatActivity
-import androidx.lifecycle.DefaultLifecycleObserver
-import androidx.lifecycle.LifecycleOwner
-import com.gh.common.constant.Config
-import com.gh.gamecenter.common.utils.DialogHelper
-import com.gh.gamecenter.entity.NewApiSettingsEntity
-import com.lightgame.utils.Utils
-
-import com.gh.gamecenter.R
-import com.gh.gamecenter.common.utils.SensorsBridge
-import com.gh.gamecenter.common.utils.enlargeTouchArea
-import com.gh.gamecenter.common.utils.setDrawableEnd
-import com.gh.gamecenter.core.utils.SPUtils
-
-/**
- * 处理厂商纯净/安全模式的辅助类
- */
-object PureModeHelper {
-
-    private const val TAG = "PureModeHelper"
-
-    private const val HW = "HUAWEI"
-
-    private const val HW_PURE_MODE_STATE = "pure_mode_state"
-    private const val HW_PURE_ENHANCED_MODE_STATE = "pure_enhanced_mode_state"
-
-    private const val HW_PURE_MODE = "harmony_os_pure_mode"
-    private const val HW_PURE_ENHANCED_MODE = "harmony_os_pure_enhanced_mode"
-
-    private const val SP_USER_IGNORE_GUIDE = "user_ignore_guide"
-
-    private const val SWITCH_EXIST = 1
-    private const val SWITCH_ON = 0
-    private const val SWITCH_OFF = -1
-
-    private var isThisDeviceUsingEnhancedMode = false // 当前设备是否是增强纯净模式
-
-    fun handlePureModeIfNeeded(
-        context: Context,
-        gameId: String,
-        gameName: String,
-        gameType: String,
-        callback: () -> Unit
-    ) {
-        // 用户忽略提醒，不再走下面的逻辑
-        if (SPUtils.getBoolean(SP_USER_IGNORE_GUIDE, false)) {
-            callback()
-            return
-        }
-
-        // 仅适用于华为手机
-        val manufacturer = android.os.Build.MANUFACTURER
-        if (manufacturer != HW) {
-            callback.invoke()
-            return
-        }
-
-        val solidContext = DialogHelper.checkDialogContext(context)
-
-        if (solidContext == null) {
-            callback.invoke()
-            return
-        }
-
-        if (readState(solidContext, HW_PURE_ENHANCED_MODE_STATE) == SWITCH_ON) {
-            Utils.log(TAG, "增强纯净模式开启！")
-            isThisDeviceUsingEnhancedMode = true
-
-            val pureModeGuide =
-                Config.getNewApiSettingsEntity()?.install?.guides?.firstOrNull { it.type == HW_PURE_ENHANCED_MODE }
-
-            if (pureModeGuide != null) {
-                showHWHintDialog(solidContext, pureModeGuide, gameId, gameName, gameType, true, callback)
-            } else {
-                callback.invoke()
-            }
-        } else if (readState(solidContext, HW_PURE_ENHANCED_MODE_STATE) != SWITCH_EXIST
-            && readState(solidContext, HW_PURE_MODE_STATE) == SWITCH_ON
-        ) {
-            Utils.log(TAG, "纯净模式开启！")
-            isThisDeviceUsingEnhancedMode = false
-
-            val pureModeGuide =
-                Config.getNewApiSettingsEntity()?.install?.guides?.firstOrNull { it.type == HW_PURE_MODE }
-
-            if (pureModeGuide != null) {
-                showHWHintDialog(solidContext, pureModeGuide, gameId, gameName, gameType, false, callback)
-            } else {
-                callback.invoke()
-            }
-        } else {
-            callback()
-        }
-    }
-
-    private fun showHWHintDialog(
-        context: Context,
-        guide: NewApiSettingsEntity.Guide,
-        gameId: String,
-        gameName: String,
-        gameType: String,
-        isEnhancedMode: Boolean,
-        callback: () -> Unit
-    ) {
-        var isIgnored = false
-
-        if (context is Activity) {
-            if (context.isFinishing) {
-                callback.invoke()
-                return
-            }
-        }
-
-        trackDialogShow(isEnhancedMode, gameId, gameName, gameType)
-
-        DialogHelper.showGuideDialog(
-            context = context,
-            title = guide.title,
-            content = guide.content,
-            confirmText = guide.buttonTextSettingJump,
-            cancelText = guide.buttonTextClose,
-            uiModificationCallback = { binding ->
-                binding.hintTv.buildSpannableString {
-                    addText(guide.linkTextPrefix)
-                    addText(guide.linkText) {
-                        setColor(ColorResId(R.color.text_theme))
-                        onClick(false) {
-                            binding.extraHintIv.performClick()
-                        }
-                    }
-                }
-                binding.extraHintIv.setImageResource(R.drawable.ic_home_head_arrow)
-                binding.extraHintIv.setOnClickListener {
-                    directToLink(
-                        context,
-                        guide,
-                        gameId,
-                        gameName,
-                        gameType,
-                        isEnhancedMode,
-                        isIgnored
-                    )
-                }
-                binding.extraHintIv.enlargeTouchArea()
-                binding.extraHintIv.visibility = View.VISIBLE
-                binding.hintTv.visibility = View.VISIBLE
-                binding.selectorContainer.visibility = if (guide.dialogFrequency == "once") View.VISIBLE else View.GONE
-                binding.selectorContainer.setOnClickListener {
-                    binding.selectorContainer.isChecked = !binding.selectorContainer.isChecked
-                    isIgnored = binding.selectorContainer.isChecked
-                }
-
-                binding.confirmTv.setOnClickListener {
-                    toHWPureModeSetting(context)
-                    trackDialogClicked(
-                        isEnhancedMode = isEnhancedMode,
-                        gameId = gameId,
-                        gameName = gameName,
-                        gameType = gameType,
-                        buttonName = guide.buttonTextSettingJump,
-                        isIgnored = isIgnored
-                    )
-                }
-
-                // 监听是否已授权，授权后自动调起安装并 dismiss dialog
-                if (context is AppCompatActivity) {
-                    val lifecycle = context.lifecycle
-                    lifecycle.addObserver(object : DefaultLifecycleObserver {
-                        override fun onResume(owner: LifecycleOwner) {
-                            val granted = (isThisDeviceUsingEnhancedMode && readState(context, HW_PURE_ENHANCED_MODE_STATE) != SWITCH_ON)
-                                    || (!isThisDeviceUsingEnhancedMode && readState(context, HW_PURE_MODE_STATE) != SWITCH_ON)
-
-                            if (granted) {
-                                binding.dialog.dismiss()
-                                callback.invoke()
-                                lifecycle.removeObserver(this)
-                            }
-                        }
-
-                        override fun onDestroy(owner: LifecycleOwner) {
-                            super.onDestroy(owner)
-
-                            lifecycle.removeObserver(this)
-                        }
-                    })
-                }
-            },
-            confirmClickCallback = {
-                // do nothing, 上面 setOnClickListener 处理了
-            },
-            cancelClickCallback = {
-                if (guide.dialogFrequency == "once" && isIgnored) {
-                    SPUtils.setBoolean(SP_USER_IGNORE_GUIDE, true)
-                }
-                trackDialogClicked(
-                    isEnhancedMode = isEnhancedMode,
-                    gameId = gameId,
-                    gameName = gameName,
-                    gameType = gameType,
-                    buttonName = guide.buttonTextClose,
-                    isIgnored = isIgnored
-                )
-                callback()
-            },
-            touchOutsideCallback = {
-                if (guide.dialogFrequency == "once" && isIgnored) {
-                    SPUtils.setBoolean(SP_USER_IGNORE_GUIDE, true)
-                }
-                trackDialogClicked(
-                    isEnhancedMode = isEnhancedMode,
-                    gameId = gameId,
-                    gameName = gameName,
-                    gameType = gameType,
-                    buttonName = "关闭弹窗",
-                    isIgnored = isIgnored
-                )
-                callback()
-            },
-            extraConfig = DialogHelper.Config(centerTitle = true)
-        )
-    }
-
-    private fun directToLink(
-        context: Context,
-        guide: NewApiSettingsEntity.Guide,
-        gameId: String,
-        gameName: String,
-        gameType: String,
-        isEnhancedMode: Boolean,
-        isIgnored: Boolean
-    ) {
-        DirectUtils.directToLinkPage(context, guide.link, "纯净模式弹窗", "")
-        trackDialogClicked(
-            isEnhancedMode,
-            gameId,
-            gameName,
-            gameType,
-            "跳转链接",
-            isIgnored,
-            guide.link.link ?: "",
-            guide.link.type ?: "",
-            guide.link.text ?: ""
-        )
-    }
-
-    private fun trackDialogShow(
-        isEnhancedMode: Boolean,
-        gameId: String,
-        gameName: String,
-        gameType: String
-    ) {
-        if (isEnhancedMode) {
-            SensorsBridge.trackAddedProtectionDialogShow(
-                gameId = gameId,
-                gameName = gameName,
-                gameType = gameType
-            )
-        } else {
-            SensorsBridge.trackPureModeDialogShow(
-                gameId = gameId,
-                gameName = gameName,
-                gameType = gameType
-            )
-        }
-    }
-
-    private fun trackDialogClicked(
-        isEnhancedMode: Boolean,
-        gameId: String,
-        gameName: String,
-        gameType: String,
-        buttonName: String,
-        isIgnored: Boolean,
-        linkId: String? = null,
-        linkType: String? = null,
-        linkText: String? = null
-    ) {
-        if (isEnhancedMode) {
-            SensorsBridge.trackAddedProtectionDialogClick(
-                gameId = gameId,
-                gameName = gameName,
-                gameType = gameType,
-                buttonName = buttonName,
-                isIgnored = isIgnored,
-                linkId = linkId ?: "",
-                linkType = linkType ?: "",
-                linkText = linkText ?: ""
-            )
-        } else {
-            SensorsBridge.trackPureModeDialogClick(
-                gameId = gameId,
-                gameName = gameName,
-                gameType = gameType,
-                buttonName = buttonName,
-                isIgnored = isIgnored,
-                linkId = linkId ?: "",
-                linkType = linkType ?: "",
-                linkText = linkText ?: ""
-            )
-        }
-    }
-
-    private fun toHWPureModeSetting(context: Context) {
-        try {
-            val intent = Intent()
-            intent.setPackage("com.huawei.security.privacycenter")
-            intent.setAction("com.huawei.securitycenter.PURE_MODE_ACTIVITY")
-            intent.putExtra("intent_from_settings", true)
-            context.startActivity(intent)
-        } catch (_: Exception) {
-            toSystemSettings(context)
-        }
-    }
-
-    private fun toSystemSettings(context: Context) {
-        try {
-            val intent = Intent(Settings.ACTION_SETTINGS)
-            context.startActivity(intent)
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-    }
-
-    private fun readState(context: Context, key: String): Int {
-        try {
-            val result = Settings.Secure.getInt(context.getContentResolver(), key, SWITCH_OFF)
-            Utils.log(TAG, "readState $key state >>> $result")
-            return result
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-        return SWITCH_OFF
-    }
-
-}

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

@@ -3,12 +3,12 @@ package com.gh.common.util
 import android.annotation.SuppressLint
 import com.gh.gamecenter.common.entity.SignatureEntity
 import com.gh.gamecenter.common.retrofit.BiResponse
+import com.gh.gamecenter.common.utils.singleToMain
 import com.gh.gamecenter.common.utils.toJson
 import com.gh.gamecenter.common.utils.toObject
 import com.gh.gamecenter.core.utils.MD5Utils
 import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.retrofit.RetrofitManager
-import io.reactivex.schedulers.Schedulers
 
 /**
  * 存储光环网游使用的签名
@@ -24,7 +24,7 @@ object SignatureRepository {
         RetrofitManager.getInstance()
             .newApi
             .ghSignature
-            .subscribeOn(Schedulers.io())
+            .compose(singleToMain())
             .subscribe(object : BiResponse<ArrayList<SignatureEntity>>() {
                 override fun onSuccess(data: ArrayList<SignatureEntity>) {
                     signDigestList = ArrayList()

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

@@ -27,8 +27,8 @@ import com.gh.gamecenter.gamedetail.rating.RatingReplyActivity
 
 object SyncDataBetweenPageHelper {
 
-    const val REQUEST_CODE_TAG = "REQUEST_CODE_TAG"
-    const val DATA_POSITION_TAG = "DATA_POSITION_TAG"
+    private const val REQUEST_CODE_TAG = "REQUEST_CODE_TAG"
+    private const val DATA_POSITION_TAG = "DATA_POSITION_TAG"
     private const val DEFAULT_NUMBER = -1111
 
     fun startActivityForResult(context: Context, intent: Intent, requestCode: Int, dataPosition: Int) {

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

@@ -2,16 +2,15 @@ package com.gh.common.util
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
-import com.alibaba.android.arouter.launcher.ARouter
 import com.gh.common.iinterface.ISuperiorChain
 import com.gh.gamecenter.amway.AmwayFragment
 import com.gh.gamecenter.category2.CategoryV2Fragment
 import com.gh.gamecenter.common.constant.EntranceConsts
-import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.entity.LinkEntity
-import com.gh.gamecenter.common.provider.IHelpAndFeedbackProvider
 import com.gh.gamecenter.discovery.DiscoveryFragment
 import com.gh.gamecenter.entity.SubjectData
+import com.gh.gamecenter.feedback.view.help.HelpAndFeedbackFragment
+import com.gh.gamecenter.feedback.view.qa.HelpContainerFragment
 import com.gh.gamecenter.forum.detail.ForumDetailFragment
 import com.gh.gamecenter.forum.home.CommunityHomeFragment
 import com.gh.gamecenter.fragment.ReloadFragment
@@ -63,8 +62,7 @@ object ViewPagerFragmentHelper {
     const val TYPE_GAME_LIST = "game_list" // 游戏单广场
     const val TYPE_FEEDBACK = "feedback" // 帮助与反馈
     const val TYPE_COLUMN = "column" // 游戏专题详情页
-    const val TYPE_QQ_MINI_GAME_COLUMN = "qq_mini_game_column_detail" // QQ小游戏专题详情页
-    const val TYPE_WECHAT_GAME_COLUMN = "wechat_game_column_detail" // 微信小游戏专题详情页
+    const val TYPE_QQ_MINI_GAME_COLUMN = "qq_mini_game_column_detail" // QQ游戏专题详情页
     const val TYPE_COLUMN_COLLECTION = "column_collection" // 专题合集详情页
     const val TYPE_SERVER = "server" // 开服表
     const val TYPE_COLUMN_TEST = "column_test_v2" // 新游开测
@@ -82,7 +80,6 @@ object ViewPagerFragmentHelper {
     const val TYPE_TOOLKIT = "toolkit" // 工具箱
 
     fun createFragment(parentFragment: Fragment?, bundle: Bundle, linkEntity: LinkEntity, isTabWrapper: Boolean): Fragment {
-        val superiorChain = if (parentFragment is ISuperiorChain) parentFragment else null
         return when (linkEntity.type) {
             // 游戏详情页
             TYPE_GAME -> {
@@ -91,12 +88,11 @@ object ViewPagerFragmentHelper {
             }
             // 我的光环
             TYPE_MY_HALO -> {
+                val superiorChain = if (parentFragment is ISuperiorChain) parentFragment else null
                 HaloPersonalFragment().setSuperiorChain(superiorChain).with(bundle)
             }
             // 社区首页
-            TYPE_COMMUNITY_HOME -> {
-                CommunityHomeFragment().setSuperiorChain(superiorChain).with(bundle)
-            }
+            TYPE_COMMUNITY_HOME -> CommunityHomeFragment().with(bundle)
             // 视频信息流
             TYPE_VIDEO_STREAM -> {
                 bundle.putBoolean(EntranceConsts.KEY_IS_HOME_VIDEO, true)
@@ -128,15 +124,7 @@ object ViewPagerFragmentHelper {
             }
             // 帮助与反馈
             TYPE_FEEDBACK -> {
-                val helpAndFeedbackProvider =
-                    ARouter.getInstance().build(RouteConsts.provider.helpAndFeedback)
-                        .navigation() as? IHelpAndFeedbackProvider
-                if (helpAndFeedbackProvider != null) {
-                    helpAndFeedbackProvider.getHelpAndFeedbackFragment().with(bundle)
-                } else {
-                    // 纯粹是占位用的 fragment
-                    AmwayFragment().with(bundle)
-                }
+                HelpAndFeedbackFragment().with(bundle)
             }
             // 帖子
             TYPE_COMMUNITY_ARTICLE -> {
@@ -150,11 +138,11 @@ object ViewPagerFragmentHelper {
                 NewQuestionDetailFragment().with(bundle)
             }
             // 其他原来带Toolbar的Fragment
-            else -> createToolbarWrapperFragment(parentFragment, bundle, linkEntity, isTabWrapper)
+            else -> createToolbarWrapperFragment(bundle, linkEntity, isTabWrapper)
         }
     }
 
-    private fun createToolbarWrapperFragment(parentFragment: Fragment?, bundle: Bundle, entity: LinkEntity, isTabWrapper: Boolean): Fragment {
+    private fun createToolbarWrapperFragment(bundle: Bundle, entity: LinkEntity, isTabWrapper: Boolean): Fragment {
         var className = ReloadFragment::class.java.name
 
         when (entity.type) {
@@ -163,16 +151,11 @@ object ViewPagerFragmentHelper {
                 className = GameCollectionSquareFragment::class.java.name
             }
             // 游戏专题详情页/QQ游戏专题详情页
-            TYPE_COLUMN, TYPE_QQ_MINI_GAME_COLUMN, TYPE_WECHAT_GAME_COLUMN -> {
-                val subjectType = when(entity.type) {
-                    TYPE_QQ_MINI_GAME_COLUMN -> SubjectData.SubjectType.QQ_GAME
-                    TYPE_WECHAT_GAME_COLUMN -> SubjectData.SubjectType.WECHAT_GAME
-                    else -> SubjectData.SubjectType.NORMAL
-                }
+            TYPE_COLUMN, TYPE_QQ_MINI_GAME_COLUMN -> {
                 className = SubjectFragment::class.java.name
                 bundle.putParcelable(
                     EntranceConsts.KEY_SUBJECT_DATA,
-                    SubjectData(entity.link, entity.text, false, subjectType = subjectType)
+                    SubjectData(entity.link, entity.text, false, isQQMiniGame = entity.type == "qq_mini_game_column_detail")
                 )
                 bundle.putBoolean(EntranceConsts.KEY_SHOW_DOWNLOAD_MENU, !isTabWrapper)
             }
@@ -192,8 +175,6 @@ object ViewPagerFragmentHelper {
             // 新游开测
             TYPE_COLUMN_TEST -> {
                 className = GameServerTestV2Fragment::class.java.name
-                bundle.putString(EntranceConsts.KEY_ID, entity.link)
-                bundle.putString(EntranceConsts.KEY_NAME, entity.text)
             }
             // 分类2.0
             TYPE_CATEGORY_V2 -> {
@@ -246,15 +227,9 @@ object ViewPagerFragmentHelper {
             }
             // QA
             TYPE_QA -> {
-                val helpAndFeedbackProvider =
-                    ARouter.getInstance().build(RouteConsts.provider.helpAndFeedback)
-                        .navigation() as? IHelpAndFeedbackProvider
-
-                helpAndFeedbackProvider?.let {
-                    className = it.getHelpContainerFragmentClass()
-                    bundle.putString(EntranceConsts.KEY_QA_ID, entity.link)
-                    bundle.putString(EntranceConsts.KEY_NAVIGATION_TITLE, entity.text)
-                }
+                className = HelpContainerFragment::class.java.name
+                bundle.putString(EntranceConsts.KEY_QA_ID, entity.link)
+                bundle.putString(EntranceConsts.KEY_NAVIGATION_TITLE, entity.text)
             }
             // 资讯中心
             TYPE_ARTICLE_CENTER -> {

app/src/main/java/com/gh/common/video/CustomExoPlayerCacheManager.kt

@@ -31,7 +31,7 @@ class CustomExoPlayerCacheManager : ICacheManager {
         mediaPlayer.setDataSource(context, Uri.parse(url), header)
     }
 
-    override fun clearCache(context: Context, cachePath: File?, url: String) {
+    override fun clearCache(context: Context, cachePath: File, url: String) {
         ExoSourceManager.clearCache(context, cachePath, url)
     }
 

app/src/main/java/com/gh/common/video/CustomIjkExo2MediaPlayer.kt

@@ -156,8 +156,8 @@ class CustomIjkExo2MediaPlayer : AbstractMediaPlayer(), Player.EventListener, An
 
     override fun setDataSource(context: Context?, uri: Uri) {
         dataSource = uri.toString()
-        mediaSource = exoHelper?.getMediaSource(dataSource, isPreview, isCache, isLooping, cacheDir, overrideExtension)
-//        mediaSource = DefaultMediaSourceFactory(context!!).createMediaSource(MediaItem.fromUri(uri))
+//        mediaSource = exoHelper?.getMediaSource(dataSource, isPreview, isCache, isLooping, cacheDir, overrideExtension)
+        mediaSource = DefaultMediaSourceFactory(context!!).createMediaSource(MediaItem.fromUri(uri))
     }
 
     override fun setDataSource(fd: FileDescriptor?) {
@@ -265,9 +265,7 @@ class CustomIjkExo2MediaPlayer : AbstractMediaPlayer(), Player.EventListener, An
         internalPlayer?.release()
         internalPlayer = null
 
-        // exoHelper?.release() 调用的是 ExoSourceManager 的 release 方法，会废弃掉全局唯一的 SimpleCache 实例
-        // 导致其他地方使用 SimpleCache 时会出现异常，无法正常播放
-//        exoHelper?.release()
+        exoHelper?.release()
 
         surface = null
         dataSource = null

app/src/main/java/com/gh/common/view/CatalogFilterView.kt

@@ -0,0 +1,331 @@
+package com.gh.common.view
+
+import android.content.Context
+import android.graphics.Color
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.PopupWindow
+import android.widget.TextView
+import androidx.annotation.ColorInt
+import androidx.core.content.ContextCompat
+import com.gh.gamecenter.R
+import com.gh.gamecenter.common.utils.setDrawableEnd
+import com.gh.gamecenter.common.utils.toColor
+import com.gh.gamecenter.common.utils.visibleIf
+import com.gh.gamecenter.entity.CatalogEntity
+import com.gh.gamecenter.entity.SubjectSettingEntity
+import com.google.android.flexbox.FlexboxLayout
+
+class CatalogFilterView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : LinearLayout(context, attrs, defStyleAttr) {
+
+    private var mTypeTv: TextView
+    private var mCatalogTv: TextView
+    private var mSizeTv: TextView
+    private var mTypeContainer: View
+    private var mCatalogContainer: View
+    private var mSizeContainer: View
+
+    private var mTypeFilterArray = ArrayList<SortType>()
+    private var mCatalogFilterArray = ArrayList<CatalogEntity.SubCatalogEntity>()
+    private var sizeFilterArray: ArrayList<SubjectSettingEntity.Size>? = null
+
+    private var mOnCatalogFilterSetupListener: OnCatalogFilterSetupListener? = null
+
+    private var mTypePopupWindow: PopupWindow? = null
+    private var mCatalogPopupWindow: PopupWindow? = null
+    private var mSizePopupWindow: PopupWindow? = null
+
+    init {
+        View.inflate(context, R.layout.layout_catalog_filter, this)
+
+        mTypeTv = findViewById(R.id.type_tv)
+        mCatalogTv = findViewById(R.id.catalog_tv)
+        mSizeTv = findViewById(R.id.size_tv)
+        mTypeContainer = findViewById(R.id.container_type)
+        mCatalogContainer = findViewById(R.id.container_catalog)
+        mSizeContainer = findViewById(R.id.container_size)
+
+        mTypeContainer.setOnClickListener {
+            showSelectTypePopupWindow(this, mTypeTv, mTypeTv.text.toString())
+        }
+
+        mCatalogContainer.setOnClickListener {
+            showSelectCatalogPopupWindow(this, mCatalogTv, mCatalogTv.text.toString())
+        }
+
+        mSizeContainer.setOnClickListener {
+            showSelectSizePopupWindow(this, mSizeTv, mSizeTv.text.toString())
+        }
+    }
+
+    fun setTypeList(switch: CatalogEntity.CatalogSwitch) {
+        switch.run {
+            if ("on" == hotSort) mTypeFilterArray.add(SortType.RECOMMENDED)
+            if ("on" == newSort) mTypeFilterArray.add(SortType.NEWEST)
+            if ("on" == starSort) mTypeFilterArray.add(SortType.RATING)
+        }
+        if (mTypeFilterArray.isNotEmpty()) mTypeTv.text = mTypeFilterArray[0].value
+    }
+
+    fun setCatalogList(subCatalogList: List<CatalogEntity.SubCatalogEntity>, initCatalogName: String) {
+        mCatalogFilterArray = ArrayList(subCatalogList)
+        mCatalogTv.text = initCatalogName
+    }
+
+    fun setOnConfigSetupListener(onCatalogFilterSetupListener: OnCatalogFilterSetupListener) {
+        mOnCatalogFilterSetupListener = onCatalogFilterSetupListener
+    }
+
+    private fun toggleHighlightedTextView(targetTextView: TextView, highlightIt: Boolean) {
+        if (highlightIt) {
+            targetTextView.background = ContextCompat.getDrawable(targetTextView.context, R.drawable.bg_tag_text)
+            targetTextView.setTextColor(Color.WHITE)
+        } else {
+            targetTextView.background = null
+            targetTextView.setTextColor(R.color.text_757575.toColor(context))
+        }
+    }
+
+    private fun showSelectTypePopupWindow(containerView: View, typeTv: TextView, typeText: String) {
+        typeTv.setTextColor(R.color.text_theme.toColor(context))
+        typeTv.setDrawableEnd(R.drawable.ic_filter_arrow_up)
+
+        val inflater = LayoutInflater.from(typeTv.context)
+        val layout = inflater.inflate(R.layout.layout_filter_size, null)
+        val popupWindow = PopupWindow(
+            layout,
+            LayoutParams.MATCH_PARENT,
+            LayoutParams.WRAP_CONTENT
+        ).apply { mTypePopupWindow = this }
+
+        val flexboxLayout = layout.findViewById<FlexboxLayout>(R.id.flexbox)
+        val backgroundView = layout.findViewById<View>(R.id.background)
+
+        backgroundView.setOnClickListener {
+            popupWindow.dismiss()
+        }
+
+        for (type in mTypeFilterArray) {
+            val item = inflater.inflate(R.layout.item_filter_size, flexboxLayout, false)
+
+            // 单列 3 个，强行设置宽度为屏幕的 1/3
+            val width = typeTv.context.resources.displayMetrics.widthPixels / 3
+            val height = item.layoutParams.height
+
+            item.layoutParams = ViewGroup.LayoutParams(width, height)
+            flexboxLayout.addView(item)
+
+            val tv = item.findViewById<TextView>(R.id.size_tv)
+            tv.text = type.value
+
+            toggleHighlightedTextView(tv, typeText == type.value)
+
+            tv.tag = type.value
+
+            item.setOnClickListener {
+                toggleHighlightedTextView(tv, true)
+                popupWindow.dismiss()
+                typeTv.text = type.value
+
+                mOnCatalogFilterSetupListener?.onSetupSortType(type)
+            }
+        }
+
+        popupWindow.setOnDismissListener {
+            typeTv.setTextColor(R.color.text_757575.toColor(context))
+            typeTv.setDrawableEnd(R.drawable.ic_filter_arrow_down)
+            mTypePopupWindow = null
+        }
+
+        popupWindow.isTouchable = true
+        popupWindow.isFocusable = true
+        popupWindow.animationStyle = 0
+        popupWindow.showAsDropDown(containerView, 0, 0)
+    }
+
+    private fun showSelectCatalogPopupWindow(containerView: View, catalogTv: TextView, catalogText: String) {
+        catalogTv.setTextColor(R.color.text_theme.toColor(context))
+        catalogTv.setDrawableEnd(R.drawable.ic_filter_arrow_up)
+
+        val inflater = LayoutInflater.from(catalogTv.context)
+        val layout = inflater.inflate(R.layout.layout_filter_size, null)
+        val popupWindow = PopupWindow(
+            layout,
+            LayoutParams.MATCH_PARENT,
+            LayoutParams.WRAP_CONTENT
+        ).apply { mCatalogPopupWindow = this }
+
+        val flexboxLayout = layout.findViewById<FlexboxLayout>(R.id.flexbox)
+        val backgroundView = layout.findViewById<View>(R.id.background)
+
+        backgroundView.setOnClickListener {
+            popupWindow.dismiss()
+        }
+
+        for (entity in mCatalogFilterArray) {
+            val item = inflater.inflate(R.layout.item_filter_size, flexboxLayout, false)
+
+            // 单列 3 个，强行设置宽度为屏幕的 1/3
+            val width = catalogTv.context.resources.displayMetrics.widthPixels / 3
+            val height = item.layoutParams.height
+
+            item.layoutParams = ViewGroup.LayoutParams(width, height)
+            flexboxLayout.addView(item)
+
+            val tv = item.findViewById<TextView>(R.id.size_tv)
+            val iv = item.findViewById<ImageView>(R.id.recommend_iv)
+            tv.text = entity.name
+            iv.visibleIf(entity.recommended)
+
+            toggleHighlightedTextView(tv, catalogText == entity.name)
+
+            tv.tag = entity.name
+
+            item.setOnClickListener {
+                toggleHighlightedTextView(tv, true)
+                popupWindow.dismiss()
+                catalogTv.text = entity.name
+
+                mOnCatalogFilterSetupListener?.onSetupSortCatalog(entity)
+            }
+        }
+
+        popupWindow.setOnDismissListener {
+            catalogTv.setTextColor(R.color.text_757575.toColor(context))
+            catalogTv.setDrawableEnd(R.drawable.ic_filter_arrow_down)
+            mCatalogPopupWindow = null
+        }
+
+        popupWindow.isTouchable = true
+        popupWindow.isFocusable = true
+        popupWindow.animationStyle = 0
+        popupWindow.showAsDropDown(containerView, 0, 0)
+    }
+
+    private fun showSelectSizePopupWindow(containerView: View, sizeTv: TextView, sizeText: String) {
+        sizeTv.setTextColor(R.color.text_theme.toColor(context))
+        sizeTv.setDrawableEnd(R.drawable.ic_filter_arrow_up)
+
+        val inflater = LayoutInflater.from(sizeTv.context)
+        val layout = inflater.inflate(R.layout.layout_filter_size, null)
+        val popupWindow = PopupWindow(
+            layout,
+            LayoutParams.MATCH_PARENT,
+            LayoutParams.WRAP_CONTENT
+        ).apply { mSizePopupWindow = this }
+
+        val flexboxLayout = layout.findViewById<FlexboxLayout>(R.id.flexbox)
+        val backgroundView = layout.findViewById<View>(R.id.background)
+
+        sizeFilterArray = if (sizeFilterArray == null) {
+            getDefaultSizeFilterArray()
+        } else {
+            sizeFilterArray?.apply {
+                if (firstOrNull()?.text != "全部大小") {
+                    add(0, SubjectSettingEntity.Size(min = -1, max = -1, text = "全部大小"))
+                }
+            }
+        }
+
+        backgroundView.setOnClickListener {
+            popupWindow.dismiss()
+        }
+
+        for (size in sizeFilterArray!!) {
+            val item = inflater.inflate(R.layout.item_filter_size, flexboxLayout, false)
+
+            // 单列 3 个，强行设置宽度为屏幕的 1/3
+            val width = sizeTv.context.resources.displayMetrics.widthPixels / 3
+            val height = item.layoutParams.height
+
+            item.layoutParams = ViewGroup.LayoutParams(width, height)
+            flexboxLayout.addView(item)
+
+            val tv = item.findViewById<TextView>(R.id.size_tv)
+            tv.text = size.text
+
+            toggleHighlightedTextView(tv, sizeText == size.text)
+
+            tv.tag = size.text
+
+            item.setOnClickListener {
+                toggleHighlightedTextView(tv, true)
+                popupWindow.dismiss()
+                sizeTv.text = size.text
+
+                mOnCatalogFilterSetupListener?.onSetupSortSize(size)
+            }
+        }
+
+        popupWindow.setOnDismissListener {
+            sizeTv.setTextColor(R.color.text_757575.toColor(context))
+            sizeTv.setDrawableEnd(R.drawable.ic_filter_arrow_down)
+            mSizePopupWindow = null
+        }
+
+        popupWindow.isTouchable = true
+        popupWindow.isFocusable = true
+        popupWindow.animationStyle = 0
+        popupWindow.showAsDropDown(containerView, 0, 0)
+    }
+
+    private fun getDefaultSizeFilterArray(): ArrayList<SubjectSettingEntity.Size> {
+        return arrayListOf<SubjectSettingEntity.Size>().apply {
+            add(SubjectSettingEntity.Size(min = -1, max = -1, text = "全部大小"))
+            add(SubjectSettingEntity.Size(min = -1, max = 100, text = "100M以下"))
+            add(SubjectSettingEntity.Size(min = 100, max = 300, text = "100-300M"))
+            add(SubjectSettingEntity.Size(min = 300, max = 500, text = "300-500M"))
+            add(SubjectSettingEntity.Size(min = 500, max = 1000, text = "500M-1G"))
+            add(SubjectSettingEntity.Size(min = 1000, max = -1, text = "1G以上"))
+        }
+    }
+
+    fun setRootBackgroundColor(@ColorInt color: Int) {
+        findViewById<View>(R.id.config_controller).setBackgroundColor(color)
+    }
+
+    fun setItemTextColor(@ColorInt color: Int) {
+        mTypeTv.setTextColor(color)
+        mCatalogTv.setTextColor(color)
+        mSizeTv.setTextColor(color)
+    }
+
+    fun updatePopupWindow() {
+        when {
+            mTypePopupWindow != null && mTypePopupWindow!!.isShowing -> {
+                mTypePopupWindow?.dismiss()
+                showSelectTypePopupWindow(this, mTypeTv, mTypeTv.text.toString())
+            }
+
+            mCatalogPopupWindow != null && mCatalogPopupWindow!!.isShowing -> {
+                mCatalogPopupWindow?.dismiss()
+                showSelectCatalogPopupWindow(this, mCatalogTv, mCatalogTv.text.toString())
+            }
+
+            mSizePopupWindow != null && mSizePopupWindow!!.isShowing -> {
+                mSizePopupWindow?.dismiss()
+                showSelectSizePopupWindow(this, mSizeTv, mSizeTv.text.toString())
+            }
+        }
+    }
+
+    interface OnCatalogFilterSetupListener {
+        fun onSetupSortSize(sortSize: SubjectSettingEntity.Size)
+        fun onSetupSortType(sortType: SortType)
+        fun onSetupSortCatalog(sortCatalog: CatalogEntity.SubCatalogEntity)
+    }
+
+    enum class SortType(val value: String) {
+        RECOMMENDED("热门推荐"),
+        NEWEST("最新上线"),
+        RATING("最高评分")
+    }
+}

app/src/main/java/com/gh/common/view/ImageContainerView.kt

@@ -6,21 +6,25 @@ import android.view.LayoutInflater
 import android.view.View
 import android.widget.LinearLayout
 import androidx.core.content.ContextCompat
-import androidx.core.view.get
 import com.facebook.drawee.drawable.ScalingUtils
 import com.facebook.drawee.view.SimpleDraweeView
+import com.gh.common.util.DirectUtils
+import com.gh.gamecenter.ImageViewerActivity
 import com.gh.gamecenter.R
-import com.gh.gamecenter.common.utils.*
+import com.gh.gamecenter.common.utils.ImageUtils
+import com.gh.gamecenter.common.utils.debounceActionWithInterval
+import com.gh.gamecenter.common.utils.dip2px
+import com.gh.gamecenter.common.utils.toResString
 import com.gh.gamecenter.core.utils.DisplayUtils
 import com.gh.gamecenter.core.utils.TopCutProcess
 import com.gh.gamecenter.databinding.ItemCommunityImageBinding
 import com.gh.gamecenter.feature.entity.AnswerEntity
-import com.gh.gamecenter.feature.entity.ImageInfo
+import com.gh.gamecenter.feature.entity.CommunityVideoEntity
 import com.gh.gamecenter.login.user.UserManager
+import com.gh.gamecenter.video.detail.VideoDetailContainerViewModel
 
 class ImageContainerView : LinearLayout {
-
-    private var data: ImageContainerData? = null
+    private var mAnswerEntity: AnswerEntity? = null
 
     //三图默认宽度
     private var mDefaultWidth = 0f
@@ -37,6 +41,9 @@ class ImageContainerView : LinearLayout {
     //长图比例
     private var mLongPictureRatio = 9 / 18f
 
+    private var mEntrance = ""
+    private var mPath = ""
+
     //图片之间的间距
     private val mItemSpace = 4f.dip2px()
     private var mOffset = 0
@@ -44,8 +51,6 @@ class ImageContainerView : LinearLayout {
 
     private val imageViewList = arrayListOf<SimpleDraweeView>()
 
-    private var onImageContainerEventListener: OnImageContainerEventListener? = null
-
     constructor(context: Context) : this(context, null)
     constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0)
     constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
@@ -70,34 +75,40 @@ class ImageContainerView : LinearLayout {
         calculateWidth()
     }
 
-    fun bindData(
-        data: ImageContainerData,
-        listener: OnImageContainerEventListener? = null
-    ) {
-        this.data = data
-        onImageContainerEventListener = listener
+    fun bindData(entity: AnswerEntity, entrance: String = "", path: String = "", imageClick: (() -> Unit)? = null) {
         imageViewList.clear()
-        removeAllViews()
+        if (entity.id != mAnswerEntity?.id) {
+            removeAllViews()
+        }
+        mAnswerEntity = entity
+        mEntrance = entrance
+        mPath = path
         index = 0
-        if (!data.show) {
+        if ((entity.user.id == UserManager.getInstance().userId && entity.videos.isNotEmpty()) ||
+            (entity.user.id != UserManager.getInstance().userId && entity.getPassVideos().isNotEmpty()) ||
+            entity.images.isNullOrEmpty()
+        ) {
             visibility = View.GONE
             return
         }
         visibility = View.VISIBLE
-        if (data.isPostCard) {
+        if (mAnswerEntity?.type == "community_article") {
             //若文章内容含有图片及视频，则信息流卡片，仅展示图片，且标题后带有‘有视频’标签
             //若文章内容仅含有图片，则信息流卡片，仅展示图片，无标签
             //若文章内容仅含有视频，则信息流卡片，仅展示视频，无标签
             when {
-                data.images.isNotEmpty() -> {
-                    data.images.take(3)
-                        .forEach {
-                            bindImage(it.url, it.width, it.height, data.images.size == 1)
-                        }
+                entity.images.isNotEmpty() -> {
+                    val imagesInfo = entity.imagesInfo
+                    val images = entity.images.take(3)
+                    images.forEachIndexed { index, url ->
+                        val width = if (index <= entity.imagesInfo.size - 1) imagesInfo[index].width else 0
+                        val height = if (index <= entity.imagesInfo.size - 1) imagesInfo[index].height else 0
+                        bindImage(url, width, height, images.size == 1, imageClick)
+                    }
                 }
 
-                data.video != null -> {
-                    val video = data.video
+                entity.getPassVideos().isNotEmpty() -> {
+                    val video = entity.getPassVideos()[0]
                     bindVideo(video, video.width, video.height, true)
                 }
 
@@ -109,22 +120,28 @@ class ImageContainerView : LinearLayout {
             //若问答内容含有图片及视频，则信息流卡片，同时展示图片及视频，且参考以往排序逻辑（视频优先放置第一位），无标签
             //若问答内容仅含有图片，则信息流卡片，仅展示图片，无标签
             //若问答内容仅含有视频，则信息流卡片，仅展示视频，无标签
-            if (data.video != null) {
-                val video = data.video
-                bindVideo(video, video.width, video.height, data.images.isNullOrEmpty())
-                data.images.take(2).forEach {
-                    bindImage(it.url, it.width, it.height, false)
+            if (entity.getPassVideos().isNotEmpty()) {
+                val video = entity.getPassVideos()[0]
+                bindVideo(video, video.width, video.height, mAnswerEntity?.images.isNullOrEmpty())
+                entity.images.take(2).forEachIndexed { index, url ->
+                    val imagesInfo = entity.imagesInfo
+                    val width = if (index <= entity.imagesInfo.size - 1) imagesInfo[index].width else 0
+                    val height = if (index <= entity.imagesInfo.size - 1) imagesInfo[index].height else 0
+                    bindImage(url, width, height, false, imageClick)
                 }
             } else {
-                data.images.take(3)
-                    .forEach {
-                        bindImage(it.url, it.width, it.height, data.images.size == 1)
-                    }
+                val images = entity.images.take(3)
+                images.forEachIndexed { index, url ->
+                    val imagesInfo = entity.imagesInfo
+                    val width = if (index <= entity.imagesInfo.size - 1) imagesInfo[index].width else 0
+                    val height = if (index <= entity.imagesInfo.size - 1) imagesInfo[index].height else 0
+                    bindImage(url, width, height, images.size == 1, imageClick)
+                }
             }
         }
     }
 
-    private fun bindVideo(video: ImageContainerData.VideoInfo, width: Int, height: Int, isChangeRatio: Boolean) {
+    private fun bindVideo(video: CommunityVideoEntity, width: Int, height: Int, isChangeRatio: Boolean) {
         val oldView = if (childCount == 0 || index >= childCount) null else getChildAt(index)
         val binding = if (oldView != null) {
             ItemCommunityImageBinding.bind(oldView)
@@ -141,7 +158,16 @@ class ImageContainerView : LinearLayout {
         displayImage(binding, video.poster, width.toFloat(), height.toFloat(), isChangeRatio, true)
         binding.root.setOnClickListener {
             debounceActionWithInterval(it.id, 1000) {
-                onImageContainerEventListener?.onVideoCLick(video.id)
+                if (mAnswerEntity == null) return@debounceActionWithInterval
+                val videoEntity = mAnswerEntity!!.getPassVideos().firstOrNull()
+                DirectUtils.directToVideoDetail(
+                    context,
+                    videoEntity?.id ?: "",
+                    VideoDetailContainerViewModel.Location.VIDEO_HOT.value,
+                    showComment = false,
+                    entrance = mEntrance,
+                    path = mPath
+                )
             }
         }
         index++
@@ -151,7 +177,8 @@ class ImageContainerView : LinearLayout {
         url: String,
         width: Int,
         height: Int,
-        isChangeRatio: Boolean
+        isChangeRatio: Boolean,
+        imageClick: (() -> Unit)?
     ) {
         val oldView = if (childCount == 0 || index >= childCount) null else getChildAt(index)
         val binding = if (oldView != null) {
@@ -168,21 +195,25 @@ class ImageContainerView : LinearLayout {
         binding.videoPlay.visibility = View.GONE
         displayImage(binding, url, width.toFloat(), height.toFloat(), isChangeRatio)
         binding.root.setOnClickListener {
-            if (data?.status == "pending" || data?.status == "fail") return@setOnClickListener
+            if (mAnswerEntity?.status == "pending" || mAnswerEntity?.status == "fail") return@setOnClickListener
+            imageClick?.invoke()
             debounceActionWithInterval(it.id, 1000) {
-                data?.run {
-                    val position = if (isPostCard) {
-                        binding.root.tag as Int
-                    } else {
-                        if (video == null) binding.root.tag as Int else (binding.root.tag as Int) - 1
-                    }
-                    onImageContainerEventListener?.onImageClick(
-                        images.map(ImageContainerData.ImageInfo::url),
-                        position,
-                        imageViewList
-                    )
+                if (mAnswerEntity == null) return@debounceActionWithInterval
+                val position = if (mAnswerEntity?.type == "community_article") {
+                    binding.root.tag as Int
+                } else {
+                    if (mAnswerEntity!!.getPassVideos()
+                            .isNullOrEmpty()
+                    ) binding.root.tag as Int else (binding.root.tag as Int) - 1
                 }
-
+                if (mAnswerEntity?.communityId.isNullOrEmpty()) {
+                    mAnswerEntity?.communityId = mAnswerEntity?.bbs?.id
+                }
+                val intent = ImageViewerActivity.getIntent(
+                    context, mAnswerEntity!!.images as ArrayList<String>, position, imageViewList,
+                    if (mAnswerEntity?.type == "community_article") mAnswerEntity else null, mEntrance, true
+                )
+                context.startActivity(intent)
             }
         }
         index++
@@ -248,7 +279,7 @@ class ImageContainerView : LinearLayout {
         }
 
         binding.pendingView.run {
-            when (data?.status) {
+            when (mAnswerEntity?.status) {
                 "pending" -> {
                     visibility = View.VISIBLE
                     text = R.string.pending_status.toResString()
@@ -266,7 +297,7 @@ class ImageContainerView : LinearLayout {
         }
 
 
-        val imageCount = data?.images?.size ?: 0
+        val imageCount = mAnswerEntity?.images?.size ?: 0
         if (!isVideo && index == 2 && imageCount > 3) {
             binding.labelIcon.visibility = View.GONE
             binding.durationOrNumTv.visibility = View.VISIBLE
@@ -277,80 +308,4 @@ class ImageContainerView : LinearLayout {
         if (index != 0) params.leftMargin = mItemSpace
         binding.root.layoutParams = params
     }
-
-    companion object {
-
-        private const val COMMUNITY_ARTICLE = "community_article"
-
-        fun AnswerEntity.toImageContainerData(): ImageContainerData {
-            val imageInfoList = arrayListOf<ImageContainerData.ImageInfo>()
-            images.forEachIndexed { index, url ->
-                if (index < 3) {
-                    imageInfoList.add(ImageContainerData.ImageInfo(url))
-                }
-            }
-            imageInfoList.forEachIndexed { index, imageInfo ->
-                val item = imagesInfo.getOrNull(index)
-                if (item != null) {
-                    imageInfo.width = item.width
-                    imageInfo.height = item.height
-                }
-            }
-            val video =
-                getPassVideos().firstOrNull()?.let {
-                    ImageContainerData.VideoInfo(
-                        it.id,
-                        it.duration,
-                        it.poster,
-                        it.width,
-                        it.height
-                    )
-                }
-            val show = !((user.id == UserManager.getInstance().userId && videos.isNotEmpty())
-                    || (user.id != UserManager.getInstance().userId && getPassVideos().isNotEmpty())
-                    || images.isNullOrEmpty())
-            return ImageContainerData(
-                status = status,
-                isPostCard = type == COMMUNITY_ARTICLE,
-                images = imageInfoList,
-                video = video,
-                show
-            )
-        }
-
-    }
-
-    data class ImageContainerData(
-        val status: String,
-        val isPostCard: Boolean,    // 是否是帖子卡片
-        val images: List<ImageInfo>,
-        val video: VideoInfo? = null,
-        val show: Boolean
-    ) {
-
-        data class ImageInfo(
-            val url: String,
-            var width: Int = 0,
-            var height: Int = 0
-        )
-
-        data class VideoInfo(
-            val id: String,
-            val duration: String,
-            val poster: String,
-            var width: Int = 0,
-            var height: Int = 0,
-        )
-    }
-
-    interface OnImageContainerEventListener {
-
-        fun onImageClick(
-            images: List<String>,
-            position: Int,
-            imageViewList: ArrayList<SimpleDraweeView>
-        )
-
-        fun onVideoCLick(videoId: String)
-    }
 }

app/src/main/java/com/gh/common/view/InterceptTouchContainView.kt

@@ -1,18 +0,0 @@
-package com.gh.common.view
-
-import android.content.Context
-import android.util.AttributeSet
-import android.view.MotionEvent
-import android.widget.FrameLayout
-import androidx.constraintlayout.widget.ConstraintLayout
-
-class InterceptTouchContainView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0,
-) : FrameLayout(context, attrs, defStyleAttr) {
-
-    override fun onInterceptTouchEvent(ev: MotionEvent?): Boolean {
-        return true
-    }
-}

app/src/main/java/com/gh/common/view/SingleCardTagContainerView.kt

@@ -1,65 +0,0 @@
-package com.gh.common.view
-
-import android.content.Context
-import android.os.Build
-import android.util.AttributeSet
-import android.widget.LinearLayout
-import android.widget.TextView
-import androidx.core.view.children
-import com.gh.gamecenter.R
-import com.gh.gamecenter.common.utils.toColor
-import com.gh.gamecenter.common.utils.visibleIf
-
-/**
- *  单游戏卡片标签样式专用
- *  根据宽度展示标签个数，最多展示三个标签
- */
-class SingleCardTagContainerView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-) : LinearLayout(context, attrs) {
-
-    private val childViews = arrayListOf<TextView>()
-
-    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec)
-        children.forEach {
-            // 父容器不限制子View的宽度
-            it.measure(MeasureSpec.UNSPECIFIED, heightMeasureSpec)
-        }
-    }
-
-    override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) {
-        super.onLayout(changed, l, t, r, b)
-        // 如果有显示不完整的标签，直接隐藏
-        children.forEach {
-            it.visibleIf(it.right <= width)
-        }
-    }
-
-    fun setData(tags: List<String>) {
-        removeAllViews()
-        tags.forEachIndexed { index, tag ->
-            if (index < 3) {
-                // 缓存子View 避免频繁创建新View
-                val tvTag = childViews.getOrNull(index) ?: TextView(context).also { childViews.add(it) }
-                if (index == 0) {
-                    tvTag.text = tag
-                } else {
-                    tvTag.text = "$DELIMITER$tag"
-                }
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                    tvTag.setTextAppearance(R.style.TextCaption2)
-                } else {
-                    tvTag.setTextAppearance(context, R.style.TextCaption2)
-                }
-                tvTag.setTextColor(R.color.text_tertiary.toColor(context))
-                addView(tvTag)
-            }
-        }
-    }
-
-    companion object {
-        private const val DELIMITER = "·"
-    }
-}

app/src/main/java/com/gh/common/view/SubCategoryView.kt

@@ -0,0 +1,64 @@
+package com.gh.common.view
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import android.widget.LinearLayout
+import android.widget.TextView
+import com.gh.gamecenter.R
+import com.gh.gamecenter.category.CategoryListActivity
+import com.gh.gamecenter.entity.CategoryEntity
+
+class SubCategoryView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) :
+    LinearLayout(context, attrs, defStyleAttr) {
+
+    var leftTv: TextView
+    var centerTv: TextView
+    var rightTv: TextView
+
+    var leftDivider: View
+    var rightDivider: View
+
+    var primeCategory: CategoryEntity? = null
+    var categoryTitle: String? = ""
+
+    init {
+        View.inflate(context, R.layout.layout_sub_category, this)
+
+        leftTv = findViewById(R.id.tv_left_sub_category)
+        centerTv = findViewById(R.id.tv_center_sub_category)
+        rightTv = findViewById(R.id.tv_right_sub_category)
+
+        leftDivider = findViewById(R.id.divider_left)
+        rightDivider = findViewById(R.id.divider_right)
+    }
+
+    fun setLeftCategory(category: CategoryEntity) {
+        setCategory(leftTv, category)
+    }
+
+    fun setCenterCategory(category: CategoryEntity) {
+        setCategory(centerTv, category)
+        leftDivider.visibility = View.VISIBLE
+    }
+
+    fun setRightCategory(category: CategoryEntity) {
+        setCategory(rightTv, category)
+        rightDivider.visibility = View.VISIBLE
+    }
+
+    private fun setCategory(tv: TextView, category: CategoryEntity) {
+        tv.text = category.name
+        tv.setOnClickListener {
+            tv.context.startActivity(
+                CategoryListActivity.getIntent(
+                    tv.context,
+                    categoryTitle!!,
+                    primeCategory!!,
+                    category.name!!
+                )
+            )
+        }
+    }
+
+}

app/src/main/java/com/gh/common/xapk/XapkDialogHelper.kt

@@ -6,12 +6,8 @@ import android.content.Context
 import android.content.Intent
 import android.graphics.Color
 import android.os.Build
-import android.text.SpannableStringBuilder
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
-import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.core.text.underline
-import androidx.core.view.updateLayoutParams
 import com.gh.common.util.NewFlatLogUtils
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.activityresult.ActResultRequest
@@ -41,14 +37,6 @@ object XapkDialogHelper {
 
         val previousShowedDialog = mUnzipFailureDialogRef?.get()
 
-        val useRebootStyle = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
-
-        val content = if (useRebootStyle) {
-            "未授权允许未知来源安装、数据包格式、设备兼容性…等均可能导致解压失败。"
-        } else {
-            "未授权允许未知来源安装、数据包格式、设备兼容性…等均可能导致解压失败。\n如果开启权限后仍未能解决，请提交反馈帮助我们改进。"
-        }
-
         if (previousShowedDialog != null
             && previousShowedDialog.isShowing
             && context == previousShowedDialog.ownerActivity
@@ -60,9 +48,9 @@ object XapkDialogHelper {
         val dialog = DialogHelper.showGuideDialog(
             context = context,
             title = "",
-            content = content,
+            content = "未授权允许未知来源安装、数据包格式、设备兼容性…等均可能导致解压失败。\n如果开启权限后仍未能解决，请提交反馈帮助我们改进。",
             confirmText = "开启权限",
-            cancelText = if (useRebootStyle) "重启助手" else "提交反馈",
+            cancelText = "提交反馈",
             confirmClickCallback = {
                 if (context is AppCompatActivity) {
                     val intent = PermissionHelper.getToInstallPermissionSettingIntent(context)
@@ -95,7 +83,11 @@ object XapkDialogHelper {
                             )
 
                             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-                                restart(context)
+                                val pm = context.packageManager
+                                val restartIntent = pm.getLaunchIntentForPackage(context.packageName)
+                                val mainIntent = Intent.makeRestartActivityTask(restartIntent!!.component)
+                                context.startActivity(mainIntent)
+                                Runtime.getRuntime().exit(0)
                             } else {
                                 XapkInstaller.install(context, downloadEntity, true)
                             }
@@ -108,22 +100,27 @@ object XapkDialogHelper {
                 }
             },
             cancelClickCallback = {
-                if (useRebootStyle) {
-                    // 记录应用重启前需要重解压的信息
-                    SPUtils.setString(Constants.SP_XAPK_UNZIP_ACTIVITY, context.javaClass.name)
-                    SPUtils.setString(Constants.SP_XAPK_URL, downloadEntity.url)
+                val hint = "游戏安装包解压失败，问题反馈："
+                HelpAndFeedbackBridge.startSuggestionActivity(
+                    context,
+                    SuggestType.GAME,
+                    null,
+                    hint,
+                    SimpleGameEntity(downloadEntity.gameId, downloadEntity.name, downloadEntity.icon)
+                )
+                NewFlatLogUtils.logXApkUnzipFailedDialogClick(
+                    "提交反馈",
+                    false,
+                    downloadEntity.gameId,
+                    downloadEntity.name
+                )
 
-                    SensorsBridge.trackGameDecompressionFailedDialogClick(
-                        buttonName = "重启助手",
-                        downloadEntity.gameId,
-                        downloadEntity.name,
-                        downloadEntity.categoryChinese
-                    )
-
-                    restart(context)
-                } else {
-                    doFeedback(context, downloadEntity)
-                }
+                SensorsBridge.trackGameDecompressionFailedDialogClick(
+                    buttonName = "提交反馈",
+                    downloadEntity.gameId,
+                    downloadEntity.name,
+                    downloadEntity.categoryChinese
+                )
             },
             uiModificationCallback = { binding ->
                 binding.headIv.setBackgroundResource(R.drawable.dialog_unzip_failure_head_background)
@@ -149,30 +146,6 @@ object XapkDialogHelper {
                     )
                     binding.dismiss()
                 }
-                if (useRebootStyle) {
-                    val spannableString = SpannableStringBuilder()
-                        .append("未能解决问题？点击 ")
-                        .underline { append("提交反馈") }
-                        .append(" ")
-                    binding.alternativeCancelTv.visibility = View.VISIBLE
-                    binding.alternativeCancelTv.text = spannableString
-                    binding.alternativeCancelTv.setTextColor(R.color.text_secondary.toColor(context))
-                    binding.alternativeCancelTv.setDrawableEnd(R.drawable.ic_right_arrow_xapk)
-                    binding.alternativeCancelTv.setOnClickListener {
-                        doFeedback(context, downloadEntity)
-                    }
-
-                    binding.hintTv.text = "开启权限后请务必重启光环助手，再进行安装"
-                    binding.hintTv.setTextColor(R.color.text_theme.toColor(context))
-                    binding.hintTv.setTextAppearance(R.style.TextCaption1)
-                    binding.hintTv.visibility = View.VISIBLE
-                    binding.hintTv.updateLayoutParams<ConstraintLayout.LayoutParams> {
-                        topMargin = 8F.dip2px()
-                    }
-                    binding.confirmTv.updateLayoutParams<ConstraintLayout.LayoutParams> {
-                        topMargin = 16F.dip2px()
-                    }
-                }
             },
             touchOutsideCallback = {
                 SensorsBridge.trackGameDecompressionFailedDialogClick(
@@ -191,37 +164,4 @@ object XapkDialogHelper {
         mUnzipFailureDialogRef = WeakReference(dialog)
     }
 
-    private fun restart(context: Context) {
-        val pm = context.packageManager
-        val restartIntent = pm.getLaunchIntentForPackage(context.packageName)
-        val mainIntent = Intent.makeRestartActivityTask(restartIntent!!.component)
-        context.startActivity(mainIntent)
-        Runtime.getRuntime().exit(0)
-    }
-
-    private fun doFeedback(context: Context, downloadEntity: DownloadEntity) {
-        val hint = "游戏安装包解压失败，问题反馈："
-
-        HelpAndFeedbackBridge.startSuggestionActivity(
-            context,
-            SuggestType.GAME,
-            null,
-            hint,
-            SimpleGameEntity(downloadEntity.gameId, downloadEntity.name, downloadEntity.icon?: "")
-        )
-        NewFlatLogUtils.logXApkUnzipFailedDialogClick(
-            "提交反馈",
-            false,
-            downloadEntity.gameId,
-            downloadEntity.name
-        )
-
-        SensorsBridge.trackGameDecompressionFailedDialogClick(
-            buttonName = "提交反馈",
-            downloadEntity.gameId,
-            downloadEntity.name,
-            downloadEntity.categoryChinese
-        )
-    }
-
 }

app/src/main/java/com/gh/common/xapk/XapkInstaller.kt

@@ -6,7 +6,10 @@ import android.content.Intent
 import android.os.Build
 import android.os.Environment
 import android.provider.Settings
+import androidx.appcompat.app.AppCompatActivity
 import com.gh.common.constant.Config
+import com.gh.common.dialog.ManagerAllFilesPermissionDialogFragment
+import com.gh.common.util.*
 import com.gh.common.util.DirectUtils
 import com.gh.common.util.DownloadNotificationHelper
 import com.gh.common.util.PackageInstaller
@@ -16,17 +19,15 @@ import com.gh.gamecenter.R
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.core.AppExecutor
+import com.gh.gamecenter.core.utils.CurrentActivityHolder
+import com.gh.gamecenter.core.utils.SentryHelper
 import com.gh.gamecenter.core.utils.ToastUtils
-import com.gh.gamecenter.feature.utils.SentryHelper
 import com.gh.gamecenter.xapk.XApkUnZipper
 import com.gh.gamecenter.xapk.core.XApkFile
 import com.gh.gamecenter.xapk.core.XApkUnZipCallback
 import com.gh.gamecenter.xapk.core.XApkUnZipEntry
 import com.gh.gamecenter.xapk.core.XApkUnZipOutputFactory
-import com.gh.gamecenter.xapk.io.NonSplitApksOutput
-import com.gh.gamecenter.xapk.io.OBBFileOutput
-import com.gh.gamecenter.xapk.io.SplitApksOutput
-import com.gh.gamecenter.xapk.io.XApkFileOutput
+import com.gh.gamecenter.xapk.io.*
 import com.gh.gamecenter.xapk.pi.IPackageInstaller
 import com.gh.ndownload.NDataChanger
 import com.halo.assistant.HaloApp
@@ -47,6 +48,8 @@ import java.util.*
 @SuppressLint("StaticFieldLeak")
 object XapkInstaller : XApkUnZipCallback, XApkUnZipOutputFactory {
 
+    private const val XAPK_PACKAGE_PATH_TAG = "xapk_package_path"
+
     const val XAPK_EXTENSION_NAME = "xapk"
 
     // 通过解压过程存放于 DownloadEntity meta
@@ -56,21 +59,12 @@ object XapkInstaller : XApkUnZipCallback, XApkUnZipOutputFactory {
     const val XAPK_DATA_EXTENSION_NAME = "obb"
     const val PACKAGE_EXTENSION_NAME = "apk"
 
-    // 系统是否有 obb 访问漏洞
-    val systemHasFlaw by lazy {
-        val systemMatched = Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE
-        val rootPath = Environment.getExternalStorageDirectory().path
-        val fileListMatched = File(rootPath, "Android").list().contentEquals(File(rootPath, "\u200bAndroid").list())
-
-        systemMatched && fileListMatched
-    }
-
     private const val GUIDE_TYPE_MIUI_OPTIMIZATION = "miui_optimization"
     private const val MIUI_OPTIMIZATION_WARNING_DIALOG_ENTRANCE = "MIUI优化关闭提示弹窗"
 
     private var mContext = HaloApp.getInstance().application.applicationContext
 
-    private val mXApkUnZipper = XApkUnZipper(this, useFlawToUnzip = systemHasFlaw)
+    private val mXApkUnZipper = XApkUnZipper(this)
         .also {
             it.registerCallback(this)
         }
@@ -120,7 +114,7 @@ object XapkInstaller : XApkUnZipCallback, XApkUnZipOutputFactory {
                 return
             }
 
-            PermissionHelper.checkManageAllFilesOrStoragePermissionBeforeAction(context) {
+            if (checkPermission(downloadEntity, showUnzipToast)) {
                 DownloadManager.getInstance().getDownloadEntitySnapshot(downloadEntity.url, downloadEntity.gameId)
                     ?.let {
                         unzipXapkFile(it)
@@ -135,6 +129,23 @@ object XapkInstaller : XApkUnZipCallback, XApkUnZipOutputFactory {
         }
     }
 
+    private fun checkPermission(downloadEntity: DownloadEntity, showUnzipToast: Boolean = false): Boolean {
+        // 安卓11以上系统需要开启所有文件访问权限
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
+            && !Environment.isExternalStorageManager()) {
+            CurrentActivityHolder.getCurrentActivity()?.let {
+                ManagerAllFilesPermissionDialogFragment.show(it as AppCompatActivity) {
+                    unzipXapkFile(downloadEntity)
+                    if (showUnzipToast) {
+                        Utils.toast(mContext, "解压过程请勿退出光环助手！")
+                    }
+                }
+            }
+            return false
+        }
+        return true
+    }
+
     private fun unzipXapkFile(downloadEntity: DownloadEntity) {
         mXApkUnZipper.unzip(
             XApkUnZipEntry(
@@ -351,7 +362,7 @@ object XapkInstaller : XApkUnZipCallback, XApkUnZipOutputFactory {
 
             mPendingSessionInfoMap[downloadEntity.path] = XapkPendingSessionInfo(downloadEntity.path, sessionId)
             AppExecutor.ioExecutor.execute {// 有可能卡顿造成anr
-                PackageInstaller.installMultiple(applicationContext, downloadEntity.packageName, downloadEntity.path, sessionId)
+                PackageInstaller.installMultiple(applicationContext, downloadEntity.path, sessionId)
                 NDataChanger.notifyDataChanged(downloadEntity)
             }
         }

app/src/main/java/com/gh/download/DownloadDataHelper.kt

@@ -10,8 +10,8 @@ import com.gh.gamecenter.common.exposure.meta.MetaUtil
 import com.gh.gamecenter.common.exposure.meta.MetaUtil.getMeta
 import com.gh.gamecenter.common.loghub.LoghubUtils
 import com.gh.gamecenter.common.utils.*
+import com.gh.gamecenter.core.utils.SentryHelper
 import com.gh.ndownload.NDataChanger
-import com.gh.ndownload.NDownloadBridge
 import com.halo.assistant.HaloApp
 import com.lightgame.download.DownloadConfig
 import com.lightgame.download.DownloadEntity
@@ -124,7 +124,6 @@ object DownloadDataHelper {
             val payloadObject = JSONObject()
             payloadObject.put("host", downloadEntity.meta[DownloadEntity.DOWNLOAD_HOST_KEY] ?: "unknown")
             payloadObject.put("path", downloadEntity.meta[DownloadEntity.DOWNLOAD_PATH_KEY] ?: "unknown")
-            payloadObject.put("redirected_host_list", downloadEntity.meta[NDownloadBridge.REDIRECTED_HOST_LIST] ?: "unknown")
             payloadObject.put("game_id", downloadEntity.gameId)
             payloadObject.put("gameName", downloadEntity.name)
             payloadObject.put("platform", downloadEntity.platform)
@@ -213,7 +212,6 @@ object DownloadDataHelper {
 
             payloadObject.put("host", downloadEntity.meta[DownloadEntity.DOWNLOAD_HOST_KEY] ?: "unknown")
             payloadObject.put("path", downloadEntity.meta[DownloadEntity.DOWNLOAD_PATH_KEY] ?: "unknown")
-            payloadObject.put("redirected_host_list", downloadEntity.meta[NDownloadBridge.REDIRECTED_HOST_LIST] ?: "unknown")
             payloadObject.put("game_id", downloadEntity.gameId)
             payloadObject.put("gameName", downloadEntity.name)
             payloadObject.put("platform", downloadEntity.platform)
@@ -253,7 +251,6 @@ object DownloadDataHelper {
 
             payloadObject.put("host", downloadEntity.meta[DownloadEntity.DOWNLOAD_HOST_KEY] ?: "unknown")
             payloadObject.put("path", downloadEntity.meta[DownloadEntity.DOWNLOAD_PATH_KEY] ?: "unknown")
-            payloadObject.put("redirected_host_list", downloadEntity.meta[NDownloadBridge.REDIRECTED_HOST_LIST] ?: "unknown")
             payloadObject.put("game_id", downloadEntity.gameId)
             payloadObject.put("gameName", downloadEntity.name)
             payloadObject.put("platform", downloadEntity.platform)
@@ -318,7 +315,6 @@ object DownloadDataHelper {
 
             payloadObject.put("host", downloadEntity.meta[DownloadEntity.DOWNLOAD_HOST_KEY] ?: "unknown")
             payloadObject.put("path", downloadEntity.meta[DownloadEntity.DOWNLOAD_PATH_KEY] ?: "unknown")
-            payloadObject.put("redirected_host_list", downloadEntity.meta[NDownloadBridge.REDIRECTED_HOST_LIST] ?: "unknown")
             payloadObject.put("game_id", downloadEntity.gameId)
             payloadObject.put("gameName", downloadEntity.name)
             payloadObject.put("platform", downloadEntity.platform)
@@ -361,7 +357,6 @@ object DownloadDataHelper {
                     sheet = JSONObject()
                     sheet.put("host", downloadEntity.meta[DownloadEntity.DOWNLOAD_HOST_KEY] ?: "unknown")
                     sheet.put("path", downloadEntity.meta[DownloadEntity.DOWNLOAD_PATH_KEY] ?: "unknown")
-                    sheet.put("redirected_host_list", downloadEntity.meta[NDownloadBridge.REDIRECTED_HOST_LIST] ?: "unknown")
                     sheet.put("game_id", downloadEntity.gameId)
                     sheet.put("platform", downloadEntity.platform)
                     sheet.put("package", downloadEntity.packageName)
@@ -381,7 +376,6 @@ object DownloadDataHelper {
                         "path",
                         downloadEntity.meta[DownloadEntity.DOWNLOAD_PATH_KEY] ?: "unknown"
                     ) // 初始化记录的 path 为空
-                    sheet.put("redirected_host_list", downloadEntity.meta[NDownloadBridge.REDIRECTED_HOST_LIST] ?: "unknown")
                     sheet.put("total_size", downloadEntity.size / 1024 / 1024) // 初始化记录的 total_size 有可能为0
                     sheet.put("progress_size", downloadEntity.progress / 1024 - progressSize)
                     sheet.put("current_progress_size", downloadEntity.progress / 1024)

app/src/main/java/com/gh/download/DownloadManager.java

@@ -20,9 +20,9 @@ import com.gh.gamecenter.common.utils.ExtensionsKt;
 import com.gh.gamecenter.common.utils.SensorsBridge;
 import com.gh.gamecenter.core.AppExecutor;
 import com.gh.gamecenter.common.constant.Constants;
-import com.gh.gamecenter.core.GHThreadFactory;
 import com.gh.gamecenter.feature.entity.TagStyleEntity;
 import com.gh.gamecenter.feature.entity.CustomPageTrackData;
+import com.gh.gamecenter.feature.entity.TagStyleEntity;
 import com.gh.gamecenter.feature.exposure.ExposureEvent;
 import com.gh.common.exposure.ExposureUtils;
 import com.gh.common.history.HistoryHelper;
@@ -34,13 +34,20 @@ import com.gh.common.util.LunchType;
 import com.gh.common.util.PackageInstaller;
 import com.gh.common.util.PackageUtils;
 import com.gh.gamecenter.BuildConfig;
+import com.gh.gamecenter.common.base.GlobalActivityManager;
+import com.gh.gamecenter.common.constant.Constants;
 import com.gh.gamecenter.common.exposure.meta.MetaUtil;
 import com.gh.gamecenter.common.utils.DeviceUtils;
+import com.gh.gamecenter.common.utils.ExtensionsKt;
 import com.gh.gamecenter.common.utils.FileUtils;
 import com.gh.gamecenter.common.utils.NetworkUtils;
+import com.gh.gamecenter.common.utils.SensorsBridge;
+import com.gh.gamecenter.core.AppExecutor;
+import com.gh.gamecenter.core.utils.AppDebugConfig;
 import com.gh.gamecenter.core.utils.GsonUtils;
 import com.gh.gamecenter.core.utils.PageSwitchDataHelper;
 import com.gh.gamecenter.core.utils.SPUtils;
+import com.gh.gamecenter.core.utils.SentryHelper;
 import com.gh.gamecenter.download.DownloadedGameIdAndPackageNameDao;
 import com.gh.gamecenter.entity.GameUpdateEntity;
 import com.gh.gamecenter.entity.HomePluggableFilterEntity;
@@ -48,7 +55,7 @@ import com.gh.gamecenter.eventbus.EBDownloadStatus;
 import com.gh.gamecenter.feature.entity.ApkEntity;
 import com.gh.gamecenter.feature.entity.GameEntity;
 import com.gh.gamecenter.feature.entity.PluginLocation;
-import com.gh.gamecenter.feature.utils.SentryHelper;
+import com.gh.gamecenter.feature.exposure.ExposureEvent;
 import com.gh.gamecenter.login.user.UserManager;
 import com.gh.gamecenter.manager.PackagesManager;
 import com.gh.gamecenter.packagehelper.PackageRepository;
@@ -57,6 +64,7 @@ import com.gh.ndownload.NDownloadBridge;
 import com.gh.ndownload.NDownloadService;
 import com.gh.vspace.VHelper;
 import com.halo.assistant.HaloApp;
+import com.lightgame.download.ConnectionUtils;
 import com.lightgame.download.DataWatcher;
 import com.lightgame.download.DownloadConfig;
 import com.lightgame.download.DownloadDao;
@@ -77,8 +85,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.concurrent.LinkedBlockingQueue;
 
 public class DownloadManager implements DownloadStatusListener {
@@ -105,9 +111,6 @@ public class DownloadManager implements DownloadStatusListener {
 
     private final Set<String> mUpdateMarks;
 
-    private final ExecutorService packageExecutor
-            = Executors.newSingleThreadExecutor(new GHThreadFactory("GH_DOWNLOAD_MANAGER_THREAD"));
-
     @Override
     public void onTaskCancelled(DownloadEntity entity) {
         EBDownloadStatus status = new EBDownloadStatus("delete", entity.getName(),
@@ -176,6 +179,9 @@ public class DownloadManager implements DownloadStatusListener {
 
         mUpdateMarks = SPUtils.getStringSet(UPDATE_IS_READ_MARK);
 
+        // 只有下载模块需要这坨东西，因此移动到这里初始化
+        ConnectionUtils.initHttpsUrlConnection(mContext);
+
         updateDownloadMetaMap();
 
         lastTimeMap = new ArrayMap<>();
@@ -298,7 +304,7 @@ public class DownloadManager implements DownloadStatusListener {
             // 下载模拟器游戏配置文件，地址是 "模拟器游戏类型根目录/cheat/"
             if (!TextUtils.isEmpty(gameEntity.getSimulatorGameConfig())) {
                 String configFilePath = SimulatorGameManager.getPathByType(gameEntity.getSimulatorType()) + "/cheat/" + apkEntity.getPackageName() + ".ini";
-                getInstance().packageExecutor.execute(() -> {
+                AppExecutor.getIoExecutor().execute(() -> {
                     FileUtils.downloadFile(gameEntity.getSimulatorGameConfig(), configFilePath);
                 });
             }
@@ -356,10 +362,9 @@ public class DownloadManager implements DownloadStatusListener {
             ExtensionsKt.addMetaExtra(downloadEntity, Constants.EXTRA_DOWNLOAD_TYPE, Constants.VGAME);
             ExtensionsKt.addMetaExtra(downloadEntity, DownloadConfig.KEY_PROGRESS_CALLBACK_INTERVAL, "200");
             ExtensionsKt.addMetaExtra(downloadEntity, VHelper.KEY_REQUIRED_G_APPS, gameEntity.getGAppsSwitch());
+            ExtensionsKt.addMetaExtra(downloadEntity, VHelper.KEY_BIT, apkEntity.getBit());
         }
 
-        ExtensionsKt.addMetaExtra(downloadEntity, Constants.KEY_BIT, apkEntity.getBit());
-
         // 记录是否为双下载按钮模式
         if (isDualDownloadTypeEnabled) {
             if (asVGame) {
@@ -542,7 +547,6 @@ public class DownloadManager implements DownloadStatusListener {
             checkDownloadEntryRecordValidate(url);
             if (isDownloadCompleted(url)) {
                 downloadEntity.setStatus(DownloadStatus.done);
-                mDownloadDao.newOrUpdate(downloadEntity);
                 NDataChanger.INSTANCE.notifyDataChanged(downloadEntity);
             } else if (!isTaskDownloading(url)) {
                 DownloadEntity daoEntity = mDownloadDao.get(downloadEntity.getUrl());
@@ -657,7 +661,7 @@ public class DownloadManager implements DownloadStatusListener {
      * @return 下载任务快照列表
      */
     @NonNull
-    public ArrayList<DownloadEntity> getAllDownloadEntitySnapshots() {
+    private ArrayList<DownloadEntity> getAllDownloadEntitySnapshots() {
         return mDownloadDao.getAllSnapshots();
     }
 
@@ -913,7 +917,7 @@ public class DownloadManager implements DownloadStatusListener {
         DownloadEntity entry = mDownloadDao.getSnapshot(url);
         DownloadDataSimpleHelper.INSTANCE.removeDownloadSimpleEntity(url);
         if (entry != null) {
-            getInstance().packageExecutor.execute(() -> {
+            AppExecutor.getIoExecutor().execute(() -> {
                 NDownloadBridge.INSTANCE.cancel(url);
 
                 mDownloadDao.delete(url);
@@ -955,6 +959,7 @@ public class DownloadManager implements DownloadStatusListener {
 
         // 改任务队列的状态
         NDataChanger.INSTANCE.getDownloadingTaskUrlSet().remove(entry.getUrl());
+        NDataChanger.INSTANCE.getDownloadEntries().remove(entry.getUrl());
         if (!cancelSilently) {
             NDataChanger.INSTANCE.notifyDataChanged(entry);
             onTaskCancelled(entry);
@@ -967,9 +972,9 @@ public class DownloadManager implements DownloadStatusListener {
      * 暂停所有正在下载的任务
      */
     public void pauseAll() {
-        synchronized (NDataChanger.INSTANCE.getDownloadingTaskUrlSet()) {
-            for (String url : NDataChanger.INSTANCE.getDownloadingTaskUrlSet()) {
-                pause(url);
+        synchronized (NDataChanger.INSTANCE.getDownloadEntries()) {
+            for (DownloadEntity entity : NDataChanger.INSTANCE.getDownloadEntries().values()) {
+                pause(entity.getUrl());
             }
         }
         Utils.log(DownloadManager.class.getSimpleName(), "pause all");
@@ -980,7 +985,7 @@ public class DownloadManager implements DownloadStatusListener {
      */
     public void pause(String url) {
         checkDownloadEntryRecordValidate(url);
-        DownloadEntity entry = getDownloadEntitySnapshot(url);
+        DownloadEntity entry = NDataChanger.INSTANCE.getDownloadEntries().get(url);
         if (entry != null) {
             startDownloadService(entry, DownloadStatus.pause);
             put(url, System.currentTimeMillis());
@@ -996,21 +1001,19 @@ public class DownloadManager implements DownloadStatusListener {
      * 3.检查是否显示下载通知栏
      */
     public void initDownloadService() {
-        packageExecutor.execute(() -> {
-            final Set<String> urlSet = NDataChanger.INSTANCE.getDownloadingTaskUrlSet();
-            for (DownloadEntity downloadEntity : getAllDownloadEntity()) {
-                if (!urlSet.contains(downloadEntity.getUrl())
-                        && (downloadEntity.getStatus().equals(DownloadStatus.downloading)
-                        || downloadEntity.getStatus().equals(DownloadStatus.waiting))) {
-                    downloadEntity.setStatus(DownloadStatus.subscribe);
-                    mDownloadDao.newOrUpdate(downloadEntity);
-                    NDataChanger.INSTANCE.notifyDataChanged(downloadEntity);
-                }
+        final Set<String> urlSet = NDataChanger.INSTANCE.getDownloadingTaskUrlSet();
+        for (DownloadEntity downloadEntity : getAllDownloadEntity()) {
+            if (!urlSet.contains(downloadEntity.getUrl())
+                    && (downloadEntity.getStatus().equals(DownloadStatus.downloading)
+                    || downloadEntity.getStatus().equals(DownloadStatus.waiting))) {
+                downloadEntity.setStatus(DownloadStatus.subscribe);
+                mDownloadDao.newOrUpdate(downloadEntity);
+                NDataChanger.INSTANCE.notifyDataChanged(downloadEntity);
             }
+        }
 
-            startDownloadService();
-            checkAndRetryDownload(true);
-        });
+        startDownloadService();
+        checkAndRetryDownload();
     }
 
     /**
@@ -1101,15 +1104,13 @@ public class DownloadManager implements DownloadStatusListener {
     /**
      * 检查并尝试重试下载
      */
-    public void checkAndRetryDownload(boolean includePausedTask) {
+    public void checkAndRetryDownload() {
         if (!NetworkUtils.isWifiConnected(mContext)) return;
 
         for (DownloadEntity downloadEntity : DownloadManager.getInstance().getAllDownloadEntityExcludeDoneTask()) {
             if (DownloadStatus.neterror.equals(downloadEntity.getStatus())
                     || DownloadStatus.timeout.equals(downloadEntity.getStatus())
-                    || DownloadStatus.subscribe.equals(downloadEntity.getStatus())
-                    || (includePausedTask && DownloadStatus.pause.equals(downloadEntity.getStatus()))
-            ) {
+                    || DownloadStatus.subscribe.equals(downloadEntity.getStatus())) {
                 DownloadManager.getInstance().put(downloadEntity.getUrl(), System.currentTimeMillis());
                 Message msg = Message.obtain();
                 msg.what = DownloadConfig.CONTINUE_DOWNLOAD_AUTO_TASK;
@@ -1214,7 +1215,7 @@ public class DownloadManager implements DownloadStatusListener {
      * 标记下载已完成的任务为已读 (用于下载管理页入口的 toolbar 红点显示)
      */
     public void markDownloadedTaskAsRead() {
-        getInstance().packageExecutor.execute(() -> {
+        AppExecutor.getIoExecutor().execute(() -> {
             boolean markHasChanged = false;
 
             List<DownloadEntity> all = getAllDownloadEntityExcludeSilentTask();
@@ -1254,7 +1255,7 @@ public class DownloadManager implements DownloadStatusListener {
      * 更改下载中任务的已读状态(用于下载页及外部toolbar)
      */
     private void markDownloadingTaskAsReadOrUnread(boolean isRead) {
-        getInstance().packageExecutor.execute(() -> {
+        AppExecutor.getIoExecutor().execute(() -> {
             boolean markHasChanged = false;
 
             List<DownloadEntity> all = getAllDownloadEntityExcludeSilentTask();
@@ -1285,7 +1286,7 @@ public class DownloadManager implements DownloadStatusListener {
      * 标记可用更新为已读 (用于下载管理页入口的 toolbar 红点显示)
      */
     public void markUpdatableTaskAsRead() {
-        getInstance().packageExecutor.execute(() -> {
+        AppExecutor.getIoExecutor().execute(() -> {
             boolean markHasChanged = false;
 
             ArrayList<GameUpdateEntity> updates = PackageRepository.INSTANCE.getGameUpdate();
@@ -1384,7 +1385,7 @@ public class DownloadManager implements DownloadStatusListener {
      * 手动触发下载 LiveData 变更
      */
     public void notifyDownloadLiveDataChanged() {
-        getInstance().packageExecutor.execute(() -> mDownloadEntityListLiveData.postValue(getAllDownloadEntity()));
+        AppExecutor.getIoExecutor().execute(() -> mDownloadEntityListLiveData.postValue(getAllDownloadEntity()));
     }
 
     /**

app/src/main/java/com/gh/download/PackageObserver.kt

@@ -20,7 +20,6 @@ import com.gh.gamecenter.core.utils.ThirdPartyPackageHelper
 import com.gh.gamecenter.core.utils.UrlFilterUtils
 import com.gh.gamecenter.entity.GameDigestEntity
 import com.gh.gamecenter.eventbus.EBPackage
-import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.utils.ConcernUtils
 import com.gh.gamecenter.login.user.UserManager
 import com.gh.gamecenter.manager.PackagesManager
@@ -56,7 +55,7 @@ object PackageObserver {
     }
 
     @JvmStatic
-    fun onPackageChanged(busFour: EBPackage, cachedGameEntity: GameEntity? = null) {
+    fun onPackageChanged(busFour: EBPackage) {
         val application = HaloApp.getInstance().application
         val packageName = busFour.packageName
         val versionName = busFour.versionName
@@ -100,7 +99,7 @@ object PackageObserver {
         if (EBPackage.TYPE_INSTALLED == busFour.type) {
             if (!busFour.isVGame) {
                 // 非畅玩游戏才执行下面的代码
-                mPackageViewModel.addInstalledGame(packageName, cachedGameEntity)
+                mPackageViewModel.addInstalledGame(packageName)
                 BrowserInstallHelper.onApkInstalled(mDownloadEntity?.path)
             }
 

app/src/main/java/com/gh/download/dialog/DownloadDialogAdapter.kt

@@ -4,12 +4,10 @@ import android.content.Context
 import android.graphics.drawable.GradientDrawable
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.os.bundleOf
 import androidx.recyclerview.widget.RecyclerView
 import com.gh.common.util.DirectUtils
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.callback.OnViewClickListener
-import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.databinding.*
 import com.gh.gamecenter.feature.entity.GameEntity
@@ -102,16 +100,7 @@ class DownloadDialogAdapter(
                             DirectUtils.directToQa(mContext, data.linkText, data.linkId)
                         }
                         "qa_collection" -> {
-                            DirectUtils.directToQaCollection(mContext, data.linkText, data.linkId)
-                        }
-                        "qa_list" -> {
-                            DirectUtils.directToHelpAndFeedback(
-                                mContext, bundleOf(
-                                    EntranceConsts.KEY_ENTRANCE to "选择下载加速版本-常见问题",
-                                    EntranceConsts.KEY_GAME_ID to viewModel.gameEntity.id,
-                                    EntranceConsts.KEY_GAME_NAME to viewModel.gameEntity.name
-                                )
-                            )
+                            DirectUtils.directToHelpAndFeedback(mContext, isPlugin = true)
                         }
                         else -> {
                             //Utils.toast(mContext, "暂不支持类型:" + data.linkType)

app/src/main/java/com/gh/download/server/BrowserInstallHelper.kt

@@ -61,7 +61,7 @@ object BrowserInstallHelper {
             }
 
             else -> {
-                val allInstalledPackageList = PackageUtils.getAllPackageName(mContext)
+                val allInstalledPackageList = PackageUtils.getAllPackageNameIncludeSystemApps(mContext)
 
                 if (allInstalledPackageList.isNotEmpty()) {
                     mValidInstalledPackageList = allInstalledPackageList

app/src/main/java/com/gh/gamecenter/BlockActivity.kt

@@ -10,9 +10,6 @@ import com.gh.gamecenter.common.utils.updateStatusBarColor
 import com.gh.gamecenter.entity.SubjectRecommendEntity
 import com.gh.gamecenter.game.GameFragment
 
-/**
- * 板块
- */
 class BlockActivity : DownloadToolbarActivity() {
 
     companion object {

app/src/main/java/com/gh/gamecenter/CleanApkActivity.java

@@ -14,7 +14,6 @@ import com.halo.assistant.fragment.ApkCleanerFragment;
 
 /**
  * Created by khy on 2017/1/24.
- * 清理安装包
  */
 @Route(path = RouteConsts.activity.cleanApkActivity)
 public class CleanApkActivity extends ToolBarActivity {

app/src/main/java/com/gh/gamecenter/CollectionActivity.java

@@ -16,7 +16,6 @@ import java.util.ArrayList;
 
 /**
  * Created by khy on 18/07/17.
- * 我的收藏
  */
 public class CollectionActivity extends ToolBarActivity {
     @Override

app/src/main/java/com/gh/gamecenter/CropImageActivity.java

@@ -23,9 +23,6 @@ import java.lang.ref.SoftReference;
 import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
 
-/**
- * 裁剪图片
- */
 public class CropImageActivity extends ToolBarActivity {
 
     protected CropImageCustom mCropImageCustom;

app/src/main/java/com/gh/gamecenter/GameDetailActivity.kt

@@ -24,7 +24,7 @@ import com.halo.assistant.HaloApp
 
 /**
  * Created by khy on 2017/3/24.
- * 游戏详情页
+ * 游戏详情适配器
  */
 class GameDetailActivity : DownloadToolbarActivity() {
 
@@ -59,8 +59,8 @@ class GameDetailActivity : DownloadToolbarActivity() {
     }
 
     override fun getBusinessId(): Pair<String, String> {
-        val fragment = targetFragment as? GameDetailFragment?
-        return if (fragment?.arguments != null) {
+        val fragment = targetFragment as GameDetailFragment
+        return if (fragment.arguments != null) {
             Pair(fragment.requireArguments().getString(EntranceConsts.KEY_GAMEID) ?: "", "")
         } else {
             super.getBusinessId()

app/src/main/java/com/gh/gamecenter/ImageViewerActivity.kt

@@ -44,11 +44,9 @@ import com.gh.gamecenter.common.base.activity.BaseActivity
 import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.entity.CommunityEntity
-import com.gh.gamecenter.common.entity.SensorsEvent
 import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.common.utils.ImageUtils.getIdealImageUrl
-import com.gh.gamecenter.common.view.DragListener
 import com.gh.gamecenter.common.view.DraggableBigImageView
 import com.gh.gamecenter.common.view.Gh_RelativeLayout
 import com.gh.gamecenter.core.runOnIoThread
@@ -105,7 +103,6 @@ class ImageViewerActivity : BaseActivity(), OnPageChangeListener {
     private var mInitialPosition = 0
     private var mUseEnterAndExitAnimation = false
     private var mShowSaveBtn = false
-    private var mSaveBtnText = ""
     private var mAnswerEntity: AnswerEntity? = null
     private var mIsFromImageContainerView = false
 
@@ -129,7 +126,6 @@ class ImageViewerActivity : BaseActivity(), OnPageChangeListener {
     private var mTranslationY = 0f
     private var mTargetCenterX = 0f
     private var mTargetCenterY = 0f
-    private var mSaveSensorsEvent: SensorsEvent? = null
 
     override fun getLayoutId() = R.layout.activity_viewimage
 
@@ -161,8 +157,6 @@ class ImageViewerActivity : BaseActivity(), OnPageChangeListener {
                 mInitialPosition = it.getInt(EntranceConsts.KEY_CURRENT, 0)
             }
             mShowSaveBtn = it.getBoolean(KEY_SHOW_SAVE)
-            mSaveBtnText = it.getString(KEY_SAVE_TEXT, "")
-            mSaveSensorsEvent = it.getParcelable(KEY_SAVE_SENSORS_EVENT)
             mUseEnterAndExitAnimation = it.getBoolean(KEY_USE_ENTER_AND_EXIT_ANIMATION)
             mAnswerEntity = it.getParcelable(AnswerEntity::class.java.name)
             mOriginLeftList = it.getIntegerArrayList(KEY_LEFT)
@@ -178,9 +172,6 @@ class ImageViewerActivity : BaseActivity(), OnPageChangeListener {
         }
 
         mSavePicBtn.visibleIf(mShowSaveBtn)
-        if (mSaveBtnText.isNotEmpty()) {
-            mBinding.btnSavePic.text = mSaveBtnText
-        }
         mArticleDetailBtn.visibleIf(mAnswerEntity != null)
         mIndicatorMask.goneIf(mUrlList?.size == 1)
         mIndicatorTv.text = String.format("%d/%d", mInitialPosition + 1, mUrlList!!.size)
@@ -226,7 +217,6 @@ class ImageViewerActivity : BaseActivity(), OnPageChangeListener {
         }
 
         mSavePicBtn.setOnClickListener {
-            mSaveSensorsEvent?.let { SensorsBridge.trackEvent(it) }
             checkStoragePermissionBeforeAction {
                 mBigImageView?.currentImageFile?.run {
                     ImageUtils.saveImageToFile(this, mFinalUrl)
@@ -799,7 +789,7 @@ class ImageViewerActivity : BaseActivity(), OnPageChangeListener {
             } else {
                 rawUrl
             }
-            var compressedStandardImageUrl: String? = if (!mShowBase64Image && rawUrl.contains("ghzs") && !rawUrl.contains("x-oss-process")) {
+            var compressedStandardImageUrl: String? = if (!mShowBase64Image && rawUrl.contains("ghzs")) {
                 // 用 oss.jpeg 加上 limit 以后会出现双指放大的情况
                 rawUrl + Config.getSettings()?.image?.oss?.gif
             } else {
@@ -816,18 +806,18 @@ class ImageViewerActivity : BaseActivity(), OnPageChangeListener {
             if (mBigImageView == null) {
                 mBigImageView = imageView
             }
-            imageView.setDragListener(object : DragListener {
-                override fun onRelease(scale: Float) {
+            imageView.setDragListener(object : DraggableBigImageView.DragListener {
+                override fun onRelease(draggableBigImageView: DraggableBigImageView, scale: Float) {
                     updateOriginPosition(mViewPager.currentItem)
-                    performExitAnimation(imageView, scale, isFadeOnly())
+                    performExitAnimation(draggableBigImageView, scale, isFadeOnly())
                 }
 
-                override fun onDrag(fraction: Float) {
+                override fun onDrag(draggableBigImageView: DraggableBigImageView, fraction: Float) {
                     mBackgroundView.alpha = 1 - fraction
                     mIndicatorMask.visibility = View.GONE
                 }
 
-                override fun onRestore(fraction: Float) {
+                override fun onRestore(draggableBigImageView: DraggableBigImageView, fraction: Float) {
                     mBackgroundView.alpha = 1F
 //                    mIndicatorMask.goneIf(mUrlList?.size == 1)
                     if (mUrlList?.size != 1 || mAnswerEntity != null) {
@@ -848,8 +838,6 @@ class ImageViewerActivity : BaseActivity(), OnPageChangeListener {
             mFinalUrl = finalUrl ?: ""
 
             imageView.setImageLoaderCallback(object : SimpleImageLoader() {
-                var tryCount = 0
-
                 override fun onSuccess(image: File) {
                     if (finalUrl != mUrlList!![position]) {
                         val options = BitmapFactory.Options()
@@ -870,15 +858,6 @@ class ImageViewerActivity : BaseActivity(), OnPageChangeListener {
                         onBackPressed()
                     }
                 }
-
-                override fun onFail(error: java.lang.Exception?) {
-                    super.onFail(error)
-                    // 加载压缩图片失败时尝试加载原图
-                    if (finalUrl != rawUrl && tryCount == 0) {
-                        loadImage(thumbnailImageUrl, rawUrl, imageView)
-                        tryCount ++
-                    }
-                }
             })
             loadImage(thumbnailImageUrl, compressedStandardImageUrl, imageView)
 
@@ -956,10 +935,8 @@ class ImageViewerActivity : BaseActivity(), OnPageChangeListener {
 
         private const val KEY_BASE64 = "base64"
         private const val KEY_SHOW_SAVE = "showSave"
-        private const val KEY_SAVE_TEXT = "saveText"
         private const val KEY_USE_ENTER_AND_EXIT_ANIMATION = "use_enter_and_exit_animation"
         private const val KEY_IS_FROM_IMAGE_CONTAINER_VIEW = "is_from_image_container_view"
-        private const val KEY_SAVE_SENSORS_EVENT = "save_sensors_event"
 
         private const val KEY_LEFT = "left"
         private const val KEY_TOP = "top"
@@ -981,27 +958,6 @@ class ImageViewerActivity : BaseActivity(), OnPageChangeListener {
             return getIntent(context, list, position, null, entrance, false)
         }
 
-        @JvmStatic
-        fun getSingleIntent(
-            context: Context,
-            url: String,
-            isShowSaveBtn: Boolean,
-            saveBtnText: String? = null,
-            entrance: String? = null,
-            saveSensorsEvent: SensorsEvent? = null
-        ): Intent {
-            return getIntent(
-                context,
-                arrayListOf(url),
-                0,
-                null,
-                entrance,
-                isShowSaveBtn,
-                saveBtnText = saveBtnText,
-                saveSensorsEvent = saveSensorsEvent
-            )
-        }
-
         @JvmStatic
         fun getIntent(
             context: Context,
@@ -1038,9 +994,7 @@ class ImageViewerActivity : BaseActivity(), OnPageChangeListener {
             entrance: String?,
             isShowSaveBtn: Boolean,
             answerEntity: AnswerEntity? = null,
-            isFromICV: Boolean = false,
-            saveBtnText: String? = null,
-            saveSensorsEvent: SensorsEvent? = null
+            isFromICV: Boolean = false
         ): Intent {
             val intent = Intent(context, ImageViewerActivity::class.java)
             intent.putExtra(EntranceConsts.KEY_URL_LIST, list)
@@ -1049,8 +1003,6 @@ class ImageViewerActivity : BaseActivity(), OnPageChangeListener {
             intent.putExtra(AnswerEntity::class.java.name, answerEntity)
             intent.putExtra(EntranceConsts.KEY_ENTRANCE, entrance)
             intent.putExtra(KEY_IS_FROM_IMAGE_CONTAINER_VIEW, isFromICV)
-            saveBtnText?.let { intent.putExtra(KEY_SAVE_TEXT, it) }
-            saveSensorsEvent?.let { intent.putExtra(KEY_SAVE_SENSORS_EVENT, saveSensorsEvent) }
 
             if (originalViewList != null) {
                 val leftList = arrayListOf<Int>()

app/src/main/java/com/gh/gamecenter/LibaoActivity.java

@@ -16,7 +16,6 @@ import java.util.ArrayList;
 
 /**
  * Created by khy on 2016/12/12.
- * 礼包中心
  */
 @Deprecated
 public class LibaoActivity extends ToolBarActivity {

app/src/main/java/com/gh/gamecenter/MainActivity.java

@@ -43,7 +43,6 @@ import androidx.lifecycle.ViewModelProvider;
 import androidx.lifecycle.ViewModelProviders;
 
 import com.gh.ad.AdDelegateHelper;
-import com.gh.ad.SplashAdVideoView;
 import com.gh.common.constant.Config;
 import com.gh.common.filter.RegionSettingHelper;
 import com.gh.common.history.HistoryDatabase;
@@ -90,16 +89,16 @@ import com.gh.gamecenter.core.utils.DisplayUtils;
 import com.gh.gamecenter.core.utils.GsonUtils;
 import com.gh.gamecenter.core.utils.MtaHelper;
 import com.gh.gamecenter.core.utils.SPUtils;
+import com.gh.gamecenter.core.utils.SentryHelper;
 import com.gh.gamecenter.core.utils.ToastUtils;
 import com.gh.gamecenter.core.utils.UrlFilterUtils;
 import com.gh.gamecenter.entity.StartupAdEntity;
 import com.gh.gamecenter.feature.entity.GameEntity;
 import com.gh.gamecenter.feature.utils.PlatformUtils;
-import com.gh.gamecenter.feature.utils.SentryHelper;
 import com.gh.gamecenter.home.custom.model.CustomPageShareRepository;
 import com.gh.gamecenter.home.skip.PackageSkipActivity;
 import com.gh.gamecenter.login.user.UserManager;
-import com.gh.gamecenter.login.utils.QuickLoginHelper;
+import com.gh.gamecenter.manager.DataCollectionManager;
 import com.gh.gamecenter.packagehelper.PackageViewModel;
 import com.gh.gamecenter.retrofit.RetrofitManager;
 import com.gh.gamecenter.room.AppDatabase;
@@ -130,6 +129,7 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import io.reactivex.SingleSource;
@@ -138,6 +138,7 @@ import io.reactivex.functions.Function;
 import io.reactivex.schedulers.Schedulers;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function0;
+import kotlin.jvm.functions.Function1;
 import okhttp3.RequestBody;
 import okhttp3.ResponseBody;
 import retrofit2.HttpException;
@@ -147,9 +148,7 @@ public class MainActivity extends BaseActivity {
 
     public static final String SHOW_AD = "show_ad";
     public static final int COUNTDOWN_AD = 100;
-    private int mCountdownMaxCount = 3;
-    public static final int COUNTDOWN_SDK_AD = 101;
-    public static final int COUNTDOWN_SDK_MAX_COUNT = 5;
+    public static final int COUNTDOWN_MAX_COUNT = 3;
     private int mCountdownCount = 0;
 
     private static final String CURRENT_PAGE = "current_page";
@@ -256,6 +255,9 @@ public class MainActivity extends BaseActivity {
             }
         }
 
+        // 必须放在这里，否则会导致获取 baseActivity 不是本应用包名
+        DownloadManager.getInstance().initDownloadService();
+
         ReservationRepository.refreshReservations();
 
         // 跳转至其它页面
@@ -288,6 +290,9 @@ public class MainActivity extends BaseActivity {
 
         // 耗时操作
         AppExecutor.getIoExecutor().execute(() -> {
+            // 上传数据
+            DataCollectionManager.getInstance().upload();
+
             // 初始化PlatformUtils
             PlatformUtils.getInstance(getApplicationContext());
 
@@ -318,7 +323,7 @@ public class MainActivity extends BaseActivity {
 
         mMainWrapperViewModel.requestAllDialogData();
 
-        QuickLoginHelper.preLogin(this);
+//        QuickLoginHelper.getPhoneInfo();
 
         // TODO 搞清楚为什么这里要获取微信相关配置
         WechatBindHelper.getWechatConfig(null);
@@ -491,7 +496,6 @@ public class MainActivity extends BaseActivity {
         if (AdDelegateHelper.INSTANCE.shouldShowStartUpAd(false)) {
             ViewGroup startAdContainer = findViewById(R.id.startAdContainer);
             ViewGroup sdkStartAdContainer = findViewById(R.id.sdkStartAdContainer);
-            TextView sdkJumpBtn = findViewById(R.id.sdkJumpBtn);
             FrameLayout adsFl = findViewById(R.id.adsFl);
             View icpContainer = findViewById(R.id.sdkStartAdIcpContainer);
             if (icpContainer != null) {
@@ -507,11 +511,6 @@ public class MainActivity extends BaseActivity {
             float screenHeightInDp = DisplayUtils.px2dip(this, screenHeightInPx);
 
             if (startAdContainer != null && sdkStartAdContainer != null && adsFl != null) {
-                mCountdownMaxCount = AdDelegateHelper.INSTANCE.getSplashAdDisplayInterval();
-                TextView jumpBtn = findViewById(R.id.jumpBtn);
-                if (jumpBtn != null) {
-                    jumpBtn.setText(getString(R.string.splash_jump, mCountdownMaxCount));
-                }
                 AdDelegateHelper.requestSplashAd(
                         this,
                         screenWidthInPx,
@@ -520,7 +519,6 @@ public class MainActivity extends BaseActivity {
                         screenHeightInDp,
                         startAdContainer,
                         sdkStartAdContainer,
-                        sdkJumpBtn,
                         adsFl,
                         (BaseHandler) mBaseHandler,
                         false,
@@ -540,19 +538,13 @@ public class MainActivity extends BaseActivity {
     @Override
     protected void handleMessage(Message msg) {
         super.handleMessage(msg);
-        if (msg.what == COUNTDOWN_AD || msg.what == COUNTDOWN_SDK_AD) {
+        if (msg.what == COUNTDOWN_AD) {
             mCountdownCount++;
-            int maxCount;
-            if (msg.what == COUNTDOWN_AD) {
-                maxCount = mCountdownMaxCount;
-            } else {
-                maxCount = COUNTDOWN_SDK_MAX_COUNT;
-            }
-            if (maxCount < mCountdownCount) {
+            if (COUNTDOWN_MAX_COUNT < mCountdownCount) {
                 AdDelegateHelper.INSTANCE.setShowingSplashAd(false);
                 hideSplashAd();
 
-                if (msg.what == COUNTDOWN_AD && msg.obj instanceof StartupAdEntity) {
+                if (msg.obj instanceof StartupAdEntity) {
                     StartupAdEntity ad = (StartupAdEntity) msg.obj;
                     LinkEntity linkEntity = ad.getJump();
                     SensorsBridge.trackEvent(
@@ -565,26 +557,14 @@ public class MainActivity extends BaseActivity {
                             linkEntity.getLink(),
                             "link_text",
                             linkEntity.getText());
-                } else if (msg.what == COUNTDOWN_SDK_AD) {
-                    SPUtils.setLong(Constants.SP_LAST_SPLASH_AD_SHOW_TIME, System.currentTimeMillis());
                 }
             } else {
-                if (msg.what == COUNTDOWN_AD) {
-                    TextView jumpBtn = findViewById(R.id.jumpBtn);
-                    if (jumpBtn != null) {
-                        jumpBtn.setText(getString(R.string.splash_jump, maxCount - mCountdownCount));
-                    }
-                    Message newMsg = Message.obtain();
-                    newMsg.what = COUNTDOWN_AD;
-                    newMsg.obj = msg.obj;
-                    mBaseHandler.sendMessageDelayed(newMsg, 1000);
-                } else {
-                    TextView jumpBtn = findViewById(R.id.sdkJumpBtn);
-                    if (jumpBtn != null) {
-                        jumpBtn.setText(getString(R.string.splash_jump, maxCount - mCountdownCount));
-                    }
-                    mBaseHandler.sendEmptyMessageDelayed(COUNTDOWN_SDK_AD, 1000);
-                }
+                TextView jumpBtn = findViewById(R.id.jumpBtn);
+                jumpBtn.setText(String.format(Locale.CHINA, "跳过 %d", COUNTDOWN_MAX_COUNT - mCountdownCount));
+                Message newMsg = Message.obtain();
+                newMsg.what = COUNTDOWN_AD;
+                newMsg.obj = msg.obj;
+                mBaseHandler.sendMessageDelayed(newMsg, 1000);
             }
         }
     }
@@ -608,11 +588,6 @@ public class MainActivity extends BaseActivity {
         getIntent().putExtra(SHOW_AD, false);
         View startAdContainer = findViewById(R.id.startAdContainer);
         if (startAdContainer != null) {
-            // 如果有播放开屏视频广告，需要及时释放
-            SplashAdVideoView adVideoView = startAdContainer.findViewById(R.id.ad_video);
-            if (adVideoView != null) {
-                adVideoView.clearAll();
-            }
             startAdContainer.setVisibility(View.GONE);
             ExtensionsKt.removeFromParent(startAdContainer, true);
         }
@@ -622,11 +597,7 @@ public class MainActivity extends BaseActivity {
             ExtensionsKt.removeFromParent(startSdkAdContainer, true);
             AdDelegateHelper.INSTANCE.cancelSplashAd(this);
         }
-        TextView jumpBtn = findViewById(R.id.sdkJumpBtn);
-        if (jumpBtn != null) {
-            jumpBtn.setVisibility(View.GONE);
-            ExtensionsKt.removeFromParent(jumpBtn, true);
-        }
+
         View startSdkAdIcpContainer = findViewById(R.id.sdkStartAdIcpContainer);
         if (startSdkAdIcpContainer != null) {
             startSdkAdIcpContainer.setVisibility(View.GONE);
@@ -772,7 +743,7 @@ public class MainActivity extends BaseActivity {
 
                                 ToastUtils.showToast("游戏启动中，请稍后~");
                                 handler.postDelayed(() -> {
-                                    if (VHelper.isInnerInstalled(gamePackageName)) {
+                                    if(VHelper.isInnerInstalled(gamePackageName)) {
                                         launchGame(gamePackageName).invoke();
                                     } else {
                                         VHelper.postOnInitialized(launchGame(gamePackageName));
@@ -832,7 +803,7 @@ public class MainActivity extends BaseActivity {
                     public void onFailure(@Nullable HttpException e) {
                         super.onFailure(e);
                         try {
-                            ErrorHelper.handleErrorWithCustomizedHandler(MainActivity.this, e.response().errorBody().string(), false, "", "", "内容实名", null, null, code -> {
+                            ErrorHelper.handleErrorWithCustomizedHandler(MainActivity.this, e.response().errorBody().string(), false, "", "", "内容实名", null, null,  code -> {
                                 if (code == 404001) {
                                     if (mShouldShowAd) {
                                         AppExecutor.getUiExecutor().executeWithDelay(() -> {
@@ -924,6 +895,13 @@ public class MainActivity extends BaseActivity {
         return true;
     }
 
+    @Override
+    public void finish() {
+        // 上传数据
+        DataCollectionManager.getInstance().statClickData();
+        super.finish();
+    }
+
     @Override
     protected void onSaveInstanceState(@NotNull Bundle outState) {
         super.onSaveInstanceState(outState);

app/src/main/java/com/gh/gamecenter/SearchActivity.kt

@@ -10,8 +10,6 @@ import android.view.inputmethod.EditorInfo
 import android.widget.*
 import androidx.core.widget.doAfterTextChanged
 import androidx.core.widget.doOnTextChanged
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentTransaction
 import com.gh.common.util.*
 import com.gh.common.util.LogUtils
 import com.gh.gamecenter.DisplayType.*
@@ -19,7 +17,6 @@ import com.gh.gamecenter.common.base.GlobalActivityManager
 import com.gh.gamecenter.common.base.activity.BaseActivity
 import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.utils.*
-import com.gh.gamecenter.db.ISearchHistoryDao
 import com.gh.gamecenter.db.SearchHistoryDao
 import com.gh.gamecenter.eventbus.EBSearch
 import com.gh.gamecenter.search.SearchDefaultFragment
@@ -32,9 +29,6 @@ import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 import java.util.concurrent.TimeUnit
 
-/**
- * 游戏搜索页
- */
 open class SearchActivity : BaseActivity() {
 
     lateinit var searchEt: EditText
@@ -42,7 +36,7 @@ open class SearchActivity : BaseActivity() {
     lateinit var backBtn: RelativeLayout
     private lateinit var deleteIv: ImageView
 
-    protected val mDao: ISearchHistoryDao by lazy { provideDao() }
+    private var mDao: SearchHistoryDao? = null
 
     protected var mSearchKey: String? = null
     protected var mIsAutoSearchDisabled: Boolean = false
@@ -81,6 +75,7 @@ open class SearchActivity : BaseActivity() {
         val searchImmediately = intent.getBooleanExtra(KEY_SEARCH_IMMEDIATELY, false)
         var ignoreTextChanges = savedInstanceState != null
 
+        mDao = SearchHistoryDao(this)
         mPublishSubject = PublishSubject.create()
 
         mPublishSubject!!
@@ -104,7 +99,7 @@ open class SearchActivity : BaseActivity() {
             searchEt.hint = hint
             if (searchImmediately) {
                 mDisplayType = GAME_DETAIL
-                mDao.add(hint)
+                mDao?.add(hint)
                 search(SearchType.DEFAULT, hint)
             }
         } else {
@@ -120,7 +115,7 @@ open class SearchActivity : BaseActivity() {
         trackSearchPageShow()
     }
 
-    protected open fun trackSearchPageShow() {
+    protected open fun trackSearchPageShow(){
         val bottomTab = intent.getStringExtra(EntranceConsts.KEY_BOTTOM_TAB_NAME) ?: ""
         val multiTabId = intent.getStringExtra(EntranceConsts.KEY_MULTI_TAB_NAV_ID) ?: ""
         val multiTabName = intent.getStringExtra(EntranceConsts.KEY_MULTI_TAB_NAV_NAME) ?: ""
@@ -181,11 +176,10 @@ open class SearchActivity : BaseActivity() {
     open fun search(type: SearchType, key: String?) {
         mSearchType = type
         mIsAutoSearchDisabled = true
-        // 自动搜索，默认搜索，热门搜索，历史搜索，主动搜索，榜单搜索
+        // 自动搜索，默认搜索，热门搜索，历史搜索，主动搜索
         when (type) {
             SearchType.AUTO -> handleAutoSearch(key)
             SearchType.DEFAULT -> handleDefaultSearch(key)
-            SearchType.RANK -> handleRankSearch(key)
             SearchType.HOT -> handleHotSearch(key)
             SearchType.HISTORY -> handleHistorySearch(key)
             SearchType.MANUAL -> handleManualSearch()
@@ -193,12 +187,12 @@ open class SearchActivity : BaseActivity() {
         mIsAutoSearchDisabled = false
     }
 
-    protected open fun handleAutoSearch(key: String?) {
+    private fun handleAutoSearch(key: String?) {
         val newSearchKey = searchEt.text.toString().trim { it <= ' ' }
         if (newSearchKey.isEmpty()) {
             val hint = searchEt.hint.toString()
             if (!TextUtils.isEmpty(hint) && HINT_TEXT != hint) {
-                mDao.add(hint)
+                mDao?.add(hint)
                 search(SearchType.DEFAULT, hint)
             }
         } else {
@@ -216,23 +210,7 @@ open class SearchActivity : BaseActivity() {
         }
     }
 
-    protected open fun handleRankSearch(key: String?) {
-        mSearchKey = key
-        searchEt.setText(key)
-        searchEt.setSelection(searchEt.text.length)
-        updateDisplayType(GAME_DETAIL)
-        LogUtils.uploadSearchGame("searching", "搜索页", key, "榜单搜索")
-
-        SensorsBridge.trackSearchButtonClick(
-            GlobalActivityManager.getCurrentPageEntity().pageId,
-            GlobalActivityManager.getCurrentPageEntity().pageName,
-            key ?: "",
-            TRACK_SEARCH_TYPE_DEFAULT,
-            mSourceEntrance
-        )
-    }
-
-    protected open fun handleDefaultSearch(key: String?) {
+    private fun handleDefaultSearch(key: String?) {
         mSearchKey = key
         searchEt.setText(key)
         searchEt.setSelection(searchEt.text.length)
@@ -249,14 +227,14 @@ open class SearchActivity : BaseActivity() {
 //        MtaHelper.onEvent("游戏搜索", "默认搜索", key)
     }
 
-    protected open fun handleHotSearch(key: String?) {
+    private fun handleHotSearch(key: String?) {
         mSearchKey = key
         searchEt.setText(key)
         searchEt.setSelection(searchEt.text.length)
         updateDisplayType(GAME_DETAIL)
     }
 
-    protected open fun handleHistorySearch(key: String?) {
+    private fun handleHistorySearch(key: String?) {
         mSearchKey = key
         searchEt.setText(key)
         searchEt.setSelection(searchEt.text.length)
@@ -273,12 +251,12 @@ open class SearchActivity : BaseActivity() {
 //        MtaHelper.onEvent("游戏搜索", "历史搜索", key)
     }
 
-    protected open fun handleManualSearch() {
+    private fun handleManualSearch() {
         val newSearchKey = searchEt.text.toString().trim { it <= ' ' }
         if (newSearchKey.isEmpty()) {
             val hint = searchEt.hint.toString()
             if (!TextUtils.isEmpty(hint) && HINT_TEXT != hint) {
-                mDao.add(hint)
+                mDao?.add(hint)
                 search(SearchType.DEFAULT, hint)
             }
         } else if (newSearchKey != mSearchKey || mDisplayType != GAME_DETAIL) {
@@ -292,7 +270,7 @@ open class SearchActivity : BaseActivity() {
                     mSourceEntrance
                 )
 
-                mDao.add(mSearchKey)
+                mDao?.add(mSearchKey)
                 updateDisplayType(GAME_DETAIL)
             } else {
                 toast("请输入搜索内容")
@@ -302,75 +280,39 @@ open class SearchActivity : BaseActivity() {
 //        MtaHelper.onEvent("游戏搜索", "主动搜索", newSearchKey)
     }
 
-    protected open fun provideDao(): ISearchHistoryDao = SearchHistoryDao(this)
-
     open fun updateDisplayType(type: DisplayType) {
-        val transaction = when (type) {
-            DEFAULT -> showFragment(
-                SearchDefaultFragment::class.java.name,
-                { SearchDefaultFragment() }
-            ) {
-                it.arguments = Bundle().also { bundle ->
-                    bundle.putBoolean(SearchDefaultFragment.KEY_IS_GAME_SEARCH, true)
-                }
-            }
-
-            GAME_DIGEST -> showFragment(
-                SearchGameIndexFragment::class.java.name,
-                { SearchGameIndexFragment() }
-            ) {
-                removeFragment(SearchGameResultFragment::class.java.name)
-                it.setParams(mSearchKey ?: "", mSearchType.value)
-            }
-
-            GAME_DETAIL -> showFragment(
-                SearchGameResultFragment::class.java.name,
-                { SearchGameResultFragment() }
-            ) {
-                removeFragment(SearchGameIndexFragment::class.java.name)
-                it.setParams(mSearchKey ?: "", mSearchType.value)
-            }
-
-            else -> null
-        }
-        transaction?.let {
-            mDisplayType = type
-            it.commitAllowingStateLoss()
-        }
-    }
-
-    protected fun <T : Fragment> showFragment(
-        tag: String,
-        onFragmentCreate: () -> T,
-        onFragmentCreated: ((T) -> Unit)? = null,
-    ): FragmentTransaction {
         val transaction = supportFragmentManager.beginTransaction()
-        var createNewFragment = false
-        var fragment = supportFragmentManager
-            .findFragmentByTag(tag)
-        if (fragment == null) {
-            createNewFragment = true
-            fragment = onFragmentCreate.invoke()
-        }
-        onFragmentCreated?.invoke(fragment as T)
-        if (createNewFragment) {
-            transaction.add(R.id.search_result, fragment, tag)
-            transaction.addToBackStack(null)
-        } else if (!fragment.isAdded) {
-            transaction.show(fragment)
-            transaction.addToBackStack(null)
-        }
-        return transaction
-    }
+        when (type) {
+            DEFAULT -> {
+                val fragment = supportFragmentManager.findFragmentByTag(SearchDefaultFragment::class.java.name)
+                    ?: SearchDefaultFragment().apply {
+                        arguments = Bundle().also { it.putBoolean(SearchDefaultFragment.KEY_IS_GAME_SEARCH, true) }
+                    }
+                transaction.replace(R.id.search_result, fragment, SearchDefaultFragment::class.java.name)
+            }
 
-    protected fun removeFragment(tag: String) {
-        val fragment = supportFragmentManager
-            .findFragmentByTag(tag) ?: return
-        supportFragmentManager
-            .beginTransaction()
-            .remove(fragment)
-            .commit()
-        supportFragmentManager.popBackStack()
+            GAME_DIGEST -> {
+                val digestListFragment =
+                    supportFragmentManager.findFragmentByTag(SearchGameIndexFragment::class.java.name) as? SearchGameIndexFragment
+                        ?: SearchGameIndexFragment()
+                digestListFragment.setParams(mSearchKey ?: "", mSearchType.value)
+                transaction.replace(R.id.search_result, digestListFragment, SearchGameIndexFragment::class.java.name)
+            }
+
+            GAME_DETAIL -> {
+                val detailListFragment =
+                    supportFragmentManager.findFragmentByTag(SearchGameResultFragment::class.java.name) as? SearchGameResultFragment
+                        ?: SearchGameResultFragment()
+                detailListFragment.setParams(mSearchKey ?: "", mSearchType.value)
+                transaction.replace(R.id.search_result, detailListFragment, SearchGameResultFragment::class.java.name)
+            }
+
+            else -> {
+                //do nothing
+            }
+        }
+        mDisplayType = type
+        transaction.commitAllowingStateLoss()
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)
@@ -378,7 +320,6 @@ open class SearchActivity : BaseActivity() {
         when (search.type) {
             SearchType.HISTORY.value -> search(SearchType.HISTORY, search.key)
             SearchType.HOT.value -> search(SearchType.HOT, search.key)
-            SearchType.RANK.value -> search(SearchType.RANK, search.key)
 
             "click" -> DataCollectionUtils.uploadSearchClick(
                 this, mSearchKey, mSearchType.value, "搜索页面",
@@ -395,8 +336,9 @@ open class SearchActivity : BaseActivity() {
     }
 
     override fun handleBackPressed(): Boolean {
-        if (supportFragmentManager.fragments.size == 1) {
-            finish()
+        val fragment = supportFragmentManager.findFragmentByTag(SearchDefaultFragment::class.java.name)
+        if (fragment == null) {
+            updateDisplayType(DEFAULT)
             return true
         }
         return super.handleBackPressed()
@@ -470,8 +412,7 @@ enum class SearchType(var value: String) {
     DEFAULT("default"),
     HISTORY("history"),
     MANUAL("initiative"),
-    HOT("remen"),
-    RANK("rank");
+    HOT("remen");
 
     fun toChinese() = when (this) {
         AUTO -> "自动搜索"
@@ -479,7 +420,6 @@ enum class SearchType(var value: String) {
         HISTORY -> "历史搜索"
         MANUAL -> "主动搜索"
         HOT -> "热门搜索"
-        RANK -> "榜单搜索"
     }
 
     companion object {

app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java

@@ -0,0 +1,21 @@
+package com.gh.gamecenter;
+
+import android.content.Context;
+import android.content.Intent;
+
+import androidx.annotation.NonNull;
+
+import com.gh.gamecenter.common.base.activity.ToolBarActivity;
+import com.halo.assistant.fragment.user.SelectPortraitFragment;
+
+/**
+ * Created by khy on 2017/2/10.
+ */
+public class SelectUserIconActivity extends ToolBarActivity {
+
+    @NonNull
+    public static Intent getIntent(Context context) {
+        return getTargetIntent(context, SelectUserIconActivity.class, SelectPortraitFragment.class);
+    }
+
+}

app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java

@@ -48,7 +48,6 @@ import io.reactivex.functions.Consumer;
 
 /**
  * Created by khy on 2016/11/7.
- * 分享卡片
  */
 public class ShareCardPicActivity extends ToolBarActivity {