build: 添加 3.7.0 版本的 sentry plugin 缓存

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

.gitlab-ci.yml

@@ -72,6 +72,7 @@ android_build:
   only:
     - dev
     - release
+    - pack/update_sentry_plugin_cache
 
 # 代码检查
 sonarqube_analysis:
@@ -157,3 +158,4 @@ oss-upload&send-email:
     only:
         - dev
         - release
+        - pack/update_sentry_plugin_cache

app/build.gradle

@@ -2,9 +2,7 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android' // kotlin
 apply plugin: 'kotlin-parcelize'
-apply plugin: 'com.google.devtools.ksp'
 apply plugin: 'kotlin-kapt'
-apply plugin: 'therouter'
 
 import groovy.xml.XmlUtil
 
@@ -53,10 +51,6 @@ android {
         }
     }
 
-    ksp {
-        arg("ROUTER_MODULE_NAME", project.getName())
-    }
-
     defaultConfig {
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true
@@ -129,6 +123,12 @@ android {
         }
     }
 
+    kapt {
+        arguments {
+            arg("AROUTER_MODULE_NAME", project.name)
+        }
+    }
+
     packagingOptions {
         // exclude 部分冗余的文件
         exclude 'META-INF/gradle/incremental.annotation.processors'
@@ -197,7 +197,7 @@ android {
             java.srcDirs = ['src/main/java', "src/default/java"]
         }
         internal {
-            java.srcDirs = ['src/main/java', "src/default/java", "src/internal/java"]
+            java.srcDirs = ['src/main/java', "src/default/java"]
         }
         tea {
             java.srcDirs = ['src/main/java', 'src/tea/java']
@@ -346,7 +346,7 @@ repositories {
 android.applicationVariants.configureEach { variant ->
     variant.mergeAssets.doLast {
         def assetDir = variant.mergeAssetsProvider.get().outputDir.get()
-        def unwantedAssets = ['1832823466', 'gdt_plugin/gdtadv2.jar']
+        def unwantedAssets = ['2011394667', 'gdt_plugin/gdtadv2.jar']
 
         unwantedAssets.each { assetPath ->
             def file = new File([assetDir, assetPath].join(File.separator))
@@ -378,7 +378,7 @@ dependencies {
     implementation "androidx.annotation:annotation:${annotation}"
 
     implementation "androidx.viewpager2:viewpager2:${viewpager2}"
-    ksp("androidx.room:room-compiler:${room}")
+    kapt "androidx.room:room-compiler:${room}"
 
     implementation "com.tencent.vasdolly:helper:${apkChannelPackage}"
     implementation "com.tencent.vasdolly:writer:${apkChannelPackage}"
@@ -402,7 +402,7 @@ dependencies {
         exclude module: "gsyvideoplayer-androidvideocache"
         exclude group: "tv.danmaku.ijk.media"
     })
-    implementation("com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-exo_player2:$gsyVideo") {
+    implementation ("com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-exo_player2:$gsyVideo") {
         exclude group: 'com.google.android.exoplayer', module: 'extension-rtmp'
     }
 
@@ -428,8 +428,7 @@ dependencies {
 
     coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:${desugarJdkLibs}"
 
-    kapt "com.google.auto.service:auto-service:${autoServiceVersion}"
-    ksp "cn.therouter:apt:${routerVersion}"
+    kapt "com.alibaba:arouter-compiler:$arouterVersion"
 
     implementation project(':ndownload')
     implementation project(':vspace-bridge:vspace')
@@ -451,9 +450,9 @@ dependencies {
         exclude group: 'androidx.swiperefreshlayout'
     }
 
-//    implementation(project(':module_setting_compose')) {
-//        exclude group: 'androidx.swiperefreshlayout'
-//    }
+    //    implementation(project(':module_setting_compose')) {
+    //        exclude group: 'androidx.swiperefreshlayout'
+    //    }
 
     if (!gradle.ext.excludeOptionalModules || gradle.ext.enablePkg) {
         implementation(project(':feature:pkg'))
@@ -510,10 +509,6 @@ dependencies {
         implementation(project(':feature:sentry'))
     }
 
-    if (gradle.ext.enableRouteDoc) {
-        ksp project(":feature:route_doc")
-    }
-
     implementation(project(':feature:media_select'))
 
     implementation(project(":module_va_api"))
@@ -526,18 +521,6 @@ dependencies {
 
     debugImplementation 'com.bytedance.android:shadowhook:1.0.9'
     debugImplementation 'io.github.shiqos:wytrace:1.0.1'
-
-    if (!gradle.ext.excludeOptionalModules || gradle.ext.enableAccelerator) {
-        implementation(project(":feature:accelerator"))
-    }
-
-    if (!gradle.ext.excludeOptionalModules || gradle.ext.enableAliPay) {
-        implementation(project(":feature:ali_pay"))
-    }
-
-    if(!gradle.ext.excludeOptionalModules || gradle.ext.enableWechatPay){
-        implementation(project(":feature:wechat_pay"))
-    }
 }
 
 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.gamecenter.gamedetail.entity.** {<fields>;}
 -keep class com.gh.download.DownloadDataSimpleEntity {<fields>;}
 -keep class com.gh.gamecenter.floatingwindow.FloatingWindowEntity {<fields>;}
 -keep class com.gh.gamecenter.BR
@@ -77,7 +76,6 @@
 
 ### TEA
 -keep class com.gh.gamecenter.TeaHelper { *; }
--keep class com.bytedance.ads.convert.broadcast.common.EncryptionTools {*;}
 
 ### EasyFloat
 -keep class com.lzf.easyfloat.* {*;}

app/src/main/AndroidManifest.xml

@@ -10,9 +10,9 @@
     <queries>
         <package android:name="com.gh.toolmap" />
         <intent>
-            <action android:name="android.intent.action.VIEW" />
-            <category android:name="android.intent.category.BROWSABLE" />
-            <data android:scheme="ghtoolmap" />
+            <action android:name="android.intent.action.VIEW"/>
+            <category android:name="android.intent.category.BROWSABLE"/>
+            <data android:scheme="ghtoolmap"/>
         </intent>
     </queries>
 
@@ -68,13 +68,6 @@
     <!-- 悬浮窗 -->
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
 
-    <!-- 适配 双开/分身 游戏授权登录 -->
-    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
-
-    <!--  日历  -->
-    <uses-permission android:name="android.permission.READ_CALENDAR" />
-    <uses-permission android:name="android.permission.WRITE_CALENDAR" />
-
     <uses-sdk tools:overrideLibrary="
         com.shuyu.gsyvideoplayer,
         com.shuyu.gsyvideoplayer.lib,
@@ -201,9 +194,7 @@
             android:name="io.sentry.breadcrumbs.system-events"
             android:value="false" />
 
-        <meta-data
-            android:name="module_version"
-            android:value="${VA_VERSION_NAME}" />
+        <meta-data android:name="module_version" android:value="${VA_VERSION_NAME}" />
 
         <service android:name="com.gh.ndownload.NDownloadService" />
 
@@ -526,6 +517,10 @@
             android:name=".video.data.VideoDataActivity"
             android:screenOrientation="portrait" />
 
+        <activity
+            android:name=".video.poster.PosterEditActivity"
+            android:screenOrientation="portrait" />
+
         <activity
             android:name=".forum.detail.ForumDetailActivity"
             android:screenOrientation="portrait" />
@@ -643,9 +638,8 @@
         <!--            android:theme="@android:style/Theme.Translucent" />-->
 
         <activity
-            android:name="com.gh.gamecenter.SkipCompatActivity"
+            android:name="com.gh.gamecenter.SkipActivity"
             android:exported="true"
-            android:launchMode="singleTask"
             android:theme="@style/Theme.AppCompat.Light.Fullscreen.Transparent">
             <intent-filter>
                 <data android:scheme="ghzhushou" />
@@ -669,8 +663,7 @@
             android:name=".authorization.AuthorizationActivity"
             android:exported="true"
             android:launchMode="singleTask"
-            android:screenOrientation="portrait"
-            android:taskAffinity=".auth">
+            android:screenOrientation="portrait">
             <intent-filter>
                 <data android:scheme="ghzhushou_authorization" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -816,14 +809,6 @@
             android:screenOrientation="portrait"
             android:theme="@style/AppCompatTheme.APP" />
 
-        <activity
-            android:name=".video.poster.PosterEditActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name="com.halo.assistant.accelerator.MyAssetsActivity"
-            android:screenOrientation="portrait" />
-
         <!--        <activity-->
         <!--            android:name="${applicationId}.douyinapi.DouYinEntryActivity"-->
         <!--            android:launchMode="singleTask"-->
@@ -879,6 +864,10 @@
         <!--                tools:node="remove" />-->
         <!--        </provider>-->
 
+        <service android:name="com.gh.gamecenter.install.InstallService" />
+
+        <service android:name="com.gh.download.suspendwindow.DownloadSuspendWindowService" />
+
         <receiver
             android:name="com.gh.gamecenter.receiver.DownloadReceiver"
             android:exported="false">

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

@@ -4,7 +4,6 @@ import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
 import android.content.SharedPreferences
-import android.graphics.drawable.Animatable
 import android.os.Message
 import android.text.TextUtils
 import android.view.View
@@ -13,22 +12,20 @@ import android.widget.FrameLayout
 import android.widget.TextView
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.fragment.app.Fragment
-import com.therouter.TheRouter
-import com.facebook.drawee.controller.BaseControllerListener
+import com.alibaba.android.arouter.launcher.ARouter
 import com.facebook.drawee.view.SimpleDraweeView
-import com.facebook.imagepipeline.image.ImageInfo
 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
+import com.gh.common.util.NewFlatLogUtils.logOpenScreenAdSkip
 import com.gh.common.util.PackageUtils
 import com.gh.gamecenter.BuildConfig
 import com.gh.gamecenter.MainActivity
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.base.activity.BaseActivity
 import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.exposure.ExposureSource
-import com.gh.gamecenter.common.exposure.meta.MetaUtil
 import com.gh.gamecenter.common.retrofit.BiResponse
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.core.AppExecutor
@@ -62,8 +59,6 @@ object AdDelegateHelper {
     private val mGameSearchAdList: ArrayList<AdConfig> by lazy { arrayListOf() }
     private var mVGameLaunchAd: AdConfig? = null
 
-    private var ownerSplashAdLoadTime = 0L
-
     val vGameLaunchAd: AdConfig?
         get() = mVGameLaunchAd
 
@@ -81,7 +76,6 @@ object AdDelegateHelper {
     }
 
     var isShowingSplashAd = false // 是否正在显示开屏广告
-    var isOwnerSplashAdShown = false // 自有开屏广告是否展示
     var gameSearchKeyword = ""
 
     fun initAdSdk(context: Context) {
@@ -100,7 +94,8 @@ object AdDelegateHelper {
     private fun initAdSdkInternal(context: Context) {
         // 初始化穿山甲
         if (mCsjAdImpl == null) {
-            mCsjAdImpl = TheRouter.get(ICsjAdProvider::class.java)
+            mCsjAdImpl =
+                ARouter.getInstance().build(RouteConsts.provider.csjAd).navigation() as? ICsjAdProvider
             val csjAppId = if (EnvHelper.isDevEnv) BuildConfig.DEV_CSJ_APPID else BuildConfig.CSJ_APPID
             mCsjAdImpl?.initSDK(context, csjAppId, HaloApp.getInstance().oaid)
             // 监听亮色/暗色模式切换
@@ -178,15 +173,6 @@ object AdDelegateHelper {
             when (config.location) {
                 "halo_launch" -> {
                     config.ownerAd?.startAd?.let { it.id = config.ownerAd.id }
-
-                    // HarmonyOS 2.2.0 版本不展示第三方开屏广告 (因为会引起奇怪的闪退)
-//                    if (MetaUtil.getRom().name == "HarmonyOS"
-//                        && MetaUtil.getRom().versionName == "2.2.0"
-//                        && config.displayRule.adSource == "third_party_ads") {
-//
-//                        return
-//                    }
-
                     mSplashAd = config
                 }
 
@@ -317,7 +303,6 @@ object AdDelegateHelper {
     ) {
         val hideCallback = {
             isShowingSplashAd = false
-            isOwnerSplashAdShown = false
             hideAction.invoke()
         }
         if (mSplashAd != null) {
@@ -590,8 +575,6 @@ object AdDelegateHelper {
         handler: BaseActivity.BaseHandler,
         hideCallback: () -> Unit
     ) {
-        isOwnerSplashAdShown = false
-
         val jumpBtn = startAdContainer.findViewById<TextView>(R.id.jumpBtn)
         val jumpDetailBtn: TextView = startAdContainer.findViewById(R.id.jumpDetailBtn)
         val adImage: SimpleDraweeView = startAdContainer.findViewById(R.id.adImage)
@@ -610,62 +593,38 @@ object AdDelegateHelper {
         )
 
         adImage.visibleIf(true)
-        ImageUtils.displayWithCallback(adImage, ad.img, true, object : BaseControllerListener<ImageInfo>() {
-            override fun onSubmit(id: String?, callerContext: Any?) {
-                super.onSubmit(id, callerContext)
-                adImage.post {
-                    ownerSplashAdLoadTime = System.currentTimeMillis()
-                    NewFlatLogUtils.logSplashAdLoad(ad.id)
-                }
-            }
-
-            override fun onFinalImageSet(id: String?, imageInfo: ImageInfo?, animatable: Animatable?) {
-                isOwnerSplashAdShown = true
-                adImage.post {
-                    NewFlatLogUtils.logSplashAdShow(ad.id, System.currentTimeMillis() - ownerSplashAdLoadTime)
-                }
-            }
-
-            override fun onFailure(id: String?, throwable: Throwable?) {
-                super.onFailure(id, throwable)
-                NewFlatLogUtils.logSplashAdFail(ad.id, "启动广告图加载失败")
-            }
-        })
+        ImageUtils.display(adImage, ad.img)
 
         if (ad.isImageType) {
             adVideo.visibleIf(false)
         } else {
+            adVideo.visibleIf(true)
             adVideo.startPlay(ad.video.url)
         }
         startAdContainer.setOnClickListener {
             // 拦截点击事件传递
         }
         jumpBtn.setOnClickListener {
-            it.debounceActionWithInterval(1000L) {
-                if (!isOwnerSplashAdShown) {
-                    NewFlatLogUtils.logSplashAdFail(ad.id, "加载过程中点击跳过广告")
-                }
-                handler.removeMessages(MainActivity.COUNTDOWN_AD)
-                hideCallback.invoke()
-                val linkEntity = ad.jump
-                NewFlatLogUtils.logOpenScreenAdSkip(
-                    ad.id,
-                    (if (linkEntity.text != null) linkEntity.text else "")!!,
-                    (if (linkEntity.type != null) linkEntity.type else "")!!,
-                    (if (linkEntity.link != null) linkEntity.link else "")!!
-                )
-                SensorsBridge.trackEvent(
-                    "SplashAdOwnSkip",
-                    "splash_ad_id",
-                    ad.id,
-                    "link_type",
-                    linkEntity.type ?: "",
-                    "link_id",
-                    linkEntity.link ?: "",
-                    "link_text",
-                    linkEntity.text ?: ""
-                )
-            }
+            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 "")!!
+            )
+            SensorsBridge.trackEvent(
+                "SplashAdOwnSkip",
+                "splash_ad_id",
+                ad.id,
+                "link_type",
+                linkEntity.type ?: "",
+                "link_id",
+                linkEntity.link ?: "",
+                "link_text",
+                linkEntity.text ?: ""
+            )
         }
         val sources: MutableList<ExposureSource> = ArrayList()
         sources.add(ExposureSource("开屏广告", ad.id))

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

@@ -19,10 +19,10 @@ import java.net.URLConnection
 
 object AdPluginDownloadHelper : InnerDownloadListener {
 
-    private const val CSJ_FILE_NAME = "1832823466"
+    private const val CSJ_FILE_NAME = "2011394667"
     private const val GDT_FILE_NAME = "gdt_plugin/gdtadv2.jar"
 
-    private const val CSJ_PLUGIN_URL = "https://and-static.ghzs66.com/android/static/1832823466"
+    private const val CSJ_PLUGIN_URL = "https://and-static.ghzs66.com/android/static/2011394667"
     private const val GDT_PLUGIN_URL = "https://and-static.ghzs66.com/android/static/gdtadv2.jar"
 
     private var csjDownloadedCallback: (() -> Unit)? = null

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

@@ -1,10 +1,13 @@
 package com.gh.ad
 
+import android.content.Context
 import android.view.View
 import android.view.ViewGroup
 import android.view.ViewStub
 import androidx.fragment.app.Fragment
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.provider.ILaunchAd
 import com.gh.gamecenter.common.utils.SensorsBridge
 import com.gh.gamecenter.common.utils.goneIf
@@ -12,8 +15,10 @@ import com.gh.gamecenter.core.utils.DisplayUtils
 import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.entity.AdConfig
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.vaAd, name = "畅玩启动页广告")
 class LaunchAdImpl : ILaunchAd {
+    override fun init(context: Context?) {
+    }
 
     override fun requestAd(fragment: Fragment, container: ViewGroup, maskView: View, topViewStub: ViewStub, bottomViewStub: ViewStub, adClickAction: () -> Unit): View {
         if (AdDelegateHelper.shouldShowHelperLaunchAd()) {
@@ -99,4 +104,4 @@ class LaunchAdImpl : ILaunchAd {
     companion object {
         private const val AD_PLACEMENT = "畅玩启动"
     }
-}
+}

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

@@ -44,16 +44,6 @@ class SplashAdVideoView @JvmOverloads constructor(
         return R.layout.layout_splash_ad_video
     }
 
-    override fun touchSurfaceMoveFullLogic(absDeltaX: Float, absDeltaY: Float) {
-        // no nothing
-    }
-
-    override fun onPrepared() {
-        super.onPrepared()
-
-        visibility = VISIBLE
-    }
-
     override fun onAutoCompletion() {
         setStateAndUi(CURRENT_STATE_AUTO_COMPLETE);
 

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

@@ -21,31 +21,26 @@ import com.gh.common.view.RichEditor
 import com.gh.gamecenter.CropImageActivity
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.base.activity.ToolBarActivity
-import com.gh.gamecenter.common.constant.EntranceConsts
-import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.entity.LocalVideoEntity
+import com.gh.gamecenter.feature.selector.LocalMediaActivity
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.core.AppExecutor
 import com.gh.gamecenter.core.runOnIoThread
 import com.gh.gamecenter.core.utils.*
-import com.gh.gamecenter.entity.GamesCollectionEntity
-import com.gh.gamecenter.entity.MyVideoEntity
-import com.gh.gamecenter.entity.VideoEntity
+import com.gh.gamecenter.entity.*
+import com.gh.gamecenter.feature.entity.GameEntity
+import com.gh.gamecenter.qa.editor.*
 import com.gh.gamecenter.feature.entity.AnswerEntity
 import com.gh.gamecenter.feature.entity.ArticleEntity
-import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.selector.ChooseType
-import com.gh.gamecenter.feature.selector.LocalMediaActivity
-import com.gh.gamecenter.qa.editor.*
 import com.gh.gamecenter.qa.entity.EditorInsertEntity
-import com.gh.gamecenter.video.poster.video.VideoPosterFragment
+import com.gh.gamecenter.video.poster.PosterEditActivity
 import com.gh.gamecenter.video.upload.UploadManager
 import com.google.gson.JsonObject
 import com.halo.assistant.HaloApp
 import com.lightgame.utils.Util_System_Keyboard
 import com.lightgame.utils.Utils
 import com.lightgame.view.CheckableImageView
-import com.therouter.TheRouter
 import io.reactivex.disposables.Disposable
 import org.json.JSONArray
 import org.json.JSONObject
@@ -234,7 +229,6 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> constructor(
     @SuppressLint("AddJavascriptInterface", "ClickableViewAccessibility")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        VideoPosterFragment.createVideoCoverFile(this)
         findView()
         onRichClick()
         mViewModel = provideViewModel()
@@ -745,9 +739,9 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> constructor(
             mViewModel.id = id
             mViewModel.videoId = videoId
             val videoEntity = VideoEntity(url = url)
-            TheRouter.build(RouteConsts.activity.videoCoverEditActivity)
-                .withParcelable(EntranceConsts.KEY_VIDEO_ENTITY, videoEntity)
-                .navigation(this@BaseRichEditorActivity, REQUEST_CODE_IMAGE_CROP)
+            val intent =
+                PosterEditActivity.getIntentByVideo(this@BaseRichEditorActivity, videoEntity)
+            startActivityForResult(intent, REQUEST_CODE_IMAGE_CROP)
         }
 
         @JavascriptInterface

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

@@ -2,9 +2,9 @@ package com.gh.base
 
 import android.app.Activity
 import android.app.Application
-import android.content.res.Configuration
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import com.alibaba.android.arouter.launcher.ARouter
 import com.gh.ad.AdDelegateHelper
 import com.gh.common.util.FloatingBackViewManager
 import com.gh.common.xapk.XapkInstaller
@@ -15,45 +15,27 @@ import com.gh.gamecenter.SplashAdActivity
 import com.gh.gamecenter.SplashScreenActivity
 import com.gh.gamecenter.authorization.AuthorizationActivity
 import com.gh.gamecenter.common.base.GlobalActivityManager
+import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.provider.IHelpAndFeedbackProvider
 import com.gh.gamecenter.common.utils.PackageFlavorHelper
 import com.gh.gamecenter.core.provider.IPushProvider
-import com.gh.gamecenter.login.utils.QuickLoginHelper
 import com.gh.gamecenter.login.view.LoginActivity
 import com.gh.gamecenter.va.VCore
+import com.gh.gamecenter.login.utils.QuickLoginHelper
 import com.gh.vspace.VHelper
 import com.halo.assistant.HaloApp
-import com.therouter.TheRouter
 
 // TODO：移动到对应的模块
 class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
     private var isFromBackgroundToForeground = false // 是否后台回到前台
 
-    override fun onActivityPreCreated(activity: Activity, savedInstanceState: Bundle?) {
-        if (QuickLoginHelper.isLoginAuthPage(activity)) {
-            try {
-                val resources = activity.resources
-                val config = Configuration(resources.configuration)
-                config.fontScale = 1.0f
-
-                // 更新Resources配置
-                val metrics = resources.displayMetrics
-                metrics.scaledDensity = metrics.density
-                resources.updateConfiguration(config, metrics)
-
-            } catch (e: Exception) {
-                // 设置字体失败
-            }
-        }
-    }
-
     override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
         // do nothing
     }
 
     override fun onActivityStarted(activity: Activity) {
         GlobalActivityManager.currentActivity = activity
-        GlobalActivityManager.activityCount++
+        GlobalActivityManager.activityCount ++
         if (GlobalActivityManager.activityCount == 1 && isFromBackgroundToForeground) {
             if (AdDelegateHelper.shouldShowStartUpAd(true)
                 && !HaloApp.getInstance().isDisableSplashAdTemporarily
@@ -71,7 +53,7 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
         if (GlobalActivityManager.activityCount == 1) {
             // 清除桌面角标
             if (activity !is SplashScreenActivity && activity !is AuthorizationActivity) {
-                val pushProvider = TheRouter.get(IPushProvider::class.java)
+                val pushProvider = ARouter.getInstance().build(RouteConsts.provider.push).navigation() as? IPushProvider
                 pushProvider?.cleanBadgeNumber(activity.applicationContext)
             }
         }
@@ -129,7 +111,7 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
     }
 
     override fun onActivityStopped(activity: Activity) {
-        GlobalActivityManager.activityCount--
+        GlobalActivityManager.activityCount --
         isFromBackgroundToForeground = GlobalActivityManager.activityCount <= 0
     }
 
@@ -144,7 +126,9 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
     }
 
     private fun isSuggestionActivity(activity: Activity): Boolean {
-        val helpAndFeedbackProvider = TheRouter.get(IHelpAndFeedbackProvider::class.java)
+        val helpAndFeedbackProvider =
+            ARouter.getInstance().build(RouteConsts.provider.helpAndFeedback)
+                .navigation() as? IHelpAndFeedbackProvider
         return helpAndFeedbackProvider?.isSuggestionActivity(activity) ?: false
     }
 

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

@@ -3,8 +3,6 @@ package com.gh.common
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
-import android.os.Handler
-import android.os.Looper
 import android.util.Base64
 import android.view.View
 import android.webkit.JavascriptInterface
@@ -13,7 +11,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.fragment.app.FragmentManager
-import androidx.lifecycle.Lifecycle
+import com.alibaba.android.arouter.launcher.ARouter
 import com.gh.common.exposure.ExposureManager
 import com.gh.common.util.*
 import com.gh.common.util.LogUtils
@@ -21,12 +19,10 @@ import com.gh.download.DownloadManager
 import com.gh.download.PackageObserver
 import com.gh.gamecenter.BuildConfig
 import com.gh.gamecenter.ImageViewerActivity
-import com.gh.gamecenter.R
 import com.gh.gamecenter.WebActivity
 import com.gh.gamecenter.common.callback.BiCallback
 import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.constant.Constants.SP_MEMBER_PAYMENT_BUTTON_CLICK
-import com.gh.gamecenter.common.constant.Constants.SP_MEMBER_RECHARGE_BUTTON_CLICK
+import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.entity.NotificationUgc
 import com.gh.gamecenter.common.exposure.ExposureSource
 import com.gh.gamecenter.common.loghub.LoghubUtils
@@ -34,22 +30,20 @@ import com.gh.gamecenter.common.provider.IHelpAndFeedbackProvider
 import com.gh.gamecenter.common.tracker.Tracker
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.common.utils.NewFlatLogUtils
-import com.gh.gamecenter.common.utils.SensorsBridge.EVENT_MEMBER_RECHARGE_BUTTON_CLICK
-import com.gh.gamecenter.common.utils.SensorsBridge.EVENT_NAME
-import com.gh.gamecenter.common.utils.SensorsBridge.KEY_IS_FIRST_TIME
 import com.gh.gamecenter.common.view.dsbridge.CompletionHandler
 import com.gh.gamecenter.core.AppExecutor
 import com.gh.gamecenter.core.provider.IPushProvider
 import com.gh.gamecenter.core.runOnIoThread
 import com.gh.gamecenter.core.runOnUiThread
-import com.gh.gamecenter.core.utils.*
+import com.gh.gamecenter.core.utils.CurrentActivityHolder
+import com.gh.gamecenter.core.utils.DisplayUtils
+import com.gh.gamecenter.core.utils.SPUtils
+import com.gh.gamecenter.core.utils.ToastUtils
 import com.gh.gamecenter.entity.SensorsEvent
 import com.gh.gamecenter.eventbus.EBDownloadStatus
 import com.gh.gamecenter.eventbus.EBPackage
-import com.gh.gamecenter.feature.entity.AcctRecordEntity
 import com.gh.gamecenter.feature.entity.Badge
 import com.gh.gamecenter.feature.entity.GameEntity
-import com.gh.gamecenter.feature.entity.OrderEntity
 import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.gh.gamecenter.login.user.LoginTag
 import com.gh.gamecenter.login.user.UserManager
@@ -61,14 +55,10 @@ import com.gh.gamecenter.personalhome.border.AvatarBorderActivity
 import com.gh.gamecenter.setting.SettingBridge
 import com.gh.vspace.VHelper
 import com.halo.assistant.HaloApp
-import com.halo.assistant.accelerator.repository.AccelerationRepository.Companion.PAYMENT_TYPE_ALIPAY
-import com.halo.assistant.accelerator.repository.AccelerationRepository.Companion.PAYMENT_TYPE_WECHAT
-import com.halo.assistant.accelerator.repository.AcceleratorDataHolder
 import com.lightgame.download.DataWatcher
 import com.lightgame.download.DownloadEntity
 import com.lightgame.download.DownloadStatus.*
 import com.lightgame.utils.Utils
-import com.therouter.TheRouter
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
@@ -81,11 +71,10 @@ import java.util.*
 class DefaultJsApi(
     var context: Context,
     val entrance: String = "",
-    private val mFragment: Fragment? = null,
+    private var mFragment: Fragment? = null,
     private var mBbsId: String? = "",
     private var mOriginUrl: String? = "",
     private val mForumName: String? = "",
-    private val listener: OnWebClickListener? = null
 ) {
 
     companion object {
@@ -98,8 +87,6 @@ class DefaultJsApi(
     private var mDownloadHandler: CompletionHandler<Any>? = null // 下载信息回调
     private var mExposureEvent: ExposureEvent? = null // 活动曝光实体
 
-    private val handler = Handler(Looper.getMainLooper())
-
     init {
         if (mFragment != null) {
             EventBus.getDefault().register(this)
@@ -246,12 +233,6 @@ class DefaultJsApi(
                     VHelper.launch(context, packageName)
                 }
             } else {
-                val wechatPkgName = "com.tencent.mm"
-                if (packageName == wechatPkgName && !PackageUtils.isInstalled(context, wechatPkgName)) {
-                    // 如果是微信客户端，需要检查是否安装微信
-                    ToastUtils.showToast(R.string.wechat_app_not_install_tips.toResString())
-                    return@runOnUiThread
-                }
                 PackageLauncher.launchApp(context, packageName = packageName)
             }
         }
@@ -364,7 +345,7 @@ class DefaultJsApi(
 
     @JavascriptInterface
     fun getPushId(): String {
-        val pushProvider = TheRouter.get(IPushProvider::class.java)
+        val pushProvider = ARouter.getInstance().build(RouteConsts.provider.push).navigation() as? IPushProvider
         return pushProvider?.getRegistrationId(HaloApp.getInstance()) ?: "unknown"
     }
 
@@ -443,7 +424,8 @@ class DefaultJsApi(
 
     @JavascriptInterface
     fun showQaFeedbackDialog(msg: Any) {
-        val mHelpAndFeedbackHelp = TheRouter.get(IHelpAndFeedbackProvider::class.java)
+        val mHelpAndFeedbackHelp =
+            ARouter.getInstance().build(RouteConsts.provider.helpAndFeedback).navigation() as? IHelpAndFeedbackProvider
         mHelpAndFeedbackHelp?.showQaFeedbackDialogFragment(context as AppCompatActivity, msg.toString())
     }
 
@@ -514,44 +496,6 @@ class DefaultJsApi(
         }
     }
 
-    @JavascriptInterface
-    fun saveWechatQRCode(msg: Any) {
-        val base64StringData = msg.toString()
-        runOnUiThread {
-            (context as? FragmentActivity)?.checkStoragePermissionBeforeAction {
-                runOnIoThread {
-                    val base64String = base64StringData.replace("data:image/png;base64", "")
-                    tryWithDefaultCatch {
-                        val imageFile =
-                            File(HaloApp.getInstance().cacheDir.absolutePath + File.separator + System.currentTimeMillis() + ".png")
-                        val decodedString = Base64.decode(base64String, Base64.DEFAULT)
-                        val bos = BufferedOutputStream(FileOutputStream(imageFile))
-                        bos.write(decodedString)
-                        bos.flush()
-                        bos.close()
-
-                        ImageUtils.saveImageToFile(imageFile, "", true) {
-                            // 这里是 ui 线程
-                            // 保存微信二维码成功，1s 以后跳转微信
-                            if (mFragment != null && mFragment.lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED)) {
-                                handler.removeCallbacksAndMessages(null)
-                                handler.postDelayed({
-                                    val wechatPkgName = "com.tencent.mm"
-                                    if (!PackageUtils.isInstalled(context, wechatPkgName)) {
-                                        ToastUtils.showToast(R.string.wechat_app_not_install_tips.toResString())
-                                        return@postDelayed
-                                    }
-                                    PackageLauncher.launchApp(context, packageName = wechatPkgName)
-                                }, 1000)
-                            }
-
-                        }
-                    }
-                }
-            }
-        }
-    }
-
     @JavascriptInterface
     fun loginWithCallback(msg: Any, handler: CompletionHandler<Any>) {
         mLoginHandler = handler
@@ -756,78 +700,6 @@ class DefaultJsApi(
         }
     }
 
-    @JavascriptInterface
-    fun preOrderWithAli(json: Any) {
-        val order = json.toString().toObject<OrderEntity>() ?: return
-        trackMemberPaymentButtonClick(order, PAYMENT_TYPE_ALIPAY)
-        listener?.onPreOrderWithAli(order)
-    }
-
-    @JavascriptInterface
-    fun preOrderWithWechat(json: Any) {
-        val order = json.toString().toObject<OrderEntity>() ?: return
-        trackMemberPaymentButtonClick(order, PAYMENT_TYPE_WECHAT)
-        listener?.onPreOrderWithWechat(order)
-    }
-
-    private fun trackMemberPaymentButtonClick(order: OrderEntity, paymentType: String) {
-        val isFirstTime = SPUtils.getBoolean(SP_MEMBER_PAYMENT_BUTTON_CLICK, true)
-        SPUtils.setBoolean(SP_MEMBER_PAYMENT_BUTTON_CLICK, false)
-        SensorsBridge.trackMemberPaymentButtonClick(
-            isFirstTime,
-            paymentType,
-            order.setMenuName,
-            order.paymentAmount
-        )
-    }
-
-    @JavascriptInterface
-    fun startGameAccelerate(acctJson: Any) {
-        if (acctJson is String) {
-            val acctRecord = GsonUtils.fromJson(acctJson, AcctRecordEntity::class.java)
-            val accInfo = acctRecord.accInfo
-            listener?.onStartGameAccelerate(accInfo)
-        }
-    }
-
-    @JavascriptInterface
-    fun getCurAcctGameId(): String {
-        return AcceleratorDataHolder.instance.getAcceleratingGameId()
-    }
-
-    @JavascriptInterface
-    fun stopGameAccelerate() {
-        listener?.onStopGameAccelerate()
-    }
-
-    @JavascriptInterface
-    fun refreshToken(token: Any, handler: CompletionHandler<Any>) {
-        val accessToken = token.toString()
-        UserManager.getInstance().refreshToken(accessToken, object : UserManager.refreshCallBack {
-            override fun onLogin() {
-                handler.complete(true)
-            }
-
-            override fun onLoginFailure(errorMessage: String?) {
-                handler.complete(false)
-            }
-
-        })
-    }
-
-    @JavascriptInterface
-    fun trackSensorsAnalytics(json: Any) {
-        val hashMap = json.toString().toObject<HashMap<String, Any>>() ?: return
-        val eventName = hashMap.remove(EVENT_NAME) ?: return
-        when (eventName) {
-            EVENT_MEMBER_RECHARGE_BUTTON_CLICK -> {
-                hashMap[KEY_IS_FIRST_TIME] = SPUtils.getBoolean(SP_MEMBER_RECHARGE_BUTTON_CLICK, true)
-                SPUtils.setBoolean(SP_MEMBER_RECHARGE_BUTTON_CLICK, false)
-            }
-        }
-        SensorsBridge.trackSensorsAnalyticsFromWeb(eventName.toString(), hashMap)
-    }
-
     /**
      * 获取 ExposureEvent，可能为空
      */
@@ -848,8 +720,6 @@ class DefaultJsApi(
                         }
 
                         EventBus.getDefault().unregister(this@DefaultJsApi)
-
-                        handler.removeCallbacksAndMessages(null)
                     }
                 }
 
@@ -946,15 +816,4 @@ class DefaultJsApi(
             }
         }
     }
-
-    interface OnWebClickListener {
-
-        fun onPreOrderWithAli(order: OrderEntity)
-
-        fun onPreOrderWithWechat(order: OrderEntity)
-
-        fun onStartGameAccelerate(accInfo: AcctRecordEntity.AccInfo)
-
-        fun onStopGameAccelerate()
-    }
 }

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.SkipCompatActivity
 import com.gh.gamecenter.WebActivity
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.constant.EntranceConsts
@@ -67,10 +66,6 @@ object DefaultUrlHandler {
                      bringAppToFront: Boolean = false,
                      sourceEntrance: String = ""): Boolean {
         val uri = Uri.parse(url)
-
-        // 优先交给新的路由拦截处理
-        if (SkipCompatActivity.handleSkip(context, uri)) return true
-
         if ("ghzhushou" == uri.scheme) {
             Utils.log("url = $url")
             Utils.log("url = " + uri.scheme!!)

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

@@ -17,7 +17,7 @@ import kotlin.concurrent.fixedRateTimer
 
 object FixedRateJobHelper {
     private const val CHECKER_PERIOD: Long = 15 * 1000L
-    private const val TIME_PERIOD: Long = 24 * 60 * 60 * 1000L
+    private const val TIME_PERIOD: Long = 10 * 60 * 1000L
     private const val LOGHUB_PERIOD: Long = 2 * 60 * 1000L
     private const val EXPOSURE_PERIOD: Long = 1 * 60 * 1000L
     private const val REGION_SETTING_PERIOD: Long = 60 * 1000L
@@ -35,7 +35,7 @@ object FixedRateJobHelper {
         // 时间检查，每15秒检查一次
         fixedRateTimer("Global-Fixed-Rate-Timer", initialDelay = 100, period = CHECKER_PERIOD) {
             val elapsedTime = mExecuteCount * CHECKER_PERIOD
-            // 时间校对，24 小时一次
+            // 时间校对，10分钟一次
             if (elapsedTime % TIME_PERIOD == 0L) {
                 RetrofitManager.getInstance().api.time
                     .subscribeOn(Schedulers.io())

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

@@ -4,7 +4,6 @@ import android.app.Activity
 import android.content.Context
 import com.gh.common.util.DialogUtils
 import com.gh.common.util.DirectUtils
-import com.gh.common.util.PackageChangeHelper
 import com.gh.common.util.TempCertificationUtils
 import com.gh.gamecenter.feature.entity.GameEntity
 
@@ -26,10 +25,6 @@ class LandPageAddressHandler : DownloadChainHandler() {
                             processEndCallback?.invoke(asVGame, null)
                         }
                     } else {
-                        val packageName = gameEntity.getApk().firstOrNull()?.packageName
-                        if (packageName?.isNotEmpty() == true) {
-                            PackageChangeHelper.addInstallPendingPackage(packageName)
-                        }
                         DirectUtils.directToExternalBrowser(context, gameEntity.landPageAddressDialog!!.link!!)
                     }
                 }

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

@@ -8,21 +8,12 @@ import com.gh.gamecenter.feature.entity.GameEntity
 class PackageCheckHandler : DownloadChainHandler() {
 
     override fun handleRequest(context: Context, gameEntity: GameEntity, asVGame: Boolean) {
-        fun nextOrProcessEnd() {
+        PackageCheckDialogFragment.show((context as AppCompatActivity), gameEntity) {
             if (hasNext()) {
                 getNext()?.handleRequest(context, gameEntity, asVGame)
             } else {
                 processEndCallback?.invoke(asVGame, null)
             }
         }
-
-        if (gameEntity.canSpeed) {
-            nextOrProcessEnd()
-        } else {
-            PackageCheckDialogFragment.show((context as AppCompatActivity), gameEntity) {
-                nextOrProcessEnd()
-            }
-        }
-
     }
 }

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

@@ -114,6 +114,8 @@ public class Config {
                 if (!TextUtils.isEmpty(json)) {
                     mSettingsEntity = GsonUtils.fromJson(json, SettingsEntity.class);
                 }
+
+                mSettingsEntity.setGameSmooth("off");
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -261,7 +263,8 @@ public class Config {
                     public void onSuccess(VSetting data) {
                         mVSetting = data;
                         SPUtils.setString(Constants.SP_V_SETTINGS, GsonUtils.toJson(data));
-                        VHelper.checkVspaceUpdate(HaloApp.getInstance());
+
+                        VHelper.init(HaloApp.getInstance());
                     }
                 });
     }

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

@@ -1,10 +1,5 @@
 package com.gh.common.databind;
 
-import static com.gh.gamecenter.entity.SubjectEntity.SUBJECT_TAG_SELLING_POINT;
-import static com.gh.gamecenter.entity.SubjectEntity.SUBJECT_TAG_TEST;
-import static com.gh.gamecenter.entity.SubjectEntity.SUBJECT_TAG_TYPE;
-import static com.gh.gamecenter.entity.SubjectEntity.SUBJECT_TAG_UPDATE;
-
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
@@ -20,10 +15,10 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
 import com.gh.common.chain.BrowserInstallHandler;
-import com.gh.common.chain.CheckDownloadHandler;
-import com.gh.common.chain.CheckStoragePermissionHandler;
 import com.gh.common.chain.DownloadChainBuilder;
 import com.gh.common.chain.DownloadChainHandler;
+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;
@@ -53,7 +48,6 @@ import com.gh.download.server.BrowserInstallHelper;
 import com.gh.gamecenter.DownloadManagerActivity;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.WebActivity;
-import com.gh.gamecenter.common.databinding.LayoutGameItemSellingPointBinding;
 import com.gh.gamecenter.common.entity.LinkEntity;
 import com.gh.gamecenter.common.utils.DarkModeUtils;
 import com.gh.gamecenter.common.utils.ExtensionsKt;
@@ -61,7 +55,6 @@ import com.gh.gamecenter.common.utils.FileUtils;
 import com.gh.gamecenter.common.utils.NewFlatLogUtils;
 import com.gh.gamecenter.common.utils.SensorsBridge;
 import com.gh.gamecenter.core.utils.MtaHelper;
-import com.gh.gamecenter.core.utils.TimeUtils;
 import com.gh.gamecenter.core.utils.ToastUtils;
 import com.gh.gamecenter.feature.entity.ApkEntity;
 import com.gh.gamecenter.feature.entity.GameEntity;
@@ -208,8 +201,7 @@ public class BindingAdapters {
                                         gameEntity,
                                         traceEvent,
                                         entrance,
-                                        location + ":" + gameEntity.getName(),
-                                        null);
+                                        location + ":" + gameEntity.getName());
                                 return null;
                             });
                             final DownloadChainHandler chainHandler = builder.buildHandlerChain();
@@ -254,8 +246,7 @@ public class BindingAdapters {
                                 gameEntity,
                                 traceEvent,
                                 entrance,
-                                location + ":" + gameEntity.getName(),
-                                null);
+                                location + ":" + gameEntity.getName());
                     }
                     break;
                 case INSTALL_PLUGIN:
@@ -296,11 +287,19 @@ public class BindingAdapters {
                     });
                     break;
                 case RESERVED:
-                    ReservationHelper.showCancelReservationDialog(progressBar.getContext(), gameEntity, () -> {
-                        ReservationHelper.cancelReservation(gameEntity, () -> {
-                            updateReservation(progressBar, gameEntity);
+                    if ("download".equals(gameEntity.getReserveStatus())) {
+                        ReservationHelper.showDeleteReservationDialog(progressBar.getContext(), () -> {
+                            ReservationHelper.deleteReservation(gameEntity, () -> {
+                                updateReservation(progressBar, gameEntity);
+                            });
                         });
-                    });
+                    } else {
+                        ReservationHelper.showCancelReservationDialog(progressBar.getContext(),gameEntity, () -> {
+                            ReservationHelper.cancelReservation(gameEntity, () -> {
+                                updateReservation(progressBar, gameEntity);
+                            });
+                        });
+                    }
                     break;
                 case H5_GAME:
                     LinkEntity linkEntity = gameEntity.getH5Link();
@@ -346,9 +345,9 @@ public class BindingAdapters {
                 }
                 progressBar.setButtonStyle(DownloadButton.ButtonStyle.H5_GAME);
             } else {
-                if (("dialog".equals(offStatus) || "third_party".equals(offStatus))) {
+                if (offStatus != null && "dialog".equals(offStatus)) {
                     progressBar.setText("查看");
-                    progressBar.setButtonStyle(DownloadButton.ButtonStyle.NONE_WITH_HINT);
+                    progressBar.setButtonStyle(DownloadButton.ButtonStyle.NONE);
                 } else if ("updating".equals(offStatus)) {
                     progressBar.setText("更新中");
                     progressBar.setButtonStyle(DownloadButton.ButtonStyle.UPDATING);
@@ -479,37 +478,39 @@ public class BindingAdapters {
         }
     }
 
-    /**
-     * 包含测试开服标签
-     *
-     * @param layout
-     * @param gameEntity
-     * @param subjectTag 默认为 “”，只有游戏专题可以配置subjectTag
-     */
-    public static void setGameTags(LinearLayout layout, GameEntity gameEntity, String subjectTag) {
+    // 包含测试开服标签
+    public static void setGameTags(LinearLayout layout, GameEntity gameEntity) {
         try {
             if (layout.getVisibility() == View.GONE) return;
             ArrayList<TagStyleEntity> tagStyle = new ArrayList<>();
             TestEntity test = gameEntity.getTest();
-            if (test != null && subjectTag.equals(SUBJECT_TAG_TEST)) {
-                // 显示开测表标签
-                TagStyleEntity typeTag = new TagStyleEntity();
-                boolean isDarkModeOn = DarkModeUtils.INSTANCE.isDarkModeOn(layout.getContext());
-                typeTag.setName(test.getType() != null ? test.getType() : "");
-                typeTag.setBackground("1AFFA142");
-                typeTag.setColor(isDarkModeOn ? "EB9238" : "FFA142");
-                tagStyle.add(typeTag);
-
-                TagStyleEntity timeTag = new TagStyleEntity();
-                if (test.getStartPending()) {
-                    timeTag.setName(test.getStartText());
+            if (test != null
+                    // 这个判断用于开测表列表
+                    && !"type_tag".equals(test.getGameTag())) {
+                if ("custom".equals(test.getGameTag())) {
+                    TagStyleEntity typeTag = new TagStyleEntity();
+                    if (!TextUtils.isEmpty(test.getText())) {
+                        typeTag.setName(test.getText() != null ? test.getText() : "");
+                    } else {
+                        typeTag.setName(test.getType() != null ? test.getType() : "");
+                    }
+                    typeTag.setBackground("E8F3FF");
+                    typeTag.setColor("1383EB");
+                    tagStyle.add(typeTag);
                 } else {
-                    timeTag.setName(GameViewUtils.getGameTestDate(test.getStart()));
-                }
-                timeTag.setBackground("1A06CEA8");
-                timeTag.setColor(isDarkModeOn ? "07A385" : "06CEA8");
-                tagStyle.add(timeTag);
+                    TagStyleEntity typeTag = new TagStyleEntity();
+                    boolean isDarkModeOn = DarkModeUtils.INSTANCE.isDarkModeOn(layout.getContext());
+                    typeTag.setName(test.getType() != null ? test.getType() : "");
+                    typeTag.setBackground("1AFFA142");
+                    typeTag.setColor(isDarkModeOn ? "EB9238" : "FFA142");
+                    tagStyle.add(typeTag);
 
+                    TagStyleEntity timeTag = new TagStyleEntity();
+                    timeTag.setName(GameViewUtils.getGameTestDate(test.getStart()));
+                    timeTag.setBackground("1A06CEA8");
+                    timeTag.setColor(isDarkModeOn ? "07A385" : "06CEA8");
+                    tagStyle.add(timeTag);
+                }
             } else {
                 tagStyle = gameEntity.getTagStyle();
             }
@@ -519,59 +520,6 @@ public class BindingAdapters {
         }
     }
 
-    public static void setGameTagsWithSellingPoint(LinearLayout layout, LayoutGameItemSellingPointBinding binding, GameEntity gameEntity, String subjectTag) {
-        if (subjectTag.equals(SUBJECT_TAG_SELLING_POINT)) {
-            layout.setVisibility(View.GONE);
-            binding.getRoot().setVisibility(View.VISIBLE);
-            GameEntity.SellingPoints sellingPoints = gameEntity.getSellingPoints();
-            if (sellingPoints != null) {
-                binding.tvSellingPoints.setVisibility(View.VISIBLE);
-                binding.tvSellingPoints.setText(sellingPoints.getText());
-            } else {
-                binding.tvSellingPoints.setVisibility(View.GONE);
-            }
-
-            Context context = layout.getContext();
-            binding.gtcvTags.removeAllViews();
-            ArrayList<TagStyleEntity> tagStyle = gameEntity.getTagStyle();
-            for (int i = 0; i < tagStyle.size(); i++) {
-                if (i < 3) {
-                    TextView textView = new TextView(layout.getContext());
-                    textView.setTextColor(ExtensionsKt.toColor(com.gh.gamecenter.common.R.color.text_tertiary, context));
-                    textView.setTextSize(10);
-                    textView.setText((i == 0 ? "" : "·") + tagStyle.get(i).getName());
-                    binding.gtcvTags.addView(textView);
-                }
-            }
-
-        } else {
-            layout.setVisibility(View.VISIBLE);
-            binding.getRoot().setVisibility(View.GONE);
-            switch (subjectTag) {
-                case SUBJECT_TAG_UPDATE:
-                    List<TagStyleEntity> updateTags = new ArrayList<>();
-                    TagStyleEntity updateTag = new TagStyleEntity(
-                            "local_generated",
-                            TimeUtils.getFormatTime(gameEntity.getUpdateTime(), "MM-dd") + " 更新",
-                            "",
-                            "1383EB",
-                            "E8F3FF",
-                            "1383EB",
-                            false
-                    );
-                    updateTags.add(updateTag);
-                    GameViewUtils.setLabelList(layout.getContext(), layout, updateTags);
-                    break;
-                case SUBJECT_TAG_TYPE:
-                    GameViewUtils.setLabelList(layout.getContext(), layout, gameEntity.getTagStyle());
-                    break;
-                default:
-                    setGameTags(layout, gameEntity, subjectTag);
-                    break;
-            }
-        }
-    }
-
     public static void setVideoDetailGameTags(LinearLayout layout, GameEntity gameEntity) {
         try {
             ArrayList<TagStyleEntity> tagStyle = new ArrayList<>();

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

@@ -3,6 +3,7 @@ package com.gh.common.dialog
 import android.animation.ValueAnimator
 import android.content.Context
 import android.content.DialogInterface
+import android.content.pm.PackageInfo
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -18,6 +19,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.gh.common.util.DirectUtils
 import com.gh.common.util.LogUtils
+import com.gh.common.util.PackageHelper
 import com.gh.common.util.PackageUtils
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.common.base.BaseRecyclerViewHolder
@@ -57,6 +59,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
     private val mDuration = 3000
     private var mDisposable: Disposable? = null
     private var mAdapter: PackageCheckAdapter? = null
+    private var mAllInstalledPackages = PackageHelper.getInstalledPackageNameList(HaloApp.getInstance().application, 0)
     var gameEntity: GameEntity? = null
     var callBack: ConfirmListener? = null
 
@@ -192,7 +195,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
             if (binding.noRemindAgainCb.isChecked) {
                 saveRecord(entity)
             }
-            val isAllPackageInstalled = isAllPackageInstalled(entity)
+            val isAllPackageInstalled = isAllPackageInstalled(mAllInstalledPackages, entity)
             if (isAllPackageInstalled) {
                 mDismissByTouchInside = true
                 callBack?.onConfirm()
@@ -296,7 +299,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
     private fun getNotInstalledLink(packageDialogEntity: PackageDialogEntity): LinkEntity? {
         val links = LinkedHashSet<LinkEntity>()
         packageDialogEntity.detectionObjects.forEach { obj ->
-            if (!checkDetectionsInstalled(obj.packages)) {
+            if (!checkDetectionsInstalled(mAllInstalledPackages, obj.packages)) {
                 obj.assignDownload.forEach {
                     links.add(packageDialogEntity.links[it])
                 }
@@ -322,8 +325,9 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
 
     override fun onResume() {
         super.onResume()
+        mAllInstalledPackages = PackageHelper.getInstalledPackageNameList(HaloApp.getInstance().application, 0)
         gameEntity?.packageDialog?.let {
-            if (isAllPackageInstalled(it)) {
+            if (isAllPackageInstalled(mAllInstalledPackages, it)) {
                 callBack?.onConfirm()
                 dismissAllowingStateLoss()
             }
@@ -359,6 +363,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onEventMainThread(busFour: EBPackage) {
         if (busFour.isInstalledOrUninstalled()) {
+            mAllInstalledPackages = PackageHelper.getInstalledPackageNameList(HaloApp.getInstance().application, 0)
             mAdapter?.notifyDataSetChanged()
         }
     }
@@ -383,7 +388,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
                 val entity = entities[position]
                 holder.binding.gameNameTv.text = entity.text
                 if (position <= index) {
-                    val isAllInstalled = checkDetectionsInstalled(entity.packages)
+                    val isAllInstalled = checkDetectionsInstalled(mAllInstalledPackages, entity.packages)
                     if (isAllInstalled) {
                         holder.binding.statusTv.text = "已安装"
                         holder.binding.statusTv.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.text_theme))
@@ -411,7 +416,8 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
                 return
             }
 
-            if (isAllPackageInstalled(packageDialogEntity)) {
+            val allInstalledPackages = PackageHelper.getInstalledPackageNameList(HaloApp.getInstance().application, 0)
+            if (isAllPackageInstalled(allInstalledPackages, packageDialogEntity)) {
                 callBack.onConfirm()
                 return
             }
@@ -447,11 +453,13 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
         }
 
         private fun checkDetectionsInstalled(
+            allInstalledPackages: List<String>,
             packages: ArrayList<String>
         ): Boolean {
             var isPackagesInstalled = false
             packages.forEach { packageName ->
-                if (PackageUtils.isInstalledFromAllPackage(HaloApp.getInstance(), packageName)) {
+                val isInstalled = allInstalledPackages.find { it == packageName } != null
+                if (isInstalled) {
                     isPackagesInstalled = true
                     return@forEach
                 }
@@ -461,14 +469,17 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
 
 
         fun isAllPackageInstalled(
+            allInstalledPackages: List<String>,
             packageDialogEntity: PackageDialogEntity
         ): Boolean {
+            var isAllInstalled = true
             packageDialogEntity.detectionObjects.forEach loop@{ obj ->
-                if (!checkDetectionsInstalled(obj.packages)) {
-                    return false
+                if (!checkDetectionsInstalled(allInstalledPackages, obj.packages)) {
+                    isAllInstalled = false
+                    return isAllInstalled
                 }
             }
-            return true
+            return isAllInstalled
         }
     }
 }

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

@@ -16,7 +16,6 @@ import com.gh.common.pop.EditBindWechatPop
 import com.gh.common.pop.RealNameTipsPop
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.entity.WechatConfigEntity
 import com.gh.gamecenter.common.utils.dip2px
 import com.gh.gamecenter.common.utils.goneIf
 import com.gh.gamecenter.common.utils.toObject
@@ -84,90 +83,79 @@ class ReserveSuccessReminderDialog(
         handlers.clear()
         binding.flContentContainer.removeAllViews()
 
-        val configTypes = mutableListOf<Int>()
-        // 短信
-        if (reserveReminder.hasSmsConfig) {
-            if (reserveReminder.smsConfig.notice) {
-                configTypes.add(SMS_REMINDER_ENABLE_TYPE)
-            } else {
-                configTypes.add(SMS_REMINDER_UNABLE_TYPE)
-            }
-        }
-
-        // 微信
-        if (reserveReminder.wechatConfig.isReminderEnable) {
-            configTypes.add(WECHAT_REMINDER_ENABLE_TYPE)
-        } else {
-            configTypes.add(WECHAT_REMINDER_UNABLE_TYPE)
-        }
-
-        // 日历
-        if (reserveReminder.hasCalendarConfig) {
-            if (reserveReminder.calendarConfig.notice) {
-                configTypes.add(CALENDAR_REMINDER_ENABLE_TYPE)
-            } else {
-                configTypes.add(CALENDAR_REMINDER_UNABLE_TYPE)
-            }
-        }
-
-        if (configTypes.size == 1) {
-            // 只有微信提醒
-            if (configTypes.first() == WECHAT_REMINDER_ENABLE_TYPE) {
-                binding.tvContent.setText(R.string.reverse_success_with_reminder_tips)
-                handlers.add(
-                    WechatReminderEnableHandler(reserveReminder.wechatConfig, 8.dp, binding.flContentContainer, this)
-                )
-            } else {
+        val smsConfig = reserveReminder.smsConfig
+        val wechatConfig = reserveReminder.wechatConfig
+        when {
+            reserveReminder.onlyShowWechatReminder && !wechatConfig.isReminderEnable -> { // 只显示微信：未开启
                 binding.tvContent.setText(R.string.reverse_success_without_reminder_tips)
-                handlers.add(OnlyWechatReminderUnableHandler(16.dp, binding.flContentContainer, this))
+                arrayListOf(OnlyWechatReminderUnableHandler(16.dp, binding.flContentContainer, this))
             }
-        } else {
-            binding.tvContent.setText(R.string.reverse_success_with_reminder_tips)
-            var isLargerSpacing = true
-            fun getPaddingTop(): Int {
-                val paddingTop = if (isLargerSpacing) 16.dp else 8.dp
-                isLargerSpacing = false
-                return paddingTop
+
+
+            reserveReminder.onlyShowWechatReminder && wechatConfig.isReminderEnable -> {   // 只显示微信:已开
+                binding.tvContent.setText(R.string.reverse_success_with_reminder_tips)
+                arrayListOf(
+                    WechatReminderEnableHandler(
+                        reserveReminder.wechatConfig.nickName,
+                        8.dp,
+                        binding.flContentContainer,
+                        this
+                    )
+                )
             }
-            configTypes.sorted().forEach {
-                when (it) {
-                    SMS_REMINDER_ENABLE_TYPE -> {
-                        isLargerSpacing = true
-                        SmsReminderEnableHandler(reserveReminder.smsConfig, 8.dp, binding.flContentContainer, this)
-                    }
 
-                    SMS_REMINDER_UNABLE_TYPE -> {
-                        SmsReminderUnableHandler(getPaddingTop(), binding.flContentContainer, this)
-                    }
-
-
-                    WECHAT_REMINDER_ENABLE_TYPE -> {
-                        isLargerSpacing = true
-                        WechatReminderEnableHandler(
-                            reserveReminder.wechatConfig,
-                            8.dp,
-                            binding.flContentContainer,
-                            this
-                        )
-                    }
-
-
-                    WECHAT_REMINDER_UNABLE_TYPE ->
-                        WechatReminderUnableHandler(getPaddingTop(), binding.flContentContainer, this)
-
-                    CALENDAR_REMINDER_ENABLE_TYPE -> {
-                        isLargerSpacing = true
-                        CalendarReminderEnableHandler(8.dp, binding.flContentContainer, this)
-                    }
-
-                    CALENDAR_REMINDER_UNABLE_TYPE ->
-                        CalendarReminderUnableHandler(getPaddingTop(), binding.flContentContainer, this)
-
-                    else -> null
-                }?.let(handlers::add)
+            !smsConfig.notice && !wechatConfig.isReminderEnable -> {    // 短信，微信未开启
+                binding.tvContent.setText(R.string.reverse_success_without_reminder_tips)
+                arrayListOf(
+                    SmsReminderUnableHandler(16.dp, binding.flContentContainer, this),
+                    WechatReminderUnableHandler(8.dp, binding.flContentContainer, this)
+                )
             }
+
+            smsConfig.notice && wechatConfig.isReminderEnable -> {// 短信，微信已开启
+                binding.tvContent.setText(R.string.reverse_success_with_reminder_tips)
+                arrayListOf(
+                    SmsReminderEnableHandler(reserveReminder.smsConfig, 8.dp, binding.flContentContainer, this),
+                    WechatReminderEnableHandler(
+                        reserveReminder.wechatConfig.nickName,
+                        8.dp,
+                        binding.flContentContainer,
+                        this
+                    )
+                )
+            }
+
+
+            smsConfig.notice && !wechatConfig.isReminderEnable -> {  // 短信开启，微信未开启
+                binding.tvContent.setText(R.string.reverse_success_with_reminder_tips)
+                arrayListOf(
+                    SmsReminderEnableHandler(smsConfig, 8.dp, binding.flContentContainer, this),
+                    WechatReminderUnableHandler(16.dp, binding.flContentContainer, this)
+                )
+            }
+
+
+            !smsConfig.notice && wechatConfig.isReminderEnable -> {   // 微信开启，短信未开启
+                binding.tvContent.setText(R.string.reverse_success_with_reminder_tips)
+                arrayListOf(
+                    WechatReminderEnableHandler(
+                        wechatConfig.nickName,
+                        8.dp,
+                        binding.flContentContainer,
+                        this
+                    ),
+                    SmsReminderUnableHandler(16.dp, binding.flContentContainer, this)
+                )
+            }
+
+            else -> {
+                binding.tvContent.setText(R.string.reverse_success_without_reminder_tips)
+                arrayListOf()
+            }
+        }.let {
+            handlers.clear()
+            handlers.addAll(it)
         }
-
         handlers.forEach {
             binding.flContentContainer.addView(it.init())
         }
@@ -232,14 +220,9 @@ class ReserveSuccessReminderDialog(
         listener.changeWechatBinding()
     }
 
-    override fun updateCalendarReminder() {
-        listener.updateCalendarReminder()
-    }
-
     override fun onStart() {
         super.onStart()
         window?.let {
-            it.setDimAmount(0.4F)
             it.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
             val params = it.attributes
             params.width = DisplayUtils.dip2px(300F)
@@ -261,13 +244,6 @@ class ReserveSuccessReminderDialog(
         private val Int.dp: Int
             get() = DisplayUtils.dip2px(this.toFloat())
 
-        private const val SMS_REMINDER_ENABLE_TYPE = 1
-        private const val WECHAT_REMINDER_ENABLE_TYPE = 2
-        private const val CALENDAR_REMINDER_ENABLE_TYPE = 3
-        private const val SMS_REMINDER_UNABLE_TYPE = 4
-        private const val WECHAT_REMINDER_UNABLE_TYPE = 5
-        private const val CALENDAR_REMINDER_UNABLE_TYPE = 6
-
         fun create(context: Context, listener: OnReserveReminderListener) =
             ReserveSuccessReminderDialog(
                 context,
@@ -384,7 +360,7 @@ class ReserveSuccessReminderDialog(
     }
 
     class WechatReminderEnableHandler(
-        private val wechatConfig: WechatConfigEntity,
+        private val nickName: String,
         topMargin: Int,
         parent: ViewGroup,
         listener: OnReserveSuccessListener
@@ -404,7 +380,7 @@ class ReserveSuccessReminderDialog(
                 }.root
 
         override fun initView() {
-            binding.tvWechat.text = wechatConfig.nickName
+            binding.tvWechat.text = nickName
             binding.vModifyWechat.setOnClickListener {
                 editWechatPop.showAsDropDown(
                     binding.ivModifyWechat,
@@ -435,51 +411,6 @@ class ReserveSuccessReminderDialog(
 
     }
 
-    class CalendarReminderUnableHandler(
-        topMargin: Int,
-        parent: ViewGroup,
-        listener: OnReserveSuccessListener
-    ) : ReminderContentHandler(topMargin, parent, listener) {
-
-        private lateinit var binding: LayoutReserveWechatReminderUnableBinding
-
-        // 复用微信提醒未开启状态布局
-        override fun createView(inflater: LayoutInflater) =
-            LayoutReserveWechatReminderUnableBinding.inflate(inflater, parent, false)
-                .also {
-                    binding = it
-                }.root
-
-        override fun initView() {
-            binding.tvWechatReminderTitle.setText(R.string.calendar_reminders)
-            binding.tvWechatReminderDescription.setText(R.string.calendar_reminders_description)
-            binding.vWechatAdd.setOnClickListener {
-                listener.updateCalendarReminder()
-            }
-        }
-
-    }
-
-    class CalendarReminderEnableHandler(
-        topMargin: Int,
-        parent: ViewGroup,
-        listener: OnReserveSuccessListener
-    ) : ReminderContentHandler(topMargin, parent, listener) {
-
-        private lateinit var binding: LayoutReserveCalendarReminderUnableBinding
-
-        override fun createView(inflater: LayoutInflater) =
-            LayoutReserveCalendarReminderUnableBinding.inflate(inflater, parent, false)
-                .also {
-                    binding = it
-                }.root
-
-        override fun initView() {
-
-        }
-
-
-    }
 
 }
 
@@ -494,6 +425,4 @@ interface OnReserveSuccessListener {
     fun verifyPhoneNumber()
 
     fun changeWechatBinding()
-
-    fun updateCalendarReminder()
 }

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

@@ -17,7 +17,7 @@ import com.gh.gamecenter.common.entity.ErrorEntity
 import com.gh.gamecenter.core.utils.CurrentActivityHolder
 import com.gh.gamecenter.core.utils.DisplayUtils
 import com.gh.gamecenter.databinding.DialogWechatBindingFailedBinding
-import com.gh.gamecenter.login.user.UserManager
+import com.gh.gamecenter.login.user.UserRepository
 import com.lightgame.utils.Utils
 
 class WechatBindingFailedDialogFragment : BaseDialogFragment() {
@@ -48,10 +48,10 @@ class WechatBindingFailedDialogFragment : BaseDialogFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        UserManager.getInstance().userInfoEntity?.let {
-            currentUserId = it.getShortUserId()
-            binding.tvCurrentName.text = it.name ?: ""
-            binding.ivCurrentAvatar.displayAvatar(it.icon)
+        UserRepository.getInstance().loginUserInfo.observe(viewLifecycleOwner) {
+            currentUserId = it.data.getShortUserId()
+            binding.tvCurrentName.text = it.data.name
+            binding.ivCurrentAvatar.displayAvatar(it.data.icon)
             binding.tvUserId.text = getString(R.string.user_id, currentUserId)
         }
 

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

@@ -31,7 +31,6 @@ class ExposureListener(var fragment: Fragment, var exposable: IExposable) : Recy
                 override fun onFragmentPaused(fm: FragmentManager, f: Fragment) {
                     if (fragment == f) {
                         visibleState?.let { commitExposure(it) }
-                        visibleState?.let { commitWXCPMExposure(it) }
                         throttleBus.clear()
                     }
                 }

app/src/main/java/com/gh/common/filter/RegionSettingHelper.kt

@@ -4,7 +4,6 @@ import android.annotation.SuppressLint
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.retrofit.BiResponse
-import com.gh.gamecenter.common.utils.PackageFlavorHelper
 import com.gh.gamecenter.common.utils.debounceActionWithInterval
 import com.gh.gamecenter.common.utils.toJson
 import com.gh.gamecenter.common.utils.toObject
@@ -124,16 +123,10 @@ object RegionSettingHelper {
                 mIsInit = false
             }
 
-            val fakeIp = if (PackageFlavorHelper.IS_TEST_FLAVOR) {
-                SPUtils.getString(Constants.SP_TEST_FLAVOR_IP)
-            } else {
-                ""
-            }
-
             // 使用默认的 Schdulers.io() 可能会触发 OOM
             RetrofitManager.getInstance()
                 .api
-                .getRegionSetting(HaloApp.getInstance().channel, fakeIp)
+                .getRegionSetting(HaloApp.getInstance().channel)
                 .subscribeOn(Schedulers.io())
                 .subscribe(object : BiResponse<RegionSetting>() {
                     override fun onSuccess(data: RegionSetting) {

app/src/main/java/com/gh/common/fragment/FragmentManagerExt.kt

@@ -1,45 +0,0 @@
-package com.gh.common.fragment
-
-import androidx.fragment.app.FragmentManager
-import java.lang.reflect.Field
-
-fun FragmentManager.popBackStackAllowStateLoss() {
-    popBackStackAllowStateLoss(-1, 0)
-}
-
-fun FragmentManager.popBackStackAllowStateLoss(id: Int, flags: Int) {
-    if (!isStateSaved) {
-        popBackStack(id, flags)
-    }
-}
-
-fun FragmentManager.popBackStackAllowStateLoss(name: String?, flags: Int) {
-    if (!isStateSaved) {
-        popBackStack(name, flags)
-    }
-}
-
-fun FragmentManager.popBackStackImmediateAllowStateLoss() = popBackStackAllowStateLoss(-1, 0)
-
-fun FragmentManager.popBackStackImmediateAllowStateLoss(id: Int, flags: Int) =
-    if (!isStateSaved) {
-        popBackStackImmediate(id, flags)
-    } else {
-        false
-    }
-
-@Throws(NoSuchFieldException::class)
-private fun getField(clazz: Class<*>, name: String): Field {
-    var cls: Class<*>? = clazz
-    while (cls != null) {
-        try {
-            val declaredField = cls.getDeclaredField(name)
-            declaredField.isAccessible = true
-            return declaredField
-        } catch (e: NoSuchFieldException) {
-            e.printStackTrace()
-        }
-        cls = cls.superclass
-    }
-    throw NoSuchFieldException()
-}

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

@@ -7,20 +7,19 @@ import androidx.room.TypeConverters
 import androidx.room.migration.Migration
 import androidx.sqlite.db.SupportSQLiteDatabase
 import com.gh.gamecenter.entity.GamesCollectionEntity
-import com.gh.gamecenter.entity.HistoryGameDetailEntity
 import com.gh.gamecenter.entity.HistoryGameEntity
 import com.gh.gamecenter.entity.MyVideoEntity
+import com.gh.gamecenter.feature.entity.NewsEntity
 import com.gh.gamecenter.feature.entity.AnswerEntity
 import com.gh.gamecenter.feature.entity.ArticleEntity
-import com.gh.gamecenter.feature.entity.NewsEntity
 import com.gh.gamecenter.feature.room.converter.*
 import com.gh.gamecenter.room.converter.*
 import com.gh.gamecenter.room.dao.*
 import com.halo.assistant.HaloApp
 
 @Database(
-    entities = [AnswerEntity::class, ArticleEntity::class, NewsEntity::class, HistoryGameEntity::class, MyVideoEntity::class, GamesCollectionEntity::class, HistoryGameDetailEntity::class],
-    version = 15,
+    entities = [AnswerEntity::class, ArticleEntity::class, NewsEntity::class, HistoryGameEntity::class, MyVideoEntity::class, GamesCollectionEntity::class],
+    version = 14,
     exportSchema = false
 )
 @TypeConverters(
@@ -54,7 +53,6 @@ abstract class HistoryDatabase : RoomDatabase() {
     abstract fun gameDao(): GameDao
     abstract fun videoHistoryDao(): VideoHistoryDao
     abstract fun gamesCollectionDao(): GamesCollectionDao
-    abstract fun gameDetailDao(): GameDetailHistoryDao
 
     companion object {
 
@@ -154,12 +152,6 @@ abstract class HistoryDatabase : RoomDatabase() {
             }
         }
 
-        val MIGRATION_14_15: Migration = object : Migration(14, 15) {
-            override fun migrate(database: SupportSQLiteDatabase) {
-                database.execSQL("CREATE TABLE HistoryGameDetailEntity (id TEXT NOT NULL PRIMARY KEY, name TEXT DEFAULT '')")
-            }
-        }
-
         val instance by lazy {
             Room.databaseBuilder(
                 HaloApp.getInstance().application,
@@ -178,7 +170,6 @@ abstract class HistoryDatabase : RoomDatabase() {
                 .addMigrations(MIGRATION_11_12)
                 .addMigrations(MIGRATION_12_13)
                 .addMigrations(MIGRATION_13_14)
-                .addMigrations(MIGRATION_14_15)
                 .build()
         }
     }

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

@@ -44,20 +44,6 @@ object HistoryHelper {
         runOnIoThread { tryCatchInRelease { HistoryDatabase.instance.gameDao().addGame(historyGameEntity) } }
     }
 
-    @JvmStatic
-    fun insertGameDetail(gameEntity: GameEntity) {
-        val historyGameDetailEntity = HistoryGameDetailEntity(gameEntity.id, gameEntity.name)
-        runOnIoThread { tryCatchInRelease { HistoryDatabase.instance.gameDetailDao().addGame(historyGameDetailEntity) } }
-    }
-
-    @JvmStatic
-    fun getHistoryGameDetailById(id: String): HistoryGameDetailEntity? =
-        try {
-            HistoryDatabase.instance.gameDetailDao().getHistoryGameDetailById(id)
-        } catch (e: Throwable) {
-            null
-        }
-
     private fun convertGameUpdateEntityToHistoryGameEntity(updateEntity: GameUpdateEntity): HistoryGameEntity {
         val historyGame = HistoryGameEntity()
 
@@ -156,15 +142,6 @@ object HistoryHelper {
         }
     }
 
-    @JvmStatic
-    fun deleteGameDetailEntity(gameId: String) {
-        runOnIoThread {
-            tryCatchInRelease {
-                HistoryDatabase.instance.gameDetailDao().deleteGame(HistoryGameDetailEntity(id = gameId))
-            }
-        }
-    }
-
 
     @JvmStatic
     fun emptyDatabase() {

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

@@ -1,9 +1,12 @@
 package com.gh.common.iinterface
 
-import com.scwang.smartrefresh.layout.api.RefreshLayout
-import com.scwang.smartrefresh.layout.constant.RefreshState
-
 interface ISmartRefreshContent {
+    /**
+     * 启用/关闭 页面滑动
+     * @param isScrollEnabled 是否启用
+     */
+    fun setScrollEnabled(isScrollEnabled: Boolean)
+
     fun onRefresh()
 
     /**
@@ -11,6 +14,4 @@ interface ISmartRefreshContent {
      * @param isSwipeRefreshEnabled 是否启用
      */
     fun setSwipeRefreshEnabled(isSwipeRefreshEnabled: Boolean)
-
-    fun onStateChanged(refreshLayout: RefreshLayout, oldState: RefreshState, newState: RefreshState)
 }

app/src/main/java/com/gh/common/interceptor/MainInterceptor.kt

@@ -1,29 +0,0 @@
-package com.gh.common.interceptor
-
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.halo.assistant.HaloApp
-import com.therouter.router.RouteItem
-import com.therouter.router.interceptor.RouterReplaceInterceptor
-import com.therouter.router.matchRouteMap
-
-/**
- * 主拦截器
- */
-class MainInterceptor: RouterReplaceInterceptor()  {
-
-    override fun replace(routeItem: RouteItem?): RouteItem? {
-        if (routeItem == null) return null
-
-        // 用户是否已经同意隐私政策
-        val isUserAcceptPrivacyPolicy = HaloApp.isUserAcceptPrivacyPolicy(HaloApp.getInstance())
-
-        // 如果用户已经同意隐私政策并且应用已经启动，直接返回 routeItem ，运行跳转
-        if (isUserAcceptPrivacyPolicy && HaloApp.getInstance().isAlreadyUpAndRunning) {
-            return routeItem
-        }
-
-        // 指向调整为 SplashScreenActivity
-        return matchRouteMap(RouteConsts.activity.splashActivity)
-    }
-
-}

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

@@ -103,6 +103,7 @@ class AccelerateNotificationHandler(priority: Int) : PriorityChainHandler(priori
                         context = activity,
                         gameId = gameEntity.id,
                         entrance = "首页插件上架弹窗",
+                        defaultTab = -1,
                         isSkipGameComment = false,
                         scrollToLibao = false,
                         openVideoStreaming = false,

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

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

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

@@ -0,0 +1,19 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.AdHelper
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.feature.entity.SettingsEntity
+import com.gh.gamecenter.feature.provider.IAdHelperProvider
+
+@Route(path = RouteConsts.provider.adHelper, name = "AdHelper暴露服务")
+class AdHelperProviderImpl : IAdHelperProvider {
+    override fun getSuggestionFunctionAd(): SettingsEntity.AD? {
+        return AdHelper.getAd(AdHelper.LOCATION_SUGGESTION_FUNCTION)
+    }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

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

@@ -1,15 +1,20 @@
 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
 import com.gh.gamecenter.core.provider.IFlavorProvider
 import com.gh.gamecenter.va.VCore
 import com.halo.assistant.HaloApp
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.app, name = "Application暴露服务")
 class AppProviderImpl : IAppProvider {
+    override fun init(context: Context?) {
+        // Do nothing
+    }
 
     override fun getAppName(): String {
         return HaloApp.getInstance().getString(R.string.app_name)
@@ -88,5 +93,4 @@ class AppProviderImpl : IAppProvider {
     override fun initImageLoaderIfNeeded() {
         HaloApp.getInstance().initFresco()
     }
-
 }

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

@@ -1,15 +1,16 @@
 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
 import com.gh.common.databind.BindingAdapters
-import com.gh.gamecenter.common.databinding.LayoutGameItemSellingPointBinding
+import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.provider.IBindingAdaptersProvider
-import com.gh.gamecenter.home.custom.adapter.CustomViewExt
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.bindingAdapters, name = "BindingAdapters暴露服务")
 class BindingAdaptersProviderImpl : IBindingAdaptersProvider {
     override fun setGameName(
         view: TextView,
@@ -20,7 +21,7 @@ class BindingAdaptersProviderImpl : IBindingAdaptersProvider {
     }
 
     override fun setGameTags(layout: LinearLayout, gameEntity: GameEntity) {
-        BindingAdapters.setGameTags(layout, gameEntity, "")
+        BindingAdapters.setGameTags(layout, gameEntity)
     }
 
     override fun setMessageUnread(view: TextView, unreadCount: Int) {
@@ -31,16 +32,7 @@ class BindingAdaptersProviderImpl : IBindingAdaptersProvider {
         BindingAdapters.setGame(view, gameEntity)
     }
 
-    override fun setGameTagsWithSellingPoints(
-        layout: LinearLayout,
-        sellingPointsBinding: LayoutGameItemSellingPointBinding,
-        gameEntity: GameEntity,
-        subjectTag: String
-    ) {
-        BindingAdapters.setGameTagsWithSellingPoint(layout, sellingPointsBinding, gameEntity, subjectTag)
-    }
-
-    override fun setGameDescription(tvDesc: TextView, briefStyle: String, game: GameEntity) {
-        CustomViewExt.setDescription(tvDesc, briefStyle, game)
+    override fun init(context: Context?) {
+        // Do nothing
     }
 }

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

@@ -1,9 +1,12 @@
 package com.gh.common.provider
 
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.download.server.BrowserInstallHelper
+import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IBrowserInstallHelperProvider
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.browserInstallHelper, name = "BrowserInstallHelper暴露服务")
 class BrowserInstallHelperProviderImpl : IBrowserInstallHelperProvider {
     override fun isUseBrowserToInstallEnabled(): Boolean = BrowserInstallHelper.isUseBrowserToInstallEnabled()
 
@@ -12,4 +15,9 @@ class BrowserInstallHelperProviderImpl : IBrowserInstallHelperProvider {
     override fun logSwitchInstallSettingEvent() {
         BrowserInstallHelper.logOrdinaryBrowserEvent(BrowserInstallHelper.Type.SWITCH_INSTALL_SETTING)
     }
+
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
 }

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

@@ -1,10 +1,17 @@
 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.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IBuildConfigProvider
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.buildConfig, name = "BuildConfig暴露服务")
 class BuildConfigImpl : IBuildConfigProvider {
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+
     override fun getApplicationId(): String = BuildConfig.APPLICATION_ID
 
     override fun getVersionName(): String = BuildConfig.VERSION_NAME

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

@@ -1,12 +1,18 @@
 package com.gh.common.provider
 
 import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.common.util.CheckLoginUtils
+import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.ICheckLoginProvider
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.checkLogin, name = "CheckLoginUtils暴露服务")
 class CheckLoginProviderImpl : ICheckLoginProvider {
     override fun checkLogin(context: Context, entrance: String, action: (() -> Unit)?) {
         CheckLoginUtils.checkLogin(context, entrance, action)
     }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
 }

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

@@ -3,16 +3,20 @@ package com.gh.common.provider
 import android.content.Context
 import android.content.Intent
 import android.os.Parcelable
-import com.therouter.router.Route
+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
 
-@com.therouter.inject.ServiceProvider
+@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,14 +1,18 @@
 package com.gh.common.provider
 
 import android.content.Context
-import com.therouter.router.Route
+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
 
-@com.therouter.inject.ServiceProvider
+@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

@@ -2,12 +2,12 @@ package com.gh.common.provider
 
 import android.content.Context
 import android.widget.TextView
-import com.therouter.router.Route
+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
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.commentUtils, name = "CommentUtils暴露服务")
 class CommentUtilsProviderImpl : ICommentUtilsProvider {
     override fun setCommentTime(textView: TextView, time: Long) {
         CommentUtils.setCommentTime(textView, time)
@@ -16,4 +16,8 @@ class CommentUtilsProviderImpl : ICommentUtilsProvider {
     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/ConcernArticleUtilsProviderImpl.kt

@@ -8,7 +8,7 @@ import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.viewbinding.ViewBinding
-import com.therouter.router.Route
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.facebook.drawee.view.SimpleDraweeView
 import com.gh.common.util.ConcernContentUtils
 import com.gh.common.view.ImageContainerView
@@ -18,7 +18,7 @@ import com.gh.gamecenter.common.utils.toArrayList
 import com.gh.gamecenter.core.provider.IConcernArticleUtilsProvider
 import com.gh.gamecenter.databinding.RecyclerGameArticleBinding
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.concernContentUtils, name = "ConcernContentUtils暴露服务")
 class ConcernArticleUtilsProviderImpl : IConcernArticleUtilsProvider {
     override fun addContentPic(
         context: Context,
@@ -95,4 +95,8 @@ class ConcernArticleUtilsProviderImpl : IConcernArticleUtilsProvider {
     override fun getTvComment(binding: ViewBinding): TextView = (binding as RecyclerGameArticleBinding).tvComment
 
     override fun getTvShare(binding: ViewBinding): TextView = (binding as RecyclerGameArticleBinding).tvShare
-}
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

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

@@ -6,14 +6,14 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.viewbinding.ViewBinding
-import com.therouter.router.Route
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.utils.goneIf
 import com.gh.gamecenter.common.utils.toColor
 import com.gh.gamecenter.core.provider.IConcernGiftPackUtilsProvider
 import com.gh.gamecenter.databinding.RecyclerGiftPackBinding
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.concernGiftPackUtils, name = "ConcernGiftPackUtils暴露服务")
 class ConcernGiftPackUtilsProviderImpl : IConcernGiftPackUtilsProvider {
     override fun createBinding(parent: ViewGroup): ViewBinding {
         val inflater = LayoutInflater.from(parent.context)
@@ -48,4 +48,7 @@ class ConcernGiftPackUtilsProviderImpl : IConcernGiftPackUtilsProvider {
     override fun getTvGiftPackContent(viewBinding: ViewBinding) =
         (viewBinding as RecyclerGiftPackBinding).tvGiftPackContent
 
-}
+    override fun init(context: Context?) {
+        // Do Nothing
+    }
+}

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

@@ -2,15 +2,19 @@ package com.gh.common.provider
 
 import android.content.Context
 import android.content.Intent
-import com.therouter.router.Route
+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
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.concernActivity, 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
+    }
 }

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

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

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

@@ -1,9 +1,12 @@
 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.core.provider.IConfigProvider
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.config, name = "Config暴露服务")
 class ConfigProviderImpl : IConfigProvider {
     override fun getTencentAppId(): String {
         return Config.TENCENT_APPID
@@ -100,4 +103,8 @@ class ConfigProviderImpl : IConfigProvider {
     override fun isJiguangSwitch(): Boolean {
         return Config.getNewApiSettingsEntity()?.jiguangSwitch ?: false
     }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
 }

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

@@ -1,12 +1,19 @@
 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
 
-@com.therouter.inject.ServiceProvider
+@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/CropImageProviderImpl.kt

@@ -1,58 +0,0 @@
-package com.gh.common.provider
-
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import com.gh.gamecenter.CropImageActivity
-import com.gh.gamecenter.R
-import com.gh.gamecenter.core.provider.ICropImageProvider
-import com.gh.gamecenter.personalhome.background.BackgroundClipActivity
-import com.halo.assistant.fragment.user.UserPortraitCropImageActivity
-import com.lightgame.utils.Utils
-import com.zhihu.matisse.internal.utils.PathUtils
-
-@com.therouter.inject.ServiceProvider
-class CropImageProviderImpl : ICropImageProvider {
-    override fun getCropImageIntent(data: List<Uri>, imageType: Int, entrance: String, context: Context): Intent? {
-        if (data.isEmpty()) {
-            return null
-        }
-        val picturePath = PathUtils.getPath(context, data[0])
-        Utils.log("picturePath = $picturePath")
-        return when (imageType) {
-
-            IMAGE_TYPE_AVATAR -> {// 上传头像
-                UserPortraitCropImageActivity.getIntent(
-                    context,
-                    picturePath,
-                    "我的光环(选择头像)"
-                )
-            }
-
-            IMAGE_TYPE_GAME_COLLECTION_COVER -> {// 游戏单封面
-                CropImageActivity.getIntent(
-                    context,
-                    picturePath,
-                    142 / 328F,
-                    false,
-                    R.layout.layout_game_collection_crop_image_assist,
-                    entrance
-                )
-            }
-
-            IMAGE_TYPE_PERSONAL_BACKGROUND -> { // 用户主页背景
-                BackgroundClipActivity.getIntent(context, picturePath, entrance)
-            }
-
-            else ->
-                null
-        }
-
-    }
-
-    companion object {
-        const val IMAGE_TYPE_AVATAR = 1
-        const val IMAGE_TYPE_GAME_COLLECTION_COVER = 2
-        const val IMAGE_TYPE_PERSONAL_BACKGROUND = 3
-    }
-}

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

@@ -1,12 +1,12 @@
 package com.gh.common.provider
 
 import android.content.Context
-import com.therouter.router.Route
+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
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.dataCollection, name = "DataCollectionUtils暴露服务")
 class DataCollectionProviderImpl : IDataCollectionProvider {
     override fun uploadClick(context: Context, vararg args: String) {
         DataCollectionUtils.uploadClick(context, *args)
@@ -15,4 +15,8 @@ class DataCollectionProviderImpl : IDataCollectionProvider {
     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/DataUtilsProviderImpl.kt

@@ -1,12 +1,20 @@
 package com.gh.common.provider
 
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.common.util.DataUtils
+import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IDataUtilsProvider
 import com.halo.assistant.HaloApp
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.dataUtils, name = "DataUtils暴露服务")
 class DataUtilsProviderImpl : IDataUtilsProvider {
+
     override fun getDeviceCertification() {
         DataUtils.getDeviceCertification(HaloApp.getInstance().gid)
     }
-}
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

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

@@ -1,12 +1,12 @@
 package com.gh.common.provider
 
 import android.content.Context
-import com.therouter.router.Route
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.common.DefaultUrlHandler
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IDefaultUrlHandlerProvider
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.defaultUrlHandler, name = "DefaultUrlHandler暴露服务")
 class DefaultUrlHandlerProviderImpl : IDefaultUrlHandlerProvider {
 
     override fun interceptUrl(
@@ -19,4 +19,7 @@ class DefaultUrlHandlerProviderImpl : IDefaultUrlHandlerProvider {
         return DefaultUrlHandler.interceptUrl(context, url, null, entrance, bringAppToFront, sourceEntrance)
     }
 
-}
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

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

@@ -2,12 +2,14 @@ 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.callback.CancelListener
 import com.gh.gamecenter.common.callback.ConfirmListener
+import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IDialogUtilsProvider
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.dialogUtils, name = "DialogUtils暴露服务")
 class DialogUtilsProviderImpl : IDialogUtilsProvider {
     override fun showRegulationTestDialog(context: Context, confirm: () -> Unit, cancel: () -> Unit) {
         DialogUtils.showRegulationTestDialog(context, object : ConfirmListener {
@@ -43,4 +45,8 @@ class DialogUtilsProviderImpl : IDialogUtilsProvider {
     }
 
     override fun showBindPhoneDialog(context: Context, confirm: () -> Unit): Dialog = DialogUtils.showBindPhoneDialog(context) { confirm.invoke() }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
 }

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

@@ -3,12 +3,12 @@ package com.gh.common.provider
 import android.app.Activity
 import android.content.Context
 import android.os.Bundle
-import com.therouter.router.Route
+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.core.provider.IDirectProvider
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.directUtils, name = "DirectUtils暴露服务")
 class DirectProviderImpl : IDirectProvider {
 
     override fun directToWebView(context: Context, url: String, entrance: String?) {
@@ -96,4 +96,8 @@ class DirectProviderImpl : IDirectProvider {
     override fun directToExternalBrowser(context: Context, url: String) {
         DirectUtils.directToExternalBrowser(context, url)
     }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
 }

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

@@ -1,9 +1,10 @@
 package com.gh.common.provider
 
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.common.util.NewFlatLogUtils
 import com.gh.gamecenter.common.base.GlobalActivityManager
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.entity.LinkEntity
+import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.exposure.ExposureSource
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.entity.GameUpdateEntity
@@ -13,11 +14,10 @@ import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.gh.gamecenter.feature.provider.IDownloadButtonClickedProvider
 import com.gh.gamecenter.feature.view.DownloadButton
 import com.gh.gamecenter.packagehelper.PackageRepository
-import com.halo.assistant.HaloApp
 import com.lightgame.download.DownloadEntity
 import com.lightgame.utils.Utils
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.downloadButtonClickedHandler, name = "DownloadButton点击事件暴露服务")
 class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
     override fun onClicked(downloadButton: DownloadButton) {
         var gameId = ""
@@ -30,9 +30,6 @@ class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
         var packageName = ""
         var exposureSourceList: List<ExposureSource>? = null
         var customPageTrackData: CustomPageTrackData? = null
-        val pushMessageId = (HaloApp.get(Constants.PUSH_MESSAGE_ID, false) as? String) ?: ""
-        val pushLinkId = (HaloApp.get(Constants.PUSH_LINK_ENTITY, false) as? LinkEntity)?.link ?: ""
-        val isFromPush = pushMessageId.isNotEmpty()
 
         val boundedObject = downloadButton.getObject()
 
@@ -118,12 +115,6 @@ class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
                     "本地下载"
                 }
 
-                // 小游戏的启动不需要上报下载点击事件
-                // @see https://jira.shanqu.cc/browse/GHZSCY-7013
-                if (boundedObject is GameEntity && boundedObject.isMiniGame()) {
-                    return
-                }
-
                 // 上报神策点击事件
                 val customPageKV = customPageTrackData?.toKV() ?: arrayOf()
                 SensorsBridge.trackEventWithExposureSource(
@@ -133,7 +124,7 @@ class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
                     "game_name", gameName,
                     "game_type", gameTypeInChinese,
                     "download_status", downloadStatusInChinese,
-                    "button_name", text,
+                    "button_name", downloadButton.text,
                     "game_schema_type", gameSchemaType,
                     "download_type", downloadType,
                     "page_name", GlobalActivityManager.getCurrentPageEntity().pageName,
@@ -142,13 +133,14 @@ class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
                     "last_page_name", GlobalActivityManager.getLastPageEntity().pageName,
                     "last_page_id", GlobalActivityManager.getLastPageEntity().pageId,
                     "last_page_business_id", GlobalActivityManager.getLastPageEntity().pageBusinessId,
-                    "is_from_push_notifications", isFromPush,
-                    "message_id", pushMessageId,
-                    "link_id", pushLinkId,
                     *customPageKV
                 )
             }
         }
     }
 
+    override fun init(context: Context?) {
+        // do nothing
+    }
+
 }

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

@@ -1,10 +1,13 @@
 package com.gh.common.provider
 
+import android.content.Context
+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.DownloadEntity
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.downloadManager, name = "DownloadManager暴露服务")
 class DownloadManagerProviderImpl : IDownloadManagerProvider {
 
     override fun getDownloadEntityByUrl(url: String): DownloadEntity? {
@@ -15,4 +18,8 @@ class DownloadManagerProviderImpl : IDownloadManagerProvider {
         DownloadManager.getInstance().resumeAllInvisiblePendingTask()
     }
 
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+
 }

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

@@ -5,16 +5,15 @@ import android.content.Intent
 import android.os.Build
 import android.os.Bundle
 import androidx.fragment.app.FragmentActivity
-import com.therouter.router.Route
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.common.util.EntranceUtils
 import com.gh.gamecenter.common.avoidcallback.Callback
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IEntranceUtilsProvider
 import com.lightgame.utils.AppManager
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.entranceUtils, name = "EntranceUtils暴露服务")
 class EntranceUtilsProviderImpl : IEntranceUtilsProvider {
-
     override fun jumpActivity(context: Context, bundle: Bundle) {
         EntranceUtils.jumpActivity(context, bundle)
     }
@@ -33,6 +32,10 @@ class EntranceUtilsProviderImpl : IEntranceUtilsProvider {
         } else {
             EntranceUtils.jumpActivityCompat(AppManager.getInstance().currentActivity(), bundle)
         }
+
     }
 
+    override fun init(context: Context?) {
+        // Do nothing
+    }
 }

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

@@ -1,11 +1,14 @@
 package com.gh.common.provider
 
 import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.common.util.ErrorHelper
+import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IErrorHelperProvider
+import com.gh.gamecenter.login.user.LoginTag
 import retrofit2.HttpException
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.errorHelper, name = "ErrorHelper暴露服务")
 class ErrorHelperProviderImpl : IErrorHelperProvider {
 
     override fun handleError(
@@ -25,4 +28,7 @@ class ErrorHelperProviderImpl : IErrorHelperProvider {
         ErrorHelper.handleLoginError(context, httpException, loginTagChinese, isCertificate)
     }
 
+    override fun init(context: Context?) {
+        // Do nothing
+    }
 }

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

@@ -1,15 +1,20 @@
 package com.gh.common.provider
 
 import android.content.Context
-import com.therouter.router.Route
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.common.exposure.ExposureManager
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.gh.gamecenter.feature.provider.IExposureManagerProvider
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.exposureManager, name = "ExposureManager暴露服务")
 class ExposureManagerProviderImpl: IExposureManagerProvider {
     override fun logExposure(exposureEvent: ExposureEvent) {
         ExposureManager.log(exposureEvent)
     }
+
+    override fun init(context: Context?) {
+        // do nothing
+    }
+
 }

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

@@ -1,11 +1,18 @@
 package com.gh.common.provider
 
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.common.FixedRateJobHelper
+import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IFixedRateJobHelperProvider
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.fixedRateJobHelper, name = "FixedRateJobHelper暴露服务")
 class FixedRateJobHelperProviderImpl : IFixedRateJobHelperProvider {
     override fun getTimeDeltaBetweenServerAndClient(): Long {
         return FixedRateJobHelper.timeDeltaBetweenServerAndClient
     }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
 }

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

@@ -2,16 +2,23 @@ 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
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.gameCollectionDetail, name = "GameCollectionDetailActivity暴露服务")
 class GameCollectionDetailProviderImpl : IGameCollectionDetailProvider {
-    override fun getIntent(context: Context, gameCollectionId: String, isFromSquare: Boolean, entrance: String): Intent {
-        return GameCollectionDetailActivity.getIntent(context, gameCollectionId, isFromSquare, entrance)
+    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, entrance: String): Intent {
-        return GameCollectionDetailActivity.getSpecifiedCommentIntent(context, gameCollectionId, topCommentId, entrance)
+    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

@@ -1,12 +1,14 @@
 package com.gh.common.provider
 
 import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.gamecenter.GameDetailActivity
+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.IGameDetailProvider
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.gameDetail, name = "GameDetailActivity暴露服务")
 class GameDetailProviderImpl : IGameDetailProvider {
     override fun startGameDetailActivity(
         context: Context,
@@ -52,6 +54,7 @@ class GameDetailProviderImpl : IGameDetailProvider {
         context: Context,
         gameId: String,
         entrance: String?,
+        defaultTab: Int,
         isSkipGameComment: Boolean,
         scrollToLibao: Boolean,
         openVideoStreaming: Boolean,
@@ -62,6 +65,7 @@ class GameDetailProviderImpl : IGameDetailProvider {
             context,
             gameId,
             entrance,
+            defaultTab,
             isSkipGameComment,
             scrollToLibao,
             openVideoStreaming,
@@ -69,4 +73,8 @@ class GameDetailProviderImpl : IGameDetailProvider {
             traceEvent
         )
     }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
 }

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

@@ -1,14 +1,18 @@
 package com.gh.common.provider
 
 import android.content.Context
-import com.therouter.router.Route
+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
 
-@com.therouter.inject.ServiceProvider
+@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/HandleGameResponseProviderImpl.kt

@@ -1,14 +1,17 @@
 package com.gh.common.provider
 
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.common.filter.RegionSettingHelper
 import com.gh.gamecenter.feature.utils.ApkActiveUtils
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.common.constant.EntranceConsts
+import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.utils.countOccurrences
 import com.gh.gamecenter.core.provider.IHandleGameResponseProvider
 import com.gh.gamecenter.feature.entity.GameEntity
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.handleGameResponse, name = "处理游戏类型返回")
 class HandleGameResponseProviderImpl : IHandleGameResponseProvider {
 
     override fun handleGameResponse(response: List<Any>, entrance: String): List<Any> {
@@ -34,4 +37,8 @@ class HandleGameResponseProviderImpl : IHandleGameResponseProvider {
         return response
     }
 
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+
 }

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

@@ -1,11 +1,18 @@
 package com.gh.common.provider
 
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.common.history.HistoryHelper
+import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IHistoryHelperProvider
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.historyHelper, name = "HistoryHelper暴露服务")
 class HistoryHelperProviderImpl : IHistoryHelperProvider {
     override fun emptyDatabase() {
         HistoryHelper.emptyDatabase()
     }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
 }

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

@@ -1,26 +0,0 @@
-package com.gh.common.provider
-
-import com.gh.gamecenter.core.provider.IAcceleratorDataHolderProvider
-import com.gh.gamecenter.feature.entity.VipEntity
-import com.halo.assistant.accelerator.repository.AcceleratorDataHolder
-
-@com.therouter.inject.ServiceProvider
-class IAcceleratorDataHolderProviderImpl : IAcceleratorDataHolderProvider {
-    override fun setVipEntity(vip: Any) {
-        if (vip is VipEntity) {
-            AcceleratorDataHolder.instance.setVipEntity(vip)
-        }
-    }
-
-    override fun addInitFunResult(result: String) {
-        AcceleratorDataHolder.instance.addInitFunResult(result)
-    }
-
-    override fun getInitFunResults(): List<String> {
-        return AcceleratorDataHolder.instance.initResults
-    }
-
-    override fun clear() {
-        AcceleratorDataHolder.instance.clear()
-    }
-}

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

@@ -1,13 +1,13 @@
 package com.gh.common.provider
 
 import android.content.Context
-import com.therouter.router.Route
+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
 
-@com.therouter.inject.ServiceProvider
+@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 {
@@ -20,4 +20,8 @@ class LibaoUtilsProviderImpl : ILibaoUtilsProvider {
             }
         })
     }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
 }

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

@@ -1,7 +1,7 @@
 package com.gh.common.provider
 
 import android.content.Context
-import com.therouter.router.Route
+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
@@ -10,7 +10,7 @@ import com.gh.gamecenter.common.entity.SuggestType
 import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.gh.gamecenter.feature.provider.ILinkDirectUtilsProvider
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.linkDirectUtils, name = "DirectUtils暴露服务，主要是暴露directToLinkPage方法")
 class LinkDirectUtilsProviderImpl : ILinkDirectUtilsProvider {
 
     override fun directToLinkPage(
@@ -61,4 +61,7 @@ class LinkDirectUtilsProviderImpl : ILinkDirectUtilsProvider {
         DirectUtils.directToCommunityColumn(context, community, subjectId, entrance, path)
     }
 
+    override fun init(context: Context?) {
+        // Do nothing
+    }
 }

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

@@ -1,13 +1,19 @@
 package com.gh.common.provider
 
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.common.util.*
+import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.*
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.logUtils, name = "LogUtils暴露服务")
 class LogUtilsProviderImpl : ILogUtilsProvider {
 
     override fun login(loginStep: String, loginType: String, entrance: String) {
         LogUtils.login(loginStep, loginType, entrance)
     }
 
+    override fun init(context: Context?) {
+        // Do nothing
+    }
 }

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

@@ -0,0 +1,19 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.DirectUtils
+import com.gh.gamecenter.MainActivity
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IMainProvider
+
+@Route(path = RouteConsts.provider.mainActivity, name = "MainActivity暴露服务")
+class MainProviderImpl : IMainProvider {
+    override fun skipToMainActivity(context: Context, type: String) {
+        DirectUtils.directToHomeDefaultTab(context)
+    }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

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

@@ -2,13 +2,13 @@ package com.gh.common.provider
 
 import android.content.Context
 import android.content.Intent
-import com.therouter.router.Route
+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
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.messageDetail, name = "MessageDetailActivity暴露服务")
 class MessageDetailProviderImpl : IMessageDetailProvider {
 
     override fun getIntentById(
@@ -24,4 +24,8 @@ class MessageDetailProviderImpl : IMessageDetailProvider {
     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,16 @@
 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.message.MessageUnreadRepository
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.messageUnreadRepository, name = "MessageUnreadRepository暴露服务")
 class MessageUnreadRepositoryProviderImpl : IMessageUnreadRepositoryProvider {
 
     override fun loadMessageUnreadData() {
@@ -30,4 +33,7 @@ class MessageUnreadRepositoryProviderImpl : IMessageUnreadRepositoryProvider {
         return MessageUnreadRepository.messageUnreadCountLiveData
     }
 
+    override fun init(context: Context?) {
+        // Do nothing
+    }
 }

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

@@ -1,13 +1,13 @@
 package com.gh.common.provider
 
 import android.content.Context
-import com.therouter.router.Route
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IMiniGameRecentlyPlayedProvider
 import com.gh.gamecenter.minigame.MiniGameRecentlyPlayUseCase
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.miniGameRecentPlayed, name = "MiniGameRecentlyPlayed暴露服务")
 class MiniGameRecentlyPlayedProviderImpl : IMiniGameRecentlyPlayedProvider {
     override fun clearMiniGameRecentlyPlayed(gameType: String) {
         MiniGameRecentlyPlayUseCase.clearRecentlyPlayedMiniGameList(gameType)
@@ -16,4 +16,8 @@ class MiniGameRecentlyPlayedProviderImpl : IMiniGameRecentlyPlayedProvider {
     override fun refreshQQMiniRecentPlayed() {
         MiniGameRecentlyPlayUseCase.loadRecentlyPlayedMiniGameList(Constants.QQ_MINI_GAME)
     }
+
+    override fun init(context: Context?) {
+        // no implement
+    }
 }

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

@@ -2,12 +2,12 @@ package com.gh.common.provider
 
 import android.content.Context
 import android.content.Intent
-import com.therouter.router.Route
+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
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.newCommentDetail, name = "NewCommentDetailActivity暴露服务")
 class NewCommentDetailProviderImpl : INewCommentDetailProvider {
 
     override fun getAnswerCommentIntent(
@@ -76,4 +76,8 @@ class NewCommentDetailProviderImpl : INewCommentDetailProvider {
             path
         )
     }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
 }

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

@@ -0,0 +1,19 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.PackageHelper
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IPackageHelperProvider
+
+@Route(path = RouteConsts.provider.packageHelper, name = "PackageHelper暴露服务")
+class PackageHelperProviderImpl : IPackageHelperProvider {
+
+    override fun getLocalPackageNameSet(): Set<String> {
+        return PackageHelper.localPackageNameSet
+    }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

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

@@ -1,11 +1,13 @@
 package com.gh.common.provider
 
 import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.common.util.PackageInstaller
+import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IPackageInstallerProvider
 import com.lightgame.download.DownloadEntity
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.packageInstaller, name = "PackageInstaller暴露服务")
 class PackageInstallerProviderImpl : IPackageInstallerProvider {
 
     override fun install(context: Context, downloadEntity: DownloadEntity, showUnzipToast: Boolean) {
@@ -16,4 +18,7 @@ class PackageInstallerProviderImpl : IPackageInstallerProvider {
         PackageInstaller.uninstall(context, path)
     }
 
+    override fun init(context: Context?) {
+        // Do nothing
+    }
 }

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

@@ -2,12 +2,14 @@ package com.gh.common.provider
 
 import android.content.Context
 import android.content.pm.PackageInfo
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.common.util.PackageHelper
 import com.gh.common.util.PackageUtils
+import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IPackageUtilsProvider
 import com.gh.gamecenter.core.utils.ProcessUtil
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.packageUtils, name = "PackageUtils暴露服务")
 class PackageUtilsProviderImpl : IPackageUtilsProvider {
     override fun obtainProcessName(): String? {
         return ProcessUtil.getCurrentProcessName()
@@ -48,4 +50,8 @@ class PackageUtilsProviderImpl : IPackageUtilsProvider {
     override fun getVersionNameByPackageName(packageName: String): String {
         return PackageUtils.getVersionNameByPackageName(packageName) ?: ""
     }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
 }

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

@@ -1,10 +1,13 @@
 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.manager.PackagesManager
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.packagesManager, name = "PackagesManager暴露服务")
 class PackagesManagerProviderImpl: IPackagesManagerProvider {
     override fun isCanPluggable(gameId: String?, packageName: String?): Boolean {
         return PackagesManager.isCanPluggable(gameId, packageName)
@@ -13,4 +16,8 @@ class PackagesManagerProviderImpl: IPackagesManagerProvider {
     override fun getFilterSameApkInstalledList(): ArrayList<GameInstall> {
         return PackagesManager.getFilterSameApkInstalledList()
     }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
 }

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

@@ -1,12 +1,18 @@
 package com.gh.common.provider
 
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.common.filter.RegionSettingHelper
+import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.entity.IpInfo
 import com.gh.gamecenter.feature.provider.IRegionSettingHelperProvider
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.regionSettingHelper, name = "RegionSettingHelper暴露服务")
 class RegionSettingHelperProviderImpl : IRegionSettingHelperProvider {
+    override fun shouldThisGameDisplayMirrorInfo(gameId: String): Boolean {
+        return RegionSettingHelper.shouldThisGameDisplayMirrorInfo(gameId)
+    }
 
     override fun getMirrorPosition(gameId: String): Int {
         return RegionSettingHelper.getMirrorPosition(gameId)
@@ -27,4 +33,8 @@ class RegionSettingHelperProviderImpl : IRegionSettingHelperProvider {
     override fun shouldThisGameBeFiltered(gameId: String?): Boolean {
         return RegionSettingHelper.shouldThisGameBeFiltered(gameId)
     }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
 }

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

@@ -1,9 +1,12 @@
 package com.gh.common.provider
 
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.common.repository.ReservationRepository
+import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IReservationRepositoryProvider
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.reservationRepository, name = "ReservationRepository暴露服务")
 class ReservationRepositoryProviderImpl : IReservationRepositoryProvider {
 
     override fun refreshReservations() {
@@ -13,4 +16,8 @@ class ReservationRepositoryProviderImpl : IReservationRepositoryProvider {
     override fun clearReservations() {
         ReservationRepository.clearReservations()
     }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
 }

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

@@ -5,12 +5,12 @@ import androidx.fragment.app.Fragment
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
-import com.therouter.router.Route
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.ISearchTabUtilsProvider
 import com.gh.gamecenter.search.viewmodel.SearchTabViewModel
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.searchTabUtils, name = "SearchTabUtils暴露服务")
 class SearchTabUtilsProviderImpl : ISearchTabUtilsProvider {
 
     override fun obtainParentViewModel(fragment: Fragment): ViewModel {
@@ -29,4 +29,8 @@ class SearchTabUtilsProviderImpl : ISearchTabUtilsProvider {
             null
         }
 
-}
+
+    override fun init(context: Context?) {
+       // no implement
+    }
+}

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

@@ -0,0 +1,19 @@
+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

@@ -0,0 +1,20 @@
+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/ShellProviderImpl.kt

@@ -3,11 +3,17 @@ 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.ShellActivity
+import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IShellProvider
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.shellActivity, name = "ShellActivity暴露服务")
 class ShellProviderImpl : IShellProvider {
     override fun getSwitchInstallMethodIntent(context: Context, extraParcelable: Parcelable?): Intent =
         ShellActivity.getIntent(context, ShellActivity.Type.SWITCH_INSTALL_METHOD, extraParcelable)
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
 }

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

@@ -2,15 +2,19 @@ package com.gh.common.provider
 
 import android.content.Context
 import android.content.Intent
-import com.therouter.router.Route
+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
 
-@com.therouter.inject.ServiceProvider
+@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,12 +1,12 @@
 package com.gh.common.provider
 
 import android.content.Context
-import com.therouter.router.Route
+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
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.subject, name = "SubjectActivity暴露服务")
 class SubjectProviderImpl : ISubjectProvider {
     override fun startSubjectActivity(
         context: Context,
@@ -17,4 +17,8 @@ class SubjectProviderImpl : ISubjectProvider {
     ) {
         SubjectActivity.startSubjectActivity(context, id, name, isOrder, null, entrance)
     }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
 }

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

@@ -0,0 +1,19 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.gamecenter.feature.exposure.time.TimeUtil
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.ITimeUtilProvider
+
+@Route(path = RouteConsts.provider.timeUtil, name = "TimeUtil暴露服务")
+class TimeUtilProviderImpl : ITimeUtilProvider {
+
+    override fun currentTimeMillis() = TimeUtil.currentTimeMillis()
+
+    override fun currentTime() = TimeUtil.currentTime()
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

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

@@ -1,12 +1,15 @@
 package com.gh.common.provider
 
+import android.content.Context
 import androidx.fragment.app.FragmentActivity
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.common.util.DialogUtils
+import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IUpdateManagerProvider
 import com.gh.gamecenter.core.utils.ToastUtils
 import com.gh.gamecenter.update.UpdateHelper
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.updateManager, name = "UpdateManager暴露服务")
 class UpdateManagerProviderImpl: IUpdateManagerProvider {
     override fun checkUpdate(activity: FragmentActivity, ignoreSuppressOption: Boolean) {
         val dialog = DialogUtils.showWaitDialog(activity, "检查更新中...")
@@ -23,4 +26,8 @@ class UpdateManagerProviderImpl: IUpdateManagerProvider {
             }
         }
     }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
 }

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

@@ -3,16 +3,20 @@ package com.gh.common.provider
 import android.content.Context
 import android.os.Build
 import androidx.annotation.RequiresApi
-import com.therouter.router.Route
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.common.util.UsageStatsHelper
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IUsageStatsHelperProvider
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.usageStatsHelper, name = "UsageStatsHelper暴露服务")
 class UsageStatsHelperProviderImpl : IUsageStatsHelperProvider {
     @RequiresApi(Build.VERSION_CODES.LOLLIPOP_MR1)
     override fun checkForPermission(): Boolean = UsageStatsHelper.checkForPermission()
     override fun skipToUsageStats(context: Context, requestCode: Int) {
         UsageStatsHelper.skipToUsageStats(context, requestCode)
     }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
 }

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

@@ -1,11 +1,13 @@
 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.InstallGameEntity
 import com.gh.gamecenter.feature.provider.IVHelperProvider
 import com.gh.vspace.VHelper
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.vhelper, name = "VHelper暴露服务")
 class VHelperProviderImpl: IVHelperProvider {
     override fun isVGameOn(): Boolean {
         return VHelper.isVGameOn()
@@ -18,4 +20,8 @@ class VHelperProviderImpl: IVHelperProvider {
     override fun launch(context: Context, packageName: String, ignoreGApps: Boolean, showLoading: Boolean) {
         VHelper.launch(context, packageName, ignoreGApps, showLoading)
     }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
 }

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

@@ -1,12 +1,12 @@
 package com.gh.common.provider
 
 import android.content.Context
-import com.therouter.router.Route
+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
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.visitManager, name = "VisitManager暴露服务")
 class VisitManagerProviderImpl : IVisitManagerProvider {
     override fun updateOkhttpCache(context: Context, newsId: String) {
         VisitManager.updateOkhttpCache(context, newsId)
@@ -15,4 +15,8 @@ class VisitManagerProviderImpl : IVisitManagerProvider {
     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

@@ -2,10 +2,12 @@ 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.WebActivity
+import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IWebProvider
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.webActivity, name = "WebActivity暴露服务")
 class WebProviderImpl : IWebProvider {
     override fun getIntent(context: Context, url: String, autoCompletionTitle: Boolean): Intent {
         return WebActivity.getIntent(context, url, autoCompletionTitle)
@@ -38,4 +40,8 @@ class WebProviderImpl : IWebProvider {
     ): Intent {
         return WebActivity.getIntentByNews(context, concernLink, concernGameName, concernId, entrance)
     }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
 }

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

@@ -1,15 +1,23 @@
 package com.gh.common.provider
 
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.common.util.WechatBindHelper
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.common.entity.WechatConfigEntity
 import com.gh.gamecenter.core.provider.IWechatBindHelperProvider
 
-@com.therouter.inject.ServiceProvider
-class WechatHelperProviderImpl : IWechatBindHelperProvider {
+@Route(path = RouteConsts.provider.wechatHelper, name = "WechatHelper暴露服务")
+class WechatHelperProviderImpl : IWechatBindHelperProvider<WechatConfigEntity> {
 
-    override fun getWechatConfig(callback: ((Any) -> Unit)?) {
+    override fun getWechatConfig(callback: ((WechatConfigEntity) -> Unit)?) {
         WechatBindHelper.getWechatConfig {
             callback?.invoke(it)
         }
     }
 
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
 }

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

@@ -1,54 +0,0 @@
-package com.gh.common.provider
-
-import android.annotation.SuppressLint
-import com.gh.gamecenter.common.utils.SensorsBridge
-import com.gh.gamecenter.common.utils.singleToMain
-import com.gh.gamecenter.core.provider.IWechatPayResultProvider
-import com.gh.gamecenter.feature.entity.OrderEntity
-import com.gh.gamecenter.feature.entity.VipEntity
-import com.gh.gamecenter.feature.eventbus.EBPayState
-import com.halo.assistant.accelerator.repository.AccelerationRepository
-import com.halo.assistant.accelerator.repository.AcceleratorDataHolder
-import org.greenrobot.eventbus.EventBus
-
-@com.therouter.inject.ServiceProvider
-class WechatPayResultProviderImpl : IWechatPayResultProvider {
-
-    private val repository = AccelerationRepository.newInstance()
-
-    @SuppressLint("CheckResult")
-    override fun onPayComplete(nonceStr: String, order: Any?) {
-        val orderEntity = order as? OrderEntity
-        repository.getWechatPayResult(nonceStr)
-            .compose(singleToMain())
-            .subscribe({
-                // 支付成功
-                EventBus.getDefault().post(EBPayState.PaySuccess)
-
-                // 先刷新本地状态，支付成功，肯定是付费会员
-                AcceleratorDataHolder.instance.setVipEntity(
-                    VipEntity(
-                        _vipStatus = true,
-                        _isNewUser = false,
-                        _isTryVip = false
-                    )
-                )
-
-                SensorsBridge.trackMemberRechargeResult(
-                    AccelerationRepository.PAYMENT_TYPE_WECHAT,
-                    orderEntity?.setMenuName ?: "",
-                    orderEntity?.paymentAmount ?: "",
-                    AccelerationRepository.RECHARGE_RESULT_SUCCESS
-                )
-            }, {
-                // 支付失败
-                EventBus.getDefault().post(EBPayState.PayFail)
-                SensorsBridge.trackMemberRechargeResult(
-                    AccelerationRepository.PAYMENT_TYPE_WECHAT,
-                    orderEntity?.setMenuName ?: "",
-                    orderEntity?.paymentAmount ?: "",
-                    AccelerationRepository.RECHARGE_RESULT_FAILURE
-                )
-            })
-    }
-}

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

@@ -4,8 +4,6 @@ import android.annotation.SuppressLint
 import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
-import android.database.sqlite.SQLiteDiskIOException
-import android.database.sqlite.SQLiteException
 import android.graphics.Bitmap
 import android.net.Uri
 import android.text.TextUtils
@@ -286,11 +284,7 @@ object SimulatorGameManager {
                         entity.isRecentlyPlayed = it.id == gameId
                         simulatorGameRecordList.add(entity)
                     }
-                    try {
-                        simulatorGameDao.addSimulatorGameList(simulatorGameRecordList)
-                    } catch (e: SQLiteException) {
-                        e.printStackTrace()
-                    }
+                    simulatorGameDao.addSimulatorGameList(simulatorGameRecordList)
                 }
             })
     }

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

@@ -2,7 +2,6 @@ package com.gh.common.util
 
 import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.common.retrofit.Response
-import com.gh.gamecenter.core.utils.TimeUtils
 import com.gh.gamecenter.retrofit.RetrofitManager
 import io.reactivex.schedulers.Schedulers
 import okhttp3.ResponseBody
@@ -13,18 +12,15 @@ import okhttp3.ResponseBody
 object ActivationHelper {
 
     private const val HAS_SENT_ACTIVATED_INFO = "has_sent_activated_info"
-    private const val SENT_ACTIVATED_INFO_TIME = "sent_activated_info_time"
-    private const val HAS_SENT_RETENTION_INFO = "has_sent_retention_info"
 
-    private var hasSentActivatedInfo = SPUtils.getBoolean(HAS_SENT_ACTIVATED_INFO, false)
-    private var hasSentRetentionInfo = SPUtils.getBoolean(HAS_SENT_RETENTION_INFO, false)
+    var mHasSentActivatedInfo = SPUtils.getBoolean(HAS_SENT_ACTIVATED_INFO, false)
 
     /**
      * 发送激活信息 (用于推广)
      */
     @JvmStatic
     fun sendActivationInfo() {
-        if (!hasSentActivatedInfo) {
+        if (!mHasSentActivatedInfo) {
             RetrofitManager.getInstance()
                 .api.postActivationInfo()
                 .subscribeOn(Schedulers.io())
@@ -32,36 +28,8 @@ object ActivationHelper {
                     override fun onResponse(response: ResponseBody?) {
                         super.onResponse(response)
 
-                        hasSentActivatedInfo = true
+                        mHasSentActivatedInfo = true
                         SPUtils.setBoolean(HAS_SENT_ACTIVATED_INFO, true)
-                        SPUtils.setLong(SENT_ACTIVATED_INFO_TIME, System.currentTimeMillis())
-                    }
-                })
-        }
-    }
-
-    /**
-     * 发送次日留存信息 (用于推广)
-     */
-    @JvmStatic
-    fun sendRetentionInfo() {
-        if (hasSentActivatedInfo && !hasSentRetentionInfo) {
-            val activateTimeMillis = SPUtils.getLong(SENT_ACTIVATED_INFO_TIME, 0)
-            val currentTimeMillis = System.currentTimeMillis()
-
-            if (!TimeUtils.isNextDay(activateTimeMillis, currentTimeMillis)) {
-                return
-            }
-
-            RetrofitManager.getInstance()
-                .api.postRetentionInfo()
-                .subscribeOn(Schedulers.io())
-                .subscribe(object : Response<ResponseBody>() {
-                    override fun onResponse(response: ResponseBody?) {
-                        super.onResponse(response)
-
-                        hasSentRetentionInfo = true
-                        SPUtils.setBoolean(HAS_SENT_RETENTION_INFO, true)
                     }
                 })
         }

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

@@ -52,7 +52,7 @@ public class CheckLoginUtils {
         }
 
         if (context != null) {
-            QuickLoginHelper.startLogin(context, entrance, null, callback);
+            QuickLoginHelper.startLogin(context, entrance, callback);
         }
     }
 

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

@@ -9,13 +9,13 @@ import android.preference.PreferenceManager;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.therouter.TheRouter;
+import com.alibaba.android.arouter.launcher.ARouter;
 import com.gh.ad.AdDelegateHelper;
 import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.common.constant.Constants;
+import com.gh.gamecenter.common.constant.RouteConsts;
 import com.gh.gamecenter.common.exposure.meta.MetaUtil;
 import com.gh.gamecenter.common.retrofit.BiResponse;
-import com.gh.gamecenter.common.utils.SensorsBridge;
 import com.gh.gamecenter.core.AppExecutor;
 import com.gh.gamecenter.core.provider.ISentryProvider;
 import com.gh.gamecenter.core.utils.GsonUtils;
@@ -39,11 +39,6 @@ import io.reactivex.schedulers.Schedulers;
  */
 public class DataUtils {
 
-    // 神策 OAID 是否已绑定
-    private static boolean isSensorOAIDBounded = false;
-    // 原始的 OAID 是否已成功获取
-    private static boolean originalOAIDIsReceived = false;
-
     private DataUtils() {
         throw new IllegalStateException("Utility class");
     }
@@ -60,7 +55,7 @@ public class DataUtils {
     }
 
     private static void initSentry(Context context, String channel) {
-        ISentryProvider sentryProvider = TheRouter.get(ISentryProvider.class);
+        ISentryProvider sentryProvider = (ISentryProvider) ARouter.getInstance().build(RouteConsts.provider.sentry).navigation();
         if (sentryProvider != null) {
             sentryProvider.init(context, channel, BuildConfig.FLAVOR, BuildConfig.VERSION_NAME);
         }
@@ -70,6 +65,7 @@ public class DataUtils {
         // 默认用 APP 级已存储的 GID 来使用，不使用外部 GID
         String savedGid = SPUtils.getString(Constants.GID);
         if (!TextUtils.isEmpty(savedGid)) {
+            HaloApp.getInstance().setGid(savedGid);
             onGidReceived(savedGid);
         } else {
             GidHelper.getInstance().registerDevice(HaloApp.getInstance().getApplication(), new GidCallback() {
@@ -93,8 +89,6 @@ public class DataUtils {
     }
 
     private static void onGidReceived(String gid) {
-        bindValidOaidToSensor(false);
-
         HaloApp.getInstance().setGid(gid);
         // 更新广告配置
         AdDelegateHelper.INSTANCE.requestAdConfig(false, "", null);
@@ -111,44 +105,15 @@ public class DataUtils {
             try {
                 HaloApp.getInstance().getContentResolver().insert(Uri.parse("content://com.gh.gamecenter.provider/device"), values);
             } catch (Exception exception) {
+                SentryHelper.INSTANCE.onEvent("DEVICE_INSERT_ERROR", "exception_digest", exception.getLocalizedMessage());
                 exception.printStackTrace();
             }
         });
     }
 
-    /**
-     * 为神策绑定有效的 OAID
-     */
-    public static void bindValidOaidToSensor(boolean fromOaidResult) {
-        if (isSensorOAIDBounded) return;
-
-        String oaid = HaloApp.getInstance().getOAID();
-
-        // 来自于 oaid 获取回调，或者说原始 oaid 已经获取成功
-        if (fromOaidResult || originalOAIDIsReceived) {
-            originalOAIDIsReceived = true;
-            // 遇到异常的 OAID
-            if (Constants.INVALID_OAID_1.equals(oaid)
-                    || Constants.INVALID_OAID_2.equals(oaid)
-                    || Constants.INVALID_OAID_3.equals(oaid)
-                    || TextUtils.isEmpty(oaid)) {
-                // 若 gid 不为空，那么整合 gid 作为 oaid https://jira.shanqu.cc/browse/GHZSCY-7004
-                if (HaloApp.getInstance().getGid() != null) {
-                    oaid = "GID" + HaloApp.getInstance().getGid();
-                    SensorsBridge.INSTANCE.setOAID(oaid);
-                    isSensorOAIDBounded = true;
-                }
-            } else {
-                SensorsBridge.INSTANCE.setOAID(oaid);
-                isSensorOAIDBounded = true;
-            }
-        }
-    }
-
     /**
      * 获取应用 gid 绑定的实名信息
      */
-    // TODO 这个方法启动时会被调用多次，后面考虑优化优化
     @SuppressLint("CheckResult")
     public static void getDeviceCertification(String gid) {
         RetrofitManager.getInstance()
@@ -195,6 +160,7 @@ public class DataUtils {
                             // TODO 将 com.gh.gamecenter 改成 BuildConfig.ApplicationID
                             HaloApp.getInstance().getContentResolver().insert(Uri.parse("content://com.gh.gamecenter.provider/certification"), values);
                         } catch (Exception exception) {
+                            SentryHelper.INSTANCE.onEvent("CERTIFICATION_INSERT_ERROR", "exception_digest", exception.getLocalizedMessage());
                             exception.printStackTrace();
                         }
                     }

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

@@ -41,8 +41,7 @@ public class DetailDownloadUtils {
 
     /**
      * 更新底部下载区域
-     *
-     * @param viewHolder           下载区域的包裹
+     * @param viewHolder 下载区域的包裹
      * @param ignoreDownloadEntity 忽略下载实体（往往用于下载异常时）
      */
     public static void updateViewHolder(DetailViewHolder viewHolder, boolean ignoreDownloadEntity) {
@@ -54,8 +53,6 @@ public class DetailDownloadUtils {
             viewHolder.getMultiVersionDownloadTv().setVisibility(View.GONE);
         }
 
-        viewHolder.setSpeedViewsVisible(false);
-
         // 根据预置的配置更新 ViewHolder 的状态 (譬如青少年模式、下载内容为空等)
         if (updateViewHolderWithPredefinedConfig(viewHolder, gameEntity)) {
             return;
@@ -138,17 +135,10 @@ public class DetailDownloadUtils {
                     showDualDownloadButton,
                     downloadEntity
             );
-
-            if(!showVGame){
-                String rawBtnText = GameUtils.getDownloadBtnText(viewHolder.getContext(), gameEntity, false, showVGame, PluginLocation.only_game);
-                viewHolder.checkIfShowSpeedUi(rawBtnText);
-            }
-
         } else {
             // 游戏包含多 APK 的情况
             viewHolder.getMultiVersionDownloadTv().setText("选择下载你的版本" + (TextUtils.isEmpty(downloadAddWord) ? "" : "-" + downloadAddWord));
             viewHolder.getMultiVersionDownloadTv().setVisibility(View.VISIBLE);
-            viewHolder.getDownloadPb().setTag(com.gh.gamecenter.feature.R.string.download, viewHolder.getMultiVersionDownloadTv().getText());
             viewHolder.getDownloadPb().setText("");
             viewHolder.getDownloadPb().setButtonStyle(DownloadButton.ButtonStyle.NORMAL);
             DownloadEntity downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity);
@@ -228,7 +218,7 @@ public class DetailDownloadUtils {
                     downloadButton.setText("");
                 }
             } else {
-                decoratedBtnText = rawBtnText + (containsAddWord ? "" : downloadAddWord) + getWrappedDownloadSizeText(viewHolder);
+                decoratedBtnText = rawBtnText + (containsAddWord? "" : downloadAddWord) + getWrappedDownloadSizeText(viewHolder);
 
                 if (overlayTv != null && downloadButton.getVisibility() != View.GONE) {
                     if (context.getString(com.gh.gamecenter.feature.R.string.launch).equals(rawBtnText)
@@ -270,7 +260,7 @@ public class DetailDownloadUtils {
                 viewHolder.getLocalDownloadSizeTv().setVisibility(View.GONE);
                 String size = viewHolder.getGameEntity().getApk().isEmpty() ? "" : viewHolder.getGameEntity().getApk().get(0).getSize();
                 if (size != null) {
-                    String sizeWithoutDigit = convertSizeString(size);
+                    String sizeWithoutDigit = size.replaceAll("(?<=\\d)\\.[0-9]+(?!\\d)", "");
                     viewHolder.getLocalDownloadSizeTv().setText(sizeWithoutDigit);
                 }
 
@@ -467,7 +457,7 @@ public class DetailDownloadUtils {
                 }
                 viewHolder.getDownloadPb().setButtonStyle(DownloadButton.ButtonStyle.H5_GAME);
             } else {
-                if ("dialog".equals(gameEntity.getDownloadOffStatus()) || "third_party".equals(gameEntity.getDownloadOffStatus())) {
+                if ("dialog".equals(gameEntity.getDownloadOffStatus())) {
                     viewHolder.getDownloadPb().setText(TextUtils.isEmpty(gameEntity.getDownloadOffText()) ? "查看详情" : gameEntity.getDownloadOffText());
                     viewHolder.getDownloadPb().setButtonStyle(DownloadButton.ButtonStyle.NONE_WITH_HINT);
                 } else if ("updating".equals(gameEntity.getDownloadOffStatus())) {
@@ -610,30 +600,6 @@ public class DetailDownloadUtils {
         return (int) Math.ceil(downloadEntity.getPercent());
     }
 
-    private static String convertSizeString(String sizeString) {
-        String numberPart;
-        String indicator;
-
-        // Check if the string ends with "MB"
-        if (sizeString.endsWith("MB")) {
-            numberPart = sizeString.substring(0, sizeString.length() - 2);
-            indicator = "MB";
-        } else if (sizeString.endsWith("G")) {
-            numberPart = sizeString.substring(0, sizeString.length() - 1);
-            indicator = "G";
-        } else {
-            return sizeString;
-        }
-
-        // Round number
-        double number = Double.parseDouble(numberPart);
-        long roundedNumber = Math.round(number);
-
-        // Combine rounded number and size indicator
-        return roundedNumber + indicator;
-    }
-
-
     private static boolean handleDownloadButtonAsXapk(DownloadEntity downloadEntity, DownloadButton downloadButton) {
         String xapkStatus = downloadEntity.getMeta().get(XapkInstaller.XAPK_UNZIP_STATUS);
 

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

@@ -11,6 +11,7 @@ import android.os.Bundle
 import android.text.TextUtils
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.os.bundleOf
+import com.alibaba.android.arouter.launcher.ARouter
 import com.gh.ad.AdPluginDownloadHelper
 import com.gh.common.constant.Config
 import com.gh.common.exposure.ExposureManager.log
@@ -18,7 +19,6 @@ import com.gh.common.exposure.ExposureTraceUtils.appendTrace
 import com.gh.common.util.EntranceUtils.jumpActivity
 import com.gh.common.util.EntranceUtils.jumpActivityCompat
 import com.gh.gamecenter.*
-import com.gh.gamecenter.ShellActivity.Type
 import com.gh.gamecenter.amway.AmwayActivity
 import com.gh.gamecenter.category2.CategoryV2Activity
 import com.gh.gamecenter.common.base.activity.BaseActivity
@@ -56,8 +56,9 @@ import com.gh.gamecenter.gamecollection.detail.GameCollectionDetailActivity
 import com.gh.gamecenter.gamecollection.hotlist.GameCollectionHotListActivity
 import com.gh.gamecenter.gamecollection.hotlist.GameCollectionListDetailActivity
 import com.gh.gamecenter.gamecollection.square.GameCollectionSquareActivity
-import com.gh.gamecenter.gamedetail.entity.GameDetailTabEntity
+import com.gh.gamecenter.gamedetail.GameDetailFragment
 import com.gh.gamecenter.gamedetail.fuli.kaifu.ServersCalendarActivity
+import com.gh.gamecenter.gamedetail.fuli.kaifu.ServersCalendarManagementActivity
 import com.gh.gamecenter.gamedetail.fuli.kaifu.ServersSubscribedGameListActivity
 import com.gh.gamecenter.gamedetail.history.HistoryApkListActivity
 import com.gh.gamecenter.gamedetail.rating.RatingReplyActivity
@@ -68,6 +69,7 @@ import com.gh.gamecenter.minigame.MiniGameRecentlyPlayUseCase
 import com.gh.gamecenter.minigame.MiniGameSearchActivity
 import com.gh.gamecenter.minigame.qq.QGameHomeWrapperActivity
 import com.gh.gamecenter.newsdetail.NewsDetailActivity
+import com.gh.gamecenter.personalhome.UserHomeActivity
 import com.gh.gamecenter.personalhome.background.PersonalityBackgroundActivity
 import com.gh.gamecenter.personalhome.border.AvatarBorderActivity
 import com.gh.gamecenter.personalhome.home.UserHistoryViewModel
@@ -77,6 +79,7 @@ import com.gh.gamecenter.qa.questions.newdetail.NewQuestionDetailActivity
 import com.gh.gamecenter.qa.subject.CommunitySubjectActivity
 import com.gh.gamecenter.qa.video.detail.ForumVideoDetailActivity
 import com.gh.gamecenter.retrofit.RetrofitManager
+import com.gh.gamecenter.SearchActivity
 import com.gh.gamecenter.servers.GameServerTestActivity
 import com.gh.gamecenter.servers.GameServersActivity
 import com.gh.gamecenter.servers.gametest2.GameServerTestV2Activity
@@ -97,7 +100,6 @@ import com.halo.assistant.fragment.WebFragment
 import com.lightgame.utils.Utils
 import com.tencent.mm.opensdk.modelbiz.WXLaunchMiniProgram
 import com.tencent.mm.opensdk.openapi.WXAPIFactory
-import com.therouter.TheRouter
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
 import retrofit2.HttpException
@@ -178,25 +180,7 @@ object DirectUtils {
         "qa",
         "feedback",
         "toolkit",
-        "float_window_game",
-        "my_halo",
-        "my_game",
-        "server_manager",
-        "receiving_information",
-        "game_archive",
-        "game_dynamics",
-        "game_upload",
-        "certification",
-        "wechat_reminder",
-        "apk_clean",
-        "personal_center",
-        "video_upload",
-        "account_security",
-        "simulator",
-        "teen_mode",
-        "message_center",
-        "archive",
-        "my_assets",
+        "float_window_game"
     )
 
     fun directToLinkPage(
@@ -401,8 +385,8 @@ object DirectUtils {
                 }
             }
 
-            "authentication", "certification" -> {
-                directToRealName(context)
+            "authentication" -> {
+                context.startActivity(ShellActivity.getIntent(context, ShellActivity.Type.REAL_NAME_INFO, null))
             }
 
             "user_background" -> {
@@ -460,7 +444,7 @@ object DirectUtils {
                 } ?: ""
             }
 
-            "my_halo", "halo_tab" -> directToHomeMyHaloTab(context)
+            "halo_tab" -> directToHomeMyHaloTab(context)
 
             "common_collection" -> directToCommonCollectionDetail(
                 context,
@@ -542,8 +526,7 @@ object DirectUtils {
                 ToolbarWrapperActivity.getMultiTabNavIntent(
                     context,
                     linkEntity.link ?: "",
-                    linkEntity.text ?: "",
-                    entrance
+                    linkEntity.text ?: ""
                 )
             )
 
@@ -551,20 +534,16 @@ object DirectUtils {
                 ToolbarWrapperActivity.getCustomPageIntent(
                     context,
                     linkEntity.link ?: "",
-                    linkEntity.text ?: "",
-                    entrance
+                    linkEntity.text ?: ""
                 )
             )
 
             // 选中首页底部 tab
             "bottom_tab" -> {
-                if (HaloApp.getInstance().isRunningForeground) {
-                    val intent = Intent(context, MainActivity::class.java)
-                    intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
-                    context.startActivity(intent)
-                } else {
-                    jumpActivity(context, Bundle())
+                val intent = Intent(context, MainActivity::class.java).apply {
+                    flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
                 }
+                context.startActivity(intent)
 
                 if (linkEntity is LaunchRedirect) {
                     MainWrapperRepository.getInstance().sendSelectTabEvent(linkEntity)
@@ -591,36 +570,6 @@ object DirectUtils {
                 }
             }
 
-            "my_game" -> directToMyGame(0, entrance)
-
-            "server_manager" -> directToServersCalendarManagement(entrance)
-
-            "receiving_information" -> directToDeliveryInfo(entrance)
-
-            "game_archive" -> directToGameArchive(entrance)
-
-            "game_dynamics" -> directToConcernInfo(context, entrance)
-
-            "wechat_reminder" -> CheckLoginUtils.checkLogin(context, entrance) {
-                context.startActivity(WebActivity.getBindWechatIntent(context))
-            }
-
-            "apk_clean" -> directToCleanApk(context, entrance)
-
-            "personal_center" -> directToUserInfo(entrance)
-
-            "simulator" -> directToSimulatorGame(entrance)
-
-            "account_security" -> directToAccountSecurity(entrance)
-
-            "teen_mode" -> directToTeenMode(entrance)
-
-            "message_center" -> directToMessageCenter(0, entrance)
-
-            "archive" -> directToCloudArchive(context, linkEntity.link ?: "", linkEntity.text ?: "", "", entrance)
-
-            "my_assets" -> navigateToMyAssetsPage(context, entrance)
-
             "" -> {
                 // do nothing
             }
@@ -641,16 +590,12 @@ object DirectUtils {
     @JvmStatic
     fun directToQa(context: Context, text: String? = "", id: String) {
         if (id.isEmpty()) return
-
+        val destination = RouteConsts.activity.qaActivity.toDestinationClass()
         val bundle = Bundle()
+        bundle.putString(KEY_TO, destination?.name ?: "")
         bundle.putString(KEY_NAVIGATION_TITLE, text)
         bundle.putString(KEY_QA_ID, id)
-
-        TheRouter.build(RouteConsts.activity.qaActivity)
-            .fillParams {
-                it.putAll(bundle)
-            }
-            .navigation(context)
+        jumpActivity(context, bundle)
     }
 
     /**
@@ -659,16 +604,12 @@ object DirectUtils {
     @JvmStatic
     fun directToQaCollection(context: Context, text: String, id: String) {
         if (id.isEmpty()) return
-
+        val destination = RouteConsts.activity.qaActivity.toDestinationClass()
         val bundle = Bundle()
+        bundle.putString(KEY_TO, destination?.name ?: "")
         bundle.putString(KEY_NAVIGATION_TITLE, text)
         bundle.putString(KEY_QA_COLLECTION_ID, id)
-
-        TheRouter.build(RouteConsts.activity.qaActivity)
-            .fillParams {
-                it.putAll(bundle)
-            }
-            .navigation(context)
+        jumpActivity(context, bundle)
     }
 
     /**
@@ -779,7 +720,7 @@ object DirectUtils {
      */
     @JvmStatic
     fun directToHomeActivity(context: Context, userId: String?, entrance: String? = null, path: String? = null) {
-        directToHomeActivity(context, userId, entrance, path, 0)
+        context.startActivity(UserHomeActivity.getIntent(context, userId ?: "", entrance, path))
     }
 
     @JvmStatic
@@ -818,20 +759,17 @@ object DirectUtils {
         entrance: String? = null,
         path: String? = null
     ) {
+
         IntegralLogHelper.log("view_homepage", "个人主页")
-
-        val uri = Uri.Builder()
-            .path(RouteConsts.activity.userHomeActivity)
-            .appendQueryParameter(KEY_USER_ID, userId)
-            .appendQueryParameter(KEY_TAB_INDEX, position.toString())
-            .appendQueryParameter(KEY_PATH, BaseActivity.mergeEntranceAndPath(entrance, path))
-            .appendQueryParameter(KEY_COMMUNITY_TYPE, UserHistoryViewModel.TYPE.fromValue(type).value)
-            .appendQueryParameter(KEY_GAME_TYPE, gameType)
-            .build()
-
-        TheRouter
-            .build(uri.toString())
-            .navigation(context)
+        val bundle = Bundle()
+        bundle.putString(KEY_USER_ID, userId)
+        bundle.putString(KEY_TO, UserHomeActivity::class.java.name)
+        bundle.putString(KEY_ENTRANCE, BaseActivity.mergeEntranceAndPath(entrance, path))
+        bundle.putString(KEY_PATH, path)
+        bundle.putString(KEY_TYPE, UserHistoryViewModel.TYPE.fromValue(type).value)
+        bundle.putString(KEY_GAME, gameType)
+        bundle.putInt(KEY_POSITION, position ?: 0)
+        jumpActivity(context, bundle)
     }
 
 
@@ -854,42 +792,33 @@ object DirectUtils {
         entrance: String? = null,
         autoDownload: Boolean? = null,
         tab: String? = "",
-        traceEvent: ExposureEvent? = null,
-        from: String? = null
+        traceEvent: ExposureEvent? = null
     ) {
         if (id.isEmpty()) return
-
-        val uri = Uri.Builder()
-            .path(RouteConsts.activity.gameDetailActivity)
-            .appendQueryParameter(KEY_ENTRANCE, entrance)
-            .appendQueryParameter(KEY_GAME_ID, id)
-            .appendQueryParameter(KEY_FROM, from)
-            .build()
-
-        TheRouter
-            .build(uri.toString())
-            .fillParams { bundle ->
-                if (!TextUtils.isEmpty(tab)) {
-                    when (tab) {
-                        "comment" -> bundle.putString(KEY_TARGET, GameDetailTabEntity.TYPE_COMMENT)
-                        "desc" -> bundle.putString(KEY_TARGET, GameDetailTabEntity.TYPE_DETAIL)
-                        "forum" -> bundle.putString(KEY_TARGET, GameDetailTabEntity.TYPE_BBS)
-                        "zone" -> bundle.putString(KEY_TARGET, GameDetailTabEntity.TYPE_ZONE)
-                    }
-                }
-                if (traceEvent != null) {
-                    val clickEvent = createEvent(
-                        GameEntity(id = id, name = name),
-                        traceEvent.source,
-                        appendTrace(traceEvent),
-                        ExposureType.CLICK
-                    )
-                    log(clickEvent)
-                    bundle.putParcelable(KEY_TRACE_EVENT, clickEvent)
-                }
-                bundle.putBoolean(KEY_AUTO_DOWNLOAD, autoDownload ?: false)
+        val bundle = Bundle()
+        bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
+        bundle.putString(KEY_TO, GameDetailActivity::class.java.simpleName)
+        bundle.putString(KEY_GAMEID, id)
+        if (!TextUtils.isEmpty(tab)) {
+            when (tab) {
+                "comment" -> bundle.putString(KEY_TARGET, GameDetailFragment.TAB_RATING)
+                "desc" -> bundle.putString(KEY_TARGET, GameDetailFragment.TAB_DESC)
+                "forum" -> bundle.putString(KEY_TARGET, GameDetailFragment.TAB_BBS)
+                "zone" -> bundle.putString(KEY_TARGET, GameDetailFragment.TAB_TRENDS)
             }
-            .navigation(context)
+        }
+        if (traceEvent != null) {
+            val clickEvent = createEvent(
+                GameEntity(id = id, name = name),
+                traceEvent.source,
+                appendTrace(traceEvent),
+                ExposureType.CLICK
+            )
+            log(clickEvent)
+            bundle.putParcelable(KEY_TRACE_EVENT, clickEvent)
+        }
+        bundle.putBoolean(KEY_AUTO_DOWNLOAD, autoDownload ?: false)
+        jumpActivity(context, bundle)
     }
 
     /**
@@ -920,7 +849,7 @@ object DirectUtils {
         bundle.putString(KEY_ENTRANCE, entrance)
         bundle.putString(KEY_GAMEID, id)
         bundle.putBoolean(KEY_OPEN_VIDEO_STREAMING, true)
-        bundle.putString(KEY_TARGET, GameDetailTabEntity.TYPE_DETAIL)
+        bundle.putString(KEY_TARGET, GameDetailFragment.TAB_DESC)
         jumpActivity(context, bundle)
     }
 
@@ -928,21 +857,15 @@ object DirectUtils {
     fun directToGameDetail(
         context: Context,
         id: String,
-        defaultTab: String = GameDetailTabEntity.TYPE_DETAIL,
+        defaultTab: String = GameDetailFragment.TAB_DESC,
         entrance: String? = null
     ) {
-        val uri = Uri.Builder()
-            .path(RouteConsts.activity.gameDetailActivity)
-            .appendQueryParameter(KEY_ENTRANCE, entrance)
-            .appendQueryParameter(KEY_GAME_ID, id)
-            .build()
-
-        TheRouter
-            .build(uri.toString())
-            .fillParams { bundle ->
-                bundle.putString(KEY_TARGET, defaultTab)
-            }
-            .navigation(context)
+        val bundle = Bundle()
+        bundle.putString(KEY_TO, GameDetailActivity::class.java.name)
+        bundle.putString(KEY_ENTRANCE, entrance)
+        bundle.putString(KEY_GAMEID, id)
+        bundle.putString(KEY_TARGET, defaultTab)
+        jumpActivity(context, bundle)
     }
 
     // 专栏
@@ -1592,7 +1515,7 @@ object DirectUtils {
                     response?.apply {
                         if (zone.status == "on") {
                             if (zone.style == "link") {
-                                directToGameDetail(context, gameId, GameDetailTabEntity.TYPE_ZONE, entrance)
+                                directToGameDetail(context, gameId, GameDetailFragment.TAB_TRENDS, entrance)
                             } else {
                                 directToWebView(context, url, entrance)
                             }
@@ -1703,11 +1626,11 @@ object DirectUtils {
      */
     @JvmStatic
     fun directToHelpAndFeedback(context: Context, bundle: Bundle? = null) {
-        TheRouter.build(RouteConsts.activity.helpAndFeedbackActivity)
-            .fillParams {
-                bundle?.run { it.putAll(this) }
-            }
-            .navigation(context)
+        val destination = RouteConsts.activity.helpAndFeedbackActivity.toDestinationClass()
+        val newBundle = Bundle()
+        newBundle.putString(KEY_TO, destination?.name ?: "")
+        bundle?.let { newBundle.putAll(it) }
+        jumpActivityCompat(context, newBundle)
     }
 
 
@@ -1804,7 +1727,8 @@ object DirectUtils {
     @JvmStatic
     fun directToConcernInfo(context: Context, entrance: String) {
         context.startActivity(
-            TheRouter.get(IConcernInfoProvider::class.java)?.getIntent(context, entrance)
+            (ARouter.getInstance().build(RouteConsts.provider.concernInfo)
+                .navigation() as? IConcernInfoProvider)?.getIntent(context, entrance)
         )
     }
 
@@ -2061,7 +1985,10 @@ object DirectUtils {
             return
         }
 
-        val qGameProvider = TheRouter.get(IQGameProvider::class.java)
+        val qGameProvider = ARouter
+            .getInstance()
+            .build(RouteConsts.provider.qGame)
+            .navigation() as? IQGameProvider
 
         if (qGameProvider == null) return
 
@@ -2110,14 +2037,8 @@ object DirectUtils {
     }
 
     @JvmStatic
-    fun directToMessageCenter(defaultTabIndex: Int, source: String) {
-        val uri = Uri.Builder()
-            .path(RouteConsts.activity.messageWrapperActivity)
-            .appendQueryParameter(RouteConsts.QueryParams.REQUIRE_LOGIN, "true")
-            .appendQueryParameter(RouteConsts.QueryParams.SOURCE, source)
-            .build()
-
-        TheRouter.build(uri.toString())
+    fun directToMessageCenter(defaultTabIndex: Int) {
+        ARouter.getInstance().build(RouteConsts.activity.messageWrapperActivity)
             .withInt(BaseActivity_TabLayout.PAGE_INDEX, defaultTabIndex)
             .navigation()
     }
@@ -2151,17 +2072,13 @@ object DirectUtils {
 
     /**
      * 跳转到开服订阅页面
+     * @param context 上下文
      */
     @JvmStatic
-    fun directToServersCalendarManagement(entrance: String) {
-        val uri = Uri.Builder()
-            .path(RouteConsts.activity.serversCalendarManagementActivity)
-            .appendQueryParameter(RouteConsts.QueryParams.REQUIRE_LOGIN, "true")
-            .appendQueryParameter(RouteConsts.QueryParams.SOURCE, entrance)
-            .build()
-
-        TheRouter.build(uri.toString())
-            .navigation()
+    fun directToServersCalendarManagement(context: Context, entrance: String) {
+        CheckLoginUtils.checkLogin(context, entrance) {
+            context.startActivity(ServersCalendarManagementActivity.getIntent(context))
+        }
     }
 
     fun directToSearch(
@@ -2221,128 +2138,4 @@ object DirectUtils {
             )
         }
     }
-
-    @JvmStatic
-    fun directToMyGame(defaultTabIndex: Int, source: String) {
-        val uri = Uri.Builder()
-            .path(RouteConsts.activity.myGameActivity)
-            .appendQueryParameter(RouteConsts.QueryParams.SOURCE, source)
-            .build()
-
-        TheRouter.build(uri.toString())
-            .withInt(BaseActivity_TabLayout.PAGE_INDEX, defaultTabIndex)
-            .navigation()
-    }
-
-    @JvmStatic
-    fun directToDeliveryInfo(source: String) {
-        val uri = Uri.Builder()
-            .path(RouteConsts.activity.deliveryInfoActivity)
-            .appendQueryParameter(RouteConsts.QueryParams.REQUIRE_LOGIN, "true")
-            .appendQueryParameter(RouteConsts.QueryParams.SOURCE, source)
-            .build()
-
-        TheRouter.build(uri.toString())
-            .navigation()
-    }
-
-    @JvmStatic
-    fun directToGameArchive(source: String) {
-        val uri = Uri.Builder()
-            .path(RouteConsts.activity.gameArchiveListActivity)
-            .appendQueryParameter(RouteConsts.QueryParams.SOURCE, source)
-            .build()
-
-        TheRouter.build(uri.toString())
-            .navigation()
-    }
-
-    @JvmStatic
-    fun directToSimulatorGame(source: String) {
-        val uri = Uri.Builder()
-            .path(RouteConsts.activity.simulatorGameActivity)
-            .appendQueryParameter(RouteConsts.QueryParams.SOURCE, source)
-            .build()
-
-        TheRouter.build(uri.toString())
-            .navigation()
-    }
-
-    @JvmStatic
-    fun directToTeenMode(source: String) {
-        val uri = Uri.Builder()
-            .path(RouteConsts.activity.teenagerModeActivity)
-            .appendQueryParameter(RouteConsts.QueryParams.SOURCE, source)
-            .build()
-
-        TheRouter.build(uri.toString())
-            .navigation()
-    }
-
-    @JvmStatic
-    fun directToUserInfo(source: String) {
-        val uri = Uri.Builder()
-            .path(RouteConsts.activity.userInfoActivity)
-            .appendQueryParameter(RouteConsts.QueryParams.REQUIRE_LOGIN, "true")
-            .appendQueryParameter(RouteConsts.QueryParams.SOURCE, source)
-            .build()
-
-        TheRouter.build(uri.toString())
-            .navigation()
-    }
-
-    @JvmStatic
-    fun directToCleanApk(context: Context, source: String) {
-        val uri = Uri.Builder()
-            .path(RouteConsts.activity.cleanApkActivity)
-            .appendQueryParameter(RouteConsts.QueryParams.SOURCE, source)
-            .build()
-
-        PermissionHelper.checkManageAllFilesOrStoragePermissionBeforeAction(context) {
-            TheRouter.build(uri.toString())
-                .navigation()
-        }
-    }
-
-    @JvmStatic
-    fun directToAccountSecurity(source: String, isLogoutStyle: Boolean = false) {
-        val uri = Uri.Builder()
-            .path(RouteConsts.activity.securityActivity)
-            .appendQueryParameter(RouteConsts.QueryParams.REQUIRE_LOGIN, "true")
-            .appendQueryParameter(RouteConsts.QueryParams.SOURCE, source)
-            .build()
-
-        TheRouter.build(uri.toString())
-            .withString(KEY_ENTRANCE, source)
-            .withBoolean(KEY_DISPLAY_TYPE, isLogoutStyle)
-            .navigation()
-    }
-
-    // 跳转云存档详情页
-    @JvmStatic
-    fun directToCloudArchive(
-        context: Context,
-        gameId: String,
-        gameName: String,
-        configUrl: String = "",
-        entrance: String = ""
-    ) {
-        val bundle = Bundle()
-        val gameEntity = GameEntity(id = gameId, name = gameName)
-        bundle.putParcelable(KEY_GAME_ENTITY, gameEntity)
-        bundle.putString(KEY_ARCHIVE_CONFIG_URL, configUrl)
-        bundle.putString(KEY_ENTRANCE, entrance)
-        bundle.putBoolean(KEY_USE_ALTERNATIVE_LAYOUT, true)
-        context.startActivity(ShellActivity.getIntent(context, Type.CLOUD_ARCHIVE, bundle))
-    }
-
-    @JvmStatic
-    fun navigateToMyAssetsPage(context: Context, entrance: String?) {
-        if (CheckLoginUtils.isLogin()) {
-            TheRouter.build(RouteConsts.activity.myAssetsActivity).navigation(context)
-        } else {
-            CheckLoginUtils.checkLogin(context, entrance, null)
-        }
-
-    }
 }

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

@@ -176,8 +176,7 @@ object DownloadItemUtils {
         pluginLocation: PluginLocation? = PluginLocation.only_game,
         hideDownloadBtnIfNoAvailableContent: Boolean = false,
         briefStyle: String? = null,
-        isShowRecommendStar: Boolean = false,
-        listener: DownloadButton.OnUpdateListener? = null
+        isShowRecommendStar: Boolean = false
     ) {
         holder.gameDownloadBtn.putObject(gameEntity)
 
@@ -190,8 +189,7 @@ object DownloadItemUtils {
                 holder.gameDownloadBtn,
                 gameEntity,
                 hideDownloadBtnIfNoAvailableContent,
-                pluginLocation,
-                listener
+                pluginLocation
             )
             return
         }
@@ -212,8 +210,7 @@ object DownloadItemUtils {
             holder.gameDownloadBtn,
             gameEntity,
             hideDownloadBtnIfNoAvailableContent,
-            pluginLocation,
-            listener
+            pluginLocation
         )
     }
 
@@ -222,8 +219,7 @@ object DownloadItemUtils {
         downloadBtn: DownloadButton,
         gameEntity: GameEntity,
         hideDownloadBtnIfNoAvailableContent: Boolean = false,
-        pluginLocation: PluginLocation? = PluginLocation.only_game,
-        listener: DownloadButton.OnUpdateListener?
+        pluginLocation: PluginLocation? = PluginLocation.only_game
     ) {
         // 控制是否显示下载按钮
         downloadBtn.goneIf(context.getString(R.string.app_name) == gameEntity.name)
@@ -231,7 +227,6 @@ object DownloadItemUtils {
         if (SPUtils.getBoolean(Constants.SP_TEENAGER_MODE) || gameEntity.isSpecialDownload()) {
             downloadBtn.text = "查看"
             downloadBtn.buttonStyle = DownloadButton.ButtonStyle.TEENAGER_MODE
-            listener?.completion(downloadBtn.text)
             return
         }
         if (gameEntity.isReservable) {
@@ -244,7 +239,6 @@ object DownloadItemUtils {
                     buttonStyle = DownloadButton.ButtonStyle.RESERVED
                 }
             }
-            listener?.completion(downloadBtn.text)
             return
         }
         if (RegionSettingHelper.getGameH5DownloadByGameId(gameEntity.id) != null) {
@@ -254,7 +248,6 @@ object DownloadItemUtils {
                 setBackgroundResource(com.gh.gamecenter.common.R.drawable.download_button_normal_style)
                 setTextColor(com.gh.gamecenter.common.R.color.white.toColor(context))
             }
-            listener?.completion(downloadBtn.text)
             return
         }
         if (gameEntity.isMiniGame()) {
@@ -272,7 +265,6 @@ object DownloadItemUtils {
                     text = context.getString(com.gh.gamecenter.feature.R.string.quick_play)
                 }
             }
-            listener?.completion(downloadBtn.text)
             return
         }
         if (gameEntity.getApk().isEmpty() || gameEntity.downloadOffStatus != null) {
@@ -288,9 +280,9 @@ object DownloadItemUtils {
                     isClickable = true
                     buttonStyle = DownloadButton.ButtonStyle.NORMAL
                 } else {
-                    if ("dialog" == offStatus || "third_party" == offStatus) {
+                    if ("dialog" == offStatus) {
                         text = context.getString(com.gh.gamecenter.feature.R.string.check)
-                        buttonStyle = DownloadButton.ButtonStyle.NONE_WITH_HINT
+                        buttonStyle = DownloadButton.ButtonStyle.NORMAL
                     } else if ("updating" == offStatus) {
                         text = context.getString(com.gh.gamecenter.feature.R.string.updating)
                         buttonStyle = DownloadButton.ButtonStyle.UPDATING
@@ -304,7 +296,6 @@ object DownloadItemUtils {
                     downloadBtn.isClickable = false
                 }
             }
-            listener?.completion(downloadBtn.text)
         } else if (gameEntity.getApk().size == 1) {
             // 来自于下载管理的实体快照
             val entityFromDownloadManager = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity)
@@ -363,60 +354,43 @@ object DownloadItemUtils {
                 downloadBtn.apply {
                     when (downloadEntity.status) {
                         DownloadStatus.done -> {
-                            val xapkStatus = downloadEntity.meta[XapkInstaller.XAPK_UNZIP_STATUS]
-                            when {
-                                downloadEntity.isSimulatorGame() && gameEntity.simulator != null -> {
-                                    GameUtils.setDownloadBtnStatus(
-                                        context,
-                                        gameEntity,
-                                        downloadBtn,
-                                        pluginLocation,
-                                        listener
-                                    )
-                                }
-
-                                isVGamePreferred -> {
-                                    buttonStyle =
-                                        if (PackagesManager.isCanUpdate(
-                                                downloadEntity.gameId,
-                                                downloadEntity.packageName,
-                                                asVGame = true
-                                            )
-                                        ) {
-                                            setText(com.gh.gamecenter.feature.R.string.update)
-                                            DownloadButton.ButtonStyle.NORMAL
-                                        } else {
-                                            setText(com.gh.gamecenter.feature.R.string.launch)
-                                            DownloadButton.ButtonStyle.LAUNCH_OR_OPEN
-                                        }
-                                    listener?.completion(downloadBtn.text)
-                                }
-
-                                XapkUnzipStatus.SUCCESS.name == xapkStatus && isInstalling(downloadEntity.path) -> {
+                            if (downloadEntity.isSimulatorGame() && gameEntity.simulator != null) {
+                                GameUtils.setDownloadBtnStatus(context, gameEntity, downloadBtn, pluginLocation)
+                            } else if (isVGamePreferred) {
+                                buttonStyle =
+                                    if (PackagesManager.isCanUpdate(
+                                            downloadEntity.gameId,
+                                            downloadEntity.packageName,
+                                            asVGame = true
+                                        )
+                                    ) {
+                                        setText(com.gh.gamecenter.feature.R.string.update)
+                                        DownloadButton.ButtonStyle.NORMAL
+                                    } else {
+                                        setText(com.gh.gamecenter.feature.R.string.launch)
+                                        DownloadButton.ButtonStyle.LAUNCH_OR_OPEN
+                                    }
+                            } else {
+                                val xapkStatus = downloadEntity.meta[XapkInstaller.XAPK_UNZIP_STATUS]
+                                if (XapkUnzipStatus.SUCCESS.name == xapkStatus && isInstalling(downloadEntity.path)) {
                                     progress = 100
                                     setText(com.gh.gamecenter.feature.R.string.installing)
                                     buttonStyle = DownloadButton.ButtonStyle.INSTALL_NORMAL
-                                    listener?.completion(downloadBtn.text)
                                     return
                                 }
-
-                                XapkUnzipStatus.UNZIPPING.name == xapkStatus -> {
+                                if (XapkUnzipStatus.UNZIPPING.name == xapkStatus) {
                                     val percent = downloadEntity.meta[XapkInstaller.XAPK_UNZIP_PERCENT]
                                     progress = (java.lang.Float.valueOf(percent) * 10).toInt()
                                     text = "$percent%"
                                     buttonStyle = DownloadButton.ButtonStyle.XAPK_UNZIPPING
-                                    listener?.completion(downloadBtn.text)
                                     return
-                                }
-
-                                XapkUnzipStatus.FAILURE.name == xapkStatus -> {
+                                } else if (XapkUnzipStatus.FAILURE.name == xapkStatus) {
                                     setText(com.gh.gamecenter.feature.R.string.install)
                                     buttonStyle = DownloadButton.ButtonStyle.INSTALL_NORMAL
-                                    listener?.completion(downloadBtn.text)
                                     return
                                 }
 
-                                PackagesManager.isInstalled(downloadEntity.packageName) && !downloadEntity.isUpdate -> {
+                                if (PackagesManager.isInstalled(downloadEntity.packageName) && !downloadEntity.isUpdate) {
                                     // 双下载按钮快速安装时存在已下载的安装包过时，需要重新下载的情况
                                     if (PackagesManager.isCanUpdate(
                                             downloadEntity.gameId,
@@ -429,13 +403,9 @@ object DownloadItemUtils {
                                         buttonStyle = DownloadButton.ButtonStyle.LAUNCH_OR_OPEN
                                         setText(com.gh.gamecenter.feature.R.string.launch)
                                     }
-                                    listener?.completion(downloadBtn.text)
-                                }
-
-                                else -> {
+                                } else {
                                     buttonStyle = DownloadButton.ButtonStyle.INSTALL_NORMAL
                                     setText(com.gh.gamecenter.feature.R.string.install)
-                                    listener?.completion(downloadBtn.text)
                                 }
                             }
                             buttonStyle =
@@ -455,24 +425,22 @@ object DownloadItemUtils {
                         DownloadStatus.overflow -> {
                             buttonStyle = DownloadButton.ButtonStyle.NORMAL
                             setText(com.gh.gamecenter.feature.R.string.resume)
-                            listener?.completion(downloadBtn.text)
                         }
 
                         DownloadStatus.cancel -> {
-                            GameUtils.setDownloadBtnStatus(context, gameEntity, downloadBtn, pluginLocation, listener)
+                            GameUtils.setDownloadBtnStatus(context, gameEntity, downloadBtn, pluginLocation)
                         }
 
                         else -> {
                             // do nothing
-                            listener?.completion(downloadBtn.text)
                         }
                     }
                 }
             } else {
-                GameUtils.setDownloadBtnStatus(context, gameEntity, downloadBtn, pluginLocation, listener)
+                GameUtils.setDownloadBtnStatus(context, gameEntity, downloadBtn, pluginLocation)
             }
         } else {
-            GameUtils.setDownloadBtnStatus(context, gameEntity, downloadBtn, pluginLocation, listener)
+            GameUtils.setDownloadBtnStatus(context, gameEntity, downloadBtn, pluginLocation)
         }
     }
 
@@ -542,18 +510,13 @@ object DownloadItemUtils {
             DownloadStatus.downloading -> {
                 if (isMultiVersion) {
                     holder.gameDownloadBtn.buttonStyle = DownloadButton.ButtonStyle.NORMAL
-                    val darkMode =
-                        (holder.gameDownloadTips?.getTag(com.gh.gamecenter.common.R.string.is_dark_mode_on_id) as? Boolean)
-                            ?: false
+                    val darkMode = (holder.gameDownloadTips?.getTag(com.gh.gamecenter.common.R.string.is_dark_mode_on_id) as? Boolean) ?: false
                     val isDarkModeChanged = DarkModeUtils.isDarkModeOn(context) != darkMode
                     if (holder.gameDownloadTips?.visibility == View.GONE || holder.gameDownloadTips?.isAnimating == false || isDarkModeChanged) {
                         holder.gameDownloadTips?.visibility = View.VISIBLE
                         holder.gameDownloadTips?.setDownloadTipsAnimation(true)
                     }
-                    holder.gameDownloadTips?.setTag(
-                        com.gh.gamecenter.common.R.string.is_dark_mode_on_id,
-                        DarkModeUtils.isDarkModeOn(context)
-                    )
+                    holder.gameDownloadTips?.setTag(com.gh.gamecenter.common.R.string.is_dark_mode_on_id, DarkModeUtils.isDarkModeOn(context))
                 } else {
                     holder.gameDownloadTips?.visibility = View.GONE
                     holder.gameDownloadBtn.buttonStyle = DownloadButton.ButtonStyle.DOWNLOADING_NORMAL
@@ -655,11 +618,7 @@ object DownloadItemUtils {
         }
 
         // 缺省情况下回落到游戏简介
-        if (TextUtils.isEmpty(briefStyle)
-            || briefStyle!!.contains("brief")
-            || briefStyle.contains("recommend")
-            || briefStyle.contains("test&appointment")
-        ) {
+        if (TextUtils.isEmpty(briefStyle) || briefStyle!!.contains("brief") || briefStyle.contains("recommend")) {
             holder.gameDes?.visibility = View.VISIBLE
         } else {
             holder.gameDes?.visibility = View.GONE
@@ -880,25 +839,34 @@ object DownloadItemUtils {
                 } else {
                     allStateClickCallback?.onCallback()
                     clickCallback?.onCallback()
-                    ReservationHelper.showCancelReservationDialog(context, gameEntity, {
-                        NewFlatLogUtils.logMyGameCancelReserveDialogClick(
-                            "确定取消",
-                            gameEntity.id,
-                            gameEntity.name ?: ""
-                        )
-                        ReservationHelper.cancelReservation(gameEntity) {
-                            adapter?.notifyItemChanged(position)
-                            refreshCallback?.onCallback()
+                    if ("download" == gameEntity.reserveStatus) {
+                        ReservationHelper.showDeleteReservationDialog(context) {
+                            ReservationHelper.deleteReservation(gameEntity) {
+                                adapter?.notifyItemChanged(position)
+                                refreshCallback?.onCallback()
+                            }
                         }
-                    }, object : CancelListener {
-                        override fun onCancel() {
+                    } else {
+                        ReservationHelper.showCancelReservationDialog(context, gameEntity,{
                             NewFlatLogUtils.logMyGameCancelReserveDialogClick(
-                                "关闭弹窗",
+                                "确定取消",
                                 gameEntity.id,
                                 gameEntity.name ?: ""
                             )
-                        }
-                    })
+                            ReservationHelper.cancelReservation(gameEntity) {
+                                adapter?.notifyItemChanged(position)
+                                refreshCallback?.onCallback()
+                            }
+                        }, object : CancelListener {
+                            override fun onCancel() {
+                                NewFlatLogUtils.logMyGameCancelReserveDialogClick(
+                                    "关闭弹窗",
+                                    gameEntity.id,
+                                    gameEntity.name ?: ""
+                                )
+                            }
+                        })
+                    }
                 }
             }
             return
@@ -1002,8 +970,7 @@ object DownloadItemUtils {
         traceEvent: ExposureEvent? = null,
         refreshCallback: EmptyCallback? = null
     ) {
-        val str =
-            if (downloadBtn is DownloadButton) downloadBtn.text else context.getString(com.gh.gamecenter.feature.R.string.download)
+        val str = if (downloadBtn is DownloadButton) downloadBtn.text else context.getString(com.gh.gamecenter.feature.R.string.download)
         if (gameEntity.getApk().isEmpty()) return
         val apk = gameEntity.getApk().safelyGetInRelease(0) ?: return
 
@@ -1022,16 +989,7 @@ object DownloadItemUtils {
                 addHandler(CheckDownloadHandler())
             }
                 .setProcessEndCallback(gameEntity.id) { asVGame, isSubscribe ->
-                    download(
-                        context,
-                        gameEntity,
-                        downloadBtn,
-                        entrance,
-                        location,
-                        asVGame,
-                        isSubscribe as Boolean,
-                        traceEvent
-                    )
+                    download(context, gameEntity, downloadBtn, entrance, location, asVGame, isSubscribe as Boolean, traceEvent)
                 }
                 .buildHandlerChain()
                 ?.handleRequest(context, gameEntity, shouldPerformAsVGame)
@@ -1050,16 +1008,7 @@ object DownloadItemUtils {
                 addHandler(CheckDownloadHandler())
             }
                 .setProcessEndCallback(gameEntity.id) { asVGame, isSubscribe ->
-                    download(
-                        context,
-                        gameEntity,
-                        downloadBtn,
-                        entrance,
-                        location,
-                        asVGame,
-                        isSubscribe as Boolean,
-                        traceEvent
-                    )
+                    download(context, gameEntity, downloadBtn, entrance, location, asVGame, isSubscribe as Boolean, traceEvent)
                 }
                 .buildHandlerChain()
                 ?.handleRequest(context, gameEntity, shouldPerformAsVGame)
@@ -1078,16 +1027,7 @@ object DownloadItemUtils {
                 addHandler(CheckDownloadHandler())
             }
                 .setProcessEndCallback(gameEntity.id) { asVGame, isSubscribe ->
-                    download(
-                        context,
-                        gameEntity,
-                        downloadBtn,
-                        entrance,
-                        location,
-                        asVGame,
-                        isSubscribe as Boolean,
-                        traceEvent
-                    )
+                    download(context, gameEntity, downloadBtn, entrance, location, asVGame, isSubscribe as Boolean, traceEvent)
                 }
                 .buildHandlerChain()
                 ?.handleRequest(context, gameEntity, shouldPerformAsVGame)

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

@@ -14,7 +14,6 @@ import com.gh.gamecenter.common.base.GlobalActivityManager.getLastPageEntity
 import com.gh.gamecenter.common.base.activity.BaseActivity
 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.entity.SimpleGameEntity
 import com.gh.gamecenter.common.entity.SuggestType
 import com.gh.gamecenter.common.eventbus.EBShowDialog
@@ -54,7 +53,6 @@ object DownloadObserver {
     private const val CORE_EVENT_DOWNLOAD_COMPLETE_LOGGED = "CORE_EVENT_DOWNLOAD_COMPLETE_LOGGED"
 
     private val mRetryableHashMap = hashMapOf<String, Boolean>()
-    private val mRetryableProgressMap = hashMapOf<String, Long>()
 
     /**
      * 当下载任务是 预约上线提醒 触发的，则所有弹窗均不显示
@@ -148,8 +146,7 @@ object DownloadObserver {
                     || DownloadStatus.timeout == status
                 ) {
                     if (mRetryableHashMap[downloadEntity.url] == true
-                        && (NetworkUtils.isWifiConnected(HaloApp.getInstance().application)
-                                || NDownloadBridge.isDownloadViaTrafficAllowed(downloadEntity))
+                        && NetworkUtils.isWifiConnected(HaloApp.getInstance().application)
                     ) {
                         downloadManager.resumeDownload(downloadEntity.url)
                         mRetryableHashMap[downloadEntity.url] = false
@@ -260,7 +257,6 @@ object DownloadObserver {
                     }
 
                     mRetryableHashMap.remove(downloadEntity.url)
-                    mRetryableProgressMap.remove(downloadEntity.url)
 
                     EventBus.getDefault().post(EBDownloadStatus("done", "", "", "", downloadEntity.packageName, ""))
                 }
@@ -268,9 +264,7 @@ object DownloadObserver {
                 DownloadNotificationHelper.addOrUpdateDownloadNotification(downloadEntity)
 
                 // 如果已下载大小发生变化,表示成功恢复下载,则重置重试标记
-                if (status == DownloadStatus.downloading
-                    && downloadEntity.progress != mRetryableProgressMap[downloadEntity.url]) {
-                    mRetryableProgressMap[downloadEntity.url] = downloadEntity.progress
+                if (status == DownloadStatus.downloading) {
                     mRetryableHashMap[downloadEntity.url] = true
                 }
             }
@@ -557,10 +551,6 @@ object DownloadObserver {
             } else {
                 arrayOf()
             }
-
-            val pushMessageId = (HaloApp.get(Constants.PUSH_MESSAGE_ID, false) as? String) ?: ""
-            val pushLinkId = (HaloApp.get(Constants.PUSH_LINK_ENTITY, false) as? LinkEntity)?.link ?: ""
-            val isFromPush = pushMessageId.isNotEmpty()
             SensorsBridge.trackEventWithExposureSource(
                 "DownloadProcessFinish",
                 exposureEvent?.source,
@@ -577,9 +567,6 @@ object DownloadObserver {
                 "last_page_business_id", getLastPageEntity().pageBusinessId,
                 "download_status", downloadEntity.meta[Constants.DOWNLOAD_STATUS_IN_CHINESE] ?: "",
                 "download_type", if (downloadEntity.asVGame()) "畅玩下载" else "本地下载",
-                "is_from_push_notifications", isFromPush,
-                "message_id", pushMessageId,
-                "link_id", pushLinkId,
                 *kvs
             )
         }