feat: 礼包功能模块化

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

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'
     }
@@ -343,19 +337,12 @@ dependencies {
     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" />
@@ -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/java/com/gh/ad/AdDelegateHelper.kt

@@ -1,445 +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.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.ExposureSource
-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
-
-    private var mIsCsjRequired: Boolean = false // 是否需要初始化穿山甲 SDK
-    private var mIsBeiziRequired: Boolean = false // 师傅需要初始化 Beizi SDK
-
-    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)
-    }
-
-    /**
-     * 请求接口获取广告相关配置
-     */
-    @SuppressLint("CheckResult")
-    fun requestAdConfig(context: Context, 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(context, 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(context, cachedConfig)
-                    }
-                }
-            })
-    }
-
-    /**
-     * 获取搜索页的广告列表
-     */
-    fun getGameSearchAdList(): ArrayList<AdConfig> {
-        return mGameSearchAdList
-    }
-
-    /**
-     * 获取下载管理页的广告
-     */
-    fun getDownloadManagerAd(): AdConfig? {
-        return mDownloadManagerAd
-    }
-
-    /**
-     * 处理广告配置
-     */
-    fun handleAdConfig(context: Context, 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
-            }
-
-            // 根据返回的值里判断是否含有 Beizi 的广告
-            if (!mIsBeiziRequired) {
-                if (config.thirdPartyAd?.sourceName == AD_SDK_BEIZI) {
-                    mIsBeiziRequired = true
-                }
-            }
-
-            // 根据返回的值里判断是否含有 穿山甲 的广告
-            if (!mIsCsjRequired) {
-                if (config.thirdPartyAd?.sourceName == AD_SDK_CSJ) {
-                    mIsCsjRequired = true
-                }
-            }
-        }
-
-        // 初始化 Beizi
-        if (mIsBeiziRequired && mBeiziAdImpl == null) {
-            mBeiziAdImpl =
-                ARouter.getInstance().build(RouteConsts.provider.beiziAd).navigation() as? IBeiziAdProvider
-            mBeiziAdImpl?.initSDK(context)
-        }
-
-        // 初始化穿山甲
-        if (mIsCsjRequired && 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))
-            }
-        }
-    }
-
-    /**
-     * 是否需要显示开屏广告
-     */
-    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/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

@@ -34,8 +34,8 @@ 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
@@ -68,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
@@ -633,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)

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

@@ -18,9 +18,9 @@ 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.databinding.LayoutPopupContainerBinding
 import com.gh.gamecenter.feature.entity.ServerCalendarEntity
 import com.gh.gamecenter.servers.add.AddKaiFuPopupAdapter
 import java.text.SimpleDateFormat

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;
@@ -68,7 +66,6 @@ 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;
@@ -284,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,
@@ -413,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();
@@ -456,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;
                                 }
 
@@ -682,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/PackageCheckDialogFragment.kt

@@ -24,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
@@ -34,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

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

@@ -69,56 +69,6 @@ class DirectProviderImpl : IDirectProvider {
         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/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,7 +4,6 @@ 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
@@ -63,16 +62,6 @@ class LinkDirectUtilsProviderImpl : ILinkDirectUtilsProvider {
         DirectUtils.directToSuggestion(context, type, hiddenHint)
     }
 
-    override fun directToCommunityColumn(
-        context: Context,
-        community: CommunityEntity?,
-        subjectId: String,
-        entrance: String?,
-        path: String?
-    ) {
-        DirectUtils.directToCommunityColumn(context, community, subjectId, entrance, path)
-    }
-
     override fun init(context: Context?) {
         // Do nothing
     }

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/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/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;

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

@@ -57,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;
@@ -71,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;
@@ -732,65 +733,40 @@ public class DialogUtils {
     public static void showOverseaDownloadDialog(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_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 -> {
+        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);
+
+            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();
+            });
+
+            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 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();
     }
 
     public static void showGameH5DownloadDialog(Context context, GameEntity gameEntity, RegionSetting.GameH5Download gameH5Download) {
@@ -798,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();
 
@@ -1318,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();
@@ -1345,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
@@ -23,6 +22,7 @@ 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
@@ -32,12 +32,13 @@ 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
 import com.gh.gamecenter.download.DownloadFragment.Companion.INDEX_UPDATE
-import com.gh.gamecenter.entity.*
+import com.gh.gamecenter.entity.SubjectData
+import com.gh.gamecenter.entity.SubjectRecommendEntity
+import com.gh.gamecenter.entity.VideoLinkEntity
 import com.gh.gamecenter.eventbus.EBSkip
 import com.gh.gamecenter.feature.entity.GameDetailServer
 import com.gh.gamecenter.feature.entity.GameEntity
@@ -46,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
@@ -62,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
@@ -72,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
@@ -98,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
 
 /**
@@ -105,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)
@@ -220,7 +266,7 @@ 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")
@@ -300,7 +346,7 @@ object DirectUtils {
 
             "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
@@ -372,7 +418,7 @@ object DirectUtils {
             "column_test" -> context.startActivity(
                 GameServerTestActivity.getIntent(
                     context, linkEntity.link
-                        ?: "", linkEntity.text ?: "", entrance, exposureEvent
+                        ?: "", linkEntity.text ?: "", entrance
                 )
             )
 
@@ -400,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,
@@ -425,8 +471,6 @@ object DirectUtils {
                 )
             )
 
-            "qq_mini_game_column" -> directToQGameHome(context)
-
             "" -> {
                 // do nothing
             }
@@ -716,12 +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)
@@ -969,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)
-    }
-
     /**
      * 切换到社区页面（旧社区页面已经没有了，处理为跳转到论坛详情）
      */
@@ -1833,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));
     }
 
     /**
@@ -1851,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)
@@ -1863,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)
     }
 
@@ -2030,65 +2040,74 @@ object DirectUtils {
         )
     }
 
+    /**
+     * 跳转到礼包页
+     * @param context 上下文
+     * @param entrance
+     */
     @JvmStatic
-    fun directToQGameHome(context: Context) {
-        context.startActivity(QGameHomeWrapperActivity.getIntent(context))
-    }
-
-    @JvmStatic
-    fun directToQGameSearch(
+    fun directToGift(
         context: Context,
-        hint: String,
-        sourceEntrance: String
+        entrance: String
     ) {
-        context.startActivity(QGameSearchActivity.getIntent(context, hint, sourceEntrance))
+        ARouter
+            .getInstance()
+            .build(RouteConsts.activity.libaoActivity)
+            .withString(KEY_ENTRANCE, entrance)
+            .withString(NORMAL_FRAGMENT_NAME, LibaoFragment::class.java.canonicalName)
+            .navigation(context)
     }
 
-    @SuppressLint("CheckResult")
+    /**
+     * 跳转到礼包详情
+     * @param context 上下文
+     * @param libaoEntity 礼包信息
+     * @param isClickReceiveBtnIn
+     * @param entrance
+     */
     @JvmStatic
-    fun directToQGameById(
-        activity: Activity,
-        qqGameId: String
+    @JvmOverloads
+    fun directToGiftDetail(
+        context: Context,
+        libaoEntity: LibaoEntity,
+        isClickReceiveBtnIn: Boolean = false,
+        entrance: String,
+        requestCode: Int = -1,
     ) {
+        if (context !is Activity) return
 
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-            ToastUtils.toast("该游戏仅支持安卓5.0及以上设备")
-            return
-        }
+        HaloApp.put(LibaoEntity.TAG, libaoEntity)
 
-        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.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 directToMessageCenter(defaultTabIndex: Int) {
-        ARouter.getInstance().build(RouteConsts.activity.messageWrapperActivity)
-            .withInt(BaseActivity_TabLayout.PAGE_INDEX, defaultTabIndex)
-            .navigation()
+    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

@@ -3,6 +3,7 @@ package com.gh.common.util
 import android.content.Context
 import android.os.Build
 import com.gh.gamecenter.common.utils.DialogHelper
+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

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

@@ -1,6 +1,5 @@
 package com.gh.common.util
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Message
 import android.text.TextUtils
@@ -8,7 +7,6 @@ import android.view.View
 import androidx.appcompat.app.AppCompatActivity
 import androidx.collection.ArrayMap
 import androidx.recyclerview.widget.RecyclerView
-import com.alibaba.android.arouter.launcher.ARouter
 import com.gh.common.chain.*
 import com.gh.common.constant.Config
 import com.gh.common.dialog.DeviceRemindDialog
@@ -28,24 +26,18 @@ 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.constant.RouteConsts
 import com.gh.gamecenter.common.entity.LinkEntity
 import com.gh.gamecenter.common.utils.*
-import com.gh.gamecenter.core.AppExecutor
-import com.gh.gamecenter.core.provider.IQGameProvider
 import com.gh.gamecenter.core.utils.*
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.entity.PluginLocation
 import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.gh.gamecenter.feature.view.DownloadButton
 import com.gh.gamecenter.gamedetail.dialog.GamePermissionDialogFragment
-import com.gh.gamecenter.login.user.UserManager
 import com.gh.gamecenter.manager.PackagesManager
-import com.gh.gamecenter.retrofit.RetrofitManager
 import com.gh.gamecenter.teenagermode.TeenagerModeActivity
 import com.gh.vspace.VHelper
 import com.lightgame.download.DownloadConfig
@@ -244,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
@@ -300,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) {
@@ -386,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) {
@@ -752,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()
@@ -848,7 +826,6 @@ object DownloadItemUtils {
                 addHandler(DownloadDialogHelperHandler())
                 addHandler(CertificationHandler())
                 addHandler(OverseaDownloadHandler())
-                addHandler(LandPageAddressHandler())
                 addHandler(CheckDownloadHandler())
             }
                 .setProcessEndCallback {
@@ -867,7 +844,6 @@ object DownloadItemUtils {
                 addHandler(DownloadDialogHelperHandler())
                 addHandler(CertificationHandler())
                 addHandler(VersionNumberHandler())
-                addHandler(LandPageAddressHandler())
                 addHandler(OverseaDownloadHandler())
                 addHandler(CheckDownloadHandler())
             }
@@ -885,7 +861,6 @@ object DownloadItemUtils {
                 addHandler(DownloadDialogHelperHandler())
                 addHandler(CertificationHandler())
                 addHandler(VersionNumberHandler())
-                addHandler(LandPageAddressHandler())
                 addHandler(OverseaDownloadHandler())
                 addHandler(CheckStoragePermissionHandler())
                 addHandler(ValidateVSpaceHandler())
@@ -967,24 +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
-                        ) { 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)
 
@@ -1047,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
@@ -1077,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

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

@@ -18,7 +18,7 @@ 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.*
-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
@@ -39,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() {
@@ -73,34 +70,28 @@ object DownloadObserver {
 
                     val currentActivity = AppManager.getInstance().currentActivity() ?: return
 
-                    DialogHelper.showDialog(
-                        currentActivity,
-                        "下载失败",
-                        "下载链接已失效，建议提交反馈",
-                        "立即反馈",
-                        "取消",
-                        {
-                            HelpAndFeedbackBridge.startSuggestionActivity(
-                                currentActivity,
-                                SuggestType.gameQuestion, "notfound",
-                                StringUtils.buildString(downloadEntity.name, "，问题反馈：下载链接失效"),
-                                SimpleGameEntity(gameId, downloadEntity.name, "")
-                            )
-                        },
-                        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("磁盘已满，请清理空间后重试下载")
@@ -111,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) {
                     // 未成年
@@ -159,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))) {
@@ -222,12 +221,10 @@ object DownloadObserver {
                                 downloadEntity.pluginDesc
                             )
                         )
-
                     downloadEntity.isPlugin -> Utils.toast(
                         mApplication,
                         downloadEntity.name + " - " + platform + " - 下载完成"
                     )
-
                     else -> {
                         if (!downloadEntity.isVGame()) {
                             Utils.toast(mApplication, downloadEntity.name + " - 下载完成")
@@ -245,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()
@@ -259,6 +261,7 @@ object DownloadObserver {
                         currentActivity, simulator,
                         SimulatorDownloadManager.SimulatorLocation.LAUNCH, downloadEntity.gameId, gameName, null
                     )
+//                    }
                     SimulatorGameManager.recordDownloadSimulatorGame(downloadEntity.gameId, simulator.type)
                     SimulatorGameManager.postPlayedGame(downloadEntity.gameId, downloadEntity.packageName)
                 } else {
@@ -399,6 +402,11 @@ object DownloadObserver {
             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
         }

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

@@ -22,12 +22,8 @@ import com.gh.gamecenter.common.constant.Constants
 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.DataLogUtils
-import com.gh.gamecenter.common.utils.DialogHelper
-import com.gh.gamecenter.common.utils.observableToMain
-import com.gh.gamecenter.common.utils.singleToMain
+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
@@ -184,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) -> {
@@ -212,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}已加入下载队列")
                 }
             }
         }
@@ -437,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)
         }
