feat: 快手推广包激活数据回传后置可行性研究 https://jira.shanqu.cc/browse/GHZSCY-5841

fix: 修复列表游戏的安装状态更新问题

See merge request halo/android/assistant-android!1720

.gitlab-ci.yml

@@ -71,7 +71,8 @@ android_build:
     exit_codes: 137
   only:
     - dev
-    - dev-5.32.0
+    - release
+    - feature-GHZS-5816
 
 # 代码检查
 sonarqube_analysis:
@@ -102,7 +103,7 @@ sonarqube_analysis:
      exit_codes: 137
    only:
      - dev
-     - dev-5.32.0
+     - release
 
 ## 发送简易检测结果报告
 send_sonar_report:
@@ -120,7 +121,7 @@ send_sonar_report:
      exit_codes: 137
    only:
      - dev
-     - dev-5.32.0
+     - release
 
 oss-upload&send-email:
     tags:
@@ -152,4 +153,5 @@ oss-upload&send-email:
         - /usr/local/bin/python /ci-android-mail-jira-comment.py
     only:
         - dev
-        - dev-5.32.0
+        - release
+        - feature-GHZS-5816

.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

@@ -23,6 +23,8 @@ android {
     }
 
     compileOptions {
+        coreLibraryDesugaringEnabled true
+
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
@@ -95,8 +97,10 @@ android {
         buildConfigField "int", "ACTIVATE_REPORTING_RATIO", "${ACTIVATE_REPORTING_RATIO}"
 
         // All third-party appid/appkey
+        buildConfigField "boolean", "IS_GAT_APP", "false"
         buildConfigField "String", "API_HOST", "\"${API_HOST}\""
         buildConfigField "String", "NEW_API_HOST", "\"${NEW_API_HOST}\""
+        buildConfigField "String", "LOG_HUB_PROJECT", "\"${LOG_HUB_PROJECT}\""
         buildConfigField "String", "VAPI_HOST", "\"${VAPI_HOST}\""
         buildConfigField "String", "WECHAT_APPID", "\"${WECHAT_APPID}\""
         buildConfigField "String", "WECHAT_SECRET", "\"${WECHAT_SECRET}\""
@@ -122,6 +126,10 @@ android {
         }
     }
 
+    packagingOptions {
+        exclude 'META-INF/gradle/incremental.annotation.processors'
+    }
+
     buildTypes {
         debug {
             debuggable true
@@ -148,16 +156,7 @@ android {
         }
     }
 
-    // Ignore useless variant
-    variantFilter { variant ->
-        def names = variant.flavors*.name
-        def isDebugType = variant.buildType.name == "debug"
-        if ((names.contains("tea") || name.contains("kuaishou") || name.contains("gdt")) && isDebugType) {
-            setIgnore(true)
-        }
-    }
-
-    flavorDimensions("env")
+    flavorDimensions("env", "region")
 
     sourceSets {
         publish {
@@ -175,6 +174,15 @@ android {
         gdt {
             java.srcDirs = ['src/main/java', 'src/gdt/java']
         }
+        gat {
+            java.srcDirs = ['src/main/java', 'src/gat/java']
+        }
+        cn {
+            java.srcDirs = ['src/main/java', 'src/cn/java']
+        }
+        sm {
+            java.srcDirs = ['src/main/java', 'src/sm/java']
+        }
     }
 
     productFlavors {
@@ -242,6 +250,37 @@ android {
             buildConfigField "String", "DEV_CSJ_APPID", "\"${CSJ_APPID}\""
             buildConfigField "String", "CSJ_APPID", "\"${CSJ_APPID}\""
         }
+
+        sm {
+            dimension "env"
+
+            buildConfigField "String", "DEV_API_HOST", "\"${API_HOST}\""
+            buildConfigField "String", "NEW_DEV_API_HOST", "\"${NEW_API_HOST}\""
+            buildConfigField "String", "DEV_VAPI_HOST", "\"${VAPI_HOST}\""
+            buildConfigField "String", "QUICK_LOGIN_APPID", "\"${QUICK_LOGIN_APPID}\""
+            buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${QUICK_LOGIN_APPKEY}\""
+            buildConfigField "String", "DEV_CSJ_APPID", "\"${CSJ_APPID}\""
+            buildConfigField "String", "CSJ_APPID", "\"${CSJ_APPID}\""
+        }
+
+        // 港澳台
+        gat {
+            dimension "region"
+
+            applicationId rootProject.ext.applicationIdGat
+
+            // 支持繁体
+            resConfigs "zh", "zh-rTW"
+
+            buildConfigField "boolean", "IS_GAT_APP", "true"
+            buildConfigField "String", "LOG_HUB_PROJECT", "\"${LOG_HUB_PROJECT_GAT}\""
+            buildConfigField "String", "API_HOST", "\"${API_HOST_GAT}\""
+            buildConfigField "String", "NEW_API_HOST", "\"${NEW_API_HOST_GAT}\""
+        }
+
+        cn {
+            dimension "region"
+        }
     }
 }
 
@@ -258,6 +297,7 @@ dependencies {
     teaImplementation fileTree(include: ['*.jar', '*.aar'], dir: 'src/tea/libs')
     kuaishouImplementation fileTree(include: ['*.jar', '*.aar'], dir: 'src/kuaishou/libs')
     gdtImplementation fileTree(include: ['*.jar', '*.aar'], dir: 'src/gdt/libs')
+    smImplementation fileTree(include: ['*.jar', '*.aar'], dir: 'src/sm/libs')
     testImplementation 'junit:junit:4.12'
 
     debugImplementation "com.squareup.leakcanary:leakcanary-android:${leakcanary}"
@@ -265,7 +305,6 @@ dependencies {
 
 //    debugImplementation "com.gu.android:toolargetool:${toolargetool}" // 需要使用调试时才启用
     debugImplementation "com.github.nichbar:WhatTheStack:${whatTheStack}"
-//    debugImplementation "io.github.didi.dokit:dokitx:${dokit}"
 
     implementation "androidx.multidex:multidex:${multiDex}"
     implementation "androidx.fragment:fragment-ktx:${fragment}"
@@ -277,7 +316,8 @@ dependencies {
 
     implementation "com.kyleduo.switchbutton:library:${switchButton}"
 
-    implementation "com.leon.channel:helper:${apkChannelPackage}"
+    implementation "com.tencent.vasdolly:helper:${apkChannelPackage}"
+    implementation "com.tencent.vasdolly:writer:${apkChannelPackage}"
 
     implementation "com.j256.ormlite:ormlite-android:${ormlite}"
     implementation "com.j256.ormlite:ormlite-core:${ormlite}"
@@ -300,12 +340,10 @@ 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}"
-    teaImplementation "com.bytedance.applog:RangersAppLog-All-convert:${bytedanceApplog}"
+    teaImplementation "com.bytedance.ads:AppConvert:${bytedanceAppConvert}"
 
     implementation "net.lingala.zip4j:zip4j:${zip4j}"
 
@@ -314,14 +352,16 @@ dependencies {
 
     implementation "com.lg:easyfloat:${easyFloat}"
 
-    implementation "io.github.florent37:shapeofview:${shapeOfView}"
-
-    implementation "com.lg:apksig:${apksig}"
+    implementation ("com.lg:apksig:${apksig}") {
+        exclude group: 'com.google.protobuf'
+    }
 
     implementation "com.lg:gid:${gid}"
 
     implementation "com.lg:shortcut:${shortcut}"
 
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:${desugarJdkLibs}"
+
     kapt "com.alibaba:arouter-compiler:$arouterVersion"
 
     implementation project(':ndownload')
@@ -354,7 +394,6 @@ dependencies {
     implementation(project(':module_message')) {
         exclude group: 'androidx.swiperefreshlayout'
     }
-//    implementation(project(':feature:vpn'))
     implementation(project(':feature:pkg'))
     implementation(project(':feature:oaid'))
     implementation(project(':feature:floating-window'))
@@ -365,6 +404,14 @@ dependencies {
         exclude group: 'androidx.swiperefreshlayout'
     }
     internalImplementation(project(':module_internal_test'))
+
+    def pushProperty = findProperty('BUILD_PUSH_TYPE')
+    // 根据BUILD_PUSH_TYPE决定使用哪个推送SDK，目前默认使用极光推送
+    def pushProject = (pushProperty == null || pushProperty == 'jg')
+            ? project(':feature:jg_push') : project(':feature:acloud_push')
+    implementation(pushProject) {
+        exclude group: 'androidx.swiperefreshlayout'
+    }
 }
 
 File propFile = file('sign.properties')
@@ -435,6 +482,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",
@@ -511,7 +565,16 @@ andResGuard {
             "R.id.cardMask",
             "R.id.cardGradientMask",
             "R.id.gameIconIv",
-            "R.id.titleContainer"
+            "R.id.titleContainer",
+            "R.id.v_login_background",
+            "R.id.tv_login_tips",
+            "R.id.tv_login",
+            "R.id.v_code_background",
+            "R.id.tv_code_tips",
+            "R.id.tv_code",
+            "R.id.tv_copy",
+            "R.id.v_indicator_background",
+            "R.id.v_indicator"
     ]
     compressFilePattern = [
             "*.png",

app/proguard-rules.txt

@@ -80,14 +80,14 @@
 ### EasyFloat
 -keep class com.lzf.easyfloat.* {*;}
 
-### dokit
--keep class com.didichuxing.** {*;}
-
 ### 广点通SDK
 -dontwarn com.qq.gdt.action.**
 -keep class com.qq.gdt.action.** {*;}
 -keep public class com.tencent.turingfd.sdk.**
 
+### 神马 SDK
+-dontwarn com.gism.**
+
 -keepclasseswithmembers class * {
 native <methods>;
 }

app/src/default/java/com/gh/gamecenter/provider/FlavorProviderImp.kt

@@ -8,7 +8,7 @@ import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.utils.PackageFlavorHelper
 import com.gh.gamecenter.core.provider.IFlavorProvider
 import com.gh.gamecenter.core.utils.SPUtils
-import com.leon.channel.helper.ChannelReaderUtil
+import com.tencent.vasdolly.helper.ChannelReaderUtil
 
 class FlavorProviderImp : IFlavorProvider {
     override fun getChannelStr(application: Application): String {

app/src/gdt/java/com/gh/gamecenter/GdtHelper.kt

@@ -5,6 +5,7 @@ import com.lightgame.utils.Utils
 import com.qq.gdt.action.ActionParam
 import com.qq.gdt.action.ActionType
 import com.qq.gdt.action.GDTAction
+import com.qq.gdt.action.PrivateController
 import org.json.JSONObject
 
 object GdtHelper {
@@ -16,11 +17,20 @@ object GdtHelper {
 
     @JvmStatic
     fun init(application: Application, channel: String) {
+        GDTAction.setPrivateController(object : PrivateController() {
+            override fun isCanUsePhoneState(): Boolean {
+                return false
+            }
+        })
+
         if (channel == "KS_GDT_GHZS_MC01") {
             GDTAction.init(application, KS_USER_ACTION_SET_ID, KS_APP_SECRET_ID, channel)
         } else {
             GDTAction.init(application, USER_ACTION_SET_ID, APP_SECRET_ID, channel)
         }
+
+        GDTAction.start()
+
         Utils.log("init GdtHelper")
     }
 

app/src/gdt/java/com/gh/gamecenter/provider/FlavorProviderImp.kt

@@ -8,7 +8,7 @@ import com.gh.gamecenter.core.provider.IFlavorProvider
 import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.core.utils.TimeUtils
 import com.halo.assistant.HaloApp
-import com.leon.channel.helper.ChannelReaderUtil
+import com.tencent.vasdolly.helper.ChannelReaderUtil
 
 class FlavorProviderImp : IFlavorProvider {
 

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

@@ -67,7 +67,7 @@ class InstallExternalGameFragment : ToolbarFragment(), OnItemClickListener {
             it.layoutManager = LinearLayoutManager(requireContext())
             val itemDecoration = HorizontalDividerItemDecoration.Builder(requireContext())
                 .size(2F.dip2px())
-                .color(R.color.divider.toColor(requireContext()))
+                .color(R.color.ui_divider.toColor(requireContext()))
                 .build()
             if (it.itemDecorationCount != 0) {
                 it.removeItemDecorationAt(0)

app/src/internal/res/values-zh-rTW/strings.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="title_install_external_game">從SD卡安裝</string>
+    <string name="text_install">安裝</string>
+    <string name="text_uninstall">卸載</string>
+    <string name="text_start">啟動</string>
+</resources>

app/src/kuaishou/java/com/gh/gamecenter/KuaishouHelper.kt

@@ -14,6 +14,7 @@ object KuaishouHelper {
             TurboConfig.TurboConfigBuilder.create(context)
                 .setAppId(mAppId)
                 .setAppName(mAppName)
+                .setEnableDebug(true)
                 .setAppChannel(channel)
                 .build()
         )

app/src/kuaishou/java/com/gh/gamecenter/provider/FlavorProviderImp.kt

@@ -12,7 +12,7 @@ import com.gh.gamecenter.core.utils.TimeUtils
 import com.gh.gamecenter.core.utils.ToastUtils
 import com.halo.assistant.HaloApp
 import com.kwai.monitor.payload.TurboHelper
-import com.leon.channel.helper.ChannelReaderUtil
+import com.tencent.vasdolly.helper.ChannelReaderUtil
 
 class FlavorProviderImp : IFlavorProvider {
 

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卡上写文件 -->
@@ -99,6 +107,18 @@
         android:name="android.permission.GET_TASKS"
         tools:node="remove" />
 
+    <uses-permission
+        android:name="android.permission.ACCESS_COARSE_LOCATION"
+        tools:node="remove" />
+
+    <uses-permission
+        android:name="android.permission.ACCESS_BACKGROUND_LOCATION"
+        tools:node="remove" />
+
+    <uses-permission
+        android:name="android.permission.ACCESS_FINE_LOCATION"
+        tools:node="remove" />
+
     <supports-screens
         android:anyDensity="true"
         android:largeScreens="true"
@@ -114,10 +134,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"
@@ -190,7 +212,7 @@
             android:screenOrientation="portrait" />
 
         <activity
-            android:name="com.gh.gamecenter.NewsDetailActivity"
+            android:name="com.gh.gamecenter.newsdetail.NewsDetailActivity"
             android:screenOrientation="portrait" />
 
         <activity
@@ -245,7 +267,7 @@
             android:windowSoftInputMode="stateHidden" />
 
         <activity
-            android:name="com.gh.gamecenter.LibaoDetailActivity"
+            android:name="com.gh.gamecenter.libao.LibaoDetailActivity"
             android:screenOrientation="portrait" />
 
         <activity
@@ -309,14 +331,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" />
@@ -325,10 +339,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" />
@@ -366,10 +376,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" />
@@ -408,10 +414,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" />
@@ -484,9 +486,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" />
@@ -498,10 +497,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" />
@@ -607,6 +602,10 @@
             android:name=".game.commoncollection.detail.CommonCollectionDetailActivity"
             android:screenOrientation="portrait" />
 
+        <activity
+            android:name=".game.commoncollection.detail.CustomCommonCollectionDetailActivity"
+            android:screenOrientation="portrait" />
+
         <activity
             android:name=".gamecollection.detail.GameCollectionDetailActivity"
             android:screenOrientation="portrait" />
@@ -698,7 +697,7 @@
             android:screenOrientation="portrait" />
 
         <activity
-            android:name="com.gh.gamecenter.toolbox.ToolBoxBlockActivity"
+            android:name="com.gh.gamecenter.toolbox.ToolBoxActivity"
             android:screenOrientation="portrait" />
 
         <activity
@@ -756,11 +755,11 @@
             android:screenOrientation="portrait" />
 
         <activity
-            android:name="com.gh.gamecenter.qgame.QGameHomeWrapperActivity"
+            android:name="com.gh.gamecenter.minigame.qq.QGameHomeWrapperActivity"
             android:screenOrientation="portrait" />
 
         <activity
-            android:name="com.gh.gamecenter.qgame.QGameSearchActivity"
+            android:name="com.gh.gamecenter.minigame.MiniGameSearchActivity"
             android:screenOrientation="portrait" />
 
         <activity
@@ -771,6 +770,27 @@
             android:name="com.gh.gamecenter.UserAuthActivity"
             android:screenOrientation="portrait" />
 
+        <activity
+            android:name="com.gh.gamecenter.SplashAdActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.wrapper.ToolbarWrapperActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".forum.home.CommunityActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".forum.home.follow.FollowDynamicActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.Transparent" />
+
+        <activity
+            android:name=".forum.home.follow.AllFollowedActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppCompatTheme.APP" />
 
         <!--        <activity-->
         <!--            android:name="${applicationId}.douyinapi.DouYinEntryActivity"-->
@@ -826,6 +846,8 @@
         <!--                tools:node="remove" />-->
         <!--        </provider>-->
 
+        <service android:name="com.gh.gamecenter.install.InstallService" />
+
         <receiver
             android:name="com.gh.gamecenter.receiver.DownloadReceiver"
             android:exported="false">
@@ -843,8 +865,8 @@
 
         <activity
             android:name="com.gh.common.xapk.XapkInstallReceiver"
-            android:theme="@style/Theme.Transparent"
-            android:exported="false" />
+            android:exported="false"
+            android:theme="@style/Theme.Transparent" />
 
         <receiver
             android:name="com.gh.gamecenter.receiver.ActivitySkipReceiver"
@@ -853,7 +875,6 @@
                 <action android:name="com.gh.gamecenter.ACTIVITYSKIP" />
             </intent-filter>
         </receiver>
-
     </application>
 
 </manifest>

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/lottie/tab_mine.json

@@ -0,0 +1 @@
+{"v":"5.12.2","fr":60,"ip":0,"op":40,"w":66,"h":66,"nm":"icon_tab_my","ddd":0,"assets":[{"id":"comp_0","nm":"icon","fr":60,"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"highlight","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33.134,34.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.667,"y":0.733},"o":{"x":0.333,"y":0},"t":0,"s":[{"i":[[0,-0.004],[0.493,0],[0,0.004],[-0.493,0]],"o":[[0,0.004],[-0.493,0],[0,-0.004],[0.493,0]],"v":[[0.893,1.488],[0,1.496],[-0.893,1.488],[0,1.483]],"c":true}]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0.267},"t":10,"s":[{"i":[[0,-1.018],[1.793,0],[0,1.018],[-1.793,0]],"o":[[0,1.018],[-1.793,0],[0,-1.018],[1.793,0]],"v":[[2.914,-0.344],[0,1.5],[-2.914,-0.344],[0,-1.5]],"c":true}]},{"i":{"x":0.333,"y":1},"o":{"x":0.667,"y":0},"t":18,"s":[{"i":[[0,-1.181],[1.407,0],[0,1.181],[-1.407,0]],"o":[[0,1.181],[-1.407,0],[0,-1.181],[1.407,0]],"v":[[2.226,-0.341],[0,1.74],[-2.211,-0.341],[0,-1.74]],"c":true}]},{"i":{"x":0.333,"y":1},"o":{"x":0.667,"y":0},"t":26,"s":[{"i":[[0,-0.905],[1.381,0],[0,0.905],[-1.381,0]],"o":[[0,0.905],[-1.381,0],[0,-0.905],[1.381,0]],"v":[[2.5,-0.306],[0,1.333],[-2.5,-0.306],[0,-1.333]],"c":true}]},{"t":32,"s":[{"i":[[0,-1.018],[1.381,0],[0,1.018],[-1.381,0]],"o":[[0,1.018],[-1.381,0],[0,-1.018],[1.381,0]],"v":[[2.5,-0.344],[0,1.5],[-2.5,-0.344],[0,-1.5]],"c":true}]}],"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"color","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"椭圆形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":60,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"body","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,34.204,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-3.866,0],[0,3.866],[3.866,0],[0,-3.866]],"o":[[3.866,0],[0,-3.866],[-3.866,0],[0,3.866]],"v":[[0,4.599],[7,-2.401],[0,-9.401],[-7,-2.401]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0.207,0.359],[2.438,0],[1.189,-2.104],[-0.361,-0.204],[-0.204,0.361],[-1.915,0],[-0.932,-1.613],[-0.359,0.207]],"o":[[-1.198,-2.072],[-2.462,0],[-0.204,0.361],[0.361,0.204],[0.925,-1.638],[1.897,0],[0.207,0.359],[0.359,-0.207]],"v":[[5.848,8.225],[0,4.849],[-5.88,8.282],[-5.596,9.304],[-4.574,9.02],[0,6.349],[4.549,8.976],[5.574,9.25]],"c":true},"ix":2},"nm":"路径 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"合并路径 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.267,0.639,1,0.5,0.241,0.596,1,1,0.216,0.553,1],"ix":9}},"s":{"a":0,"k":[-3.812,-4.384],"ix":5},"e":{"a":0,"k":[6.345,8.129],"ix":6},"t":1,"nm":"color","mn":"ADBE Vector Graphic - G-Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"Union","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":60,"st":0,"ct":1,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":0,"nm":"icon","refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,33,0],"ix":2,"l":2},"a":{"a":0,"k":[33,33,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":0,"s":[100,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":8,"s":[70,70,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":18,"s":[110,110,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":26,"s":[90,90,100]},{"t":32,"s":[100,100,100]}],"ix":6,"l":2}},"ao":0,"w":66,"h":66,"ip":0,"op":60,"st":0,"bm":0}],"markers":[],"props":{}}

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/ad/AdDelegateHelper.kt

@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
 import android.content.SharedPreferences
+import android.os.Message
 import android.text.TextUtils
 import android.view.View
 import android.view.ViewGroup
@@ -17,6 +18,7 @@ import com.gh.common.exposure.ExposureManager
 import com.gh.common.util.DirectUtils.directToLinkPage
 import com.gh.common.util.LogUtils
 import com.gh.common.util.NewFlatLogUtils.logOpenScreenAdSkip
+import com.gh.common.util.PackageUtils
 import com.gh.gamecenter.BuildConfig
 import com.gh.gamecenter.MainActivity
 import com.gh.gamecenter.R
@@ -53,7 +55,7 @@ object AdDelegateHelper {
     private var mCsjAdImpl: ICsjAdProvider? = null
     private var mBeiziAdImpl: IBeiziAdProvider? = null
 
-    private var mAdConfigList: ArrayList<AdConfig>? = null
+    private val mAdConfigList: ArrayList<AdConfig> by lazy { arrayListOf() }
 
     private var mSplashAd: AdConfig? = null
     private var mDownloadManagerAd: AdConfig? = null
@@ -66,6 +68,7 @@ object AdDelegateHelper {
     private const val AD_SDK_CSJ = "穿山甲"
     private const val AD_SDK_BEIZI = "倍孜"
     const val AD_TYPE_SDK = "third_party_ads" // 第三方 SDK 广告
+    const val AD_TYPE_OWNER = "owner_ads" // 自有广告
 
     private const val KEY_CACHE_CONFIG = "cache_config" // 放在 SP 里的广告缓存（避免接口加载问题）
 
@@ -73,6 +76,7 @@ object AdDelegateHelper {
         HaloApp.getInstance().getSharedPreferences("AdConfig", Context.MODE_PRIVATE)
     }
 
+    var isShowingSplashAd = false // 是否正在显示开屏广告
     var gameSearchKeyword = ""
 
     fun initAdSdk(context: Context) {
@@ -103,7 +107,7 @@ object AdDelegateHelper {
     @SuppressLint("CheckResult")
     fun requestAdConfig(isFromRetry: Boolean, keyword: String = "", callback: (() -> Unit)? = null) {
         // mAdConfigList 不为空不需要重试
-        if (isFromRetry && mAdConfigList != null) {
+        if (isFromRetry && mAdConfigList.isNotEmpty()) {
             return
         }
         val paramsMap = if (keyword.isNotEmpty()) mapOf("keyword" to keyword) else mapOf()
@@ -126,7 +130,7 @@ object AdDelegateHelper {
 
                     // 若接口请求失败时，从 SP 里获取上次缓存的数据
                     val cachedConfig: List<AdConfig>? = SPUtils.getString(mAdConfigSp, KEY_CACHE_CONFIG).toObject()
-                    if (cachedConfig != null) {
+                    if (cachedConfig != null && mAdConfigList.isEmpty()) {
                         handleAdConfig(cachedConfig)
                     }
 
@@ -153,11 +157,13 @@ object AdDelegateHelper {
      * 处理广告配置
      */
     fun handleAdConfig(configList: List<AdConfig>) {
+        mAdConfigList.clear()
         mGameSearchAdList.clear()
         mSplashAd = null
         mDownloadManagerAd = null
         mVGameLaunchAd = null
         for (config in configList) {
+            mAdConfigList.add(config)
             // 处理返回的数据
             when (config.location) {
                 "halo_launch" -> {
@@ -174,9 +180,101 @@ object AdDelegateHelper {
 
     /**
      * 是否需要显示开屏广告
+     * @param isHotLaunch 是否为热启动
      */
-    fun shouldShowStartUpAd(): Boolean {
+    fun shouldShowStartUpAd(isHotLaunch: Boolean): Boolean {
         return mSplashAd != null
+                && !isShowingSplashAd
+                && (!isHotLaunch || shouldShowStartUpAdWhenHotLaunch())
+                && !isMatchAdFreeRule(mSplashAd)
+                && isMatchStartUpAdDisplayRule()
+    }
+
+    /**
+     * 热启动是否需要显示开屏广告(目前只展示第三方广告)
+     */
+    private fun shouldShowStartUpAdWhenHotLaunch() = (mCsjAdImpl != null || mBeiziAdImpl != null)
+            && mSplashAd?.displayRule?.hotStartSplashAd?.type == AD_TYPE_SDK
+            && mSplashAd?.hotStartThirdPartyAd != null
+
+    /**
+     * 是否需要显示下载管理广告
+     */
+    fun shouldShowDownloadManagerAd(): Boolean {
+        return mDownloadManagerAd != null && !isMatchAdFreeRule(mDownloadManagerAd) && isMatchDownloadManagerAdDisplayRule()
+    }
+
+    /**
+     * 是否需要显示游戏搜索广告
+     */
+    fun shouldShowGameSearchAd(adConfig: AdConfig): Boolean {
+        return !isMatchAdFreeRule(adConfig) && isMatchGameSearchAdDisplayRule(adConfig)
+    }
+
+    /**
+     * 是否在免广告时长内
+     */
+    private fun isMatchAdFreeRule(adConfig: AdConfig?): Boolean {
+        adConfig?.displayRule?.run {
+            if (adFreeDuration > 0) {
+                val ghInstalledDurationInHours = (System.currentTimeMillis() - PackageUtils.getInstalledTime(
+                    HaloApp.getInstance(),
+                    BuildConfig.APPLICATION_ID
+                )).toFloat() / 1000 / 3600
+                return ghInstalledDurationInHours < adFreeDuration
+            } else {
+                return false
+            }
+        }
+        return false
+    }
+
+    /**
+     * 是否大于开屏广告展示间隔时长
+     */
+    private fun isMatchStartUpAdDisplayRule(): Boolean {
+        mSplashAd?.displayRule?.run {
+            if (adDisplayInterval > 0) {
+                val lastShowTime = SPUtils.getLong(Constants.SP_LAST_SPLASH_AD_SHOW_TIME, 0L)
+                val durationInMinutes = (System.currentTimeMillis() - lastShowTime).toFloat() / 1000 / 60
+                return durationInMinutes > adDisplayInterval
+            } else {
+                return true
+            }
+        }
+        return true
+    }
+
+    /**
+     * 是否大于广告管理展示间隔时长
+     */
+    private fun isMatchDownloadManagerAdDisplayRule(): Boolean {
+        mDownloadManagerAd?.displayRule?.run {
+            if (adDisplayInterval > 0) {
+                val lastShowTime = SPUtils.getLong(Constants.SP_LAST_DOWNLOAD_MANAGER_AD_SHOW_TIME, 0L)
+                val durationInMinutes = (System.currentTimeMillis() - lastShowTime).toFloat() / 1000 / 60
+                return durationInMinutes > adDisplayInterval
+            } else {
+                return true
+            }
+        }
+        return true
+    }
+
+    /**
+     * 是否大于游戏搜索展示间隔时长
+     */
+    private fun isMatchGameSearchAdDisplayRule(adConfig: AdConfig?): Boolean {
+        adConfig?.displayRule?.run {
+            if (adDisplayInterval > 0) {
+                val lastShowTime = SPUtils.getLong(Constants.SP_LAST_GAME_SEARCH_AD_SHOW_TIME + adConfig.position, 0L)
+                val durationInMinutes = (System.currentTimeMillis() - lastShowTime).toFloat() / 1000 / 60
+                return durationInMinutes > adDisplayInterval
+            } else {
+                return true
+            }
+        }
+        return true
     }
 
     /**
@@ -200,54 +298,127 @@ object AdDelegateHelper {
         sdkStartAdContainer: ViewGroup,
         adsViewGroup: FrameLayout,
         handler: BaseActivity.BaseHandler,
-        hideCallback: () -> Unit
+        isHotLaunch: Boolean,
+        hideAction: () -> Unit
     ) {
+        val hideCallback = {
+            isShowingSplashAd = false
+            hideAction.invoke()
+        }
         if (mSplashAd != null) {
-            if (mSplashAd!!.displayRule.adSource == AD_TYPE_SDK) {
-                // 第三方开屏广告回调，失败时根据接口配置选项决定是否显示自有开屏广告
-                val sdkSplashCallback: (isSuccess: Boolean) -> Unit = { isSuccess ->
-                    if (isSuccess) {
-                        hideCallback.invoke()
-                    } else {
-                        if (mSplashAd?.displayRule?.onFailedAction == "show") {
-                            sdkStartAdContainer.visibility = View.GONE
-                            requestStandardSplashAd(
-                                mSplashAd!!.ownerAd?.startAd,
-                                startAdContainer,
-                                handler,
-                                hideCallback
-                            )
-                        } else {
-                            hideCallback.invoke()
-                        }
-                    }
-                }
-
-                // 第三方广告的数据为空，按加载失败处理
-                if (mSplashAd?.thirdPartyAd == null) {
-                    sdkSplashCallback.invoke(false)
-                    return
-                }
-
-                if (mSplashAd?.thirdPartyAd?.sourceName == AD_SDK_BEIZI) {
-                    sdkStartAdContainer.visibility = View.VISIBLE
-                    requestBeiziSplashAd(sdkStartAdContainer, adsViewGroup, adViewWidthInPx, adViewHeightInPx, sdkSplashCallback)
-                } else if (mSplashAd?.thirdPartyAd?.sourceName == AD_SDK_CSJ) {
-                    sdkStartAdContainer.visibility = View.VISIBLE
-                    requestCsjSplashAd(
+            when (if (isHotLaunch) mSplashAd!!.displayRule.hotStartSplashAd?.type else mSplashAd!!.displayRule.adSource) {
+                AD_TYPE_SDK -> {
+                    isShowingSplashAd = true
+                    requestThirdPartySplashAd(
                         activity,
-                        mSplashAd?.thirdPartyAd?.slotId ?: "unknown",
                         adViewWidthInPx,
                         adViewHeightInPx,
                         adViewWidthInDp,
                         adViewHeightInDp,
+                        startAdContainer,
                         sdkStartAdContainer,
-                        sdkSplashCallback
+                        adsViewGroup,
+                        handler,
+                        isHotLaunch,
+                        hideCallback
+                    )
+                }
+
+                AD_TYPE_OWNER -> {
+                    isShowingSplashAd = true
+                    requestStandardSplashAd(
+                        activity,
+                        adViewWidthInPx,
+                        adViewHeightInPx,
+                        adViewWidthInDp,
+                        adViewHeightInDp,
+                        startAdContainer,
+                        sdkStartAdContainer,
+                        adsViewGroup,
+                        handler,
+                        isHotLaunch,
+                        hideCallback
                     )
                 }
-            } else {
-                requestStandardSplashAd(mSplashAd!!.ownerAd?.startAd, startAdContainer, handler, hideCallback)
             }
+        } else {
+            hideCallback.invoke()
+        }
+    }
+
+    /**
+     * 获取第三方开屏广告
+     */
+    private fun requestThirdPartySplashAd(
+        activity: Activity,
+        adViewWidthInPx: Int,
+        adViewHeightInPx: Int,
+        adViewWidthInDp: Float,
+        adViewHeightInDp: Float,
+        startAdContainer: ViewGroup,
+        sdkStartAdContainer: ViewGroup,
+        adsViewGroup: FrameLayout,
+        handler: BaseActivity.BaseHandler,
+        isHotLaunch: Boolean,
+        hideCallback: () -> Unit
+    ) {
+        // 第三方开屏广告回调，失败时根据接口配置选项决定是否显示自有开屏广告
+        val sdkSplashCallback: (isSuccess: Boolean) -> Unit = { isSuccess ->
+            if (isSuccess) {
+                hideCallback.invoke()
+                SPUtils.setLong(Constants.SP_LAST_SPLASH_AD_SHOW_TIME, System.currentTimeMillis())
+            } else {
+                if (mSplashAd?.displayRule?.adSource == AD_TYPE_SDK && mSplashAd?.displayRule?.onFailedAction == "show" && !isHotLaunch) {
+                    sdkStartAdContainer.visibility = View.GONE
+                    requestStandardSplashAd(
+                        activity,
+                        adViewWidthInPx,
+                        adViewHeightInPx,
+                        adViewWidthInDp,
+                        adViewHeightInDp,
+                        startAdContainer,
+                        sdkStartAdContainer,
+                        adsViewGroup,
+                        handler,
+                        isHotLaunch,
+                        hideCallback
+                    )
+                } else {
+                    hideCallback.invoke()
+                }
+            }
+        }
+
+        val thirdPartyAd = if (isHotLaunch) mSplashAd?.hotStartThirdPartyAd else mSplashAd?.thirdPartyAd
+
+        // 第三方广告的数据为空，按加载失败处理
+        if (mSplashAd == null || thirdPartyAd == null) {
+            sdkSplashCallback.invoke(false)
+            return
+        }
+
+        val timeout = if (isHotLaunch) {
+            ((mSplashAd?.displayRule?.hotStartSplashAd?.timeout ?: 3.5F) * 1000).toInt()
+        } else {
+            ((mSplashAd?.displayRule?.timeout ?: 3.5F) * 1000).toInt()
+        }
+
+        if (thirdPartyAd.sourceName == AD_SDK_BEIZI) {
+            sdkStartAdContainer.visibility = View.VISIBLE
+            requestBeiziSplashAd(sdkStartAdContainer, adsViewGroup, adViewWidthInPx, adViewHeightInPx, timeout.toLong(), sdkSplashCallback)
+        } else if (thirdPartyAd.sourceName == AD_SDK_CSJ) {
+            sdkStartAdContainer.visibility = View.VISIBLE
+            requestCsjSplashAd(
+                activity,
+                thirdPartyAd.slotId,
+                adViewWidthInPx,
+                adViewHeightInPx,
+                adViewWidthInDp,
+                adViewHeightInDp,
+                sdkStartAdContainer,
+                timeout,
+                sdkSplashCallback
+            )
         }
     }
 
@@ -262,6 +433,7 @@ object AdDelegateHelper {
         adViewWidthInDp: Float,
         adViewHeightInDp: Float,
         startAdContainer: ViewGroup,
+        timeout: Int,
         callback: (isSuccess: Boolean) -> Unit,
     ) {
         if (mCsjAdImpl == null) {
@@ -275,6 +447,7 @@ object AdDelegateHelper {
                 adViewWidthInDp,
                 adViewHeightInDp,
                 startAdContainer,
+                timeout,
                 callback,
             )
         }
@@ -288,12 +461,13 @@ object AdDelegateHelper {
         adsFl: FrameLayout,
         adViewWidthInPx: Int,
         adViewHeightInPx: Int,
+        timeout: Long,
         callback: (isSuccess: Boolean) -> Unit,
     ) {
         if (mBeiziAdImpl == null) {
             callback.invoke(false)
         } else {
-            mBeiziAdImpl?.requestSplashAd(startAdContainer, adsFl, adViewWidthInPx, adViewHeightInPx, callback)
+            mBeiziAdImpl?.requestSplashAd(startAdContainer, adsFl, adViewWidthInPx, adViewHeightInPx, timeout, callback)
         }
     }
 
@@ -301,13 +475,41 @@ object AdDelegateHelper {
      * 显示自有的开屏广告
      */
     private fun requestStandardSplashAd(
-        splashAd: StartupAdEntity?,
+        activity: Activity,
+        adViewWidthInPx: Int,
+        adViewHeightInPx: Int,
+        adViewWidthInDp: Float,
+        adViewHeightInDp: Float,
         startAdContainer: ViewGroup,
+        sdkStartAdContainer: ViewGroup,
+        adsViewGroup: FrameLayout,
         handler: BaseActivity.BaseHandler,
+        isHotLaunch: Boolean,
         hideCallback: () -> Unit
     ) {
+        val splashAd = mSplashAd?.ownerAd?.startAd
+        val onEmptyCallback = {
+            if (mSplashAd?.displayRule?.adSource == AD_TYPE_OWNER && mSplashAd?.displayRule?.onFailedAction == "show" && mSplashAd?.thirdPartyAd != null) {
+                // 自有广告为空时，显示第三方广告
+                requestThirdPartySplashAd(
+                    activity,
+                    adViewWidthInPx,
+                    adViewHeightInPx,
+                    adViewWidthInDp,
+                    adViewHeightInDp,
+                    startAdContainer,
+                    sdkStartAdContainer,
+                    adsViewGroup,
+                    handler,
+                    isHotLaunch,
+                    hideCallback
+                )
+            } else {
+                hideCallback.invoke()
+            }
+        }
         if (splashAd == null) {
-            hideCallback.invoke()
+            onEmptyCallback.invoke()
             return
         }
 
@@ -320,7 +522,7 @@ object AdDelegateHelper {
                 ) {
                     showStandardSplashAd(splashAd, startAdContainer, handler, hideCallback)
                 } else {
-                    hideCallback.invoke()
+                    onEmptyCallback.invoke()
                 }
 
                 "everyday" -> {
@@ -331,7 +533,7 @@ object AdDelegateHelper {
                     ) {
                         showStandardSplashAd(splashAd, startAdContainer, handler, hideCallback)
                     } else {
-                        hideCallback.invoke()
+                        onEmptyCallback.invoke()
                     }
                 }
 
@@ -376,6 +578,17 @@ object AdDelegateHelper {
                 (if (linkEntity.type != null) linkEntity.type else "")!!,
                 (if (linkEntity.link != null) linkEntity.link else "")!!
             )
+            SensorsBridge.trackEvent(
+                "SplashAdOwnSkip",
+                "splash_ad_id",
+                ad.id,
+                "link_type",
+                linkEntity.type ?: "",
+                "link_id",
+                linkEntity.link ?: "",
+                "link_text",
+                linkEntity.text ?: ""
+            )
         }
         val sources: MutableList<ExposureSource> = ArrayList()
         sources.add(ExposureSource("开屏广告", ad.id))
@@ -383,7 +596,19 @@ object AdDelegateHelper {
         ExposureManager.log(event)
         if (ad.button) {
             jumpDetailBtn.setOnClickListener { v: View ->
-                directToLinkPage(v.context, ad.jump, "(启动广告)", "", event)
+                val linkEntity = ad.jump
+                directToLinkPage(v.context, linkEntity, "(启动广告)", "", event)
+                SensorsBridge.trackEvent(
+                    "SplashAdOwnClick",
+                    "splash_ad_id",
+                    ad.id,
+                    "link_type",
+                    linkEntity.type ?: "",
+                    "link_id",
+                    linkEntity.link ?: "",
+                    "link_text",
+                    linkEntity.text ?: ""
+                )
                 v.postDelayed({
                     handler.removeMessages(MainActivity.COUNTDOWN_AD)
                     hideCallback.invoke()
@@ -394,7 +619,11 @@ object AdDelegateHelper {
         } else {
             LogUtils.logStartAd("start_ads", ad)
         }
-        handler.sendEmptyMessageDelayed(MainActivity.COUNTDOWN_AD, 1000)
+        SPUtils.setLong(Constants.SP_LAST_SPLASH_AD_SHOW_TIME, System.currentTimeMillis())
+        val msg = Message.obtain()
+        msg.what = MainActivity.COUNTDOWN_AD
+        msg.obj = ad
+        handler.sendMessageDelayed(msg, 1000)
     }
 
     /**

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

@@ -44,7 +44,7 @@ import org.json.JSONObject
 import java.io.File
 
 // TODO: 移动到module_bbs模块
-abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarActivity(),
+abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> constructor() : ToolBarActivity(),
     KeyboardHeightObserver, UploadVideoListener {
 
     lateinit var mRichEditor: RichEditor
@@ -233,7 +233,7 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
         mKeyboardHeightProvider = KeyboardHeightProvider(this)
         mRichEditor.post { mKeyboardHeightProvider?.start() }
         mRichEditor.enableForceDark(DarkModeUtils.isDarkModeOn(this))
-        mRichEditor.setEditorBackgroundColor(R.color.background_white.toColor(this))
+        mRichEditor.setEditorBackgroundColor(R.color.ui_surface.toColor(this))
         mRichEditor.setEditorFontColor(if (mIsDarkModeOn) Color.parseColor("#C2C2C2") else Color.parseColor("#4A4A4A"))
         // 防止个别手机在Js里无法获取粘贴内容
         mRichEditor.addJavascriptInterface(OnPasteListener(), "onPasteListener")
@@ -797,9 +797,9 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
 
     override fun onDarkModeChanged() {
         super.onDarkModeChanged()
-        updateStatusBarColor(R.color.background_white, R.color.background_white)
+        updateStatusBarColor(R.color.ui_surface, R.color.ui_surface)
         mRichEditor.enableForceDark(DarkModeUtils.isDarkModeOn(this))
-        mRichEditor.setEditorBackgroundColor(R.color.background_white.toColor(this))
+        mRichEditor.setEditorBackgroundColor(R.color.ui_surface.toColor(this))
         mRichEditor.setEditorFontColor(if (mIsDarkModeOn) Color.parseColor("#C2C2C2") else Color.parseColor("#4A4A4A"))
     }
 

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

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

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

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

@@ -4,20 +4,27 @@ import android.app.Activity
 import android.app.Application
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import com.alibaba.android.arouter.launcher.ARouter
+import com.gh.ad.AdDelegateHelper
 import com.gh.common.util.FloatingBackViewManager
 import com.gh.common.xapk.XapkInstaller
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.SingletonWebActivity
 import com.gh.gamecenter.SkipActivity
+import com.gh.gamecenter.SplashAdActivity
 import com.gh.gamecenter.SplashScreenActivity
 import com.gh.gamecenter.authorization.AuthorizationActivity
 import com.gh.gamecenter.common.base.GlobalActivityManager
+import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.utils.PackageFlavorHelper
+import com.gh.gamecenter.core.provider.IPushProvider
 import com.gh.vspace.VHelper
 import com.halo.assistant.HaloApp
 
 // TODO：移动到对应的模块
 class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
+    private var isFromBackgroundToForeground = false // 是否后台回到前台
+    private var activityCount = 0
 
     override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
         // do nothing
@@ -25,6 +32,27 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
 
     override fun onActivityStarted(activity: Activity) {
         GlobalActivityManager.currentActivity = activity
+        activityCount ++
+        if (activityCount == 1 && isFromBackgroundToForeground) {
+            if (AdDelegateHelper.shouldShowStartUpAd(true)
+                && !HaloApp.getInstance().isSkippingThirdParty
+                && activity !is SplashScreenActivity
+                && activity !is SkipActivity
+                && activity !is AuthorizationActivity
+                && activity !is SplashAdActivity
+            ) {
+                activity.startActivity(SplashAdActivity.getIntent(activity))
+            }
+            isFromBackgroundToForeground = false
+        }
+
+        if (activityCount == 1) {
+            // 清除桌面角标
+            if (activity !is SplashScreenActivity && activity !is AuthorizationActivity) {
+                val pushProvider = ARouter.getInstance().build(RouteConsts.provider.push).navigation() as? IPushProvider
+                pushProvider?.cleanBadgeNumber(activity.applicationContext)
+            }
+        }
     }
 
     override fun onActivityResumed(activity: Activity) {
@@ -74,7 +102,8 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
     }
 
     override fun onActivityStopped(activity: Activity) {
-        // do nothing
+        activityCount --
+        isFromBackgroundToForeground = activityCount <= 0
     }
 
     override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {

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

@@ -32,9 +32,13 @@ import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.common.utils.NewFlatLogUtils
 import com.gh.gamecenter.common.view.dsbridge.CompletionHandler
 import com.gh.gamecenter.core.AppExecutor
+import com.gh.gamecenter.core.provider.IPushProvider
 import com.gh.gamecenter.core.runOnIoThread
 import com.gh.gamecenter.core.runOnUiThread
-import com.gh.gamecenter.core.utils.*
+import com.gh.gamecenter.core.utils.CurrentActivityHolder
+import com.gh.gamecenter.core.utils.DisplayUtils
+import com.gh.gamecenter.core.utils.SPUtils
+import com.gh.gamecenter.core.utils.ToastUtils
 import com.gh.gamecenter.entity.SensorsEvent
 import com.gh.gamecenter.eventbus.EBDownloadStatus
 import com.gh.gamecenter.eventbus.EBPackage
@@ -45,7 +49,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
@@ -70,7 +73,7 @@ class DefaultJsApi(
     private var mFragment: Fragment? = null,
     private var mBbsId: String? = "",
     private var mOriginUrl: String? = "",
-    private val mForumName: String? = ""
+    private val mForumName: String? = "",
 ) {
 
     companion object {
@@ -90,6 +93,11 @@ class DefaultJsApi(
         }
     }
 
+    @JavascriptInterface
+    fun isEnableForceDark(msg: Any): Boolean {
+        return DarkModeUtils.isWebViewForceDarkEnabled
+    }
+
     @JavascriptInterface
     fun isGhzs(msg: Any): String {
         return "true"
@@ -130,12 +138,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
@@ -329,6 +337,17 @@ class DefaultJsApi(
         return HaloApp.getInstance().gid
     }
 
+    @JavascriptInterface
+    fun getOaid(msg: Any): String {
+        return HaloApp.getInstance().oaid
+    }
+
+    @JavascriptInterface
+    fun getPushId(): String {
+        val pushProvider = ARouter.getInstance().build(RouteConsts.provider.push).navigation() as? IPushProvider
+        return pushProvider?.getRegistrationId(HaloApp.getInstance()) ?: "unknown"
+    }
+
     @JavascriptInterface
     fun showIncompatibleVersionDialog(msg: Any) {
         DialogHelper.showUpgradeDialog(context)

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

@@ -15,9 +15,6 @@ import com.gh.common.util.DirectUtils.directToLegacyVideoDetail
 import com.gh.common.util.DirectUtils.directToLinkPage
 import com.gh.common.util.DirectUtils.directToQa
 import com.gh.common.util.PackageUtils
-import com.gh.gamecenter.LibaoDetailActivity
-import com.gh.gamecenter.MainActivity
-import com.gh.gamecenter.NewsDetailActivity
 import com.gh.gamecenter.WebActivity
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.constant.EntranceConsts
@@ -34,12 +31,12 @@ import com.gh.gamecenter.core.utils.ToastUtils
 import com.gh.gamecenter.entity.ActivityLabelEntity
 import com.gh.gamecenter.entity.SubjectRecommendEntity
 import com.gh.gamecenter.entity.VideoLinkEntity
-import com.gh.gamecenter.eventbus.EBSkip
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.gh.gamecenter.feature.utils.PlatformUtils
-import com.gh.gamecenter.fragment.MainWrapperFragment
 import com.gh.gamecenter.gamecollection.publish.GameCollectionEditActivity
+import com.gh.gamecenter.libao.LibaoDetailActivity
+import com.gh.gamecenter.newsdetail.NewsDetailActivity
 import com.gh.gamecenter.qa.BbsType
 import com.gh.gamecenter.qa.video.publish.VideoPublishActivity
 import com.gh.gamecenter.subject.SubjectActivity
@@ -51,8 +48,8 @@ import java.nio.charset.Charset
 object DefaultUrlHandler {
 
     @JvmStatic
-    fun interceptUrl(context: Context, url: String, entrance: String): Boolean {
-        return interceptUrl(context, url, null, entrance, false)
+    fun interceptUrl(context: Context, url: String, entrance: String, sourceEntrance: String = ""): Boolean {
+        return interceptUrl(context, url, null, entrance, false, sourceEntrance)
     }
 
     /**
@@ -66,7 +63,8 @@ object DefaultUrlHandler {
     fun interceptUrl(context: Context, url: String,
                      traceEvent: ExposureEvent? = null,
                      entrance: String,
-                     bringAppToFront: Boolean = false): Boolean {
+                     bringAppToFront: Boolean = false,
+                     sourceEntrance: String = ""): Boolean {
         val uri = Uri.parse(url)
         if ("ghzhushou" == uri.scheme) {
             Utils.log("url = $url")
@@ -135,7 +133,7 @@ object DefaultUrlHandler {
                     }
 
                 }
-                "question" -> DirectUtils.directToQuestionDetail(context, id, entrance, "文章链接")
+                "question" -> DirectUtils.directToQuestionDetail(context, id, entrance, "文章链接", sourceEntrance)
 
                 "real_name" -> DirectUtils.directToRealName(context)
 
@@ -178,7 +176,7 @@ object DefaultUrlHandler {
                     if ("articles" == type) {
                         DirectUtils.directToCommunityArticle(
                             context, typeId, communityId,
-                            entrance, "文章链接"
+                            entrance, "文章链接", sourceEntrance
                         )
                     }
                 }
@@ -246,24 +244,22 @@ object DefaultUrlHandler {
                         act,
                         paginationType,
                         fieldId,
-                        sectionName
+                        sectionName,
+                        sourceEntrance = sourceEntrance
                     )
                 }
                 EntranceConsts.HOST_VIDEO_DETAIL -> {
-                    DirectUtils.directToVideoDetail(context, id, entrance, path)
+                    DirectUtils.directToVideoDetail(context, id, entrance, path, sourceEntrance)
                 }
                 EntranceConsts.HOST_VIDEO_SINGLE -> {
                     val referer = uri.getQueryParameter("referer") ?: ""
                     DirectUtils.directToVideoDetail(
                         context, id, VideoDetailContainerViewModel.Location.SINGLE_VIDEO.value,
-                        false, "", entrance, "", if (TextUtils.isEmpty(referer)) "" else referer
+                        false, "", entrance, "", if (TextUtils.isEmpty(referer)) "" else referer, sourceEntrance
                     )
                 }
                 EntranceConsts.HOST_VIDEO_STREAMING_HOME -> {
-                    intent = Intent(context, MainActivity::class.java)
-                    intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
-                    intent.putExtra(MainActivity.SWITCH_TO_VIDEO, true)
-                    context.startActivity(intent)
+                    DirectUtils.directToHomeVideoTab(context)
                 }
                 EntranceConsts.HOST_VIDEO_STREAMING_DESC -> {
                     directToGameDetailVideoStreaming(context, id, entrance)
@@ -325,7 +321,7 @@ object DefaultUrlHandler {
                             val linkData = Base64.decode(dataString, Base64.DEFAULT)
                             val linkDataString = String(linkData, Charset.defaultCharset())
                             val le = gson.fromJson(linkDataString, LinkEntity::class.java)
-                            directToLinkPage(context, le, entrance, "")
+                            directToLinkPage(context, le, entrance, sourceEntrance, "")
                         }
                     } catch (e: Exception) {
                         e.printStackTrace()
@@ -364,9 +360,8 @@ object DefaultUrlHandler {
                 }
 
                 EntranceConsts.HOST_FORUM -> {
-                    val position = uri.getQueryParameter(EntranceConsts.KEY_POSITION)?.toInt()
 
-                    DirectUtils.directToForum(context, position ?: 0)
+                    DirectUtils.directToHomeCommunityTab(context)
                 }
 
                 EntranceConsts.HOST_UPLOAD_VIDEO_NEW -> {
@@ -503,13 +498,11 @@ object DefaultUrlHandler {
 
                 EntranceConsts.HOST_GAME_LIBRARY -> {
                     DirectUtils.directToMainActivity(context)
-                    EventBus.getDefault().post(EBSkip(MainActivity.EB_SKIP_MAIN, MainWrapperFragment.INDEX_GAME))
                 }
 
                 EntranceConsts.HOST_HOME_GAME_COLLECTION_SQUARE -> {
                     DirectUtils.directToMainActivity(context)
-                    EventBus.getDefault()
-                        .post(EBSkip(MainActivity.EB_SKIP_MAIN, MainWrapperFragment.INDEX_HOME))
+                    DirectUtils.directToHomeDefaultTab(context)
                     EventBus.getDefault().post(EBReuse(host))
                 }
 
@@ -564,7 +557,7 @@ object DefaultUrlHandler {
         }
 
         // 处理内部页面逻辑
-        if (transformNormalScheme(context, url, entrance)) {
+        if (transformNormalScheme(context, url, entrance, sourceEntrance)) {
             return true
         }
 
@@ -573,14 +566,14 @@ object DefaultUrlHandler {
     }
 
     @JvmStatic
-    fun transformNormalScheme(context: Context, url: String, entrance: String): Boolean {
-        val b = transformNewNormalScheme(context, url, entrance)
+    fun transformNormalScheme(context: Context, url: String, entrance: String, sourceEntrance: String): Boolean {
+        val b = transformNewNormalScheme(context, url, entrance, sourceEntrance)
         if (b) return b
-        return transformOldNormalScheme(context, url, entrance)
+        return transformOldNormalScheme(context, url, entrance, sourceEntrance)
     }
 
     @JvmStatic
-    fun transformOldNormalScheme(context: Context, url: String, entrance: String): Boolean {
+    fun transformOldNormalScheme(context: Context, url: String, entrance: String, sourceEntrance: String): Boolean {
         val uri = Uri.parse(url)
         if (uri.host == "www.ghzs666.com"
             || uri.host == "www.ghzs.com"
@@ -596,6 +589,7 @@ object DefaultUrlHandler {
                         DirectUtils.directToGameDetail(
                             context,
                             gameId,
+                            "",
                             entrance,
                             autoDownload = false,
                             traceEvent = null
@@ -605,7 +599,7 @@ object DefaultUrlHandler {
                         val questionId = split("/")[2]
                         val answerId = uri.getQueryParameter("answer")
                         if (answerId.isNullOrEmpty()) {
-                            DirectUtils.directToQuestionDetail(context, questionId, entrance, "")
+                            DirectUtils.directToQuestionDetail(context, questionId, entrance, "", sourceEntrance)
                         } else {
                             DirectUtils.directToAnswerDetail(context, answerId, entrance, "")
                         }
@@ -635,7 +629,7 @@ object DefaultUrlHandler {
                         if ("articles" == type || "article" == type) {
                             DirectUtils.directToCommunityArticle(
                                 context, typeId, communityId,
-                                entrance, "文章链接"
+                                entrance, "文章链接", sourceEntrance
                             )
                         }
                     }
@@ -666,7 +660,7 @@ object DefaultUrlHandler {
     }
 
     @JvmStatic
-    fun transformNewNormalScheme(context: Context, url: String, entrance: String): Boolean {
+    fun transformNewNormalScheme(context: Context, url: String, entrance: String, sourceEntrance: String): Boolean {
         val uri = Uri.parse(url)
         if (uri.host == "www.ghzs666.com"
             || uri.host == "www.ghzs.com"
@@ -684,7 +678,7 @@ object DefaultUrlHandler {
                         val articleId = splits[2].substring(7)
                         DirectUtils.directToCommunityArticle(
                             context, articleId, "",
-                            entrance, "文章链接"
+                            entrance, "文章链接", sourceEntrance
                         )
                     }
                     //https://m.ghzs666.com/article/文章ID
@@ -704,7 +698,7 @@ object DefaultUrlHandler {
                     //https://m.ghzs666.com/bbs/video-视频ID
                     splits.size >= 3 && splits[1] == "bbs" && splits[2].startsWith("video-") -> {
                         val videoId = splits[2].substring(6)
-                        DirectUtils.directToVideoDetail(context, videoId, entrance)
+                        DirectUtils.directToVideoDetail(context, videoId, entrance, sourceEntrance)
                     }
                     else -> return false
                 }

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/browse/BrowseTimer.kt

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

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

@@ -1,18 +0,0 @@
-package com.gh.common.chain
-
-import android.content.Context
-import com.gh.common.dialog.CertificationDialog
-import com.gh.gamecenter.feature.entity.GameEntity
-
-class CertificationHandler : DownloadChainHandler() {
-
-    override fun handleRequest(context: Context, gameEntity: GameEntity, asVGame: Boolean) {
-        CertificationDialog.showCertificationDialog(context, gameEntity) {
-            if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity, asVGame)
-            } else {
-                processEndCallback?.invoke(asVGame, null)
-            }
-        }
-    }
-}

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

@@ -11,7 +11,8 @@ class CheckStoragePermissionHandler : DownloadChainHandler() {
             context,
             gameEntity.id,
             gameEntity.name ?: "",
-            gameEntity.categoryChinese
+            gameEntity.categoryChinese,
+            gameEntity.getApk().firstOrNull()?.format,
         ) {
             if (hasNext()) {
                 getNext()?.handleRequest(context, gameEntity, asVGame)

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

@@ -1,16 +1,33 @@
 package com.gh.common.chain
 
+import android.app.Activity
 import android.content.Context
 import com.gh.common.util.DialogUtils
 import com.gh.common.util.DirectUtils
+import com.gh.common.util.TempCertificationUtils
 import com.gh.gamecenter.feature.entity.GameEntity
 
 class LandPageAddressHandler : DownloadChainHandler() {
 
     override fun handleRequest(context: Context, gameEntity: GameEntity, asVGame: Boolean) {
         if (gameEntity.isLandPageAddressDialog()) {
-            DialogUtils.showLandPageAddressDialog(context, gameEntity) {// 跳转第三方落地页
-                DirectUtils.directToExternalBrowser(context, gameEntity.landPageAddressDialog!!.link!!)
+            TempCertificationUtils.checkCertificationBeforeAction(gameEntity) {
+                if (context is Activity && context.isFinishing) {
+                    // 当前 context 已经无效，不需要再传递执行下去了
+                    return@checkCertificationBeforeAction
+                }
+
+                DialogUtils.showLandPageAddressDialog(context, gameEntity) {// 跳转第三方落地页
+                    if (gameEntity.isLandPageAddressDialogShowOnly()) {
+                        if (hasNext()) {
+                            getNext()?.handleRequest(context, gameEntity, asVGame)
+                        } else {
+                            processEndCallback?.invoke(asVGame, null)
+                        }
+                    } else {
+                        DirectUtils.directToExternalBrowser(context, gameEntity.landPageAddressDialog!!.link!!)
+                    }
+                }
             }
         } else {
             if (hasNext()) {

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

@@ -1,18 +1,27 @@
 package com.gh.common.chain
 
+import android.app.Activity
 import android.content.Context
 import com.gh.common.util.DialogUtils
+import com.gh.common.util.TempCertificationUtils
 import com.gh.gamecenter.feature.entity.GameEntity
 
 class OverseaDownloadHandler : DownloadChainHandler() {
 
     override fun handleRequest(context: Context, gameEntity: GameEntity, asVGame: Boolean) {
         if (gameEntity.isOverseaAddressDialog()) {
-            DialogUtils.showOverseaDownloadDialog(context, gameEntity) {// 跳转海外下载地址弹窗
-                if (hasNext()) {
-                    getNext()?.handleRequest(context, gameEntity, asVGame)
-                } else {
-                    processEndCallback?.invoke(asVGame, null)
+            TempCertificationUtils.checkCertificationBeforeAction(gameEntity) {
+                if (context is Activity && context.isFinishing) {
+                    // 当前 context 已经无效，不需要再传递执行下去了
+                    return@checkCertificationBeforeAction
+                }
+
+                DialogUtils.showOverseaDownloadDialog(context, gameEntity) {// 跳转海外下载地址弹窗
+                    if (hasNext()) {
+                        getNext()?.handleRequest(context, gameEntity, asVGame)
+                    } else {
+                        processEndCallback?.invoke(asVGame, null)
+                    }
                 }
             }
         } else {

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

@@ -1,6 +1,7 @@
 package com.gh.common.constant;
 
 import android.annotation.SuppressLint;
+import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.os.Build;
 import android.preference.PreferenceManager;
@@ -8,13 +9,13 @@ import android.text.TextUtils;
 
 import androidx.annotation.Nullable;
 
-import com.gh.common.util.AdHelper;
 import com.gh.common.util.PackageHelper;
 import com.gh.common.util.PackageUtils;
 import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.common.constant.CommonConsts;
 import com.gh.gamecenter.common.constant.Constants;
 import com.gh.gamecenter.common.eventbus.EBReuse;
+import com.gh.gamecenter.common.exposure.meta.MetaUtil;
 import com.gh.gamecenter.common.retrofit.BiResponse;
 import com.gh.gamecenter.common.retrofit.Response;
 import com.gh.gamecenter.common.utils.DarkModeUtils;
@@ -26,20 +27,19 @@ import com.gh.gamecenter.entity.GameGuidePopupEntity;
 import com.gh.gamecenter.entity.NewApiSettingsEntity;
 import com.gh.gamecenter.entity.NewSettingsEntity;
 import com.gh.gamecenter.entity.VSetting;
-import com.gh.gamecenter.feature.entity.NewsEntity;
 import com.gh.gamecenter.feature.entity.SettingsEntity;
 import com.gh.gamecenter.feature.entity.SimulatorEntity;
+import com.gh.gamecenter.feature.utils.ContentBlockedHelper;
+import com.gh.gamecenter.receiver.PackageChangeBroadcastReceiver;
 import com.gh.gamecenter.retrofit.RetrofitManager;
 import com.gh.vspace.VHelper;
 import com.halo.assistant.HaloApp;
-import com.lightgame.utils.Utils;
 
 import org.greenrobot.eventbus.EventBus;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.IOException;
-import java.util.List;
 import java.util.Locale;
 
 import io.reactivex.android.schedulers.AndroidSchedulers;
@@ -60,8 +60,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";
 
@@ -75,136 +74,17 @@ public class Config {
     private static GameGuidePopupEntity mGameGuidePopupEntity;
     private static SharedPreferences mDefaultSharedPreferences;
 
-    public static final String FIX_DOWNLOAD_KEY = "isFixDownload";
-    public static final String FIX_PLUGIN_KEY = "isFixPlugin";
-
     public static final int VIDEO_PAGE_SIZE = 21; // 视频列表大多都是一行3个
 
     public static boolean isShow() {
-        if (SPUtils.getBoolean(Constants.SP_TEENAGER_MODE)) return false;
-
-        if (getPreferences().getBoolean(FIX_DOWNLOAD_KEY, false)) return true;
-
-        if (!isExistDownloadFilter()) return false;
-
-        for (SettingsEntity.Download entity : getSettings().getDownload()) {
-            if ("all".equals(entity.getGame())) {
-                if (entity.getPluginfy() && "normal".equals(entity.getPolicy()) && filterTime(entity.getTime())) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-
-    public static boolean isShowDownload(String gameId) {
-
-        if (getPreferences().getBoolean(FIX_DOWNLOAD_KEY, false)) return true;
-
-        if (TextUtils.isEmpty(gameId) || !isExistDownloadFilter())
-            return false;
-
-        for (SettingsEntity.Download entity : getSettings().getDownload()) {
-            if (gameId.equals(entity.getGame())) {
-                if ("normal".equals(entity.getPolicy()) && filterTime(entity.getTime())) {
-                    return true;
-                } else {
-                    return false;
-                }
-            } else if ("all".equals(entity.getGame())) {
-                if ("normal".equals(entity.getPolicy()) && filterTime(entity.getTime())) {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * VPN 开关选项是否开启
-     */
-    public static boolean isVpnOptionEnabled() {
-        if (mNewApiSettingsEntity == null
-                || mNewApiSettingsEntity.getInstall() == null
-                || mNewApiSettingsEntity.getInstall().getVpnRequired() == null) {
-            return false;
-        }
-
-        return mNewApiSettingsEntity.getInstall().getVpnRequired().getShouldShowVpnOption();
-    }
-
-    public static boolean isShowPlugin(String gameId) {
-        SharedPreferences preferences = getPreferences();
-        boolean isFixPlugin = preferences.getBoolean(FIX_PLUGIN_KEY, false);
-        if (isFixPlugin) return true;
-
-        if (TextUtils.isEmpty(gameId) || !isExistDownloadFilter())
-            return false;
-
-        for (SettingsEntity.Download entity : getSettings().getDownload()) {
-            if (gameId.equals(entity.getGame())) {
-                if (entity.getPluginfy() && filterTime(entity.getTime())) {
-                    return true;
-                } else {
-                    return false;
-                }
-            }
-
-            if ("all".equals(entity.getGame())) {
-                if (entity.getPluginfy() && filterTime(entity.getTime())) {
-                    preferences.edit().putBoolean(FIX_PLUGIN_KEY, true).apply();
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    public static boolean isShowPlugin() {
-        SharedPreferences preferences = getPreferences();
-        boolean isFixPlugin = preferences.getBoolean(FIX_PLUGIN_KEY, false);
-        if (isFixPlugin) return true;
-
-        if (!isExistDownloadFilter())
-            return false;
-
-        for (SettingsEntity.Download entity : getSettings().getDownload()) {
-            if ("all".equals(entity.getGame())) {
-                if (entity.getPluginfy() && filterTime(entity.getTime())) {
-                    preferences.edit().putBoolean(FIX_PLUGIN_KEY, true).apply();
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    private static boolean filterTime(SettingsEntity.Download.TimeEntity timeEntity) {
-        long end = timeEntity.getEnd();
-        long start = timeEntity.getStart();
-        long curTime = Utils.getTime(HaloApp.getInstance().getApplication());
-
-        if ((start == 0 || curTime >= start) && (end == 0 || curTime <= end)) {
-            return true;
-        }
-
-        return false;
+        return !SPUtils.getBoolean(Constants.SP_TEENAGER_MODE);
     }
 
     public static void setSettings(SettingsEntity settingsEntity) {
         getPreferences().edit().putString(SETTINGS_KEY, GsonUtils.toJson(settingsEntity)).apply();
         mSettingsEntity = settingsEntity;
 
-        // 更新设置状态
-        mSettingsEntity.showArticleEntrance();
-        mSettingsEntity.showCommunityEntrance();
-
-        // 加载完设置后刷新下
-        PackageHelper.initList();
+        PackageHelper.refreshPackageNameList();
     }
 
     @Nullable
@@ -330,27 +210,6 @@ public class Config {
         return mGameGuidePopupEntity;
     }
 
-    private static boolean isExistDownloadFilter() {
-        if (getSettings() == null || getSettings().getDownload() == null || getSettings().getDownload().size() == 0) {
-            return false;
-        } else {
-            return true;
-        }
-    }
-
-    public static void filterPluginArticle(List<NewsEntity> list) {
-        if (isShowPlugin() || list == null) return;
-
-        for (int i = 0; i < list.size(); i++) {
-            NewsEntity newsEntity = list.get(i);
-            String title = newsEntity.getTitle();
-            if (!TextUtils.isEmpty(title) && title.contains("插件")) {
-                list.remove(i);
-                i--;
-            }
-        }
-    }
-
     public static SharedPreferences getPreferences() {
         if (mDefaultSharedPreferences == null) {
             mDefaultSharedPreferences = PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().getApplication());
@@ -381,9 +240,6 @@ public class Config {
                                 GsonUtils.toJson(response.getSuggestion()));
                         edit.apply();
 
-                        if (!getPreferences().getBoolean(Config.FIX_DOWNLOAD_KEY, false) && Config.isShow()) {
-                            getPreferences().edit().putBoolean(Config.FIX_DOWNLOAD_KEY, true).apply();
-                        }
                         if (!SPUtils.getBoolean(Constants.SP_TEENAGER_MODE)) {
                             EventBus.getDefault().post(new EBReuse("Refresh"));
                         }
@@ -443,7 +299,9 @@ public class Config {
             String filterString = UrlFilterUtils.getFilterQuery(
                     "manufacturer", Build.MANUFACTURER,
                     "model", Build.MODEL,
-                    "android_sdk_version", String.valueOf(Build.VERSION.SDK_INT));
+                    "android_sdk_version", String.valueOf(Build.VERSION.SDK_INT),
+                    "rom", MetaUtil.INSTANCE.getRom().name() + " " + MetaUtil.INSTANCE.getRom().getVersionName()
+            );
 
             RetrofitManager.getInstance()
                     .getNewApi().getNewSettings(PackageUtils.getGhVersionName(), channel, filterString)
@@ -460,8 +318,36 @@ public class Config {
                                 DarkModeUtils.INSTANCE.initDarkMode();
                             }
                             SPUtils.setString(Constants.SP_NEW_API_SETTINGS, GsonUtils.toJson(data));
+
+                            // 刷新屏蔽字段
+                            if (mNewApiSettingsEntity.getGameShieldContents() != null) {
+                                ContentBlockedHelper.INSTANCE.init(mNewApiSettingsEntity.getGameShieldContents());
+                            }
+
+                            // 更新安装列表是否开启的配置
+                            if (mNewApiSettingsEntity.getInstalledComplianceSwitch() != null) {
+                                PackageHelper.INSTANCE.updateIsGetInstalledPackagesApiAgreedRequired(mNewApiSettingsEntity.getInstalledComplianceSwitch());
+                            } else {
+                                PackageHelper.INSTANCE.updateIsGetInstalledPackagesApiAgreedRequired(false);
+                            }
+
+                            // 更新包名监听是否开启
+                            if (mNewApiSettingsEntity.isPackageObserveEnable()) {
+                                observePackageChange(mNewApiSettingsEntity.getPackageObserveActions());
+                            }
                         }
                     });
         }
     }
+
+    public static void observePackageChange(NewApiSettingsEntity.PackageObserveActions packageObserveActions) {
+        PackageChangeBroadcastReceiver receiver = new PackageChangeBroadcastReceiver(packageObserveActions);
+        IntentFilter intentFilter = new IntentFilter();
+        intentFilter.addAction(packageObserveActions.getAdd());
+        intentFilter.addAction(packageObserveActions.getRem());
+        intentFilter.addAction(packageObserveActions.getRep());
+        intentFilter.addDataScheme("package");
+        HaloApp.getInstance().registerReceiver(receiver, intentFilter);
+    }
+
 }

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

@@ -120,13 +120,13 @@ object AddKaiFuBindingAdapter {
     @BindingAdapter("kaiFuTextColor", "kaiFuTextPosition")
     fun kaiFuTextColor(view: EditText, dataMark: Int, position: Int) {
         if (dataMark == 1 && view.id == R.id.kaifu_add_time || dataMark == 2 && view.id == R.id.kaifu_add_first_name || dataMark == 3 && view.id == R.id.kaifu_add_server_name || dataMark == 4) {
-            view.setTextColor(ContextCompat.getColor(view.context, R.color.theme_red))
-            view.setHintTextColor(ContextCompat.getColor(view.context, R.color.theme_red))
+            view.setTextColor(ContextCompat.getColor(view.context, R.color.secondary_red))
+            view.setHintTextColor(ContextCompat.getColor(view.context, R.color.secondary_red))
         } else if (position == 0) {
             view.setTextColor(ContextCompat.getColor(view.context, R.color.hint))
             view.setHintTextColor(ContextCompat.getColor(view.context, R.color.hint))
         } else {
-            view.setTextColor(ContextCompat.getColor(view.context, R.color.text_title))
+            view.setTextColor(ContextCompat.getColor(view.context, R.color.text_primary))
             view.setHintTextColor(ContextCompat.getColor(view.context, R.color.hint))
         }
     }

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

@@ -15,7 +15,6 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
 import com.gh.common.chain.BrowserInstallHandler;
-import com.gh.common.chain.CertificationHandler;
 import com.gh.common.chain.DownloadChainBuilder;
 import com.gh.common.chain.DownloadChainHandler;
 import com.gh.common.chain.CheckDownloadHandler;
@@ -53,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;
@@ -70,13 +71,14 @@ 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;
 import java.util.ArrayList;
 import java.util.List;
 
+import kotlin.collections.CollectionsKt;
+
 /**
  * Created by khy on 12/02/18.
  */
@@ -96,20 +98,29 @@ public class BindingAdapters {
         }
     }
 
-    // 大图下的进度条
     public static void setDownloadButton(DownloadButton progressBar,
                                          GameEntity gameEntity,
                                          ExposureEvent traceEvent,
                                          @Nullable View.OnClickListener clickCallBack,
                                          @Nullable String entrance,
                                          @Nullable String location) {
+        setDownloadButton(progressBar, gameEntity, traceEvent, clickCallBack, entrance, location, "其他");
+    }
+
+    // 大图下的进度条
+    public static void setDownloadButton(DownloadButton progressBar,
+                                         GameEntity gameEntity,
+                                         ExposureEvent traceEvent,
+                                         @Nullable View.OnClickListener clickCallBack,
+                                         @Nullable String entrance,
+                                         @Nullable String location,
+                                         String sourceEntrance) {
 
         // 恢复DialogFragment
         restoreDialogFragment(progressBar);
 
         // 判断是否显示按钮
         if (gameEntity != null
-                && Config.isShowDownload(gameEntity.getId())
                 && !"光环助手".equals(gameEntity.getName())) {
             progressBar.setVisibility(View.VISIBLE);
         } else {
@@ -124,7 +135,7 @@ public class BindingAdapters {
                 case DOWNLOADING_PLUGIN:
                 case DOWNLOADING_NORMAL:
                     Intent intent = DownloadManagerActivity.getDownloadMangerIntent(v.getContext(),
-                            gameEntity.getApk().get(0).getUrl(), entrance);
+                            gameEntity.getApk().isEmpty() ? "" : gameEntity.getApk().get(0).getUrl(), entrance);
                     v.getContext().startActivity(intent);
                     break;
                 case NONE:
@@ -156,7 +167,6 @@ public class BindingAdapters {
                             builder.addHandler(new BrowserInstallHandler());
                             builder.addHandler(new PackageCheckHandler());
                             builder.addHandler(new DownloadDialogHelperHandler());
-                            builder.addHandler(new CertificationHandler());
                             builder.addHandler(new VersionNumberHandler());
                             builder.addHandler(new LandPageAddressHandler());
                             builder.addHandler(new OverseaDownloadHandler());
@@ -185,7 +195,6 @@ public class BindingAdapters {
                             DownloadChainBuilder builder = new DownloadChainBuilder();
                             builder.addHandler(new UnsupportedFeatureHandler());
                             builder.addHandler(new GamePermissionHandler());
-                            builder.addHandler(new CertificationHandler());
                             builder.addHandler(new VersionNumberHandler());
 
                             builder.setProcessEndCallback((asVGame, isSubscribe) -> {
@@ -212,7 +221,7 @@ public class BindingAdapters {
                     if (gameEntity.getApk().size() == 1) {
                         //启动模拟器游戏
                         if (SimulatorGameManager.isSimulatorGame(gameEntity)) {
-                            DownloadEntity downloadEntity = SimulatorGameManager.findDownloadEntityByUrl(gameEntity.getApk().get(0).getUrl());
+                            DownloadEntity downloadEntity = SimulatorGameManager.findDownloadEntityByUrl(gameEntity.getApk().isEmpty() ? "" : gameEntity.getApk().get(0).getUrl());
                             if (downloadEntity != null) {
                                 File file = new File(downloadEntity.getPath());
                                 if (!file.exists()) {
@@ -272,7 +281,7 @@ public class BindingAdapters {
                 case RESERVABLE:
                     GamePermissionDialogFragment.show((AppCompatActivity) v.getContext(), gameEntity, gameEntity.getInfo(), () -> {
                         CheckLoginUtils.checkLogin(progressBar.getContext(), "", () -> {
-                            ReservationHelper.reserve(v.getContext(), gameEntity.getId(), gameEntity.getName(), () -> {
+                            ReservationHelper.reserve(v.getContext(), gameEntity, sourceEntrance, () -> {
                                 LogUtils.logReservation(gameEntity, traceEvent);
                                 updateReservation(progressBar, gameEntity);
                             });
@@ -450,9 +459,9 @@ public class BindingAdapters {
             ToastUtils.toast(context.getString(R.string.unsupported_browser_install_hint));
         }
         String buttonText = progressBar.getText();
-        ApkEntity apkEntity = gameEntity.getApk().get(0);
-        String msg = FileUtils.isCanDownload(progressBar.getContext(), apkEntity.getSize());
-        if (TextUtils.isEmpty(msg)) {
+        ApkEntity apkEntity = CollectionsKt.firstOrNull(gameEntity.getApk());
+        String msg = FileUtils.isCanDownload(progressBar.getContext(), apkEntity == null ? "" : apkEntity.getSize());
+        if (apkEntity != null && TextUtils.isEmpty(msg)) {
             DownloadManager.createDownload(progressBar.getContext(),
                     apkEntity,
                     gameEntity,
@@ -540,11 +549,10 @@ public class BindingAdapters {
         }
     }
 
-    public static void setGameName(TextView view, GameEntity game, boolean isShowPlatform, @Nullable Boolean isShowSuffix) {
-        if (isShowSuffix == null) isShowSuffix = true; // 默认显示
+    public static void setGameName(TextView view, GameEntity game, boolean isShowPlatform) {
         String gameName;
         if (isShowPlatform && game.getApk().size() > 0) {
-            gameName = String.format("%s - %s", !isShowSuffix ? game.getNameWithoutSuffix() : game.getName(),
+            gameName = String.format("%s - %s", game.getName(),
                     PlatformUtils.getInstance(view.getContext()).getPlatformName(
                             game.getApk().get(0).getPlatform()));
             if (!gameName.equals((String) view.getTag(R.string.tag_game_name_id))) {
@@ -552,7 +560,7 @@ public class BindingAdapters {
                 view.setTag(R.string.tag_game_name_id, gameName);
             }
         } else {
-            gameName = !isShowSuffix ? game.getNameWithoutSuffix() : game.getName();
+            gameName = game.getName();
             if (gameName != null && !gameName.equals((String) view.getTag(R.string.tag_game_name_id))) {
                 view.setText(gameName);
                 view.setTag(R.string.tag_game_name_id, gameName);

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

@@ -49,7 +49,7 @@ class ApplyModeratorDialogFragment : BaseDialogFragment() {
                 requireContext(),
                 startText.length,
                 startText.length + mGroupNumber.length,
-                R.color.theme_font,
+                R.color.text_theme,
                 true
             ) {
                 DirectUtils.directToQqGroup(

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

@@ -1,221 +0,0 @@
-package com.gh.common.dialog
-
-import android.annotation.SuppressLint
-import android.app.Activity
-import android.app.Dialog
-import android.content.Context
-import android.content.Intent
-import android.graphics.Color
-import android.graphics.Paint
-import android.graphics.drawable.ColorDrawable
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.widget.CheckBox
-import android.widget.TextView
-import androidx.appcompat.app.AppCompatActivity
-import com.gh.gamecenter.common.avoidcallback.AvoidOnResultManager
-import com.gh.gamecenter.common.avoidcallback.Callback
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.common.util.*
-import com.gh.gamecenter.R
-import com.gh.gamecenter.ShellActivity
-import com.gh.gamecenter.common.callback.ConfirmListener
-import com.gh.gamecenter.common.constant.EntranceConsts
-import com.gh.gamecenter.common.utils.SensorsBridge
-import com.gh.gamecenter.core.utils.GsonUtils
-import com.gh.gamecenter.core.utils.SPUtils
-import com.gh.gamecenter.feature.entity.AuthDialogEntity
-import com.gh.gamecenter.feature.entity.AuthDialogLevel
-import com.gh.gamecenter.feature.entity.GameEntity
-import com.gh.gamecenter.login.user.UserManager
-import com.google.gson.reflect.TypeToken
-import com.halo.assistant.fragment.user.UserInfoEditFragment
-import com.lightgame.utils.AppManager
-
-class CertificationDialog(
-    context: Context,
-    private val authDialogEntity: AuthDialogEntity,
-    val gameEntity: GameEntity,
-    val listener: ConfirmListener
-) :
-    Dialog(context, R.style.GhAlertDialog) {
-
-    private lateinit var view: View
-    private lateinit var detailedDesTv: TextView
-    private lateinit var noRemindAgainCb: CheckBox
-    private lateinit var actionLeftTv: TextView
-    private lateinit var actionRightTv: TextView
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
-        view = LayoutInflater.from(context).inflate(R.layout.dialog_sertification, null)
-        setContentView(view)
-        detailedDesTv = view.findViewById(R.id.detailedDesTv)
-        noRemindAgainCb = view.findViewById(R.id.noRemindAgainCb)
-        actionLeftTv = view.findViewById(R.id.actionLeftTv)
-        actionRightTv = view.findViewById(R.id.actionRightTv)
-
-        detailedDesTv.paint.flags = Paint.UNDERLINE_TEXT_FLAG
-        detailedDesTv.paint.isAntiAlias = true
-
-        detailedDesTv.setOnClickListener {
-            DirectUtils.directToWebView(context, authDialogEntity.link)
-        }
-
-        when (authDialogEntity.level) {
-            AuthDialogLevel.MUST_PASS.value -> {
-                actionLeftTv.text = "暂不下载"
-                actionRightTv.text = "去实名认证"
-                noRemindAgainCb.visibility = View.GONE
-                actionLeftTv.setOnClickListener {
-                    SensorsBridge.trackEvent("VerificationPopupClick", "button_name", actionLeftTv.text.toString())
-                    dismiss()
-                }
-                actionRightTv.setOnClickListener {
-                    SensorsBridge.trackEvent("VerificationPopupClick", "button_name", actionRightTv.text.toString())
-                    if (UserManager.getInstance().isLoggedIn) {
-                        gotoAuthPage()
-                    } else {
-                        gotoLoginPage()
-                    }
-                }
-            }
-            AuthDialogLevel.ALWAYS_HINT.value -> {
-                actionLeftTv.text = "去实名认证"
-                actionRightTv.text = "继续下载"
-                noRemindAgainCb.visibility = View.GONE
-                actionLeftTv.setOnClickListener {
-                    SensorsBridge.trackEvent("VerificationPopupClick", "button_name", actionLeftTv.text.toString())
-                    if (UserManager.getInstance().isLoggedIn) {
-                        gotoAuthPage()
-                    } else {
-                        gotoLoginPage()
-                    }
-                }
-                actionRightTv.setOnClickListener {
-                    SensorsBridge.trackEvent("VerificationPopupClick", "button_name", actionRightTv.text.toString())
-                    listener.onConfirm()
-                    dismiss()
-                }
-            }
-            AuthDialogLevel.OPTIONAL_HINT.value -> {
-                actionLeftTv.text = "去实名认证"
-                actionRightTv.text = "继续下载"
-                noRemindAgainCb.visibility = View.VISIBLE
-                actionLeftTv.setOnClickListener {
-                    SensorsBridge.trackEvent("VerificationPopupClick", "button_name", actionLeftTv.text.toString())
-                    if (noRemindAgainCb.isChecked) {
-                        SPUtils.setBoolean(gameEntity.id, true)
-                    }
-                    if (UserManager.getInstance().isLoggedIn) {
-                        gotoAuthPage()
-                    } else {
-                        gotoLoginPage()
-                    }
-                }
-                actionRightTv.setOnClickListener {
-                    SensorsBridge.trackEvent("VerificationPopupClick", "button_name", actionRightTv.text.toString())
-                    if (noRemindAgainCb.isChecked) {
-                        SPUtils.getBoolean(gameEntity.id, true)
-                    }
-                    listener.onConfirm()
-                    dismiss()
-                }
-            }
-        }
-
-        SensorsBridge.trackEvent(
-            "VerificationDialogShow",
-            "game_id",
-            gameEntity.id,
-            "game_name",
-            gameEntity.name ?: "",
-            "game_type",
-            gameEntity.categoryChinese
-        )
-    }
-
-    //跳转登录页面
-    private fun gotoLoginPage() {
-        val currentActivity = AppManager.getInstance().currentActivity() ?: return
-
-        CheckLoginUtils.checkLogin(
-            currentActivity as AppCompatActivity,
-            null, true, "实名认证弹窗"
-        ) {
-            if (UserManager.getInstance().isAuth) {
-                listener.onConfirm()
-                dismiss()
-            }
-        }
-    }
-
-    //跳转实名认证页面
-    private fun gotoAuthPage() {
-        val currentActivity = AppManager.getInstance().currentActivity() ?: return
-
-        AvoidOnResultManager.getInstance(currentActivity as AppCompatActivity)
-            .startForResult(
-                ShellActivity.getIntent(
-                    context,
-                    ShellActivity.Type.REAL_NAME_INFO,
-                ).apply {
-                    putExtra(EntranceConsts.KEY_GAME_ID, gameEntity.id)
-                }, object : Callback {
-                    override fun onActivityResult(resultCode: Int, data: Intent?) {
-                        if (resultCode == Activity.RESULT_OK && data != null) {
-                            val isAuthSuccess =
-                                data.getBooleanExtra(UserInfoEditFragment.AUTH_SUCCESS, false)
-                            if (isAuthSuccess) {
-                                listener.onConfirm()
-                                dismiss()
-                            }
-                        }
-                    }
-                })
-    }
-
-
-    companion object {
-        @JvmStatic
-        fun showCertificationDialog(context: Context, game: GameEntity, listener: ConfirmListener) {
-            //1.先判断是否登录 是执行2 否执行3
-            //2.判断是否实名认证 是终止 否执行3
-            //3.判断是否需要弹出认证弹窗接口
-            if (UserManager.getInstance().isLoggedIn) {
-                if (UserManager.getInstance().isAuth) {//已实名认证
-                    listener.onConfirm()
-                } else {
-                    authDialog(context, game, listener)
-                }
-            } else {
-                authDialog(context, game, listener)
-            }
-        }
-
-        @SuppressLint("CheckResult")
-        private fun authDialog(context: Context, game: GameEntity, listener: ConfirmListener) {
-            var authDialog: AuthDialogEntity? = null
-            if (game.authDialog != null) {
-                authDialog = game.authDialog
-            }
-            if (authDialog == null) {
-                val datas = SPUtils.getString(Constants.SP_AUTH_DIALOG)
-                val type = object : TypeToken<List<AuthDialogEntity>>() {}.type
-                val authDialogs = GsonUtils.gson.fromJson<List<AuthDialogEntity>>(datas, type)
-                if (!authDialogs.isNullOrEmpty()) {
-                    authDialog = authDialogs.find { it.gameCategory == game.category }
-                }
-            }
-            val isCloseAuthDialog = SPUtils.getBoolean(game.id, false)
-            if (authDialog != null && (authDialog.level != AuthDialogLevel.OPTIONAL_HINT.value || !isCloseAuthDialog)) {
-                val dialog = CertificationDialog(context, authDialog, game, listener)
-                dialog.show()
-            } else {
-                listener.onConfirm()
-            }
-        }
-    }
-}

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()
                 }
 
@@ -60,11 +62,10 @@ class GameOffServiceDialogFragment : BaseDialogFragment() {
                         if (index == notEmptySite.size - 1) bottomMargin = 8F.dip2px()
                     }
                     siteTv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14F)
-                    siteTv.setTextColor(R.color.theme_font.toColor(requireContext()))
+                    siteTv.setTextColor(R.color.text_theme.toColor(requireContext()))
                     siteTv.text = site.text
                     siteTv.paintFlags = siteTv.paintFlags or Paint.UNDERLINE_TEXT_FLAG
                     siteTv.setOnClickListener {
-                        //                    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/NewPrivacyPolicyDialogFragment.kt

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

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
 
@@ -125,7 +126,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
                     requireContext(),
                     0,
                     (link.title ?: "").length,
-                    R.color.theme_font,
+                    R.color.text_theme,
                     true
                 ) {
                     LogUtils.uploadPackageCheck(
@@ -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()
         }
     }
@@ -391,10 +392,10 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
                     val isAllInstalled = checkDetectionsInstalled(mAllInstalledPackages, entity.packages)
                     if (isAllInstalled) {
                         holder.binding.statusTv.text = "已安装"
-                        holder.binding.statusTv.setTextColor(ContextCompat.getColor(context, R.color.theme_font))
+                        holder.binding.statusTv.setTextColor(ContextCompat.getColor(context, R.color.text_theme))
                     } else {
                         holder.binding.statusTv.text = "未安装"
-                        holder.binding.statusTv.setTextColor(ContextCompat.getColor(context, R.color.theme_red))
+                        holder.binding.statusTv.setTextColor(ContextCompat.getColor(context, R.color.secondary_red))
                     }
                     holder.binding.statusTv.visibility = View.VISIBLE
                 } else {
@@ -416,7 +417,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
                 return
             }
 
-            val allInstalledPackages = 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/dialog/PrivacyPolicyDialogFragment.kt

@@ -29,6 +29,15 @@ class PrivacyPolicyDialogFragment : BaseDialogFragment() {
     private var mCallBack: ((isSuccess: Boolean) -> Unit)? = null
     private val mBinding by lazy { DialogPrivacyProtocolBinding.inflate(layoutInflater) }
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        if (savedInstanceState != null) {
+            dismiss()
+            return
+        }
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -59,7 +68,7 @@ class PrivacyPolicyDialogFragment : BaseDialogFragment() {
         skipText.setSpan(object : ClickableSpan() {
             override fun updateDrawState(ds: TextPaint) {
                 super.updateDrawState(ds)
-                ds.color = ContextCompat.getColor(requireContext(), R.color.theme_font)
+                ds.color = ContextCompat.getColor(requireContext(), R.color.text_theme)
                 ds.isUnderlineText = false
             }
 
@@ -101,7 +110,7 @@ class PrivacyPolicyDialogFragment : BaseDialogFragment() {
         skipText.setSpan(object : ClickableSpan() {
             override fun updateDrawState(ds: TextPaint) {
                 super.updateDrawState(ds)
-                ds.color = ContextCompat.getColor(requireContext(), R.color.theme_font)
+                ds.color = ContextCompat.getColor(requireContext(), R.color.text_theme)
                 ds.isUnderlineText = false
             }
 
@@ -115,7 +124,7 @@ class PrivacyPolicyDialogFragment : BaseDialogFragment() {
         skipText.setSpan(object : ClickableSpan() {
             override fun updateDrawState(ds: TextPaint) {
                 super.updateDrawState(ds)
-                ds.color = ContextCompat.getColor(requireContext(), R.color.theme_font)
+                ds.color = ContextCompat.getColor(requireContext(), R.color.text_theme)
                 ds.isUnderlineText = false
             }
 

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

@@ -24,6 +24,15 @@ class ReserveDialog : BaseDialogFragment() {
     private lateinit var mReserveList: List<SimpleGameEntity>
     private var mDismissListener: (() -> Unit)? = null
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        if (savedInstanceState != null) {
+            dismiss()
+            return
+        }
+    }
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         val binding: DialogReserveBinding = DialogReserveBinding.inflate(layoutInflater, null, false)
 

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

@@ -1,13 +1,13 @@
 package com.gh.common.exposure
 
-import com.aliyun.sls.android.producer.Log
 import com.gh.gamecenter.BuildConfig
-import com.gh.gamecenter.common.loghub.LoghubHelper
+import com.gh.gamecenter.common.loghub.TLogHubHelper
 import com.gh.gamecenter.common.utils.FixedSizeLinkedHashSet
 import com.gh.gamecenter.common.utils.toJson
 import com.gh.gamecenter.core.AppExecutor
 import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.lightgame.utils.Utils
+import com.volcengine.model.tls.LogItem
 
 /**
  * A handful tool for committing logs to aliyun loghub.
@@ -78,19 +78,20 @@ object ExposureManager {
 
     private fun uploadExposures(eventSet: HashSet<ExposureEvent>, forced: Boolean) {
         eventSet.forEach {
-            LoghubHelper.uploadLog(buildLog(it), LOG_STORE, forced)
+            TLogHubHelper.sendLog(buildLog(it), LOG_STORE)
+//            LoghubHelper.uploadLog(buildLog(it), LOG_STORE, forced)
 //            it.recycle()
         }
     }
 
-    private fun buildLog(event: ExposureEvent) = Log().apply {
-        putContent("id", event.id)
-        putContent("payload", event.payload.toJson())
-        putContent("event", event.event.toString())
-        putContent("source", eliminateMultipleBrackets(event.source.toJson()))
-        putContent("meta", event.meta.toJson())
-        putContent("real_millisecond", event.timeInMillisecond.toString())
-        putContent(
+    private fun buildLog(event: ExposureEvent) = LogItem(System.currentTimeMillis()).apply {
+        addContent("__id", event.id)
+        addContent("payload", event.payload.toJson())
+        addContent("event", event.event.toString())
+        addContent("source", eliminateMultipleBrackets(event.source.toJson()))
+        addContent("meta", event.meta.toJson())
+        addContent("real_millisecond", event.timeInMillisecond.toString())
+        addContent(
             "e-traces", if (event.eTrace != null) {
                 eliminateMultipleBrackets(event.eTrace?.toJson() ?: "")
             } else ""

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

@@ -27,7 +27,7 @@ object ExposureUtils {
     ): ExposureEvent {
         val gameEntity = entity.copy()
         gameEntity.id = if (entity.id.contains(DownloadEntity.GAME_ID_DIVIDER)) {
-            entity.id.split(DownloadEntity.GAME_ID_DIVIDER).toTypedArray()[0]
+            entity.id.split(DownloadEntity.GAME_ID_DIVIDER).toTypedArray().firstOrNull() ?: ""
         } else {
             entity.id
         }

app/src/main/java/com/gh/common/history/HistoryDatabase.kt

@@ -19,7 +19,7 @@ import com.halo.assistant.HaloApp
 
 @Database(
     entities = [AnswerEntity::class, ArticleEntity::class, NewsEntity::class, HistoryGameEntity::class, MyVideoEntity::class, GamesCollectionEntity::class],
-    version = 13,
+    version = 14,
     exportSchema = false
 )
 @TypeConverters(
@@ -41,7 +41,8 @@ import com.halo.assistant.HaloApp
     SimpleGameListConverter::class,
     TagInfoListConverter::class,
     ActivityLabelListConverter::class,
-    IconFloatConverter::class
+    IconFloatConverter::class,
+    SectionConverter::class
 )
 
 abstract class HistoryDatabase : RoomDatabase() {
@@ -143,6 +144,14 @@ abstract class HistoryDatabase : RoomDatabase() {
             }
         }
 
+        val MIGRATION_13_14: Migration = object : Migration(13, 14) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.execSQL("Alter TABLE ArticleEntity add type TEXT NOT NULL DEFAULT 'community_article'")
+                database.execSQL("Alter TABLE ArticleEntity add sections TEXT NOT NULL DEFAULT ''")
+                database.execSQL("Alter TABLE ArticleEntity add tagActivityName TEXT NOT NULL DEFAULT ''")
+            }
+        }
+
         val instance by lazy {
             Room.databaseBuilder(
                 HaloApp.getInstance().application,
@@ -160,6 +169,7 @@ abstract class HistoryDatabase : RoomDatabase() {
                 .addMigrations(MIGRATION_10_11)
                 .addMigrations(MIGRATION_11_12)
                 .addMigrations(MIGRATION_12_13)
+                .addMigrations(MIGRATION_13_14)
                 .build()
         }
     }

app/src/main/java/com/gh/common/history/HistoryHelper.kt

@@ -6,11 +6,7 @@ import com.gh.gamecenter.common.utils.removeVideoContent
 import com.gh.gamecenter.common.utils.tryCatchInRelease
 import com.gh.gamecenter.core.runOnIoThread
 import com.gh.gamecenter.entity.*
-import com.gh.gamecenter.feature.entity.AnswerEntity
-import com.gh.gamecenter.feature.entity.ArticleEntity
-import com.gh.gamecenter.feature.entity.GameEntity
-import com.gh.gamecenter.feature.entity.NewsEntity
-import com.gh.gamecenter.feature.entity.User
+import com.gh.gamecenter.feature.entity.*
 import com.gh.gamecenter.qa.entity.AnswerDetailEntity
 import com.gh.gamecenter.qa.entity.ArticleDetailEntity
 
@@ -75,7 +71,6 @@ object HistoryHelper {
         historyGame.iconFloat = gameEntity.iconFloat
         historyGame.name = gameEntity.name
         historyGame.tagStyle = gameEntity.tagStyle
-        historyGame.tag = gameEntity.getTag()
         historyGame.subtitle = gameEntity.subtitle
         historyGame.subtitleStyle = gameEntity.subtitleStyle
         return historyGame
@@ -109,7 +104,7 @@ object HistoryHelper {
     fun deleteArticleEntity(articleId: String) {
         runOnIoThread {
             tryCatchInRelease {
-                HistoryDatabase.instance.articleDao().deleteArticle(ArticleEntity(id = articleId))
+                HistoryDatabase.instance.articleDao().deleteArticle(ArticleEntity(_id = articleId))
             }
         }
     }
@@ -170,6 +165,9 @@ object HistoryHelper {
         articleEntity.images = articleDetailEntity.images
         articleEntity.imagesInfo = articleDetailEntity.imagesInfo
         articleEntity.videos = articleDetailEntity.videos
+        articleEntity.tagActivityName = articleDetailEntity.tagActivityName
+        articleEntity.sections = articleDetailEntity.sections ?: emptyList()
+        articleEntity.type = "community_article"
 
         return articleEntity
     }

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

@@ -0,0 +1,10 @@
+package com.gh.common.iinterface
+
+import com.gh.gamecenter.entity.MultiTabNav
+
+interface IMultiTab {
+    fun provideMultiTabId(): String
+    fun provideMultiTabName(): String
+    fun provideCurrentTabEntity(): MultiTabNav.LinkMultiTabNav?
+    fun provideLastSelectedPosition(): Int
+}

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

@@ -0,0 +1,10 @@
+package com.gh.common.iinterface
+
+import com.gh.gamecenter.entity.BottomTab
+
+interface ISearchToolbarTab {
+    fun onScrollChanged(totalHeight: Int, offset: Int, isDarkModeChanged: Boolean)
+    fun changeAppBarColor(color: Int, pageId: String)
+    fun setSearchStyle(searchStyle: BottomTab.SearchStyle)
+    fun getCurrentTabIndex(): Int?
+}

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

@@ -0,0 +1,12 @@
+package com.gh.common.iinterface
+
+import com.gh.common.prioritychain.PullDownPushHandler
+import com.gh.gamecenter.entity.PullDownPush
+
+interface ISmartRefresh {
+    fun setSmartRefreshEnabled(isEnable: Boolean)
+    fun finishTwoLevel(action: String)
+    fun finishRefresh()
+    fun popupPullDownPush(finishCallback: () -> Unit)
+    fun setPullDownPush(pullDownPush: PullDownPush?, pullDownPushHandler: PullDownPushHandler?)
+}

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

@@ -0,0 +1,17 @@
+package com.gh.common.iinterface
+
+interface ISmartRefreshContent {
+    /**
+     * 启用/关闭 页面滑动
+     * @param isScrollEnabled 是否启用
+     */
+    fun setScrollEnabled(isScrollEnabled: Boolean)
+
+    fun onRefresh()
+
+    /**
+     * 启用/关闭 SwipeRefreshLayout 的下拉刷新
+     * @param isSwipeRefreshEnabled 是否启用
+     */
+    fun setSwipeRefreshEnabled(isSwipeRefreshEnabled: Boolean)
+}

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

@@ -0,0 +1,9 @@
+package com.gh.common.iinterface
+
+import com.gh.common.prioritychain.PriorityChain
+
+interface ISuperiorChain {
+    fun registerInferiorChain(chain: PriorityChain)
+
+    fun unregisterInferiorChain(chain: PriorityChain)
+}

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

@@ -14,7 +14,7 @@ import com.gh.gamecenter.core.utils.DisplayUtils
 import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.databinding.PopupAccelerateNotificationBinding
 import com.gh.gamecenter.feature.entity.GameEntity
-import com.gh.gamecenter.fragment.MainWrapperViewModel
+import com.gh.gamecenter.wrapper.MainWrapperViewModel
 
 class AccelerateNotificationHandler(priority: Int) : PriorityChainHandler(priority) {
 
@@ -42,7 +42,7 @@ class AccelerateNotificationHandler(priority: Int) : PriorityChainHandler(priori
                 processNext()
             } else {
                 updateStatus(STATUS_VALID)
-                onProcess()
+                process()
             }
         } else {
             if (gameEntityList == null) {
@@ -53,7 +53,7 @@ class AccelerateNotificationHandler(priority: Int) : PriorityChainHandler(priori
         }
     }
 
-    override fun onProcess() {
+    override fun onProcess() : Boolean {
         when (getStatus()) {
             STATUS_VALID -> {
                 val accelerateSet =
@@ -64,6 +64,7 @@ class AccelerateNotificationHandler(priority: Int) : PriorityChainHandler(priori
                     }
                     accelerateSet.add(mGameList!![0].messageId)
                     SPUtils.setStringSet(Constants.SP_ACCELERATE_NOTIFICATION_POP_UP_SET, accelerateSet)
+                    return true
                 } else {
                     processNext()
                 }
@@ -73,6 +74,8 @@ class AccelerateNotificationHandler(priority: Int) : PriorityChainHandler(priori
                 processNext()
             }
         }
+
+        return false
     }
 
     companion object {

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

@@ -0,0 +1,82 @@
+package com.gh.common.prioritychain
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import com.gh.gamecenter.floatingwindow.FloatingWindowEntity
+import com.gh.gamecenter.livedata.Event
+
+class CustomFloatingWindowHandler(priority: Int) : PriorityChainHandler(priority) {
+
+    private val data = arrayListOf<FloatingWindowEntity>()
+
+    private val _showFloatingAction = MutableLiveData<Event<ArrayList<FloatingWindowEntity>>>()
+    val showFloatingAction: LiveData<Event<ArrayList<FloatingWindowEntity>>> = _showFloatingAction
+
+    fun setData(newData: List<FloatingWindowEntity>) {
+        data.clear()
+        data.addAll(newData)
+        doPreProcess()
+    }
+
+    private fun doPreProcess() {
+//        debugOnly {
+//            data.clear()
+//            data.add(
+//                FloatingWindowEntity(
+//                    id = "audire",
+//                    image = "https://jira.shanqu.cc/secure/attachment/57822/57822_image-2023-12-01-17-53-04-492.png",
+//                    link = WelcomeDialogEntity(
+//                        id = null,
+//                        time = null,
+//                        packages = null,
+//                        floatingWindowId = null,
+//                        shouldShowExitAnimation = false
+//                    ),
+//                    pushType = "maiorum",
+//                    expandable = false,
+//                    expandedImage = "fermentum",
+//                    bigPopupNotice = "dignissim"
+//                )
+//            )
+//        }
+
+        if (getStatus() == STATUS_PENDING) {
+            if (data.isNotEmpty()) {
+                updateStatus(STATUS_VALID)
+                process()
+            } else {
+                processNext()
+            }
+        } else {
+            if (data.isNotEmpty()) {
+                updateStatus(STATUS_VALID)
+            } else {
+                updateStatus(STATUS_INVALID)
+            }
+        }
+    }
+
+    override fun onProcess(): Boolean {
+        when (getStatus()) {
+            STATUS_VALID -> {
+                _showFloatingAction.value = Event(data)
+                processNext()
+//                    floatingWindowProvider.showFloatingWindowOnly(
+//                        mFragment!!,
+//                        mRecyclerView!!,
+//                        mWindowList!!,
+//                    ) {
+//                        val welcomeDialog = WelcomeDialogFragment.getInstance(it, true, mFragment)
+//                        welcomeDialog.show(mFragment!!.childFragmentManager, "WelcomeDialog")
+//                    }
+            }
+
+            STATUS_INVALID -> {
+                processNext()
+            }
+        }
+
+        return false
+    }
+
+}

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

@@ -1,87 +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)
-                onProcess()
-            } else {
-                processNext()
-            }
-        } else {
-            if (!mWindowList.isNullOrEmpty()) {
-                updateStatus(STATUS_VALID)
-            } else {
-                updateStatus(STATUS_INVALID)
-            }
-        }
-    }
-
-    override fun onProcess() {
-        when (getStatus()) {
-            STATUS_VALID -> {
-                val floatingWindowProvider =
-                    ARouter.getInstance().build(RouteConsts.provider.floatingwindow)
-                        .navigation() as? IFloatingWindowProvider<WelcomeDialogEntity>
-
-                // 强校验所有条件均通过才能显示
-                if (floatingWindowProvider == null || mFragment == null || mFragment?.isAdded == false || mRecyclerView == null) {
-                    processNext()
-                    return
-                }
-
-                floatingWindowProvider.showFloatingWindowOnly(
-                    mFragment!!,
-                    mRecyclerView!!,
-                    mWindowList!!,
-                ) {
-                    val welcomeDialog = WelcomeDialogFragment.getInstance(it, true, mFragment)
-                    welcomeDialog.show(mFragment!!.childFragmentManager, "WelcomeDialog")
-                }
-            }
-
-            STATUS_INVALID -> {
-                processNext()
-            }
-        }
-    }
-
-}

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

@@ -0,0 +1,263 @@
+package com.gh.common.prioritychain
+
+import android.annotation.SuppressLint
+import android.app.Activity
+import android.app.Application.ActivityLifecycleCallbacks
+import android.os.Bundle
+import android.preference.PreferenceManager
+import androidx.fragment.app.FragmentActivity
+import com.gh.common.iinterface.ISuperiorChain
+import com.gh.common.util.CheckLoginUtils
+import com.gh.common.util.PackageUtils
+import com.gh.gamecenter.SplashAdActivity
+import com.gh.gamecenter.SplashScreenActivity
+import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.entity.SimpleGameEntity
+import com.gh.gamecenter.common.retrofit.BiResponse
+import com.gh.gamecenter.core.AppExecutor
+import com.gh.gamecenter.core.utils.SPUtils
+import com.gh.gamecenter.entity.DialogEntity
+import com.gh.gamecenter.feature.entity.WelcomeDialogEntity
+import com.gh.gamecenter.login.user.UserManager
+import com.gh.gamecenter.retrofit.RetrofitManager
+import com.halo.assistant.HaloApp
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.schedulers.Schedulers
+
+/**
+ * 全局的 APP 优先级弹窗链管理器
+ *
+ * 弹窗的优先级为
+ * 启动跳转(-101) > 更新弹窗(-100) > 隐私政策弹窗(-99) > 消息通知权限弹窗(0) > 预约弹窗(1) > 启动弹窗(2)
+ */
+object GlobalPriorityChainHelper : ISuperiorChain {
+
+    private val api = RetrofitManager.getInstance().api
+    private var inferiorChain: PriorityChain? = null
+    private val mainChain: PriorityChain by lazy { PriorityChain { inferiorChain?.start() } }
+
+    /**
+     * 当前 activity 是否使用于应用全局弹窗的弹出
+     * 排除启动页和其它非 FragmentActivity
+     */
+    fun isThisActivityValid(activity: Activity?): Boolean {
+        return activity is FragmentActivity
+                && !activity.isFinishing
+                && activity !is SplashScreenActivity
+                && activity !is SplashAdActivity
+    }
+
+    /**
+     * 预启动所有的优先级弹窗管理链
+     */
+    fun preStart(withSpecialDelay: Boolean) {
+        val launchRedirectHandler = LaunchRedirectHandler(-101)
+        val updateDialogHandler = UpdateDialogHandler(-100)
+        val privacyPolicyDialogHandler = PrivacyPolicyDialogHandler(-99)
+        val notificationPermissionDialogHandler = NotificationPermissionDialogHandler(0)
+        val reserveDialogHandler = ReserveDialogHandler(1)
+        val welcomeDialogHandler = WelcomeDialogHandler(2)
+
+        mainChain.addHandler(launchRedirectHandler)
+        mainChain.addHandler(updateDialogHandler)
+        mainChain.addHandler(privacyPolicyDialogHandler)
+        mainChain.addHandler(welcomeDialogHandler)
+        mainChain.addHandler(reserveDialogHandler)
+        mainChain.addHandler(notificationPermissionDialogHandler)
+
+        launchRedirectHandler.doPreProcess()
+        updateDialogHandler.doPreProcess()
+
+        // 首次启动延迟 300ms，保证请求首次启动时已经获取到了 GID 、 OAID 等标记
+        val requestDelay = if (withSpecialDelay) 300L else 0L
+        AppExecutor.uiExecutor.executeWithDelay({
+            requestOpeningDialogData(welcomeDialogHandler, privacyPolicyDialogHandler)
+            requestReserveDialogData(reserveDialogHandler)
+        }, requestDelay)
+    }
+
+    /**
+     * 启动优先级弹窗管理链的执行
+     */
+    fun start() {
+        if (mainChain.isHandlerQueueEmpty()) return
+
+        mainChain.start()
+
+        observeLifecycle()
+    }
+
+    private fun observeLifecycle() {
+        HaloApp.getInstance().registerActivityLifecycleCallbacks(object : ActivityLifecycleCallbacks {
+            override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
+                // do nothing
+            }
+
+            override fun onActivityStarted(activity: Activity) {
+                // do nothing
+            }
+
+            override fun onActivityResumed(activity: Activity) {
+                // 优先级弹窗管理链为空时取消注册，避免无用调用
+                if (mainChain.isHandlerQueueEmpty()) {
+                    HaloApp.getInstance().unregisterActivityLifecycleCallbacks(this)
+                } else {
+                    resume()
+                }
+            }
+
+            override fun onActivityPaused(activity: Activity) {
+                // do nothing
+            }
+
+            override fun onActivityStopped(activity: Activity) {
+                // do nothing
+            }
+
+            override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {
+                // do nothing
+            }
+
+            override fun onActivityDestroyed(activity: Activity) {
+                // do nothing
+            }
+        })
+    }
+
+    /**
+     * 恢复链的处理
+     */
+    fun resume() {
+        mainChain.resume()
+    }
+
+    /**
+     * 添加新的 handler 到优先级弹窗管理链 (插队！)
+     */
+    fun queueNewHandler(handler: PriorityChainHandler) {
+        if (mainChain.isHandlerQueueEmpty()) {
+            observeLifecycle()
+        }
+
+        mainChain.addHandler(handler)
+    }
+
+    /**
+     * 请求首页启动弹窗相关的数据并执行相关 handler 的 preProcess
+     */
+    @SuppressLint("CheckResult")
+    private fun requestOpeningDialogData(
+        welcomeDialogHandler: WelcomeDialogHandler,
+        privacyPolicyDialogHandler: PrivacyPolicyDialogHandler
+    ) {
+        val sp = PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance())
+
+        val lastId = SPUtils.getString(sp, Constants.SP_LAST_OPENING_ID, "")
+        val lastTime = SPUtils.getLong(sp, Constants.SP_LAST_OPENING_TIME, 0)
+        val openType = if (HaloApp.getInstance().isNewForThisVersion) "first" else "not_first_time"
+
+        api.getOpeningDialog(HaloApp.getInstance().channel, lastId, lastTime, openType)
+            .subscribeOn(Schedulers.io())
+            .subscribe(object : BiResponse<DialogEntity>() {
+                override fun onSuccess(data: DialogEntity) {
+                    var welcomeDialogEntity: WelcomeDialogEntity? = null
+                    var privacyPolicyDialogEntity: DialogEntity.PrivacyPolicyEntity? = null
+
+                    // 全新安装忽略隐私弹窗
+                    if (data.privacyPolicyDialog != null) {
+                        val id = data.privacyPolicyDialog.id
+                        val lastAcceptedId = SPUtils.getString(Constants.SP_LAST_ACCEPTED_PRIVACY_DIALOG_ID, "")
+                        if (HaloApp.getInstance().isBrandNewInstall) {
+                            SPUtils.setString(Constants.SP_LAST_ACCEPTED_PRIVACY_DIALOG_ID, id)
+                        } else {
+                            if (id != lastAcceptedId) {
+                                privacyPolicyDialogEntity = data.privacyPolicyDialog
+                            }
+                        }
+                    }
+
+//                    debugOnly {
+//                        privacyPolicyDialogEntity = DialogEntity.PrivacyPolicyEntity(
+//                            "5f6f5f3d9d9b4e0001c3b3a5",
+//                            "privacy_policy",
+//                            "ONCE",
+//                            "INFORM",
+//                            "隐私政策",
+//                            1601116800000)
+//                    }
+
+                    privacyPolicyDialogHandler.doPreProcess(privacyPolicyDialogEntity)
+
+                    // 类型为游戏时判断是否本地已安装该游戏，已安装不弹弹窗
+                    if (data.welcomeDialog != null) {
+                        welcomeDialogEntity = data.welcomeDialog
+
+                        if (data.welcomeDialog.type == "game") {
+                            if (data.welcomeDialog.packages != null) {
+                                for (packageName in data.welcomeDialog.packages!!) {
+                                    if (PackageUtils.isInstalled(HaloApp.getInstance(), packageName)) {
+                                        welcomeDialogEntity = null
+                                        break
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    welcomeDialogHandler.doPreProcess(welcomeDialogEntity)
+                }
+
+                override fun onFailure(exception: Exception) {
+                    privacyPolicyDialogHandler.doPreProcess(null)
+                    welcomeDialogHandler.doPreProcess(null)
+                }
+            })
+    }
+
+    /**
+     * 请求预约弹窗相关的数据
+     */
+    @SuppressLint("CheckResult")
+    private fun requestReserveDialogData(reserveDialogHandler: ReserveDialogHandler) {
+//        debugOnly {
+//            reserveDialogHandler.doPreProcess(arrayListOf(SimpleGameEntity(
+//                "5f6f5f3d9d9b4e0001c3b3a5",
+//                "5f6f5f3d9d9b4e0001c3b3a5",
+//                "https://and-static.ghzs.com/image/game/icon/2022/11/18/63772b0d398daaa7c5067298.png",
+//                "5f6f5f3d9d9b4e0001c3b3a5",
+//            )))
+//            return
+//        }
+
+        if (CheckLoginUtils.isLogin()) {
+            api.getReserveDialog(UserManager.getInstance().userId)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(object : BiResponse<List<SimpleGameEntity>>() {
+                    override fun onSuccess(data: List<SimpleGameEntity>) {
+                        reserveDialogHandler.doPreProcess(data)
+                    }
+
+                    override fun onFailure(exception: Exception) {
+                        reserveDialogHandler.doPreProcess(null)
+                    }
+                })
+        } else {
+            reserveDialogHandler.doPreProcess(null)
+        }
+    }
+
+    override fun registerInferiorChain(chain: PriorityChain) {
+        inferiorChain = chain
+        if (mainChain.isHandlerQueueEmpty()) {
+            inferiorChain?.resume()
+        }
+    }
+
+    override fun unregisterInferiorChain(chain: PriorityChain) {
+        if (inferiorChain == chain) {
+            inferiorChain = null
+        }
+    }
+
+}

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

@@ -1,45 +0,0 @@
-package com.gh.common.prioritychain
-
-import com.gh.gamecenter.fragment.HomeSearchToolWrapperFragment
-
-class HomePushHandler(priority: Int): PriorityChainHandler(priority) {
-
-    private var mHomeFragment: HomeSearchToolWrapperFragment? = null
-
-    /**
-     * 提前预处理显示弹窗的内容
-     */
-    fun doPreProcess(homeFragment: HomeSearchToolWrapperFragment?, shouldShow: Boolean) {
-        mHomeFragment = homeFragment
-
-        if (getStatus() == STATUS_PENDING) {
-            if (shouldShow && homeFragment != null) {
-                updateStatus(STATUS_VALID)
-                onProcess()
-            } else {
-                processNext()
-            }
-        } else {
-            if (shouldShow && homeFragment != null) {
-                updateStatus(STATUS_VALID)
-            } else {
-                updateStatus(STATUS_INVALID)
-            }
-        }
-    }
-
-    override fun onProcess() {
-        when (getStatus()) {
-            STATUS_VALID -> {
-                // 目前首页下拉二楼是首页最后一个弹窗类的东西，还没实现回调，如果有其它要在它后面弹出的，需要自行在它的实现结果后添加回调
-                mHomeFragment?.popUpHomePushIfNeeded {
-                    processNext()
-                }
-            }
-            STATUS_INVALID -> {
-                processNext()
-            }
-        }
-    }
-
-}

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

@@ -0,0 +1,86 @@
+package com.gh.common.prioritychain
+
+import android.annotation.SuppressLint
+import com.gh.common.util.DirectUtils
+import com.gh.gamecenter.BuildConfig
+import com.gh.gamecenter.common.entity.LaunchRedirect
+import com.gh.gamecenter.common.entity.LaunchRedirectWrapper
+import com.gh.gamecenter.common.retrofit.BiResponse
+import com.gh.gamecenter.common.utils.singleToMain
+import com.gh.gamecenter.core.AppExecutor
+import com.gh.gamecenter.core.utils.CurrentActivityHolder
+import com.gh.gamecenter.retrofit.RetrofitManager
+import com.gh.gamecenter.wrapper.MainWrapperRepository
+import com.halo.assistant.HaloApp
+
+/**
+ * 初次启动跳转
+ */
+class LaunchRedirectHandler(priority: Int) : PriorityChainHandler(priority) {
+
+    private var launchData: LaunchRedirect? = null
+
+    @SuppressLint("CheckResult")
+    fun doPreProcess() {
+//        if (true) {
+        if (HaloApp.getInstance().isBrandNewInstall) {
+            RetrofitManager.getInstance().newApi
+                .getLaunchRedirect(BuildConfig.VERSION_NAME, HaloApp.getInstance().channel)
+                .compose(singleToMain())
+                .subscribe(object : BiResponse<LaunchRedirectWrapper>() {
+                    override fun onSuccess(data: LaunchRedirectWrapper) {
+                        launchData = data.launchRedirect
+
+                        if (launchData == null) {
+                            updateStatus(STATUS_INVALID)
+                            processNext()
+                            return
+                        }
+
+                        // 尝试提前设置 tab default 避免首页数据加载完成，tab 选中会闪烁
+                        if (launchData?.type == "bottom_tab") {
+                            MainWrapperRepository.getInstance().sendSelectTabEvent(launchData!!)
+                        }
+
+                        if (getStatus() == STATUS_PENDING) {
+                            updateStatus(STATUS_VALID)
+                            process()
+                        } else {
+                            updateStatus(STATUS_VALID)
+                        }
+                    }
+
+                    override fun onFailure(exception: Exception) {
+                        super.onFailure(exception)
+                        updateStatus(STATUS_INVALID)
+                        processNext()
+                    }
+                })
+        } else {
+            updateStatus(STATUS_INVALID)
+            processNext()
+        }
+    }
+
+    override fun onProcess(): Boolean {
+        val currentActivity = CurrentActivityHolder.getCurrentActivity()
+
+        if (GlobalPriorityChainHelper.isThisActivityValid(currentActivity)) {
+            if (getStatus() == STATUS_VALID) {
+                // 当 type 为 "bottom_tab" 时上面 doPreProcess 中已经处理过了，但再选中一次好像也没有什么问题，先不特殊处理这个 case 了
+                DirectUtils.directToLinkPage(currentActivity!!, launchData!!, "首次启动跳转", "")
+                // 跳转页面不管回调，延迟 500ms 后执行下一个 handler
+                AppExecutor.uiExecutor.executeWithDelay({
+                    processNext()
+                }, 500L)
+
+                return true
+            } else if (getStatus() == STATUS_INVALID) {
+                processNext()
+            }
+        }
+
+        return false
+    }
+
+}

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

@@ -6,15 +6,18 @@ import com.gh.gamecenter.login.user.UserManager
 
 class NotificationPermissionDialogHandler(priority: Int) : PriorityChainHandler(priority) {
 
-    override fun onProcess() {
+    override fun onProcess(): Boolean {
         // 仅登录后再启动光环时请求一次权限
         if (UserManager.getInstance().isLoggedIn) {
             NotificationHelper.showNotificationHintDialog(NotificationUgc.LOGIN) {
                 processNext()
             }
+            return true
         } else {
             processNext()
         }
+
+        return false
     }
 
 }

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

@@ -1,22 +1,54 @@
 package com.gh.common.prioritychain
 
+import com.lightgame.utils.Utils
 import java.util.*
 import java.util.concurrent.PriorityBlockingQueue
 
-class PriorityChain {
+class PriorityChain(private val completeCallback: (() -> Unit)? = null) {
 
-    private val mHandlerQueue: Queue<PriorityChainHandler> = PriorityBlockingQueue()
+    private val handlerQueue: Queue<PriorityChainHandler> = PriorityBlockingQueue()
 
+    /**
+     * 添加 handler 到队列中
+     */
     fun addHandler(handler: PriorityChainHandler) {
-        mHandlerQueue.add(handler.also {
+        handlerQueue.add(handler.also {
             it.setPriorityChain(this)
         })
     }
 
+    /**
+     * 启动队列中的 handler
+     */
     fun start() {
-        mHandlerQueue.poll()?.process(mHandlerQueue)
+        handlerQueue.peek()?.let {
+            it.injectQueue(handlerQueue)
+            it.process()
+        }
     }
 
-    fun isHandlerQueueEmpty() = mHandlerQueue.isEmpty()
+    /**
+     * 恢复队列中的 handler
+     */
+    fun resume() {
+        val handler = handlerQueue.peek()
+
+        if (handler?.getStatus() == PriorityChainHandler.STATUS_HANDLING) {
+            Utils.log(PriorityChainHandler.TAG, "${handler.javaClass.simpleName} 处于执行中状态，不用恢复")
+        } else {
+            handler?.injectQueue(handlerQueue)
+            handler?.process()
+        }
+    }
+
+    /**
+     * 队列是否为空
+     */
+    fun isHandlerQueueEmpty() = handlerQueue.isEmpty()
+
+
+    fun onHandleComplete() {
+        completeCallback?.invoke()
+    }
 
 }

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

@@ -5,54 +5,76 @@ import java.util.*
 
 abstract class PriorityChainHandler(private val mPriority: Int) : Comparable<PriorityChainHandler> {
 
-    private var mStatus = STATUS_UNKNOWN
-    private var mQueue: Queue<PriorityChainHandler>? = null
+    private var status = STATUS_UNKNOWN
+    private var queue: Queue<PriorityChainHandler>? = null
 
-    private var mPriorityChain: PriorityChain? = null
+    private var priorityChain: PriorityChain? = null
 
     /**
      * 获取当前 handler 的状态
      * - 等待结果返回 （STATUS_PENDING）
      * - 无需执行 （STATUS_INVALID）
      * - 可执行 （STATUS_VALID）
+     * - 执行中 （STATUS_HANDLING）
      * - 未知 （STATUS_UNKNOWN）
      */
-    fun getStatus(): Int = mStatus
+    fun getStatus(): Int = status
 
     fun updateStatus(status: Int) {
-        Utils.log(TAG, "${javaClass.simpleName} updateStatus $status")
+        Utils.log(TAG, "${javaClass.simpleName} updateStatus ${this.status} $status")
 
-        mStatus = status
+        this.status = status
     }
 
     fun setPriorityChain(priorityChain: PriorityChain) {
-        mPriorityChain = priorityChain
+        this.priorityChain = priorityChain
     }
 
-    fun process(queue: Queue<PriorityChainHandler>) {
-        Utils.log(TAG, "${javaClass.simpleName} process $mStatus")
+    fun injectQueue(queue: Queue<PriorityChainHandler>) {
+        this.queue = queue
+    }
+
+    fun process() {
+        Utils.log(TAG, "${javaClass.simpleName} process $status")
 
-        mQueue = queue
         // 若当前 handler 未经处理，将其状态改为 pending
-        if (mStatus == STATUS_UNKNOWN) {
+        if (status == STATUS_UNKNOWN) {
             updateStatus(STATUS_PENDING)
         }
 
-        onProcess()
+        if (status == STATUS_HANDLING) {
+            Utils.log(TAG, "${javaClass.simpleName} 已经处于执行中状态，不用再次执行")
+            return
+        }
+
+        val isHandling = onProcess()
+
+        if (isHandling) {
+            updateStatus(STATUS_HANDLING)
+        }
     }
 
     /**
      * 执行相关功能的地方
+     * @return 是否满足执行条件并处于执行中状态
      */
-    abstract fun onProcess()
+    abstract fun onProcess(): Boolean
 
     /**
      * 分发给下一个 handler 处理
      */
     fun processNext() {
-        Utils.log(TAG, "${javaClass.simpleName} processNext $mStatus")
+        Utils.log(TAG, "${javaClass.simpleName} processNext")
 
-        mQueue?.poll()?.process(mQueue!!)
+        queue?.remove(this)
+        if (queue?.isEmpty() == true) {
+            priorityChain?.onHandleComplete()
+        } else {
+            queue?.peek()?.let {
+                it.injectQueue(queue!!)
+                it.process()
+            }
+        }
     }
 
     override fun compareTo(other: PriorityChainHandler): Int {
@@ -64,6 +86,7 @@ abstract class PriorityChainHandler(private val mPriority: Int) : Comparable<Pri
         internal const val STATUS_INVALID = 1
         internal const val STATUS_VALID = 2
         internal const val STATUS_UNKNOWN = 3
+        internal const val STATUS_HANDLING = 4
 
         const val TAG = "PriorityChainHandler"
     }

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

@@ -2,18 +2,17 @@ package com.gh.common.prioritychain
 
 import androidx.fragment.app.FragmentActivity
 import com.gh.common.dialog.PrivacyPolicyDialogFragment
+import com.gh.gamecenter.core.utils.CurrentActivityHolder
 import com.gh.gamecenter.entity.DialogEntity
 
 class PrivacyPolicyDialogHandler(priority: Int) : PriorityChainHandler(priority) {
 
-    private var mActivity: FragmentActivity? = null
     private var mPrivacyPolicyEntity: DialogEntity.PrivacyPolicyEntity? = null
 
     /**
      * 提前预处理显示弹窗的内容
      */
-    fun doPreProcess(fragmentActivity: FragmentActivity, privacyPolicyEntity: DialogEntity.PrivacyPolicyEntity?) {
-        mActivity = fragmentActivity
+    fun doPreProcess(privacyPolicyEntity: DialogEntity.PrivacyPolicyEntity?) {
         mPrivacyPolicyEntity = privacyPolicyEntity
 
         if (getStatus() == STATUS_PENDING) {
@@ -21,7 +20,7 @@ class PrivacyPolicyDialogHandler(priority: Int) : PriorityChainHandler(priority)
                 processNext()
             } else {
                 updateStatus(STATUS_VALID)
-                onProcess()
+                process()
             }
         } else {
             if (privacyPolicyEntity == null) {
@@ -32,17 +31,26 @@ class PrivacyPolicyDialogHandler(priority: Int) : PriorityChainHandler(priority)
         }
     }
 
-    override fun onProcess() {
-        when(getStatus()) {
-            STATUS_VALID -> {
-                PrivacyPolicyDialogFragment.show(mActivity!!, mPrivacyPolicyEntity) { _: Boolean? ->
+    override fun onProcess(): Boolean {
+        val currentActivity = CurrentActivityHolder.getCurrentActivity()
+
+        if (GlobalPriorityChainHelper.isThisActivityValid(currentActivity)) {
+            when (getStatus()) {
+                STATUS_VALID -> {
+                    PrivacyPolicyDialogFragment.show(currentActivity as FragmentActivity, mPrivacyPolicyEntity) { _: Boolean? ->
+                        processNext()
+                    }
+
+                    return true
+                }
+
+                STATUS_INVALID -> {
                     processNext()
                 }
             }
-            STATUS_INVALID -> {
-                processNext()
-            }
         }
+
+        return false
     }
 
 }

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

@@ -0,0 +1,48 @@
+package com.gh.common.prioritychain
+
+import com.gh.common.iinterface.ISmartRefresh
+
+class PullDownPushHandler(priority: Int): PriorityChainHandler(priority) {
+
+    private var mSmartRefreshFragment: ISmartRefresh? = null
+
+    /**
+     * 提前预处理显示弹窗的内容
+     */
+    fun doPreProcess(smartRefreshFragment: ISmartRefresh?, shouldShow: Boolean) {
+        mSmartRefreshFragment = smartRefreshFragment
+
+        if (getStatus() == STATUS_PENDING) {
+            if (shouldShow && smartRefreshFragment != null) {
+                updateStatus(STATUS_VALID)
+                process()
+            } else {
+                processNext()
+            }
+        } else {
+            if (shouldShow && smartRefreshFragment != null) {
+                updateStatus(STATUS_VALID)
+            } else {
+                updateStatus(STATUS_INVALID)
+            }
+        }
+    }
+
+    override fun onProcess(): Boolean {
+        when (getStatus()) {
+            STATUS_VALID -> {
+                mSmartRefreshFragment?.popupPullDownPush {
+                    processNext()
+                }
+
+                return true
+            }
+            STATUS_INVALID -> {
+                processNext()
+            }
+        }
+
+        return false
+    }
+
+}

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

@@ -0,0 +1,28 @@
+package com.gh.common.prioritychain
+
+import androidx.fragment.app.FragmentActivity
+import com.gh.common.util.PackageHelper
+import com.gh.gamecenter.common.base.GlobalActivityManager
+
+class RequestInstalledListPermissionHandler : PriorityChainHandler(-1000) {
+
+    init {
+        updateStatus(STATUS_VALID)
+    }
+
+    override fun onProcess(): Boolean {
+        val currentActivity = GlobalActivityManager.currentActivity ?: return false
+
+        if (currentActivity !is FragmentActivity) return false
+
+        PackageHelper.showGetInstallAppsListDialogAndRequestPermissionIfNeeded(
+            activity = currentActivity,
+            ignorePermanentlyDenied = true
+        ) {
+            processNext()
+        }
+
+        return true
+    }
+
+}

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

@@ -1,20 +1,18 @@
 package com.gh.common.prioritychain
 
-import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
 import com.gh.common.dialog.ReserveDialog
 import com.gh.gamecenter.common.entity.SimpleGameEntity
-import com.gh.gamecenter.message.MessageUnreadRepository
+import com.gh.gamecenter.core.utils.CurrentActivityHolder
 
 class ReserveDialogHandler(priority: Int) : PriorityChainHandler(priority) {
 
-    private var mFragment: Fragment? = null
     private var mReserveData: List<SimpleGameEntity>? = null
 
     /**
      * 提前预处理显示弹窗的内容
      */
-    fun doPreProcess(fragment: Fragment, reserveData: List<SimpleGameEntity>?) {
-        mFragment = fragment
+    fun doPreProcess(reserveData: List<SimpleGameEntity>?) {
         mReserveData = reserveData
 
         if (getStatus() == STATUS_PENDING) {
@@ -22,7 +20,7 @@ class ReserveDialogHandler(priority: Int) : PriorityChainHandler(priority) {
                 processNext()
             } else {
                 updateStatus(STATUS_VALID)
-                onProcess()
+                process()
             }
         } else {
             if (reserveData.isNullOrEmpty()) {
@@ -33,21 +31,28 @@ class ReserveDialogHandler(priority: Int) : PriorityChainHandler(priority) {
         }
     }
 
-    override fun onProcess() {
-        when (getStatus()) {
-            STATUS_VALID -> {
-                val reserveDialog = ReserveDialog.getInstance(mReserveData!!)
-                reserveDialog.setOnDismissListener {
-                    MessageUnreadRepository.loadMessageUnreadData()
+    override fun onProcess(): Boolean {
+        val currentActivity = CurrentActivityHolder.getCurrentActivity()
+
+        if (GlobalPriorityChainHelper.isThisActivityValid(currentActivity)) {
+            when (getStatus()) {
+                STATUS_VALID -> {
+                    val reserveDialog = ReserveDialog.getInstance(mReserveData!!)
+                    reserveDialog.setOnDismissListener {
+                        processNext()
+                    }
+                    reserveDialog.show((currentActivity as FragmentActivity).supportFragmentManager, "reserveDialog")
+
+                    return true
+                }
+
+                STATUS_INVALID -> {
                     processNext()
                 }
-                reserveDialog.show(mFragment!!.childFragmentManager, "reserveDialog")
-            }
-
-            STATUS_INVALID -> {
-                processNext()
             }
         }
+
+        return false
     }
 
 }

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

@@ -1,17 +1,47 @@
 package com.gh.common.prioritychain
 
-import android.content.Context
-import com.gh.gamecenter.manager.UpdateManager
+import androidx.fragment.app.FragmentActivity
+import com.gh.gamecenter.core.utils.CurrentActivityHolder
+import com.gh.gamecenter.update.UpdateHelper
 
-class UpdateDialogHandler(context: Context, priority: Int) : PriorityChainHandler(priority) {
+class UpdateDialogHandler(priority: Int) : PriorityChainHandler(priority) {
 
-    private val mUpdateManager = UpdateManager.getInstance(context)
-
-    override fun onProcess() {
-        mUpdateManager.checkUpdate(true, null)
-        mUpdateManager.setDismissCallback {
-            processNext()
+    fun doPreProcess() {
+        UpdateHelper.getUpdate(false) {
+            if (getStatus() == STATUS_PENDING) {
+                if (UpdateHelper.isUpdateValid(false)) {
+                    updateStatus(STATUS_VALID)
+                    process()
+                } else {
+                    updateStatus(STATUS_INVALID)
+                    processNext()
+                }
+            } else {
+                if (UpdateHelper.isUpdateValid(false)) {
+                    updateStatus(STATUS_VALID)
+                } else {
+                    updateStatus(STATUS_INVALID)
+                }
+            }
         }
     }
 
+    override fun onProcess(): Boolean {
+        val currentActivity = CurrentActivityHolder.getCurrentActivity()
+
+        if (GlobalPriorityChainHelper.isThisActivityValid(currentActivity)) {
+            if (getStatus() == STATUS_VALID) {
+                UpdateHelper.showUpdateDialog(currentActivity as FragmentActivity) {
+                    processNext()
+                }
+
+                return true
+            } else if (getStatus() == STATUS_INVALID) {
+                processNext()
+            }
+        }
+
+        return false
+    }
+
 }

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

@@ -1,41 +1,37 @@
 package com.gh.common.prioritychain
 
-import android.graphics.Bitmap
-import androidx.fragment.app.Fragment
-import com.gh.gamecenter.common.callback.BiCallback
+import androidx.fragment.app.FragmentActivity
 import com.gh.gamecenter.common.utils.ImageUtils
+import com.gh.gamecenter.core.utils.CurrentActivityHolder
 import com.gh.gamecenter.feature.entity.WelcomeDialogEntity
-import com.gh.gamecenter.fragment.MainWrapperViewModel
 import com.gh.gamecenter.fragment.WelcomeDialogFragment
+import com.gh.gamecenter.wrapper.MainWrapperViewModel
 import com.halo.assistant.HaloApp
 
-class WelcomeDialogHandler(priority: Int): PriorityChainHandler(priority) {
+class WelcomeDialogHandler(priority: Int) : PriorityChainHandler(priority) {
 
-    private var mFragment: Fragment? = null
-    private var mWelcomeDialogEntity: WelcomeDialogEntity? = null
+    private var welcomeDialogEntity: WelcomeDialogEntity? = null
 
-    fun doPreProcess(fragment: Fragment, welcomeDialogEntity: WelcomeDialogEntity?) {
-        mFragment = fragment
-        mWelcomeDialogEntity = welcomeDialogEntity
+    fun doPreProcess(welcomeDialogEntity: WelcomeDialogEntity?) {
+        this.welcomeDialogEntity = welcomeDialogEntity
 
         val preLoadClosure = {
             // 判断启动本次应用是否已经弹窗，不是的话弹启动弹窗
             if (HaloApp.get(MainWrapperViewModel.SHOULD_SHOW_OPENING_DIALOG, false) == null) {
                 HaloApp.put(MainWrapperViewModel.SHOULD_SHOW_OPENING_DIALOG, false)
-                ImageUtils.getBitmap(mWelcomeDialogEntity!!.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)
-                            onProcess()
+                            process()
                         } else {
                             updateStatus(STATUS_VALID)
                         }
-                    }
-
-                    override fun onSecond(second: Boolean) {
+                    } else {
                         processNext()
                     }
-                })
+                }
             } else {
                 processNext()
             }
@@ -56,24 +52,28 @@ class WelcomeDialogHandler(priority: Int): PriorityChainHandler(priority) {
         }
     }
 
-    override fun onProcess() {
-        when (getStatus()) {
-            STATUS_VALID -> {
-                if (mFragment == null || !mFragment!!.isAdded) {
-                    updateStatus(STATUS_INVALID)
-                    processNext()
-                } else {
-                    val welcomeDialog = WelcomeDialogFragment.getInstance(mWelcomeDialogEntity)
+    override fun onProcess(): Boolean {
+        val currentActivity = CurrentActivityHolder.getCurrentActivity()
+
+        if (GlobalPriorityChainHelper.isThisActivityValid(currentActivity)) {
+            when (getStatus()) {
+                STATUS_VALID -> {
+                    val welcomeDialog = WelcomeDialogFragment.getInstance(welcomeDialogEntity)
                     welcomeDialog.setOnDismissListener {
                         processNext()
                     }
-                    welcomeDialog.show(mFragment!!.childFragmentManager, "WelcomeDialog")
+                    welcomeDialog.show((currentActivity as FragmentActivity).supportFragmentManager, "WelcomeDialog")
+
+                    return true
+                }
+
+                STATUS_INVALID -> {
+                    processNext()
                 }
             }
-            STATUS_INVALID -> {
-                processNext()
-            }
         }
+
+        return false
     }
 
 }

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

@@ -82,4 +82,8 @@ class AppProviderImpl : IAppProvider {
     override fun getIsBrandNewInstall(): Boolean {
         return HaloApp.getInstance().isBrandNewInstall
     }
+
+    override fun setSkippingThirdParty(isSkippingThirdParty: Boolean) {
+        HaloApp.getInstance().isSkippingThirdParty = isSkippingThirdParty
+    }
 }

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

@@ -16,9 +16,8 @@ class BindingAdaptersProviderImpl : IBindingAdaptersProvider {
         view: TextView,
         game: GameEntity,
         isShowPlatform: Boolean,
-        isShowSuffix: Boolean
     ) {
-        BindingAdapters.setGameName(view, game, isShowPlatform, isShowSuffix)
+        BindingAdapters.setGameName(view, game, isShowPlatform)
     }
 
     override fun setGameTags(layout: LinearLayout, gameEntity: GameEntity) {

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

@@ -19,6 +19,7 @@ class BuildConfigImpl : IBuildConfigProvider {
     override fun getExposureVersion(): String = BuildConfig.EXPOSURE_VERSION
 
     override fun isDebug(): Boolean = BuildConfig.DEBUG
+    override fun isGATApp(): Boolean = BuildConfig.IS_GAT_APP
 
     override fun getApiHost(): String = BuildConfig.API_HOST
 
@@ -31,4 +32,6 @@ class BuildConfigImpl : IBuildConfigProvider {
     override fun getVApiHost(): String = BuildConfig.VAPI_HOST
 
     override fun getVDevApiHost(): String = BuildConfig.DEV_VAPI_HOST
+
+    override fun getLogProducerProject(): String = BuildConfig.LOG_HUB_PROJECT
 }

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

@@ -0,0 +1,103 @@
+package com.gh.common.provider
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.core.content.ContextCompat
+import androidx.viewbinding.ViewBinding
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.facebook.drawee.view.SimpleDraweeView
+import com.gh.common.util.ConcernContentUtils
+import com.gh.common.view.ImageContainerView
+import com.gh.gamecenter.ImageViewerActivity.Companion.getIntent
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.common.utils.toArrayList
+import com.gh.gamecenter.core.provider.IConcernArticleUtilsProvider
+import com.gh.gamecenter.databinding.RecyclerGameArticleBinding
+import com.gh.gamecenter.message.R
+
+@Route(path = RouteConsts.provider.concernContentUtils, name = "ConcernContentUtils暴露服务")
+class ConcernArticleUtilsProviderImpl : IConcernArticleUtilsProvider {
+    override fun addContentPic(
+        context: Context,
+        linearLayout: LinearLayout,
+        list: List<String>,
+        entrance: String,
+        width: Int
+    ) {
+        ConcernContentUtils.addContentPic(context, linearLayout, list, entrance, width)
+    }
+
+    override fun createArticleBinding(parent: ViewGroup): ViewBinding {
+        val inflater = LayoutInflater.from(parent.context)
+        return RecyclerGameArticleBinding.inflate(inflater, parent, false)
+    }
+
+    override fun initArticleStyle(binding: ViewBinding) {
+        if (binding is RecyclerGameArticleBinding) {
+            val context = binding.root.context
+            binding.root
+                .setBackground(ContextCompat.getDrawable(context, R.drawable.reuse_listview_item_style))
+            binding.tvGameName.setTextColor(ContextCompat.getColor(context, R.color.text_primary))
+            binding.tvTime.setTextColor(ContextCompat.getColor(context, R.color.text_tertiary))
+            binding.tvTitle.setTextColor(ContextCompat.getColor(context, R.color.text_primary))
+            binding.tvDescription.setTextColor(ContextCompat.getColor(context, R.color.text_secondary))
+            binding.tvComment.setTextColor(ContextCompat.getColor(context, R.color.text_tertiary))
+            binding.tvShare.setTextColor(ContextCompat.getColor(context, R.color.text_tertiary))
+        }
+    }
+
+    override fun getIvIcon(binding: ViewBinding): View =
+        (binding as RecyclerGameArticleBinding).ivIcon
+
+    override fun getTvGameName(binding: ViewBinding): TextView =
+        (binding as RecyclerGameArticleBinding).tvGameName
+
+    override fun getTvTime(binding: ViewBinding): TextView = (binding as RecyclerGameArticleBinding).tvTime
+
+    override fun getTvTitle(binding: ViewBinding): TextView = (binding as RecyclerGameArticleBinding).tvTitle
+
+    override fun getTvDescription(binding: ViewBinding): TextView =
+        (binding as RecyclerGameArticleBinding).tvDescription
+
+    override fun bindImgs(binding: ViewBinding, img: List<String>) {
+        if (binding is RecyclerGameArticleBinding) {
+            val images = img.map {
+                ImageContainerView.ImageContainerData.ImageInfo(it, 3, 2)
+            }
+            val imageContainerData =
+                ImageContainerView.ImageContainerData("", false, images, show = images.isNotEmpty())
+            binding.ivImagesContainer.bindData(imageContainerData,
+                object : ImageContainerView.OnImageContainerEventListener {
+                    override fun onImageClick(
+                        images: List<String>,
+                        position: Int,
+                        imageViewList: ArrayList<SimpleDraweeView>
+                    ) {
+                        val checkIntent = getIntent(
+                            binding.root.context,
+                            images.toArrayList(),
+                            position,
+                            imageViewList,
+                            ""
+                        )
+                        binding.root.context.startActivity(checkIntent)
+                    }
+
+                    override fun onVideoCLick(videoId: String) = Unit
+
+                })
+        }
+    }
+
+    override fun getTvComment(binding: ViewBinding): TextView = (binding as RecyclerGameArticleBinding).tvComment
+
+    override fun getTvShare(binding: ViewBinding): TextView = (binding as RecyclerGameArticleBinding).tvShare
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

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

@@ -1,26 +0,0 @@
-package com.gh.common.provider
-
-import android.content.Context
-import android.widget.LinearLayout
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.common.util.ConcernContentUtils
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.core.provider.IConcernContentUtilsProvider
-
-@Route(path = RouteConsts.provider.concernContentUtils, name = "ConcernContentUtils暴露服务")
-class ConcernContentUtilsProviderImpl : IConcernContentUtilsProvider {
-    override fun addContentPic(
-        context: Context,
-        linearLayout: LinearLayout,
-        list: List<String>,
-        entrance: String,
-        width: Int
-    ) {
-        ConcernContentUtils.addContentPic(context, linearLayout, list, entrance, width)
-    }
-
-
-    override fun init(context: Context?) {
-        // Do nothing
-    }
-}

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

@@ -0,0 +1,55 @@
+package com.gh.common.provider
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.viewbinding.ViewBinding
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.gamecenter.R
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.common.utils.goneIf
+import com.gh.gamecenter.common.utils.toColor
+import com.gh.gamecenter.core.provider.IConcernGiftPackUtilsProvider
+import com.gh.gamecenter.databinding.RecyclerGiftPackBinding
+
+@Route(path = RouteConsts.provider.concernGiftPackUtils, name = "ConcernGiftPackUtils暴露服务")
+class ConcernGiftPackUtilsProviderImpl : IConcernGiftPackUtilsProvider {
+    override fun createBinding(parent: ViewGroup): ViewBinding {
+        val inflater = LayoutInflater.from(parent.context)
+        return RecyclerGiftPackBinding.inflate(inflater, parent, false)
+            .also {
+                it.gCode.goneIf(true)
+            }
+    }
+
+    override fun initStyle(viewBinding: ViewBinding) {
+        with(viewBinding as RecyclerGiftPackBinding) {
+            val context = root.context
+            tvGameName.setTextColor(R.color.text_primary.toColor(context))
+            tvTime.setTextColor(R.color.text_tertiary.toColor(context))
+            tvGiftPackName.setTextColor(R.color.text_primary.toColor(context))
+            tvGiftPackContent.setTextColor(R.color.text_secondary.toColor(context))
+        }
+    }
+
+    override fun getIvGameIcon(viewBinding: ViewBinding) =
+        (viewBinding as RecyclerGiftPackBinding).ivIcon
+
+    override fun getTvGameName(viewBinding: ViewBinding) =
+        (viewBinding as RecyclerGiftPackBinding).tvGameName
+
+    override fun getTvTime(viewBinding: ViewBinding) =
+        (viewBinding as RecyclerGiftPackBinding).tvTime
+
+    override fun getTvGiftPackName(viewBinding: ViewBinding) =
+        (viewBinding as RecyclerGiftPackBinding).tvGiftPackName
+
+    override fun getTvGiftPackContent(viewBinding: ViewBinding) =
+        (viewBinding as RecyclerGiftPackBinding).tvGiftPackContent
+
+    override fun init(context: Context?) {
+        // Do Nothing
+    }
+}

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

@@ -0,0 +1,19 @@
+package com.gh.common.provider
+
+import android.content.Context
+import androidx.appcompat.app.AppCompatActivity
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IConcernShareNewsProvider
+import com.gh.gamecenter.newsdetail.NewsShareDialog
+
+@Route(path = RouteConsts.provider.concernShareNews, name = "ConcernShareNews暴露服务")
+class ConcernShareNewsProviderImpl : IConcernShareNewsProvider {
+    override fun share(activity: AppCompatActivity, shortId: String?, id: String?, gameIcon: String?, title: String?) {
+        NewsShareDialog.show(activity, shortId, id, gameIcon, title)
+    }
+
+    override fun init(context: Context?) {
+        // Do Nothing
+    }
+}

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

@@ -100,10 +100,6 @@ class ConfigProviderImpl : IConfigProvider {
         return Config.getNightModeSetting()?.setting ?: false
     }
 
-    override fun isShowPlugin(gameId: String): Boolean {
-        return Config.isShowPlugin(gameId)
-    }
-
     override fun init(context: Context?) {
         // Do nothing
     }

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

@@ -13,9 +13,10 @@ class DefaultUrlHandlerProviderImpl : IDefaultUrlHandlerProvider {
         context: Context,
         url: String,
         entrance: String,
-        bringAppToFront: Boolean
+        bringAppToFront: Boolean,
+        sourceEntrance: String
     ): Boolean {
-        return DefaultUrlHandler.interceptUrl(context, url, null, entrance, bringAppToFront)
+        return DefaultUrlHandler.interceptUrl(context, url, null, entrance, bringAppToFront, sourceEntrance)
     }
 
     override fun init(context: Context?) {

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

@@ -1,5 +1,6 @@
 package com.gh.common.provider
 
+import android.app.Activity
 import android.content.Context
 import android.os.Bundle
 import com.alibaba.android.arouter.facade.annotation.Route
@@ -22,34 +23,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)
     }
@@ -83,43 +56,32 @@ class DirectProviderImpl : IDirectProvider {
         articleId: String?,
         communityId: String?,
         entrance: String?,
-        path: String?
+        path: String?,
+        sourceEntrance: String
     ) {
-        DirectUtils.directToCommunityArticle(context, articleId, communityId, entrance, path)
+        DirectUtils.directToCommunityArticle(context, articleId, communityId, entrance, path, sourceEntrance)
     }
 
-    override fun directToVideoDetail(context: Context, videoId: String, entrance: String?, path: String?) {
-        DirectUtils.directToVideoDetail(context, videoId, entrance, path)
+    override fun directToVideoDetail(context: Context, videoId: String, entrance: String?, path: String?, sourceEntrance: String) {
+        DirectUtils.directToVideoDetail(context, videoId, entrance, path, sourceEntrance)
     }
 
     override fun directToAmway(context: Context, fixedTopAmwayCommentId: String?, entrance: String?, path: String?) {
         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) {
+    override fun directToQQGameHome(context: Context) {
         return DirectUtils.directToQGameHome(context)
     }
 
+    override fun directToQQGameById(activity: Activity, qqAppId: String) {
+        DirectUtils.directToQQGameById(activity, qqAppId)
+    }
+
+    override fun directToWechatGameById(activity: Activity, qqAppId: String) {
+        DirectUtils.directToWechatGameById(activity, qqAppId)
+    }
+
     override fun directToExternalBrowser(context: Context, url: String) {
         DirectUtils.directToExternalBrowser(context, url)
     }

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

@@ -9,6 +9,7 @@ import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.exposure.ExposureSource
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.entity.GameUpdateEntity
+import com.gh.gamecenter.feature.entity.CustomPageTrackData
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.gh.gamecenter.feature.provider.IDownloadButtonClickedProvider
@@ -29,6 +30,7 @@ class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
         var gameSchemaType = ""
         var packageName = ""
         var exposureSourceList: List<ExposureSource>? = null
+        var customPageTrackData: CustomPageTrackData? = null
 
         val boundedObject = downloadButton.getObject()
 
@@ -55,6 +57,7 @@ class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
                     gameSchemaType = boundedObject.gameBitChinese
                     packageName = boundedObject.getUniquePackageName() ?: ""
                     exposureSourceList = boundedObject.exposureEvent?.source
+                    customPageTrackData = boundedObject.customPageTrackData
                 }
 
                 is GameUpdateEntity -> {
@@ -80,11 +83,13 @@ class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
 
             // 上报 UI 状态为启动的点击事件 (样式为启动，或者文案包含启动都算能启动)
             if (downloadButton.buttonStyle == DownloadButton.ButtonStyle.LAUNCH_OR_OPEN
-                || downloadButton.text.contains("启动")) {
+                || downloadButton.text.contains("启动")
+            ) {
 
                 // boundedObject 里找不到游戏类型时，尝试从已安装列表中获取
                 if (gameCategory.isEmpty() && packageName.isNotEmpty()) {
-                    gameCategory = PackageRepository.gameInstalled.find { it.packageName == packageName }?.category ?: ""
+                    gameCategory =
+                        PackageRepository.gameInstalled.find { it.packageName == packageName }?.category ?: ""
                 }
 
                 NewFlatLogUtils.logGameLaunchButtonClicked(
@@ -98,7 +103,8 @@ class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
 
             // 预约状态不上报
             if (downloadButton.buttonStyle == DownloadButton.ButtonStyle.NORMAL
-                || downloadButton.buttonStyle == DownloadButton.ButtonStyle.PLUGIN) {
+                || downloadButton.buttonStyle == DownloadButton.ButtonStyle.PLUGIN
+            ) {
 
                 val text = downloadButton.text.ifEmpty {
                     downloadButton.getTag(R.string.download) ?: ""
@@ -111,6 +117,7 @@ class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
                 }
 
                 // 上报神策点击事件
+                val customPageKV = customPageTrackData?.toKV() ?: arrayOf()
                 SensorsBridge.trackEventWithExposureSource(
                     "DownLoadbuttonClick",
                     exposureSourceList,
@@ -127,6 +134,7 @@ class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
                     "last_page_name", GlobalActivityManager.getLastPageEntity().pageName,
                     "last_page_id", GlobalActivityManager.getLastPageEntity().pageId,
                     "last_page_business_id", GlobalActivityManager.getLastPageEntity().pageBusinessId,
+                    *customPageKV
                 )
             }
         }

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

@@ -1,19 +0,0 @@
-package com.gh.common.provider
-
-import android.content.Context
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.common.util.GameSubstituteRepositoryHelper
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.core.provider.IGameSubstituteRepositoryProvider
-
-@Route(path = RouteConsts.provider.gameSubstituteRepository, name = "GameSubstituteRepositoryHelper暴露服务")
-class GameSubstituteRepositoryProviderImpl : IGameSubstituteRepositoryProvider {
-
-    override fun updateSubstitutableGames() {
-        GameSubstituteRepositoryHelper.updateSubstitutableGames()
-    }
-
-    override fun init(context: Context?) {
-        // Do nothing
-    }
-}

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

@@ -2,14 +2,15 @@ package com.gh.common.provider
 
 import android.content.Context
 import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.DirectUtils
 import com.gh.gamecenter.MainActivity
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IMainProvider
 
 @Route(path = RouteConsts.provider.mainActivity, name = "MainActivity暴露服务")
 class MainProviderImpl : IMainProvider {
-    override fun skipToMainActivity(context: Context, position: Int) {
-        MainActivity.skipToMainActivity(context, position)
+    override fun skipToMainActivity(context: Context, type: String) {
+        DirectUtils.directToHomeDefaultTab(context)
     }
 
     override fun init(context: 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/provider/UpdateManagerProviderImpl.kt

@@ -1,16 +1,30 @@
 package com.gh.common.provider
 
 import android.content.Context
-import android.os.Handler
+import androidx.fragment.app.FragmentActivity
 import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.DialogUtils
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IUpdateManagerProvider
-import com.gh.gamecenter.manager.UpdateManager
+import com.gh.gamecenter.core.utils.ToastUtils
+import com.gh.gamecenter.update.UpdateHelper
 
 @Route(path = RouteConsts.provider.updateManager, name = "UpdateManager暴露服务")
 class UpdateManagerProviderImpl: IUpdateManagerProvider {
-    override fun checkUpdate(context: Context, isAutoCheck: Boolean, handler: Handler?) {
-        UpdateManager.getInstance(context).checkUpdate(isAutoCheck, handler)
+    override fun checkUpdate(activity: FragmentActivity, ignoreSuppressOption: Boolean) {
+        val dialog = DialogUtils.showWaitDialog(activity, "检查更新中...")
+
+        UpdateHelper.getUpdate(ignoreSuppressOption) {
+            dialog.dismiss()
+
+            if (UpdateHelper.isUpdateValid(ignoreSuppressOption)) {
+                UpdateHelper.showUpdateDialog(activity) {
+                    // Do nothing
+                }
+            } else {
+                ToastUtils.toast("您的光环助手已是最新版本")
+            }
+        }
     }
 
     override fun init(context: Context?) {

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

@@ -3,7 +3,8 @@ package com.gh.common.provider
 import android.content.Context
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.core.provider.IVHelperProvider
+import com.gh.gamecenter.feature.entity.InstallGameEntity
+import com.gh.gamecenter.feature.provider.IVHelperProvider
 import com.gh.vspace.VHelper
 
 @Route(path = RouteConsts.provider.vhelper, name = "VHelper暴露服务")
@@ -12,6 +13,14 @@ class VHelperProviderImpl: IVHelperProvider {
         return VHelper.isVGameOn()
     }
 
+    override fun getAllInstalledVGameEntity(): ArrayList<InstallGameEntity> {
+        return VHelper.getAllInstalledVGameEntity()
+    }
+
+    override fun launch(context: Context, packageName: String, ignoreGApps: Boolean, showLoading: Boolean) {
+        VHelper.launch(context, packageName, ignoreGApps, showLoading)
+    }
+
     override fun init(context: Context?) {
         // Do nothing
     }

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

@@ -91,7 +91,7 @@ object NewSimulatorGameManager {
             },
             uiModificationCallback = { binding ->
                 binding.contentTv.gravity = Gravity.START
-                binding.contentTv.setTextColor(R.color.text_subtitle.toColor(context))
+                binding.contentTv.setTextColor(R.color.text_secondary.toColor(context))
             },
             extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
         )

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

@@ -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(
@@ -395,7 +392,7 @@ class SimulatorDownloadManager private constructor() {
                 ToastUtils.showToast("该模拟器暂未提供下载")
             },
             uiModificationCallback = { binding ->
-                binding.confirmTv.setTextColor(R.color.text_body.toColor(context))
+                binding.confirmTv.setTextColor(R.color.text_instance.toColor(context))
             },
             extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
         )
@@ -420,7 +417,7 @@ class SimulatorDownloadManager private constructor() {
                 DownloadStatus.diskioerror,
                 DownloadStatus.diskisfull -> {
                     DownloadManager.getInstance().addObserver(dataWatcher)
-                    uiExecutor.executeWithDelay(Runnable { DownloadManager.getInstance().resume(entity, true) }, 200)
+                    uiExecutor.executeWithDelay(Runnable { DownloadManager.getInstance().resume(entity, false) }, 200)
                     SensorsBridge.trackSimulatorDownloadDialogShow(
                         gameId = gameId,
                         gameName = gameName,

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

@@ -8,7 +8,6 @@ import android.graphics.Bitmap
 import android.net.Uri
 import android.text.TextUtils
 import com.gh.common.constant.Config
-import com.gh.gamecenter.feature.utils.ApkActiveUtils
 import com.gh.common.util.LogUtils
 import com.gh.common.util.PackageUtils
 import com.gh.download.DownloadManager
@@ -24,13 +23,13 @@ import com.gh.gamecenter.core.utils.ToastUtils
 import com.gh.gamecenter.core.utils.UrlFilterUtils
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.entity.SimulatorGameRecordEntity
+import com.gh.gamecenter.feature.utils.ApkActiveUtils
 import com.gh.gamecenter.login.user.UserManager
 import com.gh.gamecenter.retrofit.RetrofitManager
 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
@@ -39,7 +38,6 @@ import okhttp3.ResponseBody
 import org.json.JSONArray
 import java.io.ByteArrayOutputStream
 import java.io.File
-import java.util.*
 
 object SimulatorGameManager {
 
@@ -185,8 +183,8 @@ object SimulatorGameManager {
                 val intent = Intent()
                 intent.data = Uri.fromFile(File(downloadEntity.path))
                 if (gameEntity.simulatorType == "FBA" || gameEntity.simulatorType == "FBN") {
-                    val apkEntity = gameEntity.getApk()[0]
-                    intent.putExtra("rom_name", apkEntity.packageName)
+                    val apkEntity = gameEntity.getApk().firstOrNull()
+                    intent.putExtra("rom_name", apkEntity?.packageName ?: "")
                 }
                 intent.putExtra("default_path", downloadEntity.path.substring(0, downloadEntity.path.lastIndexOf('/')))
                 intent.putExtra("game_type", gameEntity.simulatorType)

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

@@ -9,6 +9,7 @@ import androidx.fragment.app.Fragment
 import com.gh.download.simple.AutoUnregisteredSimpleDownloadListener
 import com.gh.download.simple.DownloadListener
 import com.gh.gamecenter.R
+import com.gh.gamecenter.cloudarchive.BaseCloudArchiveViewModel
 import com.gh.gamecenter.common.eventbus.EBReuse
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.core.runOnUiThread
@@ -36,6 +37,7 @@ object ArchiveDownloadButtonHelper {
         entrance: String,
         fragment: Fragment,
         packageName: String,
+        viewModel: BaseCloudArchiveViewModel,
         archiveEntity: ArchiveEntity,
         downloadBtn: TextView,
         gameEntity: GameEntity?,
@@ -60,19 +62,23 @@ object ArchiveDownloadButtonHelper {
                     }
                 }
                 // 检查本地是否已下载存档
-                VArchiveHelper.isArchiveDownloaded(archiveEntity.md5) -> showApplyArchiveTipDialog(
-                    context,
-                    entrance,
-                    packageName,
-                    archiveEntity,
-                    gameEntity
-                )
+                VArchiveHelper.isArchiveDownloaded(archiveEntity.md5) -> viewModel.getArchiveConfigString {
+                    showApplyArchiveTipDialog(
+                        context,
+                        entrance,
+                        packageName,
+                        it,
+                        archiveEntity,
+                        gameEntity
+                    )
+                }
                 // 检查完毕下载存档
                 else -> downloadArchive(
                     context,
                     entrance,
                     fragment,
                     packageName,
+                    viewModel,
                     archiveEntity,
                     downloadBtn,
                     gameEntity,
@@ -125,6 +131,7 @@ object ArchiveDownloadButtonHelper {
         context: Context,
         entrance: String,
         packageName: String,
+        config: String,
         archiveEntity: ArchiveEntity,
         gameEntity: GameEntity?
     ) {
@@ -135,7 +142,7 @@ object ArchiveDownloadButtonHelper {
                 .subscribeOn(Schedulers.io())
                 .subscribe()
 
-            VArchiveHelper.applyGameArchive(context, packageName, this) { packageName, isSuccess ->
+            VArchiveHelper.applyGameArchive(context, packageName, config, this) { packageName, isSuccess ->
                 runOnUiThread {
                     if (isSuccess) {
                         VHelper.launch(context, packageName)
@@ -161,6 +168,7 @@ object ArchiveDownloadButtonHelper {
         entrance: String,
         fragment: Fragment,
         packageName: String,
+        viewModel: BaseCloudArchiveViewModel,
         archiveEntity: ArchiveEntity,
         downloadBtn: TextView,
         gameEntity: GameEntity?,
@@ -197,7 +205,9 @@ object ArchiveDownloadButtonHelper {
                     DownloadStatus.COMPLETED -> {
                         dismissArchiveLoadingDialog(archiveLoadingDialog)
                         downloadBtn.text = R.string.archive_apply.toResString()
-                        showApplyArchiveTipDialog(context, entrance, packageName, archiveEntity, gameEntity)
+                        viewModel.getArchiveConfigString {
+                            showApplyArchiveTipDialog(context, entrance, packageName, it, archiveEntity, gameEntity)
+                        }
                         downloadCompletedListener?.invoke()
                     }
                     else -> {
@@ -251,43 +261,46 @@ object ArchiveDownloadButtonHelper {
         context: Context,
         entrance: String,
         packageName: String,
+        config: String,
         archiveEntity: ArchiveEntity,
         gameEntity: GameEntity?
     ) {
-        DialogHelper.showDialog(
-            context,
-            R.string.archive_dialog_title.toResString(),
-            R.string.archive_apply_dialog_content.toResString(),
-            R.string.archive_apply.toResString(),
-            R.string.cancel.toResString(),
-            {
-                applyArchive(context, entrance, packageName, archiveEntity, gameEntity)
-                NewFlatLogUtils.logCloudArchiveApplyDialogRelated("cloud_save_overwrite_dialog_click", "使用")
-                SensorsBridge.trackEvent(
-                    "CloudSaveOverwriteDialogClick",
-                    "game_id", gameEntity?.id ?: "",
-                    "game_name", gameEntity?.name ?: "",
-                    "button_name", "使用"
-                )
-            },
-            {
-                NewFlatLogUtils.logCloudArchiveApplyDialogRelated("cloud_save_overwrite_dialog_click", "取消")
-                SensorsBridge.trackEvent(
-                    "CloudSaveOverwriteDialogClick",
-                    "game_id", gameEntity?.id ?: "",
-                    "game_name", gameEntity?.name ?: "",
-                    "button_name", "取消"
-                )
-            },
-            extraConfig = DialogHelper.Config(centerTitle = true)
-        )
+        runOnUiThread {
+            DialogHelper.showDialog(
+                context,
+                R.string.archive_dialog_title.toResString(),
+                R.string.archive_apply_dialog_content.toResString(),
+                R.string.archive_apply.toResString(),
+                R.string.cancel.toResString(),
+                {
+                    applyArchive(context, entrance, packageName, config, archiveEntity, gameEntity)
+                    NewFlatLogUtils.logCloudArchiveApplyDialogRelated("cloud_save_overwrite_dialog_click", "使用")
+                    SensorsBridge.trackEvent(
+                        "CloudSaveOverwriteDialogClick",
+                        "game_id", gameEntity?.id ?: "",
+                        "game_name", gameEntity?.name ?: "",
+                        "button_name", "使用"
+                    )
+                },
+                {
+                    NewFlatLogUtils.logCloudArchiveApplyDialogRelated("cloud_save_overwrite_dialog_click", "取消")
+                    SensorsBridge.trackEvent(
+                        "CloudSaveOverwriteDialogClick",
+                        "game_id", gameEntity?.id ?: "",
+                        "game_name", gameEntity?.name ?: "",
+                        "button_name", "取消"
+                    )
+                },
+                extraConfig = DialogHelper.Config(centerTitle = true)
+            )
 
-        NewFlatLogUtils.logCloudArchiveApplyDialogRelated("cloud_save_overwrite_dialog_show")
-        SensorsBridge.trackEvent(
-            "CloudSaveOverwriteDialogShow",
-            "game_id", gameEntity?.id ?: "",
-            "game_name", gameEntity?.name ?: ""
-        )
+            NewFlatLogUtils.logCloudArchiveApplyDialogRelated("cloud_save_overwrite_dialog_show")
+            SensorsBridge.trackEvent(
+                "CloudSaveOverwriteDialogShow",
+                "game_id", gameEntity?.id ?: "",
+                "game_name", gameEntity?.name ?: ""
+            )
+        }
     }
 
     private fun dismissArchiveLoadingDialog(archiveLoadingDialog: Dialog) {

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

@@ -64,7 +64,7 @@ object BbsReportHelper {
                     this,
                     1f,
                     false,
-                    R.color.background
+                    R.color.ui_background
                 )
             )
             binding.reasonRv.adapter = reportReasonAdapter
@@ -94,7 +94,7 @@ object BbsReportHelper {
             binding.otherReasonEt.doOnTextChanged { text, start, before, count ->
                 val tvCount: Int = text.toString().length
                 if (tvCount >= 500) {
-                    binding.tvCount.setTextColor(R.color.theme_red.toColor(binding.tvCount.context))
+                    binding.tvCount.setTextColor(R.color.secondary_red.toColor(binding.tvCount.context))
                 }
                 binding.tvCount.text = "$tvCount/500"
             }

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

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

@@ -198,7 +198,7 @@ public class CommentUtils {
         LinearLayout container = new LinearLayout(context);
         container.setOrientation(LinearLayout.VERTICAL);
         container.setPadding(0, DisplayUtils.dip2px(context, 12), 0, DisplayUtils.dip2px(context, 12));
-        container.setBackgroundColor(ContextCompat.getColor(context, R.color.background_white));
+        container.setBackgroundColor(ContextCompat.getColor(context, R.color.ui_surface));
 
         for (final String s : arrReportType) {
             TextView reportTypeTv = new TextView(context);
@@ -248,12 +248,12 @@ public class CommentUtils {
     public static void postVote(final Context context, final CommentEntity commentEntity,
                                 final TextView commentLikeCountTv, final ImageView commentLikeIv,
                                 final OnVoteListener listener) {
-        if (commentLikeCountTv.getCurrentTextColor() == ContextCompat.getColor(context, R.color.theme_font)) {
+        if (commentLikeCountTv.getCurrentTextColor() == ContextCompat.getColor(context, R.color.text_theme)) {
             ToastUtils.INSTANCE.showToast("已经点过赞啦！");
             return;
         }
         commentEntity.setVote(commentEntity.getVote() + 1);
-        commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.theme_font));
+        commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.text_theme));
         commentLikeIv.setImageResource(R.drawable.comment_vote_select);
         commentLikeCountTv.setText(NumberUtils.transSimpleCount(commentEntity.getVote()));
         commentLikeCountTv.setVisibility(View.VISIBLE);
@@ -318,12 +318,12 @@ public class CommentUtils {
             entrance = "视频流-评论-点赞";
         }
         CheckLoginUtils.checkLogin(context, entrance, () -> {
-            if (commentLikeCountTv.getCurrentTextColor() == ContextCompat.getColor(context, R.color.theme_font)) {
+            if (commentLikeCountTv.getCurrentTextColor() == ContextCompat.getColor(context, R.color.text_theme)) {
                 ToastUtils.INSTANCE.showToast("已经点过赞啦！");
                 return;
             }
             commentEntity.setVote(commentEntity.getVote() + 1);
-            commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.theme_font));
+            commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.text_theme));
             commentLikeIv.setImageResource(R.drawable.comment_vote_select);
             commentLikeCountTv.setText(NumberUtils.transSimpleCount(commentEntity.getVote()));
             commentLikeCountTv.setVisibility(View.VISIBLE);
@@ -444,7 +444,7 @@ public class CommentUtils {
                         public void onFailure(@Nullable HttpException e) {
                             super.onFailure(e);
                             commentEntity.setVote(commentEntity.getVote() + 1);
-                            commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.theme_font));
+                            commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.text_theme));
                             commentLikeIv.setImageResource(R.drawable.comment_vote_select);
                             commentLikeCountTv.setText(NumberUtils.transSimpleCount(commentEntity.getVote()));
                             commentLikeCountTv.setVisibility(View.VISIBLE);
@@ -502,7 +502,7 @@ public class CommentUtils {
             holder.commentLikeCountTv.setVisibility(View.GONE);
         } else { // 检查是否已点赞
             if (userDataEntity != null && (userDataEntity.isCommentVoted())) {
-                holder.commentLikeCountTv.setTextColor(ContextCompat.getColor(mContext, R.color.theme_font));
+                holder.commentLikeCountTv.setTextColor(ContextCompat.getColor(mContext, R.color.text_theme));
                 holder.commentLikeIv.setImageResource(R.drawable.comment_vote_select);
             }
             holder.commentLikeCountTv.setVisibility(View.VISIBLE);
@@ -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/ConcernContentUtils.java

@@ -7,8 +7,8 @@ import android.widget.LinearLayout;
 import com.facebook.drawee.drawable.ScalingUtils;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.gh.gamecenter.ImageViewerActivity;
-import com.gh.gamecenter.core.utils.DisplayUtils;
 import com.gh.gamecenter.common.utils.ImageUtils;
+import com.gh.gamecenter.core.utils.DisplayUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -121,5 +121,4 @@ public class ConcernContentUtils {
         }
         return imageView;
     }
-
 }

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

@@ -1,16 +1,14 @@
 package com.gh.common.util;
 
 import android.content.Context;
-import android.os.Build;
 
 import com.gh.gamecenter.common.constant.Constants;
 import com.gh.gamecenter.common.constant.EntranceConsts;
-import com.gh.gamecenter.common.utils.NetworkUtils;
+import com.gh.gamecenter.common.exposure.meta.MetaUtil;
 import com.gh.gamecenter.feature.entity.GameEntity;
 import com.gh.gamecenter.entity.NewsDetailEntity;
 import com.gh.gamecenter.feature.utils.PlatformUtils;
 import com.gh.gamecenter.manager.DataCollectionManager;
-import com.gh.gamecenter.manager.PackagesManager;
 import com.lightgame.download.DownloadEntity;
 
 import java.util.HashMap;
@@ -31,7 +29,7 @@ public class DataCollectionUtils {
         map.put("type", android.os.Build.MODEL);
         map.put("system", android.os.Build.VERSION.SDK_INT + "=" + android.os.Build.VERSION.RELEASE);
         // WIFI实时
-        DataCollectionManager.onEvent(context, "error", map, NetworkUtils.isWifiConnected(context));
+        DataCollectionManager.onEvent(context, "error", map, true);
     }
 
     // 上传下载数据（开始、完成）
@@ -54,7 +52,7 @@ public class DataCollectionUtils {
         map.put("location", downloadEntity.getLocation());
         map.put(EntranceConsts.KEY_ENTRANCE, downloadEntity.getEntrance());
         map.put("installed", downloadEntity.getInstalled());
-        map.put("network", NetworkUtils.getConnectedType(context));
+        map.put("network", MetaUtil.getMeta().getNetwork());
         DataCollectionManager.onEvent(context, "download", map);
     }
 
@@ -118,7 +116,7 @@ public class DataCollectionUtils {
         map.put("key", args[0]);
         map.put("game_id", args[3]);
         map.put("game_name", args[4]);
-        map.put("netword", NetworkUtils.getConnectedType(context));
+        map.put("netword", MetaUtil.getMeta().getNetwork());
         map.put("type", "search");
         map.put("device_type", android.os.Build.MODEL);
         map.put("device_system", android.os.Build.VERSION.SDK_INT + "=" + android.os.Build.VERSION.RELEASE);
@@ -136,7 +134,7 @@ public class DataCollectionUtils {
         map.put("key", args[0]);
         map.put("game_id", args[3]);
         map.put("game_name", args[4]);
-        map.put("netword", NetworkUtils.getConnectedType(context));
+        map.put("netword", MetaUtil.getMeta().getNetwork());
         map.put("type", "click");
         map.put("device_type", android.os.Build.MODEL);
         map.put("device_system", android.os.Build.VERSION.SDK_INT + "=" + android.os.Build.VERSION.RELEASE);

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

@@ -14,13 +14,10 @@ import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.common.base.GlobalActivityManager;
 import com.gh.gamecenter.common.base.activity.BaseActivity;
 import com.gh.gamecenter.common.constant.Constants;
-import com.gh.gamecenter.common.eventbus.EBReuse;
 import com.gh.gamecenter.common.exposure.meta.MetaUtil;
 import com.gh.gamecenter.common.retrofit.BiResponse;
-import com.gh.gamecenter.common.utils.ExtensionsKt;
-import com.gh.gamecenter.common.utils.SensorsBridge;
+import com.gh.gamecenter.core.AppExecutor;
 import com.gh.gamecenter.core.utils.GsonUtils;
-import com.gh.gamecenter.core.utils.MtaHelper;
 import com.gh.gamecenter.core.utils.SPUtils;
 import com.gh.gamecenter.core.utils.SentryHelper;
 import com.gh.gamecenter.login.entity.IdCardEntity;
@@ -33,8 +30,6 @@ import com.halo.assistant.HaloApp;
 import com.lightgame.config.CommonDebug;
 import com.lightgame.utils.Utils;
 
-import org.greenrobot.eventbus.EventBus;
-
 import io.reactivex.schedulers.Schedulers;
 import io.sentry.Sentry;
 import io.sentry.android.core.SentryAndroid;
@@ -109,53 +104,51 @@ public class DataUtils {
     }
 
     public static void getGid() {
-        GidHelper.getInstance().registerDevice(HaloApp.getInstance().getApplication(), new GidCallback() {
-            @Override
-            public void onSuccess(String gid) {
-                Utils.log("Gid", gid);
-                PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().getApplication()).edit().putString(Constants.DEVICE_KEY, gid).apply();
+        // 默认用 APP 级已存储的 GID 来使用，不使用外部 GID
+        String savedGid = SPUtils.getString(Constants.GID);
+        if (!TextUtils.isEmpty(savedGid)) {
+            HaloApp.getInstance().setGid(savedGid);
+            onGidReceived(savedGid);
+        } else {
+            GidHelper.getInstance().registerDevice(HaloApp.getInstance().getApplication(), new GidCallback() {
+                @Override
+                public void onSuccess(String gid) {
+                    Utils.log("Gid", gid);
+                    PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().getApplication()).edit().putString(Constants.DEVICE_KEY, gid).apply();
 
-                // 默认用 APP 级已存储的 GID 来使用，不使用外部 GID
-                String savedGid = SPUtils.getString(Constants.GID);
-                if (!TextUtils.isEmpty(savedGid)) {
-                    gid = savedGid;
-                } else {
                     SPUtils.setString(Constants.GID, gid);
+
+                    onGidReceived(gid);
                 }
 
-                HaloApp.getInstance().setGid(gid);
-
-                SensorsBridge.setGid(gid);
-
-                // 更新广告配置
-                ExtensionsKt.doOnMainProcessOnly(HaloApp.getInstance(), () -> {
+                @Override
+                public void onFailure(String s) {
+                    // 更新广告配置
                     AdDelegateHelper.INSTANCE.requestAdConfig(false, "", null);
-                });
-
-                // 避免重复调用
-                if (!TextUtils.isEmpty(gid)) {
-                    GameSubstituteRepositoryHelper.updateSubstitutableGames();
                 }
+            });
+        }
+    }
 
-                getDeviceCertification(gid);
+    private static void onGidReceived(String gid) {
+        HaloApp.getInstance().setGid(gid);
+        // 更新广告配置
+        AdDelegateHelper.INSTANCE.requestAdConfig(false, "", null);
 
-                // 避免初始化顺序问题导致 MetaUtil 一直持有空的 gid
-                MetaUtil.INSTANCE.refreshMeta();
+        getDeviceCertification(gid);
 
-                ContentValues values = new ContentValues();
-                values.put(GhContentProvider.KEY_GID, gid);
-                values.put(GhContentProvider.KEY_ANDROID_ID, MetaUtil.getBase64EncodedAndroidId());
-                try {
-                    HaloApp.getInstance().getContentResolver().insert(Uri.parse("content://com.gh.gamecenter.provider/device"), values);
-                } catch (Exception exception) {
-                    SentryHelper.INSTANCE.onEvent("DEVICE_INSERT_ERROR", "exception_digest", exception.getLocalizedMessage());
-                    exception.printStackTrace();
-                }
-            }
+        // 避免初始化顺序问题导致 MetaUtil 一直持有空的 gid
+        MetaUtil.INSTANCE.refreshMeta();
 
-            @Override
-            public void onFailure(String s) {
-                MtaHelper.onEventWithBasicDeviceInfo("开发辅助", "GID 获取异常", s);
+        AppExecutor.getIoExecutor().execute(() -> {
+            ContentValues values = new ContentValues();
+            values.put(GhContentProvider.KEY_GID, gid);
+            values.put(GhContentProvider.KEY_ANDROID_ID, MetaUtil.getBase64EncodedAndroidId());
+            try {
+                HaloApp.getInstance().getContentResolver().insert(Uri.parse("content://com.gh.gamecenter.provider/device"), values);
+            } catch (Exception exception) {
+                SentryHelper.INSTANCE.onEvent("DEVICE_INSERT_ERROR", "exception_digest", exception.getLocalizedMessage());
+                exception.printStackTrace();
             }
         });
     }
@@ -180,9 +173,11 @@ public class DataUtils {
                         if (idCardEntity != null) {
                             boolean isCertificated = !TextUtils.isEmpty(data.getIdCard().getId());
                             boolean isAdult = data.getIdCard().getMinor() == null || !data.getIdCard().getMinor();
+                            boolean isCertificating = data.getIdCard().getStatus() == 1;
 
                             values.put(GhContentProvider.KEY_IS_CERTIFICATED, isCertificated); // 是否认证
                             values.put(GhContentProvider.KEY_IS_ADULT, isAdult); // 是否成年
+                            values.put(GhContentProvider.KEY_IS_CERTIFICATING, isCertificating); // 是否认证中
 
                             if (!isCertificated) {
                                 RealNameHelper.updateCertificationStatus(0);
@@ -196,12 +191,12 @@ public class DataUtils {
                         } else {
                             values.put(GhContentProvider.KEY_IS_CERTIFICATED, false);
                             values.put(GhContentProvider.KEY_IS_ADULT, false);
+                            values.put(GhContentProvider.KEY_IS_CERTIFICATING, false);
                             RealNameHelper.updateCertificationStatus(0);
                         }
 
-                        EventBus.getDefault().post(new EBReuse(Constants.EB_REALNAME_RESULT));
+                        RealNameHelper.INSTANCE.onRealNameInfoUpdated();
 
-//                     new GhContentProvider().localInsert( HaloApp.getInstance().getApplication(),values);
                         try {
                             // Unknown URL content://com.gh.gamecenter.provider/certification
                             // TODO 将 com.gh.gamecenter 改成 BuildConfig.ApplicationID

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

@@ -0,0 +1,80 @@
+package com.gh.common.util
+
+import android.view.animation.AlphaAnimation
+import android.view.animation.Animation
+import android.view.animation.ScaleAnimation
+import android.widget.TextView
+import com.gh.common.constant.Config
+
+/**
+ * 光环游戏搜索栏默认文案轮换
+ */
+object DefaultSearchHintHelper {
+    private val hintList = ArrayList<String>()
+
+    init {
+        loadData()
+    }
+
+    fun loadData() {
+        hintList.clear()
+        Config.getSettings()?.search?.defaultData?.also {
+            if (it.isNotEmpty()) {
+                for (h in it) {
+                    hintList.add(h.removeSuffix("."))
+                }
+            }
+        }
+    }
+
+    fun setSearchHint(searchTv: TextView) {
+        var hintIndex = 0
+        val scaleAnimation = ScaleAnimation(
+            0.4F, 1.0F, 0.4F, 1.0F,
+            Animation.RELATIVE_TO_SELF, 0.5F, Animation.RELATIVE_TO_SELF, 0.5F
+        )
+        scaleAnimation.duration = 500
+        val alphaAnimation = AlphaAnimation(1F, 0.2F)
+        alphaAnimation.duration = 300
+        alphaAnimation.startOffset = 5000
+        scaleAnimation.setAnimationListener(object : Animation.AnimationListener {
+            override fun onAnimationStart(animation: Animation) {}
+            override fun onAnimationEnd(animation: Animation) {
+                searchTv.animation = alphaAnimation
+                alphaAnimation.start()
+            }
+
+            override fun onAnimationRepeat(animation: Animation) {}
+        })
+        alphaAnimation.setAnimationListener(object : Animation.AnimationListener {
+            override fun onAnimationStart(animation: Animation) {}
+            override fun onAnimationEnd(animation: Animation) {
+                // 切换数据
+                if (hintList.isNotEmpty()) {
+                    if (hintIndex > hintList.size - 1) {
+                        hintIndex = 0
+                    }
+                    searchTv.hint = hintList[hintIndex]
+                    hintIndex++
+                    searchTv.animation = scaleAnimation
+                    scaleAnimation.start()
+                }
+            }
+
+            override fun onAnimationRepeat(animation: Animation) {}
+        })
+
+        if (hintList.isEmpty()) {
+            loadData()
+        }
+
+        if (hintList.isNotEmpty()) {
+            if (hintList.size > 1) {
+                searchTv.animation = alphaAnimation
+            } else {
+                val hint = hintList[0]
+                searchTv.hint = hint
+            }
+        }
+    }
+}

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

@@ -12,9 +12,6 @@ import com.gh.common.repository.ReservationRepository;
 import com.gh.common.simulator.SimulatorGameManager;
 import com.gh.common.xapk.XapkInstaller;
 import com.gh.common.xapk.XapkUnzipStatus;
-import com.gh.gamecenter.feature.entity.GameEntity;
-import com.gh.gamecenter.feature.entity.PluginLocation;
-import com.gh.gamecenter.feature.view.DownloadButton;
 import com.gh.download.DownloadManager;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.adapter.viewholder.DetailViewHolder;
@@ -22,6 +19,9 @@ import com.gh.gamecenter.common.constant.Constants;
 import com.gh.gamecenter.common.entity.LinkEntity;
 import com.gh.gamecenter.common.utils.ExtensionsKt;
 import com.gh.gamecenter.core.utils.SPUtils;
+import com.gh.gamecenter.feature.entity.GameEntity;
+import com.gh.gamecenter.feature.entity.PluginLocation;
+import com.gh.gamecenter.feature.view.DownloadButton;
 import com.gh.gamecenter.manager.PackagesManager;
 import com.gh.vspace.VHelper;
 import com.lightgame.download.DownloadEntity;
@@ -259,7 +259,7 @@ public class DetailDownloadUtils {
 
             if (showDualDownloadButton && viewHolder.getLocalDownloadSizeTv() != null) {
                 viewHolder.getLocalDownloadSizeTv().setVisibility(View.GONE);
-                String size = viewHolder.getGameEntity().getApk().get(0).getSize();
+                String size = viewHolder.getGameEntity().getApk().isEmpty() ? "" : viewHolder.getGameEntity().getApk().get(0).getSize();
                 if (size != null) {
                     String sizeWithoutDigit = size.replaceAll("(?<=\\d)\\.[0-9]+(?!\\d)", "");
                     viewHolder.getLocalDownloadSizeTv().setText(sizeWithoutDigit);
@@ -367,8 +367,7 @@ public class DetailDownloadUtils {
         String downloadAddWord = gameEntity.getDownloadAddWord();
 
         // 不满足条件的部分游戏隐藏下载按钮
-        if (Config.isShowDownload(gameEntity.getId())
-                && !"光环助手".equals(gameEntity.getName())) {
+        if (!"光环助手".equals(gameEntity.getName())) {
             viewHolder.getDownloadBottom().setVisibility(View.VISIBLE);
         } else {
             viewHolder.getDownloadBottom().setVisibility(View.GONE);
@@ -443,7 +442,7 @@ public class DetailDownloadUtils {
     }
 
     private static String getDownloadSizeText(DetailViewHolder viewHolder) {
-        return String.format("（%s）", viewHolder.getGameEntity().getApk().get(0).getSize());
+        return String.format("（%s）", viewHolder.getGameEntity().getApk().isEmpty() ? "" : viewHolder.getGameEntity().getApk().get(0).getSize());
     }
 
     private static void updateVStyleDownloadButton(DetailViewHolder viewHolder,
@@ -458,8 +457,7 @@ public class DetailDownloadUtils {
                 break;
             case waiting:
                 downloadButton.setText(R.string.waiting);
-                downloadButton.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_NORMAL);
-                downloadButton.setVisibility(View.GONE);
+                downloadButton.setButtonStyle(DownloadButton.ButtonStyle.WAITING);
                 break;
             case overflow:
             case timeout:

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

@@ -1,23 +1,17 @@
 package com.gh.common.util
 
 import android.content.Context
-import android.os.Environment
 import android.preference.PreferenceManager
-import com.gh.gamecenter.common.exposure.meta.MetaUtil
-import com.gh.gamecenter.BuildConfig
+import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.entity.TimeEntity
 import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.halo.assistant.HaloApp
-import com.lightgame.utils.Utils
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
-import java.io.File
 
 object DeviceTokenUtils {
 
-    const val DEVICE_ID = "uuid"
-
     // 同步服务器时间
     @JvmStatic
     @Synchronized
@@ -39,99 +33,29 @@ object DeviceTokenUtils {
     }
 
     @JvmStatic
-    fun getLaunchType(readOnly: Boolean = false): LunchType {
+    fun getLaunchType(): LunchType {
         var lunchType: LunchType? = null
         val values = PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().application).all
         // 版本更新
         if (values.isNotEmpty()) {
             for (value in values) {
-                if (value.key.contains("isNewFirstLaunchV")) {
+                if (value.key.contains(Constants.SP_NEW_FIRST_LAUNCH_VERSION)) {
                     lunchType = LunchType.UPDATE
                     break
                 }
             }
         }
-        // 再次重装
-        if (lunchType == null && !getDeviceId().isNullOrEmpty()) {
-            lunchType = LunchType.AGAIN
-        }
         // 首次安装
         if (lunchType == null) {
             lunchType = LunchType.FIRST
         }
-        // 保存deviceId
-        var deviceId = MetaUtil.getIMEI()
-        if (deviceId.isNullOrEmpty()) {
-            deviceId = Utils.getTime(HaloApp.getInstance().application).toString()
-        }
-
-        if (!readOnly) {
-            setDeviceId(deviceId)
-        }
 
         return lunchType
     }
 
-    private fun getDeviceFileList(): List<File> {
-        val sdCardDir = Environment.getExternalStorageDirectory()
-        val fileList: MutableList<File> = ArrayList()
-        fileList.add(File(sdCardDir.path + "/gh-uuid/$DEVICE_ID"))
-        fileList.add(File(sdCardDir.path + "/system/$DEVICE_ID"))
-        fileList.add(File(sdCardDir.path + "/data/$DEVICE_ID"))
-        return fileList
-    }
-
-
-    @Synchronized
-    private fun setDeviceId(deviceId: String) {
-        //将deviceId存到sp
-        val sp = PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().application)
-        val edit = sp.edit()
-        edit.putString(DEVICE_ID, deviceId)
-        edit.apply()
-        Utils.log("saveDeviceId", "保存成功SP")
-
-        //将deviceId存到SD卡
-        for (file in getDeviceFileList()) {
-            try {
-                val parentFile = file.parentFile
-                if (!parentFile.exists()) parentFile.mkdirs()
-                file.writeText(deviceId)
-                Utils.log("saveDeviceId", "保存成功SDCard目录为：${file.path}")
-            } catch (e: Exception) {
-                Utils.log("保存u${DEVICE_ID}到SDCard异常${file.path} " + e.toString())
-                e.printStackTrace()
-            }
-        }
-    }
-
-    private fun getDeviceId(): String? {
-        val sp = PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().application)
-        var deviceId = sp.getString(DEVICE_ID, null)
-        if (deviceId.isNullOrEmpty()) {
-            val fileList = getDeviceFileList()
-            for (file in fileList) {
-                if (file.exists()) {
-                    try {
-                        deviceId = file.readText()
-                        Utils.log("getDeviceId", "获取成功DataFile$DEVICE_ID")
-                        return deviceId
-                    } catch (e: Exception) {
-                        e.printStackTrace()
-                    }
-                }
-            }
-        }
-        if (BuildConfig.DEBUG) {
-            Utils.log("getDeviceId", "获取成功SP$DEVICE_ID")
-        }
-        return deviceId
-    }
-
 }
 
 enum class LunchType {
     FIRST,
-    UPDATE,
-    AGAIN
+    UPDATE
 }

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

@@ -4,7 +4,6 @@ import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
@@ -12,16 +11,9 @@ import android.net.Uri;
 import android.os.CountDownTimer;
 import android.provider.Settings;
 import android.text.Html;
-import android.text.Spannable;
 import android.text.SpannableStringBuilder;
-import android.text.Spanned;
-import android.text.TextPaint;
 import android.text.TextUtils;
 import android.text.method.LinkMovementMethod;
-import android.text.style.ClickableSpan;
-import android.text.style.URLSpan;
-import android.text.style.UnderlineSpan;
-import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -34,12 +26,9 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 
-import com.facebook.drawee.generic.GenericDraweeHierarchy;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.gh.common.constant.Config;
 import com.gh.common.filter.RegionSetting;
@@ -47,11 +36,9 @@ import com.gh.common.xapk.XapkDialogHelper;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.ShellActivity;
 import com.gh.gamecenter.adapter.ReportReasonAdapter;
-import com.gh.gamecenter.adapter.viewholder.PrivacyPolicyItemViewHolder;
 import com.gh.gamecenter.common.base.TrackableDialog;
 import com.gh.gamecenter.common.callback.CancelListener;
 import com.gh.gamecenter.common.callback.ConfirmListener;
-import com.gh.gamecenter.common.callback.SimpleCallback;
 import com.gh.gamecenter.common.databinding.DialogAlertDefaultBinding;
 import com.gh.gamecenter.common.entity.SimpleGameEntity;
 import com.gh.gamecenter.common.entity.SuggestType;
@@ -60,9 +47,7 @@ import com.gh.gamecenter.common.utils.ExtensionsKt;
 import com.gh.gamecenter.common.utils.ImageUtils;
 import com.gh.gamecenter.common.utils.NetworkUtils;
 import com.gh.gamecenter.common.utils.SensorsBridge;
-import com.gh.gamecenter.common.view.CustomLinkMovementMethod;
 import com.gh.gamecenter.common.view.DrawableView;
-import com.gh.gamecenter.common.view.FixLinearLayoutManager;
 import com.gh.gamecenter.common.view.MaxHeightLinearLayout;
 import com.gh.gamecenter.common.view.MaxHeightNestedScrollView;
 import com.gh.gamecenter.common.view.VerticalItemDecoration;
@@ -80,10 +65,7 @@ import com.gh.gamecenter.databinding.DialogRelievePhoneBinding;
 import com.gh.gamecenter.databinding.DialogReportReasonBinding;
 import com.gh.gamecenter.databinding.DialogWechatReserveSuccessBinding;
 import com.gh.gamecenter.databinding.ImprintContentItemBinding;
-import com.gh.gamecenter.databinding.PrivacyItemBinding;
 import com.gh.gamecenter.entity.BadgeEntity;
-import com.gh.gamecenter.entity.PermissionsEntity;
-import com.gh.gamecenter.entity.PrivacyPolicyEntity;
 import com.gh.gamecenter.entity.TrackableEntity;
 import com.gh.gamecenter.feature.entity.ApkEntity;
 import com.gh.gamecenter.feature.entity.Badge;
@@ -91,7 +73,6 @@ import com.gh.gamecenter.feature.entity.GameEntity;
 import com.gh.gamecenter.feature.entity.SettingsEntity;
 import com.gh.gamecenter.help.HelpAndFeedbackBridge;
 import com.gh.gamecenter.setting.SettingBridge;
-import com.lightgame.adapter.BaseRecyclerAdapter;
 import com.lightgame.download.DownloadEntity;
 import com.lightgame.utils.AppManager;
 import com.lightgame.utils.Util_System_Keyboard;
@@ -101,6 +82,7 @@ import java.util.ArrayList;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import kotlin.Unit;
+import kotlin.collections.CollectionsKt;
 import kotlin.jvm.functions.Function0;
 
 public class DialogUtils {
@@ -328,180 +310,7 @@ public class DialogUtils {
         return dialog;
     }
 
-    public static void showPrivacyPolicyDialog(Context context,
-                                               @NonNull PrivacyPolicyEntity entity,
-                                               SimpleCallback<Boolean> callback) {
-
-        final Context activityContext = checkDialogContext(context);
-
-        // 区分此 dialog 是点击 dialog 外部取消的还是点击返回取消的
-        AtomicBoolean isCanceledByClickOutsideOfDialog = new AtomicBoolean(true);
-
-        final Dialog dialog = new Dialog(activityContext, R.style.GhAlertDialog);
-        View contentView = LayoutInflater.from(activityContext).inflate(R.layout.dialog_privacy_policy, null);
-        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-        dialog.setContentView(contentView);
-
-        Window window = dialog.getWindow();
-        if (window != null) {
-            window.setBackgroundDrawableResource(android.R.color.transparent);
-            WindowManager.LayoutParams params = window.getAttributes();
-            params.horizontalMargin = 0;
-            params.width = context.getResources().getDisplayMetrics().widthPixels - DisplayUtils.dip2px(40);
-//            int height = context.getResources().getDisplayMetrics().heightPixels - DisplayUtils.dip2px(120);
-//            int maxHeight = DisplayUtils.dip2px(446);
-//            if (height > maxHeight) {
-//                params.height = maxHeight;
-//            } else {
-//                params.height = height;
-//            }
-            window.setAttributes(params);
-        }
-
-        TextView title = contentView.findViewById(R.id.title);
-        TextView bottomContent = contentView.findViewById(R.id.bottom_content);
-        TextView topContent = contentView.findViewById(R.id.top_content);
-        TextView allowButton = contentView.findViewById(R.id.allow_button);
-        TextView disallowButton = contentView.findViewById(R.id.disallow_button);
-        TextView linkContent = contentView.findViewById(R.id.link_content);
-        RecyclerView permissions = contentView.findViewById(R.id.permissions_content);
-
-        permissions.setLayoutManager(new FixLinearLayoutManager(context));
-        permissions.setAdapter(new BaseRecyclerAdapter(context) {
-            @NonNull
-            @Override
-            public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-                View view = mLayoutInflater.inflate(R.layout.privacy_item, parent, false);
-                return new PrivacyPolicyItemViewHolder(PrivacyItemBinding.bind(view));
-            }
-
-            @Override
-            public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-                if (holder instanceof PrivacyPolicyItemViewHolder) {
-                    PrivacyPolicyItemViewHolder viewHolder = (PrivacyPolicyItemViewHolder) holder;
-                    PrivacyItemBinding binding = viewHolder.getBinding();
-                    final PermissionsEntity permissionsEntity = entity.getPermissions().get(position);
-                    ImageUtils.display(binding.icon, permissionsEntity.getIcon());
-                    binding.name.setText(permissionsEntity.getName());
-                    binding.intro.setText(permissionsEntity.getIntro());
-                    GenericDraweeHierarchy hierarchy = binding.icon.getHierarchy();
-                    if (hierarchy != null) {
-                        if (position == 0) {
-                            hierarchy.setPlaceholderImage(R.drawable.permission_storage);
-                        } else if (position == 1) {
-                            hierarchy.setPlaceholderImage(R.drawable.permission_phone_state);
-                        }
-                    }
-                }
-            }
-
-            @Override
-            public int getItemCount() {
-                return entity.getPermissions().size();
-            }
-        });
-
-        SpannableStringBuilder skipText = new SpannableStringBuilder("查看完整版的隐私政策和用户协议");
-        skipText.setSpan(new ClickableSpan() {
-            @Override
-            public void updateDrawState(@NonNull TextPaint ds) {
-                super.updateDrawState(ds);
-                ds.setColor(ContextCompat.getColor(activityContext, R.color.theme_font));
-                ds.setUnderlineText(false);
-            }
-
-            @Override
-            public void onClick(@NonNull View widget) {
-//                MtaHelper.onEvent("隐私政策弹窗", "隐私政策弹窗", "点击隐私政策");
-                DirectUtils.directToExternalBrowser(context, context.getString(R.string.privacy_policy_url));
-            }
-        }, skipText.length() - 9, skipText.length() - 5, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-
-        skipText.setSpan(new ClickableSpan() {
-            @Override
-            public void updateDrawState(@NonNull TextPaint ds) {
-                super.updateDrawState(ds);
-                ds.setColor(ContextCompat.getColor(activityContext, R.color.theme_font));
-                ds.setUnderlineText(false);
-            }
-
-            @Override
-            public void onClick(@NonNull View widget) {
-//                MtaHelper.onEvent("隐私政策弹窗", "隐私政策弹窗", "点击用户协议");
-                DirectUtils.directToExternalBrowser(context, context.getString(R.string.disclaimer_url));
-            }
-        }, skipText.length() - 4, skipText.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-
-        /*skipText.setSpan(new ClickableSpan() {
-            @Override
-            public void updateDrawState(@NonNull TextPaint ds) {
-                super.updateDrawState(ds);
-                ds.setColor(ContextCompat.getColor(activityContext, R.color.theme_font));
-                ds.setUnderlineText(false);
-            }
-
-            @Override
-            public void onClick(@NonNull View widget) {
-//                MtaHelper.onEvent("隐私政策弹窗", "隐私政策弹窗", "点击第三方SDK接入说明");
-                activityContext.startActivity(WebActivity.getThirdPartySdkStatementIntent(activityContext));
-            }
-        }, skipText.length() - 10, skipText.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);*/
-
-        title.setText(entity.getTitle());
-        linkContent.setText(skipText);
-        linkContent.setMovementMethod(LinkMovementMethod.getInstance());
-        topContent.setText(entity.getTopContent());
-        bottomContent.setText(ExtensionsKt.fromHtml(entity.getBottomContent()));
-        bottomContent.setMovementMethod(CustomLinkMovementMethod.getInstance());
-
-        // Remove underline
-        Spannable sa = (Spannable) bottomContent.getText();
-        for (URLSpan u : sa.getSpans(0, sa.length(), URLSpan.class)) {
-            sa.setSpan(new UnderlineSpan() {
-                public void updateDrawState(TextPaint tp) {
-                    tp.setUnderlineText(false);
-                }
-            }, sa.getSpanStart(u), sa.getSpanEnd(u), 0);
-        }
-
-        allowButton.setOnClickListener(view -> {
-            dialog.dismiss();
-            callback.onCallback(true);
-//            MtaHelper.onEvent("隐私政策弹窗", "隐私政策弹窗", "点击同意");
-        });
-
-        disallowButton.setOnClickListener(v -> {
-            dialog.dismiss();
-            callback.onCallback(false);
-//            showPrivacyPolicyDisallowDialog(activityContext, entity, callback);
-//            MtaHelper.onEvent("隐私政策弹窗", "隐私政策弹窗", "不同意并退出App");
-        });
-
-        dialog.setOnCancelListener(cd -> {
-            if (isCanceledByClickOutsideOfDialog.get()) {
-//                MtaHelper.onEvent("隐私政策弹窗", "隐私政策弹窗", "点击空白");
-            }
-        });
-
-        dialog.setOnKeyListener((dialog1, keyCode, event) -> {
-            if (keyCode == KeyEvent.KEYCODE_BACK && event.getAction() == KeyEvent.ACTION_UP) {
-                isCanceledByClickOutsideOfDialog.set(false);
-//                MtaHelper.onEvent("隐私政策弹窗", "隐私政策弹窗", "点击返回");
-            }
-            return false;
-        });
-        // 用户未同意隐私策略不应该触发 MTA 事件
-//        MtaHelper.onEvent("隐私政策弹窗", "隐私政策弹窗", "出现弹窗");
-
-        try {
-            dialog.setCancelable(false);
-            dialog.show();
-        } catch (Exception ignored) {
-        }
-    }
-
     public static void showPrivacyPolicyDisallowDialog(Context context,
-                                                       @NonNull PrivacyPolicyEntity entity,
                                                        EmptyCallback callback) {
         final Context activityContext = checkDialogContext(context);
 
@@ -547,8 +356,8 @@ public class DialogUtils {
         TextView negativeTv = contentView.findViewById(R.id.negative);
         TextView positiveTv = contentView.findViewById(R.id.positive);
         TextView content = contentView.findViewById(R.id.content);
-        positiveTv.setBackground(DrawableView.getOvalDrawable(R.color.background, 999));
-        negativeTv.setBackground(DrawableView.getOvalDrawable(R.color.theme, 999));
+        positiveTv.setBackground(DrawableView.getOvalDrawable(R.color.ui_background, 999));
+        negativeTv.setBackground(DrawableView.getOvalDrawable(R.color.primary_theme, 999));
         content.setText(Html.fromHtml(context.getString(R.string.video_upload_draft_dialog_content)));
 
         negativeTv.setOnClickListener(view -> {
@@ -770,11 +579,15 @@ public class DialogUtils {
             dialog.dismiss();
         });
 
+        ApkEntity apkEntity = CollectionsKt.firstOrNull(gameEntity.getApk());
+        String size = apkEntity == null ? "" : apkEntity.getSize();
         if ("show&download".equals(gameEntity.getOverseasAddressDialog().getStatus())) {
-            gameEntity.getApk().get(0).setUrl(gameEntity.getOverseasAddressDialog().getLink());
+            if (apkEntity != null) {
+                apkEntity.setUrl(gameEntity.getOverseasAddressDialog().getLink());
+            }
         }
         binding.urlTv.setText(gameEntity.getOverseasAddressDialog().getLink());
-        binding.downloadBtn.setText("下载（" + gameEntity.getApk().get(0).getSize() + "）");
+        binding.downloadBtn.setText("下载（" + size + "）");
         binding.downloadBtn.setOnClickListener(v -> {
             dismissByTouchInside.set(true);
             SensorsBridge.trackOverseasAddressDialogClick(
@@ -820,15 +633,50 @@ public class DialogUtils {
 
         binding.gameIcon.displayGameIcon(gameEntity);
         binding.gameNameTv.setText(context.getString(R.string.dialog_land_page_address_hint, gameEntity.getName()));
-        binding.closeIv.setOnClickListener(v -> dialog.dismiss());
+
+        AtomicBoolean dismissByButton = new AtomicBoolean(false);
+
+        binding.closeIv.setOnClickListener(v -> {
+            dismissByButton.set(true);
+            SensorsBridge.INSTANCE.trackJumpLandPageAddressDialogClick(
+                    "取消",
+                    gameEntity.getId(),
+                    gameEntity.getName() != null ? gameEntity.getName() : "",
+                    gameEntity.getCategoryChinese()
+            );
+            dialog.dismiss();
+        });
 
         binding.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 -> {
+            dismissByButton.set(true);
+            SensorsBridge.INSTANCE.trackJumpLandPageAddressDialogClick(
+                    "前往第三方网站下载游戏",
+                    gameEntity.getId(),
+                    gameEntity.getName() != null ? gameEntity.getName() : "",
+                    gameEntity.getCategoryChinese()
+            );
             listener.onConfirm();
             dialog.dismiss();
         });
 
+        dialog.setOnDismissListener(dialog1 -> {
+            if (!dismissByButton.get()) {
+                SensorsBridge.INSTANCE.trackJumpLandPageAddressDialogClick(
+                        "关闭弹窗",
+                        gameEntity.getId(),
+                        gameEntity.getName() != null ? gameEntity.getName() : "",
+                        gameEntity.getCategoryChinese()
+                );
+            }
+        });
+
         Window window = dialog.getWindow();
         if (window != null) {
             window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
@@ -837,6 +685,12 @@ public class DialogUtils {
         dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
         dialog.setContentView(contentView);
         dialog.show();
+
+        SensorsBridge.INSTANCE.trackJumpLandPageAddressDialogShow(
+                gameEntity.getId(),
+                gameEntity.getName() != null ? gameEntity.getName() : "",
+                gameEntity.getCategoryChinese()
+        );
     }
 
     public static void showGameH5DownloadDialog(Context context, GameEntity gameEntity, RegionSetting.GameH5Download gameH5Download) {
@@ -1251,10 +1105,10 @@ public class DialogUtils {
 
         DialogPackageParseErrorBinding binding = DialogPackageParseErrorBinding.inflate(LayoutInflater.from(context), null, false);
         Context finalContext = context;
-        SpannableStringBuilder builder = new SpanBuilder("您也可以点击提交反馈跟我们联系").click(context, 6, 10, R.color.theme_font, true, new Function0<Unit>() {
+        SpannableStringBuilder builder = new SpanBuilder("您也可以点击提交反馈跟我们联系").click(context, 6, 10, R.color.text_theme, true, new Function0<Unit>() {
             @Override
             public Unit invoke() {
-                SimpleGameEntity entity = new SimpleGameEntity(gameId, gameName, "");
+                SimpleGameEntity entity = new SimpleGameEntity(gameId, gameName, "", "");
                 HelpAndFeedbackBridge.startSuggestionActivity(finalContext, SuggestType.GAME, "notfound", "模拟器安装包解析错误", entity);
                 dialog.dismiss();
                 return null;
@@ -1310,7 +1164,7 @@ public class DialogUtils {
             return null;
         });
         binding.reasonRv.setLayoutManager(new LinearLayoutManager(context));
-        binding.reasonRv.addItemDecoration(new VerticalItemDecoration(context, 1F, false, R.color.background));
+        binding.reasonRv.addItemDecoration(new VerticalItemDecoration(context, 1F, false, R.color.ui_background));
         binding.reasonRv.setAdapter(reportReasonAdapter);
 
         binding.negativeBtn.setOnClickListener(v -> {
@@ -1332,7 +1186,7 @@ public class DialogUtils {
         ExtensionsKt.setTextChangedListener(binding.otherReasonEt, (s, start, before, count) -> {
             int tvCount = s.length();
             if (tvCount >= 500) {
-                binding.tvCount.setTextColor(ContextCompat.getColor(finalContext, R.color.theme_red));
+                binding.tvCount.setTextColor(ContextCompat.getColor(finalContext, R.color.secondary_red));
             }
             binding.tvCount.setText(tvCount + "/500");
             return null;