feat: 测试插件化

Signed-off-by: chenjuntao <chenjuntao@ghzhushou.com>

.gitlab-ci.yml

@@ -71,7 +71,7 @@ android_build:
     exit_codes: 137
   only:
     - dev
-    - release
+    - feat/GHZSCY-5250
 
 # 代码检查
 sonarqube_analysis:
@@ -152,4 +152,4 @@ oss-upload&send-email:
         - /usr/local/bin/python /ci-android-mail-jira-comment.py
     only:
         - dev
-        - release
+        - feat/GHZSCY-5250

.gitmodules

@@ -5,9 +5,6 @@
 [submodule "vspace-bridge"]
 	path = vspace-bridge
 	url = ../../../cwzs/android/vspace-bridge.git
-[submodule "module_common/src/debug/assets/assistant-android-mock"]
-	path = module_common/src/debug/assets/assistant-android-mock
-	url = ../../../halo/android/assistant-android-mock.git
 [submodule "ndownload"]
 	path = ndownload
 	url = ../../../android/ndownload.git

app/build.gradle

@@ -345,8 +345,6 @@ dependencies {
     })
     implementation "com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-exo_player2:$gsyVideo"
 
-//    implementation "androidx.work:work-runtime:${workManager}"
-
     implementation "com.llew.huawei:verifier:${verifier}"
 
     teaImplementation "com.bytedance.applog:RangersAppLog-Lite-cn:${bytedanceApplog}"