@@ -462,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)
         }
@@ -508,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

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

@@ -2340,74 +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)
-    }
-
-    @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/PackageHelper.kt

@@ -3,6 +3,7 @@ package com.gh.common.util
 import android.content.Context
 import android.content.pm.ApplicationInfo
 import com.gh.common.constant.Config
+import com.gh.common.util.PackageUtils
 import com.gh.gamecenter.feature.entity.SettingsEntity
 import com.halo.assistant.HaloApp
 

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

@@ -16,6 +16,7 @@ import com.gh.download.server.BrowserInstallHelper
 import com.gh.gamecenter.BuildConfig
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.utils.DialogHelper
+import com.gh.common.util.PackageUtils
 import com.gh.gamecenter.common.utils.getExtension
 import com.gh.gamecenter.common.utils.getMetaExtra
 import com.gh.gamecenter.core.utils.CurrentActivityHolder
@@ -161,13 +162,14 @@ object PackageInstaller {
             }
 
         val flags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_CANCEL_CURRENT
+            PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
         } else {
-            PendingIntent.FLAG_CANCEL_CURRENT
+            PendingIntent.FLAG_UPDATE_CURRENT
         }
-        val pendingIntent = PendingIntent.getActivity(context, sessionId, intent, flags)
+        val pendingIntent = PendingIntent.getBroadcast(context, 0, intent, flags)
         // 提交数据流并执行安装
         session.commit(pendingIntent.intentSender)
