fix:游戏预约功能（第五期）-0912测试-客户端 https://jira.shanqu.cc/browse/GHZSCY-6675

feat:https://jira.shanqu.cc/browse/GHZSCY-5915 游戏预约功能（第五期）-前端部分—客户端

ci

.gitlab-ci.yml

@@ -72,14 +72,14 @@ android_build:
   only:
     - dev
     - release
-    - pack/update_sentry_plugin_cache
+    - feat/GHZSCY-5915
 
 # 代码检查
 sonarqube_analysis:
    tags:
      - offline-test
    stage: build&analyze
-   image: hub.shanqu.cc/library/sonar-scanner-cli:latest
+   image: sonarsource/sonar-scanner-cli:latest
    dependencies: []    #禁止传递来的artifact
    script:
      ## 获取项目的一级组和二级组和项目名作为projectKey，例如projectKey=platform-backend-eci-monitor
@@ -104,6 +104,7 @@ sonarqube_analysis:
    only:
      - dev
      - release
+     - feat/GHZSCY-5915
 
 ## 发送简易检测结果报告
 send_sonar_report:
@@ -122,6 +123,7 @@ send_sonar_report:
    only:
      - dev
      - release
+     - feat/GHZSCY-5915
 
 oss-upload&send-email:
     tags:
@@ -158,4 +160,4 @@ oss-upload&send-email:
     only:
         - dev
         - release
-        - pack/update_sentry_plugin_cache
+        - feat/GHZSCY-5915

app/build.gradle

@@ -101,14 +101,13 @@ android {
         buildConfigField "String", "NEW_API_HOST", "\"${NEW_API_HOST}\""
         buildConfigField "String", "LOG_HUB_PROJECT", "\"${LOG_HUB_PROJECT}\""
         buildConfigField "String", "VAPI_HOST", "\"${VAPI_HOST}\""
-        buildConfigField "String", "WGAME_CPM_BUSIAPPID", "\"${WGAME_CPM_BUSIAPPID}\""
-        buildConfigField "String", "WGAME_CPM_API_HOST", "\"${WGAME_CPM_API_HOST}\""
         buildConfigField "String", "WECHAT_APPID", "\"${WECHAT_APPID}\""
         buildConfigField "String", "WECHAT_SECRET", "\"${WECHAT_SECRET}\""
         buildConfigField "String", "TENCENT_APPID", "\"${TENCENT_APPID}\""
         buildConfigField "String", "WEIBO_APPKEY", "\"${WEIBO_APPKEY}\""
         // 一体包的32位畅玩游戏助手包名
         buildConfigField "String", "EXT_PACKAGE_NAME", "\"${rootProject.ext.EXT_PACKAGE_NAME}\""
+        buildConfigField "String", "VA_VERSION_NAME", "\"${rootProject.ext.VA_VERSION}\""
     }
 
     // gradle 2.2以上默认同时启用v1和v2（优先用于Android N）
