feat: 礼包功能模块化

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

app/build.gradle

@@ -319,6 +319,9 @@ dependencies {
     implementation(project(':module_login')) {
         exclude group: 'androidx.swiperefreshlayout'
     }
+    implementation(project(':module_libao')) {
+        exclude group: 'androidx.swiperefreshlayout'
+    }
     implementation(project(':module_setting')) {
         exclude group: 'androidx.swiperefreshlayout'
     }

app/src/main/AndroidManifest.xml

@@ -232,15 +232,6 @@
             android:screenOrientation="portrait"
             android:theme="@style/TransparentStatusBarAndNavigationBar" />
 
-        <activity
-            android:name="com.gh.gamecenter.LibaoActivity"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateHidden" />
-
-        <activity
-            android:name="com.gh.gamecenter.LibaoDetailActivity"
-            android:screenOrientation="portrait" />
-
         <activity
             android:name="com.gh.gamecenter.ShareGhActivity"
             android:screenOrientation="portrait" />

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

@@ -15,7 +15,7 @@ import com.gh.gamecenter.common.utils.viewModelProvider
 import com.gh.gamecenter.core.utils.DisplayUtils
 import com.gh.gamecenter.core.utils.SPUtils.getBoolean
 import com.gh.gamecenter.entity.GameUpdateEntity
-import com.gh.gamecenter.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
 import com.gh.gamecenter.packagehelper.PackageViewModel
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode

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

@@ -34,8 +34,8 @@ import com.gh.gamecenter.core.runOnIoThread
 import com.gh.gamecenter.core.runOnUiThread
 import com.gh.gamecenter.core.utils.*
 import com.gh.gamecenter.entity.SensorsEvent
-import com.gh.gamecenter.eventbus.EBDownloadStatus
-import com.gh.gamecenter.eventbus.EBPackage
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBPackage
 import com.gh.gamecenter.feature.entity.Badge
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.exposure.ExposureEvent

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

@@ -15,7 +15,6 @@ import com.gh.common.util.DirectUtils.directToLegacyVideoDetail
 import com.gh.common.util.DirectUtils.directToLinkPage
 import com.gh.common.util.DirectUtils.directToQa
 import com.gh.common.util.PackageUtils
-import com.gh.gamecenter.LibaoDetailActivity
 import com.gh.gamecenter.MainActivity
 import com.gh.gamecenter.NewsDetailActivity
 import com.gh.gamecenter.WebActivity
@@ -103,7 +102,7 @@ object DefaultUrlHandler {
                     entrance
                 )
 
-                "libao" -> context.startActivity(LibaoDetailActivity.getIntentById(context, id, entrance))
+                "libao" -> DirectUtils.directToGiftDetail(context, id, entrance)
 
                 "qq" -> try {
                     DirectUtils.directToQqConversation(context, id)

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

@@ -18,9 +18,9 @@ import com.gh.gamecenter.common.utils.dip2px
 import com.gh.gamecenter.common.utils.toDrawable
 import com.gh.gamecenter.common.view.BugFixedPopupWindow
 import com.gh.gamecenter.R
+import com.gh.gamecenter.common.databinding.LayoutPopupContainerBinding
 import com.gh.gamecenter.databinding.KaifuAddItemBinding
 import com.gh.gamecenter.databinding.LayoutAddKaifuPopupBinding
-import com.gh.gamecenter.databinding.LayoutPopupContainerBinding
 import com.gh.gamecenter.feature.entity.ServerCalendarEntity
 import com.gh.gamecenter.servers.add.AddKaiFuPopupAdapter
 import java.text.SimpleDateFormat

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

@@ -281,68 +281,68 @@ public class BindingAdapters {
         }
     }
 
-    public static void setLiBaoBtn(TextView view, String status) {
-        if (TextUtils.isEmpty(status)) return;
-        switch (status) {
-            case "coming":
-                view.setText(R.string.libao_coming);
-                view.setBackgroundResource(R.drawable.textview_blue_style);
-                break;
-            case "ling":
-                view.setText(R.string.libao_ling);
-                view.setBackgroundResource(R.drawable.textview_green_style);
-                break;
-            case "tao":
-                view.setText(R.string.libao_tao);
-                view.setBackgroundResource(R.drawable.textview_orange_style);
-                break;
-            case "used_up":
-                view.setText(R.string.libao_used_up);
-                view.setBackgroundResource(R.drawable.textview_cancel_up);
-                break;
-            case "finish":
-                view.setText(R.string.libao_finish);
-                view.setBackgroundResource(R.drawable.textview_cancel_up);
-                break;
-            case "linged":
-                view.setText(R.string.libao_linged);
-                view.setBackgroundResource(R.drawable.libao_linged_style);
-                view.setTextColor(ContextCompat.getColorStateList(view.getContext(), R.color.libao_linged_selector));
-                break;
-            case "taoed":
-                view.setText(R.string.libao_taoed);
-                view.setBackgroundResource(R.drawable.libao_taoed_style);
-                view.setTextColor(ContextCompat.getColorStateList(view.getContext(), R.color.libao_taoed_selector));
-                break;
-            case "copy":
-                view.setText(R.string.libao_copy);
-                view.setBackgroundResource(R.drawable.textview_blue_style);
-                break;
-            case "repeatLing":
-                view.setText(R.string.libao_repeat_ling);
-                view.setBackgroundResource(R.drawable.textview_cancel_up);
-                break;
-            case "repeatLinged":
-                view.setText(R.string.libao_repeat_ling);
-                view.setBackgroundResource(R.drawable.textview_green_style);
-                break;
-            case "repeatTao":
-                view.setText(R.string.libao_repeat_tao);
-                view.setBackgroundResource(R.drawable.textview_cancel_up);
-                break;
-            case "repeatTaoed":
-                view.setText(R.string.libao_repeat_tao);
-                view.setBackgroundResource(R.drawable.textview_orange_style);
-                break;
-            case "unshelve":
-                view.setBackgroundResource(R.drawable.textview_cancel_style);
-                view.setText(R.string.libao_unshelve);
-                break;
-            default:
-                view.setBackgroundResource(R.drawable.textview_cancel_style);
-                view.setText("异常");
-        }
-    }
+//    public static void setLiBaoBtn(TextView view, String status) {
+//        if (TextUtils.isEmpty(status)) return;
+//        switch (status) {
+//            case "coming":
+//                view.setText(R.string.libao_coming);
+//                view.setBackgroundResource(R.drawable.textview_blue_style);
+//                break;
+//            case "ling":
+//                view.setText(R.string.libao_ling);
+//                view.setBackgroundResource(R.drawable.textview_green_style);
+//                break;
+//            case "tao":
+//                view.setText(R.string.libao_tao);
+//                view.setBackgroundResource(R.drawable.textview_orange_style);
+//                break;
+//            case "used_up":
+//                view.setText(R.string.libao_used_up);
+//                view.setBackgroundResource(R.drawable.textview_cancel_up);
+//                break;
+//            case "finish":
+//                view.setText(R.string.libao_finish);
+//                view.setBackgroundResource(R.drawable.textview_cancel_up);
+//                break;
+//            case "linged":
+//                view.setText(R.string.libao_linged);
+//                view.setBackgroundResource(R.drawable.libao_linged_style);
+//                view.setTextColor(ContextCompat.getColorStateList(view.getContext(), R.color.libao_linged_selector));
+//                break;
+//            case "taoed":
+//                view.setText(R.string.libao_taoed);
+//                view.setBackgroundResource(R.drawable.libao_taoed_style);
+//                view.setTextColor(ContextCompat.getColorStateList(view.getContext(), R.color.libao_taoed_selector));
+//                break;
+//            case "copy":
+//                view.setText(R.string.libao_copy);
+//                view.setBackgroundResource(R.drawable.textview_blue_style);
+//                break;
+//            case "repeatLing":
+//                view.setText(R.string.libao_repeat_ling);
+//                view.setBackgroundResource(R.drawable.textview_cancel_up);
+//                break;
+//            case "repeatLinged":
+//                view.setText(R.string.libao_repeat_ling);
+//                view.setBackgroundResource(R.drawable.textview_green_style);
+//                break;
+//            case "repeatTao":
+//                view.setText(R.string.libao_repeat_tao);
+//                view.setBackgroundResource(R.drawable.textview_cancel_up);
+//                break;
+//            case "repeatTaoed":
+//                view.setText(R.string.libao_repeat_tao);
+//                view.setBackgroundResource(R.drawable.textview_orange_style);
+//                break;
+//            case "unshelve":
+//                view.setBackgroundResource(R.drawable.textview_cancel_style);
+//                view.setText(R.string.libao_unshelve);
+//                break;
+//            default:
+//                view.setBackgroundResource(R.drawable.textview_cancel_style);
+//                view.setText("异常");
+//        }
+//    }
 
     // 大图下的进度条
     public static void setDownloadButton(DownloadButton progressBar,

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

@@ -24,6 +24,7 @@ import com.gh.gamecenter.common.base.BaseRecyclerViewHolder
 import com.gh.gamecenter.common.callback.ConfirmListener
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.entity.LinkEntity
+import com.gh.gamecenter.common.eventbus.EBPackage
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.common.view.CustomLinkMovementMethod
 import com.gh.gamecenter.core.utils.DisplayUtils
@@ -34,7 +35,6 @@ import com.gh.gamecenter.databinding.PackageCheckItemBinding
 import com.gh.gamecenter.feature.entity.DetectionObjectEntity
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.entity.PackageDialogEntity
-import com.gh.gamecenter.eventbus.EBPackage
 import com.halo.assistant.HaloApp
 import com.lightgame.adapter.BaseRecyclerAdapter
 import com.lightgame.dialog.BaseDialogFragment

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

@@ -0,0 +1,22 @@
+package com.gh.common.provider
+
+import android.app.Dialog
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.DialogUtils
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IAppDialogUtilsProvider
+
+@Route(path = RouteConsts.provider.appDialogUtils, name = "DialogUtils暴露服务")
+class AppDialogUtilsProviderImpl : IAppDialogUtilsProvider {
+
+    override fun showWaitDialog(context: Context, string: String): Dialog {
+        return DialogUtils.showWaitDialog(context, string)
+    }
+
+
+
+    override fun init(context: Context?) {
+
+    }
+}

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

@@ -0,0 +1,18 @@
+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.ConcernActivity
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.feature.provider.IConcernProvider
+
+@Route(path = RouteConsts.provider.concern, name = "ConcernActivity暴露服务")
+class ConcernProviderImpl : IConcernProvider {
+
+    override fun getIntent(context: Context, entrance: String): Intent {
+        return ConcernActivity.getIntent(context, entrance)
+    }
+
+    override fun init(context: Context?) {}
+}

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

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

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

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

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

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

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

@@ -18,6 +18,16 @@ class GameDetailProviderImpl : IGameDetailProvider {
     ) {
         GameDetailActivity.startGameDetailActivity(context, gameId, entrance, traceEvent)
     }
+
+    override fun startGameDetailActivity(
+        context: Context,
+        gameEntity: GameEntity?,
+        entrance: String,
+        traceEvent: ExposureEvent?
+    ) {
+        GameDetailActivity.startGameDetailActivity(context, gameEntity, entrance, traceEvent)
+    }
+
     override fun startGameDetailActivity(
         context: Context,
         gameEntity: GameEntity?,

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

@@ -33,6 +33,10 @@ class PackageUtilsProviderImpl : IPackageUtilsProvider {
         return PackageUtils.getSideLoadedInfo()
     }
 
+    override fun launchApplicationByPackageName(context: Context, packageName: String) {
+        PackageUtils.launchApplicationByPackageName(context, packageName)
+    }
+
     override fun init(context: Context?) {
         // Do nothing
     }

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

@@ -30,6 +30,10 @@ class RegionSettingHelperProviderImpl : IRegionSettingHelperProvider {
         return RegionSettingHelper.getIpInfo()
     }
 
+    override fun shouldThisGameBeFiltered(gameId: String?): Boolean {
+        return RegionSettingHelper.shouldThisGameBeFiltered(gameId)
+    }
+
     override fun init(context: Context?) {
         // Do nothing
     }

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

@@ -1,7 +1,7 @@
 package com.gh.common.util
 
 import android.text.TextUtils
-import com.gh.gamecenter.eventbus.EBConcernChanged
+import com.gh.gamecenter.common.eventbus.EBConcernChanged
 import com.gh.gamecenter.login.user.UserManager
 import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.retrofit.RetrofitManager
@@ -38,7 +38,12 @@ object ConcernUtils {
                 override fun onResponse(response: ResponseBody?) {
                     super.onResponse(response)
                     listener?.onSuccess()
-                    EventBus.getDefault().post(EBConcernChanged(gameId, true))
+                    EventBus.getDefault().post(
+                        EBConcernChanged(
+                            gameId,
+                            true
+                        )
+                    )
                 }
 
                 override fun onFailure(e: HttpException?) {
@@ -57,7 +62,12 @@ object ConcernUtils {
                 override fun onResponse(response: ResponseBody?) {
                     super.onResponse(response)
                     listener?.onSuccess()
-                    EventBus.getDefault().post(EBConcernChanged(gameId, false))
+                    EventBus.getDefault().post(
+                        EBConcernChanged(
+                            gameId,
+                            false
+                        )
+                    )
                 }
 
                 override fun onFailure(e: HttpException?) {

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

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

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

@@ -57,6 +57,7 @@ import com.gh.gamecenter.common.utils.DialogHelper;
 import com.gh.gamecenter.common.utils.ExtensionsKt;
 import com.gh.gamecenter.common.utils.ImageUtils;
 import com.gh.gamecenter.common.utils.NetworkUtils;
+import com.gh.common.util.PackageUtils;
 import com.gh.gamecenter.common.utils.SensorsBridge;
 import com.gh.gamecenter.common.view.CustomLinkMovementMethod;
 import com.gh.gamecenter.common.view.DrawableView;

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

@@ -9,6 +9,7 @@ import android.os.Build
 import android.os.Bundle
 import android.text.TextUtils
 import androidx.appcompat.app.AppCompatActivity
+import com.alibaba.android.arouter.launcher.ARouter
 import com.gh.common.constant.Config
 import com.gh.common.exposure.ExposureManager.log
 import com.gh.common.exposure.ExposureTraceUtils.appendTrace
@@ -21,6 +22,7 @@ import com.gh.gamecenter.category2.CategoryV2Activity
 import com.gh.gamecenter.common.base.activity.BaseActivity
 import com.gh.gamecenter.common.base.activity.BaseActivity_TabLayout
 import com.gh.gamecenter.common.base.activity.ToolBarActivity
+import com.gh.gamecenter.common.base.activity.ToolBarActivity.NORMAL_FRAGMENT_NAME
 import com.gh.gamecenter.common.base.fragment.BaseFragment_TabLayout
 import com.gh.gamecenter.common.constant.CommonConsts
 import com.gh.gamecenter.common.constant.Constants
@@ -28,17 +30,19 @@ import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.constant.EntranceConsts.*
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.entity.*
-import com.gh.gamecenter.common.entity.Display
 import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.core.runOnIoThread
 import com.gh.gamecenter.core.utils.ToastUtils
 import com.gh.gamecenter.discovery.DiscoveryActivity
 import com.gh.gamecenter.download.DownloadFragment.Companion.INDEX_UPDATE
-import com.gh.gamecenter.entity.*
+import com.gh.gamecenter.entity.SubjectData
+import com.gh.gamecenter.entity.SubjectRecommendEntity
+import com.gh.gamecenter.entity.VideoLinkEntity
 import com.gh.gamecenter.eventbus.EBSkip
 import com.gh.gamecenter.feature.entity.GameDetailServer
 import com.gh.gamecenter.feature.entity.GameEntity
+import com.gh.gamecenter.feature.entity.LibaoEntity
 import com.gh.gamecenter.feature.entity.MeEntity
 import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.gh.gamecenter.feature.exposure.ExposureEvent.Companion.createEvent
@@ -58,6 +62,7 @@ import com.gh.gamecenter.gamedetail.fuli.kaifu.ServersCalendarActivity
 import com.gh.gamecenter.gamedetail.history.HistoryApkListActivity
 import com.gh.gamecenter.gamedetail.rating.RatingReplyActivity
 import com.gh.gamecenter.help.HelpAndFeedbackBridge
+import com.gh.gamecenter.libao.view.LibaoFragment
 import com.gh.gamecenter.login.user.UserManager
 import com.gh.gamecenter.personalhome.UserHomeActivity
 import com.gh.gamecenter.personalhome.background.PersonalityBackgroundActivity
@@ -1007,29 +1012,6 @@ object DirectUtils {
 
     }
 
-    /**
-     * 跳转到 礼包详情
-     */
-    @JvmStatic
-    fun directToGiftDetail(context: Context, giftId: String, entrance: String? = null) {
-        if (giftId.isEmpty()) return
-        val bundle = Bundle()
-        bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
-        bundle.putString(KEY_TO, LibaoDetailActivity::class.java.simpleName)
-        bundle.putString(EntranceConsts.KEY_ID, giftId)
-        HaloApp.put(LibaoEntity.TAG, null)
-        jumpActivity(context, bundle)
-    }
-
-    /**
-     * 跳转到礼包中心，请不要随意修改方法名
-     */
-    @JvmStatic
-    fun directToGift(context: Context, entrance: String) {
-        val intent = LibaoActivity.getIntent(context, entrance)
-        context.startActivity(intent)
-    }
-
     /**
      * 切换到社区页面（旧社区页面已经没有了，处理为跳转到论坛详情）
      */
@@ -2057,4 +2039,75 @@ object DirectUtils {
             platform = platform
         )
     }
+
+    /**
+     * 跳转到礼包页
+     * @param context 上下文
+     * @param entrance
+     */
+    @JvmStatic
+    fun directToGift(
+        context: Context,
+        entrance: String
+    ) {
+        ARouter
+            .getInstance()
+            .build(RouteConsts.activity.libaoActivity)
+            .withString(KEY_ENTRANCE, entrance)
+            .withString(NORMAL_FRAGMENT_NAME, LibaoFragment::class.java.canonicalName)
+            .navigation(context)
+    }
+
+    /**
+     * 跳转到礼包详情
+     * @param context 上下文
+     * @param libaoEntity 礼包信息
+     * @param isClickReceiveBtnIn
+     * @param entrance
+     */
+    @JvmStatic
+    @JvmOverloads
+    fun directToGiftDetail(
+        context: Context,
+        libaoEntity: LibaoEntity,
+        isClickReceiveBtnIn: Boolean = false,
+        entrance: String,
+        requestCode: Int = -1,
+    ) {
+        if (context !is Activity) return
+
+        HaloApp.put(LibaoEntity.TAG, libaoEntity)
+
+        ARouter
+            .getInstance()
+            .build(RouteConsts.activity.libaoDetailActivity)
+            .withString(KEY_ENTRANCE, entrance)
+            .withBoolean(KEY_IS_CLICK_RECEIVE_BTN, isClickReceiveBtnIn)
+            .navigation(context, requestCode, null)
+    }
+
+    /**
+     * 跳转到礼包详情
+     * @param context 上下文
+     * @param id 礼包ID
+     * @param entrance
+     */
+    @JvmStatic
+    fun directToGiftDetail(
+        context: Context,
+        giftId: String,
+        entrance: String? = null
+    ) {
+        if (giftId.isEmpty()) return
+
+        HaloApp.put(LibaoEntity.TAG, null)
+
+        ARouter
+            .getInstance()
+            .build(RouteConsts.activity.libaoDetailActivity)
+            .withString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
+            .withString(KEY_ID, giftId)
+            .navigation(context)
+
+    }
 }

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

@@ -3,6 +3,7 @@ package com.gh.common.util
 import android.content.Context
 import android.os.Build
 import com.gh.gamecenter.common.utils.DialogHelper
+import com.gh.common.util.PackageUtils
 import com.gh.gamecenter.core.utils.EmptyCallback
 import com.gh.gamecenter.feature.entity.ApkEntity
 import com.gh.gamecenter.feature.entity.GameEntity

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

@@ -18,7 +18,7 @@ import com.gh.gamecenter.common.entity.SuggestType
 import com.gh.gamecenter.common.eventbus.EBShowDialog
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.core.utils.*
-import com.gh.gamecenter.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.entity.SimulatorEntity
 import com.gh.gamecenter.feature.utils.PlatformUtils

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

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

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

@@ -22,10 +22,7 @@ import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.retrofit.ApiResponse
 import com.gh.gamecenter.common.retrofit.EmptyResponse
 import com.gh.gamecenter.common.retrofit.Response
-import com.gh.gamecenter.common.utils.DataLogUtils
-import com.gh.gamecenter.common.utils.DialogHelper
-import com.gh.gamecenter.common.utils.observableToMain
-import com.gh.gamecenter.common.utils.singleToMain
+import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.common.view.dsbridge.CompletionHandler
 import com.gh.gamecenter.core.runOnUiThread
 import com.gh.gamecenter.core.utils.EmptyCallback

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

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

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

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

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

@@ -16,6 +16,7 @@ import com.gh.download.server.BrowserInstallHelper
 import com.gh.gamecenter.BuildConfig
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.utils.DialogHelper
+import com.gh.common.util.PackageUtils
 import com.gh.gamecenter.common.utils.getExtension
 import com.gh.gamecenter.common.utils.getMetaExtra
 import com.gh.gamecenter.core.utils.CurrentActivityHolder

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

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

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

@@ -45,7 +45,7 @@ import com.gh.gamecenter.feature.entity.GameEntity;
 import com.gh.gamecenter.entity.GameUpdateEntity;
 import com.gh.gamecenter.entity.HomePluggableFilterEntity;
 import com.gh.gamecenter.feature.entity.PluginLocation;
-import com.gh.gamecenter.eventbus.EBDownloadStatus;
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus;
 import com.gh.gamecenter.manager.PackagesManager;
 import com.gh.gamecenter.login.user.UserManager;
 import com.gh.gamecenter.packagehelper.PackageRepository;

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

@@ -9,6 +9,7 @@ import com.gh.common.util.PackageUtils
 import com.gh.common.xapk.XapkInstaller
 import com.gh.download.server.BrowserInstallHelper
 import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.eventbus.EBPackage
 import com.gh.gamecenter.common.loghub.LoghubUtils
 import com.gh.gamecenter.common.retrofit.EmptyResponse
 import com.gh.gamecenter.common.retrofit.Response
@@ -18,7 +19,6 @@ import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.core.utils.ThirdPartyPackageHelper
 import com.gh.gamecenter.core.utils.UrlFilterUtils
 import com.gh.gamecenter.entity.GameDigestEntity
-import com.gh.gamecenter.eventbus.EBPackage
 import com.gh.gamecenter.login.user.UserManager
 import com.gh.gamecenter.packagehelper.PackageRepository
 import com.gh.gamecenter.packagehelper.PackageViewModel

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

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

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

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

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

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

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

@@ -40,7 +40,10 @@ import com.gh.gamecenter.adapter.viewholder.DetailViewHolder;
 import com.gh.gamecenter.common.callback.OnRequestCallBackListener;
 import com.gh.gamecenter.common.constant.Constants;
 import com.gh.gamecenter.common.constant.EntranceConsts;
+import com.gh.gamecenter.common.eventbus.EBConcernChanged;
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus;
 import com.gh.gamecenter.common.eventbus.EBNetworkState;
+import com.gh.gamecenter.common.eventbus.EBPackage;
 import com.gh.gamecenter.common.eventbus.EBReuse;
 import com.gh.gamecenter.common.retrofit.Response;
 import com.gh.gamecenter.common.utils.ExtensionsKt;
@@ -51,11 +54,8 @@ import com.gh.gamecenter.core.utils.ClickUtils;
 import com.gh.gamecenter.core.utils.DisplayUtils;
 import com.gh.gamecenter.core.utils.MtaHelper;
 import com.gh.gamecenter.entity.NewsDetailEntity;
-import com.gh.gamecenter.eventbus.EBConcernChanged;
 import com.gh.gamecenter.eventbus.EBAddComment;
 import com.gh.gamecenter.eventbus.EBDeleteComment;
-import com.gh.gamecenter.eventbus.EBDownloadStatus;
-import com.gh.gamecenter.eventbus.EBPackage;
 import com.gh.gamecenter.feature.entity.GameEntity;
 import com.gh.gamecenter.feature.entity.MeEntity;
 import com.gh.gamecenter.feature.entity.NewsEntity;

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

@@ -23,7 +23,7 @@ import com.gh.gamecenter.common.constant.EntranceConsts;
 import com.gh.gamecenter.common.utils.ImageUtils;
 import com.gh.common.util.MessageShareUtils;
 import com.gh.common.util.QRCodeUtils;
-import com.gh.gamecenter.entity.ConcernEntity;
+import com.gh.gamecenter.feature.entity.ConcernEntity;
 
 import java.io.File;
 

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

@@ -32,7 +32,7 @@ import com.gh.gamecenter.common.utils.ImageUtils;
 import com.gh.common.util.MessageShareUtils;
 import com.gh.common.util.QRCodeUtils;
 import com.gh.gamecenter.core.utils.StringUtils;
-import com.gh.gamecenter.entity.ConcernEntity;
+import com.gh.gamecenter.feature.entity.ConcernEntity;
 import com.gh.gamecenter.common.retrofit.ObservableUtil;
 
 import java.io.File;

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

@@ -13,7 +13,7 @@ import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.utils.EnvHelper
 import com.gh.gamecenter.common.utils.updateStatusBarColor
-import com.gh.gamecenter.entity.ConcernEntity
+import com.gh.gamecenter.feature.entity.ConcernEntity
 import com.gh.gamecenter.feature.entity.NewsEntity
 import com.gh.gamecenter.common.entity.ToolBoxEntity
 import com.halo.assistant.fragment.WebFragment

app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java

@@ -41,7 +41,7 @@ import com.gh.gamecenter.databinding.CommentHeadItemBinding;
 import com.gh.gamecenter.databinding.NewsDigestItemBinding;
 import com.gh.gamecenter.entity.ArticleCommentParent;
 import com.gh.gamecenter.entity.CommentEntity;
-import com.gh.gamecenter.entity.ConcernEntity;
+import com.gh.gamecenter.feature.entity.ConcernEntity;
 import com.gh.gamecenter.eventbus.EBDeleteComment;
 import com.gh.gamecenter.manager.VisitManager;
 import com.gh.gamecenter.common.retrofit.JSONObjectResponse;

app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsDigestViewHolder.java

@@ -3,7 +3,7 @@ package com.gh.gamecenter.adapter.viewholder;
 import com.gh.gamecenter.common.base.BaseRecyclerViewHolder;
 import com.gh.gamecenter.common.callback.OnListClickListener;
 import com.gh.gamecenter.databinding.NewsDigestItemBinding;
-import com.gh.gamecenter.entity.ConcernEntity;
+import com.gh.gamecenter.feature.entity.ConcernEntity;
 
 /**
  * Created by Administrator on 2016/9/8.

app/src/main/java/com/gh/gamecenter/amway/AmwayAdapter.kt

@@ -24,7 +24,7 @@ import com.gh.gamecenter.core.utils.DisplayUtils
 import com.gh.gamecenter.core.utils.MtaHelper
 import com.gh.gamecenter.core.utils.NumberUtils
 import com.gh.gamecenter.databinding.AmwayCommentItemBinding
-import com.gh.gamecenter.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
 import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.gh.gamecenter.feature.exposure.ExposureSource
 import com.gh.gamecenter.feature.game.GameItemViewHolder

app/src/main/java/com/gh/gamecenter/amway/AmwayFragment.kt

@@ -32,8 +32,8 @@ import com.gh.gamecenter.core.utils.TimeElapsedHelper
 import com.gh.gamecenter.databinding.FragmentAmwayAlBinding
 import com.gh.gamecenter.databinding.FragmentAmwayBinding
 import com.gh.gamecenter.entity.RatingComment
-import com.gh.gamecenter.eventbus.EBDownloadStatus
-import com.gh.gamecenter.eventbus.EBPackage
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBPackage
 import com.gh.gamecenter.fragment.HomeSearchToolWrapperFragment
 import com.gh.gamecenter.gamedetail.rating.RatingFragment
 import com.google.android.material.appbar.AppBarLayout

app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListAdapter.kt

@@ -15,7 +15,7 @@ import com.gh.gamecenter.common.utils.dip2px
 import com.gh.gamecenter.common.utils.toBinding
 import com.gh.gamecenter.common.viewholder.FooterViewHolder
 import com.gh.gamecenter.core.utils.StringUtils
-import com.gh.gamecenter.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.gh.gamecenter.feature.exposure.ExposureSource

app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListFragment.kt

@@ -21,8 +21,8 @@ import com.gh.gamecenter.databinding.FragmentCatalogListBinding
 import com.gh.gamecenter.entity.CatalogEntity
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.entity.SubjectSettingEntity
-import com.gh.gamecenter.eventbus.EBDownloadStatus
-import com.gh.gamecenter.eventbus.EBPackage
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBPackage
 import com.lightgame.download.DataWatcher
 import com.lightgame.download.DownloadEntity
 import org.greenrobot.eventbus.Subscribe

app/src/main/java/com/gh/gamecenter/category/NewCategoryListAdapter.kt

@@ -15,7 +15,7 @@ import com.gh.gamecenter.common.utils.dip2px
 import com.gh.gamecenter.common.utils.toBinding
 import com.gh.gamecenter.common.viewholder.FooterViewHolder
 import com.gh.gamecenter.core.utils.StringUtils
-import com.gh.gamecenter.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.gh.gamecenter.feature.exposure.ExposureSource

app/src/main/java/com/gh/gamecenter/category/NewCategoryListFragment.kt

@@ -23,8 +23,8 @@ import com.gh.gamecenter.databinding.FragmentTagsBinding
 import com.gh.gamecenter.entity.CategoryEntity
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.entity.SubjectSettingEntity
-import com.gh.gamecenter.eventbus.EBDownloadStatus
-import com.gh.gamecenter.eventbus.EBPackage
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBPackage
 import com.lightgame.download.DataWatcher
 import com.lightgame.download.DownloadEntity
 import org.greenrobot.eventbus.Subscribe

app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListAdapter.kt

@@ -24,7 +24,7 @@ import com.gh.gamecenter.core.utils.PageSwitchDataHelper
 import com.gh.gamecenter.core.utils.StringUtils
 import com.gh.gamecenter.databinding.CategoryGameItemBinding
 import com.gh.gamecenter.feature.entity.GameEntity
-import com.gh.gamecenter.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
 import com.gh.gamecenter.feature.game.GameItemViewHolder
 import com.lightgame.download.DownloadEntity
 import org.json.JSONException

app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListFragment.kt

@@ -20,8 +20,8 @@ import com.gh.gamecenter.databinding.LayoutSelectedCategoryBinding
 import com.gh.gamecenter.entity.CategoryEntity
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.entity.SubjectSettingEntity
-import com.gh.gamecenter.eventbus.EBDownloadStatus
-import com.gh.gamecenter.eventbus.EBPackage
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBPackage
 import com.google.android.flexbox.FlexboxLayout
 import com.lightgame.download.DataWatcher
 import com.lightgame.download.DownloadEntity

app/src/main/java/com/gh/gamecenter/discovery/DiscoveryAdapter.kt

@@ -31,7 +31,7 @@ import com.gh.gamecenter.databinding.ItemRecommendInterestImageBinding
 import com.gh.gamecenter.discovery.DiscoveryFragment.Companion.INTERESTED_GAME_REQUEST_CODE
 import com.gh.gamecenter.discovery.interestedgame.InterestedGameActivity
 import com.gh.gamecenter.entity.DiscoveryGameCardLabel
-import com.gh.gamecenter.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
 import com.gh.gamecenter.eventbus.EBSkip
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.exposure.ExposureEvent

app/src/main/java/com/gh/gamecenter/discovery/DiscoveryFragment.kt

@@ -32,8 +32,8 @@ import com.gh.gamecenter.core.utils.ToastUtils
 import com.gh.gamecenter.databinding.LayoutDiscoveryGuideBinding
 import com.gh.gamecenter.databinding.LayoutPopupDiscoveryDislikeBinding
 import com.gh.gamecenter.eventbus.EBDiscoverChanged
-import com.gh.gamecenter.eventbus.EBDownloadStatus
-import com.gh.gamecenter.eventbus.EBPackage
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBPackage
 import com.gh.gamecenter.feature.exposure.ExposureSource
 import com.google.android.flexbox.FlexboxLayout
 import com.lightgame.download.DataWatcher

app/src/main/java/com/gh/gamecenter/download/DownloadFragment.kt

@@ -23,7 +23,7 @@ import com.gh.gamecenter.entity.HomePluggableFilterEntity
 import com.gh.gamecenter.feature.entity.PluginLocation
 import com.gh.gamecenter.eventbus.EBDownloadChanged
 import com.gh.gamecenter.eventbus.EBSkip
-import com.gh.gamecenter.eventbus.EBUISwitch
+import com.gh.gamecenter.common.eventbus.EBUISwitch
 import com.gh.gamecenter.manager.PackagesManager
 import com.lightgame.download.DownloadStatus
 import org.greenrobot.eventbus.EventBus
@@ -122,7 +122,12 @@ class DownloadFragment : BaseFragment_TabLayout() {
     }
 
     override fun onPageSelected(index: Int) {
-        EventBus.getDefault().post(EBUISwitch(DownloadManagerActivity.TAG, index))
+        EventBus.getDefault().post(
+            EBUISwitch(
+                DownloadManagerActivity.TAG,
+                index
+            )
+        )
 
         if (index == INDEX_UPDATE) {
             mIsUpdateTabHasBeenSelected = true

app/src/main/java/com/gh/gamecenter/download/GameDownloadFragment.java

@@ -8,32 +8,31 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.DefaultItemAnimator;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.gh.common.xapk.XapkDialogHelper;
-import com.gh.gamecenter.common.base.fragment.BaseFragment;
-import com.gh.gamecenter.common.utils.DialogHelper;
-import com.gh.gamecenter.common.constant.EntranceConsts;
-import com.gh.gamecenter.common.utils.NetworkUtils;
 import com.gh.common.util.PackageUtils;
+import com.gh.common.xapk.XapkDialogHelper;
 import com.gh.common.xapk.XapkInstaller;
 import com.gh.common.xapk.XapkUnzipStatus;
 import com.gh.download.DownloadManager;
 import com.gh.gamecenter.DownloadManagerActivity;
 import com.gh.gamecenter.MainActivity;
 import com.gh.gamecenter.R;
+import com.gh.gamecenter.common.base.fragment.BaseFragment;
+import com.gh.gamecenter.common.constant.EntranceConsts;
+import com.gh.gamecenter.common.eventbus.EBMiPush;
+import com.gh.gamecenter.common.eventbus.EBPackage;
+import com.gh.gamecenter.common.eventbus.EBUISwitch;
+import com.gh.gamecenter.common.utils.DialogHelper;
 import com.gh.gamecenter.common.utils.ExtensionsKt;
+import com.gh.gamecenter.common.utils.NetworkUtils;
 import com.gh.gamecenter.core.utils.DisplayUtils;
 import com.gh.gamecenter.databinding.DownloadmanagerBinding;
 import com.gh.gamecenter.eventbus.EBDownloadChanged;
-import com.gh.gamecenter.common.eventbus.EBMiPush;
-import com.gh.gamecenter.eventbus.EBPackage;
-import com.gh.gamecenter.eventbus.EBUISwitch;
 import com.gh.gamecenter.fragment.MainWrapperFragment;
 import com.halo.assistant.HaloApp;
 import com.lightgame.download.DataWatcher;

app/src/main/java/com/gh/gamecenter/download/NewInstalledGameFragment.kt

@@ -24,8 +24,8 @@ import com.gh.gamecenter.core.utils.EmptyCallback
 import com.gh.gamecenter.databinding.FragmentMyGameBinding
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.entity.GameInstall
-import com.gh.gamecenter.eventbus.EBDownloadStatus
-import com.gh.gamecenter.eventbus.EBPackage
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBPackage
 import com.gh.gamecenter.fragment.MainWrapperFragment
 import com.gh.gamecenter.manager.PackagesManager
 import com.gh.gamecenter.packagehelper.PackageRepository

app/src/main/java/com/gh/gamecenter/download/UpdatableGameAdapter.kt

@@ -8,23 +8,23 @@ import android.widget.LinearLayout
 import androidx.core.view.setPadding
 import androidx.fragment.app.FragmentActivity
 import androidx.recyclerview.widget.RecyclerView
-import com.gh.gamecenter.feature.exposure.ExposureEvent
-import com.gh.gamecenter.feature.exposure.ExposureEvent.Companion.createEvent
-import com.gh.gamecenter.feature.exposure.ExposureSource
 import com.gh.common.exposure.IExposable
 import com.gh.common.util.*
-import com.gh.common.util.DialogUtils
-import com.gh.gamecenter.feature.view.DownloadButton
 import com.gh.download.DownloadManager
 import com.gh.download.dialog.DownloadDialog
 import com.gh.gamecenter.DownloadManagerActivity
 import com.gh.gamecenter.R
+import com.gh.gamecenter.common.databinding.LayoutPopupContainerBinding
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.common.view.BugFixedPopupWindow
 import com.gh.gamecenter.core.utils.CurrentActivityHolder
 import com.gh.gamecenter.databinding.*
 import com.gh.gamecenter.entity.GameUpdateEntity
 import com.gh.gamecenter.eventbus.EBSkip
+import com.gh.gamecenter.feature.exposure.ExposureEvent
+import com.gh.gamecenter.feature.exposure.ExposureEvent.Companion.createEvent
+import com.gh.gamecenter.feature.exposure.ExposureSource
+import com.gh.gamecenter.feature.view.DownloadButton
 import com.gh.gamecenter.home.BlankDividerViewHolder
 import com.gh.gamecenter.manager.PackagesManager
 import com.lightgame.download.DownloadEntity

app/src/main/java/com/gh/gamecenter/download/UpdatableGameFragment.kt

@@ -13,7 +13,7 @@ import com.gh.gamecenter.common.view.FixLinearLayoutManager
 import com.gh.gamecenter.core.utils.DisplayUtils
 import com.gh.gamecenter.core.utils.EmptyCallback
 import com.gh.gamecenter.databinding.FragmentGameUpdatableBinding
-import com.gh.gamecenter.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
 import com.gh.gamecenter.fragment.MainWrapperFragment
 import com.gh.gamecenter.packagehelper.PackageRepository
 import com.gh.gamecenter.packagehelper.PackageViewModel

app/src/main/java/com/gh/gamecenter/entity/UnifiedUserTrendEntity.kt

@@ -2,6 +2,7 @@ package com.gh.gamecenter.entity
 
 import com.gh.gamecenter.common.entity.ToolBoxEntity
 import com.gh.gamecenter.feature.entity.AnswerEntity
+import com.gh.gamecenter.feature.entity.LibaoEntity
 import com.google.gson.annotations.SerializedName
 
 class UnifiedUserTrendEntity(

app/src/main/java/com/gh/gamecenter/forum/home/CommunityHomeFragment.kt

@@ -27,7 +27,7 @@ import com.gh.gamecenter.databinding.FragmentCommunityHomeBinding
 import com.gh.gamecenter.databinding.TabItemCommunityBinding
 import com.gh.gamecenter.eventbus.EBSkip
 import com.gh.gamecenter.eventbus.EBTypeChange
-import com.gh.gamecenter.eventbus.EBUISwitch
+import com.gh.gamecenter.common.eventbus.EBUISwitch
 import com.gh.gamecenter.feature.entity.ArticleEntity
 import com.gh.gamecenter.feature.entity.ForumVideoEntity
 import com.gh.gamecenter.forum.search.ForumOrUserSearchActivity

app/src/main/java/com/gh/gamecenter/fragment/HomeSearchToolWrapperFragment.kt

@@ -39,8 +39,8 @@ import com.gh.gamecenter.discovery.DiscoveryFragment
 import com.gh.gamecenter.entity.HomePush
 import com.gh.gamecenter.entity.SubjectData
 import com.gh.gamecenter.entity.SubjectRecommendEntity
-import com.gh.gamecenter.eventbus.EBDownloadStatus
-import com.gh.gamecenter.eventbus.EBPackage
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBPackage
 import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.gh.gamecenter.feature.exposure.ExposureSource
 import com.gh.gamecenter.feature.game.GameItemViewHolder

app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java

@@ -57,7 +57,7 @@ import com.gh.gamecenter.entity.SubjectData;
 import com.gh.gamecenter.entity.SubjectRecommendEntity;
 import com.gh.gamecenter.entity.WelcomeDialogEntity;
 import com.gh.gamecenter.eventbus.EBSkip;
-import com.gh.gamecenter.eventbus.EBUISwitch;
+import com.gh.gamecenter.common.eventbus.EBUISwitch;
 import com.gh.gamecenter.feature.entity.SettingsEntity;
 import com.gh.gamecenter.feature.exposure.ExposureSource;
 import com.gh.gamecenter.forum.home.CommunityHomeFragment;

app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java

@@ -41,7 +41,7 @@ import com.gh.gamecenter.MessageActivity;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.SearchActivity;
 import com.gh.gamecenter.entity.GameUpdateEntity;
-import com.gh.gamecenter.eventbus.EBDownloadStatus;
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus;
 import com.gh.gamecenter.common.eventbus.EBReuse;
 import com.gh.gamecenter.message.MessageUnreadViewModel;
 import com.gh.gamecenter.packagehelper.PackageViewModel;

app/src/main/java/com/gh/gamecenter/game/GameFragment.kt

@@ -28,9 +28,9 @@ import com.gh.gamecenter.core.utils.MD5Utils
 import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.databinding.FragmentGameBinding
 import com.gh.gamecenter.eventbus.EBDiscoverChanged
-import com.gh.gamecenter.eventbus.EBDownloadStatus
-import com.gh.gamecenter.eventbus.EBPackage
-import com.gh.gamecenter.eventbus.EBUISwitch
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBPackage
+import com.gh.gamecenter.common.eventbus.EBUISwitch
 import com.gh.gamecenter.feature.exposure.ExposureSource
 import com.gh.gamecenter.fragment.MainWrapperFragment
 import com.gh.gamecenter.game.data.GameItemData

app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt

@@ -44,7 +44,7 @@ import com.gh.gamecenter.core.utils.StringUtils
 import com.gh.gamecenter.databinding.GameViewpagerItemBinding
 import com.gh.gamecenter.entity.CommonCollectionContentEntity
 import com.gh.gamecenter.entity.GameNavigationEntity
-import com.gh.gamecenter.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
 import com.gh.gamecenter.feature.databinding.GameItemBinding
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.exposure.ExposureEvent

app/src/main/java/com/gh/gamecenter/game/GameViewModel.kt

@@ -15,10 +15,7 @@ import com.gh.gamecenter.common.entity.ExposureEntity
 import com.gh.gamecenter.common.entity.LinkEntity
 import com.gh.gamecenter.common.retrofit.BiResponse
 import com.gh.gamecenter.common.retrofit.Response
-import com.gh.gamecenter.common.utils.countOccurrences
-import com.gh.gamecenter.common.utils.debugOnly
-import com.gh.gamecenter.common.utils.observableToMain
-import com.gh.gamecenter.common.utils.singleToMain
+import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.core.iinterface.IOffsetable
 import com.gh.gamecenter.core.utils.RandomUtils
 import com.gh.gamecenter.core.utils.SPUtils

app/src/main/java/com/gh/gamecenter/game/rank/RankAdapter.kt

@@ -18,7 +18,7 @@ import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.databinding.RankGameItemBinding
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.entity.TagStyleEntity
-import com.gh.gamecenter.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
 import com.lightgame.adapter.BaseRecyclerAdapter
 import com.lightgame.download.DownloadEntity
 import java.util.*

app/src/main/java/com/gh/gamecenter/game/rank/RankCollectionAdapter.kt

@@ -14,7 +14,7 @@ import com.gh.gamecenter.core.runOnIoThread
 import com.gh.gamecenter.core.runOnUiThread
 import com.gh.gamecenter.databinding.RankCollectionItemBinding
 import com.gh.gamecenter.entity.SubjectEntity
-import com.gh.gamecenter.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
 import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.lightgame.adapter.BaseRecyclerAdapter
 import com.lightgame.download.DownloadEntity

app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailAdapter.kt

@@ -34,7 +34,7 @@ import com.gh.gamecenter.databinding.GameCollectionGameItemBinding
 import com.gh.gamecenter.databinding.ItemArticleDetailCommentBinding
 import com.gh.gamecenter.databinding.LayoutGameCollectionAuthTagBinding
 import com.gh.gamecenter.entity.CommentEntity
-import com.gh.gamecenter.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.gh.gamecenter.feature.exposure.ExposureSource

app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailFragment.kt

@@ -30,6 +30,8 @@ import com.gh.gamecenter.common.baselist.LoadType
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.entity.NormalShareEntity
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBPackage
 import com.gh.gamecenter.common.eventbus.EBShare
 import com.gh.gamecenter.common.syncpage.SyncDataEntity
 import com.gh.gamecenter.common.syncpage.SyncFieldConstants
@@ -41,8 +43,6 @@ import com.gh.gamecenter.core.utils.*
 import com.gh.gamecenter.databinding.FragmentGameCollectionDetailBinding
 import com.gh.gamecenter.databinding.LayoutGameCollectionTagBinding
 import com.gh.gamecenter.entity.GamesCollectionDetailEntity
-import com.gh.gamecenter.eventbus.EBDownloadStatus
-import com.gh.gamecenter.eventbus.EBPackage
 import com.gh.gamecenter.eventbus.EBUserFollow
 import com.gh.gamecenter.feature.exposure.ExposureSource
 import com.gh.gamecenter.gamedetail.GameDetailFragment

app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt

@@ -49,6 +49,9 @@ import com.gh.gamecenter.common.base.fragment.BaseFragment_TabLayout
 import com.gh.gamecenter.common.base.fragment.ToolbarFragment
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.constant.EntranceConsts
+import com.gh.gamecenter.common.eventbus.EBConcernChanged
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBPackage
 import com.gh.gamecenter.common.eventbus.EBReuse
 import com.gh.gamecenter.common.mvvm.Status
 import com.gh.gamecenter.common.utils.*
@@ -58,6 +61,7 @@ import com.gh.gamecenter.core.utils.*
 import com.gh.gamecenter.databinding.*
 import com.gh.gamecenter.entity.*
 import com.gh.gamecenter.eventbus.*
+import com.gh.gamecenter.feature.databinding.DetailDownloadItemBinding
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.entity.PluginLocation
 import com.gh.gamecenter.feature.entity.SimpleGame
@@ -102,7 +106,6 @@ import org.greenrobot.eventbus.ThreadMode
 import retrofit2.HttpException
 import java.lang.ref.WeakReference
 import java.util.*
-import kotlin.collections.ArrayList
 import kotlin.math.abs
 
 class GameDetailFragment : ToolbarFragment(), IScrollable {

app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailViewModel.kt

@@ -9,12 +9,13 @@ import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
+import com.alibaba.android.arouter.launcher.ARouter
 import com.gh.common.filter.RegionSettingHelper
 import com.gh.common.history.HistoryHelper
 import com.gh.common.util.CheckLoginUtils
 import com.gh.common.util.ConcernUtils
-import com.gh.common.util.LibaoUtils
 import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.mvvm.Resource
 import com.gh.gamecenter.common.retrofit.BiResponse
 import com.gh.gamecenter.common.retrofit.Response
@@ -25,7 +26,10 @@ import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.core.utils.UrlFilterUtils
 import com.gh.gamecenter.entity.*
 import com.gh.gamecenter.feature.entity.GameEntity
+import com.gh.gamecenter.feature.entity.LibaoEntity
+import com.gh.gamecenter.feature.entity.LibaoStatusEntity
 import com.gh.gamecenter.feature.entity.SimpleGame
+import com.gh.gamecenter.feature.provider.ILibaoUtilsProvider
 import com.gh.gamecenter.feature.utils.ApkActiveUtils
 import com.gh.gamecenter.gamedetail.entity.BigEvent
 import com.gh.gamecenter.gamedetail.entity.CustomColumn
@@ -511,7 +515,11 @@ class GameDetailViewModel(
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe(object : Response<List<LibaoStatusEntity>>() {
                 override fun onResponse(list: List<LibaoStatusEntity>?) {
-                    LibaoUtils.initLiBaoEntity(list, libaoList)
+                    val libaoUtilsProvider = ARouter
+                        .getInstance()
+                        .build(RouteConsts.provider.libaoUtils)
+                        .navigation() as ILibaoUtilsProvider
+                    libaoUtilsProvider.initLiBaoEntity(list, libaoList)
                     if (libaoList.isNotEmpty()) {
                         newGameDetailEntity.detailEntity.forEach {
                             if (it.type == "libao") {

app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt

@@ -30,7 +30,6 @@ import com.gh.common.util.NewFlatLogUtils
 import com.gh.common.util.NewLogUtils
 import com.gh.gamecenter.GameNewsActivity
 import com.gh.gamecenter.R
-import com.gh.gamecenter.common.callback.OnListClickListener
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.entity.CommunityEntity
 import com.gh.gamecenter.common.entity.LinkEntity

app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameLibaoAdapter.kt

@@ -1,16 +1,15 @@
 package com.gh.gamecenter.gamedetail.desc
 
-import android.app.Activity
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.gh.common.util.LibaoUtils
+import com.alibaba.android.arouter.launcher.ARouter
+import com.gh.common.util.DirectUtils
 import com.gh.common.util.NewLogUtils
-import com.gh.gamecenter.LibaoDetailActivity
 import com.gh.gamecenter.R
-import com.gh.gamecenter.common.callback.OnListClickListener
+import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.utils.copyTextAndToast
 import com.gh.gamecenter.common.utils.fromHtml
 import com.gh.gamecenter.common.utils.toBinding
@@ -18,7 +17,8 @@ import com.gh.gamecenter.core.utils.MtaHelper
 import com.gh.gamecenter.core.utils.SpanBuilder
 import com.gh.gamecenter.databinding.ItemGameDetailMoreBinding
 import com.gh.gamecenter.databinding.ItemGameLibaoBinding
-import com.gh.gamecenter.entity.LibaoEntity
+import com.gh.gamecenter.feature.entity.LibaoEntity
+import com.gh.gamecenter.feature.provider.ILibaoUtilsProvider
 import com.gh.gamecenter.login.user.UserManager
 
 class GameLibaoAdapter(
@@ -156,7 +156,11 @@ class GameLibaoAdapter(
                 }
 
 //                LibaoUtils.setLiBaoBtnStatusRound(holder.binding.receiveTv, libaoEntity,true, context)
-                LibaoUtils.initLibaoBtn(
+                val libaoUtilsProvider = ARouter
+                    .getInstance()
+                    .build(RouteConsts.provider.libaoUtils)
+                    .navigation() as ILibaoUtilsProvider
+                libaoUtilsProvider.initLibaoBtn(
                     context,
                     holder.binding.receiveTv,
                     libaoEntity,
@@ -170,20 +174,15 @@ class GameLibaoAdapter(
                 }
                 if (!libaoEntity.packageName.isNullOrEmpty()) {
                     holder.binding.receiveTv.setOnClickListener {
-                        val intent = LibaoDetailActivity.getIntent(context, libaoEntity, true, "游戏详情")
-                        if (it.context is Activity) {
-                            (it.context as Activity).startActivityForResult(intent, 100)
-                        }
+                        DirectUtils.directToGiftDetail(context, libaoEntity, true, "游戏详情", 100)
                     }
                 }
                 holder.itemView.setOnClickListener {
                     if (isTypeCopy) {
                         // do nothing
                     } else {
-                        val intent = LibaoDetailActivity.getIntent(context, libaoEntity, "游戏详情")
-                        if (it.context is Activity) {
-                            (it.context as Activity).startActivityForResult(intent, 100)
-                        }
+
+                        DirectUtils.directToGiftDetail(context, libaoEntity, false, "游戏详情",  100)
 
                         NewLogUtils.logGameDetailGiftClick(gameName, gameId, "礼包详情")
                     }

app/src/main/java/com/gh/gamecenter/gamedetail/entity/ContentCardEntity.kt

@@ -7,6 +7,7 @@ import com.gh.gamecenter.common.entity.LinkEntity
 import com.gh.gamecenter.common.entity.ToolBoxEntity
 import com.gh.gamecenter.entity.*
 import com.gh.gamecenter.feature.entity.GameDetailServer
+import com.gh.gamecenter.feature.entity.LibaoEntity
 import com.google.gson.annotations.SerializedName
 
 @Keep

app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListAdapter.kt

@@ -22,6 +22,7 @@ import com.gh.download.DownloadManager
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.baselist.ListAdapter
 import com.gh.gamecenter.common.utils.DialogHelper
+import com.gh.common.util.PackageUtils
 import com.gh.gamecenter.core.utils.TimeUtils
 import com.gh.gamecenter.common.utils.getMetaExtra
 import com.gh.gamecenter.common.utils.setRootBackgroundColor

app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListFragment.kt

@@ -7,20 +7,20 @@ import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import com.gh.common.exposure.ExposureListener
 import com.gh.common.util.NewLogUtils
-import com.gh.gamecenter.common.view.CustomDividerItemDecoration
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.baselist.ListAdapter
 import com.gh.gamecenter.common.baselist.ListFragment
 import com.gh.gamecenter.common.constant.EntranceConsts
+import com.gh.gamecenter.common.eventbus.EBPackage
 import com.gh.gamecenter.common.utils.goneIf
 import com.gh.gamecenter.common.utils.observeNonNull
 import com.gh.gamecenter.common.utils.setRootBackgroundColor
 import com.gh.gamecenter.common.utils.viewModelProvider
+import com.gh.gamecenter.common.view.CustomDividerItemDecoration
 import com.gh.gamecenter.core.utils.DisplayUtils
 import com.gh.gamecenter.databinding.FragmentHistoryApkListBinding
 import com.gh.gamecenter.feature.entity.GameEntity
-import com.gh.gamecenter.eventbus.EBPackage
 import com.halo.assistant.HaloApp
 import com.lightgame.download.DataWatcher
 import com.lightgame.download.DownloadEntity

app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingDetailCommentItemViewHolder.kt

@@ -31,7 +31,6 @@ import com.gh.gamecenter.common.view.DrawableView
 import com.gh.gamecenter.core.utils.*
 import com.gh.gamecenter.databinding.ItemArticleDetailCommentBinding
 import com.gh.gamecenter.entity.RatingComment
-import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.gamedetail.rating.edit.RatingEditActivity
 import com.gh.gamecenter.gamedetail.rating.edit.RatingEditActivity.Companion.LABEL_REGEX
 import com.gh.gamecenter.gamedetail.rating.logs.CommentLogsActivity

app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyActivity.kt

@@ -20,6 +20,8 @@ import com.gh.gamecenter.R
 import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment
 import com.gh.gamecenter.common.baselist.ListActivity
 import com.gh.gamecenter.common.constant.EntranceConsts
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBPackage
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.common.view.CustomDividerItemDecoration
 import com.gh.gamecenter.core.utils.DisplayUtils
@@ -29,15 +31,12 @@ import com.gh.gamecenter.core.utils.PageSwitchDataHelper
 import com.gh.gamecenter.databinding.ActivityRatingReplyBinding
 import com.gh.gamecenter.databinding.PieceArticleInputContainerBinding
 import com.gh.gamecenter.databinding.PieceCommentTypingContainerBinding
-import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.entity.RatingComment
 import com.gh.gamecenter.entity.RatingReplyEntity
-import com.gh.gamecenter.eventbus.EBDownloadStatus
-import com.gh.gamecenter.eventbus.EBPackage
+import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.exposure.ExposureSource
 import com.lightgame.download.DataWatcher
 import com.lightgame.download.DownloadEntity
-import com.lightgame.download.DownloadStatus
 import com.lightgame.utils.Util_System_Keyboard
 import com.lightgame.utils.Utils
 import org.greenrobot.eventbus.Subscribe

app/src/main/java/com/gh/gamecenter/home/HomeFragment.kt

@@ -19,7 +19,10 @@ import com.gh.gamecenter.common.baselist.LoadStatus
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBPackage
 import com.gh.gamecenter.common.eventbus.EBReuse
+import com.gh.gamecenter.common.eventbus.EBUISwitch
 import com.gh.gamecenter.common.utils.goneIf
 import com.gh.gamecenter.common.utils.observeNonNull
 import com.gh.gamecenter.common.utils.viewModelProvider
@@ -33,9 +36,6 @@ import com.gh.gamecenter.core.utils.MtaHelper
 import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.databinding.FragmentMainHomeBinding
 import com.gh.gamecenter.eventbus.EBDiscoverChanged
-import com.gh.gamecenter.eventbus.EBDownloadStatus
-import com.gh.gamecenter.eventbus.EBPackage
-import com.gh.gamecenter.eventbus.EBUISwitch
 import com.gh.gamecenter.fragment.HomeSearchToolWrapperFragment
 import com.gh.gamecenter.fragment.HomeSearchToolWrapperViewModel
 import com.gh.gamecenter.fragment.MainWrapperFragment

app/src/main/java/com/gh/gamecenter/home/HomeFragmentAdapter.kt

@@ -24,7 +24,7 @@ import com.gh.gamecenter.common.viewholder.FooterViewHolder
 import com.gh.gamecenter.core.runOnIoThread
 import com.gh.gamecenter.entity.AmwayCommentEntity
 import com.gh.gamecenter.entity.SubjectEntity
-import com.gh.gamecenter.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
 import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.gh.gamecenter.feature.exposure.ExposureSource
 import com.gh.gamecenter.game.GameAndPosition

app/src/main/java/com/gh/gamecenter/home/HomeViewModel.kt

@@ -15,6 +15,7 @@ import com.gh.gamecenter.common.baselist.LoadStatus
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.retrofit.BiResponse
 import com.gh.gamecenter.common.retrofit.Response
+import com.gh.common.util.PackageUtils
 import com.gh.gamecenter.common.utils.observableToMain
 import com.gh.gamecenter.core.runOnIoThread
 import com.gh.gamecenter.core.utils.RandomUtils

app/src/main/java/com/gh/gamecenter/home/skip/PackageSkipFragment.kt

@@ -12,8 +12,8 @@ import com.gh.gamecenter.R
 import com.gh.gamecenter.common.utils.toColor
 import com.gh.gamecenter.databinding.FragmentPackageSkipBinding
 import com.gh.gamecenter.feature.entity.GameEntity
-import com.gh.gamecenter.eventbus.EBDownloadStatus
-import com.gh.gamecenter.eventbus.EBPackage
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBPackage
 import com.lightgame.download.DataWatcher
 import com.lightgame.download.DownloadEntity
 import org.greenrobot.eventbus.Subscribe

app/src/main/java/com/gh/gamecenter/info/ConcernAdapter.java

@@ -10,35 +10,37 @@ import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.RecyclerView.ViewHolder;
 
+import com.alibaba.android.arouter.launcher.ARouter;
+import com.gh.common.util.ConcernContentUtils;
+import com.gh.common.util.NewsUtils;
+import com.gh.gamecenter.R;
+import com.gh.gamecenter.adapter.viewholder.NewsDigestViewHolder;
 import com.gh.gamecenter.common.callback.OnListClickListener;
 import com.gh.gamecenter.common.callback.OnRequestCallBackListener;
 import com.gh.gamecenter.common.constant.ItemViewType;
-import com.gh.common.util.ConcernContentUtils;
-import com.gh.gamecenter.core.utils.DisplayUtils;
-import com.gh.common.util.LibaoUtils;
-import com.gh.common.util.NewsUtils;
-import com.gh.gamecenter.core.utils.NumberUtils;
-import com.gh.gamecenter.feature.utils.PlatformUtils;
-import com.gh.gamecenter.core.utils.StringUtils;
-import com.gh.gamecenter.core.utils.UrlFilterUtils;
-import com.gh.gamecenter.R;
-import com.gh.gamecenter.common.viewholder.FooterViewHolder;
-import com.gh.gamecenter.adapter.viewholder.NewsDigestViewHolder;
-import com.gh.gamecenter.databinding.NewsDigestItemBinding;
-import com.gh.gamecenter.entity.CommentnumEntity;
-import com.gh.gamecenter.entity.ConcernEntity;
-import com.gh.gamecenter.feature.entity.GameEntity;
-import com.gh.gamecenter.entity.LibaoStatusEntity;
-import com.gh.gamecenter.feature.entity.MeEntity;
-import com.gh.gamecenter.feature.entity.UserDataLibaoEntity;
-import com.gh.gamecenter.entity.ViewsEntity;
-import com.gh.gamecenter.feature.game.GameItemViewHolder;
-import com.gh.gamecenter.manager.CommentManager;
-import com.gh.gamecenter.login.user.UserManager;
-import com.gh.gamecenter.manager.VisitManager;
+import com.gh.gamecenter.common.constant.RouteConsts;
 import com.gh.gamecenter.common.retrofit.JSONObjectResponse;
 import com.gh.gamecenter.common.retrofit.ObservableUtil;
 import com.gh.gamecenter.common.retrofit.Response;
+import com.gh.gamecenter.common.viewholder.FooterViewHolder;
+import com.gh.gamecenter.core.utils.DisplayUtils;
+import com.gh.gamecenter.core.utils.NumberUtils;
+import com.gh.gamecenter.core.utils.StringUtils;
+import com.gh.gamecenter.core.utils.UrlFilterUtils;
+import com.gh.gamecenter.databinding.NewsDigestItemBinding;
+import com.gh.gamecenter.entity.CommentnumEntity;
+import com.gh.gamecenter.entity.ViewsEntity;
+import com.gh.gamecenter.feature.entity.ConcernEntity;
+import com.gh.gamecenter.feature.entity.GameEntity;
+import com.gh.gamecenter.feature.entity.LibaoStatusEntity;
+import com.gh.gamecenter.feature.entity.MeEntity;
+import com.gh.gamecenter.feature.entity.UserDataLibaoEntity;
+import com.gh.gamecenter.feature.game.GameItemViewHolder;
+import com.gh.gamecenter.feature.provider.ILibaoUtilsProvider;
+import com.gh.gamecenter.feature.utils.PlatformUtils;
+import com.gh.gamecenter.login.user.UserManager;
+import com.gh.gamecenter.manager.CommentManager;
+import com.gh.gamecenter.manager.VisitManager;
 import com.gh.gamecenter.retrofit.RetrofitManager;
 import com.lightgame.adapter.BaseRecyclerAdapter;
 import com.lightgame.utils.Utils;
@@ -55,6 +57,8 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.functions.Consumer;
 import io.reactivex.functions.Function;
 import io.reactivex.schedulers.Schedulers;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
 import retrofit2.HttpException;
 
 /**
@@ -200,17 +204,14 @@ class ConcernAdapter extends BaseRecyclerAdapter<ViewHolder> {
         builder.deleteCharAt(builder.length() - 1);
         String ids = builder.toString();
 
-        LibaoUtils.getLibaoStatus(ids, new LibaoUtils.PostLibaoListener() {
-            @Override
-            public void postSucceed(Object response) {
-                libaoStatusList.addAll((List<LibaoStatusEntity>) response);
-                notifyItemRangeChanged(0, getItemCount());
-            }
-
-            @Override
-            public void postFailed(Throwable error) {
-
-            }
+        ILibaoUtilsProvider provider = (ILibaoUtilsProvider) ARouter
+                .getInstance()
+                .build(RouteConsts.provider.libaoUtils)
+                .navigation();
+        provider.getLibaoStatus(ids, res -> {
+            libaoStatusList.addAll((List<LibaoStatusEntity>) res);
+            notifyItemRangeChanged(0, getItemCount());
+            return null;
         });
     }
 
@@ -219,21 +220,17 @@ class ConcernAdapter extends BaseRecyclerAdapter<ViewHolder> {
         if (list == null || list.isEmpty()) {
             return;
         }
-        ObservableUtil.computation(new ObservableOnSubscribe<String>() {
-            @Override
-            public void subscribe(ObservableEmitter<String> emitter) {
-                StringBuilder builder = new StringBuilder();
-                for (int i = 0, size = list.size(); i < size; i++) {
-                    builder.append(list.get(i).getId());
-                    builder.append("-");
-                }
-                builder.deleteCharAt(builder.length() - 1);
-                String ids = builder.toString();
-                VisitManager.getInstance().addUrl(ids);
-                emitter.onNext(ids);
-                emitter.onComplete();
+        ObservableUtil.computation(emitter -> {
+            StringBuilder builder = new StringBuilder();
+            for (int i = 0, size = list.size(); i < size; i++) {
+                builder.append(list.get(i).getId());
+                builder.append("-");
             }
-
+            builder.deleteCharAt(builder.length() - 1);
+            String ids = builder.toString();
+            VisitManager.getInstance().addUrl(ids);
+            emitter.onNext(ids);
+            emitter.onComplete();
         }, new Consumer<String>() {
             @Override
             public void accept(String s) {

app/src/main/java/com/gh/gamecenter/info/ConcernFragment.java

@@ -17,39 +17,39 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
-import com.gh.gamecenter.common.callback.OnRequestCallBackListener;
-import com.gh.gamecenter.common.base.activity.ToolBarActivity;
 import com.gh.common.filter.RegionSettingHelper;
-import com.gh.gamecenter.eventbus.EBAddComment;
-import com.gh.gamecenter.eventbus.EBDeleteComment;
-import com.gh.gamecenter.feature.utils.ApkActiveUtils;
 import com.gh.common.util.CheckLoginUtils;
 import com.gh.common.util.DataCollectionUtils;
-import com.gh.gamecenter.core.utils.MtaHelper;
-import com.gh.gamecenter.core.utils.StringUtils;
+import com.gh.common.util.DirectUtils;
 import com.gh.common.view.Concern_LinearLayout;
-import com.gh.gamecenter.common.view.CustomDividerItemDecoration;
 import com.gh.gamecenter.ConcernActivity;
-import com.gh.gamecenter.LibaoDetailActivity;
 import com.gh.gamecenter.MessageDetailActivity;
 import com.gh.gamecenter.NewsDetailActivity;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.ShareCardActivity;
 import com.gh.gamecenter.ShareCardPicActivity;
 import com.gh.gamecenter.WebActivity;
-import com.gh.gamecenter.databinding.FragmentInfoConcernBinding;
-import com.gh.gamecenter.entity.ConcernEntity;
-import com.gh.gamecenter.feature.entity.GameEntity;
-import com.gh.gamecenter.entity.LibaoEntity;
-import com.gh.gamecenter.entity.LibaoStatusEntity;
-import com.gh.gamecenter.feature.entity.MeEntity;
-import com.gh.gamecenter.feature.entity.UserDataLibaoEntity;
-import com.gh.gamecenter.eventbus.EBConcernChanged;
+import com.gh.gamecenter.common.base.activity.ToolBarActivity;
+import com.gh.gamecenter.common.base.fragment.ToolbarFragment;
+import com.gh.gamecenter.common.callback.OnRequestCallBackListener;
+import com.gh.gamecenter.common.eventbus.EBConcernChanged;
 import com.gh.gamecenter.common.eventbus.EBNetworkState;
 import com.gh.gamecenter.common.eventbus.EBReuse;
-import com.gh.gamecenter.login.user.UserManager;
-import com.gh.gamecenter.common.base.fragment.ToolbarFragment;
 import com.gh.gamecenter.common.retrofit.Response;
+import com.gh.gamecenter.common.view.CustomDividerItemDecoration;
+import com.gh.gamecenter.core.utils.MtaHelper;
+import com.gh.gamecenter.core.utils.StringUtils;
+import com.gh.gamecenter.databinding.FragmentInfoConcernBinding;
+import com.gh.gamecenter.eventbus.EBAddComment;
+import com.gh.gamecenter.eventbus.EBDeleteComment;
+import com.gh.gamecenter.feature.entity.ConcernEntity;
+import com.gh.gamecenter.feature.entity.GameEntity;
+import com.gh.gamecenter.feature.entity.LibaoEntity;
+import com.gh.gamecenter.feature.entity.LibaoStatusEntity;
+import com.gh.gamecenter.feature.entity.MeEntity;
+import com.gh.gamecenter.feature.entity.UserDataLibaoEntity;
+import com.gh.gamecenter.feature.utils.ApkActiveUtils;
+import com.gh.gamecenter.login.user.UserManager;
 import com.gh.gamecenter.retrofit.RetrofitManager;
 import com.halo.assistant.fragment.myconcern.MyConcernRecommendAdapter;
 
@@ -439,8 +439,7 @@ public class ConcernFragment extends ToolbarFragment implements SwipeRefreshLayo
                             entity = LibaoEntity.Companion.createLibaoEntity(concernEntity, libaoStatusEntity);
                         }
                     }
-                    intent = LibaoDetailActivity.getIntent(getContext(), entity, entrance);
-                    startActivityForResult(intent, NEWS_MESSAGE_LIBAO_REQUEST);
+                    DirectUtils.directToGiftDetail(getContext(), entity, false, entrance, NEWS_MESSAGE_LIBAO_REQUEST);
                 } else {
                     DataCollectionUtils.uploadClick(getContext(), "列表", "资讯-关注", concernEntity.getTitle());
 

app/src/main/java/com/gh/gamecenter/info/InfoWrapperFragment.java

@@ -7,7 +7,7 @@ import android.view.View;
 import com.gh.gamecenter.common.base.fragment.BaseFragment_TabLayout;
 import com.gh.gamecenter.core.utils.MtaHelper;
 import com.gh.gamecenter.R;
-import com.gh.gamecenter.eventbus.EBUISwitch;
+import com.gh.gamecenter.common.eventbus.EBUISwitch;
 
 import org.greenrobot.eventbus.EventBus;
 

app/src/main/java/com/gh/gamecenter/info/StrategyFragment.java

@@ -30,9 +30,9 @@ import com.gh.gamecenter.databinding.DialogStrategySelectGameBinding;
 import com.gh.gamecenter.databinding.FragmentInfoStrategyBinding;
 import com.gh.gamecenter.feature.entity.GameEntity;
 import com.gh.gamecenter.feature.entity.NewsEntity;
-import com.gh.gamecenter.eventbus.EBConcernChanged;
+import com.gh.gamecenter.common.eventbus.EBConcernChanged;
 import com.gh.gamecenter.common.eventbus.EBReuse;
-import com.gh.gamecenter.eventbus.EBUISwitch;
+import com.gh.gamecenter.common.eventbus.EBUISwitch;
 import com.gh.gamecenter.manager.DataCollectionManager;
 import com.gh.gamecenter.login.user.UserManager;
 import com.gh.gamecenter.common.retrofit.Response;

app/src/main/java/com/gh/gamecenter/message/MessageDetailFragment.java

@@ -41,9 +41,7 @@ import com.gh.gamecenter.core.utils.KeyboardHeightProvider;
 import com.gh.gamecenter.core.utils.UrlFilterUtils;
 import com.gh.gamecenter.databinding.FragmentMessageDetailBinding;
 import com.gh.gamecenter.entity.CommentEntity;
-import com.gh.gamecenter.entity.CommentnumEntity;
-import com.gh.gamecenter.entity.ConcernEntity;
-import com.gh.gamecenter.entity.ViewsEntity;
+import com.gh.gamecenter.feature.entity.ConcernEntity;
 import com.gh.gamecenter.eventbus.EBAddComment;
 import com.gh.gamecenter.eventbus.EBDeleteComment;
 import com.gh.gamecenter.login.entity.UserInfoEntity;
@@ -63,13 +61,8 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.function.BiFunction;
-
 import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.functions.Function3;
 import io.reactivex.schedulers.Schedulers;
 import retrofit2.HttpException;
 

app/src/main/java/com/gh/gamecenter/message/MessageUnreadRepository.kt

@@ -14,6 +14,7 @@ import com.gh.gamecenter.login.user.UserManager
 import com.gh.gamecenter.common.retrofit.BiResponse
 import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.entity.*
+import com.gh.gamecenter.feature.entity.ConcernEntity
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.gh.gamecenter.retrofit.service.ApiService
 import com.google.gson.reflect.TypeToken

app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameFragment.kt

@@ -16,7 +16,7 @@ import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.databinding.FragmentFollowedGameBinding
 import com.gh.gamecenter.feature.entity.GameEntity
-import com.gh.gamecenter.eventbus.EBConcernChanged
+import com.gh.gamecenter.common.eventbus.EBConcernChanged
 import com.gh.gamecenter.common.eventbus.EBReuse
 import com.gh.gamecenter.common.view.CustomDividerItemDecoration
 import com.gh.gamecenter.login.user.UserManager

app/src/main/java/com/gh/gamecenter/mygame/MyReservationAdapter.kt

@@ -22,7 +22,7 @@ import com.gh.gamecenter.core.utils.EmptyCallback
 import com.gh.gamecenter.core.utils.MtaHelper
 import com.gh.gamecenter.core.utils.StringUtils
 import com.gh.gamecenter.databinding.ItemFollowedGameBinding
-import com.gh.gamecenter.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.gh.gamecenter.feature.exposure.ExposureSource

app/src/main/java/com/gh/gamecenter/mygame/MyReservationFragment.kt

@@ -6,21 +6,21 @@ import android.view.View
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import com.gh.common.exposure.ExposureListener
-import com.gh.gamecenter.common.utils.ifLogin
-import com.gh.gamecenter.common.utils.toColor
-import com.gh.gamecenter.common.utils.toDrawable
-import com.gh.gamecenter.common.utils.viewModelProvider
-import com.gh.gamecenter.common.view.CustomDividerItemDecoration
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.baselist.ListAdapter
 import com.gh.gamecenter.common.baselist.ListFragment
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.databinding.FragmentListBaseBinding
-import com.gh.gamecenter.feature.entity.GameEntity
-import com.gh.gamecenter.eventbus.EBDownloadStatus
-import com.gh.gamecenter.eventbus.EBPackage
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBPackage
 import com.gh.gamecenter.common.eventbus.EBReuse
+import com.gh.gamecenter.common.utils.ifLogin
+import com.gh.gamecenter.common.utils.toColor
+import com.gh.gamecenter.common.utils.toDrawable
+import com.gh.gamecenter.common.utils.viewModelProvider
+import com.gh.gamecenter.common.view.CustomDividerItemDecoration
+import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.login.user.UserManager
 import com.lightgame.download.DataWatcher
 import com.lightgame.download.DownloadEntity

app/src/main/java/com/gh/gamecenter/mygame/PlayedGameAdapter.kt

@@ -31,7 +31,7 @@ import com.gh.gamecenter.core.utils.NumberUtils
 import com.gh.gamecenter.core.utils.StringUtils
 import com.gh.gamecenter.databinding.ItemPlayedGameBinding
 import com.gh.gamecenter.databinding.ViewSimpleToggleBinding
-import com.gh.gamecenter.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.gh.gamecenter.feature.exposure.ExposureSource

app/src/main/java/com/gh/gamecenter/mygame/PlayedGameFragment.kt

@@ -3,16 +3,16 @@ package com.gh.gamecenter.mygame
 import android.os.Bundle
 import android.view.View
 import com.gh.common.exposure.ExposureListener
-import com.gh.gamecenter.common.constant.EntranceConsts
-import com.gh.gamecenter.common.utils.viewModelProvider
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.common.baselist.ListAdapter
 import com.gh.gamecenter.common.baselist.ListFragment
 import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.feature.entity.GameEntity
-import com.gh.gamecenter.eventbus.EBDownloadStatus
-import com.gh.gamecenter.eventbus.EBPackage
+import com.gh.gamecenter.common.constant.EntranceConsts
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBPackage
 import com.gh.gamecenter.common.eventbus.EBReuse
+import com.gh.gamecenter.common.utils.viewModelProvider
+import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.login.user.UserManager
 import com.lightgame.download.DataWatcher
 import com.lightgame.download.DownloadEntity

app/src/main/java/com/gh/gamecenter/personal/HaloPersonalFragment.kt

@@ -35,7 +35,7 @@ import com.gh.gamecenter.databinding.FragmentHaloPersonalBinding
 import com.gh.gamecenter.databinding.FragmentPersonalStubBinding
 import com.gh.gamecenter.entity.BadgeEntity
 import com.gh.gamecenter.entity.MessageUnreadEntity
-import com.gh.gamecenter.eventbus.EBConcernChanged
+import com.gh.gamecenter.common.eventbus.EBConcernChanged
 import com.gh.gamecenter.feature.entity.Badge
 import com.gh.gamecenter.fragment.MainWrapperFragment
 import com.gh.gamecenter.gamecollection.mine.MyGameCollectionActivity

app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserPlayedGameAdapter.kt

@@ -19,7 +19,7 @@ import com.gh.gamecenter.core.utils.StringUtils
 import com.gh.gamecenter.common.utils.dip2px
 import com.gh.gamecenter.common.utils.toColor
 import com.gh.gamecenter.feature.entity.GameEntity
-import com.gh.gamecenter.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
 import com.gh.gamecenter.feature.databinding.GameItemBinding
 import com.gh.gamecenter.feature.utils.PlatformUtils
 import com.gh.gamecenter.feature.game.GameItemViewHolder

app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserPlayedGameFragment.kt

@@ -2,23 +2,23 @@ package com.gh.gamecenter.personalhome.home.game
 
 import android.os.Bundle
 import android.view.View
-import com.gh.gamecenter.common.constant.Constants
 import com.gh.common.util.DialogUtils
-import com.gh.gamecenter.common.constant.EntranceConsts.KEY_USER_ID
-import com.gh.gamecenter.core.utils.SPUtils
-import com.gh.gamecenter.common.utils.toColor
-import com.gh.gamecenter.common.utils.viewModelProvider
 import com.gh.common.xapk.XapkInstaller
 import com.gh.common.xapk.XapkUnzipStatus
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.baselist.ListFragment
-import com.gh.gamecenter.feature.entity.GameEntity
+import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.constant.EntranceConsts.KEY_USER_ID
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBPackage
+import com.gh.gamecenter.common.utils.toColor
+import com.gh.gamecenter.common.utils.viewModelProvider
+import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.entity.GameInstall
-import com.gh.gamecenter.eventbus.EBDownloadStatus
-import com.gh.gamecenter.eventbus.EBPackage
-import com.gh.gamecenter.manager.PackagesManager
+import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.login.user.UserManager
+import com.gh.gamecenter.manager.PackagesManager
 import com.gh.gamecenter.mygame.PlayedGameViewModel
 import com.gh.gamecenter.personalhome.InstalledGameDialog
 import com.lightgame.download.DataWatcher

app/src/main/java/com/gh/gamecenter/qa/editor/ArticleAdapter.kt

@@ -13,6 +13,7 @@ import com.gh.gamecenter.common.viewholder.FooterViewHolder
 import com.gh.gamecenter.common.baselist.ListAdapter
 import com.gh.gamecenter.collection.CollectionCommunityArticleViewHolder
 import com.gh.gamecenter.common.callback.ConfirmListener
+import com.gh.common.util.DialogUtils
 import com.gh.gamecenter.common.utils.goneIf
 import com.gh.gamecenter.common.utils.safelyGetInRelease
 import com.gh.gamecenter.common.utils.ImageUtils

app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailFragment.kt

@@ -33,14 +33,14 @@ import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.entity.AdditionalParamsEntity
 import com.gh.gamecenter.common.entity.NormalShareEntity
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBPackage
 import com.gh.gamecenter.common.mvvm.Status
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.core.utils.*
 import com.gh.gamecenter.databinding.FragmentForumVideoDetailBinding
 import com.gh.gamecenter.entity.*
 import com.gh.gamecenter.eventbus.EBDeleteDetail
-import com.gh.gamecenter.eventbus.EBDownloadStatus
-import com.gh.gamecenter.eventbus.EBPackage
 import com.gh.gamecenter.eventbus.EBTopCommunityChanged
 import com.gh.gamecenter.feature.entity.ForumVideoEntity
 import com.gh.gamecenter.feature.entity.GameEntity

app/src/main/java/com/gh/gamecenter/receiver/InstallAndUninstallReceiver.java

@@ -9,10 +9,10 @@ import com.gh.common.util.PackageHelper;
 import com.gh.common.util.PackageUtils;
 import com.gh.download.PackageObserver;
 import com.gh.gamecenter.common.constant.Constants;
+import com.gh.gamecenter.common.eventbus.EBPackage;
 import com.gh.gamecenter.common.utils.ExtensionsKt;
 import com.gh.gamecenter.core.AppExecutor;
 import com.gh.gamecenter.core.utils.SPUtils;
-import com.gh.gamecenter.eventbus.EBPackage;
 import com.halo.assistant.HaloApp;
 import com.lightgame.utils.Utils;
 

app/src/main/java/com/gh/gamecenter/receiver/InstallReceiver.java

@@ -23,8 +23,6 @@ import com.gh.gamecenter.download.DownloadFragment;
 import com.lightgame.download.DownloadDao;
 import com.gh.gamecenter.core.utils.CurrentActivityHolder;
 import com.halo.assistant.HaloApp;
-import com.gh.gamecenter.download.DownloadFragment;
-import com.lightgame.download.DownloadDao;
 import com.lightgame.download.DownloadEntity;
 
 import org.greenrobot.eventbus.EventBus;

app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java

@@ -22,7 +22,6 @@ import com.gh.gamecenter.entity.CommentEntity;
 import com.gh.gamecenter.entity.CommentnumEntity;
 import com.gh.gamecenter.entity.CommonCollectionContentEntity;
 import com.gh.gamecenter.entity.CommonCollectionEntity;
-import com.gh.gamecenter.entity.ConcernEntity;
 import com.gh.gamecenter.entity.DefaultAvatar;
 import com.gh.gamecenter.entity.DeviceDialogEntity;
 import com.gh.gamecenter.entity.DialogEntity;
@@ -53,9 +52,6 @@ import com.gh.gamecenter.entity.HomeGameCollectionEntity;
 import com.gh.gamecenter.entity.HomeItemTestV2Entity;
 import com.gh.gamecenter.entity.ImageInfoEntity;
 import com.gh.gamecenter.entity.InterestedGameEntity;
-import com.gh.gamecenter.entity.LibaoDetailEntity;
-import com.gh.gamecenter.entity.LibaoEntity;
-import com.gh.gamecenter.entity.LibaoStatusEntity;
 import com.gh.gamecenter.entity.MessageEntity;
 import com.gh.gamecenter.entity.MessageFold;
 import com.gh.gamecenter.entity.MessageKeFuEntity;
@@ -103,8 +99,11 @@ import com.gh.gamecenter.feature.entity.ArticleEntity;
 import com.gh.gamecenter.feature.entity.AuthDialogEntity;
 import com.gh.gamecenter.feature.entity.AvatarBorderEntity;
 import com.gh.gamecenter.feature.entity.BackgroundImageEntity;
+import com.gh.gamecenter.feature.entity.ConcernEntity;
 import com.gh.gamecenter.feature.entity.ForumVideoEntity;
 import com.gh.gamecenter.feature.entity.GameEntity;
+import com.gh.gamecenter.feature.entity.LibaoEntity;
+import com.gh.gamecenter.feature.entity.LibaoStatusEntity;
 import com.gh.gamecenter.feature.entity.NewsEntity;
 import com.gh.gamecenter.feature.entity.PersonalEntity;
 import com.gh.gamecenter.feature.entity.QuestionDraftEntity;
@@ -116,7 +115,6 @@ import com.gh.gamecenter.gamedetail.entity.BigEvent;
 import com.gh.gamecenter.gamedetail.entity.NewGameDetailEntity;
 import com.gh.gamecenter.login.entity.UserInfoEntity;
 import com.gh.gamecenter.personalhome.rating.MyRating;
-import com.gh.gamecenter.qa.entity.TopCommunityCategory;
 import com.gh.gamecenter.qa.entity.AnswerDetailEntity;
 import com.gh.gamecenter.qa.entity.AnswerDraftEntity;
 import com.gh.gamecenter.qa.entity.ArticleDetailEntity;
@@ -125,6 +123,7 @@ import com.gh.gamecenter.qa.entity.EditorInsertDefaultEntity;
 import com.gh.gamecenter.qa.entity.InviteEntity;
 import com.gh.gamecenter.qa.entity.QuestionsDetailEntity;
 import com.gh.gamecenter.qa.entity.QuestionsIndexEntity;
+import com.gh.gamecenter.qa.entity.TopCommunityCategory;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 
@@ -530,36 +529,6 @@ public interface ApiService {
 
     /*********  LibaoService ********/
 
-    /**
-     * 获取礼包列表数据
-     */
-    @GET("libao")
-    Observable<List<LibaoEntity>> getLibao(@Query("page") int page);
-
-    /**
-     * 搜索礼包列表数据
-     */
-    @GET("libao")
-    Observable<List<LibaoEntity>> getLibaoBySearch(@Query("filter") String filter, @Query("page") int page);
-
-    /**
-     * 关注礼包列表数据
-     */
-    @GET("users/{user_id}/follows/libao")
-    Observable<List<LibaoEntity>> getConcernLibao(@Path("user_id") String user_id, @Query("page") int page);
-
-    /**
-     * 获取礼包详情数据
-     */
-    @GET("libao/{libao_id}?view=detail")
-    Observable<LibaoDetailEntity> getLibaoDetail(@Path("libao_id") String libao_id);
-
-    /**
-     * 获取礼包摘要数据
-     */
-    @GET("libao/{libao_id}?view=digest")
-    Observable<LibaoEntity> getLibaoDigest(@Path("libao_id") String libao_id);
-
     /**
      * 获取礼包领取按钮状态
      */

app/src/main/java/com/gh/gamecenter/savegame/GameArchiveListRecommendAdapter.kt

@@ -16,7 +16,7 @@ import com.gh.gamecenter.common.constant.ItemViewType
 import com.gh.gamecenter.common.utils.dip2px
 import com.gh.gamecenter.common.viewholder.FooterViewHolder
 import com.gh.gamecenter.feature.entity.GameEntity
-import com.gh.gamecenter.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
 import com.gh.gamecenter.feature.databinding.GameItemBinding
 import com.gh.gamecenter.feature.game.GameItemViewHolder
 import com.lightgame.download.DownloadEntity

app/src/main/java/com/gh/gamecenter/savegame/GameArchiveListRecommendFragment.kt

@@ -15,8 +15,8 @@ import com.gh.gamecenter.common.databinding.FragmentListBaseBinding
 import com.gh.gamecenter.common.utils.toColor
 import com.gh.gamecenter.common.utils.viewModelProvider
 import com.gh.gamecenter.feature.entity.GameEntity
-import com.gh.gamecenter.eventbus.EBDownloadStatus
-import com.gh.gamecenter.eventbus.EBPackage
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBPackage
 import com.lightgame.download.DataWatcher
 import com.lightgame.download.DownloadEntity
 import com.lightgame.download.DownloadStatus