+        session.close()
     }
 
     /**

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

@@ -2,7 +2,7 @@ package com.gh.common.util
 
 import android.content.Context
 import com.gh.gamecenter.core.utils.ToastUtils
-import com.gh.gamecenter.feature.entity.GameInstall
+import com.gh.gamecenter.entity.GameInstall
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.packagehelper.PackageRepository
 

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

@@ -7,14 +7,12 @@ import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.pm.PermissionInfo;
 import android.content.pm.Signature;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.PowerManager;
-import android.provider.Settings;
 import android.text.TextUtils;
 
 import androidx.annotation.NonNull;
@@ -31,7 +29,6 @@ import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.common.constant.Constants;
 import com.gh.gamecenter.common.utils.ExtensionsKt;
 import com.gh.gamecenter.common.utils.PackageFlavorHelper;
-import com.gh.gamecenter.common.utils.PermissionHelper;
 import com.gh.gamecenter.core.utils.MD5Utils;
 import com.gh.gamecenter.core.utils.SentryHelper;
 import com.gh.gamecenter.feature.entity.ApkEntity;
@@ -77,9 +74,6 @@ public class PackageUtils {
 
     private static final String TAG = "PackageUtils";
 
-    // 设备是否支持禁用获取已安装应用列表。-1 代表支持情况未知，0 代表不支持， 1 代表支持
-    private static int mIsSupportGetInstalledListPermission = -1;
-
     public static String getInstallPackageInfoSourceDir(String packageName) {
         try {
             return HaloApp.getInstance().getApplication().getPackageManager().getPackageInfo(packageName,
@@ -143,9 +137,6 @@ public class PackageUtils {
                 updateEntity.setSignature(apkEntity.getSignature());
                 updateEntity.setCategory(gameEntity.getCategory());
                 updateEntity.setCurrentVersion(PackageUtils.getVersionNameByPackageName(apkEntity.getPackageName()));
-                if (gameEntity.isLandPageAddressDialog()) {
-                    updateEntity.setLandPageAddressDialog(gameEntity.getLandPageAddressDialog());
-                }
                 updateList.add(updateEntity);
             }
         }
@@ -220,9 +211,6 @@ public class PackageUtils {
                         updateEntity.setSignature(apkEntity.getSignature());
                         updateEntity.setCategory(gameEntity.getCategory());
                         updateEntity.setCurrentVersion(PackageUtils.getVersionNameByPackageName(apkEntity.getPackageName()));
-                        if (gameEntity.isLandPageAddressDialog()) {
-                            updateEntity.setLandPageAddressDialog(gameEntity.getLandPageAddressDialog());
-                        }
                         updateList.add(updateEntity);
                     }
                 }
@@ -972,78 +960,18 @@ public class PackageUtils {
             return new ArrayList<>(mInstalledPackageList);
         }
 
-        // 是否需要调用系统 API 获取最新的已安装应用列表
-        boolean shouldGetNewInstalledPackagedList = false;
-
-        // 当前设备是否支持限制获取已安装应用列表的功能
-        if (isSupportGetInstalledAppsPermission(context)) {
-            Utils.log(TAG, "当前设备支持限制获取已安装应用列表的功能");
-            // 当前设备是否支持禁用了获取已安装应用列表
-            if (!PermissionHelper.isGetInstalledListPermissionDisabled(context)) {
-                Utils.log(TAG, "当前设备没有限制获取已安装应用列表的功能");
-                shouldGetNewInstalledPackagedList = true;
-            } else {
-                Utils.log(TAG, "当前设备已限制获取已安装应用列表的功能");
-            }
-        } else {
-            Utils.log(TAG, "当前设备不支持限制获取已安装应用列表的功能");
-            shouldGetNewInstalledPackagedList = true;
-        }
-
-        if (shouldGetNewInstalledPackagedList) {
-            mLastInstalledPackageListTime = System.currentTimeMillis();
-            mInstalledPackageList = getInstalledPackagesInternal(context, flags);
-        }
-
-        if (mInstalledPackageList == null) {
-            mInstalledPackageList = new ArrayList<>();
-        }
+        Utils.log(TAG, "调用系统 API 获取全新的已安装应用列表");
 
+        mLastInstalledPackageListTime = System.currentTimeMillis();
+        mInstalledPackageList = getInstalledPackagesInternal(context, flags);
         return mInstalledPackageList;
     }
 
-    public static boolean isSupportGetInstalledAppsPermission(Context context) {
-        // 若存在缓存，直接返回缓存结果。为 0 代表不支持，为 1 代表支持
-        if (mIsSupportGetInstalledListPermission != -1) {
-            return mIsSupportGetInstalledListPermission != 0;
-        }
-
-        try {
-            // 根据官方提供的方法来判定是否支持限制获取已安装应用列表
-            int flag = Settings.Secure.getInt(context.getContentResolver(), "oem_installed_apps_runtime_permission_enable", 0);
-            if (flag == 1) {
-                mIsSupportGetInstalledListPermission = 1;
-                return true;
-            }
-
-            // 部分未升级的手机没有上面配置项，有定义下面危险权限也认为是支持设备软件列表管控
-            PackageManager packageManager = context.getPackageManager();
-            PermissionInfo permissionInfo = packageManager.getPermissionInfo("com.android.permission.GET_INSTALLED_APPS", 0);
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-                if (permissionInfo.getProtection() == PermissionInfo.PROTECTION_DANGEROUS) {
-                    mIsSupportGetInstalledListPermission = 1;
-                    return true;
-                } else {
-                    mIsSupportGetInstalledListPermission = 0;
-                    return false;
-                }
-            } else {
-                mIsSupportGetInstalledListPermission = 0;
-                return false;
-            }
-        } catch (NameNotFoundException e) {
-            mIsSupportGetInstalledListPermission = 0;
-            return false;
-        }
-    }
-
     /**
      * 在5.1系统手机使用PackageManager获取已安装应用容易发生Package manager has died异常
      * https://stackoverflow.com/questions/13235793/transactiontoolargeeception-when-trying-tÏo-get-a-list-of-applications-installed/30062632#30062632
      */
     private static List<PackageInfo> getInstalledPackagesInternal(Context context, int flags) {
-        Utils.log(TAG, "调用系统 API 获取已安装应用列表");
-
         final PackageManager pm = context.getPackageManager();
         try {
             return pm.getInstalledPackages(flags);

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

@@ -7,7 +7,7 @@ import android.text.TextUtils;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.common.retrofit.JSONObjectResponse;
 import com.gh.gamecenter.common.retrofit.Response;
-import com.gh.gamecenter.feature.entity.CommentEntity;
+import com.gh.gamecenter.entity.CommentEntity;
 import com.gh.gamecenter.retrofit.RetrofitManager;
 import com.lightgame.utils.Utils;
 import com.walkud.rom.checker.RomIdentifier;

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

@@ -2,6 +2,7 @@ package com.gh.common.util
 
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.common.dialog.DeviceRemindDialog
+import com.gh.common.util.PackageUtils
 import com.gh.gamecenter.core.utils.GsonUtils
 import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.core.utils.TimeUtils

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

@@ -95,19 +95,21 @@ object ReservationHelper {
                         NewLogUtils.logReserveGameSuccess(wechatConfig)
                         if (bind && follow && notice) {
                             NewLogUtils.logReserveWechatSuccessPopShow()
-                            DialogUtils.showReserveOrVoteSuccessDialog(context, true)
+                            DialogUtils.showReserveSuccessDialog(context)
                         } else {
                             NewLogUtils.logReserveWechatRemindPopShow(wechatConfig)
                             SensorsBridge.trackEvent("AppointmenWechatRemindDialogShow")
-                            DialogUtils.showReserveOrVoteSuccess2WechatBindDialog(context, true, {
-                                NewLogUtils.logReserveWechatRemindPopClick(wechatConfig, "开启微信提醒")
-                                SensorsBridge.trackEvent("AppointmenWechatRemindDialogClick")
-                                context.startActivity(WebActivity.getBindWechatIntent(context))
-                                SensorsBridge.trackEvent(
-                                    "AppointmenWechatRemindConfigPageShow",
-                                    "source_entrance",
-                                    "设置微信提醒弹窗"
-                                )
+                            DialogUtils.showReserveSuccess2WechatBindDialog(context, object : ConfirmListener {
+                                override fun onConfirm() {
+                                    NewLogUtils.logReserveWechatRemindPopClick(wechatConfig, "开启微信提醒")
+                                    SensorsBridge.trackEvent("AppointmenWechatRemindDialogClick")
+                                    context.startActivity(WebActivity.getBindWechatIntent(context))
+                                    SensorsBridge.trackEvent(
+                                        "AppointmenWechatRemindConfigPageShow",
+                                        "source_entrance",
+                                        "设置微信提醒弹窗"
+                                    )
+                                }
                             }, object : CancelListener {
                                 override fun onCancel() {
                                     NewLogUtils.logReserveWechatRemindPopClick(wechatConfig, "关闭弹窗")

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

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.feature.view;
+package com.gh.common.view;
 
 import android.content.Context;
 import android.util.AttributeSet;
@@ -8,8 +8,8 @@ import android.widget.LinearLayout;
 
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.gh.gamecenter.R;
 import com.gh.gamecenter.core.utils.DisplayUtils;
-import com.gh.gamecenter.feature.R;
 
 public class Concern_LinearLayout extends LinearLayout {
 

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

@@ -1,40 +1,30 @@
 package com.gh.common.xapk
 
-import android.app.Activity
+import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageInstaller
+import android.content.pm.PackageInstaller.SessionInfo
 import android.os.Build
-import android.os.Bundle
 import androidx.annotation.RequiresApi
 
 @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
-class XapkInstallReceiver : Activity() {
+class XapkInstallReceiver : BroadcastReceiver() {
 
     companion object {
         const val KEY_PACKAGE_PATH = "package_path"
     }
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        overridePendingTransition(0, 0)
-        handleIntent(this, intent)
-
-    }
-
-    private fun handleIntent(context: Context, intent: Intent) {
+    override fun onReceive(context: Context, intent: Intent) {
         when (intent.getIntExtra(PackageInstaller.EXTRA_STATUS, -999)) {
             PackageInstaller.STATUS_PENDING_USER_ACTION -> {
                 val installIntent = intent.getParcelableExtra<Intent>(Intent.EXTRA_INTENT)
                 if (installIntent != null) {
-                    try {
-                        context.startActivity(installIntent)
-                        updatePendingSessionInfoStatus(intent, XapkPendingSessionInfo.STATUS_PENDING_USER_ACTION)
-                    } catch (e: Exception) {
-                        // OPPO低版本会出现CONFIRM_PERMISSIONS的权限异常，这个问题无解，直接取消安装
-                        updatePendingSessionInfoStatus(intent, XapkPendingSessionInfo.STATUS_INSTALL_CANCELED)
-                    }
-                    finish()
+                    val installPackagePath = intent.getStringExtra(KEY_PACKAGE_PATH)
+                    val installSessionId = intent.getIntExtra(PackageInstaller.EXTRA_SESSION_ID, -1)
+                    XapkInstaller.onPendingUserAction(installPackagePath!!, installSessionId)
+                    installIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                    context.startActivity(installIntent)
                 }
             }
             PackageInstaller.STATUS_FAILURE,
@@ -44,21 +34,11 @@ class XapkInstallReceiver : Activity() {
             PackageInstaller.STATUS_FAILURE_INCOMPATIBLE,
             PackageInstaller.STATUS_FAILURE_INVALID,
             PackageInstaller.STATUS_FAILURE_STORAGE -> {
-                updatePendingSessionInfoStatus(intent, XapkPendingSessionInfo.STATUS_INSTALL_CANCELED)
-                finish()
+                val installPackagePath = intent.getStringExtra(KEY_PACKAGE_PATH)
+                if (!installPackagePath.isNullOrEmpty()) {
+                    XapkInstaller.onInstallCanceled(installPackagePath)
+                }
             }
-            else -> {
-                updatePendingSessionInfoStatus(intent, XapkPendingSessionInfo.STATUS_INSTALL_SUCCESS)
-                finish()
-            }
-        }
-    }
-
-    private fun updatePendingSessionInfoStatus(intent: Intent, status: Int) {
-        val installPackagePath = intent.getStringExtra(KEY_PACKAGE_PATH)
-        if (!installPackagePath.isNullOrEmpty()) {
-            val pendingSessionInfo = XapkInstaller.getPendingSessionInfo(installPackagePath)
-            pendingSessionInfo?.updateStatus(status)
         }
     }
 }

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

@@ -2,19 +2,14 @@ package com.gh.common.xapk
 
 import android.annotation.SuppressLint
 import android.content.Context
-import android.content.Intent
 import android.os.Build
-import android.provider.Settings
-import com.gh.common.constant.Config
 import com.gh.common.util.*
 import com.gh.download.DownloadDataHelper
 import com.gh.download.DownloadManager
-import com.gh.gamecenter.R
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.utils.*
-import com.gh.gamecenter.core.AppExecutor
+import com.gh.gamecenter.common.utils.debugOnly
+import com.gh.gamecenter.common.utils.getExtension
+import com.gh.gamecenter.common.utils.throwExceptionInDebug
 import com.gh.gamecenter.core.utils.SentryHelper
-import com.gh.gamecenter.core.utils.ToastUtils
 import com.gh.gamecenter.xapk.XApkUnZipper
 import com.gh.gamecenter.xapk.core.XApkFile
 import com.gh.gamecenter.xapk.core.XApkUnZipCallback
@@ -55,9 +50,6 @@ object XapkInstaller : XApkUnZipCallback, XApkUnZipOutputFactory {
     const val XAPK_DATA_EXTENSION_NAME = "obb"
     const val PACKAGE_EXTENSION_NAME = "apk"
 
-    private const val GUIDE_TYPE_MIUI_OPTIMIZATION = "miui_optimization"
-    private const val MIUI_OPTIMIZATION_WARNING_DIALOG_ENTRANCE = "MIUI优化关闭提示弹窗"
-
     private var mContext = HaloApp.getInstance().application.applicationContext
 
     private val mXApkUnZipper = XApkUnZipper(this)
@@ -67,7 +59,9 @@ object XapkInstaller : XApkUnZipCallback, XApkUnZipOutputFactory {
 
     private val mDownloadEntityMap = Collections.synchronizedMap(HashMap<String, DownloadEntity>())
 
-    private val mPendingSessionInfoMap = HashMap<String, XapkPendingSessionInfo>()
+    private val mInstallingPath = Collections.synchronizedList(mutableListOf<String>())
+
+    private val mPendingSessionIdMap = Collections.synchronizedMap(HashMap<String, Int>())
 
     // 按并行解压
     @JvmStatic
@@ -76,38 +70,6 @@ object XapkInstaller : XApkUnZipCallback, XApkUnZipOutputFactory {
 
         val filePath = downloadEntity.path
         if (XAPK_EXTENSION_NAME == filePath.getExtension()) {
-            if (MiuiUtils.isMiui() && !MiuiUtils.isMiuiOptimizationDisabled() && downloadEntity.format == Constants.XAPK_APKS_FORMAT) {// 小米手机开启miui以后，需要引导用户关闭miui优化
-                DialogHelper.showMiuiOptimizationWarning(
-                    context,
-                    onHintClick = {
-                        val guides = Config.getNewApiSettingsEntity()?.install
-                        val miuiOptimizationGuide = guides?.guides?.findLast {
-                            it.type == GUIDE_TYPE_MIUI_OPTIMIZATION
-                        }
-                        if (miuiOptimizationGuide != null) {
-                            DirectUtils.directToLinkPage(
-                                context,
-                                miuiOptimizationGuide.link,
-                                MIUI_OPTIMIZATION_WARNING_DIALOG_ENTRANCE,
-                                ""
-                            )
-                        }
-                    },
-                    onConfirmClick = {
-                        if (SystemUtils.isDevelopmentSettingsEnabled(context)) {
-                            context.startActivity(
-                                Intent(Settings.ACTION_APPLICATION_DEVELOPMENT_SETTINGS)
-                                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                            )
-                            it.dismiss()
-                        } else {
-                            ToastUtils.showToast(context.getString(R.string.miui_open_adb_hint))
-                        }
-                    }
-                )
-                return
-            }
-
             unzipXapkFile(downloadEntity)
             if (showUnzipToast) {
                 Utils.toast(mContext, "解压过程请勿退出光环助手！")
@@ -137,11 +99,7 @@ object XapkInstaller : XApkUnZipCallback, XApkUnZipOutputFactory {
         val downloadEntity = mDownloadEntityMap[apk.file.path] ?: return
         downloadEntity.meta[XAPK_UNZIP_PERCENT] = String.format("%.2f", progress * 100)
         downloadEntity.meta[XAPK_UNZIP_STATUS] = XapkUnzipStatus.UNZIPPING.name
-
-        AppExecutor.ioExecutor.execute {
-            NDataChanger.notifyDataChanged(downloadEntity)
-        }
-
+        NDataChanger.notifyDataChanged(downloadEntity)
         debugOnly {
             Utils.log("unzip", "onProgress->$progress")
         }
@@ -152,40 +110,43 @@ object XapkInstaller : XApkUnZipCallback, XApkUnZipOutputFactory {
 
         downloadEntity.meta[XAPK_UNZIP_PERCENT] = "100.0"
         downloadEntity.meta[XAPK_UNZIP_STATUS] = XapkUnzipStatus.SUCCESS.name
+        NDataChanger.notifyDataChanged(downloadEntity)
+        DownloadManager.getInstance().updateDownloadEntity(downloadEntity)
 
-        AppExecutor.ioExecutor.execute {
-            NDataChanger.notifyDataChanged(downloadEntity)
-            DownloadManager.getInstance().updateDownloadEntity(downloadEntity)
-            DownloadDataHelper.uploadDownloadStatusEvent(downloadEntity, "xapk解压成功")
-        }
+        DownloadDataHelper.uploadDownloadStatusEvent(downloadEntity, "xapk解压成功")
 
         debugOnly {
             Utils.log("unzip", "onSuccess->${downloadEntity.path}")
         }
 
-        installer.install(mContext)
+        if (!mInstallingPath.contains(downloadEntity.path)) {
+            mInstallingPath.add(downloadEntity.path)
+        }
+
+        NDataChanger.notifyDataChanged(downloadEntity)
+
+        XapkInstallerLooper.add(downloadEntity.path, installer)
+        XapkInstallerLooper.install(mContext)
     }
 
     override fun onError(apk: XApkFile, exception: Throwable) {
         val downloadEntity = mDownloadEntityMap[apk.file.path] ?: return
         downloadEntity.meta[XAPK_UNZIP_STATUS] = XapkUnzipStatus.FAILURE.name
+        DownloadNotificationHelper.addOrUpdateDownloadNotification(downloadEntity)
+        NDataChanger.notifyDataChanged(downloadEntity)
+        DownloadManager.getInstance().updateDownloadEntity(downloadEntity)
 
-        AppExecutor.ioExecutor.execute {
-            DownloadNotificationHelper.addOrUpdateDownloadNotification(downloadEntity)
-            NDataChanger.notifyDataChanged(downloadEntity)
-            DownloadManager.getInstance().updateDownloadEntity(downloadEntity)
-            // 仅官网渠道上报 XAPK 异常信息
-            if (HaloApp.getInstance().channel == "GH_206") {
-                SentryHelper.onEvent(
-                    "XAPK_UNZIP_ERROR",
-                    "gameName", downloadEntity.name,
-                    "errorDigest", exception.localizedMessage
-                )
-            }
-
-            DownloadDataHelper.uploadDownloadStatusEvent(downloadEntity, "xapk解压失败")
+        // 仅官网渠道上报 XAPK 异常信息
+        if (HaloApp.getInstance().channel == "GH_206") {
+            SentryHelper.onEvent(
+                "XAPK_UNZIP_ERROR",
+                "gameName", downloadEntity.name,
+                "errorDigest", exception.localizedMessage
+            )
         }
 
+        DownloadDataHelper.uploadDownloadStatusEvent(downloadEntity, "xapk解压失败")
+
         debugOnly {
             Utils.log("unzip", "onFailure->$exception")
         }
@@ -195,10 +156,8 @@ object XapkInstaller : XApkUnZipCallback, XApkUnZipOutputFactory {
         val downloadEntity = mDownloadEntityMap.remove(apk.file.path) ?: return
         downloadEntity.meta[XAPK_UNZIP_PERCENT] = "0.0"
         downloadEntity.meta[XAPK_UNZIP_STATUS] = XapkUnzipStatus.CANCEL.name
-        AppExecutor.ioExecutor.execute {
-            NDataChanger.notifyDataChanged(downloadEntity)
-            DownloadManager.getInstance().updateDownloadEntity(downloadEntity)
-        }
+        NDataChanger.notifyDataChanged(downloadEntity)
+        DownloadManager.getInstance().updateDownloadEntity(downloadEntity)
     }
 
     override fun onNext(apk: XApkFile, fileName: String) {
@@ -207,9 +166,11 @@ object XapkInstaller : XApkUnZipCallback, XApkUnZipOutputFactory {
         }
     }
 
-    fun getPendingSessionInfo(packagePath: String): XapkPendingSessionInfo? = mPendingSessionInfoMap[packagePath]
+    fun isInstalling(packagePath: String): Boolean = mInstallingPath.contains(packagePath)
 
-    fun isInstalling(packagePath: String): Boolean = mPendingSessionInfoMap.containsKey(packagePath)
+    fun onPendingUserAction(packagePath: String, sessionId: Int) {
+        mPendingSessionIdMap[packagePath] = sessionId
+    }
 
     /**
      * 通知XAPK安装完成
@@ -217,32 +178,41 @@ object XapkInstaller : XApkUnZipCallback, XApkUnZipOutputFactory {
     fun onInstalled(packagePath: String) {
         val downloadEntity = mDownloadEntityMap.remove(packagePath) ?: return
 
-        mPendingSessionInfoMap.remove(packagePath)
+        mPendingSessionIdMap.remove(packagePath)
+        mInstallingPath.remove(packagePath)
 
         downloadEntity.meta[XAPK_UNZIP_PERCENT] = "100.0"
         downloadEntity.meta[XAPK_UNZIP_STATUS] = XapkUnzipStatus.INSTALLED.name
 
-        AppExecutor.ioExecutor.execute {
-            NDataChanger.notifyDataChanged(downloadEntity)
-            DownloadManager.getInstance().updateDownloadEntity(downloadEntity)
-            DownloadDataHelper.uploadDownloadStatusEvent(downloadEntity, "xapk安装成功")
-        }
+        NDataChanger.notifyDataChanged(downloadEntity)
+
+        DownloadManager.getInstance().updateDownloadEntity(downloadEntity)
+
+        DownloadDataHelper.uploadDownloadStatusEvent(downloadEntity, "xapk安装成功")
+
+        XapkInstallerLooper.remove(downloadEntity.path)
+        XapkInstallerLooper.install(mContext)
     }
 
     fun onInstallCanceled(packagePath: String) {
 
         val downloadEntity = mDownloadEntityMap.remove(packagePath) ?: return
 
-        mPendingSessionInfoMap.remove(packagePath)
+        mPendingSessionIdMap.remove(packagePath)
+
+        mInstallingPath.remove(packagePath)
 
         downloadEntity.meta[XAPK_UNZIP_PERCENT] = "0.0"
         downloadEntity.meta[XAPK_UNZIP_STATUS] = XapkUnzipStatus.CANCEL.name
 
-        AppExecutor.ioExecutor.execute {
-            NDataChanger.notifyDataChanged(downloadEntity)
-            DownloadManager.getInstance().updateDownloadEntity(downloadEntity)
-            DownloadDataHelper.uploadDownloadStatusEvent(downloadEntity, "xapk安装取消")
-        }
+        NDataChanger.notifyDataChanged(downloadEntity)
+
+        DownloadManager.getInstance().updateDownloadEntity(downloadEntity)
+
+        DownloadDataHelper.uploadDownloadStatusEvent(downloadEntity, "xapk安装取消")
+
+        XapkInstallerLooper.remove(downloadEntity.path)
+        XapkInstallerLooper.install(mContext)
     }
 
     /**
@@ -250,52 +220,29 @@ object XapkInstaller : XApkUnZipCallback, XApkUnZipOutputFactory {
      * 1. 用户触碰安装弹窗(原生Android系统)区域外导致安装取消
      */
     fun updateCurrentInstallStatus() {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP || mPendingSessionInfoMap.isEmpty()) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP || mPendingSessionIdMap.isEmpty()) {
             return
         }
 
-        val updateList = mutableListOf<XapkPendingSessionInfo>()
+        val installer = mContext.packageManager.packageInstaller
 
-        for (pendingSessionInfoEntry in mPendingSessionInfoMap) {
+        for (pendingSessionEntry in mPendingSessionIdMap) {
+            val sessionInfo = installer.getSessionInfo(pendingSessionEntry.value)
 
-            val pendingSessionInfo = pendingSessionInfoEntry.value
-
-            if (pendingSessionInfo.getStatus() == XapkPendingSessionInfo.STATUS_PENDING_USER_ACTION) {// 用户触摸安装弹窗外部区域取消安装后，更新安装状态
-                val installer = mContext.packageManager.packageInstaller
-                val sessionId = pendingSessionInfo.sessionId
-                if (sessionId != -1) {
-                    val sessionInfo = installer.getSessionInfo(sessionId)
-                    // 表示用户点击了安装弹窗外部区域
-                    if (sessionInfo == null) {
-                        pendingSessionInfo.updateStatus(XapkPendingSessionInfo.STATUS_INSTALL_CANCELED)
-                    } else if (sessionInfo.progress <= 0.8F) {
-                        AppExecutor.ioExecutor.execute {
-                            try {
-                                installer.abandonSession(sessionInfo.sessionId)
-                            } catch (_: Exception) {
-                                // 有概率抛SecurityException，这里只要直接catch不做处理即可
-                            }
-                        }
-                        pendingSessionInfo.updateStatus(XapkPendingSessionInfo.STATUS_INSTALL_CANCELED)
-                    }
-                }
+            // 1. 用户点击了取消按钮时，sessionInfo为空
+            // 2. 用户点击了确定按钮时，sessionInfo的progress大于0.8
+            if (sessionInfo == null || sessionInfo.progress > 0.8F) {
+                continue
             }
 
-            val installStatus = pendingSessionInfo.getStatus()
-            if (installStatus == XapkPendingSessionInfo.STATUS_INSTALL_CANCELED
-                || installStatus == XapkPendingSessionInfo.STATUS_INSTALL_SUCCESS
-            ) {
-                updateList.add(pendingSessionInfo)
-            }
-        }
+            installer.abandonSession(sessionInfo.sessionId)
 
-        for (pendingSessionInfo in updateList) {
-            val downloadEntity = mDownloadEntityMap[pendingSessionInfo.path] ?: continue
-            val installStatus = pendingSessionInfo.getStatus()
-            if (installStatus == XapkPendingSessionInfo.STATUS_INSTALL_SUCCESS) {
-                onInstalled(downloadEntity.path)
-            } else if (installStatus == XapkPendingSessionInfo.STATUS_INSTALL_CANCELED) {
+            val downloadEntity = mDownloadEntityMap[pendingSessionEntry.key] ?: return
+
+            if (!PackageUtils.isInstalled(mContext, downloadEntity.packageName)) {
                 onInstallCanceled(downloadEntity.path)
+            } else {
+                onInstalled(downloadEntity.path)
             }
         }
     }
@@ -321,16 +268,9 @@ object XapkInstaller : XApkUnZipCallback, XApkUnZipOutputFactory {
         private val xApkFile: XApkFile,
         private val sessionId: Int,
     ) : IPackageInstaller {
-
         override fun install(context: Context) {
-            val applicationContext = context.applicationContext
             val downloadEntity = mDownloadEntityMap[xApkFile.file.path] ?: return
-
-            mPendingSessionInfoMap[downloadEntity.path] = XapkPendingSessionInfo(downloadEntity.path, sessionId)
-            AppExecutor.ioExecutor.execute {// 有可能卡顿造成anr
-                PackageInstaller.installMultiple(applicationContext, downloadEntity.path, sessionId)
-                NDataChanger.notifyDataChanged(downloadEntity)
-            }
+            PackageInstaller.installMultiple(context, downloadEntity.path, sessionId)
         }
     }
 
@@ -338,7 +278,6 @@ object XapkInstaller : XApkUnZipCallback, XApkUnZipOutputFactory {
         private val xApkFile: XApkFile,
         private val file: File
     ) : IPackageInstaller {
-
         override fun install(context: Context) {
             val downloadEntity = mDownloadEntityMap[xApkFile.file.path] ?: return
             PackageInstaller.install(
@@ -349,12 +288,49 @@ object XapkInstaller : XApkUnZipCallback, XApkUnZipOutputFactory {
             )
         }
     }
+
+    /**
+     * XAPK安装每次只能执行一个安装流程，因此添加一个安装队列
+     */
+    private object XapkInstallerLooper {
+
+        private val packagePathList = mutableListOf<String>()
+
+        private val installerList = mutableListOf<IPackageInstaller>()
+
+        fun add(packagePath: String, installer: IPackageInstaller) {
+            if (packagePathList.contains(packagePath)) {
+                return
+            }
+            packagePathList.add(packagePath)
+            installerList.add(installer)
+        }
+
+        fun install(context: Context) {
+            if (installerList.isEmpty()) {
+                return
+            }
+            installerList.first().install(context)
+        }
+
+        fun remove(packagePath: String) {
+            if (!packagePathList.contains(packagePath)) {
+                return
+            }
+            val index = packagePathList.indexOf(packagePath)
+            if (index != -1) {
+                packagePathList.removeAt(index)
+                installerList.removeAt(index)
+            }
+        }
+    }
 }
 
 enum class XapkUnzipStatus(status: String) {
     UNZIPPING("unzipping"),
     SUCCESS("success"),
     CANCEL("cancel"),
+    INSTALLING("installing"),
     INSTALLED("installed"),
     FAILURE("failure");
 }

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

@@ -1,21 +0,0 @@
-package com.gh.common.xapk
-
-class XapkPendingSessionInfo(
-    val path: String,
-    val sessionId: Int = -1
-) {
-    companion object {
-        const val STATUS_INIT = -1
-        const val STATUS_PENDING_USER_ACTION = 0
-        const val STATUS_INSTALL_SUCCESS = 1
-        const val STATUS_INSTALL_CANCELED = 2
-    }
-
-    private var status = STATUS_INIT
-
-    internal fun updateStatus(status: Int) {
-        this.status = status
-    }
-
-    fun getStatus(): Int = status
-}

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

@@ -23,6 +23,9 @@ import org.json.JSONObject
 object DownloadDataHelper {
     private const val TAG = "DownloadDataHelper"
 
+    private const val DOWNLOAD_SPEED_TIME = "download_speed_time"
+    private const val DOWNLOAD_SPEED_SIZE = "download_speed_size"
+
     const val DOWNLOAD_RESUME_WAY = "download_resume_way"
     const val DOWNLOAD_RESUME_MANUAL = "manual"
     const val DOWNLOAD_RESUME_AUTO = "auto"
@@ -31,6 +34,8 @@ object DownloadDataHelper {
     const val DOWNLOAD_CANCEL_MANUAL = "manual"
     const val DOWNLOAD_CANCEL_AUTO = "auto"
 
+    const val DOWNLOAD_FIRST_START = "download_first_start"
+
     const val DOWNLOAD_THREAD_SIZE = "download_thread_size" // 线程数量，0为传统单线程模式; 1为多线程的单线程; >1为多线程的实际线程数量
 
     private val mDownloadSpeedMap = HashMap<String, MutableList<Long>>()
@@ -135,28 +140,26 @@ object DownloadDataHelper {
 
     @JvmStatic
     fun uploadDownloadEvent(downloadEntity: DownloadEntity) {
-        val downloadSimpleEntity = DownloadDataSimpleHelper.getDownloadDataSimpleEntity(downloadEntity.url)
-
         if (downloadEntity.status != DownloadStatus.downloading) {
             uploadDownloadStatusEvent(downloadEntity)
         }
 
         if (downloadEntity.status == DownloadStatus.downloading) {
-            val startupTime =
-                downloadSimpleEntity?.downloadStartUpTime
+            val startupTime = downloadEntity.meta[DownloadEntity.DOWNLOAD_STARTUP_TIME_KEY]
             if (startupTime != null) {
-                uploadDownloadStartupTimeEvent(downloadEntity, startupTime)
-                DownloadDataSimpleHelper.updateDownloadDataSimpleEntity(downloadEntity.url, downloadStartUpTime = null)
+                uploadDownloadStartupTimeEvent(downloadEntity, startupTime.toInt())
+                downloadEntity.meta.remove(DownloadEntity.DOWNLOAD_STARTUP_TIME_KEY)
+                DownloadManager.getInstance().updateDownloadEntity(downloadEntity)
             }
         }
 
         if (downloadEntity.status == DownloadStatus.downloading || downloadEntity.status == DownloadStatus.done) {
-            val time = downloadSimpleEntity?.downloadSpeedTime
-            val size = downloadSimpleEntity?.downloadSpeedSize
+            val time = downloadEntity.meta[DOWNLOAD_SPEED_TIME]
+            val size = downloadEntity.meta[DOWNLOAD_SPEED_SIZE]
             if (downloadEntity.speed == 0L || time == null || size == null) {
-                val currentTime = System.currentTimeMillis()
-                val currentProgress = downloadEntity.progress
-                DownloadDataSimpleHelper.updateDownloadDataSimpleEntity(downloadEntity.url, downloadSpeedTime = currentTime, downloadSpeedSize = currentProgress)
+                downloadEntity.meta[DOWNLOAD_SPEED_TIME] = System.currentTimeMillis().toString()
+                downloadEntity.meta[DOWNLOAD_SPEED_SIZE] = downloadEntity.progress.toString()
+                DownloadManager.getInstance().updateDownloadEntity(downloadEntity)
             } else {
                 val offset = System.currentTimeMillis() - time.toLong()
                 if (offset > 5000) {
@@ -177,15 +180,15 @@ object DownloadDataHelper {
                             }
                         }
                     }
-                    val currentTime = System.currentTimeMillis()
-                    val currentProgress = downloadEntity.progress
-                    DownloadDataSimpleHelper.updateDownloadDataSimpleEntity(downloadEntity.url, downloadSpeedTime = currentTime, downloadSpeedSize = currentProgress)
+                    downloadEntity.meta[DOWNLOAD_SPEED_TIME] = System.currentTimeMillis().toString()
+                    downloadEntity.meta[DOWNLOAD_SPEED_SIZE] = downloadEntity.progress.toString()
+                    DownloadManager.getInstance().updateDownloadEntity(downloadEntity)
                 }
             }
         }
     }
 
-    private fun uploadDownloadStartupTimeEvent(downloadEntity: DownloadEntity, startupTime: Long) {
+    private fun uploadDownloadStartupTimeEvent(downloadEntity: DownloadEntity, startupTime: Int) {
         val jsonObject = JSONObject()
 
         try {
@@ -261,6 +264,13 @@ object DownloadDataHelper {
                     // 下载时间统计时间为零时，手动改成 1000ms，如果文件大小大于 50M 时上报 sentry
                     if (elapsedTime == 0L) {
                         elapsedTime = 1000L
+                        if (sizeInMB > 50) {
+                            SentryHelper.onEvent(
+                                "DOWNLOAD_ELAPSED_TIME",
+                                "elapsedTime is zero",
+                                downloadEntity.gameId + ":" + sizeInMB
+                            )
+                        }
                     }
                     val speed = downloadEntity.size / elapsedTime
                     payloadObject.put("speed", speed)
@@ -270,7 +280,7 @@ object DownloadDataHelper {
             }
             payloadObject.put("completed_size", downloadEntity.progress / 1024 / 1024)
             if (downloadEntity.status == DownloadStatus.resume) {
-                if (DownloadDataSimpleHelper.getDownloadDataSimpleEntity(downloadEntity.url)?.isFirstTimeDownload == true) {
+                if (downloadEntity.meta[DOWNLOAD_FIRST_START] == "YES") {
                     payloadObject.put("is_first_start", true)
                 } else {
                     payloadObject.put("is_first_start", false)
@@ -278,7 +288,8 @@ object DownloadDataHelper {
             }
 
             if (downloadEntity.status == DownloadStatus.resume || downloadEntity.status == DownloadStatus.add) {
-                DownloadDataSimpleHelper.updateDownloadSimpleEntityFirstTimeDownload(downloadEntity.url, false)
+                downloadEntity.meta[DOWNLOAD_FIRST_START] = "NO"
+                DownloadManager.getInstance().updateDownloadEntity(downloadEntity)
             }
             jsonObject.put("payload", payloadObject)
         } catch (e: Exception) {
@@ -331,7 +342,7 @@ object DownloadDataHelper {
     /**
      * 分片检测下载进度,每隔15秒内记录一次,60秒上传一次
      *
-     * 请见:https://git.shanqu.cc/stats/stats-issues/-/issues/188#note_66919
+     * 请见:https://gitlab.ghzs.com/stats/stats-issues/-/issues/188#note_66919
      */
     fun uploadDownloadHeartbeat(upload: Boolean) {
         val allDownloadEntity = DownloadManager.getInstance().allDownloadEntity

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

@@ -1,60 +0,0 @@
-package com.gh.download
-
-import android.content.Context
-import android.content.SharedPreferences
-import com.gh.gamecenter.common.HaloApp
-import com.gh.gamecenter.common.utils.toJsonIgnoredNull
-import com.gh.gamecenter.common.utils.toObject
-import com.gh.gamecenter.core.utils.SPUtils
-
-/**
- * 用来简单保存/获取下载时一些额外信息的辅助类，避免下载时反复修改原始下载实体的糟糕操作
- * 使用 SP 来实现，只适用于相对较为低频的调用
- */
-object DownloadDataSimpleHelper {
-
-    private val mSp: SharedPreferences by lazy {
-        HaloApp.getInstance().getSharedPreferences("DownloadDataSimpleDao", Context.MODE_PRIVATE)
-    }
-
-    fun getDownloadDataSimpleEntity(url: String): DownloadDataSimpleEntity? {
-        return mSp.getString(url, "")?.toObject()
-    }
-
-    fun updateDownloadDataSimpleEntity(
-        url: String,
-        downloadStartUpTime: Long? = null,
-        downloadSpeedTime: Long? = null,
-        downloadSpeedSize: Long? = null,
-    ) {
-        val entity = getDownloadDataSimpleEntity(url) ?: DownloadDataSimpleEntity()
-        entity.downloadStartUpTime = downloadStartUpTime
-
-        entity.downloadSpeedTime = downloadSpeedTime
-        entity.downloadSpeedSize = downloadSpeedSize
-
-        SPUtils.setString(mSp, url, entity.toJsonIgnoredNull())
-    }
-
-    fun updateDownloadSimpleEntityFirstTimeDownload(url: String, isFirstTimeDownload: Boolean) {
-        val entity = getDownloadDataSimpleEntity(url) ?: DownloadDataSimpleEntity()
-
-        entity.isFirstTimeDownload = isFirstTimeDownload
-
-        SPUtils.setString(mSp, url, entity.toJsonIgnoredNull())
-    }
-
-    fun removeDownloadSimpleEntity(url: String) {
-        SPUtils.remove(mSp, url)
-    }
-
-}
-
-class DownloadDataSimpleEntity(
-    var downloadStartUpTime: Long? = null,
-
-    var downloadSpeedTime: Long? = null,
-    var downloadSpeedSize: Long? = null,
-
-    var isFirstTimeDownload: Boolean? = true
-)

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

@@ -45,7 +45,7 @@ import com.gh.gamecenter.feature.entity.GameEntity;
 import com.gh.gamecenter.entity.GameUpdateEntity;
 import com.gh.gamecenter.entity.HomePluggableFilterEntity;
 import com.gh.gamecenter.feature.entity.PluginLocation;
-import com.gh.gamecenter.eventbus.EBDownloadStatus;
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus;
 import com.gh.gamecenter.manager.PackagesManager;
 import com.gh.gamecenter.login.user.UserManager;
 import com.gh.gamecenter.packagehelper.PackageRepository;
@@ -834,7 +834,6 @@ public class DownloadManager implements DownloadStatusListener {
      */
     public void cancel(String url, boolean isDeleteFile, boolean automatic, boolean cancelSilently) {
         DownloadEntity entry = mDownloadDao.getSnapshot(url);
-        DownloadDataSimpleHelper.INSTANCE.removeDownloadSimpleEntity(url);
         if (entry != null) {
             AppExecutor.getIoExecutor().execute(() -> {
                 NDownloadBridge.INSTANCE.cancel(url);
@@ -997,11 +996,8 @@ public class DownloadManager implements DownloadStatusListener {
         }
 
         if (status == DownloadStatus.add || status == DownloadStatus.subscribe) {
-            DownloadDataSimpleEntity simpleEntity =
-                    DownloadDataSimpleHelper.INSTANCE.getDownloadDataSimpleEntity(downloadEntity.getUrl());
-
-            if (simpleEntity == null || simpleEntity.isFirstTimeDownload() == null) {
-                DownloadDataSimpleHelper.INSTANCE.updateDownloadSimpleEntityFirstTimeDownload(downloadEntity.getUrl(), true);
+            if (downloadEntity.getMeta().get(DownloadDataHelper.DOWNLOAD_FIRST_START) == null) {
+                downloadEntity.getMeta().put(DownloadDataHelper.DOWNLOAD_FIRST_START, "YES");
             }
         }
 
@@ -1241,10 +1237,7 @@ public class DownloadManager implements DownloadStatusListener {
 
     /**
      * 更新数据库中的下载实体
-     *
-     * @deprecated 随意更新数据库可能会出现意想不到的情况，建议不要随意调用
      */
-    @Deprecated()
     public void updateDownloadEntity(DownloadEntity downloadEntity) {
         mDownloadDao.update(downloadEntity, false);
     }

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

@@ -2,13 +2,14 @@ package com.gh.download
 
 import android.annotation.SuppressLint
 import android.text.TextUtils
-import com.gh.gamecenter.feature.utils.ConcernUtils
+import com.gh.common.util.ConcernUtils
 import com.gh.common.util.DataCollectionUtils
 import com.gh.common.util.PackageInstaller
 import com.gh.common.util.PackageUtils
 import com.gh.common.xapk.XapkInstaller
 import com.gh.download.server.BrowserInstallHelper
 import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.eventbus.EBPackage
 import com.gh.gamecenter.common.loghub.LoghubUtils
 import com.gh.gamecenter.common.retrofit.EmptyResponse
 import com.gh.gamecenter.common.retrofit.Response
@@ -18,7 +19,6 @@ import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.core.utils.ThirdPartyPackageHelper
 import com.gh.gamecenter.core.utils.UrlFilterUtils
 import com.gh.gamecenter.entity.GameDigestEntity
-import com.gh.gamecenter.eventbus.EBPackage
 import com.gh.gamecenter.login.user.UserManager
 import com.gh.gamecenter.packagehelper.PackageRepository
 import com.gh.gamecenter.packagehelper.PackageViewModel
@@ -111,7 +111,8 @@ object PackageObserver {
                     runOnIoThread { FileUtils.deleteFile(mDownloadEntity.path) }
                 }
 
-                if (mDownloadEntity.format == Constants.XAPK_FORMAT) {
+                if (mDownloadEntity.format == Constants.XAPK_FORMAT
+                    || mDownloadEntity.format == Constants.XAPK_APKS_FORMAT) {
                     XapkInstaller.onInstalled(mDownloadEntity.path)
                 }
 

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

@@ -22,6 +22,7 @@ import com.gh.gamecenter.R
 import com.gh.gamecenter.common.base.activity.ToolBarActivity
 import com.gh.gamecenter.common.base.fragment.BaseDraggableDialogFragment
 import com.gh.gamecenter.common.constant.EntranceConsts
+import com.gh.common.util.DialogUtils
 import com.gh.gamecenter.common.utils.goneIf
 import com.gh.gamecenter.common.utils.observeNonNull
 import com.gh.gamecenter.common.utils.throwExceptionInDebug
@@ -30,7 +31,8 @@ import com.gh.gamecenter.core.utils.TimeElapsedHelper
 import com.gh.gamecenter.databinding.DialogDownloadBinding
 import com.gh.gamecenter.feature.entity.ApkEntity
 import com.gh.gamecenter.feature.entity.GameEntity
-import com.gh.gamecenter.eventbus.EBPackage
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBPackage
 import com.halo.assistant.HaloApp
 import com.lightgame.download.DataWatcher
 import com.lightgame.download.DownloadEntity

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

@@ -3,14 +3,14 @@ package com.gh.download.dialog
 import android.view.View
 import com.gh.gamecenter.common.base.BaseRecyclerViewHolder
 import com.gh.common.constant.Config
+import com.gh.common.util.PackageUtils
 import com.gh.gamecenter.feature.exposure.ExposureEvent
-import com.gh.common.util.*
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.R
+import com.gh.gamecenter.common.utils.ImageUtils
 import com.gh.gamecenter.common.utils.goneIf
 import com.gh.gamecenter.common.utils.throwExceptionInDebug
 import com.gh.gamecenter.common.utils.toColor
-import com.gh.gamecenter.common.utils.ImageUtils
 import com.gh.gamecenter.databinding.DownloadDialogInstalledItemBinding
 import com.gh.gamecenter.feature.entity.ApkEntity
 import com.lightgame.download.DownloadStatus

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

@@ -55,21 +55,23 @@ object DownloadMessageHandler : InnerDownloadListener {
      * @param status 下载状态
      */
     override fun onStatusChanged(id: String, status: DownloadStatus) {
-        val entity = findEntity(id) ?: return
+        val entity = findEntity(id)
 
-        entity.status = status
+        if (entity != null) {
+            entity.status = status
 
-        if (status == DownloadStatus.COMPLETED) {
-            SimpleDownloadManager.resumeQueuedTask()
-        }
+            if (status == DownloadStatus.COMPLETED) {
+                SimpleDownloadManager.resumeQueuedTask()
+            }
 
-        ExecutorProvider.getInstance().backgroundExecutor.execute {
-            updateDownloadToDatabase(entity)
-            updateDownloadList()
+            ExecutorProvider.getInstance().backgroundExecutor.execute {
+                updateDownloadToDatabase(entity)
+                updateDownloadList()
+            }
         }
 
         for (listener in mGlobalStatusChangedListenerList) {
-            listener.invoke(entity, status)
+            listener.invoke(entity!!, status)
         }
 
         val listenerList = mListenerMap[id] ?: return

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

@@ -10,7 +10,7 @@ import com.gh.gamecenter.common.base.activity.ToolBarActivity;
 import com.gh.gamecenter.common.constant.EntranceConsts;
 import com.gh.gamecenter.core.utils.DisplayUtils;
 import com.gh.gamecenter.common.entity.LinkEntity;
-import com.gh.gamecenter.feature.entity.MessageEntity;
+import com.gh.gamecenter.entity.MessageEntity;
 import com.gh.gamecenter.qa.comment.CommentActivity;
 import com.gh.gamecenter.qa.comment.NewCommentConversationFragment;
 import com.halo.assistant.fragment.comment.CommentDetailFragment;

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

@@ -0,0 +1,32 @@
+package com.gh.gamecenter;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+
+import com.gh.gamecenter.common.base.activity.ToolBarActivity;
+import com.gh.gamecenter.common.utils.ExtensionsKt;
+import com.gh.gamecenter.info.ConcernFragment;
+
+/**
+ * Created by khy on 10/04/18.
+ */
+
+public class ConcernInfoActivity extends ToolBarActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white);
+    }
+
+    public static Intent getIntent(Context context) {
+        return getTargetIntent(context, ConcernInfoActivity.class, ConcernFragment.class);
+    }
+
+    @Override
+    protected void onDarkModeChanged() {
+        super.onDarkModeChanged();
+        ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white);
+    }
+}

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

@@ -34,7 +34,6 @@ import androidx.transition.*
 import androidx.viewpager.widget.PagerAdapter
 import androidx.viewpager.widget.ViewPager
 import androidx.viewpager.widget.ViewPager.OnPageChangeListener
-import com.alibaba.android.arouter.facade.annotation.Route
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
 import com.facebook.drawee.backends.pipeline.Fresco
 import com.facebook.imagepipeline.core.ImagePipeline
@@ -42,7 +41,6 @@ import com.facebook.imagepipeline.request.ImageRequest
 import com.gh.common.constant.Config
 import com.gh.gamecenter.common.base.activity.BaseActivity
 import com.gh.gamecenter.common.constant.EntranceConsts
-import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.entity.CommunityEntity
 import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.common.utils.*
@@ -73,7 +71,6 @@ import kotlin.math.roundToInt
  * @author 黄壮华
  *
  */
-@Route(path = RouteConsts.activity.imageViewerActivity)
 class ImageViewerActivity : BaseActivity(), OnPageChangeListener {
 
     private var mScale = 0F
@@ -153,8 +150,8 @@ class ImageViewerActivity : BaseActivity(), OnPageChangeListener {
                 mUrlList = ArrayList()
                 mUrlList?.add(base64Image)
             } else {
-                mUrlList = it.getStringArrayList(EntranceConsts.KEY_URL_LIST) ?: arrayListOf()
-                mInitialPosition = it.getInt(EntranceConsts.KEY_CURRENT, 0)
+                mUrlList = it.getStringArrayList(KEY_URL_LIST) ?: arrayListOf()
+                mInitialPosition = it.getInt(KEY_CURRENT, 0)
             }
             mShowSaveBtn = it.getBoolean(KEY_SHOW_SAVE)
             mUseEnterAndExitAnimation = it.getBoolean(KEY_USE_ENTER_AND_EXIT_ANIMATION)
@@ -933,6 +930,8 @@ class ImageViewerActivity : BaseActivity(), OnPageChangeListener {
         var base64Image: String = ""
 
         private const val KEY_BASE64 = "base64"
+        private const val KEY_URL_LIST = "urls"
+        private const val KEY_CURRENT = "current"
         private const val KEY_SHOW_SAVE = "showSave"
         private const val KEY_USE_ENTER_AND_EXIT_ANIMATION = "use_enter_and_exit_animation"
         private const val KEY_IS_FROM_IMAGE_CONTAINER_VIEW = "is_from_image_container_view"
@@ -996,8 +995,8 @@ class ImageViewerActivity : BaseActivity(), OnPageChangeListener {
             isFromICV: Boolean = false
         ): Intent {
             val intent = Intent(context, ImageViewerActivity::class.java)
-            intent.putExtra(EntranceConsts.KEY_URL_LIST, list)
-            intent.putExtra(EntranceConsts.KEY_CURRENT, position)
+            intent.putExtra(KEY_URL_LIST, list)
+            intent.putExtra(KEY_CURRENT, position)
             intent.putExtra(KEY_SHOW_SAVE, isShowSaveBtn)
             intent.putExtra(AnswerEntity::class.java.name, answerEntity)
             intent.putExtra(EntranceConsts.KEY_ENTRANCE, entrance)

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

@@ -21,6 +21,7 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.ApplicationInfo;
 import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
@@ -32,7 +33,6 @@ import android.text.Html;
 import android.text.TextUtils;
 import android.view.KeyEvent;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.TextView;
 
@@ -43,8 +43,9 @@ import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProviders;
 
+import com.alibaba.android.arouter.launcher.ARouter;
 import com.facebook.drawee.view.SimpleDraweeView;
-import com.gh.ad.AdDelegateHelper;
+import com.gh.common.DefaultUrlHandler;
 import com.gh.common.constant.Config;
 import com.gh.common.exposure.ExposureManager;
 import com.gh.common.filter.RegionSettingHelper;
@@ -76,6 +77,7 @@ import com.gh.gamecenter.common.base.fragment.ToolbarFragment;
 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.RouteConsts;
 import com.gh.gamecenter.common.entity.LinkEntity;
 import com.gh.gamecenter.common.entity.NotificationUgc;
 import com.gh.gamecenter.common.entity.SuggestType;
@@ -90,6 +92,7 @@ import com.gh.gamecenter.common.utils.ImageUtils;
 import com.gh.gamecenter.common.utils.NotificationHelper;
 import com.gh.gamecenter.common.utils.ShareUtils;
 import com.gh.gamecenter.core.AppExecutor;
+import com.gh.gamecenter.core.provider.IStartUpAdProvider;
 import com.gh.gamecenter.core.utils.ClassUtils;
 import com.gh.gamecenter.core.utils.DisplayUtils;
 import com.gh.gamecenter.core.utils.GsonUtils;
@@ -99,6 +102,8 @@ import com.gh.gamecenter.core.utils.SentryHelper;
 import com.gh.gamecenter.core.utils.TimeUtils;
 import com.gh.gamecenter.core.utils.ToastUtils;
 import com.gh.gamecenter.core.utils.UrlFilterUtils;
+import com.gh.gamecenter.download.DownloadFragment;
+import com.gh.gamecenter.entity.InnerMetaInfoEntity;
 import com.gh.gamecenter.entity.StartupAdEntity;
 import com.gh.gamecenter.eventbus.EBSkip;
 import com.gh.gamecenter.feature.entity.GameEntity;
@@ -136,16 +141,22 @@ import org.greenrobot.eventbus.ThreadMode;
 import org.jetbrains.annotations.NotNull;
 import org.json.JSONObject;
 
+import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
+import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Timer;
 import java.util.TimerTask;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
 
 import io.reactivex.SingleSource;
 import io.reactivex.android.schedulers.AndroidSchedulers;
@@ -163,7 +174,7 @@ public class MainActivity extends BaseActivity {
     public static final String SWITCH_TO_COMMUNITY = "switch_to_community";
     public static final String SWITCH_TO_VIDEO = "switch_to_video";
     public static final String SHOW_AD = "show_ad";
-    public static final int COUNTDOWN_AD = 100;
+    private static final int COUNTDOWN_AD = 100;
     private static final int COUNTDOWN_MAX_COUNT = 3;
     private int countdownCount = 0;
 
@@ -179,12 +190,15 @@ public class MainActivity extends BaseActivity {
     public static boolean isNewFirstLaunch;
 
     private final Handler handler = new Handler();
-    private boolean mShouldShowAd = false; // 是否显示广告
+    public boolean showAd = false; // 是否显示广告
+
+    private IStartUpAdProvider mStartUpAdProvider;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        mShouldShowAd = getIntent().getBooleanExtra(SHOW_AD, false) && savedInstanceState == null;
+        showAd = getIntent().getBooleanExtra(SHOW_AD, false) && savedInstanceState == null;
 
+        HaloApp.getInstance().initFresco();
         HaloApp.getInstance().isAlreadyUpAndRunning = true;
 
         super.onCreate(savedInstanceState);
@@ -217,6 +231,7 @@ public class MainActivity extends BaseActivity {
                     }
                 }
             }, 2000L);
+            getPluginUpdate();
             sp.edit().putBoolean("isNewFirstLaunchV" + PackageUtils.getGhVersionName(), false).apply();
 
             // 记录曾安装过的版本 + 渠道
@@ -270,6 +285,8 @@ public class MainActivity extends BaseActivity {
             }
         }
 
+//        checkTinkerPath(); //　看情况是否需要显示补丁弹窗
+
         // 必须放在这里，否则会导致获取 baseActivity 不是本应用包名
         DownloadManager.getInstance().initDownloadService();
 
@@ -286,16 +303,17 @@ public class MainActivity extends BaseActivity {
             doSkip();
         }
 
-        // debug 模式下的快速跳转页面
         if (BuildConfig.DEBUG) {
-            handler.postDelayed(() -> EntranceUtils.jumpShortcut(this), 500);
+            handler.postDelayed(() -> {
+                EntranceUtils.jumpShortcut(this);
+            }, 500);
         }
 
-        if (mShouldShowAd) {
-            showAd();
+        if (showAd) {
+            observeStartUp();
         } else {
-            hideTextAd();
-            hideSplashAd();
+            hideStartUp();
+            hideStartUpAd();
         }
 
         // 默认配置为空时重试
@@ -458,7 +476,7 @@ public class MainActivity extends BaseActivity {
     protected void onDestroy() {
         super.onDestroy();
 
-        AdDelegateHelper.INSTANCE.cancelSplashAd(this);
+        if (mStartUpAdProvider != null) mStartUpAdProvider.cancelStartUpAd(this);
 
         handler.removeCallbacksAndMessages(null);
         releaseExoSourceCache();
@@ -482,58 +500,87 @@ public class MainActivity extends BaseActivity {
         }
     }
 
-    /**
-     * 显示广告 (包括文本广告和开屏广告)
-     */
-    private void showAd() {
-        if (!mShouldShowAd) {
-            hideTextAd();
-            hideSplashAd();
+    private void observeStartUp() {
+        if (!showAd) {
+            hideStartUp();
+            hideStartUpAd();
             return;
         }
-        final StartupAdEntity textAd = AdHelper.getStartUp();
-        if (textAd != null) {
-            showTextAd(textAd);
+        final StartupAdEntity startUp = AdHelper.getStartUp();
+        if (startUp != null) {
+            showStartUp(startUp);
             AppExecutor.getUiExecutor().executeWithDelay(() -> {
-                hideTextAd();
-                showSplashAd();
+                hideStartUp();
+                initStartUpAd();
             }, 2000);
         } else {
-            showSplashAd();
+            initStartUpAd();
         }
     }
 
-    /**
-     * 显示开屏广告
-     */
-    private void showSplashAd() {
-        if (AdDelegateHelper.INSTANCE.shouldShowStartUpAd()) {
-            ViewGroup startAdContainer = findViewById(R.id.startAdContainer);
-            ViewGroup sdkStartAdContainer = findViewById(R.id.sdkStartAdContainer);
-            FrameLayout adsFl = findViewById(R.id.adsFl);
-
-            int screenWidthInPx = DisplayUtils.getScreenWidth(this);
-            int screenHeightInPx = DisplayUtils.getScreenHeight(this) + DisplayUtils.getStatusBarHeight(this.getResources());
-            float screenWidthInDp = DisplayUtils.px2dip(this, screenWidthInPx);
-            float screenHeightInDp = DisplayUtils.px2dip(this, screenHeightInPx);
-
-            AdDelegateHelper.requestSplashAd(
-                    this,
-                    screenWidthInPx,
-                    screenHeightInPx,
-                    screenWidthInDp,
-                    screenHeightInDp,
-                    startAdContainer,
-                    sdkStartAdContainer,
-                    adsFl,
-                    (BaseHandler) mBaseHandler,
-                    () -> {
-                        hideSplashAd();
-                        return null;
-                    }
-            );
+    private void initStartUpAd() {
+        mStartUpAdProvider = (IStartUpAdProvider) ARouter.getInstance().build(RouteConsts.provider.adSdk).navigation();
+        if (mStartUpAdProvider != null && mStartUpAdProvider.shouldEnableSDK(HaloApp.getInstance().getChannel())) {
+            initSDKStartUpAd();
         } else {
-            hideSplashAd();
+            observeStartUpAd();
+        }
+    }
+
+    private void observeStartUpAd() {
+        final StartupAdEntity startUpAd = AdHelper.getStartUpAd();
+
+        if (startUpAd != null && !TextUtils.isEmpty(startUpAd.getImg())) {
+            // 根据接口返回的广告时间，判断该图片广告是否还有必要显示
+            boolean isAdValid = false;
+            if (startUpAd.getTime() != null) {
+                long currentTimeInSecond = System.currentTimeMillis() / 1000;
+                if (currentTimeInSecond > startUpAd.getTime().getStart()
+                        && currentTimeInSecond < startUpAd.getTime().getEnd()) {
+                    isAdValid = true;
+                }
+            } else {
+                // 接口没有返回开始和结束时间时，默认有效
+                isAdValid = true;
+            }
+
+            // 图片广告无效，跳过
+            if (!isAdValid) {
+                hideStartUpAd();
+                return;
+            }
+
+            final String showedTodayTimestamp = SPUtils.getString(Constants.SP_STARTUP_AD_TIMESTAMP, "");
+            final String rule = startUpAd.getRule();
+            switch (rule) {
+                case "each":
+                    showStartUpAd(startUpAd);
+                    break;
+                case "once":
+                    if (TextUtils.isEmpty(showedTodayTimestamp)
+                            || !showedTodayTimestamp.contains(startUpAd.getId())) {
+                        showStartUpAd(startUpAd);
+                    } else {
+                        hideStartUpAd();
+                    }
+                    break;
+                case "everyday":
+                    final String today = TimeUtils.getToday();
+                    if (TextUtils.isEmpty(showedTodayTimestamp)
+                            || !showedTodayTimestamp.contains(today)
+                            || !showedTodayTimestamp.contains(startUpAd.getId())) {
+                        showStartUpAd(startUpAd);
+                    } else {
+                        hideStartUpAd();
+                    }
+                    break;
+                default:
+                    hideStartUpAd();
+                    break;
+            }
+            SPUtils.setString(Constants.SP_STARTUP_AD_TIMESTAMP, startUpAd.getId() + TimeUtils.getToday());
+        } else {
+            hideStartUpAd();
         }
     }
 
@@ -545,17 +592,14 @@ public class MainActivity extends BaseActivity {
             TextView jumpBtn = findViewById(R.id.jumpBtn);
             jumpBtn.setText(String.format(Locale.CHINA, "跳过 %d", COUNTDOWN_MAX_COUNT - countdownCount));
             if (COUNTDOWN_MAX_COUNT < countdownCount) {
-                hideSplashAd();
+                hideStartUpAd();
             } else {
                 mBaseHandler.sendEmptyMessageDelayed(COUNTDOWN_AD, 1000);
             }
         }
     }
 
-    /**
-     * 隐藏开屏文案
-     */
-    private void hideTextAd() {
+    private void hideStartUp() {
         View maskContainer = findViewById(R.id.maskContainer);
         if (maskContainer != null) {
             maskContainer.setVisibility(View.GONE);
@@ -563,11 +607,8 @@ public class MainActivity extends BaseActivity {
         }
     }
 
-    /**
-     * 隐藏开屏广告
-     */
-    private void hideSplashAd() {
-        mShouldShowAd = false;
+    private void hideStartUpAd() {
+        showAd = false;
         getIntent().putExtra(SHOW_AD, false);
         View startAdContainer = findViewById(R.id.startAdContainer);
         if (startAdContainer != null) {
@@ -578,7 +619,7 @@ public class MainActivity extends BaseActivity {
         if (startSdkAdContainer != null) {
             startSdkAdContainer.setVisibility(View.GONE);
             ExtensionsKt.removeFromParent(startSdkAdContainer);
-            AdDelegateHelper.INSTANCE.cancelSplashAd(this);
+            if (mStartUpAdProvider != null) mStartUpAdProvider.cancelStartUpAd(this);
         }
         checkDialog();
     }
@@ -594,10 +635,62 @@ public class MainActivity extends BaseActivity {
         });
     }
 
-    /**
-     * 显示文本广告
-     */
-    private void showTextAd(StartupAdEntity ad) {
+    private void showStartUpAd(StartupAdEntity ad) {
+        View startAdContainer = findViewById(R.id.startAdContainer);
+        View jumpBtn = findViewById(R.id.jumpBtn);
+        TextView jumpDetailBtn = findViewById(R.id.jumpDetailBtn);
+        SimpleDraweeView adImage = findViewById(R.id.adImage);
+        startAdContainer.setVisibility(View.VISIBLE);
+        jumpDetailBtn.setText(ad.getDesc());
+        ExtensionsKt.setDrawableEnd(jumpDetailBtn, AppCompatResources.getDrawable(this, R.drawable.ic_startup_ad_arrow), null, null);
+        ImageUtils.display(adImage, ad.getImg());
+        startAdContainer.setOnClickListener(v -> {
+            // do nothing 只是为了点击拦截事件，避免传递到下面的页面
+        });
+        jumpBtn.setOnClickListener(v -> {
+            mBaseHandler.removeMessages(COUNTDOWN_AD);
+            hideStartUpAd();
+            LinkEntity linkEntity = ad.getJump();
+            NewFlatLogUtils.logOpenScreenAdSkip(
+                    ad.getId(),
+                    linkEntity.getText() != null ? linkEntity.getText() : "",
+                    linkEntity.getType() != null ? linkEntity.getType() : "",
+                    linkEntity.getLink() != null ? linkEntity.getLink() : ""
+            );
+        });
+        List<ExposureSource> sources = new ArrayList<>();
+        sources.add(new ExposureSource("开屏广告", ad.getId()));
+        final ExposureEvent event = ExposureEvent.createEvent(null, sources, null, ExposureType.EXPOSURE);
+        ExposureManager.INSTANCE.log(event);
+        if (ad.getButton()) {
+            jumpDetailBtn.setOnClickListener(v -> {
+                DirectUtils.directToLinkPage(this, ad.getJump(), "(启动广告)", "", event);
+                v.postDelayed(() -> {
+                    mBaseHandler.removeMessages(COUNTDOWN_AD);
+                    hideStartUpAd();
+                }, 1000);
+            });
+            jumpDetailBtn.setVisibility(View.VISIBLE);
+            LogUtils.logStartAd("watch_start_ads", ad);
+        } else {
+            LogUtils.logStartAd("start_ads", ad);
+        }
+        mBaseHandler.sendEmptyMessageDelayed(COUNTDOWN_AD, 1000);
+    }
+
+    private void initSDKStartUpAd() {
+        View startAdContainer = findViewById(R.id.sdkStartAdContainer);
+        startAdContainer.setVisibility(View.VISIBLE);
+        FrameLayout adsFl = findViewById(R.id.adsFl);
+        if (mStartUpAdProvider != null) {
+            mStartUpAdProvider.initStartUpAd(startAdContainer, adsFl, showAd, () -> {
+                hideStartUpAd();
+                return null;
+            });
+        }
+    }
+
+    private void showStartUp(StartupAdEntity ad) {
         TextView adContentTv = findViewById(R.id.adContentTv);
         View containerView = findViewById(R.id.maskContainer);
         containerView.setVisibility(View.VISIBLE);
@@ -605,7 +698,7 @@ public class MainActivity extends BaseActivity {
             containerView.setElevation(500F);
         }
         containerView.setOnClickListener(v -> {
-            // 拦截点击事件，避免传递到下面的页面
+            // do nothing 只是为了点击拦截事件，避免传递到下面的页面
         });
         adContentTv.setText(ad.getDesc());
         adContentTv.setVisibility(View.VISIBLE);
@@ -655,6 +748,7 @@ public class MainActivity extends BaseActivity {
                         } else {
                             Intent skipIntent = new Intent(MainActivity.this, clazz);
                             skipIntent.putExtras(bundle);
+//                            startActivity(skipIntent);
                             AvoidOnResultManager.Companion.getInstance(this)
                                     .startForResult(skipIntent, (resultCode, data) -> {
                                         Bundle nextToBundle = getIntent().getBundleExtra(KEY_NEXT_TO);
@@ -776,7 +870,7 @@ public class MainActivity extends BaseActivity {
                                 @Override
                                 public Boolean invoke(Integer code) {
                                     if (code == 404001) {
-                                        if (mShouldShowAd) {
+                                        if (showAd) {
                                             AppExecutor.getUiExecutor().executeWithDelay(() -> {
                                                 toast("抱歉，暂未找到相关内容");
                                             }, 1000);
@@ -887,7 +981,7 @@ public class MainActivity extends BaseActivity {
 
     @Override
     protected int getLayoutId() {
-        if (mShouldShowAd) {
+        if (showAd) {
             return R.layout.activity_main;
         } else {
             return R.layout.layout_wrapper_activity;
@@ -910,6 +1004,71 @@ public class MainActivity extends BaseActivity {
         }
     }
 
+    // 获取META-INF中的plugin_update 文件，判断是否从游戏插件中下载的app，是则获取游戏id，启动游戏更新，下载该游戏
+    private void getPluginUpdate() {
+        AppExecutor.getIoExecutor().execute(() -> {
+            ApplicationInfo appinfo = getApplicationInfo();
+            String sourceDir = appinfo.sourceDir;
+            ZipFile zipfile = null;
+
+            try {
+                zipfile = new ZipFile(sourceDir);
+                Enumeration<?> entries = zipfile.entries();
+
+                while (entries.hasMoreElements()) {
+                    ZipEntry entry = ((ZipEntry) entries.nextElement());
+                    String entryName = entry.getName();
+                    if (entryName.contains("gh_assist")) {
+                        String packageName = entryName.substring(entryName.lastIndexOf("_") + 1);
+                        startActivity(DownloadManagerActivity.getDownloadMangerIntent(MainActivity.this,
+                                packageName, DownloadFragment.INDEX_UPDATE, "(游戏插件)"));
+                        break;
+                    } else if (entryName.contains("halo_skip.json")) {
+                        InputStream in = zipfile.getInputStream(entry);
+                        if (in != null) {
+                            final BufferedReader reader = new BufferedReader(new InputStreamReader(in));
+
+                            InnerMetaInfoEntity info = GsonUtils.getGson().fromJson(reader, InnerMetaInfoEntity.class);
+                            if (info != null) {
+                                if (EntranceConsts.HOST_COMMUNITY.equals(info.getType())) {
+                                    runOnUiThread(() -> mMainWrapperFragment.setCurrentItem(MainWrapperFragment.INDEX_BBS));
+                                } else {
+                                    DirectUtils.directToSpecificPage(this,
+                                            info.getType(),
+                                            info.getLink(),
+                                            info.getText(),
+                                            EntranceConsts.KEY_PLUGIN,
+                                            "特定包启动跳转");
+                                }
+                            }
+                        }
+                    } else if (entryName.contains("halo_skip.dat")) {
+                        InputStream in = zipfile.getInputStream(entry);
+                        if (in != null) {
+                            final BufferedReader reader = new BufferedReader(new InputStreamReader(in));
+                            String content = "";
+                            for (String line; (line = reader.readLine()) != null; content += line) ;
+
+                            if (!TextUtils.isEmpty(content)) {
+                                DefaultUrlHandler.interceptUrl(this, content, "(特定包启动跳转)");
+                            }
+                        }
+                    }
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            } finally {
+                if (zipfile != null) {
+                    try {
+                        zipfile.close();
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        });
+    }
+
     // 连接上网络事件
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onEventMainThread(EBNetworkState busNetworkState) {

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

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.message.view.concern;
+package com.gh.gamecenter;
 
 import android.content.Context;
 import android.content.Intent;
@@ -7,13 +7,13 @@ import android.os.Bundle;
 import com.gh.gamecenter.common.base.activity.ToolBarActivity;
 import com.gh.gamecenter.common.constant.EntranceConsts;
 import com.gh.gamecenter.common.utils.ExtensionsKt;
-import com.gh.gamecenter.message.R;
+import com.gh.gamecenter.message.MessageFragment;
 
 /**
- * Created by khy on 10/04/18.
+ * Created by khy on 21/07/17.
  */
-
-public class ConcernInfoActivity extends ToolBarActivity {
+@Deprecated
+public class MessageActivity extends ToolBarActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -24,7 +24,7 @@ public class ConcernInfoActivity extends ToolBarActivity {
     public static Intent getIntent(Context context, String entrance) {
         Bundle bundle = new Bundle();
         bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance);
-        return getTargetIntent(context, ConcernInfoActivity.class, ConcernFragment.class, bundle);
+        return getTargetIntent(context, MessageActivity.class, MessageFragment.class, bundle);
     }
 
     @Override

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

@@ -9,7 +9,7 @@ import android.view.ViewGroup;
 import com.gh.gamecenter.common.base.activity.ToolBarActivity;
 import com.gh.gamecenter.common.constant.EntranceConsts;
 import com.gh.gamecenter.core.utils.DisplayUtils;
-import com.gh.gamecenter.feature.entity.CommentEntity;
+import com.gh.gamecenter.entity.CommentEntity;
 import com.gh.gamecenter.feature.entity.ConcernEntity;
 import com.gh.gamecenter.message.MessageDetailFragment;
 import com.halo.assistant.HaloApp;

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

@@ -0,0 +1,37 @@
+package com.gh.gamecenter;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+
+import com.gh.gamecenter.common.base.activity.ToolBarActivity;
+import com.gh.gamecenter.common.constant.EntranceConsts;
+import com.gh.gamecenter.common.utils.ExtensionsKt;
+import com.gh.gamecenter.message.MessageNormalFragment;
+
+/**
+ * Created by khy on 10/04/18.
+ */
+
+public class MessageInviteActivity extends ToolBarActivity {
+
+    public static Intent getIntent(Context context, String messageType, String outerInfo, String entrance) {
+        Bundle bundle = new Bundle();
+        bundle.putString(EntranceConsts.KEY_MESSAGE_TYPE, messageType);
+        bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance);
+        bundle.putString(EntranceConsts.KEY_OUTER_INFO, outerInfo);
+        return getTargetIntent(context, MessageInviteActivity.class, MessageNormalFragment.class, bundle);
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white);
+    }
+
+    @Override
+    protected void onDarkModeChanged() {
+        super.onDarkModeChanged();
+        ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white);
+    }
+}

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

@@ -0,0 +1,40 @@
+package com.gh.gamecenter;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+
+import com.gh.gamecenter.common.base.activity.ToolBarActivity;
+import com.gh.gamecenter.common.constant.EntranceConsts;
+import com.gh.gamecenter.common.utils.ExtensionsKt;
+import com.gh.gamecenter.message.KeFuFragment;
+
+/**
+ * Created by khy on 10/04/18.
+ */
+
+public class MessageKeFuActivity extends ToolBarActivity {
+
+    @Override
+    protected Intent provideNormalIntent() {
+        return getTargetIntent(this, MessageKeFuActivity.class, KeFuFragment.class);
+    }
+
+    public static Intent getIntent(Context context, String entrance) {
+        Bundle bundle = new Bundle();
+        bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance);
+        return getTargetIntent(context, MessageKeFuActivity.class, KeFuFragment.class, bundle);
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white);
+    }
+
+    @Override
+    protected void onDarkModeChanged() {
+        super.onDarkModeChanged();
+        ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white);
+    }
+}

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

@@ -0,0 +1,37 @@
+package com.gh.gamecenter;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+
+import com.gh.gamecenter.common.base.activity.ToolBarActivity;
+import com.gh.gamecenter.common.constant.EntranceConsts;
+import com.gh.gamecenter.common.utils.ExtensionsKt;
+import com.gh.gamecenter.message.MessageNormalFragment;
+
+/**
+ * Created by khy on 10/04/18.
+ */
+
+public class MessageVoteActivity extends ToolBarActivity {
+
+    public static Intent getIntent(Context context, String messageType, String outerInfo, String entrance) {
+        Bundle bundle = new Bundle();
+        bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance);
+        bundle.putString(EntranceConsts.KEY_MESSAGE_TYPE, messageType);
+        bundle.putString(EntranceConsts.KEY_OUTER_INFO, outerInfo);
+        return getTargetIntent(context, MessageVoteActivity.class, MessageNormalFragment.class, bundle);
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white);
+    }
+
+    @Override
+    protected void onDarkModeChanged() {
+        super.onDarkModeChanged();
+        ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white);
+    }
+}

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

@@ -25,7 +25,6 @@ import androidx.core.content.ContextCompat;
 import androidx.core.view.MotionEventCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.alibaba.android.arouter.facade.annotation.Route;
 import com.ethanhua.skeleton.Skeleton;
 import com.ethanhua.skeleton.ViewSkeletonScreen;
 import com.gh.base.DownloadToolbarActivity;
@@ -41,8 +40,10 @@ import com.gh.gamecenter.adapter.viewholder.DetailViewHolder;
 import com.gh.gamecenter.common.callback.OnRequestCallBackListener;
 import com.gh.gamecenter.common.constant.Constants;
 import com.gh.gamecenter.common.constant.EntranceConsts;
-import com.gh.gamecenter.common.constant.RouteConsts;
+import com.gh.gamecenter.common.eventbus.EBConcernChanged;
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus;
 import com.gh.gamecenter.common.eventbus.EBNetworkState;
+import com.gh.gamecenter.common.eventbus.EBPackage;
 import com.gh.gamecenter.common.eventbus.EBReuse;
 import com.gh.gamecenter.common.retrofit.Response;
 import com.gh.gamecenter.common.utils.ExtensionsKt;
@@ -53,11 +54,8 @@ import com.gh.gamecenter.core.utils.ClickUtils;
 import com.gh.gamecenter.core.utils.DisplayUtils;
 import com.gh.gamecenter.core.utils.MtaHelper;
 import com.gh.gamecenter.entity.NewsDetailEntity;
-import com.gh.gamecenter.feature.eventbus.EBConcernChanged;
-import com.gh.gamecenter.feature.eventbus.EBAddComment;
-import com.gh.gamecenter.feature.eventbus.EBDeleteComment;
-import com.gh.gamecenter.eventbus.EBDownloadStatus;
-import com.gh.gamecenter.eventbus.EBPackage;
+import com.gh.gamecenter.eventbus.EBAddComment;
+import com.gh.gamecenter.eventbus.EBDeleteComment;
 import com.gh.gamecenter.feature.entity.GameEntity;
 import com.gh.gamecenter.feature.entity.MeEntity;
 import com.gh.gamecenter.feature.entity.NewsEntity;
@@ -85,7 +83,6 @@ import retrofit2.HttpException;
  *
  * @author 黄壮华
  */
-@Route(path = RouteConsts.activity.newsDetailActivity)
 public class NewsDetailActivity extends DownloadToolbarActivity implements OnClickListener, OnRequestCallBackListener {
 
     RecyclerView mDetailRv;

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

@@ -18,11 +18,11 @@ import androidx.annotation.NonNull;
 import androidx.core.content.ContextCompat;
 
 import com.facebook.drawee.view.SimpleDraweeView;
-import com.gh.common.util.MessageShareUtils;
-import com.gh.common.util.QRCodeUtils;
 import com.gh.gamecenter.common.base.activity.ToolBarActivity;
 import com.gh.gamecenter.common.constant.EntranceConsts;
 import com.gh.gamecenter.common.utils.ImageUtils;
+import com.gh.common.util.MessageShareUtils;
+import com.gh.common.util.QRCodeUtils;
 import com.gh.gamecenter.feature.entity.ConcernEntity;
 
 import java.io.File;

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

@@ -16,7 +16,6 @@ import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_GAME_COLLECT
 import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_INVOKE_ONLY;
 import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_LIBAO;
 import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_QQ;
-import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_QQ_GAME;
 import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_QQ_GROUP;
 import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_QQ_QUN;
 import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_QUESTION;
@@ -50,25 +49,19 @@ import android.util.Base64;
 
 import androidx.annotation.Nullable;
 
-import com.alibaba.android.arouter.launcher.ARouter;
 import com.gh.common.util.CheckLoginUtils;
 import com.gh.common.util.DirectUtils;
-import com.gh.common.util.DownloadItemUtils;
 import com.gh.common.util.EntranceUtils;
 import com.gh.gamecenter.common.base.activity.BaseActivity;
 import com.gh.gamecenter.common.constant.EntranceConsts;
-import com.gh.gamecenter.common.constant.RouteConsts;
 import com.gh.gamecenter.common.entity.CommunityEntity;
 import com.gh.gamecenter.common.entity.LinkEntity;
 import com.gh.gamecenter.common.entity.SimpleGameEntity;
-import com.gh.gamecenter.core.provider.IQGameProvider;
 import com.gh.gamecenter.core.utils.GsonUtils;
 import com.gh.gamecenter.core.utils.ToastUtils;
 import com.gh.gamecenter.entity.SubjectRecommendEntity;
 import com.gh.gamecenter.entity.VideoLinkEntity;
 import com.gh.gamecenter.feature.utils.PlatformUtils;
-import com.gh.gamecenter.login.entity.UserInfoEntity;
-import com.gh.gamecenter.login.user.UserManager;
 import com.gh.gamecenter.video.detail.VideoDetailContainerViewModel;
 import com.gh.gamecenter.video.videomanager.VideoManagerActivity;
 import com.gh.vspace.shortcut.OnCreateShortcutResult;
@@ -79,14 +72,6 @@ import com.lightgame.config.CommonDebug;
 import com.lightgame.utils.Utils;
 import com.muugi.shortcut.core.Executor;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.function.Function;
-
-import kotlin.Unit;
-import kotlin.jvm.functions.Function2;
-
 /**
  * Created by LGT on 2016/11/16.
  * 链接跳转用
@@ -138,7 +123,7 @@ public class SkipActivity extends BaseActivity {
                             DirectUtils.directToGameDetail(this, path, ENTRANCE_BROWSER, "true".equals(uri.getQueryParameter("auto_download")), to, null);
                             break;
                         case HOST_COLUMN:
-                            DirectUtils.directToSubject(this, path, uri.getQueryParameter(KEY_NAME), ENTRANCE_BROWSER, null, false);
+                            DirectUtils.directToSubject(this, path, uri.getQueryParameter(KEY_NAME), ENTRANCE_BROWSER, null);
                             break;
                         case HOST_SUGGESTION:
                             String platform = uri.getQueryParameter(KEY_PLATFORM);
@@ -418,15 +403,7 @@ public class SkipActivity extends BaseActivity {
                             DirectUtils.directToGameCollectionDetail(this, path, ENTRANCE_BROWSER, "", null);
                             break;
                         case HOST_GAME_COLLECTION_SQUARE:
-                            DirectUtils.directToGameCollectionSquare(this, ENTRANCE_BROWSER, "", "", "", "", "", null);
-                            break;
-                        case HOST_QQ_GAME:
-                            String extJson = uri.getQueryParameter("ext");
-                            try {
-                                JSONObject extJsonObject = new JSONObject(extJson);
-                                String qqGameId = extJsonObject.optString("aid");
-                                DirectUtils.directToQGameById(this, qqGameId);
-                            } catch (JSONException ignored) {}
+                            DirectUtils.directToGameCollectionSquare(this, ENTRANCE_BROWSER, "", "", "", "", "");
                             break;
                         default:
                             EntranceUtils.jumpActivity(this, new Bundle()); // 跳转至首页