@@ -130,20 +129,7 @@ android {
     }
 
     packagingOptions {
-        // exclude 部分冗余的文件
         exclude 'META-INF/gradle/incremental.annotation.processors'
-        exclude 'darwin/x86_64/liblz4-java.dylib'
-
-        exclude 'assets/libwbsafeedit_x86'
-        exclude 'assets/libwbsafeedit_x86_64'
-
-        exclude 'lib/armeabi-v7a/libRSSupport.so'
-        exclude 'lib/arm64-v8a/libRSSupport.so'
-        exclude 'lib/armeabi-v7a/librsjni.so'
-        exclude 'lib/arm64-v8a/librsjni.so'
-
-        resources.excludes += "com/j256/*"
-        resources.excludes += "org/apache/commons/codec/language/bm/*"
     }
 
     buildTypes {
@@ -232,9 +218,6 @@ android {
             buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${DEV_QUICK_LOGIN_APPKEY}\""
             buildConfigField "String", "DEV_CSJ_APPID", "\"${DEV_CSJ_APPID}\""
             buildConfigField "String", "CSJ_APPID", "\"${CSJ_APPID}\""
-
-            buildConfigField "String", "VA_VERSION_NAME", "\"${rootProject.ext.VA_VERSION}-debug\""
-            manifestPlaceholders.put("VA_VERSION_NAME", "${rootProject.ext.VA_VERSION}-debug")
         }
 
         // publish， 发布时候使用的 flavor，接口仅包含正式环境
@@ -248,9 +231,6 @@ android {
             buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${QUICK_LOGIN_APPKEY}\""
             buildConfigField "String", "DEV_CSJ_APPID", "\"${CSJ_APPID}\""
             buildConfigField "String", "CSJ_APPID", "\"${CSJ_APPID}\""
-
-            buildConfigField "String", "VA_VERSION_NAME", "\"${rootProject.ext.VA_VERSION}\""
-            manifestPlaceholders.put("VA_VERSION_NAME", "${rootProject.ext.VA_VERSION}")
         }
 
         tea {
@@ -264,10 +244,7 @@ android {
             buildConfigField "String", "DEV_CSJ_APPID", "\"${CSJ_APPID}\""
             buildConfigField "String", "CSJ_APPID", "\"${CSJ_APPID}\""
 
-            buildConfigField "String", "VA_VERSION_NAME", "\"${rootProject.ext.VA_VERSION}\""
-
             manifestPlaceholders.put("APPLOG_SCHEME", "rangersapplog.byAx6uYt".toLowerCase())
-            manifestPlaceholders.put("VA_VERSION_NAME", "${rootProject.ext.VA_VERSION}")
         }
 
         kuaishou {
@@ -280,9 +257,6 @@ android {
             buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${QUICK_LOGIN_APPKEY}\""
             buildConfigField "String", "DEV_CSJ_APPID", "\"${CSJ_APPID}\""
             buildConfigField "String", "CSJ_APPID", "\"${CSJ_APPID}\""
-
-            buildConfigField "String", "VA_VERSION_NAME", "\"${rootProject.ext.VA_VERSION}\""
-            manifestPlaceholders.put("VA_VERSION_NAME", "${rootProject.ext.VA_VERSION}")
         }
 
         gdt {
@@ -295,9 +269,6 @@ android {
             buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${QUICK_LOGIN_APPKEY}\""
             buildConfigField "String", "DEV_CSJ_APPID", "\"${CSJ_APPID}\""
             buildConfigField "String", "CSJ_APPID", "\"${CSJ_APPID}\""
-
-            buildConfigField "String", "VA_VERSION_NAME", "\"${rootProject.ext.VA_VERSION}\""
-            manifestPlaceholders.put("VA_VERSION_NAME", "${rootProject.ext.VA_VERSION}")
         }
 
         sm {
@@ -310,9 +281,6 @@ android {
             buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${QUICK_LOGIN_APPKEY}\""
             buildConfigField "String", "DEV_CSJ_APPID", "\"${CSJ_APPID}\""
             buildConfigField "String", "CSJ_APPID", "\"${CSJ_APPID}\""
-
-            buildConfigField "String", "VA_VERSION_NAME", "\"${rootProject.ext.VA_VERSION}\""
-            manifestPlaceholders.put("VA_VERSION_NAME", "${rootProject.ext.VA_VERSION}")
         }
 
         // 港澳台
@@ -342,21 +310,6 @@ repositories {
     }
 }
 
-// 删除不需要的 assets
-android.applicationVariants.configureEach { variant ->
-    variant.mergeAssets.doLast {
-        def assetDir = variant.mergeAssetsProvider.get().outputDir.get()
-        def unwantedAssets = ['2011394667', 'gdt_plugin/gdtadv2.jar']
-
-        unwantedAssets.each { assetPath ->
-            def file = new File([assetDir, assetPath].join(File.separator))
-            if (file.exists()) {
-                file.delete()
-            }
-        }
-    }
-}
-
 dependencies {
 
     implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
@@ -380,6 +333,8 @@ dependencies {
     implementation "androidx.viewpager2:viewpager2:${viewpager2}"
     kapt "androidx.room:room-compiler:${room}"
 
+    implementation "com.kyleduo.switchbutton:library:${switchButton}"
+
     implementation "com.tencent.vasdolly:helper:${apkChannelPackage}"
     implementation "com.tencent.vasdolly:writer:${apkChannelPackage}"
 
@@ -402,9 +357,7 @@ dependencies {
         exclude module: "gsyvideoplayer-androidvideocache"
         exclude group: "tv.danmaku.ijk.media"
     })
-    implementation ("com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-exo_player2:$gsyVideo") {
-        exclude group: 'com.google.android.exoplayer', module: 'extension-rtmp'
-    }
+    implementation "com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-exo_player2:$gsyVideo"
 
     implementation "com.llew.huawei:verifier:${verifier}"
 
@@ -418,7 +371,7 @@ dependencies {
 
     implementation "com.lg:easyfloat:${easyFloat}"
 
-    implementation("com.lg:apksig:${apksig}") {
+    implementation ("com.lg:apksig:${apksig}") {
         exclude group: 'com.google.protobuf'
     }
 
@@ -434,7 +387,7 @@ dependencies {
     implementation project(':vspace-bridge:vspace')
     implementation(project(':feature:xapk-installer'))
 
-    implementation(project(':module_common')) {
+    implementation (project(':module_common')) {
         exclude group: 'androidx.swiperefreshlayout'
     }
 
@@ -509,11 +462,9 @@ dependencies {
         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) {
+    if(!gradle.ext.excludeOptionalModules || gradle.ext.enableVa) {
         implementation(project(":module_va_impl"))
     }
     debugImplementation "com.bytedance.tools.codelocator:codelocator-core:2.0.3"

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

@@ -32,11 +32,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,14 +1,10 @@
 package com.gh.vspace.installexternalgames
 
-import android.Manifest
 import android.app.Dialog
-import android.content.ComponentName
-import android.content.pm.PackageManager
 import android.os.Bundle
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.gh.common.util.DialogUtils
+import com.gh.gamecenter.R
 import com.gh.gamecenter.common.base.fragment.ToolbarFragment
 import com.gh.gamecenter.common.exposure.meta.MetaUtil
 import com.gh.gamecenter.common.utils.dip2px
@@ -44,19 +40,6 @@ class InstallExternalGameFragment : ToolbarFragment(), OnItemClickListener {
 
     private lateinit var dialog: Dialog
 
-
-    private val requestPermissionLauncher = registerForActivityResult<String, Boolean>(
-        ActivityResultContracts.RequestPermission()
-    ) { result ->
-        if (result == true) {
-            // grant
-            mViewModel.scanPaths()
-        } else {
-            // not grant
-        }
-    }
-
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setNavigationTitle(getString(com.gh.gamecenter.R.string.title_install_external_game))
@@ -73,30 +56,11 @@ class InstallExternalGameFragment : ToolbarFragment(), OnItemClickListener {
             )
             adapter.notifyDataSetChanged()
         }
+        mViewModel.scanPaths()
+
 
-        requestStoragePermission()
     }
 
-    private fun requestStoragePermission() {
-        when {
-            ContextCompat.checkSelfPermission(
-                requireContext(),
-                Manifest.permission.READ_EXTERNAL_STORAGE
-            ) == PackageManager.PERMISSION_GRANTED -> {
-                mViewModel.scanPaths()
-            }
-
-            shouldShowRequestPermissionRationale(Manifest.permission.READ_EXTERNAL_STORAGE) -> {
-                requestPermissionLauncher.launch(Manifest.permission.READ_EXTERNAL_STORAGE)
-            }
-
-            else -> {
-                requestPermissionLauncher.launch(Manifest.permission.READ_EXTERNAL_STORAGE)
-            }
-        }
-    }
-
-
     private fun initView() {
         dialog = DialogUtils.showWaitDialog(requireContext(), "")
         mBinding.externalGamesList.let {
@@ -104,7 +68,7 @@ class InstallExternalGameFragment : ToolbarFragment(), OnItemClickListener {
             it.layoutManager = LinearLayoutManager(requireContext())
             val itemDecoration = HorizontalDividerItemDecoration.Builder(requireContext())
                 .size(2F.dip2px())
-                .color(com.gh.gamecenter.common.R.color.ui_divider.toColor(requireContext()))
+                .color(R.color.ui_divider.toColor(requireContext()))
                 .build()
             if (it.itemDecorationCount != 0) {
                 it.removeItemDecorationAt(0)
@@ -130,11 +94,9 @@ class InstallExternalGameFragment : ToolbarFragment(), OnItemClickListener {
             OnItemClickListener.ClickType.CLICK_INSTALL -> {
                 install(externalGameUiState)
             }
-
             OnItemClickListener.ClickType.CLICK_UNINSTALL -> {
                 uninstall(externalGameUiState)
             }
-
             OnItemClickListener.ClickType.CLICK_START -> {
                 start(externalGameUiState)
             }
@@ -142,8 +104,9 @@ class InstallExternalGameFragment : ToolbarFragment(), OnItemClickListener {
     }
 
     private fun install(externalGameUiState: ExternalGameUiState) {
+        val bit =
+            externalGameUiState.externalGameEntity.cpuAbi.let { if (it.size == 1 && it.contains("armeabi-v7a")) "32" else "64" }
 
-        VHelper.disableLaunchGameAfterInstallation()
         VHelper.install(requireContext(), DownloadEntity().apply {
             externalGameUiState.externalGameEntity.apply {
                 packageName = apkPackageName
@@ -151,12 +114,20 @@ class InstallExternalGameFragment : ToolbarFragment(), OnItemClickListener {
             }
         }, true)
 
-        VHelper.newCwValidateVspaceBeforeAction(
-            requireContext(),null,
-        ) {
-            dialog.show()
-        }
 
+        if (VHelper.showDialogIfVSpaceIsNeeded(
+                requireContext(),
+                "",
+                externalGameUiState.externalGameEntity.appName,
+                "",
+                bit = bit
+            )
+        ) return
+        dialog.show()
+        externalGameUiState.externalGameEntity.let {
+            val intent = VirtualAppManager.getInstallIntent(context, it.apkPath, it.apkPackageName)
+            requireActivity().startActivity(intent)
+        }
     }
 
     private fun uninstall(externalGameUiState: ExternalGameUiState) {
@@ -187,12 +158,6 @@ class InstallExternalGameFragment : ToolbarFragment(), OnItemClickListener {
             com.gh.gamecenter.BuildConfig.VA_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

@@ -7,15 +7,6 @@
         <package android:name="com.gh.gamecenter" />
     </queries>
 
-    <queries>
-        <package android:name="com.gh.toolmap" />
-        <intent>
-            <action android:name="android.intent.action.VIEW"/>
-            <category android:name="android.intent.category.BROWSABLE"/>
-            <data android:scheme="ghtoolmap"/>
-        </intent>
-    </queries>
-
     <queries>
         <package android:name="com.lg.vspace" />
         <package android:name="com.gh.gamecenter.addon" />
@@ -194,8 +185,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
@@ -465,6 +454,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"
@@ -582,6 +574,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" />
@@ -803,12 +799,6 @@
             android:screenOrientation="portrait"
             android:theme="@style/AppCompatTheme.APP" />
 
-        <activity
-            android:name=".search.SearchTabActivity"
-            android:configChanges="keyboardHidden"
-            android:screenOrientation="portrait"
-            android:theme="@style/AppCompatTheme.APP" />
-
         <!--        <activity-->
         <!--            android:name="${applicationId}.douyinapi.DouYinEntryActivity"-->
         <!--            android:launchMode="singleTask"-->

app/src/main/assets/lottie/tab_forum.json

@@ -0,0 +1 @@
+{"v":"5.6.9","fr":30,"ip":0,"op":20,"w":66,"h":66,"nm":"bottom bar tab/论坛/选中/E","ddd":0,"assets":[{"id":"comp_0","layers":[{"ddd":0,"ind":1,"ty":4,"nm":"白-修正","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,33,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":4,"s":[80,80,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":9,"s":[110,110,100]},{"t":13,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":1,"y":0},"t":0,"s":[{"i":[[0,-0.66],[0,0],[1.38,0],[0,1.38],[0,0],[-0.66,0],[0,0]],"o":[[0,0],[0,1.38],[-1.38,0],[0,0],[0,-0.66],[0,0],[0.66,0]],"v":[[2.5,-1.3],[2.5,0],[0,2.5],[-2.5,0],[-2.5,-1.3],[-1.3,-2.5],[1.3,-2.5]],"c":true}]},{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"t":4,"s":[{"i":[[0,-0.66],[0,0],[1.38,0],[0,1.38],[0,0],[-0.66,0],[0,0]],"o":[[0,0],[0,1.38],[-1.38,0],[0,0],[0,-0.66],[0,0],[0.66,0]],"v":[[2.5,-0.102],[2.5,0],[0,2.109],[-2.5,0],[-2.5,-0.102],[-1.3,-1.302],[1.3,-1.302]],"c":true}]},{"i":{"x":0.667,"y":1},"o":{"x":1,"y":0},"t":9,"s":[{"i":[[0,-0.66],[0,0],[1.38,0],[0,1.38],[0,0],[-0.66,0],[0,0]],"o":[[0,0],[0,1.38],[-1.38,0],[0,0],[0,-0.66],[0,0],[0.66,0]],"v":[[2.498,-1.845],[2.5,0],[0,2.734],[-2.5,0],[-2.502,-1.845],[-1.302,-3.045],[1.298,-3.045]],"c":true}]},{"t":13,"s":[{"i":[[0,-0.66],[0,0],[1.38,0],[0,1.38],[0,0],[-0.66,0],[0,0]],"o":[[0,0],[0,1.38],[-1.38,0],[0,0],[0,-0.66],[0,0],[0.66,0]],"v":[[2.5,-1.3],[2.5,0],[0,2.5],[-2.5,0],[-2.5,-1.3],[-1.3,-2.5],[1.3,-2.5]],"c":true}]}],"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"矩形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":150,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"蓝","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,33.76,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.8,0.42],[-3.44,-0.79],[-0.09,-1.71],[0,0],[0,0],[1.98,-0.1],[0,0],[0,0],[0,0],[0.62,0.57],[0,0],[0,0],[0,0],[0,0],[0,0],[0.2,1.89],[0,0],[0,0],[0,0]],"o":[[3.44,-0.79],[1.74,0.41],[0,0],[0,0],[0,2],[0,0],[0,0],[0,0],[-0.69,0.52],[0,0],[0,0],[0,0],[0,0],[0,0],[-1.94,0],[0,0],[0,0],[0,0],[0,-1.8]],"v":[[-6.39,-8.971],[6.39,-8.971],[9.49,-5.471],[9.5,-5.271],[9.5,3.249],[5.95,6.989],[5.75,6.999],[3.25,6.999],[0.3,9.209],[-1.95,9.089],[-2.06,8.969],[-2.17,8.849],[-2.21,8.779],[-3.4,6.999],[-5.75,6.999],[-9.48,3.639],[-9.49,3.449],[-9.5,3.249],[-9.5,-5.271]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.266,0.638,1,0.5,0.242,0.595,1,1,0.217,0.552,1],"ix":9}},"s":{"a":0,"k":[-9.5,-9.561],"ix":5},"e":{"a":0,"k":[9.5,9.561],"ix":6},"t":1,"nm":"color","mn":"ADBE Vector Graphic - G-Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"路径","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":150,"st":0,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":0,"nm":"预合成 1","refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,33,0],"ix":2},"a":{"a":0,"k":[33,33,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":0,"s":[100,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":4,"s":[70,70,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":9,"s":[110,110,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":13,"s":[90,90,100]},{"t":16,"s":[100,100,100]}],"ix":6}},"ao":0,"w":66,"h":66,"ip":0,"op":20,"st":0,"bm":0}],"markers":[]}

app/src/main/assets/lottie/tab_video.json

@@ -0,0 +1 @@
+{"v":"5.5.9","fr":30,"ip":0,"op":20,"w":66,"h":66,"nm":"tab_video","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"形状图层 1","parent":2,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.771],"y":[0]},"t":0,"s":[0]},{"t":5,"s":[100]}],"ix":11},"r":{"a":0,"k":90,"ix":10},"p":{"a":0,"k":[-3.742,6.835,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[30.937,31.042,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"sr","sy":2,"d":1,"pt":{"a":0,"k":3,"ix":3},"p":{"a":0,"k":[0,0],"ix":4},"r":{"a":0,"k":0,"ix":5},"or":{"a":0,"k":29.286,"ix":7},"os":{"a":0,"k":75,"ix":9},"ix":1,"nm":"多边星形路径 1","mn":"ADBE Vector Shape - Star","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":13,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[-20.75,-13.25],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[102.743,88.578],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"多边星形 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.657],"y":[0]},"t":0,"s":[0]},{"t":8,"s":[100]}],"ix":2},"o":{"a":0,"k":-115,"ix":3},"m":1,"ix":2,"nm":"修剪路径 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":60,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"路径 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,33.004,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.508,0.508,0.333],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.488,0.488,0.333],"y":[0,0,0]},"t":4,"s":[80,80,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.502,0.502,0.333],"y":[0,0,0]},"t":9,"s":[110,110,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.534,0.534,0.333],"y":[0,0,0]},"t":13,"s":[95,95,100]},{"t":16,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[2.16,0.38],[3.22,-0.55],[0.38,-2.16],[-0.55,-3.22],[-2.16,-0.38],[-1.63,0],[-1.61,0.27],[-0.38,2.16],[0.55,3.22]],"o":[[-0.38,-2.16],[-3.22,-0.55],[-2.16,0.38],[-0.55,3.22],[0.38,2.16],[1.61,0.27],[1.63,0],[2.16,-0.38],[0.55,-3.22],[0,0]],"v":[[9.09,-4.86],[4.86,-9.09],[-4.86,-9.09],[-9.09,-4.86],[-9.09,4.86],[-4.86,9.09],[0,9.5],[4.86,9.09],[9.09,4.86],[9.09,-4.86]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.266,0.638,1,0.5,0.242,0.595,1,1,0.217,0.552,1],"ix":9}},"s":{"a":0,"k":[-5.174,-4.43],"ix":5},"e":{"a":0,"k":[8.612,8.214],"ix":6},"t":1,"nm":"Gradient Fill 3","mn":"ADBE Vector Graphic - G-Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"路径","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":60,"st":0,"bm":0}],"markers":[]}

app/src/main/assets/rich_editor.js

@@ -588,7 +588,7 @@ document.addEventListener("selectionchange", function(e) {
 });
 
 document.addEventListener("selectionchange", function(e) {
-   setTimeout(() => RE.enabledEditingItems(e), 10)
+   RE.enabledEditingItems(e)
 });
 
 RE.recursion = function(dom) {

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

@@ -28,7 +28,6 @@ import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.exposure.ExposureSource
 import com.gh.gamecenter.common.retrofit.BiResponse
 import com.gh.gamecenter.common.utils.*
-import com.gh.gamecenter.core.AppExecutor
 import com.gh.gamecenter.core.provider.ICsjAdProvider
 import com.gh.gamecenter.core.utils.CurrentActivityHolder
 import com.gh.gamecenter.core.utils.SPUtils
@@ -79,19 +78,6 @@ object AdDelegateHelper {
     var gameSearchKeyword = ""
 
     fun initAdSdk(context: Context) {
-        if (AdPluginDownloadHelper.isCsjPluginDownloaded()) {
-            initAdSdkInternal(context)
-        } else {
-            // 首次启动，为了不影响首页加载，延迟 3 秒再下载广告插件并初始化
-            AppExecutor.uiExecutor.executeWithDelay({
-                AdPluginDownloadHelper.downloadPluginIfNeeded(isCsj = true) {
-                    initAdSdkInternal(context)
-                }
-            }, 3000L)
-        }
-    }
-
-    private fun initAdSdkInternal(context: Context) {
         // 初始化穿山甲
         if (mCsjAdImpl == null) {
             mCsjAdImpl =
@@ -241,7 +227,18 @@ object AdDelegateHelper {
     /**
      * 是否大于开屏广告展示间隔时长
      */
-    private fun isMatchStartUpAdDisplayRule(): Boolean = isMatchAdDisplayRule(mSplashAd, Constants.SP_LAST_SPLASH_AD_SHOW_TIME)
+    private fun isMatchStartUpAdDisplayRule(): Boolean {
+        mSplashAd?.displayRule?.run {
+            if (adDisplayInterval > 0) {
+                val lastShowTime = SPUtils.getLong(Constants.SP_LAST_SPLASH_AD_SHOW_TIME, 0L)
+                val durationInMinutes = (System.currentTimeMillis() - lastShowTime).toFloat() / 1000 / 60
+                return durationInMinutes > adDisplayInterval
+            } else {
+                return true
+            }
+        }
+        return true
+    }
 
     /**
      * 是否大于广告管理展示间隔时长
@@ -295,7 +292,6 @@ object AdDelegateHelper {
         adViewHeightInDp: Float,
         startAdContainer: ViewGroup,
         sdkStartAdContainer: ViewGroup,
-        sdkJumpBtn: TextView,
         adsViewGroup: FrameLayout,
         handler: BaseActivity.BaseHandler,
         isHotLaunch: Boolean,
@@ -317,7 +313,6 @@ object AdDelegateHelper {
                         adViewHeightInDp,
                         startAdContainer,
                         sdkStartAdContainer,
-                        sdkJumpBtn,
                         adsViewGroup,
                         handler,
                         isHotLaunch,
@@ -335,7 +330,6 @@ object AdDelegateHelper {
                         adViewHeightInDp,
                         startAdContainer,
                         sdkStartAdContainer,
-                        sdkJumpBtn,
                         adsViewGroup,
                         handler,
                         isHotLaunch,
@@ -359,7 +353,6 @@ object AdDelegateHelper {
         adViewHeightInDp: Float,
         startAdContainer: ViewGroup,
         sdkStartAdContainer: ViewGroup,
-        sdkJumpBtn: TextView,
         adsViewGroup: FrameLayout,
         handler: BaseActivity.BaseHandler,
         isHotLaunch: Boolean,
@@ -381,7 +374,6 @@ object AdDelegateHelper {
                         adViewHeightInDp,
                         startAdContainer,
                         sdkStartAdContainer,
-                        sdkJumpBtn,
                         adsViewGroup,
                         handler,
                         isHotLaunch,
@@ -411,14 +403,13 @@ object AdDelegateHelper {
             sdkStartAdContainer.visibility = View.VISIBLE
             requestCsjSplashAd(
                 activity,
+                thirdPartyAd.slotId,
                 adViewWidthInPx,
                 adViewHeightInPx,
                 adViewWidthInDp,
                 adViewHeightInDp,
                 sdkStartAdContainer,
-                sdkJumpBtn,
                 timeout,
-                isHotLaunch,
                 sdkSplashCallback
             )
         }
@@ -429,65 +420,27 @@ 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,
             )
         }
@@ -504,7 +457,6 @@ object AdDelegateHelper {
         adViewHeightInDp: Float,
         startAdContainer: ViewGroup,
         sdkStartAdContainer: ViewGroup,
-        sdkJumpBtn: TextView,
         adsViewGroup: FrameLayout,
         handler: BaseActivity.BaseHandler,
         isHotLaunch: Boolean,
@@ -522,7 +474,6 @@ object AdDelegateHelper {
                     adViewHeightInDp,
                     startAdContainer,
                     sdkStartAdContainer,
-                    sdkJumpBtn,
                     adsViewGroup,
                     handler,
                     isHotLaunch,
@@ -670,11 +621,9 @@ object AdDelegateHelper {
         slotId: String,
         adContainerView: ViewGroup,
         expressViewWidth: Float,
-        onAdShowAction: () -> Unit,
-        onAdClickAction: () -> Unit,
         callback: (isSuccess: Boolean) -> Unit,
     ) {
-        mCsjAdImpl?.requestFlowAd(fragment, adContainerView, slotId, expressViewWidth, onAdShowAction, onAdClickAction, callback)
+        mCsjAdImpl?.requestFlowAd(fragment, adContainerView, slotId, expressViewWidth, callback)
     }
 
     /**
@@ -685,8 +634,6 @@ object AdDelegateHelper {
         containerView: ViewGroup,
         ad: AdConfig.ThirdPartyAd,
         expressViewWidthInDp: Float,
-        onAdShowAction: () -> Unit,
-        onAdClickAction: () -> Unit,
         callback: (isSuccess: Boolean) -> Unit
     ) {
 
@@ -709,28 +656,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
         )
     }

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

@@ -1,149 +0,0 @@
-package com.gh.ad
-
-import com.gh.download.simple.DownloadMessageHandler
-import com.gh.download.simple.SimpleDownloadDatabase
-import com.gh.download.simple.SimpleDownloadManager
-import com.gh.gamecenter.core.runOnIoThread
-import com.gh.gamecenter.core.utils.PluginRedirectHelper
-import com.gh.gamecenter.core.utils.SPUtils
-import com.lg.download.DownloadError
-import com.lg.download.DownloadStatus
-import com.lg.download.httpclient.DefaultHttpClient
-import com.lg.download.listener.InnerDownloadListener
-import com.lg.ndownload.DownloadConfig
-import com.lg.ndownload.DownloadConfigBuilder
-import com.lg.ndownload.DownloadIoExecutor
-import com.lightgame.utils.Utils
-import java.lang.Exception
-import java.net.URLConnection
-
-object AdPluginDownloadHelper : InnerDownloadListener {
-
-    private const val CSJ_FILE_NAME = "2011394667"
-    private const val GDT_FILE_NAME = "gdt_plugin/gdtadv2.jar"
-
-    private const val CSJ_PLUGIN_URL = "https://and-static.ghzs66.com/android/static/2011394667"
-    private const val GDT_PLUGIN_URL = "https://and-static.ghzs66.com/android/static/gdtadv2.jar"
-
-    private var csjDownloadedCallback: (() -> Unit)? = null
-
-    /**
-     * 是否已经下载了广告插件
-     */
-    fun isCsjPluginDownloaded(): Boolean {
-        return SPUtils.getBoolean(CSJ_FILE_NAME, false)
-    }
-
-    /**
-     * 下载广告插件并初始化 （初始化限定穿山甲）
-     */
-    fun downloadPluginIfNeeded(isCsj: Boolean = false, isGdt: Boolean = false, csjCallback: (() -> Unit)? = null) {
-        val isCsjPluginDownloaded = SPUtils.getBoolean(CSJ_FILE_NAME, false)
-        val isGdtPluginDownloaded = SPUtils.getBoolean(GDT_FILE_NAME, false)
-
-        if (isCsj && isCsjPluginDownloaded) {
-            csjCallback?.invoke()
-            return
-        }
-
-        if (isGdt && isGdtPluginDownloaded) {
-            return
-        }
-
-        runOnIoThread {
-            csjDownloadedCallback = csjCallback
-
-            DownloadMessageHandler.init(SimpleDownloadDatabase.instance.downloadDao())
-
-            if (!isCsjPluginDownloaded && isCsj) {
-                val csjPluginConfig = DownloadConfigBuilder()
-                    .setUniqueId(CSJ_FILE_NAME)
-                    .setUrl(CSJ_PLUGIN_URL)
-                    .setFileName(CSJ_FILE_NAME)
-                    .setHttpClient(DefaultHttpClient())
-                    .setDownloadThreadSize(2)
-                    .setPathToStore(PluginRedirectHelper.getAssetDir())
-                    .setDownloadExecutor(DownloadIoExecutor.getInstance())
-                    .setDownloadListener(this).build()
-
-                SimpleDownloadManager.download(csjPluginConfig)
-            }
-
-            if (!isGdtPluginDownloaded && isGdt) {
-                val gdtPluginConfig = DownloadConfigBuilder()
-                    .setUniqueId(GDT_FILE_NAME)
-                    .setUrl(GDT_PLUGIN_URL)
-                    .setFileName(GDT_FILE_NAME)
-                    .setHttpClient(DefaultHttpClient())
-                    .setDownloadThreadSize(2)
-                    .setPathToStore(PluginRedirectHelper.getAssetDir())
-                    .setDownloadExecutor(DownloadIoExecutor.getInstance())
-                    .setDownloadListener(this).build()
-
-                SimpleDownloadManager.download(gdtPluginConfig)
-            }
-        }
-    }
-
-    override fun onError(id: String?, error: DownloadError?, exception: Exception?) {
-        Utils.log("下载广告插件失败 $id")
-        id?.let {
-            if (it == CSJ_FILE_NAME) {
-                csjDownloadedCallback = null
-            }
-            SimpleDownloadManager.cancel(it)
-        }
-    }
-
-    override fun onProgress(id: String?, progress: Float) {
-        Utils.log("下载广告插件进度 $id $progress")
-    }
-
-    override fun onProgressWithoutThrottle(id: String?, progress: Float) {
-        // do nothing
-    }
-
-    override fun onSizeReceived(id: String?, fileSize: Long) {
-        // do nothing
-    }
-
-    override fun onReadyToDownload(id: String?, actualThreadSize: Int) {
-        // do nothing
-    }
-
-    override fun onStatusChanged(id: String?, status: DownloadStatus?) {
-        // do nothing
-    }
-
-    override fun onDownloadComplete(id: String?, elapsedTime: Long) {
-        id?.let {
-            // id 即为插件名
-            SPUtils.setBoolean(it, true)
-            if (it == CSJ_FILE_NAME) {
-                csjDownloadedCallback?.invoke()
-                csjDownloadedCallback = null
-            }
-        }
-    }
-
-    override fun onSpeedChanged(id: String?, speed: Float) {
-        // do nothing
-    }
-
-    override fun onRedirectingUrl(
-        id: String?,
-        connection: URLConnection?,
-        config: DownloadConfig?
-    ) {
-        // do nothing
-    }
-
-    override fun onRedirectedUrl(
-        id: String?,
-        connection: URLConnection?,
-        redirectedUrl: String?
-    ) {
-        // do nothing
-    }
-
-}

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
 
 @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/base/BaseRichEditorActivity.kt

@@ -21,8 +21,6 @@ import com.gh.common.view.RichEditor
 import com.gh.gamecenter.CropImageActivity
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.base.activity.ToolBarActivity
-import com.gh.gamecenter.common.entity.LocalVideoEntity
-import com.gh.gamecenter.feature.selector.LocalMediaActivity
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.core.AppExecutor
 import com.gh.gamecenter.core.runOnIoThread
@@ -32,7 +30,6 @@ import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.qa.editor.*
 import com.gh.gamecenter.feature.entity.AnswerEntity
 import com.gh.gamecenter.feature.entity.ArticleEntity
-import com.gh.gamecenter.feature.selector.ChooseType
 import com.gh.gamecenter.qa.entity.EditorInsertEntity
 import com.gh.gamecenter.video.poster.PosterEditActivity
 import com.gh.gamecenter.video.upload.UploadManager
@@ -236,7 +233,7 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> constructor(
         mKeyboardHeightProvider = KeyboardHeightProvider(this)
         mRichEditor.post { mKeyboardHeightProvider?.start() }
         mRichEditor.enableForceDark(DarkModeUtils.isDarkModeOn(this))
-        mRichEditor.setEditorBackgroundColor(com.gh.gamecenter.common.R.color.ui_surface.toColor(this))
+        mRichEditor.setEditorBackgroundColor(R.color.ui_surface.toColor(this))
         mRichEditor.setEditorFontColor(if (mIsDarkModeOn) Color.parseColor("#C2C2C2") else Color.parseColor("#4A4A4A"))
         // 防止个别手机在Js里无法获取粘贴内容
         mRichEditor.addJavascriptInterface(OnPasteListener(), "onPasteListener")
@@ -505,7 +502,7 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> constructor(
                 startActivityForResult(
                     LocalMediaActivity.getIntent(
                         this@BaseRichEditorActivity,
-                        ChooseType.VIDEO,
+                        LocalMediaActivity.ChooseType.VIDEO,
                         maxChooseCount,
                         if (mtaEventName() == "提问帖") "发提问帖" else "发帖子"
                     ), INSERT_MEDIA_VIDEO_CODE
@@ -534,7 +531,7 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> constructor(
                 val maxChooseCount = if (imageCount + 10 <= MAX_IMAGE_COUNT) 10 else MAX_IMAGE_COUNT - imageCount
                 val intent = LocalMediaActivity.getIntent(
                     this@BaseRichEditorActivity,
-                    ChooseType.IMAGE,
+                    LocalMediaActivity.ChooseType.IMAGE,
                     maxChooseCount,
                     if (mtaEventName() == "提问帖") "发提问帖" else "发帖子"
                 )
@@ -800,9 +797,9 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> constructor(
 
     override fun onDarkModeChanged() {
         super.onDarkModeChanged()
-        updateStatusBarColor(com.gh.gamecenter.common.R.color.ui_surface, com.gh.gamecenter.common.R.color.ui_surface)
+        updateStatusBarColor(R.color.ui_surface, R.color.ui_surface)
         mRichEditor.enableForceDark(DarkModeUtils.isDarkModeOn(this))
-        mRichEditor.setEditorBackgroundColor(com.gh.gamecenter.common.R.color.ui_surface.toColor(this))
+        mRichEditor.setEditorBackgroundColor(R.color.ui_surface.toColor(this))
         mRichEditor.setEditorFontColor(if (mIsDarkModeOn) Color.parseColor("#C2C2C2") else Color.parseColor("#4A4A4A"))
     }
 

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

@@ -10,6 +10,7 @@ import android.text.TextUtils
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.MediatorLiveData
 import androidx.lifecycle.MutableLiveData
+import com.gh.gamecenter.R
 import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment
 import com.gh.gamecenter.common.entity.ErrorEntity
 import com.gh.gamecenter.common.retrofit.BiResponse
@@ -19,7 +20,7 @@ import com.gh.gamecenter.core.runOnUiThread
 import com.gh.gamecenter.core.utils.MD5Utils
 import com.gh.gamecenter.core.utils.ToastUtils
 import com.gh.gamecenter.entity.ForumDetailEntity
-import com.gh.gamecenter.common.entity.LocalVideoEntity
+import com.gh.gamecenter.entity.LocalVideoEntity
 import com.gh.gamecenter.entity.QuoteCountEntity
 import com.gh.gamecenter.qa.BbsType
 import com.gh.gamecenter.retrofit.RetrofitManager
@@ -38,6 +39,8 @@ import retrofit2.HttpException
 import java.io.File
 import java.io.FileOutputStream
 import java.util.*
+import kotlin.collections.ArrayList
+import kotlin.collections.HashMap
 import kotlin.collections.LinkedHashMap
 import kotlin.collections.set
 
@@ -83,7 +86,7 @@ abstract class BaseRichEditorViewModel(application: Application) : AndroidViewMo
                     val application: Application = getApplication()
                     Utils.toast(
                         getApplication(),
-                        application.getString(com.gh.gamecenter.common.R.string.pic_max_hint, count)
+                        application.getString(R.string.pic_max_hint, count)
                     )
                     continue
                 }

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

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

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

@@ -374,7 +374,7 @@ object DefaultUrlHandler {
                     val iconSubscript = uri.getQueryParameter("game_icon_subscript") ?: ""
                     val gameEntity =
                         if (forumType == BbsType.OFFICIAL_BBS.value && gameId.isNotEmpty() && gameName.isNotEmpty() && icon.isNotEmpty()) {
-                            GameEntity(_id = gameId, mName = gameName, mIcon = icon, mIconSubscript = iconSubscript)
+                            GameEntity(id = gameId, mName = gameName, mIcon = icon, mIconSubscript = iconSubscript)
                         } else null
                     val activityLabelEntity = if (activityId.isNotEmpty() && activityName.isNotEmpty()) {
                         ActivityLabelEntity(

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/chain/VersionNumberHandler.kt

@@ -30,7 +30,7 @@ class VersionNumberHandler : DownloadChainHandler() {
                 "温馨提示",
                 gameEntity.getVersionNumberString(),
                 "继续下载",
-                com.gh.gamecenter.common.R.string.cancel.toResString(),
+                R.string.cancel.toResString(),
                 {
                     confirmCallback.invoke()
                     SensorsBridge.trackGameDemoDialogClick(
@@ -42,7 +42,7 @@ class VersionNumberHandler : DownloadChainHandler() {
                 },
                 cancelClickCallback = {
                     SensorsBridge.trackGameDemoDialogClick(
-                        buttonName = com.gh.gamecenter.common.R.string.cancel.toResString(),
+                        buttonName = R.string.cancel.toResString(),
                         gameId = gameEntity.id,
                         gameName = gameEntity.name ?: "",
                         gameType = gameEntity.categoryChinese

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;
@@ -26,7 +25,6 @@ import com.gh.gamecenter.core.utils.GsonUtils;
 import com.gh.gamecenter.core.utils.SPUtils;
 import com.gh.gamecenter.core.utils.UrlFilterUtils;
 import com.gh.gamecenter.entity.AppEntity;
-import com.gh.gamecenter.entity.FloatWindowSettingEntity;
 import com.gh.gamecenter.entity.GameGuidePopupEntity;
 import com.gh.gamecenter.entity.NewApiSettingsEntity;
 import com.gh.gamecenter.entity.NewSettingsEntity;
@@ -48,7 +46,6 @@ 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.functions.Function;
@@ -63,9 +60,6 @@ public class Config {
     public static final String NEW_API_HOST = EnvHelper.getNewHost();
     public static final String VAPI_HOST = EnvHelper.getVHost();
 
-    public static final String WGAME_CPM_BUSIAPPID = BuildConfig.WGAME_CPM_BUSIAPPID;
-    public static final String WGAME_CPM_API_HOST = EnvHelper.getWGameCPMHost();
-
     // Third-Party confs
     public static final String WECHAT_APPID = BuildConfig.WECHAT_APPID;
     public static final String WECHAT_SECRET = BuildConfig.WECHAT_SECRET;
@@ -84,12 +78,10 @@ public class Config {
     private static NewApiSettingsEntity.NightMode mNightModeSetting;
     private static SimulatorEntity mNewSimulatorEntity;
     private static VSetting mVSetting;
-    private volatile static VNewSetting mVNewSetting;
-
-    private static FloatWindowSettingEntity mFloatWindowSetting;
+    private static VNewSetting mVNewSetting;
 
     private static AppEntity mNew32UpdateEntity;
-    private static BehaviorSubject<VNewSetting> vNewSettingSubject = BehaviorSubject.create();
+    public static BehaviorSubject<VNewSetting> vNewSettingSubject = BehaviorSubject.create();
     private static GameGuidePopupEntity mGameGuidePopupEntity;
     private static SharedPreferences mDefaultSharedPreferences;
 
@@ -219,31 +211,6 @@ public class Config {
         }
         return mVNewSetting;
     }
-    @Nullable
-    public static FloatWindowSettingEntity getFloatWindowSettingEntity() {
-        if (mFloatWindowSetting == null) {
-            try {
-                String json = SPUtils.getString(Constants.SP_FLOAT_WINDOW_SETTINGS);
-                if (!TextUtils.isEmpty(json)) {
-                    mFloatWindowSetting = GsonUtils.fromJson(json, FloatWindowSettingEntity.class);
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-        return mFloatWindowSetting;
-    }
-
-
-    @NonNull
-    public static Observable<VNewSetting> getVNewSettingObservable() {
-        if (mVNewSetting != null) {
-            return Observable.just(mVNewSetting);
-        } else {
-            return vNewSettingSubject.hide();
-        }
-    }
-
 
     @Nullable
     public static AppEntity getNew32UpdateEntity() {
@@ -351,7 +318,6 @@ public class Config {
 
         refreshVSettingEntity();
         getNewSetting();
-        getFloatWindowSetting();
 
         RetrofitManager.getInstance()
                 .getApi().getGameGuidePopup(Build.MANUFACTURER, Build.VERSION.RELEASE, Build.MODEL, channel, BuildConfig.VERSION_NAME)
@@ -430,20 +396,6 @@ public class Config {
         }
     }
 
-    @SuppressLint("CheckResult")
-    private static void getFloatWindowSetting() {
-        RetrofitManager.getInstance().getNewApi()
-                .getFloatWindowSettings()
-                .subscribeOn(Schedulers.io())
-                .subscribe(new BiResponse<FloatWindowSettingEntity>() {
-                    @Override
-                    public void onSuccess(FloatWindowSettingEntity data) {
-                        mFloatWindowSetting = data;
-                        SPUtils.setString(Constants.SP_FLOAT_WINDOW_SETTINGS, GsonUtils.toJson(data));
-                    }
-                });
-    }
-
     public static void observePackageChange(NewApiSettingsEntity.PackageObserveActions packageObserveActions) {
         PackageChangeBroadcastReceiver receiver = new PackageChangeBroadcastReceiver(packageObserveActions);
         IntentFilter intentFilter = new IntentFilter();

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

@@ -120,14 +120,14 @@ object AddKaiFuBindingAdapter {
     @BindingAdapter("kaiFuTextColor", "kaiFuTextPosition")
     fun kaiFuTextColor(view: EditText, dataMark: Int, position: Int) {
         if (dataMark == 1 && view.id == R.id.kaifu_add_time || dataMark == 2 && view.id == R.id.kaifu_add_first_name || dataMark == 3 && view.id == R.id.kaifu_add_server_name || dataMark == 4) {
-            view.setTextColor(ContextCompat.getColor(view.context, com.gh.gamecenter.common.R.color.secondary_red))
-            view.setHintTextColor(ContextCompat.getColor(view.context, com.gh.gamecenter.common.R.color.secondary_red))
+            view.setTextColor(ContextCompat.getColor(view.context, R.color.secondary_red))
+            view.setHintTextColor(ContextCompat.getColor(view.context, R.color.secondary_red))
         } else if (position == 0) {
-            view.setTextColor(ContextCompat.getColor(view.context, com.gh.gamecenter.common.R.color.hint))
-            view.setHintTextColor(ContextCompat.getColor(view.context, com.gh.gamecenter.common.R.color.hint))
+            view.setTextColor(ContextCompat.getColor(view.context, R.color.hint))
+            view.setHintTextColor(ContextCompat.getColor(view.context, R.color.hint))
         } else {
-            view.setTextColor(ContextCompat.getColor(view.context, com.gh.gamecenter.common.R.color.text_primary))
-            view.setHintTextColor(ContextCompat.getColor(view.context, com.gh.gamecenter.common.R.color.hint))
+            view.setTextColor(ContextCompat.getColor(view.context, R.color.text_primary))
+            view.setHintTextColor(ContextCompat.getColor(view.context, R.color.hint))
         }
     }
 
@@ -176,7 +176,7 @@ object AddKaiFuBindingAdapter {
             popupWindow.isTouchable = true
             popupWindow.inputMethodMode = PopupWindow.INPUT_METHOD_NEEDED
             popupWindow.isOutsideTouchable = true
-            popupWindow.animationStyle = com.gh.gamecenter.common.R.style.popwindow_option_anim_style
+            popupWindow.animationStyle = R.style.popwindow_option_anim_style
 
             // 设置偏移
             windowPos[1] = windowPos[1] - 12F.dip2px()

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

@@ -27,6 +27,7 @@ import com.gh.common.chain.PackageCheckHandler;
 import com.gh.common.chain.UnsupportedFeatureHandler;
 import com.gh.common.chain.ValidateVSpaceHandler;
 import com.gh.common.chain.VersionNumberHandler;
+import com.gh.common.constant.Config;
 import com.gh.common.filter.RegionSetting;
 import com.gh.common.filter.RegionSettingHelper;
 import com.gh.common.history.HistoryHelper;
@@ -52,6 +53,7 @@ import com.gh.gamecenter.common.entity.LinkEntity;
 import com.gh.gamecenter.common.utils.DarkModeUtils;
 import com.gh.gamecenter.common.utils.ExtensionsKt;
 import com.gh.gamecenter.common.utils.FileUtils;
+import com.gh.gamecenter.common.utils.ImageUtils;
 import com.gh.gamecenter.common.utils.NewFlatLogUtils;
 import com.gh.gamecenter.common.utils.SensorsBridge;
 import com.gh.gamecenter.core.utils.MtaHelper;
@@ -170,7 +172,7 @@ public class BindingAdapters {
                             builder.addHandler(new OverseaDownloadHandler());
                             builder.addHandler(new CheckDownloadHandler());
 
-                            builder.setProcessEndCallback(gameEntity.getId(), (asVGame, isSubscribe) -> {
+                            builder.setProcessEndCallback((asVGame, isSubscribe) -> {
                                 download(v.getContext(),
                                         progressBar,
                                         gameEntity,
@@ -195,7 +197,7 @@ public class BindingAdapters {
                             builder.addHandler(new GamePermissionHandler());
                             builder.addHandler(new VersionNumberHandler());
 
-                            builder.setProcessEndCallback(gameEntity.getId(), (asVGame, isSubscribe) -> {
+                            builder.setProcessEndCallback((asVGame, isSubscribe) -> {
                                 DownloadDialog.showDownloadDialog(
                                         v.getContext(),
                                         gameEntity,
@@ -387,7 +389,7 @@ public class BindingAdapters {
                     case diskisfull:
                     case diskioerror:
                     case waiting:
-                        progressBar.setText(com.gh.gamecenter.feature.R.string.downloading);
+                        progressBar.setText(R.string.downloading);
                         if (downloadEntity.isPluggable() && PackagesManager.isInstalled(downloadEntity.getPackageName())) {
                             progressBar.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_PLUGIN);
                         } else {
@@ -395,7 +397,7 @@ public class BindingAdapters {
                         }
                         break;
                     case done:
-                        progressBar.setText(com.gh.gamecenter.feature.R.string.install);
+                        progressBar.setText(R.string.install);
                         if (downloadEntity.isPluggable()
                                 && PackagesManager.isInstalled(downloadEntity.getPackageName())) {
                             progressBar.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_PLUGIN);
@@ -553,15 +555,15 @@ public class BindingAdapters {
             gameName = String.format("%s - %s", game.getName(),
                     PlatformUtils.getInstance(view.getContext()).getPlatformName(
                             game.getApk().get(0).getPlatform()));
-            if (!gameName.equals((String) view.getTag(com.gh.gamecenter.common.R.string.tag_game_name_id))) {
+            if (!gameName.equals((String) view.getTag(R.string.tag_game_name_id))) {
                 view.setText(gameName);
-                view.setTag(com.gh.gamecenter.common.R.string.tag_game_name_id, gameName);
+                view.setTag(R.string.tag_game_name_id, gameName);
             }
         } else {
             gameName = game.getName();
-            if (gameName != null && !gameName.equals((String) view.getTag(com.gh.gamecenter.common.R.string.tag_game_name_id))) {
+            if (gameName != null && !gameName.equals((String) view.getTag(R.string.tag_game_name_id))) {
                 view.setText(gameName);
-                view.setTag(com.gh.gamecenter.common.R.string.tag_game_name_id, gameName);
+                view.setTag(R.string.tag_game_name_id, gameName);
             }
         }
 

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

@@ -7,6 +7,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import com.gh.common.util.DirectUtils
+import com.gh.gamecenter.R
 import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
 import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.utils.dip2px
@@ -48,7 +49,7 @@ class ApplyModeratorDialogFragment : BaseDialogFragment() {
                 requireContext(),
                 startText.length,
                 startText.length + mGroupNumber.length,
-                com.gh.gamecenter.common.R.color.text_theme,
+                R.color.text_theme,
                 true
             ) {
                 DirectUtils.directToQqGroup(

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

@@ -40,7 +40,7 @@ import java.lang.ref.WeakReference
  * 设备提醒弹窗
  */
 class DeviceRemindDialog(context: Context, val entity: DeviceDialogEntity, val gameEntity: GameEntity) :
-    Dialog(context, com.gh.gamecenter.common.R.style.GhAlertDialog) {
+    Dialog(context, R.style.GhAlertDialog) {
     private val mBinding: DialogDeviceRemindBinding by lazy { DialogDeviceRemindBinding.inflate(layoutInflater) }
     private var currentPage = 0
     private var mSlideLooperInterval = 3000L
@@ -136,13 +136,13 @@ class DeviceRemindDialog(context: Context, val entity: DeviceDialogEntity, val g
         val isFirst = SPUtils.getBoolean(Constants.SP_FIRST_DEVICE_REMIND, false)
         if (!isFirst) {
             mBinding.cancelTv.isEnabled = false
-            mBinding.cancelTv.background = ContextCompat.getDrawable(context, com.gh.gamecenter.common.R.drawable.button_round_f5f5f5)
+            mBinding.cancelTv.background = ContextCompat.getDrawable(context, R.drawable.button_round_f5f5f5)
             disposable = countDownTimer(3) { finish, time ->
                 if (finish) {
                     mBinding.cancelTv.isEnabled = true
-                    mBinding.cancelTv.background = ContextCompat.getDrawable(context, com.gh.gamecenter.common.R.drawable.button_blue_oval)
+                    mBinding.cancelTv.background = ContextCompat.getDrawable(context, R.drawable.button_blue_oval)
                     mBinding.cancelTv.text = "我知道了"
-                    mBinding.cancelTv.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.white))
+                    mBinding.cancelTv.setTextColor(ContextCompat.getColor(context, R.color.white))
                 } else {
                     mBinding.cancelTv.text = "我知道了(${time}S)"
                 }
@@ -153,8 +153,8 @@ class DeviceRemindDialog(context: Context, val entity: DeviceDialogEntity, val g
             mBinding.noRemindAgainCb.visibility = View.VISIBLE
             mBinding.cancelTv.text = "我知道了"
             mBinding.cancelTv.isEnabled = true
-            mBinding.cancelTv.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.white))
-            mBinding.cancelTv.background = ContextCompat.getDrawable(context, com.gh.gamecenter.common.R.drawable.button_blue_oval)
+            mBinding.cancelTv.setTextColor(ContextCompat.getColor(context, R.color.white))
+            mBinding.cancelTv.background = ContextCompat.getDrawable(context, R.drawable.button_blue_oval)
         }
         mBinding.cancelTv.setOnClickListener {
             SPUtils.setBoolean(Constants.SP_NO_REMIND_AGAIN, mBinding.noRemindAgainCb.isChecked)

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

@@ -14,6 +14,7 @@ import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
 import com.gh.common.util.DirectUtils
 import com.gh.gamecenter.common.utils.dip2px
 import com.gh.gamecenter.common.utils.toColor
+import com.gh.gamecenter.R
 import com.gh.gamecenter.databinding.DialogGameOffServiceBinding
 import com.gh.gamecenter.feature.entity.GameEntity
 
@@ -61,7 +62,7 @@ class GameOffServiceDialogFragment : BaseDialogFragment() {
                         if (index == notEmptySite.size - 1) bottomMargin = 8F.dip2px()
                     }
                     siteTv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14F)
-                    siteTv.setTextColor(com.gh.gamecenter.common.R.color.text_theme.toColor(requireContext()))
+                    siteTv.setTextColor(R.color.text_theme.toColor(requireContext()))
                     siteTv.text = site.text
                     siteTv.paintFlags = siteTv.paintFlags or Paint.UNDERLINE_TEXT_FLAG
                     siteTv.setOnClickListener {

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

@@ -76,12 +76,12 @@ class NewPrivacyPolicyDialogFragment : BaseDialogFragment() {
             contentText.setSpan(object : ClickableSpan() {
                 override fun updateDrawState(ds: TextPaint) {
                     super.updateDrawState(ds)
-                    ds.color = ContextCompat.getColor(requireContext(), com.gh.gamecenter.common.R.color.text_theme)
+                    ds.color = ContextCompat.getColor(requireContext(), R.color.text_theme)
                     ds.isUnderlineText = false
                 }
 
                 override fun onClick(widget: View) {
-                    val privacyPolicyUrl = requireContext().getString(com.gh.gamecenter.common.R.string.privacy_policy_url)
+                    val privacyPolicyUrl = requireContext().getString(R.string.privacy_policy_url)
                     val childrenPrivacyPolicyUrl = requireContext().getString(R.string.children_policy_url)
                     val thirdPartySdkUrl = requireContext().getString(R.string.sdk_list_url)
                     val permissionListUrl = requireContext().getString(R.string.permission_and_usage_url)

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

@@ -22,6 +22,7 @@ import com.gh.common.util.LogUtils
 import com.gh.common.util.PackageHelper
 import com.gh.common.util.PackageUtils
 import com.gh.download.DownloadManager
+import com.gh.gamecenter.R
 import com.gh.gamecenter.common.base.BaseRecyclerViewHolder
 import com.gh.gamecenter.common.callback.ConfirmListener
 import com.gh.gamecenter.common.constant.Constants
@@ -125,7 +126,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
                     requireContext(),
                     0,
                     (link.title ?: "").length,
-                    com.gh.gamecenter.common.R.color.text_theme,
+                    R.color.text_theme,
                     true
                 ) {
                     LogUtils.uploadPackageCheck(
@@ -284,7 +285,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
             if (it >= mDuration) {
                 mDisposable?.dispose()
                 binding.downloadBtn.isEnabled = true
-                binding.downloadBtn.background = com.gh.gamecenter.common.R.drawable.bg_notification_open_btn_style_2.toDrawable()
+                binding.downloadBtn.background = R.drawable.bg_notification_open_btn_style_2.toDrawable()
             }
         }
         val animator = ValueAnimator.ofInt(0, 100)
@@ -391,10 +392,10 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
                     val isAllInstalled = checkDetectionsInstalled(mAllInstalledPackages, entity.packages)
                     if (isAllInstalled) {
                         holder.binding.statusTv.text = "已安装"
-                        holder.binding.statusTv.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.text_theme))
+                        holder.binding.statusTv.setTextColor(ContextCompat.getColor(context, R.color.text_theme))
                     } else {
                         holder.binding.statusTv.text = "未安装"
-                        holder.binding.statusTv.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.secondary_red))
+                        holder.binding.statusTv.setTextColor(ContextCompat.getColor(context, R.color.secondary_red))
                     }
                     holder.binding.statusTv.visibility = View.VISIBLE
                 } else {

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

@@ -12,6 +12,7 @@ import android.view.*
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentActivity
 import androidx.fragment.app.FragmentTransaction
+import com.gh.gamecenter.R
 import com.gh.gamecenter.WebActivity
 import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
 import com.gh.gamecenter.common.constant.Constants
@@ -67,13 +68,13 @@ class PrivacyPolicyDialogFragment : BaseDialogFragment() {
         skipText.setSpan(object : ClickableSpan() {
             override fun updateDrawState(ds: TextPaint) {
                 super.updateDrawState(ds)
-                ds.color = ContextCompat.getColor(requireContext(), com.gh.gamecenter.common.R.color.text_theme)
+                ds.color = ContextCompat.getColor(requireContext(), R.color.text_theme)
                 ds.isUnderlineText = false
             }
 
             override fun onClick(widget: View) {
                 val intent =
-                    WebActivity.getIntent(requireContext(), context!!.getString(com.gh.gamecenter.common.R.string.privacy_policy_url), true)
+                    WebActivity.getIntent(requireContext(), context!!.getString(R.string.privacy_policy_url), true)
                 context?.startActivity(intent)
             }
         }, skipText.length - 6, skipText.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
@@ -109,13 +110,13 @@ class PrivacyPolicyDialogFragment : BaseDialogFragment() {
         skipText.setSpan(object : ClickableSpan() {
             override fun updateDrawState(ds: TextPaint) {
                 super.updateDrawState(ds)
-                ds.color = ContextCompat.getColor(requireContext(), com.gh.gamecenter.common.R.color.text_theme)
+                ds.color = ContextCompat.getColor(requireContext(), R.color.text_theme)
                 ds.isUnderlineText = false
             }
 
             override fun onClick(widget: View) {
                 val intent =
-                    WebActivity.getIntent(requireContext(), context!!.getString(com.gh.gamecenter.common.R.string.privacy_policy_url), true)
+                    WebActivity.getIntent(requireContext(), context!!.getString(R.string.privacy_policy_url), true)
                 context?.startActivity(intent)
             }
         }, skipText.length - 9, skipText.length - 5, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
@@ -123,12 +124,12 @@ class PrivacyPolicyDialogFragment : BaseDialogFragment() {
         skipText.setSpan(object : ClickableSpan() {
             override fun updateDrawState(ds: TextPaint) {
                 super.updateDrawState(ds)
-                ds.color = ContextCompat.getColor(requireContext(), com.gh.gamecenter.common.R.color.text_theme)
+                ds.color = ContextCompat.getColor(requireContext(), R.color.text_theme)
                 ds.isUnderlineText = false
             }
 
             override fun onClick(widget: View) {
-                val intent = WebActivity.getIntent(requireContext(), context!!.getString(com.gh.gamecenter.common.R.string.disclaimer_url), true)
+                val intent = WebActivity.getIntent(requireContext(), context!!.getString(R.string.disclaimer_url), true)
                 context?.startActivity(intent)
             }
         }, skipText.length - 4, skipText.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)

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

@@ -79,14 +79,14 @@ class ReserveReminderPhoneNumberDialog(
                 binding.tvTitle.setText(R.string.enable_sms_reminder)
                 binding.tvDescription.setText(R.string.enable_sms_reminder_description)
                 binding.etInput.setText(phoneNumber)
-                binding.etInput.setHint(com.gh.gamecenter.login.R.string.input_phone_hint)
+                binding.etInput.setHint(R.string.input_phone_hint)
             }
 
             DIALOG_TYPE_CHANGE_PHONE -> {
                 binding.tvTitle.setText(R.string.change_phone_number_2)
                 binding.tvDescription.setText(R.string.enable_sms_reminder_description)
                 binding.etInput.setText(phoneNumber)
-                binding.etInput.setHint(com.gh.gamecenter.login.R.string.input_phone_hint)
+                binding.etInput.setHint(R.string.input_phone_hint)
             }
 
             DIALOG_TYPE_VERIFY_PHONE -> {
@@ -189,8 +189,8 @@ class ReserveReminderPhoneNumberDialog(
 
     private fun startCountDown() {
         binding.tvSubmit.isEnabled = false
-        binding.tvSubmit.setBackgroundResource(com.gh.gamecenter.common.R.drawable.bg_common_button_light_fill_gray)
-        binding.tvSubmit.setTextColor(com.gh.gamecenter.common.R.color.text_tertiary.toColor(context))
+        binding.tvSubmit.setBackgroundResource(R.drawable.bg_common_button_light_fill_gray)
+        binding.tvSubmit.setTextColor(R.color.text_tertiary.toColor(context))
         Observable.interval(0, 1, TimeUnit.SECONDS)
             .take(COUNT_DOWN_DURATION)
             .map {
@@ -210,8 +210,8 @@ class ReserveReminderPhoneNumberDialog(
 
                 override fun onComplete() {
                     binding.tvSubmit.isEnabled = true
-                    binding.tvSubmit.setBackgroundResource(com.gh.gamecenter.common.R.drawable.bg_common_button_fill_blue)
-                    binding.tvSubmit.setTextColor(com.gh.gamecenter.common.R.color.text_aw_primary.toColor(context))
+                    binding.tvSubmit.setBackgroundResource(R.drawable.bg_common_button_fill_blue)
+                    binding.tvSubmit.setTextColor(R.color.text_aw_primary.toColor(context))
                     binding.tvSubmit.setText(R.string.resend)
 
                 }
@@ -266,7 +266,7 @@ class ReserveReminderPhoneNumberDialog(
         ) =
             ReserveReminderPhoneNumberDialog(
                 context,
-                com.gh.gamecenter.common.R.style.DialogWindowTransparent,
+                R.style.DialogWindowTransparent,
                 dialogType,
                 phoneNumber,
                 serviceId,

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

@@ -6,7 +6,6 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.LayoutManager
 import androidx.recyclerview.widget.StaggeredGridLayoutManager
-import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.feature.exposure.ExposureEvent
 import io.reactivex.functions.Consumer
 
@@ -17,9 +16,8 @@ class ExposureListener(var fragment: Fragment, var exposable: IExposable) : Recy
 
     val throttleBus: ExposureThrottleBus by lazy {
         ExposureThrottleBus(
-            { commitExposure(it) },
-            Consumer(Throwable::printStackTrace),
-            { commitWXCPMExposure(it) }
+            Consumer { commitExposure(it) },
+            Consumer(Throwable::printStackTrace)
         )
     }
     var layoutManager: LayoutManager? = null
@@ -95,32 +93,4 @@ class ExposureListener(var fragment: Fragment, var exposable: IExposable) : Recy
         ExposureManager.log(eventList)
     }
 
-    /**
-     * 微信小游戏CPM曝光事件接口上报，由于普通曝光事件的上报通道存在节流特性，不符合CPM接口对于数据上报的实时性和准确性的要求，所以使用额外的通道进行上报
-     */
-    private fun commitWXCPMExposure(visibleState: ExposureThrottleBus.VisibleState) {
-
-        val eventList = arrayListOf<ExposureEvent>()
-
-        for (pos in visibleState.firstVisiblePosition..visibleState.lastVisiblePosition) {
-            try {
-                exposable.getEventByPosition(pos)?.let {
-                    if (it.payload.miniGameType == Constants.WECHAT_MINI_GAME_CPM) {
-                        eventList.add(it)
-                    }
-                }
-                exposable.getEventListByPosition(pos)?.let { list ->
-                    list.forEach {
-                        if (it.payload.miniGameType == Constants.WECHAT_MINI_GAME_CPM) {
-                            eventList.add(it)
-                        }
-                    }
-                }
-            } catch (ignore: Exception) {
-                // Just ignore the error.
-            }
-        }
-        ExposureManager.logCPM(eventList)
-    }
-
 }

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

@@ -1,13 +1,11 @@
 package com.gh.common.exposure
 
 import com.gh.gamecenter.BuildConfig
-import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.loghub.TLogHubHelper
 import com.gh.gamecenter.common.utils.FixedSizeLinkedHashSet
 import com.gh.gamecenter.common.utils.toJson
 import com.gh.gamecenter.core.AppExecutor
 import com.gh.gamecenter.feature.exposure.ExposureEvent
-import com.gh.gamecenter.feature.minigame.wechat.WGameSubjectCPMListReportHelper
 import com.lightgame.utils.Utils
 import com.volcengine.model.tls.LogItem
 
@@ -34,9 +32,6 @@ object ExposureManager {
      */
     fun log(event: ExposureEvent) {
         AppExecutor.logExecutor.execute {
-            if (event.payload.miniGameType == Constants.WECHAT_MINI_GAME_CPM) {
-                WGameSubjectCPMListReportHelper.reportExposure(event)
-            }
             if (!exposureCache.contains(event.id)) {
                 exposureSet.add(event)
                 exposureCache.add(event.id)
@@ -63,17 +58,6 @@ object ExposureManager {
         }
     }
 
-    /**
-     * Log a wechat mini game cpm collection of exposure event.
-     */
-    fun logCPM(eventList: List<ExposureEvent>) {
-        AppExecutor.logExecutor.execute {
-            if (eventList.isNotEmpty()) {
-                WGameSubjectCPMListReportHelper.reportExposure(eventList.toSet())
-            }
-        }
-    }
-
     /**
      * @param forcedUpload Ignore all restrictions.
      */

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

@@ -3,20 +3,16 @@ package com.gh.common.exposure
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.functions.Consumer
 import io.reactivex.schedulers.Schedulers
-import io.reactivex.subjects.BehaviorSubject
+import io.reactivex.subjects.PublishSubject
 import java.util.concurrent.TimeUnit
 
-class ExposureThrottleBus(
-    var onSuccess: Consumer<VisibleState>,
-    var onError: Consumer<Throwable>,
-    onPreSuccess: Consumer<VisibleState>
-) {
+class ExposureThrottleBus(var onSuccess: Consumer<VisibleState>, var onError: Consumer<Throwable>) {
 
     companion object {
         private const val THRESHOLD_TIME = 300L
     }
 
-    private val mPublishSubject: BehaviorSubject<VisibleState> = BehaviorSubject.create()
+    private val mPublishSubject: PublishSubject<VisibleState> = PublishSubject.create()
     private val mCompositeDisposable: CompositeDisposable = CompositeDisposable()
 
     init {
@@ -28,7 +24,6 @@ class ExposureThrottleBus(
          */
         val disposable = mPublishSubject
             .distinctUntilChanged()
-            .doOnNext(onPreSuccess)
             .throttleWithTimeout(THRESHOLD_TIME, TimeUnit.MILLISECONDS)
             .subscribeOn(Schedulers.io())
             .subscribe(onSuccess, onError)

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

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

app/src/main/java/com/gh/common/iinterface/ISearchToolbarTab.kt

@@ -5,6 +5,6 @@ import com.gh.gamecenter.entity.BottomTab
 interface ISearchToolbarTab {
     fun onScrollChanged(totalHeight: Int, offset: Int, isDarkModeChanged: Boolean)
     fun changeAppBarColor(color: Int, pageId: String)
-    fun updateSearchStyle(searchStyle: BottomTab.SearchStyle)
+    fun setSearchStyle(searchStyle: BottomTab.SearchStyle)
     fun getCurrentTabIndex(): Int?
 }

app/src/main/java/com/gh/common/pop/RealNameTipsPop.kt

@@ -41,7 +41,7 @@ class RealNameTipsPop(
         val clickSpan = object : ClickableSpan() {
             override fun updateDrawState(ds: TextPaint) {
                 ds.bgColor = Color.TRANSPARENT
-                ds.setColor(com.gh.gamecenter.common.R.color.text_theme.toColor(context))
+                ds.setColor(R.color.text_theme.toColor(context))
             }
 
             override fun onClick(widget: View) {

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

@@ -7,6 +7,7 @@ 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.constant.Constants
 import com.gh.gamecenter.common.view.BugFixedPopupWindow
 import com.gh.gamecenter.core.utils.DisplayUtils
@@ -120,7 +121,7 @@ class AccelerateNotificationHandler(priority: Int) : PriorityChainHandler(priori
                 isTouchable = true
                 isFocusable = true
                 isOutsideTouchable = true
-                animationStyle = com.gh.gamecenter.common.R.style.popup_window_ease_in_and_out_anim_style
+                animationStyle = R.style.popup_window_ease_in_and_out_anim_style
                 showAtLocation(
                     activity.window.decorView,
                     Gravity.TOP,

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

@@ -8,6 +8,7 @@ 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
@@ -152,7 +153,7 @@ class BottomTabGuideHandler(priority: Int): PriorityChainHandler(priority) {
             return popupWindow.apply {
                 isFocusable = false
                 isOutsideTouchable = false
-                animationStyle = com.gh.gamecenter.common.R.style.popup_window_ease_in_and_out_anim_style
+                animationStyle = R.style.popup_window_ease_in_and_out_anim_style
                 setOnDismissListener {
                     dismissCallback?.invoke()
                 }

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/GlobalPriorityChainHelper.kt

@@ -6,7 +6,6 @@ import android.app.Application.ActivityLifecycleCallbacks
 import android.os.Bundle
 import android.preference.PreferenceManager
 import android.text.TextUtils
-import androidx.annotation.WorkerThread
 import androidx.fragment.app.FragmentActivity
 import com.gh.common.iinterface.ISuperiorChain
 import com.gh.common.util.CheckLoginUtils
@@ -19,7 +18,6 @@ import com.gh.gamecenter.common.exposure.ExposureSource
 import com.gh.gamecenter.common.retrofit.BiResponse
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.core.AppExecutor
-import com.gh.gamecenter.core.runOnIoThread
 import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.core.utils.SPUtils.getBoolean
 import com.gh.gamecenter.core.utils.ToastUtils
@@ -257,6 +255,7 @@ object GlobalPriorityChainHelper : ISuperiorChain {
     /**
      * 由于用户预约的游戏个数没有限制，为避免一次加载游戏过多，这里采用先加载第一页，显示出dialog,后续数据在第二页返回
      * 注意:当page = 2 时，后台会将后续所有数据一次性返回，所以递归到第三层时，就会结束
+     * 当拉取第一页数据时，后台会将当前接口的数据全部标记为已读，这个时候在请求第一页数据会返回空(避免弹窗重复显示)，但是第二页永远有数据(方便将后续自动下载的任务加入到下载队列)
      * @param isTeenagerMode 青少年模式关闭时才需要启动自动下载，所以当 isTeenagerMode == true 时，不需要加载后续数据，也不需要启动自动下载
      */
     @SuppressLint("CheckResult")
@@ -267,9 +266,7 @@ object GlobalPriorityChainHelper : ISuperiorChain {
                 override fun onSuccess(data: ReserveOnlineEntity) {
                     handler?.doPreProcess(data)
                     // 继续获取后续需要自动下载的游戏
-                    runOnIoThread {
-                        loadGamesWithAutoDownload(1, 20, isTeenagerMode)
-                    }
+                    loadGamesWithAutoDownload(1, 20, isTeenagerMode)
                 }
 
                 override fun onFailure(exception: Exception) {
@@ -282,7 +279,6 @@ object GlobalPriorityChainHelper : ISuperiorChain {
      * 由于这个方法本身就是在子线程调用的，这里不需要另外在做线程切换
      */
     @SuppressLint("CheckResult")
-    @WorkerThread
     private fun loadGamesWithAutoDownload(page: Int, pageSize: Int, isTeenagerMode: Boolean) {
         if (page >= 5) {
             // 为防止死循环，这里设置最多请求到第5页(正常情况下，第一页就是全部数据)
@@ -290,6 +286,7 @@ object GlobalPriorityChainHelper : ISuperiorChain {
         }
         val filter = "wifi_auto_download:true"
         newApi.loadGamesWithAutoDownload(page, pageSize, filter)
+            .subscribeOn(Schedulers.io())
             .doOnSuccess(::trackAppointmentGameOnlineDialogShow)
             .subscribe(object : BiResponse<List<GameEntity>>() {
 

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

@@ -6,6 +6,7 @@ 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
@@ -281,7 +282,7 @@ class MultiTabGuideHandler(priority: Int): PriorityChainHandler(priority) {
                 isTouchable = false
                 isFocusable = false
                 isOutsideTouchable = true
-                animationStyle = com.gh.gamecenter.common.R.style.popup_window_ease_in_and_out_anim_style
+                animationStyle = R.style.popup_window_ease_in_and_out_anim_style
                 setOnDismissListener {
                     dismissCallback?.invoke()
                 }

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/BuildConfigImpl.kt

@@ -33,9 +33,5 @@ class BuildConfigImpl : IBuildConfigProvider {
 
     override fun getVDevApiHost(): String = BuildConfig.DEV_VAPI_HOST
 
-    override fun getWGameCPMApiHost(): String = BuildConfig.WGAME_CPM_API_HOST
-
-    override fun getWGameCPMBusiAppId(): String = BuildConfig.WGAME_CPM_BUSIAPPID
-
     override fun getLogProducerProject(): String = BuildConfig.LOG_HUB_PROJECT
 }

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

@@ -17,6 +17,7 @@ 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 {
@@ -39,13 +40,13 @@ class ConcernArticleUtilsProviderImpl : IConcernArticleUtilsProvider {
         if (binding is RecyclerGameArticleBinding) {
             val context = binding.root.context
             binding.root
-                .setBackground(ContextCompat.getDrawable(context, com.gh.gamecenter.common.R.drawable.reuse_listview_item_style))
-            binding.tvGameName.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.text_primary))
-            binding.tvTime.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.text_tertiary))
-            binding.tvTitle.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.text_primary))
-            binding.tvDescription.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.text_secondary))
-            binding.tvComment.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.text_tertiary))
-            binding.tvShare.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.text_tertiary))
+                .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))
         }
     }
 

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

@@ -7,6 +7,7 @@ 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
@@ -26,10 +27,10 @@ class ConcernGiftPackUtilsProviderImpl : IConcernGiftPackUtilsProvider {
     override fun initStyle(viewBinding: ViewBinding) {
         with(viewBinding as RecyclerGiftPackBinding) {
             val context = root.context
-            tvGameName.setTextColor(com.gh.gamecenter.common.R.color.text_primary.toColor(context))
-            tvTime.setTextColor(com.gh.gamecenter.common.R.color.text_tertiary.toColor(context))
-            tvGiftPackName.setTextColor(com.gh.gamecenter.common.R.color.text_primary.toColor(context))
-            tvGiftPackContent.setTextColor(com.gh.gamecenter.common.R.color.text_secondary.toColor(context))
+            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))
         }
     }
 

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

@@ -62,13 +62,7 @@ class DirectProviderImpl : IDirectProvider {
         DirectUtils.directToCommunityArticle(context, articleId, communityId, entrance, path, sourceEntrance)
     }
 
-    override fun directToVideoDetail(
-        context: Context,
-        videoId: String,
-        entrance: String?,
-        path: String?,
-        sourceEntrance: String
-    ) {
+    override fun directToVideoDetail(context: Context, videoId: String, entrance: String?, path: String?, sourceEntrance: String) {
         DirectUtils.directToVideoDetail(context, videoId, entrance, path, sourceEntrance)
     }
 
@@ -84,13 +78,8 @@ class DirectProviderImpl : IDirectProvider {
         DirectUtils.directToQQGameById(activity, qqAppId)
     }
 
-    override fun directToWechatGameById(
-        activity: Activity,
-        wechatAppId: String,
-        wechatAppPath: String,
-        wechatAppExtData: String
-    ) {
-        DirectUtils.directToWechatGameById(activity, wechatAppId, wechatAppPath, wechatAppExtData)
+    override fun directToWechatGameById(activity: Activity, qqAppId: String) {
+        DirectUtils.directToWechatGameById(activity, qqAppId)
     }
 
     override fun directToExternalBrowser(context: Context, url: String) {

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

@@ -3,6 +3,7 @@ package com.gh.common.provider
 import android.content.Context
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.common.util.NewFlatLogUtils
+import com.gh.gamecenter.R
 import com.gh.gamecenter.common.base.GlobalActivityManager
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.exposure.ExposureSource
@@ -106,7 +107,7 @@ class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
             ) {
 
                 val text = downloadButton.text.ifEmpty {
-                    downloadButton.getTag(com.gh.gamecenter.feature.R.string.download) ?: ""
+                    downloadButton.getTag(R.string.download) ?: ""
                 }.toString()
 
                 val downloadType = if (text.contains("畅玩")) {

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

@@ -2,15 +2,12 @@ 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 {
@@ -23,16 +20,11 @@ class EntranceUtilsProviderImpl : IEntranceUtilsProvider {
     }
 
     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)
-        }
-
+        EntranceUtils.jumpActivity(context, null, bundle, object : Callback {
+            override fun onActivityResult(resultCode: Int, data: Intent?) {
+                callback()
+            }
+        })
     }
 
     override fun init(context: Context?) {

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

@@ -9,7 +9,7 @@ import com.gh.gamecenter.core.provider.IPackageHelperProvider
 @Route(path = RouteConsts.provider.packageHelper, name = "PackageHelper暴露服务")
 class PackageHelperProviderImpl : IPackageHelperProvider {
 
-    override fun getLocalPackageNameSet(): Set<String> {
+    override fun getLocalPackageNameSet(): HashSet<String> {
         return PackageHelper.localPackageNameSet
     }
 

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

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

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

@@ -11,6 +11,7 @@ import com.gh.common.constant.Config
 import com.gh.common.util.LogUtils
 import com.gh.common.util.NewFlatLogUtils
 import com.gh.gamecenter.BuildConfig
+import com.gh.gamecenter.R
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.core.utils.EmptyCallback
 import com.gh.gamecenter.core.utils.SPUtils
@@ -90,7 +91,7 @@ object NewSimulatorGameManager {
             },
             uiModificationCallback = { binding ->
                 binding.contentTv.gravity = Gravity.START
-                binding.contentTv.setTextColor(com.gh.gamecenter.common.R.color.text_secondary.toColor(context))
+                binding.contentTv.setTextColor(R.color.text_secondary.toColor(context))
             },
             extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
         )

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

@@ -339,8 +339,8 @@ class SimulatorDownloadManager private constructor() {
             Utils.toast(context, "当前使用移动数据进行下载")
         }
 
-        downloadDialog = TrackableDialog(context, com.gh.gamecenter.common.R.style.GhAlertDialog, "模拟器下载", "下载中弹窗")
-        downloadDialog?.window?.setBackgroundDrawableResource(com.gh.gamecenter.common.R.color.transparent)
+        downloadDialog = TrackableDialog(context, R.style.GhAlertDialog, "模拟器下载", "下载中弹窗")
+        downloadDialog?.window?.setBackgroundDrawableResource(R.color.transparent)
 
         val view = View.inflate(context, R.layout.download_simulator_dialog, null)
 
@@ -392,7 +392,7 @@ class SimulatorDownloadManager private constructor() {
                 ToastUtils.showToast("该模拟器暂未提供下载")
             },
             uiModificationCallback = { binding ->
-                binding.confirmTv.setTextColor(com.gh.gamecenter.common.R.color.text_instance.toColor(context))
+                binding.confirmTv.setTextColor(R.color.text_instance.toColor(context))
             },
             extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
         )

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

@@ -95,13 +95,13 @@ object ArchiveDownloadButtonHelper {
             R.string.archive_dialog_title.toResString(),
             R.string.archive_vspace_dialog_content.toResString(),
             R.string.archive_vspace_dialog_confirm.toResString(),
-            com.gh.gamecenter.common.R.string.cancel.toResString(),
+            R.string.cancel.toResString(),
             {
                 NewFlatLogUtils.logCloudArchiveVSpaceDownloadDialogClick(R.string.archive_vspace_dialog_confirm.toResString())
                 VHelper.showVSpaceDialog(context, gameEntity)
             },
             {
-                NewFlatLogUtils.logCloudArchiveVSpaceDownloadDialogClick(com.gh.gamecenter.common.R.string.cancel.toResString())
+                NewFlatLogUtils.logCloudArchiveVSpaceDownloadDialogClick(R.string.cancel.toResString())
             },
             extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
         )
@@ -114,14 +114,14 @@ object ArchiveDownloadButtonHelper {
             R.string.archive_dialog_title.toResString(),
             R.string.archive_download_dialog_content.toResString(),
             R.string.archive_download_dialog_confirm.toResString(),
-            com.gh.gamecenter.common.R.string.cancel.toResString(),
+            R.string.cancel.toResString(),
             confirmClickCallback = {
                 NewFlatLogUtils.logCloudArchiveGameDownloadDialogClick(R.string.archive_download_dialog_confirm.toResString())
                 VHelper.disableLaunchGameAfterInstallation()
                 EventBus.getDefault().post(EBReuse("download"))
             },
             cancelClickCallback = {
-                NewFlatLogUtils.logCloudArchiveGameDownloadDialogClick(com.gh.gamecenter.common.R.string.cancel.toResString())
+                NewFlatLogUtils.logCloudArchiveGameDownloadDialogClick(R.string.cancel.toResString())
             },
             extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
         )
@@ -178,7 +178,7 @@ object ArchiveDownloadButtonHelper {
         VArchiveHelper.downloadArchive(archiveEntity)
 
         // 下载进度弹窗
-        val archiveLoadingDialog = Dialog(context, com.gh.gamecenter.common.R.style.DialogWindowTransparent)
+        val archiveLoadingDialog = Dialog(context, R.style.DialogWindowTransparent)
         val archiveLoadingBinding = DialogArchiveLoadingBinding.inflate(context.layoutInflater)
         showArchiveLoadingDialog(archiveLoadingDialog, archiveLoadingBinding.root)
 
@@ -271,7 +271,7 @@ object ArchiveDownloadButtonHelper {
                 R.string.archive_dialog_title.toResString(),
                 R.string.archive_apply_dialog_content.toResString(),
                 R.string.archive_apply.toResString(),
-                com.gh.gamecenter.common.R.string.cancel.toResString(),
+                R.string.cancel.toResString(),
                 {
                     if(gameEntity.is32() && VHelper.isInnerInstalled(packageName) && !VCore.getInstance().isExtPackageInstalled()) {
                         // 32位的游戏 并且 32位畅玩没有安装 并且 一体化

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

@@ -41,7 +41,7 @@ object BbsReportHelper {
         CurrentActivityHolder.getCurrentActivity()?.apply {
             if (this.isFinishing) return@apply
 
-            val dialog = Dialog(this, com.gh.gamecenter.common.R.style.DialogWindowTransparent)
+            val dialog = Dialog(this, R.style.DialogWindowTransparent)
             val binding: DialogReportReasonBinding =
                 DialogReportReasonBinding.inflate(LayoutInflater.from(this))
             val reportReasonAdapter = ReportReasonAdapter(
@@ -64,7 +64,7 @@ object BbsReportHelper {
                     this,
                     1f,
                     false,
-                    com.gh.gamecenter.common.R.color.ui_background
+                    R.color.ui_background
                 )
             )
             binding.reasonRv.adapter = reportReasonAdapter
@@ -94,7 +94,7 @@ object BbsReportHelper {
             binding.otherReasonEt.doOnTextChanged { text, start, before, count ->
                 val tvCount: Int = text.toString().length
                 if (tvCount >= 500) {
-                    binding.tvCount.setTextColor(com.gh.gamecenter.common.R.color.secondary_red.toColor(binding.tvCount.context))
+                    binding.tvCount.setTextColor(R.color.secondary_red.toColor(binding.tvCount.context))
                 }
                 binding.tvCount.text = "$tvCount/500"
             }

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

@@ -74,7 +74,7 @@ public class CheckLoginUtils {
                 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) -> {
+                EntranceUtils.jumpActivity(context, nextToBundle, bundle, (resultCode, data) -> {
                     if (isTriggerNextStep && listener != null && isLogin()) {
                         listener.onLogin();
                     }

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

@@ -177,7 +177,7 @@ object CommentHelper {
         }
 
         val inflater = LayoutInflater.from(context)
-        val layout = inflater.inflate(com.gh.gamecenter.common.R.layout.layout_popup_container, null)
+        val layout = inflater.inflate(R.layout.layout_popup_container, null)
         val popupWindow = BugFixedPopupWindow(
             layout,
             LinearLayout.LayoutParams.WRAP_CONTENT,

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

@@ -117,7 +117,7 @@ public class CommentUtils {
     ) {
         Context context = anchor.getContext();
         LayoutInflater inflater = LayoutInflater.from(context);
-        View contentView = inflater.inflate(com.gh.gamecenter.common.R.layout.layout_popup_container, null);
+        View contentView = inflater.inflate(R.layout.layout_popup_container, null);
         PopupWindow popupWindow = new PopupWindow(
                 contentView,
                 ViewGroup.LayoutParams.WRAP_CONTENT,
@@ -198,14 +198,14 @@ public class CommentUtils {
         LinearLayout container = new LinearLayout(context);
         container.setOrientation(LinearLayout.VERTICAL);
         container.setPadding(0, DisplayUtils.dip2px(context, 12), 0, DisplayUtils.dip2px(context, 12));
-        container.setBackgroundColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.ui_surface));
+        container.setBackgroundColor(ContextCompat.getColor(context, R.color.ui_surface));
 
         for (final String s : arrReportType) {
             TextView reportTypeTv = new TextView(context);
             reportTypeTv.setText(s);
             reportTypeTv.setTextSize(17);
-            reportTypeTv.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.title));
-            reportTypeTv.setBackgroundResource(com.gh.gamecenter.common.R.drawable.textview_white_style);
+            reportTypeTv.setTextColor(ContextCompat.getColor(context, R.color.title));
+            reportTypeTv.setBackgroundResource(R.drawable.textview_white_style);
             reportTypeTv.setLayoutParams(new LinearLayout.LayoutParams((widthPixels * 9) / 10,
                     LinearLayout.LayoutParams.WRAP_CONTENT));
             reportTypeTv.setPadding(DisplayUtils.dip2px(context, 20), DisplayUtils.dip2px(context, 12),
@@ -248,12 +248,12 @@ public class CommentUtils {
     public static void postVote(final Context context, final CommentEntity commentEntity,
                                 final TextView commentLikeCountTv, final ImageView commentLikeIv,
                                 final OnVoteListener listener) {
-        if (commentLikeCountTv.getCurrentTextColor() == ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.text_theme)) {
+        if (commentLikeCountTv.getCurrentTextColor() == ContextCompat.getColor(context, R.color.text_theme)) {
             ToastUtils.INSTANCE.showToast("已经点过赞啦！");
             return;
         }
         commentEntity.setVote(commentEntity.getVote() + 1);
-        commentLikeCountTv.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.text_theme));
+        commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.text_theme));
         commentLikeIv.setImageResource(R.drawable.comment_vote_select);
         commentLikeCountTv.setText(NumberUtils.transSimpleCount(commentEntity.getVote()));
         commentLikeCountTv.setVisibility(View.VISIBLE);
@@ -271,7 +271,7 @@ public class CommentUtils {
                     public void postFailed(Throwable e) {
 
                         commentEntity.setVote(commentEntity.getVote() - 1);
-                        commentLikeCountTv.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.hint));
+                        commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.hint));
                         commentLikeIv.setImageResource(R.drawable.comment_vote_unselect);
                         commentLikeCountTv.setText(NumberUtils.transSimpleCount(commentEntity.getVote()));
                         if (commentEntity.getVote() == 0) {
@@ -318,12 +318,12 @@ public class CommentUtils {
             entrance = "视频流-评论-点赞";
         }
         CheckLoginUtils.checkLogin(context, entrance, () -> {
-            if (commentLikeCountTv.getCurrentTextColor() == ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.text_theme)) {
+            if (commentLikeCountTv.getCurrentTextColor() == ContextCompat.getColor(context, R.color.text_theme)) {
                 ToastUtils.INSTANCE.showToast("已经点过赞啦！");
                 return;
             }
             commentEntity.setVote(commentEntity.getVote() + 1);
-            commentLikeCountTv.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.text_theme));
+            commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.text_theme));
             commentLikeIv.setImageResource(R.drawable.comment_vote_select);
             commentLikeCountTv.setText(NumberUtils.transSimpleCount(commentEntity.getVote()));
             commentLikeCountTv.setVisibility(View.VISIBLE);
@@ -340,7 +340,7 @@ public class CommentUtils {
                         @Override
                         public void postFailed(Throwable e) {
                             commentEntity.setVote(commentEntity.getVote() - 1);
-                            commentLikeCountTv.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.hint));
+                            commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.hint));
                             commentLikeIv.setImageResource(R.drawable.comment_vote_unselect);
                             commentLikeCountTv.setText(NumberUtils.transSimpleCount(commentEntity.getVote()));
                             if (commentEntity.getVote() == 0) {
@@ -394,7 +394,7 @@ public class CommentUtils {
                         @Override
                         public void postFailed(Throwable e) {
                             commentEntity.setVote(commentEntity.getVote() - 1);
-                            commentLikeCountTv.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.hint));
+                            commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.hint));
                             commentLikeIv.setImageResource(R.drawable.comment_vote_unselect);
                             commentLikeCountTv.setText(NumberUtils.transSimpleCount(commentEntity.getVote()));
                             if (commentEntity.getVote() == 0) {
@@ -444,7 +444,7 @@ public class CommentUtils {
                         public void onFailure(@Nullable HttpException e) {
                             super.onFailure(e);
                             commentEntity.setVote(commentEntity.getVote() + 1);
-                            commentLikeCountTv.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.text_theme));
+                            commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.text_theme));
                             commentLikeIv.setImageResource(R.drawable.comment_vote_select);
                             commentLikeCountTv.setText(NumberUtils.transSimpleCount(commentEntity.getVote()));
                             commentLikeCountTv.setVisibility(View.VISIBLE);
@@ -487,7 +487,7 @@ public class CommentUtils {
     // 设置评论item 用户相关的view(点赞/头像/用户名)
     public static void setCommentUserView(Context mContext, CommentViewHolder holder, CommentEntity entity) {
         MeEntity userDataEntity = entity.getMe();
-        holder.commentLikeCountTv.setTextColor(ContextCompat.getColor(mContext, com.gh.gamecenter.common.R.color.hint));
+        holder.commentLikeCountTv.setTextColor(ContextCompat.getColor(mContext, R.color.hint));
         holder.commentLikeIv.setImageResource(R.drawable.comment_vote_unselect);
 
         if (userDataEntity == null || !userDataEntity.isCommentOwner()) {
@@ -502,7 +502,7 @@ public class CommentUtils {
             holder.commentLikeCountTv.setVisibility(View.GONE);
         } else { // 检查是否已点赞
             if (userDataEntity != null && (userDataEntity.isCommentVoted())) {
-                holder.commentLikeCountTv.setTextColor(ContextCompat.getColor(mContext, com.gh.gamecenter.common.R.color.text_theme));
+                holder.commentLikeCountTv.setTextColor(ContextCompat.getColor(mContext, R.color.text_theme));
                 holder.commentLikeIv.setImageResource(R.drawable.comment_vote_select);
             }
             holder.commentLikeCountTv.setVisibility(View.VISIBLE);

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

@@ -194,7 +194,7 @@ public class DetailDownloadUtils {
 
         if (showAsVGame) {
             // 显示为畅玩游戏
-            if (context.getString(com.gh.gamecenter.feature.R.string.launch).equals(rawBtnText)) {
+            if (context.getString(R.string.launch).equals(rawBtnText)) {
                 downloadButton.setButtonStyle(DownloadButton.ButtonStyle.LAUNCH_OR_OPEN);
             } else {
                 downloadButton.setButtonStyle(DownloadButton.ButtonStyle.NORMAL);
@@ -203,13 +203,13 @@ public class DetailDownloadUtils {
             String decoratedBtnText;
             // 双下载按钮时，显示特殊样式
             if (showDualDownloadButton
-                    && (context.getString(com.gh.gamecenter.feature.R.string.launch).equals(rawBtnText) || context.getString(com.gh.gamecenter.feature.R.string.install).equals(rawBtnText) || context.getString(com.gh.gamecenter.feature.R.string.smooth).equals(rawBtnText) || context.getString(com.gh.gamecenter.feature.R.string.update).equals(rawBtnText))) {
-                if (context.getString(com.gh.gamecenter.feature.R.string.smooth).equals(rawBtnText)) {
-                    decoratedBtnText = context.getString(com.gh.gamecenter.feature.R.string.download_v);
-                } else if (context.getString(com.gh.gamecenter.feature.R.string.update).equals(rawBtnText)) {
-                    decoratedBtnText = context.getString(com.gh.gamecenter.feature.R.string.update_v);
+                    && (context.getString(R.string.launch).equals(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);
                 } else {
-                    decoratedBtnText = context.getString(com.gh.gamecenter.feature.R.string.launch_v);
+                    decoratedBtnText = context.getString(R.string.launch_v);
                 }
 
                 if (overlayTv != null && downloadButton.getVisibility() != View.GONE) {
@@ -221,8 +221,8 @@ public class DetailDownloadUtils {
                 decoratedBtnText = rawBtnText + (containsAddWord? "" : downloadAddWord) + getWrappedDownloadSizeText(viewHolder);
 
                 if (overlayTv != null && downloadButton.getVisibility() != View.GONE) {
-                    if (context.getString(com.gh.gamecenter.feature.R.string.launch).equals(rawBtnText)
-                            || context.getString(com.gh.gamecenter.feature.R.string.install).equals(rawBtnText)) {
+                    if (context.getString(R.string.launch).equals(rawBtnText)
+                            || context.getString(R.string.install).equals(rawBtnText)) {
                         overlayTv.setVisibility(View.VISIBLE);
                         overlayTv.setText("启动（畅玩）");
                     } else {
@@ -246,11 +246,11 @@ public class DetailDownloadUtils {
             }
         } else {
             // 非畅玩，显示为普通游戏
-            if (context.getString(com.gh.gamecenter.feature.R.string.pluggable).equals(rawBtnText)) {
+            if (context.getString(R.string.pluggable).equals(rawBtnText)) {
                 downloadButton.setButtonStyle(DownloadButton.ButtonStyle.PLUGIN);
-            } else if (context.getString(com.gh.gamecenter.feature.R.string.launch).equals(rawBtnText)) {
+            } else if (context.getString(R.string.launch).equals(rawBtnText)) {
                 downloadButton.setButtonStyle(DownloadButton.ButtonStyle.LAUNCH_OR_OPEN);
-            } else if (context.getString(com.gh.gamecenter.feature.R.string.install).equals(rawBtnText)) {
+            } else if (context.getString(R.string.install).equals(rawBtnText)) {
                 downloadButton.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_NORMAL);
             } else {
                 downloadButton.setButtonStyle(DownloadButton.ButtonStyle.NORMAL);
@@ -278,14 +278,14 @@ public class DetailDownloadUtils {
             if (viewHolder.isNewsDetail()) {
                 decoratedBtnText = rawBtnText;
                 localBtnText = rawBtnText;
-            } else if (context.getString(com.gh.gamecenter.feature.R.string.pluggable).equals(rawBtnText)) {
+            } else if (context.getString(R.string.pluggable).equals(rawBtnText)) {
                 decoratedBtnText = "升级" + (!containsAddWord ? "" : "至" + downloadAddWord) + getWrappedDownloadSizeText(viewHolder);
                 localBtnText = "升级" + (!containsAddWord ? "" : "至" + downloadAddWord);
-            } else if (context.getString(com.gh.gamecenter.feature.R.string.launch).equals(rawBtnText)) {
+            } else if (context.getString(R.string.launch).equals(rawBtnText)) {
                 decoratedBtnText = rawBtnText + (!containsAddWord ? "" : "-" + downloadAddWord);
-                localBtnText = context.getString(com.gh.gamecenter.feature.R.string.launch_local);
-            } else if (context.getString(com.gh.gamecenter.feature.R.string.attempt).equals(rawBtnText)) {
-                decoratedBtnText = context.getString(com.gh.gamecenter.feature.R.string.attempt);
+                localBtnText = context.getString(R.string.launch_local);
+            } else if (context.getString(R.string.attempt).equals(rawBtnText)) {
+                decoratedBtnText = context.getString(R.string.attempt);
                 localBtnText = rawBtnText;
                 if (showDualDownloadButton
                         && viewHolder.getLocalDownloadContainer() != null
@@ -294,12 +294,12 @@ public class DetailDownloadUtils {
                 } else if (viewHolder.getOverlayTv() != null) {
                     useAlternativeTextStyle = true;
                 }
-            } else if (context.getString(com.gh.gamecenter.feature.R.string.install).equals(rawBtnText)) {
-                decoratedBtnText = context.getString(com.gh.gamecenter.feature.R.string.install);
-                localBtnText = context.getString(com.gh.gamecenter.feature.R.string.install_local);
-            } else if (context.getString(com.gh.gamecenter.feature.R.string.update).equals(rawBtnText)) {
-                decoratedBtnText = context.getString(com.gh.gamecenter.feature.R.string.update);
-                localBtnText = context.getString(com.gh.gamecenter.feature.R.string.update_local);
+            } else if (context.getString(R.string.install).equals(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);
                 if (showDualDownloadButton
                         && viewHolder.getLocalDownloadContainer() != null
                         && viewHolder.getLocalDownloadContainer().getVisibility() == View.VISIBLE) {
@@ -311,7 +311,7 @@ public class DetailDownloadUtils {
                 } else {
                     decoratedBtnText = rawBtnText;
                 }
-                localBtnText = context.getString(com.gh.gamecenter.feature.R.string.download_local);
+                localBtnText = context.getString(R.string.download_local);
                 if (showDualDownloadButton
                         && viewHolder.getLocalDownloadContainer() != null
                         && viewHolder.getLocalDownloadContainer().getVisibility() == View.VISIBLE) {
@@ -346,9 +346,9 @@ public class DetailDownloadUtils {
         }
 
         if (overlayTv != null && overlayTv.getVisibility() == View.VISIBLE) {
-            downloadButton.setTag(com.gh.gamecenter.feature.R.string.download, overlayTv.getText());
+            downloadButton.setTag(R.string.download, overlayTv.getText());
         } else {
-            downloadButton.setTag(com.gh.gamecenter.feature.R.string.download, downloadButton.getText());
+            downloadButton.setTag(R.string.download, downloadButton.getText());
         }
 
         if (downloadEntity == null) return;
@@ -488,7 +488,7 @@ public class DetailDownloadUtils {
                 downloadButton.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_NORMAL);
                 break;
             case waiting:
-                downloadButton.setText(com.gh.gamecenter.feature.R.string.waiting);
+                downloadButton.setText(R.string.waiting);
                 downloadButton.setButtonStyle(DownloadButton.ButtonStyle.WAITING);
                 break;
             case overflow:
@@ -498,12 +498,12 @@ public class DetailDownloadUtils {
             case diskisfull:
             case diskioerror:
             case pause:
-                String pausedText = viewHolder.getContext().getString(com.gh.gamecenter.feature.R.string.paused);
+                String pausedText = viewHolder.getContext().getString(R.string.paused);
                 downloadButton.setText(getValidProgress(downloadEntity) + "% " + pausedText);
                 downloadButton.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_NORMAL);
                 break;
             case done:
-                String updateText = viewHolder.getContext().getString(com.gh.gamecenter.feature.R.string.update);
+                String updateText = viewHolder.getContext().getString(R.string.update);
                 if (!status.contains(updateText)) {
                     if (VHelper.isInstalled(downloadEntity.getPackageName())) {
                         downloadButton.setButtonStyle(DownloadButton.ButtonStyle.LAUNCH_OR_OPEN);
@@ -544,7 +544,7 @@ public class DetailDownloadUtils {
             case diskisfull:
             case diskioerror:
             case overflow:
-                String pausedText = context.getString(com.gh.gamecenter.feature.R.string.paused);
+                String pausedText = context.getString(R.string.paused);
                 String downloadingText = SpeedUtils.getSpeed(downloadEntity.getSpeed());
                 String resumeText = getValidProgress(downloadEntity) + "% " + pausedText;
                 downloadButton.setText((downloadEntity.getStatus() == DownloadStatus.downloading || downloadEntity.getStatus() == DownloadStatus.redirected) ? downloadingText : resumeText);
@@ -555,7 +555,7 @@ public class DetailDownloadUtils {
                 }
                 break;
             case waiting:
-                downloadButton.setText(com.gh.gamecenter.feature.R.string.waiting);
+                downloadButton.setText(R.string.waiting);
                 downloadButton.setButtonStyle(DownloadButton.ButtonStyle.WAITING);
                 break;
             case done:
@@ -563,21 +563,21 @@ public class DetailDownloadUtils {
                     boolean isInstalled = PackageUtils.isInstalledFromAllPackage(context, gameEntity.getSimulator().getApk().getPackageName());
                     boolean isInstalledNewSimulator = SimulatorGameManager.isNewSimulatorInstalled(context);
                     if (isInstalled || isInstalledNewSimulator) {
-                        downloadButton.setText(com.gh.gamecenter.feature.R.string.launch);
+                        downloadButton.setText(R.string.launch);
                         downloadButton.setButtonStyle(DownloadButton.ButtonStyle.LAUNCH_OR_OPEN);
                     } else {
                         if (SPUtils.getBoolean(Constants.SP_USE_BROWSER_TO_INSTALL) && !Objects.equals(Constants.XAPK_APKS_FORMAT, downloadEntity.getFormat())) {
-                            downloadButton.setText(com.gh.gamecenter.feature.R.string.browser_install_install);
+                            downloadButton.setText(R.string.browser_install_install);
                         } else {
-                            downloadButton.setText(com.gh.gamecenter.feature.R.string.install);
+                            downloadButton.setText(R.string.install);
                         }
                         downloadButton.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_NORMAL);
                     }
                 } else {
                     if (SPUtils.getBoolean(Constants.SP_USE_BROWSER_TO_INSTALL) && !Objects.equals(Constants.XAPK_APKS_FORMAT, downloadEntity.getFormat())) {
-                        downloadButton.setText(com.gh.gamecenter.feature.R.string.browser_install_install);
+                        downloadButton.setText(R.string.browser_install_install);
                     } else {
-                        downloadButton.setText(com.gh.gamecenter.feature.R.string.install);
+                        downloadButton.setText(R.string.install);
                     }
                 }
 
@@ -617,7 +617,7 @@ public class DetailDownloadUtils {
             downloadButton.setButtonStyle(DownloadButton.ButtonStyle.XAPK_UNZIPPING);
             return true;
         } else if (XapkUnzipStatus.FAILURE.name().equals(xapkStatus)) {
-            downloadButton.setText(com.gh.gamecenter.feature.R.string.install);
+            downloadButton.setText(R.string.install);
             downloadButton.setButtonStyle(DownloadButton.ButtonStyle.XAPK_FAILURE);
             return true;
         }

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

@@ -94,13 +94,13 @@ public class DialogUtils {
         context = checkDialogContext(context);
 
         Dialog dialog = new Dialog(context);
-        View view = View.inflate(context, com.gh.gamecenter.common.R.layout.set_wait_dialog, null);
-        TextView message = view.findViewById(com.gh.gamecenter.common.R.id.set_wait_message);
+        View view = View.inflate(context, R.layout.set_wait_dialog, null);
+        TextView message = view.findViewById(R.id.set_wait_message);
         message.setText(msg);
         dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
         dialog.setContentView(view);
         dialog.setCanceledOnTouchOutside(false);
-        dialog.getWindow().setBackgroundDrawableResource(com.gh.gamecenter.common.R.drawable.background_shape_white_radius_8);
+        dialog.getWindow().setBackgroundDrawableResource(R.drawable.background_shape_white_radius_8);
         WindowManager.LayoutParams layoutParams = dialog.getWindow().getAttributes();
         layoutParams.width = DisplayUtils.dip2px(160);
         dialog.getWindow().setAttributes(layoutParams);
@@ -163,7 +163,7 @@ public class DialogUtils {
 
         NewFlatLogUtils.logDownloadMobileDataDialogShow(gameId, gameName);
 
-        final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.GhAlertDialog);
+        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
 
         View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_download_traffic, null);
         View allowOnce = contentView.findViewById(R.id.allow_once);
@@ -259,7 +259,7 @@ public class DialogUtils {
                                              final ConfirmListener cmListener) {
         context = checkDialogContext(context);
 
-        final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.GhAlertDialog);
+        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
 
         View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_community, null);
         View contentContainer = contentView.findViewById(R.id.content_container);
@@ -318,7 +318,7 @@ public class DialogUtils {
                                                        EmptyCallback callback) {
         final Context activityContext = checkDialogContext(context);
 
-        final Dialog dialog = new Dialog(activityContext, com.gh.gamecenter.common.R.style.DialogWindowTransparent);
+        final Dialog dialog = new Dialog(activityContext, R.style.DialogWindowTransparent);
 
         View contentView = LayoutInflater.from(activityContext).inflate(R.layout.dialog_disallow_privacy_policy, null);
         View backButton = contentView.findViewById(R.id.back_button);
@@ -354,14 +354,14 @@ public class DialogUtils {
                                                final ConfirmListener cmListener) {
         context = checkDialogContext(context);
 
-        final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.GhAlertDialog);
+        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
 
         View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_video_upload_draft, null);
         TextView negativeTv = contentView.findViewById(R.id.negative);
         TextView positiveTv = contentView.findViewById(R.id.positive);
         TextView content = contentView.findViewById(R.id.content);
-        positiveTv.setBackground(DrawableView.getOvalDrawable(com.gh.gamecenter.common.R.color.ui_background, 999));
-        negativeTv.setBackground(DrawableView.getOvalDrawable(com.gh.gamecenter.common.R.color.primary_theme, 999));
+        positiveTv.setBackground(DrawableView.getOvalDrawable(R.color.ui_background, 999));
+        negativeTv.setBackground(DrawableView.getOvalDrawable(R.color.primary_theme, 999));
         content.setText(Html.fromHtml(context.getString(R.string.video_upload_draft_dialog_content)));
 
         negativeTv.setOnClickListener(view -> {
@@ -411,7 +411,7 @@ public class DialogUtils {
         context = checkDialogContext(context);
 
         final TrackableDialog dialog = new TrackableDialog(context,
-                com.gh.gamecenter.common.R.style.GhAlertDialog,
+                R.style.GhAlertDialog,
                 trackableEntity.getEvent(),
                 trackableEntity.getKey(),
                 trackableEntity.getValue(),
@@ -427,7 +427,7 @@ public class DialogUtils {
                 window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
             }
         } else {
-            contentView = LayoutInflater.from(context).inflate(com.gh.gamecenter.common.R.layout.dialog_alert, null);
+            contentView = LayoutInflater.from(context).inflate(R.layout.dialog_alert, null);
         }
 
         TextView contentTv = contentView.findViewById(R.id.dialog_content);
@@ -482,7 +482,7 @@ public class DialogUtils {
     public static Dialog showUsageStatsDialog(Context context, final ConfirmListener cmListener, final CancelListener clListener) {
         context = checkDialogContext(context);
 
-        final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.GhAlertDialog);
+        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
 
         View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_usage_stats, null);
         TextView negativeTv = contentView.findViewById(R.id.dialog_negative);
@@ -522,7 +522,7 @@ public class DialogUtils {
     public static void showDownloadMutexDialog(Context context) {
         context = checkDialogContext(context);
 
-        final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.GhAlertDialog);
+        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
 
         View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_downlaod_mutex, null);
         TextView positive = contentView.findViewById(R.id.dialog_positive);
@@ -562,7 +562,7 @@ public class DialogUtils {
 
         context = checkDialogContext(context);
 
-        final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.GhAlertDialog);
+        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
 
         DialogAddressConfirmationBinding binding = DialogAddressConfirmationBinding.inflate(LayoutInflater.from(context), null, false);
 
@@ -629,7 +629,7 @@ public class DialogUtils {
     public static void showLandPageAddressDialog(Context context, GameEntity gameEntity, @NonNull ConfirmListener listener) {
         context = checkDialogContext(context);
 
-        final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.GhAlertDialog);
+        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
 
         DialogAddressConfirmationBinding binding = DialogAddressConfirmationBinding.inflate(LayoutInflater.from(context), null, false);
 
@@ -700,7 +700,7 @@ public class DialogUtils {
     public static void showGameH5DownloadDialog(Context context, GameEntity gameEntity, RegionSetting.GameH5Download gameH5Download) {
         context = checkDialogContext(context);
 
-        final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.GhAlertDialog);
+        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
 
         DialogAddressConfirmationBinding binding = DialogAddressConfirmationBinding.inflate(LayoutInflater.from(context), null, false);
 
@@ -741,7 +741,7 @@ public class DialogUtils {
             params = window.getAttributes();
             params.width = (int) (context.getResources().getDisplayMetrics().widthPixels * 0.9);
             window.setAttributes(params);
-            window.setBackgroundDrawableResource(com.gh.gamecenter.common.R.drawable.textview_white_up);
+            window.setBackgroundDrawableResource(R.drawable.textview_white_up);
         }
 
         inflate.findViewById(R.id.imprint_close).setOnClickListener(v -> dialog.dismiss());
@@ -771,7 +771,7 @@ public class DialogUtils {
 
         // close line
         View view = new View(context);
-        view.setBackgroundColor(context.getResources().getColor(com.gh.gamecenter.common.R.color.text_5d5d5d));
+        view.setBackgroundColor(context.getResources().getColor(R.color.text_5d5d5d));
         view.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, DisplayUtils.dip2px(1)));
         content.addView(view);
     }
@@ -779,7 +779,7 @@ public class DialogUtils {
     public static void showKaifuRemindDialog(Context context, String content, String gameName) {
         context = checkDialogContext(context);
 
-        final Dialog dialog = new TrackableDialog(context, com.gh.gamecenter.common.R.style.GhAlertDialog, "开服说明弹窗", "弹窗", gameName, null, null, true);
+        final Dialog dialog = new TrackableDialog(context, R.style.GhAlertDialog, "开服说明弹窗", "弹窗", gameName, null, null, true);
 
         View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_kaifu_remind, null);
 
@@ -809,7 +809,7 @@ public class DialogUtils {
     public static void showStopServerExplanationDialog(Context context, String content, String gameName) {
         context = checkDialogContext(context);
 
-        final Dialog dialog = new TrackableDialog(context, com.gh.gamecenter.common.R.style.GhAlertDialog, "评论说明弹窗", "弹窗", gameName, null, null, true);
+        final Dialog dialog = new TrackableDialog(context, R.style.GhAlertDialog, "评论说明弹窗", "弹窗", gameName, null, null, true);
 
         View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_stop_service_explanation, null);
 
@@ -854,7 +854,7 @@ public class DialogUtils {
 
         final Dialog dialog = new TrackableDialog(
                 context,
-                com.gh.gamecenter.common.R.style.GhAlertDialog,
+                R.style.GhAlertDialog,
                 "礼仪考试",
                 "礼仪考试弹窗",
                 null, null, null,
@@ -908,9 +908,9 @@ public class DialogUtils {
     public static void showNoticeDialog(Context context, String title, String content, @NonNull ConfirmListener listener) {
         context = checkDialogContext(context);
 
-        final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.DialogWindowTransparent);
+        final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
 
-        View contentView = LayoutInflater.from(context).inflate(com.gh.gamecenter.common.R.layout.dialog_notice, null);
+        View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_notice, null);
         TextView titleTv = contentView.findViewById(R.id.dialog_title);
         TextView contentTv = contentView.findViewById(R.id.dialog_content);
 
@@ -935,7 +935,7 @@ public class DialogUtils {
     public static void showViewBadgeDialog(Context context, Badge badge, ConfirmListener listener) {
         context = checkDialogContext(context);
 
-        final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.DialogWindowTransparent);
+        final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
 
         View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_view_badge, null);
         TextView titleTv = contentView.findViewById(R.id.dialog_title);
@@ -956,7 +956,7 @@ public class DialogUtils {
             });
         }
 
-        Animation animation = AnimationUtils.loadAnimation(context, com.gh.gamecenter.common.R.anim.anim_badge_light_bg);
+        Animation animation = AnimationUtils.loadAnimation(context, R.anim.anim_badge_light_bg);
         badgeLightBg.startAnimation(animation);
 
         contentView.findViewById(R.id.dialog_ok).setOnClickListener(v -> {
@@ -973,7 +973,7 @@ public class DialogUtils {
     public static void showReceiveBadgeDialog(Context context, BadgeEntity badge, ConfirmListener listener) {
         context = checkDialogContext(context);
 
-        final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.DialogWindowTransparent);
+        final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
 
         View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_receive_badge, null);
         TextView titleTv = contentView.findViewById(R.id.dialog_title);
@@ -1003,7 +1003,7 @@ public class DialogUtils {
             receiveTv.setText(R.string.apply_badge);
         }
 
-        Animation animation = AnimationUtils.loadAnimation(context, com.gh.gamecenter.common.R.anim.anim_badge_light_bg);
+        Animation animation = AnimationUtils.loadAnimation(context, R.anim.anim_badge_light_bg);
         badgeLightBg.startAnimation(animation);
 
         contentView.findViewById(R.id.dialog_ok).setOnClickListener(v -> {
@@ -1020,7 +1020,7 @@ public class DialogUtils {
     public static void showPassRegulationDialog(Context context, String icon) {
         context = checkDialogContext(context);
 
-        final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.DialogWindowTransparent);
+        final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
 
         View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_pass_regulation, null);
         SimpleDraweeView userIcon = contentView.findViewById(R.id.dialog_icon);
@@ -1039,7 +1039,7 @@ public class DialogUtils {
     public static void showShortCutPermissionDialog(Context context) {
         context = checkDialogContext(context);
 
-        final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.DialogWindowTransparent);
+        final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
 
         View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_shortcut_permission, null);
 
@@ -1064,7 +1064,7 @@ public class DialogUtils {
             , String positive, String negative, final ConfirmListener cmListener, final CancelListener clListener) {
         context = checkDialogContext(context);
 
-        final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.GhAlertDialog);
+        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
 
         View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_cancel_reservation, null);
         TextView contentTv = contentView.findViewById(R.id.dialog_content);
@@ -1105,11 +1105,11 @@ public class DialogUtils {
 
     public static void showSimulatorParseErrorDialog(Context context, String gameId, String gameName, ConfirmListener confirmListener) {
         context = checkDialogContext(context);
-        final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.GhAlertDialog);
+        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
 
         DialogPackageParseErrorBinding binding = DialogPackageParseErrorBinding.inflate(LayoutInflater.from(context), null, false);
         Context finalContext = context;
-        SpannableStringBuilder builder = new SpanBuilder("您也可以点击提交反馈跟我们联系").click(context, 6, 10, com.gh.gamecenter.common.R.color.text_theme, true, new Function0<Unit>() {
+        SpannableStringBuilder builder = new SpanBuilder("您也可以点击提交反馈跟我们联系").click(context, 6, 10, R.color.text_theme, true, new Function0<Unit>() {
             @Override
             public Unit invoke() {
                 SimpleGameEntity entity = new SimpleGameEntity(gameId, gameName, "", "");
@@ -1149,7 +1149,7 @@ public class DialogUtils {
     public static void showReportReasonDialog(Context context, ArrayList<String> items, String title, ReportReasonCallBack callBack) {
         context = checkDialogContext(context);
 
-        final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.DialogWindowTransparent);
+        final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
         DialogReportReasonBinding binding = DialogReportReasonBinding.inflate(LayoutInflater.from(context));
 
         if (!title.isEmpty()) {
@@ -1168,7 +1168,7 @@ public class DialogUtils {
             return null;
         });
         binding.reasonRv.setLayoutManager(new LinearLayoutManager(context));
-        binding.reasonRv.addItemDecoration(new VerticalItemDecoration(context, 1F, false, com.gh.gamecenter.common.R.color.ui_background));
+        binding.reasonRv.addItemDecoration(new VerticalItemDecoration(context, 1F, false, R.color.ui_background));
         binding.reasonRv.setAdapter(reportReasonAdapter);
 
         binding.negativeBtn.setOnClickListener(v -> {
@@ -1190,7 +1190,7 @@ public class DialogUtils {
         ExtensionsKt.setTextChangedListener(binding.otherReasonEt, (s, start, before, count) -> {
             int tvCount = s.length();
             if (tvCount >= 500) {
-                binding.tvCount.setTextColor(ContextCompat.getColor(finalContext, com.gh.gamecenter.common.R.color.secondary_red));
+                binding.tvCount.setTextColor(ContextCompat.getColor(finalContext, R.color.secondary_red));
             }
             binding.tvCount.setText(tvCount + "/500");
             return null;
@@ -1204,7 +1204,7 @@ public class DialogUtils {
     public static Dialog showBindPhoneDialog(Context context, ConfirmListener listener) {
         context = checkDialogContext(context);
 
-        final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.DialogWindowTransparent);
+        final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
         DialogBindPhoneBinding binding = DialogBindPhoneBinding.inflate(LayoutInflater.from(context));
 
         binding.positiveTv.setOnClickListener(v -> {
@@ -1225,7 +1225,7 @@ public class DialogUtils {
     public static void showReserveOrVoteSuccess2WechatBindDialog(Context context, Boolean isReserve, ConfirmListener confirmListener, CancelListener cancelListener) {
         context = checkDialogContext(context);
 
-        final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.DialogWindowTransparent);
+        final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
         DialogWechatReserveSuccessBinding binding = DialogWechatReserveSuccessBinding.inflate(LayoutInflater.from(context));
         binding.titleIv.setImageResource(isReserve ? R.drawable.bg_reserve_success : R.drawable.bg_vote_success);
         binding.contentTv.setText(isReserve ? "游戏上线时，您将在消息中心收到通知。为了避免错过通知，建议您开启微信公众号提醒" : "版本上线时，您将在消息中心收到通知。为了避免错过通知，亦建议您开启微信公众号提醒");
@@ -1252,7 +1252,7 @@ public class DialogUtils {
     public static void showReserveOrVoteSuccessDialog(Context context, Boolean isReserve) {
         context = checkDialogContext(context);
 
-        final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.DialogWindowTransparent);
+        final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
         DialogAlertDefaultBinding binding = DialogAlertDefaultBinding.inflate(LayoutInflater.from(context));
         binding.titleTv.setText(isReserve ? "游戏预约成功" : "版本投票成功");
         binding.contentTv.setText(isReserve ? "游戏上线时，您将在消息中心和微信公众号收到通知，不会错过任何预约的游戏" : "版本上线时，您将在消息中心和微信公众号收到通知，不会错过任何投票的版本");
@@ -1280,7 +1280,7 @@ public class DialogUtils {
     public static void showRelievePhoneDialog(Context context) {
         context = checkDialogContext(context);
 
-        final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.DialogWindowTransparent);
+        final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
         DialogRelievePhoneBinding binding = DialogRelievePhoneBinding.inflate(LayoutInflater.from(context));
 
         Context finalContext = context;

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

@@ -12,7 +12,6 @@ import android.text.TextUtils
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.os.bundleOf
 import com.alibaba.android.arouter.launcher.ARouter
-import com.gh.ad.AdPluginDownloadHelper
 import com.gh.common.constant.Config
 import com.gh.common.exposure.ExposureManager.log
 import com.gh.common.exposure.ExposureTraceUtils.appendTrace
@@ -79,7 +78,6 @@ 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.retrofit.RetrofitManager
-import com.gh.gamecenter.SearchActivity
 import com.gh.gamecenter.servers.GameServerTestActivity
 import com.gh.gamecenter.servers.GameServersActivity
 import com.gh.gamecenter.servers.gametest2.GameServerTestV2Activity
@@ -179,8 +177,7 @@ object DirectUtils {
         "bbs_section",
         "qa",
         "feedback",
-        "toolkit",
-        "float_window_game"
+        "toolkit"
     )
 
     fun directToLinkPage(
@@ -485,13 +482,11 @@ object DirectUtils {
             ColumnCollectionDetailFragment.TYPE_QQ_MINI_GAME_COLUMN -> directToQGameHome(context)
 
             // QQ游戏专题详情页
-            ViewPagerFragmentHelper.TYPE_QQ_MINI_GAME_COLUMN,
-            ViewPagerFragmentHelper.TYPE_WECHAT_GAME_COLUMN,
-            ViewPagerFragmentHelper.TYPE_WECHAT_GAME_CPM_COLUMN -> {
-                val subjectType = when (linkEntity.type) {
-                    ViewPagerFragmentHelper.TYPE_QQ_MINI_GAME_COLUMN -> SubjectData.SubjectType.QQ_GAME
-                    ViewPagerFragmentHelper.TYPE_WECHAT_GAME_CPM_COLUMN -> SubjectData.SubjectType.WECHAT_GAME_CPM
-                    else -> SubjectData.SubjectType.WECHAT_GAME
+            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
                 }
                 directToSubject(
                     context = context,
@@ -554,22 +549,6 @@ object DirectUtils {
                 MiniGameItemHelper.launchMiniGame(it, Constants.WECHAT_MINI_GAME)
             }
 
-            "float_window_game" -> linkEntity.link?.let { link ->
-                if (PackageUtils.isInstalled(context, Constants.TOOL_MAP_PACKAGE_NAME)) {
-                    val intent = Intent(
-                        Intent.ACTION_VIEW,
-                        Uri.parse("ghtoolmap://floatWindow")
-                    ).also {
-                        it.addCategory(Intent.CATEGORY_DEFAULT)
-                        it.addCategory(Intent.CATEGORY_BROWSABLE)
-                        it.putExtra("gameId", linkEntity.link)
-                    }
-                    context.startActivity(intent)
-                } else {
-                    directToGameDetail(context, Config.getFloatWindowSettingEntity()?.gameId ?: "")
-                }
-            }
-
             "" -> {
                 // do nothing
             }
@@ -1985,23 +1964,19 @@ object DirectUtils {
             return
         }
 
-        val qGameProvider = ARouter
-            .getInstance()
-            .build(RouteConsts.provider.qGame)
-            .navigation() as? IQGameProvider
-
-        if (qGameProvider == null) return
-
-        // 下载广点通广告插件，供 QQ 小游戏启动使用 （当次启动不保证能用，但是下一次就大概率就能了）
-        AdPluginDownloadHelper.downloadPluginIfNeeded(isGdt = true)
-
-        CheckLoginUtils.checkLogin(activity, null, true, "QQ小游戏-秒开") {
+        CheckLoginUtils.checkLogin(
+            activity, null, true, "QQ小游戏-秒开"
+        ) {
             val userToken = UserManager.getInstance().token
             val userId = UserManager.getInstance().userId
             val userName = UserManager.getInstance().userInfoEntity?.name ?: "unknown"
 
-            qGameProvider.setLoginInfo(activity, userId, userName, userToken)
-            qGameProvider.launchGame(activity, qqAppId) { _, _ ->
+            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)
             }
         }
@@ -2011,8 +1986,6 @@ object DirectUtils {
     fun directToWechatGameById(
         activity: Activity,
         wechatAppId: String,
-        wechatAppPath: String = "",
-        wechatAppExtData: String = ""
     ) {
 
         val wxApiProxy = WXAPIFactory.createWXAPI(
@@ -2027,9 +2000,8 @@ object DirectUtils {
         wxApiProxy.sendReq(
             WXLaunchMiniProgram.Req().apply {
                 userName = wechatAppId
-                path = wechatAppPath.ifEmpty { Constants.WECHAT_MINI_GAME_PCS }
-                extData = wechatAppExtData
-                miniprogramType = WXLaunchMiniProgram.Req.MINIPTOGRAM_TYPE_RELEASE
+                path = Constants.WECHAT_MINI_GAME_PCS
+                miniprogramType = WXLaunchMiniProgram.Req.MINIPTOGRAM_TYPE_RELEASE;
             }
         )
 

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

@@ -39,10 +39,10 @@ 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
+import com.gh.gamecenter.feature.minigame.MiniGameItemHelper
 import com.gh.gamecenter.teenagermode.TeenagerModeActivity
 import com.gh.vspace.VHelper
 import com.lightgame.download.DownloadConfig
@@ -244,9 +244,9 @@ object DownloadItemUtils {
         if (RegionSettingHelper.getGameH5DownloadByGameId(gameEntity.id) != null) {
             downloadBtn.apply {
                 isClickable = true
-                text = context.getString(com.gh.gamecenter.feature.R.string.check)
-                setBackgroundResource(com.gh.gamecenter.common.R.drawable.download_button_normal_style)
-                setTextColor(com.gh.gamecenter.common.R.color.white.toColor(context))
+                text = context.getString(R.string.check)
+                setBackgroundResource(R.drawable.download_button_normal_style)
+                setTextColor(R.color.white.toColor(context))
             }
             return
         }
@@ -254,15 +254,15 @@ object DownloadItemUtils {
             if (gameEntity.isMiniGameOffShelve()) {
                 downloadBtn.apply {
                     isClickable = false
-                    text = context.getString(com.gh.gamecenter.feature.R.string.off_shelve)
+                    text = context.getString(R.string.off_shelve)
                     buttonStyle = DownloadButton.ButtonStyle.NONE
                 }
             } else {
                 downloadBtn.apply {
                     isClickable = true
-                    setBackgroundResource(com.gh.gamecenter.common.R.drawable.download_button_normal_style)
-                    setTextColor(com.gh.gamecenter.common.R.color.white.toColor(context))
-                    text = context.getString(com.gh.gamecenter.feature.R.string.quick_play)
+                    setBackgroundResource(R.drawable.download_button_normal_style)
+                    setTextColor(R.color.white.toColor(context))
+                    text = context.getString(R.string.quick_play)
                 }
             }
             return
@@ -273,21 +273,21 @@ object DownloadItemUtils {
             downloadBtn.apply {
                 if (h5LinkEntity != null) {
                     text = if ("play" == h5LinkEntity.type) {
-                        context.getString(com.gh.gamecenter.feature.R.string.start_playing)
+                        context.getString(R.string.start_playing)
                     } else {
-                        context.getString(com.gh.gamecenter.feature.R.string.check)
+                        context.getString(R.string.check)
                     }
                     isClickable = true
                     buttonStyle = DownloadButton.ButtonStyle.NORMAL
                 } else {
                     if ("dialog" == offStatus) {
-                        text = context.getString(com.gh.gamecenter.feature.R.string.check)
+                        text = context.getString(R.string.check)
                         buttonStyle = DownloadButton.ButtonStyle.NORMAL
                     } else if ("updating" == offStatus) {
-                        text = context.getString(com.gh.gamecenter.feature.R.string.updating)
+                        text = context.getString(R.string.updating)
                         buttonStyle = DownloadButton.ButtonStyle.UPDATING
                     } else {
-                        text = context.getString(com.gh.gamecenter.feature.R.string.none)
+                        text = context.getString(R.string.none)
                         buttonStyle = DownloadButton.ButtonStyle.NONE
                         if (hideDownloadBtnIfNoAvailableContent) {
                             visibility = View.GONE
@@ -364,17 +364,17 @@ object DownloadItemUtils {
                                             asVGame = true
                                         )
                                     ) {
-                                        setText(com.gh.gamecenter.feature.R.string.update)
+                                        setText(R.string.update)
                                         DownloadButton.ButtonStyle.NORMAL
                                     } else {
-                                        setText(com.gh.gamecenter.feature.R.string.launch)
+                                        setText(R.string.launch)
                                         DownloadButton.ButtonStyle.LAUNCH_OR_OPEN
                                     }
                             } else {
                                 val xapkStatus = downloadEntity.meta[XapkInstaller.XAPK_UNZIP_STATUS]
                                 if (XapkUnzipStatus.SUCCESS.name == xapkStatus && isInstalling(downloadEntity.path)) {
                                     progress = 100
-                                    setText(com.gh.gamecenter.feature.R.string.installing)
+                                    setText(R.string.installing)
                                     buttonStyle = DownloadButton.ButtonStyle.INSTALL_NORMAL
                                     return
                                 }
@@ -385,7 +385,7 @@ object DownloadItemUtils {
                                     buttonStyle = DownloadButton.ButtonStyle.XAPK_UNZIPPING
                                     return
                                 } else if (XapkUnzipStatus.FAILURE.name == xapkStatus) {
-                                    setText(com.gh.gamecenter.feature.R.string.install)
+                                    setText(R.string.install)
                                     buttonStyle = DownloadButton.ButtonStyle.INSTALL_NORMAL
                                     return
                                 }
@@ -398,14 +398,14 @@ object DownloadItemUtils {
                                         )
                                     ) {
                                         buttonStyle = DownloadButton.ButtonStyle.NORMAL
-                                        setText(com.gh.gamecenter.feature.R.string.update)
+                                        setText(R.string.update)
                                     } else {
                                         buttonStyle = DownloadButton.ButtonStyle.LAUNCH_OR_OPEN
-                                        setText(com.gh.gamecenter.feature.R.string.launch)
+                                        setText(R.string.launch)
                                     }
                                 } else {
                                     buttonStyle = DownloadButton.ButtonStyle.INSTALL_NORMAL
-                                    setText(com.gh.gamecenter.feature.R.string.install)
+                                    setText(R.string.install)
                                 }
                             }
                             buttonStyle =
@@ -424,7 +424,7 @@ object DownloadItemUtils {
                         DownloadStatus.diskioerror,
                         DownloadStatus.overflow -> {
                             buttonStyle = DownloadButton.ButtonStyle.NORMAL
-                            setText(com.gh.gamecenter.feature.R.string.resume)
+                            setText(R.string.resume)
                         }
 
                         DownloadStatus.cancel -> {
@@ -510,13 +510,13 @@ object DownloadItemUtils {
             DownloadStatus.downloading -> {
                 if (isMultiVersion) {
                     holder.gameDownloadBtn.buttonStyle = DownloadButton.ButtonStyle.NORMAL
-                    val darkMode = (holder.gameDownloadTips?.getTag(com.gh.gamecenter.common.R.string.is_dark_mode_on_id) as? Boolean) ?: false
+                    val darkMode = (holder.gameDownloadTips?.getTag(R.string.is_dark_mode_on_id) as? Boolean) ?: false
                     val isDarkModeChanged = DarkModeUtils.isDarkModeOn(context) != darkMode
                     if (holder.gameDownloadTips?.visibility == View.GONE || holder.gameDownloadTips?.isAnimating == false || isDarkModeChanged) {
                         holder.gameDownloadTips?.visibility = View.VISIBLE
                         holder.gameDownloadTips?.setDownloadTipsAnimation(true)
                     }
-                    holder.gameDownloadTips?.setTag(com.gh.gamecenter.common.R.string.is_dark_mode_on_id, DarkModeUtils.isDarkModeOn(context))
+                    holder.gameDownloadTips?.setTag(R.string.is_dark_mode_on_id, DarkModeUtils.isDarkModeOn(context))
                 } else {
                     holder.gameDownloadTips?.visibility = View.GONE
                     holder.gameDownloadBtn.buttonStyle = DownloadButton.ButtonStyle.DOWNLOADING_NORMAL
@@ -531,7 +531,7 @@ object DownloadItemUtils {
                     holder.gameDownloadTips?.setDownloadTipsAnimation(false)
                 }
                 holder.gameDownloadBtn.buttonStyle = DownloadButton.ButtonStyle.WAITING
-                holder.gameDownloadBtn.text = context.getString(com.gh.gamecenter.feature.R.string.waiting)
+                holder.gameDownloadBtn.text = context.getString(R.string.waiting)
             }
 
             DownloadStatus.pause,
@@ -546,7 +546,7 @@ object DownloadItemUtils {
                     holder.gameDownloadTips?.setDownloadTipsAnimation(false)
                 }
                 holder.gameDownloadBtn.buttonStyle = DownloadButton.ButtonStyle.NORMAL
-                holder.gameDownloadBtn.text = context.getString(com.gh.gamecenter.feature.R.string.resume)
+                holder.gameDownloadBtn.text = context.getString(R.string.resume)
             }
 
             DownloadStatus.done -> {
@@ -561,7 +561,7 @@ object DownloadItemUtils {
                     holder.gameDownloadBtn.text = "$percent%"
                     return
                 } else if (XapkUnzipStatus.FAILURE.name == xapkStatus) {
-                    holder.gameDownloadBtn.setText(com.gh.gamecenter.feature.R.string.install)
+                    holder.gameDownloadBtn.setText(R.string.install)
                     holder.gameDownloadBtn.buttonStyle = DownloadButton.ButtonStyle.INSTALL_NORMAL
                     return
                 }
@@ -728,7 +728,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()
@@ -880,7 +880,7 @@ object DownloadItemUtils {
         }
         if (gameEntity.isMiniGame()) {
             downloadBtn.setOnClickListener {
-                MiniGameItemHelper.launchMiniGame(gameEntity)
+                MiniGameItemHelper.launchMiniGame(gameEntity.miniGameAppId, gameEntity.miniGameType)
                 clickCallback?.onCallback()
                 allStateClickCallback?.onCallback()
             }
@@ -922,7 +922,7 @@ object DownloadItemUtils {
                 }
 
                 // 启动不需要请求存储权限
-                if (downloadBtn is DownloadButton && downloadBtn.text == context.getString(com.gh.gamecenter.feature.R.string.launch)) {
+                if (downloadBtn is DownloadButton && downloadBtn.text == context.getString(R.string.launch)) {
                     clickRunnable.onCallback()
                 } else {
                     PermissionHelper.checkStoragePermissionBeforeAction(
@@ -945,7 +945,7 @@ object DownloadItemUtils {
                     addHandler(CheckStoragePermissionHandler())
                     addHandler(VersionNumberHandler())
                 }
-                    .setProcessEndCallback(gameEntity.id) { _, _ ->
+                    .setProcessEndCallback { _, _ ->
                         DownloadDialog.showDownloadDialog(view.context, gameEntity, traceEvent, entrance, location)
                     }
                     .buildHandlerChain()
@@ -970,13 +970,13 @@ object DownloadItemUtils {
         traceEvent: ExposureEvent? = null,
         refreshCallback: EmptyCallback? = null
     ) {
-        val str = if (downloadBtn is DownloadButton) downloadBtn.text else context.getString(com.gh.gamecenter.feature.R.string.download)
+        val str = if (downloadBtn is DownloadButton) downloadBtn.text else context.getString(R.string.download)
         if (gameEntity.getApk().isEmpty()) return
         val apk = gameEntity.getApk().safelyGetInRelease(0) ?: return
 
         val shouldPerformAsVGame = GameUtils.shouldPerformAsVGame(gameEntity)
 
-        if (str == context.getString(com.gh.gamecenter.feature.R.string.download)) {
+        if (str == context.getString(R.string.download)) {
             DownloadChainBuilder().apply {
                 addHandler(UnsupportedFeatureHandler())
                 addHandler(UpdateNewSimulatorHandler())
@@ -988,13 +988,22 @@ object DownloadItemUtils {
                 addHandler(LandPageAddressHandler())
                 addHandler(CheckDownloadHandler())
             }
-                .setProcessEndCallback(gameEntity.id) { asVGame, isSubscribe ->
-                    download(context, gameEntity, downloadBtn, entrance, location, asVGame, isSubscribe as Boolean, traceEvent)
+                .setProcessEndCallback { asVGame, isSubscribe ->
+                    download(
+                        context,
+                        gameEntity,
+                        downloadBtn,
+                        entrance,
+                        location,
+                        asVGame,
+                        isSubscribe as Boolean,
+                        traceEvent
+                    )
                 }
                 .buildHandlerChain()
                 ?.handleRequest(context, gameEntity, shouldPerformAsVGame)
             DataLogUtils.uploadGameLog(context, gameEntity.id, gameEntity.name, entrance)
-        } else if (str == context.getString(com.gh.gamecenter.feature.R.string.attempt)) {
+        } else if (str == context.getString(R.string.attempt)) {
             DownloadChainBuilder().apply {
                 addHandler(UnsupportedFeatureHandler())
                 addHandler(UpdateNewSimulatorHandler())
@@ -1007,13 +1016,22 @@ object DownloadItemUtils {
                 addHandler(OverseaDownloadHandler())
                 addHandler(CheckDownloadHandler())
             }
-                .setProcessEndCallback(gameEntity.id) { asVGame, isSubscribe ->
-                    download(context, gameEntity, downloadBtn, entrance, location, asVGame, isSubscribe as Boolean, traceEvent)
+                .setProcessEndCallback { asVGame, isSubscribe ->
+                    download(
+                        context,
+                        gameEntity,
+                        downloadBtn,
+                        entrance,
+                        location,
+                        asVGame,
+                        isSubscribe as Boolean,
+                        traceEvent
+                    )
                 }
                 .buildHandlerChain()
                 ?.handleRequest(context, gameEntity, shouldPerformAsVGame)
             DataLogUtils.uploadGameLog(context, gameEntity.id, gameEntity.name, entrance)
-        } else if (str == context.getString(com.gh.gamecenter.feature.R.string.smooth)) {
+        } else if (str == context.getString(R.string.smooth)) {
             DownloadChainBuilder().apply {
                 addHandler(UnsupportedFeatureHandler())
                 addHandler(GamePermissionHandler())
@@ -1026,8 +1044,17 @@ object DownloadItemUtils {
                 addHandler(ValidateVSpaceHandler())
                 addHandler(CheckDownloadHandler())
             }
-                .setProcessEndCallback(gameEntity.id) { asVGame, isSubscribe ->
-                    download(context, gameEntity, downloadBtn, entrance, location, asVGame, isSubscribe as Boolean, traceEvent)
+                .setProcessEndCallback { asVGame, isSubscribe ->
+                    download(
+                        context,
+                        gameEntity,
+                        downloadBtn,
+                        entrance,
+                        location,
+                        asVGame,
+                        isSubscribe as Boolean,
+                        traceEvent
+                    )
                 }
                 .buildHandlerChain()
                 ?.handleRequest(context, gameEntity, shouldPerformAsVGame)
@@ -1039,13 +1066,13 @@ object DownloadItemUtils {
                     addHandler(DownloadDialogHelperHandler())
                     addHandler(CheckDownloadHandler())
                 }
-                    .setProcessEndCallback(gameEntity.id) { _, isSubscribe ->
+                    .setProcessEndCallback { _, isSubscribe ->
                         plugin(context, gameEntity, downloadBtn, entrance, location, isSubscribe as Boolean, traceEvent)
                     }
                     .buildHandlerChain()
                     ?.handleRequest(context, gameEntity, shouldPerformAsVGame)
             }
-        } else if (str == context.getString(com.gh.gamecenter.feature.R.string.install)) {
+        } else if (str == context.getString(R.string.install)) {
             val downloadEntity = SimulatorGameManager.findDownloadEntityByUrl(apk.url)
 
             com.gh.gamecenter.common.utils.NewFlatLogUtils.logGameInstall(
@@ -1085,7 +1112,7 @@ object DownloadItemUtils {
             }
 
             install(context, gameEntity, position, adapter, refreshCallback)
-        } else if (str == context.getString(com.gh.gamecenter.feature.R.string.launch)) {
+        } else if (str == context.getString(R.string.launch)) {
             //启动模拟器游戏
             if (SimulatorGameManager.isSimulatorGame(gameEntity)) {
                 if (NewSimulatorGameManager.shouldShowUpdateNewSimulatorAlert(context)) {
@@ -1116,7 +1143,7 @@ object DownloadItemUtils {
             }
 
             PackageLauncher.launch(context, gameEntity)
-        } else if (str == context.getString(com.gh.gamecenter.feature.R.string.update)) {
+        } else if (str == context.getString(R.string.update)) {
             if (shouldPerformAsVGame) {
                 VHelper.updateOrReDownload(gameEntity)
                 return
@@ -1125,7 +1152,7 @@ object DownloadItemUtils {
             DownloadChainBuilder()
                 .apply {
                     addHandler(LandPageAddressHandler())
-                }.setProcessEndCallback(gameEntity.id) { asVGame, _ ->
+                }.setProcessEndCallback { asVGame, _ ->
                     DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk) {
                         DialogUtils.checkDownload(
                             context,
@@ -1158,11 +1185,11 @@ object DownloadItemUtils {
                     return
                 }
                 when (str) {
-                    context.getString(com.gh.gamecenter.feature.R.string.resume) -> {
+                    context.getString(R.string.resume) -> {
                         DownloadManager.getInstance().resume(downloadEntity, false)
                     }
 
-                    context.getString(com.gh.gamecenter.feature.R.string.waiting) -> {
+                    context.getString(R.string.waiting) -> {
                         Utils.toast(context, "最多只能同时下载三个任务，请稍等")
                     }
 
@@ -1240,7 +1267,7 @@ object DownloadItemUtils {
                 }, 1000)
             }
             if (downloadBtn is DownloadButton) {
-                downloadBtn.setText(com.gh.gamecenter.feature.R.string.downloading)
+                downloadBtn.setText(R.string.downloading)
                 downloadBtn.buttonStyle = DownloadButton.ButtonStyle.DOWNLOADING_PLUGIN
             }
         } else {
@@ -1262,7 +1289,7 @@ object DownloadItemUtils {
             val path = downloadEntity.path
             when {
                 FileUtils.isEmptyFile(path) -> {
-                    Utils.toast(context, com.gh.gamecenter.common.R.string.install_failure_hint)
+                    Utils.toast(context, R.string.install_failure_hint)
                     DownloadManager.getInstance().cancel(downloadEntity.url)
                     gameEntity.getEntryMap().remove(apkEntity?.getPlatform())
                     adapter?.notifyItemChanged(position)

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

@@ -10,6 +10,7 @@ import android.os.Build
 import androidx.core.app.NotificationCompat
 import com.gh.common.xapk.XapkInstaller
 import com.gh.common.xapk.XapkUnzipStatus
+import com.gh.gamecenter.R
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.utils.getMetaExtra
@@ -198,6 +199,6 @@ object DownloadNotificationHelper {
     }
 
     private fun getNotificationIcon(): Int {
-        return com.gh.gamecenter.common.R.mipmap.logo
+        return R.mipmap.logo
     }
 }

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

@@ -30,7 +30,6 @@ import com.gh.gamecenter.feature.entity.SimulatorEntity
 import com.gh.gamecenter.feature.utils.PlatformUtils
 import com.gh.gamecenter.help.HelpAndFeedbackBridge
 import com.gh.gamecenter.pkg.PkgHelper
-import com.gh.ndownload.NDownloadBridge
 import com.gh.vspace.VHelper
 import com.halo.assistant.HaloApp
 import com.lightgame.download.DataWatcher
@@ -76,16 +75,14 @@ object DownloadObserver {
                     DownloadDataHelper.uploadDownloadEvent(downloadEntity)
                 }
 
-                val status = downloadEntity.status
-
-                if (DownloadStatus.hijack == status) {
+                if (DownloadStatus.hijack == downloadEntity.status) {
                     // 链接被劫持
-                    if (downloadEntity.isDownloadByReserveOnlineReminder) {
+                    if(downloadEntity.isDownloadByReserveOnlineReminder){
                         return
                     }
                     processHijack(downloadEntity)
                     return
-                } else if (DownloadStatus.notfound == status) {
+                } else if (DownloadStatus.notfound == downloadEntity.status) {
                     // 404 Not Found
                     // 删除任务
                     downloadEntity.status = DownloadStatus.cancel
@@ -99,7 +96,7 @@ object DownloadObserver {
                         gameName = downloadEntity.name,
                         gameType = downloadEntity.categoryChinese
                     )
-                    if (downloadEntity.isDownloadByReserveOnlineReminder) {
+                    if(downloadEntity.isDownloadByReserveOnlineReminder){
                         return
                     }
                     DialogHelper.showDialog(
@@ -141,9 +138,10 @@ object DownloadObserver {
                         extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
                     )
                     return
-                } else if (DownloadStatus.neterror == status
-                    || DownloadStatus.diskioerror == status
-                    || DownloadStatus.timeout == status
+                } else if (DownloadStatus.neterror == downloadEntity.status
+                    || DownloadStatus.timeout == downloadEntity.status
+                    || DownloadStatus.diskioerror == downloadEntity.status
+                    || DownloadStatus.diskisfull == downloadEntity.status
                 ) {
                     if (mRetryableHashMap[downloadEntity.url] == true
                         && NetworkUtils.isWifiConnected(HaloApp.getInstance().application)
@@ -152,7 +150,9 @@ object DownloadObserver {
                         mRetryableHashMap[downloadEntity.url] = false
                         Utils.log(TAG, "下载重试->" + downloadEntity.toJson())
                     } else {
-                        if (DownloadStatus.diskioerror == status) {
+                        if (DownloadStatus.diskisfull == downloadEntity.status) {
+                            ToastUtils.toast("磁盘已满，请清理空间后重试下载")
+                        } else if (DownloadStatus.diskioerror == downloadEntity.status) {
                             ToastUtils.toast("磁盘 IO 异常，请稍后重试")
                         } else {
                             ToastUtils.toast("网络不稳定，下载任务已暂停")
@@ -161,23 +161,19 @@ object DownloadObserver {
                         DataLogUtils.uploadNeterrorLog(mApplication, downloadEntity)
                         Utils.log(TAG, "下载自动暂停->" + downloadEntity.toJson())
                     }
-                } else if (DownloadStatus.diskisfull == status) {
-                    ToastUtils.toast("磁盘已满，请清理空间后重试下载")
-
-                    downloadManager.pause(downloadEntity.url)
-                } else if (DownloadStatus.redirected == status) {
+                } else if (DownloadStatus.redirected == downloadEntity.status) {
                     Utils.log(TAG, "重定向完毕")
                     DownloadDataHelper.uploadRedirectEvent(downloadEntity)
-                } else if (DownloadStatus.unqualified == status) {
+                } else if (DownloadStatus.unqualified == downloadEntity.status) {
                     // 未成年
-                    if (!downloadEntity.isDownloadByReserveOnlineReminder) {
+                    if(!downloadEntity.isDownloadByReserveOnlineReminder){
                         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()
 
@@ -196,7 +192,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()
 
@@ -224,23 +220,23 @@ object DownloadObserver {
                     // 删除任务
                     downloadEntity.status = DownloadStatus.cancel
                     downloadManager.cancel(downloadEntity.url)
-                } else if (DownloadStatus.uncertificated == status) {
+                } else if (DownloadStatus.uncertificated == downloadEntity.status) {
                     // 未实名
-                    if (!downloadEntity.isDownloadByReserveOnlineReminder) {
+                    if(!downloadEntity.isDownloadByReserveOnlineReminder){
                         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())
                         // 清理临时变量
@@ -264,7 +260,7 @@ object DownloadObserver {
                 DownloadNotificationHelper.addOrUpdateDownloadNotification(downloadEntity)
 
                 // 如果已下载大小发生变化,表示成功恢复下载,则重置重试标记
-                if (status == DownloadStatus.downloading) {
+                if (downloadEntity.status == DownloadStatus.downloading) {
                     mRetryableHashMap[downloadEntity.url] = true
                 }
             }
@@ -372,7 +368,7 @@ object DownloadObserver {
                     val isAutoInstall = SPUtils.getBoolean(Constants.SP_AUTO_INSTALL, true)
                     if (downloadType != Constants.VSPACE_32_DOWNLOAD_ONLY && (downloadType == Constants.SIMULATOR_DOWNLOAD || isAutoInstall)) {
                         if (FileUtils.isEmptyFile(downloadEntity.path)) {
-                            Utils.toast(mApplication, com.gh.gamecenter.common.R.string.install_failure_hint)
+                            Utils.toast(mApplication, R.string.install_failure_hint)
                             downloadManager.cancel(downloadEntity.url)
                         } else {
                             if (PackageUtils.isCanLaunchSetup(mApplication, downloadEntity.path)
@@ -494,7 +490,7 @@ object DownloadObserver {
             java.lang.Boolean.parseBoolean(downloadEntity.getMetaExtra(Constants.IS_PLATFORM_RECOMMEND))
         val exposureEvent = ExposureUtils.logADownloadCompleteExposureEvent(
             GameEntity(
-                _id = downloadEntity.gameId,
+                id = downloadEntity.gameId,
                 mName = downloadEntity.name.removeSuffix(Constants.GAME_NAME_DECORATOR),
                 gameVersion = downloadEntity.versionName ?: "",
                 isPlatformRecommend = isPlatformRecommend,
@@ -506,7 +502,6 @@ object DownloadObserver {
             downloadSpeed,
             downloadEntity.meta[DownloadEntity.DOWNLOAD_HOST_KEY] ?: "unknown",
             downloadEntity.meta[DownloadEntity.DOWNLOAD_PATH_KEY] ?: "unknown",
-            downloadEntity.meta[NDownloadBridge.REDIRECTED_URL_LIST] ?: "unknown",
             type
         )
 

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/ErrorHelper.kt

@@ -188,7 +188,7 @@ object ErrorHelper {
             403015 -> Utils.toast(context, "已经关注过了")
             404001 -> Utils.toast(context, "请求的资源不存在")
             403016 -> Utils.toast(context, "标签内容可能包含敏感信息，请修改后再提交")
-            403018 -> Utils.toast(context, com.gh.gamecenter.common.R.string.comment_failed_unable)
+            403018 -> Utils.toast(context, R.string.comment_failed_unable)
             403070 -> Utils.toast(context, "请勿重复提交~")
             403073 -> Utils.toast(context, "标题违规，请重新编辑")
             403074 -> handleErrorWithRepeatWechatBinding(context, errorEntity)
@@ -296,7 +296,7 @@ object ErrorHelper {
                         )
                     }
                 binding.hintTv.text = errorEntity.data?.text
-                binding.hintTv.setTextColor(com.gh.gamecenter.common.R.color.text_theme.toColor(context))
+                binding.hintTv.setTextColor(R.color.text_theme.toColor(context))
                 binding.hintTv.setOnClickListener {
                     errorEntity.data?.toLinkEntity()?.let { entity ->
                         DirectUtils.directToLinkPage(context, entity, "实名提醒弹窗", "")
@@ -365,7 +365,7 @@ object ErrorHelper {
                         )
                     }
                 binding.hintTv.text = errorEntity.data?.text
-                binding.hintTv.setTextColor(com.gh.gamecenter.common.R.color.text_theme.toColor(context))
+                binding.hintTv.setTextColor(R.color.text_theme.toColor(context))
                 binding.hintTv.setOnClickListener {
                     errorEntity.data?.toLinkEntity()?.let { entity ->
                         DirectUtils.directToLinkPage(context, entity, "手机号验证", "")

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

@@ -207,8 +207,8 @@ object GameActivityDownloadHelper {
             pluginLocation = PluginLocation.only_game
         )
         if (downloadEntity != null
-            && str != context.getString(com.gh.gamecenter.feature.R.string.install)
-            && str != context.getString(com.gh.gamecenter.feature.R.string.launch)
+            && str != context.getString(R.string.install)
+            && str != context.getString(R.string.launch)
         ) {
             ToastUtils.toast("${gameEntity.name}已加入下载队列")
             if (BrowserInstallHelper.shouldAutoSwitchAssistantInstall(gameEntity)) {
@@ -219,23 +219,22 @@ object GameActivityDownloadHelper {
             }
         } else {
             when {
-                str == context.getString(com.gh.gamecenter.feature.R.string.download) || str == context.getString(
-                    com.gh.gamecenter.feature.R.string.attempt) -> {
+                str == context.getString(R.string.download) || str == context.getString(R.string.attempt) -> {
                     handleDownloadStatus(context, gameEntity, apk, entrance, location, traceEvent)
                 }
-                str == context.getString(com.gh.gamecenter.feature.R.string.smooth) -> {
+                str == context.getString(R.string.smooth) -> {
                     handleSmoothStatus(context, gameEntity, apk, entrance, location, traceEvent)
                 }
                 str.contains("化") -> {
                     handlePluginStatus(context, gameEntity, apk, entrance, location, traceEvent)
                 }
-                str == context.getString(com.gh.gamecenter.feature.R.string.install) -> {
+                str == context.getString(R.string.install) -> {
                     handleInstallStatus(context, gameEntity, apk, downloadEntity)
                 }
-                str == context.getString(com.gh.gamecenter.feature.R.string.launch) -> {
+                str == context.getString(R.string.launch) -> {
                     handleLaunchStatus(context, gameEntity, apk, entrance, location, traceEvent)
                 }
-                str == context.getString(com.gh.gamecenter.feature.R.string.update) -> {
+                str == context.getString(R.string.update) -> {
                     handleUpdateStatus(context, gameEntity, apk, entrance, location, traceEvent)
                 }
                 else -> {
@@ -526,7 +525,7 @@ object GameActivityDownloadHelper {
         val path = downloadEntity.path
         when {
             FileUtils.isEmptyFile(path) -> {
-                Utils.toast(context, com.gh.gamecenter.common.R.string.install_failure_hint)
+                Utils.toast(context, R.string.install_failure_hint)
                 DownloadManager.getInstance().cancel(downloadEntity.url)
                 gameEntity.getEntryMap().remove(apkEntity.getPlatform())
             }

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

@@ -8,6 +8,7 @@ import com.gh.common.simulator.SimulatorGameManager.findDownloadEntityByUrl
 import com.gh.common.simulator.SimulatorGameManager.isNewSimulatorInstalled
 import com.gh.common.simulator.SimulatorGameManager.isSimulatorGame
 import com.gh.download.DownloadManager
+import com.gh.gamecenter.R
 import com.gh.gamecenter.common.utils.isLocalDownloadInDualDownloadMode
 import com.gh.gamecenter.common.utils.isVGameDownloadInDualDownloadMode
 import com.gh.gamecenter.core.AppExecutor.lightWeightIoExecutor
@@ -65,7 +66,7 @@ object GameUtils {
             )
             uiExecutor.execute {
                 downloadBtn.text = status
-                if (context.getString(com.gh.gamecenter.feature.R.string.pluggable) == status) {
+                if (context.getString(R.string.pluggable) == status) {
                     downloadBtn.buttonStyle = DownloadButton.ButtonStyle.PLUGIN
                     var pluginDesc = gameEntity.pluginDesc
                     if (pluginDesc.length > 3) pluginDesc = pluginDesc.substring(0, 3)
@@ -186,7 +187,7 @@ object GameUtils {
         }
 
         if ((isRelatedEmulatorInstalled || isInstalledNewSimulator) && doneCount != 0) {
-            return context.getString(com.gh.gamecenter.feature.R.string.launch)
+            return context.getString(R.string.launch)
         }
 
         if (performAsVGame) {
@@ -208,18 +209,18 @@ object GameUtils {
         }
 
         return if (doneCount != 0) {
-            context.getString(com.gh.gamecenter.feature.R.string.install)
+            context.getString(R.string.install)
         } else if (pluginCount != 0 && !isSimulatorGame(gameEntity)) {
-            context.getString(com.gh.gamecenter.feature.R.string.pluggable)
+            context.getString(R.string.pluggable)
         } else if (updateCount != 0 && !isSimulatorGame(gameEntity)) {
-            context.getString(com.gh.gamecenter.feature.R.string.update)
+            context.getString(R.string.update)
         } else if (installCount != 0) {
-            context.getString(com.gh.gamecenter.feature.R.string.launch)
+            context.getString(R.string.launch)
         } else if ("demo" == gameEntity.downloadStatus) {
-            context.getString(com.gh.gamecenter.feature.R.string.attempt)
+            context.getString(R.string.attempt)
         } else {
             if (performAsVGame) {
-                context.getString(com.gh.gamecenter.feature.R.string.smooth)
+                context.getString(R.string.smooth)
             } else {
 //                if (Constants.V_GAME == gameEntity.downloadStatus || Constants.V_GAME_32 == gameEntity.downloadStatus) {
 //                    val gameCategory = gameEntity.getGameCategory()
@@ -230,7 +231,7 @@ object GameUtils {
 //                        context.getString(R.string.attempt)
 //                    }
 //                } else {
-                context.getString(com.gh.gamecenter.feature.R.string.download)
+                context.getString(R.string.download)
 //                }
             }
         }
@@ -307,7 +308,7 @@ object GameUtils {
     }
 
     /**
-     * 是否默认以畅玩游戏的形式来处理
+     * 是否以畅玩游戏的形式来处理
      */
     @JvmStatic
     fun shouldPerformAsVGame(gameEntity: GameEntity): Boolean {

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

@@ -26,12 +26,16 @@ object HomeBottomBarHelper {
         } catch (ignore: Exception) {
 
         }
+        val animationCode = HaloApp.getInstance().application.assets
+            .open("lottie/tab_game.json")
+            .bufferedReader().use { it.readText() }
         return SubjectRecommendEntity(
             link = "5de21b5d75e6fa054f784882",
             type = "block",
             text = "游戏库",
             name = "游戏库",
             position = 2,
+            animationCode = animationCode,
             default = false,
             display = Display()
         )

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

@@ -1,6 +1,9 @@
 package com.gh.common.util;
 
+
 import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.Handler;
 import android.os.Message;
@@ -16,8 +19,10 @@ import org.greenrobot.eventbus.EventBus;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
+
 /**
  * 下载完成跳安装，
  */
@@ -44,15 +49,15 @@ 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);
                     if (installMap != null && installMap.size() != 0) {
                         ArrayList<String> keys = new ArrayList<>();
                         for (String packageName : installMap.keySet()) {
-                            if (TextUtils.isEmpty(packageName)) continue;
-
                             long time = installMap.get(packageName);
                             if (System.currentTimeMillis() - time >= MAX_TIME) {
                                 keys.add(packageName);
-                            } else if (PackageUtils.isInstalled(context, packageName)) {
+                            } else if (list.contains(packageName)) {
                                 keys.add(packageName);
 
                                 DownloadEntity downloadEntity = DownloadManager.getInstance().getDownloadEntityByPackageName(packageName);
@@ -60,7 +65,7 @@ public class InstallUtils {
                                 if (!TextUtils.isEmpty(installVersion) && downloadEntity != null &&
                                         installVersion.equals(downloadEntity.getVersionName())) {
                                     if (!downloadEntity.isPluggable() || PackageUtils.isSignedByGh(context, packageName)) {
-                                        EventBus.getDefault().post(new EBPackage(EBPackage.TYPE_INSTALLED, packageName, installVersion, false));
+                                        EventBus.getDefault().post(new EBPackage(EBPackage.TYPE_INSTALLED, packageName, installVersion));
                                     }
                                 }
                             }
@@ -75,9 +80,9 @@ public class InstallUtils {
                             long time = uninstallMap.get(packageName);
                             if (System.currentTimeMillis() - time >= MAX_TIME) {
                                 keys.add(packageName);
-                            } else if (!PackageUtils.isInstalled(context, packageName)) {
+                            } else if (!list.contains(packageName)) {
                                 keys.add(packageName);
-                                EventBus.getDefault().post(new EBPackage("卸载", packageName, "", false));
+                                EventBus.getDefault().post(new EBPackage("卸载", packageName, ""));
                             }
                         }
                         for (String key : keys) {
@@ -100,8 +105,6 @@ public class InstallUtils {
     }
 
     public void addInstall(String packageName) {
-        if (TextUtils.isEmpty(packageName)) return;
-
         if (installMap == null) {
             installMap = Collections.synchronizedMap(new HashMap<String, Long>());
         }

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

@@ -2,6 +2,7 @@ package com.gh.common.util;
 
 import android.app.Dialog;
 import android.content.Context;
+import android.content.pm.PackageInfo;
 import android.graphics.Color;
 import android.text.Html;
 import android.text.Spanned;
@@ -181,28 +182,28 @@ public class LibaoUtils {
                 break;
             case "coming":
                 libaoBtn.setText(R.string.libao_coming);
-                libaoBtn.setBackgroundResource(com.gh.gamecenter.feature.R.drawable.button_round_gray_light);
-                libaoBtn.setTextColor(context.getResources().getColor(com.gh.gamecenter.common.R.color.text_tertiary));
+                libaoBtn.setBackgroundResource(R.drawable.button_round_gray_light);
+                libaoBtn.setTextColor(context.getResources().getColor(R.color.text_tertiary));
                 break;
             case "used_up":
                 libaoBtn.setText(R.string.libao_used_up);
-                libaoBtn.setBackgroundResource(com.gh.gamecenter.feature.R.drawable.button_normal_round_border);
-                libaoBtn.setTextColor(context.getResources().getColor(com.gh.gamecenter.common.R.color.text_theme));
+                libaoBtn.setBackgroundResource(R.drawable.button_normal_round_border);
+                libaoBtn.setTextColor(context.getResources().getColor(R.color.text_theme));
                 break;
             case "finish":
-                libaoBtn.setText(com.gh.gamecenter.feature.R.string.libao_finish);
+                libaoBtn.setText(R.string.libao_finish);
                 libaoBtn.setBackgroundResource(R.drawable.button_border_round_gray);
-                libaoBtn.setTextColor(context.getResources().getColor(com.gh.gamecenter.common.R.color.button_gray));
+                libaoBtn.setTextColor(context.getResources().getColor(R.color.button_gray));
                 break;
             case "linged":
-                libaoBtn.setText(com.gh.gamecenter.feature.R.string.libao_linged);
-                libaoBtn.setBackgroundResource(com.gh.gamecenter.feature.R.drawable.button_round_gray_light);
-                libaoBtn.setTextColor(context.getResources().getColor(com.gh.gamecenter.common.R.color.text_tertiary));
+                libaoBtn.setText(R.string.libao_linged);
+                libaoBtn.setBackgroundResource(R.drawable.button_round_gray_light);
+                libaoBtn.setTextColor(context.getResources().getColor(R.color.text_tertiary));
                 break;
             case "taoed":
-                libaoBtn.setText(com.gh.gamecenter.feature.R.string.libao_taoed);
-                libaoBtn.setBackgroundResource(com.gh.gamecenter.feature.R.drawable.button_normal_round_border);
-                libaoBtn.setTextColor(context.getResources().getColor(com.gh.gamecenter.common.R.color.text_theme));
+                libaoBtn.setText(R.string.libao_taoed);
+                libaoBtn.setBackgroundResource(R.drawable.button_normal_round_border);
+                libaoBtn.setTextColor(context.getResources().getColor(R.color.text_theme));
                 break;
             case "copy":
                 libaoBtn.setText(R.string.libao_copy);
@@ -211,19 +212,19 @@ public class LibaoUtils {
             case "repeatLing":
             case "repeatLinged":
                 libaoBtn.setText(R.string.libao_repeat_ling);
-                libaoBtn.setBackgroundResource(com.gh.gamecenter.feature.R.drawable.button_normal_round_border);
-                libaoBtn.setTextColor(context.getResources().getColor(com.gh.gamecenter.common.R.color.text_theme));
+                libaoBtn.setBackgroundResource(R.drawable.button_normal_round_border);
+                libaoBtn.setTextColor(context.getResources().getColor(R.color.text_theme));
                 break;
             case "repeatTao":
             case "repeatTaoed":
                 libaoBtn.setText(R.string.libao_repeat_tao);
-                libaoBtn.setBackgroundResource(com.gh.gamecenter.feature.R.drawable.button_normal_round_border);
-                libaoBtn.setTextColor(context.getResources().getColor(com.gh.gamecenter.common.R.color.text_theme));
+                libaoBtn.setBackgroundResource(R.drawable.button_normal_round_border);
+                libaoBtn.setTextColor(context.getResources().getColor(R.color.text_theme));
                 break;
             case "unshelve":
                 libaoBtn.setBackgroundResource(R.drawable.button_border_round_gray);
                 libaoBtn.setText(R.string.libao_unshelve);
-                libaoBtn.setTextColor(context.getResources().getColor(com.gh.gamecenter.common.R.color.button_gray));
+                libaoBtn.setTextColor(context.getResources().getColor(R.color.button_gray));
                 break;
             case "check":
                 libaoBtn.setText(R.string.libao_check);
@@ -232,7 +233,7 @@ public class LibaoUtils {
             default:
                 libaoBtn.setBackgroundResource(R.drawable.button_border_round_gray);
                 libaoBtn.setText("异常");
-                libaoBtn.setTextColor(context.getResources().getColor(com.gh.gamecenter.common.R.color.button_gray));
+                libaoBtn.setTextColor(context.getResources().getColor(R.color.button_gray));
                 break;
         }
     }
@@ -320,13 +321,13 @@ public class LibaoUtils {
         // 类型为复制的，不需要登录也可以直接复制
         if ("copy".equals(libaoEntity.getReceiveMethod())) {
             if ("finish".equals(libaoEntity.getStatus())) {
-                libaoBtn.setText(com.gh.gamecenter.feature.R.string.libao_finish);
+                libaoBtn.setText(R.string.libao_finish);
                 libaoBtn.setBackgroundResource(R.drawable.button_border_round_gray);
-                libaoBtn.setTextColor(context.getResources().getColor(com.gh.gamecenter.common.R.color.button_gray));
+                libaoBtn.setTextColor(context.getResources().getColor(R.color.button_gray));
                 libaoBtn.setOnClickListener(v -> ToastUtils.toast("兑换码领取已结束"));
             } else {
                 libaoBtn.setText(R.string.libao_copy);
-                libaoBtn.setTextColor(ExtensionsKt.toColor(com.gh.gamecenter.common.R.color.white, context));
+                libaoBtn.setTextColor(ExtensionsKt.toColor(R.color.white, context));
                 libaoBtn.setBackgroundResource(R.drawable.button_normal_round_style);
                 libaoBtn.setOnClickListener(v -> {
                     LogUtils.uploadReceiveGift(
@@ -681,7 +682,7 @@ public class LibaoUtils {
                                     }
 
                                     if (libaoBtn != null) {
-                                        libaoBtn.setText(com.gh.gamecenter.feature.R.string.libao_linged);
+                                        libaoBtn.setText(R.string.libao_linged);
                                         libaoBtn.setBackgroundResource(R.drawable.libao_linged_style);
                                         libaoBtn.setTextColor(ContextCompat.getColorStateList(context, R.color.libao_linged_selector));
                                     }

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

@@ -79,6 +79,32 @@ public class MessageShareUtils {
 
 
     private String[] mArrLabel = {"微信好友", "朋友圈", "QQ好友", "QQ空间", "保存"};
+    private int[] arrLogo = {
+            R.drawable.share_wechat_logo,
+            R.drawable.share_wechatmoments_logo,
+            R.drawable.share_qq_logo,
+            R.drawable.share_qzone_logo,
+            R.drawable.share_save
+    };
+
+    public enum ShareWay {
+        qq("qq"),
+        qqZone("qq空间"),
+        weibo("微博"),
+        wechat("微信"),
+        wechatMoments("朋友圈");
+
+        private String name;
+
+        ShareWay(String name) {
+            this.name = name;
+        }
+
+        public String getName() {
+            return name;
+        }
+    }
+
     //QQ或者QQ空间分享回调处理
     public IUiListener QqShareListener = new IUiListener() {
         @Override
@@ -113,7 +139,7 @@ public class MessageShareUtils {
 
         @Override
         public void onCancel() {
-            Utils.toast(mContext, com.gh.gamecenter.common.R.string.share_cancel_hint);
+            Utils.toast(mContext, R.string.share_cancel_hint);
             if (isFromInviteFriends) {
                 IntegralLogHelper.INSTANCE.logInviteResult("取消", shareWay.getName());
             }
@@ -125,31 +151,6 @@ public class MessageShareUtils {
         }
     };
 
-    public enum ShareWay {
-        qq("qq"),
-        qqZone("qq空间"),
-        weibo("微博"),
-        wechat("微信"),
-        wechatMoments("朋友圈");
-
-        private String name;
-
-        ShareWay(String name) {
-            this.name = name;
-        }
-
-        public String getName() {
-            return name;
-        }
-    }
-    private int[] arrLogo = {
-            com.gh.gamecenter.common.R.drawable.share_wechat_logo,
-            com.gh.gamecenter.common.R.drawable.share_wechatmoments_logo,
-            com.gh.gamecenter.common.R.drawable.share_qq_logo,
-            com.gh.gamecenter.common.R.drawable.share_qzone_logo,
-            com.gh.gamecenter.common.R.drawable.share_save
-    };
-
     // 适配快传成绩单分享
     private int contentSize;
     private int paddTop;
@@ -333,7 +334,7 @@ public class MessageShareUtils {
             Utils.toast(mContext, "分享跳转中...");
 
             if (!mIWXAPI.isWXAppInstalled() && !PermissionHelper.isGetInstalledListPermissionDisabled(mContext)) {
-                Utils.toast(mContext, mContext.getString(com.gh.gamecenter.common.R.string.share_no_wechat_hint));
+                Utils.toast(mContext, mContext.getString(R.string.share_no_wechat_hint));
                 return;
             }
 
@@ -398,7 +399,7 @@ public class MessageShareUtils {
         Utils.toast(mContext, "分享跳转中...");
 
         if (!mIWXAPI.isWXAppInstalled() && !PermissionHelper.isGetInstalledListPermissionDisabled(mContext)) {
-            Utils.toast(mContext, mContext.getString(com.gh.gamecenter.common.R.string.share_no_wechat_hint));
+            Utils.toast(mContext, mContext.getString(R.string.share_no_wechat_hint));
             return;
         }
 
@@ -434,7 +435,7 @@ public class MessageShareUtils {
         Utils.toast(mContext, "分享跳转中...");
 
         if (!mIWXAPI.isWXAppInstalled() && !PermissionHelper.isGetInstalledListPermissionDisabled(mContext)) {
-            Utils.toast(mContext, mContext.getString(com.gh.gamecenter.common.R.string.share_no_wechat_hint));
+            Utils.toast(mContext, mContext.getString(R.string.share_no_wechat_hint));
             return;
         }
 
@@ -580,7 +581,7 @@ public class MessageShareUtils {
             linearLayout.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, DisplayUtils.dip2px(mContext, itemSize)));
             linearLayout.setOrientation(LinearLayout.VERTICAL);
             linearLayout.setGravity(Gravity.CENTER_HORIZONTAL);
-            linearLayout.setBackgroundResource(com.gh.gamecenter.common.R.drawable.cardview_item_style);
+            linearLayout.setBackgroundResource(R.drawable.cardview_item_style);
 
             ImageView shareLogo = new ImageView(mContext);
             LinearLayout.LayoutParams logoParams = new LinearLayout.LayoutParams(DisplayUtils.dip2px(mContext, picSize), DisplayUtils.dip2px(mContext, picSize));
@@ -592,7 +593,7 @@ public class MessageShareUtils {
             layoutParams.setMargins(0, DisplayUtils.dip2px(mContext, 10), 0, 0);
             shareLabel.setLayoutParams(layoutParams);
             shareLabel.setGravity(Gravity.CENTER);
-            shareLabel.setTextColor(ContextCompat.getColor(mContext, com.gh.gamecenter.common.R.color.text_3a3a3a));
+            shareLabel.setTextColor(ContextCompat.getColor(mContext, R.color.text_3a3a3a));
             shareLabel.setTextSize(marImg);
 
             linearLayout.addView(shareLogo);

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
@@ -661,14 +654,12 @@ object NewFlatLogUtils {
     @JvmStatic
     fun logSearchBbs(
         searchType: String,
-        searchKey: String,
-        location: String
+        searchKey: String
     ) {
         json {
             KEY_EVENT to "search_bbs"
             "search_type" to searchType
             "key" to searchKey
-            KEY_LOCATION to location
             parseAndPutMeta()()
         }.let(::log)
     }
@@ -680,8 +671,7 @@ object NewFlatLogUtils {
         bbsId: String,
         sequence: Int,
         name: String,
-        button: String,
-        location: String
+        button: String
     ) {
         json {
             KEY_EVENT to "search_bbs_click"
@@ -691,7 +681,6 @@ object NewFlatLogUtils {
             "sequence" to sequence
             "name" to name
             "button" to button
-            KEY_LOCATION to location
             parseAndPutMeta()()
         }.let(::log)
     }
@@ -699,14 +688,12 @@ object NewFlatLogUtils {
     @JvmStatic
     fun logSearchUser(
         searchType: String,
-        searchKey: String,
-        location: String
+        searchKey: String
     ) {
         json {
             KEY_EVENT to "search_user"
             "search_type" to searchType
             "key" to searchKey
-            KEY_LOCATION to location
             parseAndPutMeta()()
         }.let(::log)
     }
@@ -717,8 +704,7 @@ object NewFlatLogUtils {
         searchKey: String,
         userId: String,
         name: String,
-        sequence: Int,
-        location: String
+        sequence: Int
     ) {
         json {
             KEY_EVENT to "search_user_click"
@@ -727,7 +713,6 @@ object NewFlatLogUtils {
             "user_id" to userId
             "name" to name
             "sequence" to sequence
-            KEY_LOCATION to location
             parseAndPutMeta()()
         }.let(::log)
     }
@@ -1352,13 +1337,7 @@ object NewFlatLogUtils {
     }
 
     // 上传存档弹窗点击事件
-    fun logCloudArchiveUploadDialogClick(
-        gameId: String,
-        gameName: String,
-        cloudSaveId: String,
-        cloudSaveName: String,
-        isSuccess: Boolean
-    ) {
+    fun logCloudArchiveUploadDialogClick(gameId: String, gameName: String, cloudSaveId: String, cloudSaveName: String, isSuccess: Boolean) {
         val json = json {
             KEY_EVENT to "cloud_save_upload_dialog_click"
             KEY_GAME_ID to gameId
@@ -2709,73 +2688,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

@@ -90,7 +90,7 @@ object PackageChangeHelper : DefaultLifecycleObserver {
                     pendingPackageTriple = null
                     pendingGhId = null
 
-                    PackageRepository.addInstalledGame(PackageRepository.packageFilterManager, packageName)
+                    PackageRepository.addInstalledGame(packageName)
 
                     // 添加到额外的包名白名单，下次启动同时查询此包的安装情况
                     PackageHelper.updateAdditionalWhiteListPackageName(packageName = packageName, isAdd = true)

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

@@ -81,33 +81,33 @@ object PackageHelper {
 
     // 评论黑名单包名列表，避免用户安装了 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 = setOf<String>()
+    var localPackageNameSet = hashSetOf<String>()
         get() {
-           return HashSet(cachedInstalledPackageNameList)
+            return if (field.isEmpty()) {
+                field = getAllPackageName(HaloApp.getInstance().application)
+                field
+            } else {
+                field
+            }
         }
 
     /**
@@ -456,10 +456,9 @@ object PackageHelper {
      * 进行包名初始化相关的操作
      */
     fun initPackageRelatedData() {
-        PackageRepository.initData {
-            refreshLocalPackageList()
-            refreshPackageNameList()
-        }
+        PackageRepository.initData()
+        refreshLocalPackageList()
+        refreshPackageNameList()
     }
 
     /**
@@ -542,7 +541,6 @@ object PackageHelper {
         Utils.log(TAG, "addInstalledButMissingPackages 需要请求接口获取的包数量为 ${installedPackageNameSet.size}")
 
         PackageRepository.addInstalledGames(
-            packageFilterManager = PackageRepository.packageFilterManager,
             pkgNameList = ArrayList(installedPackageNameSet),
             updateInstallStatus = true
         )
@@ -814,7 +812,7 @@ object PackageHelper {
             uploadUIDGapLog = false
 
             val uidGap = (android.os.Process.LAST_APPLICATION_UID - lastValidUid) / 100 * 100
-//            SentryHelper.onEvent("UID_GAP", "gap", uidGap.toString())
+            SentryHelper.onEvent("UID_GAP", "gap", uidGap.toString())
         }
 
         return packageList

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

@@ -4,7 +4,6 @@ import android.app.Activity
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
-import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Build
 import androidx.appcompat.app.AppCompatActivity
@@ -16,6 +15,7 @@ import com.gh.download.server.BrowserInstallHelper
 import com.gh.gamecenter.BuildConfig
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.utils.*
+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
@@ -31,15 +31,6 @@ object PackageInstaller {
 
     private val listeners = mutableListOf<OnInstallListener>()
 
-    private val packageInstallerPackageName = arrayOf(
-        "com.android.packageinstaller",
-        "com.miui.packageinstaller",
-        "com.google.android.packageinstaller",
-        "com.samsung.android.packageinstaller",
-        "com.lenovo",
-        "com.zhuoyi"
-    )
-
     /**
      * 为了兼容java代码
      */
@@ -283,27 +274,11 @@ object PackageInstaller {
             }
             installIntent.setDataAndType(uri, "application/vnd.android.package-archive")
         }
-
-        updateSystemInstallerIfAvailable(context, installIntent)
-
         InstallUtils.getInstance()
             .addInstall(PackageUtils.getPackageNameByPath(context, path))
         return installIntent
     }
 
-    /**
-     * 查找并设置系统安装器作为安装 intent 的包名
-     */
-    private fun updateSystemInstallerIfAvailable(context: Context, intent: Intent) {
-        for (rf in context.packageManager.queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY)) {
-            val targetPackageName = packageInstallerPackageName.firstOrNull { rf.activityInfo.packageName.contains(it) }
-            if (!targetPackageName.isNullOrEmpty()) {
-                intent.setPackage(targetPackageName)
-                break
-            }
-        }
-    }
-
     /**
      * 卸载应用
      */

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;
@@ -223,8 +222,8 @@ public class PackageUtils {
             if (metaDate != null) {
                 return metaDate.get(name);
             }
-        } catch (Exception e) {
-            e.printStackTrace();
+        } catch (NameNotFoundException e) {
+//            e.printStackTrace();
         }
         return null;
     }
@@ -486,6 +485,7 @@ public class PackageUtils {
             }
         } catch (Exception e) {
             e.printStackTrace();
+            SentryHelper.INSTANCE.onEvent("GET_PACKAGE_INFO_ERROR", "path", path);
         }
 
         return null;
@@ -565,7 +565,8 @@ public class PackageUtils {
             }
             return true;
         } catch (Exception e) {
-            boolean isInstalled = PackageHelper.INSTANCE.getLocalPackageNameSet().contains(packageName);
+            ArrayList<String> allPackageName = getAllPackageName(context);
+            boolean isInstalled = allPackageName.contains(packageName);
 
             if (isInstalled) {
                 // 能进这里说明上面的 try {} 结果有问题，记录一下
@@ -626,8 +627,8 @@ public class PackageUtils {
         try {
             return HaloApp.getInstance().getApplication().getPackageManager().getPackageInfo(packageName,
                     PackageManager.COMPONENT_ENABLED_STATE_DEFAULT).versionName;
-        } catch (Exception e) {
-            e.printStackTrace();
+        } catch (NameNotFoundException e) {
+            // do nothing
         }
         return null;
     }
@@ -639,8 +640,8 @@ public class PackageUtils {
         try {
             return HaloApp.getInstance().getApplication().getPackageManager().getPackageInfo(packageName,
                     PackageManager.COMPONENT_ENABLED_STATE_DEFAULT).versionCode;
-        } catch (Exception e) {
-            e.printStackTrace();
+        } catch (NameNotFoundException e) {
+            // do nothing
         }
         return 0;
     }
@@ -653,12 +654,31 @@ public class PackageUtils {
         try {
             PackageManager packageManager = context.getApplicationContext().getPackageManager();
             return packageManager.getApplicationIcon(packageName);
-        } catch (Exception e) {
-            e.printStackTrace();
+        } 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);
+            }
+        }
+        return list;
+    }
+
+    public static ArrayList<String> getAllPackageNameIncludeGh(Context context) {
+        List<String> packageNameList = PackageHelper.INSTANCE.getInstalledPackageNameList(context, 0);
+        return new ArrayList<>(packageNameList);
+    }
+
     public static JSONArray getAppList(Context context) {
         JSONArray jsonArray = new JSONArray();
         try {
@@ -686,7 +706,7 @@ public class PackageUtils {
                 jsonObject.put("version", packageInfo.versionName);
             }
             return jsonObject;
-        } catch (Exception e) {
+        } catch (JSONException | NameNotFoundException e) {
             e.printStackTrace();
             return jsonObject;
         }

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

@@ -130,7 +130,7 @@ object PureModeHelper {
                 binding.hintTv.buildSpannableString {
                     addText(guide.linkTextPrefix)
                     addText(guide.linkText) {
-                        setColor(ColorResId(com.gh.gamecenter.common.R.color.text_theme))
+                        setColor(ColorResId(R.color.text_theme))
                         onClick(false) {
                             binding.extraHintIv.performClick()
                         }

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

@@ -46,7 +46,7 @@ object RecommendPopupHelper {
             //判断是否符合包名限制
             val nameRule = entity.recommendPackage.nameRule
             val packages = entity.recommendPackage.details
-            val installedPackages = PackageHelper.getInstalledPackageNameList(HaloApp.getInstance(), 0)
+            val installedPackages = PackageUtils.getAllPackageNameIncludeGh(HaloApp.getInstance())
             var isMatchSuccess = true
             val checkInstalled: (splitPackages: List<String>) -> Boolean = {
                 var isInstalled = false

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

@@ -5,7 +5,6 @@ import android.content.Context
 import com.alibaba.android.arouter.launcher.ARouter
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.common.repository.ReservationRepository
-import com.gh.gamecenter.WebActivity
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.base.GlobalActivityManager.getCurrentPageEntity
 import com.gh.gamecenter.common.base.GlobalActivityManager.getLastPageEntity
@@ -19,6 +18,7 @@ import com.gh.gamecenter.common.retrofit.BiResponse
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.core.provider.IPushProvider
 import com.gh.gamecenter.entity.ReserveReminderEntity
+import com.gh.gamecenter.jg.push.service.HaloJPushMessageReceiver
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.halo.assistant.HaloApp
 import com.lightgame.utils.Utils
@@ -201,7 +201,7 @@ object ReservationHelper {
                 }
                 cancelListener?.onCancel()
             }, uiModificationCallback = {
-                it.confirmTv.setTextColor(com.gh.gamecenter.common.R.color.secondary_red.toColor(context))
+                it.confirmTv.setTextColor(R.color.secondary_red.toColor(context))
             }, extraConfig = DialogHelper.Config(centerContent = true, centerTitle = true),
             dialogCancelCallback = {
                 if (game != null) {
@@ -219,11 +219,7 @@ object ReservationHelper {
 
     private fun checkWechatConfigEntityUpdated(newWechatConfig: WechatConfigEntity) {
         val wechatConfig = SPUtils.getString(Constants.SP_WECHAT_CONFIG).toObject<WechatConfigEntity>()
-        if (newWechatConfig.bind != wechatConfig?.bind
-            || newWechatConfig.follow != wechatConfig.follow
-            || newWechatConfig.notice != wechatConfig.notice
-            || newWechatConfig.nickName != wechatConfig.nickName
-        ) {
+        if (wechatConfig != newWechatConfig) {
             SPUtils.setString(Constants.SP_WECHAT_CONFIG, newWechatConfig.toJson())
         }
     }

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

@@ -27,9 +27,7 @@ import com.gh.gamecenter.retrofit.RetrofitManager
 import com.halo.assistant.HaloApp
 import com.lightgame.utils.Utils
 import okhttp3.MediaType
-import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.RequestBody
-import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.ResponseBody
 import org.json.JSONArray
 import org.json.JSONObject
@@ -126,12 +124,11 @@ object UsageStatsHelper {
                 && curEvent.className == nextEvent.className
             ) {
                 val diff = nextEvent.timeStamp - curEvent.timeStamp
-                val packageName = curEvent.packageName ?: continue
 
-                if (pakAndTime[packageName] == null) {
-                    pakAndTime[packageName] = diff
+                if (pakAndTime[curEvent.packageName] == null) {
+                    pakAndTime[curEvent.packageName] = diff
                 } else {
-                    pakAndTime[packageName] = pakAndTime[packageName]!! + diff
+                    pakAndTime[curEvent.packageName] = pakAndTime[curEvent.packageName]!! + diff
                 }
             }
         }
@@ -178,7 +175,7 @@ object UsageStatsHelper {
             return
         }
 
-        val body = postBody.toString().toRequestBody("application/json".toMediaTypeOrNull())
+        val body = RequestBody.create(MediaType.parse("application/json"), postBody.toString())
         mApi.postUsageStatus(body, UserManager.getInstance().userId)
             .subscribe(object : BiResponse<ResponseBody>() {
                 override fun onSuccess(data: ResponseBody) {

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

@@ -65,7 +65,6 @@ object ViewPagerFragmentHelper {
     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_WECHAT_GAME_CPM_COLUMN = "wechat_game_cpm_column_detail" // 微信小游戏CPM专题详情页
     const val TYPE_COLUMN_COLLECTION = "column_collection" // 专题合集详情页
     const val TYPE_SERVER = "server" // 开服表
     const val TYPE_COLUMN_TEST = "column_test_v2" // 新游开测
@@ -83,7 +82,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 -> {
@@ -92,12 +90,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)
@@ -151,11 +148,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) {
@@ -164,11 +161,10 @@ object ViewPagerFragmentHelper {
                 className = GameCollectionSquareFragment::class.java.name
             }
             // 游戏专题详情页/QQ游戏专题详情页
-            TYPE_COLUMN, TYPE_QQ_MINI_GAME_COLUMN, TYPE_WECHAT_GAME_COLUMN, TYPE_WECHAT_GAME_CPM_COLUMN -> {
+            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
-                    TYPE_WECHAT_GAME_CPM_COLUMN -> SubjectData.SubjectType.WECHAT_GAME_CPM
                     else -> SubjectData.SubjectType.NORMAL
                 }
                 className = SubjectFragment::class.java.name
@@ -176,7 +172,6 @@ object ViewPagerFragmentHelper {
                     EntranceConsts.KEY_SUBJECT_DATA,
                     SubjectData(entity.link, entity.text, false, subjectType = subjectType)
                 )
-                bundle.putString(EntranceConsts.KEY_SUBJECT_TYPE, "detail")
                 bundle.putBoolean(EntranceConsts.KEY_SHOW_DOWNLOAD_MENU, !isTabWrapper)
             }
             // 专题合集详情页
@@ -186,7 +181,6 @@ object ViewPagerFragmentHelper {
                 bundle.putInt(EntranceConsts.KEY_POSITION, 0)
                 bundle.putString(EntranceConsts.KEY_COLUMNNAME, entity.text)
                 bundle.putBoolean(EntranceConsts.KEY_IS_COLUMN_COLLECTION, true)
-                bundle.putString(EntranceConsts.KEY_SUBJECT_TYPE, "tab")
             }
             // 开服表
             TYPE_SERVER -> {

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

@@ -85,12 +85,12 @@ class CategoryFilterView @JvmOverloads constructor(
             targetTextView.setTextColor(Color.WHITE)
         } else {
             targetTextView.background = null
-            targetTextView.setTextColor(ContextCompat.getColor(targetTextView.context, com.gh.gamecenter.common.R.color.text_757575))
+            targetTextView.setTextColor(ContextCompat.getColor(targetTextView.context, R.color.text_757575))
         }
     }
 
     private fun showSelectTypePopupWindow(containerView: View, typeTv: TextView, typeText: String) {
-        typeTv.setTextColor(com.gh.gamecenter.common.R.color.text_theme.toColor(context))
+        typeTv.setTextColor(R.color.text_theme.toColor(context))
         typeTv.setDrawableEnd(R.drawable.ic_filter_arrow_up)
 
         val inflater = LayoutInflater.from(typeTv.context)
@@ -136,7 +136,7 @@ class CategoryFilterView @JvmOverloads constructor(
         }
 
         popupWindow.setOnDismissListener {
-            typeTv.setTextColor(com.gh.gamecenter.common.R.color.text_757575.toColor(context))
+            typeTv.setTextColor(R.color.text_757575.toColor(context))
             typeTv.setDrawableEnd(R.drawable.ic_filter_arrow_down)
             mTypePopupWindow = null
         }
@@ -148,7 +148,7 @@ class CategoryFilterView @JvmOverloads constructor(
     }
 
     private fun showSelectSizePopupWindow(containerView: View, sizeTv: TextView, sizeText: String) {
-        sizeTv.setTextColor(com.gh.gamecenter.common.R.color.text_theme.toColor(context))
+        sizeTv.setTextColor(R.color.text_theme.toColor(context))
         sizeTv.setDrawableEnd(R.drawable.ic_filter_arrow_up)
 
         val inflater = LayoutInflater.from(sizeTv.context)
@@ -204,7 +204,7 @@ class CategoryFilterView @JvmOverloads constructor(
         }
 
         popupWindow.setOnDismissListener {
-            sizeTv.setTextColor(com.gh.gamecenter.common.R.color.text_757575.toColor(context))
+            sizeTv.setTextColor(R.color.text_757575.toColor(context))
             sizeTv.setDrawableEnd(R.drawable.ic_filter_arrow_down)
             mSizePopupWindow = null
         }

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

@@ -87,7 +87,7 @@ class ConfigFilterView @JvmOverloads constructor(
             SortType.RATING -> updateHighlightedTextView(ratingTv)
             SortType.UPDATE -> updateHighlightedTextView(updateTv)
         }
-        mSizeTv.setTextColor(com.gh.gamecenter.common.R.color.text_757575.toColor(context))
+        mSizeTv.setTextColor(R.color.text_757575.toColor(context))
     }
 
     fun setOnConfigSetupListener(onConfigFilterSetupListener: OnConfigFilterSetupListener) {
@@ -97,10 +97,10 @@ class ConfigFilterView @JvmOverloads constructor(
     private fun toggleHighlightedTextView(targetTextView: TextView, highlightIt: Boolean) {
         if (highlightIt) {
             targetTextView.background = R.drawable.bg_tag_text.toDrawable()
-            targetTextView.setTextColor(com.gh.gamecenter.common.R.color.text_white.toColor(context))
+            targetTextView.setTextColor(R.color.text_white.toColor(context))
         } else {
             targetTextView.background = null
-            targetTextView.setTextColor(com.gh.gamecenter.common.R.color.text_757575.toColor(context))
+            targetTextView.setTextColor(R.color.text_757575.toColor(context))
         }
     }
 
@@ -112,7 +112,7 @@ class ConfigFilterView @JvmOverloads constructor(
     }
 
     private fun showSelectionPopupWindow(containerView: View, sizeTv: TextView, sizeText: String) {
-        sizeTv.setTextColor(com.gh.gamecenter.common.R.color.text_theme.toColor(sizeTv.context))
+        sizeTv.setTextColor(R.color.text_theme.toColor(sizeTv.context))
         sizeTv.setDrawableEnd(R.drawable.ic_filter_arrow_up)
 
         val inflater = LayoutInflater.from(sizeTv.context)
@@ -171,7 +171,7 @@ class ConfigFilterView @JvmOverloads constructor(
         }
 
         popupWindow.setOnDismissListener {
-            sizeTv.setTextColor(com.gh.gamecenter.common.R.color.text_757575.toColor(sizeTv.context))
+            sizeTv.setTextColor(R.color.text_757575.toColor(sizeTv.context))
             sizeTv.setDrawableEnd(R.drawable.ic_filter_arrow_down)
             mPopupWindow = null
         }

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

@@ -86,9 +86,9 @@ class FilterView @JvmOverloads constructor(context: Context, attrs: AttributeSet
         mSelectedSubFilter = filter
         mBinding?.subFilterTv?.text = filter
         if (filter != mSubFilterList.firstOrNull() && mHighlightSubFilterIfItsNotDefault) {
-            mBinding?.subFilterTv?.setTextColor(com.gh.gamecenter.common.R.color.text_theme.toColor(context))
+            mBinding?.subFilterTv?.setTextColor(R.color.text_theme.toColor(context))
         } else {
-            mBinding?.subFilterTv?.setTextColor(com.gh.gamecenter.common.R.color.text_757575.toColor(context))
+            mBinding?.subFilterTv?.setTextColor(R.color.text_757575.toColor(context))
         }
     }
 
@@ -98,7 +98,7 @@ class FilterView @JvmOverloads constructor(context: Context, attrs: AttributeSet
             targetTextView.setTextColor(Color.WHITE)
         } else {
             targetTextView.background = null
-            targetTextView.setTextColor(ContextCompat.getColor(targetTextView.context, com.gh.gamecenter.common.R.color.text_757575))
+            targetTextView.setTextColor(ContextCompat.getColor(targetTextView.context, R.color.text_757575))
         }
     }
 
@@ -108,7 +108,7 @@ class FilterView @JvmOverloads constructor(context: Context, attrs: AttributeSet
         subFilterText: String,
         selectedCallback: ((String) -> Unit)
     ) {
-        subFilterTv.setTextColor(com.gh.gamecenter.common.R.color.text_theme.toColor(context))
+        subFilterTv.setTextColor(R.color.text_theme.toColor(context))
         subFilterTv.setDrawableEnd(R.drawable.ic_filter_arrow_up)
 
         val inflater = LayoutInflater.from(subFilterTv.context)
@@ -213,10 +213,10 @@ class FilterView @JvmOverloads constructor(context: Context, attrs: AttributeSet
 
             if (mSelectedFilter == mFilterList[position]) {
                 holder.binding.titleTv.background = R.drawable.bg_tag_text.toDrawable(context)
-                holder.binding.titleTv.setTextColor(com.gh.gamecenter.common.R.color.white.toColor(context))
+                holder.binding.titleTv.setTextColor(R.color.white.toColor(context))
             } else {
-                holder.binding.titleTv.setBackgroundColor(com.gh.gamecenter.common.R.color.ui_surface.toColor(context))
-                holder.binding.titleTv.setTextColor(com.gh.gamecenter.common.R.color.text_777777.toColor(context))
+                holder.binding.titleTv.setBackgroundColor(R.color.ui_surface.toColor(context))
+                holder.binding.titleTv.setTextColor(R.color.text_777777.toColor(context))
             }
 
             holder.binding.titleTv.text = mFilterList[position]

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

@@ -91,7 +91,7 @@ class FlexLinearLayout @JvmOverloads constructor(context: Context, attrs: Attrib
                 val params = LayoutParams(mLastItemWidth, mItemHeight)
                 layoutParams = params
                 setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_game_detail_label_more))
-                if (DarkModeUtils.isDarkModeOn(context)) setColorFilter(com.gh.gamecenter.common.R.color.text_primary.toColor(context))
+                if (DarkModeUtils.isDarkModeOn(context)) setColorFilter(R.color.text_primary.toColor(context))
                 background = createNormalBackgroundDrawable()
                 scaleType = ImageView.ScaleType.CENTER
             }
@@ -114,7 +114,7 @@ class FlexLinearLayout @JvmOverloads constructor(context: Context, attrs: Attrib
             setPadding(mPadding, 0, mPadding, 0)
             layoutParams = params
 
-            setTextColor(if (tag.isTop) "#${tag.color}".hexStringToIntColor() else com.gh.gamecenter.common.R.color.text_primary.toColor(context))
+            setTextColor(if (tag.isTop) "#${tag.color}".hexStringToIntColor() else R.color.text_primary.toColor(context))
             background = if (tag.isTop) createTopBackgroundDrawable(tag) else createNormalBackgroundDrawable()
             setOnClickListener {
                 onClickListener?.onItemClickListener(tag, position)

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

@@ -11,6 +11,7 @@ import android.widget.LinearLayout
 import android.widget.TextView
 import com.gh.gamecenter.core.utils.DisplayUtils
 import com.gh.gamecenter.common.utils.toColor
+import com.gh.gamecenter.R
 import com.gh.gamecenter.feature.entity.TagStyleEntity
 import kotlin.math.ceil
 
@@ -79,7 +80,7 @@ class GameTagFlexLinearLayout @JvmOverloads constructor(context: Context, attrs:
             includeFontPadding = false
             textSize = mTextSize
             gravity = Gravity.CENTER
-            setTextColor(com.gh.gamecenter.common.R.color.text_tertiary.toColor(context))
+            setTextColor(R.color.text_tertiary.toColor(context))
 
             val params = LayoutParams(LayoutParams.WRAP_CONTENT, mItemHeight)
             params.setMargins(0, 0, mMargin, 0)

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

@@ -251,7 +251,7 @@ class ImageContainerView : LinearLayout {
             when (data?.status) {
                 "pending" -> {
                     visibility = View.VISIBLE
-                    text = com.gh.gamecenter.feature.R.string.pending_status.toResString()
+                    text = R.string.pending_status.toResString()
                 }
 
                 "fail" -> {

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

@@ -6,6 +6,7 @@ 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
 
@@ -48,11 +49,11 @@ class SingleCardTagContainerView @JvmOverloads constructor(
                     tvTag.text = "$DELIMITER$tag"
                 }
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                    tvTag.setTextAppearance(com.gh.gamecenter.common.R.style.TextCaption2)
+                    tvTag.setTextAppearance(R.style.TextCaption2)
                 } else {
-                    tvTag.setTextAppearance(context, com.gh.gamecenter.common.R.style.TextCaption2)
+                    tvTag.setTextAppearance(context, R.style.TextCaption2)
                 }
-                tvTag.setTextColor(com.gh.gamecenter.common.R.color.text_tertiary.toColor(context))
+                tvTag.setTextColor(R.color.text_tertiary.toColor(context))
                 addView(tvTag)
             }
         }

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

@@ -156,15 +156,15 @@ object XapkDialogHelper {
                         .append(" ")
                     binding.alternativeCancelTv.visibility = View.VISIBLE
                     binding.alternativeCancelTv.text = spannableString
-                    binding.alternativeCancelTv.setTextColor(com.gh.gamecenter.common.R.color.text_secondary.toColor(context))
+                    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(com.gh.gamecenter.common.R.color.text_theme.toColor(context))
-                    binding.hintTv.setTextAppearance(com.gh.gamecenter.common.R.style.TextCaption1)
+                    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()

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

@@ -34,9 +34,7 @@ import com.lightgame.utils.Utils
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
 import okhttp3.MediaType
-import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.RequestBody
-import okhttp3.RequestBody.Companion.toRequestBody
 import org.json.JSONException
 import org.json.JSONObject
 import java.util.*
@@ -218,7 +216,7 @@ object PackageObserver {
             try {
                 jsonObject.put("game_id", gameId)
                 jsonObject.put("package", packageName)
-                val rBody = jsonObject.toString().toRequestBody("application/json".toMediaTypeOrNull())
+                val rBody = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString())
                 RetrofitManager.getInstance().api
                     .postPlayedGame(UserManager.getInstance().userId, rBody)
                     .subscribeOn(Schedulers.io())

app/src/main/java/com/gh/download/cache/ExoCacheManager.kt

@@ -94,8 +94,8 @@ object ExoCacheManager {
             response =
                 OkHttpClient.Builder().connectTimeout(5, TimeUnit.SECONDS).readTimeout(5, TimeUnit.SECONDS).build()
                     .newCall(request).execute()
-            if (response!!.isSuccessful && response.body != null) {
-                val length = response.body!!.contentLength()
+            if (response!!.isSuccessful && response.body() != null) {
+                val length = response.body()!!.contentLength()
                 contentLength = if (length == 0L) -1L else length
             }
         } catch (e: Exception) {

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

@@ -53,7 +53,6 @@ class DownloadDialog : BaseDraggableDialogFragment() {
 
     private var mAdapter: DownloadDialogAdapter? = null
     private var mTraceEvent: ExposureEvent? = null
-    private var mPlatformListAutoDownload: Boolean = true
     private var mPlatformList: List<GamePlatform>? = null
     private var mParentBundle: Bundle? = null
 
@@ -100,15 +99,10 @@ class DownloadDialog : BaseDraggableDialogFragment() {
         super.onCreate(savedInstanceState)
 
         mParentBundle = requireActivity().intent.extras?.getBundle(ToolBarActivity.NORMAL_FRAGMENT_BUNDLE)
-        mPlatformListAutoDownload = mParentBundle?.getBoolean(EntranceConsts.KEY_PLATFORMS_AUTO_DOWNLOAD, true) ?: true
-        mPlatformList = if (mPlatformListAutoDownload) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                mParentBundle?.getParcelableArrayList(EntranceConsts.KEY_PLATFORMS, GamePlatform::class.java)
-            } else {
-                mParentBundle?.getParcelableArrayList(EntranceConsts.KEY_PLATFORMS)
-            }
+        mPlatformList = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            mParentBundle?.getParcelableArrayList(EntranceConsts.KEY_PLATFORMS, GamePlatform::class.java)
         } else {
-            emptyList()
+            mParentBundle?.getParcelableArrayList(EntranceConsts.KEY_PLATFORMS)
         }
         mGameEntity = requireArguments().getParcelable(GameEntity::class.java.simpleName)!!
         mEntrance = requireArguments().getString(EntranceConsts.KEY_ENTRANCE) ?: ""
@@ -229,7 +223,6 @@ class DownloadDialog : BaseDraggableDialogFragment() {
                 mParentBundle?.putString(EntranceConsts.KEY_PLATFORM, "")
                 mParentBundle?.putString(EntranceConsts.KEY_PACKAGENAME, "")
             }
-            mParentBundle?.putBoolean(EntranceConsts.KEY_PLATFORMS_AUTO_DOWNLOAD, false)
         }, 200)
     }
 

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

@@ -136,11 +136,11 @@ class DownloadDialogAdapter(
                     rightLink.text = links?.getOrNull(1)?.title ?: ""
                     leftLink.background = GradientDrawable().apply {
                         cornerRadius = 8F.dip2px().toFloat()
-                        setStroke(0.5F.dip2px(), com.gh.gamecenter.common.R.color.ui_divider.toColor(mContext))
+                        setStroke(0.5F.dip2px(), R.color.ui_divider.toColor(mContext))
                     }
                     rightLink.background = GradientDrawable().apply {
                         cornerRadius = 8F.dip2px().toFloat()
-                        setStroke(0.5F.dip2px(), com.gh.gamecenter.common.R.color.ui_divider.toColor(mContext))
+                        setStroke(0.5F.dip2px(), R.color.ui_divider.toColor(mContext))
                     }
                 }
             }

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

@@ -67,10 +67,10 @@ class DownloadDialogInstalledItemViewHolder(val binding: DownloadDialogInstalled
             binding.collection.text = if (apkCollection != null) {
                 if (apkCollection.showPluggableHint) {
                     binding.collectionPluggableHint.visibility = View.VISIBLE
-                    binding.collection.setTextColor(com.gh.gamecenter.common.R.color.text_05CBA3.toColor(binding.collection.context))
+                    binding.collection.setTextColor(R.color.text_05CBA3.toColor(binding.collection.context))
                     gameEntity.pluginDesc + "此版本"
                 } else {
-                    binding.collection.setTextColor(com.gh.gamecenter.common.R.color.text_instance.toColor(binding.collection.context))
+                    binding.collection.setTextColor(R.color.text_instance.toColor(binding.collection.context))
                     "查看合集"
                 }
             } else "查看详情"

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

@@ -256,7 +256,7 @@ class DownloadDialogItemViewHolder(val binding: DownloadDialogItemBinding) : Bas
                             ?: return@setOnClickListener
 
                         if (FileUtils.isEmptyFile(downloadEntity.path)) {
-                            Utils.toast(it.context, com.gh.gamecenter.common.R.string.install_failure_hint)
+                            Utils.toast(it.context, R.string.install_failure_hint)
                             DownloadManager.getInstance().cancel(apkEntity.url)
                         } else {
                             if (PackageUtils.isCanPluggable(apkEntity)) {

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

@@ -3,7 +3,6 @@ package com.gh.download.dialog
 import android.app.Application
 import androidx.lifecycle.*
 import com.gh.common.constant.Config
-import com.gh.common.util.PackageHelper
 import com.gh.common.util.PackageUtils
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.feature.entity.ApkEntity
@@ -35,7 +34,7 @@ class DownloadViewModel(application: Application, val gameEntity: GameEntity) :
     private var mAllApkList: MutableList<ApkEntity> = ArrayList()
     private var mInstalledApkList: MutableList<ApkEntity> = ArrayList()
     private var mOtherApkList: MutableList<ApkEntity> = ArrayList()
-    private var allPackageName: List<String>? = null
+    private var allPackageName: ArrayList<String>? = null
     var otherSectionPosition = -1
 
     init {
@@ -48,7 +47,7 @@ class DownloadViewModel(application: Application, val gameEntity: GameEntity) :
     }
 
     fun getAllPackageName() {
-        allPackageName = PackageHelper.getInstalledPackageNameList(HaloApp.getInstance(), 0)
+        allPackageName = PackageUtils.getAllPackageName(HaloApp.getInstance())
     }
 
     fun initListData() {

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

@@ -6,7 +6,7 @@ import android.util.Base64
 import com.gh.common.constant.Config
 import com.gh.common.util.DirectUtils
 import com.gh.common.util.LogUtils
-import com.gh.common.util.PackageHelper
+import com.gh.common.util.PackageUtils
 import com.gh.gamecenter.ShellActivity
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.entity.ExposureEntity
@@ -28,6 +28,7 @@ import org.json.JSONObject
 import java.io.File
 import java.net.URLEncoder
 import java.util.*
+import kotlin.collections.ArrayList
 
 object BrowserInstallHelper {
 
@@ -39,7 +40,7 @@ object BrowserInstallHelper {
     private val mContext by lazy { HaloApp.getInstance().application }
     private var mUseReservePort = false
 
-    private var mValidInstalledPackageList: List<String> = listOf()
+    private var mValidInstalledPackageList: ArrayList<String> = arrayListOf()
     private var mValidConditionMatchedCache: Boolean? = null
 
     private fun getServer(port: Int): DownloadServer {
@@ -53,14 +54,14 @@ object BrowserInstallHelper {
         return server
     }
 
-    private fun getAllInstalledPackageList(): List<String> {
+    private fun getAllInstalledPackageList(): ArrayList<String> {
         when {
             mValidInstalledPackageList.isNotEmpty() -> {
                 return mValidInstalledPackageList
             }
 
             else -> {
-                val allInstalledPackageList = PackageHelper.getInstalledPackageNameList(mContext, 0)
+                val allInstalledPackageList = PackageUtils.getAllPackageName(mContext)
 
                 if (allInstalledPackageList.isNotEmpty()) {
                     mValidInstalledPackageList = allInstalledPackageList

app/src/main/java/com/gh/download/simple/DownloadMessageHandler.kt

@@ -37,8 +37,6 @@ object DownloadMessageHandler : InnerDownloadListener {
 
     @SuppressLint("CheckResult")
     fun init(downloadDao: DownloadDao) {
-        if (::mDownloadDao.isInitialized) return
-
         mDownloadDao = downloadDao
 
         updateDownloadList()