feat: 礼包功能模块化

# Conflicts:
#	app/src/main/java/com/gh/gamecenter/servers/GameServersContentFragment.kt
#	ndownload

.gitlab-ci.yml

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

README.md

@@ -30,7 +30,14 @@
 
 ### git 版本管理
 
-本项目使用简化版的 git flow 来管理分支，细节请看 [光环安卓简单 git 规范](https://git.shanqu.cc/halo/android/assistant-android/-/wikis/%E5%85%89%E7%8E%AF%E5%AE%89%E5%8D%93%E7%AE%80%E5%8D%95-git-%E8%A7%84%E8%8C%83)
+本项目使用简化版的 git flow 来管理分支，细节请看 [光环安卓简单 git 规范](https://git.ghzs.com/halo/android/assistant-android/-/wikis/%E5%85%89%E7%8E%AF%E5%AE%89%E5%8D%93%E7%AE%80%E5%8D%95-git-%E8%A7%84%E8%8C%83)
+
+### API 环境配置
+
+本项目使用 Build Variants 来切换 API 环境
+
+* internal 为测试环境
+* publish 为正式环境
 
 ### 图片资源配置
 
@@ -46,3 +53,14 @@
 
 * 本项目使用了微信的 [AndResGuard](https://github.com/shwenzhang/AndResGuard) 作为资源混淆压缩方案，新增需要使用 `getIdentifier` 获取的资源文件时需要添加至白名单
 * 本项目默认使用 R8 作为混淆工具，往 proguard-rules.txt 添加 proguard 新配置项时请检查可用性(如语法等)
+
+### APK打包配置
+
+> 打内部测试包：`./scripts/test_build.sh`
+> 打邮件测试包：`./scripts/jenkins_build.sh`
+
+### TODO
+
+* 把原有 EventBus 的消息 Type 统一到一个文件内
+* 将实现细节从 View(Fragment、Activity) 剥离并以 MVVM 结构改造
+* 重构 MainActivity

app/build.gradle

@@ -11,10 +11,6 @@ android {
 
     String CONFIG_ID = ""
     String FIRST_LAUNCH = ""
-    String SDK_VERSION = ""
-    String SDK_APP_ID = ""
-    String SDK_APP_NAME = ""
-    boolean USE_DEFAULT_CHANNEL_SDK = true
     int ACTIVATE_REPORTING_RATIO = 100
 
     buildFeatures {
@@ -83,12 +79,6 @@ android {
         // 推广用的配置 id
         buildConfigField "String", "CONFIG_ID", "\"${CONFIG_ID}\""
 
-        // 推广用的 SDK 版本 （仅记录使用）
-        buildConfigField "String", "SDK_VERSION", "\"${SDK_VERSION}\""
-        buildConfigField "String", "SDK_APP_ID", "\"${SDK_APP_ID}\""
-        buildConfigField "String", "SDK_APP_NAME", "\"${SDK_APP_NAME}\""
-        buildConfigField "boolean", "USE_DEFAULT_CHANNEL_SDK", "${USE_DEFAULT_CHANNEL_SDK}"
-
         // 首次启动的跳转配置
         buildConfigField "String", "FIRST_LAUNCH", "\"${FIRST_LAUNCH}\""
 
@@ -188,7 +178,6 @@ android {
             buildConfigField "String", "DEV_VAPI_HOST", "\"${DEV_VAPI_HOST}\""
             buildConfigField "String", "QUICK_LOGIN_APPID", "\"${DEV_QUICK_LOGIN_APPID}\""
             buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${DEV_QUICK_LOGIN_APPKEY}\""
-            buildConfigField "String", "CSJ_APPID", "\"${DEV_CSJ_APPID}\""
         }
 
         // publish， 发布时候使用的 flavor，接口仅包含正式环境
@@ -200,7 +189,6 @@ android {
             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", "CSJ_APPID", "\"${CSJ_APPID}\""
         }
 
         tea {
@@ -211,7 +199,6 @@ android {
             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", "CSJ_APPID", "\"${CSJ_APPID}\""
 
             manifestPlaceholders.put("APPLOG_SCHEME", "rangersapplog.byAx6uYt".toLowerCase())
         }
@@ -219,12 +206,17 @@ android {
         kuaishou {
             dimension "env"
 
+            String KUAI_SHOU_APP_ID = ""
+            String KUAI_SHOU_APP_NAME = ""
+
             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", "CSJ_APPID", "\"${CSJ_APPID}\""
+
+            buildConfigField "String", "KUAI_SHOU_APP_ID", "\"${KUAI_SHOU_APP_ID}\""
+            buildConfigField "String", "KUAI_SHOU_APP_NAME", "\"${KUAI_SHOU_APP_NAME}\""
         }
 
         gdt {
@@ -235,7 +227,6 @@ android {
             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", "CSJ_APPID", "\"${CSJ_APPID}\""
         }
     }
 }
@@ -328,6 +319,9 @@ dependencies {
     implementation(project(':module_login')) {
         exclude group: 'androidx.swiperefreshlayout'
     }
+    implementation(project(':module_libao')) {
+        exclude group: 'androidx.swiperefreshlayout'
+    }
     implementation(project(':module_setting')) {
         exclude group: 'androidx.swiperefreshlayout'
     }
@@ -337,28 +331,18 @@ dependencies {
     implementation(project(':module_core_feature')) {
         exclude group: 'androidx.swiperefreshlayout'
     }
-//    implementation(project(':module_feedback')) {
-//        exclude group: 'androidx.swiperefreshlayout'
-//    }
-    implementation(project(':feature:new_feedback',)) {
+    implementation(project(':module_feedback')) {
         exclude group: 'androidx.swiperefreshlayout'
     }
     implementation(project(':module_sensors_data')) {
         exclude group: 'androidx.swiperefreshlayout'
     }
-    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'))
-    implementation(project(':feature:csj_ad'))
-//    implementation(project(':feature:beizi_startup_ad'))
+    implementation(project(':feature:beizi_startup_ad'))
     implementation(project(':feature:xapk-installer'))
-    implementation(project(':feature:qq_game')) {
-        exclude group: 'androidx.swiperefreshlayout'
-    }
 }
 
 File propFile = file('sign.properties')

app/proguard-rules.txt

@@ -20,7 +20,6 @@
 -keep class com.gh.gamecenter.db.info.* {*;}
 -keep class com.gh.gamecenter.entity.** {<fields>;}
 -keep class com.gh.gamecenter.qa.entity.** {<fields>;}
--keep class com.gh.download.DownloadDataSimpleEntity {<fields>;}
 -keep class com.gh.gamecenter.floatingwindow.FloatingWindowEntity {<fields>;}
 -keep class com.gh.gamecenter.BR
 -keep class com.gh.gamecenter.retrofit.* {*;}

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

@@ -5,8 +5,8 @@ import com.kwai.monitor.log.TurboAgent
 import com.kwai.monitor.log.TurboConfig
 
 object KuaishouHelper {
-    private val mAppId by lazy { BuildConfig.SDK_APP_ID.ifEmpty { "81537" } }
-    private val mAppName by lazy { BuildConfig.SDK_APP_NAME.ifEmpty { "guanghuanzhushou_1" } }
+    private val mAppId by lazy { BuildConfig.KUAI_SHOU_APP_ID.ifEmpty { "81537" } }
+    private val mAppName by lazy { BuildConfig.KUAI_SHOU_APP_NAME.ifEmpty { "guanghuanzhushou_1" } }
 
     @JvmStatic
     fun init(context: Context, channel: String) {

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

@@ -3,16 +3,12 @@ package com.gh.gamecenter.provider
 import android.app.Activity
 import android.app.Application
 import android.text.TextUtils
-import com.gh.gamecenter.BuildConfig
 import com.gh.gamecenter.KuaishouHelper
-import com.gh.gamecenter.core.AppExecutor
 import com.gh.gamecenter.core.provider.IFlavorProvider
 import com.gh.gamecenter.core.utils.SPUtils
 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
 
 class FlavorProviderImp : IFlavorProvider {
 
@@ -35,11 +31,7 @@ class FlavorProviderImp : IFlavorProvider {
     }
 
     override fun getChannelStr(application: Application): String {
-        var channel = if (BuildConfig.USE_DEFAULT_CHANNEL_SDK) {
-            ChannelReaderUtil.getChannel(application)
-        } else {
-            TurboHelper.getChannel(application)
-        }
+        var channel = TurboHelper.getChannel(application)
         if (channel == null || TextUtils.isEmpty(channel.trim())) {
             channel = KUAISHOU_CHANNEL
         }
@@ -52,11 +44,6 @@ class FlavorProviderImp : IFlavorProvider {
 
     override fun logCoreEvent() {
         logEvent("EVENT_KEY_PATH_OPTIMIZATION")
-        if (BuildConfig.ACTIVATE_REPORTING_RATIO == 1) {
-            AppExecutor.uiExecutor.executeWithDelay({
-                ToastUtils.toast("关键行为 EVENT_KEY_PATH_OPTIMIZATION")
-            }, 500)
-        }
     }
 
     companion object {

app/src/main/AndroidManifest.xml

@@ -77,12 +77,7 @@
         androidx.compose.animation.core,
         androidx.constraintlayout.compose,
         androidx.compose.ui.test.manifest,
-        com.bytedance.sdk.openadsdk,
-        androidx.compose.ui.tooling.preview,
-        com.tencent.qqmini,
-        com.tencent.qqmini.minigame.external,
-        com.tencent.qqmini.minigame.opensdk,
-        com.tencent.qqmini.union.ad" />
+        androidx.compose.ui.tooling.preview" />
 
     <!-- 去掉 SDK 一些流氓权限 -->
     <uses-permission
@@ -237,15 +232,6 @@
             android:screenOrientation="portrait"
             android:theme="@style/TransparentStatusBarAndNavigationBar" />
 
-        <activity
-            android:name="com.gh.gamecenter.LibaoActivity"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateHidden" />
-
-        <activity
-            android:name="com.gh.gamecenter.LibaoDetailActivity"
-            android:screenOrientation="portrait" />
-
         <activity
             android:name="com.gh.gamecenter.ShareGhActivity"
             android:screenOrientation="portrait" />
@@ -275,7 +261,7 @@
         <activity
             android:name="com.gh.gamecenter.VoteActivity"
             android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateAlwaysHidden|adjustPan" />
+            android:windowSoftInputMode="stateAlwaysHidden|adjustResize" />
 
         <activity
             android:name="com.gh.gamecenter.WeiBoShareActivity"
@@ -302,6 +288,10 @@
             android:name="com.gh.gamecenter.CollectionActivity"
             android:screenOrientation="portrait" />
 
+        <activity
+            android:name="com.gh.gamecenter.MessageActivity"
+            android:screenOrientation="portrait" />
+
         <activity
             android:name="com.gh.gamecenter.UserInfoEditActivity"
             android:screenOrientation="portrait"
@@ -315,10 +305,26 @@
             android:name="com.gh.gamecenter.qa.answer.edit.AnswerEditActivity"
             android:screenOrientation="portrait" />
 
+        <activity
+            android:name="com.gh.gamecenter.ConcernInfoActivity"
+            android:screenOrientation="portrait" />
+
         <activity
             android:name="com.gh.gamecenter.InfoActivity"
             android:screenOrientation="portrait" />
 
+        <activity
+            android:name="com.gh.gamecenter.MessageKeFuActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.MessageInviteActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.MessageVoteActivity"
+            android:screenOrientation="portrait" />
+
         <activity
             android:name=".qa.questions.invite.QuestionsInviteActivity"
             android:screenOrientation="portrait" />
@@ -745,18 +751,6 @@
             android:name="com.gh.gamecenter.gamecollection.hotlist.GameCollectionHotListActivity"
             android:screenOrientation="portrait" />
 
-        <activity
-            android:name="com.gh.gamecenter.qgame.QGameHomeWrapperActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name="com.gh.gamecenter.qgame.QGameSearchActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name="com.gh.gamecenter.qgame.QGameSubjectActivity"
-            android:screenOrientation="portrait" />
-
 
         <!--        <activity-->
         <!--            android:name="${applicationId}.douyinapi.DouYinEntryActivity"-->
@@ -827,9 +821,8 @@
             </intent-filter>
         </receiver>
 
-        <activity
+        <receiver
             android:name="com.gh.common.xapk.XapkInstallReceiver"
-            android:theme="@style/Theme.Transparent"
             android:exported="false" />
 
         <receiver
@@ -840,6 +833,39 @@
             </intent-filter>
         </receiver>
 
+        <!-- 梦工厂配置 开始 -->
+        <!--<meta-data
+            android:name="MGC_APPID"
+            android:value="1001276" />
+
+        <provider
+            android:name="com.leto.game.base.provider.LetoFileProvider"
+            android:authorities="${applicationId}.leto.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/leto_file_path"
+                tools:replace="android:resource" />
+        </provider>-->
+        <!-- 梦工厂配置 结束 -->
+
+        <!-- 穿山甲配置 开始 -->
+        <!--<provider
+            android:name="com.bytedance.sdk.openadsdk.TTFileProvider"
+            android:authorities="${applicationId}.TTFileProvider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
+
+        <provider
+            android:name="com.bytedance.sdk.openadsdk.multipro.TTMultiProvider"
+            android:authorities="${applicationId}.TTMultiProvider"
+            android:exported="false" />-->
+        <!-- 穿山甲配置 结束 -->
     </application>
 
 </manifest>

app/src/main/assets/rich_editor.js

@@ -205,17 +205,14 @@ RE.setOutdent = function() {
 
 RE.setJustifyLeft = function() {
     document.execCommand('justifyLeft', false, null);
-    RE.enabledEditingItems()
 }
 
 RE.setJustifyCenter = function() {
     document.execCommand('justifyCenter', false, null);
-    RE.enabledEditingItems()
 }
 
 RE.setJustifyRight = function() {
     document.execCommand('justifyRight', false, null);
-    RE.enabledEditingItems()
 }
 
 RE.setBlockquote = function() {
@@ -230,16 +227,6 @@ RE.insertImage = function(url) {
     RE.insertHTML(html);
 }
 
-// 设置分割线
-RE.insertHorizontalRule = function() {
-    document.execCommand('insertHorizontalRule', false, null);
-}
-
-// 设置编辑器默认换行符
-RE.setDefaultParagraphSeparator = function(separator) {
-    document.execCommand('defaultParagraphSeparator', false, separator);
-}
-
 // 替换成缩略图
 RE.replaceTbImage = function(imgRuleFlag, gifRuleFlag) {
     var imgs = document.getElementsByTagName("img");
@@ -352,9 +339,9 @@ RE.ImageClickListener = function() {
          var img = imgs[i];
          var imageClassName = img.className;
          if (imageClassName == "image-link"|| img.className == "poster") continue;
-         window.NativeCallBack.invokeMethod("imageArr", img.src);
+         window.imagelistener.imageArr(img.src);
          img.onclick = function() {
-            window.NativeCallBack.invokeMethod("imageClick", this.src);
+             window.imagelistener.imageClick(this.src);
          }
     }
 }
@@ -587,10 +574,6 @@ document.addEventListener("selectionchange", function(e) {
    RE.sendElementNameToNative()
 });
 
-document.addEventListener("selectionchange", function(e) {
-   RE.enabledEditingItems(e)
-});
-
 RE.recursion = function(dom) {
     var parenDom = dom.parentElement
     if (parenDom && parenDom instanceof Element &&
@@ -633,6 +616,7 @@ RE.sendElementNameToNative = function() {
 // android function to open link
 function customLinkgo(self) {
   var datas = self.dataset.datas
+  // console.log(datas)
   window.OnLinkClickListener.onClick(datas)
 }
 

app/src/main/assets/style.css

@@ -30,6 +30,7 @@ body {
 }
 
 #editor {
+  display: table-cell;
   outline: 0px solid transparent;
   background-repeat: no-repeat;
   background-position: center;

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

@@ -1,433 +0,0 @@
-package com.gh.ad
-
-import android.annotation.SuppressLint
-import android.app.Activity
-import android.content.Context
-import android.content.SharedPreferences
-import android.text.TextUtils
-import android.view.View
-import android.view.ViewGroup
-import android.widget.FrameLayout
-import android.widget.TextView
-import androidx.appcompat.content.res.AppCompatResources
-import androidx.fragment.app.Fragment
-import com.alibaba.android.arouter.launcher.ARouter
-import com.facebook.drawee.view.SimpleDraweeView
-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.gamecenter.BuildConfig
-import com.gh.gamecenter.MainActivity
-import com.gh.gamecenter.R
-import com.gh.gamecenter.common.base.activity.BaseActivity
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.common.exposure.ExposureSource
-import com.gh.gamecenter.common.retrofit.BiResponse
-import com.gh.gamecenter.common.utils.*
-import com.gh.gamecenter.core.provider.IBeiziAdProvider
-import com.gh.gamecenter.core.provider.ICsjAdProvider
-import com.gh.gamecenter.core.utils.CurrentActivityHolder
-import com.gh.gamecenter.core.utils.SPUtils
-import com.gh.gamecenter.core.utils.TimeUtils.getToday
-import com.gh.gamecenter.entity.AdConfig
-import com.gh.gamecenter.entity.StartupAdEntity
-import com.gh.gamecenter.feature.exposure.ExposureEvent.Companion.createEvent
-import com.gh.gamecenter.feature.exposure.ExposureType
-import com.gh.gamecenter.retrofit.RetrofitManager
-import com.halo.assistant.HaloApp
-import io.reactivex.schedulers.Schedulers
-
-/**
- * 广告实现代理类
- *
- * 由它来分发功能实现到具体的实现
- *
- * 以最复杂的开屏广告为例，有三种实现（1. 自有的广告实现 2. 穿山甲的开屏广告实现 3. Beizi 的开屏广告实现）
- *
- * 由于两个广告 SDK 有可能在一次启动中都被使用，所以会根据获取到的广告配置 config 来决定是否需要出是很好两个 SDK
- */
-object AdDelegateHelper {
-
-    private var mCsjAdImpl: ICsjAdProvider? = null
-    private var mBeiziAdImpl: IBeiziAdProvider? = null
-
-    private var mAdConfigList: ArrayList<AdConfig>? = null
-
-    private var mSplashAd: AdConfig? = null
-    private var mDownloadManagerAd: AdConfig? = null
-    private val mGameSearchAdList: ArrayList<AdConfig> by lazy { arrayListOf() }
-    private var mVGameLaunchAd: AdConfig? = null
-
-    val vGameLaunchAd: AdConfig?
-        get() = mVGameLaunchAd
-
-    private const val AD_SDK_CSJ = "穿山甲"
-    private const val AD_SDK_BEIZI = "倍孜"
-    private const val AD_TYPE_SDK = "third_party_ads" // 第三方 SDK 广告
-
-    private const val KEY_CACHE_CONFIG = "cache_config" // 放在 SP 里的广告缓存（避免接口加载问题）
-
-    private val mAdConfigSp: SharedPreferences by lazy {
-        HaloApp.getInstance().getSharedPreferences("AdConfig", Context.MODE_PRIVATE)
-    }
-
-    fun initAdSdk(context: Context) {
-        // 初始化 Beizi
-        if (mBeiziAdImpl == null) {
-            mBeiziAdImpl =
-                ARouter.getInstance().build(RouteConsts.provider.beiziAd).navigation() as? IBeiziAdProvider
-            mBeiziAdImpl?.initSDK(context)
-        }
-
-        // 初始化穿山甲
-        if (mCsjAdImpl == null) {
-            mCsjAdImpl =
-                ARouter.getInstance().build(RouteConsts.provider.csjAd).navigation() as? ICsjAdProvider
-            mCsjAdImpl?.initSDK(context, BuildConfig.CSJ_APPID, HaloApp.getInstance().oaid)
-            // 监听亮色/暗色模式切换
-            DarkModeUtils.registerModeChangeListener {
-                val topActivity = CurrentActivityHolder.getCurrentActivity() ?: return@registerModeChangeListener
-                updateThemeStatus(context, DarkModeUtils.isDarkModeOn(topActivity))
-            }
-        }
-    }
-
-    /**
-     * 请求接口获取广告相关配置
-     */
-    @SuppressLint("CheckResult")
-    fun requestAdConfig(isFromRetry: Boolean) {
-        // mAdConfigList 不为空不需要重试
-        if (isFromRetry && mAdConfigList != null) {
-            return
-        }
-
-        RetrofitManager.getInstance()
-            .newApi
-            .adConfig
-            .subscribeOn(Schedulers.io())
-            .subscribe(object : BiResponse<List<AdConfig>>() {
-                override fun onSuccess(data: List<AdConfig>) {
-                    handleAdConfig(data)
-
-                    // 缓存数据到 SP 供接口请求失败用
-                    SPUtils.setString(mAdConfigSp, KEY_CACHE_CONFIG, data.toJson())
-                }
-
-                override fun onFailure(exception: Exception) {
-                    super.onFailure(exception)
-
-                    // 若接口请求失败时，从 SP 里获取上次缓存的数据
-                    val cachedConfig: List<AdConfig>? = SPUtils.getString(mAdConfigSp, KEY_CACHE_CONFIG).toObject()
-                    if (cachedConfig != null) {
-                        handleAdConfig(cachedConfig)
-                    }
-                }
-            })
-    }
-
-    /**
-     * 获取搜索页的广告列表
-     */
-    fun getGameSearchAdList(): ArrayList<AdConfig> {
-        return mGameSearchAdList
-    }
-
-    /**
-     * 获取下载管理页的广告
-     */
-    fun getDownloadManagerAd(): AdConfig? {
-        return mDownloadManagerAd
-    }
-
-    /**
-     * 处理广告配置
-     */
-    fun handleAdConfig(configList: List<AdConfig>) {
-        for (config in configList) {
-            // 处理返回的数据
-            when (config.location) {
-                "halo_launch" -> mSplashAd = config
-                "download_manager" -> mDownloadManagerAd = config
-                "game_search" -> config.let { mGameSearchAdList.add(it) }
-                "helper_launch" -> mVGameLaunchAd = config
-            }
-        }
-    }
-
-    /**
-     * 是否需要显示开屏广告
-     */
-    fun shouldShowStartUpAd(): Boolean {
-        return mSplashAd != null
-    }
-
-    /**
-     * 更新主题样式
-     */
-    private fun updateThemeStatus(context: Context, isDarkMode: Boolean) {
-        mCsjAdImpl?.updateThemeStatus(context, isDarkMode)
-    }
-
-    /**
-     * 请求开屏广告
-     */
-    @JvmStatic
-    fun requestSplashAd(
-        activity: Activity,
-        adViewWidthInPx: Int,
-        adViewHeightInPx: Int,
-        adViewWidthInDp: Float,
-        adViewHeightInDp: Float,
-        startAdContainer: ViewGroup,
-        sdkStartAdContainer: ViewGroup,
-        adsViewGroup: FrameLayout,
-        handler: BaseActivity.BaseHandler,
-        hideCallback: () -> Unit
-    ) {
-        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, 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(
-                        activity,
-                        mSplashAd?.thirdPartyAd?.slotId ?: "unknown",
-                        adViewWidthInPx,
-                        adViewHeightInPx,
-                        adViewWidthInDp,
-                        adViewHeightInDp,
-                        sdkStartAdContainer,
-                        sdkSplashCallback
-                    )
-                }
-            } else {
-                requestStandardSplashAd(mSplashAd!!.ownerAd, startAdContainer, handler, hideCallback)
-            }
-        }
-    }
-
-    /**
-     * 获取穿山甲的开屏广告
-     */
-    private fun requestCsjSplashAd(
-        activity: Activity,
-        slotId: String,
-        adViewWidthInPx: Int,
-        adViewHeightInPx: Int,
-        adViewWidthInDp: Float,
-        adViewHeightInDp: Float,
-        startAdContainer: ViewGroup,
-        callback: (isSuccess: Boolean) -> Unit,
-    ) {
-        if (mCsjAdImpl == null) {
-            callback.invoke(false)
-        } else {
-            mCsjAdImpl?.requestSplashAd(
-                activity,
-                slotId,
-                adViewWidthInPx,
-                adViewHeightInPx,
-                adViewWidthInDp,
-                adViewHeightInDp,
-                startAdContainer,
-                callback,
-            )
-        }
-    }
-
-    /**
-     * 获取 Beizi 的开屏广告
-     */
-    private fun requestBeiziSplashAd(
-        startAdContainer: View,
-        adsFl: FrameLayout,
-        adViewWidthInPx: Int,
-        adViewHeightInPx: Int,
-        callback: (isSuccess: Boolean) -> Unit,
-    ) {
-        if (mBeiziAdImpl == null) {
-            callback.invoke(false)
-        } else {
-            mBeiziAdImpl?.requestSplashAd(startAdContainer, adsFl, adViewWidthInPx, adViewHeightInPx, callback)
-        }
-    }
-
-    /**
-     * 显示自有的开屏广告
-     */
-    private fun requestStandardSplashAd(
-        splashAd: StartupAdEntity?,
-        startAdContainer: ViewGroup,
-        handler: BaseActivity.BaseHandler,
-        hideCallback: () -> Unit
-    ) {
-        if (splashAd == null) {
-            hideCallback.invoke()
-            return
-        }
-
-        if (!TextUtils.isEmpty(splashAd.img)) {
-            val showedTodayTimestamp = SPUtils.getString(Constants.SP_STARTUP_AD_TIMESTAMP, "") ?: ""
-            when (splashAd.rule) {
-                "each" -> showStandardSplashAd(splashAd, startAdContainer, handler, hideCallback)
-                "once" -> if (TextUtils.isEmpty(showedTodayTimestamp)
-                    || !showedTodayTimestamp.contains(splashAd.id)
-                ) {
-                    showStandardSplashAd(splashAd, startAdContainer, handler, hideCallback)
-                } else {
-                    hideCallback.invoke()
-                }
-
-                "everyday" -> {
-                    val today = getToday()
-                    if (TextUtils.isEmpty(showedTodayTimestamp)
-                        || !showedTodayTimestamp.contains(today)
-                        || !showedTodayTimestamp.contains(splashAd.id)
-                    ) {
-                        showStandardSplashAd(splashAd, startAdContainer, handler, hideCallback)
-                    } else {
-                        hideCallback.invoke()
-                    }
-                }
-
-                else -> hideCallback.invoke()
-            }
-            SPUtils.setString(Constants.SP_STARTUP_AD_TIMESTAMP, splashAd.id + getToday())
-        } else {
-            hideCallback.invoke()
-        }
-    }
-
-    private fun showStandardSplashAd(
-        ad: StartupAdEntity,
-        startAdContainer: ViewGroup,
-        handler: BaseActivity.BaseHandler,
-        hideCallback: () -> Unit
-    ) {
-        val jumpBtn: View = startAdContainer.findViewById(R.id.jumpBtn)
-        val jumpDetailBtn: TextView = startAdContainer.findViewById(R.id.jumpDetailBtn)
-        val adImage: SimpleDraweeView = startAdContainer.findViewById(R.id.adImage)
-        startAdContainer.visibility = View.VISIBLE
-        jumpDetailBtn.text = ad.desc
-        jumpDetailBtn.setDrawableEnd(
-            AppCompatResources.getDrawable(
-                startAdContainer.context,
-                R.drawable.ic_startup_ad_arrow
-            ), null, null
-        )
-        ImageUtils.display(adImage, ad.img)
-        startAdContainer.setOnClickListener {
-            // 拦截点击事件传递
-        }
-        jumpBtn.setOnClickListener {
-            handler.removeMessages(MainActivity.COUNTDOWN_AD)
-            hideCallback.invoke()
-            val linkEntity = ad.jump
-            logOpenScreenAdSkip(
-                ad.id,
-                (if (linkEntity.text != null) linkEntity.text else "")!!,
-                (if (linkEntity.type != null) linkEntity.type else "")!!,
-                (if (linkEntity.link != null) linkEntity.link else "")!!
-            )
-        }
-        val sources: MutableList<ExposureSource> = ArrayList()
-        sources.add(ExposureSource("开屏广告", ad.id))
-        val event = createEvent(null, sources, null, ExposureType.EXPOSURE)
-        ExposureManager.log(event)
-        if (ad.button) {
-            jumpDetailBtn.setOnClickListener { v: View ->
-                directToLinkPage(v.context, ad.jump, "(启动广告)", "", event)
-                v.postDelayed({
-                    handler.removeMessages(MainActivity.COUNTDOWN_AD)
-                    hideCallback.invoke()
-                }, 1000)
-            }
-            jumpDetailBtn.visibility = View.VISIBLE
-            LogUtils.logStartAd("watch_start_ads", ad)
-        } else {
-            LogUtils.logStartAd("start_ads", ad)
-        }
-        handler.sendEmptyMessageDelayed(MainActivity.COUNTDOWN_AD, 1000)
-    }
-
-    /**
-     * 获取信息流广告
-     */
-    fun requestFlowAd(
-        fragment: Fragment,
-        slotId: String,
-        adContainerView: ViewGroup,
-        expressViewWidth: Float,
-        callback: (isSuccess: Boolean) -> Unit,
-    ) {
-        mCsjAdImpl?.requestFlowAd(fragment, adContainerView, slotId, expressViewWidth, callback)
-    }
-
-    /**
-     * 获取 Banner 广告
-     */
-    fun requestBannerAd(
-        fragment: Fragment,
-        containerView: ViewGroup,
-        ad: AdConfig.ThirdPartyAd,
-        expressViewWidthInDp: Float,
-        callback: (isSuccess: Boolean) -> Unit
-    ) {
-
-        val slotId = ad.slotId
-        val displayRatio: Float = if (ad.displaySize.isEmpty()) {
-            2F
-        } else {
-            val array = ad.displaySize.split("*")
-            if (array.size == 2) {
-                array[0].toFloat() / array[1].toFloat()
-            } else {
-                2F
-            }
-        }
-        val expressViewHeightInDp = expressViewWidthInDp / displayRatio
-
-        mCsjAdImpl?.requestBannerAd(
-            fragment,
-            containerView,
-            slotId,
-            expressViewWidthInDp,
-            expressViewHeightInDp,
-            callback
-        )
-    }
-
-    /**
-     * 取消开屏广告
-     */
-    fun cancelSplashAd(context: Context) {
-        mBeiziAdImpl?.cancelSplashAd(context)
-        mCsjAdImpl?.cancelSplashAd(context)
-    }
-
-}

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

@@ -57,16 +57,11 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
     private lateinit var mEditorFontItalic: CheckableImageView
     private lateinit var mEditorFontStrikeThrough: CheckableImageView
     private lateinit var mEditorFontUnderline: CheckableImageView
-    private lateinit var mEditorParagraphDivider: CheckableImageView
     private lateinit var mEditorParagraphH1: CheckableImageView
     private lateinit var mEditorParagraphH2: CheckableImageView
     private lateinit var mEditorParagraphH3: CheckableImageView
     private lateinit var mEditorParagraphH4: CheckableImageView
     private lateinit var mEditorParagraphQuote: CheckableImageView
-    private lateinit var mEditorAlignLeft: CheckableImageView
-    private lateinit var mEditorAlignCenter: CheckableImageView
-    private lateinit var mEditorAlignRight: CheckableImageView
-    private lateinit var mEditorAlignContainer: View
     private lateinit var mEditorFontContainer: View
     private lateinit var mEditorParagraphContainer: View
     private lateinit var mEditorLinkContainer: View
@@ -102,7 +97,6 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
                     mRichEditor.insertCustomStyleLink(insertData)
                 }
             }
-
             INSERT_ARTICLE_CODE -> {
                 val article =
                     data?.getParcelableExtra<ArticleEntity>(ArticleEntity::class.java.simpleName)
@@ -112,7 +106,6 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
                     mRichEditor.insertCustomStyleLink(insertData)
                 }
             }
-
             INSERT_GAME_CODE -> {
                 val game = data?.getParcelableExtra<GameEntity>(GameEntity::class.java.simpleName)
                 if (game != null) {
@@ -121,7 +114,6 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
                     mRichEditor.insertCustomStyleLink(insertData)
                 }
             }
-
             INSERT_GAME_COLLECTION_CODE -> {
                 val gameCollectionEntity =
                     data?.getParcelableExtra<GamesCollectionEntity>(GamesCollectionEntity::class.java.simpleName)
@@ -131,11 +123,9 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
                     mRichEditor.insertCustomStyleLink(insertData)
                 }
             }
-
             REQUEST_CODE_IMAGE -> {
                 if (data != null) mViewModel.uploadPic(data)
             }
-
             INSERT_MEDIA_VIDEO_CODE -> {
                 val localVideoList =
                     data?.getParcelableArrayListExtra<LocalVideoEntity>(LocalVideoEntity::class.java.name)
@@ -145,14 +135,12 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
                     uploadVideo(localVideoList)
                 }
             }
-
             REQUEST_CODE_IMAGE_CROP -> {
                 val imagePath = data?.getStringExtra(CropImageActivity.RESULT_CLIP_PATH)
                 if (!imagePath.isNullOrEmpty()) {
                     mViewModel.uploadPoster(imagePath)
                 }
             }
-
             INSERT_VIDEO_CODE -> {
                 val videoEntity = data?.getParcelableExtra<MyVideoEntity>(MyVideoEntity::class.java.simpleName)
                 if (videoEntity != null) {
@@ -206,12 +194,7 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
         mEditorParagraphH2 = findViewById(R.id.editor_paragraph_h2)
         mEditorParagraphH3 = findViewById(R.id.editor_paragraph_h3)
         mEditorParagraphH4 = findViewById(R.id.editor_paragraph_h4)
-        mEditorParagraphDivider = findViewById(R.id.editor_paragraph_divider)
         mEditorParagraphQuote = findViewById(R.id.editor_paragraph_quote)
-        mEditorAlignLeft = findViewById(R.id.editor_align_left)
-        mEditorAlignCenter = findViewById(R.id.editor_align_center)
-        mEditorAlignRight = findViewById(R.id.editor_align_right)
-        mEditorAlignContainer = findViewById(R.id.editor_align_container)
         mEditorFontContainer = findViewById(R.id.editor_font_container)
         mEditorParagraphContainer = findViewById(R.id.editor_paragraph_container)
         mEditorLinkContainer = findViewById(R.id.editor_link_container)
@@ -258,13 +241,6 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
                 mRichEditor.hasFocus()
             } else false
         }
-
-        mRichEditor.setOnDecorationChangeListener { _, types ->
-            mEditorAlignLeft.isChecked = types.contains(RichEditor.Type.JUSTIFYLEFT)
-            mEditorAlignCenter.isChecked = types.contains(RichEditor.Type.JUSTIFYCENTER)
-            mEditorAlignRight.isChecked = types.contains(RichEditor.Type.JUSTIFYRIGHT)
-        }
-
         mOriginalCb.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 mOriginalTipsContainer.alpha = 0f
@@ -349,9 +325,6 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
                 MtaHelper.onEvent(mtaEventName(), "文字样式", "文字样式-下滑线")
             }
         }
-        mEditorParagraphDivider.setOnClickListener {
-            mRichEditor.insertDivider()
-        }
         mEditorParagraphH1.setOnClickListener {
             if (mEditorParagraphH1.isChecked) {
                 mRichEditor.formatBlock()
@@ -397,27 +370,6 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
             }
             mEditorParagraphQuote.isChecked = !mEditorParagraphQuote.isChecked
         }
-        mEditorAlignLeft.setOnClickListener {
-            if (!mEditorAlignLeft.isChecked) {
-                mRichEditor.setAlignLeft()
-                MtaHelper.onEvent(mtaEventName(), "文本对齐选项", "文本对齐选项-靠左")
-                mEditorAlignLeft.isChecked = !mEditorAlignLeft.isChecked
-            }
-        }
-        mEditorAlignCenter.setOnClickListener {
-            if (!mEditorAlignCenter.isChecked) {
-                mRichEditor.setAlignCenter()
-                MtaHelper.onEvent(mtaEventName(), "文本对齐选项", "文本对齐选项-靠中")
-                mEditorAlignCenter.isChecked = !mEditorAlignCenter.isChecked
-            }
-        }
-        mEditorAlignRight.setOnClickListener {
-            if (!mEditorAlignRight.isChecked) {
-                mRichEditor.setAlignRight()
-                MtaHelper.onEvent(mtaEventName(), "文本对齐选项", "文本对齐选项-靠右")
-                mEditorAlignRight.isChecked = !mEditorAlignRight.isChecked
-            }
-        }
         findViewById<View>(R.id.editor_link_answer).setOnClickListener {
             MtaHelper.onEvent(mtaEventName(), "插入链接", "插入链接-回答")
             startActivityForResult(
@@ -497,22 +449,25 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
             return
         }
         try {
-            PermissionHelper.checkStoragePermissionBeforeAction(this) {
-                val maxChooseCount = if (videoCount + 3 <= MAX_MEDIA_COUNT) 3 else MAX_MEDIA_COUNT - videoCount
-                startActivityForResult(
-                    LocalMediaActivity.getIntent(
-                        this@BaseRichEditorActivity,
-                        LocalMediaActivity.ChooseType.VIDEO,
-                        maxChooseCount,
-                        if (mtaEventName() == "提问帖") "发提问帖" else "发帖子"
-                    ), INSERT_MEDIA_VIDEO_CODE
-                )
-                NewLogUtils.logChooseMedia(
-                    "view_media",
-                    if (mtaEventName() == "提问帖") "提问帖" else "帖子",
-                    "视频"
-                )
-            }
+            PermissionHelper.checkStoragePermissionBeforeAction(this,
+                object : EmptyCallback {
+                    override fun onCallback() {
+                        val maxChooseCount = if (videoCount + 3 <= MAX_MEDIA_COUNT) 3 else MAX_MEDIA_COUNT - videoCount
+                        startActivityForResult(
+                            LocalMediaActivity.getIntent(
+                                this@BaseRichEditorActivity,
+                                LocalMediaActivity.ChooseType.VIDEO,
+                                maxChooseCount,
+                                if (mtaEventName() == "提问帖") "发提问帖" else "发帖子"
+                            ), INSERT_MEDIA_VIDEO_CODE
+                        )
+                        NewLogUtils.logChooseMedia(
+                            "view_media",
+                            if (mtaEventName() == "提问帖") "提问帖" else "帖子",
+                            "视频"
+                        )
+                    }
+                })
         } catch (e: Exception) {
             toast(R.string.media_image_hint)
             e.printStackTrace()
@@ -527,16 +482,18 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
             return
         }
         try {
-            PermissionHelper.checkStoragePermissionBeforeAction(this) {
-                val maxChooseCount = if (imageCount + 10 <= MAX_IMAGE_COUNT) 10 else MAX_IMAGE_COUNT - imageCount
-                val intent = LocalMediaActivity.getIntent(
-                    this@BaseRichEditorActivity,
-                    LocalMediaActivity.ChooseType.IMAGE,
-                    maxChooseCount,
-                    if (mtaEventName() == "提问帖") "发提问帖" else "发帖子"
-                )
-                startActivityForResult(intent, REQUEST_CODE_IMAGE)
-            }
+            PermissionHelper.checkStoragePermissionBeforeAction(this, object : EmptyCallback {
+                override fun onCallback() {
+                    val maxChooseCount = if (imageCount + 10 <= MAX_IMAGE_COUNT) 10 else MAX_IMAGE_COUNT - imageCount
+                    val intent = LocalMediaActivity.getIntent(
+                        this@BaseRichEditorActivity,
+                        LocalMediaActivity.ChooseType.IMAGE,
+                        maxChooseCount,
+                        if (mtaEventName() == "提问帖") "发提问帖" else "发帖子"
+                    )
+                    startActivityForResult(intent, REQUEST_CODE_IMAGE)
+                }
+            })
         } catch (e: Exception) {
             toast(R.string.media_image_hint)
             e.printStackTrace()
@@ -559,7 +516,6 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
             mEditorFontContainer.visibility = if (mEditorFont.isChecked) View.VISIBLE else View.GONE
             mEditorParagraphContainer.visibility =
                 if (mEditorFont.isChecked) View.VISIBLE else View.GONE
-            mEditorAlignContainer.visibility = if (mEditorFont.isChecked) View.VISIBLE else View.GONE
             mEditorLinkContainer.visibility = View.GONE
             mTagsContainer.visibility = View.GONE
             mIsExtendedKeyboardShow = mEditorFont.isChecked
@@ -581,7 +537,6 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
                 if (mEditorLink.isChecked) View.VISIBLE else View.GONE
             mEditorLinkContainer.visibility = if (mEditorLink.isChecked) View.VISIBLE else View.GONE
             mEditorFontContainer.visibility = View.GONE
-            mEditorAlignContainer.visibility = View.GONE
             mEditorParagraphContainer.visibility = View.GONE
             mTagsContainer.visibility = View.GONE
             mIsExtendedKeyboardShow = mEditorLink.isChecked
@@ -821,7 +776,7 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
         const val INSERT_VIDEO_CODE = 415
         const val MAX_INPUT_TEXT_NUM = 10000
         const val MAX_MEDIA_COUNT = 20
-        const val MAX_IMAGE_COUNT = 70
+        const val MAX_IMAGE_COUNT = 35
 
         const val REQUEST_CODE_IMAGE = 120
         const val INSERT_MEDIA_VIDEO_CODE = 121

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

@@ -1,23 +1,21 @@
 package com.gh.base
 
-import android.graphics.Typeface
 import android.os.Bundle
+import android.text.TextUtils
 import android.view.MenuItem
 import android.view.View
-import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
-import androidx.constraintlayout.widget.ConstraintLayout
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.DownloadManagerActivity
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.base.activity.ToolBarActivity
 import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.utils.dip2px
 import com.gh.gamecenter.common.utils.viewModelProvider
+import com.gh.gamecenter.core.utils.DisplayUtils
 import com.gh.gamecenter.core.utils.SPUtils.getBoolean
 import com.gh.gamecenter.entity.GameUpdateEntity
-import com.gh.gamecenter.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
 import com.gh.gamecenter.packagehelper.PackageViewModel
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
@@ -60,7 +58,6 @@ 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")
     }
 
     override fun onMenuItemClick(item: MenuItem?): Boolean {
@@ -77,27 +74,19 @@ abstract class DownloadToolbarActivity : ToolBarActivity() {
         if (mDownloadCountHint == null) return
         val count = DownloadManager.getInstance().getDownloadOrUpdateCount(updateList)
         if (count != null) {
-            mDownloadCountHint?.visibility = View.VISIBLE
-            mDownloadCountHint?.text = count
-            val params = mDownloadCountHint?.layoutParams
-            params?.width = if (count.isEmpty()) 6F.dip2px() else ConstraintLayout.LayoutParams.WRAP_CONTENT
-            params?.height = if (count.isEmpty()) 6F.dip2px() else 14F.dip2px()
-            (params as? ViewGroup.MarginLayoutParams)?.setMargins(
-                0,
-                if (count.isEmpty()) 0 else (-4F).dip2px(),
-                if (count.isEmpty()) (-4F).dip2px() else (-8F).dip2px(),
-                0
-            )
-            mDownloadCountHint?.setPadding(
-                if (count.isEmpty()) 0 else 4F.dip2px(),
-                0,
-                if (count.isEmpty()) 0 else 4F.dip2px(),
-                0
-            )
-            mDownloadCountHint?.minWidth = if (count.isEmpty()) 0 else 14F.dip2px()
-            mDownloadCountHint?.layoutParams = params
+            mDownloadCountHint!!.visibility = View.VISIBLE
+            mDownloadCountHint!!.text = count
+            val params = mDownloadCountHint!!.layoutParams
+            if (TextUtils.isEmpty(count)) {
+                params.width = DisplayUtils.dip2px(6f)
+                params.height = DisplayUtils.dip2px(6f)
+            } else {
+                params.width = DisplayUtils.dip2px(12f)
+                params.height = DisplayUtils.dip2px(12f)
+            }
+            mDownloadCountHint!!.layoutParams = params
         } else {
-            mDownloadCountHint?.visibility = View.GONE
+            mDownloadCountHint!!.visibility = View.GONE
         }
     }
 

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

@@ -24,23 +24,22 @@ import com.gh.gamecenter.common.callback.BiCallback
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.entity.NotificationUgc
-import com.gh.gamecenter.common.exposure.ExposureSource
 import com.gh.gamecenter.common.loghub.LoghubUtils
 import com.gh.gamecenter.common.provider.IHelpAndFeedbackProvider
 import com.gh.gamecenter.common.tracker.Tracker
 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.runOnIoThread
 import com.gh.gamecenter.core.runOnUiThread
 import com.gh.gamecenter.core.utils.*
 import com.gh.gamecenter.entity.SensorsEvent
-import com.gh.gamecenter.eventbus.EBDownloadStatus
-import com.gh.gamecenter.eventbus.EBPackage
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBPackage
 import com.gh.gamecenter.feature.entity.Badge
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.exposure.ExposureEvent
+import com.gh.gamecenter.feature.exposure.ExposureSource
 import com.gh.gamecenter.login.user.LoginTag
 import com.gh.gamecenter.login.user.UserManager
 import com.gh.gamecenter.login.user.UserRepository
@@ -69,7 +68,6 @@ class DefaultJsApi(
     val entrance: String = "",
     private var mFragment: Fragment? = null,
     private var mBbsId: String? = "",
-    private var mOriginUrl: String?= "",
 ) {
 
     private var mLoginHandler: CompletionHandler<Any>? = null
@@ -536,18 +534,6 @@ class DefaultJsApi(
         val downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(url, null, false)
             ?: DownloadManager.getInstance().getDownloadEntitySnapshot(vUrl, null, false)
 
-        NewFlatLogUtils.logGameInstall(
-            gameId = downloadEntity?.gameId ?: "",
-            gameName = downloadEntity?.name ?: "",
-            trigger = "主动安装"
-        )
-
-        SensorsBridge.trackInstallGameClick(
-            gameId = downloadEntity?.gameId ?: "",
-            gameName = downloadEntity?.name ?: "",
-            action = "主动安装"
-        )
-
         downloadEntity?.let {
             PackageInstaller.install(context, it, showUnzipToast = false)
         }
@@ -646,19 +632,12 @@ class DefaultJsApi(
     fun logExposure(event: Any) {
         val simpleExposureEvent = event.toString().toObject() ?: SimpleExposureEvent()
         if (simpleExposureEvent.id.isNotEmpty()) {
-            val sourceKey = if (mOriginUrl?.contains(Constants.URL_QUERY_FROM_FLOATING_WINDOW) == true) {
-                "落地页"
-            } else {
-                "游戏活动"
-            }
-
-            val exposureSource = ExposureSource(sourceKey, "${simpleExposureEvent.title}+${simpleExposureEvent.id}")
+            val exposureSource = ExposureSource("游戏活动", "${simpleExposureEvent.title}+${simpleExposureEvent.id}")
             mExposureEvent = ExposureEvent.createEvent(
                 gameEntity = null,
                 source = arrayListOf(exposureSource),
             )
             ExposureManager.log(mExposureEvent!!)
-            ExposureManager.commitSavedExposureEvents(true)
         }
     }
 

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

@@ -15,7 +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
@@ -103,7 +102,7 @@ object DefaultUrlHandler {
                     entrance
                 )
 
-                "libao" -> context.startActivity(LibaoDetailActivity.getIntentById(context, id, entrance))
+                "libao" -> DirectUtils.directToGiftDetail(context, id, entrance)
 
                 "qq" -> try {
                     DirectUtils.directToQqConversation(context, id)
@@ -350,8 +349,7 @@ object DefaultUrlHandler {
                 }
 
                 EntranceConsts.HOST_FORUM_DETAIL -> {
-                    val sectionId = uri.getQueryParameter("section_id") ?: ""
-                    DirectUtils.directForumDetailSection(context, id, sectionId, entrance)
+                    DirectUtils.directForumDetail(context, id, entrance)
                 }
 
                 EntranceConsts.HOST_GAME_RATING_DETAIL -> {
@@ -439,17 +437,17 @@ object DefaultUrlHandler {
                         directToFeedback(
                             context,
                             content,
+                            null,
                             isQaFeedback,
                             qaContentId,
-                            isPlugin = false,
-                            isSmoothGame = false,
                             EntranceConsts.ENTRANCE_BROWSER
                         )
                     }
                 }
 
                 EntranceConsts.HOST_HELP_AND_FEEDBACK -> {
-                    DirectUtils.directToHelpAndFeedback(context)
+                    val position = uri.getQueryParameter("position") ?: ""
+                    DirectUtils.directToHelpAndFeedback(context, position.toInt())
                 }
 
                 EntranceConsts.HOST_HELP_DETAIL -> {
@@ -490,13 +488,12 @@ object DefaultUrlHandler {
                     val activityName = uri.getQueryParameter("activity_name") ?: ""
                     val gameId = uri.getQueryParameter("game_id") ?: ""
                     context.startActivity(
-                        GameCollectionEditActivity.getCreateIntent(
+                        GameCollectionEditActivity.getIntent(
                             context,
                             activityId,
                             activityName,
                             gameId,
-                            entrance,
-                            "其他"
+                            entrance
                         )
                     )
                 }

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

@@ -84,6 +84,11 @@ object FixedRateJobHelper {
                     VideoRecordUtils.commitVideoRecord()
                 }
 
+                // 获取启动广告 (第一次不需要获取)
+                if (elapsedTime % STARTUP_AD == 0L && mExecuteCount != 0) {
+                    AdHelper.getSettingAdCache()
+                }
+
                 mExecuteCount++
             }
         }

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

@@ -0,0 +1,23 @@
+package com.gh.common.chain
+
+import android.content.Context
+import com.gh.download.server.BrowserInstallHelper
+import com.gh.gamecenter.R
+import com.gh.gamecenter.core.utils.ToastUtils
+import com.gh.gamecenter.feature.entity.GameEntity
+
+class AutoSwitchAssistantInstallHandler : ChainHandler() {
+
+    override fun handleRequest(context: Context, gameEntity: GameEntity) {
+        if (BrowserInstallHelper.isUseBrowserToInstallEnabled()
+            && BrowserInstallHelper.shouldUseBrowserToInstall()
+            && gameEntity.isSplitXApk()) {
+            ToastUtils.toast(context.getString(R.string.unsupported_browser_install_hint))
+        }
+        if (hasNext()) {
+            getNext()?.handleRequest(context, gameEntity)
+        } else {
+            processEndCallback?.invoke(null)
+        }
+    }
+}

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

@@ -11,7 +11,6 @@ class BrowserInstallHandler : ChainHandler() {
     override fun handleRequest(context: Context, gameEntity: GameEntity) {
         BrowserInstallHelper.showBrowserInstallHintDialog(
             context,
-            gameEntity,
             gameEntity.isVGame() || gameEntity.isSplitXApk()
         ) {
             if (hasNext()) {

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

@@ -9,7 +9,7 @@ class CheckDownloadHandler : ChainHandler() {
 
     override fun handleRequest(context: Context, gameEntity: GameEntity) {
         val apk = gameEntity.getApk().safelyGetInRelease(0) ?: return
-        DialogUtils.checkDownload(context, apk.size, gameEntity.id, gameEntity.name, gameEntity.categoryChinese) { isSubscribe: Boolean ->
+        DialogUtils.checkDownload(context, apk.size, gameEntity.id, gameEntity.name) { isSubscribe: Boolean ->
             if (hasNext()) {
                 getNext()?.handleRequest(context, gameEntity)
             } else {

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

@@ -2,22 +2,20 @@ package com.gh.common.chain
 
 import android.content.Context
 import com.gh.gamecenter.common.utils.PermissionHelper
+import com.gh.gamecenter.core.utils.EmptyCallback
 import com.gh.gamecenter.feature.entity.GameEntity
 
 class CheckStoragePermissionHandler : ChainHandler() {
 
     override fun handleRequest(context: Context, gameEntity: GameEntity) {
-        PermissionHelper.checkStoragePermissionBeforeAction(
-            context,
-            gameEntity.id,
-            gameEntity.name ?: "",
-            gameEntity.categoryChinese
-        ) {
-            if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity)
-            } else {
-                processEndCallback?.invoke(null)
+        PermissionHelper.checkStoragePermissionBeforeAction(context, object : EmptyCallback {
+            override fun onCallback() {
+                if (hasNext()) {
+                    getNext()?.handleRequest(context, gameEntity)
+                } else {
+                    processEndCallback?.invoke(null)
+                }
             }
-        }
+        })
     }
 }

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

@@ -1,23 +0,0 @@
-package com.gh.common.chain
-
-import android.content.Context
-import com.gh.common.util.DialogUtils
-import com.gh.common.util.DirectUtils
-import com.gh.gamecenter.feature.entity.GameEntity
-
-class LandPageAddressHandler : ChainHandler() {
-
-    override fun handleRequest(context: Context, gameEntity: GameEntity) {
-        if (gameEntity.isLandPageAddressDialog()) {
-            DialogUtils.showLandPageAddressDialog(context, gameEntity) {// 跳转第三方落地页
-                DirectUtils.directToExternalBrowser(context, gameEntity.landPageAddressDialog!!.link!!)
-            }
-        } else {
-            if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity)
-            } else {
-                processEndCallback?.invoke(null)
-            }
-        }
-    }
-}

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

@@ -7,15 +7,7 @@ import com.gh.gamecenter.feature.entity.GameEntity
 class OverseaDownloadHandler : ChainHandler() {
 
     override fun handleRequest(context: Context, gameEntity: GameEntity) {
-        if (gameEntity.isOverseaAddressDialog()) {
-            DialogUtils.showOverseaDownloadDialog(context, gameEntity) {// 跳转海外下载地址弹窗
-                if (hasNext()) {
-                    getNext()?.handleRequest(context, gameEntity)
-                } else {
-                    processEndCallback?.invoke(null)
-                }
-            }
-        } else {
+        DialogUtils.showOverseaDownloadDialog(context, gameEntity) {
             if (hasNext()) {
                 getNext()?.handleRequest(context, gameEntity)
             } else {

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

@@ -10,7 +10,7 @@ class UpdateNewSimulatorHandler: ChainHandler() {
     override fun handleRequest(context: Context, gameEntity: GameEntity) {
         if (SimulatorGameManager.isSimulatorGame(gameEntity)) {
             if (NewSimulatorGameManager.shouldShowUpdateNewSimulatorAlert(context)) {
-                NewSimulatorGameManager.showUpdateNewsSimulator(context, gameEntity) {
+                NewSimulatorGameManager.showUpdateNewsSimulator(context) {
                     if (hasNext()) {
                         getNext()?.handleRequest(context, gameEntity)
                     } else {

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

@@ -3,7 +3,6 @@ package com.gh.common.chain
 import android.content.Context
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.utils.DialogHelper
-import com.gh.gamecenter.common.utils.SensorsBridge
 import com.gh.gamecenter.common.utils.toResString
 import com.gh.gamecenter.feature.entity.GameEntity
 
@@ -20,42 +19,13 @@ class VersionNumberHandler : ChainHandler() {
         if (!gameEntity.isShowVersionNumber()) {
             confirmCallback.invoke()
         } else {
-            SensorsBridge.trackGameDemoDialogShow(
-                gameId = gameEntity.id,
-                gameName = gameEntity.name ?: "",
-                gameType = gameEntity.categoryChinese
-            )
             DialogHelper.showGuideDialog(
                 context,
                 "温馨提示",
                 gameEntity.getVersionNumberString(),
                 "继续下载",
                 R.string.cancel.toResString(),
-                {
-                    confirmCallback.invoke()
-                    SensorsBridge.trackGameDemoDialogClick(
-                        buttonName = "继续下载",
-                        gameId = gameEntity.id,
-                        gameName = gameEntity.name ?: "",
-                        gameType = gameEntity.categoryChinese
-                    )
-                },
-                cancelClickCallback = {
-                    SensorsBridge.trackGameDemoDialogClick(
-                        buttonName = R.string.cancel.toResString(),
-                        gameId = gameEntity.id,
-                        gameName = gameEntity.name ?: "",
-                        gameType = gameEntity.categoryChinese
-                    )
-                },
-                touchOutsideCallback = {
-                    SensorsBridge.trackGameDemoDialogClick(
-                        buttonName = "关闭弹窗",
-                        gameId = gameEntity.id,
-                        gameName = gameEntity.name ?: "",
-                        gameType = gameEntity.categoryChinese
-                    )
-                },
+                { confirmCallback.invoke() },
                 extraConfig = DialogHelper.Config(titleIcon = R.drawable.ic_dialog_tips)
             )
         }

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

@@ -459,6 +459,7 @@ public class Config {
                                 DarkModeUtils.INSTANCE.updateFollowSystemDarkModeToSp(true);
                                 DarkModeUtils.INSTANCE.initDarkMode();
                             }
+                            AdHelper.prefetchStartUpAd(mNewApiSettingsEntity);
                             SPUtils.setString(Constants.SP_NEW_API_SETTINGS, GsonUtils.toJson(data));
                         }
                     });

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

@@ -13,12 +13,12 @@ import android.widget.PopupWindow
 import androidx.core.content.ContextCompat
 import androidx.databinding.BindingAdapter
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.gh.gamecenter.R
 import com.gh.gamecenter.common.callback.OnViewClickListener
-import com.gh.gamecenter.common.databinding.LayoutPopupContainerBinding
 import com.gh.gamecenter.common.utils.dip2px
 import com.gh.gamecenter.common.utils.toDrawable
 import com.gh.gamecenter.common.view.BugFixedPopupWindow
+import com.gh.gamecenter.R
+import com.gh.gamecenter.common.databinding.LayoutPopupContainerBinding
 import com.gh.gamecenter.databinding.KaifuAddItemBinding
 import com.gh.gamecenter.databinding.LayoutAddKaifuPopupBinding
 import com.gh.gamecenter.feature.entity.ServerCalendarEntity

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

@@ -1,6 +1,5 @@
 package com.gh.common.databind;
 
-import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.Typeface;
@@ -20,6 +19,7 @@ import androidx.core.content.ContextCompat;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import com.facebook.drawee.view.SimpleDraweeView;
+import com.gh.common.chain.AutoSwitchAssistantInstallHandler;
 import com.gh.common.chain.BrowserInstallHandler;
 import com.gh.common.chain.CertificationHandler;
 import com.gh.common.chain.ChainBuilder;
@@ -28,7 +28,6 @@ import com.gh.common.chain.CheckDownloadHandler;
 import com.gh.common.chain.CheckStoragePermissionHandler;
 import com.gh.common.chain.DownloadDialogHelperHandler;
 import com.gh.common.chain.GamePermissionHandler;
-import com.gh.common.chain.LandPageAddressHandler;
 import com.gh.common.chain.OverseaDownloadHandler;
 import com.gh.common.chain.PackageCheckHandler;
 import com.gh.common.chain.UnsupportedFeatureHandler;
@@ -53,7 +52,6 @@ import com.gh.common.util.PackageUtils;
 import com.gh.common.util.ReservationHelper;
 import com.gh.download.DownloadManager;
 import com.gh.download.dialog.DownloadDialog;
-import com.gh.download.server.BrowserInstallHelper;
 import com.gh.gamecenter.DownloadManagerActivity;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.WebActivity;
@@ -64,13 +62,10 @@ import com.gh.gamecenter.common.eventbus.EBReuse;
 import com.gh.gamecenter.common.utils.DarkModeUtils;
 import com.gh.gamecenter.common.utils.ExtensionsKt;
 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.common.view.DrawableView;
 import com.gh.gamecenter.core.utils.DisplayUtils;
 import com.gh.gamecenter.core.utils.MtaHelper;
 import com.gh.gamecenter.core.utils.NumberUtils;
-import com.gh.gamecenter.core.utils.ToastUtils;
 import com.gh.gamecenter.databinding.KaifuDetailItemRowBinding;
 import com.gh.gamecenter.feature.entity.ApkEntity;
 import com.gh.gamecenter.feature.entity.CommunityVideoEntity;
@@ -286,68 +281,68 @@ public class BindingAdapters {
         }
     }
 
-    public static void setLiBaoBtn(TextView view, String status) {
-        if (TextUtils.isEmpty(status)) return;
-        switch (status) {
-            case "coming":
-                view.setText(R.string.libao_coming);
-                view.setBackgroundResource(R.drawable.textview_blue_style);
-                break;
-            case "ling":
-                view.setText(R.string.libao_ling);
-                view.setBackgroundResource(R.drawable.textview_green_style);
-                break;
-            case "tao":
-                view.setText(R.string.libao_tao);
-                view.setBackgroundResource(R.drawable.textview_orange_style);
-                break;
-            case "used_up":
-                view.setText(R.string.libao_used_up);
-                view.setBackgroundResource(R.drawable.textview_cancel_up);
-                break;
-            case "finish":
-                view.setText(R.string.libao_finish);
-                view.setBackgroundResource(R.drawable.textview_cancel_up);
-                break;
-            case "linged":
-                view.setText(R.string.libao_linged);
-                view.setBackgroundResource(R.drawable.libao_linged_style);
-                view.setTextColor(ContextCompat.getColorStateList(view.getContext(), R.color.libao_linged_selector));
-                break;
-            case "taoed":
-                view.setText(R.string.libao_taoed);
-                view.setBackgroundResource(R.drawable.libao_taoed_style);
-                view.setTextColor(ContextCompat.getColorStateList(view.getContext(), R.color.libao_taoed_selector));
-                break;
-            case "copy":
-                view.setText(R.string.libao_copy);
-                view.setBackgroundResource(R.drawable.textview_blue_style);
-                break;
-            case "repeatLing":
-                view.setText(R.string.libao_repeat_ling);
-                view.setBackgroundResource(R.drawable.textview_cancel_up);
-                break;
-            case "repeatLinged":
-                view.setText(R.string.libao_repeat_ling);
-                view.setBackgroundResource(R.drawable.textview_green_style);
-                break;
-            case "repeatTao":
-                view.setText(R.string.libao_repeat_tao);
-                view.setBackgroundResource(R.drawable.textview_cancel_up);
-                break;
-            case "repeatTaoed":
-                view.setText(R.string.libao_repeat_tao);
-                view.setBackgroundResource(R.drawable.textview_orange_style);
-                break;
-            case "unshelve":
-                view.setBackgroundResource(R.drawable.textview_cancel_style);
-                view.setText(R.string.libao_unshelve);
-                break;
-            default:
-                view.setBackgroundResource(R.drawable.textview_cancel_style);
-                view.setText("异常");
-        }
-    }
+//    public static void setLiBaoBtn(TextView view, String status) {
+//        if (TextUtils.isEmpty(status)) return;
+//        switch (status) {
+//            case "coming":
+//                view.setText(R.string.libao_coming);
+//                view.setBackgroundResource(R.drawable.textview_blue_style);
+//                break;
+//            case "ling":
+//                view.setText(R.string.libao_ling);
+//                view.setBackgroundResource(R.drawable.textview_green_style);
+//                break;
+//            case "tao":
+//                view.setText(R.string.libao_tao);
+//                view.setBackgroundResource(R.drawable.textview_orange_style);
+//                break;
+//            case "used_up":
+//                view.setText(R.string.libao_used_up);
+//                view.setBackgroundResource(R.drawable.textview_cancel_up);
+//                break;
+//            case "finish":
+//                view.setText(R.string.libao_finish);
+//                view.setBackgroundResource(R.drawable.textview_cancel_up);
+//                break;
+//            case "linged":
+//                view.setText(R.string.libao_linged);
+//                view.setBackgroundResource(R.drawable.libao_linged_style);
+//                view.setTextColor(ContextCompat.getColorStateList(view.getContext(), R.color.libao_linged_selector));
+//                break;
+//            case "taoed":
+//                view.setText(R.string.libao_taoed);
+//                view.setBackgroundResource(R.drawable.libao_taoed_style);
+//                view.setTextColor(ContextCompat.getColorStateList(view.getContext(), R.color.libao_taoed_selector));
+//                break;
+//            case "copy":
+//                view.setText(R.string.libao_copy);
+//                view.setBackgroundResource(R.drawable.textview_blue_style);
+//                break;
+//            case "repeatLing":
+//                view.setText(R.string.libao_repeat_ling);
+//                view.setBackgroundResource(R.drawable.textview_cancel_up);
+//                break;
+//            case "repeatLinged":
+//                view.setText(R.string.libao_repeat_ling);
+//                view.setBackgroundResource(R.drawable.textview_green_style);
+//                break;
+//            case "repeatTao":
+//                view.setText(R.string.libao_repeat_tao);
+//                view.setBackgroundResource(R.drawable.textview_cancel_up);
+//                break;
+//            case "repeatTaoed":
+//                view.setText(R.string.libao_repeat_tao);
+//                view.setBackgroundResource(R.drawable.textview_orange_style);
+//                break;
+//            case "unshelve":
+//                view.setBackgroundResource(R.drawable.textview_cancel_style);
+//                view.setText(R.string.libao_unshelve);
+//                break;
+//            default:
+//                view.setBackgroundResource(R.drawable.textview_cancel_style);
+//                view.setText("异常");
+//        }
+//    }
 
     // 大图下的进度条
     public static void setDownloadButton(DownloadButton progressBar,
@@ -400,7 +395,7 @@ public class BindingAdapters {
                                 boolean isInstalled = PackageUtils.isInstalledFromAllPackage(v.getContext(), gameEntity.getSimulator().getApk().getPackageName());
                                 if (downloadEntity != null && SimulatorGameManager.isSimulatorGame(gameEntity) && !isInstalled) {
                                     SimulatorDownloadManager.getInstance().showDownloadDialog(v.getContext(), gameEntity.getSimulator(),
-                                            SimulatorDownloadManager.SimulatorLocation.LAUNCH, gameEntity.getId(), gameEntity.getName(), gameEntity.getCategoryChinese(), null);
+                                            SimulatorDownloadManager.SimulatorLocation.LAUNCH, gameEntity.getId(), gameEntity.getName(), null);
                                     return;
                                 }
                             }
@@ -415,12 +410,11 @@ public class BindingAdapters {
                             builder.addHandler(new DownloadDialogHelperHandler());
                             builder.addHandler(new CertificationHandler());
                             builder.addHandler(new VersionNumberHandler());
-                            builder.addHandler(new LandPageAddressHandler());
                             builder.addHandler(new OverseaDownloadHandler());
                             builder.addHandler(new CheckDownloadHandler());
 
                             builder.setProcessEndCallback(o -> {
-                                download(v.getContext(), progressBar, gameEntity, traceEvent, (boolean) o, entrance, location);
+                                download(progressBar, gameEntity, traceEvent, (boolean) o, entrance, location);
                                 return null;
                             });
                             final ChainHandler chainHandler = builder.buildHandlerChain();
@@ -458,7 +452,7 @@ public class BindingAdapters {
                             if (downloadEntity != null) {
                                 File file = new File(downloadEntity.getPath());
                                 if (!file.exists()) {
-                                    download(v.getContext(), progressBar, gameEntity, traceEvent, false, entrance, location);
+                                    download(progressBar, gameEntity, traceEvent, false, entrance, location);
                                     return;
                                 }
 
@@ -485,19 +479,6 @@ public class BindingAdapters {
                 case INSTALL_PLUGIN:
                 case INSTALL_NORMAL:
                     if (gameEntity.getApk().size() == 1) {
-
-                        NewFlatLogUtils.INSTANCE.logGameInstall(
-                                gameEntity.getId(),
-                                gameEntity.getName() != null ? gameEntity.getName() : "",
-                                "主动安装"
-                        );
-
-                        SensorsBridge.trackInstallGameClick(
-                                gameEntity.getId(),
-                                gameEntity.getName() != null ? gameEntity.getName() : "",
-                                "主动安装"
-                        );
-
                         DownloadEntity downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity);
 
                         if (gameEntity.isVGame()) {
@@ -697,16 +678,12 @@ public class BindingAdapters {
 
 
     // 开始下载
-    private static void download(Context context,
-                                 DownloadButton progressBar,
+    private static void download(DownloadButton progressBar,
                                  GameEntity gameEntity,
                                  ExposureEvent traceEvent,
                                  boolean isSubscribe,
                                  String entrance,
                                  String location) {
-        if (BrowserInstallHelper.shouldAutoSwitchAssistantInstall(gameEntity)) {
-            ToastUtils.toast(context.getString(R.string.unsupported_browser_install_hint));
-        }
         String str = progressBar.getText().toString();
         String method;
         if (str.contains("更新")) {

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

@@ -1,7 +1,6 @@
 package com.gh.common.dialog
 
 import android.app.Activity.RESULT_OK
-import android.content.DialogInterface
 import android.content.Intent
 import android.os.Build
 import android.os.Bundle
@@ -19,10 +18,13 @@ import com.gh.common.xapk.XapkInstaller
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
 import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.utils.*
+import com.gh.gamecenter.common.utils.PermissionHelper
 import com.gh.gamecenter.common.utils.PermissionHelper.INSTALL_PERMISSION_CODE
+import com.gh.gamecenter.common.utils.getExtension
+import com.gh.gamecenter.common.utils.goneIf
 import com.gh.gamecenter.core.utils.SPUtils
 import com.lightgame.download.DownloadEntity
+import com.lightgame.utils.Utils
 import kotlin.random.Random
 
 class InstallPermissionDialogFragment : BaseDialogFragment() {
@@ -32,11 +34,8 @@ class InstallPermissionDialogFragment : BaseDialogFragment() {
     var url: String = ""
     var gameId: String = ""
     var gameName: String = ""
-    var gameType: String = ""
     var mCallBack: ((isFromPermissionGrantedCallback: Boolean) -> Unit)? = null
 
-    private var dismissByTouchInside = false
-
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         mView = inflater.inflate(R.layout.dialog_install_permission, null, false)
         return mView
@@ -56,12 +55,6 @@ class InstallPermissionDialogFragment : BaseDialogFragment() {
 
         if (isXapk) NewFlatLogUtils.logXApkInstallPermissionDialogShowed(gameId, gameName)
 
-        SensorsBridge.trackInstallPermissionDialogShow(
-            gameId = gameId,
-            gameName = gameName,
-            gameType = gameType
-        )
-
         val randomNumber = if (isXapk) 1 else Random.nextInt(2)
         closeTv.goneIf(randomNumber == 0)
         closeIv.goneIf(randomNumber != 0)
@@ -71,38 +64,18 @@ class InstallPermissionDialogFragment : BaseDialogFragment() {
         }
 
         closeTv.setOnClickListener {
-            dismissByTouchInside = true
             if (isXapk) {
                 NewFlatLogUtils.logXApkInstallPermissionDialogClick("尝试解压", false, gameId, gameName)
                 mCallBack?.invoke(false)
             }
-            SensorsBridge.trackInstallPermissionDialogClick(
-                buttonName = "尝试解压",
-                gameId = gameId,
-                gameName = gameName,
-                gameType = gameType
-            )
             dismiss()
         }
         closeIv.setOnClickListener {
-            dismissByTouchInside = true
             if (isXapk) NewFlatLogUtils.logXApkInstallPermissionDialogClick("关闭", false, gameId, gameName)
-            SensorsBridge.trackInstallPermissionDialogClick(
-                buttonName = "关闭",
-                gameId = gameId,
-                gameName = gameName,
-                gameType = gameType
-            )
             dismiss()
         }
         activateTv.setOnClickListener {
             NewFlatLogUtils.logXApkInstallPermissionDialogClick("立即开启", false, gameId, gameName)
-            SensorsBridge.trackInstallPermissionDialogClick(
-                buttonName = "立即开启",
-                gameId = gameId,
-                gameName = gameName,
-                gameType = gameType
-            )
             PermissionHelper.toInstallPermissionSetting(requireActivity())
             if (isXapk) {
                 SPUtils.setString(Constants.SP_XAPK_UNZIP_ACTIVITY, requireActivity().javaClass.name)
@@ -111,23 +84,9 @@ class InstallPermissionDialogFragment : BaseDialogFragment() {
         }
     }
 
-    override fun onDismiss(dialog: DialogInterface) {
-        if (!dismissByTouchInside) {
-            SensorsBridge.trackInstallPermissionDialogClick(
-                buttonName = "关闭弹窗",
-                gameId = gameId,
-                gameName = gameName,
-                gameType = gameType
-            )
-        }
-        super.onDismiss(dialog)
-    }
-
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         if (resultCode == RESULT_OK && requestCode == INSTALL_PERMISSION_CODE) {
-            dismissByTouchInside = true
-
             NewFlatLogUtils.logXApkInstallPermissionDialogClick("立即开启", true, gameId, gameName)
 
             if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.R) {
@@ -177,7 +136,6 @@ class InstallPermissionDialogFragment : BaseDialogFragment() {
                 installPermissionDialogFragment.url = downloadEntity.url
                 installPermissionDialogFragment.gameId = downloadEntity.gameId
                 installPermissionDialogFragment.gameName = downloadEntity.name
-                installPermissionDialogFragment.gameType = downloadEntity.categoryChinese
                 val transaction: FragmentTransaction = activity.supportFragmentManager.beginTransaction()
                 transaction.show(installPermissionDialogFragment)
                 transaction.commit()
@@ -188,7 +146,6 @@ class InstallPermissionDialogFragment : BaseDialogFragment() {
                     this.url = downloadEntity.url
                     this.gameId = downloadEntity.gameId
                     this.gameName = downloadEntity.name
-                    this.gameType = downloadEntity.categoryChinese
                 }
                 installPermissionDialogFragment.show(
                     activity.supportFragmentManager,

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

@@ -2,7 +2,6 @@ package com.gh.common.dialog
 
 import android.animation.ValueAnimator
 import android.content.Context
-import android.content.DialogInterface
 import android.content.pm.PackageInfo
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -12,7 +11,6 @@ import android.view.animation.LinearInterpolator
 import android.widget.LinearLayout
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
-import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentTransaction
 import androidx.lifecycle.Lifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -26,6 +24,7 @@ import com.gh.gamecenter.common.base.BaseRecyclerViewHolder
 import com.gh.gamecenter.common.callback.ConfirmListener
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.entity.LinkEntity
+import com.gh.gamecenter.common.eventbus.EBPackage
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.common.view.CustomLinkMovementMethod
 import com.gh.gamecenter.core.utils.DisplayUtils
@@ -36,7 +35,6 @@ import com.gh.gamecenter.databinding.PackageCheckItemBinding
 import com.gh.gamecenter.feature.entity.DetectionObjectEntity
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.entity.PackageDialogEntity
-import com.gh.gamecenter.eventbus.EBPackage
 import com.halo.assistant.HaloApp
 import com.lightgame.adapter.BaseRecyclerAdapter
 import com.lightgame.dialog.BaseDialogFragment
@@ -63,8 +61,6 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
     var gameEntity: GameEntity? = null
     var callBack: ConfirmListener? = null
 
-    private var mDismissByTouchInside = false
-
     private val dataWatcher = object : DataWatcher() {
         override fun onDataChanged(downloadEntity: DownloadEntity) {
             val packageName = downloadEntity.packageName
@@ -94,11 +90,6 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
         EventBus.getDefault().register(this)
         gameEntity?.let {
             LogUtils.uploadPackageCheck("pkg_check_pop_click", "出现弹窗", it, "", "", "", "")
-            SensorsBridge.trackPkgCheckDialogShow(
-                gameId = it.id,
-                gameName = it.name ?: "",
-                gameType = it.categoryChinese
-            )
         }
     }
 
@@ -137,18 +128,6 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
                         "",
                         ""
                     )
-                    SensorsBridge.trackPkgCheckDialogClick(
-                        buttonName = "点击链接",
-                        gameId = gameEntity?.id ?: "",
-                        gameName = gameEntity?.name ?: "",
-                        gameType = gameEntity?.categoryChinese ?: "",
-                        isNotPrompt = if (binding.noRemindAgainCb.isVisible) {
-                            binding.noRemindAgainCb.isChecked
-                        } else null,
-                        linkId = link.link ?: "",
-                        linkType = link.type ?: "",
-                        linkText = link.linkText ?: ""
-                    )
                     DirectUtils.directToLinkPage(requireContext(), link, "包名检测弹窗", "")
                 }.build()
                 spanBuilder.append(linkSpan)
@@ -197,7 +176,6 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
             }
             val isAllPackageInstalled = isAllPackageInstalled(mAllInstalledPackages, entity)
             if (isAllPackageInstalled) {
-                mDismissByTouchInside = true
                 callBack?.onConfirm()
                 dismissAllowingStateLoss()
             } else {
@@ -215,15 +193,6 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
                         "",
                         ""
                     )
-                    SensorsBridge.trackPkgCheckDialogClick(
-                        buttonName = "点击前往下载",
-                        gameId = gameEntity?.id ?: "",
-                        gameName = gameEntity?.name ?: "",
-                        gameType = gameEntity?.categoryChinese ?: "",
-                        isNotPrompt = if (binding.noRemindAgainCb.isVisible) {
-                            binding.noRemindAgainCb.isChecked
-                        } else null
-                    )
                     DirectUtils.directToLinkPage(requireContext(), packageLink, "包名检测弹窗", "")
                 }
             }
@@ -237,19 +206,6 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
                 saveRecord(entity)
                 LogUtils.uploadPackageCheck("pkg_check_pop_click", "不再提示", gameEntity, "", "", "", "")
             }
-
-            mDismissByTouchInside = true
-
-            SensorsBridge.trackPkgCheckDialogClick(
-                buttonName = binding.cancelTv.text.toString(),
-                gameId = gameEntity?.id ?: "",
-                gameName = gameEntity?.name ?: "",
-                gameType = gameEntity?.categoryChinese ?: "",
-                isNotPrompt = if (binding.noRemindAgainCb.isVisible) {
-                    binding.noRemindAgainCb.isChecked
-                } else null
-            )
-
             dismissAllowingStateLoss()
         }
     }
@@ -344,21 +300,6 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
         DownloadManager.getInstance().removeObserver(dataWatcher)
     }
 
-    override fun onDismiss(dialog: DialogInterface) {
-        if (!mDismissByTouchInside) {
-            SensorsBridge.trackPkgCheckDialogClick(
-                buttonName = "关闭弹窗",
-                gameId = gameEntity?.id ?: "",
-                gameName = gameEntity?.name ?: "",
-                gameType = gameEntity?.categoryChinese ?: "",
-                isNotPrompt = if (binding.noRemindAgainCb.isVisible) {
-                    binding.noRemindAgainCb.isChecked
-                } else null
-            )
-        }
-        super.onDismiss(dialog)
-    }
-
     //安装、卸载事件
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onEventMainThread(busFour: EBPackage) {

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

@@ -47,7 +47,7 @@ object ExposureManager {
     fun log(eventList: List<ExposureEvent>) {
         AppExecutor.logExecutor.execute {
             for (event in eventList) {
-                if (event != null && !exposureCache.contains(event.id)) {
+                if (!exposureCache.contains(event.id)) {
                     exposureSet.add(event)
                     exposureCache.add(event.id)
                 } else {

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

@@ -62,17 +62,17 @@ object ExposureUtils {
         host: String? = "unknown",
         path: String? = "unknown",
         downloadType: DownloadType
-    ): ExposureEvent? {
+    ) {
         val gameEntity = entity.copy()
         gameEntity.platform = platform
         gameEntity.downloadCompleteType = downloadType.toString()
         val traceEvent = trace?.toObject<ExposureEvent>()
 
-        if (TextUtils.isEmpty(entity.id)) return null
+        if (TextUtils.isEmpty(entity.id)) return
 
         // 避免生成 trace 相同的下载完成事件，根据日志看下载完成的同一秒有可能生成两条
         if (mDownloadCompleteTraceEventIdSet.contains(traceEvent?.id)) {
-            return null
+            return
         }
 
         traceEvent?.payload?.gameId?.let { mDownloadCompleteTraceEventIdSet.add(it) }
@@ -91,8 +91,6 @@ object ExposureUtils {
 
         ExposureManager.log(exposureEvent)
         ExposureManager.commitSavedExposureEvents(forcedUpload = true)
-
-        return exposureEvent
     }
 
     @JvmStatic

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

@@ -10,7 +10,6 @@ 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.qa.entity.AnswerDetailEntity
 import com.gh.gamecenter.qa.entity.ArticleDetailEntity
 

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

@@ -1,134 +0,0 @@
-package com.gh.common.prioritychain
-
-import android.app.Activity
-import android.view.Gravity
-import android.view.LayoutInflater
-import android.widget.FrameLayout
-import com.gh.common.util.NewFlatLogUtils
-import com.gh.gamecenter.GameDetailActivity
-import com.gh.gamecenter.R
-import com.gh.gamecenter.common.base.fragment.BaseFragment
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.view.BugFixedPopupWindow
-import com.gh.gamecenter.core.utils.DisplayUtils
-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
-
-class AccelerateNotificationHandler(priority: Int) : PriorityChainHandler(priority) {
-
-    private var mActivity: Activity? = null
-    private var mBaseHandler: BaseFragment.BaseHandler? = null
-    private var mGameList: List<GameEntity>? = null
-    private var mViewModel: MainWrapperViewModel? = null
-
-    /**
-     * 提前预处理显示弹窗的内容
-     */
-    fun doPreProcess(
-        activity: Activity,
-        baseHandler: BaseFragment.BaseHandler,
-        gameEntityList: List<GameEntity>?,
-        viewModel: MainWrapperViewModel
-    ) {
-        mActivity = activity
-        mGameList = gameEntityList
-        mBaseHandler = baseHandler
-        mViewModel = viewModel
-
-        if (getStatus() == STATUS_PENDING) {
-            if (gameEntityList == null) {
-                processNext()
-            } else {
-                onProcess()
-            }
-        } else {
-            if (gameEntityList == null) {
-                updateStatus(STATUS_INVALID)
-            } else {
-                updateStatus(STATUS_VALID)
-            }
-        }
-    }
-
-    override fun onProcess() {
-        when (getStatus()) {
-            STATUS_VALID -> {
-                val accelerateSet =
-                    HashSet(SPUtils.getStringSet(Constants.SP_ACCELERATE_NOTIFICATION_POP_UP_SET))
-                if (!mGameList.isNullOrEmpty() && !accelerateSet.contains(mGameList!![0].messageId)) {
-                    showAccelerateNotificationPopupWindow(mActivity!!, mViewModel, mBaseHandler, mGameList!![0]) {
-                        processNext()
-                    }
-                    accelerateSet.add(mGameList!![0].messageId)
-                    SPUtils.setStringSet(Constants.SP_ACCELERATE_NOTIFICATION_POP_UP_SET, accelerateSet)
-                } else {
-                    processNext()
-                }
-            }
-
-            STATUS_INVALID -> {
-                processNext()
-            }
-        }
-    }
-
-    companion object {
-        fun showAccelerateNotificationPopupWindow(
-            activity: Activity,
-            viewModel: MainWrapperViewModel?,
-            baseHandler: BaseFragment.BaseHandler?,
-            gameEntity: GameEntity?,
-            dismissCallback: (() -> Unit)?
-        ) {
-            val binding: PopupAccelerateNotificationBinding =
-                PopupAccelerateNotificationBinding.inflate(LayoutInflater.from(activity))
-            if (gameEntity != null) {
-                binding.gameIconView.displayGameIcon(gameEntity)
-                binding.gameNameTv.text = gameEntity.name
-                binding.root.setOnClickListener {
-                    NewFlatLogUtils.logMessageInformClickPluginVersion(
-                        gameEntity.id,
-                        gameEntity.name!!
-                    )
-                    if (gameEntity.messageId.isNotEmpty()) {
-                        // 把对应系统消息设为已读
-                        viewModel?.postMessageRead(gameEntity.messageId)
-                    }
-                    GameDetailActivity.startGameDetailActivity(
-                        context = activity,
-                        gameId = gameEntity.id,
-                        entrance = "首页插件上架弹窗",
-                        defaultTab = -1,
-                        isSkipGameComment = false,
-                        scrollToLibao = false,
-                        openVideoStreaming = false,
-                        openPlatformWindow = true,
-                        traceEvent = null
-                    )
-                }
-            }
-            BugFixedPopupWindow(
-                binding.root,
-                FrameLayout.LayoutParams.MATCH_PARENT,
-                FrameLayout.LayoutParams.WRAP_CONTENT
-            ).apply {
-                isTouchable = true
-                isFocusable = true
-                isOutsideTouchable = true
-                animationStyle = R.style.popup_window_ease_in_and_out_anim_style
-                showAtLocation(
-                    activity.window.decorView,
-                    Gravity.TOP,
-                    0,
-                    DisplayUtils.getStatusBarHeight(activity.resources) + DisplayUtils.dip2px(42f)
-                )
-                setOnDismissListener {
-                    dismissCallback?.invoke()
-                }
-                baseHandler?.postDelayed({ dismiss() }, 5000)
-            }
-        }
-    }
-}

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

@@ -1,86 +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) {
-            preProcess()
-        }
-    }
-
-    fun setView(
-        fragment: BaseLazyFragment,
-        recyclerView: RecyclerView
-    ) {
-        mFragment = fragment
-        mRecyclerView = recyclerView
-
-        if (mWindowList != null) {
-            preProcess()
-        }
-    }
-
-    private fun preProcess() {
-        Utils.log(TAG, "FloatingWindowHandler preProcess windowSize is -> ${mWindowList?.size}")
-
-        if (getStatus() == STATUS_PENDING) {
-            if (!mWindowList.isNullOrEmpty()) {
-                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/HomePushHandler.kt

@@ -1,44 +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) {
-                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/NotificationPermissionDialogHandler.kt

@@ -1,20 +0,0 @@
-package com.gh.common.prioritychain
-
-import com.gh.gamecenter.common.entity.NotificationUgc
-import com.gh.gamecenter.common.utils.NotificationHelper
-import com.gh.gamecenter.login.user.UserManager
-
-class NotificationPermissionDialogHandler(priority: Int) : PriorityChainHandler(priority) {
-
-    override fun onProcess() {
-        // 仅登录后再启动光环时请求一次权限
-        if (UserManager.getInstance().isLoggedIn) {
-            NotificationHelper.showNotificationHintDialog(NotificationUgc.LOGIN) {
-                processNext()
-            }
-        } else {
-            processNext()
-        }
-    }
-
-}

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

@@ -1,22 +0,0 @@
-package com.gh.common.prioritychain
-
-import java.util.*
-import java.util.concurrent.PriorityBlockingQueue
-
-class PriorityChain {
-
-    private val mHandlerQueue: Queue<PriorityChainHandler> = PriorityBlockingQueue()
-
-    fun addHandler(handler: PriorityChainHandler) {
-        mHandlerQueue.add(handler.also {
-            it.setPriorityChain(this)
-        })
-    }
-
-    fun start() {
-        mHandlerQueue.poll()?.process(mHandlerQueue)
-    }
-
-    fun isHandlerQueueEmpty() = mHandlerQueue.isEmpty()
-
-}

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

@@ -1,71 +0,0 @@
-package com.gh.common.prioritychain
-
-import com.lightgame.utils.Utils
-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 mPriorityChain: PriorityChain? = null
-
-    /**
-     * 获取当前 handler 的状态
-     * - 等待结果返回 （STATUS_PENDING）
-     * - 无需执行 （STATUS_INVALID）
-     * - 可执行 （STATUS_VALID）
-     * - 未知 （STATUS_UNKNOWN）
-     */
-    fun getStatus(): Int = mStatus
-
-    fun updateStatus(status: Int) {
-        Utils.log(TAG, "${javaClass.simpleName} updateStatus $status")
-
-        mStatus = status
-    }
-
-    fun setPriorityChain(priorityChain: PriorityChain) {
-        mPriorityChain = priorityChain
-    }
-
-    fun process(queue: Queue<PriorityChainHandler>) {
-        Utils.log(TAG, "${javaClass.simpleName} process $mStatus")
-
-        mQueue = queue
-        // 若当前 handler 未经处理，将其状态改为 pending
-        if (mStatus == STATUS_UNKNOWN) {
-            updateStatus(STATUS_PENDING)
-        }
-
-        onProcess()
-    }
-
-    /**
-     * 执行相关功能的地方
-     */
-    abstract fun onProcess()
-
-    /**
-     * 分发给下一个 handler 处理
-     */
-    fun processNext() {
-        Utils.log(TAG, "${javaClass.simpleName} processNext $mStatus")
-
-        mQueue?.poll()?.process(mQueue!!)
-    }
-
-    override fun compareTo(other: PriorityChainHandler): Int {
-        return (mPriority - other.mPriority)
-    }
-
-    companion object {
-        internal const val STATUS_PENDING = 0
-        internal const val STATUS_INVALID = 1
-        internal const val STATUS_VALID = 2
-        internal const val STATUS_UNKNOWN = 3
-
-        const val TAG = "PriorityChainHandler"
-    }
-
-}

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

@@ -1,47 +0,0 @@
-package com.gh.common.prioritychain
-
-import androidx.fragment.app.FragmentActivity
-import com.gh.common.dialog.PrivacyPolicyDialogFragment
-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
-        mPrivacyPolicyEntity = privacyPolicyEntity
-
-        if (getStatus() == STATUS_PENDING) {
-            if (privacyPolicyEntity == null) {
-                processNext()
-            } else {
-                onProcess()
-            }
-        } else {
-            if (privacyPolicyEntity == null) {
-                updateStatus(STATUS_INVALID)
-            } else {
-                updateStatus(STATUS_VALID)
-            }
-        }
-    }
-
-    override fun onProcess() {
-        when(getStatus()) {
-            STATUS_VALID -> {
-                PrivacyPolicyDialogFragment.show(mActivity!!, mPrivacyPolicyEntity) { _: Boolean? ->
-                    processNext()
-                }
-            }
-            STATUS_INVALID -> {
-                processNext()
-            }
-        }
-    }
-
-}

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

@@ -1,52 +0,0 @@
-package com.gh.common.prioritychain
-
-import androidx.fragment.app.Fragment
-import com.gh.common.dialog.ReserveDialog
-import com.gh.gamecenter.common.entity.SimpleGameEntity
-import com.gh.gamecenter.message.MessageUnreadRepository
-
-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
-        mReserveData = reserveData
-
-        if (getStatus() == STATUS_PENDING) {
-            if (reserveData.isNullOrEmpty()) {
-                processNext()
-            } else {
-                onProcess()
-            }
-        } else {
-            if (reserveData.isNullOrEmpty()) {
-                updateStatus(STATUS_INVALID)
-            } else {
-                updateStatus(STATUS_VALID)
-            }
-        }
-    }
-
-    override fun onProcess() {
-        when (getStatus()) {
-            STATUS_VALID -> {
-                val reserveDialog = ReserveDialog.getInstance(mReserveData!!)
-                reserveDialog.setOnDismissListener {
-                    MessageUnreadRepository.loadMessageUnreadData()
-                    processNext()
-                }
-                reserveDialog.show(mFragment!!.childFragmentManager, "reserveDialog")
-            }
-
-            STATUS_INVALID -> {
-                processNext()
-            }
-        }
-    }
-
-}

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

@@ -1,17 +0,0 @@
-package com.gh.common.prioritychain
-
-import android.content.Context
-import com.gh.gamecenter.manager.UpdateManager
-
-class UpdateDialogHandler(context: Context, priority: Int) : PriorityChainHandler(priority) {
-
-    private val mUpdateManager = UpdateManager.getInstance(context)
-
-    override fun onProcess() {
-        mUpdateManager.checkUpdate(true, null)
-        mUpdateManager.setDismissCallback {
-            processNext()
-        }
-    }
-
-}

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

@@ -1,79 +0,0 @@
-package com.gh.common.prioritychain
-
-import android.graphics.Bitmap
-import androidx.fragment.app.Fragment
-import com.gh.gamecenter.common.callback.BiCallback
-import com.gh.gamecenter.common.utils.ImageUtils
-import com.gh.gamecenter.feature.entity.WelcomeDialogEntity
-import com.gh.gamecenter.fragment.MainWrapperViewModel
-import com.gh.gamecenter.fragment.WelcomeDialogFragment
-import com.halo.assistant.HaloApp
-
-class WelcomeDialogHandler(priority: Int): PriorityChainHandler(priority) {
-
-    private var mFragment: Fragment? = null
-    private var mWelcomeDialogEntity: WelcomeDialogEntity? = null
-
-    fun doPreProcess(fragment: Fragment, welcomeDialogEntity: WelcomeDialogEntity?) {
-        mFragment = fragment
-        mWelcomeDialogEntity = 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) {
-                        if (getStatus() == STATUS_PENDING) {
-                            updateStatus(STATUS_VALID)
-                            onProcess()
-                        } else {
-                            updateStatus(STATUS_VALID)
-                        }
-                    }
-
-                    override fun onSecond(second: Boolean) {
-                        processNext()
-                    }
-                })
-            } else {
-                processNext()
-            }
-        }
-
-        if (getStatus() == STATUS_PENDING) {
-            if (welcomeDialogEntity == null) {
-                processNext()
-            } else {
-                preLoadClosure.invoke()
-            }
-        } else {
-            if (welcomeDialogEntity == null) {
-                updateStatus(STATUS_INVALID)
-            } else {
-                preLoadClosure.invoke()
-            }
-        }
-    }
-
-    override fun onProcess() {
-        when (getStatus()) {
-            STATUS_VALID -> {
-                if (mFragment == null || !mFragment!!.isAdded) {
-                    updateStatus(STATUS_INVALID)
-                    processNext()
-                } else {
-                    val welcomeDialog = WelcomeDialogFragment.getInstance(mWelcomeDialogEntity)
-                    welcomeDialog.setOnDismissListener {
-                        processNext()
-                    }
-                    welcomeDialog.show(mFragment!!.childFragmentManager, "WelcomeDialog")
-                }
-            }
-            STATUS_INVALID -> {
-                processNext()
-            }
-        }
-    }
-
-}

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

@@ -0,0 +1,22 @@
+package com.gh.common.provider
+
+import android.app.Dialog
+import android.content.Context
+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.IAppDialogUtilsProvider
+
+@Route(path = RouteConsts.provider.appDialogUtils, name = "DialogUtils暴露服务")
+class AppDialogUtilsProviderImpl : IAppDialogUtilsProvider {
+
+    override fun showWaitDialog(context: Context, string: String): Dialog {
+        return DialogUtils.showWaitDialog(context, string)
+    }
+
+
+
+    override fun init(context: Context?) {
+
+    }
+}

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

@@ -2,7 +2,6 @@ package com.gh.common.provider
 
 import android.content.Context
 import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.gamecenter.BuildConfig
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IAppProvider
@@ -19,10 +18,6 @@ class AppProviderImpl : IAppProvider {
         return HaloApp.getInstance().getString(R.string.app_name)
     }
 
-    override fun getAppVersion(): String {
-        return BuildConfig.VERSION_NAME
-    }
-
     override fun getGid(): String {
         return HaloApp.getInstance().gid ?: ""
     }
@@ -75,10 +70,6 @@ class AppProviderImpl : IAppProvider {
         return HaloApp.getInstance().flavorProvider
     }
 
-    override fun getFlavor(): String {
-        return BuildConfig.FLAVOR
-    }
-
     override fun getIsBrandNewInstall(): Boolean {
         return HaloApp.getInstance().isBrandNewInstall
     }

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

@@ -1,7 +1,6 @@
 package com.gh.common.provider
 
 import android.content.Context
-import android.view.View
 import android.widget.LinearLayout
 import android.widget.TextView
 import com.alibaba.android.arouter.facade.annotation.Route
@@ -25,14 +24,6 @@ class BindingAdaptersProviderImpl : IBindingAdaptersProvider {
         BindingAdapters.setGameTags(layout, gameEntity)
     }
 
-    override fun setMessageUnread(view: TextView, unreadCount: Int) {
-        BindingAdapters.setMessageUnread(view, unreadCount)
-    }
-
-    override fun setGame(view: View, gameEntity: GameEntity) {
-        BindingAdapters.setGame(view, gameEntity)
-    }
-
     override fun init(context: Context?) {
         // Do nothing
     }

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

@@ -1,22 +0,0 @@
-package com.gh.common.provider
-
-import android.content.Context
-import android.content.Intent
-import android.os.Parcelable
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.gamecenter.CommentDetailActivity
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.feature.provider.ICommentDetailProvider
-import com.gh.gamecenter.feature.entity.MessageEntity
-
-@Route(path = RouteConsts.provider.commentDetail, name = "CommentDetailActivity暴露服务")
-class CommentDetailProviderImpl : ICommentDetailProvider {
-
-    override fun getIntent(context: Context, commentId: String?, message: Parcelable): Intent {
-        return CommentDetailActivity.getIntent(context, commentId, message as MessageEntity.Article)
-    }
-
-    override fun init(context: Context?) {
-        // Do nothing
-    }
-}

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

@@ -1,18 +0,0 @@
-package com.gh.common.provider
-
-import android.content.Context
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.core.provider.ICommentManagerProvider
-import com.gh.gamecenter.manager.CommentManager
-
-@Route(path = RouteConsts.provider.commentManager, name = "CommentManager暴露服务")
-class CommentManagerProviderImpl : ICommentManagerProvider {
-    override fun addUrl(ids: String) {
-        CommentManager.getInstance().addUrl(ids)
-    }
-
-    override fun init(context: Context?) {
-        // Do nothing
-    }
-}

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

@@ -1,23 +0,0 @@
-package com.gh.common.provider
-
-import android.content.Context
-import android.widget.TextView
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.common.util.CommentUtils
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.feature.provider.ICommentUtilsProvider
-
-@Route(path = RouteConsts.provider.commentUtils, name = "CommentUtils暴露服务")
-class CommentUtilsProviderImpl : ICommentUtilsProvider {
-    override fun setCommentTime(textView: TextView, time: Long) {
-        CommentUtils.setCommentTime(textView, time)
-    }
-
-    override fun getCommentTime(timestamp: Long): String {
-        return CommentUtils.getCommentTime(timestamp)
-    }
-
-    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/ConcernProviderImpl.kt

@@ -5,16 +5,14 @@ import android.content.Intent
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.gamecenter.ConcernActivity
 import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.core.provider.IConcernProvider
+import com.gh.gamecenter.feature.provider.IConcernProvider
 
-@Route(path = RouteConsts.provider.concernActivity, name = "ConcernActivity暴露服务")
+@Route(path = RouteConsts.provider.concern, name = "ConcernActivity暴露服务")
 class ConcernProviderImpl : IConcernProvider {
 
     override fun getIntent(context: Context, entrance: String): Intent {
         return ConcernActivity.getIntent(context, entrance)
     }
 
-    override fun init(context: Context?) {
-        // Do nothing
-    }
+    override fun init(context: Context?) {}
 }

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

@@ -56,22 +56,6 @@ class ConfigProviderImpl : IConfigProvider {
         return Config.getSettings()?.image?.oss?.gifWaterMark ?: ""
     }
 
-    override fun getVideoSnapshotSuffix(): String {
-        return Config.getSettings()?.image?.oss?.snapshot ?: ""
-    }
-
-    override fun getImageCropSuffix(): String {
-        return Config.getSettings()?.image?.oss?.crop ?: ""
-    }
-
-    override fun getImageInfoSuffix(): String {
-        return Config.getSettings()?.image?.oss?.info ?: ""
-    }
-
-    override fun getImageResizeSuffix(): String {
-        return Config.getSettings()?.image?.oss?.resize ?: ""
-    }
-
     override fun getQQ(): String {
         return Config.getSettings()?.support?.qq ?: ""
     }

app/src/main/java/com/gh/common/provider/ConfigSettingProviderImpl.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.constant.Config
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.feature.entity.SettingsEntity
-import com.gh.gamecenter.feature.provider.IConfigSettingProvider
-
-@Route(path = RouteConsts.provider.configSetting, name = "Config.getSettings暴露服务")
-class ConfigSettingProviderImpl : IConfigSettingProvider {
-    override fun getSettings(): SettingsEntity? {
-        return Config.getSettings()
-    }
-
-    override fun init(context: Context?) {
-        // do nothing
-    }
-}

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

@@ -1,22 +0,0 @@
-package com.gh.common.provider
-
-import android.content.Context
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.common.util.DataCollectionUtils
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.feature.provider.IDataCollectionProvider
-
-@Route(path = RouteConsts.provider.dataCollection, name = "DataCollectionUtils暴露服务")
-class DataCollectionProviderImpl : IDataCollectionProvider {
-    override fun uploadClick(context: Context, vararg args: String) {
-        DataCollectionUtils.uploadClick(context, *args)
-    }
-
-    override fun uploadConcern(context: Context, vararg args: String) {
-        DataCollectionUtils.uploadConcern(context, *args)
-    }
-
-    override fun init(context: Context?) {
-        // Do nothing
-    }
-}

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

@@ -0,0 +1,70 @@
+package com.gh.common.provider
+
+import android.content.Context
+import android.view.View
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.DetailDownloadUtils
+import com.gh.gamecenter.adapter.viewholder.DetailViewHolder
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.feature.entity.GameEntity
+import com.gh.gamecenter.feature.exposure.ExposureEvent
+import com.gh.gamecenter.feature.provider.IDetailDownloadUtilsProvider
+import com.lightgame.download.DownloadEntity
+
+@Route(path = RouteConsts.provider.detailDownloadUtils, name = "DetailDownloadUtils暴露服务")
+class DetailDownloadUtilsProviderImpl : IDetailDownloadUtilsProvider {
+
+    override fun detailInitDownload(
+        contentView: View,
+        gameEntity: GameEntity?,
+        downloadEntity: DownloadEntity?,
+        isNewsDetail: Boolean,
+        entrance: String?,
+        name: String?,
+        title: String?,
+        exposureEvent: ExposureEvent?,
+        isCheck: Boolean
+    ) {
+        return DetailDownloadUtils.detailInitDownload(
+            DetailViewHolder(
+                contentView,
+                gameEntity,
+                downloadEntity,
+                isNewsDetail,
+                entrance,
+                name,
+                title,
+                exposureEvent
+            ),
+            isCheck
+        )
+    }
+
+    override fun detailInitInvalidate(
+        contentView: View,
+        gameEntity: GameEntity,
+        downloadEntity: DownloadEntity,
+        isNewsDetail: Boolean,
+        entrance: String,
+        name: String,
+        title: String,
+        exposureEvent: ExposureEvent?
+    ) {
+        return DetailDownloadUtils.detailInvalidate(
+            DetailViewHolder(
+                contentView,
+                gameEntity,
+                downloadEntity,
+                isNewsDetail,
+                entrance,
+                name,
+                title,
+                exposureEvent
+            )
+        )
+    }
+
+    override fun init(context: Context?) {
+
+    }
+}

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

@@ -0,0 +1,17 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.DeviceTokenUtils
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IDeviceTokenUtilsProvider
+
+@Route(path = RouteConsts.provider.deviceTokenUtils, name = "DeviceTokenUtils暴露服务")
+class DeviceTokenUtilsProviderImpl : IDeviceTokenUtilsProvider {
+
+    override fun syncServerTime(context: Context) {
+        DeviceTokenUtils.syncServerTime(context)
+    }
+
+    override fun init(context: Context?) {}
+}

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

@@ -1,7 +1,6 @@
 package com.gh.common.provider
 
 import android.content.Context
-import android.os.Bundle
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.common.util.DirectUtils
 import com.gh.gamecenter.common.constant.RouteConsts
@@ -54,72 +53,22 @@ class DirectProviderImpl : IDirectProvider {
         DirectUtils.directDouyin(context, userId)
     }
 
-    override fun directToSuggestionFromDiagnosis(context: Context, content: String, diagnosis: String) {
-        DirectUtils.directToSuggestion(context, content = content, diagnosis = diagnosis)
+    override fun directToSuggestionFromDiagnosis(context: Context, diagnosis: String) {
+        DirectUtils.directToSuggestion(context, diagnosis = diagnosis)
     }
 
     override fun directToQa(context: Context, text: String?, id: String) {
         DirectUtils.directToQa(context, text, id)
     }
 
-    override fun directToHelpAndFeedback(context: Context, bundle: Bundle?) {
-        DirectUtils.directToHelpAndFeedback(context, bundle)
+    override fun directToHelpAndFeedback(context: Context, position: Int) {
+        DirectUtils.directToHelpAndFeedback(context, position)
     }
 
     override fun directToQqGroup(context: Context, groupNumber: String?): Boolean {
         return DirectUtils.directToQqGroup(context, groupNumber)
     }
 
-    override fun directToHomeActivity(context: Context, userId: String?, entrance: String?, path: String?) {
-        DirectUtils.directToHomeActivity(context, userId, entrance, path)
-    }
-
-    override fun directToAnswerDetail(context: Context, id: String, entrance: String?, path: String?) {
-        DirectUtils.directToAnswerDetail(context, id, entrance, path)
-    }
-
-    override fun directToCommunityArticle(
-        context: Context,
-        articleId: String?,
-        communityId: String?,
-        entrance: String?,
-        path: String?
-    ) {
-        DirectUtils.directToCommunityArticle(context, articleId, communityId, entrance, path)
-    }
-
-    override fun directToVideoDetail(context: Context, videoId: String, entrance: String?, path: String?) {
-        DirectUtils.directToVideoDetail(context, videoId, entrance, path)
-    }
-
-    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) {
-        return DirectUtils.directToQGameHome(context)
-    }
-
     override fun init(context: Context?) {
         // Do nothing
     }

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

@@ -5,11 +5,9 @@ import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.common.util.NewFlatLogUtils
 import com.gh.gamecenter.common.base.GlobalActivityManager
 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.GameEntity
-import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.gh.gamecenter.feature.provider.IDownloadButtonClickedProvider
 import com.gh.gamecenter.feature.view.DownloadButton
 import com.gh.gamecenter.packagehelper.PackageRepository
@@ -27,7 +25,6 @@ class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
         var downloadStatusInChinese = ""
         var gameSchemaType = ""
         var packageName = ""
-        var exposureSourceList: List<ExposureSource>? = null
 
         val boundedObject = downloadButton.getObject()
 
@@ -50,7 +47,6 @@ class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
                     downloadStatusInChinese = boundedObject.downloadStatusChinese
                     gameSchemaType = boundedObject.gameBitChinese
                     packageName = boundedObject.getUniquePackageName() ?: ""
-                    exposureSourceList = boundedObject.exposureEvent?.source
                 }
 
                 is GameUpdateEntity -> {
@@ -61,7 +57,6 @@ class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
                     gameTypeInChinese = boundedObject.categoryChinese
                     downloadStatusInChinese = boundedObject.downloadStatusChinese
                     packageName = boundedObject.packageName
-                    exposureSourceList = boundedObject.exposureEvent?.source
                 }
 
                 is DownloadEntity -> {
@@ -70,7 +65,6 @@ class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
                     gameCategory = boundedObject.getGameCategory()
                     downloadStatus = if (boundedObject.isVGame()) "畅玩" else "下载"
                     packageName = boundedObject.packageName
-                    exposureSourceList = boundedObject.exposureTrace?.toObject<ExposureEvent>()?.source
                 }
             }
 
@@ -98,9 +92,8 @@ class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
             ) {
 
                 // 上报神策点击事件
-                SensorsBridge.trackEventWithExposureSource(
+                SensorsBridge.trackEvent(
                     "DownLoadbuttonClick",
-                    exposureSourceList,
                     "game_id", gameId,
                     "game_name", gameName,
                     "game_type", gameTypeInChinese,
@@ -112,9 +105,10 @@ class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
                     "page_business_id", GlobalActivityManager.getCurrentPageEntity().pageBusinessId,
                     "last_page_name", GlobalActivityManager.getLastPageEntity().pageName,
                     "last_page_id", GlobalActivityManager.getLastPageEntity().pageId,
-                    "last_page_business_id", GlobalActivityManager.getLastPageEntity().pageBusinessId,
+                    "last_page_business_id", GlobalActivityManager.getLastPageEntity().pageBusinessId
                 )
             }
+
         }
     }
 

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

@@ -5,7 +5,9 @@ import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IDownloadManagerProvider
+import com.lightgame.download.DataWatcher
 import com.lightgame.download.DownloadEntity
+import com.lightgame.download.DownloadStatus
 
 @Route(path = RouteConsts.provider.downloadManager, name = "DownloadManager暴露服务")
 class DownloadManagerProviderImpl : IDownloadManagerProvider {
@@ -18,6 +20,18 @@ class DownloadManagerProviderImpl : IDownloadManagerProvider {
         DownloadManager.getInstance().resumeAllInvisiblePendingTask()
     }
 
+    override fun getStatus(url: String): DownloadStatus {
+        return DownloadManager.getInstance().getStatus(url)
+    }
+
+    override fun addObserver(dataWatcher: DataWatcher) {
+        return DownloadManager.getInstance().addObserver(dataWatcher)
+    }
+
+    override fun removeObserver(dataWatcher: DataWatcher) {
+        return DownloadManager.getInstance().removeObserver(dataWatcher)
+    }
+
     override fun init(context: Context?) {
         // Do nothing
     }

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

@@ -1,24 +0,0 @@
-package com.gh.common.provider
-
-import android.content.Context
-import android.content.Intent
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.feature.provider.IGameCollectionDetailProvider
-import com.gh.gamecenter.gamecollection.detail.GameCollectionDetailActivity
-
-@Route(path = RouteConsts.provider.gameCollectionDetail, name = "GameCollectionDetailActivity暴露服务")
-class GameCollectionDetailProviderImpl : IGameCollectionDetailProvider {
-    override fun getIntent(context: Context, gameCollectionId: String, isFromSquare: Boolean): Intent {
-        return GameCollectionDetailActivity.getIntent(context, gameCollectionId, isFromSquare)
-    }
-
-    override fun getSpecifiedCommentIntent(context: Context, gameCollectionId: String, topCommentId: String): Intent {
-        return GameCollectionDetailActivity.getSpecifiedCommentIntent(context, gameCollectionId, topCommentId)
-    }
-
-
-    override fun init(context: Context?) {
-        // Do nothing
-    }
-}

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

@@ -10,15 +10,6 @@ import com.gh.gamecenter.feature.provider.IGameDetailProvider
 
 @Route(path = RouteConsts.provider.gameDetail, name = "GameDetailActivity暴露服务")
 class GameDetailProviderImpl : IGameDetailProvider {
-    override fun startGameDetailActivity(
-        context: Context,
-        gameEntity: GameEntity?,
-        entrance: String,
-        traceEvent: ExposureEvent?
-    ) {
-        GameDetailActivity.startGameDetailActivity(context, gameEntity, entrance, traceEvent)
-    }
-
     override fun startGameDetailActivity(
         context: Context,
         gameId: String,
@@ -28,6 +19,15 @@ class GameDetailProviderImpl : IGameDetailProvider {
         GameDetailActivity.startGameDetailActivity(context, gameId, entrance, traceEvent)
     }
 
+    override fun startGameDetailActivity(
+        context: Context,
+        gameEntity: GameEntity?,
+        entrance: String,
+        traceEvent: ExposureEvent?
+    ) {
+        GameDetailActivity.startGameDetailActivity(context, gameEntity, entrance, traceEvent)
+    }
+
     override fun startGameDetailActivity(
         context: Context,
         gameEntity: GameEntity?,
@@ -50,30 +50,6 @@ class GameDetailProviderImpl : IGameDetailProvider {
         )
     }
 
-    override fun startGameDetailActivity(
-        context: Context,
-        gameId: String,
-        entrance: String?,
-        defaultTab: Int,
-        isSkipGameComment: Boolean,
-        scrollToLibao: Boolean,
-        openVideoStreaming: Boolean,
-        openPlatformWindow: Boolean,
-        traceEvent: ExposureEvent?
-    ) {
-        GameDetailActivity.startGameDetailActivity(
-            context,
-            gameId,
-            entrance,
-            defaultTab,
-            isSkipGameComment,
-            scrollToLibao,
-            openVideoStreaming,
-            openPlatformWindow,
-            traceEvent
-        )
-    }
-
     override fun init(context: Context?) {
         // Do nothing
     }

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

@@ -1,18 +0,0 @@
-package com.gh.common.provider
-
-import android.content.Context
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.common.util.GameTrendsHelper
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.core.provider.IGameTrendsHelperProvider
-
-@Route(path = RouteConsts.provider.gameTrendsHelper, name = "GameTrendsHelper暴露服务")
-class GameTrendsHelperProviderImpl : IGameTrendsHelperProvider {
-    override fun updateReadPostTime() {
-        GameTrendsHelper.updateReadPostTime()
-    }
-
-    override fun init(context: Context?) {
-        // do nothing
-    }
-}

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

@@ -1,27 +0,0 @@
-package com.gh.common.provider
-
-import android.content.Context
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.common.util.LibaoUtils
-import com.gh.common.util.LibaoUtils.PostLibaoListener
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.core.provider.ILibaoUtilsProvider
-
-@Route(path = RouteConsts.provider.libaoUtils, name = "LibaoUtils暴露服务")
-class LibaoUtilsProviderImpl : ILibaoUtilsProvider {
-    override fun getLibaoStatus(ids: String, successCallback: ((Any?) -> Unit)?, failureCallback: (() -> Unit)?) {
-        LibaoUtils.getLibaoStatus(ids, object : PostLibaoListener {
-            override fun postSucceed(response: Any?) {
-                successCallback?.invoke(response)
-            }
-
-            override fun postFailed(error: Throwable?) {
-                failureCallback?.invoke()
-            }
-        })
-    }
-
-    override fun init(context: Context?) {
-        // Do nothing
-    }
-}

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

@@ -4,8 +4,8 @@ import android.content.Context
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.common.util.DirectUtils
 import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.common.entity.CommunityEntity
 import com.gh.gamecenter.common.entity.LinkEntity
+import com.gh.gamecenter.common.entity.SimpleGameEntity
 import com.gh.gamecenter.common.entity.SuggestType
 import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.gh.gamecenter.feature.provider.ILinkDirectUtilsProvider
@@ -47,18 +47,19 @@ class LinkDirectUtilsProviderImpl : ILinkDirectUtilsProvider {
         DirectUtils.directToSuggestion(context, type, suggestHintType, content, isQaFeedback, qaContentId)
     }
 
-    override fun directToSuggestion(context: Context, type: SuggestType, hiddenHint: String) {
-        DirectUtils.directToSuggestion(context, type, hiddenHint)
+    override fun directToSuggestion(
+        context: Context,
+        type: SuggestType,
+        suggestHintType: String?,
+        content: String?,
+        game: SimpleGameEntity,
+        platform: String
+    ) {
+        DirectUtils.directToSuggestion(context, type, suggestHintType, content, game, platform)
     }
 
-    override fun directToCommunityColumn(
-        context: Context,
-        community: CommunityEntity?,
-        subjectId: String,
-        entrance: String?,
-        path: String?
-    ) {
-        DirectUtils.directToCommunityColumn(context, community, subjectId, entrance, path)
+    override fun directToSuggestion(context: Context, type: SuggestType, hiddenHint: String) {
+        DirectUtils.directToSuggestion(context, type, hiddenHint)
     }
 
     override fun init(context: Context?) {

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

@@ -1,31 +0,0 @@
-package com.gh.common.provider
-
-import android.content.Context
-import android.content.Intent
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.gamecenter.MessageDetailActivity
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.feature.entity.ConcernEntity
-import com.gh.gamecenter.feature.provider.IMessageDetailProvider
-
-@Route(path = RouteConsts.provider.messageDetail, name = "MessageDetailActivity暴露服务")
-class MessageDetailProviderImpl : IMessageDetailProvider {
-
-    override fun getIntentById(
-        context: Context,
-        newsId: String,
-        commentNum: Int,
-        openSoftInput: Boolean,
-        entrance: String
-    ): Intent {
-        return MessageDetailActivity.getIntentById(context, newsId, commentNum, openSoftInput, entrance)
-    }
-
-    override fun getIntentByEntity(context: Context, concernEntity: ConcernEntity, entrance: String): Intent? {
-        return MessageDetailActivity.getIntentByEntity(context, concernEntity, entrance)
-    }
-
-    override fun init(context: Context?) {
-        // Do nothing
-    }
-}

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

@@ -1,13 +1,9 @@
 package com.gh.common.provider
 
 import android.content.Context
-import androidx.lifecycle.MediatorLiveData
-import androidx.lifecycle.MutableLiveData
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.feature.entity.MessageUnreadCount
-import com.gh.gamecenter.feature.entity.MessageUnreadEntity
-import com.gh.gamecenter.feature.provider.IMessageUnreadRepositoryProvider
+import com.gh.gamecenter.core.provider.IMessageUnreadRepositoryProvider
 import com.gh.gamecenter.message.MessageUnreadRepository
 
 @Route(path = RouteConsts.provider.messageUnreadRepository, name = "MessageUnreadRepository暴露服务")
@@ -17,22 +13,6 @@ class MessageUnreadRepositoryProviderImpl : IMessageUnreadRepositoryProvider {
         MessageUnreadRepository.loadMessageUnreadData()
     }
 
-    override fun loadMessageUnreadTotal(isRecordData: Boolean) {
-        MessageUnreadRepository.loadMessageUnreadTotal(isRecordData)
-    }
-
-    override fun getUnreadLiveData(): MediatorLiveData<MessageUnreadEntity> {
-        return MessageUnreadRepository.unreadLiveData
-    }
-
-    override fun getZixunConcernLiveData(): MutableLiveData<Boolean> {
-        return MessageUnreadRepository.zixunConcern
-    }
-
-    override fun getMessageUnreadCountLiveData(): MutableLiveData<MessageUnreadCount?> {
-        return MessageUnreadRepository.messageUnreadCountLiveData
-    }
-
     override fun init(context: Context?) {
         // Do nothing
     }

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

@@ -1,83 +0,0 @@
-package com.gh.common.provider
-
-import android.content.Context
-import android.content.Intent
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.feature.provider.INewCommentDetailProvider
-import com.gh.gamecenter.qa.comment.NewCommentDetailActivity
-
-@Route(path = RouteConsts.provider.newCommentDetail, name = "NewCommentDetailActivity暴露服务")
-class NewCommentDetailProviderImpl : INewCommentDetailProvider {
-
-    override fun getAnswerCommentIntent(
-        context: Context,
-        commentId: String,
-        questionId: String,
-        topCommentId: String,
-        entrance: String,
-        path: String
-    ): Intent {
-        return NewCommentDetailActivity.getAnswerCommentIntent(
-            context,
-            commentId,
-            questionId,
-            topCommentId,
-            entrance,
-            path
-        )
-    }
-
-    override fun getArticleCommentIntent(
-        context: Context,
-        commentId: String,
-        communityId: String,
-        articleId: String,
-        topCommentId: String,
-        entrance: String,
-        path: String
-    ): Intent {
-        return NewCommentDetailActivity.getArticleCommentIntent(
-            context,
-            commentId,
-            communityId,
-            articleId,
-            topCommentId,
-            entrance,
-            path
-        )
-    }
-
-    override fun getVideoCommentIntent(
-        context: Context,
-        commentId: String,
-        videoId: String,
-        topCommentId: String,
-        entrance: String,
-        path: String
-    ): Intent {
-        return NewCommentDetailActivity.getVideoCommentIntent(context, commentId, videoId, topCommentId, entrance, path)
-    }
-
-    override fun getGameCollectionCommentIntent(
-        context: Context,
-        commentId: String,
-        gameCollectionId: String,
-        topCommentId: String,
-        entrance: String,
-        path: String
-    ): Intent {
-        return NewCommentDetailActivity.getGameCollectionCommentIntent(
-            context,
-            commentId,
-            gameCollectionId,
-            topCommentId,
-            entrance,
-            path
-        )
-    }
-
-    override fun init(context: Context?) {
-        // Do nothing
-    }
-}

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

@@ -33,16 +33,8 @@ class PackageUtilsProviderImpl : IPackageUtilsProvider {
         return PackageUtils.getSideLoadedInfo()
     }
 
-    override fun isSignedByGh(context: Context, packageName: String): Boolean {
-        return PackageUtils.isSignedByGh(context, packageName)
-    }
-
-    override fun getInstalledTime(context: Context, packageName: String): Long {
-        return PackageUtils.getInstalledTime(context, packageName)
-    }
-
-    override fun getVersionNameByPackageName(packageName: String): String {
-        return PackageUtils.getVersionNameByPackageName(packageName) ?: ""
+    override fun launchApplicationByPackageName(context: Context, packageName: String) {
+        PackageUtils.launchApplicationByPackageName(context, packageName)
     }
 
     override fun init(context: Context?) {

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

@@ -3,8 +3,7 @@ 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.feature.entity.GameInstall
-import com.gh.gamecenter.feature.provider.IPackagesManagerProvider
+import com.gh.gamecenter.core.provider.IPackagesManagerProvider
 import com.gh.gamecenter.manager.PackagesManager
 
 @Route(path = RouteConsts.provider.packagesManager, name = "PackagesManager暴露服务")
@@ -13,10 +12,6 @@ class PackagesManagerProviderImpl: IPackagesManagerProvider {
         return PackagesManager.isCanPluggable(gameId, packageName)
     }
 
-    override fun getFilterSameApkInstalledList(): ArrayList<GameInstall> {
-        return PackagesManager.getFilterSameApkInstalledList()
-    }
-
     override fun init(context: Context?) {
         // Do nothing
     }

app/src/main/java/com/gh/common/provider/ShareCardPicProviderImpl.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.gamecenter.ShareCardPicActivity
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.feature.entity.ConcernEntity
-import com.gh.gamecenter.feature.provider.IShareCardPicProvider
-
-@Route(path = RouteConsts.provider.shareCardPicActivity, name = "ShareCardPicActivity暴露服务")
-class ShareCardPicProviderImpl : IShareCardPicProvider {
-    override fun startShareCardPicActivity(context: Context, concernEntity: ConcernEntity, entrance: String) {
-        ShareCardPicActivity.startShareCardPicActivity(context, concernEntity, entrance)
-    }
-
-    override fun init(context: Context?) {
-        // do nothing
-    }
-}

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

@@ -1,20 +0,0 @@
-package com.gh.common.provider
-
-import android.content.Context
-import android.content.Intent
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.gamecenter.ShareCardActivity
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.feature.entity.ConcernEntity
-import com.gh.gamecenter.feature.provider.IShareCardProvider
-
-@Route(path = RouteConsts.provider.shareCardActivity, name = "ShareCardActivity暴露服务")
-class ShareCardProviderImpl : IShareCardProvider {
-    override fun getIntent(context: Context, concernEntity: ConcernEntity, shareContent: String): Intent {
-        return ShareCardActivity.getIntent(context, concernEntity, shareContent)
-    }
-
-    override fun init(context: Context?) {
-        // do nothing
-    }
-}

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

@@ -1,20 +0,0 @@
-package com.gh.common.provider
-
-import android.content.Context
-import android.content.Intent
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.feature.provider.ISimpleAnswerDetailProvider
-import com.gh.gamecenter.qa.answer.detail.SimpleAnswerDetailActivity
-
-@Route(path = RouteConsts.provider.simpleAnswerDetail, name = "SimpleAnswerDetailActivity暴露服务")
-class SimpleAnswerDetailProviderImpl : ISimpleAnswerDetailProvider {
-
-    override fun getIntent(context: Context, answerId: String, entrance: String, path: String): Intent {
-        return SimpleAnswerDetailActivity.getIntent(context, answerId, entrance, path)
-    }
-
-    override fun init(context: Context?) {
-        // Do nothing
-    }
-}

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

@@ -1,24 +0,0 @@
-package com.gh.common.provider
-
-import android.content.Context
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.feature.provider.ISubjectProvider
-import com.gh.gamecenter.subject.SubjectActivity
-
-@Route(path = RouteConsts.provider.subject, name = "SubjectActivity暴露服务")
-class SubjectProviderImpl : ISubjectProvider {
-    override fun startSubjectActivity(
-        context: Context,
-        id: String?,
-        name: String?,
-        isOrder: Boolean,
-        entrance: String?
-    ) {
-        SubjectActivity.startSubjectActivity(context, id, name, isOrder, null, entrance)
-    }
-
-    override fun init(context: Context?) {
-        // Do nothing
-    }
-}

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

@@ -1,22 +0,0 @@
-package com.gh.common.provider
-
-import android.content.Context
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.core.provider.IVisitManagerProvider
-import com.gh.gamecenter.manager.VisitManager
-
-@Route(path = RouteConsts.provider.visitManager, name = "VisitManager暴露服务")
-class VisitManagerProviderImpl : IVisitManagerProvider {
-    override fun updateOkhttpCache(context: Context, newsId: String) {
-        VisitManager.updateOkhttpCache(context, newsId)
-    }
-
-    override fun addUrl(ids: String) {
-        VisitManager.getInstance().addUrl(ids)
-    }
-
-    override fun init(context: Context?) {
-        // Do nothing
-    }
-}

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

@@ -35,16 +35,6 @@ class WebProviderImpl : IWebProvider {
         return WebActivity.getQAIntent(context, url, title, isWebPageHandleBackPressed, qaType)
     }
 
-    override fun getIntentByNews(
-        context: Context?,
-        concernLink: String?,
-        concernGameName: String,
-        concernId: String?,
-        entrance: String?
-    ): Intent {
-        return WebActivity.getIntentByNews(context, concernLink, concernGameName, concernId, entrance)
-    }
-
     override fun init(context: Context?) {
         // Do nothing
     }

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

@@ -41,7 +41,7 @@ object NewSimulatorGameManager {
     private const val KEY_USE_DEBUG_API = "USE_DEBUG_API"
     private const val KEY_META = "META"
 
-    //    private const val GH_RETRO_EMU_APP_PACKAGE_NAME = "com.gh.retroemu"
+//    private const val GH_RETRO_EMU_APP_PACKAGE_NAME = "com.gh.retroemu"
     private const val GH_RETRO_EMU_APP_LAUNCHER_ACTIVITY_NAME = "com.gh.retroemu.ui.SplashActivity"
 
 
@@ -61,10 +61,10 @@ object NewSimulatorGameManager {
     }
 
     /**
-     * 弹出更新弹框
-     */
+    * 弹出更新弹框
+    */
     @JvmStatic
-    fun showUpdateNewsSimulator(context: Context, gameEntity: GameEntity, callback: EmptyCallback? = null) {
+    fun showUpdateNewsSimulator(context: Context, callback: EmptyCallback? = null){
         NewFlatLogUtils.logSimulatorUpdateAlertShow()
         DialogHelper.showDialog(
             context,
@@ -76,13 +76,7 @@ object NewSimulatorGameManager {
                 NewFlatLogUtils.logSimulatorUpdateAlertClick("更新")
                 val simulator = Config.getNewSimulatorEntitySetting()
                 if (simulator != null) {
-                    SimulatorDownloadManager.getInstance().showDownloadingDialog(
-                        context,
-                        simulator,
-                        gameEntity.id,
-                        gameEntity.name ?: "",
-                        gameEntity.categoryChinese
-                    )
+                    SimulatorDownloadManager.getInstance().showDownloadingDialog(context, simulator)
                 }
             },
             cancelClickCallback = {
@@ -133,10 +127,7 @@ object NewSimulatorGameManager {
                 )
 
                 val intent = Intent()
-                intent.setClassName(
-                    SimulatorGameManager.NEW_SIMULATOR_PACKAGE_NAME,
-                    GH_RETRO_EMU_APP_LAUNCHER_ACTIVITY_NAME
-                )
+                intent.setClassName(SimulatorGameManager.NEW_SIMULATOR_PACKAGE_NAME, GH_RETRO_EMU_APP_LAUNCHER_ACTIVITY_NAME)
                 intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
                 intent.data = gamePackageFileUri
                 gameEntity.getApk().safelyGetInRelease(0)?.let { apk ->
@@ -147,10 +138,7 @@ object NewSimulatorGameManager {
                 intent.putExtra(KEY_GAME_ICON, it)
                 intent.putExtra(KEY_GAME_PACKAGE_PATH, downloadEntity.path) // 游戏包文件路径，冗余参数)
                 intent.putExtra(KEY_GAME_PACKAGE_SDCARD_PATH, true)
-                intent.putExtra(
-                    KEY_GAME_PACKAGE_LAST_MODIFICATION,
-                    File(downloadEntity.path).lastModified()
-                ) // 游戏包文件修改时间
+                intent.putExtra(KEY_GAME_PACKAGE_LAST_MODIFICATION, File(downloadEntity.path).lastModified()) // 游戏包文件修改时间
                 intent.putExtra(KEY_GAME_EMU_SYSTEM, gameEntity.simulatorType) // 模拟器类型
                 intent.putExtra(KEY_GAME_ID, gameEntity.id)
                 // TODO 补充光环模拟器的游戏 id

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

@@ -14,7 +14,6 @@ import com.gh.common.util.PackageInstaller
 import com.gh.common.util.PackageUtils
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.R
-import com.gh.gamecenter.common.base.GlobalActivityManager
 import com.gh.gamecenter.common.base.TrackableDialog
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.utils.*
@@ -48,7 +47,6 @@ class SimulatorDownloadManager private constructor() {
     private var simulator: SimulatorEntity? = null
     private var gameId: String = ""
     private var gameName: String = ""
-    private var gameType: String = ""
     private var downloadType: String = ""
 
     private val dataWatcher = object : DataWatcher() {
@@ -101,43 +99,33 @@ class SimulatorDownloadManager private constructor() {
                             downloadDialog?.dismiss()
                         }
                     }
-
                     DownloadStatus.diskisfull == downloadEntity.status -> {
                         ToastUtils.showToast("存储空间已满，下载任务已暂停")
                     }
-
                     DownloadStatus.diskioerror == downloadEntity.status -> {
                         ToastUtils.showToast("下载 IO 出现异常，下载任务已暂停")
                     }
-
                     DownloadStatus.neterror == downloadEntity.status -> {
                         ToastUtils.showToast("网络不稳定，下载任务已暂停")
                     }
-
                     DownloadStatus.timeout == downloadEntity.status -> {
                         ToastUtils.showToast("网络不稳定，下载任务已暂停")
                     }
-
                     DownloadStatus.notfound == downloadEntity.status -> {
                         ToastUtils.showToast("下载链接异常，请稍后重试")
                     }
-
                     DownloadStatus.uncertificated == downloadEntity.status -> {
                         ToastUtils.showToast("请先进行实名认证")
                     }
-
                     DownloadStatus.unqualified == downloadEntity.status -> {
                         ToastUtils.showToast("未成年人暂不允许在此时间下载游戏")
                     }
-
                     DownloadStatus.unavailable == downloadEntity.status -> {
                         ToastUtils.showToast("该游戏未接入防沉迷系统，暂不支持下载")
                     }
-
                     DownloadStatus.banned == downloadEntity.status -> {
                         ToastUtils.showToast("网络异常")
                     }
-
                     DownloadStatus.hijack == downloadEntity.status -> {
                         ToastUtils.showToast("网络劫持，请稍后重试")
                     }
@@ -147,7 +135,7 @@ class SimulatorDownloadManager private constructor() {
     }
 
     fun showDownloadDialog(context: Context, simulator: SimulatorEntity?, location: SimulatorLocation) {
-        showDownloadDialog(context, simulator, location, "", "", "", null)
+        showDownloadDialog(context, simulator, location, "", "", null)
     }
 
     fun showDownloadDialog(
@@ -156,7 +144,6 @@ class SimulatorDownloadManager private constructor() {
         location: SimulatorLocation,
         gameId: String = "",
         gameName: String = "",
-        gameCategoryChinese: String = "",
         cancelCallback: (() -> Unit)? = null
     ) {
         if (context == null) return
@@ -165,7 +152,6 @@ class SimulatorDownloadManager private constructor() {
         this.simulator = simulator
         this.gameId = gameId
         this.gameName = gameName
-        this.gameType = gameCategoryChinese
 
         PermissionHelper.checkGetInstalledAppsListBeforeAction(context, object : EmptyCallback {
             override fun onCallback() {
@@ -197,8 +183,7 @@ class SimulatorDownloadManager private constructor() {
                     return
                 }
                 val title = if (shouldShowUpdate && isInstalled) "更新模拟器" else "安装模拟器"
-                val message =
-                    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 "取消"
@@ -210,25 +195,6 @@ class SimulatorDownloadManager private constructor() {
                 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,
@@ -241,79 +207,16 @@ class SimulatorDownloadManager private constructor() {
                             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)
+                        showDownloadingDialog(context, simulator)
                         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)
@@ -325,13 +228,7 @@ class SimulatorDownloadManager private constructor() {
         })
     }
 
-    fun showDownloadingDialog(
-        context: Context,
-        simulator: SimulatorEntity?,
-        gameId: String = "",
-        gameName: String = "",
-        gameCategoryChinese: String = "",
-    ) {
+    fun showDownloadingDialog(context: Context, simulator: SimulatorEntity?) {
         mContextRef = WeakReference(context)
         val msg = FileUtils.isCanDownload(context, simulator?.apk?.size)
         if (!msg.isNullOrEmpty()) {
@@ -364,11 +261,6 @@ class SimulatorDownloadManager private constructor() {
         }
 
         downloadDialog?.setOnDismissListener {
-            SensorsBridge.trackSimulatorDownloadDialogClose(
-                gameId = gameId,
-                gameName = gameName,
-                gameType = gameCategoryChinese
-            )
             DownloadManager.getInstance().removeObserver(dataWatcher)
         }
 
@@ -381,7 +273,7 @@ class SimulatorDownloadManager private constructor() {
         params?.width = context.resources.displayMetrics.widthPixels - DisplayUtils.dip2px(60f)
         downloadDialog?.window?.attributes = params
 
-        download(simulator, gameId, gameName, gameCategoryChinese)
+        download(simulator)
     }
 
     private fun showNoneEmulatorDialog(context: Context) {
@@ -401,12 +293,7 @@ class SimulatorDownloadManager private constructor() {
         )
     }
 
-    private fun download(
-        simulator: SimulatorEntity?,
-        gameId: String = "",
-        gameName: String = "",
-        gameCategoryChinese: String = ""
-    ) {
+    private fun download(simulator: SimulatorEntity?) {
         val apkEntity = simulator?.apk ?: return
 
         val entity = DownloadManager.getInstance().getDownloadEntityByUrl(apkEntity.url)
@@ -421,30 +308,18 @@ class SimulatorDownloadManager private constructor() {
                 DownloadStatus.diskisfull -> {
                     DownloadManager.getInstance().addObserver(dataWatcher)
                     uiExecutor.executeWithDelay(Runnable { DownloadManager.getInstance().resume(entity, true) }, 200)
-                    SensorsBridge.trackSimulatorDownloadDialogShow(
-                        gameId = gameId,
-                        gameName = gameName,
-                        gameType = gameCategoryChinese
-                    )
                     downloadDialog?.show()
                 }
-
                 DownloadStatus.done -> NDataChanger.notifyDataChanged(entity)
 
-                else -> createDownload(apkEntity, simulator, gameId, gameName, gameCategoryChinese)
+                else -> createDownload(apkEntity, simulator)
             }
         } else {
-            createDownload(apkEntity, simulator, gameId, gameName, gameCategoryChinese)
+            createDownload(apkEntity, simulator)
         }
     }
 
-    private fun createDownload(
-        apkEntity: ApkEntity,
-        simulator: SimulatorEntity,
-        gameId: String = "",
-        gameName: String = "",
-        gameCategoryChinese: String = ""
-    ) {
+    private fun createDownload(apkEntity: ApkEntity, simulator: SimulatorEntity) {
         DownloadManager.getInstance().addObserver(dataWatcher)
         val downloadId = PackageInstaller.createDownloadId(simulator.name)
         val downloadEntity = DownloadEntity()
@@ -476,11 +351,6 @@ class SimulatorDownloadManager private constructor() {
             downloadType,
             ""
         )
-        SensorsBridge.trackSimulatorDownloadDialogShow(
-            gameId = gameId,
-            gameName = gameName,
-            gameType = gameCategoryChinese
-        )
 
         downloadDialog?.show()
     }

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

@@ -150,7 +150,7 @@ object SimulatorGameManager {
                 SimulatorDownloadManager.getInstance().showDownloadDialog(
                     AppManager.getInstance().recentActiveActivity, simulator,
                     SimulatorDownloadManager.SimulatorLocation.LAUNCH, gameEntity.id, gameEntity.name
-                        ?: "", gameEntity.categoryChinese
+                        ?: ""
                 ) {
                     jumpToSimulator(downloadEntity, gameEntity)
                 }

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

@@ -19,11 +19,44 @@ object AdHelper {
     const val LOCATION_SUGGESTION_FUNCTION = "suggestion_function"
     const val LOCATION_SIMULATOR_GAME = "simulator_game"
 
+    @JvmStatic
+    fun getStartUpAd(): StartupAdEntity? {
+        return Config.getNewApiSettingsEntity()?.startAd
+    }
+
     @JvmStatic
     fun getStartUp(): StartupAdEntity? {
         return Config.getNewApiSettingsEntity()?.startup
     }
 
+    @JvmStatic
+    fun prefetchStartUpAd(settingsEntity: NewApiSettingsEntity) {
+        if (settingsEntity.startAd != null && !settingsEntity.startAd?.img.isNullOrEmpty()) {
+            val screenWidth = DisplayUtils.getScreenWidth()
+            val transformedUrl = ImageUtils.getTransformedUrl(settingsEntity.startAd?.img, screenWidth) ?: return
+            ImageUtils.prefetchToDiskCache(transformedUrl)
+        }
+    }
+
+    fun getSettingAdCache() {
+        RetrofitManager.getInstance().newApi
+            .getSettingAdCache(HaloApp.getInstance().channel)
+            .compose(observableToMain())
+            .subscribe(object : Response<NewApiSettingsEntity>() {
+                override fun onResponse(response: NewApiSettingsEntity?) {
+                    super.onResponse(response)
+                    val settings = Config.getNewApiSettingsEntity()
+                    if (settings != null) {
+                        settings.startAd = response?.startAd
+                        Config.updateNewApiSettings(settings)
+                        if (response != null) {
+                            prefetchStartUpAd(response)
+                        }
+                    }
+                }
+            })
+    }
+
     fun getAd(location: String): SettingsEntity.AD? {
         val adList = Config.getSettings()?.adList ?: return null
 

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

@@ -109,12 +109,12 @@ object ArchiveDownloadButtonHelper {
             R.string.archive_download_dialog_content.toResString(),
             R.string.archive_download_dialog_confirm.toResString(),
             R.string.cancel.toResString(),
-            confirmClickCallback = {
+            {
                 NewFlatLogUtils.logCloudArchiveGameDownloadDialogClick(R.string.archive_download_dialog_confirm.toResString())
                 VHelper.disableLaunchGameAfterInstallation()
                 EventBus.getDefault().post(EBReuse("download"))
             },
-            cancelClickCallback = {
+            {
                 NewFlatLogUtils.logCloudArchiveGameDownloadDialogClick(R.string.cancel.toResString())
             },
             extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)

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

@@ -13,7 +13,7 @@ import com.gh.gamecenter.common.json.json
 import com.gh.gamecenter.common.utils.ifLogin
 import com.gh.gamecenter.common.utils.showAutoOrientation
 import com.gh.gamecenter.common.view.BugFixedPopupWindow
-import com.gh.gamecenter.feature.entity.CommentEntity
+import com.gh.gamecenter.entity.CommentEntity
 import com.gh.gamecenter.feature.entity.Permissions
 import com.gh.gamecenter.login.user.UserManager
 import com.gh.gamecenter.qa.comment.OnCommentOptionClickListener

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

@@ -29,7 +29,7 @@ import com.gh.gamecenter.common.utils.ImageUtils;
 import com.gh.gamecenter.core.utils.DisplayUtils;
 import com.gh.gamecenter.core.utils.NumberUtils;
 import com.gh.gamecenter.core.utils.ToastUtils;
-import com.gh.gamecenter.feature.entity.CommentEntity;
+import com.gh.gamecenter.entity.CommentEntity;
 import com.gh.gamecenter.feature.entity.MeEntity;
 import com.gh.gamecenter.login.entity.UserInfoEntity;
 import com.gh.gamecenter.login.user.UserManager;
@@ -177,8 +177,6 @@ public class CommentUtils {
                                     return null;
                                 },
                                 null,
-                                null,
-                                null,
                                 new DialogHelper.Config("", false, true, true, false, -1)
                         );
                         break;

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

@@ -1,12 +1,10 @@
-package com.gh.gamecenter.feature.utils
+package com.gh.common.util
 
 import android.text.TextUtils
-import com.alibaba.android.arouter.launcher.ARouter
-import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.common.eventbus.EBConcernChanged
+import com.gh.gamecenter.login.user.UserManager
 import com.gh.gamecenter.common.retrofit.Response
-import com.gh.gamecenter.core.provider.IUserManagerProvider
-import com.gh.gamecenter.feature.eventbus.EBConcernChanged
-import com.gh.gamecenter.feature.retrofit.RetrofitManager
+import com.gh.gamecenter.retrofit.RetrofitManager
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
 import okhttp3.ResponseBody
@@ -19,9 +17,6 @@ import retrofit2.HttpException
  */
 object ConcernUtils {
 
-    private val mUserManager =
-        ARouter.getInstance().build(RouteConsts.provider.userManager).navigation() as? IUserManagerProvider
-
     /**
      * autoConcern:是否自动关注'关联关注'
      */
@@ -32,18 +27,23 @@ object ConcernUtils {
     ) {
         val mode = if (autoConcern) "auto" else "manual"
 
-        val userId = mUserManager?.getUserId()
+        val userId = UserManager.getInstance().userId
         if (TextUtils.isEmpty(userId)) return
 
         RetrofitManager.getInstance().api
-            .postConcern(userId!!, gameId, mode)
+            .postConcern(UserManager.getInstance().userId, gameId, mode)
             .subscribeOn(Schedulers.io())
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe(object : Response<ResponseBody>() {
                 override fun onResponse(response: ResponseBody?) {
                     super.onResponse(response)
                     listener?.onSuccess()
-                    EventBus.getDefault().post(EBConcernChanged(gameId, true))
+                    EventBus.getDefault().post(
+                        EBConcernChanged(
+                            gameId,
+                            true
+                        )
+                    )
                 }
 
                 override fun onFailure(e: HttpException?) {
@@ -54,18 +54,20 @@ object ConcernUtils {
     }
 
     fun deleteConcernData(gameId: String, listener: OnConcernListener?) {
-        val userId = mUserManager?.getUserId()
-        if (TextUtils.isEmpty(userId)) return
-
         RetrofitManager.getInstance().api
-            .deleteConcern(userId!!, gameId)
+            .deleteConcern(UserManager.getInstance().userId, gameId)
             .subscribeOn(Schedulers.io())
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe(object : Response<ResponseBody>() {
                 override fun onResponse(response: ResponseBody?) {
                     super.onResponse(response)
                     listener?.onSuccess()
-                    EventBus.getDefault().post(EBConcernChanged(gameId, false))
+                    EventBus.getDefault().post(
+                        EBConcernChanged(
+                            gameId,
+                            false
+                        )
+                    )
                 }
 
                 override fun onFailure(e: HttpException?) {

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

@@ -8,6 +8,7 @@ import com.gh.common.filter.RegionSetting;
 import com.gh.common.filter.RegionSettingHelper;
 import com.gh.common.repository.ReservationRepository;
 import com.gh.common.simulator.SimulatorGameManager;
+import com.gh.common.util.PackageUtils;
 import com.gh.gamecenter.feature.view.DownloadButton;
 import com.gh.common.xapk.XapkInstaller;
 import com.gh.common.xapk.XapkUnzipStatus;

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;
@@ -34,7 +33,6 @@ 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;
@@ -59,6 +57,7 @@ import com.gh.gamecenter.common.utils.DialogHelper;
 import com.gh.gamecenter.common.utils.ExtensionsKt;
 import com.gh.gamecenter.common.utils.ImageUtils;
 import com.gh.gamecenter.common.utils.NetworkUtils;
+import com.gh.common.util.PackageUtils;
 import com.gh.gamecenter.common.utils.SensorsBridge;
 import com.gh.gamecenter.common.view.CustomLinkMovementMethod;
 import com.gh.gamecenter.common.view.DrawableView;
@@ -73,8 +72,8 @@ import com.gh.gamecenter.core.utils.MtaHelper;
 import com.gh.gamecenter.core.utils.SPUtils;
 import com.gh.gamecenter.core.utils.SpanBuilder;
 import com.gh.gamecenter.core.utils.ToastUtils;
-import com.gh.gamecenter.databinding.DialogAddressConfirmationBinding;
 import com.gh.gamecenter.databinding.DialogBindPhoneBinding;
+import com.gh.gamecenter.databinding.DialogOverseaConfirmationBinding;
 import com.gh.gamecenter.databinding.DialogPackageParseErrorBinding;
 import com.gh.gamecenter.databinding.DialogRelievePhoneBinding;
 import com.gh.gamecenter.databinding.DialogReportReasonBinding;
@@ -123,7 +122,7 @@ public class DialogUtils {
         return dialog;
     }
 
-    public static void checkDownload(Context context, String size, String gameId, String gameName, String gameCategoryChinese, CheckDownloadCallBack callBack) {
+    public static void checkDownload(Context context, String size, String gameId, String gameName, CheckDownloadCallBack callBack) {
         if (!NetworkUtils.isNetworkConnected(context)) {
             showNoConnectionDownloadDialog(context, () -> {
                     },
@@ -140,8 +139,7 @@ public class DialogUtils {
                     () -> callBack.onResponse(false),
                     () -> callBack.onResponse(true),
                     gameId,
-                    gameName,
-                    gameCategoryChinese);
+                    gameName);
         }
     }
 
@@ -170,9 +168,7 @@ public class DialogUtils {
         DialogHelper.showDialog(context, "下载提示", "网络异常，请检查手机网络状态", "知道了", "WiFi自动下载", listener::onConfirm, cancelListener::onCancel, false, "", "");
     }
 
-    public static void showDownloadDialog(Context context, ConfirmListener listener, CancelListener cancelListener, String gameId, String gameName, String gameCategoryChinese) {
-        SensorsBridge.trackDownloadMobileDataDialogShow(gameId, gameName, gameCategoryChinese);
-
+    public static void showDownloadDialog(Context context, ConfirmListener listener, CancelListener cancelListener, String gameId, String gameName) {
         context = checkDialogContext(context);
 
         NewFlatLogUtils.logDownloadMobileDataDialogShow(gameId, gameName);
@@ -187,7 +183,6 @@ public class DialogUtils {
         Context finalContext = context;
         allowOnce.setOnClickListener(v -> {
             NewFlatLogUtils.logDownloadMobileDataDialogClick(gameId, gameName, "允许一次");
-            SensorsBridge.trackDownloadMobileDataDialogClick("允许一次", gameId, gameName, gameCategoryChinese);
             AppExecutor.getUiExecutor().executeWithDelay(() -> {
                 Utils.toast(finalContext, "已使用移动网络下载，请注意流量消耗");
             }, 500);
@@ -197,14 +192,12 @@ public class DialogUtils {
         });
         wifiAuto.setOnClickListener(v -> {
             NewFlatLogUtils.logDownloadMobileDataDialogClick(gameId, gameName, "WiFi自动下载");
-            SensorsBridge.trackDownloadMobileDataDialogClick("WiFi自动下载", gameId, gameName, gameCategoryChinese);
             cancelListener.onCancel();
             dialog.dismiss();
 //            MtaHelper.onEvent("移动网络下载", NetworkUtils.getMobileNetworkType(finalContext), "连上WiFi后自动下载");
         });
         allowAlways.setOnClickListener(v -> {
             NewFlatLogUtils.logDownloadMobileDataDialogClick(gameId, gameName, "总是允许");
-            SensorsBridge.trackDownloadMobileDataDialogClick("总是允许", gameId, gameName, gameCategoryChinese);
             SPUtils.setBoolean(getTrafficDownloadHintKey(), false);
             AppExecutor.getUiExecutor().executeWithDelay(() -> {
                 // 显示了弹窗以后，即便下面这个 toast 放在 listener.onConfirm 后调用也是显示 listener.onConfirm 里的 toast
@@ -216,10 +209,7 @@ public class DialogUtils {
 //            MtaHelper.onEvent("移动网络下载", NetworkUtils.getMobileNetworkType(finalContext), "总是允许");
         });
 
-        dialog.setOnCancelListener(downloadDialog -> {
-            NewFlatLogUtils.logDownloadMobileDataDialogClick(gameId, gameName, "关闭弹窗");
-            SensorsBridge.trackDownloadMobileDataDialogClick("关闭弹窗", gameId, gameName, gameCategoryChinese);
-        });
+        dialog.setOnCancelListener(downloadDialog -> NewFlatLogUtils.logDownloadMobileDataDialogClick(gameId, gameName, "关闭弹窗"));
 
         dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
         dialog.setContentView(contentView);
@@ -741,102 +731,42 @@ public class DialogUtils {
 
     // 海外下载地址弹窗
     public static void showOverseaDownloadDialog(Context context, GameEntity gameEntity, @NonNull ConfirmListener listener) {
-        SensorsBridge.trackOverseasAddressDialogShow(
-                gameEntity.getId(),
-                gameEntity.getName() != null ? gameEntity.getName() : "",
-                gameEntity.getCategoryChinese()
-        );
-
         context = checkDialogContext(context);
 
-        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
-
-        DialogAddressConfirmationBinding binding = DialogAddressConfirmationBinding.inflate(LayoutInflater.from(context), null, false);
-
-        View contentView = binding.getRoot();
-
-        binding.gameIcon.displayGameIcon(gameEntity);
-
-        AtomicBoolean dismissByTouchInside = new AtomicBoolean(false);
-
-        binding.closeIv.setOnClickListener(v -> {
-            dismissByTouchInside.set(true);
-            SensorsBridge.trackOverseasAddressDialogClick(
-                    "取消",
-                    gameEntity.getId(),
-                    gameEntity.getName() != null ? gameEntity.getName() : "",
-                    gameEntity.getCategoryChinese()
-            );
-            dialog.dismiss();
-        });
-
-        if ("show&download".equals(gameEntity.getOverseasAddressDialog().getStatus())) {
-            gameEntity.getApk().get(0).setUrl(gameEntity.getOverseasAddressDialog().getLink());
-        }
-        binding.urlTv.setText(gameEntity.getOverseasAddressDialog().getLink());
-        binding.downloadBtn.setText("下载（" + gameEntity.getApk().get(0).getSize() + "）");
-        binding.downloadBtn.setOnClickListener(v -> {
-            dismissByTouchInside.set(true);
-            SensorsBridge.trackOverseasAddressDialogClick(
-                    "下载",
-                    gameEntity.getId(),
-                    gameEntity.getName() != null ? gameEntity.getName() : "",
-                    gameEntity.getCategoryChinese()
-            );
+        if (gameEntity.getOverseasAddressDialog() == null
+                || gameEntity.getApk().size() == 0
+                || !gameEntity.getOverseasAddressDialog().isEnable()) {
             listener.onConfirm();
-            dialog.dismiss();
-        });
+        } else {
+            final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
 
-        Window window = dialog.getWindow();
-        if (window != null) {
-            window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-        }
+            DialogOverseaConfirmationBinding binding = DialogOverseaConfirmationBinding.inflate(LayoutInflater.from(context), null, false);
 
-        dialog.setOnDismissListener(dialog1 -> {
-            if (!dismissByTouchInside.get()) {
-                SensorsBridge.trackOverseasAddressDialogClick(
-                        "关闭弹窗",
-                        gameEntity.getId(),
-                        gameEntity.getName() != null ? gameEntity.getName() : "",
-                        gameEntity.getCategoryChinese()
-                );
+            View contentView = binding.getRoot();
+
+            binding.gameIcon.displayGameIcon(gameEntity);
+            binding.gameNameTv.setText(context.getString(R.string.dialog_oversea_hint, gameEntity.getName()));
+            binding.closeIv.setOnClickListener(v -> dialog.dismiss());
+
+            if ("show&download".equals(gameEntity.getOverseasAddressDialog().getStatus())) {
+                gameEntity.getApk().get(0).setUrl(gameEntity.getOverseasAddressDialog().getLink());
             }
-        });
+            binding.urlTv.setText(gameEntity.getOverseasAddressDialog().getLink());
+            binding.downloadBtn.setText("下载（" + gameEntity.getApk().get(0).getSize() + "）");
+            binding.downloadBtn.setOnClickListener(v -> {
+                listener.onConfirm();
+                dialog.dismiss();
+            });
 
-        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-        dialog.setContentView(contentView);
-        dialog.show();
-    }
+            Window window = dialog.getWindow();
+            if (window != null) {
+                window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+            }
 
-    // 跳转第三方落地页下载弹窗
-    public static void showLandPageAddressDialog(Context context, GameEntity gameEntity, @NonNull ConfirmListener listener) {
-        context = checkDialogContext(context);
-
-        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
-
-        DialogAddressConfirmationBinding binding = DialogAddressConfirmationBinding.inflate(LayoutInflater.from(context), null, false);
-
-        View contentView = binding.getRoot();
-
-        binding.gameIcon.displayGameIcon(gameEntity);
-        binding.gameNameTv.setText(context.getString(R.string.dialog_land_page_address_hint, gameEntity.getName()));
-        binding.closeIv.setOnClickListener(v -> dialog.dismiss());
-
-        binding.urlTv.setText(gameEntity.getLandPageAddressDialog().getLink());
-        binding.downloadBtn.setText(context.getString(R.string.dialog_land_page_address_confirm));
-        binding.downloadBtn.setOnClickListener(v -> {
-            listener.onConfirm();
-            dialog.dismiss();
-        });
-
-        Window window = dialog.getWindow();
-        if (window != null) {
-            window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+            dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+            dialog.setContentView(contentView);
+            dialog.show();
         }
-
-        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-        dialog.setContentView(contentView);
-        dialog.show();
     }
 
     public static void showGameH5DownloadDialog(Context context, GameEntity gameEntity, RegionSetting.GameH5Download gameH5Download) {
@@ -844,7 +774,7 @@ public class DialogUtils {
 
         final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
 
-        DialogAddressConfirmationBinding binding = DialogAddressConfirmationBinding.inflate(LayoutInflater.from(context), null, false);
+        DialogOverseaConfirmationBinding binding = DialogOverseaConfirmationBinding.inflate(LayoutInflater.from(context), null, false);
 
         View contentView = binding.getRoot();
 
@@ -1255,7 +1185,7 @@ public class DialogUtils {
             @Override
             public Unit invoke() {
                 SimpleGameEntity entity = new SimpleGameEntity(gameId, gameName, "");
-                HelpAndFeedbackBridge.startSuggestionActivity(finalContext, SuggestType.GAME, "notfound", "模拟器安装包解析错误", entity);
+                HelpAndFeedbackBridge.startSuggestionActivity(finalContext, SuggestType.gameQuestion, "notfound", "模拟器安装包解析错误", entity, "-");
                 dialog.dismiss();
                 return null;
             }
@@ -1364,13 +1294,11 @@ public class DialogUtils {
         return dialog;
     }
 
-    public static void showReserveOrVoteSuccess2WechatBindDialog(Context context, Boolean isReserve, ConfirmListener confirmListener, CancelListener cancelListener) {
+    public static void showReserveSuccess2WechatBindDialog(Context context, ConfirmListener confirmListener, CancelListener cancelListener) {
         context = checkDialogContext(context);
 
         final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
         DialogWechatReserveSuccessBinding binding = DialogWechatReserveSuccessBinding.inflate(LayoutInflater.from(context));
-        binding.titleIv.setImageResource(isReserve ? R.drawable.bg_reserve_success : R.drawable.bg_vote_success);
-        binding.contentTv.setText(isReserve ? "游戏上线时，您将在消息中心收到通知。为了避免错过通知，建议您开启微信公众号提醒": "版本上线时，您将在消息中心收到通知。为了避免错过通知，亦建议您开启微信公众号提醒");
         binding.closeBtn.setOnClickListener(v -> {
             cancelListener.onCancel();
             dialog.dismiss();
@@ -1391,13 +1319,13 @@ public class DialogUtils {
         }
     }
 
-    public static void showReserveOrVoteSuccessDialog(Context context, Boolean isReserve) {
+    public static void showReserveSuccessDialog(Context context) {
         context = checkDialogContext(context);
 
         final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
         DialogAlertDefaultBinding binding = DialogAlertDefaultBinding.inflate(LayoutInflater.from(context));
-        binding.titleTv.setText(isReserve ? "游戏预约成功" : "版本投票成功");
-        binding.contentTv.setText(isReserve ? "游戏上线时，您将在消息中心和微信公众号收到通知，不会错过任何预约的游戏" : "版本上线时，您将在消息中心和微信公众号收到通知，不会错过任何投票的版本");
+        binding.titleTv.setText("游戏预约成功");
+        binding.contentTv.setText("游戏上线时，您将在消息中心和微信公众号收到通知，不会错过任何预约的游戏");
         binding.confirmTv.setText("我知道了");
         binding.centerDivider.setVisibility(View.GONE);
         binding.cancelTv.setVisibility(View.GONE);

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

@@ -1,6 +1,5 @@
 package com.gh.common.util
 
-import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.ActivityNotFoundException
 import android.content.Context
@@ -15,7 +14,6 @@ import com.gh.common.constant.Config
 import com.gh.common.exposure.ExposureManager.log
 import com.gh.common.exposure.ExposureTraceUtils.appendTrace
 import com.gh.common.util.EntranceUtils.jumpActivity
-import com.gh.common.util.EntranceUtils.jumpActivityCompat
 import com.gh.gamecenter.*
 import com.gh.gamecenter.amway.AmwayActivity
 import com.gh.gamecenter.catalog.CatalogActivity
@@ -24,7 +22,9 @@ import com.gh.gamecenter.category2.CategoryV2Activity
 import com.gh.gamecenter.common.base.activity.BaseActivity
 import com.gh.gamecenter.common.base.activity.BaseActivity_TabLayout
 import com.gh.gamecenter.common.base.activity.ToolBarActivity
+import com.gh.gamecenter.common.base.activity.ToolBarActivity.NORMAL_FRAGMENT_NAME
 import com.gh.gamecenter.common.base.fragment.BaseFragment_TabLayout
+import com.gh.gamecenter.common.constant.CommonConsts
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.constant.EntranceConsts.*
@@ -32,7 +32,6 @@ import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.entity.*
 import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.common.utils.*
-import com.gh.gamecenter.core.provider.IQGameProvider
 import com.gh.gamecenter.core.runOnIoThread
 import com.gh.gamecenter.core.utils.ToastUtils
 import com.gh.gamecenter.discovery.DiscoveryActivity
@@ -48,7 +47,6 @@ import com.gh.gamecenter.feature.entity.MeEntity
 import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.gh.gamecenter.feature.exposure.ExposureEvent.Companion.createEvent
 import com.gh.gamecenter.feature.exposure.ExposureType
-import com.gh.gamecenter.feature.provider.IConcernInfoProvider
 import com.gh.gamecenter.forum.detail.ForumDetailActivity
 import com.gh.gamecenter.forum.home.CommunityHomeFragment
 import com.gh.gamecenter.forum.search.ForumOrUserSearchActivity
@@ -64,6 +62,7 @@ import com.gh.gamecenter.gamedetail.fuli.kaifu.ServersCalendarActivity
 import com.gh.gamecenter.gamedetail.history.HistoryApkListActivity
 import com.gh.gamecenter.gamedetail.rating.RatingReplyActivity
 import com.gh.gamecenter.help.HelpAndFeedbackBridge
+import com.gh.gamecenter.libao.view.LibaoFragment
 import com.gh.gamecenter.login.user.UserManager
 import com.gh.gamecenter.personalhome.UserHomeActivity
 import com.gh.gamecenter.personalhome.background.PersonalityBackgroundActivity
@@ -74,9 +73,6 @@ import com.gh.gamecenter.qa.article.detail.ArticleDetailActivity
 import com.gh.gamecenter.qa.questions.newdetail.NewQuestionDetailActivity
 import com.gh.gamecenter.qa.subject.CommunitySubjectActivity
 import com.gh.gamecenter.qa.video.detail.ForumVideoDetailActivity
-import com.gh.gamecenter.qgame.QGameHomeWrapperActivity
-import com.gh.gamecenter.qgame.QGameSearchActivity
-import com.gh.gamecenter.qgame.QGameViewModel
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.gh.gamecenter.servers.GameServerTestActivity
 import com.gh.gamecenter.servers.GameServersActivity
@@ -100,6 +96,7 @@ import org.greenrobot.eventbus.EventBus
 import retrofit2.HttpException
 import java.net.URLEncoder
 import java.util.*
+import kotlin.collections.ArrayList
 import kotlin.math.roundToInt
 
 /**
@@ -107,6 +104,53 @@ import kotlin.math.roundToInt
  */
 object DirectUtils {
 
+    /**
+     * 跳转到特定页面，根据 [type] 决定跳转页面，[path] 为跳转前的页面名称
+     */
+    @JvmStatic
+    fun directToSpecificPage(
+        context: Context,
+        type: String,
+        link: String,
+        text: String? = "",
+        entrance: String? = null,
+        path: String? = null
+    ) {
+        when (type) {
+            HOST_ARTICLE -> directToArticle(context, id = link, entrance = entrance)
+
+            HOST_GAME -> directToGameDetail(context, id = link, entrance = entrance)
+
+            HOST_GAME_DOWNLOAD -> directToGameDetail(context, id = link, entrance = entrance, autoDownload = true)
+
+            HOST_COLUMN -> directToSubject(context, id = link, subjectName = text, entrance = entrance)
+
+            HOST_QUESTION -> directToQuestionDetail(context, id = link, entrance = entrance, path = path)
+
+            HOST_ANSWER -> directToAnswerDetail(context, id = link, entrance = entrance, path = path)
+
+            HOST_WEB -> directToWebView(context, url = link, entrance = entrance)
+
+            HOST_DOWNLOAD -> directToDownloadManagerAndStartDownload(
+                context,
+                gameId = link,
+                packageName = text,
+                entrance = entrance
+            )
+
+            HOST_UPDATE -> directToDownloadManagerAndStartUpdate(
+                context,
+                gameId = link,
+                packageName = text,
+                entrance = entrance
+            )
+
+            HOST_LIBAO -> directToGiftDetail(context, giftId = link, entrance = entrance)
+
+            HOST_COMMUNITY -> directToCommunity(context, CommunityEntity(link, text!!))
+        }
+    }
+
     @JvmStatic
     fun directToLinkPage(context: Context, linkEntity: LinkEntity, entrance: String, path: String) {
         directToLinkPage(context, linkEntity, entrance, path, null)
@@ -222,12 +266,11 @@ object DirectUtils {
                 path
             )
 
-            HOST_WEB, HOST_WEB_INURL, HOST_WEB_AL -> {
+            "web", "inurl", "web链接" -> {
                 when {
                     linkEntity.link!!.contains("v.douyin") && PackageHelper.localPackageNameSet.contains("com.ss.android.ugc.aweme") -> {
                         directDouyin(context, "1402577827140941")
                     }
-
                     else -> directToWebView(
                         context,
                         url = linkEntity.link!!,
@@ -281,16 +324,7 @@ object DirectUtils {
                 )
             }
 
-            "column_collection", "专题合集" -> directToColumnCollection(
-                context,
-                linkEntity.link!!,
-                -1,
-                entrance,
-                "",
-                linkEntity.blockId,
-                linkEntity.blockName,
-                exposureEvent
-            )
+            "column_collection", "专题合集" -> directToColumnCollection(context, linkEntity.link!!, -1, entrance, "", exposureEvent)
 
             "server", "game_server", "开服表" -> directToGameServers(context, entrance, path, exposureEvent)
 
@@ -310,9 +344,9 @@ object DirectUtils {
 
             "libao", "礼包" -> directToGiftDetail(context, linkEntity.link ?: "", entrance)
 
-            "feedback" -> directToFeedback(context, linkEntity.name, false, "", false, false, entrance)
+            "feedback" -> directToFeedback(context, linkEntity.name, linkEntity.text, false, "", entrance)
 
-            "qa", "qa_content", "Q&A" -> directToQa(context, linkEntity.text ?: "", linkEntity.link ?: "")
+            "qa", "Q&A" -> directToQa(context, linkEntity.text ?: "", linkEntity.link ?: "")
 
             "qa_collection", "Q&A合集" -> directToQaCollection(
                 context, linkEntity.text
@@ -320,12 +354,7 @@ object DirectUtils {
                     ?: ""
             )
 
-            "anliwall", "安利墙" -> directToAmway(
-                context,
-                fixedTopAmwayCommentId = null,
-                entrance = entrance,
-                path = path
-            )
+            "anliwall", "安利墙" -> directToAmway(context, fixedTopAmwayCommentId = null, entrance = entrance, path = path)
 
             "game_detail_comment" -> directToGameDetail(context, linkEntity.link ?: "", entrance)
 
@@ -389,7 +418,7 @@ object DirectUtils {
             "column_test" -> context.startActivity(
                 GameServerTestActivity.getIntent(
                     context, linkEntity.link
-                        ?: "", linkEntity.text ?: "", entrance, exposureEvent
+                        ?: "", linkEntity.text ?: "", entrance
                 )
             )
 
@@ -417,7 +446,7 @@ object DirectUtils {
 
             //"h5_game_center" -> directLetoGameCenter(context)
 
-            "game_list" -> directToGameCollectionSquare(context, entrance, traceEvent = exposureEvent)
+            "game_list" -> directToGameCollectionSquare(context, entrance, "", "", "")
 
             "game_list_detail" -> directToGameCollectionDetail(
                 context,
@@ -442,12 +471,9 @@ object DirectUtils {
                 )
             )
 
-            "qq_mini_game_column" -> directToQGameHome(context)
-
             "" -> {
                 // do nothing
             }
-
             else -> {
                 if (unknownCallback != null) {
                     unknownCallback.invoke()
@@ -496,8 +522,6 @@ object DirectUtils {
         position: Int = -1,
         entrance: String,
         columnName: String = "",
-        blockId: String = "",
-        blockName: String = "",
         exposureEvent: ExposureEvent? = null
     ) {
         if (id.isEmpty()) return
@@ -506,11 +530,9 @@ object DirectUtils {
         bundle.putString(KEY_ENTRANCE, entrance)
         bundle.putString(KEY_COLLECTION_ID, id)
         bundle.putString(KEY_COLUMNNAME, columnName)
-        bundle.putString(KEY_BLOCK_ID, blockId)
-        bundle.putString(KEY_BLOCK_NAME, blockName)
         bundle.putInt(KEY_POSITION, position)
         if (exposureEvent != null) {
-            bundle.putParcelableArrayList(EntranceConsts.KEY_EXPOSURE_SOURCE_LIST, ArrayList(exposureEvent.source))
+            bundle.putParcelableArrayList(EntranceConsts.KEY_EXPOSURE_SOURCE_LIST ,ArrayList(exposureEvent.source))
         }
         jumpActivity(context, bundle)
     }
@@ -738,13 +760,11 @@ object DirectUtils {
         id: String,
         subjectName: String? = "",
         entrance: String? = null,
-        exposureEvent: ExposureEvent? = null,
-        isQQMiniGame: Boolean = false,
+        exposureEvent: ExposureEvent? = null
     ) {
         if (id.isEmpty()) return
         val bundle = Bundle()
-        val subjectData =
-            SubjectData(subjectId = id, subjectName = subjectName, isOrder = false, isQQMiniGame = isQQMiniGame)
+        val subjectData = SubjectData(subjectId = id, subjectName = subjectName, isOrder = false)
         bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
         bundle.putString(KEY_TO, SubjectActivity::class.java.name)
         bundle.putParcelable(EntranceConsts.KEY_SUBJECT_DATA, subjectData)
@@ -758,68 +778,72 @@ object DirectUtils {
     // 反馈
     @JvmStatic
     fun directToFeedback(context: Context, content: String? = null, entrance: String? = null) {
-        directToFeedback(context, content, false, "", false, false, entrance)
+        directToFeedback(context, content, null, false, "", entrance)
     }
 
     @JvmStatic
     fun directToFeedback(
         context: Context,
         content: String? = null,
+        hintType: String? = null,
         isQaFeedback: Boolean = false,
         qaContentId: String? = "",
-        isPlugin: Boolean = false,
-        isSmoothGame: Boolean = false,
         entrance: String? = null
     ) {
         val bundle = Bundle()
         bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
-        bundle.putBoolean(KEY_PLUGIN, isPlugin)
-        bundle.putBoolean(KEY_SMOOTH_GAME, isSmoothGame)
-        if (isPlugin) {
-            bundle.putString(KEY_HIDE_SUGGEST_HINT, "【插件问题】")
-        }
-        if (isSmoothGame) {
-            bundle.putString(KEY_HIDE_SUGGEST_HINT, "【畅玩问题】")
-        }
+        val destination = RouteConsts.activity.suggestionActivity.toDestinationClass()
+        bundle.putString(KEY_TO, destination?.name ?: "")
         if (isQaFeedback) {
             bundle.putBoolean(KEY_IS_QA_FEEDBACK, true)
             bundle.putString(KEY_QA_CONTENT_ID, qaContentId)
+            bundle.putSerializable(KEY_SUGGESTTYPE, SuggestType.normal)
         } else {
             bundle.putString(KEY_CONTENT, content)
+            if (TextUtils.isEmpty(hintType)) {
+                bundle.putSerializable(KEY_SUGGESTTYPE, SuggestType.gameQuestion)
+                bundle.putString(KEY_SUGGEST_HINT_TYPE, KEY_PLUGIN)
+            } else {
+                bundle.putSerializable(KEY_SUGGESTTYPE, SuggestType.normal)
+                bundle.putString(KEY_SUGGEST_HINT_TYPE, hintType)
+            }
         }
-        context.startActivity(HelpAndFeedbackBridge.getSuggestionCategoryIntent(context, bundle))
+
+        jumpActivity(context, bundle)
     }
 
     /**
-     * 跳转至使用帮助与反馈，请不要随意修改方法名
+     * 畅玩助手反馈跳转
      */
     @JvmStatic
-    fun directToHelpAndFeedback(
+    fun directToVGameFeedback(
         context: Context,
         content: String? = null,
+        hintType: String? = null,
         isQaFeedback: Boolean = false,
         qaContentId: String? = "",
-        isPlugin: Boolean = false,
-        isSmoothGame: Boolean = false,
         entrance: String? = null
     ) {
         val bundle = Bundle()
         bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
-        bundle.putBoolean(KEY_PLUGIN, isPlugin)
-        bundle.putBoolean(KEY_SMOOTH_GAME, isSmoothGame)
-        if (isPlugin) {
-            bundle.putString(KEY_HIDE_SUGGEST_HINT, "【插件问题】")
-        }
-        if (isSmoothGame) {
-            bundle.putString(KEY_HIDE_SUGGEST_HINT, "【畅玩问题】")
-        }
+        val destination = RouteConsts.activity.suggestionActivity.toDestinationClass()
+        bundle.putString(KEY_TO, destination?.name ?: "")
         if (isQaFeedback) {
             bundle.putBoolean(KEY_IS_QA_FEEDBACK, true)
             bundle.putString(KEY_QA_CONTENT_ID, qaContentId)
+            bundle.putSerializable(KEY_SUGGESTTYPE, SuggestType.cwzsQuestion)
         } else {
             bundle.putString(KEY_CONTENT, content)
+            if (TextUtils.isEmpty(hintType)) {
+                bundle.putSerializable(KEY_SUGGESTTYPE, SuggestType.gameQuestion)
+                bundle.putString(KEY_SUGGEST_HINT_TYPE, KEY_PLUGIN)
+            } else {
+                bundle.putSerializable(KEY_SUGGESTTYPE, SuggestType.cwzsQuestion)
+                bundle.putString(KEY_SUGGEST_HINT_TYPE, hintType)
+            }
         }
-        directToHelpAndFeedback(context, bundle)
+
+        EntranceUtils.jumpActivityCompat(context, bundle)
     }
 
     @JvmStatic
@@ -988,29 +1012,6 @@ object DirectUtils {
 
     }
 
-    /**
-     * 跳转到 礼包详情
-     */
-    @JvmStatic
-    fun directToGiftDetail(context: Context, giftId: String, entrance: String? = null) {
-        if (giftId.isEmpty()) return
-        val bundle = Bundle()
-        bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
-        bundle.putString(KEY_TO, LibaoDetailActivity::class.java.simpleName)
-        bundle.putString(EntranceConsts.KEY_ID, giftId)
-        HaloApp.put(LibaoEntity.TAG, null)
-        jumpActivity(context, bundle)
-    }
-
-    /**
-     * 跳转到礼包中心，请不要随意修改方法名
-     */
-    @JvmStatic
-    fun directToGift(context: Context, entrance: String) {
-        val intent = LibaoActivity.getIntent(context, entrance)
-        context.startActivity(intent)
-    }
-
     /**
      * 切换到社区页面（旧社区页面已经没有了，处理为跳转到论坛详情）
      */
@@ -1449,7 +1450,7 @@ object DirectUtils {
     fun directForumDetailSection(
         context: Context,
         bbsId: String? = "",
-        sectionId: String? = "",
+        sectionId: String = "",
         entrance: String? = null
     ) {
         val bundle = Bundle()
@@ -1544,14 +1545,15 @@ object DirectUtils {
 
     /**
      * 跳转至使用帮助与反馈，请不要随意修改方法名
+     * @param position 使用帮助：[CommonConsts.TAB_MAIN],意见反馈：[CommonConsts.TAB_SUB]
      */
     @JvmStatic
-    fun directToHelpAndFeedback(context: Context, bundle: Bundle? = null) {
+    fun directToHelpAndFeedback(context: Context, position: Int = CommonConsts.TAB_MAIN) {
         val destination = RouteConsts.activity.helpAndFeedbackActivity.toDestinationClass()
-        val newBundle = Bundle()
-        newBundle.putString(KEY_TO, destination?.name ?: "")
-        bundle?.let { newBundle.putAll(it) }
-        jumpActivityCompat(context, newBundle)
+        val bundle = Bundle()
+        bundle.putString(KEY_TO, destination?.name ?: "")
+        bundle.putInt(BaseActivity_TabLayout.PAGE_INDEX, position)
+        jumpActivity(context, bundle)
     }
 
     /**
@@ -1851,11 +1853,8 @@ object DirectUtils {
      * 跳转到游戏动态，请不要随意修改方法名
      */
     @JvmStatic
-    fun directToConcernInfo(context: Context, entrance: String) {
-        context.startActivity(
-            (ARouter.getInstance().build(RouteConsts.provider.concernInfo)
-                .navigation() as? IConcernInfoProvider)?.getIntent(context, entrance)
-        )
+    fun directToConcernInfo(context: Context) {
+        context.startActivity(ConcernInfoActivity.getIntent(context));
     }
 
     /**
@@ -1869,11 +1868,9 @@ object DirectUtils {
         gameCollectionTitle: String = "",
         gameCollectionId: String = "",
         collectionName: String = "",
-        collectionId: String = "",
-        traceEvent: ExposureEvent? = null
+        collectionId: String = ""
     ) {
         val bundle = Bundle()
-        val exposureSourceList = traceEvent?.source
         bundle.putString(KEY_TO, GameCollectionSquareActivity::class.java.name)
         bundle.putString(KEY_ENTRANCE, entrance)
         bundle.putString(KEY_FORUM_NAME, forumName)
@@ -1881,11 +1878,6 @@ object DirectUtils {
         bundle.putString(KEY_GAME_COLLECTION_ID, gameCollectionId)
         bundle.putString(KEY_COLLECTION_ID, collectionId)
         bundle.putString(KEY_COLLECTION_NAME, collectionName)
-        if (exposureSourceList is ArrayList) {
-            bundle.putParcelableArrayList(KEY_EXPOSURE_SOURCE_LIST, exposureSourceList)
-        } else if (exposureSourceList != null) {
-            bundle.putParcelableArrayList(KEY_EXPOSURE_SOURCE_LIST, ArrayList(exposureSourceList))
-        }
         jumpActivity(context, bundle)
     }
 
@@ -1932,16 +1924,16 @@ object DirectUtils {
     @JvmStatic
     fun directToSuggestion(
         context: Context,
-        type: SuggestType = SuggestType.APP,
+        type: SuggestType = SuggestType.normal,
         hiddenHint: String = "",
         suggestHintType: String? = null,
         content: String? = null,
+        platform: String = "",
         game: SimpleGameEntity? = null,
         isQaFeedback: Boolean = false,
         qaContentId: String = "",
         fromRatingKey: Boolean = false,
         diagnosis: String = "",
-        forceLogin: Boolean = true,
         requestCode: Int? = null
     ) {
         val intent = HelpAndFeedbackBridge.getIntent(
@@ -1950,12 +1942,12 @@ object DirectUtils {
             hiddenHint,
             suggestHintType,
             content,
+            platform,
             game,
             isQaFeedback,
             qaContentId,
             fromRatingKey,
-            diagnosis,
-            forceLogin
+            diagnosis
         )
         if (requestCode != null) {
             (context as Activity).startActivityForResult(intent, requestCode)
@@ -1998,19 +1990,12 @@ object DirectUtils {
     }
 
     @JvmStatic
-    fun directToSuggestion(
-        context: Context,
-        type: SuggestType,
-        hiddenHint: String,
-        forceLogin: Boolean = true,
-        requestCode: Int?
-    ) {
+    fun directToSuggestion(context: Context, type: SuggestType, hiddenHint: String, requestCode: Int?) {
         directToSuggestion(
             context = context,
             type = type,
             hiddenHint = hiddenHint,
             suggestHintType = null,
-            forceLogin = forceLogin,
             requestCode = requestCode,
         )
     }
@@ -2036,69 +2021,93 @@ object DirectUtils {
     }
 
     @JvmStatic
-    fun directToQGameHome(context: Context) {
-        context.startActivity(QGameHomeWrapperActivity.getIntent(context))
-    }
-
-    @JvmStatic
-    fun directToQGameSearch(
+    fun directToSuggestion(
         context: Context,
-        hint: String,
-        sourceEntrance: String
+        type: SuggestType,
+        suggestHintType: String? = null,
+        content: String? = null,
+        game: SimpleGameEntity,
+        platform: String = ""
     ) {
-        context.startActivity(QGameSearchActivity.getIntent(context, hint, sourceEntrance))
+        directToSuggestion(
+            context = context,
+            type = type,
+            hiddenHint = "",
+            suggestHintType = suggestHintType,
+            content = content,
+            game = game,
+            platform = platform
+        )
     }
 
-    @SuppressLint("CheckResult")
+    /**
+     * 跳转到礼包页
+     * @param context 上下文
+     * @param entrance
+     */
     @JvmStatic
-    fun directToQGameById(
-        activity: Activity,
-        qqGameId: String
+    fun directToGift(
+        context: Context,
+        entrance: String
     ) {
-
-        if (activity !is AppCompatActivity || activity.supportFragmentManager.isDestroyed) {
-            ToastUtils.toast("启动QQ小游戏失败，请稍后再试")
-            return
-        }
-
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-            ToastUtils.toast("该游戏仅支持安卓5.0及以上设备")
-            return
-        }
-
-        CheckLoginUtils.checkLogin(
-            activity, null, true, "QQ小游戏-秒开"
-        ) {
-            val userToken = UserManager.getInstance().token
-            val userId = UserManager.getInstance().userId
-            val userName = UserManager.getInstance().userInfoEntity?.name ?: "unknown"
-
-            val qGameProvider = ARouter
-                .getInstance()
-                .build(RouteConsts.provider.qGame)
-                .navigation() as IQGameProvider<*>
-            qGameProvider.setLoginInfo(activity, userId, userName, userToken)
-            qGameProvider.launchGame(activity, qqGameId) { _, _ ->
-                RetrofitManager
-                    .getInstance()
-                    .newApi
-                    .postQGamePlay(qqGameId, userId)
-                    .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(
-                        {
-                            QGameViewModel.notifyQGameSubjectUpdate() // 通知QQ小游戏首页列表刷新
-                        },
-                        {}
-                    ) // 秒玩记录上报
-            }
-        }
+        ARouter
+            .getInstance()
+            .build(RouteConsts.activity.libaoActivity)
+            .withString(KEY_ENTRANCE, entrance)
+            .withString(NORMAL_FRAGMENT_NAME, LibaoFragment::class.java.canonicalName)
+            .navigation(context)
     }
 
+    /**
+     * 跳转到礼包详情
+     * @param context 上下文
+     * @param libaoEntity 礼包信息
+     * @param isClickReceiveBtnIn
+     * @param entrance
+     */
     @JvmStatic
-    fun directToMessageCenter(defaultTabIndex: Int) {
-        ARouter.getInstance().build(RouteConsts.activity.messageWrapperActivity)
-            .withInt(BaseActivity_TabLayout.PAGE_INDEX, defaultTabIndex)
-            .navigation()
+    @JvmOverloads
+    fun directToGiftDetail(
+        context: Context,
+        libaoEntity: LibaoEntity,
+        isClickReceiveBtnIn: Boolean = false,
+        entrance: String,
+        requestCode: Int = -1,
+    ) {
+        if (context !is Activity) return
+
+        HaloApp.put(LibaoEntity.TAG, libaoEntity)
+
+        ARouter
+            .getInstance()
+            .build(RouteConsts.activity.libaoDetailActivity)
+            .withString(KEY_ENTRANCE, entrance)
+            .withBoolean(KEY_IS_CLICK_RECEIVE_BTN, isClickReceiveBtnIn)
+            .navigation(context, requestCode, null)
+    }
+
+    /**
+     * 跳转到礼包详情
+     * @param context 上下文
+     * @param id 礼包ID
+     * @param entrance
+     */
+    @JvmStatic
+    fun directToGiftDetail(
+        context: Context,
+        giftId: String,
+        entrance: String? = null
+    ) {
+        if (giftId.isEmpty()) return
+
+        HaloApp.put(LibaoEntity.TAG, null)
+
+        ARouter
+            .getInstance()
+            .build(RouteConsts.activity.libaoDetailActivity)
+            .withString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
+            .withString(KEY_ID, giftId)
+            .navigation(context)
+
     }
 }

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

@@ -2,10 +2,8 @@ package com.gh.common.util
 
 import android.content.Context
 import android.os.Build
-import com.gh.gamecenter.R
 import com.gh.gamecenter.common.utils.DialogHelper
-import com.gh.gamecenter.common.utils.SensorsBridge
-import com.gh.gamecenter.common.utils.toResString
+import com.gh.common.util.PackageUtils
 import com.gh.gamecenter.core.utils.EmptyCallback
 import com.gh.gamecenter.feature.entity.ApkEntity
 import com.gh.gamecenter.feature.entity.GameEntity
@@ -24,43 +22,7 @@ object DownloadDialogHelper {
     ) {
         val dialog = retrieveAvailableDialog(gameEntity, apkEntity)
         if (dialog != null) {
-            SensorsBridge.trackGameDownloadDialogShow(
-                gameId = gameEntity.id,
-                gameName = gameEntity.name ?: "",
-                gameType = gameEntity.categoryChinese
-            )
-            DialogHelper.showDialogWithHtmlContent(
-                context,
-                dialog.title,
-                dialog.content,
-                "继续下载",
-                "取消",
-                confirmClickCallback = {
-                    SensorsBridge.trackGameDownloadDialogClick(
-                        buttonName = "继续下载",
-                        gameId = gameEntity.id ,
-                        gameName = gameEntity.name ?: "",
-                        gameType = gameEntity.categoryChinese
-                    )
-                },
-                cancelClickCallback = {
-                    SensorsBridge.trackGameDownloadDialogClick(
-                        buttonName = "取消",
-                        gameId = gameEntity.id ,
-                        gameName = gameEntity.name ?: "",
-                        gameType = gameEntity.categoryChinese
-                    )
-                    callback.onCallback()
-                },
-                touchOutsideCallback = {
-                    SensorsBridge.trackGameDownloadDialogClick(
-                        buttonName = "关闭弹窗",
-                        gameId = gameEntity.id ,
-                        gameName = gameEntity.name ?: "",
-                        gameType = gameEntity.categoryChinese
-                    )
-                }
-            )
+            showDownloadDialog(context, dialog, callback)
         } else {
             callback.onCallback()
         }
@@ -148,4 +110,14 @@ object DownloadDialogHelper {
         return null
     }
 
+    private fun showDownloadDialog(context: Context, dialog: GameEntity.Dialog, callback: EmptyCallback) {
+        DialogHelper.showDialogWithHtmlContent(
+            context,
+            dialog.title,
+            dialog.content,
+            "继续下载",
+            "取消",
+            { callback.onCallback() })
+    }
+
 }

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

@@ -26,13 +26,11 @@ import com.gh.download.server.BrowserInstallHelper
 import com.gh.gamecenter.R
 import com.gh.gamecenter.WebActivity
 import com.gh.gamecenter.adapter.viewholder.GameViewHolder
-import com.gh.gamecenter.common.base.GlobalActivityManager
 import com.gh.gamecenter.common.callback.CancelListener
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.entity.LinkEntity
 import com.gh.gamecenter.common.utils.*
-import com.gh.gamecenter.core.AppExecutor
 import com.gh.gamecenter.core.utils.*
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.entity.PluginLocation
@@ -238,24 +236,6 @@ object DownloadItemUtils {
             }
             return
         }
-        if (gameEntity.isQQMiniGame()) {
-            val isQQMiniGameOffShelve = gameEntity.qqMiniGameAppStatus == 1 // QQ小游戏是否下架
-            if (isQQMiniGameOffShelve) {
-                downloadBtn.apply {
-                    isClickable = false
-                    text = context.getString(R.string.off_shelve)
-                    buttonStyle = DownloadButton.ButtonStyle.NONE
-                }
-            } else {
-                downloadBtn.apply {
-                    isClickable = true
-                    setBackgroundResource(R.drawable.download_button_normal_style)
-                    setTextColor(R.color.white.toColor(context))
-                    text = context.getString(R.string.quick_play)
-                }
-            }
-            return
-        }
         if (gameEntity.getApk().isEmpty() || gameEntity.downloadOffStatus != null) {
             val h5LinkEntity = gameEntity.h5Link
             val offStatus = gameEntity.downloadOffStatus
@@ -294,6 +274,11 @@ object DownloadItemUtils {
                 downloadEntity = VHelper.getVDownloadEntitySnapshot(gameEntity.id, gameEntity.getUniquePackageName())
             }
 
+            // 还是找不到时，尝试从 gameEntity 里找已绑定的 downloadEntity
+            if (downloadEntity == null) {
+                downloadEntity = gameEntity.getEntryMap().getOrDefault(gameEntity.getUniquePlatform(), null)
+            }
+
             if (downloadEntity != null) {
                 downloadBtn.apply {
                     when (downloadEntity.status) {
@@ -380,7 +365,15 @@ object DownloadItemUtils {
         briefStyle: String?,
         isShowRecommendStar: Boolean = false
     ) {
-        val downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity)
+        val entryMap: ArrayMap<String, DownloadEntity> = gameEntity.getEntryMap()
+        val apkEntity = gameEntity.getApk()[0]
+        var downloadEntity: DownloadEntity? = null
+        if (entryMap.isNotEmpty()) {
+            downloadEntity = entryMap[apkEntity.getPlatform()]
+        }
+        if (downloadEntity == null) {
+            downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity)
+        }
         if (downloadEntity != null) {
             if (downloadEntity.isSimulatorGame()) {
                 if (downloadEntity.status != DownloadStatus.done) {
@@ -636,43 +629,15 @@ object DownloadItemUtils {
         gamePermissionDialogFragment?.dismissAllowingStateLoss()
         if (SPUtils.getBoolean(Constants.SP_TEENAGER_MODE)) {
             downloadBtn.setOnClickListener {
-                SensorsBridge.trackAdolescentModeDialogShow(
-                    gameId = gameEntity.id,
-                    gameName = gameEntity.name ?: "",
-                    gameType = gameEntity.categoryChinese
-                )
                 DialogHelper.showDialog(
                     context,
                     "提示",
                     "当前处于儿童/青少年模式， \n暂不提供游戏下载",
                     "退出青少年模式",
                     "关闭",
-                    confirmClickCallback = {
-                        context.startActivity(TeenagerModeActivity.getIntent(context))
-                        SensorsBridge.trackAdolescentModeDialogClick(
-                            buttonName = "退出青少年模式",
-                            gameId = gameEntity.id,
-                            gameName = gameEntity.name ?: "",
-                            gameType = gameEntity.categoryChinese
-                        )
-                    },
-                    cancelClickCallback = {
-                        SensorsBridge.trackAdolescentModeDialogClick(
-                            buttonName = "关闭",
-                            gameId = gameEntity.id,
-                            gameName = gameEntity.name ?: "",
-                            gameType = gameEntity.categoryChinese
-                        )
-                    },
-                    touchOutsideCallback = {
-                        SensorsBridge.trackAdolescentModeDialogClick(
-                            buttonName = "关闭弹窗",
-                            gameId = gameEntity.id,
-                            gameName = gameEntity.name ?: "",
-                            gameType = gameEntity.categoryChinese
-                        )
-                    },
-                    extraConfig = DialogHelper.Config(
+                    { context.startActivity(TeenagerModeActivity.getIntent(context)) },
+                    {},
+                    DialogHelper.Config(
                         centerTitle = true,
                         centerContent = true
                     )
@@ -699,7 +664,7 @@ object DownloadItemUtils {
                         }
                     },
                     {},
-                    extraConfig = DialogHelper.Config(
+                    DialogHelper.Config(
                         centerTitle = true,
                         centerContent = true
                     )
@@ -774,15 +739,6 @@ object DownloadItemUtils {
             }
             return
         }
-        if (gameEntity.isQQMiniGame()) {
-            downloadBtn.setOnClickListener {
-                NewFlatLogUtils.logQGameClick(gameEntity.qqMiniGameAppId, gameEntity.name)
-                GlobalActivityManager.currentActivity?.let { activity ->
-                    DirectUtils.directToQGameById(activity, gameEntity.qqMiniGameAppId)
-                }
-            }
-            return
-        }
         if (gameEntity.getApk().size == 0 && gameEntity.h5Link != null) {
             downloadBtn.setOnClickListener {
                 allStateClickCallback?.onCallback()
@@ -822,13 +778,7 @@ object DownloadItemUtils {
                 if (downloadBtn is DownloadButton && downloadBtn.text == context.getString(R.string.launch)) {
                     clickRunnable.onCallback()
                 } else {
-                    PermissionHelper.checkStoragePermissionBeforeAction(
-                        context,
-                        gameEntity.id,
-                        gameEntity.name ?: "",
-                        gameEntity.categoryChinese,
-                        clickRunnable
-                    )
+                    PermissionHelper.checkStoragePermissionBeforeAction(context, clickRunnable)
                 }
             }
         } else {
@@ -876,7 +826,6 @@ object DownloadItemUtils {
                 addHandler(DownloadDialogHelperHandler())
                 addHandler(CertificationHandler())
                 addHandler(OverseaDownloadHandler())
-                addHandler(LandPageAddressHandler())
                 addHandler(CheckDownloadHandler())
             }
                 .setProcessEndCallback {
@@ -895,7 +844,6 @@ object DownloadItemUtils {
                 addHandler(DownloadDialogHelperHandler())
                 addHandler(CertificationHandler())
                 addHandler(VersionNumberHandler())
-                addHandler(LandPageAddressHandler())
                 addHandler(OverseaDownloadHandler())
                 addHandler(CheckDownloadHandler())
             }
@@ -913,7 +861,6 @@ object DownloadItemUtils {
                 addHandler(DownloadDialogHelperHandler())
                 addHandler(CertificationHandler())
                 addHandler(VersionNumberHandler())
-                addHandler(LandPageAddressHandler())
                 addHandler(OverseaDownloadHandler())
                 addHandler(CheckStoragePermissionHandler())
                 addHandler(ValidateVSpaceHandler())
@@ -941,19 +888,6 @@ object DownloadItemUtils {
             }
         } else if (str == context.getString(R.string.install)) {
             val downloadEntity = SimulatorGameManager.findDownloadEntityByUrl(apk.url)
-
-            com.gh.gamecenter.common.utils.NewFlatLogUtils.logGameInstall(
-                gameId = downloadEntity?.gameId ?: "",
-                gameName = downloadEntity?.name ?: "",
-                trigger = "主动安装"
-            )
-
-            SensorsBridge.trackInstallGameClick(
-                gameId = downloadEntity?.gameId ?: "",
-                gameName = downloadEntity?.name ?: "",
-                action = "主动安装"
-            )
-
             if (gameEntity.simulator != null) {
                 val isInstalled =
                     PackageUtils.isInstalledFromAllPackage(context, gameEntity.simulator!!.apk!!.packageName)
@@ -966,13 +900,8 @@ object DownloadItemUtils {
                 }
                 if (downloadEntity != null && SimulatorGameManager.isSimulatorGame(gameEntity) && !isInstalled && !isInstalledNewSimulator) {
                     SimulatorDownloadManager.getInstance().showDownloadDialog(
-                        context,
-                        simulator,
-                        SimulatorDownloadManager.SimulatorLocation.LAUNCH,
-                        gameEntity.id,
-                        gameEntity.name!!,
-                        gameEntity.categoryChinese,
-                        null
+                        context, simulator,
+                        SimulatorDownloadManager.SimulatorLocation.LAUNCH, gameEntity.id, gameEntity.name!!, null
                     )
                     return
                 }
@@ -987,7 +916,7 @@ object DownloadItemUtils {
             //启动模拟器游戏
             if (SimulatorGameManager.isSimulatorGame(gameEntity)) {
                 if (NewSimulatorGameManager.shouldShowUpdateNewSimulatorAlert(context)) {
-                    NewSimulatorGameManager.showUpdateNewsSimulator(context, gameEntity, null)
+                    NewSimulatorGameManager.showUpdateNewsSimulator(context, null)
                     return
                 }
                 val downloadEntity = SimulatorGameManager.findDownloadEntityByUrl(gameEntity.getApk()[0].url)
@@ -1013,25 +942,16 @@ object DownloadItemUtils {
                 VHelper.updateOrReDownload(gameEntity)
                 return
             }
-
-            ChainBuilder()
-                .apply {
-                    addHandler(LandPageAddressHandler())
-                }.setProcessEndCallback {
-                    DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk) {
-                        DialogUtils.checkDownload(
-                            context,
-                            apk.size,
-                            gameEntity.id,
-                            gameEntity.name,
-                            gameEntity.categoryChinese
-                        ) { isSubscribe: Boolean ->
-                            update(context, gameEntity, entrance, location, isSubscribe, traceEvent)
-                        }
-                    }
+            DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk) {
+                DialogUtils.checkDownload(
+                    context,
+                    apk.size,
+                    gameEntity.id,
+                    gameEntity.name
+                ) { isSubscribe: Boolean ->
+                    update(context, gameEntity, entrance, location, isSubscribe, traceEvent)
                 }
-                .buildHandlerChain()
-                ?.handleRequest(context, gameEntity)
+            }
         } else {
             var downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity)
 
@@ -1094,13 +1014,10 @@ object DownloadItemUtils {
                 isSubscribe,
                 traceEvent
             )
-            ToastUtils.toast(gameEntity.name + "已加入下载队列")
             if (BrowserInstallHelper.shouldAutoSwitchAssistantInstall(gameEntity)) {
-                val toast = context.getString(R.string.unsupported_browser_install_hint)
-                AppExecutor.uiExecutor.executeWithDelay({
-                    ToastUtils.toast(toast)
-                }, 1000)
+                ToastUtils.toast(context.getString(R.string.unsupported_browser_install_hint))
             }
+            Utils.toast(context, gameEntity.name + "已加入下载队列")
             if (downloadBtn is DownloadButton) {
                 downloadBtn.text = "0%"
                 downloadBtn.buttonStyle = DownloadButton.ButtonStyle.DOWNLOADING_NORMAL
@@ -1124,13 +1041,10 @@ object DownloadItemUtils {
         val msg = FileUtils.isCanDownload(context, gameEntity.getApk()[0].size ?: "")
         if (TextUtils.isEmpty(msg)) {
             DownloadManager.createDownload(context, gameEntity, "插件化", entrance, location, isSubscribe, traceEvent)
-            ToastUtils.toast(gameEntity.name + "已加入下载队列")
             if (BrowserInstallHelper.shouldAutoSwitchAssistantInstall(gameEntity)) {
-                val toast = context.getString(R.string.unsupported_browser_install_hint)
-                AppExecutor.uiExecutor.executeWithDelay({
-                    ToastUtils.toast(toast)
-                }, 1000)
+                ToastUtils.toast(context.getString(R.string.unsupported_browser_install_hint))
             }
+            Utils.toast(context, gameEntity.name + "已加入下载队列")
             if (downloadBtn is DownloadButton) {
                 downloadBtn.setText(R.string.downloading)
                 downloadBtn.buttonStyle = DownloadButton.ButtonStyle.DOWNLOADING_PLUGIN
@@ -1162,16 +1076,7 @@ object DownloadItemUtils {
                 }
 
                 PackageUtils.isCanPluggable(apkEntity) -> {
-                    DialogHelper.showPluginDialog(
-                        context,
-                        pluginDesc = gameEntity.pluginDesc,
-                        gameId = gameEntity.id,
-                        gameName = gameEntity.name ?: "",
-                        gameType = gameEntity.categoryChinese,
-                        platform = gameEntity.platform ?: ""
-                    ) {
-                        PackageInstaller.uninstall(context, path)
-                    }
+                    DialogHelper.showPluginDialog(context, gameEntity.pluginDesc) { PackageInstaller.uninstall(context, path) }
                 }
 
                 else -> {

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

@@ -17,13 +17,8 @@ import com.gh.gamecenter.common.entity.SimpleGameEntity
 import com.gh.gamecenter.common.entity.SuggestType
 import com.gh.gamecenter.common.eventbus.EBShowDialog
 import com.gh.gamecenter.common.utils.*
-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.ToastUtils
-import com.gh.gamecenter.common.utils.NewFlatLogUtils
 import com.gh.gamecenter.core.utils.*
-import com.gh.gamecenter.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.entity.SimulatorEntity
 import com.gh.gamecenter.feature.utils.PlatformUtils
@@ -44,11 +39,8 @@ object DownloadObserver {
     // TODO 修复因为更改内存对象造成的双重下载完成事件问题，具体触发代码见 DownloadDao.updateSnapshotList
     private var mDoneDebouncePair: Pair<String, Long>? = null
 
-    private const val TAG = "DownloadObserver"
     private const val CORE_EVENT_DOWNLOAD_COMPLETE_LOGGED = "CORE_EVENT_DOWNLOAD_COMPLETE_LOGGED"
 
-    private val mRetryableHashMap = hashMapOf<String, Boolean>()
-
     // 如果在WIFI状态下,下载自动暂停,则再重试一遍
     @JvmStatic
     fun initObserver() {
@@ -78,62 +70,28 @@ object DownloadObserver {
 
                     val currentActivity = AppManager.getInstance().currentActivity() ?: return
 
-                    SensorsBridge.trackDownloadLinkRotDialogShow(
-                        gameId = downloadEntity.gameId,
-                        gameName = downloadEntity.name,
-                        gameType = downloadEntity.categoryChinese
-                    )
-
-                    DialogHelper.showDialog(
-                        currentActivity,
-                        "下载失败",
-                        "下载链接已失效，建议提交反馈",
-                        "立即反馈",
-                        "取消",
-                        confirmClickCallback = {
-                            HelpAndFeedbackBridge.startSuggestionActivity(
-                                currentActivity,
-                                SuggestType.GAME, "notfound",
-                                "问题反馈：下载链接失效",
-                                SimpleGameEntity(gameId, downloadEntity.name, "")
-                            )
-                            SensorsBridge.trackDownloadLinkRotDialogClick(
-                                buttonName = "立即反馈",
-                                gameId = downloadEntity.gameId,
-                                gameName = downloadEntity.name,
-                                gameType = downloadEntity.categoryChinese
-                            )
-                        },
-                        cancelClickCallback = {
-                            SensorsBridge.trackDownloadLinkRotDialogClick(
-                                buttonName = "取消",
-                                gameId = downloadEntity.gameId,
-                                gameName = downloadEntity.name,
-                                gameType = downloadEntity.categoryChinese
-                            )
-                        },
-                        touchOutsideCallback = {
-                            SensorsBridge.trackDownloadLinkRotDialogClick(
-                                buttonName = "关闭弹窗",
-                                gameId = downloadEntity.gameId,
-                                gameName = downloadEntity.name,
-                                gameType = downloadEntity.categoryChinese
-                            )
-                        },
-                        extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
-                    )
+                    DialogHelper.showDialog(currentActivity, "下载失败", "下载链接已失效，建议提交反馈", "立即反馈", "取消", {
+                        HelpAndFeedbackBridge.startSuggestionActivity(
+                            currentActivity,
+                            SuggestType.gameQuestion, "notfound",
+                            StringUtils.buildString(downloadEntity.name, "，问题反馈：下载链接失效"),
+                            SimpleGameEntity(gameId, downloadEntity.name, "")
+                        )
+                    }, extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true))
                     return
                 } else if (DownloadStatus.neterror == downloadEntity.status
                     || DownloadStatus.timeout == downloadEntity.status
                     || DownloadStatus.diskioerror == downloadEntity.status
-                    || DownloadStatus.diskisfull == downloadEntity.status
-                ) {
-                    if (mRetryableHashMap[downloadEntity.url] == true
+                    || DownloadStatus.diskisfull == downloadEntity.status) {
+                    if (downloadEntity.meta[Constants.MARK_RETRY_DOWNLOAD].isNullOrEmpty()
                         && NetworkUtils.isWifiConnected(HaloApp.getInstance().application)
                     ) {
+                        downloadEntity.meta[Constants.MARK_RETRY_DOWNLOAD] = downloadEntity.progress.toString()
+                        downloadManager.updateDownloadEntity(downloadEntity)
                         downloadManager.resumeDownload(downloadEntity.url)
-                        mRetryableHashMap[downloadEntity.url] = false
-                        Utils.log(TAG, "下载重试->" + downloadEntity.toJson())
+                        debugOnly {
+                            Utils.log("DownloadObserver", "下载重试->" + downloadEntity.toJson())
+                        }
                     } else {
                         if (DownloadStatus.diskisfull == downloadEntity.status) {
                             ToastUtils.toast("磁盘已满，请清理空间后重试下载")
@@ -144,10 +102,13 @@ object DownloadObserver {
                         }
 
                         DataLogUtils.uploadNeterrorLog(mApplication, downloadEntity)
-                        Utils.log(TAG, "下载自动暂停->" + downloadEntity.toJson())
+
+                        debugOnly {
+                            Utils.log("DownloadObserver", "下载自动暂停->" + downloadEntity.toJson())
+                        }
                     }
                 } else if (DownloadStatus.redirected == downloadEntity.status) {
-                    Utils.log(TAG, "重定向完毕")
+                    debugOnly { Utils.log("重定向完毕") }
                     DownloadDataHelper.uploadRedirectEvent(downloadEntity)
                 } else if (DownloadStatus.unqualified == downloadEntity.status) {
                     // 未成年
@@ -192,35 +153,40 @@ object DownloadObserver {
                 if (DownloadStatus.done == downloadEntity.status) {
                     if (mDoneDebouncePair?.first != downloadEntity.url) {
                         mDoneDebouncePair = Pair(downloadEntity.url, System.currentTimeMillis())
-                        performDownloadCompleteAction(downloadEntity, downloadManager)
+                        performDownloadCompleteAction(downloadEntity, gameId, downloadManager)
                     } else {
                         if (mDoneDebouncePair?.second == 0L
                             || System.currentTimeMillis() - (mDoneDebouncePair?.second ?: 0) > 500
                         ) {
-                            performDownloadCompleteAction(downloadEntity, downloadManager)
+                            performDownloadCompleteAction(downloadEntity, gameId, downloadManager)
                         }
                     }
+                }
 
-                    mRetryableHashMap.remove(downloadEntity.url)
-
+                if (downloadEntity.status == DownloadStatus.done) {
                     EventBus.getDefault().post(EBDownloadStatus("done", "", "", "", downloadEntity.packageName, ""))
                 }
 
                 DownloadNotificationHelper.addOrUpdateDownloadNotification(downloadEntity)
 
                 // 如果已下载大小发生变化,表示成功恢复下载,则重置重试标记
-                if (downloadEntity.status == DownloadStatus.downloading) {
-                    mRetryableHashMap[downloadEntity.url] = true
+                if (downloadEntity.status == DownloadStatus.downloading &&
+                    downloadEntity.progress.toString() != downloadEntity.meta[Constants.MARK_RETRY_DOWNLOAD]
+                ) {
+                    downloadEntity.meta[Constants.MARK_RETRY_DOWNLOAD] = ""
+                    downloadManager.updateDownloadEntity(downloadEntity)
                 }
             }
         }
 
         // 添加观察者
         DownloadManager.getInstance().addObserver(dataWatcher)
+
     }
 
     private fun performDownloadCompleteAction(
         downloadEntity: DownloadEntity,
+        gameId: String,
         downloadManager: DownloadManager
     ) {
         if (downloadEntity.name.contains(mApplication.getString(R.string.app_name))) {
@@ -229,18 +195,6 @@ object DownloadObserver {
             // 会有 ActivityNotFoundException 异常，catch 掉不管了
             tryWithDefaultCatch {
                 if (Constants.SILENT_UPDATE != downloadEntity.getMetaExtra(Constants.EXTRA_DOWNLOAD_TYPE)) {
-                    NewFlatLogUtils.logGameInstall(
-                        gameId = downloadEntity.gameId ?: "",
-                        gameName = downloadEntity.name ?: "",
-                        trigger = "自动安装"
-                    )
-
-                    SensorsBridge.trackInstallGameClick(
-                        gameName = downloadEntity.name,
-                        gameId = downloadEntity.gameId,
-                        action = "自动安装"
-                    )
-
                     // TODO 在 Android 11 上没有授权安装未知应用的权限前第一次调用这个方法系统会杀掉我们的进程...
                     // 没能找到类似的解释，最接近的是这个 https://issuetracker.google.com/issues/154157387，但也只是点授权杀进程而已
                     PackageInstaller.install(mApplication, downloadEntity);
@@ -264,15 +218,13 @@ object DownloadObserver {
                             EBShowDialog(
                                 BaseActivity.PLUGGABLE,
                                 downloadEntity.path,
-                                downloadEntity
+                                downloadEntity.pluginDesc
                             )
                         )
-
                     downloadEntity.isPlugin -> Utils.toast(
                         mApplication,
                         downloadEntity.name + " - " + platform + " - 下载完成"
                     )
-
                     else -> {
                         if (!downloadEntity.isVGame()) {
                             Utils.toast(mApplication, downloadEntity.name + " - 下载完成")
@@ -290,10 +242,15 @@ object DownloadObserver {
                     val gameName = downloadEntity.getMetaExtra(Constants.GAME_NAME)
                     if (simulatorJson.isEmpty()) return
                     var simulator = GsonUtils.fromJson(simulatorJson, SimulatorEntity::class.java)
+                    val isInstalled = PackageUtils.isInstalledFromAllPackage(
+                        HaloApp.getInstance().application,
+                        simulator.apk?.packageName
+                    )
                     val isInstalledNewSimulator =
                         SimulatorGameManager.isNewSimulatorInstalled(HaloApp.getInstance().application)
                     val isInstalledOldSimulator =
                         SimulatorGameManager.isOldSimulatorInstalled(HaloApp.getInstance().application)
+//                    if (!isInstalled && !isInstalledNewSimulator) {
                     val currentActivity = AppManager.getInstance().currentActivity()
                         ?: return
                     val newSimulator = Config.getNewSimulatorEntitySetting()
@@ -302,8 +259,9 @@ object DownloadObserver {
                     }
                     SimulatorDownloadManager.getInstance().showDownloadDialog(
                         currentActivity, simulator,
-                        SimulatorDownloadManager.SimulatorLocation.LAUNCH, downloadEntity.gameId, gameName, downloadEntity.categoryChinese, null
+                        SimulatorDownloadManager.SimulatorLocation.LAUNCH, downloadEntity.gameId, gameName, null
                     )
+//                    }
                     SimulatorGameManager.recordDownloadSimulatorGame(downloadEntity.gameId, simulator.type)
                     SimulatorGameManager.postPlayedGame(downloadEntity.gameId, downloadEntity.packageName)
                 } else {
@@ -322,17 +280,6 @@ object DownloadObserver {
                             ) {
                                 downloadEntity.meta[Constants.MARK_ALREADY_TRIGGERED_INSTALLATION] = "YES"
                                 tryWithDefaultCatch {
-                                    NewFlatLogUtils.logGameInstall(
-                                        gameId = downloadEntity.gameId ?: "",
-                                        gameName = downloadEntity.name ?: "",
-                                        trigger = "自动安装"
-                                    )
-
-                                    SensorsBridge.trackInstallGameClick(
-                                        gameId = downloadEntity.gameId,
-                                        gameName = downloadEntity.name,
-                                        action = "自动安装"
-                                    )
                                     PackageInstaller.install(mApplication, downloadEntity, false)
                                 }
                             } else {
@@ -342,15 +289,14 @@ object DownloadObserver {
                                         EBShowDialog(
                                             BaseActivity.PLUGGABLE,
                                             downloadEntity.path,
-                                            downloadEntity
+                                            downloadEntity.pluginDesc
                                         )
                                     )
                                 } else {
                                     EventBus.getDefault().post(
                                         EBShowDialog(
                                             BaseActivity.SIGNATURE_CONFLICT,
-                                            downloadEntity.path,
-                                            downloadEntity
+                                            downloadEntity.path
                                         )
                                     )
                                 }
@@ -421,19 +367,53 @@ object DownloadObserver {
             type = ExposureUtils.DownloadType.PLUGIN_DOWNLOAD
         }
 
+        if (downloadEntity.isVGame()) {
+            SensorsBridge.trackEvent(
+                "HaloFunGameDownloadDone",
+                "game_name", downloadEntity.name,
+                "game_id", downloadEntity.gameId,
+                "game_schema_type", if (downloadEntity.getMetaExtra(VHelper.KEY_BIT) == "32") "32位" else "64位"
+            )
+        } else if (downloadEntity.gameId == Constants.HALO_FUN_GAME_ID) {
+            SensorsBridge.trackEvent(
+                "HaloFunDownloadDone",
+                "space_schema_type",
+                if (downloadEntity.packageName == VHelper.VSPACE_32BIT_PACKAGENAME) "32位" else "64位"
+            )
+        } else if (downloadEntity.gameId != Constants.GHZS_GAME_ID && downloadEntity.getMetaExtra(Constants.EXTRA_DOWNLOAD_TYPE) != Constants.SIMULATOR_DOWNLOAD) {
+            SensorsBridge.trackEvent(
+                "DownloadProcessFinish",
+                "game_id", downloadEntity.gameId,
+                "game_name", downloadEntity.meta[Constants.GAME_NAME] ?: "",
+                "game_type", downloadEntity.meta[Constants.GAME_CATEGORY_IN_CHINESE] ?: "",
+                "game_schema_type", if (downloadEntity.getMetaExtra(VHelper.KEY_BIT) == "32") "32位" else "64位",
+                "page_name", getCurrentPageEntity().pageName,
+                "page_id", getCurrentPageEntity().pageId,
+                "page_business_id", getCurrentPageEntity().pageBusinessId,
+                "last_page_name", getLastPageEntity().pageName,
+                "last_page_id", getLastPageEntity().pageId,
+                "last_page_business_id", getLastPageEntity().pageBusinessId
+            )
+        }
+
         var downloadSpeed = 0L
         val elapsedTimeString = downloadEntity.meta[DownloadConfig.KEY_DOWNLOAD_ELAPSED_TIME]
         if (elapsedTimeString != null) {
             var elapsedTime = elapsedTimeString.toLong()
             if (elapsedTime == 0L) {
                 elapsedTime = 1L
+                SentryHelper.onEvent(
+                    "DOWNLOAD_ELAPSED_TIME",
+                    "elapsedTime is zero",
+                    downloadEntity.gameId + ":" + downloadEntity.size
+                )
             }
             downloadSpeed = downloadEntity.size / elapsedTime
         }
 
         val isPlatformRecommend =
             java.lang.Boolean.parseBoolean(downloadEntity.getMetaExtra(Constants.IS_PLATFORM_RECOMMEND))
-        val exposureEvent = ExposureUtils.logADownloadCompleteExposureEvent(
+        ExposureUtils.logADownloadCompleteExposureEvent(
             GameEntity(
                 id = downloadEntity.gameId,
                 mName = downloadEntity.name.removeSuffix(Constants.GAME_NAME_DECORATOR),
@@ -450,41 +430,6 @@ object DownloadObserver {
             type
         )
 
-        if (downloadEntity.isVGame()) {
-            SensorsBridge.trackEventWithExposureSource(
-                "HaloFunGameDownloadDone",
-                exposureEvent?.source,
-                "game_name", downloadEntity.name,
-                "game_id", downloadEntity.gameId,
-                "game_schema_type", if (downloadEntity.getMetaExtra(VHelper.KEY_BIT) == "32") "32位" else "64位"
-            )
-        } else if (downloadEntity.gameId == Constants.HALO_FUN_GAME_ID) {
-            SensorsBridge.trackEvent(
-                "HaloFunDownloadDone",
-                "space_schema_type",
-                if (downloadEntity.packageName == VHelper.VSPACE_32BIT_PACKAGENAME) "32位" else "64位"
-            )
-        }
-
-        if (downloadEntity.gameId != Constants.GHZS_GAME_ID
-            && downloadEntity.getMetaExtra(Constants.EXTRA_DOWNLOAD_TYPE) != Constants.SIMULATOR_DOWNLOAD
-            && downloadEntity.gameId != Constants.HALO_FUN_GAME_ID) {
-                SensorsBridge.trackEventWithExposureSource(
-                    "DownloadProcessFinish",
-                    exposureEvent?.source,
-                    "game_id", downloadEntity.gameId,
-                    "game_name", downloadEntity.meta[Constants.GAME_NAME] ?: "",
-                    "game_type", downloadEntity.meta[Constants.GAME_CATEGORY_IN_CHINESE] ?: "",
-                    "game_schema_type", if (downloadEntity.getMetaExtra(VHelper.KEY_BIT) == "32") "32位" else "64位",
-                    "page_name", getCurrentPageEntity().pageName,
-                    "page_id", getCurrentPageEntity().pageId,
-                    "page_business_id", getCurrentPageEntity().pageBusinessId,
-                    "last_page_name", getLastPageEntity().pageName,
-                    "last_page_id", getLastPageEntity().pageId,
-                    "last_page_business_id", getLastPageEntity().pageBusinessId
-                )
-        }
-
         DataCollectionUtils.uploadDownload(mApplication, downloadEntity, "完成")
     }
 

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

@@ -15,19 +15,18 @@ import android.text.TextUtils;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
+import com.gh.gamecenter.common.base.activity.ToolBarActivity;
 import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.MainActivity;
 import com.gh.gamecenter.SplashScreenActivity;
 import com.gh.gamecenter.common.avoidcallback.AvoidOnResultManager;
 import com.gh.gamecenter.common.avoidcallback.Callback;
-import com.gh.gamecenter.common.base.activity.ToolBarActivity;
 import com.gh.gamecenter.common.base.fragment.ToolbarFragment;
 import com.gh.gamecenter.common.constant.EntranceConsts;
 import com.gh.gamecenter.core.utils.ClassUtils;
 import com.gh.gamecenter.core.utils.GsonUtils;
 import com.gh.gamecenter.core.utils.SPUtils;
 import com.halo.assistant.HaloApp;
-import com.lightgame.utils.AppManager;
 import com.lightgame.utils.Utils;
 
 import org.json.JSONException;
@@ -67,8 +66,8 @@ public class EntranceUtils {
     public static void jumpActivity(Context context, Bundle bundle) {
         bundle.putBoolean(KEY_REQUIRE_REDIRECT, true);
 
-        if (AppManager.getInstance().findActivity(MainActivity.class) != null) {
-            // 应用正在运行，前台或后台，且MainActivity在栈中
+        if (HaloApp.getInstance().isRunningForeground) {
+            // 应用正在运行，前台或后台
             String to = bundle.getString(KEY_TO);
             Class<?> clazz = ClassUtils.forName(to);
             if (clazz == null) clazz = MainActivity.class;
@@ -93,8 +92,8 @@ public class EntranceUtils {
     public static void jumpActivity(Context context, Bundle nextToBundle, Bundle bundle, Callback callback) {
         bundle.putBoolean(KEY_REQUIRE_REDIRECT, true);
 
-        if (AppManager.getInstance().findActivity(MainActivity.class) != null) {
-            // 应用正在运行，前台或后台，且MainActivity在栈中
+        if (HaloApp.getInstance().isRunningForeground) {
+            // 应用正在运行，前台或后台
             String to = bundle.getString(KEY_TO);
             Class<?> clazz = ClassUtils.forName(to);
             if (clazz == null) clazz = MainActivity.class;

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

@@ -18,7 +18,6 @@ import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.entity.ErrorEntity
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.common.utils.SensorsBridge
-import com.gh.gamecenter.login.user.LoginTag
 import com.halo.assistant.fragment.user.UserInfoEditFragment
 import com.halo.assistant.fragment.user.VerifyPhoneFragment
 import com.lightgame.utils.AppManager

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

@@ -19,13 +19,11 @@ import com.gh.download.server.BrowserInstallHelper
 import com.gh.gamecenter.R
 import com.gh.gamecenter.WebActivity
 import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.exposure.ExposureSource
 import com.gh.gamecenter.common.retrofit.ApiResponse
 import com.gh.gamecenter.common.retrofit.EmptyResponse
 import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.common.view.dsbridge.CompletionHandler
-import com.gh.gamecenter.core.AppExecutor
 import com.gh.gamecenter.core.runOnUiThread
 import com.gh.gamecenter.core.utils.EmptyCallback
 import com.gh.gamecenter.core.utils.MtaHelper
@@ -35,6 +33,7 @@ import com.gh.gamecenter.feature.entity.ApkEntity
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.entity.PluginLocation
 import com.gh.gamecenter.feature.exposure.ExposureEvent
+import com.gh.gamecenter.feature.exposure.ExposureSource
 import com.gh.gamecenter.feature.exposure.ExposureType
 import com.gh.gamecenter.feature.utils.ApkActiveUtils
 import com.gh.gamecenter.gamedetail.dialog.GamePermissionDialogFragment
@@ -109,43 +108,15 @@ object GameActivityDownloadHelper {
     // 青少年模式
     private fun isTeenageMode(context: Context): Boolean {
         if (SPUtils.getBoolean(Constants.SP_TEENAGER_MODE)) {
-            SensorsBridge.trackAdolescentModeDialogShow(
-                gameId = mGameEntity?.id ?: "",
-                gameName = mGameEntity?.name ?: "",
-                gameType = mGameEntity?.categoryChinese ?: ""
-            )
             DialogHelper.showDialog(
                 context,
                 "提示",
                 "当前处于儿童/青少年模式， \n暂不提供游戏下载",
                 "退出青少年模式",
                 "关闭",
-                confirmClickCallback = {
-                    context.startActivity(TeenagerModeActivity.getIntent(context))
-                    SensorsBridge.trackAdolescentModeDialogClick(
-                        buttonName = "退出青少年模式",
-                        gameId = mGameEntity?.id ?: "",
-                        gameName = mGameEntity?.name ?: "",
-                        gameType = mGameEntity?.categoryChinese ?: ""
-                    )
-                },
-                cancelClickCallback = {
-                    SensorsBridge.trackAdolescentModeDialogClick(
-                        buttonName = "关闭",
-                        gameId = mGameEntity?.id ?: "",
-                        gameName = mGameEntity?.name ?: "",
-                        gameType = mGameEntity?.categoryChinese ?: ""
-                    )
-                },
-                touchOutsideCallback = {
-                    SensorsBridge.trackAdolescentModeDialogClick(
-                        buttonName = "关闭弹窗",
-                        gameId = mGameEntity?.id ?: "",
-                        gameName = mGameEntity?.name ?: "",
-                        gameType = mGameEntity?.categoryChinese ?: ""
-                    )
-                },
-                extraConfig = DialogHelper.Config(
+                { context.startActivity(TeenagerModeActivity.getIntent(context)) },
+                {},
+                DialogHelper.Config(
                     centerTitle = true,
                     centerContent = true
                 )
@@ -209,13 +180,10 @@ object GameActivityDownloadHelper {
             str != context.getString(R.string.install) &&
             str != context.getString(R.string.launch)
         ) {
-            ToastUtils.toast("${gameEntity.name}已加入下载队列")
             if (BrowserInstallHelper.shouldAutoSwitchAssistantInstall(gameEntity)) {
-                val toast = context.getString(R.string.unsupported_browser_install_hint)
-                AppExecutor.uiExecutor.executeWithDelay({
-                    ToastUtils.toast(toast)
-                }, 1000)
+                ToastUtils.toast(context.getString(R.string.unsupported_browser_install_hint))
             }
+            ToastUtils.toast("${gameEntity.name}已加入下载队列")
         } else {
             when {
                 str == context.getString(R.string.download) || str == context.getString(R.string.attempt) -> {
@@ -237,13 +205,10 @@ object GameActivityDownloadHelper {
                     handleUpdateStatus(context, gameEntity, apk, entrance, location, traceEvent)
                 }
                 else -> {
-                    ToastUtils.toast("${gameEntity.name}已加入下载队列")
                     if (BrowserInstallHelper.shouldAutoSwitchAssistantInstall(gameEntity)) {
-                        val toast = context.getString(R.string.unsupported_browser_install_hint)
-                        AppExecutor.uiExecutor.executeWithDelay({
-                            ToastUtils.toast(toast)
-                        }, 1000)
+                        ToastUtils.toast(context.getString(R.string.unsupported_browser_install_hint))
                     }
+                    ToastUtils.toast("${gameEntity.name}已加入下载队列")
                 }
             }
         }
@@ -260,7 +225,7 @@ object GameActivityDownloadHelper {
     ) {
         GamePermissionDialogFragment.show((context as AppCompatActivity), gameEntity, gameEntity.info) {
             CertificationDialog.showCertificationDialog(context, gameEntity) {
-                DialogUtils.checkDownload(context, apk.size, gameEntity.id, gameEntity.name, gameEntity.categoryChinese) { isSubscribe: Boolean ->
+                DialogUtils.checkDownload(context, apk.size, gameEntity.id, gameEntity.name) { isSubscribe: Boolean ->
                     download(context, gameEntity, apk, isSubscribe, entrance, location, traceEvent)
                 }
             }
@@ -284,8 +249,7 @@ object GameActivityDownloadHelper {
                         context,
                         apk.size,
                         gameEntity.id,
-                        gameEntity.name,
-                        gameEntity.categoryChinese
+                        gameEntity.name
                     ) { isSubscribe: Boolean ->
                         download(context, gameEntity, apk, isSubscribe, entrance, location, traceEvent)
                     }
@@ -307,7 +271,7 @@ object GameActivityDownloadHelper {
             DownloadDialog.showDownloadDialog(context, gameEntity, traceEvent, entrance, location)
         } else {
             CertificationDialog.showCertificationDialog(context, gameEntity) {
-                DialogUtils.checkDownload(context, apk.size, gameEntity.id, gameEntity.name, gameEntity.categoryChinese) { isSubscribe: Boolean ->
+                DialogUtils.checkDownload(context, apk.size, gameEntity.id, gameEntity.name) { isSubscribe: Boolean ->
                     plugin(context, gameEntity, apk, entrance, location, isSubscribe, traceEvent)
                 }
             }
@@ -321,18 +285,6 @@ object GameActivityDownloadHelper {
         apk: ApkEntity,
         downloadEntity: DownloadEntity?
     ) {
-        com.gh.gamecenter.common.utils.NewFlatLogUtils.logGameInstall(
-            gameId = downloadEntity?.gameId ?: "",
-            gameName = downloadEntity?.name ?: "",
-            trigger = "主动安装"
-        )
-
-        SensorsBridge.trackInstallGameClick(
-            gameName = downloadEntity?.name ?: "",
-            gameId = downloadEntity?.gameId ?: "",
-            action = "主动安装"
-        )
-
         val simulatorDownloadEntity = SimulatorGameManager.findDownloadEntityByUrl(apk.url)
         if (gameEntity.simulator != null) {
             val isInstalled =
@@ -348,7 +300,7 @@ object GameActivityDownloadHelper {
             if (simulatorDownloadEntity != null && SimulatorGameManager.isSimulatorGame(gameEntity) && !isInstalled && !isInstalledNewSimulator) {
                 SimulatorDownloadManager.getInstance().showDownloadDialog(
                     context, simulator,
-                    SimulatorDownloadManager.SimulatorLocation.LAUNCH, gameEntity.id, gameEntity.name!!, gameEntity.categoryChinese, null
+                    SimulatorDownloadManager.SimulatorLocation.LAUNCH, gameEntity.id, gameEntity.name!!, null
                 )
                 return
             }
@@ -375,7 +327,7 @@ object GameActivityDownloadHelper {
         //启动模拟器游戏
         if (SimulatorGameManager.isSimulatorGame(gameEntity)) {
             if (NewSimulatorGameManager.shouldShowUpdateNewSimulatorAlert(context)) {
-                NewSimulatorGameManager.showUpdateNewsSimulator(context, gameEntity, null)
+                NewSimulatorGameManager.showUpdateNewsSimulator(context, null)
                 return
             }
             val simulatorDownloadEntity =
@@ -412,7 +364,7 @@ object GameActivityDownloadHelper {
         location: String,
         traceEvent: ExposureEvent
     ) {
-        DialogUtils.checkDownload(context, apk.size, gameEntity.id, gameEntity.name, gameEntity.categoryChinese) { isSubscribe: Boolean ->
+        DialogUtils.checkDownload(context, apk.size, gameEntity.id, gameEntity.name) { isSubscribe: Boolean ->
             update(context, gameEntity, apk, entrance, location, isSubscribe, traceEvent)
         }
     }
@@ -475,13 +427,10 @@ object GameActivityDownloadHelper {
                     R.string.download
                 ), entrance, location, isSubscribe, traceEvent
             )
-            ToastUtils.toast("${gameEntity.name}已加入下载队列")
             if (BrowserInstallHelper.shouldAutoSwitchAssistantInstall(gameEntity)) {
-                val toast = context.getString(R.string.unsupported_browser_install_hint)
-                AppExecutor.uiExecutor.executeWithDelay({
-                    ToastUtils.toast(toast)
-                }, 1000)
+                ToastUtils.toast(context.getString(R.string.unsupported_browser_install_hint))
             }
+            ToastUtils.toast("${gameEntity.name}已加入下载队列")
         } else {
             ToastUtils.toast(msg)
         }
@@ -500,13 +449,10 @@ object GameActivityDownloadHelper {
         val msg = FileUtils.isCanDownload(context, apk.size)
         if (TextUtils.isEmpty(msg)) {
             DownloadManager.createDownload(context, apk, gameEntity, "插件化", entrance, location, isSubscribe, traceEvent)
-            ToastUtils.toast("${gameEntity.name}已加入下载队列")
             if (BrowserInstallHelper.shouldAutoSwitchAssistantInstall(gameEntity)) {
-                val toast = context.getString(R.string.unsupported_browser_install_hint)
-                AppExecutor.uiExecutor.executeWithDelay({
-                    ToastUtils.toast(toast)
-                }, 1000)
+                ToastUtils.toast(context.getString(R.string.unsupported_browser_install_hint))
             }
+            ToastUtils.toast("${gameEntity.name}已加入下载队列")
         } else {
             ToastUtils.toast(msg)
         }
@@ -527,16 +473,7 @@ object GameActivityDownloadHelper {
                 gameEntity.getEntryMap().remove(apkEntity.getPlatform())
             }
             PackageUtils.isCanPluggable(apkEntity) -> {
-                DialogHelper.showPluginDialog(
-                    context,
-                    pluginDesc = gameEntity.pluginDesc,
-                    gameId = gameEntity.id,
-                    gameName = gameEntity.name ?: "",
-                    gameType = gameEntity.categoryChinese,
-                    platform = gameEntity.platform ?: ""
-                ) {
-                    PackageInstaller.uninstall(context, path)
-                }
+                DialogHelper.showPluginDialog(context, gameEntity.pluginDesc) { PackageInstaller.uninstall(context, path) }
             }
             else -> {
                 PackageInstaller.install(context, downloadEntity)
@@ -555,13 +492,10 @@ object GameActivityDownloadHelper {
         traceEvent: ExposureEvent?
     ) {
         DownloadManager.createDownload(context, apk, gameEntity, "更新", entrance, location, isSubscribe, traceEvent)
-        ToastUtils.toast("${gameEntity.name}已加入下载队列")
         if (BrowserInstallHelper.shouldAutoSwitchAssistantInstall(gameEntity)) {
-            val toast = context.getString(R.string.unsupported_browser_install_hint)
-            AppExecutor.uiExecutor.executeWithDelay({
-                ToastUtils.toast(toast)
-            }, 1000)
+            ToastUtils.toast(context.getString(R.string.unsupported_browser_install_hint))
         }
+        ToastUtils.toast("${gameEntity.name}已加入下载队列")
     }
 
     @SuppressLint("CheckResult")

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

@@ -1,18 +0,0 @@
-package com.gh.common.util
-
-import com.gh.gamecenter.db.GameTrendsDao
-import com.gh.gamecenter.login.user.UserManager
-import com.gh.gamecenter.message.MessageUnreadRepository
-import com.halo.assistant.HaloApp
-
-object GameTrendsHelper {
-    private val mGameTrendsDao = GameTrendsDao(HaloApp.getInstance().application)
-
-    fun updateReadPostTime() {
-        mGameTrendsDao.findGameTrendsInfo(UserManager.getInstance().userId)?.let { trendsInfo ->
-            trendsInfo.readPostTime = System.currentTimeMillis()
-            mGameTrendsDao.add(trendsInfo)
-            MessageUnreadRepository.loadMessageUnreadTotal(true)
-        }
-    }
-}

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

@@ -10,7 +10,9 @@ import android.os.Message;
 import android.text.TextUtils;
 
 import com.gh.download.DownloadManager;
-import com.gh.gamecenter.eventbus.EBPackage;
+import com.gh.common.util.PackageUtils;
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus;
+import com.gh.gamecenter.common.eventbus.EBPackage;
 import com.halo.assistant.HaloApp;
 import com.lightgame.download.DownloadEntity;
 

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

@@ -24,7 +24,7 @@ import com.gh.gamecenter.feature.entity.GameEntity;
 import com.gh.gamecenter.feature.entity.PackageDialogEntity;
 import com.gh.gamecenter.feature.entity.Questions;
 import com.gh.gamecenter.feature.exposure.ExposureEvent;
-import com.gh.gamecenter.common.exposure.ExposureSource;
+import com.gh.gamecenter.feature.exposure.ExposureSource;
 import com.gh.gamecenter.login.user.UserManager;
 import com.halo.assistant.HaloApp;
 import com.lightgame.utils.Utils;
@@ -986,7 +986,7 @@ public class LogUtils {
         LoghubUtils.log(object, LOG_STORE_EVENT, false);
     }
 
-    public static void logHomeTopTabClick(String tabName, String linkType, String linkTitle, String linkId, int sequence, String entrance) {
+    public static void logHomeTopTabClick(String tabName, String linkType, String linkTitle, String linkId, int sequence) {
         JSONObject object = new JSONObject();
         try {
             object.put(KEY_EVENT, "top_tab_click");
@@ -995,7 +995,6 @@ public class LogUtils {
             object.put("link_id", linkId);
             object.put("link_text", linkTitle);
             object.put("sequence", sequence);
-            object.put("entrance", entrance);
             object.put(KEY_META, getMetaObject());
             object.put(KEY_TIMESTAMP, System.currentTimeMillis() / 1000);
         } catch (JSONException e) {

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

@@ -1623,13 +1623,12 @@ object NewFlatLogUtils {
     }
 
     //新游开测详情页点击游戏类型
-    fun logGameTestDetailGameCategoryClick(tabName: String, gameCategory: String, gameTestStartType: String, isOn: Boolean) {
+    fun logGameTestDetailGameCategoryClick(tabName: String, gameCategory: String, gameTestStartType: String) {
         val json = json {
             "event" to "game_test_detail_game_category_click"
             "tab_name" to tabName
             KEY_GAME_CATEGORY to gameCategory
             "game_test_start_type" to gameTestStartType
-            "is_on" to isOn
             parseAndPutMeta().invoke(this)
         }
         log(json, "event", false)
@@ -2341,102 +2340,4 @@ object NewFlatLogUtils {
         }
         log(json)
     }
-
-    // 游戏详情-求加速点击事件
-    fun logGameDetailClickForAccelerate(gameId: String, gameName: String) {
-        val json = json {
-            KEY_EVENT to "game_detail_click_for_accelerate"
-            "game_name" to gameName
-            "game_id" to gameId
-            parseAndPutMeta().invoke(this)
-        }
-        log(json)
-    }
-
-    // 游戏详情-求版本投票事件
-    fun logGameDetailClickForVersionVote(gameId: String, gameName: String, button: String) {
-        val json = json {
-            KEY_EVENT to "game_detail_click_for_version_vote"
-            "game_name" to gameName
-            "game_id" to gameId
-            "button" to button
-            parseAndPutMeta().invoke(this)
-        }
-        log(json)
-    }
-
-    // 游戏详情-求版本取消投票事件
-    fun logGameDetailCancelForVersionVote(gameId: String, gameName: String, button: String) {
-        val json = json {
-            KEY_EVENT to "game_detail_cancel_for_version_vote"
-            "game_name" to gameName
-            "game_id" to gameId
-            "button" to button
-            parseAndPutMeta().invoke(this)
-        }
-        log(json)
-    }
-
-    // 消息中心-插件版本提醒弹窗点击事件
-    @JvmStatic
-    fun logMessageInformClickPluginVersion(gameId: String, gameName: String) {
-        val json = json {
-            KEY_EVENT to "message_inform_click_plugin_version"
-            "game_name" to gameName
-            "game_id" to gameId
-            parseAndPutMeta().invoke(this)
-        }
-        log(json)
-    }
-
-    // 游戏动态关注列表取消关注事件 / 游戏动态关注列表查看详情事件
-    @JvmStatic
-    fun logGameActivityConcern(event: String, gameId: String, gameName: String?) {
-        val json = json {
-            KEY_EVENT to event
-            KEY_GAME_ID to gameId
-            KEY_GAME_NAME to gameName
-            parseAndPutMeta().invoke(this)
-        }
-        log(json)
-    }
-
-    // QA视频事件
-    @JvmStatic
-    fun logQAVideo(
-        event: String,
-        contentId: String,
-        contentTitle: String,
-        type: String,
-        sequence: Int,
-        videoId: String,
-        playAction: String,
-        playProcess: Float,
-        playTime: Int
-    ) {
-        val json = json {
-            KEY_EVENT to event
-            "content_id" to contentId
-            "content_title" to contentTitle
-            "type" to type
-            "sequence" to sequence
-            "video_id" to videoId
-            "play_action" to playAction
-            "play_process" to playProcess
-            "play_time" to playTime
-            parseAndPutMeta().invoke(this)
-        }
-        log(json)
-    }
-
-    @JvmStatic
-    fun logQGameClick(qqGameId: String, qqGameName: String?) {
-        val json = json {
-            KEY_EVENT to "qq_game_click"
-            "qq_game_id" to qqGameId
-            "qq_game_name" to qqGameName ?: ""
-            parseAndPutMeta().invoke(this)
-        }
-        log(json)
-    }
 }

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

@@ -1646,7 +1646,7 @@ object NewLogUtils {
     }
 
     //进入创建游戏单
-    fun logEnterGameCollectionCreate(entrance: String) {
+    fun logEnterGameCollectionEdit(entrance: String) {
         val json = json {
             KEY_EVENT to "enter_game_collect_create_location"
             KEY_ENTRANCE to entrance