@@ -359,8 +357,6 @@ dependencies {
 
     implementation "com.lg:easyfloat:${easyFloat}"
 
-    implementation "io.github.florent37:shapeofview:${shapeOfView}"
-
     implementation "com.lg:apksig:${apksig}"
 
     implementation "com.lg:gid:${gid}"
@@ -489,6 +485,13 @@ andResGuard {
     // 打开这个开关会合并所有哈希值相同的资源，但请不要过度依赖这个功能去除去冗余资源
     mergeDuplicatedRes = true
     whiteList = [
+            "R.xml.jpush*",
+            "R.drawable.jpush*",
+            "R.layout.jpush*",
+            "R.layout.push*",
+            "R.string.jg*",
+            "R.style.MyDialogStyle",
+            "R.style.JPushTheme",
             "R.drawable.icon",
             "R.drawable.ic_bar_back",
             "R.drawable.toolbar_search_icon",

app/src/main/AndroidManifest.xml

@@ -11,6 +11,14 @@
         <package android:name="com.lg.vspace" />
     </queries>
 
+    <!-- 华为/荣耀角标 -->
+    <uses-permission android:name="com.huawei.android.launcher.permission.CHANGE_BADGE "/>
+    <uses-permission android:name="com.hihonor.android.launcher.permission.CHANGE_BADGE" />
+    <!-- vivo角标 -->
+    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
+
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"
+        tools:ignore="ScopedStorage" />
     <!-- 允许应用程序访问网络连接 -->
     <uses-permission android:name="android.permission.INTERNET" />
     <!-- 允许应用程序写入外部存储，如SD卡上写文件 -->
@@ -118,10 +126,12 @@
         android:label="@string/app_name"
         android:largeHeap="true"
         android:networkSecurityConfig="@xml/network_security_config"
+        android:preserveLegacyExternalStorage="true"
+        android:requestLegacyExternalStorage="true"
         android:resizeableActivity="true"
         android:theme="@style/AppCompatTheme.APP"
         tools:replace="android:name,android:allowBackup"
-        tools:targetApi="n">
+        tools:targetApi="r">
 
         <meta-data
             android:name="EasyGoClient"
@@ -313,14 +323,6 @@
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden" />
 
-        <activity
-            android:name="com.gh.gamecenter.qa.answer.detail.AnswerDetailActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name="com.gh.gamecenter.qa.answer.edit.AnswerEditActivity"
-            android:screenOrientation="portrait" />
-
         <activity
             android:name="com.gh.gamecenter.InfoActivity"
             android:screenOrientation="portrait" />
@@ -329,10 +331,6 @@
             android:name=".qa.questions.invite.QuestionsInviteActivity"
             android:screenOrientation="portrait" />
 
-        <activity
-            android:name="com.gh.gamecenter.qa.myqa.MyAskActivity"
-            android:screenOrientation="portrait" />
-
         <activity
             android:name="com.gh.gamecenter.qa.questions.edit.QuestionEditActivity"
             android:screenOrientation="portrait" />
@@ -370,10 +368,6 @@
             android:name="com.gh.gamecenter.qa.article.edit.ArticleEditActivity"
             android:screenOrientation="portrait" />
 
-        <activity
-            android:name="com.gh.gamecenter.qa.article.MyArticleActivity"
-            android:screenOrientation="portrait" />
-
         <activity
             android:name="com.gh.gamecenter.qa.article.draft.ArticleDraftActivity"
             android:screenOrientation="portrait" />
@@ -412,10 +406,6 @@
             android:name="com.gh.gamecenter.history.HistoryActivity"
             android:screenOrientation="portrait" />
 
-        <activity
-            android:name="com.gh.gamecenter.personalhome.rating.RatingActivity"
-            android:screenOrientation="portrait" />
-
         <activity
             android:name="com.gh.gamecenter.gamedetail.rating.logs.CommentLogsActivity"
             android:screenOrientation="portrait" />
@@ -488,9 +478,6 @@
             android:name=".gamedetail.fuli.kaifu.ServersSubscribedGameListActivity"
             android:screenOrientation="portrait" />
 
-        <activity
-            android:name=".qa.answer.draft.AnswerDraftActivity"
-            android:screenOrientation="portrait" />
         <activity
             android:name=".gamedetail.rating.RatingFoldActivity"
             android:screenOrientation="portrait" />
@@ -502,10 +489,6 @@
             android:name=".video.poster.PosterEditActivity"
             android:screenOrientation="portrait" />
 
-        <activity
-            android:name=".video.poster.PosterClipActivity"
-            android:screenOrientation="portrait" />
-
         <activity
             android:name=".forum.detail.ForumDetailActivity"
             android:screenOrientation="portrait" />

app/src/main/assets/editor.html

@@ -6,8 +6,6 @@
     <link rel="stylesheet" type="text/css" href="normalize.css">
     <link rel="stylesheet" type="text/css" href="style.css">
     <link rel="stylesheet" type="text/css" href="video-js.min.css">
-<!--    <link rel="stylesheet" href="https://static-web.ghzs.com/website-static/lib/video-js.min.css">--> <!--在web页面播放视频-->
-    <!--<link rel="stylesheet" type="text/css" href="https://resource.ghzs.com/css/halo_app.css">-->
 </head>
 
 <body style="overflow-x: hidden; word-break: break-all;">
@@ -15,8 +13,5 @@
 <script type="text/javascript" src="zepto.min.js"></script>
 <script type="text/javascript" src="rich_editor.js"></script>
 <script type="text/javascript" src="video.min.js"></script>
-<!--<script src="https://static-web.ghzs.com/website-static/lib/video.min.js"></script>--> <!--在web页面播放视频-->
-<!--<script type="text/javascript" src="content.js"></script>-->
-<!--<script type="text/javascript" src="https://resource.ghzs.com/js/halo_app.js"></script>-->
 </body>
 </html>

app/src/main/assets/rich_editor.js

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

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

@@ -12,13 +12,13 @@ import androidx.lifecycle.MediatorLiveData
 import androidx.lifecycle.MutableLiveData
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment
+import com.gh.gamecenter.common.entity.ErrorEntity
+import com.gh.gamecenter.common.retrofit.BiResponse
 import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.core.runOnUiThread
 import com.gh.gamecenter.core.utils.MD5Utils
 import com.gh.gamecenter.core.utils.ToastUtils
-import com.gh.gamecenter.common.entity.ErrorEntity
-import com.gh.gamecenter.common.retrofit.BiResponse
 import com.gh.gamecenter.entity.ForumDetailEntity
 import com.gh.gamecenter.entity.LocalVideoEntity
 import com.gh.gamecenter.entity.QuoteCountEntity
@@ -28,7 +28,6 @@ import com.gh.gamecenter.retrofit.service.ApiService
 import com.gh.gamecenter.video.upload.OnUploadListener
 import com.gh.gamecenter.video.upload.UploadManager
 import com.google.gson.JsonObject
-import com.lightgame.download.FileUtils
 import com.lightgame.utils.Utils
 import com.zhihu.matisse.Matisse
 import com.zhihu.matisse.internal.utils.PathUtils
@@ -62,7 +61,6 @@ abstract class BaseRichEditorViewModel(application: Application) : AndroidViewMo
     val TITLE_MIN_LENGTH = 6
     val MIN_TEXT_LENGTH = 6
     val MAX_TEXT_LENGTH = 10000
-    val FILE_HOST = "file:///"
     var id = ""//视频标记
     var videoId = ""//更改封面视频id
     val quoteCountEntity = QuoteCountEntity()//数据上报用
@@ -129,15 +127,13 @@ abstract class BaseRichEditorViewModel(application: Application) : AndroidViewMo
                     }
                     val map = LinkedHashMap<String, String>()
                     for (key in imageUrlMap.keys) {
-                        val localFileUri = FILE_HOST + key.decodeURI()
-
                         // 文件格式为 HEIC 时，使用经 OSS 转码的图片作为预览图片
                         if (FileUtils.getFileMimeType(getApplication(), key.decodeURI())?.lowercase(Locale.CHINA)?.contains("heic") == true) {
-                            val transformedImgUrl = ImageUtils.getTransformedUrl(imageUrlMap[key], 5000) ?: ""
+                            val transformedImgUrl = ImageUtils.getIdealImageUrl(imageUrlMap[key], 5000) ?: ""
                             map[MD5Utils.getUrlMD5(key)] = transformedImgUrl
                             mapImages[transformedImgUrl.decodeURI()] = imageUrlMap[key] ?: ""
                         } else {
-                            map[MD5Utils.getUrlMD5(key)] = localFileUri
+                            map[MD5Utils.getUrlMD5(key)] = imageUrlMap[key] ?: ""
                             mapImages[TextUtils.htmlEncode(key).decodeURI()] = imageUrlMap[key] ?: ""
                         }
                     }

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

@@ -4,6 +4,7 @@ import android.app.Activity
 import android.app.Application
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import com.alibaba.android.arouter.launcher.ARouter
 import com.gh.ad.AdDelegateHelper
 import com.gh.common.util.FloatingBackViewManager
 import com.gh.common.xapk.XapkInstaller
@@ -14,7 +15,9 @@ import com.gh.gamecenter.SplashAdActivity
 import com.gh.gamecenter.SplashScreenActivity
 import com.gh.gamecenter.authorization.AuthorizationActivity
 import com.gh.gamecenter.common.base.GlobalActivityManager
+import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.utils.PackageFlavorHelper
+import com.gh.gamecenter.core.provider.IPushProvider
 import com.gh.vspace.VHelper
 import com.halo.assistant.HaloApp
 
@@ -81,6 +84,10 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
         }
 
         XapkInstaller.updateCurrentInstallStatus()
+
+        // 清除桌面角标
+        val pushProvider = ARouter.getInstance().build(RouteConsts.provider.push).navigation() as? IPushProvider
+        pushProvider?.cleanBadgeNumber(activity.applicationContext)
     }
 
     override fun onActivityPaused(activity: Activity) {

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

@@ -45,7 +45,6 @@ import com.gh.gamecenter.login.user.LoginTag
 import com.gh.gamecenter.login.user.UserManager
 import com.gh.gamecenter.login.user.UserRepository
 import com.gh.gamecenter.login.utils.LoginHelper
-import com.gh.gamecenter.login.utils.QuickLoginHelper
 import com.gh.gamecenter.login.view.LoginActivity
 import com.gh.gamecenter.personalhome.border.AvatarBorderActivity
 import com.gh.gamecenter.setting.SettingBridge
@@ -130,12 +129,12 @@ class DefaultJsApi(
 
     @JavascriptInterface
     fun login(msg: Any) {
-        if (SPUtils.getBoolean(Constants.SP_HAS_GET_PHONE_INFO) || NetworkUtils.isOpenMobileData(context)) {
-            QuickLoginHelper.startLogin(context, "浏览器")
-        } else {
+//        if (SPUtils.getBoolean(Constants.SP_HAS_GET_PHONE_INFO) || NetworkUtils.isOpenMobileData(context)) {
+//            QuickLoginHelper.startLogin(context, "浏览器")
+//        } else {
             val intent = LoginActivity.getIntent(context, "浏览器")
             context.startActivity(intent)
-        }
+//        }
     }
 
     @JavascriptInterface

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

@@ -2,17 +2,16 @@ package com.gh.common
 
 import com.gh.common.exposure.ExposureManager
 import com.gh.common.filter.RegionSettingHelper
-import com.gh.common.util.AdHelper
 import com.gh.common.videolog.VideoRecordUtils
 import com.gh.download.DownloadDataHelper
 import com.gh.gamecenter.common.loghub.LoghubUtils
 import com.gh.gamecenter.common.retrofit.Response
-import com.gh.gamecenter.common.utils.doOnMainProcessOnly
 import com.gh.gamecenter.common.utils.tryCatchInRelease
 import com.gh.gamecenter.core.runOnUiThread
 import com.gh.gamecenter.entity.TimeEntity
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.halo.assistant.HaloApp
+import com.lightgame.utils.Utils
 import io.reactivex.schedulers.Schedulers
 import kotlin.concurrent.fixedRateTimer
 
@@ -26,7 +25,6 @@ object FixedRateJobHelper {
 
     private const val DOWNLOAD_HEARTBEAT_PERIOD: Long = 60 * 1000L
     private const val DOWNLOAD_HEARTBEAT_SHEET_PERIOD: Long = 15 * 1000L
-    private const val STARTUP_AD: Long = 30 * 60 * 1000L
 
     private var mExecuteCount: Int = 0
 
@@ -34,58 +32,56 @@ object FixedRateJobHelper {
 
     @JvmStatic
     fun begin() {
-        doOnMainProcessOnly {
-            // 时间检查，每15秒检查一次
-            fixedRateTimer("Global-Fixed-Rate-Timer", initialDelay = 100, period = CHECKER_PERIOD) {
-                val elapsedTime = mExecuteCount * CHECKER_PERIOD
-                // 时间校对，10分钟一次
-                if (elapsedTime % TIME_PERIOD == 0L) {
-                    RetrofitManager.getInstance().api.time
-                        .subscribeOn(Schedulers.io())
-                        .subscribe(object : Response<TimeEntity>() {
-                            override fun onResponse(response: TimeEntity?) {
-                                val serverTime = response?.time
-                                serverTime?.let {
-                                    timeDeltaBetweenServerAndClient = it * 1000 - System.currentTimeMillis()
-                                }
+        // 时间检查，每15秒检查一次
+        fixedRateTimer("Global-Fixed-Rate-Timer", initialDelay = 100, period = CHECKER_PERIOD) {
+            val elapsedTime = mExecuteCount * CHECKER_PERIOD
+            // 时间校对，10分钟一次
+            if (elapsedTime % TIME_PERIOD == 0L) {
+                RetrofitManager.getInstance().api.time
+                    .subscribeOn(Schedulers.io())
+                    .subscribe(object : Response<TimeEntity>() {
+                        override fun onResponse(response: TimeEntity?) {
+                            val serverTime = response?.time
+                            serverTime?.let {
+                                timeDeltaBetweenServerAndClient = it * 1000 - System.currentTimeMillis()
                             }
-                        })
-                }
-
-                // 提交曝光数据
-                if (elapsedTime % EXPOSURE_PERIOD == 0L) {
-                    ExposureManager.commitSavedExposureEvents(true)
-                }
-
-                // 分片检测下载进度
-                if (elapsedTime % DOWNLOAD_HEARTBEAT_SHEET_PERIOD == 0L) {
-                    tryCatchInRelease {
-                        val upload = (mExecuteCount * CHECKER_PERIOD) % DOWNLOAD_HEARTBEAT_PERIOD == 0L
-                        DownloadDataHelper.uploadDownloadHeartbeat(upload)
-                    }
-                }
-
-                // 提交普通 loghub 数据
-                if (elapsedTime % LOGHUB_PERIOD == 0L) {
-                    runOnUiThread {
-                        LoghubUtils.commitSavedLoghubEvents(true)
-                    }
-                }
-
-                // 更新游戏屏蔽信息
-                if (elapsedTime % REGION_SETTING_PERIOD == 0L) {
-                    if (HaloApp.getInstance().isRunningForeground) {
-                        RegionSettingHelper.getRegionSetting()
-                    }
-                }
-
-                // 提交视频浏览记录数据
-                if (elapsedTime % VIDEO_RECORD_PERIOD == 0L) {
-                    VideoRecordUtils.commitVideoRecord()
-                }
-
-                mExecuteCount++
+                        }
+                    })
             }
+
+            // 提交曝光数据
+            if (elapsedTime % EXPOSURE_PERIOD == 0L) {
+                ExposureManager.commitSavedExposureEvents(true)
+            }
+
+            // 分片检测下载进度
+            if (elapsedTime % DOWNLOAD_HEARTBEAT_SHEET_PERIOD == 0L) {
+                tryCatchInRelease {
+                    val upload = (mExecuteCount * CHECKER_PERIOD) % DOWNLOAD_HEARTBEAT_PERIOD == 0L
+                    DownloadDataHelper.uploadDownloadHeartbeat(upload)
+                }
+            }
+
+            // 提交普通 loghub 数据
+            if (elapsedTime % LOGHUB_PERIOD == 0L) {
+                runOnUiThread {
+                    LoghubUtils.commitSavedLoghubEvents(true)
+                }
+            }
+
+            // 更新游戏屏蔽信息
+            if (elapsedTime % REGION_SETTING_PERIOD == 0L) {
+                if (HaloApp.getInstance().isRunningForeground) {
+                    RegionSettingHelper.getRegionSetting()
+                }
+            }
+
+            // 提交视频浏览记录数据
+            if (elapsedTime % VIDEO_RECORD_PERIOD == 0L) {
+                VideoRecordUtils.commitVideoRecord()
+            }
+
+            mExecuteCount++
         }
     }
 }

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

@@ -18,7 +18,15 @@ class LandPageAddressHandler : DownloadChainHandler() {
                 }
 
                 DialogUtils.showLandPageAddressDialog(context, gameEntity) {// 跳转第三方落地页
-                    DirectUtils.directToExternalBrowser(context, gameEntity.landPageAddressDialog!!.link!!)
+                    if (gameEntity.isLandPageAddressDialogShowOnly()) {
+                        if (hasNext()) {
+                            getNext()?.handleRequest(context, gameEntity, asVGame)
+                        } else {
+                            processEndCallback?.invoke(asVGame, null)
+                        }
+                    } else {
+                        DirectUtils.directToExternalBrowser(context, gameEntity.landPageAddressDialog!!.link!!)
+                    }
                 }
             }
         } else {

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

@@ -57,8 +57,7 @@ public class Config {
     public static final String WEIBO_APPKEY = BuildConfig.WEIBO_APPKEY;
     public static final String QUICK_LOGIN_APPID = BuildConfig.QUICK_LOGIN_APPID;
     public static final String QUICK_LOGIN_APPKEY = BuildConfig.QUICK_LOGIN_APPKEY;
-    // http://www.ghzs666.com/article/${articleId}.html
-    public static final String URL_ARTICLE = "http://www.ghzs666.com/article/"; // ghzs/ghzs666 统一
+    public static final String URL_ARTICLE = "www.ghzs666.com/article/"; // ghzs/ghzs666 统一
 
     private static final String SETTINGS_KEY = "settingsKey";
 
@@ -95,8 +94,7 @@ public class Config {
         getPreferences().edit().putString(SETTINGS_KEY, GsonUtils.toJson(settingsEntity)).apply();
         mSettingsEntity = settingsEntity;
 
-        // 加载完设置后刷新下
-        PackageHelper.initList();
+        PackageHelper.refreshList();
     }
 
     @Nullable

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

@@ -52,6 +52,8 @@ import com.gh.gamecenter.WebActivity;
 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;
@@ -69,7 +71,6 @@ import com.gh.gamecenter.gamedetail.dialog.GamePermissionDialogFragment;
 import com.gh.gamecenter.manager.PackagesManager;
 import com.gh.vspace.VHelper;
 import com.lightgame.download.DownloadEntity;
-import com.lightgame.download.FileUtils;
 import com.lightgame.utils.Utils;
 
 import java.io.File;

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

@@ -23,6 +23,7 @@ class GameOffServiceDialogFragment : BaseDialogFragment() {
 
     private var mDialog: GameEntity.Dialog? = null
     private var mBinding: DialogGameOffServiceBinding? = null
+    private var mCallback: (() -> Unit)? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -44,6 +45,7 @@ class GameOffServiceDialogFragment : BaseDialogFragment() {
                 titleTv.text = title
                 contentTv.text = HtmlCompat.fromHtml(content, HtmlCompat.FROM_HTML_MODE_LEGACY)
                 okTv.setOnClickListener {
+                    mCallback?.invoke()
                     dismissAllowingStateLoss()
                 }
 
@@ -64,7 +66,6 @@ class GameOffServiceDialogFragment : BaseDialogFragment() {
                     siteTv.text = site.text
                     siteTv.paintFlags = siteTv.paintFlags or Paint.UNDERLINE_TEXT_FLAG
                     siteTv.setOnClickListener {
-                        //                    MtaHelper.onEvent("游戏下载状态按钮", getKey(), site.text)
                         DirectUtils.directToWebView(requireContext(), site.url, "(关闭下载弹窗)")
                         dismissAllowingStateLoss()
                     }
@@ -83,11 +84,13 @@ class GameOffServiceDialogFragment : BaseDialogFragment() {
         const val KEY_DIALOG = "dialog"
 
         @JvmStatic
-        fun getInstance(dialog: GameEntity.Dialog) = GameOffServiceDialogFragment().apply {
-            arguments = Bundle().apply {
-                putParcelable(KEY_DIALOG, dialog)
+        fun getInstance(dialog: GameEntity.Dialog, callback: (() -> Unit)? = null) =
+            GameOffServiceDialogFragment().apply {
+                arguments = Bundle().apply {
+                    putParcelable(KEY_DIALOG, dialog)
+                }
+                mCallback = callback
             }
-        }
     }
 
 }

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

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

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

@@ -19,6 +19,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.gh.common.util.DirectUtils
 import com.gh.common.util.LogUtils
+import com.gh.common.util.PackageHelper
 import com.gh.common.util.PackageUtils
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.R
@@ -59,7 +60,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
     private val mDuration = 3000
     private var mDisposable: Disposable? = null
     private var mAdapter: PackageCheckAdapter? = null
-    private var mAllInstalledPackages = PackageUtils.getInstalledPackages(HaloApp.getInstance().application, 0)
+    private var mAllInstalledPackages = PackageHelper.getInstalledPackages(HaloApp.getInstance().application, 0)
     var gameEntity: GameEntity? = null
     var callBack: ConfirmListener? = null
 
@@ -325,7 +326,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
 
     override fun onResume() {
         super.onResume()
-        mAllInstalledPackages = PackageUtils.getInstalledPackages(HaloApp.getInstance().application, 0)
+        mAllInstalledPackages = PackageHelper.getInstalledPackages(HaloApp.getInstance().application, 0)
         gameEntity?.packageDialog?.let {
             if (isAllPackageInstalled(mAllInstalledPackages, it)) {
                 callBack?.onConfirm()
@@ -363,7 +364,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onEventMainThread(busFour: EBPackage) {
         if (busFour.isInstalledOrUninstalled()) {
-            mAllInstalledPackages = PackageUtils.getInstalledPackages(HaloApp.getInstance().application, 0)
+            mAllInstalledPackages = PackageHelper.getInstalledPackages(HaloApp.getInstance().application, 0)
             mAdapter?.notifyDataSetChanged()
         }
     }
@@ -416,7 +417,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
                 return
             }
 
-            val allInstalledPackages = PackageUtils.getInstalledPackages(HaloApp.getInstance().application, 0)
+            val allInstalledPackages = PackageHelper.getInstalledPackages(HaloApp.getInstance().application, 0)
             if (isAllPackageInstalled(allInstalledPackages, packageDialogEntity)) {
                 callBack.onConfirm()
                 return

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

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

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

@@ -1,8 +1,6 @@
 package com.gh.common.prioritychain
 
-import android.graphics.Bitmap
 import androidx.fragment.app.FragmentActivity
-import com.gh.gamecenter.common.callback.BiCallback
 import com.gh.gamecenter.common.utils.ImageUtils
 import com.gh.gamecenter.core.utils.CurrentActivityHolder
 import com.gh.gamecenter.feature.entity.WelcomeDialogEntity
@@ -21,20 +19,19 @@ class WelcomeDialogHandler(priority: Int) : PriorityChainHandler(priority) {
             // 判断启动本次应用是否已经弹窗，不是的话弹启动弹窗
             if (HaloApp.get(MainWrapperViewModel.SHOULD_SHOW_OPENING_DIALOG, false) == null) {
                 HaloApp.put(MainWrapperViewModel.SHOULD_SHOW_OPENING_DIALOG, false)
-                ImageUtils.getBitmap(this.welcomeDialogEntity!!.icon, object : BiCallback<Bitmap, Boolean> {
-                    override fun onFirst(first: Bitmap) {
+                val idealUrl = ImageUtils.getIdealImageUrl(this.welcomeDialogEntity!!.icon, 0, true) ?: ""
+                ImageUtils.prefetchToDiskCache(idealUrl) { isSuccess ->
+                    if (isSuccess) {
                         if (getStatus() == STATUS_PENDING) {
                             updateStatus(STATUS_VALID)
                             process()
                         } else {
                             updateStatus(STATUS_VALID)
                         }
-                    }
-
-                    override fun onSecond(second: Boolean) {
+                    } else {
                         processNext()
                     }
-                })
+                }
             } else {
                 processNext()
             }

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

@@ -22,34 +22,6 @@ class DirectProviderImpl : IDirectProvider {
         DirectUtils.directToQqConversation(context, qq)
     }
 
-    override fun directToCommodityDetail(context: Context, commodityId: String) {
-        DirectUtils.directToCommodityDetail(context, commodityId)
-    }
-
-    override fun directToEnergyRecord(context: Context) {
-        DirectUtils.directToEnergyRecord(context)
-    }
-
-    override fun directToEnergyRulePage(context: Context) {
-        DirectUtils.directToEnergyRulePage(context)
-    }
-
-    override fun directToInviteFriends(context: Context) {
-        DirectUtils.directToInviteFriends(context)
-    }
-
-    override fun directToExchangeRulePage(context: Context) {
-        DirectUtils.directToExchangeRulePage(context)
-    }
-
-    override fun directToExchangeCommodityPage(context: Context) {
-        DirectUtils.directToExchangeCommodityPage(context)
-    }
-
-    override fun directToLotteryParadisePage(context: Context) {
-        DirectUtils.directToLotteryParadisePage(context)
-    }
-
     override fun directDouyin(context: Context, userId: String) {
         DirectUtils.directDouyin(context, userId)
     }
@@ -97,26 +69,6 @@ class DirectProviderImpl : IDirectProvider {
         DirectUtils.directToAmway(context, fixedTopAmwayCommentId, entrance, path)
     }
 
-    override fun directToOrderCenter(context: Context) {
-        DirectUtils.directToOrderCenter(context)
-    }
-
-    override fun directToOrderDetail(context: Context, orderId: String) {
-        DirectUtils.directToOrderDetail(context, orderId)
-    }
-
-    override fun directToEnergyRecord(context: Context, position: Int) {
-        DirectUtils.directToEnergyRecord(context, position)
-    }
-
-    override fun directToMyPrizePage(context: Context) {
-        DirectUtils.directToMyPrizePage(context)
-    }
-
-    override fun directToWinOrderDetail(context: Context, orderId: String, activityId: String) {
-        DirectUtils.directToWinOrderDetail(context, orderId, activityId)
-    }
-
     override fun directToQGame(context: Context) {
         return DirectUtils.directToQGameHome(context)
     }

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

@@ -3,14 +3,16 @@ package com.gh.common.provider
 import android.content.Context
 import android.content.pm.PackageInfo
 import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.PackageHelper
 import com.gh.common.util.PackageUtils
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IPackageUtilsProvider
+import com.gh.gamecenter.core.utils.ProcessUtil
 
 @Route(path = RouteConsts.provider.packageUtils, name = "PackageUtils暴露服务")
 class PackageUtilsProviderImpl : IPackageUtilsProvider {
-    override fun obtainProcessName(context: Context): String? {
-        return PackageUtils.obtainProcessName(context)
+    override fun obtainProcessName(): String? {
+        return ProcessUtil.getCurrentProcessName()
     }
 
     override fun getGhVersionName(): String {
@@ -22,7 +24,7 @@ class PackageUtilsProviderImpl : IPackageUtilsProvider {
     }
 
     override fun getInstalledPackages(context: Context, flag: Int): List<PackageInfo> {
-        return PackageUtils.getInstalledPackages(context, flag)
+        return PackageHelper.getInstalledPackages(context, flag)
     }
 
     override fun getApkSignatureByPackageName(context: Context, packageName: String): Array<String> {
@@ -37,6 +39,10 @@ class PackageUtilsProviderImpl : IPackageUtilsProvider {
         return PackageUtils.isSignedByGh(context, packageName)
     }
 
+    override fun isInstalledWithLauncherIcon(context: Context, packageName: String): Boolean {
+        return PackageUtils.isInstalled(context, packageName)
+    }
+
     override fun getInstalledTime(context: Context, packageName: String): Long {
         return PackageUtils.getInstalledTime(context, packageName)
     }

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

@@ -20,15 +20,14 @@ import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.core.AppExecutor.uiExecutor
 import com.gh.gamecenter.core.utils.*
+import com.gh.gamecenter.entity.TrackableEntity
 import com.gh.gamecenter.feature.entity.ApkEntity
 import com.gh.gamecenter.feature.entity.SimulatorEntity
-import com.gh.gamecenter.entity.TrackableEntity
 import com.gh.ndownload.NDataChanger
 import com.halo.assistant.HaloApp
 import com.lightgame.download.DataWatcher
 import com.lightgame.download.DownloadEntity
 import com.lightgame.download.DownloadStatus
-import com.lightgame.download.FileUtils
 import com.lightgame.utils.Utils
 import java.lang.ref.WeakReference
 import java.text.DecimalFormat
@@ -167,162 +166,160 @@ class SimulatorDownloadManager private constructor() {
         this.gameName = gameName
         this.gameType = gameCategoryChinese
 
-        PermissionHelper.checkGetInstalledAppsListBeforeAction(context, object : EmptyCallback {
-            override fun onCallback() {
-                val isInstalledNewSimulator =
-                    SimulatorGameManager.isNewSimulatorInstalled(HaloApp.getInstance().application)
-                //当没有安装新版本模拟器时候 判断是否隐藏
-                if (simulator?.active == false && !isInstalledNewSimulator) {
-                    showNoneEmulatorDialog(context)
-                    return
-                }
-                var isInstalled = PackageUtils.isInstalledFromAllPackage(
-                    context,
-                    simulator?.apk?.packageName
-                )
-                //模拟器管理界面还是用之前的逻辑
-                if (isInstalledNewSimulator && location != SimulatorLocation.SIMULATOR_MANAGE) {
-                    isInstalled = isInstalledNewSimulator
-                }
-//                val versionFromInstalledApp = PackageUtils.getVersionNameByPackageName(simulator?.apk?.packageName)
-                val shouldShowUpdate =
-                    PackageUtils.isInstalledApkMatchedMd5(simulator?.apk?.packageName, simulator?.apk?.md5)
-                val showAlertTag = SPUtils.getString(SimulatorGameManager.SIMULATOR_UPDATE_SHOW_ALERT_TAG, "") //当天是否弹过
-                val todayIsShow = showAlertTag == TimeUtils.getToday()
-                downloadType = if (shouldShowUpdate && isInstalled) "update" else "download"
-                if (downloadType == "update" && todayIsShow && location != SimulatorLocation.SIMULATOR_MANAGE) {
-                    return
-                }
-                if (downloadType == "download" && isInstalled) {
-                    return
-                }
-                val title = if (shouldShowUpdate && isInstalled) "更新模拟器" else "安装模拟器"
-                val message =
-                    if (shouldShowUpdate && isInstalled) "检测到模拟器存在更高版本，是否前往更新" else "模拟器游戏需要先下载安装对应的模拟器，才可以运行"
-                val positiveText =
-                    if (shouldShowUpdate && isInstalled) "更新（${simulator?.apk?.size}）" else "下载（${simulator?.apk?.size}）"
-                val negativeText = if (shouldShowUpdate && isInstalled) "下次再说" else "取消"
-                val trackableEntity = TrackableEntity(
-                    "模拟器下载",
-                    key = if (shouldShowUpdate && isInstalled) "更新弹窗" else "下载弹窗",
-                    logShowEvent = true
-                )
-                if (shouldShowUpdate && isInstalled) {
-                    NewFlatLogUtils.logSimulatorUpdateAlertShow()
-                }
-                if (shouldShowUpdate && isInstalled) {
-                    SensorsBridge.trackSimulatorUpdateDialogShow(
-                        gameId = gameId,
-                        gameName = gameName,
-                        gameType = gameCategoryChinese,
-                        lastPageId = GlobalActivityManager.getLastPageEntity().pageId,
-                        lastPageName = GlobalActivityManager.getLastPageEntity().pageName,
-                        lastPageBusinessId = GlobalActivityManager.getLastPageEntity().pageBusinessId
-                    )
-                } else {
-                    SensorsBridge.trackSimulatorInstallDialogShow(
-                        gameId = gameId,
-                        gameName = gameName,
-                        gameType = gameCategoryChinese,
-                        lastPageId = GlobalActivityManager.getLastPageEntity().pageId,
-                        lastPageName = GlobalActivityManager.getLastPageEntity().pageName,
-                        lastPageBusinessId = GlobalActivityManager.getLastPageEntity().pageBusinessId
-                    )
-                }
-                DialogHelper.showDialog(
-                    context,
-                    title,
-                    message,
-                    positiveText,
-                    negativeText,
-                    trackMtaEvent = true,
-                    cancelClickCallback = {
-                        if (shouldShowUpdate && isInstalled) {
-                            cancelCallback?.invoke()
-                            NewFlatLogUtils.logSimulatorUpdateAlertClick("取消")
-                            MtaHelper.onEvent(trackableEntity.event, trackableEntity.key, "点击下次再说")
-                            SensorsBridge.trackSimulatorUpdateDialogClick(
-                                buttonName = negativeText,
-                                gameId = gameId,
-                                gameName = gameName,
-                                gameType = gameCategoryChinese,
-                                lastPageId = GlobalActivityManager.getLastPageEntity().pageId,
-                                lastPageName = GlobalActivityManager.getLastPageEntity().pageName,
-                                lastPageBusinessId = GlobalActivityManager.getLastPageEntity().pageBusinessId
-                            )
-                        } else {
-                            SensorsBridge.trackSimulatorInstallDialogClick(
-                                buttonName = negativeText,
-                                gameId = gameId,
-                                gameName = gameName,
-                                gameType = gameCategoryChinese,
-                                lastPageId = GlobalActivityManager.getLastPageEntity().pageId,
-                                lastPageName = GlobalActivityManager.getLastPageEntity().pageName,
-                                lastPageBusinessId = GlobalActivityManager.getLastPageEntity().pageBusinessId
-                            )
-                        }
-                    },
-                    confirmClickCallback = {
-                        showDownloadingDialog(context, simulator, gameId, gameName, gameCategoryChinese)
-                        NewFlatLogUtils.logSimulatorUpdateAlertClick("更新")
-                        MtaHelper.onEvent(
-                            trackableEntity.event,
-                            trackableEntity.key,
-                            if (shouldShowUpdate && isInstalled) "点击更新" else "点击下载"
-                        )
-                        if (shouldShowUpdate && isInstalled) {
-                            SensorsBridge.trackSimulatorUpdateDialogClick(
-                                buttonName = positiveText,
-                                gameId = gameId,
-                                gameName = gameName,
-                                gameType = gameCategoryChinese,
-                                lastPageId = GlobalActivityManager.getLastPageEntity().pageId,
-                                lastPageName = GlobalActivityManager.getLastPageEntity().pageName,
-                                lastPageBusinessId = GlobalActivityManager.getLastPageEntity().pageBusinessId
-                            )
-                        } else {
-                            SensorsBridge.trackSimulatorInstallDialogClick(
-                                buttonName = positiveText,
-                                gameId = gameId,
-                                gameName = gameName,
-                                gameType = gameCategoryChinese,
-                                lastPageId = GlobalActivityManager.getLastPageEntity().pageId,
-                                lastPageName = GlobalActivityManager.getLastPageEntity().pageName,
-                                lastPageBusinessId = GlobalActivityManager.getLastPageEntity().pageBusinessId
-                            )
-                        }
-                    },
-                    touchOutsideCallback = {
-                        if (shouldShowUpdate && isInstalled) {
-                            SensorsBridge.trackSimulatorUpdateDialogClick(
-                                buttonName = "关闭弹窗",
-                                gameId = gameId,
-                                gameName = gameName,
-                                gameType = gameCategoryChinese,
-                                lastPageId = GlobalActivityManager.getLastPageEntity().pageId,
-                                lastPageName = GlobalActivityManager.getLastPageEntity().pageName,
-                                lastPageBusinessId = GlobalActivityManager.getLastPageEntity().pageBusinessId
-                            )
-                        } else {
-                            SensorsBridge.trackSimulatorInstallDialogClick(
-                                buttonName = "关闭弹窗",
-                                gameId = gameId,
-                                gameName = gameName,
-                                gameType = gameCategoryChinese,
-                                lastPageId = GlobalActivityManager.getLastPageEntity().pageId,
-                                lastPageName = GlobalActivityManager.getLastPageEntity().pageName,
-                                lastPageBusinessId = GlobalActivityManager.getLastPageEntity().pageBusinessId
-                            )
-                        }
-                    },
-                    mtaEvent = trackableEntity.event, mtaKey = trackableEntity.key,
-                    extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
-                )
-                if (downloadType == "update" && location != SimulatorLocation.SIMULATOR_MANAGE) {
-                    SPUtils.setString(SimulatorGameManager.SIMULATOR_UPDATE_SHOW_ALERT_TAG, TimeUtils.getToday())
-                }
+        PermissionHelper.checkGetInstalledAppsListBeforeAction(context) { _ ->
+            val isInstalledNewSimulator =
+                SimulatorGameManager.isNewSimulatorInstalled(HaloApp.getInstance().application)
+            //当没有安装新版本模拟器时候 判断是否隐藏
+            if (simulator?.active == false && !isInstalledNewSimulator) {
+                showNoneEmulatorDialog(context)
+                return@checkGetInstalledAppsListBeforeAction
             }
-        })
+            var isInstalled = PackageUtils.isInstalledFromAllPackage(
+                context,
+                simulator?.apk?.packageName
+            )
+            //模拟器管理界面还是用之前的逻辑
+            if (isInstalledNewSimulator && location != SimulatorLocation.SIMULATOR_MANAGE) {
+                isInstalled = isInstalledNewSimulator
+            }
+//                val versionFromInstalledApp = PackageUtils.getVersionNameByPackageName(simulator?.apk?.packageName)
+            val shouldShowUpdate =
+                PackageUtils.isInstalledApkMatchedMd5(simulator?.apk?.packageName, simulator?.apk?.md5)
+            val showAlertTag = SPUtils.getString(SimulatorGameManager.SIMULATOR_UPDATE_SHOW_ALERT_TAG, "") //当天是否弹过
+            val todayIsShow = showAlertTag == TimeUtils.getToday()
+            downloadType = if (shouldShowUpdate && isInstalled) "update" else "download"
+            if (downloadType == "update" && todayIsShow && location != SimulatorLocation.SIMULATOR_MANAGE) {
+                return@checkGetInstalledAppsListBeforeAction
+            }
+            if (downloadType == "download" && isInstalled) {
+                return@checkGetInstalledAppsListBeforeAction
+            }
+            val title = if (shouldShowUpdate && isInstalled) "更新模拟器" else "安装模拟器"
+            val message =
+                if (shouldShowUpdate && isInstalled) "检测到模拟器存在更高版本，是否前往更新" else "模拟器游戏需要先下载安装对应的模拟器，才可以运行"
+            val positiveText =
+                if (shouldShowUpdate && isInstalled) "更新（${simulator?.apk?.size}）" else "下载（${simulator?.apk?.size}）"
+            val negativeText = if (shouldShowUpdate && isInstalled) "下次再说" else "取消"
+            val trackableEntity = TrackableEntity(
+                "模拟器下载",
+                key = if (shouldShowUpdate && isInstalled) "更新弹窗" else "下载弹窗",
+                logShowEvent = true
+            )
+            if (shouldShowUpdate && isInstalled) {
+                NewFlatLogUtils.logSimulatorUpdateAlertShow()
+            }
+            if (shouldShowUpdate && isInstalled) {
+                SensorsBridge.trackSimulatorUpdateDialogShow(
+                    gameId = gameId,
+                    gameName = gameName,
+                    gameType = gameCategoryChinese,
+                    lastPageId = GlobalActivityManager.getLastPageEntity().pageId,
+                    lastPageName = GlobalActivityManager.getLastPageEntity().pageName,
+                    lastPageBusinessId = GlobalActivityManager.getLastPageEntity().pageBusinessId
+                )
+            } else {
+                SensorsBridge.trackSimulatorInstallDialogShow(
+                    gameId = gameId,
+                    gameName = gameName,
+                    gameType = gameCategoryChinese,
+                    lastPageId = GlobalActivityManager.getLastPageEntity().pageId,
+                    lastPageName = GlobalActivityManager.getLastPageEntity().pageName,
+                    lastPageBusinessId = GlobalActivityManager.getLastPageEntity().pageBusinessId
+                )
+            }
+            DialogHelper.showDialog(
+                context,
+                title,
+                message,
+                positiveText,
+                negativeText,
+                trackMtaEvent = true,
+                cancelClickCallback = {
+                    if (shouldShowUpdate && isInstalled) {
+                        cancelCallback?.invoke()
+                        NewFlatLogUtils.logSimulatorUpdateAlertClick("取消")
+                        MtaHelper.onEvent(trackableEntity.event, trackableEntity.key, "点击下次再说")
+                        SensorsBridge.trackSimulatorUpdateDialogClick(
+                            buttonName = negativeText,
+                            gameId = gameId,
+                            gameName = gameName,
+                            gameType = gameCategoryChinese,
+                            lastPageId = GlobalActivityManager.getLastPageEntity().pageId,
+                            lastPageName = GlobalActivityManager.getLastPageEntity().pageName,
+                            lastPageBusinessId = GlobalActivityManager.getLastPageEntity().pageBusinessId
+                        )
+                    } else {
+                        SensorsBridge.trackSimulatorInstallDialogClick(
+                            buttonName = negativeText,
+                            gameId = gameId,
+                            gameName = gameName,
+                            gameType = gameCategoryChinese,
+                            lastPageId = GlobalActivityManager.getLastPageEntity().pageId,
+                            lastPageName = GlobalActivityManager.getLastPageEntity().pageName,
+                            lastPageBusinessId = GlobalActivityManager.getLastPageEntity().pageBusinessId
+                        )
+                    }
+                },
+                confirmClickCallback = {
+                    showDownloadingDialog(context, simulator, gameId, gameName, gameCategoryChinese)
+                    NewFlatLogUtils.logSimulatorUpdateAlertClick("更新")
+                    MtaHelper.onEvent(
+                        trackableEntity.event,
+                        trackableEntity.key,
+                        if (shouldShowUpdate && isInstalled) "点击更新" else "点击下载"
+                    )
+                    if (shouldShowUpdate && isInstalled) {
+                        SensorsBridge.trackSimulatorUpdateDialogClick(
+                            buttonName = positiveText,
+                            gameId = gameId,
+                            gameName = gameName,
+                            gameType = gameCategoryChinese,
+                            lastPageId = GlobalActivityManager.getLastPageEntity().pageId,
+                            lastPageName = GlobalActivityManager.getLastPageEntity().pageName,
+                            lastPageBusinessId = GlobalActivityManager.getLastPageEntity().pageBusinessId
+                        )
+                    } else {
+                        SensorsBridge.trackSimulatorInstallDialogClick(
+                            buttonName = positiveText,
+                            gameId = gameId,
+                            gameName = gameName,
+                            gameType = gameCategoryChinese,
+                            lastPageId = GlobalActivityManager.getLastPageEntity().pageId,
+                            lastPageName = GlobalActivityManager.getLastPageEntity().pageName,
+                            lastPageBusinessId = GlobalActivityManager.getLastPageEntity().pageBusinessId
+                        )
+                    }
+                },
+                touchOutsideCallback = {
+                    if (shouldShowUpdate && isInstalled) {
+                        SensorsBridge.trackSimulatorUpdateDialogClick(
+                            buttonName = "关闭弹窗",
+                            gameId = gameId,
+                            gameName = gameName,
+                            gameType = gameCategoryChinese,
+                            lastPageId = GlobalActivityManager.getLastPageEntity().pageId,
+                            lastPageName = GlobalActivityManager.getLastPageEntity().pageName,
+                            lastPageBusinessId = GlobalActivityManager.getLastPageEntity().pageBusinessId
+                        )
+                    } else {
+                        SensorsBridge.trackSimulatorInstallDialogClick(
+                            buttonName = "关闭弹窗",
+                            gameId = gameId,
+                            gameName = gameName,
+                            gameType = gameCategoryChinese,
+                            lastPageId = GlobalActivityManager.getLastPageEntity().pageId,
+                            lastPageName = GlobalActivityManager.getLastPageEntity().pageName,
+                            lastPageBusinessId = GlobalActivityManager.getLastPageEntity().pageBusinessId
+                        )
+                    }
+                },
+                mtaEvent = trackableEntity.event, mtaKey = trackableEntity.key,
+                extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
+            )
+            if (downloadType == "update" && location != SimulatorLocation.SIMULATOR_MANAGE) {
+                SPUtils.setString(SimulatorGameManager.SIMULATOR_UPDATE_SHOW_ALERT_TAG, TimeUtils.getToday())
+            }
+        }
     }
 
     fun showDownloadingDialog(

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

@@ -30,7 +30,6 @@ import com.gh.gamecenter.room.AppDatabase
 import com.halo.assistant.HaloApp
 import com.lightgame.download.DownloadDao
 import com.lightgame.download.DownloadEntity
-import com.lightgame.download.FileUtils
 import com.lightgame.utils.AppManager
 import io.reactivex.Single
 import io.reactivex.android.schedulers.AndroidSchedulers

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

@@ -1,17 +1,11 @@
 package com.gh.common.util;
 
-import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
 import android.text.TextUtils;
 
 import com.gh.gamecenter.common.constant.EntranceConsts;
-import com.gh.gamecenter.core.utils.CurrentActivityHolder;
-import com.gh.gamecenter.common.constant.Constants;
-import com.gh.gamecenter.login.utils.QuickLoginHelper;
 import com.gh.gamecenter.login.view.LoginActivity;
-import com.gh.gamecenter.common.utils.NetworkUtils;
-import com.gh.gamecenter.core.utils.SPUtils;
 import com.gh.gamecenter.login.user.UserManager;
 import com.lightgame.utils.Utils;
 
@@ -28,15 +22,15 @@ public class CheckLoginUtils {
             LogUtils.login("dialog", null, entrance);
             LogUtils.login("activity", null, entrance);
 
-            if (SPUtils.getBoolean(Constants.SP_HAS_GET_PHONE_INFO) || NetworkUtils.isOpenMobileData(context)) {
-                startQuickLogin(context, entrance);
-            } else {
-                // 有可能App未启动
-                Bundle bundle = new Bundle();
-                bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance);
-                bundle.putString(EntranceConsts.KEY_TO, LoginActivity.class.getName());
-                EntranceUtils.jumpActivity(context, bundle);
-            }
+//            if (SPUtils.getBoolean(Constants.SP_HAS_GET_PHONE_INFO) || NetworkUtils.isOpenMobileData(context)) {
+//                startQuickLogin(context, entrance);
+//            } else {
+            // 有可能App未启动
+            Bundle bundle = new Bundle();
+            bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance);
+            bundle.putString(EntranceConsts.KEY_TO, LoginActivity.class.getName());
+            EntranceUtils.jumpActivity(context, bundle);
+//            }
         } else {
             if (listener != null) {
                 listener.onLogin();
@@ -44,16 +38,16 @@ public class CheckLoginUtils {
         }
     }
 
-    private static void startQuickLogin(Context context, String entrance) {
-        // 需要确保传入的 context 不为 application
-        if (!(context instanceof Activity)) {
-            context = CurrentActivityHolder.getCurrentActivity();
-        }
-
-        if (context != null) {
-            QuickLoginHelper.startLogin(context, entrance);
-        }
-    }
+//    private static void startQuickLogin(Context context, String entrance) {
+//        // 需要确保传入的 context 不为 application
+//        if (!(context instanceof Activity)) {
+//            context = CurrentActivityHolder.getCurrentActivity();
+//        }
+//
+//        if (context != null) {
+//            QuickLoginHelper.startLogin(context, entrance);
+//        }
+//    }
 
     public static void checkLogin(final Context context, Bundle nextToBundle, boolean isTriggerNextStep, String entrance, OnLoginListener listener) {
         if (!isLogin()) {

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

@@ -533,7 +533,7 @@ public class CommentUtils {
             } else {
                 ImageUtils.display(holder.commentUserBadgeIv, "");
             }
-            ImageUtils.displayIcon(holder.commentUserIconDv, userInfo.getIcon());
+            ImageUtils.display(holder.commentUserIconDv, userInfo.getIcon());
         } else {
             if (entity.getMe() != null && entity.getMe().isContentOwner()) {
                 holder.commentAuthorTv.setVisibility(View.VISIBLE);
@@ -549,7 +549,7 @@ public class CommentUtils {
             if (TextUtils.isEmpty(entity.getUser().getIcon())) {
                 ImageUtils.display(holder.commentUserIconDv, R.drawable.user_default_icon_comment);
             } else {
-                ImageUtils.displayIcon(holder.commentUserIconDv, entity.getUser().getIcon());
+                ImageUtils.display(holder.commentUserIconDv, entity.getUser().getIcon());
             }
         }
     }

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

@@ -125,9 +125,7 @@ public class DataUtils {
                 HaloApp.getInstance().setGid(gid);
 
                 // 更新广告配置
-                ExtensionsKt.doOnMainProcessOnly(HaloApp.getInstance(), () -> {
-                    AdDelegateHelper.INSTANCE.requestAdConfig(false, "", null);
-                });
+                AdDelegateHelper.INSTANCE.requestAdConfig(false, "", null);
 
                 getDeviceCertification(gid);
 
@@ -147,11 +145,8 @@ public class DataUtils {
 
             @Override
             public void onFailure(String s) {
-                MtaHelper.onEventWithBasicDeviceInfo("开发辅助", "GID 获取异常", s);
                 // 更新广告配置
-                ExtensionsKt.doOnMainProcessOnly(HaloApp.getInstance(), () -> {
-                    AdDelegateHelper.INSTANCE.requestAdConfig(false, "", null);
-                });
+                AdDelegateHelper.INSTANCE.requestAdConfig(false, "", null);
             }
         });
     }

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

@@ -636,7 +636,12 @@ public class DialogUtils {
         binding.closeIv.setOnClickListener(v -> dialog.dismiss());
 
         binding.urlTv.setText(gameEntity.getLandPageAddressDialog().getLink());
-        binding.downloadBtn.setText(context.getString(R.string.dialog_land_page_address_confirm));
+
+        String downloadText = gameEntity.isLandPageAddressDialogShowOnly()
+                ? "下载（" + gameEntity.getApk().get(0).getSize() + "）"
+                : context.getString(R.string.dialog_land_page_address_confirm);
+
+        binding.downloadBtn.setText(downloadText);
         binding.downloadBtn.setOnClickListener(v -> {
             listener.onConfirm();
             dialog.dismiss();

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

@@ -1625,211 +1625,6 @@ object DirectUtils {
         jumpActivityCompat(context, newBundle)
     }
 
-    /**
-     * 跳转至商品详情
-     */
-    @JvmStatic
-    fun directToCommodityDetail(context: Context, commodityId: String) {
-        var url: String = if (EnvHelper.isDevEnv) {
-            Constants.COMMODITY_DETAIL_ADDRESS_DEV
-        } else {
-            Constants.COMMODITY_DETAIL_ADDRESS
-        }
-
-        url = String.format(
-            Locale.CHINA,
-            "%s&shopid=%s&timestamp=%d",
-            url,
-            commodityId,
-            (Date().time / 1000 / 1000.toFloat()).roundToInt()
-        )
-        directToFullScreenWebPage(context, url, true)
-    }
-
-    /**
-     * 跳转至光能记录（默认跳到光能记录第一个Tab）
-     */
-    @JvmStatic
-    fun directToEnergyRecord(context: Context) {
-        directToEnergyRecord(context, 0)
-    }
-
-    @JvmStatic
-    fun directToEnergyRecord(context: Context, position: Int) {
-        var url: String = if (EnvHelper.isDevEnv) {
-            Constants.ENERGY_RECORD_ADDRESS_DEV
-        } else {
-            Constants.ENERGY_RECORD_ADDRESS
-        }
-
-        url = String.format(
-            Locale.CHINA,
-            "%s&position=%s&timestamp=%d",
-            url,
-            position,
-            (Date().time / 1000 / 1000.toFloat()).roundToInt()
-        )
-        directToFullScreenWebPage(context, url, true)
-    }
-
-    /**
-     * 跳转至订单中心
-     */
-    @JvmStatic
-    fun directToOrderCenter(context: Context) {
-        val url: String = if (EnvHelper.isDevEnv) {
-            Constants.ORDER_CENTER_ADDRESS_DEV
-        } else {
-            Constants.ORDER_CENTER_ADDRESS
-        }
-        directToFullScreenWebPage(context, url, true)
-    }
-
-    /**
-     * 跳转至订单详情
-     */
-    @JvmStatic
-    fun directToOrderDetail(context: Context, orderId: String) {
-        var url: String = if (EnvHelper.isDevEnv) {
-            Constants.ORDER_DETAIL_ADDRESS_DEV
-        } else {
-            Constants.ORDER_DETAIL_ADDRESS
-        }
-
-        url = String.format(
-            Locale.CHINA,
-            "%s&order_id=%s&timestamp=%d",
-            url,
-            orderId,
-            (Date().time / 1000 / 1000.toFloat()).roundToInt()
-        )
-        directToFullScreenWebPage(context, url, true)
-    }
-
-    /**
-     * 跳转至邀请好友
-     */
-    @JvmStatic
-    fun directToInviteFriends(context: Context) {
-        val url: String = if (EnvHelper.isDevEnv) {
-            Constants.INVITE_FRIENDS_ADDRESS_DEV
-        } else {
-            Constants.INVITE_FRIENDS_ADDRESS
-        }
-        directToFullScreenWebPage(context, url, true)
-    }
-
-    /**
-     * 跳转至等级页面
-     */
-    @JvmStatic
-    fun directToLevelPage(context: Context) {
-        var url: String = if (isPublishEnv()) {
-            Constants.LEVEL_ADDRESS
-        } else {
-            Constants.LEVEL_ADDRESS_DEV
-        }
-
-        url = String.format(Locale.CHINA, "%s?timestamp=%d", url, (Date().time / 1000 / 1000.toFloat()).roundToInt())
-        directToFullScreenWebPage(context, url, true)
-    }
-
-    /**
-     * 跳转至兑换规则
-     */
-    @JvmStatic
-    fun directToExchangeRulePage(context: Context) {
-        var url: String = if (isPublishEnv()) {
-            Constants.EXCHANGE_RULE_ADDRESS
-        } else {
-            Constants.EXCHANGE_RULE_ADDRESS_DEV
-        }
-
-        url = String.format(Locale.CHINA, "%s&timestamp=%d", url, (Date().time / 1000 / 1000.toFloat()).roundToInt())
-        directToFullScreenWebPage(context, url, true)
-    }
-
-    /**
-     * 跳转至光能规则
-     */
-    @JvmStatic
-    fun directToEnergyRulePage(context: Context) {
-        var url: String = if (isPublishEnv()) {
-            Constants.ENERGY_RULE_ADDRESS
-        } else {
-            Constants.ENERGY_RULE_ADDRESS_DEV
-        }
-
-        url = String.format(Locale.CHINA, "%s&timestamp=%d", url, (Date().time / 1000 / 1000.toFloat()).roundToInt())
-        directToFullScreenWebPage(context, url, true)
-    }
-
-    /**
-     * 跳转至兑换商品
-     */
-    @JvmStatic
-    fun directToExchangeCommodityPage(context: Context) {
-        var url: String = if (isPublishEnv()) {
-            Constants.EXCHANGE_COMMODITY_ADDRESS
-        } else {
-            Constants.EXCHANGE_COMMODITY_ADDRESS_DEV
-        }
-
-        url = String.format(Locale.CHINA, "%s&timestamp=%d", url, (Date().time / 1000 / 1000.toFloat()).roundToInt())
-        directToFullScreenWebPage(context, url, true)
-    }
-
-    /**
-     * 跳转至抽奖乐园
-     */
-    @JvmStatic
-    fun directToLotteryParadisePage(context: Context) {
-        var url: String = if (isPublishEnv()) {
-            Constants.LOTTERY_PARADISE_ADDRESS
-        } else {
-            Constants.LOTTERY_PARADISE_ADDRESS_DEV
-        }
-
-        url = String.format(Locale.CHINA, "%s&timestamp=%d", url, (Date().time / 1000 / 1000.toFloat()).roundToInt())
-        directToFullScreenWebPage(context, url, true)
-    }
-
-    /**
-     * 跳转至我的奖品
-     */
-    @JvmStatic
-    fun directToMyPrizePage(context: Context) {
-        var url: String = if (isPublishEnv()) {
-            Constants.MY_PRIZE_ADDRESS
-        } else {
-            Constants.MY_PRIZE_ADDRESS_DEV
-        }
-
-        url = String.format(Locale.CHINA, "%s&timestamp=%d", url, (Date().time / 1000 / 1000.toFloat()).roundToInt())
-        directToFullScreenWebPage(context, url, true)
-    }
-
-    /**
-     * 跳转至中奖订单详情
-     */
-    @JvmStatic
-    fun directToWinOrderDetail(context: Context, orderId: String, activityId: String) {
-        var url: String = if (isPublishEnv()) {
-            Constants.WIN_ORDER_DETAIL_ADDRESS
-        } else {
-            Constants.WIN_ORDER_DETAIL_ADDRESS_DEV
-        }
-
-        url = String.format(
-            Locale.CHINA,
-            "%s&order_id=%s&activity_id=%s&timestamp=%d",
-            url,
-            orderId,
-            activityId,
-            (Date().time / 1000 / 1000.toFloat()).roundToInt()
-        )
-        directToFullScreenWebPage(context, url, true)
-    }
 
     /**
      * 跳转至地址信息

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

@@ -46,7 +46,6 @@ import com.gh.vspace.VHelper
 import com.lightgame.download.DownloadConfig
 import com.lightgame.download.DownloadEntity
 import com.lightgame.download.DownloadStatus
-import com.lightgame.download.FileUtils
 import com.lightgame.utils.Utils
 import java.io.File
 import java.util.concurrent.LinkedBlockingQueue

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

@@ -32,7 +32,10 @@ import com.gh.gamecenter.help.HelpAndFeedbackBridge
 import com.gh.gamecenter.pkg.PkgHelper
 import com.gh.vspace.VHelper
 import com.halo.assistant.HaloApp
-import com.lightgame.download.*
+import com.lightgame.download.DataWatcher
+import com.lightgame.download.DownloadConfig
+import com.lightgame.download.DownloadEntity
+import com.lightgame.download.DownloadStatus
 import com.lightgame.utils.AppManager
 import com.lightgame.utils.Utils
 import org.greenrobot.eventbus.EventBus

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

@@ -41,7 +41,6 @@ import com.gh.gamecenter.retrofit.RetrofitManager
 import com.gh.gamecenter.teenagermode.TeenagerModeActivity
 import com.gh.vspace.VHelper
 import com.lightgame.download.DownloadEntity
-import com.lightgame.download.FileUtils
 import com.lightgame.utils.Utils
 import java.io.File
 

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

@@ -35,8 +35,6 @@ object HomeBottomBarHelper {
             text = "游戏库",
             name = "游戏库",
             position = 2,
-            iconSelect = "https://resource.ghzs.com/image/game/library/entrance/5e183202913fbd002c75f247.png",
-            iconUnselect = "https://resource.ghzs.com/image/game/library/entrance/5e1831fd913fbd003024641e.png",
             animationCode = animationCode,
             default = false,
             display = Display()

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

@@ -50,7 +50,7 @@ public class InstallUtils {
             public void handleMessage(Message msg) {
                 if (msg.what == INSTALL_WHAT && packageManager != null) {
                     ArrayList<String> list = new ArrayList<>();
-                    List<PackageInfo> packageInfos = PackageUtils.getInstalledPackages(context, 0);
+                    List<PackageInfo> packageInfos = PackageHelper.INSTANCE.getInstalledPackages(context, 0);
                     for (PackageInfo packageInfo : packageInfos) {
                         if ((packageInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 0) {
                             list.add(packageInfo.packageName);

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

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

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

@@ -566,7 +566,7 @@ public class MessageShareUtils {
         String path;
         // 安卓11无法访问Android/data目录
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            path = Environment.getExternalStorageDirectory().getAbsolutePath() + "/ShareImg/";
+            path = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES).getAbsolutePath() + "/ShareImg/";
         } else {
             path = context.getExternalCacheDir().getPath() + "/ShareImg/";
         }

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

@@ -2,23 +2,53 @@ 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.content.pm.PermissionInfo
+import android.os.Build
+import android.provider.Settings
 import com.gh.common.constant.Config
+import com.gh.gamecenter.common.utils.PermissionHelper.isGetInstalledListPermissionDisabled
+import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.feature.entity.SettingsEntity
 import com.halo.assistant.HaloApp
+import com.lightgame.utils.Utils
+import java.io.BufferedReader
+import java.io.IOException
+import java.io.InputStreamReader
+import kotlin.collections.ArrayList
+import kotlin.collections.HashSet
 
 object PackageHelper {
 
+    private const val TAG = "PackageHelper"
+
+    private const val SP_GET_INSTALLED_API_AGREED = "get_installed_api_agreed"
+
+    private const val UNKNOWN = -1
+    private const val UNSUPPORTED = 0
+    private const val SUPPORTED = 1
+
+    private var lastInstalledPackageListTime = 0L
+    private var installedPackageList: List<PackageInfo> = arrayListOf()
+    private var isGetInstalledPackagesApiAgreed = false
+    private var isGetInstalledListPermissionSupported = UNKNOWN // 设备是否支持禁用获取已安装应用列表。-1 代表支持情况未知，0 代表不支持， 1 代表支持
+
     // 评论黑名单包名列表，避免用户安装了 Xposed Installer 这样的工具，也能在包含该安装包的游戏详情页评论
-    var commentPackageNameBlackList = arrayListOf<String>()
+    private var _commentPackageNameBlackList = arrayListOf<String>()
+    val commentPackageNameBlackList: ArrayList<String> = _commentPackageNameBlackList
 
     // 关闭下载的包列表
-    var downloadPackageNameBlackList = arrayListOf<String>()
+    private var _downloadPackageNameBlackList = arrayListOf<String>()
+    val downloadPackageNameBlackList: ArrayList<String> = _downloadPackageNameBlackList
 
     // 本地已安装的包去掉关闭下载的包后的列表
-    var validLocalPackageNameSet = hashSetOf<String>()
+    private var _validLocalPackageNameSet = hashSetOf<String>()
+    val validLocalPackageNameSet: HashSet<String> = _validLocalPackageNameSet
 
     // 游戏包名匹配列表
-    var relatedPackageList = arrayListOf<SettingsEntity.GameWithPackages>()
+    private var _relatedPackageList = arrayListOf<SettingsEntity.GameWithPackages>()
+    val relatedPackageList: ArrayList<SettingsEntity.GameWithPackages> = _relatedPackageList
 
     // 本地已安装包的列表
     var localPackageNameSet = hashSetOf<String>()
@@ -38,33 +68,26 @@ object PackageHelper {
     }
 
     @JvmStatic
-    fun initList() {
-        Config.getSettings()?.gameCommentBlackList?.let {
-            commentPackageNameBlackList = ArrayList(it)
-        }
-        Config.getSettings()?.gameDownloadBlackList?.let {
-            downloadPackageNameBlackList = ArrayList(it)
-        }
-        Config.getSettings()?.gamePackageMatch?.let {
-            relatedPackageList = ArrayList(it)
-        }
+    fun refreshList() {
+        Config.getSettings()?.gameCommentBlackList?.let { _commentPackageNameBlackList = ArrayList(it) }
+        Config.getSettings()?.gameDownloadBlackList?.let { _downloadPackageNameBlackList = ArrayList(it) }
+        Config.getSettings()?.gamePackageMatch?.let { _relatedPackageList = ArrayList(it) }
 
-        Config.getSettings()?.gameDownloadBlackList
         updateValidPackageNameList()
     }
 
     private fun updateValidPackageNameList() {
-        validLocalPackageNameSet =
+        _validLocalPackageNameSet =
             localPackageNameSet.filterNot { p -> downloadPackageNameBlackList.contains(p) }.toHashSet()
     }
 
-    /*
+    /**
      * 获取所有已安装的软件的包名、版本(非系统应用)
      */
     private fun getAllPackageName(context: Context): HashSet<String> {
         val set = HashSet<String>()
         return try {
-            val packageInfos = PackageUtils.getInstalledPackages(context, 0)
+            val packageInfos = getInstalledPackages(context, 0)
             for (packageInfo in packageInfos) {
                 if (packageInfo.applicationInfo.flags and ApplicationInfo.FLAG_SYSTEM == 0) {
                     if (context.packageName != packageInfo.packageName) {
@@ -79,4 +102,154 @@ object PackageHelper {
         }
     }
 
+    /**
+     * 弃用已安装列表缓存
+     */
+    fun dumpInstalledListCache() {
+        lastInstalledPackageListTime = 0
+    }
+
+    /**
+     * 用户是否已经允许了调用获取已安装应用列表接口
+     * 优先用内存的值，没有再从 SP 中获取并更新
+     */
+    fun isGetInstalledPackagesApiAgreed(): Boolean {
+        return isGetInstalledPackagesApiAgreed
+                || (SPUtils.getBoolean(SP_GET_INSTALLED_API_AGREED).also { isGetInstalledPackagesApiAgreed = it })
+    }
+
+    /**
+     * 同意使用已安装应用列表 API
+     */
+    fun agreeOnGetInstalledPackagesApi() {
+        isGetInstalledPackagesApiAgreed = true
+        SPUtils.setBoolean(SP_GET_INSTALLED_API_AGREED, true)
+    }
+
+    /**
+     * 获取已安装应用列表
+     */
+    fun getInstalledPackages(context: Context?, flags: Int): List<PackageInfo> {
+        Utils.log(TAG, "即将获取已安装应用列表")
+
+//        Utils.log(TAG, "即将获取已安装应用列表" + Thread.currentThread().getStackTrace().contentToString().replace( ',', '\n' ))
+
+        // 用户未同意使用已安装应用列表 API，返回空列表
+        if (!isGetInstalledPackagesApiAgreed()) {
+            Utils.log(TAG, "用户未同意使用已安装应用列表 API，返回空列表")
+            return installedPackageList
+        }
+
+        // 简单 debounce 过于频繁的获取已安装应用列表调用
+        if (System.currentTimeMillis() - lastInstalledPackageListTime < 3000 && installedPackageList.isNotEmpty()) {
+            Utils.log(TAG, "使用了缓存的已安装应用列表")
+            return installedPackageList
+        }
+
+        var shouldGetNewInstalledPackagedList = false
+
+        // 当前设备是否支持限制获取已安装应用列表的功能
+        if (isSupportGetInstalledAppsPermission(context!!)) {
+            Utils.log(TAG, "当前设备支持限制获取已安装应用列表的功能")
+            // 当前设备是否支持禁用了获取已安装应用列表
+            if (!isGetInstalledListPermissionDisabled(context)) {
+                Utils.log(TAG, "当前设备没有限制获取已安装应用列表的功能")
+                shouldGetNewInstalledPackagedList = true
+            } else {
+                Utils.log(TAG, "当前设备已限制获取已安装应用列表的功能")
+            }
+        } else {
+            Utils.log(TAG, "当前设备不支持限制获取已安装应用列表的功能")
+            shouldGetNewInstalledPackagedList = true
+        }
+
+        if (shouldGetNewInstalledPackagedList) {
+            lastInstalledPackageListTime = System.currentTimeMillis()
+            installedPackageList = getInstalledPackagesInternal(context, flags)
+        }
+
+        return installedPackageList
+    }
+
+    /**
+     * 是否支持动态获取已安装应用列表权限
+     */
+    fun isSupportGetInstalledAppsPermission(context: Context): Boolean {
+        // 若存在缓存，直接返回缓存结果。
+        if (isGetInstalledListPermissionSupported != UNKNOWN) {
+            return isGetInstalledListPermissionSupported != UNSUPPORTED
+        }
+
+        try {
+            // 根据官方提供的方法来判定是否支持限制获取已安装应用列表
+            val flag =
+                Settings.Secure.getInt(context.contentResolver, "oem_installed_apps_runtime_permission_enable", 0)
+            if (flag == 1) {
+                isGetInstalledListPermissionSupported = SUPPORTED
+                return true
+            }
+
+            // 部分未升级的手机没有上面配置项，有定义下面危险权限也认为是支持设备软件列表管控
+            val packageManager = context.packageManager
+            val permissionInfo = packageManager.getPermissionInfo("com.android.permission.GET_INSTALLED_APPS", 0)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+                if (permissionInfo.protection == PermissionInfo.PROTECTION_DANGEROUS) {
+                    isGetInstalledListPermissionSupported = SUPPORTED
+                    return true
+                } else {
+                    isGetInstalledListPermissionSupported = UNSUPPORTED
+                    return false
+                }
+            } else {
+                isGetInstalledListPermissionSupported = UNSUPPORTED
+                return false
+            }
+        } catch (e: PackageManager.NameNotFoundException) {
+            isGetInstalledListPermissionSupported = UNSUPPORTED
+            return false
+        }
+    }
+
+    /**
+     * 在5.1系统手机使用PackageManager获取已安装应用容易发生Package manager has died异常
+     * https://stackoverflow.com/questions/13235793/transactiontoolargeeception-when-trying-tÏo-get-a-list-of-applications-installed/30062632#30062632
+     */
+    private fun getInstalledPackagesInternal(context: Context, flags: Int): List<PackageInfo> {
+        Utils.log(TAG, "调用系统 API 获取已安装应用列表")
+
+        val pm = context.packageManager
+        try {
+            return pm.getInstalledPackages(flags)
+        } catch (ignored: java.lang.Exception) {
+            //we don't care why it didn't succeed. We'll do it using an alternative way instead
+        }
+        // use fallback:
+        val process: Process
+        val result: MutableList<PackageInfo> = java.util.ArrayList()
+        var bufferedReader: BufferedReader? = null
+        try {
+            process = Runtime.getRuntime().exec("pm list packages")
+            bufferedReader = BufferedReader(InputStreamReader(process.inputStream))
+            var line: String
+            while ((bufferedReader.readLine().also { line = it }) != null) {
+                val packageName = line.substring(line.indexOf(':') + 1)
+                val packageInfo = pm.getPackageInfo(packageName, flags)
+                result.add(packageInfo)
+            }
+            process.waitFor()
+        } catch (e: java.lang.Exception) {
+            e.printStackTrace()
+            if (e is InterruptedException) {
+                Thread.currentThread().interrupt()
+            }
+        } finally {
+            if (bufferedReader != null) try {
+                bufferedReader.close()
+            } catch (e: IOException) {
+                e.printStackTrace()
+            }
+        }
+        return result
+    }
+
 }

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

@@ -24,7 +24,6 @@ import com.gh.gamecenter.vpn.VpnHelper
 import com.gh.vspace.VHelper
 import com.halo.assistant.HaloApp
 import com.lightgame.download.DownloadEntity
-import com.lightgame.download.FileUtils
 import com.lightgame.utils.Utils
 import java.io.File
 

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

@@ -29,7 +29,6 @@ import com.gh.common.xapk.XapkInstaller;
 import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.common.constant.Constants;
 import com.gh.gamecenter.common.utils.ExtensionsKt;
-import com.gh.gamecenter.common.utils.PackageFlavorHelper;
 import com.gh.gamecenter.common.utils.PermissionHelper;
 import com.gh.gamecenter.core.utils.MD5Utils;
 import com.gh.gamecenter.core.utils.SentryHelper;
@@ -68,14 +67,8 @@ import java.util.zip.ZipFile;
 
 public class PackageUtils {
 
-    private static long mLastInstalledPackageListTime = 0L;
-    private static List<PackageInfo> mInstalledPackageList = null;
-
     private static final String TAG = "PackageUtils";
 
-    // 设备是否支持禁用获取已安装应用列表。-1 代表支持情况未知，0 代表不支持， 1 代表支持
-    private static int mIsSupportGetInstalledListPermission = -1;
-
     public static String getInstallPackageInfoSourceDir(String packageName) {
         try {
             return HaloApp.getInstance().getApplication().getPackageManager().getPackageInfo(packageName,
@@ -677,7 +670,7 @@ public class PackageUtils {
      */
     public static ArrayList<String> getAllPackageName(Context context) {
         ArrayList<String> list = new ArrayList<>();
-        List<PackageInfo> packageInfos = getInstalledPackages(context, 0);
+        List<PackageInfo> packageInfos = PackageHelper.INSTANCE.getInstalledPackages(context, 0);
         for (PackageInfo packageInfo : packageInfos) {
             if ((packageInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 0) {
                 if (!context.getPackageName().equals(packageInfo.packageName)) {
@@ -690,7 +683,7 @@ public class PackageUtils {
 
     public static ArrayList<String> getAllPackageNameIncludeGh(Context context) {
         ArrayList<String> list = new ArrayList<>();
-        List<PackageInfo> packageInfos = getInstalledPackages(context, 0);
+        List<PackageInfo> packageInfos = PackageHelper.INSTANCE.getInstalledPackages(context, 0);
         for (PackageInfo packageInfo : packageInfos) {
             if ((packageInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 0) {
                 list.add(packageInfo.packageName);
@@ -704,11 +697,9 @@ public class PackageUtils {
      */
     public static ArrayList<String> getAllPackageNameIncludeSystemApps(Context context) {
         ArrayList<String> list = new ArrayList<>();
-        List<PackageInfo> packageInfos = getInstalledPackages(context, 0);
+        List<PackageInfo> packageInfos = PackageHelper.INSTANCE.getInstalledPackages(context, 0);
         for (PackageInfo packageInfo : packageInfos) {
-            if (!context.getPackageName().equals(packageInfo.packageName)) {
-                list.add(packageInfo.packageName);
-            }
+            list.add(packageInfo.packageName);
         }
         return list;
     }
@@ -717,7 +708,7 @@ public class PackageUtils {
         JSONArray jsonArray = new JSONArray();
         try {
             PackageManager pm = context.getPackageManager();
-            List<PackageInfo> packageInfos = getInstalledPackages(context, 0);
+            List<PackageInfo> packageInfos = PackageHelper.INSTANCE.getInstalledPackages(context, 0);
             for (PackageInfo packageInfo : packageInfos) {
                 if ((packageInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 0) {
                     JSONObject jsonObject = new JSONObject();
@@ -758,7 +749,6 @@ public class PackageUtils {
         }
     }
 
-
     /**
      * 启动应用
      * 请使用 PackageLauncher.launchApp()
@@ -778,22 +768,6 @@ public class PackageUtils {
         }
     }
 
-    /*
-     * 根据包名，获取软件名称
-     */
-    public static String getNameByPackageName(Context context, String packageName) {
-        try {
-            PackageManager pm = context.getApplicationContext().getPackageManager();
-            ApplicationInfo applicationInfo = pm.getApplicationInfo(
-                    packageName, 0);
-            return applicationInfo.loadLabel(pm).toString();
-        } catch (NameNotFoundException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-
     /**
      * todo 统一判断
      * <p>
@@ -888,37 +862,6 @@ public class PackageUtils {
                 && !PackageUtils.isSignedByGh(HaloApp.getInstance().getApplication(), apkEntity.getPackageName());
     }
 
-    /**
-     * 获取调用者的进程名
-     *
-     * @param context 调用者的上下文
-     * @return 进程名
-     */
-    public static String obtainProcessName(Context context) {
-        if (PackageFlavorHelper.IS_TEST_FLAVOR) {
-            try {
-                final int pid = android.os.Process.myPid();
-                ActivityManager am = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
-                List<ActivityManager.RunningAppProcessInfo> listTaskInfo = am.getRunningAppProcesses();
-                if (listTaskInfo != null && !listTaskInfo.isEmpty()) {
-                    for (ActivityManager.RunningAppProcessInfo info : listTaskInfo) {
-                        if (info != null && info.pid == pid) {
-                            return info.processName;
-                        }
-                    }
-                }
-            } catch (Exception e) {
-                // 遇到异常了让这次调用正常执行
-                e.printStackTrace();
-                return BuildConfig.APPLICATION_ID;
-            }
-        } else {
-            return null;
-        }
-        return null;
-    }
-
-
     /**
      * 应用是否在前台运行
      */
@@ -943,8 +886,8 @@ public class PackageUtils {
             String packageName = context.getApplicationContext().getPackageName();
             for (ActivityManager.RunningAppProcessInfo appProcess : appProcesses) {
                 // The name of the process that this object is associated with.
-                if (appProcess.processName.equals(packageName) && appProcess.importance
-                        == ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND) {
+                if (appProcess.processName.equals(packageName)
+                        && appProcess.importance == ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND) {
                     return true;
                 }
             }
@@ -955,132 +898,6 @@ public class PackageUtils {
         return false;
     }
 
-    /**
-     * 弃用已安装列表缓存
-     */
-    public static void dumpInstalledListCache() {
-        mLastInstalledPackageListTime = 0;
-    }
-
-    public static List<PackageInfo> getInstalledPackages(Context context, int flags) {
-        Utils.log(TAG, "即将获取已安装应用列表");
-
-        // 简单 debounce 掉过于频繁的调用获取已安装列表调用
-        if (System.currentTimeMillis() - mLastInstalledPackageListTime < 1000
-                && mInstalledPackageList != null
-                && mInstalledPackageList.size() > 0) {
-            Utils.log(TAG, "使用了缓存的已安装应用列表");
-            return new ArrayList<>(mInstalledPackageList);
-        }
-
-        // 是否需要调用系统 API 获取最新的已安装应用列表
-        boolean shouldGetNewInstalledPackagedList = false;
-
-        // 当前设备是否支持限制获取已安装应用列表的功能
-        if (isSupportGetInstalledAppsPermission(context)) {
-            Utils.log(TAG, "当前设备支持限制获取已安装应用列表的功能");
-            // 当前设备是否支持禁用了获取已安装应用列表
-            if (!PermissionHelper.isGetInstalledListPermissionDisabled(context)) {
-                Utils.log(TAG, "当前设备没有限制获取已安装应用列表的功能");
-                shouldGetNewInstalledPackagedList = true;
-            } else {
-                Utils.log(TAG, "当前设备已限制获取已安装应用列表的功能");
-            }
-        } else {
-            Utils.log(TAG, "当前设备不支持限制获取已安装应用列表的功能");
-            shouldGetNewInstalledPackagedList = true;
-        }
-
-        if (shouldGetNewInstalledPackagedList) {
-            mLastInstalledPackageListTime = System.currentTimeMillis();
-            mInstalledPackageList = getInstalledPackagesInternal(context, flags);
-        }
-
-        if (mInstalledPackageList == null) {
-            mInstalledPackageList = new ArrayList<>();
-        }
-
-        return mInstalledPackageList;
-    }
-
-    public static boolean isSupportGetInstalledAppsPermission(Context context) {
-        // 若存在缓存，直接返回缓存结果。为 0 代表不支持，为 1 代表支持
-        if (mIsSupportGetInstalledListPermission != -1) {
-            return mIsSupportGetInstalledListPermission != 0;
-        }
-
-        try {
-            // 根据官方提供的方法来判定是否支持限制获取已安装应用列表
-            int flag = Settings.Secure.getInt(context.getContentResolver(), "oem_installed_apps_runtime_permission_enable", 0);
-            if (flag == 1) {
-                mIsSupportGetInstalledListPermission = 1;
-                return true;
-            }
-
-            // 部分未升级的手机没有上面配置项，有定义下面危险权限也认为是支持设备软件列表管控
-            PackageManager packageManager = context.getPackageManager();
-            PermissionInfo permissionInfo = packageManager.getPermissionInfo("com.android.permission.GET_INSTALLED_APPS", 0);
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-                if (permissionInfo.getProtection() == PermissionInfo.PROTECTION_DANGEROUS) {
-                    mIsSupportGetInstalledListPermission = 1;
-                    return true;
-                } else {
-                    mIsSupportGetInstalledListPermission = 0;
-                    return false;
-                }
-            } else {
-                mIsSupportGetInstalledListPermission = 0;
-                return false;
-            }
-        } catch (NameNotFoundException e) {
-            mIsSupportGetInstalledListPermission = 0;
-            return false;
-        }
-    }
-
-    /**
-     * 在5.1系统手机使用PackageManager获取已安装应用容易发生Package manager has died异常
-     * https://stackoverflow.com/questions/13235793/transactiontoolargeeception-when-trying-tÏo-get-a-list-of-applications-installed/30062632#30062632
-     */
-    private static List<PackageInfo> getInstalledPackagesInternal(Context context, int flags) {
-        Utils.log(TAG, "调用系统 API 获取已安装应用列表");
-
-        final PackageManager pm = context.getPackageManager();
-        try {
-            return pm.getInstalledPackages(flags);
-        } catch (Exception ignored) {
-            //we don't care why it didn't succeed. We'll do it using an alternative way instead
-        }
-        // use fallback:
-        Process process;
-        List<PackageInfo> result = new ArrayList<>();
-        BufferedReader bufferedReader = null;
-        try {
-            process = Runtime.getRuntime().exec("pm list packages");
-            bufferedReader = new BufferedReader(new InputStreamReader(process.getInputStream()));
-            String line;
-            while ((line = bufferedReader.readLine()) != null) {
-                final String packageName = line.substring(line.indexOf(':') + 1);
-                final PackageInfo packageInfo = pm.getPackageInfo(packageName, flags);
-                result.add(packageInfo);
-            }
-            process.waitFor();
-        } catch (Exception e) {
-            e.printStackTrace();
-            if (e instanceof InterruptedException) {
-                Thread.currentThread().interrupt();
-            }
-        } finally {
-            if (bufferedReader != null)
-                try {
-                    bufferedReader.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-        }
-        return result;
-    }
-
     public static String getWebviewPath(Context context) {
         final PackageInfo webViewPackageInfo = WebViewCompat.getCurrentWebViewPackage(context);
         return webViewPackageInfo != null ? webViewPackageInfo.applicationInfo.sourceDir : null;

app/src/main/java/com/gh/common/view/DownloadProgressBar.java

@@ -1,248 +0,0 @@
-package com.gh.common.view;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffXfermode;
-import android.graphics.Rect;
-import android.graphics.RectF;
-import android.text.TextPaint;
-import android.text.TextUtils;
-import android.util.AttributeSet;
-import android.widget.ProgressBar;
-
-import androidx.annotation.StringRes;
-import androidx.core.content.ContextCompat;
-
-import com.gh.gamecenter.core.utils.DisplayUtils;
-import com.gh.gamecenter.R;
-
-public class DownloadProgressBar extends ProgressBar {
-    public static final int MAX_LENGTH = 1000;
-    public static final int DOWNLOAD_NORMAL_STYLE = 0;
-    public static final int DOWNLOAD_IMAGE_STYLE = 2;
-
-    public enum DownloadType {
-        NORMAL,
-        NONE,
-        NONE_WITH_HINT,
-        PLUGIN,
-        LAUNCH_OR_OPEN,
-        INSTALL_NORMAL,
-        INSTALL_PLUGIN,
-        DOWNLOADING_NORMAL,
-        DOWNLOADING_PLUGIN,
-        RESERVABLE,
-        RESERVED,
-        H5_GAME,
-        UPDATING,
-        TEENAGER_MODEL,
-        SPECIAL_DOWNLOAD,
-
-        XAPK_UNZIPPING,
-        XAPK_SUCCESS,
-        XAPK_FAILURE,
-    }
-
-    private PorterDuffXfermode mDuffXFerMode = new PorterDuffXfermode(PorterDuff.Mode.SRC_IN);
-    private Paint mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-    // 仅用于测量文字是否超出范围，不用于画文字
-    private TextPaint mFakeTextPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG);
-
-    private DownloadType mDownloadType;
-
-    private String mText;
-
-    private int mDownloadStyle;
-    private int mDefaultColor;
-    private int mTextSize;
-
-    private boolean mShowDownloadPercent = false;
-
-    private Rect mTextBound = new Rect();
-
-    public DownloadProgressBar(Context context) {
-        super(context);
-    }
-
-    public DownloadProgressBar(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        if (attrs != null) {
-            TypedArray ta = context.obtainStyledAttributes(attrs, R.styleable.DownloadProgressBar);
-            mDownloadStyle = ta.getInteger(R.styleable.DownloadProgressBar_downloadStyle, DOWNLOAD_NORMAL_STYLE);
-            mTextSize = ta.getDimensionPixelSize(R.styleable.DownloadProgressBar_textSize, DisplayUtils.sp2px(getContext(), 14));
-            mShowDownloadPercent = ta.getBoolean(R.styleable.DownloadProgressBar_showDownloadPercent, false);
-            ta.recycle();
-        }
-        setMax(MAX_LENGTH);
-        setProgressDrawable(getResources().getDrawable(R.drawable.game_item_btn_download_style));
-    }
-
-    Bitmap srcBitmap;
-    Canvas srcCanvas;
-    RectF rectF;
-
-    private void create() {
-        srcBitmap = Bitmap.createBitmap(getMeasuredWidth(), getMeasuredHeight(), Bitmap.Config.ARGB_8888);
-        srcCanvas = new Canvas(srcBitmap);
-        rectF = new RectF(0, 0, getProgress() * getWidth() / MAX_LENGTH, getMeasuredHeight());
-    }
-
-    @Override
-    protected void onDraw(Canvas canvas) {
-        super.onDraw(canvas);
-        if (TextUtils.isEmpty(mText)) return;
-
-        mPaint.setColor(mDefaultColor == 0 ? ContextCompat.getColor(getContext(), R.color.text_theme) : mDefaultColor); // 初始化颜色
-        mPaint.setTextSize(mTextSize);
-        mFakeTextPaint.setTextSize(mTextSize);
-        mFakeTextPaint.setStyle(Paint.Style.FILL_AND_STROKE);
-        mFakeTextPaint.setTextAlign(Paint.Align.CENTER);
-        mPaint.setStyle(Paint.Style.FILL_AND_STROKE);
-        mPaint.setXfermode(null);
-        create();
-
-        Paint.FontMetricsInt fontMetrics = mPaint.getFontMetricsInt();
-        int baseline = (getHeight() - fontMetrics.bottom - fontMetrics.top) / 2;
-
-        mPaint.setTextAlign(Paint.Align.CENTER);
-
-        canvas.getClipBounds(mTextBound); //The dimensions of your canvas
-        int width = mTextBound.width() - 20; //10 to keep some space on the right for the "..."
-        String txt = TextUtils.ellipsize(mText, mFakeTextPaint, width, TextUtils.TruncateAt.END).toString();
-        srcCanvas.drawText(txt, getWidth() / 2, baseline, mPaint);
-        mPaint.setXfermode(mDuffXFerMode);
-        if (getProgress() != 0) {
-            int color = Color.WHITE;
-            if (DOWNLOAD_IMAGE_STYLE == mDownloadStyle) {
-                color = Color.BLACK;
-            }
-            mPaint.setColor(color); // 反向颜色
-        }
-
-        srcCanvas.drawRect(rectF, mPaint);
-        canvas.drawBitmap(srcBitmap, 0, 0, null);
-    }
-
-    public void setText(String text) {
-        mText = text;
-        invalidate();
-    }
-
-    public String getText() {
-        if (mText != null && mText.contains("%")) {
-            return getResources().getString(R.string.downloading);
-        }
-        return mText;
-    }
-
-    public void setText(@StringRes int res) {
-        if (mShowDownloadPercent && res == R.string.downloading) {
-            setText(getProgressPercent());
-        } else {
-            setText(getResources().getString(res));
-        }
-    }
-
-    public void setDownloadStyle(int downloadStyle) {
-        this.mDownloadStyle = downloadStyle;
-    }
-
-    @Override
-    public synchronized void setProgress(int progress) {
-        super.setProgress(progress);
-        if (getResources().getString(R.string.downloading).equals(mText)) {
-            setText(getProgressPercent());
-        }
-    }
-
-    private String getProgressPercent() {
-        return getProgress() / 10 + "%";
-    }
-
-    public void setDownloadType(DownloadType downloadType) {
-        switch (downloadType) {
-            case NORMAL:
-            case NONE_WITH_HINT:
-            case INSTALL_NORMAL:
-            case H5_GAME:
-                if (mDownloadStyle == DOWNLOAD_IMAGE_STYLE) {
-                    setProgressDrawable(getResources().getDrawable(R.drawable.text_white_background));
-                    mDefaultColor = Color.BLACK;
-                } else {
-                    setProgressDrawable(getResources().getDrawable(R.drawable.download_button_normal_style));
-                    mDefaultColor = Color.WHITE;
-                }
-                setProgress(0);
-                break;
-            case PLUGIN:
-            case INSTALL_PLUGIN:
-                setProgressDrawable(getResources().getDrawable(R.drawable.download_button_pluggable_style));
-                mDefaultColor = Color.WHITE;
-                setProgress(0);
-                break;
-            case NONE:
-                setProgressDrawable(getResources().getDrawable(R.drawable.button_round_gray_light));
-                mDefaultColor = ContextCompat.getColor(getContext(), R.color.text_tertiary);
-                setProgress(0);
-                break;
-            case LAUNCH_OR_OPEN:
-                if (mDownloadStyle == DOWNLOAD_IMAGE_STYLE) {
-                    setProgressDrawable(getResources().getDrawable(R.drawable.detail_download_open_image_style));
-                    mDefaultColor = Color.WHITE;
-                } else {
-                    setProgressDrawable(getResources().getDrawable(R.drawable.download_button_normal_style));
-                    mDefaultColor = Color.WHITE;
-                }
-                setProgress(0);
-                break;
-            case DOWNLOADING_NORMAL:
-                if (mDownloadStyle == DOWNLOAD_IMAGE_STYLE) {
-                    setProgressDrawable(getResources().getDrawable(R.drawable.detail_downloading_normal_image_style));
-                    mDefaultColor = Color.WHITE;
-                } else {
-                    setProgressDrawable(getResources().getDrawable(R.drawable.detail_downloading_normal_style));
-                    mDefaultColor = ContextCompat.getColor(getContext(), R.color.text_theme);
-                }
-                break;
-            case DOWNLOADING_PLUGIN:
-                setProgressDrawable(getResources().getDrawable(R.drawable.detail_downloading_normal_style));
-                mDefaultColor = ContextCompat.getColor(getContext(), R.color.text_theme);
-                break;
-            case RESERVABLE:
-                setProgressDrawable(getResources().getDrawable(R.drawable.button_reserve));
-                mDefaultColor = ContextCompat.getColor(getContext(), R.color.white);
-                break;
-            case UPDATING:
-                setProgressDrawable(getResources().getDrawable(R.drawable.download_button_updating_style));
-                mDefaultColor = ContextCompat.getColor(getContext(), R.color.white);
-                break;
-            case RESERVED:
-                setProgressDrawable(getResources().getDrawable(R.drawable.button_round_gray_light));
-                mDefaultColor = ContextCompat.getColor(getContext(), R.color.text_tertiary);
-                break;
-            case XAPK_FAILURE:
-            case XAPK_SUCCESS:
-            case XAPK_UNZIPPING:
-                setProgressDrawable(getResources().getDrawable(R.drawable.progressbar_xapk_detail_style));
-                mDefaultColor = ContextCompat.getColor(getContext(), R.color.white);
-                break;
-            case TEENAGER_MODEL:
-            case SPECIAL_DOWNLOAD:
-                setProgressDrawable(getResources().getDrawable(R.drawable.download_button_normal_style));
-                mDefaultColor = ContextCompat.getColor(getContext(), R.color.white);
-                break;
-        }
-
-        mDownloadType = downloadType;
-    }
-
-    public DownloadType getDownloadType() {
-        return mDownloadType;
-    }
-
-}

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

@@ -4,8 +4,12 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.os.Build
+import android.os.Environment
 import android.provider.Settings
+import androidx.appcompat.app.AppCompatActivity
 import com.gh.common.constant.Config
+import com.gh.common.dialog.ManagerAllFilesPermissionDialogFragment
+import com.gh.common.util.*
 import com.gh.common.util.DirectUtils
 import com.gh.common.util.DownloadNotificationHelper
 import com.gh.common.util.PackageInstaller
@@ -15,6 +19,7 @@ import com.gh.gamecenter.R
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.core.AppExecutor
+import com.gh.gamecenter.core.utils.CurrentActivityHolder
 import com.gh.gamecenter.core.utils.SentryHelper
 import com.gh.gamecenter.core.utils.ToastUtils
 import com.gh.gamecenter.xapk.XApkUnZipper
@@ -22,10 +27,7 @@ import com.gh.gamecenter.xapk.core.XApkFile
 import com.gh.gamecenter.xapk.core.XApkUnZipCallback
 import com.gh.gamecenter.xapk.core.XApkUnZipEntry
 import com.gh.gamecenter.xapk.core.XApkUnZipOutputFactory
-import com.gh.gamecenter.xapk.io.NonSplitApksOutput
-import com.gh.gamecenter.xapk.io.OBBFileOutput
-import com.gh.gamecenter.xapk.io.SplitApksOutput
-import com.gh.gamecenter.xapk.io.XApkFileOutput
+import com.gh.gamecenter.xapk.io.*
 import com.gh.gamecenter.xapk.pi.IPackageInstaller
 import com.gh.ndownload.NDataChanger
 import com.halo.assistant.HaloApp
@@ -112,19 +114,38 @@ object XapkInstaller : XApkUnZipCallback, XApkUnZipOutputFactory {
                 return
             }
 
-            DownloadManager.getInstance().getDownloadEntitySnapshot(downloadEntity.url, downloadEntity.gameId)
-                ?.let {
-                    unzipXapkFile(it)
-                    if (showUnzipToast) {
-                        Utils.toast(mContext, "解压过程请勿退出光环助手！")
+            if (checkPermission(downloadEntity, showUnzipToast)) {
+                DownloadManager.getInstance().getDownloadEntitySnapshot(downloadEntity.url, downloadEntity.gameId)
+                    ?.let {
+                        unzipXapkFile(it)
+                        if (showUnzipToast) {
+                            Utils.toast(mContext, "解压过程请勿退出光环助手！")
+                        }
                     }
-                }
+            }
         } else {
             throwExceptionInDebug("如果是Apk包请使用PackageInstaller进行安装")
             PackageInstaller.install(mContext, downloadEntity)
         }
     }
 
+    private fun checkPermission(downloadEntity: DownloadEntity, showUnzipToast: Boolean = false): Boolean {
+        // 安卓11以上系统需要开启所有文件访问权限
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
+            && !Environment.isExternalStorageManager()) {
+            CurrentActivityHolder.getCurrentActivity()?.let {
+                ManagerAllFilesPermissionDialogFragment.show(it as AppCompatActivity) {
+                    unzipXapkFile(downloadEntity)
+                    if (showUnzipToast) {
+                        Utils.toast(mContext, "解压过程请勿退出光环助手！")
+                    }
+                }
+            }
+            return false
+        }
+        return true
+    }
+
     private fun unzipXapkFile(downloadEntity: DownloadEntity) {
         mXApkUnZipper.unzip(
             XApkUnZipEntry(

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

@@ -2,15 +2,11 @@ package com.gh.common.xapk
 
 import android.os.Build
 import android.os.Environment
-import com.gh.gamecenter.common.utils.debounceActionWithInterval
-import com.gh.gamecenter.common.utils.getExtension
-import com.gh.gamecenter.common.utils.throwException
-import com.gh.gamecenter.common.utils.throwExceptionInDebug
 import com.gh.gamecenter.BuildConfig
+import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.core.utils.MD5Utils
 import com.halo.assistant.HaloApp
 import com.lightgame.download.DownloadEntity
-import com.lightgame.download.FileUtils
 import com.lightgame.utils.Utils
 import net.lingala.zip4j.progress.ProgressMonitor
 import java.io.File

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

@@ -25,36 +25,44 @@ import com.gh.gamecenter.feature.entity.CustomPageTrackData;
 import com.gh.gamecenter.feature.entity.TagStyleEntity;
 import com.gh.gamecenter.feature.exposure.ExposureEvent;
 import com.gh.common.exposure.ExposureUtils;
-import com.gh.gamecenter.common.exposure.meta.MetaUtil;
 import com.gh.common.history.HistoryHelper;
 import com.gh.common.simulator.SimulatorGameManager;
 import com.gh.common.util.DataCollectionUtils;
-import com.gh.gamecenter.common.utils.DeviceUtils;
 import com.gh.common.util.DialogUtils;
-import com.gh.gamecenter.core.utils.GsonUtils;
 import com.gh.common.util.HomePluggableHelper;
 import com.gh.common.util.LunchType;
-import com.gh.gamecenter.common.utils.NetworkUtils;
 import com.gh.common.util.PackageInstaller;
 import com.gh.common.util.PackageUtils;
+import com.gh.gamecenter.BuildConfig;
+import com.gh.gamecenter.common.base.GlobalActivityManager;
+import com.gh.gamecenter.common.constant.Constants;
+import com.gh.gamecenter.common.exposure.meta.MetaUtil;
+import com.gh.gamecenter.common.utils.DeviceUtils;
+import com.gh.gamecenter.common.utils.ExtensionsKt;
+import com.gh.gamecenter.common.utils.FileUtils;
+import com.gh.gamecenter.common.utils.NetworkUtils;
+import com.gh.gamecenter.common.utils.SensorsBridge;
+import com.gh.gamecenter.core.AppExecutor;
+import com.gh.gamecenter.core.utils.AppDebugConfig;
+import com.gh.gamecenter.core.utils.GsonUtils;
 import com.gh.gamecenter.core.utils.PageSwitchDataHelper;
 import com.gh.gamecenter.core.utils.SPUtils;
-import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.core.utils.SentryHelper;
 import com.gh.gamecenter.download.DownloadedGameIdAndPackageNameDao;
-import com.gh.gamecenter.feature.entity.ApkEntity;
-import com.gh.gamecenter.feature.entity.GameEntity;
 import com.gh.gamecenter.entity.GameUpdateEntity;
 import com.gh.gamecenter.entity.HomePluggableFilterEntity;
-import com.gh.gamecenter.feature.entity.PluginLocation;
 import com.gh.gamecenter.eventbus.EBDownloadStatus;
-import com.gh.gamecenter.manager.PackagesManager;
+import com.gh.gamecenter.feature.entity.ApkEntity;
+import com.gh.gamecenter.feature.entity.GameEntity;
+import com.gh.gamecenter.feature.entity.PluginLocation;
+import com.gh.gamecenter.feature.exposure.ExposureEvent;
 import com.gh.gamecenter.login.user.UserManager;
+import com.gh.gamecenter.manager.PackagesManager;
 import com.gh.gamecenter.packagehelper.PackageRepository;
-import com.gh.vspace.VHelper;
 import com.gh.ndownload.NDataChanger;
 import com.gh.ndownload.NDownloadBridge;
 import com.gh.ndownload.NDownloadService;
+import com.gh.vspace.VHelper;
 import com.halo.assistant.HaloApp;
 import com.lightgame.download.ConnectionUtils;
 import com.lightgame.download.DataWatcher;
@@ -63,7 +71,6 @@ import com.lightgame.download.DownloadDao;
 import com.lightgame.download.DownloadEntity;
 import com.lightgame.download.DownloadStatus;
 import com.lightgame.download.DownloadStatusListener;
-import com.lightgame.download.FileUtils;
 import com.lightgame.download.HttpDnsManager;
 import com.lightgame.utils.Utils;
 

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

@@ -3,7 +3,9 @@ package com.gh.download
 import android.annotation.SuppressLint
 import android.text.TextUtils
 import com.gh.common.util.*
-import com.gh.gamecenter.feature.utils.ConcernUtils
+import com.gh.common.util.DataCollectionUtils
+import com.gh.common.util.PackageInstaller
+import com.gh.common.util.PackageUtils
 import com.gh.common.xapk.XapkInstaller
 import com.gh.download.server.BrowserInstallHelper
 import com.gh.gamecenter.common.constant.Constants
@@ -18,6 +20,7 @@ import com.gh.gamecenter.core.utils.ThirdPartyPackageHelper
 import com.gh.gamecenter.core.utils.UrlFilterUtils
 import com.gh.gamecenter.entity.GameDigestEntity
 import com.gh.gamecenter.eventbus.EBPackage
+import com.gh.gamecenter.feature.utils.ConcernUtils
 import com.gh.gamecenter.login.user.UserManager
 import com.gh.gamecenter.manager.PackagesManager
 import com.gh.gamecenter.packagehelper.PackageRepository

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

@@ -27,21 +27,13 @@ object ExoCacheManager {
             if (NetworkUtils.isWifiConnected(HaloApp.getInstance().application)) {
                 10 * 1024 * 1024L
             } else {
-                when (NetworkUtils.getMobileNetworkType(HaloApp.getInstance().application)) {
-                    "5G", "4G" -> 10 * 1024 * 1024L
-                    "3G" -> 5 * 1024 * 1024L
-                    else -> 0L
-                }
+                10 * 1024 * 1024L
             }
         } else {
             if (NetworkUtils.isWifiConnected(HaloApp.getInstance().application)) {
                 50 * 1024 * 1024L
             } else {
-                when (NetworkUtils.getMobileNetworkType(HaloApp.getInstance().application)) {
-                    "5G", "4G" -> 20 * 1024 * 1024L
-                    "3G" -> 5 * 1024 * 1024L
-                    else -> 0L
-                }
+                20 * 1024 * 1024L
             }
         }
     }

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

@@ -28,7 +28,6 @@ import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.gh.gamecenter.manager.PackagesManager
 import com.lightgame.download.DownloadEntity
 import com.lightgame.download.DownloadStatus
-import com.lightgame.download.FileUtils
 import com.lightgame.utils.AppManager
 import com.lightgame.utils.Utils
 

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

@@ -28,10 +28,10 @@ import org.json.JSONObject
 import java.io.File
 import java.net.URLEncoder
 import java.util.*
+import kotlin.collections.ArrayList
 
 object BrowserInstallHelper {
 
-    // 随便选的 32321 居然在部分 vivo 手机上被占用，喷了
     private const val PORT = 40705
     private const val RESERVE_PORT = 40706
 
@@ -40,15 +40,12 @@ object BrowserInstallHelper {
     private val mContext by lazy { HaloApp.getInstance().application }
     private var mUseReservePort = false
 
-    private val mAllInstalledPackageList: ArrayList<String> by lazy {
-        PackageUtils.getAllPackageNameIncludeSystemApps(HaloApp.getInstance().applicationContext).apply {
-            add(HaloApp.getInstance().applicationContext.packageName)
-        }
-    }
+    private var mValidInstalledPackageList: ArrayList<String> = arrayListOf()
+    private var mValidConditionMatchedCache: Boolean? = null
 
     private fun getServer(port: Int): DownloadServer {
         val server = DownloadServer(port)
-        for (packageName in mAllInstalledPackageList) {
+        for (packageName in getAllInstalledPackageList()) {
             if (packageName.contains("com.freeme") || packageName.contains("com.zhuoyi")) {
                 server.isBuggyDevice = true
                 break
@@ -57,6 +54,23 @@ object BrowserInstallHelper {
         return server
     }
 
+    private fun getAllInstalledPackageList(): ArrayList<String> {
+        when {
+            mValidInstalledPackageList.isNotEmpty() -> {
+                return mValidInstalledPackageList
+            }
+
+            else -> {
+                val allInstalledPackageList = PackageUtils.getAllPackageNameIncludeSystemApps(mContext)
+
+                if (allInstalledPackageList.isNotEmpty()) {
+                    mValidInstalledPackageList = allInstalledPackageList
+                }
+                return mValidInstalledPackageList
+            }
+        }
+    }
+
     fun downloadFile(filePath: String) {
         if (!::mServer.isInitialized) mServer = if (mUseReservePort) getServer(RESERVE_PORT) else getServer(PORT)
         if (!mServer.isAlive && !startServer()) {
@@ -80,7 +94,7 @@ object BrowserInstallHelper {
                 Base64.encodeToString(URLEncoder.encode(downloadUrl).trim().toByteArray(), Base64.NO_WRAP)
             DirectUtils.directToExternalBrowser(
                 mContext,
-                "https://down-and.ghzs.com/redirect?location=base64($encodedString)"
+                "https://down-and.ghzs6.com/redirect?location=base64($encodedString)"
             )
         } else {
             DirectUtils.directToExternalBrowser(mContext, downloadUrl)
@@ -237,32 +251,43 @@ object BrowserInstallHelper {
      * 是否满足开启浏览器安装的条件
      */
     private fun isConditionMatched(settingsEntity: NewSettingsEntity): Boolean {
+        if (mValidConditionMatchedCache != null) {
+            return mValidConditionMatchedCache!!
+        }
+
+        val packageList = getAllInstalledPackageList()
+
+        if (packageList.isEmpty()) return false
+
         settingsEntity.installModel?.whiteList?.let {
             for (packageName in it) {
-                if (mAllInstalledPackageList.contains(packageName)) {
-                    return false
+                if (packageList.contains(packageName)) {
+                    mValidConditionMatchedCache = false
+                    break
                 }
             }
         }
         settingsEntity.installModel?.packages?.let {
             for (packageName in it) {
-                if (mAllInstalledPackageList.contains(packageName)) {
-                    return true
+                if (packageList.contains(packageName)) {
+                    mValidConditionMatchedCache = true
+                    break
                 }
             }
         }
         // 匹配部分字符串即可
         settingsEntity.installModel?.regexPackages?.let {
             for (packageNamePieces in it) {
-                for (installedPackageName in mAllInstalledPackageList) {
+                for (installedPackageName in packageList) {
                     if (installedPackageName.contains(packageNamePieces)) {
-                        return true
+                        mValidConditionMatchedCache = true
+                        break
                     }
                 }
             }
         }
 
-        return false
+        return mValidConditionMatchedCache ?: false
     }
 
     fun onApkInstalled(path: String?) {

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

@@ -1,12 +1,12 @@
 package com.gh.download.server
 
+import com.gh.download.DownloadManager
 import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.feature.exposure.ExposureEvent
+import com.gh.gamecenter.common.utils.FileUtils
 import com.gh.gamecenter.common.utils.getMetaExtra
 import com.gh.gamecenter.common.utils.toObject
-import com.gh.download.DownloadManager
+import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.halo.assistant.HaloApp
-import com.lightgame.download.FileUtils
 import fi.iki.elonen.NanoHTTPD
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.schedulers.Schedulers

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

@@ -4,7 +4,7 @@ import com.lg.download.*
 import com.lg.ndownload.DownloadConfig
 import com.lg.ndownload.DownloadDbManager
 import com.lg.ndownload.DownloadQueue
-import com.lightgame.download.FileUtils
+import com.gh.gamecenter.common.utils.FileUtils
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
 

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

@@ -46,7 +46,7 @@ import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.entity.CommunityEntity
 import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.common.utils.*
-import com.gh.gamecenter.common.utils.ImageUtils.getTransformedUrl
+import com.gh.gamecenter.common.utils.ImageUtils.getIdealImageUrl
 import com.gh.gamecenter.common.view.DraggableBigImageView
 import com.gh.gamecenter.common.view.Gh_RelativeLayout
 import com.gh.gamecenter.core.runOnIoThread
@@ -831,7 +831,7 @@ class ImageViewerActivity : BaseActivity(), OnPageChangeListener {
                 && !NetworkUtils.isWifiOr4GConnected(this@ImageViewerActivity)
                 && !thumbnailImageUrl.contains(".gif")
             ) {
-                compressedStandardImageUrl = getTransformedUrl(thumbnailImageUrl, mLimitWidth)
+                compressedStandardImageUrl = getIdealImageUrl(thumbnailImageUrl, mLimitWidth)
                 thumbnailImageUrl = compressedStandardImageUrl ?: ""
             }
             val finalUrl = compressedStandardImageUrl

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

@@ -79,6 +79,7 @@ import com.gh.gamecenter.common.retrofit.BiResponse;
 import com.gh.gamecenter.common.retrofit.Response;
 import com.gh.gamecenter.common.utils.DialogHelper;
 import com.gh.gamecenter.common.utils.ExtensionsKt;
+import com.gh.gamecenter.common.utils.FileUtils;
 import com.gh.gamecenter.common.utils.NewFlatLogUtils;
 import com.gh.gamecenter.common.utils.SensorsBridge;
 import com.gh.gamecenter.common.utils.ShareUtils;
@@ -97,7 +98,6 @@ import com.gh.gamecenter.feature.utils.PlatformUtils;
 import com.gh.gamecenter.home.custom.model.CustomPageShareRepository;
 import com.gh.gamecenter.home.skip.PackageSkipActivity;
 import com.gh.gamecenter.login.user.UserManager;
-import com.gh.gamecenter.login.utils.QuickLoginHelper;
 import com.gh.gamecenter.manager.DataCollectionManager;
 import com.gh.gamecenter.packagehelper.PackageViewModel;
 import com.gh.gamecenter.retrofit.RetrofitManager;
@@ -113,7 +113,6 @@ import com.google.gson.reflect.TypeToken;
 import com.halo.assistant.HaloApp;
 import com.lightgame.download.DownloadEntity;
 import com.lightgame.download.DownloadStatus;
-import com.lightgame.download.FileUtils;
 import com.lightgame.utils.Utils;
 import com.sina.weibo.sdk.auth.AuthInfo;
 import com.sina.weibo.sdk.openapi.IWBAPI;
@@ -172,6 +171,8 @@ public class MainActivity extends BaseActivity {
         mMainWrapperViewModel = new ViewModelProvider(this, new MainWrapperViewModel.Factory(HaloApp.getInstance()))
                 .get(MainWrapperViewModel.class);
 
+        DisplayUtils.updateGlobalScreen(this);
+
         super.onCreate(savedInstanceState);
         setStatusBarColor(Color.TRANSPARENT);
 
@@ -317,8 +318,7 @@ public class MainActivity extends BaseActivity {
 
         mMainWrapperViewModel.requestAllDialogData();
 
-        // TODO 去掉一键登录？
-        QuickLoginHelper.getPhoneInfo();
+//        QuickLoginHelper.getPhoneInfo();
 
         // TODO 搞清楚为什么这里要获取微信相关配置
         WechatBindHelper.getWechatConfig(null);

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

@@ -111,7 +111,7 @@ public class ShareCardActivity extends ToolBarActivity {
 
         String qrBody;
         if (!TextUtils.isEmpty(newsId)) {
-            qrBody = "http://www.ghzs666.com/article/" + newsId + ".html?source=appshare200";
+            qrBody = "https://www.ghzs666.com/article/" + newsId + ".html?source=appshare200";
         } else {
             qrBody = "https://www.ghzs.com/?source=appshare200";
         }

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

@@ -166,7 +166,7 @@ public class ShareCardPicActivity extends ToolBarActivity {
 
         String qrBody;
         if (!TextUtils.isEmpty(newsId)) {
-            qrBody = "http://www.ghzs666.com/article/" + newsId + ".html?source=appshare200";
+            qrBody = "https://www.ghzs666.com/article/" + newsId + ".html?source=appshare200";
         } else {
             qrBody = "https://www.ghzs.com/?source=appshare200";
         }

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

@@ -1,6 +1,7 @@
 package com.gh.gamecenter;
 
 import static com.gh.gamecenter.common.constant.EntranceConsts.ENTRANCE_BROWSER;
+import static com.gh.gamecenter.common.constant.EntranceConsts.ENTRANCE_PUSH;
 import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_ANSWER;
 import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_ARTICLE;
 import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_CATEGORY;
@@ -129,6 +130,10 @@ public class SkipActivity extends BaseActivity {
                 String qaId = uri.getQueryParameter("qa_id");
                 String qaContentId = uri.getQueryParameter(EntranceConsts.KEY_QA_CONTENT_ID);
                 String qaTitle = uri.getQueryParameter(EntranceConsts.KEY_QA_TITLE);
+                String isFromPushString = uri.getQueryParameter(EntranceConsts.KEY_IS_FROM_PUSH);
+                boolean isFromPush = !TextUtils.isEmpty(isFromPushString) && isFromPushString.equals("true");
+                String entrance = isFromPush ? ENTRANCE_PUSH : ENTRANCE_BROWSER;
+                String pathName = isFromPush ? ENTRANCE_PUSH : "浏览器";
 
                 if (host != null) {
                     Intent intent;
@@ -141,40 +146,40 @@ public class SkipActivity extends BaseActivity {
                             createShortcut(uri);
                             return;
                         case HOST_ARTICLE:
-                            DirectUtils.directToArticle(this, path, ENTRANCE_BROWSER);
+                            DirectUtils.directToArticle(this, path, entrance);
                             break;
                         case HOST_GAME:
-                            DirectUtils.directToGameDetail(this, path, "", ENTRANCE_BROWSER, "true".equals(uri.getQueryParameter("auto_download")), to, null);
+                            DirectUtils.directToGameDetail(this, path, "", entrance, "true".equals(uri.getQueryParameter("auto_download")), to, null);
                             break;
                         case HOST_COLUMN:
-                            DirectUtils.directToSubject(this, path, uri.getQueryParameter(KEY_NAME), ENTRANCE_BROWSER, null, false);
+                            DirectUtils.directToSubject(this, path, uri.getQueryParameter(KEY_NAME), entrance, null, false);
                             break;
                         case HOST_SUGGESTION:
                             if (!TextUtils.isEmpty(qaId)) {
                                 DirectUtils.directToQa(this, qaTitle, qaId);
                             } else {
                                 // 插件反馈跳转到意见反馈分类页
-                                DirectUtils.directToFeedback(this, content, isQaFeedback, qaContentId, true, false, EntranceConsts.ENTRANCE_BROWSER);
+                                DirectUtils.directToFeedback(this, content, isQaFeedback, qaContentId, true, false, entrance);
                             }
                             break;
                         case HOST_DOWNLOAD:
-                            DirectUtils.directToDownloadManagerAndStartUpdate(this, path, uri.getQueryParameter(KEY_PACKAGENAME), ENTRANCE_BROWSER);
+                            DirectUtils.directToDownloadManagerAndStartUpdate(this, path, uri.getQueryParameter(KEY_PACKAGENAME), entrance);
                             break;
                         case HOST_ANSWER:
-                            DirectUtils.directToAnswerDetail(this, path, ENTRANCE_BROWSER, "浏览器");
+                            DirectUtils.directToAnswerDetail(this, path, entrance, pathName);
                             break;
                         case HOST_QUESTION:
-                            DirectUtils.directToQuestionDetail(this, path, ENTRANCE_BROWSER, "浏览器", "");
+                            DirectUtils.directToQuestionDetail(this, path, entrance, pathName, "");
                             break;
                         case HOST_TOOLBOX:
-                            DirectUtils.directToToolbox(this, uri.getQueryParameter("gameId"), uri.getQueryParameter("toolboxUrl"), ENTRANCE_BROWSER);
+                            DirectUtils.directToToolbox(this, uri.getQueryParameter("gameId"), uri.getQueryParameter("toolboxUrl"), entrance);
                             break;
                         case HOST_COMMUNITY:
                             DirectUtils.directToHomeCommunityTab(this);
                             break;
                         // 社区文章格式一
                         case "community.article":
-                            DirectUtils.directToCommunityArticle(this, uri.getQueryParameter("articleId"), uri.getQueryParameter("communityId"), ENTRANCE_BROWSER, "浏览器", "");
+                            DirectUtils.directToCommunityArticle(this, uri.getQueryParameter("articleId"), uri.getQueryParameter("communityId"), entrance, pathName, "");
                             break;
                         // 社区文章格式二
                         case "communities":
@@ -195,13 +200,13 @@ public class SkipActivity extends BaseActivity {
                                 }
                             }
                             if ("articles".equals(type)) {
-                                DirectUtils.directToCommunityArticle(this, typeId, communityId, ENTRANCE_BROWSER, "浏览器", "");
+                                DirectUtils.directToCommunityArticle(this, typeId, communityId, entrance, pathName, "");
                                 break;
                             }
                             break;
                         case HOST_VIDEO:
                             DirectUtils.directToVideoDetail(this, path, VideoDetailContainerViewModel.Location.HOTTEST_GAME_VIDEO.getValue(),
-                                    false, id, ENTRANCE_BROWSER, "浏览器", TextUtils.isEmpty(referer) ? "" : referer, "");
+                                    false, id, entrance, pathName, TextUtils.isEmpty(referer) ? "" : referer, "");
                             break;
                         case HOST_UPLOAD_VIDEO://跳转上传视频
                             String titleParameter = uri.getQueryParameter("title");
@@ -215,13 +220,13 @@ public class SkipActivity extends BaseActivity {
                             VideoLinkEntity linkEntity = new VideoLinkEntity(title, categoryId, link, tagActivityId, tagActivityName);
 
                             SimpleGameEntity simpleGameEntity = new SimpleGameEntity(gameId != null ? gameId : "", gameName != null ? gameName : "", "", "");
-                            Bundle nextToBundle = VideoManagerActivity.getVideoManagerBundle(linkEntity, simpleGameEntity, EntranceConsts.ENTRANCE_BROWSER, "");
-                            CheckLoginUtils.checkLogin(this, nextToBundle, true, EntranceConsts.ENTRANCE_BROWSER, () ->
-                                    DirectUtils.directToVideoManager(SkipActivity.this, linkEntity, simpleGameEntity, EntranceConsts.ENTRANCE_BROWSER, "浏览器"));
+                            Bundle nextToBundle = VideoManagerActivity.getVideoManagerBundle(linkEntity, simpleGameEntity, entrance, "");
+                            CheckLoginUtils.checkLogin(this, nextToBundle, true, entrance, () ->
+                                    DirectUtils.directToVideoManager(SkipActivity.this, linkEntity, simpleGameEntity, entrance, pathName));
                             break;
                         case HOST_VIDEO_SINGLE:
                             DirectUtils.directToVideoDetail(this, path, VideoDetailContainerViewModel.Location.SINGLE_VIDEO.getValue(),
-                                    false, "", ENTRANCE_BROWSER, "浏览器", TextUtils.isEmpty(referer) ? "" : referer, "");
+                                    false, "", entrance, pathName, TextUtils.isEmpty(referer) ? "" : referer, "");
                             break;
                         case HOST_VIDEO_MORE:
                             gameId = uri.getQueryParameter("gameId");
@@ -238,7 +243,7 @@ public class SkipActivity extends BaseActivity {
                                 location = path;
                             }
                             DirectUtils.directToLegacyVideoDetail(this, path, location,
-                                    false, TextUtils.isEmpty(gameId) ? "" : gameId, ENTRANCE_BROWSER, "浏览器", TextUtils.isEmpty(referer) ? "" : referer,
+                                    false, TextUtils.isEmpty(gameId) ? "" : gameId, entrance, pathName, TextUtils.isEmpty(referer) ? "" : referer,
                                     TextUtils.isEmpty(type) ? "" : type, TextUtils.isEmpty(act) ? "" : act, TextUtils.isEmpty(paginationType) ? "page" : paginationType, TextUtils.isEmpty(fieldId) ? "" : fieldId,
                                     TextUtils.isEmpty(sectionName) ? "" : sectionName, false, "");
                             break;
@@ -246,10 +251,10 @@ public class SkipActivity extends BaseActivity {
                             DirectUtils.directToHomeVideoTab(this);
                             break;
                         case HOST_VIDEO_STREAMING_DESC:
-                            DirectUtils.directToGameDetailVideoStreaming(this, path, ENTRANCE_BROWSER);
+                            DirectUtils.directToGameDetailVideoStreaming(this, path, entrance);
                             break;
                         case HOST_VIDEO_COLLECTION:
-                            DirectUtils.directToGameVideo(this, path, ENTRANCE_BROWSER, "浏览器");
+                            DirectUtils.directToGameVideo(this, path, entrance, pathName);
                             break;
                         case HOST_QQ:
                             bundle = new Bundle();
@@ -278,32 +283,32 @@ public class SkipActivity extends BaseActivity {
                             EntranceUtils.jumpActivityCompat(this, bundle);
                             break;
                         case EntranceConsts.HOST_VIDEO_DETAIL:
-                            DirectUtils.directToVideoDetail(this, path, ENTRANCE_BROWSER, "", "");
+                            DirectUtils.directToVideoDetail(this, path, entrance, "", "");
                             break;
                         case HOST_LIBAO:
-                            DirectUtils.directToGiftDetail(this, path, ENTRANCE_BROWSER);
+                            DirectUtils.directToGiftDetail(this, path, entrance);
                             break;
                         case HOST_USERHOME:
                             String position = uri.getQueryParameter("position");
                             String subTypeString = uri.getQueryParameter("sub_type");
                             String subGameType = uri.getQueryParameter("sub_game_type");
 
-                            DirectUtils.directToHomeActivity(this, path, subTypeString, subGameType, TextUtils.isEmpty(position) ? -1 : Integer.parseInt(position), ENTRANCE_BROWSER, "浏览器");
+                            DirectUtils.directToHomeActivity(this, path, subTypeString, subGameType, TextUtils.isEmpty(position) ? -1 : Integer.parseInt(position), entrance, pathName);
                             break;
                         case HOST_COMMUNITY_COLUMN:
                             CommunityEntity community = new CommunityEntity();
                             community.setId(uri.getQueryParameter("community_id"));
                             community.setName(uri.getQueryParameter("community_name"));
                             String columnId = uri.getQueryParameter("column_id");
-                            DirectUtils.directToCommunityColumn(this, community, columnId, ENTRANCE_BROWSER, "");
+                            DirectUtils.directToCommunityColumn(this, community, columnId, entrance, "");
                             break;
 
                         case HOST_CATEGORY:
                             title = uri.getQueryParameter("title");
-                            DirectUtils.directCategoryDirectory(this, path, title, ENTRANCE_BROWSER, "浏览器");
+                            DirectUtils.directCategoryDirectory(this, path, title, entrance, pathName);
                             break;
                         case HOST_COLUMN_COLLECTION:
-                            DirectUtils.directToColumnCollection(this, path, -1, ENTRANCE_BROWSER, "", "", "", "", null,false);
+                            DirectUtils.directToColumnCollection(this, path, -1, entrance, "", "", "", "", null,false);
                             break;
                         case EntranceConsts.HOST_BLOCK:
                             name = uri.getQueryParameter("name");
@@ -315,11 +320,11 @@ public class SkipActivity extends BaseActivity {
                             break;
 
                         case EntranceConsts.HOST_SERVER_BLOCK:
-                            DirectUtils.directToGameServers(this, ENTRANCE_BROWSER, "浏览器", null);
+                            DirectUtils.directToGameServers(this, entrance, pathName, null);
                             break;
 
                         case EntranceConsts.HOST_AMWAY_BLOCK:
-                            DirectUtils.directToAmway(this, null, ENTRANCE_BROWSER, "浏览器");
+                            DirectUtils.directToAmway(this, null, entrance, pathName);
                             break;
 
                         case EntranceConsts.HOST_HELP:
@@ -332,11 +337,11 @@ public class SkipActivity extends BaseActivity {
                             DirectUtils.directToQaCollection(this, name, path);
                             break;
                         case EntranceConsts.HOST_GAME_UPLOAD:
-                            DirectUtils.directGameUpload(this, ENTRANCE_BROWSER, "浏览器");
+                            DirectUtils.directGameUpload(this, entrance, pathName);
                             break;
                         case EntranceConsts.HOST_GAME_ZONE:
                             String zoneUrl = uri.getQueryParameter("url");
-                            DirectUtils.directGameZone(this, path, zoneUrl, ENTRANCE_BROWSER);
+                            DirectUtils.directGameZone(this, path, zoneUrl, entrance);
                             break;
                         case EntranceConsts.HOST_LINK:
                             try {
@@ -345,7 +350,7 @@ public class SkipActivity extends BaseActivity {
                                     byte[] linkData = Base64.decode(dataString, Base64.DEFAULT);
                                     String linkDataString = new String(linkData, "UTF-8");
                                     LinkEntity le = GsonUtils.INSTANCE.getGson().fromJson(linkDataString, LinkEntity.class);
-                                    DirectUtils.directToLinkPage(this, le, ENTRANCE_BROWSER, "", "");
+                                    DirectUtils.directToLinkPage(this, le, entrance, "", "");
                                 }
                             } catch (Exception e) {
                                 e.printStackTrace();
@@ -360,7 +365,7 @@ public class SkipActivity extends BaseActivity {
                                     this,
                                     uri.getQueryParameter(EntranceConsts.KEY_GAME_ID),
                                     uri.getQueryParameter(EntranceConsts.KEY_GAME_NAME),
-                                    EntranceConsts.ENTRANCE_BROWSER);
+                                    entrance);
                             break;
                         case EntranceConsts.HOST_GAME_CALENDAR:
                             DirectUtils.directToGameServerCalendar(this, uri.getQueryParameter(EntranceConsts.KEY_GAME_ID), 0);
@@ -370,26 +375,26 @@ public class SkipActivity extends BaseActivity {
                             break;
                         case EntranceConsts.HOST_FORUM_DETAIL:
                             String sectionId = uri.getQueryParameter("section_id");
-                            DirectUtils.directForumDetailSection(this, id, sectionId, ENTRANCE_BROWSER);
+                            DirectUtils.directForumDetailSection(this, id, sectionId, entrance);
                             break;
                         case EntranceConsts.HOST_GAME_RATING_DETAIL:
-                            DirectUtils.directToGameRatingDetail(this, uri.getQueryParameter(EntranceConsts.KEY_GAME_ID), uri.getQueryParameter(EntranceConsts.KEY_COMMENT_ID), ENTRANCE_BROWSER);
+                            DirectUtils.directToGameRatingDetail(this, uri.getQueryParameter(EntranceConsts.KEY_GAME_ID), uri.getQueryParameter(EntranceConsts.KEY_COMMENT_ID), entrance);
                             break;
                         case EntranceConsts.HOST_FORUM:
                             DirectUtils.directToHomeCommunityTab(this);
                             break;
                         case EntranceConsts.HOST_HELP_AND_FEEDBACK:
                             if ("vgame".equals(suggestionType)) {
-                                DirectUtils.directToHelpAndFeedback(this, content, isQaFeedback, qaContentId, false, true, EntranceConsts.ENTRANCE_BROWSER);
+                                DirectUtils.directToHelpAndFeedback(this, content, isQaFeedback, qaContentId, false, true, entrance);
                             } else {
-                                DirectUtils.directToHelpAndFeedback(this, content, isQaFeedback, qaContentId, true, false, EntranceConsts.ENTRANCE_BROWSER);
+                                DirectUtils.directToHelpAndFeedback(this, content, isQaFeedback, qaContentId, true, false, entrance);
                             }
                             break;
                         case HOST_GAME_COLLECTION_DETAIL:
-                            DirectUtils.directToGameCollectionDetail(this, path, ENTRANCE_BROWSER, "", null);
+                            DirectUtils.directToGameCollectionDetail(this, path, entrance, "", null);
                             break;
                         case HOST_GAME_COLLECTION_SQUARE:
-                            DirectUtils.directToGameCollectionSquare(this, ENTRANCE_BROWSER, "", "", "", "", "", null);
+                            DirectUtils.directToGameCollectionSquare(this, entrance, "", "", "", "", "", null);
                             break;
                         case HOST_QQ_GAME:
                             String extJson = uri.getQueryParameter("ext");

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

@@ -197,15 +197,7 @@ class SplashScreenActivity : BaseActivity() {
 
     // 尝试获取安装应用列表权限并启动首页（不在乎结果）
     private fun requestGetInstallListPermissionAndLaunchMainActivity() {
-        if (PackageUtils.isSupportGetInstalledAppsPermission(this)
-            && PermissionHelper.isGetInstalledListPermissionDisabled(this)
-        ) {
-            PermissionHelper.requestGetInstalledAppsListPermission(this, true) {
-                launchMainActivity()
-            }
-        } else {
-            launchMainActivity()
-        }
+        launchMainActivity()
     }
 
     // 删除更新后的光环助手包

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

@@ -269,9 +269,9 @@ public class WeiBoShareActivity extends Activity implements WbShareCallback {
             if (ShareUtils.shareEntrance == ShareUtils.ShareEntrance.inviteFriends) {
                 IntegralLogHelper.INSTANCE.logInviteResult("成功", "微博");
             }
-            if (ShareUtils.shareEntrance == ShareUtils.ShareEntrance.askNormal ||
+            if (ShareUtils.additionalParams != null && (ShareUtils.shareEntrance == ShareUtils.ShareEntrance.askNormal ||
                     ShareUtils.shareEntrance == ShareUtils.ShareEntrance.communityArticle ||
-                    ShareUtils.shareEntrance == ShareUtils.ShareEntrance.video) {
+                    ShareUtils.shareEntrance == ShareUtils.ShareEntrance.video)) {
                 com.gh.gamecenter.common.utils.NewLogUtils.logShareResult(ShareUtils.additionalParams, true);
                 SensorsBridge.trackArticleShareResult(
                         ShareUtils.additionalParams.getCustomerType(),
@@ -319,9 +319,9 @@ public class WeiBoShareActivity extends Activity implements WbShareCallback {
                 com.gh.gamecenter.common.utils.NewLogUtils.logShareResult(ShareUtils.additionalParams, false);
             }
 
-            if(ShareUtils.shareEntrance == ShareUtils.ShareEntrance.video
+            if(ShareUtils.additionalParams != null && (ShareUtils.shareEntrance == ShareUtils.ShareEntrance.video
                     || ShareUtils.shareEntrance == ShareUtils.ShareEntrance.communityArticle
-                    || ShareUtils.shareEntrance == ShareUtils.ShareEntrance.askNormal)
+                    || ShareUtils.shareEntrance == ShareUtils.ShareEntrance.askNormal))
             {
                 SensorsBridge.trackArticleShareResult(
                         ShareUtils.additionalParams.getCustomerType(),

app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java

@@ -18,6 +18,7 @@ import android.widget.TextView;
 import androidx.collection.ArrayMap;
 import androidx.core.content.ContextCompat;
 
+import com.gh.common.util.PackageHelper;
 import com.gh.common.util.PackageInstaller;
 import com.gh.common.util.PackageUtils;
 import com.gh.gamecenter.R;
@@ -188,7 +189,7 @@ public class CleanApkAdapter extends BaseRecyclerAdapter<KcSelectGameViewHolder>
     }
 
     private int doType(String packageName) {
-        List<PackageInfo> pakageinfos = PackageUtils.getInstalledPackages(mContext, 0);
+        List<PackageInfo> pakageinfos = PackageHelper.INSTANCE.getInstalledPackages(mContext, 0);
         for (PackageInfo pi : pakageinfos) {
             if ((pi.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 0) {
                 String pi_packageName = pi.packageName;

app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java

@@ -205,7 +205,7 @@ public class LibaoDetailAdapter extends BaseRecyclerAdapter<ViewHolder> {
             GameEntity gameEntity = mLibaoEntity.getGame().toGameEntity();
             GameItemViewHolder.initGameSubtitleAndAdLabel(gameEntity, holder.binding.gameSubtitleTv, null, null, false, null, false, null);
         } else {
-            holder.binding.libaodetailGameIcon.displayGameIcon(mLibaoEntity.getIcon(), null, mLibaoEntity.getGame().getIconFloat());
+            holder.binding.libaodetailGameIcon.displayGameIcon(mLibaoEntity.getIcon(), null, null);
         }
         holder.binding.libaodetailName.setText(mLibaoEntity.getName());
         if (TextUtils.isEmpty(mLibaoEntity.getPlatform())) {

app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java

@@ -297,7 +297,7 @@ public class MessageDetailAdapter extends BaseRecyclerAdapter<ViewHolder> {
         if (mConcernEntity.getGame() != null) {
             viewHolder.binding.newsDigestThumb.displayGameIcon(mConcernEntity.getGame().getIcon(), mConcernEntity.getGame().getIconSubscript(), mConcernEntity.getGame().getIconFloat());
         } else {
-            viewHolder.binding.newsDigestThumb.displayGameIcon(mConcernEntity.getGameIcon(), null, mConcernEntity.getGame().getIconFloat());
+            viewHolder.binding.newsDigestThumb.displayGameIcon(mConcernEntity.getGameIcon(), null, null);
         }
         viewHolder.binding.newsDigestTitle.setText(mConcernEntity.getGameName());
         NewsUtils.setNewsPublishOn(viewHolder.binding.newsDigestTime, mConcernEntity.getTime());

app/src/main/java/com/gh/gamecenter/adapter/viewholder/DetailViewHolder.kt

@@ -47,7 +47,6 @@ import com.gh.gamecenter.teenagermode.TeenagerModeActivity.Companion.getIntent
 import com.gh.vspace.VHelper
 import com.lightgame.download.DownloadEntity
 import com.lightgame.download.DownloadStatus
-import com.lightgame.download.FileUtils
 import org.greenrobot.eventbus.EventBus
 import java.io.File
 
@@ -177,6 +176,15 @@ class DetailViewHolder(
         private val mGameEntity: GameEntity = mViewHolder.gameEntity
         private var mDownloadEntity: DownloadEntity? = null
 
+        private fun showLandPageAddressDialogIfNeeded() {
+            if (mGameEntity.isLandPageAddressDialog() && !mGameEntity.isLandPageAddressDialogShowOnly()) {
+                // 第三方落地页为开启状态并且展示状态不为“仅显示弹窗”,需要在点击确认后显示弹窗
+                DialogUtils.showLandPageAddressDialog(mViewHolder.context, mGameEntity) {
+                    DirectUtils.directToExternalBrowser(mViewHolder.context, mGameEntity.landPageAddressDialog!!.link!!)
+                }
+            }
+        }
+
         override fun onClick(v: View) {
             v.tag = null
 
@@ -245,13 +253,17 @@ class DetailViewHolder(
                     val offStatus = mGameEntity.downloadOffStatus
                     if (offStatus != null && "off" != offStatus) {
                         if ("dialog" == offStatus) {
-                            showOffServiceDialog(mGameEntity.downloadOffDialog)
+                            showOffServiceDialog(mGameEntity.downloadOffDialog) {
+                                showLandPageAddressDialogIfNeeded()
+                            }
                         } else if ("toast" == offStatus) {
                             EventBus.getDefault().post(EBReuse(GameDetailFragment.SKIP_RATING))
                             ToastUtils.toast("该游戏因故暂不提供下载，具体详情可在相关评论中查看，敬请谅解～")
+                            showLandPageAddressDialogIfNeeded()
                         }
                     } else {
                         ToastUtils.toast("该游戏已关闭下载")
+                        showLandPageAddressDialogIfNeeded()
                     }
                 }
 
@@ -453,7 +465,10 @@ class DetailViewHolder(
                     }
                 }
 
-                ButtonStyle.UPDATING -> ToastUtils.toast("正在加急更新版本，敬请后续留意")
+                ButtonStyle.UPDATING -> {
+                    ToastUtils.toast("正在加急更新版本，敬请后续留意")
+                    showLandPageAddressDialogIfNeeded()
+                }
                 ButtonStyle.TEENAGER_MODE -> {
                     SensorsBridge.trackAdolescentModeDialogShow(
                         mGameEntity.id,
@@ -531,8 +546,8 @@ class DetailViewHolder(
             }
         }
 
-        private fun showOffServiceDialog(dialog: GameEntity.Dialog?) {
-            val dialogFragment = GameOffServiceDialogFragment.getInstance(dialog!!)
+        private fun showOffServiceDialog(dialog: GameEntity.Dialog?, callback: () -> Unit) {
+            val dialogFragment = GameOffServiceDialogFragment.getInstance(dialog!!, callback)
             dialogFragment.show((mViewHolder.context as FragmentActivity).supportFragmentManager, "off_service_dialog")
         }
 

app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameImageViewHolder.kt

@@ -34,6 +34,6 @@ class GameImageViewHolder(var binding: GameImageItemBinding) : BaseRecyclerViewH
             binding.gameImageIcon.hierarchy.roundingParams = roundingParams
         }
 
-        ImageUtils.display(binding.gameImageIcon, entity.image, width)
+        ImageUtils.displayWithAdaptiveHeight(binding.gameImageIcon, entity.image, width)
     }
 }

app/src/main/java/com/gh/gamecenter/authorization/AuthorizationActivity.kt

@@ -89,7 +89,7 @@ class AuthorizationActivity : ToolBarActivity() {
     }
 
     private fun initData() {
-        if (mToken.isNotEmpty()) return
+        if (mToken.isNotEmpty() || isFinishing) return
         val loadingDialog = DialogUtils.showWaitDialog(this, "请稍后...")
         mViewModel.getAccessToken(listOf(mContent), {
             mToken = it

app/src/main/java/com/gh/gamecenter/cloudarchive/MyArchiveOptionDialogFragment.kt

@@ -23,7 +23,6 @@ import com.gh.gamecenter.entity.ArchiveEntity
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.vspace.VArchiveHelper
 import com.halo.assistant.HaloApp
-import com.lightgame.download.FileUtils
 import org.greenrobot.eventbus.EventBus
 
 class MyArchiveOptionDialogFragment(

app/src/main/java/com/gh/gamecenter/collection/ArticleAdapter.java

@@ -301,7 +301,7 @@ public class ArticleAdapter extends ListAdapter<NewsEntity> {
         viewHolder.binding.selectIv.setChecked(selectItems.contains(newsEntity.getId()));
 
         if (newsEntity.getThumbnail() != null && newsEntity.getThumbnail().getUrl() != null) {
-            ImageUtils.display(viewHolder.binding.newsImage3Thumb, CollectionsKt.firstOrNull(newsEntity.getThumbnail().getUrl()),
+            ImageUtils.displayWithAdaptiveHeight(viewHolder.binding.newsImage3Thumb, CollectionsKt.firstOrNull(newsEntity.getThumbnail().getUrl()),
                     mContext.getResources().getDisplayMetrics().widthPixels - DisplayUtils.dip2px(mContext, 40));
         }
         int views = newsEntity.getViews();

app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java

@@ -28,6 +28,7 @@ import com.gh.gamecenter.common.constant.Constants;
 import com.gh.gamecenter.common.entity.IconFloat;
 import com.gh.gamecenter.common.utils.DialogHelper;
 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.NetworkUtils;
 import com.gh.gamecenter.common.utils.NewFlatLogUtils;
@@ -44,7 +45,6 @@ import com.lightgame.adapter.BaseRecyclerAdapter;
 import com.lightgame.download.DownloadConfig;
 import com.lightgame.download.DownloadEntity;
 import com.lightgame.download.DownloadStatus;
-import com.lightgame.download.FileUtils;
 import com.lightgame.utils.Utils;
 
 import org.greenrobot.eventbus.EventBus;

app/src/main/java/com/gh/gamecenter/download/NewInstalledGameFragment.kt

@@ -153,7 +153,7 @@ class NewInstalledGameFragment : ToolbarFragment() {
                 reuseNoneData.reuseNoneDataDescTv.text = " 及时获悉游戏最新的更新消息"
                 reuseNoneData.reuseResetLoadTv.text = "去开启"
                 reuseNoneData.reuseResetLoadTv.setOnClickListener {
-                    PermissionHelper.requestGetInstalledAppsListPermission(requireActivity()) {
+                    PermissionHelper.showGetInstalledAppsListPermissionDialogAndRequestPermission(requireActivity()) {
                         updateNoDataView()
                         PackageRepository.initData()
                     }

app/src/main/java/com/gh/gamecenter/download/UpdatableGameAdapter.kt

@@ -389,70 +389,21 @@ class UpdatableGameAdapter(private var mViewModel: UpdatableGameViewModel) :
         updateBtn.putWidgetBusinessName("下载管理")
         updateBtn.putObject(update)
         updateBtn.setOnClickListener {
-            val str: String = updateBtn.text.toString()
+            val str: String = updateBtn.text
             if ("更新" == str || str.contains("化")) {
                 // 这里用 CurrentActivity 不用 view.context 的原因是
                 // view.context 在 5.0 以下设备会使用 TintContextWrapper 包一层导致类型转换异常
                 if ("更新" == str && update.isLandPageAddressDialog()) {// 第三方落地页跳转直接展示跳转弹窗
                     DialogUtils.showLandPageAddressDialog(it.context, update.transformGameEntity()) {// 跳转第三方落地页
-                        DirectUtils.directToExternalBrowser(it.context, update.landPageAddressDialog!!.link!!)
+                        if (update.isLandPageAddressDialogShowOnly()) {
+                            updateOrPluggable(updateBtn, update, downloadEntity, pluginDesc)
+                        } else {
+                            DirectUtils.directToExternalBrowser(it.context, update.landPageAddressDialog!!.link!!)
+                        }
                     }
                     return@setOnClickListener
                 }
-
-                (CurrentActivityHolder.getCurrentActivity() as? FragmentActivity)?.checkStoragePermissionBeforeAction(
-                    gameId = update.id,
-                    gameName = update.name ?: "",
-                    gameType = update.categoryChinese,
-                    gameFormat = update.format,
-                ) {
-                    DialogUtils.checkDownload(
-                        updateBtn.context,
-                        update.size,
-                        update.id,
-                        update.name ?: "",
-                        update.categoryChinese
-                    ) { isSubscribe: Boolean ->
-                        if (str.contains("化")) {
-                            if (update.pluggableCollection != null) {
-                                DownloadDialog.showDownloadDialog(
-                                    updateBtn.context,
-                                    update.transformGameEntity(),
-                                    update.exposureEvent,
-                                    mViewModel.entrance,
-                                    pluginDesc + "化：" + update.name
-                                )
-                                return@checkDownload
-                            } else {
-                                updateBtn.text = "0%"
-                                updateBtn.buttonStyle = DownloadButton.ButtonStyle.DOWNLOADING_PLUGIN
-                                updateBtn.progress = 0
-                            }
-                        } else {
-                            updateBtn.text = "0%"
-                            updateBtn.buttonStyle = DownloadButton.ButtonStyle.DOWNLOADING_NORMAL
-                            updateBtn.progress = 0
-                        }
-
-                        // 如果历史下载 downloadEntity 不为空，且版本与当前需要更新的不一致，先移除旧任务再执行更新
-                        if ((downloadEntity?.isVGameDownloadInDualDownloadMode() == true
-                                    || downloadEntity?.isLocalDownloadInDualDownloadMode() == true)
-                            && (update.version != downloadEntity.versionName)
-                        ) {
-                            DownloadManager.getInstance().cancel(downloadEntity.url ?: "")
-                        }
-
-                        mViewModel.update(update, isSubscribe)
-                        mViewModel.refreshList()
-                        EventBus.getDefault()
-                            .post(
-                                EBSkip(
-                                    DownloadManagerActivity.TAG,
-                                    DownloadManagerActivity.INDEX_DOWNLOAD
-                                )
-                            )
-                    }
-                }
+                updateOrPluggable(updateBtn, update, downloadEntity, pluginDesc)
             } else if (updateBtn.context.getString(R.string.launch) == str) {
                 PackageLauncher.launchApp(updateBtn.context, packageName = update.packageName)
             } else if (updateBtn.context.getString(R.string.resume) == str) {
@@ -489,6 +440,68 @@ class UpdatableGameAdapter(private var mViewModel: UpdatableGameViewModel) :
         }
     }
 
+    private fun updateOrPluggable(
+        updateBtn: DownloadButton,
+        update: GameUpdateEntity,
+        downloadEntity: DownloadEntity?,
+        pluginDesc: String
+    ) {
+        val str: String = updateBtn.text
+        (CurrentActivityHolder.getCurrentActivity() as? FragmentActivity)?.checkStoragePermissionBeforeAction(
+            gameId = update.id,
+            gameName = update.name ?: "",
+            gameType = update.categoryChinese,
+            gameFormat = update.format,
+        ) {
+            DialogUtils.checkDownload(
+                updateBtn.context,
+                update.size,
+                update.id,
+                update.name ?: "",
+                update.categoryChinese
+            ) { isSubscribe: Boolean ->
+                if (str.contains("化")) {
+                    if (update.pluggableCollection != null) {
+                        DownloadDialog.showDownloadDialog(
+                            updateBtn.context,
+                            update.transformGameEntity(),
+                            update.exposureEvent,
+                            mViewModel.entrance,
+                            pluginDesc + "化：" + update.name
+                        )
+                        return@checkDownload
+                    } else {
+                        updateBtn.text = "0%"
+                        updateBtn.buttonStyle = DownloadButton.ButtonStyle.DOWNLOADING_PLUGIN
+                        updateBtn.progress = 0
+                    }
+                } else {
+                    updateBtn.text = "0%"
+                    updateBtn.buttonStyle = DownloadButton.ButtonStyle.DOWNLOADING_NORMAL
+                    updateBtn.progress = 0
+                }
+
+                // 如果历史下载 downloadEntity 不为空，且版本与当前需要更新的不一致，先移除旧任务再执行更新
+                if ((downloadEntity?.isVGameDownloadInDualDownloadMode() == true
+                            || downloadEntity?.isLocalDownloadInDualDownloadMode() == true)
+                    && (update.version != downloadEntity.versionName)
+                ) {
+                    DownloadManager.getInstance().cancel(downloadEntity.url ?: "")
+                }
+
+                mViewModel.update(update, isSubscribe)
+                mViewModel.refreshList()
+                EventBus.getDefault()
+                    .post(
+                        EBSkip(
+                            DownloadManagerActivity.TAG,
+                            DownloadManagerActivity.INDEX_DOWNLOAD
+                        )
+                    )
+            }
+        }
+    }
+
     private fun generateExposureEvent(updateEntity: GameUpdateEntity) {
         updateEntity.exposureEvent =
             createEvent(updateEntity.transformGameEntity(), mExposureSource)

app/src/main/java/com/gh/gamecenter/download/UpdatableGameFragment.kt

@@ -4,7 +4,6 @@ import android.view.View
 import com.gh.common.exposure.ExposureListener
 import com.gh.common.util.DirectUtils
 import com.gh.download.DownloadManager
-import com.gh.gamecenter.MainActivity
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.base.fragment.LazyFragment
 import com.gh.gamecenter.common.constant.EntranceConsts
@@ -12,12 +11,10 @@ import com.gh.gamecenter.common.eventbus.EBReuse
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.common.view.FixLinearLayoutManager
 import com.gh.gamecenter.core.utils.DisplayUtils
-import com.gh.gamecenter.core.utils.EmptyCallback
 import com.gh.gamecenter.databinding.FragmentGameUpdatableBinding
 import com.gh.gamecenter.eventbus.EBDownloadStatus
 import com.gh.gamecenter.packagehelper.PackageRepository
 import com.gh.gamecenter.packagehelper.PackageViewModel
-import com.gh.gamecenter.wrapper.MainWrapperFragment
 import com.lightgame.download.DataWatcher
 import com.lightgame.download.DownloadEntity
 import org.greenrobot.eventbus.Subscribe
@@ -40,7 +37,6 @@ class UpdatableGameFragment : LazyFragment() {
         }
     }
 
-
     override fun getRealLayoutId() = R.layout.fragment_game_updatable
     override fun onRealLayoutInflated(inflatedView: View) {
         mBinding = FragmentGameUpdatableBinding.bind(inflatedView)
@@ -104,15 +100,14 @@ class UpdatableGameFragment : LazyFragment() {
                 noDataContainer.reuseNoneDataDescTv.text = "及时获悉游戏最新的更新消息"
                 noDataContainer.reuseResetLoadTv.text = "去开启"
                 noDataContainer.reuseResetLoadTv.setOnClickListener {
-                    PermissionHelper.requestGetInstalledAppsListPermission(
-                        requireActivity(),
-                        false,
-                        object : EmptyCallback {
-                            override fun onCallback() {
-                                updateNoDataView()
-                                PackageRepository.initData()
-                            }
-                        })
+                    PermissionHelper.showGetInstalledAppsListPermissionDialogAndRequestPermission(
+                        requireActivity()
+                    ) { isGranted ->
+                        if (isGranted) {
+                            updateNoDataView()
+                            PackageRepository.initData()
+                        }
+                    }
                 }
             } else {
                 noDataContainer.reuseNoneDataIv.visibility = View.VISIBLE

app/src/main/java/com/gh/gamecenter/entity/CommonCollectionEntity.kt

@@ -36,6 +36,8 @@ data class CommonCollectionEntity(
 
 @Parcelize
 data class CommonCollectionContentEntity(
+    @SerializedName("_id")
+    private val _id: String? = null,
     val title: String = "",
     val style: String = "",
     val image: String = "",
@@ -45,4 +47,8 @@ data class CommonCollectionContentEntity(
     var addedContent1: String? = "",
     @SerializedName("added_content_2")
     var addedContent2: String? = "",
-) : Parcelable
+) : Parcelable {
+
+    val id: String
+        get() = _id ?: ""
+}

app/src/main/java/com/gh/gamecenter/entity/GameUpdateEntity.kt

@@ -92,6 +92,11 @@ data class GameUpdateEntity(
         return landPageAddressDialog?.let { it.status == "on" } ?: false
     }
 
+    /**
+     * 第三方落地页的状态是否为“仅显示弹窗”
+     */
+    fun isLandPageAddressDialogShowOnly(): Boolean = landPageAddressDialog?.showOnly == true
+
     fun transformGameEntity(): GameEntity {
         val gameEntity = GameEntity()
         gameEntity.id = id

app/src/main/java/com/gh/gamecenter/entity/PullDownPush.kt

@@ -8,6 +8,8 @@ data class PullDownPush(
     val id: String = "",
     @SerializedName("pop_switch")
     val popSwitch: String = "",
+    @SerializedName("put_away_switch")
+    val putAwaySwitch: String = "", // 自动收起，never：永不、video_finished：视频播放完毕（视频必填）、n：n秒后（5-15秒后）
     val description: String = "",
     @SerializedName("img_url")
     val imgUrl: String = "",

app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListFragment.kt

@@ -134,9 +134,11 @@ class ForumArticleAskListFragment : LazyListFragment<AnswerEntity, ForumArticleA
 
     override fun onLoadRefresh() {
         super.onLoadRefresh()
-        mBinding.nestedScrollNoConnection.root.visibility = View.GONE
-        mBinding.nestedScrollNoneData.root.visibility = View.GONE
-        mBinding.nestedScrollDataException.root.visibility = View.GONE
+        if (::mBinding.isInitialized) {
+            mBinding.nestedScrollNoConnection.root.visibility = View.GONE
+            mBinding.nestedScrollNoneData.root.visibility = View.GONE
+            mBinding.nestedScrollDataException.root.visibility = View.GONE
+        }
         // Fix：https://sentry.shanqu.cc/organizations/lightgame/issues/288994/?project=22&query=LazyListFragment&statsPeriod=14d
         // Fragment在内存泄露的情况下，调用requireView()会触发崩溃，这里替换为getView()方法
         // TODO 解决Fragment内存泄露的问题
@@ -145,9 +147,11 @@ class ForumArticleAskListFragment : LazyListFragment<AnswerEntity, ForumArticleA
 
     override fun onLoadDone() {
         super.onLoadDone()
-        mBinding.nestedScrollNoConnection.root.visibility = View.GONE
-        mBinding.nestedScrollNoneData.root.visibility = View.GONE
-        mBinding.nestedScrollDataException.root.visibility = View.GONE
+        if (::mBinding.isInitialized) {
+            mBinding.nestedScrollNoConnection.root.visibility = View.GONE
+            mBinding.nestedScrollNoneData.root.visibility = View.GONE
+            mBinding.nestedScrollDataException.root.visibility = View.GONE
+        }
         view?.setBackgroundColor(Color.TRANSPARENT)
         mBaseHandler.postDelayed(Runnable {
             tryCatchInRelease {
@@ -159,25 +163,31 @@ class ForumArticleAskListFragment : LazyListFragment<AnswerEntity, ForumArticleA
 
     override fun onLoadError() {
         super.onLoadError()
-        mBinding.nestedScrollNoConnection.root.visibility = View.VISIBLE
-        mBinding.nestedScrollNoneData.root.visibility = View.GONE
-        mBinding.nestedScrollDataException.root.visibility = View.GONE
+        if (::mBinding.isInitialized) {
+            mBinding.nestedScrollNoConnection.root.visibility = View.VISIBLE
+            mBinding.nestedScrollNoneData.root.visibility = View.GONE
+            mBinding.nestedScrollDataException.root.visibility = View.GONE
+        }
         view?.setBackgroundColor(Color.TRANSPARENT)
     }
 
     override fun onLoadEmpty() {
         super.onLoadEmpty()
-        mBinding.nestedScrollNoConnection.root.visibility = View.GONE
-        mBinding.nestedScrollNoneData.root.visibility = View.VISIBLE
-        mBinding.nestedScrollDataException.root.visibility = View.GONE
+        if (::mBinding.isInitialized) {
+            mBinding.nestedScrollNoConnection.root.visibility = View.GONE
+            mBinding.nestedScrollNoneData.root.visibility = View.VISIBLE
+            mBinding.nestedScrollDataException.root.visibility = View.GONE
+        }
         view?.setBackgroundColor(Color.TRANSPARENT)
     }
 
     override fun loadNotFound() {
         super.loadNotFound()
-        mBinding.nestedScrollNoConnection.root.visibility = View.GONE
-        mBinding.nestedScrollNoneData.root.visibility = View.GONE
-        mBinding.nestedScrollDataException.root.visibility = View.VISIBLE
+        if (::mBinding.isInitialized) {
+            mBinding.nestedScrollNoConnection.root.visibility = View.GONE
+            mBinding.nestedScrollNoneData.root.visibility = View.GONE
+            mBinding.nestedScrollDataException.root.visibility = View.VISIBLE
+        }
     }
 
     override fun hideRefreshingLayout() {

app/src/main/java/com/gh/gamecenter/forum/home/ArticleItemVideoView.kt

@@ -413,7 +413,7 @@ class ArticleItemVideoView @JvmOverloads constructor(context: Context, attrs: At
             val shareUrl = if (isPublishEnv()) {
                 "https://m.ghzs666.com/video/${it.id}"
             } else {
-                "https://resource.ghzs.com/page/video_play/video/video.html?video=${it.id}"
+                "https://dev-and-static.ghzs66.com/page/video_play/video/video.html?video=${it.id}"
             }
             val additionalParams = AdditionalParamsEntity().apply {
                 contentType = "视频帖"

app/src/main/java/com/gh/gamecenter/fragment/UpdateDialogFragment.kt

@@ -45,6 +45,12 @@ class UpdateDialogFragment : BaseDialogFragment() {
     private var mIsDisplayingDownloadingStyle = false // 是否正在显示更新中样式
 
     private val mDataWatcher = object : DataWatcher() {
+        override fun onDataInit(downloadEntity: DownloadEntity) {
+            super.onDataInit(downloadEntity)
+
+            onDataChanged(downloadEntity)
+        }
+
         override fun onDataChanged(downloadEntity: DownloadEntity) {
             if (downloadEntity.name.contains("光环助手")) {
                 if (mIsDisplayingDownloadingStyle) {
@@ -74,13 +80,11 @@ class UpdateDialogFragment : BaseDialogFragment() {
             return
         }
 
-        DownloadManager.getInstance().addObserver(mDataWatcher)
-
         mUpdateEntity = arguments?.getParcelable(UPDATE_ENTITY)
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        showUpdateHintStyle(requireContext(), mUpdateEntity!!)
+        showUpdateHintStyle(requireContext(), mUpdateEntity!!, true)
 
         return mBinding.root
     }
@@ -109,8 +113,14 @@ class UpdateDialogFragment : BaseDialogFragment() {
         mDismissCallback?.onCallback()
     }
 
-    override fun onDestroyView() {
-        super.onDestroyView()
+    override fun onStart() {
+        super.onStart()
+
+        DownloadManager.getInstance().addObserver(mDataWatcher)
+    }
+
+    override fun onStop() {
+        super.onStop()
 
         DownloadManager.getInstance().removeObserver(mDataWatcher)
     }
@@ -120,7 +130,9 @@ class UpdateDialogFragment : BaseDialogFragment() {
      * @param context 上下文
      * @param updateEntity 更新实体
      */
-    private fun showUpdateHintStyle(context: Context, updateEntity: AppEntity) {
+    private fun showUpdateHintStyle(context: Context,
+                                    updateEntity: AppEntity,
+                                    invokeByViewCreated: Boolean) {
         mIsDisplayingDownloadingStyle = false
 
         val updateHintBinding = mBinding.updateHintContainerView
@@ -200,12 +212,15 @@ class UpdateDialogFragment : BaseDialogFragment() {
             )
         }
 
-        SensorsBridge.trackVersionUpdateDialogShow(
-            keyDialogReminderTime = mUpdateEntity?.alert,
-            keyDialogClose = if (mUpdateEntity?.isForce == true) "关闭且强退" else "仅关闭"
-        )
+        if (invokeByViewCreated) {
+            SensorsBridge.trackVersionUpdateDialogShow(
+                keyDialogReminderTime = mUpdateEntity?.alert,
+                keyDialogClose = if (mUpdateEntity?.isForce == true) "关闭且强退" else "仅关闭"
+            )
+
+            DataLogUtils.uploadUpgradeLog(context, "notice") //上传更新通知弹窗数据
+        }
 
-        DataLogUtils.uploadUpgradeLog(context, "notice") //上传更新通知弹窗数据
     }
 
     /**
@@ -294,13 +309,8 @@ class UpdateDialogFragment : BaseDialogFragment() {
 
         if (DownloadStatus.done == downloadEntity.status) {
             DownloadManager.getInstance().cancel(downloadEntity.url, false, true, false)
-            try {
-                dismiss()
-            } catch (ignored: IllegalArgumentException) {
-                // do nothing
-            }
-            if (updateEntity.isForce) {
-                AppExecutor.uiExecutor.executeWithDelay({ UpdateHelper.exitApp() }, 1000L)
+            tryWithDefaultCatch {
+                showUpdateHintStyle(requireContext(), updateEntity, false)
             }
         } else if (DownloadStatus.neterror == downloadEntity.status) {
             ToastUtils.toast("网络错误，请稍后重试")

app/src/main/java/com/gh/gamecenter/fragment/WelcomeDialogFragment.kt

@@ -1,37 +1,26 @@
 package com.gh.gamecenter.fragment
 
-import android.animation.AnimatorSet
-import android.animation.ObjectAnimator
 import android.app.Dialog
 import android.content.DialogInterface
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
-import android.os.Build
 import android.os.Bundle
 import android.preference.PreferenceManager
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.Window
-import android.view.animation.PathInterpolator
 import android.widget.RelativeLayout
-import com.alibaba.android.arouter.launcher.ARouter
 import com.gh.common.util.DirectUtils
 import com.gh.common.util.LogUtils
 import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
-import com.gh.gamecenter.common.base.fragment.BaseLazyFragment
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.constant.EntranceConsts
-import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.utils.ImageUtils
 import com.gh.gamecenter.common.utils.SensorsBridge
-import com.gh.gamecenter.common.utils.dip2px
 import com.gh.gamecenter.common.utils.tryWithDefaultCatch
 import com.gh.gamecenter.common.view.WrapContentDraweeView
-import com.gh.gamecenter.core.provider.IFloatingWindowProvider
-import com.gh.gamecenter.core.utils.DisplayUtils
 import com.gh.gamecenter.core.utils.SPUtils
-import com.gh.gamecenter.core.utils.addListener
 import com.gh.gamecenter.databinding.DialogWelcomeBinding
 import com.gh.gamecenter.feature.entity.WelcomeDialogEntity
 import com.halo.assistant.HaloApp
@@ -44,12 +33,6 @@ class WelcomeDialogFragment : BaseDialogFragment() {
 
     private var mDismissListener: (() -> Unit)? = null
 
-    private var mShowEnterAnimation: Boolean = false
-    private var mShowExitAnimation: Boolean = false
-
-    // 触发此 dialogFragment 的 fragment，可能为空
-    private var mTriggerFragment: BaseLazyFragment? = null
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -67,11 +50,6 @@ class WelcomeDialogFragment : BaseDialogFragment() {
         dialog.window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
         dialog.requestWindowFeature(Window.FEATURE_NO_TITLE)
         dialog.setContentView(root)
-        if (mShowEnterAnimation) {
-            dialog.window?.setDimAmount(0F)
-        } else {
-            dialog.window?.setDimAmount(0.5F)
-        }
         dialog.window?.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
         return dialog
     }
@@ -93,22 +71,6 @@ class WelcomeDialogFragment : BaseDialogFragment() {
 
             mWelcomeEntity?.let {
                 DirectUtils.directToLinkPage(requireContext(), it, EntranceConsts.ENTRANCE_WELCOME, "", "首页弹窗")
-                if (mShowEnterAnimation) {
-                    val floatingWindowProvider =
-                        ARouter.getInstance().build(RouteConsts.provider.floatingwindow)
-                            .navigation() as? IFloatingWindowProvider<WelcomeDialogEntity>
-
-                    floatingWindowProvider?.logWindowClicked(
-                        action = "点击弹窗跳转页面",
-                        windowId = mWelcomeEntity?.floatingWindowId ?: "",
-                        source = "首页",
-                        gameId = "",
-                        gameName = "",
-                        linkId = mWelcomeEntity?.link ?: "",
-                        linkType = mWelcomeEntity?.type ?: "",
-                        linkText = mWelcomeEntity?.text ?: ""
-                    )
-                }
             }
 
             dismissAllowingStateLoss()
@@ -123,10 +85,6 @@ class WelcomeDialogFragment : BaseDialogFragment() {
                     } else {
                         mBinding.ivClose.visibility = View.VISIBLE
                     }
-
-                    if (mShowEnterAnimation) {
-                        performAnimation(true)
-                    }
                 }
 
                 mBinding.ivOpeningCover.registerLoadingCallback(null)
@@ -134,33 +92,11 @@ class WelcomeDialogFragment : BaseDialogFragment() {
         })
 
         mBinding.ivCloseBackup.setOnClickListener {
-            val floatingWindowProvider =
-                ARouter.getInstance().build(RouteConsts.provider.floatingwindow)
-                    .navigation() as? IFloatingWindowProvider<WelcomeDialogEntity>
-
-            // 来源 fragment 是否不可见
-            if (mTriggerFragment?.isCurrentlyVisible() == false) {
-                mShowExitAnimation = false
-            } else {
-                floatingWindowProvider?.showHiddenWindow(requireActivity())
-            }
-
-            if (mShowExitAnimation) {
-                dismissWithAnimation()
-            } else {
-                dismissAllowingStateLoss()
-            }
+            dismissAllowingStateLoss()
         }
         mBinding.ivClose.setOnClickListener { mBinding.ivCloseBackup.performClick() }
         ImageUtils.displayWithoutMemoryCache(mBinding.ivOpeningCover, mWelcomeEntity?.icon)
 
-        // 弹起启动弹窗时，把右下角悬浮窗置为隐藏
-        val floatingWindowProvider =
-            ARouter.getInstance().build(RouteConsts.provider.floatingwindow)
-                .navigation() as? IFloatingWindowProvider<WelcomeDialogEntity>
-
-        floatingWindowProvider?.hideWindow(requireActivity())
-
         return mBinding.root
     }
 
@@ -180,132 +116,14 @@ class WelcomeDialogFragment : BaseDialogFragment() {
         mDismissListener = dismissListener
     }
 
-    /**
-     * 显示动画
-     * @param isEnterAnimation 是否为进入动画
-     */
-    private fun performAnimation(isEnterAnimation: Boolean) {
-        // 贝塞尔曲线需要 Android 版本大于 Android 5.0
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            val screenWidth = DisplayUtils.getScreenWidth(requireActivity())
-            val screenHeight = DisplayUtils.getScreenHeight(requireActivity())
-            val statusBarHeight = DisplayUtils.getStatusBarHeight(requireContext().resources)
-
-            // 最大宽度为 300dp
-            val maxWidth = 300F
-            val initialWidth = 1F
-
-            val containerWidth = mBinding.container.width
-            val containerHeight = containerWidth / mBinding.ivOpeningCover.aspectRatio + 54F.dip2px()
-
-            val location = IntArray(2)
-            mBinding.container.getLocationOnScreen(location)
-
-            val xOffsetToTheScreen = location[0]
-            // 由于显示的时机问题，mBinding.container.getLocationOnScreen(location) 获取到的纵座标不一定是真实在屏幕的高度，这里手动计算
-            val yOffsetToTheScreen = (screenHeight - containerHeight) / 2 + statusBarHeight
-
-            val scaleRatio = initialWidth / maxWidth
-            // 获取动画原点的 X, Y 座标，由于 scale 会变化，所以需要结合 scale 进行计算
-            val initialX = (screenWidth - 40F.dip2px() - xOffsetToTheScreen) - (containerWidth * (1 - scaleRatio)) / 2
-            val initialY =
-                (screenHeight - 156F.dip2px() - yOffsetToTheScreen) - (containerHeight * (1 - scaleRatio)) / 2 + statusBarHeight
-
-            val startX = if (isEnterAnimation) initialX else 0F
-            val startY = if (isEnterAnimation) initialY else 0F
-
-            val startScale = if (isEnterAnimation) scaleRatio else 1F
-            val endScale = if (isEnterAnimation) 1F else scaleRatio
-
-            val endX = if (isEnterAnimation) 0F else initialX
-            val endY = if (isEnterAnimation) 0F else initialY
-
-            val enteringTranslationXInterpolator = PathInterpolator(0.4F, 1.6F, 0.4F, 1.24F)
-            val enteringTranslationYInterpolator = PathInterpolator(0.4F, 1.8F, 0.4F, 1.24F)
-            val exitingTranslationXInterpolator = PathInterpolator(0.6F, -0.24F, 0.6F, -0.6F)
-            val exitingTranslationYInterpolator = PathInterpolator(0.6F, -0.24F, 0.6F, -0.2F)
-
-            val enteringScaleInterpolator = PathInterpolator(0.61F, 1F, 0.88F, 1F)
-            val exitingScaleInterpolator = PathInterpolator(0.12F, 0F, 0.39F, 0F)
-
-            val translationXAnimator =
-                ObjectAnimator.ofFloat(mBinding.container, "translationX", startX, endX).apply {
-                    interpolator =
-                        if (isEnterAnimation) enteringTranslationXInterpolator else exitingTranslationXInterpolator
-                }
-            val translationYAnimator =
-                ObjectAnimator.ofFloat(mBinding.container, "translationY", startY, endY).apply {
-                    interpolator =
-                        if (isEnterAnimation) enteringTranslationYInterpolator else exitingTranslationYInterpolator
-                }
-
-            val scaleXAnimator = ObjectAnimator.ofFloat(mBinding.container, "scaleX", startScale, endScale).apply {
-                addUpdateListener {
-                    val dimAmount = it.animatedValue as Float / 2
-                    dialog?.window?.setDimAmount(dimAmount)
-
-                    // 避免与原有悬浮窗重叠，退出动画执行到 95% 进度后隐藏
-                    if (!isEnterAnimation && (it.animatedValue as Float) < 0.05F) {
-                        mBinding.container.visibility = View.GONE
-                    } else {
-                        mBinding.container.visibility = View.VISIBLE
-                    }
-                }
-            }
-            val scaleYAnimator = ObjectAnimator.ofFloat(mBinding.container, "scaleY", startScale, endScale)
-            val scaleAnimatorSet = AnimatorSet().apply {
-                playTogether(scaleXAnimator, scaleYAnimator)
-                interpolator = if (isEnterAnimation) enteringScaleInterpolator else exitingScaleInterpolator
-            }
-
-            mBinding.root.pivotX = mBinding.root.width / 2F
-            mBinding.root.pivotY = mBinding.root.height / 2F
-
-            dialog?.window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
-
-            val translationAnimatorSet = AnimatorSet().apply {
-                playTogether(translationXAnimator, translationYAnimator)
-            }
-
-            AnimatorSet().apply {
-                playTogether(
-                    scaleAnimatorSet,
-                    translationAnimatorSet
-                )
-                addListener(
-                    onStart = {
-                        mBinding.container.isClickable = false
-                        mBinding.ivOpeningCover.isClickable = false
-                        mBinding.ivClose.isClickable = false
-                    },
-                    onEnd = {
-                        if (!isEnterAnimation) {
-                            dismissAllowingStateLoss()
-                        }
-                        mBinding.container.isClickable = true
-                        mBinding.ivOpeningCover.isClickable = true
-                        mBinding.ivClose.isClickable = true
-                    }
-                )
-                duration = ANIMATION_DURATION
-            }.start()
-        }
-    }
-
-    private fun dismissWithAnimation() {
-        performAnimation(false)
-    }
-
     override fun onDismiss(dialog: DialogInterface) {
         super.onDismiss(dialog)
 
-        // 仅不显示进入动画的首页弹窗才记录 id
-        if (!mShowEnterAnimation) {
-            val sp = PreferenceManager.getDefaultSharedPreferences(context?.applicationContext)
+        // 首页弹窗记录 id
+        val sp = PreferenceManager.getDefaultSharedPreferences(context?.applicationContext)
 
-            SPUtils.setString(sp, Constants.SP_LAST_OPENING_ID, mWelcomeEntity?.id)
-            SPUtils.setLong(sp, Constants.SP_LAST_OPENING_TIME, mWelcomeEntity?.time ?: 0L)
-        }
+        SPUtils.setString(sp, Constants.SP_LAST_OPENING_ID, mWelcomeEntity?.id)
+        SPUtils.setLong(sp, Constants.SP_LAST_OPENING_TIME, mWelcomeEntity?.time ?: 0L)
 
         mDismissListener?.invoke()
         LogUtils.uploadWelcomeDialog(
@@ -320,14 +138,8 @@ class WelcomeDialogFragment : BaseDialogFragment() {
     companion object {
         const val TAG = "welcome_dialog"
 
-        const val ANIMATION_DURATION = 800L
-
         @JvmStatic
-        fun getInstance(
-            welcomeEntity: WelcomeDialogEntity?,
-            withAnimation: Boolean = false,
-            triggerFragment: BaseLazyFragment? = null
-        ) = WelcomeDialogFragment().apply {
+        fun getInstance(welcomeEntity: WelcomeDialogEntity?) = WelcomeDialogFragment().apply {
             arguments = Bundle()
             arguments?.putParcelable(TAG, welcomeEntity)
             LogUtils.uploadWelcomeDialog(
@@ -338,21 +150,6 @@ class WelcomeDialogFragment : BaseDialogFragment() {
                 welcomeEntity?.text
             )
 
-            mTriggerFragment = triggerFragment
-
-            // 低于 Android 5.0 禁用动画，因为贝塞尔曲线需要 5.0+ 支持
-            mShowEnterAnimation = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-                false
-            } else {
-                withAnimation
-            }
-
-            mShowExitAnimation = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-                false
-            } else {
-                withAnimation || welcomeEntity?.shouldShowExitAnimation == true
-            }
-
             SensorsBridge.trackEvent("HomeDialogShow")
         }
     }

app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareAdapter.kt

@@ -29,7 +29,6 @@ import com.gh.gamecenter.common.constant.ItemViewType
 import com.gh.gamecenter.common.entity.ExposureEntity
 import com.gh.gamecenter.common.exposure.ExposureSource
 import com.gh.gamecenter.common.utils.*
-import com.gh.gamecenter.common.utils.ImageUtils.display
 import com.gh.gamecenter.common.view.ScrollEventListener
 import com.gh.gamecenter.common.viewholder.FooterViewHolder
 import com.gh.gamecenter.core.utils.DisplayUtils
@@ -437,8 +436,8 @@ class GameCollectionSquareAdapter(
             binding.run {
                 val context = root.context
                 poster.setTag(ImageUtils.TAG_TARGET_WIDTH, mPosterWidth)
-                display(poster, gamesCollectionEntity.cover)
-                display(userIv, gamesCollectionEntity.user?.icon)
+                ImageUtils.display(poster, gamesCollectionEntity.cover)
+                ImageUtils.display(userIv, gamesCollectionEntity.user?.icon)
                 titleTv.text = gamesCollectionEntity.title
                 gamesCollectionEntity.games?.take(3)?.forEachIndexed { index, game ->
                     when (index) {

app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt

@@ -285,95 +285,114 @@ class GameDetailFragment : BaseLazyFragment(), IScrollable {
                 linkType = contentCardEntity.type ?: "",
                 linkId = contentCardEntity.id
             )
-            val path = "游戏详情->内容卡片"
-            when (contentCardEntity.type) {
-                "func_server" -> {
-                    if (contentCardEntity.server != null) {
-                        requireContext().startActivity(
-                            ServersCalendarActivity.getIntent(
-                                requireContext(),
-                                mViewModel.game!!, contentCardEntity.server!!,
-                                mNewGameDetailEntity?.me
-                            )
+
+            val dialog = contentCardEntity.dialog
+            if (dialog != null) {// 展示内容卡片提示弹窗
+                DialogHelper.showDialog(
+                    context = requireContext(),
+                    title = dialog.title ?: "",
+                    content = dialog.body ?: "",
+                    confirmText = requireContext().getString(R.string.confirm),
+                    cancelText = requireContext().getString(R.string.cancel),
+                    confirmClickCallback = {
+                        jumpToContentCardLink(contentCardEntity)
+                    }
+                )
+            } else {
+                jumpToContentCardLink(contentCardEntity)
+            }
+        }
+
+    private fun jumpToContentCardLink(contentCardEntity: ContentCardEntity) {
+        val path = "游戏详情->内容卡片"
+        when (contentCardEntity.type) {
+            "func_server" -> {
+                if (contentCardEntity.server != null) {
+                    requireContext().startActivity(
+                        ServersCalendarActivity.getIntent(
+                            requireContext(),
+                            mViewModel.game!!, contentCardEntity.server!!,
+                            mNewGameDetailEntity?.me
                         )
-                    }
+                    )
                 }
+            }
 
-                "func_libao" -> {
-                    mBodyBinding.gamedetailVp.currentItem = 0
-                    mBodyBinding.gamedetailAppbar.setExpanded(false, true)
-                    val fragment = mFragmentsList[0]
-                    if (fragment is DescFragment && fragment.isAdded) {
-                        fragment.scrollToLibao()
-                    }
+            "func_libao" -> {
+                mBodyBinding.gamedetailVp.currentItem = 0
+                mBodyBinding.gamedetailAppbar.setExpanded(false, true)
+                val fragment = mFragmentsList[0]
+                if (fragment is DescFragment && fragment.isAdded) {
+                    fragment.scrollToLibao()
                 }
+            }
 
-                "func_related_version" -> {
-                    mBodyBinding.gamedetailVp.currentItem = 0
-                    mBodyBinding.gamedetailAppbar.setExpanded(false, true)
-                    val fragment = mFragmentsList[0]
-                    if (fragment is DescFragment && fragment.isAdded) {
-                        fragment.scrollToRelatedVersion()
-                    }
+            "func_related_version" -> {
+                mBodyBinding.gamedetailVp.currentItem = 0
+                mBodyBinding.gamedetailAppbar.setExpanded(false, true)
+                val fragment = mFragmentsList[0]
+                if (fragment is DescFragment && fragment.isAdded) {
+                    fragment.scrollToRelatedVersion()
                 }
+            }
 
-                "func_zone" -> {
-                    val gameDetailEntity = mViewModel.gameDetailLiveData.value?.data
-                    if (contentCardEntity.zoneTab && gameDetailEntity?.zone != null && gameDetailEntity.zone!!.style == "link") {
-                        requireContext().startActivity(
-                            WebActivity.getIntent(
-                                requireContext(),
-                                gameDetailEntity.zone!!.link,
-                                true
-                            )
+            "func_zone" -> {
+                val gameDetailEntity = mViewModel.gameDetailLiveData.value?.data
+                if (contentCardEntity.zoneTab && gameDetailEntity?.zone != null && gameDetailEntity.zone!!.style == "link") {
+                    requireContext().startActivity(
+                        WebActivity.getIntent(
+                            requireContext(),
+                            gameDetailEntity.zone!!.link,
+                            true
                         )
-                    }
+                    )
                 }
+            }
 
-                "func_bbs" -> {
-                    val funcBbs = contentCardEntity.funcBbs
-                    funcBbs?.let {
-                        DirectUtils.directForumDetail(requireContext(), it.link, path)
-                    }
+            "func_bbs" -> {
+                val funcBbs = contentCardEntity.funcBbs
+                funcBbs?.let {
+                    DirectUtils.directForumDetail(requireContext(), it.link, path)
                 }
+            }
 
-                "func_tool_kit" -> {
-                    if (contentCardEntity.toolkit.isNotEmpty()) {
-                        contentCardEntity.toolkit.safelyGetInRelease(0)?.let {
-                            val url = it.url
-                            if (url != null && url.contains(Config.URL_ARTICLE)) {
-                                val newsId = url.substring(url.lastIndexOf("/") + 1, url.length - 5) // 5: ".html"
-                                val intent = NewsDetailActivity.getIntentById(requireContext(), newsId, path)
-                                requireContext().startActivity(intent)
-                            } else {
-                                requireContext().startActivity(
-                                    WebActivity.getWebByCollectionTools(
-                                        requireContext(),
-                                        it,
-                                        false
-                                    )
+            "func_tool_kit" -> {
+                if (contentCardEntity.toolkit.isNotEmpty()) {
+                    contentCardEntity.toolkit.safelyGetInRelease(0)?.let {
+                        val url = it.url
+                        if (url != null && url.contains(Config.URL_ARTICLE)) {
+                            val newsId = url.substring(url.lastIndexOf("/") + 1, url.length - 5) // 5: ".html"
+                            val intent = NewsDetailActivity.getIntentById(requireContext(), newsId, path)
+                            requireContext().startActivity(intent)
+                        } else {
+                            requireContext().startActivity(
+                                WebActivity.getWebByCollectionTools(
+                                    requireContext(),
+                                    it,
+                                    false
                                 )
-                            }
+                            )
                         }
                     }
                 }
-
-                else -> DirectUtils.directToLinkPage(
-                    requireContext(),
-                    contentCardEntity.toLinkEntity(),
-                    mEntrance,
-                    path,
-                    ExposureEvent.createEvent(
-                        null,
-                        listOf(
-                            ExposureSource("游戏详情", mGameEntity?.id ?: ""),
-                            ExposureSource("内容卡片", contentCardEntity.id)
-                        )
-                    ),
-                    "游戏详情页-内容卡片"
-                )
             }
+
+            else -> DirectUtils.directToLinkPage(
+                requireContext(),
+                contentCardEntity.toLinkEntity(),
+                mEntrance,
+                path,
+                ExposureEvent.createEvent(
+                    null,
+                    listOf(
+                        ExposureSource("游戏详情", mGameEntity?.id ?: ""),
+                        ExposureSource("内容卡片", contentCardEntity.id)
+                    )
+                ),
+                "游戏详情页-内容卡片"
+            )
         }
+    }
 
     override fun getLayoutId(): Int = 0
     override fun getInflatedLayout(): View {
@@ -424,12 +443,13 @@ class GameDetailFragment : BaseLazyFragment(), IScrollable {
             .load(R.layout.fragment_gamedetail_skeleton)
             .show()
 
+        val gameId = args.getString(EntranceConsts.KEY_GAMEID) ?: ""
         val factory = GameDetailViewModel.Factory(
             HaloApp.getInstance().application,
-            args.getString(EntranceConsts.KEY_GAMEID),
+            gameId,
             args.getParcelable(GameEntity.TAG)
         )
-        mViewModel = viewModelProviderFromParent(factory)
+        mViewModel = viewModelProviderFromParent(factory, gameId)
         mPackageViewModel = viewModelProvider(PackageViewModel.Factory())
         mUserViewModel = viewModelProvider(UserViewModel.Factory(HaloApp.getInstance().application))
 
@@ -784,7 +804,7 @@ class GameDetailFragment : BaseLazyFragment(), IScrollable {
                     }
                     SensorsBridge.trackEventWithExposureSource(
                         "GameDetailPageShow",
-                        mTraceEvent?.source,
+                        mTraceEvent?.source ?: listOf(ExposureSource(mEntrance)),
                         "game_id", mGameEntity?.id ?: "",
                         "game_name", mGameEntity?.name ?: "",
                         "download_status", mGameEntity?.downloadStatusChinese ?: "",

app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailViewModel.kt

@@ -15,6 +15,7 @@ import com.gh.common.util.CheckLoginUtils
 import com.gh.gamecenter.feature.utils.ConcernUtils
 import com.gh.common.util.LibaoUtils
 import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.livedata.NonStickyMutableLiveData
 import com.gh.gamecenter.common.mvvm.Resource
 import com.gh.gamecenter.common.retrofit.BiResponse
 import com.gh.gamecenter.common.retrofit.Response
@@ -30,10 +31,7 @@ import com.gh.gamecenter.feature.entity.LibaoStatusEntity
 import com.gh.gamecenter.feature.entity.SimpleGame
 import com.gh.gamecenter.feature.utils.ApkActiveUtils
 import com.gh.gamecenter.feature.utils.ContentBlockedHelper
-import com.gh.gamecenter.gamedetail.entity.BigEvent
-import com.gh.gamecenter.gamedetail.entity.CustomColumn
-import com.gh.gamecenter.gamedetail.entity.DetailEntity
-import com.gh.gamecenter.gamedetail.entity.NewGameDetailEntity
+import com.gh.gamecenter.gamedetail.entity.*
 import com.gh.gamecenter.login.user.UserManager
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.halo.assistant.HaloApp

app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescFragment.kt

@@ -123,7 +123,7 @@ class DescFragment: LazyFragment(), IScrollable {
 
         val gameDetailFactory =
             GameDetailViewModel.Factory(HaloApp.getInstance().application, mGameEntity?.id, mGameEntity)
-        val gameDetailViewModel: GameDetailViewModel = viewModelProviderFromParent(gameDetailFactory)
+        val gameDetailViewModel: GameDetailViewModel = viewModelProviderFromParent(gameDetailFactory, mGameEntity?.id ?: "")
         mNewDetailEntity = gameDetailViewModel.gameDetailLiveData.value?.data
 
         val factory = DescViewModel.Factory(HaloApp.getInstance().application, mGameEntity)

app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameDetailMoreDialog.kt

@@ -20,6 +20,7 @@ import com.gh.gamecenter.core.utils.MtaHelper
 import com.gh.gamecenter.databinding.DialogGameDetailMoreBinding
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.gamedetail.GameDetailViewModel
+import com.halo.assistant.HaloApp
 
 class GameDetailMoreDialog : BaseDraggableDialogFragment() {
 
@@ -29,7 +30,15 @@ class GameDetailMoreDialog : BaseDraggableDialogFragment() {
     private var mGameEntity: GameEntity? = null
     private var mShowConcernIcon = false
     private var mIsConcerned = false
-    private val mViewModel: GameDetailViewModel by lazy { viewModelProviderFromParent() }
+    private val mViewModel: GameDetailViewModel by lazy {
+        viewModelProviderFromParent(
+            GameDetailViewModel.Factory(
+                HaloApp.getInstance().application,
+                mGameEntity?.id,
+                mGameEntity
+            ), mGameEntity?.id ?: ""
+        )
+    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

app/src/main/java/com/gh/gamecenter/gamedetail/entity/ContentCardEntity.kt

@@ -54,8 +54,18 @@ class ContentCardEntity(
     var relatedVersion: Boolean = false,
     var toolkit: ArrayList<ToolBoxEntity> = ArrayList(),
     @SerializedName("func_bbs")
-    val funcBbs: LinkEntity? = null
+    val funcBbs: LinkEntity? = null,
+    val dialog: Dialog? = null
 ) {
+
+    @Keep
+    class Dialog(
+        @SerializedName("_id")
+        val id: String? = "",
+        val title: String? = "",
+        val body: String? = ""
+    )
+
     fun toLinkEntity(): LinkEntity {
         return LinkEntity(
             name = name,

app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiFragment.kt

@@ -65,7 +65,7 @@ class FuLiFragment : LazyFragment(), IScrollable {
             GameDetailViewModel.Factory(HaloApp.getInstance().application, gameEntity?.id, gameEntity)
         shouldScroolToLibao = arguments?.getBoolean(EntranceConsts.KEY_SCROLL_TO_LIBAO) ?: false
 
-        mGameDetailViewModel = viewModelProviderFromParent(gameDetailFactory)
+        mGameDetailViewModel = viewModelProviderFromParent(gameDetailFactory, gameEntity?.id ?: "")
         mFuLiViewModel = viewModelProvider()
 
         super.onFragmentFirstVisible()

app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarDetailDialog.kt

@@ -146,7 +146,7 @@ class ServersCalendarDetailDialog : DialogFragment() {
             val serverCalendarList = adapter.selectedServerCalendarList
             serverCalendarList.forEachIndexed { index, entity ->
                 if (index != 0) builder.append("；")
-                builder.append("${entity.getFormatTime("YYYY年MM月dd日")}开服信息有误：${entity.getNote()}")
+                builder.append("${entity.getFormatTime("yyyy年MM月dd日")}开服信息有误：${entity.getNote()}")
             }
             HelpAndFeedbackBridge.startSuggestionActivity(
                 it.context,

app/src/main/java/com/gh/gamecenter/gamedetail/rating/edit/RatingEditActivity.kt

@@ -282,10 +282,10 @@ class RatingEditActivity : ToolBarActivity(), KeyboardHeightObserver {
             }
         }
         mBinding.mWebView.addJavascriptObject(DefaultJsApi(this), null)
-        val url = if ("internal" == BuildConfig.FLAVOR) {
-            "https://resource.ghzs.com/page/comment_tag_editor_dev/index.html?timestamp=${System.currentTimeMillis()}"
+        val url = if (PackageFlavorHelper.IS_TEST_FLAVOR) {
+            "https://dev-and-static.ghzs66.com/page/comment_tag_editor/index.html?timestamp=${System.currentTimeMillis()}"
         } else {
-            "https://resource.ghzs.com/page/comment_tag_editor/index.html?timestamp=${System.currentTimeMillis()}"
+            "https://and-static.ghzs66.com/page/comment_tag_editor/index.html?timestamp=${System.currentTimeMillis()}"
         }
         mBinding.mWebView.loadUrl(url)
     }

app/src/main/java/com/gh/gamecenter/home/custom/adapter/CustomCommonCollectionAdapter.kt

@@ -32,7 +32,7 @@ class CustomCommonCollectionAdapter(
     }
 
     override fun getKey(t: CommonCollectionContentEntity): String {
-        return t.title
+        return "${_data.data.layout}-${t.id}"
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CustomCommonCollectionItemViewHolder {

app/src/main/java/com/gh/gamecenter/home/custom/adapter/CustomHomeGameCollectionSlideAdapter.kt

@@ -82,7 +82,7 @@ class CustomHomeGameCollectionSlideAdapter(
                     } else {
                         gUser.goneIf(true)
                     }
-                    ImageUtils.display(coverImage, subject.image, false)
+                    ImageUtils.display(coverImage, subject.image)
 
                     titleTv.text = subject.title
 

app/src/main/java/com/gh/gamecenter/home/custom/viewholder/CustomBigImageRecommendViewHolder.kt

@@ -27,7 +27,7 @@ class CustomBigImageRecommendViewHolder(
         if (item is CustomContentCardItem) {
             val contentCard = item.data
             binding.run {
-                ImageUtils.display(poster, contentCard.img, shouldAutoPlayAnimatedImage = false)
+                ImageUtils.display(poster, contentCard.img)
                 recommendTag.goneIf(contentCard.recommendTag.isEmpty())
                 recommendTextTwo.goneIf(contentCard.secondLineRecommend.isEmpty())
                 recommendTag.text = contentCard.recommendTag

app/src/main/java/com/gh/gamecenter/home/custom/viewholder/CustomHomeGameItemViewHolder.kt

@@ -109,7 +109,7 @@ class CustomHomeGameItemViewHolder(
             }
             binding.gameBrief.text = game.recommendText
             binding.gameImage.visibleIf(game.showImage) {
-                ImageUtils.display(binding.gameImage, game.homeSetting.image, false)
+                ImageUtils.display(binding.gameImage, game.homeSetting.image)
                 val hierarchy = binding.gameImage.hierarchy
                 try {
                     hierarchy.setPlaceholderImage(ColorDrawable(game.homeSetting.placeholderColor.hexStringToIntColor()))

app/src/main/java/com/gh/gamecenter/home/custom/viewholder/CustomHomeSlideListItemViewHolder.kt

@@ -1,8 +1,10 @@
 package com.gh.gamecenter.home.custom.viewholder
 
 import android.graphics.Color
+import android.graphics.drawable.Animatable
 import android.graphics.drawable.ColorDrawable
 import android.view.View
+import com.facebook.drawee.controller.BaseControllerListener
 import com.facebook.imagepipeline.image.ImageInfo
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.base.BaseRecyclerViewHolder
@@ -45,16 +47,19 @@ class CustomHomeSlideListItemViewHolder(val binding: HomeSlideListItemCustomBind
             GameItemViewHolder.initGameSubtitleAndAdLabel(it, binding.includeGame.gameSubtitleTv)
         }
 
-        binding.bottomGradient.visibility = View.GONE
-        ImageUtils.addLimitWidthAndLoad(
+        if (homeSlide.image != binding.slideBackground.tag) {
+            binding.bottomGradient.visibility = View.GONE
+        }
+        binding.slideBackground.setTag(ImageUtils.TAG_TARGET_WIDTH, mImageWith)
+        ImageUtils.displayWithCallback(
             binding.slideBackground,
             homeSlide.image,
-            mImageWith,
-            object : ImageUtils.OnImageloadListener {
-                override fun onLoadFinal(imageInfo: ImageInfo?) {
+            object : BaseControllerListener<ImageInfo>() {
+                override fun onFinalImageSet(id: String?, imageInfo: ImageInfo?, animatable: Animatable?) {
                     binding.bottomGradient.visibility = View.VISIBLE
                 }
-            })
+            }
+        )
 
         val hierarchy = binding.slideBackground.hierarchy
         try {

app/src/main/java/com/gh/gamecenter/home/custom/viewholder/CustomHomeSubSlideListItemViewHolder.kt

@@ -1,18 +1,19 @@
 package com.gh.gamecenter.home.custom.viewholder
 
 import android.graphics.Color
+import android.graphics.drawable.Animatable
 import android.graphics.drawable.ColorDrawable
 import android.graphics.drawable.GradientDrawable
 import android.view.View
 import androidx.core.graphics.ColorUtils
 import androidx.core.view.isVisible
+import com.facebook.drawee.controller.BaseControllerListener
 import com.facebook.imagepipeline.image.ImageInfo
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.base.BaseRecyclerViewHolder
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.core.utils.DisplayUtils
 import com.gh.gamecenter.core.utils.RandomUtils
-import com.gh.gamecenter.databinding.HomeSubSlideListItemBinding
 import com.gh.gamecenter.databinding.HomeSubSlideListItemCustomBinding
 import com.gh.gamecenter.entity.HomeSlide
 import com.gh.gamecenter.feature.game.GameItemViewHolder
@@ -52,7 +53,9 @@ class CustomHomeSubSlideListItemViewHolder(val binding: HomeSubSlideListItemCust
             val startColor = Color.HSVToColor(colorHSV)
             val endColor = ColorUtils.setAlphaComponent(startColor, 0)
 
-            binding.slideMask.visibility = View.GONE
+            if (homeSlide.image != binding.slideBackground.tag) {
+                binding.slideMask.visibility = View.GONE
+            }
             binding.slideMask.background = GradientDrawable().apply {
                 gradientType = GradientDrawable.LINEAR_GRADIENT
                 orientation = GradientDrawable.Orientation.BOTTOM_TOP
@@ -60,17 +63,18 @@ class CustomHomeSubSlideListItemViewHolder(val binding: HomeSubSlideListItemCust
             }
         }
 
-        ImageUtils.addLimitWidthAndLoad(
+        binding.slideBackground.setTag(ImageUtils.TAG_TARGET_WIDTH, mImageWith)
+        ImageUtils.displayWithCallback(
             binding.slideBackground,
             homeSlide.image,
-            mImageWith,
-            object : ImageUtils.OnImageloadListener {
-                override fun onLoadFinal(imageInfo: ImageInfo?) {
+            object : BaseControllerListener<ImageInfo>() {
+                override fun onFinalImageSet(id: String?, imageInfo: ImageInfo?, animatable: Animatable?) {
                     if (homeSlide.placeholderColor.isNotEmpty() && homeSlide.linkGame != null) {
                         binding.slideMask.visibility = View.VISIBLE
                     }
                 }
-            })
+            }
+        )
 
         val hierarchy = binding.slideBackground.hierarchy
         try {

app/src/main/java/com/gh/gamecenter/home/slide/HomeSlideListItemViewHolder.kt

@@ -1,12 +1,17 @@
 package com.gh.gamecenter.home.slide
 
 import android.graphics.Color
+import android.graphics.drawable.Animatable
 import android.graphics.drawable.ColorDrawable
 import android.view.View
+import com.facebook.drawee.controller.BaseControllerListener
 import com.facebook.imagepipeline.image.ImageInfo
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.base.BaseRecyclerViewHolder
-import com.gh.gamecenter.common.utils.*
+import com.gh.gamecenter.common.utils.ImageUtils
+import com.gh.gamecenter.common.utils.dip2px
+import com.gh.gamecenter.common.utils.goneIf
+import com.gh.gamecenter.common.utils.toColor
 import com.gh.gamecenter.core.utils.RandomUtils
 import com.gh.gamecenter.databinding.HomeSlideListItemBinding
 import com.gh.gamecenter.entity.HomeSlide
@@ -42,16 +47,19 @@ class HomeSlideListItemViewHolder(val binding: HomeSlideListItemBinding) : BaseR
             GameItemViewHolder.initGameSubtitleAndAdLabel(it, binding.includeGame.gameSubtitleTv)
         }
 
-        binding.bottomGradient.visibility = View.GONE
-        ImageUtils.addLimitWidthAndLoad(
+        if (homeSlide.image != binding.slideBackground.tag) {
+            binding.bottomGradient.visibility = View.GONE
+        }
+        binding.slideBackground.setTag(ImageUtils.TAG_TARGET_WIDTH, mImageWith)
+        ImageUtils.displayWithCallback(
             binding.slideBackground,
             homeSlide.image,
-            mImageWith,
-            object : ImageUtils.OnImageloadListener {
-                override fun onLoadFinal(imageInfo: ImageInfo?) {
+            object : BaseControllerListener<ImageInfo>() {
+                override fun onFinalImageSet(id: String?, imageInfo: ImageInfo?, animatable: Animatable?) {
                     binding.bottomGradient.visibility = View.VISIBLE
                 }
-            })
+            }
+        )
 
         val hierarchy = binding.slideBackground.hierarchy
         try {

app/src/main/java/com/gh/gamecenter/home/slide/HomeSubSlideListItemViewHolder.kt

@@ -1,11 +1,13 @@
 package com.gh.gamecenter.home.slide
 
 import android.graphics.Color
+import android.graphics.drawable.Animatable
 import android.graphics.drawable.ColorDrawable
 import android.graphics.drawable.GradientDrawable
 import android.view.View
 import androidx.core.graphics.ColorUtils
 import androidx.core.view.isVisible
+import com.facebook.drawee.controller.BaseControllerListener
 import com.facebook.imagepipeline.image.ImageInfo
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.base.BaseRecyclerViewHolder
@@ -51,7 +53,9 @@ class HomeSubSlideListItemViewHolder(val binding: HomeSubSlideListItemBinding) :
             val startColor = Color.HSVToColor(colorHSV)
             val endColor = ColorUtils.setAlphaComponent(startColor, 0)
 
-            binding.slideMask.visibility = View.GONE
+            if (homeSlide.image != binding.slideBackground.tag) {
+                binding.slideMask.visibility = View.GONE
+            }
             binding.slideMask.background = GradientDrawable().apply {
                 gradientType = GradientDrawable.LINEAR_GRADIENT
                 orientation = GradientDrawable.Orientation.BOTTOM_TOP
@@ -59,17 +63,18 @@ class HomeSubSlideListItemViewHolder(val binding: HomeSubSlideListItemBinding) :
             }
         }
 
-        ImageUtils.addLimitWidthAndLoad(
+        binding.slideBackground.setTag(ImageUtils.TAG_TARGET_WIDTH, mImageWith)
+        ImageUtils.displayWithCallback(
             binding.slideBackground,
             homeSlide.image,
-            mImageWith,
-            object : ImageUtils.OnImageloadListener {
-                override fun onLoadFinal(imageInfo: ImageInfo?) {
+            object : BaseControllerListener<ImageInfo>() {
+                override fun onFinalImageSet(id: String?, imageInfo: ImageInfo?, animatable: Animatable?) {
                     if (homeSlide.placeholderColor.isNotEmpty() && homeSlide.linkGame != null) {
                         binding.slideMask.visibility = View.VISIBLE
                     }
                 }
-            })
+            }
+        )
 
         val hierarchy = binding.slideBackground.hierarchy
         try {

app/src/main/java/com/gh/gamecenter/home/video/AutomaticVideoView.kt

@@ -369,7 +369,7 @@ class AutomaticVideoView @JvmOverloads constructor(context: Context, attrs: Attr
     }
 
     fun updateThumb(url: String) {
-        ImageUtils.display(thumbImage, url, false)
+        ImageUtils.display(thumbImage, url)
     }
 
     /********************************各类UI的状态显示*********************************************/

app/src/main/java/com/gh/gamecenter/info/InfoAdapter.java

@@ -169,7 +169,7 @@ class InfoAdapter extends ListAdapter<NewsEntity> {
         viewHolder.binding.newsImage3Title.setTextColor(ContextCompat.getColor(viewHolder.itemView.getContext(), R.color.title));
 
         if (newsEntity.getThumbnail() != null && newsEntity.getThumbnail().getUrl() != null) {
-            ImageUtils.display(viewHolder.binding.newsImage3Thumb, CollectionsKt.firstOrNull(newsEntity.getThumbnail().getUrl()),
+            ImageUtils.displayWithAdaptiveHeight(viewHolder.binding.newsImage3Thumb, CollectionsKt.firstOrNull(newsEntity.getThumbnail().getUrl()),
                     mContext.getResources().getDisplayMetrics().widthPixels - DisplayUtils.dip2px(mContext, 40));
         }
         int views = newsEntity.getViews();

app/src/main/java/com/gh/gamecenter/info/OriginalAdapter.java

@@ -150,7 +150,7 @@ class OriginalAdapter extends ListAdapter<NewsEntity> {
         viewHolder.binding.newsImage3Title.setTextColor(ContextCompat.getColor(viewHolder.itemView.getContext(), R.color.title));
 
         if (newsEntity.getThumbnail() != null && newsEntity.getThumbnail().getUrl() != null) {
-            ImageUtils.display(viewHolder.binding.newsImage3Thumb, CollectionsKt.firstOrNull(newsEntity.getThumbnail().getUrl()),
+            ImageUtils.displayWithAdaptiveHeight(viewHolder.binding.newsImage3Thumb, CollectionsKt.firstOrNull(newsEntity.getThumbnail().getUrl()),
                     mContext.getResources().getDisplayMetrics().widthPixels - DisplayUtils.dip2px(mContext, 40));
         }
         int views = newsEntity.getViews();

app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt

@@ -90,9 +90,6 @@ class UserHomeFragment : ToolbarFragment() {
             getUserInfo()
             getBadgeList()
             getUserPlayedGameCount()
-            if (PackageFlavorHelper.IS_TEST_FLAVOR) {
-                getUserLevel()
-            }
         }
 
         mHomeBinding?.container?.setZoomView(mHomeBinding?.userBackgroundContainer)
@@ -167,38 +164,12 @@ class UserHomeFragment : ToolbarFragment() {
             if (mUserHomeViewModel.userId == UserManager.getInstance().userId) {
                 mUserHomeViewModel.availableBadges()
             }
-
-
-//            if (mUserHomeViewModel.userId == UserManager.getInstance().userId) {
-//                mUserHomeViewModel.availableBadges()
-//            } else {
-//                mHomeBinding?.userBadgeTips?.visibility = View.VISIBLE
-//                if (it.isNotEmpty()) {
-//                    mHomeBinding?.userBadge?.visibility = View.VISIBLE
-//                    updateUserBadge(it)
-//                } else {
-//                    mHomeBinding?.userBadge?.visibility = View.GONE
-//                }
-//            }
         }
 
         mUserHomeViewModel.availableBadgeCount.observeNonNull(this) {
             mHomeBinding?.badgeTips?.visibility = if (it > 0) View.VISIBLE else View.GONE
         }
 
-//        mUserHomeViewModel.availableBadgeCount.observeNonNull(this) {
-//            mHomeBinding?.viewBadgeMessageTip?.visibleIf(it > 0)
-//            if (mUserHomeViewModel.badges.value?.isEmpty() == true && it > 0) {
-//                mHomeBinding?.userBadgeList?.visibility = View.INVISIBLE
-//                mHomeBinding?.userBadgeTips?.visibility = View.VISIBLE
-//                mHomeBinding?.userBadgeTips?.text = "有${it}枚徽章可领取"
-//            } else if (mUserHomeViewModel.badges.value?.isEmpty() == false) {
-//                mHomeBinding?.userBadgeList?.visibility = View.VISIBLE
-//                mHomeBinding?.userBadgeTips?.visibility = View.GONE
-//                updateUserBadge(mUserHomeViewModel.badges.value!!)
-//            }
-//        }
-
         mUserHomeViewModel.networkError.observeNonNull(this) {
             mHomeBinding?.container?.visibility = View.GONE
             mHomeBinding?.reuseNoConnection?.root?.visibility = View.VISIBLE
@@ -214,28 +185,10 @@ class UserHomeFragment : ToolbarFragment() {
             mPlayGameCount = it
         })
 
-        mUserHomeViewModel.level.observeNonNull(this) {
-            mHomeBinding?.run {
-                levelContainer.visibility = View.VISIBLE
-                levelContainer.setOnClickListener {
-                    if (mUserHomeViewModel.userId == UserManager.getInstance().userId) {
-                        IntegralLogHelper.run {
-                            log("click_grade_label", LOCATION)
-                            log("view_grade", "等级中心页")
-                        }
-                        DirectUtils.directToLevelPage(requireContext())
-                    }
-                }
-                val levelNum = if (it > 9) 9 else it
-                levelTv.text = "Lv$levelNum "
-            }
-        }
-
         mMessageUnreadViewModel.liveData.observeNonNull(this) {
             updateUnreadInfo(it)
         }
 
-
         mUserViewModel.editObsUserinfo.observeNonNull(this) {
             it.data?.let { updatedUserInfo ->
                 if (mUserHomeViewModel.userId == UserManager.getInstance().userId) {
@@ -492,7 +445,7 @@ class UserHomeFragment : ToolbarFragment() {
 
             // 设置有边框挂件的头像
             userIcon.display(personalData.iconBorder?.url, personalData.icon, "")
-            ImageUtils.displayIcon(userSmallIcon, personalData.icon)
+            ImageUtils.display(userSmallIcon, personalData.icon)
 
             authTv.setOnClickListener {
                 personalData.auth?.link?.let { link ->
@@ -542,7 +495,6 @@ class UserHomeFragment : ToolbarFragment() {
 
                 // 跳转更换背景页
                 userChangeBgBtn.setOnClickListener {
-                    IntegralLogHelper.log("click_change _background", LOCATION)
                     SPUtils.setBoolean(Constants.SP_HAS_CLICK_CHANGE_BG, false)
                     changeBgTips.visibility = View.GONE
                     startActivity(PersonalityBackgroundActivity.getIntent(requireContext()))

app/src/main/java/com/gh/gamecenter/personalhome/UserHomeViewModel.kt

@@ -33,7 +33,6 @@ class UserHomeViewModel(application: Application, var userId: String) : AndroidV
     var availableBadge = MutableLiveData<BadgeEntity>()
     var availableBadgeCount = MutableLiveData<Int>()
     var playGamesCount = MutableLiveData<Int>()
-    var level = MutableLiveData<Int>()
 
     fun getUserInfo() {
         RetrofitManager.getInstance()
@@ -133,19 +132,6 @@ class UserHomeViewModel(application: Application, var userId: String) : AndroidV
             })
     }
 
-    @SuppressLint("CheckResult")
-    fun getUserLevel() {
-        RetrofitManager.getInstance()
-            .api.getUserLevels(userId)
-            .subscribeOn(Schedulers.io())
-            .observeOn(AndroidSchedulers.mainThread())
-            .subscribe(object : BiResponse<JsonObject>() {
-                override fun onSuccess(data: JsonObject) {
-                    level.postValue(data["level"].asInt)
-                }
-            })
-    }
-
     @SuppressLint("CheckResult")
     fun postReport(reason: String, desc: String) {
         val requestMap = hashMapOf<String, String>()

app/src/main/java/com/gh/gamecenter/personalhome/rating/RatingActivity.kt

@@ -1,65 +0,0 @@
-package com.gh.gamecenter.personalhome.rating
-
-import android.content.Context
-import android.content.Intent
-import android.os.Bundle
-import androidx.lifecycle.ViewModelProviders
-import com.gh.gamecenter.common.base.activity.BaseActivity
-import com.gh.gamecenter.common.constant.EntranceConsts
-import com.gh.gamecenter.R
-import com.gh.gamecenter.common.baselist.ListActivity
-import com.gh.gamecenter.common.baselist.NormalListViewModel
-import com.gh.gamecenter.common.utils.updateStatusBarColor
-import com.gh.gamecenter.login.user.UserManager
-import com.gh.gamecenter.retrofit.RetrofitManager
-import com.halo.assistant.HaloApp
-import io.reactivex.Single
-
-class RatingActivity : ListActivity<MyRating, NormalListViewModel<MyRating>>() {
-
-    private var mAdapter: RatingAdapter? = null
-    private var mUserId: String? = null
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        mUserId = intent.getStringExtra(EntranceConsts.KEY_USER_ID)
-        super.onCreate(savedInstanceState)
-        if (mUserId == UserManager.getInstance().userId) {
-            setNavigationTitle("我的评分")
-        } else {
-            setNavigationTitle("Ta的评分")
-        }
-        updateStatusBarColor(R.color.ui_surface, R.color.ui_surface)
-    }
-
-    override fun provideListAdapter(): RatingAdapter {
-        if (mAdapter == null) mAdapter = RatingAdapter(this, mEntrance, mListViewModel)
-        return mAdapter!!
-    }
-
-    override fun provideDataSingle(page: Int): Single<MutableList<MyRating>> {
-        return RetrofitManager.getInstance().api.getMyRating(mUserId, page, "view:default")
-    }
-
-    override fun provideListViewModel(): NormalListViewModel<MyRating> {
-        val factory = NormalListViewModel.Factory(HaloApp.getInstance().application, this)
-        return ViewModelProviders.of(this, factory)
-            .get(NormalListViewModel::class.java) as NormalListViewModel<MyRating>
-    }
-
-    override fun isAutoResetViewBackgroundEnabled(): Boolean = true
-
-    override fun onDarkModeChanged() {
-        super.onDarkModeChanged()
-        updateStatusBarColor(R.color.ui_surface, R.color.ui_surface)
-    }
-
-
-    companion object {
-        fun getIntent(context: Context, userId: String, entrance: String, path: String): Intent {
-            val intent = Intent(context, RatingActivity::class.java)
-            intent.putExtra(EntranceConsts.KEY_ENTRANCE, BaseActivity.mergeEntranceAndPath(entrance, path))
-            intent.putExtra(EntranceConsts.KEY_USER_ID, userId)
-            return intent
-        }
-    }
-}

app/src/main/java/com/gh/gamecenter/personalhome/rating/RatingAdapter.kt

@@ -1,88 +0,0 @@
-package com.gh.gamecenter.personalhome.rating
-
-import android.content.Context
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import com.gh.gamecenter.common.constant.ItemViewType
-import com.gh.common.util.NewsUtils
-import com.gh.gamecenter.core.utils.NumberUtils
-import com.gh.gamecenter.common.utils.fromHtml
-import com.gh.gamecenter.common.utils.setTextWithHighlightedTextWrappedInsideWrapper
-import com.gh.gamecenter.GameDetailActivity
-import com.gh.gamecenter.R
-import com.gh.gamecenter.common.viewholder.FooterViewHolder
-import com.gh.gamecenter.adapter.viewholder.PersonalHomeRatingViewHolder
-import com.gh.gamecenter.common.baselist.ListAdapter
-import com.gh.gamecenter.common.baselist.NormalListViewModel
-import com.gh.gamecenter.databinding.PersonalHomeRatingBinding
-
-class RatingAdapter(
-    context: Context,
-    private val mEntrance: String,
-    private val mListViewModel: NormalListViewModel<MyRating>
-) : ListAdapter<MyRating>(context) {
-
-    override fun getItemViewType(position: Int): Int {
-        return if (position == itemCount - 1) {
-            ItemViewType.ITEM_FOOTER
-        } else {
-            ItemViewType.ITEM_BODY
-        }
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        val view: View
-        return when (viewType) {
-            ItemViewType.ITEM_FOOTER -> {
-                view = mLayoutInflater.inflate(R.layout.refresh_footerview, parent, false)
-                FooterViewHolder(view)
-            }
-            else -> {
-                view = mLayoutInflater.inflate(R.layout.personal_home_rating, parent, false)
-                PersonalHomeRatingViewHolder(PersonalHomeRatingBinding.bind(view))
-            }
-        }
-    }
-
-    override fun getItemCount(): Int {
-        return if (mEntityList == null || mEntityList.isEmpty()) 0 else mEntityList.size + 1
-    }
-
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        when (holder) {
-            is PersonalHomeRatingViewHolder -> {
-                val entity = mEntityList[holder.adapterPosition]
-                val historyEntity = entity.transformHistoryEntity()
-                holder.binding.comment.text =
-                    if (historyEntity.count.reply > 0) NumberUtils.transSimpleCount(historyEntity.count.reply) else ""
-                holder.binding.vote.isChecked = historyEntity.me.isVoted
-                holder.binding.vote.text =
-                    if (historyEntity.count.vote > 0) NumberUtils.transSimpleCount(historyEntity.count.vote) else ""
-                holder.binding.ratingStart.rating = historyEntity.comment.star.toFloat()
-
-                holder.binding.userCommand.text = (mContext.getString(
-                    R.string.personal_home_rating_command,
-                    NewsUtils.getFormattedTime(entity.time),
-                    entity.game.name
-                )).fromHtml()
-                holder.binding.content.setTextWithHighlightedTextWrappedInsideWrapper(
-                    text = entity.content,
-                    copyClickedText = true
-                )
-                holder.itemView.setOnClickListener {
-                    GameDetailActivity.startGameDetailActivity(
-                        mContext,
-                        entity.game.id,
-                        mEntrance,
-                        isSkipGameComment = true
-                    )
-                }
-            }
-            is FooterViewHolder -> {
-                holder.initItemPadding()
-                holder.initFooterViewHolder(mListViewModel, mIsLoading, mIsNetworkError, mIsOver)
-            }
-        }
-    }
-}

app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailActivity.java

@@ -1,71 +0,0 @@
-package com.gh.gamecenter.qa.answer.detail;
-
-import static com.gh.gamecenter.common.constant.Constants.GAME_DETAIL_COME_IN;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-
-import com.gh.gamecenter.common.base.activity.ToolBarActivity;
-import com.gh.gamecenter.common.constant.EntranceConsts;
-import com.gh.gamecenter.entity.SpecialColumn;
-import com.halo.assistant.HaloApp;
-
-/**
- * Created by khy on 10/04/18.
- */
-
-public class AnswerDetailActivity extends ToolBarActivity {
-    public static final String TAG = "AnswerDetailActivity";
-
-    @Override
-    public boolean showToolbarAtLeft() {
-        if (HaloApp.get(GAME_DETAIL_COME_IN, false) != null) {
-            return true;
-        }
-        return super.showToolbarAtLeft();
-    }
-
-    @NonNull
-    public static Intent getIntent(Context context, String answerId, String entrance, String path) {
-        return getIntent(context, answerId, entrance, path, false, null);
-    }
-
-    @NonNull
-    public static Intent getIntent(Context context, String answerId, String entrance, String path, boolean isOpenCommentManager) {
-        return getIntent(context, answerId, entrance, path, isOpenCommentManager, null);
-    }
-
-    @NonNull
-    public static Intent getIntent(Context context, String answerId, String entrance, String path, SpecialColumn specialColumn) {
-        return getIntent(context, answerId, entrance, path, false, specialColumn);
-    }
-
-    @NonNull
-    public static Intent getIntent(Context context, String answerId, String entrance, String path, boolean isOpenCommentManager, SpecialColumn specialColumn) {
-        Bundle bundle = new Bundle();
-        bundle.putString(EntranceConsts.KEY_ANSWER_ID, answerId);
-        bundle.putString(EntranceConsts.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path));
-        bundle.putBoolean(EntranceConsts.KEY_SHOW_ANSWER_COMMENT, isOpenCommentManager);
-        bundle.putString(EntranceConsts.KEY_PATH, path);
-        bundle.putParcelable(EntranceConsts.KEY_DATA, specialColumn);
-        return getTargetIntent(context, AnswerDetailActivity.class, AnswerDetailContainerFragment.class, bundle);
-    }
-
-    @NonNull
-    public static Intent getRecommendsIntent(Context context, String answerId, String entrance, String path) {
-        Bundle bundle = new Bundle();
-        bundle.putString(EntranceConsts.KEY_ANSWER_ID, answerId);
-        bundle.putString(EntranceConsts.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path));
-        bundle.putBoolean(EntranceConsts.KEY_RECOMMENDS_CONTENTS, true);
-        bundle.putString(EntranceConsts.KEY_PATH, path);
-        return getTargetIntent(context, AnswerDetailActivity.class, AnswerDetailContainerFragment.class, bundle);
-    }
-
-    @Override
-    protected Intent provideNormalIntent() {
-        return getTargetIntent(this, AnswerDetailActivity.class, AnswerDetailContainerFragment.class);
-    }
-}

app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailContainerFragment.kt

@@ -1,121 +0,0 @@
-package com.gh.gamecenter.qa.answer.detail
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.MenuItem
-import android.view.View
-import com.gh.gamecenter.common.constant.EntranceConsts
-import com.gh.common.util.SyncDataBetweenPageHelper
-import com.gh.gamecenter.common.utils.observeNonNull
-import com.gh.gamecenter.common.utils.viewModelProviderFromParent
-import com.gh.gamecenter.databinding.FragmentAnswerDetailContainerBinding
-import com.gh.gamecenter.common.base.fragment.ToolbarFragment
-
-
-class AnswerDetailContainerFragment : ToolbarFragment() {
-
-    private lateinit var mFragmentAdapter: AnswerDetailFragmentStatePagerAdapter
-    private lateinit var mContainerViewModel: AnswerDetailContainerViewModel
-    private lateinit var mBinding: FragmentAnswerDetailContainerBinding
-    private val fragments = ArrayList<AnswerDetailFragment>()
-
-    // 是否已经传了 argument 给第一个子 fragment
-    private var mHasPassedOneTimeArgumentToChild = false
-
-    override fun getLayoutId(): Int = 0
-
-    override fun getInflatedLayout(): View {
-        return FragmentAnswerDetailContainerBinding.inflate(LayoutInflater.from(requireContext()), null, false).apply {
-            mBinding = this
-        }.root
-    }
-
-    override fun onMenuItemClick(menuItem: MenuItem?) {
-        fragmentManager?.fragments?.let {
-            for (fragment in it) {
-                if (fragment is AnswerDetailFragment && fragment.isResumed) {
-                    fragment.onMenuItemClick(menuItem!!)
-                }
-            }
-        }
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        mContainerViewModel = viewModelProviderFromParent()
-
-        val answerId = arguments?.getString(EntranceConsts.KEY_ANSWER_ID) ?: ""
-        if (!mContainerViewModel.answerIdList.contains(answerId)) {
-            mContainerViewModel.answerIdList.add(answerId)
-        }
-        val tag = "android:switcher:${mBinding.viewpager.id}:"
-        mFragmentAdapter = AnswerDetailFragmentStatePagerAdapter(parentFragmentManager) { id, position ->
-            var fragment = childFragmentManager.findFragmentByTag("${tag}${position}") as? AnswerDetailFragment
-            if (fragment == null) {
-                fragment = AnswerDetailFragment().apply {
-                    if (mHasPassedOneTimeArgumentToChild) {
-                        this@AnswerDetailContainerFragment.arguments?.putBoolean(
-                            EntranceConsts.KEY_SHOW_ANSWER_COMMENT,
-                            false
-                        )
-                        this@AnswerDetailContainerFragment.arguments?.putBoolean(
-                            EntranceConsts.KEY_RECOMMENDS_CONTENTS,
-                            false
-                        )
-                    }
-
-                    // 将外部的 argument 传给里面的 fragment
-                    this.arguments = this@AnswerDetailContainerFragment.arguments
-                    this.arguments?.putString(EntranceConsts.KEY_ANSWER_ID, id)
-                    mHasPassedOneTimeArgumentToChild = true
-                    fragments.add(this)
-                }
-            }
-            fragment
-        }
-        mFragmentAdapter.answerIdList = ArrayList(mContainerViewModel.answerIdList)
-
-        mBinding.viewpager.adapter = mFragmentAdapter
-
-        mContainerViewModel.answerListChange.observeNonNull(this) {
-            mFragmentAdapter.answerIdList = ArrayList(mContainerViewModel.answerIdList)
-            try {
-                mFragmentAdapter.notifyDataSetChanged()
-            } catch (e: Exception) {
-                e.printStackTrace()
-            }
-        }
-
-        mContainerViewModel.scroll.observeNonNull(this) {
-            val currentItem = mBinding.viewpager.currentItem
-            when (it) {
-                AnswerDetailContainerViewModel.SCROLL_TO_NEXT_ANSWER -> {
-                    if (currentItem == mContainerViewModel.answerIdList.size) {
-                        toast("到底了")
-                        return@observeNonNull
-                    } else {
-                        mBinding.viewpager.currentItem = currentItem + 1
-                    }
-                }
-                AnswerDetailContainerViewModel.SCROLL_TO_PREVIOUS_ANSWER -> {
-                    if (currentItem == mContainerViewModel.answerIdList.size) {
-                        toast("到顶了")
-                        return@observeNonNull
-                    } else {
-                        mBinding.viewpager.currentItem = currentItem - 1
-                    }
-                }
-            }
-        }
-    }
-
-    override fun onBackPressed(): Boolean {
-        val answerDetail = fragments[0].mViewModel.answerDetail
-        if (SyncDataBetweenPageHelper.setResultAndFinish(requireActivity(), answerDetail)) {
-            return true
-        }
-        return super.onBackPressed()
-    }
-
-}