fix: va_core进程没有启动导致aidl的NPE问题。

fix: 手机不支持armeabi-v7a架构时，根据游戏来选择架构

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

app/build.gradle

@@ -2,9 +2,7 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android' // kotlin
 apply plugin: 'kotlin-parcelize'
-apply plugin: 'com.google.devtools.ksp'
 apply plugin: 'kotlin-kapt'
-apply plugin: 'therouter'
 
 import groovy.xml.XmlUtil
 
@@ -53,10 +51,6 @@ android {
         }
     }
 
-    ksp {
-        arg("ROUTER_MODULE_NAME", project.getName())
-    }
-
     defaultConfig {
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true
@@ -129,6 +123,12 @@ android {
         }
     }
 
+    kapt {
+        arguments {
+            arg("AROUTER_MODULE_NAME", project.name)
+        }
+    }
+
     packagingOptions {
         // exclude 部分冗余的文件
         exclude 'META-INF/gradle/incremental.annotation.processors'
@@ -197,7 +197,7 @@ android {
             java.srcDirs = ['src/main/java', "src/default/java"]
         }
         internal {
-            java.srcDirs = ['src/main/java', "src/default/java", "src/internal/java"]
+            java.srcDirs = ['src/main/java', "src/default/java"]
         }
         tea {
             java.srcDirs = ['src/main/java', 'src/tea/java']
@@ -378,7 +378,7 @@ dependencies {
     implementation "androidx.annotation:annotation:${annotation}"
 
     implementation "androidx.viewpager2:viewpager2:${viewpager2}"
-    ksp("androidx.room:room-compiler:${room}")
+    kapt "androidx.room:room-compiler:${room}"
 
     implementation "com.tencent.vasdolly:helper:${apkChannelPackage}"
     implementation "com.tencent.vasdolly:writer:${apkChannelPackage}"
@@ -428,8 +428,7 @@ dependencies {
 
     coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:${desugarJdkLibs}"
 
-    kapt "com.google.auto.service:auto-service:${autoServiceVersion}"
-    ksp "cn.therouter:apt:${routerVersion}"
+    kapt "com.alibaba:arouter-compiler:$arouterVersion"
 
     implementation project(':ndownload')
     implementation project(':vspace-bridge:vspace')
@@ -451,9 +450,9 @@ dependencies {
         exclude group: 'androidx.swiperefreshlayout'
     }
 
-//    implementation(project(':module_setting_compose')) {
-//        exclude group: 'androidx.swiperefreshlayout'
-//    }
+    //    implementation(project(':module_setting_compose')) {
+    //        exclude group: 'androidx.swiperefreshlayout'
+    //    }
 
     if (!gradle.ext.excludeOptionalModules || gradle.ext.enablePkg) {
         implementation(project(':feature:pkg'))
@@ -510,10 +509,6 @@ dependencies {
         implementation(project(':feature:sentry'))
     }
 
-    if (gradle.ext.enableRouteDoc) {
-        ksp project(":feature:route_doc")
-    }
-
     implementation(project(':feature:media_select'))
 
     implementation(project(":module_va_api"))

app/src/main/AndroidManifest.xml

@@ -68,9 +68,6 @@
     <!-- 悬浮窗 -->
     <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,
@@ -520,6 +517,10 @@
             android:name=".video.data.VideoDataActivity"
             android:screenOrientation="portrait" />
 
+        <activity
+            android:name=".video.poster.PosterEditActivity"
+            android:screenOrientation="portrait" />
+
         <activity
             android:name=".forum.detail.ForumDetailActivity"
             android:screenOrientation="portrait" />
@@ -637,9 +638,8 @@
         <!--            android:theme="@android:style/Theme.Translucent" />-->
 
         <activity
-            android:name="com.gh.gamecenter.SkipCompatActivity"
+            android:name="com.gh.gamecenter.SkipActivity"
             android:exported="true"
-            android:launchMode="singleTask"
             android:theme="@style/Theme.AppCompat.Light.Fullscreen.Transparent">
             <intent-filter>
                 <data android:scheme="ghzhushou" />
@@ -810,10 +810,6 @@
             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"-->

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.therouter.TheRouter
+import com.alibaba.android.arouter.launcher.ARouter
+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,7 +100,8 @@ object AdDelegateHelper {
     private fun initAdSdkInternal(context: Context) {
         // 初始化穿山甲
         if (mCsjAdImpl == null) {
-            mCsjAdImpl = TheRouter.get(ICsjAdProvider::class.java)
+            mCsjAdImpl =
+                ARouter.getInstance().build(RouteConsts.provider.csjAd).navigation() as? ICsjAdProvider
             val csjAppId = if (EnvHelper.isDevEnv) BuildConfig.DEV_CSJ_APPID else BuildConfig.CSJ_APPID
             mCsjAdImpl?.initSDK(context, csjAppId, HaloApp.getInstance().oaid)
             // 监听亮色/暗色模式切换
@@ -302,6 +309,7 @@ object AdDelegateHelper {
     ) {
         val hideCallback = {
             isShowingSplashAd = false
+            isOwnerSplashAdShown = false
             hideAction.invoke()
         }
         if (mSplashAd != null) {
@@ -574,6 +582,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)
@@ -592,38 +602,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,10 +1,13 @@
 package com.gh.ad
 
+import android.content.Context
 import android.view.View
 import android.view.ViewGroup
 import android.view.ViewStub
 import androidx.fragment.app.Fragment
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.provider.ILaunchAd
 import com.gh.gamecenter.common.utils.SensorsBridge
 import com.gh.gamecenter.common.utils.goneIf
@@ -12,8 +15,10 @@ import com.gh.gamecenter.core.utils.DisplayUtils
 import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.entity.AdConfig
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.vaAd, name = "畅玩启动页广告")
 class LaunchAdImpl : ILaunchAd {
+    override fun init(context: Context?) {
+    }
 
     override fun requestAd(fragment: Fragment, container: ViewGroup, maskView: View, topViewStub: ViewStub, bottomViewStub: ViewStub, adClickAction: () -> Unit): View {
         if (AdDelegateHelper.shouldShowHelperLaunchAd()) {
@@ -99,4 +104,4 @@ class LaunchAdImpl : ILaunchAd {
     companion object {
         private const val AD_PLACEMENT = "畅玩启动"
     }
-}
+}

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

@@ -48,6 +48,12 @@ class SplashAdVideoView @JvmOverloads constructor(
         // no nothing
     }
 
+    override fun onPrepared() {
+        super.onPrepared()
+
+        visibility = VISIBLE
+    }
+
     override fun onAutoCompletion() {
         setStateAndUi(CURRENT_STATE_AUTO_COMPLETE);
 

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

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

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

@@ -4,7 +4,7 @@ import android.app.Activity
 import android.app.Application
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.therouter.TheRouter
+import com.alibaba.android.arouter.launcher.ARouter
 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 = TheRouter.get(IPushProvider::class.java)
+                val pushProvider = ARouter.getInstance().build(RouteConsts.provider.push).navigation() as? IPushProvider
                 pushProvider?.cleanBadgeNumber(activity.applicationContext)
             }
         }
@@ -126,7 +126,9 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
     }
 
     private fun isSuggestionActivity(activity: Activity): Boolean {
-        val helpAndFeedbackProvider = TheRouter.get(IHelpAndFeedbackProvider::class.java)
+        val helpAndFeedbackProvider =
+            ARouter.getInstance().build(RouteConsts.provider.helpAndFeedback)
+                .navigation() as? IHelpAndFeedbackProvider
         return helpAndFeedbackProvider?.isSuggestionActivity(activity) ?: false
     }
 

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

@@ -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.therouter.TheRouter
+import com.alibaba.android.arouter.launcher.ARouter
 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 = TheRouter.get(IPushProvider::class.java)
+        val pushProvider = ARouter.getInstance().build(RouteConsts.provider.push).navigation() as? IPushProvider
         return pushProvider?.getRegistrationId(HaloApp.getInstance()) ?: "unknown"
     }
 
@@ -424,7 +424,8 @@ class DefaultJsApi(
 
     @JavascriptInterface
     fun showQaFeedbackDialog(msg: Any) {
-        val mHelpAndFeedbackHelp = TheRouter.get(IHelpAndFeedbackProvider::class.java)
+        val mHelpAndFeedbackHelp =
+            ARouter.getInstance().build(RouteConsts.provider.helpAndFeedback).navigation() as? IHelpAndFeedbackProvider
         mHelpAndFeedbackHelp?.showQaFeedbackDialogFragment(context as AppCompatActivity, msg.toString())
     }
 

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

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

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

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

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

@@ -261,7 +261,8 @@ public class Config {
                     public void onSuccess(VSetting data) {
                         mVSetting = data;
                         SPUtils.setString(Constants.SP_V_SETTINGS, GsonUtils.toJson(data));
-                        VHelper.checkVspaceUpdate(HaloApp.getInstance());
+
+                        VHelper.init(HaloApp.getInstance());
                     }
                 });
     }

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

@@ -15,10 +15,10 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
 import com.gh.common.chain.BrowserInstallHandler;
-import com.gh.common.chain.CheckDownloadHandler;
-import com.gh.common.chain.CheckStoragePermissionHandler;
 import com.gh.common.chain.DownloadChainBuilder;
 import com.gh.common.chain.DownloadChainHandler;
+import com.gh.common.chain.CheckDownloadHandler;
+import com.gh.common.chain.CheckStoragePermissionHandler;
 import com.gh.common.chain.DownloadDialogHelperHandler;
 import com.gh.common.chain.GamePermissionHandler;
 import com.gh.common.chain.LandPageAddressHandler;
@@ -337,9 +337,9 @@ public class BindingAdapters {
                 }
                 progressBar.setButtonStyle(DownloadButton.ButtonStyle.H5_GAME);
             } else {
-                if (("dialog".equals(offStatus) || "third_party".equals(offStatus))) {
+                if (offStatus != null && "dialog".equals(offStatus)) {
                     progressBar.setText("查看");
-                    progressBar.setButtonStyle(DownloadButton.ButtonStyle.NONE_WITH_HINT);
+                    progressBar.setButtonStyle(DownloadButton.ButtonStyle.NONE);
                 } else if ("updating".equals(offStatus)) {
                     progressBar.setText("更新中");
                     progressBar.setButtonStyle(DownloadButton.ButtonStyle.UPDATING);

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/fragment/FragmentManagerExt.kt

@@ -10,16 +10,12 @@ fun FragmentManager.popBackStackAllowStateLoss() {
 fun FragmentManager.popBackStackAllowStateLoss(id: Int, flags: Int) {
     if (!isStateSaved) {
         popBackStack(id, flags)
-    } else {
-        hook { popBackStack(id, flags) }
     }
 }
 
 fun FragmentManager.popBackStackAllowStateLoss(name: String?, flags: Int) {
     if (!isStateSaved) {
         popBackStack(name, flags)
-    } else {
-        hook { popBackStack(name, flags) }
     }
 }
 
@@ -29,34 +25,9 @@ fun FragmentManager.popBackStackImmediateAllowStateLoss(id: Int, flags: Int) =
     if (!isStateSaved) {
         popBackStackImmediate(id, flags)
     } else {
-        hook { popBackStackImmediate(id, flags) }
+        false
     }
 
-fun FragmentManager.popBackStackImmediateAllowStateLoss(name: String?, flags: Int): Boolean =
-    if (!isStateSaved) {
-        popBackStackImmediate(name, flags)
-    } else {
-        hook { popBackStackImmediate(name, flags) }
-    }
-
-/**
- * 通过反射将FragmentManager的mStateSaved和mStopped设为false，否则Activity在回调onSavedInstance以后，
- * 调用Fragment的popBackStack和popBackStackImmediate方法会触发“java.lang.IllegalStateException: Can not perform this action after onSaveInstanceState”的异常。
- * @see <a href="https://sentry.shanqu.cc/organizations/lightgame/issues/418688/?project=22">Sentry-418688</a>
- */
-private fun <T> FragmentManager.hook(callback: FragmentManager.() -> T): T {
-    val mStateSavedField = getField(this::class.java,"mStateSaved")
-    val stateSaved = mStateSavedField.get(this);
-    mStateSavedField.set(this, false)
-    val mStoppedField = getField(this::class.java,"mStopped")
-    val stopped = mStateSavedField.get(this);
-    mStoppedField.set(this, false)
-    val result = callback.invoke(this)
-    mStateSavedField.set(this, stateSaved)
-    mStoppedField.set(this, stopped)
-    return result
-}
-
 @Throws(NoSuchFieldException::class)
 private fun getField(clazz: Class<*>, name: String): Field {
     var cls: Class<*>? = clazz

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

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

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

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

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

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

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

@@ -1,15 +1,20 @@
 package com.gh.common.provider
 
 import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.gamecenter.BuildConfig
 import com.gh.gamecenter.R
+import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IAppProvider
 import com.gh.gamecenter.core.provider.IFlavorProvider
 import com.gh.gamecenter.va.VCore
 import com.halo.assistant.HaloApp
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.app, name = "Application暴露服务")
 class AppProviderImpl : IAppProvider {
+    override fun init(context: Context?) {
+        // Do nothing
+    }
 
     override fun getAppName(): String {
         return HaloApp.getInstance().getString(R.string.app_name)
@@ -88,5 +93,4 @@ class AppProviderImpl : IAppProvider {
     override fun initImageLoaderIfNeeded() {
         HaloApp.getInstance().initFresco()
     }
-
 }

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

@@ -1,13 +1,16 @@
 package com.gh.common.provider
 
+import android.content.Context
 import android.view.View
 import android.widget.LinearLayout
 import android.widget.TextView
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.common.databind.BindingAdapters
+import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.provider.IBindingAdaptersProvider
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.bindingAdapters, name = "BindingAdapters暴露服务")
 class BindingAdaptersProviderImpl : IBindingAdaptersProvider {
     override fun setGameName(
         view: TextView,
@@ -28,4 +31,8 @@ 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,9 +1,12 @@
 package com.gh.common.provider
 
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.download.server.BrowserInstallHelper
+import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IBrowserInstallHelperProvider
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.browserInstallHelper, name = "BrowserInstallHelper暴露服务")
 class BrowserInstallHelperProviderImpl : IBrowserInstallHelperProvider {
     override fun isUseBrowserToInstallEnabled(): Boolean = BrowserInstallHelper.isUseBrowserToInstallEnabled()
 
@@ -12,4 +15,9 @@ class BrowserInstallHelperProviderImpl : IBrowserInstallHelperProvider {
     override fun logSwitchInstallSettingEvent() {
         BrowserInstallHelper.logOrdinaryBrowserEvent(BrowserInstallHelper.Type.SWITCH_INSTALL_SETTING)
     }
+
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
 }

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

@@ -1,10 +1,17 @@
 package com.gh.common.provider
 
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.gamecenter.BuildConfig
+import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IBuildConfigProvider
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.buildConfig, name = "BuildConfig暴露服务")
 class BuildConfigImpl : IBuildConfigProvider {
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+
     override fun getApplicationId(): String = BuildConfig.APPLICATION_ID
 
     override fun getVersionName(): String = BuildConfig.VERSION_NAME

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

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

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

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

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

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

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

@@ -2,12 +2,12 @@ package com.gh.common.provider
 
 import android.content.Context
 import android.widget.TextView
-import com.therouter.router.Route
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.common.util.CommentUtils
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.feature.provider.ICommentUtilsProvider
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.commentUtils, name = "CommentUtils暴露服务")
 class CommentUtilsProviderImpl : ICommentUtilsProvider {
     override fun setCommentTime(textView: TextView, time: Long) {
         CommentUtils.setCommentTime(textView, time)
@@ -16,4 +16,8 @@ class CommentUtilsProviderImpl : ICommentUtilsProvider {
     override fun getCommentTime(timestamp: Long): String {
         return CommentUtils.getCommentTime(timestamp)
     }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
 }

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

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

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

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

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

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

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

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

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

@@ -1,9 +1,12 @@
 package com.gh.common.provider
 
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.common.constant.Config
+import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IConfigProvider
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.config, name = "Config暴露服务")
 class ConfigProviderImpl : IConfigProvider {
     override fun getTencentAppId(): String {
         return Config.TENCENT_APPID
@@ -100,4 +103,8 @@ class ConfigProviderImpl : IConfigProvider {
     override fun isJiguangSwitch(): Boolean {
         return Config.getNewApiSettingsEntity()?.jiguangSwitch ?: false
     }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
 }

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

@@ -1,12 +1,19 @@
 package com.gh.common.provider
 
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.common.constant.Config
+import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.feature.entity.SettingsEntity
 import com.gh.gamecenter.feature.provider.IConfigSettingProvider
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.configSetting, name = "Config.getSettings暴露服务")
 class ConfigSettingProviderImpl : IConfigSettingProvider {
     override fun getSettings(): SettingsEntity? {
         return Config.getSettings()
     }
+
+    override fun init(context: Context?) {
+        // do nothing
+    }
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,7 +1,10 @@
 package com.gh.common.provider
 
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.common.util.NewFlatLogUtils
 import com.gh.gamecenter.common.base.GlobalActivityManager
+import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.exposure.ExposureSource
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.entity.GameUpdateEntity
@@ -14,7 +17,7 @@ import com.gh.gamecenter.packagehelper.PackageRepository
 import com.lightgame.download.DownloadEntity
 import com.lightgame.utils.Utils
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.downloadButtonClickedHandler, name = "DownloadButton点击事件暴露服务")
 class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
     override fun onClicked(downloadButton: DownloadButton) {
         var gameId = ""
@@ -142,4 +145,8 @@ class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
         }
     }
 
+    override fun init(context: Context?) {
+        // do nothing
+    }
+
 }

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

@@ -1,10 +1,13 @@
 package com.gh.common.provider
 
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.download.DownloadManager
+import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IDownloadManagerProvider
 import com.lightgame.download.DownloadEntity
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.downloadManager, name = "DownloadManager暴露服务")
 class DownloadManagerProviderImpl : IDownloadManagerProvider {
 
     override fun getDownloadEntityByUrl(url: String): DownloadEntity? {
@@ -15,4 +18,8 @@ class DownloadManagerProviderImpl : IDownloadManagerProvider {
         DownloadManager.getInstance().resumeAllInvisiblePendingTask()
     }
 
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,13 +1,13 @@
 package com.gh.common.provider
 
 import android.content.Context
-import com.therouter.router.Route
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.common.util.LibaoUtils
 import com.gh.common.util.LibaoUtils.PostLibaoListener
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.ILibaoUtilsProvider
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.libaoUtils, name = "LibaoUtils暴露服务")
 class LibaoUtilsProviderImpl : ILibaoUtilsProvider {
     override fun getLibaoStatus(ids: String, successCallback: ((Any?) -> Unit)?, failureCallback: (() -> Unit)?) {
         LibaoUtils.getLibaoStatus(ids, object : PostLibaoListener {
@@ -20,4 +20,8 @@ class LibaoUtilsProviderImpl : ILibaoUtilsProvider {
             }
         })
     }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
 }

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

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

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

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

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

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

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

@@ -2,13 +2,13 @@ package com.gh.common.provider
 
 import android.content.Context
 import android.content.Intent
-import com.therouter.router.Route
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.gamecenter.MessageDetailActivity
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.feature.entity.ConcernEntity
 import com.gh.gamecenter.feature.provider.IMessageDetailProvider
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.messageDetail, name = "MessageDetailActivity暴露服务")
 class MessageDetailProviderImpl : IMessageDetailProvider {
 
     override fun getIntentById(
@@ -24,4 +24,8 @@ class MessageDetailProviderImpl : IMessageDetailProvider {
     override fun getIntentByEntity(context: Context, concernEntity: ConcernEntity, entrance: String): Intent? {
         return MessageDetailActivity.getIntentByEntity(context, concernEntity, entrance)
     }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
 }

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

@@ -1,13 +1,16 @@
 package com.gh.common.provider
 
+import android.content.Context
 import androidx.lifecycle.MediatorLiveData
 import androidx.lifecycle.MutableLiveData
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.feature.entity.MessageUnreadCount
 import com.gh.gamecenter.feature.entity.MessageUnreadEntity
 import com.gh.gamecenter.feature.provider.IMessageUnreadRepositoryProvider
 import com.gh.gamecenter.message.MessageUnreadRepository
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.messageUnreadRepository, name = "MessageUnreadRepository暴露服务")
 class MessageUnreadRepositoryProviderImpl : IMessageUnreadRepositoryProvider {
 
     override fun loadMessageUnreadData() {
@@ -30,4 +33,7 @@ class MessageUnreadRepositoryProviderImpl : IMessageUnreadRepositoryProvider {
         return MessageUnreadRepository.messageUnreadCountLiveData
     }
 
+    override fun init(context: Context?) {
+        // Do nothing
+    }
 }

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

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

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

@@ -2,12 +2,12 @@ package com.gh.common.provider
 
 import android.content.Context
 import android.content.Intent
-import com.therouter.router.Route
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.feature.provider.INewCommentDetailProvider
 import com.gh.gamecenter.qa.comment.NewCommentDetailActivity
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.newCommentDetail, name = "NewCommentDetailActivity暴露服务")
 class NewCommentDetailProviderImpl : INewCommentDetailProvider {
 
     override fun getAnswerCommentIntent(
@@ -76,4 +76,8 @@ class NewCommentDetailProviderImpl : INewCommentDetailProvider {
             path
         )
     }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
 }

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

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

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

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

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

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

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

@@ -1,10 +1,13 @@
 package com.gh.common.provider
 
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.feature.entity.GameInstall
 import com.gh.gamecenter.feature.provider.IPackagesManagerProvider
 import com.gh.gamecenter.manager.PackagesManager
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.packagesManager, name = "PackagesManager暴露服务")
 class PackagesManagerProviderImpl: IPackagesManagerProvider {
     override fun isCanPluggable(gameId: String?, packageName: String?): Boolean {
         return PackagesManager.isCanPluggable(gameId, packageName)
@@ -13,4 +16,8 @@ class PackagesManagerProviderImpl: IPackagesManagerProvider {
     override fun getFilterSameApkInstalledList(): ArrayList<GameInstall> {
         return PackagesManager.getFilterSameApkInstalledList()
     }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
 }

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

@@ -1,11 +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.common.constant.RouteConsts
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.entity.IpInfo
 import com.gh.gamecenter.feature.provider.IRegionSettingHelperProvider
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.regionSettingHelper, name = "RegionSettingHelper暴露服务")
 class RegionSettingHelperProviderImpl : IRegionSettingHelperProvider {
     override fun shouldThisGameDisplayMirrorInfo(gameId: String): Boolean {
         return RegionSettingHelper.shouldThisGameDisplayMirrorInfo(gameId)
@@ -30,4 +33,8 @@ class RegionSettingHelperProviderImpl : IRegionSettingHelperProvider {
     override fun shouldThisGameBeFiltered(gameId: String?): Boolean {
         return RegionSettingHelper.shouldThisGameBeFiltered(gameId)
     }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
 }

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

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

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

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

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

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

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

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

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

@@ -3,11 +3,17 @@ package com.gh.common.provider
 import android.content.Context
 import android.content.Intent
 import android.os.Parcelable
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.gamecenter.ShellActivity
+import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IShellProvider
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.shellActivity, name = "ShellActivity暴露服务")
 class ShellProviderImpl : IShellProvider {
     override fun getSwitchInstallMethodIntent(context: Context, extraParcelable: Parcelable?): Intent =
         ShellActivity.getIntent(context, ShellActivity.Type.SWITCH_INSTALL_METHOD, extraParcelable)
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
 }

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

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

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

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

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

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

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

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

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

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

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

@@ -1,11 +1,13 @@
 package com.gh.common.provider
 
 import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.feature.entity.InstallGameEntity
 import com.gh.gamecenter.feature.provider.IVHelperProvider
 import com.gh.vspace.VHelper
 
-@com.therouter.inject.ServiceProvider
+@Route(path = RouteConsts.provider.vhelper, name = "VHelper暴露服务")
 class VHelperProviderImpl: IVHelperProvider {
     override fun isVGameOn(): Boolean {
         return VHelper.isVGameOn()
@@ -18,4 +20,8 @@ class VHelperProviderImpl: IVHelperProvider {
     override fun launch(context: Context, packageName: String, ignoreGApps: Boolean, showLoading: Boolean) {
         VHelper.launch(context, packageName, ignoreGApps, showLoading)
     }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
 }

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

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

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

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

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

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

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

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

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

@@ -9,7 +9,7 @@ import android.preference.PreferenceManager;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.therouter.TheRouter;
+import com.alibaba.android.arouter.launcher.ARouter;
 import com.gh.ad.AdDelegateHelper;
 import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.common.constant.Constants;
@@ -61,7 +61,7 @@ public class DataUtils {
     }
 
     private static void initSentry(Context context, String channel) {
-        ISentryProvider sentryProvider = TheRouter.get(ISentryProvider.class);
+        ISentryProvider sentryProvider = (ISentryProvider) ARouter.getInstance().build(RouteConsts.provider.sentry).navigation();
         if (sentryProvider != null) {
             sentryProvider.init(context, channel, BuildConfig.FLAVOR, BuildConfig.VERSION_NAME);
         }

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

@@ -458,7 +458,7 @@ public class DetailDownloadUtils {
                 }
                 viewHolder.getDownloadPb().setButtonStyle(DownloadButton.ButtonStyle.H5_GAME);
             } else {
-                if ("dialog".equals(gameEntity.getDownloadOffStatus()) || "third_party".equals(gameEntity.getDownloadOffStatus())) {
+                if ("dialog".equals(gameEntity.getDownloadOffStatus())) {
                     viewHolder.getDownloadPb().setText(TextUtils.isEmpty(gameEntity.getDownloadOffText()) ? "查看详情" : gameEntity.getDownloadOffText());
                     viewHolder.getDownloadPb().setButtonStyle(DownloadButton.ButtonStyle.NONE_WITH_HINT);
                 } else if ("updating".equals(gameEntity.getDownloadOffStatus())) {

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

@@ -11,6 +11,7 @@ import android.os.Bundle
 import android.text.TextUtils
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.os.bundleOf
+import com.alibaba.android.arouter.launcher.ARouter
 import com.gh.ad.AdPluginDownloadHelper
 import com.gh.common.constant.Config
 import com.gh.common.exposure.ExposureManager.log
@@ -55,7 +56,9 @@ import com.gh.gamecenter.gamecollection.detail.GameCollectionDetailActivity
 import com.gh.gamecenter.gamecollection.hotlist.GameCollectionHotListActivity
 import com.gh.gamecenter.gamecollection.hotlist.GameCollectionListDetailActivity
 import com.gh.gamecenter.gamecollection.square.GameCollectionSquareActivity
+import com.gh.gamecenter.gamedetail.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
@@ -66,6 +69,7 @@ import com.gh.gamecenter.minigame.MiniGameRecentlyPlayUseCase
 import com.gh.gamecenter.minigame.MiniGameSearchActivity
 import com.gh.gamecenter.minigame.qq.QGameHomeWrapperActivity
 import com.gh.gamecenter.newsdetail.NewsDetailActivity
+import com.gh.gamecenter.personalhome.UserHomeActivity
 import com.gh.gamecenter.personalhome.background.PersonalityBackgroundActivity
 import com.gh.gamecenter.personalhome.border.AvatarBorderActivity
 import com.gh.gamecenter.personalhome.home.UserHistoryViewModel
@@ -75,6 +79,7 @@ import com.gh.gamecenter.qa.questions.newdetail.NewQuestionDetailActivity
 import com.gh.gamecenter.qa.subject.CommunitySubjectActivity
 import com.gh.gamecenter.qa.video.detail.ForumVideoDetailActivity
 import com.gh.gamecenter.retrofit.RetrofitManager
+import com.gh.gamecenter.SearchActivity
 import com.gh.gamecenter.servers.GameServerTestActivity
 import com.gh.gamecenter.servers.GameServersActivity
 import com.gh.gamecenter.servers.gametest2.GameServerTestV2Activity
@@ -95,7 +100,6 @@ import com.halo.assistant.fragment.WebFragment
 import com.lightgame.utils.Utils
 import com.tencent.mm.opensdk.modelbiz.WXLaunchMiniProgram
 import com.tencent.mm.opensdk.openapi.WXAPIFactory
-import com.therouter.TheRouter
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
 import retrofit2.HttpException
@@ -176,23 +180,7 @@ object DirectUtils {
         "qa",
         "feedback",
         "toolkit",
-        "float_window_game",
-        "my_halo",
-        "my_game",
-        "server_manager",
-        "receiving_information",
-        "game_archive",
-        "game_dynamics",
-        "game_upload",
-        "certification",
-        "wechat_reminder",
-        "apk_clean",
-        "personal_center",
-        "video_upload",
-        "account_security",
-        "simulator",
-        "teen_mode",
-        "message_center",
+        "float_window_game"
     )
 
     fun directToLinkPage(
@@ -397,8 +385,8 @@ object DirectUtils {
                 }
             }
 
-            "authentication", "certification" -> {
-                directToRealName(context)
+            "authentication" -> {
+                context.startActivity(ShellActivity.getIntent(context, ShellActivity.Type.REAL_NAME_INFO, null))
             }
 
             "user_background" -> {
@@ -456,7 +444,7 @@ object DirectUtils {
                 } ?: ""
             }
 
-            "my_halo", "halo_tab" -> directToHomeMyHaloTab(context)
+            "halo_tab" -> directToHomeMyHaloTab(context)
 
             "common_collection" -> directToCommonCollectionDetail(
                 context,
@@ -538,8 +526,7 @@ object DirectUtils {
                 ToolbarWrapperActivity.getMultiTabNavIntent(
                     context,
                     linkEntity.link ?: "",
-                    linkEntity.text ?: "",
-                    entrance
+                    linkEntity.text ?: ""
                 )
             )
 
@@ -547,20 +534,16 @@ object DirectUtils {
                 ToolbarWrapperActivity.getCustomPageIntent(
                     context,
                     linkEntity.link ?: "",
-                    linkEntity.text ?: "",
-                    entrance
+                    linkEntity.text ?: ""
                 )
             )
 
             // 选中首页底部 tab
             "bottom_tab" -> {
-                if (HaloApp.getInstance().isRunningForeground) {
-                    val intent = Intent(context, MainActivity::class.java)
-                    intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
-                    context.startActivity(intent)
-                } else {
-                    jumpActivity(context, Bundle())
+                val intent = Intent(context, MainActivity::class.java).apply {
+                    flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
                 }
+                context.startActivity(intent)
 
                 if (linkEntity is LaunchRedirect) {
                     MainWrapperRepository.getInstance().sendSelectTabEvent(linkEntity)
@@ -587,32 +570,6 @@ object DirectUtils {
                 }
             }
 
-            "my_game" -> directToMyGame(0, entrance)
-
-            "server_manager" -> directToServersCalendarManagement(entrance)
-
-            "receiving_information" -> directToDeliveryInfo(entrance)
-
-            "game_archive" -> directToGameArchive(entrance)
-
-            "game_dynamics" -> directToConcernInfo(context, entrance)
-
-            "wechat_reminder" -> CheckLoginUtils.checkLogin(context, entrance) {
-                context.startActivity(WebActivity.getBindWechatIntent(context))
-            }
-
-            "apk_clean" -> directToCleanApk(context, entrance)
-
-            "personal_center" -> directToUserInfo(entrance)
-
-            "simulator" -> directToSimulatorGame(entrance)
-
-            "account_security" -> directToAccountSecurity(entrance)
-
-            "teen_mode" -> directToTeenMode(entrance)
-
-            "message_center" -> directToMessageCenter(0, entrance)
-
             "" -> {
                 // do nothing
             }
@@ -633,16 +590,12 @@ object DirectUtils {
     @JvmStatic
     fun directToQa(context: Context, text: String? = "", id: String) {
         if (id.isEmpty()) return
-
+        val destination = RouteConsts.activity.qaActivity.toDestinationClass()
         val bundle = Bundle()
+        bundle.putString(KEY_TO, destination?.name ?: "")
         bundle.putString(KEY_NAVIGATION_TITLE, text)
         bundle.putString(KEY_QA_ID, id)
-
-        TheRouter.build(RouteConsts.activity.qaActivity)
-            .fillParams {
-                it.putAll(bundle)
-            }
-            .navigation(context)
+        jumpActivity(context, bundle)
     }
 
     /**
@@ -651,16 +604,12 @@ object DirectUtils {
     @JvmStatic
     fun directToQaCollection(context: Context, text: String, id: String) {
         if (id.isEmpty()) return
-
+        val destination = RouteConsts.activity.qaActivity.toDestinationClass()
         val bundle = Bundle()
+        bundle.putString(KEY_TO, destination?.name ?: "")
         bundle.putString(KEY_NAVIGATION_TITLE, text)
         bundle.putString(KEY_QA_COLLECTION_ID, id)
-
-        TheRouter.build(RouteConsts.activity.qaActivity)
-            .fillParams {
-                it.putAll(bundle)
-            }
-            .navigation(context)
+        jumpActivity(context, bundle)
     }
 
     /**
@@ -771,7 +720,7 @@ object DirectUtils {
      */
     @JvmStatic
     fun directToHomeActivity(context: Context, userId: String?, entrance: String? = null, path: String? = null) {
-        directToHomeActivity(context, userId, entrance, path, 0)
+        context.startActivity(UserHomeActivity.getIntent(context, userId ?: "", entrance, path))
     }
 
     @JvmStatic
@@ -810,20 +759,17 @@ object DirectUtils {
         entrance: String? = null,
         path: String? = null
     ) {
+
         IntegralLogHelper.log("view_homepage", "个人主页")
-
-        val uri = Uri.Builder()
-            .path(RouteConsts.activity.userHomeActivity)
-            .appendQueryParameter(KEY_USER_ID, userId)
-            .appendQueryParameter(KEY_TAB_INDEX, position.toString())
-            .appendQueryParameter(KEY_PATH, BaseActivity.mergeEntranceAndPath(entrance, path))
-            .appendQueryParameter(KEY_COMMUNITY_TYPE, UserHistoryViewModel.TYPE.fromValue(type).value)
-            .appendQueryParameter(KEY_GAME_TYPE, gameType)
-            .build()
-
-        TheRouter
-            .build(uri.toString())
-            .navigation(context)
+        val bundle = Bundle()
+        bundle.putString(KEY_USER_ID, userId)
+        bundle.putString(KEY_TO, UserHomeActivity::class.java.name)
+        bundle.putString(KEY_ENTRANCE, BaseActivity.mergeEntranceAndPath(entrance, path))
+        bundle.putString(KEY_PATH, path)
+        bundle.putString(KEY_TYPE, UserHistoryViewModel.TYPE.fromValue(type).value)
+        bundle.putString(KEY_GAME, gameType)
+        bundle.putInt(KEY_POSITION, position ?: 0)
+        jumpActivity(context, bundle)
     }
 
 
@@ -855,10 +801,10 @@ object DirectUtils {
         bundle.putString(KEY_GAMEID, id)
         if (!TextUtils.isEmpty(tab)) {
             when (tab) {
-                "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)
+                "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)
             }
         }
         if (traceEvent != null) {
@@ -903,7 +849,7 @@ object DirectUtils {
         bundle.putString(KEY_ENTRANCE, entrance)
         bundle.putString(KEY_GAMEID, id)
         bundle.putBoolean(KEY_OPEN_VIDEO_STREAMING, true)
-        bundle.putString(KEY_TARGET, EntranceConsts.TAB_TYPE_DESC)
+        bundle.putString(KEY_TARGET, GameDetailFragment.TAB_DESC)
         jumpActivity(context, bundle)
     }
 
@@ -911,7 +857,7 @@ object DirectUtils {
     fun directToGameDetail(
         context: Context,
         id: String,
-        defaultTab: String = EntranceConsts.TAB_TYPE_DESC,
+        defaultTab: String = GameDetailFragment.TAB_DESC,
         entrance: String? = null
     ) {
         val bundle = Bundle()
@@ -1569,7 +1515,7 @@ object DirectUtils {
                     response?.apply {
                         if (zone.status == "on") {
                             if (zone.style == "link") {
-                                directToGameDetail(context, gameId, EntranceConsts.TAB_TYPE_TRENDS, entrance)
+                                directToGameDetail(context, gameId, GameDetailFragment.TAB_TRENDS, entrance)
                             } else {
                                 directToWebView(context, url, entrance)
                             }
@@ -1680,11 +1626,11 @@ object DirectUtils {
      */
     @JvmStatic
     fun directToHelpAndFeedback(context: Context, bundle: Bundle? = null) {
-        TheRouter.build(RouteConsts.activity.helpAndFeedbackActivity)
-            .fillParams {
-                it.putAll(bundle)
-            }
-            .navigation(context)
+        val destination = RouteConsts.activity.helpAndFeedbackActivity.toDestinationClass()
+        val newBundle = Bundle()
+        newBundle.putString(KEY_TO, destination?.name ?: "")
+        bundle?.let { newBundle.putAll(it) }
+        jumpActivityCompat(context, newBundle)
     }
 
 
@@ -1781,7 +1727,8 @@ object DirectUtils {
     @JvmStatic
     fun directToConcernInfo(context: Context, entrance: String) {
         context.startActivity(
-            TheRouter.get(IConcernInfoProvider::class.java)?.getIntent(context, entrance)
+            (ARouter.getInstance().build(RouteConsts.provider.concernInfo)
+                .navigation() as? IConcernInfoProvider)?.getIntent(context, entrance)
         )
     }
 
@@ -2038,7 +1985,10 @@ object DirectUtils {
             return
         }
 
-        val qGameProvider = TheRouter.get(IQGameProvider::class.java)
+        val qGameProvider = ARouter
+            .getInstance()
+            .build(RouteConsts.provider.qGame)
+            .navigation() as? IQGameProvider
 
         if (qGameProvider == null) return
 
@@ -2087,14 +2037,8 @@ object DirectUtils {
     }
 
     @JvmStatic
-    fun directToMessageCenter(defaultTabIndex: Int, source: String) {
-        val uri = Uri.Builder()
-            .path(RouteConsts.activity.messageWrapperActivity)
-            .appendQueryParameter(RouteConsts.QueryParams.REQUIRE_LOGIN, "true")
-            .appendQueryParameter(RouteConsts.QueryParams.SOURCE, source)
-            .build()
-
-        TheRouter.build(uri.toString())
+    fun directToMessageCenter(defaultTabIndex: Int) {
+        ARouter.getInstance().build(RouteConsts.activity.messageWrapperActivity)
             .withInt(BaseActivity_TabLayout.PAGE_INDEX, defaultTabIndex)
             .navigation()
     }
@@ -2128,17 +2072,13 @@ object DirectUtils {
 
     /**
      * 跳转到开服订阅页面
+     * @param context 上下文
      */
     @JvmStatic
-    fun directToServersCalendarManagement(entrance: String) {
-        val uri = Uri.Builder()
-            .path(RouteConsts.activity.serversCalendarManagementActivity)
-            .appendQueryParameter(RouteConsts.QueryParams.REQUIRE_LOGIN, "true")
-            .appendQueryParameter(RouteConsts.QueryParams.SOURCE, entrance)
-            .build()
-
-        TheRouter.build(uri.toString())
-            .navigation()
+    fun directToServersCalendarManagement(context: Context, entrance: String) {
+        CheckLoginUtils.checkLogin(context, entrance) {
+            context.startActivity(ServersCalendarManagementActivity.getIntent(context))
+        }
     }
 
     fun directToSearch(
@@ -2198,100 +2138,4 @@ object DirectUtils {
             )
         }
     }
-
-    @JvmStatic
-    fun directToMyGame(defaultTabIndex: Int, source: String) {
-        val uri = Uri.Builder()
-            .path(RouteConsts.activity.myGameActivity)
-            .appendQueryParameter(RouteConsts.QueryParams.SOURCE, source)
-            .build()
-
-        TheRouter.build(uri.toString())
-            .withInt(BaseActivity_TabLayout.PAGE_INDEX, defaultTabIndex)
-            .navigation()
-    }
-
-    @JvmStatic
-    fun directToDeliveryInfo(source: String) {
-        val uri = Uri.Builder()
-            .path(RouteConsts.activity.deliveryInfoActivity)
-            .appendQueryParameter(RouteConsts.QueryParams.REQUIRE_LOGIN, "true")
-            .appendQueryParameter(RouteConsts.QueryParams.SOURCE, source)
-            .build()
-
-        TheRouter.build(uri.toString())
-            .navigation()
-    }
-
-    @JvmStatic
-    fun directToGameArchive(source: String) {
-        val uri = Uri.Builder()
-            .path(RouteConsts.activity.gameArchiveListActivity)
-            .appendQueryParameter(RouteConsts.QueryParams.SOURCE, source)
-            .build()
-
-        TheRouter.build(uri.toString())
-            .navigation()
-    }
-
-    @JvmStatic
-    fun directToSimulatorGame(source: String) {
-        val uri = Uri.Builder()
-            .path(RouteConsts.activity.simulatorGameActivity)
-            .appendQueryParameter(RouteConsts.QueryParams.SOURCE, source)
-            .build()
-
-        TheRouter.build(uri.toString())
-            .navigation()
-    }
-
-    @JvmStatic
-    fun directToTeenMode(source: String) {
-        val uri = Uri.Builder()
-            .path(RouteConsts.activity.teenagerModeActivity)
-            .appendQueryParameter(RouteConsts.QueryParams.SOURCE, source)
-            .build()
-
-        TheRouter.build(uri.toString())
-            .navigation()
-    }
-
-    @JvmStatic
-    fun directToUserInfo(source: String) {
-        val uri = Uri.Builder()
-            .path(RouteConsts.activity.userInfoActivity)
-            .appendQueryParameter(RouteConsts.QueryParams.REQUIRE_LOGIN, "true")
-            .appendQueryParameter(RouteConsts.QueryParams.SOURCE, source)
-            .build()
-
-        TheRouter.build(uri.toString())
-            .navigation()
-    }
-
-    @JvmStatic
-    fun directToCleanApk(context: Context, source: String) {
-        val uri = Uri.Builder()
-            .path(RouteConsts.activity.cleanApkActivity)
-            .appendQueryParameter(RouteConsts.QueryParams.SOURCE, source)
-            .build()
-
-        PermissionHelper.checkManageAllFilesOrStoragePermissionBeforeAction(context) {
-            TheRouter.build(uri.toString())
-                .navigation()
-        }
-    }
-
-    @JvmStatic
-    fun directToAccountSecurity(source: String, isLogoutStyle: Boolean = false) {
-        val uri = Uri.Builder()
-            .path(RouteConsts.activity.securityActivity)
-            .appendQueryParameter(RouteConsts.QueryParams.REQUIRE_LOGIN, "true")
-            .appendQueryParameter(RouteConsts.QueryParams.SOURCE, source)
-            .build()
-
-        TheRouter.build(uri.toString())
-            .withString(KEY_ENTRANCE, source)
-            .withBoolean(KEY_DISPLAY_TYPE, isLogoutStyle)
-            .navigation()
-    }
 }

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 || "third_party" == offStatus) {
+                    if ("dialog" == offStatus) {
                         text = context.getString(com.gh.gamecenter.feature.R.string.check)
-                        buttonStyle = DownloadButton.ButtonStyle.NONE_WITH_HINT
+                        buttonStyle = DownloadButton.ButtonStyle.NORMAL
                     } else if ("updating" == offStatus) {
                         text = context.getString(com.gh.gamecenter.feature.R.string.updating)
                         buttonStyle = DownloadButton.ButtonStyle.UPDATING

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

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/PackageLauncher.kt

@@ -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 {
-            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 "下载"
-            )
-        }
-
         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

@@ -301,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};

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.therouter.TheRouter
+import com.alibaba.android.arouter.launcher.ARouter
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.common.repository.ReservationRepository
 import com.gh.gamecenter.WebActivity
@@ -194,7 +194,7 @@ object ReservationHelper {
     @JvmStatic
     fun getReserveRequestBody(game: GameEntity?, context: Context): RequestBody {
         val jPushId =
-            (TheRouter.get(IPushProvider::class.java))
+            (ARouter.getInstance().build(RouteConsts.provider.push).navigation() as? IPushProvider)
                 ?.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.therouter.TheRouter
+import com.alibaba.android.arouter.launcher.ARouter
 import com.gh.common.iinterface.ISuperiorChain
 import com.gh.gamecenter.amway.AmwayFragment
 import com.gh.gamecenter.category2.CategoryV2Fragment
@@ -129,7 +129,9 @@ object ViewPagerFragmentHelper {
             }
             // 帮助与反馈
             TYPE_FEEDBACK -> {
-                val helpAndFeedbackProvider = TheRouter.get(IHelpAndFeedbackProvider::class.java)
+                val helpAndFeedbackProvider =
+                    ARouter.getInstance().build(RouteConsts.provider.helpAndFeedback)
+                        .navigation() as? IHelpAndFeedbackProvider
                 if (helpAndFeedbackProvider != null) {
                     helpAndFeedbackProvider.getHelpAndFeedbackFragment().with(bundle)
                 } else {
@@ -248,7 +250,9 @@ object ViewPagerFragmentHelper {
             }
             // QA
             TYPE_QA -> {
-                val helpAndFeedbackProvider = TheRouter.get(IHelpAndFeedbackProvider::class.java)
+                val helpAndFeedbackProvider =
+                    ARouter.getInstance().build(RouteConsts.provider.helpAndFeedback)
+                        .navigation() as? IHelpAndFeedbackProvider
 
                 helpAndFeedbackProvider?.let {
                     className = it.getHelpContainerFragmentClass()

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

@@ -6,7 +6,7 @@ import android.os.Bundle;
 
 import androidx.annotation.NonNull;
 
-import com.therouter.router.Route;
+import com.alibaba.android.arouter.facade.annotation.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,25 +3,26 @@ 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.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 com.gh.gamecenter.common.constant.EntranceConsts;
+import com.gh.gamecenter.common.view.CropImageCustom;
 
 import java.io.File;
 import java.lang.ref.SoftReference;
 
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+
 /**
  * 裁剪图片
  */
@@ -31,8 +32,6 @@ 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;
@@ -52,7 +51,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_STYLE, new CropBoxStyle.Rectangle(cropRatio));
+        intent.putExtra(EntranceConsts.KEY_IMAGE_CROP_RATIO, cropRatio);
         intent.putExtra(EntranceConsts.KEY_BLACK_THEME, isBlackTheme);
         intent.putExtra(EntranceConsts.KEY_ASSIST_RES, assistRes);
         return intent;
@@ -69,14 +68,20 @@ public class CropImageActivity extends ToolBarActivity {
         super.onCreate(savedInstanceState);
 
         mCropImageCustom = findViewById(R.id.cropimage_custom);
-        TextView tvCancel = findViewById(R.id.tv_cancel);
-        TextView tvSubmit = findViewById(R.id.tv_submit);
+        View statusBarView = findViewById(R.id.status_bar);
 
-        CropBoxStyle boxStyle = getIntent().getParcelableExtra(EntranceConsts.KEY_IMAGE_CROP_STYLE);
-        if (boxStyle == null) {
-            boxStyle = new CropBoxStyle.Rectangle(1F);
-        }
-        mCropImageCustom.setCropBoxStyle(boxStyle);
+        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);
 
         int assistRes = getIntent().getIntExtra(EntranceConsts.KEY_ASSIST_RES, -1);
         if (assistRes > 0) {
@@ -84,21 +89,8 @@ public class CropImageActivity extends ToolBarActivity {
             addAssistView(view);
         }
 
-        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();
+        DisplayUtils.setLightStatusBar(this, !mBlackTheme);
+        DisplayUtils.setStatusBarColor(this, com.gh.gamecenter.common.R.color.transparent, !mBlackTheme);
     }
 
     @Override
@@ -106,6 +98,20 @@ 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,17 +5,12 @@ 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
+import com.gh.common.exposure.ExposureManager.log
 import com.gh.common.exposure.ExposureTraceUtils.appendTrace
 import com.gh.gamecenter.common.base.GlobalActivityManager
-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.Constants
 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
@@ -25,54 +20,15 @@ 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
 
-@Route(
-    path = RouteConsts.activity.gameDetailActivity,
-    description = "游戏详情页"
-)
+/**
+ * Created by khy on 2017/3/24.
+ * 游戏详情页
+ */
 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)
     }
@@ -81,21 +37,37 @@ class GameDetailActivity : DownloadToolbarActivity() {
         return getTargetIntent(this, GameDetailActivity::class.java, GameDetailFragment::class.java)
     }
 
-    override fun getLayoutId() = R.layout.activity_game_detail
+    override fun getLayoutId(): Int {
+        return R.layout.activity_game_detail
+    }
 
-    override fun showToolbarAtLeft() = true
-    override fun showDownloadMenu() = true
+    override fun showToolbarAtLeft(): Boolean {
+        return true
+    }
 
-    override fun getActivityNameInChinese() = "游戏详情"
+    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 getBusinessId(): Pair<String, String> {
-        return if (!gameId.isNullOrEmpty()) {
-            Pair(gameId ?: "", "")
+        val fragment = targetFragment as? GameDetailFragment?
+        return if (fragment?.arguments != null) {
+            Pair(fragment.requireArguments().getString(EntranceConsts.KEY_GAMEID) ?: "", "")
         } else {
             super.getBusinessId()
         }
     }
 
+
     override fun attachBaseContext(newBase: Context) {
         super.attachBaseContext(object : ContextWrapper(newBase) {
             override fun getSystemService(name: String): Any? {
@@ -124,13 +96,6 @@ 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
@@ -166,10 +131,9 @@ class GameDetailActivity : DownloadToolbarActivity() {
 
             if (traceEvent != null) {
                 val clickEvent = createEvent(gameEntity, traceEvent.source, appendTrace(traceEvent), ExposureType.CLICK)
-                ExposureManager.log(clickEvent)
+                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(
@@ -180,35 +144,31 @@ class GameDetailActivity : DownloadToolbarActivity() {
                 )
                 traceEvent.payload = payload
             }
-
             if (defaultTab.isNotEmpty()) {
                 bundle.putString(EntranceConsts.KEY_TARGET, defaultTab)
             }
-
             if (isSkipGameComment) {
-                bundle.putBoolean(EntranceConsts.KEY_COMMENT_AS_DEFAULT_TAB, true)
+                bundle.putBoolean(EntranceConsts.KEY_SKIP_GAME_COMMENT, true)
             }
-
             if (scrollToLibao) {
-                bundle.putString(EntranceConsts.KEY_TARGET, EntranceConsts.TAB_TYPE_DESC)
+                bundle.putString(EntranceConsts.KEY_TARGET, GameDetailFragment.TAB_DESC)
                 bundle.putBoolean(EntranceConsts.KEY_SCROLL_TO_LIBAO, true)
             }
-
             if (scrollToServer) {
-                bundle.putString(EntranceConsts.KEY_TARGET, EntranceConsts.TAB_TYPE_DESC)
+                bundle.putString(EntranceConsts.KEY_TARGET, GameDetailFragment.TAB_DESC)
                 bundle.putBoolean(EntranceConsts.KEY_SCROLL_TO_SERVER, true)
             }
-
-            bundle.putString(EntranceConsts.KEY_GAME_ID, gameEntity?.id)
+            bundle.putString(EntranceConsts.KEY_GAMEID, gameEntity?.id)
             bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance)
-            bundle.putParcelable(EntranceConsts.KEY_GAME_ENTITY, gameEntity)
-
-            TheRouter
-                .build(RouteConsts.activity.gameDetailActivity)
-                .fillParams {
-                    it.putAll(bundle)
-                }
-                .navigation(context)
+            bundle.putParcelable(GameEntity.TAG, gameEntity)
+            context.startActivity(
+                getTargetIntent(
+                    context,
+                    GameDetailActivity::class.java,
+                    GameDetailFragment::class.java,
+                    bundle
+                )
+            )
         }
 
         @JvmStatic
@@ -218,7 +178,7 @@ class GameDetailActivity : DownloadToolbarActivity() {
             entrance: String?,
             traceEvent: ExposureEvent?
         ) {
-            startGameDetailActivity(context, gameId, entrance, isSkipGameComment = false, traceEvent = traceEvent)
+            startGameDetailActivity(context, gameId, entrance, -1, traceEvent = traceEvent)
         }
 
         @JvmStatic
@@ -226,6 +186,7 @@ class GameDetailActivity : DownloadToolbarActivity() {
             context: Context,
             gameId: String,
             entrance: String?,
+            defaultTab: Int = -1,
             isSkipGameComment: Boolean = false,
             scrollToLibao: Boolean = false,
             openVideoStreaming: Boolean = false,
@@ -236,6 +197,7 @@ class GameDetailActivity : DownloadToolbarActivity() {
                 context,
                 gameId,
                 entrance,
+                defaultTab,
                 isSkipGameComment,
                 scrollToLibao,
                 openVideoStreaming,
@@ -249,6 +211,7 @@ class GameDetailActivity : DownloadToolbarActivity() {
 
         /**
          * @param gameId 游戏Id
+         * @param defaultTab 默认定位到哪个tab
          * @param isSkipGameComment 是否跳转到评论tab
          * @param scrollToLibao 滚动到礼包区域
          * @param openVideoStreaming 是否打开视频流
@@ -262,6 +225,7 @@ class GameDetailActivity : DownloadToolbarActivity() {
             context: Context,
             gameId: String,
             entrance: String?,
+            defaultTab: Int = -1,
             isSkipGameComment: Boolean = false,
             scrollToLibao: Boolean = false,
             openVideoStreaming: Boolean = false,
@@ -284,7 +248,7 @@ class GameDetailActivity : DownloadToolbarActivity() {
                     appendTrace(traceEvent),
                     ExposureType.CLICK
                 )
-                ExposureManager.log(clickEvent)
+                log(clickEvent)
                 bundle.putParcelable(EntranceConsts.KEY_TRACE_EVENT, clickEvent)
             }
             if (traceEvent != null && gameId != traceEvent.payload.gameId) {
@@ -297,12 +261,15 @@ class GameDetailActivity : DownloadToolbarActivity() {
                 )
                 traceEvent.payload = payload
             }
+            if (defaultTab != -1) {
+                bundle.putInt(EntranceConsts.KEY_TARGET, defaultTab)
+            }
             if (isSkipGameComment) {
-                bundle.putBoolean(EntranceConsts.KEY_COMMENT_AS_DEFAULT_TAB, true)
+                bundle.putBoolean(EntranceConsts.KEY_SKIP_GAME_COMMENT, true)
             }
             if (openVideoStreaming) {
                 bundle.putBoolean(EntranceConsts.KEY_OPEN_VIDEO_STREAMING, true)
-                bundle.putString(EntranceConsts.KEY_TARGET, EntranceConsts.TAB_TYPE_DESC)
+                bundle.putString(EntranceConsts.KEY_TARGET, GameDetailFragment.TAB_DESC)
             }
             if (openPlatformWindow) {
                 bundle.putBoolean(EntranceConsts.KEY_OPEN_PLATFORM_WINDOW, true)
@@ -316,10 +283,10 @@ class GameDetailActivity : DownloadToolbarActivity() {
                 }
             }
             if (scrollToLibao) {
-                bundle.putString(EntranceConsts.KEY_TARGET, EntranceConsts.TAB_TYPE_DESC)
+                bundle.putString(EntranceConsts.KEY_TARGET, GameDetailFragment.TAB_DESC)
                 bundle.putBoolean(EntranceConsts.KEY_SCROLL_TO_LIBAO, true)
             }
-            bundle.putString(EntranceConsts.KEY_GAME_ID, gameId)
+            bundle.putString(EntranceConsts.KEY_GAMEID, 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)
@@ -328,13 +295,14 @@ class GameDetailActivity : DownloadToolbarActivity() {
                 EntranceConsts.KEY_LAST_PAGE_BUSINESS_ID,
                 GlobalActivityManager.getLastPageEntity().pageBusinessId
             )
-
-            TheRouter
-                .build(RouteConsts.activity.gameDetailActivity)
-                .fillParams {
-                    it.putAll(bundle)
-                }
-                .navigation(context)
+            context.startActivity(
+                getTargetIntent(
+                    context,
+                    GameDetailActivity::class.java,
+                    GameDetailFragment::class.java,
+                    bundle
+                )
+            )
         }
 
     }

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

@@ -34,7 +34,7 @@ import androidx.transition.*
 import androidx.viewpager.widget.PagerAdapter
 import androidx.viewpager.widget.ViewPager
 import androidx.viewpager.widget.ViewPager.OnPageChangeListener
-import com.therouter.router.Route
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
 import com.facebook.drawee.backends.pipeline.Fresco
 import com.facebook.imagepipeline.core.ImagePipeline

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

@@ -554,25 +554,31 @@ public class MainActivity extends BaseActivity {
     protected void handleMessage(Message msg) {
         super.handleMessage(msg);
         if (msg.what == COUNTDOWN_AD || msg.what == COUNTDOWN_SDK_AD) {
-            mCountdownCount++;
             int maxCount;
 
-            // 第三秒的时候初始化 Fragment
-            if (mCountdownCount == 3) {
-                doInitMainFragment(mTempSavedInstanceState);
-            }
-
             if (msg.what == COUNTDOWN_AD) {
                 maxCount = mCountdownMaxCount;
             } else {
                 maxCount = COUNTDOWN_SDK_MAX_COUNT;
             }
+
+            // 读秒到一半的时候初始化 MainWrapperFragment
+            if (mCountdownCount == maxCount / 2) {
+                doInitMainFragment(mTempSavedInstanceState);
+            }
+
+            mCountdownCount++;
+
             if (maxCount < mCountdownCount) {
                 AdDelegateHelper.INSTANCE.setShowingSplashAd(false);
                 hideSplashAd();
 
                 if (msg.what == COUNTDOWN_AD && msg.obj instanceof StartupAdEntity) {
                     StartupAdEntity ad = (StartupAdEntity) msg.obj;
+                    if (!AdDelegateHelper.INSTANCE.isOwnerSplashAdShown()) {
+                        com.gh.common.util.NewFlatLogUtils.logSplashAdFail(ad.getId(), "广告加载超时");
+                    }
+                    AdDelegateHelper.INSTANCE.setOwnerSplashAdShown(false);
                     LinkEntity linkEntity = ad.getJump();
                     SensorsBridge.trackEvent(
                             "SplashAdOwnSkip",

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

@@ -191,7 +191,6 @@ open class SearchActivity : BaseActivity() {
         when (type) {
             SearchType.AUTO -> handleAutoSearch(key)
             SearchType.DEFAULT -> handleDefaultSearch(key)
-            SearchType.DISCOVERY -> handleDiscoverySearch(key)
             SearchType.RANK -> handleRankSearch(key)
             SearchType.HOT -> handleHotSearch(key)
             SearchType.HISTORY -> handleHistorySearch(key)
@@ -245,22 +244,6 @@ open class SearchActivity : BaseActivity() {
         )
     }
 
-    protected open fun handleDiscoverySearch(key: String?) {
-        mSearchKey = key
-        searchEt.setText(key)
-        searchEt.setSelection(searchEt.text.length)
-        updateDisplayType(GAME_DETAIL)
-        LogUtils.uploadSearchGame("searching", "搜索页", key, "搜索发现")
-
-        SensorsBridge.trackSearchButtonClick(
-            GlobalActivityManager.getCurrentPageEntity().pageId,
-            GlobalActivityManager.getCurrentPageEntity().pageName,
-            key ?: "",
-            TRACK_SEARCH_TYPE_DISCOVERY,
-            mSourceEntrance
-        )
-    }
-
     protected open fun handleDefaultSearch(key: String?) {
         mSearchKey = key
         searchEt.setText(key)
@@ -329,6 +312,19 @@ open class SearchActivity : BaseActivity() {
 //        MtaHelper.onEvent("游戏搜索", "主动搜索", newSearchKey)
     }
 
+    override fun onResume() {
+        super.onResume()
+        val newSearchKey = searchEt.text.toString().trim { it <= ' ' }
+        if (newSearchKey.isBlank()) {
+            try {
+                popBackToFragment(SearchDefaultFragment::class.java.name)
+            } catch (e: Exception) {
+                // no implement
+            }
+
+        }
+    }
+
     protected open fun provideDao(): ISearchHistoryDao = SearchHistoryDao(this)
 
     open fun updateDisplayType(type: DisplayType) {
@@ -408,7 +404,6 @@ open class SearchActivity : BaseActivity() {
             SearchType.HISTORY.value -> search(SearchType.HISTORY, search.key)
             SearchType.HOT.value -> search(SearchType.HOT, search.key)
             SearchType.RANK.value -> search(SearchType.RANK, search.key)
-            SearchType.DISCOVERY.value -> search(SearchType.DISCOVERY, search.key)
 
             "click" -> DataCollectionUtils.uploadSearchClick(
                 this, mSearchKey, mSearchType.value, "搜索页面",
@@ -453,7 +448,6 @@ open class SearchActivity : BaseActivity() {
         const val TRACK_SEARCH_TYPE_DEFAULT = "默认搜索"
         const val TRACK_SEARCH_TYPE_HISTORY = "历史搜索"
         const val TRACK_SEARCH_TYPE_RANK = "榜单搜索"
-        const val TRACK_SEARCH_TYPE_DISCOVERY = "搜索发现"
 
         @JvmStatic
         fun toTrackSearchType(type: String) = when (type) {
@@ -461,7 +455,6 @@ open class SearchActivity : BaseActivity() {
             SearchType.MANUAL.value -> TRACK_SEARCH_TYPE_INPUT
             SearchType.HISTORY.value -> TRACK_SEARCH_TYPE_HISTORY
             SearchType.RANK.value -> TRACK_SEARCH_TYPE_RANK
-            SearchType.DISCOVERY.value -> TRACK_SEARCH_TYPE_DISCOVERY
             else -> TRACK_SEARCH_TYPE_DEFAULT
         }
 
@@ -511,8 +504,7 @@ enum class SearchType(var value: String) {
     HISTORY("history"),
     MANUAL("initiative"),
     HOT("remen"),
-    RANK("rank"),
-    DISCOVERY("dicovery");
+    RANK("rank");
 
     fun toChinese() = when (this) {
         AUTO -> "自动搜索"
@@ -521,7 +513,6 @@ enum class SearchType(var value: String) {
         MANUAL -> "主动搜索"
         HOT -> "热门搜索"
         RANK -> "榜单搜索"
-        DISCOVERY -> "搜索发现"
     }
 
     companion object {

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

@@ -62,16 +62,16 @@ import com.gh.gamecenter.common.base.activity.BaseActivity;
 import com.gh.gamecenter.common.constant.Constants;
 import com.gh.gamecenter.common.constant.EntranceConsts;
 import com.gh.gamecenter.common.entity.CommunityEntity;
-import com.gh.gamecenter.common.entity.LaunchRedirect;
+import com.gh.gamecenter.common.entity.LinkEntity;
 import com.gh.gamecenter.common.entity.SimpleGameEntity;
 import com.gh.gamecenter.core.utils.GsonUtils;
 import com.gh.gamecenter.core.utils.ToastUtils;
 import com.gh.gamecenter.entity.SubjectData;
 import com.gh.gamecenter.entity.SubjectRecommendEntity;
 import com.gh.gamecenter.entity.VideoLinkEntity;
-import com.gh.gamecenter.feature.minigame.MiniGameItemHelper;
 import com.gh.gamecenter.feature.utils.PlatformUtils;
 import com.gh.gamecenter.login.view.LoginActivity;
+import com.gh.gamecenter.feature.minigame.MiniGameItemHelper;
 import com.gh.gamecenter.video.detail.VideoDetailContainerViewModel;
 import com.gh.gamecenter.video.videomanager.VideoManagerActivity;
 import com.gh.vspace.VHelper;
@@ -356,8 +356,8 @@ public class SkipActivity extends BaseActivity {
                                 if (!TextUtils.isEmpty(dataString)) {
                                     byte[] linkData = Base64.decode(dataString, Base64.DEFAULT);
                                     String linkDataString = new String(linkData, "UTF-8");
-                                    LaunchRedirect launchRedirect = GsonUtils.fromJson(linkDataString, LaunchRedirect.class);
-                                    DirectUtils.directToLinkPage(this, launchRedirect, entrance, "", "");
+                                    LinkEntity le = GsonUtils.INSTANCE.getGson().fromJson(linkDataString, LinkEntity.class);
+                                    DirectUtils.directToLinkPage(this, le, entrance, "", "");
                                 }
                             } catch (Exception e) {
                                 e.printStackTrace();
@@ -445,6 +445,24 @@ public class SkipActivity extends BaseActivity {
                             break;
                     }
                 }
+            } else if ("market".equals(uri.getScheme())) {
+                String host = uri.getHost();
+                String id = "";
+                try {
+                    id = uri.getQueryParameter("id");
+                } catch (UnsupportedOperationException e) {
+                    e.printStackTrace();
+                }
+                if (host != null) {
+                    if ("details".equals(host)) {
+                        bundle = new Bundle();
+                        bundle.putString(KEY_TO, EntranceConsts.KEY_MARKET_DETAILS);
+                        bundle.putString(KEY_DATA, id);
+                        EntranceUtils.jumpActivity(this, bundle);
+                    } else {
+                        EntranceUtils.jumpActivity(this, new Bundle()); // 跳转至首页
+                    }
+                }
             }
         }
 

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

@@ -1,107 +0,0 @@
-package com.gh.gamecenter
-
-import android.app.Activity
-import android.content.Context
-import android.net.Uri
-import android.os.Bundle
-import com.therouter.router.Navigator
-import com.therouter.router.interceptor.NavigationCallback
-import com.therouter.TheRouter
-import com.gh.common.util.EntranceUtils
-import com.gh.gamecenter.common.constant.EntranceConsts
-import com.gh.gamecenter.common.utils.DialogHelper
-import com.gh.gamecenter.common.utils.dropSchemeAndHost
-import com.halo.assistant.HaloApp
-import com.lightgame.utils.Utils
-
-class SkipCompatActivity : SkipActivity() {
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        val uri = intent.data
-        if (handleSkip(this, uri)) {
-            intent.setData(null)
-        }
-
-        super.onCreate(savedInstanceState)
-
-        finish()
-    }
-
-    companion object {
-        const val TAG = "SkipCompat"
-
-        const val HOST = "app"
-
-        const val SCHEME = "ghzhushou"
-        const val MARKET = "market"
-
-        fun handleSkip(context: Context, uri: Uri?): Boolean {
-            if (uri == null) return false
-
-            // Handle skip
-            if (uri.scheme == SCHEME) {
-                Utils.log(TAG, "handleSkip: $uri")
-
-                val host = uri.host
-                if (host == HOST) {
-                    TheRouter
-                        .build(uri.dropSchemeAndHost())
-                        .navigation(context, object : NavigationCallback() {
-                            override fun onFound(postcard: Navigator) {
-                                Utils.log(TAG, "navigate to postcard ${postcard.originalUrl} onFound" )
-                            }
-
-                            override fun onLost(postcard: Navigator, requestCode: Int) {
-                                Utils.log(TAG, "navigate to postcard ${postcard.originalUrl} onLost" )
-
-                                if (HaloApp.getInstance().isAlreadyUpAndRunning) {
-                                    // 在光环应用内时，显示不支持弹窗
-                                    // 显示不支持弹窗
-                                    DialogHelper.showUpgradeDialog(context)
-                                } else {
-                                    // 在光环应用外跳转时，重定向至首页
-                                    EntranceUtils.jumpActivity(context, Bundle())
-                                }
-                            }
-
-                            override fun onArrival(postcard: Navigator) {
-                                Utils.log(TAG, "navigate to postcard ${postcard.originalUrl} onArrival" )
-                            }
-
-                            override fun onActivityCreated(postcard: Navigator, activity: Activity) {
-                                Utils.log(TAG, "navigate to postcard ${postcard.originalUrl} onActivityCreated" )
-                            }
-                        })
-
-                    return true
-                }
-            } else if (uri.scheme == MARKET) {
-                val host = uri.host
-                var id = ""
-                try {
-                    id = uri.getQueryParameter("id") ?: ""
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                }
-
-                if (host != null) {
-                    if ("details" == host) {
-                        val bundle = Bundle()
-                        bundle.putString(
-                            EntranceConsts.KEY_TO,
-                            EntranceConsts.KEY_MARKET_DETAILS
-                        )
-                        bundle.putString(EntranceConsts.KEY_DATA, id)
-                        EntranceUtils.jumpActivity(context, bundle)
-                    } else {
-                        EntranceUtils.jumpActivity(context, Bundle()) // 跳转至首页
-                    }
-                    return true
-                }
-            }
-
-            return false
-        }
-    }
-
-}

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

@@ -14,8 +14,8 @@ import androidx.core.app.NotificationCompat
 import androidx.core.text.bold
 import androidx.core.text.buildSpannedString
 import androidx.core.text.color
-import com.therouter.router.Route
-import com.therouter.TheRouter
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.alibaba.android.arouter.launcher.ARouter
 import com.gh.common.dialog.NewPrivacyPolicyDialogFragment
 import com.gh.common.util.DeviceTokenUtils
 import com.gh.common.util.DialogUtils
@@ -29,7 +29,6 @@ import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.tracker.TrackerLogger
 import com.gh.gamecenter.common.utils.*
-import com.gh.gamecenter.core.iinterface.ISplashScreen
 import com.gh.gamecenter.core.provider.IAppProvider
 import com.gh.gamecenter.core.provider.IPackageUtilsProvider
 import com.gh.gamecenter.core.provider.IPushProvider
@@ -48,7 +47,7 @@ import java.util.*
  * 引导页面
  */
 @Route(path = RouteConsts.activity.splashActivity)
-class SplashScreenActivity : BaseActivity(), ISplashScreen {
+class SplashScreenActivity : BaseActivity() {
 
     private var mSharedPreferences: SharedPreferences? = null
     private var mIsNewForThisVersion = false
@@ -137,8 +136,9 @@ class SplashScreenActivity : BaseActivity(), ISplashScreen {
     }
 
     private fun logAppLaunch() {
-        val packageUtilsConfig = TheRouter.get(IPackageUtilsProvider::class.java)
-        val appProvider = TheRouter.get(IAppProvider::class.java)
+        val packageUtilsConfig =
+            ARouter.getInstance().build(RouteConsts.provider.packageUtils).navigation() as? IPackageUtilsProvider
+        val appProvider = ARouter.getInstance().build(RouteConsts.provider.app).navigation() as? IAppProvider
         val signatureHash = packageUtilsConfig?.getApkSignatureByPackageName(this, packageName)?.get(0)
         val sideLoadInfo = packageUtilsConfig?.getSideLoadedInfo()
         val trackEvent = JSONObject()

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

@@ -4,15 +4,12 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import com.gh.gamecenter.common.base.activity.ToolBarActivity
-import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.utils.updateStatusBarColor
 import com.halo.assistant.fragment.user.UserInfoFragment
-import com.therouter.router.Route
 
-@Route(
-    path = RouteConsts.activity.userInfoActivity,
-    description = "个人中心"
-)
+/**
+ * 编辑资料
+ */
 class UserInfoActivity : ToolBarActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -20,14 +17,6 @@ class UserInfoActivity : ToolBarActivity() {
         updateStatusBarColor(com.gh.gamecenter.common.R.color.ui_surface, com.gh.gamecenter.common.R.color.ui_surface)
     }
 
-    override fun provideNormalIntent(): Intent {
-        return getTargetIntent(
-            this,
-            UserInfoActivity::class.java,
-            UserInfoFragment::class.java
-        )
-    }
-
     companion object {
         fun getIntent(context: Context?): Intent? {
             return getTargetIntent(

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

@@ -6,7 +6,7 @@ import android.os.Bundle
 import android.text.TextUtils
 import android.view.KeyEvent
 import android.view.View
-import com.therouter.router.Route
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.gamecenter.common.base.activity.ToolBarActivity
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.constant.EntranceConsts

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

@@ -19,8 +19,8 @@ import android.util.Base64;
 
 import androidx.annotation.NonNull;
 
-import com.therouter.router.Route;
-import com.therouter.TheRouter;
+import com.alibaba.android.arouter.facade.annotation.Route;
+import com.alibaba.android.arouter.launcher.ARouter;
 import com.gh.common.constant.Config;
 import com.gh.common.util.IntegralLogHelper;
 import com.gh.gamecenter.common.callback.BiCallback;
@@ -52,7 +52,7 @@ import java.io.ByteArrayOutputStream;
  */
 @Route(path = RouteConsts.activity.weiBoShareActivity)
 public class WeiBoShareActivity extends Activity implements WbShareCallback {
-    private final IAppProvider mAppProvider = TheRouter.get(IAppProvider.class);
+    private IAppProvider mAppProvider = (IAppProvider) ARouter.getInstance().build(RouteConsts.provider.app).navigation();
 
     private static final String WEIBO_SCOPE = (
             "email,direct_messages_read,direct_messages_write,"

app/src/main/java/com/gh/gamecenter/adapter/viewholder/DetailViewHolder.kt

@@ -271,20 +271,14 @@ class DetailViewHolder(
                 ButtonStyle.NONE_WITH_HINT, ButtonStyle.NONE -> {
                     val offStatus = mGameEntity.downloadOffStatus
                     if (offStatus != null && "off" != offStatus) {
-                        when (offStatus) {
-                            "dialog" -> {
-                                showOffServiceDialog(mGameEntity.downloadOffDialog) {
-                                    showLandPageAddressDialogIfNeeded()
-                                }
-                            }
-                            "toast" -> {
-                                EventBus.getDefault().post(EBReuse(GameDetailFragment.SKIP_RATING))
-                                ToastUtils.toast("该游戏因故暂不提供下载，具体详情可在相关评论中查看，敬请谅解～")
-                                showLandPageAddressDialogIfNeeded()
-                            }
-                            "third_party" -> {
+                        if ("dialog" == offStatus) {
+                            showOffServiceDialog(mGameEntity.downloadOffDialog) {
                                 showLandPageAddressDialogIfNeeded()
                             }
+                        } else if ("toast" == offStatus) {
+                            EventBus.getDefault().post(EBReuse(GameDetailFragment.SKIP_RATING))
+                            ToastUtils.toast("该游戏因故暂不提供下载，具体详情可在相关评论中查看，敬请谅解～")
+                            showLandPageAddressDialogIfNeeded()
                         }
                     } else {
                         ToastUtils.toast("该游戏已关闭下载")