fix: 修复 build_with_simple_backup.sh 不能在 mac Bash 上编译的问题

fix: 修复推广打包渠道不生效的问题

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

app/build.gradle

@@ -2,7 +2,9 @@
 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
 
@@ -51,6 +53,10 @@ android {
         }
     }
 
+    ksp {
+        arg("ROUTER_MODULE_NAME", project.getName())
+    }
+
     defaultConfig {
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true
@@ -123,12 +129,6 @@ 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"]
+            java.srcDirs = ['src/main/java', "src/default/java", "src/internal/java"]
         }
         tea {
             java.srcDirs = ['src/main/java', 'src/tea/java']
@@ -378,7 +378,7 @@ dependencies {
     implementation "androidx.annotation:annotation:${annotation}"
 
     implementation "androidx.viewpager2:viewpager2:${viewpager2}"
-    kapt "androidx.room:room-compiler:${room}"
+    ksp("androidx.room:room-compiler:${room}")
 
     implementation "com.tencent.vasdolly:helper:${apkChannelPackage}"
     implementation "com.tencent.vasdolly:writer:${apkChannelPackage}"
@@ -428,7 +428,8 @@ dependencies {
 
     coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:${desugarJdkLibs}"
 
-    kapt "com.alibaba:arouter-compiler:$arouterVersion"
+    kapt "com.google.auto.service:auto-service:${autoServiceVersion}"
+    ksp "cn.therouter:apt:${routerVersion}"
 
     implementation project(':ndownload')
     implementation project(':vspace-bridge:vspace')
@@ -450,9 +451,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'))
@@ -509,6 +510,10 @@ dependencies {
         implementation(project(':feature:sentry'))
     }
 
+    if (gradle.ext.enableRouteDoc) {
+        ksp project(":feature:route_doc")
+    }
+
     implementation(project(':feature:media_select'))
 
     implementation(project(":module_va_api"))

app/src/main/AndroidManifest.xml

@@ -68,6 +68,9 @@
     <!-- 悬浮窗 -->
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
 
+    <!-- 适配 双开/分身 游戏授权登录 -->
+    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
+
     <uses-sdk tools:overrideLibrary="
         com.shuyu.gsyvideoplayer,
         com.shuyu.gsyvideoplayer.lib,
@@ -517,10 +520,6 @@
             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" />
@@ -638,8 +637,9 @@
         <!--            android:theme="@android:style/Theme.Translucent" />-->
 
         <activity
-            android:name="com.gh.gamecenter.SkipActivity"
+            android:name="com.gh.gamecenter.SkipCompatActivity"
             android:exported="true"
+            android:launchMode="singleTask"
             android:theme="@style/Theme.AppCompat.Light.Fullscreen.Transparent">
             <intent-filter>
                 <data android:scheme="ghzhushou" />
@@ -663,7 +663,8 @@
             android:name=".authorization.AuthorizationActivity"
             android:exported="true"
             android:launchMode="singleTask"
-            android:screenOrientation="portrait">
+            android:screenOrientation="portrait"
+            android:taskAffinity=".auth">
             <intent-filter>
                 <data android:scheme="ghzhushou_authorization" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -809,6 +810,10 @@
             android:screenOrientation="portrait"
             android:theme="@style/AppCompatTheme.APP" />
 
+        <activity
+            android:name=".video.poster.PosterEditActivity"
+            android:screenOrientation="portrait" />
+
         <!--        <activity-->
         <!--            android:name="${applicationId}.douyinapi.DouYinEntryActivity"-->
         <!--            android:launchMode="singleTask"-->
@@ -864,10 +869,6 @@
         <!--                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,6 +4,7 @@ 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
@@ -12,12 +13,14 @@ import android.widget.FrameLayout
 import android.widget.TextView
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.fragment.app.Fragment
-import com.alibaba.android.arouter.launcher.ARouter
+import com.therouter.TheRouter
+import com.facebook.drawee.controller.BaseControllerListener
 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.logOpenScreenAdSkip
+import com.gh.common.util.NewFlatLogUtils
 import com.gh.common.util.PackageUtils
 import com.gh.gamecenter.BuildConfig
 import com.gh.gamecenter.MainActivity
@@ -59,6 +62,8 @@ object AdDelegateHelper {
     private val mGameSearchAdList: ArrayList<AdConfig> by lazy { arrayListOf() }
     private var mVGameLaunchAd: AdConfig? = null
 
+    private var ownerSplashAdLoadTime = 0L
+
     val vGameLaunchAd: AdConfig?
         get() = mVGameLaunchAd
 
@@ -76,6 +81,7 @@ object AdDelegateHelper {
     }
 
     var isShowingSplashAd = false // 是否正在显示开屏广告
+    var isOwnerSplashAdShown = false // 自有开屏广告是否展示
     var gameSearchKeyword = ""
 
     fun initAdSdk(context: Context) {
@@ -94,8 +100,7 @@ object AdDelegateHelper {
     private fun initAdSdkInternal(context: Context) {
         // 初始化穿山甲
         if (mCsjAdImpl == null) {
-            mCsjAdImpl =
-                ARouter.getInstance().build(RouteConsts.provider.csjAd).navigation() as? ICsjAdProvider
+            mCsjAdImpl = TheRouter.get(ICsjAdProvider::class.java)
             val csjAppId = if (EnvHelper.isDevEnv) BuildConfig.DEV_CSJ_APPID else BuildConfig.CSJ_APPID
             mCsjAdImpl?.initSDK(context, csjAppId, HaloApp.getInstance().oaid)
             // 监听亮色/暗色模式切换
@@ -303,6 +308,7 @@ object AdDelegateHelper {
     ) {
         val hideCallback = {
             isShowingSplashAd = false
+            isOwnerSplashAdShown = false
             hideAction.invoke()
         }
         if (mSplashAd != null) {
@@ -575,6 +581,8 @@ 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)
@@ -593,38 +601,62 @@ object AdDelegateHelper {
         )
 
         adImage.visibleIf(true)
-        ImageUtils.display(adImage, ad.img)
+        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, "启动广告图加载失败")
+            }
+        })
 
         if (ad.isImageType) {
             adVideo.visibleIf(false)
         } else {
-            adVideo.visibleIf(true)
             adVideo.startPlay(ad.video.url)
         }
         startAdContainer.setOnClickListener {
             // 拦截点击事件传递
         }
         jumpBtn.setOnClickListener {
-            handler.removeMessages(MainActivity.COUNTDOWN_AD)
-            hideCallback.invoke()
-            val linkEntity = ad.jump
-            logOpenScreenAdSkip(
-                ad.id,
-                (if (linkEntity.text != null) linkEntity.text else "")!!,
-                (if (linkEntity.type != null) linkEntity.type else "")!!,
-                (if (linkEntity.link != null) linkEntity.link else "")!!
-            )
-            SensorsBridge.trackEvent(
-                "SplashAdOwnSkip",
-                "splash_ad_id",
-                ad.id,
-                "link_type",
-                linkEntity.type ?: "",
-                "link_id",
-                linkEntity.link ?: "",
-                "link_text",
-                linkEntity.text ?: ""
-            )
+            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 ?: ""
+                )
+            }
         }
         val sources: MutableList<ExposureSource> = ArrayList()
         sources.add(ExposureSource("开屏广告", ad.id))

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

@@ -1,13 +1,10 @@
 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
@@ -15,10 +12,8 @@ import com.gh.gamecenter.core.utils.DisplayUtils
 import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.entity.AdConfig
 
-@Route(path = RouteConsts.provider.vaAd, name = "畅玩启动页广告")
+@com.therouter.inject.ServiceProvider
 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()) {
@@ -104,4 +99,4 @@ class LaunchAdImpl : ILaunchAd {
     companion object {
         private const val AD_PLACEMENT = "畅玩启动"
     }
-}
+}

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

@@ -44,6 +44,16 @@ 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,26 +21,31 @@ 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.*
-import com.gh.gamecenter.feature.entity.GameEntity
-import com.gh.gamecenter.qa.editor.*
+import com.gh.gamecenter.entity.GamesCollectionEntity
+import com.gh.gamecenter.entity.MyVideoEntity
+import com.gh.gamecenter.entity.VideoEntity
 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.PosterEditActivity
+import com.gh.gamecenter.video.poster.video.VideoPosterFragment
 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
@@ -229,6 +234,7 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> constructor(
     @SuppressLint("AddJavascriptInterface", "ClickableViewAccessibility")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        VideoPosterFragment.createVideoCoverFile(this)
         findView()
         onRichClick()
         mViewModel = provideViewModel()
@@ -739,9 +745,9 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> constructor(
             mViewModel.id = id
             mViewModel.videoId = videoId
             val videoEntity = VideoEntity(url = url)
-            val intent =
-                PosterEditActivity.getIntentByVideo(this@BaseRichEditorActivity, videoEntity)
-            startActivityForResult(intent, REQUEST_CODE_IMAGE_CROP)
+            TheRouter.build(RouteConsts.activity.videoCoverEditActivity)
+                .withParcelable(EntranceConsts.KEY_VIDEO_ENTITY, videoEntity)
+                .navigation(this@BaseRichEditorActivity, REQUEST_CODE_IMAGE_CROP)
         }
 
         @JavascriptInterface

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

@@ -4,7 +4,7 @@ import android.app.Activity
 import android.app.Application
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.alibaba.android.arouter.launcher.ARouter
+import com.therouter.TheRouter
 import com.gh.ad.AdDelegateHelper
 import com.gh.common.util.FloatingBackViewManager
 import com.gh.common.xapk.XapkInstaller
@@ -53,7 +53,7 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
         if (GlobalActivityManager.activityCount == 1) {
             // 清除桌面角标
             if (activity !is SplashScreenActivity && activity !is AuthorizationActivity) {
-                val pushProvider = ARouter.getInstance().build(RouteConsts.provider.push).navigation() as? IPushProvider
+                val pushProvider = TheRouter.get(IPushProvider::class.java)
                 pushProvider?.cleanBadgeNumber(activity.applicationContext)
             }
         }
@@ -126,9 +126,7 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
     }
 
     private fun isSuggestionActivity(activity: Activity): Boolean {
-        val helpAndFeedbackProvider =
-            ARouter.getInstance().build(RouteConsts.provider.helpAndFeedback)
-                .navigation() as? IHelpAndFeedbackProvider
+        val helpAndFeedbackProvider = TheRouter.get(IHelpAndFeedbackProvider::class.java)
         return helpAndFeedbackProvider?.isSuggestionActivity(activity) ?: false
     }
 

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

@@ -11,7 +11,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.fragment.app.FragmentManager
-import com.alibaba.android.arouter.launcher.ARouter
+import com.therouter.TheRouter
 import com.gh.common.exposure.ExposureManager
 import com.gh.common.util.*
 import com.gh.common.util.LogUtils
@@ -345,7 +345,7 @@ class DefaultJsApi(
 
     @JavascriptInterface
     fun getPushId(): String {
-        val pushProvider = ARouter.getInstance().build(RouteConsts.provider.push).navigation() as? IPushProvider
+        val pushProvider = TheRouter.get(IPushProvider::class.java)
         return pushProvider?.getRegistrationId(HaloApp.getInstance()) ?: "unknown"
     }
 
@@ -424,8 +424,7 @@ class DefaultJsApi(
 
     @JavascriptInterface
     fun showQaFeedbackDialog(msg: Any) {
-        val mHelpAndFeedbackHelp =
-            ARouter.getInstance().build(RouteConsts.provider.helpAndFeedback).navigation() as? IHelpAndFeedbackProvider
+        val mHelpAndFeedbackHelp = TheRouter.get(IHelpAndFeedbackProvider::class.java)
         mHelpAndFeedbackHelp?.showQaFeedbackDialogFragment(context as AppCompatActivity, msg.toString())
     }
 

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

@@ -15,6 +15,7 @@ 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
@@ -66,6 +67,10 @@ 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 = 10 * 60 * 1000L
+    private const val TIME_PERIOD: Long = 24 * 60 * 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
-            // 时间校对，10分钟一次
+            // 时间校对，24 小时一次
             if (elapsedTime % TIME_PERIOD == 0L) {
                 RetrofitManager.getInstance().api.time
                     .subscribeOn(Schedulers.io())

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

@@ -4,6 +4,7 @@ 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
 
@@ -25,6 +26,10 @@ 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/constant/Config.java

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

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

@@ -15,10 +15,10 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
 import com.gh.common.chain.BrowserInstallHandler;
-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.DownloadChainBuilder;
+import com.gh.common.chain.DownloadChainHandler;
 import com.gh.common.chain.DownloadDialogHelperHandler;
 import com.gh.common.chain.GamePermissionHandler;
 import com.gh.common.chain.LandPageAddressHandler;
@@ -287,19 +287,11 @@ public class BindingAdapters {
                     });
                     break;
                 case RESERVED:
-                    if ("download".equals(gameEntity.getReserveStatus())) {
-                        ReservationHelper.showDeleteReservationDialog(progressBar.getContext(), () -> {
-                            ReservationHelper.deleteReservation(gameEntity, () -> {
-                                updateReservation(progressBar, gameEntity);
-                            });
+                    ReservationHelper.showCancelReservationDialog(progressBar.getContext(),gameEntity, () -> {
+                        ReservationHelper.cancelReservation(gameEntity, () -> {
+                            updateReservation(progressBar, gameEntity);
                         });
-                    } else {
-                        ReservationHelper.showCancelReservationDialog(progressBar.getContext(),gameEntity, () -> {
-                            ReservationHelper.cancelReservation(gameEntity, () -> {
-                                updateReservation(progressBar, gameEntity);
-                            });
-                        });
-                    }
+                    });
                     break;
                 case H5_GAME:
                     LinkEntity linkEntity = gameEntity.getH5Link();
@@ -345,9 +337,9 @@ public class BindingAdapters {
                 }
                 progressBar.setButtonStyle(DownloadButton.ButtonStyle.H5_GAME);
             } else {
-                if (offStatus != null && "dialog".equals(offStatus)) {
+                if (("dialog".equals(offStatus) || "third_party".equals(offStatus))) {
                     progressBar.setText("查看");
-                    progressBar.setButtonStyle(DownloadButton.ButtonStyle.NONE);
+                    progressBar.setButtonStyle(DownloadButton.ButtonStyle.NONE_WITH_HINT);
                 } else if ("updating".equals(offStatus)) {
                     progressBar.setText("更新中");
                     progressBar.setButtonStyle(DownloadButton.ButtonStyle.UPDATING);

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

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

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.UserRepository
+import com.gh.gamecenter.login.user.UserManager
 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)
 
-        UserRepository.getInstance().loginUserInfo.observe(viewLifecycleOwner) {
-            currentUserId = it.data.getShortUserId()
-            binding.tvCurrentName.text = it.data.name
-            binding.ivCurrentAvatar.displayAvatar(it.data.icon)
+        UserManager.getInstance().userInfoEntity?.let {
+            currentUserId = it.getShortUserId()
+            binding.tvCurrentName.text = it.name ?: ""
+            binding.ivCurrentAvatar.displayAvatar(it.icon)
             binding.tvUserId.text = getString(R.string.user_id, currentUserId)
         }
 

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

@@ -31,6 +31,7 @@ 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/fragment/FragmentManagerExt.kt

@@ -0,0 +1,45 @@
+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/iinterface/ISmartRefreshContent.kt

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

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

@@ -103,7 +103,6 @@ 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

@@ -1,18 +0,0 @@
-package com.gh.common.provider
-
-import android.content.Context
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.common.util.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

@@ -1,19 +0,0 @@
-package com.gh.common.provider
-
-import android.content.Context
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.common.util.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,20 +1,15 @@
 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
 
-@Route(path = RouteConsts.provider.app, name = "Application暴露服务")
+@com.therouter.inject.ServiceProvider
 class AppProviderImpl : IAppProvider {
-    override fun init(context: Context?) {
-        // Do nothing
-    }
 
     override fun getAppName(): String {
         return HaloApp.getInstance().getString(R.string.app_name)
@@ -93,4 +88,5 @@ class AppProviderImpl : IAppProvider {
     override fun initImageLoaderIfNeeded() {
         HaloApp.getInstance().initFresco()
     }
+
 }

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

@@ -1,16 +1,13 @@
 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.constant.RouteConsts
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.provider.IBindingAdaptersProvider
 
-@Route(path = RouteConsts.provider.bindingAdapters, name = "BindingAdapters暴露服务")
+@com.therouter.inject.ServiceProvider
 class BindingAdaptersProviderImpl : IBindingAdaptersProvider {
     override fun setGameName(
         view: TextView,
@@ -31,8 +28,4 @@ class BindingAdaptersProviderImpl : IBindingAdaptersProvider {
     override fun setGame(view: View, gameEntity: GameEntity) {
         BindingAdapters.setGame(view, gameEntity)
     }
-
-    override fun init(context: Context?) {
-        // Do nothing
-    }
 }

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

@@ -1,12 +1,9 @@
 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
 
-@Route(path = RouteConsts.provider.browserInstallHelper, name = "BrowserInstallHelper暴露服务")
+@com.therouter.inject.ServiceProvider
 class BrowserInstallHelperProviderImpl : IBrowserInstallHelperProvider {
     override fun isUseBrowserToInstallEnabled(): Boolean = BrowserInstallHelper.isUseBrowserToInstallEnabled()
 
@@ -15,9 +12,4 @@ 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,17 +1,10 @@
 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
 
-@Route(path = RouteConsts.provider.buildConfig, name = "BuildConfig暴露服务")
+@com.therouter.inject.ServiceProvider
 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,18 +1,12 @@
 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
 
-@Route(path = RouteConsts.provider.checkLogin, name = "CheckLoginUtils暴露服务")
+@com.therouter.inject.ServiceProvider
 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,20 +3,16 @@ 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.therouter.router.Route
 import com.gh.gamecenter.CommentDetailActivity
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.feature.provider.ICommentDetailProvider
 import com.gh.gamecenter.feature.entity.MessageEntity
 
-@Route(path = RouteConsts.provider.commentDetail, name = "CommentDetailActivity暴露服务")
+@com.therouter.inject.ServiceProvider
 class CommentDetailProviderImpl : ICommentDetailProvider {
 
     override fun getIntent(context: Context, commentId: String?, message: Parcelable): Intent {
         return CommentDetailActivity.getIntent(context, commentId, message as MessageEntity.Article)
     }
-
-    override fun init(context: Context?) {
-        // Do nothing
-    }
-}
+}

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

@@ -1,18 +1,14 @@
 package com.gh.common.provider
 
 import android.content.Context
-import com.alibaba.android.arouter.facade.annotation.Route
+import com.therouter.router.Route
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.ICommentManagerProvider
 import com.gh.gamecenter.manager.CommentManager
 
-@Route(path = RouteConsts.provider.commentManager, name = "CommentManager暴露服务")
+@com.therouter.inject.ServiceProvider
 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.alibaba.android.arouter.facade.annotation.Route
+import com.therouter.router.Route
 import com.gh.common.util.CommentUtils
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.feature.provider.ICommentUtilsProvider
 
-@Route(path = RouteConsts.provider.commentUtils, name = "CommentUtils暴露服务")
+@com.therouter.inject.ServiceProvider
 class CommentUtilsProviderImpl : ICommentUtilsProvider {
     override fun setCommentTime(textView: TextView, time: Long) {
         CommentUtils.setCommentTime(textView, time)
@@ -16,8 +16,4 @@ 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.alibaba.android.arouter.facade.annotation.Route
+import com.therouter.router.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
 
-@Route(path = RouteConsts.provider.concernContentUtils, name = "ConcernContentUtils暴露服务")
+@com.therouter.inject.ServiceProvider
 class ConcernArticleUtilsProviderImpl : IConcernArticleUtilsProvider {
     override fun addContentPic(
         context: Context,
@@ -95,8 +95,4 @@ 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.alibaba.android.arouter.facade.annotation.Route
+import com.therouter.router.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
 
-@Route(path = RouteConsts.provider.concernGiftPackUtils, name = "ConcernGiftPackUtils暴露服务")
+@com.therouter.inject.ServiceProvider
 class ConcernGiftPackUtilsProviderImpl : IConcernGiftPackUtilsProvider {
     override fun createBinding(parent: ViewGroup): ViewBinding {
         val inflater = LayoutInflater.from(parent.context)
@@ -48,7 +48,4 @@ 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,19 +2,15 @@ package com.gh.common.provider
 
 import android.content.Context
 import android.content.Intent
-import com.alibaba.android.arouter.facade.annotation.Route
+import com.therouter.router.Route
 import com.gh.gamecenter.ConcernActivity
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IConcernProvider
 
-@Route(path = RouteConsts.provider.concernActivity, name = "ConcernActivity暴露服务")
+@com.therouter.inject.ServiceProvider
 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,18 +2,14 @@ package com.gh.common.provider
 
 import android.content.Context
 import androidx.appcompat.app.AppCompatActivity
-import com.alibaba.android.arouter.facade.annotation.Route
+import com.therouter.router.Route
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IConcernShareNewsProvider
 import com.gh.gamecenter.newsdetail.NewsShareDialog
 
-@Route(path = RouteConsts.provider.concernShareNews, name = "ConcernShareNews暴露服务")
+@com.therouter.inject.ServiceProvider
 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,12 +1,9 @@
 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
 
-@Route(path = RouteConsts.provider.config, name = "Config暴露服务")
+@com.therouter.inject.ServiceProvider
 class ConfigProviderImpl : IConfigProvider {
     override fun getTencentAppId(): String {
         return Config.TENCENT_APPID
@@ -103,8 +100,4 @@ 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,19 +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.feature.entity.SettingsEntity
 import com.gh.gamecenter.feature.provider.IConfigSettingProvider
 
-@Route(path = RouteConsts.provider.configSetting, name = "Config.getSettings暴露服务")
+@com.therouter.inject.ServiceProvider
 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

@@ -0,0 +1,58 @@
+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.alibaba.android.arouter.facade.annotation.Route
+import com.therouter.router.Route
 import com.gh.common.util.DataCollectionUtils
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.feature.provider.IDataCollectionProvider
 
-@Route(path = RouteConsts.provider.dataCollection, name = "DataCollectionUtils暴露服务")
+@com.therouter.inject.ServiceProvider
 class DataCollectionProviderImpl : IDataCollectionProvider {
     override fun uploadClick(context: Context, vararg args: String) {
         DataCollectionUtils.uploadClick(context, *args)
@@ -15,8 +15,4 @@ 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,20 +1,12 @@
 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
 
-@Route(path = RouteConsts.provider.dataUtils, name = "DataUtils暴露服务")
+@com.therouter.inject.ServiceProvider
 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.alibaba.android.arouter.facade.annotation.Route
+import com.therouter.router.Route
 import com.gh.common.DefaultUrlHandler
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IDefaultUrlHandlerProvider
 
-@Route(path = RouteConsts.provider.defaultUrlHandler, name = "DefaultUrlHandler暴露服务")
+@com.therouter.inject.ServiceProvider
 class DefaultUrlHandlerProviderImpl : IDefaultUrlHandlerProvider {
 
     override fun interceptUrl(
@@ -19,7 +19,4 @@ 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,14 +2,12 @@ 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
 
-@Route(path = RouteConsts.provider.dialogUtils, name = "DialogUtils暴露服务")
+@com.therouter.inject.ServiceProvider
 class DialogUtilsProviderImpl : IDialogUtilsProvider {
     override fun showRegulationTestDialog(context: Context, confirm: () -> Unit, cancel: () -> Unit) {
         DialogUtils.showRegulationTestDialog(context, object : ConfirmListener {
@@ -45,8 +43,4 @@ 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.alibaba.android.arouter.facade.annotation.Route
+import com.therouter.router.Route
 import com.gh.common.util.DirectUtils
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IDirectProvider
 
-@Route(path = RouteConsts.provider.directUtils, name = "DirectUtils暴露服务")
+@com.therouter.inject.ServiceProvider
 class DirectProviderImpl : IDirectProvider {
 
     override fun directToWebView(context: Context, url: String, entrance: String?) {
@@ -96,8 +96,4 @@ 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,10 +1,7 @@
 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.RouteConsts
 import com.gh.gamecenter.common.exposure.ExposureSource
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.entity.GameUpdateEntity
@@ -17,7 +14,7 @@ import com.gh.gamecenter.packagehelper.PackageRepository
 import com.lightgame.download.DownloadEntity
 import com.lightgame.utils.Utils
 
-@Route(path = RouteConsts.provider.downloadButtonClickedHandler, name = "DownloadButton点击事件暴露服务")
+@com.therouter.inject.ServiceProvider
 class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
     override fun onClicked(downloadButton: DownloadButton) {
         var gameId = ""
@@ -115,6 +112,12 @@ 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(
@@ -124,7 +127,7 @@ class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
                     "game_name", gameName,
                     "game_type", gameTypeInChinese,
                     "download_status", downloadStatusInChinese,
-                    "button_name", downloadButton.text,
+                    "button_name", text,
                     "game_schema_type", gameSchemaType,
                     "download_type", downloadType,
                     "page_name", GlobalActivityManager.getCurrentPageEntity().pageName,
@@ -139,8 +142,4 @@ class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
         }
     }
 
-    override fun init(context: Context?) {
-        // do nothing
-    }
-
 }

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

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

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

@@ -5,15 +5,16 @@ import android.content.Intent
 import android.os.Build
 import android.os.Bundle
 import androidx.fragment.app.FragmentActivity
-import com.alibaba.android.arouter.facade.annotation.Route
+import com.therouter.router.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
 
-@Route(path = RouteConsts.provider.entranceUtils, name = "EntranceUtils暴露服务")
+@com.therouter.inject.ServiceProvider
 class EntranceUtilsProviderImpl : IEntranceUtilsProvider {
+
     override fun jumpActivity(context: Context, bundle: Bundle) {
         EntranceUtils.jumpActivity(context, bundle)
     }
@@ -32,10 +33,6 @@ 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,14 +1,11 @@
 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
 
-@Route(path = RouteConsts.provider.errorHelper, name = "ErrorHelper暴露服务")
+@com.therouter.inject.ServiceProvider
 class ErrorHelperProviderImpl : IErrorHelperProvider {
 
     override fun handleError(
@@ -28,7 +25,4 @@ 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,20 +1,15 @@
 package com.gh.common.provider
 
 import android.content.Context
-import com.alibaba.android.arouter.facade.annotation.Route
+import com.therouter.router.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
 
-@Route(path = RouteConsts.provider.exposureManager, name = "ExposureManager暴露服务")
+@com.therouter.inject.ServiceProvider
 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,18 +1,11 @@
 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
 
-@Route(path = RouteConsts.provider.fixedRateJobHelper, name = "FixedRateJobHelper暴露服务")
+@com.therouter.inject.ServiceProvider
 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,23 +2,16 @@ package com.gh.common.provider
 
 import android.content.Context
 import android.content.Intent
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.feature.provider.IGameCollectionDetailProvider
 import com.gh.gamecenter.gamecollection.detail.GameCollectionDetailActivity
 
-@Route(path = RouteConsts.provider.gameCollectionDetail, name = "GameCollectionDetailActivity暴露服务")
+@com.therouter.inject.ServiceProvider
 class GameCollectionDetailProviderImpl : IGameCollectionDetailProvider {
-    override fun getIntent(context: Context, gameCollectionId: String, isFromSquare: Boolean): Intent {
-        return GameCollectionDetailActivity.getIntent(context, gameCollectionId, isFromSquare)
+    override fun getIntent(context: Context, gameCollectionId: String, isFromSquare: Boolean, entrance: String): Intent {
+        return GameCollectionDetailActivity.getIntent(context, gameCollectionId, isFromSquare, entrance)
     }
 
-    override fun getSpecifiedCommentIntent(context: Context, gameCollectionId: String, topCommentId: String): Intent {
-        return GameCollectionDetailActivity.getSpecifiedCommentIntent(context, gameCollectionId, topCommentId)
-    }
-
-
-    override fun init(context: Context?) {
-        // Do nothing
+    override fun getSpecifiedCommentIntent(context: Context, gameCollectionId: String, topCommentId: String, entrance: String): Intent {
+        return GameCollectionDetailActivity.getSpecifiedCommentIntent(context, gameCollectionId, topCommentId, entrance)
     }
 }

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

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

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

@@ -1,18 +1,14 @@
 package com.gh.common.provider
 
 import android.content.Context
-import com.alibaba.android.arouter.facade.annotation.Route
+import com.therouter.router.Route
 import com.gh.common.util.GameTrendsHelper
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IGameTrendsHelperProvider
 
-@Route(path = RouteConsts.provider.gameTrendsHelper, name = "GameTrendsHelper暴露服务")
+@com.therouter.inject.ServiceProvider
 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,17 +1,14 @@
 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
 
-@Route(path = RouteConsts.provider.handleGameResponse, name = "处理游戏类型返回")
+@com.therouter.inject.ServiceProvider
 class HandleGameResponseProviderImpl : IHandleGameResponseProvider {
 
     override fun handleGameResponse(response: List<Any>, entrance: String): List<Any> {
@@ -37,8 +34,4 @@ class HandleGameResponseProviderImpl : IHandleGameResponseProvider {
         return response
     }
 
-    override fun init(context: Context?) {
-        // Do nothing
-    }
-
 }

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

@@ -1,18 +1,11 @@
 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
 
-@Route(path = RouteConsts.provider.historyHelper, name = "HistoryHelper暴露服务")
+@com.therouter.inject.ServiceProvider
 class HistoryHelperProviderImpl : IHistoryHelperProvider {
     override fun emptyDatabase() {
         HistoryHelper.emptyDatabase()
     }
-
-    override fun init(context: Context?) {
-        // Do nothing
-    }
 }

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.alibaba.android.arouter.facade.annotation.Route
+import com.therouter.router.Route
 import com.gh.common.util.LibaoUtils
 import com.gh.common.util.LibaoUtils.PostLibaoListener
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.ILibaoUtilsProvider
 
-@Route(path = RouteConsts.provider.libaoUtils, name = "LibaoUtils暴露服务")
+@com.therouter.inject.ServiceProvider
 class LibaoUtilsProviderImpl : ILibaoUtilsProvider {
     override fun getLibaoStatus(ids: String, successCallback: ((Any?) -> Unit)?, failureCallback: (() -> Unit)?) {
         LibaoUtils.getLibaoStatus(ids, object : PostLibaoListener {
@@ -20,8 +20,4 @@ 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.alibaba.android.arouter.facade.annotation.Route
+import com.therouter.router.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
 
-@Route(path = RouteConsts.provider.linkDirectUtils, name = "DirectUtils暴露服务，主要是暴露directToLinkPage方法")
+@com.therouter.inject.ServiceProvider
 class LinkDirectUtilsProviderImpl : ILinkDirectUtilsProvider {
 
     override fun directToLinkPage(
@@ -61,7 +61,4 @@ 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,19 +1,13 @@
 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.*
 
-@Route(path = RouteConsts.provider.logUtils, name = "LogUtils暴露服务")
+@com.therouter.inject.ServiceProvider
 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

@@ -1,19 +0,0 @@
-package com.gh.common.provider
-
-import android.content.Context
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.common.util.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.alibaba.android.arouter.facade.annotation.Route
+import com.therouter.router.Route
 import com.gh.gamecenter.MessageDetailActivity
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.feature.entity.ConcernEntity
 import com.gh.gamecenter.feature.provider.IMessageDetailProvider
 
-@Route(path = RouteConsts.provider.messageDetail, name = "MessageDetailActivity暴露服务")
+@com.therouter.inject.ServiceProvider
 class MessageDetailProviderImpl : IMessageDetailProvider {
 
     override fun getIntentById(
@@ -24,8 +24,4 @@ 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,16 +1,13 @@
 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
 
-@Route(path = RouteConsts.provider.messageUnreadRepository, name = "MessageUnreadRepository暴露服务")
+@com.therouter.inject.ServiceProvider
 class MessageUnreadRepositoryProviderImpl : IMessageUnreadRepositoryProvider {
 
     override fun loadMessageUnreadData() {
@@ -33,7 +30,4 @@ 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.alibaba.android.arouter.facade.annotation.Route
+import com.therouter.router.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
 
-@Route(path = RouteConsts.provider.miniGameRecentPlayed, name = "MiniGameRecentlyPlayed暴露服务")
+@com.therouter.inject.ServiceProvider
 class MiniGameRecentlyPlayedProviderImpl : IMiniGameRecentlyPlayedProvider {
     override fun clearMiniGameRecentlyPlayed(gameType: String) {
         MiniGameRecentlyPlayUseCase.clearRecentlyPlayedMiniGameList(gameType)
@@ -16,8 +16,4 @@ 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.alibaba.android.arouter.facade.annotation.Route
+import com.therouter.router.Route
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.feature.provider.INewCommentDetailProvider
 import com.gh.gamecenter.qa.comment.NewCommentDetailActivity
 
-@Route(path = RouteConsts.provider.newCommentDetail, name = "NewCommentDetailActivity暴露服务")
+@com.therouter.inject.ServiceProvider
 class NewCommentDetailProviderImpl : INewCommentDetailProvider {
 
     override fun getAnswerCommentIntent(
@@ -76,8 +76,4 @@ class NewCommentDetailProviderImpl : INewCommentDetailProvider {
             path
         )
     }
-
-    override fun init(context: Context?) {
-        // Do nothing
-    }
 }

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

@@ -1,19 +0,0 @@
-package com.gh.common.provider
-
-import android.content.Context
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.common.util.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,13 +1,11 @@
 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
 
-@Route(path = RouteConsts.provider.packageInstaller, name = "PackageInstaller暴露服务")
+@com.therouter.inject.ServiceProvider
 class PackageInstallerProviderImpl : IPackageInstallerProvider {
 
     override fun install(context: Context, downloadEntity: DownloadEntity, showUnzipToast: Boolean) {
@@ -18,7 +16,4 @@ 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,14 +2,12 @@ package com.gh.common.provider
 
 import android.content.Context
 import android.content.pm.PackageInfo
-import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.common.util.PackageHelper
 import com.gh.common.util.PackageUtils
-import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IPackageUtilsProvider
 import com.gh.gamecenter.core.utils.ProcessUtil
 
-@Route(path = RouteConsts.provider.packageUtils, name = "PackageUtils暴露服务")
+@com.therouter.inject.ServiceProvider
 class PackageUtilsProviderImpl : IPackageUtilsProvider {
     override fun obtainProcessName(): String? {
         return ProcessUtil.getCurrentProcessName()
@@ -50,8 +48,4 @@ 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,13 +1,10 @@
 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
 
-@Route(path = RouteConsts.provider.packagesManager, name = "PackagesManager暴露服务")
+@com.therouter.inject.ServiceProvider
 class PackagesManagerProviderImpl: IPackagesManagerProvider {
     override fun isCanPluggable(gameId: String?, packageName: String?): Boolean {
         return PackagesManager.isCanPluggable(gameId, packageName)
@@ -16,8 +13,4 @@ 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,14 +1,11 @@
 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
 
-@Route(path = RouteConsts.provider.regionSettingHelper, name = "RegionSettingHelper暴露服务")
+@com.therouter.inject.ServiceProvider
 class RegionSettingHelperProviderImpl : IRegionSettingHelperProvider {
     override fun shouldThisGameDisplayMirrorInfo(gameId: String): Boolean {
         return RegionSettingHelper.shouldThisGameDisplayMirrorInfo(gameId)
@@ -33,8 +30,4 @@ 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,12 +1,9 @@
 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
 
-@Route(path = RouteConsts.provider.reservationRepository, name = "ReservationRepository暴露服务")
+@com.therouter.inject.ServiceProvider
 class ReservationRepositoryProviderImpl : IReservationRepositoryProvider {
 
     override fun refreshReservations() {
@@ -16,8 +13,4 @@ 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.alibaba.android.arouter.facade.annotation.Route
+import com.therouter.router.Route
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.ISearchTabUtilsProvider
 import com.gh.gamecenter.search.viewmodel.SearchTabViewModel
 
-@Route(path = RouteConsts.provider.searchTabUtils, name = "SearchTabUtils暴露服务")
+@com.therouter.inject.ServiceProvider
 class SearchTabUtilsProviderImpl : ISearchTabUtilsProvider {
 
     override fun obtainParentViewModel(fragment: Fragment): ViewModel {
@@ -29,8 +29,4 @@ class SearchTabUtilsProviderImpl : ISearchTabUtilsProvider {
             null
         }
 
-
-    override fun init(context: Context?) {
-       // no implement
-    }
-}
+}

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

@@ -1,19 +0,0 @@
-package com.gh.common.provider
-
-import android.content.Context
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.gamecenter.ShareCardPicActivity
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.feature.entity.ConcernEntity
-import com.gh.gamecenter.feature.provider.IShareCardPicProvider
-
-@Route(path = RouteConsts.provider.shareCardPicActivity, name = "ShareCardPicActivity暴露服务")
-class ShareCardPicProviderImpl : IShareCardPicProvider {
-    override fun startShareCardPicActivity(context: Context, concernEntity: ConcernEntity, entrance: String) {
-        ShareCardPicActivity.startShareCardPicActivity(context, concernEntity, entrance)
-    }
-
-    override fun init(context: Context?) {
-        // do nothing
-    }
-}

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

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

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

@@ -3,17 +3,11 @@ 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
 
-@Route(path = RouteConsts.provider.shellActivity, name = "ShellActivity暴露服务")
+@com.therouter.inject.ServiceProvider
 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,19 +2,15 @@ package com.gh.common.provider
 
 import android.content.Context
 import android.content.Intent
-import com.alibaba.android.arouter.facade.annotation.Route
+import com.therouter.router.Route
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.feature.provider.ISimpleAnswerDetailProvider
 import com.gh.gamecenter.qa.answer.detail.SimpleAnswerDetailActivity
 
-@Route(path = RouteConsts.provider.simpleAnswerDetail, name = "SimpleAnswerDetailActivity暴露服务")
+@com.therouter.inject.ServiceProvider
 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.alibaba.android.arouter.facade.annotation.Route
+import com.therouter.router.Route
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.feature.provider.ISubjectProvider
 import com.gh.gamecenter.subject.SubjectActivity
 
-@Route(path = RouteConsts.provider.subject, name = "SubjectActivity暴露服务")
+@com.therouter.inject.ServiceProvider
 class SubjectProviderImpl : ISubjectProvider {
     override fun startSubjectActivity(
         context: Context,
@@ -17,8 +17,4 @@ 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

@@ -1,19 +0,0 @@
-package com.gh.common.provider
-
-import android.content.Context
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.gamecenter.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,15 +1,12 @@
 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
 
-@Route(path = RouteConsts.provider.updateManager, name = "UpdateManager暴露服务")
+@com.therouter.inject.ServiceProvider
 class UpdateManagerProviderImpl: IUpdateManagerProvider {
     override fun checkUpdate(activity: FragmentActivity, ignoreSuppressOption: Boolean) {
         val dialog = DialogUtils.showWaitDialog(activity, "检查更新中...")
@@ -26,8 +23,4 @@ class UpdateManagerProviderImpl: IUpdateManagerProvider {
             }
         }
     }
-
-    override fun init(context: Context?) {
-        // Do nothing
-    }
 }

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

@@ -3,20 +3,16 @@ package com.gh.common.provider
 import android.content.Context
 import android.os.Build
 import androidx.annotation.RequiresApi
-import com.alibaba.android.arouter.facade.annotation.Route
+import com.therouter.router.Route
 import com.gh.common.util.UsageStatsHelper
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IUsageStatsHelperProvider
 
-@Route(path = RouteConsts.provider.usageStatsHelper, name = "UsageStatsHelper暴露服务")
+@com.therouter.inject.ServiceProvider
 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,13 +1,11 @@
 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
 
-@Route(path = RouteConsts.provider.vhelper, name = "VHelper暴露服务")
+@com.therouter.inject.ServiceProvider
 class VHelperProviderImpl: IVHelperProvider {
     override fun isVGameOn(): Boolean {
         return VHelper.isVGameOn()
@@ -20,8 +18,4 @@ 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.alibaba.android.arouter.facade.annotation.Route
+import com.therouter.router.Route
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IVisitManagerProvider
 import com.gh.gamecenter.manager.VisitManager
 
-@Route(path = RouteConsts.provider.visitManager, name = "VisitManager暴露服务")
+@com.therouter.inject.ServiceProvider
 class VisitManagerProviderImpl : IVisitManagerProvider {
     override fun updateOkhttpCache(context: Context, newsId: String) {
         VisitManager.updateOkhttpCache(context, newsId)
@@ -15,8 +15,4 @@ 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,12 +2,10 @@ 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
 
-@Route(path = RouteConsts.provider.webActivity, name = "WebActivity暴露服务")
+@com.therouter.inject.ServiceProvider
 class WebProviderImpl : IWebProvider {
     override fun getIntent(context: Context, url: String, autoCompletionTitle: Boolean): Intent {
         return WebActivity.getIntent(context, url, autoCompletionTitle)
@@ -40,8 +38,4 @@ 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,23 +1,15 @@
 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
 
-@Route(path = RouteConsts.provider.wechatHelper, name = "WechatHelper暴露服务")
-class WechatHelperProviderImpl : IWechatBindHelperProvider<WechatConfigEntity> {
+@com.therouter.inject.ServiceProvider
+class WechatHelperProviderImpl : IWechatBindHelperProvider {
 
-    override fun getWechatConfig(callback: ((WechatConfigEntity) -> Unit)?) {
+    override fun getWechatConfig(callback: ((Any) -> Unit)?) {
         WechatBindHelper.getWechatConfig {
             callback?.invoke(it)
         }
     }
 
-
-    override fun init(context: Context?) {
-        // Do nothing
-    }
 }

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

@@ -4,6 +4,8 @@ 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
@@ -284,7 +286,11 @@ object SimulatorGameManager {
                         entity.isRecentlyPlayed = it.id == gameId
                         simulatorGameRecordList.add(entity)
                     }
-                    simulatorGameDao.addSimulatorGameList(simulatorGameRecordList)
+                    try {
+                        simulatorGameDao.addSimulatorGameList(simulatorGameRecordList)
+                    } catch (e: SQLiteException) {
+                        e.printStackTrace()
+                    }
                 }
             })
     }

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

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

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

@@ -9,13 +9,14 @@ import android.preference.PreferenceManager;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.alibaba.android.arouter.launcher.ARouter;
+import com.therouter.TheRouter;
 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,6 +40,11 @@ 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");
     }
@@ -55,7 +61,7 @@ public class DataUtils {
     }
 
     private static void initSentry(Context context, String channel) {
-        ISentryProvider sentryProvider = (ISentryProvider) ARouter.getInstance().build(RouteConsts.provider.sentry).navigation();
+        ISentryProvider sentryProvider = TheRouter.get(ISentryProvider.class);
         if (sentryProvider != null) {
             sentryProvider.init(context, channel, BuildConfig.FLAVOR, BuildConfig.VERSION_NAME);
         }
@@ -65,7 +71,6 @@ 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() {
@@ -89,6 +94,8 @@ public class DataUtils {
     }
 
     private static void onGidReceived(String gid) {
+        bindValidOaidToSensor(false);
+
         HaloApp.getInstance().setGid(gid);
         // 更新广告配置
         AdDelegateHelper.INSTANCE.requestAdConfig(false, "", null);
@@ -111,6 +118,35 @@ public class DataUtils {
         });
     }
 
+    /**
+     * 为神策绑定有效的 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 绑定的实名信息
      */

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

@@ -139,6 +139,7 @@ public class DetailDownloadUtils {
             // 游戏包含多 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);
@@ -457,7 +458,7 @@ public class DetailDownloadUtils {
                 }
                 viewHolder.getDownloadPb().setButtonStyle(DownloadButton.ButtonStyle.H5_GAME);
             } else {
-                if ("dialog".equals(gameEntity.getDownloadOffStatus())) {
+                if ("dialog".equals(gameEntity.getDownloadOffStatus()) || "third_party".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())) {

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

@@ -11,7 +11,6 @@ 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
@@ -56,9 +55,7 @@ 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.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
@@ -69,7 +66,6 @@ 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
@@ -79,7 +75,6 @@ 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
@@ -100,6 +95,7 @@ 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
@@ -180,7 +176,23 @@ object DirectUtils {
         "qa",
         "feedback",
         "toolkit",
-        "float_window_game"
+        "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",
     )
 
     fun directToLinkPage(
@@ -385,8 +397,8 @@ object DirectUtils {
                 }
             }
 
-            "authentication" -> {
-                context.startActivity(ShellActivity.getIntent(context, ShellActivity.Type.REAL_NAME_INFO, null))
+            "authentication", "certification" -> {
+                directToRealName(context)
             }
 
             "user_background" -> {
@@ -444,7 +456,7 @@ object DirectUtils {
                 } ?: ""
             }
 
-            "halo_tab" -> directToHomeMyHaloTab(context)
+            "my_halo", "halo_tab" -> directToHomeMyHaloTab(context)
 
             "common_collection" -> directToCommonCollectionDetail(
                 context,
@@ -526,7 +538,8 @@ object DirectUtils {
                 ToolbarWrapperActivity.getMultiTabNavIntent(
                     context,
                     linkEntity.link ?: "",
-                    linkEntity.text ?: ""
+                    linkEntity.text ?: "",
+                    entrance
                 )
             )
 
@@ -534,16 +547,20 @@ object DirectUtils {
                 ToolbarWrapperActivity.getCustomPageIntent(
                     context,
                     linkEntity.link ?: "",
-                    linkEntity.text ?: ""
+                    linkEntity.text ?: "",
+                    entrance
                 )
             )
 
             // 选中首页底部 tab
             "bottom_tab" -> {
-                val intent = Intent(context, MainActivity::class.java).apply {
-                    flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
+                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())
                 }
-                context.startActivity(intent)
 
                 if (linkEntity is LaunchRedirect) {
                     MainWrapperRepository.getInstance().sendSelectTabEvent(linkEntity)
@@ -570,6 +587,32 @@ 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)
+
             "" -> {
                 // do nothing
             }
@@ -590,12 +633,16 @@ 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)
-        jumpActivity(context, bundle)
+
+        TheRouter.build(RouteConsts.activity.qaActivity)
+            .fillParams {
+                it.putAll(bundle)
+            }
+            .navigation(context)
     }
 
     /**
@@ -604,12 +651,16 @@ 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)
-        jumpActivity(context, bundle)
+
+        TheRouter.build(RouteConsts.activity.qaActivity)
+            .fillParams {
+                it.putAll(bundle)
+            }
+            .navigation(context)
     }
 
     /**
@@ -720,7 +771,7 @@ object DirectUtils {
      */
     @JvmStatic
     fun directToHomeActivity(context: Context, userId: String?, entrance: String? = null, path: String? = null) {
-        context.startActivity(UserHomeActivity.getIntent(context, userId ?: "", entrance, path))
+        directToHomeActivity(context, userId, entrance, path, 0)
     }
 
     @JvmStatic
@@ -759,17 +810,20 @@ object DirectUtils {
         entrance: String? = null,
         path: String? = null
     ) {
-
         IntegralLogHelper.log("view_homepage", "个人主页")
-        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)
+
+        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)
     }
 
 
@@ -801,10 +855,10 @@ object DirectUtils {
         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)
+                "comment" -> bundle.putString(KEY_TARGET, EntranceConsts.TAB_TYPE_RATING)
+                "desc" -> bundle.putString(KEY_TARGET, EntranceConsts.TAB_TYPE_DESC)
+                "forum" -> bundle.putString(KEY_TARGET, EntranceConsts.TAB_TYPE_BBS)
+                "zone" -> bundle.putString(KEY_TARGET, EntranceConsts.TAB_TYPE_TRENDS)
             }
         }
         if (traceEvent != null) {
@@ -849,7 +903,7 @@ object DirectUtils {
         bundle.putString(KEY_ENTRANCE, entrance)
         bundle.putString(KEY_GAMEID, id)
         bundle.putBoolean(KEY_OPEN_VIDEO_STREAMING, true)
-        bundle.putString(KEY_TARGET, GameDetailFragment.TAB_DESC)
+        bundle.putString(KEY_TARGET, EntranceConsts.TAB_TYPE_DESC)
         jumpActivity(context, bundle)
     }
 
@@ -857,7 +911,7 @@ object DirectUtils {
     fun directToGameDetail(
         context: Context,
         id: String,
-        defaultTab: String = GameDetailFragment.TAB_DESC,
+        defaultTab: String = EntranceConsts.TAB_TYPE_DESC,
         entrance: String? = null
     ) {
         val bundle = Bundle()
@@ -1515,7 +1569,7 @@ object DirectUtils {
                     response?.apply {
                         if (zone.status == "on") {
                             if (zone.style == "link") {
-                                directToGameDetail(context, gameId, GameDetailFragment.TAB_TRENDS, entrance)
+                                directToGameDetail(context, gameId, EntranceConsts.TAB_TYPE_TRENDS, entrance)
                             } else {
                                 directToWebView(context, url, entrance)
                             }
@@ -1626,11 +1680,11 @@ object DirectUtils {
      */
     @JvmStatic
     fun directToHelpAndFeedback(context: Context, bundle: Bundle? = null) {
-        val destination = RouteConsts.activity.helpAndFeedbackActivity.toDestinationClass()
-        val newBundle = Bundle()
-        newBundle.putString(KEY_TO, destination?.name ?: "")
-        bundle?.let { newBundle.putAll(it) }
-        jumpActivityCompat(context, newBundle)
+        TheRouter.build(RouteConsts.activity.helpAndFeedbackActivity)
+            .fillParams {
+                it.putAll(bundle)
+            }
+            .navigation(context)
     }
 
 
@@ -1727,8 +1781,7 @@ object DirectUtils {
     @JvmStatic
     fun directToConcernInfo(context: Context, entrance: String) {
         context.startActivity(
-            (ARouter.getInstance().build(RouteConsts.provider.concernInfo)
-                .navigation() as? IConcernInfoProvider)?.getIntent(context, entrance)
+            TheRouter.get(IConcernInfoProvider::class.java)?.getIntent(context, entrance)
         )
     }
 
@@ -1985,10 +2038,7 @@ object DirectUtils {
             return
         }
 
-        val qGameProvider = ARouter
-            .getInstance()
-            .build(RouteConsts.provider.qGame)
-            .navigation() as? IQGameProvider
+        val qGameProvider = TheRouter.get(IQGameProvider::class.java)
 
         if (qGameProvider == null) return
 
@@ -2037,8 +2087,14 @@ object DirectUtils {
     }
 
     @JvmStatic
-    fun directToMessageCenter(defaultTabIndex: Int) {
-        ARouter.getInstance().build(RouteConsts.activity.messageWrapperActivity)
+    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())
             .withInt(BaseActivity_TabLayout.PAGE_INDEX, defaultTabIndex)
             .navigation()
     }
@@ -2072,13 +2128,17 @@ object DirectUtils {
 
     /**
      * 跳转到开服订阅页面
-     * @param context 上下文
      */
     @JvmStatic
-    fun directToServersCalendarManagement(context: Context, entrance: String) {
-        CheckLoginUtils.checkLogin(context, entrance) {
-            context.startActivity(ServersCalendarManagementActivity.getIntent(context))
-        }
+    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 directToSearch(
@@ -2138,4 +2198,100 @@ 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()
+    }
 }

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

@@ -280,9 +280,9 @@ object DownloadItemUtils {
                     isClickable = true
                     buttonStyle = DownloadButton.ButtonStyle.NORMAL
                 } else {
-                    if ("dialog" == offStatus) {
+                    if ("dialog" == offStatus || "third_party" == offStatus) {
                         text = context.getString(com.gh.gamecenter.feature.R.string.check)
-                        buttonStyle = DownloadButton.ButtonStyle.NORMAL
+                        buttonStyle = DownloadButton.ButtonStyle.NONE_WITH_HINT
                     } else if ("updating" == offStatus) {
                         text = context.getString(com.gh.gamecenter.feature.R.string.updating)
                         buttonStyle = DownloadButton.ButtonStyle.UPDATING
@@ -839,34 +839,25 @@ object DownloadItemUtils {
                 } else {
                     allStateClickCallback?.onCallback()
                     clickCallback?.onCallback()
-                    if ("download" == gameEntity.reserveStatus) {
-                        ReservationHelper.showDeleteReservationDialog(context) {
-                            ReservationHelper.deleteReservation(gameEntity) {
-                                adapter?.notifyItemChanged(position)
-                                refreshCallback?.onCallback()
-                            }
+                    ReservationHelper.showCancelReservationDialog(context, gameEntity, {
+                        NewFlatLogUtils.logMyGameCancelReserveDialogClick(
+                            "确定取消",
+                            gameEntity.id,
+                            gameEntity.name ?: ""
+                        )
+                        ReservationHelper.cancelReservation(gameEntity) {
+                            adapter?.notifyItemChanged(position)
+                            refreshCallback?.onCallback()
                         }
-                    } else {
-                        ReservationHelper.showCancelReservationDialog(context, gameEntity,{
+                    }, object : CancelListener {
+                        override fun onCancel() {
                             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

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

@@ -53,6 +53,7 @@ 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>()
 
     /**
      * 当下载任务是 预约上线提醒 触发的，则所有弹窗均不显示
@@ -146,7 +147,8 @@ object DownloadObserver {
                     || DownloadStatus.timeout == status
                 ) {
                     if (mRetryableHashMap[downloadEntity.url] == true
-                        && NetworkUtils.isWifiConnected(HaloApp.getInstance().application)
+                        && (NetworkUtils.isWifiConnected(HaloApp.getInstance().application)
+                                || NDownloadBridge.isDownloadViaTrafficAllowed(downloadEntity))
                     ) {
                         downloadManager.resumeDownload(downloadEntity.url)
                         mRetryableHashMap[downloadEntity.url] = false
@@ -257,6 +259,7 @@ object DownloadObserver {
                     }
 
                     mRetryableHashMap.remove(downloadEntity.url)
+                    mRetryableProgressMap.remove(downloadEntity.url)
 
                     EventBus.getDefault().post(EBDownloadStatus("done", "", "", "", downloadEntity.packageName, ""))
                 }
@@ -264,7 +267,9 @@ object DownloadObserver {
                 DownloadNotificationHelper.addOrUpdateDownloadNotification(downloadEntity)
 
                 // 如果已下载大小发生变化,表示成功恢复下载,则重置重试标记
-                if (status == DownloadStatus.downloading) {
+                if (status == DownloadStatus.downloading
+                    && downloadEntity.progress != mRetryableProgressMap[downloadEntity.url]) {
+                    mRetryableProgressMap[downloadEntity.url] = downloadEntity.progress
                     mRetryableHashMap[downloadEntity.url] = true
                 }
             }

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

@@ -135,12 +135,16 @@ object GameUtils {
             // 畅玩状态优先，且畅玩实体不为空时将 downloadEntity 置为畅玩实体
             if (performAsVGame && vGameDownloadEntity != null) {
                 downloadEntity = vGameDownloadEntity
-            } else if (!performAsVGame && !isFromList && downloadEntity?.isVGameDownloadInDualDownloadMode() == true) {
-                // 下载的任务是由畅玩触发的，游戏详情页不需判定为需要安装
-                downloadEntity = null
-            } else if (performAsVGame && !isFromList && downloadEntity?.isLocalDownloadInDualDownloadMode() == true) {
-                // 下载的任务是由下载安装触发的，游戏详情页不需判定为需要安装
-                downloadEntity = null
+            } else if (!isFromList) {
+                if (!performAsVGame
+                    && gameEntity.isDualBtnModeEnabled()
+                    && downloadEntity?.isVGameDownloadInDualDownloadMode() == true) {
+                    // 下载的任务是由畅玩触发的，并且双下载按钮启用，游戏详情页不需判定为需要安装
+                    downloadEntity = null
+                } else if (performAsVGame && downloadEntity?.isLocalDownloadInDualDownloadMode() == true) {
+                    // 下载的任务是由下载安装触发的，游戏详情页不需判定为需要安装
+                    downloadEntity = null
+                }
             }
 
             if (downloadEntity != null) {

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

@@ -1,9 +1,6 @@
 package com.gh.common.util;
 
-
 import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.Handler;
 import android.os.Message;
@@ -19,10 +16,8 @@ import org.greenrobot.eventbus.EventBus;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
-
 /**
  * 下载完成跳安装，
  */
@@ -49,15 +44,15 @@ public class InstallUtils {
             @Override
             public void handleMessage(Message msg) {
                 if (msg.what == INSTALL_WHAT && packageManager != null) {
-                    List<String> packageNameList = PackageHelper.INSTANCE.getInstalledPackageNameList(context, 0);
-                    ArrayList<String> list = new ArrayList<>(packageNameList);
                     if (installMap != null && installMap.size() != 0) {
                         ArrayList<String> keys = new ArrayList<>();
                         for (String packageName : installMap.keySet()) {
+                            if (TextUtils.isEmpty(packageName)) continue;
+
                             long time = installMap.get(packageName);
                             if (System.currentTimeMillis() - time >= MAX_TIME) {
                                 keys.add(packageName);
-                            } else if (list.contains(packageName)) {
+                            } else if (PackageUtils.isInstalled(context, packageName)) {
                                 keys.add(packageName);
 
                                 DownloadEntity downloadEntity = DownloadManager.getInstance().getDownloadEntityByPackageName(packageName);
@@ -80,7 +75,7 @@ public class InstallUtils {
                             long time = uninstallMap.get(packageName);
                             if (System.currentTimeMillis() - time >= MAX_TIME) {
                                 keys.add(packageName);
-                            } else if (!list.contains(packageName)) {
+                            } else if (!PackageUtils.isInstalled(context, packageName)) {
                                 keys.add(packageName);
                                 EventBus.getDefault().post(new EBPackage("卸载", packageName, "", false));
                             }
@@ -105,6 +100,8 @@ public class InstallUtils {
     }
 
     public void addInstall(String packageName) {
+        if (TextUtils.isEmpty(packageName)) return;
+
         if (installMap == null) {
             installMap = Collections.synchronizedMap(new HashMap<String, Long>());
         }

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

@@ -2778,4 +2778,34 @@ object NewFlatLogUtils {
             parseAndPutMeta()(this)
         }.let(::log)
     }
+
+    // 自有开屏广告加载
+    fun logSplashAdLoad(id: String) {
+        json {
+            KEY_EVENT to "splash_ad_load"
+            "ad_id" to id
+            parseAndPutMeta()(this)
+        }.let(::log)
+    }
+
+    // 自有开屏广告展示
+    fun logSplashAdShow(id: String, duration: Long) {
+        json {
+            KEY_EVENT to "splash_ad_show"
+            "ad_id" to id
+            "duration" to duration
+            parseAndPutMeta()(this)
+        }.let(::log)
+    }
+
+    // 自有开屏广告加载/展示失败
+    @JvmStatic
+    fun logSplashAdFail(id: String, error: String) {
+        json {
+            KEY_EVENT to "splash_ad_fail"
+            "ad_id" to id
+            "error" to error
+            parseAndPutMeta()(this)
+        }.let(::log)
+    }
 }

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

@@ -578,7 +578,6 @@ object PackageHelper {
             Utils.log(TAG, "refreshWrongInstallStatus 检查安装状态异常的应用")
 
             val uninstalledButKeepingWrongStatusPackageNameSet: HashSet<String> = hashSetOf()
-            val updatedButKeepingWrongStatusPackageNameSet: HashSet<String> = hashSetOf()
 
             for (packageName in packageNameSet) {
                 val installedVersionName = PackageUtils.getVersionNameByPackageName(packageName)
@@ -587,18 +586,9 @@ object PackageHelper {
                     && installedVersionName == null
                 ) {
                     uninstalledButKeepingWrongStatusPackageNameSet.add(packageName)
-                } else if (PackagesManager.isInstalled(packageName)
-                    && installedVersionName != null
-                    && !PackagesManager.isInstalledWithSpecificVersion(packageName, installedVersionName)
-                ) {
-                    updatedButKeepingWrongStatusPackageNameSet.add(packageName)
                 }
             }
 
-            Utils.log(
-                TAG,
-                "refreshWrongInstallStatus 需要更新已更新状态的包数量为 ${updatedButKeepingWrongStatusPackageNameSet.size}"
-            )
             Utils.log(
                 TAG,
                 "refreshWrongInstallStatus 需要移除已安装的包数量为 ${uninstalledButKeepingWrongStatusPackageNameSet.size}"
@@ -616,12 +606,6 @@ object PackageHelper {
                         additionalWhiteListPackageNameSet.toString()
                     )
                 }
-
-                if (updatedButKeepingWrongStatusPackageNameSet.isNotEmpty()) {
-                    for (packageName in updatedButKeepingWrongStatusPackageNameSet) {
-                        PackageChangeHelper.addUpdate(packageName)
-                    }
-                }
             }
         }
     }
@@ -635,7 +619,6 @@ object PackageHelper {
 
             val installedButKeepingWrongStatusPackageNameSet: HashSet<String> = hashSetOf()
             val uninstalledButKeepingWrongStatusPackageNameSet: HashSet<String> = hashSetOf()
-            val updatedButKeepingWrongStatusPackageNameSet: HashSet<String> = hashSetOf()
 
             for (game in gameEntityList) {
                 for (apk in game.getApk()) {
@@ -651,13 +634,6 @@ object PackageHelper {
                         && installedVersionName == null
                     ) {
                         uninstalledButKeepingWrongStatusPackageNameSet.add(packageName)
-                    } else if (PackagesManager.isInstalled(packageName)
-                        && installedVersionName != null
-                        && !PackagesManager.isInstalledWithSpecificVersion(packageName, installedVersionName)
-                        && !PackagesManager.isCanUpdate(game.id, packageName, false)
-                    ) {
-                        cachedPkgNameAndGameEntityMap.put(packageName, game)
-                        updatedButKeepingWrongStatusPackageNameSet.add(packageName)
                     }
                 }
             }
@@ -666,10 +642,6 @@ object PackageHelper {
                 TAG,
                 "refreshWrongInstallStatus 需要更新已安装状态的包数量为 ${installedButKeepingWrongStatusPackageNameSet.size}"
             )
-            Utils.log(
-                TAG,
-                "refreshWrongInstallStatus 需要更新已更新状态的包数量为 ${updatedButKeepingWrongStatusPackageNameSet.size}"
-            )
             Utils.log(
                 TAG,
                 "refreshWrongInstallStatus 需要移除已安装的包数量为 ${uninstalledButKeepingWrongStatusPackageNameSet.size}"
@@ -699,12 +671,6 @@ object PackageHelper {
                         additionalWhiteListPackageNameSet.toString()
                     )
                 }
-
-                if (updatedButKeepingWrongStatusPackageNameSet.isNotEmpty()) {
-                    for (packageName in updatedButKeepingWrongStatusPackageNameSet) {
-                        PackageChangeHelper.addUpdate(packageName, cachedPkgNameAndGameEntityMap.remove(packageName))
-                    }
-                }
             }
         }
     }
@@ -814,7 +780,7 @@ object PackageHelper {
             uploadUIDGapLog = false
 
             val uidGap = (android.os.Process.LAST_APPLICATION_UID - lastValidUid) / 100 * 100
-            SentryHelper.onEvent("UID_GAP", "gap", uidGap.toString())
+//            SentryHelper.onEvent("UID_GAP", "gap", uidGap.toString())
         }
 
         return packageList

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

@@ -18,7 +18,6 @@ import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.core.utils.MD5Utils
 import com.gh.gamecenter.core.utils.ToastUtils
-import com.gh.gamecenter.install.InstallService
 import com.gh.vspace.VHelper
 import com.halo.assistant.HaloApp
 import com.lightgame.download.DownloadEntity
@@ -194,12 +193,6 @@ object PackageInstaller {
     private fun install(context: Context, pkgPath: String, pkgName: String?) {
         HaloApp.put(Constants.LAST_INSTALL_GAME, pkgPath)
 
-        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.TIRAMISU && Build.MANUFACTURER.lowercase().contains("xiaomi")) {
-            val foregroundServiceIntent = Intent(context, InstallService::class.java)
-            foregroundServiceIntent.putExtra(InstallService.KEY_SERVICE_ACTION, InstallService.START_FOREGROUND)
-            context.startForegroundService(foregroundServiceIntent)
-        }
-
         val installIntent = getInstallIntent(context, pkgPath)
         context.startActivity(installIntent)
 
@@ -284,7 +277,12 @@ object PackageInstaller {
             installIntent.setDataAndType(uri, "application/vnd.android.package-archive")
         }
 
-        updateSystemInstallerIfAvailable(context, installIntent)
+        // 优选系统的安装器（遇到 Exception 就回落到正常的安装器）
+        try {
+            updateSystemInstallerIfAvailable(context, installIntent)
+        } catch (ignored: Exception) {
+            // ignored
+        }
 
         InstallUtils.getInstance()
             .addInstall(PackageUtils.getPackageNameByPath(context, path))

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

@@ -7,7 +7,7 @@ import com.gh.gamecenter.common.utils.isVGameDownloadInDualDownloadMode
 import com.gh.gamecenter.core.utils.ToastUtils
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.entity.GameInstall
-import com.gh.gamecenter.packagehelper.PackageRepository
+import com.gh.gamecenter.manager.PackagesManager
 import com.gh.vspace.VHelper
 
 object PackageLauncher {
@@ -81,28 +81,11 @@ object PackageLauncher {
         gameEntity: GameEntity? = null,
         packageName: String?
     ) {
-
         if (packageName.isNullOrEmpty()) {
             ToastUtils.toast("启动失败")
             return
         }
 
-        // 获取 GameInstall 实体，用于记录启动日志用
-        val gameInstall = if (gameEntity != null) {
-            GameInstall.transformGameInstall(gameEntity, packageName)
-        } else {
-            PackageRepository.gameInstalled.find { it.packageName == packageName }
-        }
-
-        if (gameInstall != null) {
-            NewFlatLogUtils.logGameLaunch(
-                gameId = gameInstall.id ?: "unknown",
-                gameName =  gameInstall.name ?: "unknown",
-                gameCategory = gameInstall.category ?: "unknown",
-                downloadStatus = if (gameInstall.downloadStatus == "demo") "试玩" else "下载"
-            )
-        }
-
         try {
             val intent = context.applicationContext.packageManager.getLaunchIntentForPackage(packageName)
             if (intent != null) {
@@ -113,6 +96,26 @@ object PackageLauncher {
         } catch (e: Exception) {
             ToastUtils.toast( "启动失败")
         }
+
+        try {
+            // 获取 GameInstall 实体，用于记录启动日志用
+            val gameInstall = if (gameEntity != null) {
+                GameInstall.transformGameInstall(gameEntity, packageName)
+            } else {
+                PackagesManager.getInstalledList().find { it.packageName == packageName }
+            }
+
+            if (gameInstall != null) {
+                NewFlatLogUtils.logGameLaunch(
+                    gameId = gameInstall.id ?: "unknown",
+                    gameName = gameInstall.name ?: "unknown",
+                    gameCategory = gameInstall.category ?: "unknown",
+                    downloadStatus = if (gameInstall.downloadStatus == "demo") "试玩" else "下载"
+                )
+            }
+        } catch (e: RuntimeException) {
+            // 都 DeadSystemException 了，还想啥日志上报
+        }
     }
 
 }

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

@@ -14,7 +14,6 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.PowerManager;
 import android.text.TextUtils;
-import android.util.AndroidException;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -29,9 +28,9 @@ import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.common.constant.Constants;
 import com.gh.gamecenter.common.utils.ExtensionsKt;
 import com.gh.gamecenter.core.utils.MD5Utils;
+import com.gh.gamecenter.entity.GameUpdateEntity;
 import com.gh.gamecenter.feature.entity.ApkEntity;
 import com.gh.gamecenter.feature.entity.GameEntity;
-import com.gh.gamecenter.entity.GameUpdateEntity;
 import com.gh.gamecenter.feature.utils.SentryHelper;
 import com.gh.gamecenter.manager.PackagesManager;
 import com.gh.vspace.VHelper;
@@ -225,17 +224,6 @@ public class PackageUtils {
             }
         } catch (Exception e) {
             e.printStackTrace();
-
-            if (e instanceof AndroidException) {
-                // 有些设备会出现 DeadSystemException
-                SentryHelper.INSTANCE.onEvent(
-                        "GET_META_DATA_ERROR",
-                        "packageName",
-                        packageName,
-                        "exception_digest",
-                        e.getLocalizedMessage()
-                );
-            }
         }
         return null;
     }
@@ -313,7 +301,7 @@ public class PackageUtils {
             Signature[] signatures = packageInfo.signatures;
 
             // 使用幸运破解器破解安卓签名认证可能会出现不用签名也能装的情况，这里有可能是空的
-            if (signatures[0] != null) {
+            if (signatures.length > 0 && signatures[0] != null) {
                 return parseSignature(signatures[0].toByteArray());
             } else {
                 return new String[]{null, null};
@@ -497,7 +485,6 @@ public class PackageUtils {
             }
         } catch (Exception e) {
             e.printStackTrace();
-            SentryHelper.INSTANCE.onEvent("GET_PACKAGE_INFO_ERROR", "path", path);
         }
 
         return null;
@@ -554,10 +541,8 @@ public class PackageUtils {
         try {
             Intent intent = context.getApplicationContext().getPackageManager().getLaunchIntentForPackage(packageName);
             return intent != null;
-        } catch (IllegalArgumentException exception) {
-            // 一些设备调用获取 intent 的时候会触发 Parcel.readException !
-            exception.printStackTrace();
-            return false;
+        } catch (Exception exception) {
+            return PackageHelper.INSTANCE.getLocalPackageNameSet().contains(packageName);
         }
     }
 
@@ -640,17 +625,6 @@ public class PackageUtils {
                     PackageManager.COMPONENT_ENABLED_STATE_DEFAULT).versionName;
         } catch (Exception e) {
             e.printStackTrace();
-
-            if (e instanceof AndroidException) {
-                // 有些设备会出现 DeadSystemException
-                SentryHelper.INSTANCE.onEvent(
-                        "GET_VERSION_NAME_ERROR",
-                        "packageName",
-                        packageName,
-                        "exception_digest",
-                        e.getLocalizedMessage()
-                );
-            }
         }
         return null;
     }
@@ -664,20 +638,23 @@ public class PackageUtils {
                     PackageManager.COMPONENT_ENABLED_STATE_DEFAULT).versionCode;
         } catch (Exception e) {
             e.printStackTrace();
-            if (e instanceof AndroidException) {
-                // 有些设备会出现 DeadSystemException
-                SentryHelper.INSTANCE.onEvent(
-                        "GET_VERSION_CODE_ERROR",
-                        "packageName",
-                        packageName,
-                        "exception_digest",
-                        e.getLocalizedMessage()
-                );
-            }
         }
         return 0;
     }
 
+    /*
+     * 获取应用的名称
+     */
+    public static CharSequence getNameByPackageName(Context context, String packageName) {
+        try {
+            PackageManager packageManager = context.getApplicationContext().getPackageManager();
+            return packageManager.getApplicationLabel(packageManager.getApplicationInfo(packageName, PackageManager.GET_META_DATA));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return "";
+    }
+
 
     /*
      * 获取应用的 icon
@@ -688,16 +665,6 @@ public class PackageUtils {
             return packageManager.getApplicationIcon(packageName);
         } catch (Exception e) {
             e.printStackTrace();
-            if (e instanceof AndroidException) {
-                // 有些设备会出现 DeadSystemException
-                SentryHelper.INSTANCE.onEvent(
-                        "GET_ICON_ERROR",
-                        "packageName",
-                        packageName,
-                        "exception_digest",
-                        e.getLocalizedMessage()
-                );
-            }
         }
         return null;
     }
@@ -731,17 +698,6 @@ public class PackageUtils {
             return jsonObject;
         } catch (Exception e) {
             e.printStackTrace();
-            if (e instanceof AndroidException) {
-                // 有些设备会出现 DeadSystemException
-                SentryHelper.INSTANCE.onEvent(
-                        "GET_APP_BASIC_INFO_BY_PACKAGE_NAME",
-                        "packageName",
-                        packageName,
-                        "exception_digest",
-                        e.getLocalizedMessage()
-                );
-            }
-
             return jsonObject;
         }
     }

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

@@ -2,7 +2,7 @@ package com.gh.common.util
 
 import android.annotation.SuppressLint
 import android.content.Context
-import com.alibaba.android.arouter.launcher.ARouter
+import com.therouter.TheRouter
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.common.repository.ReservationRepository
 import com.gh.gamecenter.WebActivity
@@ -29,53 +29,31 @@ import okhttp3.ResponseBody
 
 object ReservationHelper {
 
-    @JvmStatic
-    fun deleteReservation(game: GameEntity, refreshCallback: EmptyCallback) {
-        deleteOrCancelReservation(game, true, refreshCallback)
-    }
-
-    @JvmStatic
-    fun cancelReservation(game: GameEntity, refreshCallback: EmptyCallback) {
-        deleteOrCancelReservation(game, false, refreshCallback)
-    }
-
     @SuppressLint("CheckResult")
-    private fun deleteOrCancelReservation(
+    @JvmStatic
+    fun cancelReservation(
         game: GameEntity,
-        deleteReservation: Boolean,
         refreshCallback: EmptyCallback
     ) {
-
         val retrofit = RetrofitManager.getInstance()
-        val single = if (deleteReservation) {
-            retrofit.newApi
-                .deleteGameReservation(
-                    game.id,
-                    getReserveRequestBody(game, context = HaloApp.getInstance().application)
-                )
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-        } else {
-            retrofit.newApi
-                .cancelGameReservation(
-                    game.id,
-                    getReserveRequestBody(game, context = HaloApp.getInstance().application)
-                )
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-        }
+        retrofit.newApi
+            .cancelGameReservation(
+                game.id,
+                getReserveRequestBody(game, context = HaloApp.getInstance().application)
+            )
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(object : BiResponse<ResponseBody>() {
+                override fun onSuccess(data: ResponseBody) {
+                    ReservationRepository.removeReservationFromMemoryAndRefresh(game.id)
+                    refreshCallback.onCallback()
+                }
 
-        single.subscribe(object : BiResponse<ResponseBody>() {
-            override fun onSuccess(data: ResponseBody) {
-                ReservationRepository.removeReservationFromMemoryAndRefresh(game.id)
-                refreshCallback.onCallback()
-            }
-
-            override fun onFailure(exception: Exception) {
-                Utils.toast(HaloApp.getInstance().application, exception.message)
-                exception.printStackTrace()
-            }
-        })
+                override fun onFailure(exception: Exception) {
+                    Utils.toast(HaloApp.getInstance().application, exception.message)
+                    exception.printStackTrace()
+                }
+            })
     }
 
     @JvmStatic
@@ -146,21 +124,6 @@ object ReservationHelper {
             })
     }
 
-    @JvmStatic
-    fun showDeleteReservationDialog(context: Context, emptyCallback: EmptyCallback) {
-        DialogUtils.showCancelOrDeleteReservationDialog(
-            context,
-            "删除预约",
-            "游戏已上线，你可以删除此预约记录，确定删除吗？",
-            "确定删除",
-            "暂不删除", object : ConfirmListener {
-                override fun onConfirm() {
-                    emptyCallback.onCallback()
-                }
-            }, null
-        )
-    }
-
     @JvmStatic
     fun showCancelReservationDialog(context: Context, game: GameEntity?, emptyCallback: EmptyCallback) {
         showCancelReservationDialog(context, game, emptyCallback, null)
@@ -231,7 +194,7 @@ object ReservationHelper {
     @JvmStatic
     fun getReserveRequestBody(game: GameEntity?, context: Context): RequestBody {
         val jPushId =
-            (ARouter.getInstance().build(RouteConsts.provider.push).navigation() as? IPushProvider)
+            (TheRouter.get(IPushProvider::class.java))
                 ?.getRegistrationId(context) ?: ""
         var mirrorPosition = game?.getMirrorPosition() ?: 0
         if (mirrorPosition == -1) {

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

@@ -2,7 +2,7 @@ package com.gh.common.util
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
-import com.alibaba.android.arouter.launcher.ARouter
+import com.therouter.TheRouter
 import com.gh.common.iinterface.ISuperiorChain
 import com.gh.gamecenter.amway.AmwayFragment
 import com.gh.gamecenter.category2.CategoryV2Fragment
@@ -129,9 +129,7 @@ object ViewPagerFragmentHelper {
             }
             // 帮助与反馈
             TYPE_FEEDBACK -> {
-                val helpAndFeedbackProvider =
-                    ARouter.getInstance().build(RouteConsts.provider.helpAndFeedback)
-                        .navigation() as? IHelpAndFeedbackProvider
+                val helpAndFeedbackProvider = TheRouter.get(IHelpAndFeedbackProvider::class.java)
                 if (helpAndFeedbackProvider != null) {
                     helpAndFeedbackProvider.getHelpAndFeedbackFragment().with(bundle)
                 } else {
@@ -250,9 +248,7 @@ object ViewPagerFragmentHelper {
             }
             // QA
             TYPE_QA -> {
-                val helpAndFeedbackProvider =
-                    ARouter.getInstance().build(RouteConsts.provider.helpAndFeedback)
-                        .navigation() as? IHelpAndFeedbackProvider
+                val helpAndFeedbackProvider = TheRouter.get(IHelpAndFeedbackProvider::class.java)
 
                 helpAndFeedbackProvider?.let {
                     className = it.getHelpContainerFragmentClass()

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

@@ -2,6 +2,7 @@ package com.gh.download.simple
 
 import android.annotation.SuppressLint
 import android.database.sqlite.SQLiteException
+import android.database.sqlite.SQLiteFullException
 import com.gh.gamecenter.core.utils.ToastUtils
 import com.lg.download.*
 import com.lg.download.listener.InnerDownloadListener
@@ -174,6 +175,9 @@ object DownloadMessageHandler : InnerDownloadListener {
             DownloadError.CONTENT_LENGTH_IS_ZERO -> {
                 ToastUtils.toast("下载链接异常，请检查")
             }
+            DownloadError.DISK_IS_FULL -> {
+                ToastUtils.toast("磁盘已满，请清理空间后获得更好的体验")
+            }
             else -> {
                 // 想怎么处理就怎么处理
             }
@@ -264,18 +268,30 @@ object DownloadMessageHandler : InnerDownloadListener {
     }
 
     fun insertDownloadToDatabase(downloadEntity: SimpleDownloadEntity) {
-        mDownloadDao.insertDownloadEntity(downloadEntity)
-        updateDownloadList()
+        try {
+            mDownloadDao.insertDownloadEntity(downloadEntity)
+            updateDownloadList()
+        } catch (e: SQLiteException) {
+            if (e is SQLiteFullException) {
+                ToastUtils.showToast("磁盘已满，请清理空间获得更好的体验")
+            }
+            e.printStackTrace()
+        }
     }
 
     fun updateDownloadToDatabase(
         downloadEntity: SimpleDownloadEntity,
         updateDownloadList: Boolean = false
     ) {
-        mDownloadDao.updateDownloadEntity(downloadEntity)
+        try {
+            mDownloadDao.updateDownloadEntity(downloadEntity)
 
-        if (updateDownloadList) {
-            updateDownloadList()
+            if (updateDownloadList) {
+                updateDownloadList()
+            }
+        } catch (e: SQLiteFullException) {
+            // 底层的下载服务遇到 SQLiteFullException 时会自动暂停下载任务，上层这里就不用纠结处理方式了
+            e.printStackTrace()
         }
     }
 

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

@@ -27,12 +27,24 @@ object SimpleDownloadManager {
         val downloadStatus = mDownloadQueue.getStatus(config.uniqueId)
 
         if (downloadStatus != DownloadStatus.PAUSED) {
-            ExecutorProvider.getInstance().backgroundExecutor.execute {
-                DownloadMessageHandler.insertDownloadToDatabase(getDownloadEntity(config))
-                mDownloadQueue.submitNewTask(config)
-            }
+            createNewTaskAndDownload(config)
         } else {
-            resume(config.uniqueId)
+            try {
+                resume(config.uniqueId)
+            } catch (e: IllegalArgumentException) {
+                createNewTaskAndDownload(config)
+            }
+        }
+    }
+
+    /**
+     * 创建新任务并下载
+     */
+    private fun createNewTaskAndDownload(config: DownloadConfig) {
+        ExecutorProvider.getInstance().backgroundExecutor.execute {
+            mDownloadQueue.cancel(config.uniqueId)
+            DownloadMessageHandler.insertDownloadToDatabase(getDownloadEntity(config))
+            mDownloadQueue.submitNewTask(config)
         }
     }
 

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

@@ -6,7 +6,7 @@ import android.os.Bundle;
 
 import androidx.annotation.NonNull;
 
-import com.alibaba.android.arouter.facade.annotation.Route;
+import com.therouter.router.Route;
 import com.gh.gamecenter.common.base.activity.ToolBarActivity;
 import com.gh.gamecenter.common.constant.EntranceConsts;
 import com.gh.gamecenter.common.constant.RouteConsts;

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

@@ -3,26 +3,25 @@ package com.gh.gamecenter;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
-import android.graphics.Color;
 import android.os.Bundle;
 import android.view.LayoutInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+
 import com.gh.gamecenter.common.base.activity.ToolBarActivity;
-import com.gh.gamecenter.common.utils.BitmapUtils;
-import com.gh.gamecenter.core.utils.DisplayUtils;
 import com.gh.gamecenter.common.constant.EntranceConsts;
+import com.gh.gamecenter.common.utils.BitmapUtils;
 import com.gh.gamecenter.common.view.CropImageCustom;
+import com.gh.gamecenter.common.view.cropbox.CropBoxStyle;
+import com.gh.gamecenter.core.utils.DisplayUtils;
 
 import java.io.File;
 import java.lang.ref.SoftReference;
 
-import androidx.annotation.LayoutRes;
-import androidx.annotation.NonNull;
-
 /**
  * 裁剪图片
  */
@@ -32,6 +31,8 @@ public class CropImageActivity extends ToolBarActivity {
 
     public static final String RESULT_CLIP_PATH = "result_clip_path";
 
+    public static final String RESULT_ORIGINAL_PATH = "result_original_path";
+
     private SoftReference<Bitmap> reference;
 
     protected boolean mBlackTheme = false;
@@ -51,7 +52,7 @@ public class CropImageActivity extends ToolBarActivity {
         Intent intent = new Intent(context, CropImageActivity.class);
         intent.putExtra(EntranceConsts.KEY_PATH, picturePath);
         intent.putExtra(EntranceConsts.KEY_ENTRANCE, entrance);
-        intent.putExtra(EntranceConsts.KEY_IMAGE_CROP_RATIO, cropRatio);
+        intent.putExtra(EntranceConsts.KEY_IMAGE_CROP_STYLE, new CropBoxStyle.Rectangle(cropRatio));
         intent.putExtra(EntranceConsts.KEY_BLACK_THEME, isBlackTheme);
         intent.putExtra(EntranceConsts.KEY_ASSIST_RES, assistRes);
         return intent;
@@ -68,20 +69,14 @@ public class CropImageActivity extends ToolBarActivity {
         super.onCreate(savedInstanceState);
 
         mCropImageCustom = findViewById(R.id.cropimage_custom);
-        View statusBarView = findViewById(R.id.status_bar);
+        TextView tvCancel = findViewById(R.id.tv_cancel);
+        TextView tvSubmit = findViewById(R.id.tv_submit);
 
-        mTitleTv.setTextColor(mBlackTheme ? Color.WHITE : Color.BLACK);
-        mToolbar.setBackgroundColor(getResources().getColor(mBlackTheme ? com.gh.gamecenter.common.R.color.text_28282E : com.gh.gamecenter.common.R.color.white));
-        statusBarView.setBackgroundColor(getResources().getColor(mBlackTheme ? com.gh.gamecenter.common.R.color.text_28282E : com.gh.gamecenter.common.R.color.white));
-
-        setNavigationTitle(getString(R.string.title_crop_image));
-        setToolbarMenu(R.menu.menu_positive);
-        MenuItem menuItem = getMenuItem(R.id.layout_menu_positive);
-        TextView menuButton = menuItem.getActionView().findViewById(R.id.menu_answer_post);
-        menuButton.setTextColor(getResources().getColor(com.gh.gamecenter.common.R.color.text_theme));
-
-        float ratio = getIntent().getFloatExtra(EntranceConsts.KEY_IMAGE_CROP_RATIO, 1F);
-        mCropImageCustom.setCropRatio(ratio);
+        CropBoxStyle boxStyle = getIntent().getParcelableExtra(EntranceConsts.KEY_IMAGE_CROP_STYLE);
+        if (boxStyle == null) {
+            boxStyle = new CropBoxStyle.Rectangle(1F);
+        }
+        mCropImageCustom.setCropBoxStyle(boxStyle);
 
         int assistRes = getIntent().getIntExtra(EntranceConsts.KEY_ASSIST_RES, -1);
         if (assistRes > 0) {
@@ -89,8 +84,21 @@ public class CropImageActivity extends ToolBarActivity {
             addAssistView(view);
         }
 
-        DisplayUtils.setLightStatusBar(this, !mBlackTheme);
-        DisplayUtils.setStatusBarColor(this, com.gh.gamecenter.common.R.color.transparent, !mBlackTheme);
+        DisplayUtils.setLightStatusBar(this, false);
+        DisplayUtils.setStatusBarColor(this, com.gh.gamecenter.common.R.color.transparent, false);
+
+        tvCancel.setOnClickListener(v -> finish());
+
+        tvSubmit.setOnClickListener(v -> saveImage());
+    }
+
+    protected void saveImage() {
+        Intent data = new Intent();
+        String clipPath = getCacheDir().getAbsolutePath() + File.separator + System.currentTimeMillis() + ".jpg";
+        mCropImageCustom.savePicture(clipPath);
+        data.putExtra(RESULT_CLIP_PATH, clipPath);
+        setResult(RESULT_OK, data);
+        finish();
     }
 
     @Override
@@ -98,20 +106,6 @@ public class CropImageActivity extends ToolBarActivity {
         return mBlackTheme ? com.gh.gamecenter.common.R.drawable.ic_toolbar_back_white : com.gh.gamecenter.common.R.drawable.ic_bar_back;
     }
 
-    @Override
-    public boolean onMenuItemClick(MenuItem item) {
-        if (item.getItemId() == R.id.layout_menu_positive) {
-            Intent data = new Intent();
-            String clipPath = getCacheDir().getAbsolutePath() + File.separator + System.currentTimeMillis() + ".jpg";
-            mCropImageCustom.savePicture(clipPath);
-
-            data.putExtra(RESULT_CLIP_PATH, clipPath);
-            setResult(RESULT_OK, data);
-            finish();
-        }
-        return super.onMenuItemClick(item);
-    }
-
     public void addAssistView(View view) {
         mCropImageCustom.addAssistView(view);
     }

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

@@ -5,12 +5,17 @@ import android.content.ContextWrapper
 import android.content.Intent
 import android.os.Bundle
 import android.view.View
+import com.therouter.router.Autowired
+import com.therouter.router.Route
+import com.therouter.TheRouter
 import com.gh.base.DownloadToolbarActivity
-import com.gh.common.exposure.ExposureManager.log
+import com.gh.common.exposure.ExposureManager
 import com.gh.common.exposure.ExposureTraceUtils.appendTrace
 import com.gh.gamecenter.common.base.GlobalActivityManager
-import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.base.activity.ToolBarActivity.NORMAL_FRAGMENT_BUNDLE
+import com.gh.gamecenter.common.base.activity.ToolBarActivity.NORMAL_FRAGMENT_NAME
 import com.gh.gamecenter.common.constant.EntranceConsts
+import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.utils.toArrayList
 import com.gh.gamecenter.core.utils.DisplayUtils
 import com.gh.gamecenter.entity.GamePlatform
@@ -20,15 +25,54 @@ import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.gh.gamecenter.feature.exposure.ExposureEvent.Companion.createEvent
 import com.gh.gamecenter.feature.exposure.ExposureType
 import com.gh.gamecenter.gamedetail.GameDetailFragment
-import com.halo.assistant.HaloApp
 
-/**
- * Created by khy on 2017/3/24.
- * 游戏详情页
- */
+@Route(
+    path = RouteConsts.activity.gameDetailActivity,
+    description = "游戏详情页"
+)
 class GameDetailActivity : DownloadToolbarActivity() {
 
+    @JvmField
+    @Autowired(name = EntranceConsts.KEY_GAME_ID, description = "游戏 id", required = true)
+    var gameId: String? = null
+
+    @JvmField
+    @Autowired(name = EntranceConsts.KEY_GAME_ENTITY, description = "游戏摘要实体，如果你不懂这个是什么，那么不要用它，直接传入游戏 id 即可")
+    var gameEntity: GameEntity? = null
+
+    @JvmField
+    @Autowired(name = EntranceConsts.KEY_ENTRANCE, description = "入口埋点字段（开发内部使用）")
+    var entrance: String? = ""
+
+    @JvmField
+    @Autowired(name = EntranceConsts.KEY_DEFAULT_TAB, description = "默认选中 tab 的类型（目前可选的有五个类型 `详情`, `专区`，`云存档`，`评价`，`论坛`），首次进入匹配并切换至对应 tab")
+    var defaultTab: String = ""
+
+    @JvmField
+    @Autowired(name = EntranceConsts.KEY_COMMENT_AS_DEFAULT_TAB, description = "跳转到评论 tab，首次进入直接跳转到评论 tab")
+    var commentAsDefaultTab: Boolean = false
+
+    @JvmField
+    @Autowired(name = EntranceConsts.KEY_SCROLL_TO_LIBAO, description = "滚动到礼包区域，首次进入滚动到礼包区域")
+    var scrollToLibao: Boolean = false
+
+    @JvmField
+    @Autowired(name = EntranceConsts.KEY_SCROLL_TO_SERVER, description = "滚动到开服表区域，首次进入滚动到开服表区域")
+    var scrollToServer: Boolean = false
+
+    @JvmField
+    @Autowired(name = EntranceConsts.KEY_OPEN_VIDEO_STREAMING, description = "打开视频流，首次进入打开视频流")
+    var openVideoStreaming: Boolean = false
+
+    @JvmField
+    @Autowired(name = EntranceConsts.KEY_OPEN_PLATFORM_WINDOW, description = "打开多版本窗口，首次进入打开多版本窗口")
+    var openPlatformWindow: Boolean = false
+
     override fun onCreate(savedInstanceState: Bundle?) {
+        TheRouter.inject(this)
+
+        generateDataFromRoute()
+
         super.onCreate(savedInstanceState)
         DisplayUtils.transparentStatusBar(this)
     }
@@ -37,37 +81,21 @@ class GameDetailActivity : DownloadToolbarActivity() {
         return getTargetIntent(this, GameDetailActivity::class.java, GameDetailFragment::class.java)
     }
 
-    override fun getLayoutId(): Int {
-        return R.layout.activity_game_detail
-    }
+    override fun getLayoutId() = R.layout.activity_game_detail
 
-    override fun showToolbarAtLeft(): Boolean {
-        return true
-    }
+    override fun showToolbarAtLeft() = true
+    override fun showDownloadMenu() = true
 
-    override fun showDownloadMenu(): Boolean {
-        return true
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        HaloApp.remove(Constants.GAME_DETAIL_COME_IN)
-    }
-
-    override fun getActivityNameInChinese(): String {
-        return "游戏详情"
-    }
+    override fun getActivityNameInChinese() = "游戏详情"
 
     override fun getBusinessId(): Pair<String, String> {
-        val fragment = targetFragment as? GameDetailFragment?
-        return if (fragment?.arguments != null) {
-            Pair(fragment.requireArguments().getString(EntranceConsts.KEY_GAMEID) ?: "", "")
+        return if (!gameId.isNullOrEmpty()) {
+            Pair(gameId ?: "", "")
         } else {
             super.getBusinessId()
         }
     }
 
-
     override fun attachBaseContext(newBase: Context) {
         super.attachBaseContext(object : ContextWrapper(newBase) {
             override fun getSystemService(name: String): Any? {
@@ -96,6 +124,13 @@ class GameDetailActivity : DownloadToolbarActivity() {
         )
     }
 
+    private fun generateDataFromRoute() {
+        val bundle = intent.extras
+
+        intent?.putExtra(NORMAL_FRAGMENT_NAME, GameDetailFragment::class.java.canonicalName)
+        intent?.putExtra(NORMAL_FRAGMENT_BUNDLE, bundle)
+    }
+
     companion object {
 
         @JvmStatic
@@ -131,9 +166,10 @@ class GameDetailActivity : DownloadToolbarActivity() {
 
             if (traceEvent != null) {
                 val clickEvent = createEvent(gameEntity, traceEvent.source, appendTrace(traceEvent), ExposureType.CLICK)
-                log(clickEvent)
+                ExposureManager.log(clickEvent)
                 bundle.putParcelable(EntranceConsts.KEY_TRACE_EVENT, clickEvent)
             }
+
             if (gameEntity != null && traceEvent != null && gameEntity.id != traceEvent.payload.gameId) {
                 // 当游戏 ID 跟曝光 traceEvent 的游戏ID 不一样的时候更新 traceEvent 的游戏ID
                 val (payload) = createEvent(
@@ -144,31 +180,35 @@ class GameDetailActivity : DownloadToolbarActivity() {
                 )
                 traceEvent.payload = payload
             }
+
             if (defaultTab.isNotEmpty()) {
                 bundle.putString(EntranceConsts.KEY_TARGET, defaultTab)
             }
+
             if (isSkipGameComment) {
-                bundle.putBoolean(EntranceConsts.KEY_SKIP_GAME_COMMENT, true)
+                bundle.putBoolean(EntranceConsts.KEY_COMMENT_AS_DEFAULT_TAB, true)
             }
+
             if (scrollToLibao) {
-                bundle.putString(EntranceConsts.KEY_TARGET, GameDetailFragment.TAB_DESC)
+                bundle.putString(EntranceConsts.KEY_TARGET, EntranceConsts.TAB_TYPE_DESC)
                 bundle.putBoolean(EntranceConsts.KEY_SCROLL_TO_LIBAO, true)
             }
+
             if (scrollToServer) {
-                bundle.putString(EntranceConsts.KEY_TARGET, GameDetailFragment.TAB_DESC)
+                bundle.putString(EntranceConsts.KEY_TARGET, EntranceConsts.TAB_TYPE_DESC)
                 bundle.putBoolean(EntranceConsts.KEY_SCROLL_TO_SERVER, true)
             }
-            bundle.putString(EntranceConsts.KEY_GAMEID, gameEntity?.id)
+
+            bundle.putString(EntranceConsts.KEY_GAME_ID, gameEntity?.id)
             bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance)
-            bundle.putParcelable(GameEntity.TAG, gameEntity)
-            context.startActivity(
-                getTargetIntent(
-                    context,
-                    GameDetailActivity::class.java,
-                    GameDetailFragment::class.java,
-                    bundle
-                )
-            )
+            bundle.putParcelable(EntranceConsts.KEY_GAME_ENTITY, gameEntity)
+
+            TheRouter
+                .build(RouteConsts.activity.gameDetailActivity)
+                .fillParams {
+                    it.putAll(bundle)
+                }
+                .navigation(context)
         }
 
         @JvmStatic
@@ -178,7 +218,7 @@ class GameDetailActivity : DownloadToolbarActivity() {
             entrance: String?,
             traceEvent: ExposureEvent?
         ) {
-            startGameDetailActivity(context, gameId, entrance, -1, traceEvent = traceEvent)
+            startGameDetailActivity(context, gameId, entrance, isSkipGameComment = false, traceEvent = traceEvent)
         }
 
         @JvmStatic
@@ -186,7 +226,6 @@ class GameDetailActivity : DownloadToolbarActivity() {
             context: Context,
             gameId: String,
             entrance: String?,
-            defaultTab: Int = -1,
             isSkipGameComment: Boolean = false,
             scrollToLibao: Boolean = false,
             openVideoStreaming: Boolean = false,
@@ -197,7 +236,6 @@ class GameDetailActivity : DownloadToolbarActivity() {
                 context,
                 gameId,
                 entrance,
-                defaultTab,
                 isSkipGameComment,
                 scrollToLibao,
                 openVideoStreaming,
@@ -211,7 +249,6 @@ class GameDetailActivity : DownloadToolbarActivity() {
 
         /**
          * @param gameId 游戏Id
-         * @param defaultTab 默认定位到哪个tab
          * @param isSkipGameComment 是否跳转到评论tab
          * @param scrollToLibao 滚动到礼包区域
          * @param openVideoStreaming 是否打开视频流
@@ -225,7 +262,6 @@ class GameDetailActivity : DownloadToolbarActivity() {
             context: Context,
             gameId: String,
             entrance: String?,
-            defaultTab: Int = -1,
             isSkipGameComment: Boolean = false,
             scrollToLibao: Boolean = false,
             openVideoStreaming: Boolean = false,
@@ -248,7 +284,7 @@ class GameDetailActivity : DownloadToolbarActivity() {
                     appendTrace(traceEvent),
                     ExposureType.CLICK
                 )
-                log(clickEvent)
+                ExposureManager.log(clickEvent)
                 bundle.putParcelable(EntranceConsts.KEY_TRACE_EVENT, clickEvent)
             }
             if (traceEvent != null && gameId != traceEvent.payload.gameId) {
@@ -261,15 +297,12 @@ class GameDetailActivity : DownloadToolbarActivity() {
                 )
                 traceEvent.payload = payload
             }
-            if (defaultTab != -1) {
-                bundle.putInt(EntranceConsts.KEY_TARGET, defaultTab)
-            }
             if (isSkipGameComment) {
-                bundle.putBoolean(EntranceConsts.KEY_SKIP_GAME_COMMENT, true)
+                bundle.putBoolean(EntranceConsts.KEY_COMMENT_AS_DEFAULT_TAB, true)
             }
             if (openVideoStreaming) {
                 bundle.putBoolean(EntranceConsts.KEY_OPEN_VIDEO_STREAMING, true)
-                bundle.putString(EntranceConsts.KEY_TARGET, GameDetailFragment.TAB_DESC)
+                bundle.putString(EntranceConsts.KEY_TARGET, EntranceConsts.TAB_TYPE_DESC)
             }
             if (openPlatformWindow) {
                 bundle.putBoolean(EntranceConsts.KEY_OPEN_PLATFORM_WINDOW, true)
@@ -283,10 +316,10 @@ class GameDetailActivity : DownloadToolbarActivity() {
                 }
             }
             if (scrollToLibao) {
-                bundle.putString(EntranceConsts.KEY_TARGET, GameDetailFragment.TAB_DESC)
+                bundle.putString(EntranceConsts.KEY_TARGET, EntranceConsts.TAB_TYPE_DESC)
                 bundle.putBoolean(EntranceConsts.KEY_SCROLL_TO_LIBAO, true)
             }
-            bundle.putString(EntranceConsts.KEY_GAMEID, gameId)
+            bundle.putString(EntranceConsts.KEY_GAME_ID, gameId)
             bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance)
             bundle.putParcelable(EntranceConsts.KEY_CUSTOM_PAGE_TRACK_DATA, customPageTrackData)
             bundle.putString(EntranceConsts.KEY_LAST_PAGE_ID, GlobalActivityManager.getLastPageEntity().pageId)
@@ -295,14 +328,13 @@ class GameDetailActivity : DownloadToolbarActivity() {
                 EntranceConsts.KEY_LAST_PAGE_BUSINESS_ID,
                 GlobalActivityManager.getLastPageEntity().pageBusinessId
             )
-            context.startActivity(
-                getTargetIntent(
-                    context,
-                    GameDetailActivity::class.java,
-                    GameDetailFragment::class.java,
-                    bundle
-                )
-            )
+
+            TheRouter
+                .build(RouteConsts.activity.gameDetailActivity)
+                .fillParams {
+                    it.putAll(bundle)
+                }
+                .navigation(context)
         }
 
     }