重置

.gitlab-ci.yml

@@ -72,6 +72,8 @@ android_build:
   only:
     - dev
     - release
+    - feat/GHZSCY-6976
+    - feat/GHZSCY-6976-log
 
 # 代码检查
 sonarqube_analysis:
@@ -103,6 +105,8 @@ sonarqube_analysis:
    only:
      - dev
      - release
+     - feat/GHZSCY-6976
+     - feat/GHZSCY-6976-log
 
 ## 发送简易检测结果报告
 send_sonar_report:
@@ -121,6 +125,8 @@ send_sonar_report:
    only:
      - dev
      - release
+     - feat/GHZSCY-6976
+     - feat/GHZSCY-6976-log
 
 oss-upload&send-email:
     tags:
@@ -157,3 +163,5 @@ oss-upload&send-email:
     only:
         - dev
         - release
+        - feat/GHZSCY-6976
+        - feat/GHZSCY-6976-log

app/build.gradle

@@ -113,7 +113,6 @@ android {
         buildConfigField "String", "WECHAT_SECRET", "\"${WECHAT_SECRET}\""
         buildConfigField "String", "TENCENT_APPID", "\"${TENCENT_APPID}\""
         buildConfigField "String", "WEIBO_APPKEY", "\"${WEIBO_APPKEY}\""
-        buildConfigField "String", "DSP_API_HOST","\"${DSP_API_HOST}\""
         // 一体包的32位畅玩游戏助手包名
         buildConfigField "String", "EXT_PACKAGE_NAME", "\"${rootProject.ext.EXT_PACKAGE_NAME}\""
     }
@@ -347,7 +346,7 @@ repositories {
 android.applicationVariants.configureEach { variant ->
     variant.mergeAssets.doLast {
         def assetDir = variant.mergeAssetsProvider.get().outputDir.get()
-        def unwantedAssets = ['1832823466', 'gdt_plugin/gdtadv2.jar']
+        def unwantedAssets = ['2011394667', 'gdt_plugin/gdtadv2.jar']
 
         unwantedAssets.each { assetPath ->
             def file = new File([assetDir, assetPath].join(File.separator))
@@ -539,8 +538,6 @@ dependencies {
     if(!gradle.ext.excludeOptionalModules || gradle.ext.enableWechatPay){
         implementation(project(":feature:wechat_pay"))
     }
-
-    implementation "me.xdrop:fuzzywuzzy:${fuzzyVersion}"
 }
 
 File propFile = file('sign.properties')

app/proguard-rules.txt

@@ -20,7 +20,6 @@
 -keep class com.gh.gamecenter.db.info.* {*;}
 -keep class com.gh.gamecenter.entity.** {<fields>;}
 -keep class com.gh.gamecenter.qa.entity.** {<fields>;}
--keep class com.gh.gamecenter.gamedetail.entity.** {<fields>;}
 -keep class com.gh.download.DownloadDataSimpleEntity {<fields>;}
 -keep class com.gh.gamecenter.floatingwindow.FloatingWindowEntity {<fields>;}
 -keep class com.gh.gamecenter.BR
@@ -77,7 +76,6 @@
 
 ### TEA
 -keep class com.gh.gamecenter.TeaHelper { *; }
--keep class com.bytedance.ads.convert.broadcast.common.EncryptionTools {*;}
 
 ### EasyFloat
 -keep class com.lzf.easyfloat.* {*;}

app/src/internal/java/com/gh/vspace/installexternalgames/InstallExternalGameFragment.kt

@@ -3,14 +3,9 @@ package com.gh.vspace.installexternalgames
 import android.Manifest
 import android.app.Dialog
 import android.content.ComponentName
-import android.content.Intent
 import android.content.pm.PackageManager
-import android.os.Build
 import android.os.Bundle
-import android.os.Environment
-import android.provider.Settings
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.gh.common.util.DialogUtils
@@ -42,9 +37,6 @@ class InstallExternalGameFragment : ToolbarFragment(), OnItemClickListener {
 
     private var uninstallDisposable: Disposable? = null
 
-
-    private var shouldScan = false
-
     override fun getLayoutId() = 0
 
     override fun getInflatedLayout() =
@@ -82,24 +74,7 @@ class InstallExternalGameFragment : ToolbarFragment(), OnItemClickListener {
             adapter.notifyDataSetChanged()
         }
 
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            if (!Environment.isExternalStorageManager()) {
-                shouldScan = true
-                AlertDialog.Builder(requireContext()).setMessage("请在设置页面允许光环助手")
-                    .setNegativeButton("去") { dialog, which ->
-                        val intent = Intent(Settings.ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION)
-                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                        startActivity(intent)
-                    }.show()
-            } else {
-                mViewModel.scanPaths()
-            }
-        } else {
-            requestStoragePermission()
-        }
-
-
+        requestStoragePermission()
     }
 
     private fun requestStoragePermission() {
@@ -121,12 +96,6 @@ class InstallExternalGameFragment : ToolbarFragment(), OnItemClickListener {
         }
     }
 
-    override fun onStart() {
-        super.onStart()
-        if (shouldScan) {
-            mViewModel.scanPaths()
-        }
-    }
 
     private fun initView() {
         dialog = DialogUtils.showWaitDialog(requireContext(), "")
@@ -183,7 +152,7 @@ class InstallExternalGameFragment : ToolbarFragment(), OnItemClickListener {
         }, true)
 
         VHelper.newCwValidateVspaceBeforeAction(
-            requireContext(), null,
+            requireContext(),null,
         ) {
             dialog.show()
         }

app/src/main/AndroidManifest.xml

@@ -71,10 +71,6 @@
     <!-- 适配 双开/分身 游戏授权登录 -->
     <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
 
-    <!--  日历  -->
-    <uses-permission android:name="android.permission.READ_CALENDAR" />
-    <uses-permission android:name="android.permission.WRITE_CALENDAR" />
-
     <uses-sdk tools:overrideLibrary="
         com.shuyu.gsyvideoplayer,
         com.shuyu.gsyvideoplayer.lib,
@@ -821,7 +817,11 @@
             android:screenOrientation="portrait" />
 
         <activity
-            android:name="com.halo.assistant.accelerator.MyAssetsActivity"
+            android:name="com.halo.assistant.member.MemberActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".BatchRegisterActivity"
             android:screenOrientation="portrait" />
 
         <!--        <activity-->

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

@@ -27,8 +27,8 @@ import com.gh.gamecenter.MainActivity
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.base.activity.BaseActivity
 import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.exposure.ExposureSource
-import com.gh.gamecenter.common.exposure.meta.MetaUtil
 import com.gh.gamecenter.common.retrofit.BiResponse
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.core.AppExecutor
@@ -178,15 +178,6 @@ object AdDelegateHelper {
             when (config.location) {
                 "halo_launch" -> {
                     config.ownerAd?.startAd?.let { it.id = config.ownerAd.id }
-
-                    // HarmonyOS 2.2.0 版本不展示第三方开屏广告 (因为会引起奇怪的闪退)
-                    if (MetaUtil.getRom().name == "HarmonyOS"
-                        && MetaUtil.getRom().versionName == "2.2.0"
-                        && config.displayRule.adSource == "third_party_ads") {
-
-                        return
-                    }
-
                     mSplashAd = config
                 }
 

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

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

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

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

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

@@ -3,8 +3,6 @@ package com.gh.common
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
-import android.os.Handler
-import android.os.Looper
 import android.util.Base64
 import android.view.View
 import android.webkit.JavascriptInterface
@@ -13,7 +11,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.fragment.app.FragmentManager
-import androidx.lifecycle.Lifecycle
+import com.therouter.TheRouter
 import com.gh.common.exposure.ExposureManager
 import com.gh.common.util.*
 import com.gh.common.util.LogUtils
@@ -21,7 +19,6 @@ import com.gh.download.DownloadManager
 import com.gh.download.PackageObserver
 import com.gh.gamecenter.BuildConfig
 import com.gh.gamecenter.ImageViewerActivity
-import com.gh.gamecenter.R
 import com.gh.gamecenter.WebActivity
 import com.gh.gamecenter.common.callback.BiCallback
 import com.gh.gamecenter.common.constant.Constants
@@ -62,14 +59,13 @@ import com.gh.gamecenter.personalhome.border.AvatarBorderActivity
 import com.gh.gamecenter.setting.SettingBridge
 import com.gh.vspace.VHelper
 import com.halo.assistant.HaloApp
-import com.halo.assistant.accelerator.repository.AccelerationRepository.Companion.PAYMENT_TYPE_ALIPAY
-import com.halo.assistant.accelerator.repository.AccelerationRepository.Companion.PAYMENT_TYPE_WECHAT
-import com.halo.assistant.accelerator.repository.AcceleratorDataHolder
+import com.halo.assistant.member.MemberRepository
+import com.halo.assistant.member.MemberRepository.Companion.PAYMENT_TYPE_ALIPAY
+import com.halo.assistant.member.MemberRepository.Companion.PAYMENT_TYPE_WECHAT
 import com.lightgame.download.DataWatcher
 import com.lightgame.download.DownloadEntity
 import com.lightgame.download.DownloadStatus.*
 import com.lightgame.utils.Utils
-import com.therouter.TheRouter
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
@@ -82,7 +78,7 @@ import java.util.*
 class DefaultJsApi(
     var context: Context,
     val entrance: String = "",
-    private val mFragment: Fragment? = null,
+    private var mFragment: Fragment? = null,
     private var mBbsId: String? = "",
     private var mOriginUrl: String? = "",
     private val mForumName: String? = "",
@@ -99,8 +95,6 @@ class DefaultJsApi(
     private var mDownloadHandler: CompletionHandler<Any>? = null // 下载信息回调
     private var mExposureEvent: ExposureEvent? = null // 活动曝光实体
 
-    private val handler = Handler(Looper.getMainLooper())
-
     init {
         if (mFragment != null) {
             EventBus.getDefault().register(this)
@@ -247,12 +241,6 @@ class DefaultJsApi(
                     VHelper.launch(context, packageName)
                 }
             } else {
-                val wechatPkgName = "com.tencent.mm"
-                if (packageName == wechatPkgName && !PackageUtils.isInstalled(context, wechatPkgName)) {
-                    // 如果是微信客户端，需要检查是否安装微信
-                    ToastUtils.showToast(R.string.wechat_app_not_install_tips.toResString())
-                    return@runOnUiThread
-                }
                 PackageLauncher.launchApp(context, packageName = packageName)
             }
         }
@@ -515,44 +503,6 @@ class DefaultJsApi(
         }
     }
 
-    @JavascriptInterface
-    fun saveWechatQRCode(msg: Any) {
-        val base64StringData = msg.toString()
-        runOnUiThread {
-            (context as? FragmentActivity)?.checkStoragePermissionBeforeAction {
-                runOnIoThread {
-                    val base64String = base64StringData.replace("data:image/png;base64", "")
-                    tryWithDefaultCatch {
-                        val imageFile =
-                            File(HaloApp.getInstance().cacheDir.absolutePath + File.separator + System.currentTimeMillis() + ".png")
-                        val decodedString = Base64.decode(base64String, Base64.DEFAULT)
-                        val bos = BufferedOutputStream(FileOutputStream(imageFile))
-                        bos.write(decodedString)
-                        bos.flush()
-                        bos.close()
-
-                        ImageUtils.saveImageToFile(imageFile, "", true) {
-                            // 这里是 ui 线程
-                            // 保存微信二维码成功，1s 以后跳转微信
-                            if (mFragment != null && mFragment.lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED)) {
-                                handler.removeCallbacksAndMessages(null)
-                                handler.postDelayed({
-                                    val wechatPkgName = "com.tencent.mm"
-                                    if (!PackageUtils.isInstalled(context, wechatPkgName)) {
-                                        ToastUtils.showToast(R.string.wechat_app_not_install_tips.toResString())
-                                        return@postDelayed
-                                    }
-                                    PackageLauncher.launchApp(context, packageName = wechatPkgName)
-                                }, 1000)
-                            }
-
-                        }
-                    }
-                }
-            }
-        }
-    }
-
     @JavascriptInterface
     fun loginWithCallback(msg: Any, handler: CompletionHandler<Any>) {
         mLoginHandler = handler
@@ -793,7 +743,13 @@ class DefaultJsApi(
 
     @JavascriptInterface
     fun getCurAcctGameId(): String {
-        return AcceleratorDataHolder.instance.getAcceleratingGameId()
+        val isSpeeding = TheRouter.get(IAcceleratorProvider::class.java)?.isCurAccSuccess() ?: false
+        val gameId = if (isSpeeding) {
+            MemberRepository.instance.acctGameRecord.gameId
+        } else {
+            ""
+        }
+        return gameId
     }
 
     @JavascriptInterface
@@ -801,14 +757,6 @@ class DefaultJsApi(
         listener?.onStopGameAccelerate()
     }
 
-    @JavascriptInterface
-    fun getDurationRemainingTime(msg: Any, handler: CompletionHandler<Any>) {
-        TheRouter.get(IAcceleratorProvider::class.java)?.loadQyUserPermissionData {
-            val durationExpiredMinute = AcceleratorDataHolder.instance.vipEntity?.durationExpiredTime ?: 0L
-            handler.complete(durationExpiredMinute)
-        }
-    }
-
     @JavascriptInterface
     fun refreshToken(token: Any, handler: CompletionHandler<Any>) {
         val accessToken = token.toString()
@@ -857,8 +805,6 @@ class DefaultJsApi(
                         }
 
                         EventBus.getDefault().unregister(this@DefaultJsApi)
-
-                        handler.removeCallbacksAndMessages(null)
                     }
                 }
 

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

@@ -66,8 +66,6 @@ public class Config {
     public static final String WGAME_CPM_BUSIAPPID = BuildConfig.WGAME_CPM_BUSIAPPID;
     public static final String WGAME_CPM_API_HOST = EnvHelper.getWGameCPMHost();
 
-    public static final String DSP_API_HOST = EnvHelper.getDspHost();
-
     // Third-Party confs
     public static final String WECHAT_APPID = BuildConfig.WECHAT_APPID;
     public static final String WECHAT_SECRET = BuildConfig.WECHAT_SECRET;

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

@@ -1,10 +1,5 @@
 package com.gh.common.databind;
 
-import static com.gh.gamecenter.entity.SubjectEntity.SUBJECT_TAG_SELLING_POINT;
-import static com.gh.gamecenter.entity.SubjectEntity.SUBJECT_TAG_TEST;
-import static com.gh.gamecenter.entity.SubjectEntity.SUBJECT_TAG_TYPE;
-import static com.gh.gamecenter.entity.SubjectEntity.SUBJECT_TAG_UPDATE;
-
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
@@ -13,14 +8,11 @@ import android.text.SpannableString;
 import android.text.TextUtils;
 import android.text.style.ForegroundColorSpan;
 import android.view.View;
-import android.view.ViewParent;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.constraintlayout.widget.ConstraintLayout;
-import androidx.constraintlayout.widget.ConstraintSet;
 
 import com.gh.common.chain.BrowserInstallHandler;
 import com.gh.common.chain.CheckDownloadHandler;
@@ -56,7 +48,6 @@ import com.gh.download.server.BrowserInstallHelper;
 import com.gh.gamecenter.DownloadManagerActivity;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.WebActivity;
-import com.gh.gamecenter.common.databinding.LayoutGameItemSellingPointBinding;
 import com.gh.gamecenter.common.entity.LinkEntity;
 import com.gh.gamecenter.common.utils.DarkModeUtils;
 import com.gh.gamecenter.common.utils.ExtensionsKt;
@@ -64,7 +55,6 @@ import com.gh.gamecenter.common.utils.FileUtils;
 import com.gh.gamecenter.common.utils.NewFlatLogUtils;
 import com.gh.gamecenter.common.utils.SensorsBridge;
 import com.gh.gamecenter.core.utils.MtaHelper;
-import com.gh.gamecenter.core.utils.TimeUtils;
 import com.gh.gamecenter.core.utils.ToastUtils;
 import com.gh.gamecenter.feature.entity.ApkEntity;
 import com.gh.gamecenter.feature.entity.GameEntity;
@@ -211,8 +201,7 @@ public class BindingAdapters {
                                         gameEntity,
                                         traceEvent,
                                         entrance,
-                                        location + ":" + gameEntity.getName(),
-                                        null);
+                                        location + ":" + gameEntity.getName());
                                 return null;
                             });
                             final DownloadChainHandler chainHandler = builder.buildHandlerChain();
@@ -257,8 +246,7 @@ public class BindingAdapters {
                                 gameEntity,
                                 traceEvent,
                                 entrance,
-                                location + ":" + gameEntity.getName(),
-                                null);
+                                location + ":" + gameEntity.getName());
                     }
                     break;
                 case INSTALL_PLUGIN:
@@ -274,9 +262,7 @@ public class BindingAdapters {
                         SensorsBridge.trackInstallGameClick(
                                 gameEntity.getId(),
                                 gameEntity.getName() != null ? gameEntity.getName() : "",
-                                "主动安装",
-                                gameEntity.isDspGame(),
-                                gameEntity.getDspAdId()
+                                "主动安装"
                         );
 
                         DownloadEntity downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity);
@@ -301,7 +287,7 @@ public class BindingAdapters {
                     });
                     break;
                 case RESERVED:
-                    ReservationHelper.showCancelReservationDialog(progressBar.getContext(), gameEntity, () -> {
+                    ReservationHelper.showCancelReservationDialog(progressBar.getContext(),gameEntity, () -> {
                         ReservationHelper.cancelReservation(gameEntity, () -> {
                             updateReservation(progressBar, gameEntity);
                         });
@@ -484,37 +470,39 @@ public class BindingAdapters {
         }
     }
 
-    /**
-     * 包含测试开服标签
-     *
-     * @param layout
-     * @param gameEntity
-     * @param subjectTag 默认为 “”，只有游戏专题可以配置subjectTag
-     */
-    public static void setGameTags(LinearLayout layout, GameEntity gameEntity, String subjectTag) {
+    // 包含测试开服标签
+    public static void setGameTags(LinearLayout layout, GameEntity gameEntity) {
         try {
             if (layout.getVisibility() == View.GONE) return;
             ArrayList<TagStyleEntity> tagStyle = new ArrayList<>();
             TestEntity test = gameEntity.getTest();
-            if (test != null && subjectTag.equals(SUBJECT_TAG_TEST)) {
-                // 显示开测表标签
-                TagStyleEntity typeTag = new TagStyleEntity();
-                boolean isDarkModeOn = DarkModeUtils.INSTANCE.isDarkModeOn(layout.getContext());
-                typeTag.setName(test.getType() != null ? test.getType() : "");
-                typeTag.setBackground("1AFFA142");
-                typeTag.setColor(isDarkModeOn ? "EB9238" : "FFA142");
-                tagStyle.add(typeTag);
-
-                TagStyleEntity timeTag = new TagStyleEntity();
-                if (test.getStartPending()) {
-                    timeTag.setName(test.getStartText());
+            if (test != null
+                    // 这个判断用于开测表列表
+                    && !"type_tag".equals(test.getGameTag())) {
+                if ("custom".equals(test.getGameTag())) {
+                    TagStyleEntity typeTag = new TagStyleEntity();
+                    if (!TextUtils.isEmpty(test.getText())) {
+                        typeTag.setName(test.getText() != null ? test.getText() : "");
+                    } else {
+                        typeTag.setName(test.getType() != null ? test.getType() : "");
+                    }
+                    typeTag.setBackground("E8F3FF");
+                    typeTag.setColor("1383EB");
+                    tagStyle.add(typeTag);
                 } else {
-                    timeTag.setName(GameViewUtils.getGameTestDate(test.getStart()));
-                }
-                timeTag.setBackground("1A06CEA8");
-                timeTag.setColor(isDarkModeOn ? "07A385" : "06CEA8");
-                tagStyle.add(timeTag);
+                    TagStyleEntity typeTag = new TagStyleEntity();
+                    boolean isDarkModeOn = DarkModeUtils.INSTANCE.isDarkModeOn(layout.getContext());
+                    typeTag.setName(test.getType() != null ? test.getType() : "");
+                    typeTag.setBackground("1AFFA142");
+                    typeTag.setColor(isDarkModeOn ? "EB9238" : "FFA142");
+                    tagStyle.add(typeTag);
 
+                    TagStyleEntity timeTag = new TagStyleEntity();
+                    timeTag.setName(GameViewUtils.getGameTestDate(test.getStart()));
+                    timeTag.setBackground("1A06CEA8");
+                    timeTag.setColor(isDarkModeOn ? "07A385" : "06CEA8");
+                    tagStyle.add(timeTag);
+                }
             } else {
                 tagStyle = gameEntity.getTagStyle();
             }
@@ -524,68 +512,6 @@ public class BindingAdapters {
         }
     }
 
-    public static void setGameTagsWithSellingPoint(LinearLayout layout, LayoutGameItemSellingPointBinding binding, GameEntity gameEntity, String subjectTag) {
-        if (subjectTag.equals(SUBJECT_TAG_SELLING_POINT)) {
-            layout.setVisibility(View.GONE);
-            binding.getRoot().setVisibility(View.VISIBLE);
-            GameEntity.SellingPoints sellingPoints = gameEntity.getSellingPoints();
-            if (sellingPoints != null) {
-                binding.tvSellingPoints.setVisibility(View.VISIBLE);
-                binding.tvSellingPoints.setText(sellingPoints.getText());
-            } else {
-                binding.tvSellingPoints.setVisibility(View.GONE);
-            }
-
-            ArrayList<TagStyleEntity> tagStyle = gameEntity.getTagStyle();
-            StringBuilder tagText = new StringBuilder();
-            for (int i = 0; i < tagStyle.size(); i++) {
-                if (i < 3) {
-                    tagText.append(i == 0 ? "" : "·").append(tagStyle.get(i).getName());
-                }
-            }
-            binding.gtcvTags.setText(tagText);
-        } else {
-            layout.setVisibility(View.VISIBLE);
-            binding.getRoot().setVisibility(View.GONE);
-            switch (subjectTag) {
-                case SUBJECT_TAG_UPDATE:
-                    List<TagStyleEntity> updateTags = new ArrayList<>();
-                    TagStyleEntity updateTag = new TagStyleEntity(
-                            "local_generated",
-                            TimeUtils.getFormatTime(gameEntity.getUpdateTime(), "MM-dd") + " 更新",
-                            "",
-                            "1383EB",
-                            "E8F3FF",
-                            "1383EB",
-                            false
-                    );
-                    updateTags.add(updateTag);
-                    GameViewUtils.setLabelList(layout.getContext(), layout, updateTags);
-                    break;
-                case SUBJECT_TAG_TYPE:
-                    GameViewUtils.setLabelList(layout.getContext(), layout, gameEntity.getTagStyle());
-                    break;
-                default:
-                    setGameTags(layout, gameEntity, subjectTag);
-                    break;
-            }
-        }
-
-        ViewParent parent = binding.getRoot().getParent();
-        if (parent instanceof ConstraintLayout) {
-            ConstraintLayout constraintLayout = (ConstraintLayout) parent;
-            ConstraintSet constraintSet = new ConstraintSet();
-            constraintSet.clone(constraintLayout);
-            constraintSet.clear(R.id.gameDesSpace, ConstraintSet.BOTTOM);
-            if (subjectTag.equals(SUBJECT_TAG_SELLING_POINT)) {
-                constraintSet.connect(R.id.gameDesSpace, ConstraintSet.BOTTOM, R.id.layout_selling_points, ConstraintSet.TOP);
-            } else {
-                constraintSet.connect(R.id.gameDesSpace, ConstraintSet.BOTTOM, R.id.label_list, ConstraintSet.TOP);
-            }
-            constraintSet.applyTo(constraintLayout);
-        }
-    }
-
     public static void setVideoDetailGameTags(LinearLayout layout, GameEntity gameEntity) {
         try {
             ArrayList<TagStyleEntity> tagStyle = new ArrayList<>();

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

@@ -1,294 +0,0 @@
-package com.gh.common.dialog
-
-import android.content.Context
-import android.os.Bundle
-import android.os.Parcelable
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.appcompat.app.AppCompatActivity
-import com.gh.common.util.DirectUtils
-import com.gh.gamecenter.R
-import com.gh.gamecenter.common.HaloApp
-import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.utils.SensorsBridge
-import com.gh.gamecenter.common.utils.dip2px
-import com.gh.gamecenter.core.utils.CurrentActivityHolder
-import com.gh.gamecenter.core.utils.SPUtils
-import com.gh.gamecenter.databinding.DialogFragmentAccelerateExporationBinding
-import kotlinx.parcelize.Parcelize
-
-public class AccelerateExpirationDialogFragment : BaseDialogFragment() {
-
-    private lateinit var binding: DialogFragmentAccelerateExporationBinding
-
-    private var _reminder: ExpirationReminder? = null
-
-    override fun onBack(): Boolean {
-        return true
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        _reminder = arguments?.getParcelable(KEY_EXPIRATION_REMINDER)
-    }
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return DialogFragmentAccelerateExporationBinding.inflate(inflater, container, false)
-            .also {
-                binding = it
-            }.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        val reminder = _reminder ?: return
-        val (title, content) = when (reminder) {
-            is ExpirationReminder.UserExpired -> {
-                SensorsBridge.trackMonthlyPackageExpiresDialogShow(
-                    reminder.gameId, reminder.gameName, reminder.pkgName, reminder.sourceEntrance
-                )
-                getString(
-                    R.string.membership_expiration_reminder_title,
-                    "${reminder.days}"
-                ) to getString(R.string.membership_expiration_reminder_content)
-            }
-
-            is ExpirationReminder.InsufficientDuration -> {
-                SensorsBridge.trackInsufficientDurationDialogShow(
-                    reminder.gameId,
-                    reminder.gameName,
-                    reminder.pkgName,
-                    reminder.sourceEntrance
-                )
-                getString(
-                    R.string.duration_time_out_reminder_title,
-                    "${reminder.hours}"
-                ) to getString(R.string.duration_time_out_reminder_content)
-            }
-
-            is ExpirationReminder.DurationExpired -> {
-                SensorsBridge.trackTimedPackageExpiresDialogShow(
-                    reminder.gameId,
-                    reminder.gameName,
-                    reminder.pkgName,
-                    reminder.sourceEntrance
-                )
-                getString(
-                    R.string.duration_expiration_reminder_title,
-                    "${reminder.days}"
-                ) to getString(R.string.duration_expiration_reminder_content)
-            }
-
-            is ExpirationReminder.TimeRunsOut -> {
-                SensorsBridge.trackDurationExhaustedDialogShow()
-                getString(R.string.accelerator_member_expired_title) to getString(R.string.accelerator_member_expired_content)
-            }
-        }
-
-        binding.tvTitle.text = title
-        binding.tvContent.text = content
-        binding.tvCancel.setOnClickListener {
-            when (reminder) {
-                is ExpirationReminder.UserExpired -> {
-                    SensorsBridge.trackMonthlyPackageExpiresDialogClick(
-                        reminder.gameId, reminder.gameName, reminder.pkgName, reminder.sourceEntrance, BUTTON_NAME_KNOW
-                    )
-                }
-
-                is ExpirationReminder.InsufficientDuration -> {
-                    SensorsBridge.trackInsufficientDurationDialogClick(
-                        reminder.gameId, reminder.gameName, reminder.pkgName, reminder.sourceEntrance, BUTTON_NAME_KNOW
-                    )
-                }
-
-                is ExpirationReminder.DurationExpired -> {
-                    SensorsBridge.trackTimedPackageExpiresDialogClick(
-                        reminder.gameId, reminder.gameName, reminder.pkgName, reminder.sourceEntrance, BUTTON_NAME_KNOW
-                    )
-                }
-
-                is ExpirationReminder.TimeRunsOut -> {
-                    SensorsBridge.trackDurationExhaustedDialogClick(BUTTON_NAME_KNOW)
-                }
-            }
-            dismissAllowingStateLoss()
-        }
-        binding.tvSubmit.setOnClickListener {
-            when (reminder) {
-                is ExpirationReminder.UserExpired -> {
-                    SensorsBridge.trackMonthlyPackageExpiresDialogClick(
-                        reminder.gameId, reminder.gameName, reminder.pkgName, reminder.sourceEntrance, BUTTON_NAME_BUY
-                    )
-                }
-
-                is ExpirationReminder.InsufficientDuration -> {
-                    SensorsBridge.trackInsufficientDurationDialogClick(
-                        reminder.gameId, reminder.gameName, reminder.pkgName, reminder.sourceEntrance, BUTTON_NAME_BUY
-                    )
-                }
-
-                is ExpirationReminder.DurationExpired -> {
-                    SensorsBridge.trackTimedPackageExpiresDialogClick(
-                        reminder.gameId, reminder.gameName, reminder.pkgName, reminder.sourceEntrance, BUTTON_NAME_BUY
-                    )
-                }
-
-                is ExpirationReminder.TimeRunsOut -> {
-                    SensorsBridge.trackDurationExhaustedDialogClick(BUTTON_NAME_BUY)
-                }
-            }
-            SensorsBridge.trackMyAssetsPageShow(
-                reminder.pkgName,
-                reminder.gameId,
-                reminder.gameName,
-                reminder.dialogName
-            )
-            dismissAllowingStateLoss()
-
-            DirectUtils.navigateToMyAssetsPage(requireContext(), reminder.sourceEntrance)
-        }
-    }
-
-    override fun onStart() {
-        super.onStart()
-        val width = HaloApp.getInstance().resources.displayMetrics.widthPixels - 60F.dip2px()
-        val height = dialog?.window?.attributes?.height ?: ViewGroup.LayoutParams.WRAP_CONTENT
-        dialog?.window?.setLayout(width, height)
-    }
-
-    companion object {
-        const val KEY_EXPIRATION_REMINDER = "key_expiration_reminder"
-
-        private const val BUTTON_NAME_KNOW = "知道了"
-        private const val BUTTON_NAME_BUY = "前往购买"
-
-        fun checkDialogShown(context: Context, reminder: ExpirationReminder, callback: ((Boolean) -> Unit)? = null) {
-
-            when (reminder) {
-                is ExpirationReminder.UserExpired -> {
-                    val days = SPUtils.getLong(Constants.SP_ACCELERATOR_USER_REMAINING_REMIND)
-                    if (reminder.days != days) {
-                        SPUtils.setLong(Constants.SP_ACCELERATOR_USER_REMAINING_REMIND, reminder.days)
-                        show(context, reminder)
-                        callback?.invoke(true)
-                    } else {
-                        callback?.invoke(false)
-                    }
-                }
-
-                is ExpirationReminder.InsufficientDuration -> {
-                    val hours = SPUtils.getLong(Constants.SP_ACCELERATOR_DURATION_REMAINING_HOURS)
-                    if (reminder.hours != hours) {
-                        SPUtils.setLong(Constants.SP_ACCELERATOR_DURATION_REMAINING_HOURS, reminder.hours)
-                        show(context, reminder)
-                        callback?.invoke(true)
-                    } else {
-                        callback?.invoke(false)
-                    }
-                }
-
-                is ExpirationReminder.DurationExpired -> {
-                    val days = SPUtils.getLong(Constants.SP_ACCELERATOR_DURATION_REMAINING_DAYS)
-                    if (reminder.days != days) {
-                        SPUtils.setLong(Constants.SP_ACCELERATOR_DURATION_REMAINING_DAYS, reminder.days)
-                        show(context, reminder)
-                        callback?.invoke(true)
-                    } else {
-                        callback?.invoke(false)
-                    }
-                }
-
-                is ExpirationReminder.TimeRunsOut -> {
-                    val hasShow = SPUtils.getBoolean(Constants.SP_ACCELERATOR_MEMBERSHIP_EXPIRED)
-                    if (!hasShow) {
-                        SPUtils.setBoolean(Constants.SP_ACCELERATOR_MEMBERSHIP_EXPIRED, true)
-                        show(context, reminder)
-                        callback?.invoke(true)
-                    } else {
-                        callback?.invoke(false)
-                    }
-                }
-            }
-        }
-
-        fun show(context: Context, reminder: ExpirationReminder) {
-            if (context is AppCompatActivity) {
-                context.supportFragmentManager
-            } else {
-                (CurrentActivityHolder.getCurrentActivity() as? AppCompatActivity)?.supportFragmentManager
-            }?.let {
-                val fragment = AccelerateExpirationDialogFragment().apply {
-                    arguments = Bundle().apply {
-                        putParcelable(KEY_EXPIRATION_REMINDER, reminder)
-                    }
-                }
-                fragment.show(it, AcceleratorPermissionGuideDialogFragment::class.java.name)
-            }
-        }
-    }
-
-    sealed class ExpirationReminder(
-        val gameId: String,
-        val gameName: String,
-        val pkgName: String,
-        val sourceEntrance: String
-    ) :
-        Parcelable {
-
-        abstract val dialogName: String
-
-        @Parcelize
-        data class InsufficientDuration(
-            val hours: Long,
-            private val _gameId: String,
-            private val _gameName: String,
-            private val _pkgName: String,
-            private val _sourceEntrance: String,
-        ) :
-            ExpirationReminder(_gameId, _gameName, _pkgName, _sourceEntrance) {
-
-            override val dialogName: String
-                get() = "时长不足提示弹窗"
-        }
-
-        @Parcelize
-        data class DurationExpired(
-            val days: Long,
-            private val _gameId: String,
-            private val _gameName: String,
-            private val _pkgName: String,
-            private val _sourceEntrance: String,
-        ) :
-            ExpirationReminder(_gameId, _gameName, _pkgName, _sourceEntrance) {
-
-            override val dialogName: String
-                get() = "计时套餐临期提示弹窗"
-        }
-
-        @Parcelize
-        data class UserExpired(
-            val days: Long,
-            private val _gameId: String,
-            private val _gameName: String,
-            private val _pkgName: String,
-            private val _sourceEntrance: String,
-        ) :
-            ExpirationReminder(_gameId, _gameName, _pkgName, _sourceEntrance) {
-
-            override val dialogName: String
-                get() = "包月套餐临期提示弹窗"
-        }
-
-        @Parcelize
-        data class TimeRunsOut(
-            private val _sourceEntrance: String,
-        ) : ExpirationReminder("", "", "", _sourceEntrance) {
-
-            override val dialogName: String
-                get() = "时长耗尽提示弹窗"
-        }
-    }
-}

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

@@ -1,68 +0,0 @@
-package com.gh.common.dialog
-
-import android.content.Context
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.appcompat.app.AppCompatActivity
-import com.gh.gamecenter.common.HaloApp
-import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.utils.dip2px
-import com.gh.gamecenter.core.utils.CurrentActivityHolder
-import com.gh.gamecenter.core.utils.SPUtils
-import com.gh.gamecenter.databinding.DialogFragmentAcceleratorPermissionGuideBinding
-
-class AcceleratorPermissionGuideDialogFragment : BaseDialogFragment() {
-
-    private lateinit var binding: DialogFragmentAcceleratorPermissionGuideBinding
-
-    private var callback: (() -> Unit)? = null
-
-    override fun onBack(): Boolean {
-        return true
-    }
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return DialogFragmentAcceleratorPermissionGuideBinding.inflate(inflater, container, false)
-            .also {
-                binding = it
-            }.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        SPUtils.setBoolean(Constants.SP_ACCELERATOR_PERMISSION_GUIDE_SHOW, true)
-        binding.tvSubmit.setOnClickListener {
-            dismiss()
-            callback?.invoke()
-        }
-    }
-
-    fun setOnCallback(block: () -> Unit) {
-        this.callback = block
-    }
-
-    override fun onStart() {
-        super.onStart()
-        val width = HaloApp.getInstance().resources.displayMetrics.widthPixels - 60F.dip2px()
-        val height = dialog?.window?.attributes?.height ?: ViewGroup.LayoutParams.WRAP_CONTENT
-        dialog?.window?.setLayout(width, height)
-    }
-
-    companion object {
-
-        fun show(context: Context, callback: () -> Unit) {
-            if (context is AppCompatActivity) {
-                context.supportFragmentManager
-            } else {
-                (CurrentActivityHolder.getCurrentActivity() as? AppCompatActivity)?.supportFragmentManager
-            }?.let {
-                val fragment = AcceleratorPermissionGuideDialogFragment()
-                fragment.setOnCallback(callback)
-                fragment.show(it, AcceleratorPermissionGuideDialogFragment::class.java.name)
-            }
-        }
-    }
-}

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

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

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

@@ -19,7 +19,7 @@ class ExposureListener(var fragment: Fragment, var exposable: IExposable) : Recy
         ExposureThrottleBus(
             { commitExposure(it) },
             Consumer(Throwable::printStackTrace),
-            { commitExternalExposure(it) }
+            { commitWXCPMExposure(it) }
         )
     }
     var layoutManager: LayoutManager? = null
@@ -31,7 +31,7 @@ class ExposureListener(var fragment: Fragment, var exposable: IExposable) : Recy
                 override fun onFragmentPaused(fm: FragmentManager, f: Fragment) {
                     if (fragment == f) {
                         visibleState?.let { commitExposure(it) }
-                        visibleState?.let { commitExternalExposure(it) }
+                        visibleState?.let { commitWXCPMExposure(it) }
                         throttleBus.clear()
                     }
                 }
@@ -97,33 +97,23 @@ class ExposureListener(var fragment: Fragment, var exposable: IExposable) : Recy
     }
 
     /**
-     * 提交第三方的曝光事件 （微信小游戏CPM 和 DSP 游戏）
-     * 由于普通曝光事件的上报通道存在节流特性，不符合CPM接口对于数据上报的实时性和准确性的要求，所以使用额外的通道进行上报
+     * 微信小游戏CPM曝光事件接口上报，由于普通曝光事件的上报通道存在节流特性，不符合CPM接口对于数据上报的实时性和准确性的要求，所以使用额外的通道进行上报
      */
-    private fun commitExternalExposure(visibleState: ExposureThrottleBus.VisibleState) {
+    private fun commitWXCPMExposure(visibleState: ExposureThrottleBus.VisibleState) {
 
-        val cpmEventList = arrayListOf<ExposureEvent>()
-        val dspEventList = arrayListOf<ExposureEvent>()
+        val eventList = arrayListOf<ExposureEvent>()
 
         for (pos in visibleState.firstVisiblePosition..visibleState.lastVisiblePosition) {
             try {
                 exposable.getEventByPosition(pos)?.let {
-                    when (it.payload.miniGameType) {
-                        Constants.WECHAT_MINI_GAME_CPM -> cpmEventList.add(it)
-                        Constants.DSP_GAME -> dspEventList.add(it)
-                        else -> {
-                            // do nothing
-                        }
+                    if (it.payload.miniGameType == Constants.WECHAT_MINI_GAME_CPM) {
+                        eventList.add(it)
                     }
                 }
                 exposable.getEventListByPosition(pos)?.let { list ->
                     list.forEach {
-                        when (it.payload.miniGameType) {
-                            Constants.WECHAT_MINI_GAME_CPM -> cpmEventList.add(it)
-                            Constants.DSP_GAME -> dspEventList.add(it)
-                            else -> {
-                                // do nothing
-                            }
+                        if (it.payload.miniGameType == Constants.WECHAT_MINI_GAME_CPM) {
+                            eventList.add(it)
                         }
                     }
                 }
@@ -131,8 +121,7 @@ class ExposureListener(var fragment: Fragment, var exposable: IExposable) : Recy
                 // Just ignore the error.
             }
         }
-        ExposureManager.logExternal(cpmEventList, dspEventList)
+        ExposureManager.logCPM(eventList)
     }
 
-
 }

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

@@ -6,9 +6,7 @@ import com.gh.gamecenter.common.loghub.TLogHubHelper
 import com.gh.gamecenter.common.utils.FixedSizeLinkedHashSet
 import com.gh.gamecenter.common.utils.toJson
 import com.gh.gamecenter.core.AppExecutor
-import com.gh.gamecenter.dsp.DspReportHelper
 import com.gh.gamecenter.feature.exposure.ExposureEvent
-import com.gh.gamecenter.feature.exposure.ExposureType
 import com.gh.gamecenter.feature.minigame.wechat.WGameSubjectCPMListReportHelper
 import com.lightgame.utils.Utils
 import com.volcengine.model.tls.LogItem
@@ -38,10 +36,6 @@ object ExposureManager {
         AppExecutor.logExecutor.execute {
             if (event.payload.miniGameType == Constants.WECHAT_MINI_GAME_CPM) {
                 WGameSubjectCPMListReportHelper.reportExposure(event)
-            } else if (event.payload.miniGameType == Constants.DSP_GAME) {
-                if (event.event == ExposureType.DOWNLOAD_COMPLETE) {
-                    DspReportHelper.report(event.payload.downloadUrl)
-                }
             }
             if (!exposureCache.contains(event.id)) {
                 exposureSet.add(event)
@@ -70,18 +64,12 @@ object ExposureManager {
     }
 
     /**
-     * Log a collection of exposure event for external use.
+     * Log a wechat mini game cpm collection of exposure event.
      */
-    fun logExternal(cpmEventList: List<ExposureEvent>, dspEventList: ArrayList<ExposureEvent>) {
+    fun logCPM(eventList: List<ExposureEvent>) {
         AppExecutor.logExecutor.execute {
-            if (cpmEventList.isNotEmpty()) {
-                WGameSubjectCPMListReportHelper.reportExposure(cpmEventList.toSet())
-            }
-
-            if (dspEventList.isNotEmpty()) {
-                for (event in dspEventList) {
-                    DspReportHelper.report(event.payload.showUrl)
-                }
+            if (eventList.isNotEmpty()) {
+                WGameSubjectCPMListReportHelper.reportExposure(eventList.toSet())
             }
         }
     }

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

@@ -89,7 +89,6 @@ object ExposureUtils {
         exposureEvent.payload.path = path
         exposureEvent.payload.speed = speed
         exposureEvent.payload.redirectedUrlList = redirectedUrlList
-        exposureEvent.payload.downloadUrl = gameEntity.downloadUrl
 
         ExposureManager.log(exposureEvent)
         ExposureManager.commitSavedExposureEvents(forcedUpload = true)

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

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

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

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

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

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

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

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

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

@@ -59,7 +59,7 @@ class CustomFloatingWindowHandler(priority: Int) : PriorityChainHandler(priority
     override fun onProcess(): Boolean {
         when (getStatus()) {
             STATUS_VALID -> {
-                _showFloatingAction.postValue(Event(data))
+                _showFloatingAction.value = Event(data)
                 return true
 //                    floatingWindowProvider.showFloatingWindowOnly(
 //                        mFragment!!,

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

@@ -64,8 +64,7 @@ object GlobalPriorityChainHelper : ISuperiorChain {
      * 预启动所有的优先级弹窗管理链
      */
     fun preStart(withSpecialDelay: Boolean) {
-        val launchRedirectHandler = LaunchRedirectHandler(-102)
-        val membershipExpiredHandler = MembershipExpiredHandler(-101)
+        val launchRedirectHandler = LaunchRedirectHandler(-101)
         val updateDialogHandler = UpdateDialogHandler(-100)
         val privacyPolicyDialogHandler = PrivacyPolicyDialogHandler(-99)
         val notificationPermissionDialogHandler = NotificationPermissionDialogHandler(0)
@@ -75,7 +74,6 @@ object GlobalPriorityChainHelper : ISuperiorChain {
         val resumeDownloadHandler = ResumeDownloadHudHandler(4)
 
         mainChain.addHandler(launchRedirectHandler)
-        mainChain.addHandler(membershipExpiredHandler)
         mainChain.addHandler(updateDialogHandler)
         mainChain.addHandler(privacyPolicyDialogHandler)
         mainChain.addHandler(welcomeDialogHandler)
@@ -85,7 +83,6 @@ object GlobalPriorityChainHelper : ISuperiorChain {
         mainChain.addHandler(resumeDownloadHandler)
 
         launchRedirectHandler.doPreProcess()
-        membershipExpiredHandler.doPreProcess()
         updateDialogHandler.doPreProcess()
 
         // 首次启动延迟 300ms，保证请求首次启动时已经获取到了 GID 、 OAID 等标记

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

@@ -1,80 +0,0 @@
-package com.gh.common.prioritychain
-
-import android.os.Bundle
-import androidx.fragment.app.FragmentActivity
-import com.gh.common.dialog.AccelerateExpirationDialogFragment
-import com.gh.gamecenter.common.constant.Constants.SP_ACCELERATOR_MEMBERSHIP_EXPIRED
-import com.gh.gamecenter.core.utils.CurrentActivityHolder
-import com.gh.gamecenter.core.utils.SPUtils
-import com.gh.gamecenter.login.user.UserRepository
-import com.halo.assistant.accelerator.repository.AcceleratorDataHolder
-
-class MembershipExpiredHandler(priority: Int) : PriorityChainHandler(priority) {
-
-    fun doPreProcess() {
-        UserRepository.getInstance().setAutoLoginListener {
-            val hasShow = SPUtils.getBoolean(SP_ACCELERATOR_MEMBERSHIP_EXPIRED)
-            val vipEntity = AcceleratorDataHolder.instance.vipEntity
-            if (getStatus() == STATUS_PENDING) {
-                if (vipEntity == null ||
-                    vipEntity.vipStatus ||
-                    vipEntity.isNewUser ||
-                    vipEntity.isVipRefundUser ||
-                    vipEntity.isDurationRefundUser ||
-                    hasShow
-                ) {
-                    processNext()
-                } else {
-                    updateStatus(STATUS_VALID)
-                    process()
-                }
-            } else {
-                if (vipEntity == null ||
-                    vipEntity.vipStatus ||
-                    vipEntity.isNewUser ||
-                    vipEntity.isVipRefundUser ||
-                    vipEntity.isDurationRefundUser ||
-                    hasShow
-                ) {
-                    updateStatus(STATUS_INVALID)
-                } else {
-                    updateStatus(STATUS_VALID)
-                }
-            }
-        }
-    }
-
-    override fun onProcess(): Boolean {
-        val currentActivity = CurrentActivityHolder.getCurrentActivity()
-        if (GlobalPriorityChainHelper.isThisActivityValid(currentActivity)) {
-            when (getStatus()) {
-                STATUS_VALID -> {
-                    val reminder = AccelerateExpirationDialogFragment.ExpirationReminder.TimeRunsOut("")
-                    SPUtils.setBoolean(SP_ACCELERATOR_MEMBERSHIP_EXPIRED, true)
-                    val dialogFragment = AccelerateExpirationDialogFragment().apply {
-                        arguments = Bundle().apply {
-                            putParcelable(
-                                AccelerateExpirationDialogFragment.KEY_EXPIRATION_REMINDER, reminder
-                            )
-                        }
-                    }
-                    dialogFragment.dialog?.setOnDismissListener {
-                        processNext()
-                    }
-                    dialogFragment.show(
-                        (currentActivity as FragmentActivity).supportFragmentManager,
-                        AccelerateExpirationDialogFragment::class.java.name
-                    )
-
-                    return true
-                }
-
-                STATUS_INVALID -> {
-                    processNext()
-                }
-            }
-        }
-
-        return false
-    }
-}

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

@@ -4,10 +4,8 @@ import android.view.View
 import android.widget.LinearLayout
 import android.widget.TextView
 import com.gh.common.databind.BindingAdapters
-import com.gh.gamecenter.common.databinding.LayoutGameItemSellingPointBinding
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.provider.IBindingAdaptersProvider
-import com.gh.gamecenter.home.custom.adapter.CustomViewExt
 
 @com.therouter.inject.ServiceProvider
 class BindingAdaptersProviderImpl : IBindingAdaptersProvider {
@@ -20,7 +18,7 @@ class BindingAdaptersProviderImpl : IBindingAdaptersProvider {
     }
 
     override fun setGameTags(layout: LinearLayout, gameEntity: GameEntity) {
-        BindingAdapters.setGameTags(layout, gameEntity, "")
+        BindingAdapters.setGameTags(layout, gameEntity)
     }
 
     override fun setMessageUnread(view: TextView, unreadCount: Int) {
@@ -30,17 +28,4 @@ class BindingAdaptersProviderImpl : IBindingAdaptersProvider {
     override fun setGame(view: View, gameEntity: GameEntity) {
         BindingAdapters.setGame(view, gameEntity)
     }
-
-    override fun setGameTagsWithSellingPoints(
-        layout: LinearLayout,
-        sellingPointsBinding: LayoutGameItemSellingPointBinding,
-        gameEntity: GameEntity,
-        subjectTag: String
-    ) {
-        BindingAdapters.setGameTagsWithSellingPoint(layout, sellingPointsBinding, gameEntity, subjectTag)
-    }
-
-    override fun setGameDescription(tvDesc: TextView, briefStyle: String, game: GameEntity) {
-        CustomViewExt.setDescription(tvDesc, briefStyle, game)
-    }
 }

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

@@ -31,6 +31,4 @@ class BuildConfigImpl : IBuildConfigProvider {
     override fun getWGameCPMBusiAppId(): String = BuildConfig.WGAME_CPM_BUSIAPPID
 
     override fun getLogProducerProject(): String = BuildConfig.LOG_HUB_PROJECT
-
-    override fun getDspApiHost(): String = BuildConfig.DSP_API_HOST
 }

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

@@ -2,8 +2,6 @@ package com.gh.common.provider
 
 import com.gh.common.util.NewFlatLogUtils
 import com.gh.gamecenter.common.base.GlobalActivityManager
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.entity.LinkEntity
 import com.gh.gamecenter.common.exposure.ExposureSource
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.entity.GameUpdateEntity
@@ -13,7 +11,6 @@ import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.gh.gamecenter.feature.provider.IDownloadButtonClickedProvider
 import com.gh.gamecenter.feature.view.DownloadButton
 import com.gh.gamecenter.packagehelper.PackageRepository
-import com.halo.assistant.HaloApp
 import com.lightgame.download.DownloadEntity
 import com.lightgame.utils.Utils
 
@@ -30,9 +27,6 @@ class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
         var packageName = ""
         var exposureSourceList: List<ExposureSource>? = null
         var customPageTrackData: CustomPageTrackData? = null
-        val pushMessageId = (HaloApp.get(Constants.PUSH_MESSAGE_ID, false) as? String) ?: ""
-        val pushLinkId = (HaloApp.get(Constants.PUSH_LINK_ENTITY, false) as? LinkEntity)?.link ?: ""
-        val isFromPush = pushMessageId.isNotEmpty()
 
         val boundedObject = downloadButton.getObject()
 
@@ -119,10 +113,8 @@ class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
                 }
 
                 // 小游戏的启动不需要上报下载点击事件
-                // @see https://jira.shanqu.cc/browse/GHZSCY-7013 & https://jira.shanqu.cc/browse/GHZSCY-7918
-                if (boundedObject is GameEntity
-                    && (boundedObject.isMiniGame() || boundedObject.isDspGame)
-                ) {
+                // @see https://jira.shanqu.cc/browse/GHZSCY-7013
+                if (boundedObject is GameEntity && boundedObject.isMiniGame()) {
                     return
                 }
 
@@ -144,9 +136,6 @@ class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
                     "last_page_name", GlobalActivityManager.getLastPageEntity().pageName,
                     "last_page_id", GlobalActivityManager.getLastPageEntity().pageId,
                     "last_page_business_id", GlobalActivityManager.getLastPageEntity().pageBusinessId,
-                    "is_from_push_notifications", isFromPush,
-                    "message_id", pushMessageId,
-                    "link_id", pushLinkId,
                     *customPageKV
                 )
             }

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

@@ -1,59 +0,0 @@
-package com.gh.common.provider
-
-import com.gh.common.util.PackageUtils
-import android.annotation.SuppressLint
-import com.gh.gamecenter.common.retrofit.BiResponse
-import com.gh.gamecenter.common.utils.singleToMain
-import com.gh.gamecenter.core.provider.IAcceleratorDataHolderProvider
-import com.gh.gamecenter.feature.entity.BaseEntity
-import com.gh.gamecenter.feature.entity.VipEntity
-import com.gh.gamecenter.login.retrofit.RetrofitManager
-import com.gh.gamecenter.login.user.UserManager
-import com.halo.assistant.accelerator.repository.AcceleratorDataHolder
-
-@com.therouter.inject.ServiceProvider
-class IAcceleratorDataHolderProviderImpl : IAcceleratorDataHolderProvider {
-
-    override fun isPaidVip(): Boolean =
-        AcceleratorDataHolder.instance.isPaidVip
-
-    override fun getGhVersionName(): String {
-        return PackageUtils.getGhVersionName()
-    }
-
-    /**
-     *   请注意，由于光环后端无法获取 奇游时长套餐 加速时长，这里的 vipStatus不准，
-     *   这里只做参考，具体的状态需要奇游sdk提供，如果奇游sdk返回失败，则以这条接口结果为准
-     */
-    @SuppressLint("CheckResult")
-    override fun loadVipEntityFromGh(userId: String, callBack: (Any?) -> Unit) {
-        RetrofitManager.getInstance().newApi.getVipStatus(
-            userId.ifBlank { UserManager.getInstance().userId },
-            "gjonline_vip",
-            true
-        )
-            .compose(singleToMain())
-            .subscribe(object : BiResponse<BaseEntity<VipEntity>>() {
-                override fun onSuccess(data: BaseEntity<VipEntity>) {
-                    callBack(data.data)
-                }
-
-                override fun onFailure(exception: Exception) {
-                    super.onFailure(exception)
-                    callBack(null)
-                }
-
-            })
-    }
-
-    override fun updateVipEntity(data: Any) {
-        if (data is VipEntity) {
-            AcceleratorDataHolder.instance.setVipEntity(data)
-        }
-    }
-
-
-    override fun clear() {
-        AcceleratorDataHolder.instance.clear()
-    }
-}

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

@@ -7,6 +7,9 @@ import com.gh.gamecenter.feature.provider.IRegionSettingHelperProvider
 
 @com.therouter.inject.ServiceProvider
 class RegionSettingHelperProviderImpl : IRegionSettingHelperProvider {
+    override fun shouldThisGameDisplayMirrorInfo(gameId: String): Boolean {
+        return RegionSettingHelper.shouldThisGameDisplayMirrorInfo(gameId)
+    }
 
     override fun getMirrorPosition(gameId: String): Int {
         return RegionSettingHelper.getMirrorPosition(gameId)

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

@@ -3,17 +3,21 @@ package com.gh.common.provider
 import android.annotation.SuppressLint
 import com.gh.gamecenter.common.utils.SensorsBridge
 import com.gh.gamecenter.common.utils.singleToMain
+import com.gh.gamecenter.core.provider.IAcceleratorProvider
 import com.gh.gamecenter.core.provider.IWechatPayResultProvider
 import com.gh.gamecenter.feature.entity.OrderEntity
+import com.gh.gamecenter.feature.entity.VipEntity
 import com.gh.gamecenter.feature.eventbus.EBPayState
-import com.halo.assistant.accelerator.repository.AccelerationRepository
-import com.halo.assistant.accelerator.repository.AcceleratorDataHolder
+import com.gh.gamecenter.login.user.UserManager
+import com.gh.gamecenter.login.user.UserRepository
+import com.halo.assistant.member.MemberRepository
+import com.therouter.TheRouter
 import org.greenrobot.eventbus.EventBus
 
 @com.therouter.inject.ServiceProvider
 class WechatPayResultProviderImpl : IWechatPayResultProvider {
 
-    private val repository = AccelerationRepository.newInstance()
+    private val repository = MemberRepository.instance
 
     @SuppressLint("CheckResult")
     override fun onPayComplete(nonceStr: String, order: Any?) {
@@ -24,23 +28,33 @@ class WechatPayResultProviderImpl : IWechatPayResultProvider {
                 // 支付成功
                 EventBus.getDefault().post(EBPayState.PaySuccess)
 
-                // 先刷新本地状态，支付成功
-                AcceleratorDataHolder.instance.handleUserRechargeSuccess(orderEntity)
+                // 先刷新本地状态，支付成功，肯定是付费会员
+                TheRouter.get(IAcceleratorProvider::class.java)?.setVipEntity(
+                    VipEntity(
+                        _vipStatus = true,
+                        _isNewUser = false,
+                        _isTryVip = false
+                    )
+                )
+                val userId = UserManager.getInstance().userId
+                if (userId.isNotBlank()) {
+                    UserRepository.getInstance().refreshVipStatus(userId, true)
+                }
 
                 SensorsBridge.trackMemberRechargeResult(
-                    AccelerationRepository.PAYMENT_TYPE_WECHAT,
+                    MemberRepository.PAYMENT_TYPE_WECHAT,
                     orderEntity?.setMenuName ?: "",
                     orderEntity?.paymentAmount ?: "",
-                    AccelerationRepository.RECHARGE_RESULT_SUCCESS
+                    MemberRepository.RECHARGE_RESULT_SUCCESS
                 )
             }, {
                 // 支付失败
                 EventBus.getDefault().post(EBPayState.PayFail)
                 SensorsBridge.trackMemberRechargeResult(
-                    AccelerationRepository.PAYMENT_TYPE_WECHAT,
+                    MemberRepository.PAYMENT_TYPE_WECHAT,
                     orderEntity?.setMenuName ?: "",
                     orderEntity?.paymentAmount ?: "",
-                    AccelerationRepository.RECHARGE_RESULT_FAILURE
+                    MemberRepository.RECHARGE_RESULT_FAILURE
                 )
             })
     }

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

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

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

@@ -13,6 +13,7 @@ import com.therouter.TheRouter;
 import com.gh.ad.AdDelegateHelper;
 import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.common.constant.Constants;
+import com.gh.gamecenter.common.constant.RouteConsts;
 import com.gh.gamecenter.common.exposure.meta.MetaUtil;
 import com.gh.gamecenter.common.retrofit.BiResponse;
 import com.gh.gamecenter.common.utils.SensorsBridge;
@@ -111,6 +112,7 @@ public class DataUtils {
             try {
                 HaloApp.getInstance().getContentResolver().insert(Uri.parse("content://com.gh.gamecenter.provider/device"), values);
             } catch (Exception exception) {
+                SentryHelper.INSTANCE.onEvent("DEVICE_INSERT_ERROR", "exception_digest", exception.getLocalizedMessage());
                 exception.printStackTrace();
             }
         });
@@ -148,7 +150,6 @@ public class DataUtils {
     /**
      * 获取应用 gid 绑定的实名信息
      */
-    // TODO 这个方法启动时会被调用多次，后面考虑优化优化
     @SuppressLint("CheckResult")
     public static void getDeviceCertification(String gid) {
         RetrofitManager.getInstance()
@@ -195,6 +196,7 @@ public class DataUtils {
                             // TODO 将 com.gh.gamecenter 改成 BuildConfig.ApplicationID
                             HaloApp.getInstance().getContentResolver().insert(Uri.parse("content://com.gh.gamecenter.provider/certification"), values);
                         } catch (Exception exception) {
+                            SentryHelper.INSTANCE.onEvent("CERTIFICATION_INSERT_ERROR", "exception_digest", exception.getLocalizedMessage());
                             exception.printStackTrace();
                         }
                     }

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

@@ -5,6 +5,8 @@ import android.text.TextUtils;
 import android.view.View;
 import android.widget.TextView;
 
+import androidx.constraintlayout.widget.ConstraintLayout;
+
 import com.gh.common.filter.RegionSetting;
 import com.gh.common.filter.RegionSettingHelper;
 import com.gh.common.repository.ReservationRepository;
@@ -53,10 +55,11 @@ public class DetailDownloadUtils {
         if (viewHolder.getMultiVersionDownloadTv() != null) {
             viewHolder.getMultiVersionDownloadTv().setVisibility(View.GONE);
         }
+        if (viewHolder.getSpeedContainer() != null) {
+            viewHolder.getSpeedContainer().setVisibility(View.GONE);
+        }
 
         viewHolder.setSpeedViewsVisible(false);
-        // 默认为显示状态
-        viewHolder.getDownloadPb().setVisibility(View.VISIBLE);
 
         // 根据预置的配置更新 ViewHolder 的状态 (譬如青少年模式、下载内容为空等)
         if (updateViewHolderWithPredefinedConfig(viewHolder, gameEntity)) {
@@ -102,9 +105,9 @@ public class DetailDownloadUtils {
                     viewHolder.getLocalDownloadContainer().setVisibility(View.VISIBLE);
                 }
 
-                // 1.畅玩未安装/当前游戏配置了加速，且当前下载的默认类型为"普通下载"，且用户未安装时，禁用双按钮，禁用畅玩
-                if ((!VHelper.isInstalled(gameEntity.getUniquePackageName())
-                        && !PackagesManager.isInstalled(gameEntity.getUniquePackageName()) || gameEntity.getCanSpeed())
+                // 畅玩未安装，且当前下载的默认类型为"普通下载"，且用户未安装时，禁用双按钮，禁用畅玩
+                if (!VHelper.isInstalled(gameEntity.getUniquePackageName())
+                        && !PackagesManager.isInstalled(gameEntity.getUniquePackageName())
                         && downloadEntity != null
                         && ExtensionsKt.isLocalDownloadInDualDownloadMode(downloadEntity)
                 ) {
@@ -112,22 +115,8 @@ public class DetailDownloadUtils {
                     if (viewHolder.getOverlayTv() != null) {
                         viewHolder.getOverlayTv().setVisibility(View.GONE);
                     }
-                    // 此时需要将 本地占位按钮样式改成单条样式
-                    if (viewHolder.getLocalDownloadContainer() != null) {
-                        viewHolder.getLocalDownloadContainer().setBackgroundResource(com.gh.gamecenter.common.R.drawable.bg_common_button_fill_gradient_blue);
-                    }
-                    if (viewHolder.getLocalDownloadTitleTv() != null) {
-                        viewHolder.getLocalDownloadTitleTv().setTextColor(ExtensionsKt.toColor(com.gh.gamecenter.common.R.color.text_aw_primary, viewHolder.getContext()));
-                    }
                 } else {
                     viewHolder.getDownloadPb().setVisibility(View.VISIBLE);
-                    // 将占位按钮样式恢复成左半边样式
-                    if (viewHolder.getLocalDownloadContainer() != null) {
-                        viewHolder.getLocalDownloadContainer().setBackgroundResource(com.gh.gamecenter.common.R.drawable.bg_common_button_light_fill_blue);
-                    }
-                    if (viewHolder.getLocalDownloadTitleTv() != null) {
-                        viewHolder.getLocalDownloadTitleTv().setTextColor(ExtensionsKt.toColor(com.gh.gamecenter.common.R.color.text_theme, viewHolder.getContext()));
-                    }
                 }
             }
 
@@ -154,11 +143,6 @@ public class DetailDownloadUtils {
                     showDualDownloadButton,
                     downloadEntity
             );
-            if (downloadEntity != null && downloadEntity.getStatus() != DownloadStatus.done) {
-                // 如果存在未完成的任务，则不显示加速按钮
-            } else {
-                viewHolder.checkIfShowSpeedUi(showVGame, showDualDownloadButton);
-            }
         } else {
             // 游戏包含多 APK 的情况
             viewHolder.getMultiVersionDownloadTv().setText("选择下载你的版本" + (TextUtils.isEmpty(downloadAddWord) ? "" : "-" + downloadAddWord));
@@ -270,22 +254,30 @@ public class DetailDownloadUtils {
                 }
             }
         } else {
+            boolean isLaunchState = false;
             // 非畅玩，显示为普通游戏
             if (context.getString(com.gh.gamecenter.feature.R.string.pluggable).equals(rawBtnText)) {
                 downloadButton.setButtonStyle(DownloadButton.ButtonStyle.PLUGIN);
             } else if (context.getString(com.gh.gamecenter.feature.R.string.launch).equals(rawBtnText)) {
                 downloadButton.setButtonStyle(DownloadButton.ButtonStyle.LAUNCH_OR_OPEN);
+                isLaunchState = true;
             } else if (context.getString(com.gh.gamecenter.feature.R.string.install).equals(rawBtnText)) {
                 downloadButton.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_NORMAL);
             } else {
                 downloadButton.setButtonStyle(DownloadButton.ButtonStyle.NORMAL);
             }
+            // 只有下载按钮状态为 “启动” 时，才需要展示加速ui
+            if (isLaunchState) {
+                viewHolder.showAcceleratorGuideLayer();
+            } else {
+                viewHolder.hideSpeedUi();
+            }
 
             if (showDualDownloadButton && viewHolder.getLocalDownloadSizeTv() != null) {
                 viewHolder.getLocalDownloadSizeTv().setVisibility(View.GONE);
                 String size = viewHolder.getGameEntity().getApk().isEmpty() ? "" : viewHolder.getGameEntity().getApk().get(0).getSize();
                 if (size != null) {
-                    String sizeWithoutDigit = convertSizeString(size);
+                    String sizeWithoutDigit = size.replaceAll("(?<=\\d)\\.[0-9]+(?!\\d)", "");
                     viewHolder.getLocalDownloadSizeTv().setText(sizeWithoutDigit);
                 }
 
@@ -625,30 +617,6 @@ public class DetailDownloadUtils {
         return (int) Math.ceil(downloadEntity.getPercent());
     }
 
-    public static String convertSizeString(String sizeString) {
-        String numberPart;
-        String indicator;
-
-        // Check if the string ends with "MB"
-        if (sizeString.endsWith("MB")) {
-            numberPart = sizeString.substring(0, sizeString.length() - 2);
-            indicator = "MB";
-        } else if (sizeString.endsWith("G")) {
-            numberPart = sizeString.substring(0, sizeString.length() - 1);
-            indicator = "G";
-        } else {
-            return sizeString;
-        }
-
-        // Round number
-        double number = Double.parseDouble(numberPart);
-        long roundedNumber = Math.round(number);
-
-        // Combine rounded number and size indicator
-        return roundedNumber + indicator;
-    }
-
-
     private static boolean handleDownloadButtonAsXapk(DownloadEntity downloadEntity, DownloadButton downloadButton) {
         String xapkStatus = downloadEntity.getMeta().get(XapkInstaller.XAPK_UNZIP_STATUS);
 

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

@@ -18,7 +18,6 @@ import com.gh.common.exposure.ExposureTraceUtils.appendTrace
 import com.gh.common.util.EntranceUtils.jumpActivity
 import com.gh.common.util.EntranceUtils.jumpActivityCompat
 import com.gh.gamecenter.*
-import com.gh.gamecenter.ShellActivity.Type
 import com.gh.gamecenter.amway.AmwayActivity
 import com.gh.gamecenter.category2.CategoryV2Activity
 import com.gh.gamecenter.common.base.activity.BaseActivity
@@ -56,7 +55,6 @@ import com.gh.gamecenter.gamecollection.detail.GameCollectionDetailActivity
 import com.gh.gamecenter.gamecollection.hotlist.GameCollectionHotListActivity
 import com.gh.gamecenter.gamecollection.hotlist.GameCollectionListDetailActivity
 import com.gh.gamecenter.gamecollection.square.GameCollectionSquareActivity
-import com.gh.gamecenter.gamedetail.entity.GameDetailTabEntity
 import com.gh.gamecenter.gamedetail.fuli.kaifu.ServersCalendarActivity
 import com.gh.gamecenter.gamedetail.fuli.kaifu.ServersSubscribedGameListActivity
 import com.gh.gamecenter.gamedetail.history.HistoryApkListActivity
@@ -195,8 +193,6 @@ object DirectUtils {
         "simulator",
         "teen_mode",
         "message_center",
-        "archive",
-        "my_assets",
     )
 
     fun directToLinkPage(
@@ -617,10 +613,6 @@ object DirectUtils {
 
             "message_center" -> directToMessageCenter(0, entrance)
 
-            "archive" -> directToCloudArchive(context, linkEntity.link ?: "", linkEntity.text ?: "", "", entrance)
-
-            "my_assets" -> navigateToMyAssetsPage(context, entrance)
-
             "" -> {
                 // do nothing
             }
@@ -854,42 +846,33 @@ object DirectUtils {
         entrance: String? = null,
         autoDownload: Boolean? = null,
         tab: String? = "",
-        traceEvent: ExposureEvent? = null,
-        from: String? = null
+        traceEvent: ExposureEvent? = null
     ) {
         if (id.isEmpty()) return
-
-        val uri = Uri.Builder()
-            .path(RouteConsts.activity.gameDetailActivity)
-            .appendQueryParameter(KEY_ENTRANCE, entrance)
-            .appendQueryParameter(KEY_GAME_ID, id)
-            .appendQueryParameter(KEY_FROM, from)
-            .build()
-
-        TheRouter
-            .build(uri.toString())
-            .fillParams { bundle ->
-                if (!TextUtils.isEmpty(tab)) {
-                    when (tab) {
-                        "comment" -> bundle.putString(KEY_TARGET, GameDetailTabEntity.TYPE_COMMENT)
-                        "desc" -> bundle.putString(KEY_TARGET, GameDetailTabEntity.TYPE_DETAIL)
-                        "forum" -> bundle.putString(KEY_TARGET, GameDetailTabEntity.TYPE_BBS)
-                        "zone" -> bundle.putString(KEY_TARGET, GameDetailTabEntity.TYPE_ZONE)
-                    }
-                }
-                if (traceEvent != null) {
-                    val clickEvent = createEvent(
-                        GameEntity(id = id, name = name),
-                        traceEvent.source,
-                        appendTrace(traceEvent),
-                        ExposureType.CLICK
-                    )
-                    log(clickEvent)
-                    bundle.putParcelable(KEY_TRACE_EVENT, clickEvent)
-                }
-                bundle.putBoolean(KEY_AUTO_DOWNLOAD, autoDownload ?: false)
+        val bundle = Bundle()
+        bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
+        bundle.putString(KEY_TO, GameDetailActivity::class.java.simpleName)
+        bundle.putString(KEY_GAMEID, id)
+        if (!TextUtils.isEmpty(tab)) {
+            when (tab) {
+                "comment" -> bundle.putString(KEY_TARGET, EntranceConsts.TAB_TYPE_RATING)
+                "desc" -> bundle.putString(KEY_TARGET, EntranceConsts.TAB_TYPE_DESC)
+                "forum" -> bundle.putString(KEY_TARGET, EntranceConsts.TAB_TYPE_BBS)
+                "zone" -> bundle.putString(KEY_TARGET, EntranceConsts.TAB_TYPE_TRENDS)
             }
-            .navigation(context)
+        }
+        if (traceEvent != null) {
+            val clickEvent = createEvent(
+                GameEntity(id = id, name = name),
+                traceEvent.source,
+                appendTrace(traceEvent),
+                ExposureType.CLICK
+            )
+            log(clickEvent)
+            bundle.putParcelable(KEY_TRACE_EVENT, clickEvent)
+        }
+        bundle.putBoolean(KEY_AUTO_DOWNLOAD, autoDownload ?: false)
+        jumpActivity(context, bundle)
     }
 
     /**
@@ -920,7 +903,7 @@ object DirectUtils {
         bundle.putString(KEY_ENTRANCE, entrance)
         bundle.putString(KEY_GAMEID, id)
         bundle.putBoolean(KEY_OPEN_VIDEO_STREAMING, true)
-        bundle.putString(KEY_TARGET, GameDetailTabEntity.TYPE_DETAIL)
+        bundle.putString(KEY_TARGET, EntranceConsts.TAB_TYPE_DESC)
         jumpActivity(context, bundle)
     }
 
@@ -928,21 +911,15 @@ object DirectUtils {
     fun directToGameDetail(
         context: Context,
         id: String,
-        defaultTab: String = GameDetailTabEntity.TYPE_DETAIL,
+        defaultTab: String = EntranceConsts.TAB_TYPE_DESC,
         entrance: String? = null
     ) {
-        val uri = Uri.Builder()
-            .path(RouteConsts.activity.gameDetailActivity)
-            .appendQueryParameter(KEY_ENTRANCE, entrance)
-            .appendQueryParameter(KEY_GAME_ID, id)
-            .build()
-
-        TheRouter
-            .build(uri.toString())
-            .fillParams { bundle ->
-                bundle.putString(KEY_TARGET, defaultTab)
-            }
-            .navigation(context)
+        val bundle = Bundle()
+        bundle.putString(KEY_TO, GameDetailActivity::class.java.name)
+        bundle.putString(KEY_ENTRANCE, entrance)
+        bundle.putString(KEY_GAMEID, id)
+        bundle.putString(KEY_TARGET, defaultTab)
+        jumpActivity(context, bundle)
     }
 
     // 专栏
@@ -1130,15 +1107,9 @@ object DirectUtils {
 
     @JvmStatic
     fun directToWebView(context: Context, url: String, entrance: String? = null) {
-        directToWebView(context, url, entrance, null)
-    }
-
-    @JvmStatic
-    fun directToWebView(context: Context, url: String, entrance: String? = null, title: String? = null) {
         if (url.isEmpty()) return
         val bundle = Bundle()
         bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
-        bundle.putString(EntranceConsts.KEY_GAMENAME, title)
         if (url.contains("android_page_type=singleton")) {
             bundle.putString(KEY_TO, SingletonWebActivity::class.java.simpleName)
         } else {
@@ -1534,8 +1505,8 @@ object DirectUtils {
         if (categoryId.isEmpty()) return
         val bundle = Bundle()
         bundle.putString(KEY_TO, CategoryV2Activity::class.java.name)
-        bundle.putString(KEY_PAGE_ID, categoryId)
-        bundle.putString(KEY_PAGE_NAME, categoryTitle)
+        bundle.putString(KEY_CATEGORY_ID, categoryId)
+        bundle.putString(KEY_CATEGORY_TITLE, categoryTitle)
         bundle.putString(KEY_ENTRANCE, BaseActivity.mergeEntranceAndPath(entrance, path))
         if (exposureEvent != null) bundle.putParcelableArrayList(
             KEY_EXPOSURE_SOURCE_LIST,
@@ -1598,7 +1569,7 @@ object DirectUtils {
                     response?.apply {
                         if (zone.status == "on") {
                             if (zone.style == "link") {
-                                directToGameDetail(context, gameId, GameDetailTabEntity.TYPE_ZONE, entrance)
+                                directToGameDetail(context, gameId, EntranceConsts.TAB_TYPE_TRENDS, entrance)
                             } else {
                                 directToWebView(context, url, entrance)
                             }
@@ -1711,7 +1682,7 @@ object DirectUtils {
     fun directToHelpAndFeedback(context: Context, bundle: Bundle? = null) {
         TheRouter.build(RouteConsts.activity.helpAndFeedbackActivity)
             .fillParams {
-                bundle?.run { it.putAll(this) }
+                it.putAll(bundle)
             }
             .navigation(context)
     }
@@ -2323,32 +2294,4 @@ object DirectUtils {
             .withBoolean(KEY_DISPLAY_TYPE, isLogoutStyle)
             .navigation()
     }
-
-    // 跳转云存档详情页
-    @JvmStatic
-    fun directToCloudArchive(
-        context: Context,
-        gameId: String,
-        gameName: String,
-        configUrl: String = "",
-        entrance: String = ""
-    ) {
-        val bundle = Bundle()
-        val gameEntity = GameEntity(id = gameId, name = gameName)
-        bundle.putParcelable(KEY_GAME_ENTITY, gameEntity)
-        bundle.putString(KEY_ARCHIVE_CONFIG_URL, configUrl)
-        bundle.putString(KEY_ENTRANCE, entrance)
-        bundle.putBoolean(KEY_USE_ALTERNATIVE_LAYOUT, true)
-        context.startActivity(ShellActivity.getIntent(context, Type.CLOUD_ARCHIVE, bundle))
-    }
-
-    @JvmStatic
-    fun navigateToMyAssetsPage(context: Context, entrance: String?) {
-        if (CheckLoginUtils.isLogin()) {
-            TheRouter.build(RouteConsts.activity.myAssetsActivity).navigation(context)
-        } else {
-            CheckLoginUtils.checkLogin(context, entrance, null)
-        }
-
-    }
 }

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

@@ -2,9 +2,10 @@ package com.gh.common.util
 
 import android.content.Context
 import android.os.Build
+import com.gh.gamecenter.R
 import com.gh.gamecenter.common.utils.DialogHelper
 import com.gh.gamecenter.common.utils.SensorsBridge
-import com.gh.gamecenter.common.utils.replaceLineBreakWithBr
+import com.gh.gamecenter.common.utils.toResString
 import com.gh.gamecenter.core.utils.EmptyCallback
 import com.gh.gamecenter.feature.entity.ApkEntity
 import com.gh.gamecenter.feature.entity.GameEntity
@@ -31,7 +32,7 @@ object DownloadDialogHelper {
             DialogHelper.showDialogWithHtmlContent(
                 context,
                 dialog.title,
-                dialog.content.replaceLineBreakWithBr(),
+                dialog.content,
                 "继续下载",
                 "取消",
                 confirmClickCallback = {
@@ -58,8 +59,7 @@ object DownloadDialogHelper {
                         gameName = gameEntity.name ?: "",
                         gameType = gameEntity.categoryChinese
                     )
-                },
-                extraConfig = DialogHelper.Config(centerTitle = true)
+                }
             )
         } else {
             callback.onCallback()

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

@@ -61,7 +61,7 @@ object DownloadItemUtils {
         gameEntity: GameEntity,
         downloadEntity: DownloadEntity,
         adapter: RecyclerView.Adapter<out RecyclerView.ViewHolder?>?,
-        index: Int,
+        index: Int
     ) {
         if (gameEntity.id != downloadEntity.gameId) {
             adapter?.notifyItemChanged(index)
@@ -139,7 +139,7 @@ object DownloadItemUtils {
         context: Context,
         gameEntity: GameEntity,
         holder: GameViewHolder,
-        hideDownloadBtnIfNoAvailableContent: Boolean,
+        hideDownloadBtnIfNoAvailableContent: Boolean
     ) {
         updateItem(
             context = context,
@@ -155,7 +155,7 @@ object DownloadItemUtils {
         context: Context,
         gameEntity: GameEntity,
         holder: GameViewHolder,
-        briefStyle: String?,
+        briefStyle: String?
     ) {
         updateItem(
             context = context,
@@ -176,8 +176,7 @@ object DownloadItemUtils {
         pluginLocation: PluginLocation? = PluginLocation.only_game,
         hideDownloadBtnIfNoAvailableContent: Boolean = false,
         briefStyle: String? = null,
-        isShowRecommendStar: Boolean = false,
-        listener: DownloadButton.OnUpdateListener? = null,
+        isShowRecommendStar: Boolean = false
     ) {
         holder.gameDownloadBtn.putObject(gameEntity)
 
@@ -190,8 +189,7 @@ object DownloadItemUtils {
                 holder.gameDownloadBtn,
                 gameEntity,
                 hideDownloadBtnIfNoAvailableContent,
-                pluginLocation,
-                listener
+                pluginLocation
             )
             return
         }
@@ -212,8 +210,7 @@ object DownloadItemUtils {
             holder.gameDownloadBtn,
             gameEntity,
             hideDownloadBtnIfNoAvailableContent,
-            pluginLocation,
-            listener
+            pluginLocation
         )
     }
 
@@ -222,8 +219,7 @@ object DownloadItemUtils {
         downloadBtn: DownloadButton,
         gameEntity: GameEntity,
         hideDownloadBtnIfNoAvailableContent: Boolean = false,
-        pluginLocation: PluginLocation? = PluginLocation.only_game,
-        listener: DownloadButton.OnUpdateListener?,
+        pluginLocation: PluginLocation? = PluginLocation.only_game
     ) {
         // 控制是否显示下载按钮
         downloadBtn.goneIf(context.getString(R.string.app_name) == gameEntity.name)
@@ -231,7 +227,6 @@ object DownloadItemUtils {
         if (SPUtils.getBoolean(Constants.SP_TEENAGER_MODE) || gameEntity.isSpecialDownload()) {
             downloadBtn.text = "查看"
             downloadBtn.buttonStyle = DownloadButton.ButtonStyle.TEENAGER_MODE
-            listener?.completion(downloadBtn.text)
             return
         }
         if (gameEntity.isReservable) {
@@ -244,7 +239,6 @@ object DownloadItemUtils {
                     buttonStyle = DownloadButton.ButtonStyle.RESERVED
                 }
             }
-            listener?.completion(downloadBtn.text)
             return
         }
         if (RegionSettingHelper.getGameH5DownloadByGameId(gameEntity.id) != null) {
@@ -254,7 +248,6 @@ object DownloadItemUtils {
                 setBackgroundResource(com.gh.gamecenter.common.R.drawable.download_button_normal_style)
                 setTextColor(com.gh.gamecenter.common.R.color.white.toColor(context))
             }
-            listener?.completion(downloadBtn.text)
             return
         }
         if (gameEntity.isMiniGame()) {
@@ -272,7 +265,6 @@ object DownloadItemUtils {
                     text = context.getString(com.gh.gamecenter.feature.R.string.quick_play)
                 }
             }
-            listener?.completion(downloadBtn.text)
             return
         }
         if (gameEntity.getApk().isEmpty() || gameEntity.downloadOffStatus != null) {
@@ -304,7 +296,6 @@ object DownloadItemUtils {
                     downloadBtn.isClickable = false
                 }
             }
-            listener?.completion(downloadBtn.text)
         } else if (gameEntity.getApk().size == 1) {
             // 来自于下载管理的实体快照
             val entityFromDownloadManager = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity)
@@ -363,60 +354,43 @@ object DownloadItemUtils {
                 downloadBtn.apply {
                     when (downloadEntity.status) {
                         DownloadStatus.done -> {
-                            val xapkStatus = downloadEntity.meta[XapkInstaller.XAPK_UNZIP_STATUS]
-                            when {
-                                downloadEntity.isSimulatorGame() && gameEntity.simulator != null -> {
-                                    GameUtils.setDownloadBtnStatus(
-                                        context,
-                                        gameEntity,
-                                        downloadBtn,
-                                        pluginLocation,
-                                        listener
-                                    )
-                                }
-
-                                isVGamePreferred -> {
-                                    buttonStyle =
-                                        if (PackagesManager.isCanUpdate(
-                                                downloadEntity.gameId,
-                                                downloadEntity.packageName,
-                                                asVGame = true
-                                            )
-                                        ) {
-                                            setText(com.gh.gamecenter.feature.R.string.update)
-                                            DownloadButton.ButtonStyle.NORMAL
-                                        } else {
-                                            setText(com.gh.gamecenter.feature.R.string.launch)
-                                            DownloadButton.ButtonStyle.LAUNCH_OR_OPEN
-                                        }
-                                    listener?.completion(downloadBtn.text)
-                                }
-
-                                XapkUnzipStatus.SUCCESS.name == xapkStatus && isInstalling(downloadEntity.path) -> {
+                            if (downloadEntity.isSimulatorGame() && gameEntity.simulator != null) {
+                                GameUtils.setDownloadBtnStatus(context, gameEntity, downloadBtn, pluginLocation)
+                            } else if (isVGamePreferred) {
+                                buttonStyle =
+                                    if (PackagesManager.isCanUpdate(
+                                            downloadEntity.gameId,
+                                            downloadEntity.packageName,
+                                            asVGame = true
+                                        )
+                                    ) {
+                                        setText(com.gh.gamecenter.feature.R.string.update)
+                                        DownloadButton.ButtonStyle.NORMAL
+                                    } else {
+                                        setText(com.gh.gamecenter.feature.R.string.launch)
+                                        DownloadButton.ButtonStyle.LAUNCH_OR_OPEN
+                                    }
+                            } else {
+                                val xapkStatus = downloadEntity.meta[XapkInstaller.XAPK_UNZIP_STATUS]
+                                if (XapkUnzipStatus.SUCCESS.name == xapkStatus && isInstalling(downloadEntity.path)) {
                                     progress = 100
                                     setText(com.gh.gamecenter.feature.R.string.installing)
                                     buttonStyle = DownloadButton.ButtonStyle.INSTALL_NORMAL
-                                    listener?.completion(downloadBtn.text)
                                     return
                                 }
-
-                                XapkUnzipStatus.UNZIPPING.name == xapkStatus -> {
+                                if (XapkUnzipStatus.UNZIPPING.name == xapkStatus) {
                                     val percent = downloadEntity.meta[XapkInstaller.XAPK_UNZIP_PERCENT]
                                     progress = (java.lang.Float.valueOf(percent) * 10).toInt()
                                     text = "$percent%"
                                     buttonStyle = DownloadButton.ButtonStyle.XAPK_UNZIPPING
-                                    listener?.completion(downloadBtn.text)
                                     return
-                                }
-
-                                XapkUnzipStatus.FAILURE.name == xapkStatus -> {
+                                } else if (XapkUnzipStatus.FAILURE.name == xapkStatus) {
                                     setText(com.gh.gamecenter.feature.R.string.install)
                                     buttonStyle = DownloadButton.ButtonStyle.INSTALL_NORMAL
-                                    listener?.completion(downloadBtn.text)
                                     return
                                 }
 
-                                PackagesManager.isInstalled(downloadEntity.packageName) && !downloadEntity.isUpdate -> {
+                                if (PackagesManager.isInstalled(downloadEntity.packageName) && !downloadEntity.isUpdate) {
                                     // 双下载按钮快速安装时存在已下载的安装包过时，需要重新下载的情况
                                     if (PackagesManager.isCanUpdate(
                                             downloadEntity.gameId,
@@ -429,13 +403,9 @@ object DownloadItemUtils {
                                         buttonStyle = DownloadButton.ButtonStyle.LAUNCH_OR_OPEN
                                         setText(com.gh.gamecenter.feature.R.string.launch)
                                     }
-                                    listener?.completion(downloadBtn.text)
-                                }
-
-                                else -> {
+                                } else {
                                     buttonStyle = DownloadButton.ButtonStyle.INSTALL_NORMAL
                                     setText(com.gh.gamecenter.feature.R.string.install)
-                                    listener?.completion(downloadBtn.text)
                                 }
                             }
                             buttonStyle =
@@ -452,28 +422,25 @@ object DownloadItemUtils {
                         DownloadStatus.subscribe,
                         DownloadStatus.diskisfull,
                         DownloadStatus.diskioerror,
-                        DownloadStatus.overflow,
-                            -> {
+                        DownloadStatus.overflow -> {
                             buttonStyle = DownloadButton.ButtonStyle.NORMAL
                             setText(com.gh.gamecenter.feature.R.string.resume)
-                            listener?.completion(downloadBtn.text)
                         }
 
                         DownloadStatus.cancel -> {
-                            GameUtils.setDownloadBtnStatus(context, gameEntity, downloadBtn, pluginLocation, listener)
+                            GameUtils.setDownloadBtnStatus(context, gameEntity, downloadBtn, pluginLocation)
                         }
 
                         else -> {
                             // do nothing
-                            listener?.completion(downloadBtn.text)
                         }
                     }
                 }
             } else {
-                GameUtils.setDownloadBtnStatus(context, gameEntity, downloadBtn, pluginLocation, listener)
+                GameUtils.setDownloadBtnStatus(context, gameEntity, downloadBtn, pluginLocation)
             }
         } else {
-            GameUtils.setDownloadBtnStatus(context, gameEntity, downloadBtn, pluginLocation, listener)
+            GameUtils.setDownloadBtnStatus(context, gameEntity, downloadBtn, pluginLocation)
         }
     }
 
@@ -483,7 +450,7 @@ object DownloadItemUtils {
         holder: GameViewHolder,
         gameEntity: GameEntity,
         briefStyle: String?,
-        isShowRecommendStar: Boolean = false,
+        isShowRecommendStar: Boolean = false
     ) {
         updateItemViewStatus(holder, briefStyle, gameEntity.columnRecommend, isShowRecommendStar)
         val downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity)
@@ -508,7 +475,7 @@ object DownloadItemUtils {
         holder: GameViewHolder,
         gameEntity: GameEntity,
         briefStyle: String?,
-        isShowRecommendStar: Boolean = false,
+        isShowRecommendStar: Boolean = false
     ) {
         val entryMap = gameEntity.getEntryMap()
         var downloadEntity: DownloadEntity? = null
@@ -536,30 +503,23 @@ object DownloadItemUtils {
         context: Context,
         holder: GameViewHolder,
         downloadEntity: DownloadEntity,
-        isMultiVersion: Boolean = false,
+        isMultiVersion: Boolean = false
     ) {
         when (downloadEntity.status) {
             DownloadStatus.redirected,
-            DownloadStatus.downloading,
-                -> {
+            DownloadStatus.downloading -> {
                 if (isMultiVersion) {
                     holder.gameDownloadBtn.buttonStyle = DownloadButton.ButtonStyle.NORMAL
-                    val darkMode =
-                        (holder.gameDownloadTips?.getTag(com.gh.gamecenter.common.R.string.is_dark_mode_on_id) as? Boolean)
-                            ?: false
+                    val darkMode = (holder.gameDownloadTips?.getTag(com.gh.gamecenter.common.R.string.is_dark_mode_on_id) as? Boolean) ?: false
                     val isDarkModeChanged = DarkModeUtils.isDarkModeOn(context) != darkMode
                     if (holder.gameDownloadTips?.visibility == View.GONE || holder.gameDownloadTips?.isAnimating == false || isDarkModeChanged) {
                         holder.gameDownloadTips?.visibility = View.VISIBLE
                         holder.gameDownloadTips?.setDownloadTipsAnimation(true)
                     }
-                    holder.gameDownloadTips?.setTag(
-                        com.gh.gamecenter.common.R.string.is_dark_mode_on_id,
-                        DarkModeUtils.isDarkModeOn(context)
-                    )
+                    holder.gameDownloadTips?.setTag(com.gh.gamecenter.common.R.string.is_dark_mode_on_id, DarkModeUtils.isDarkModeOn(context))
                 } else {
                     holder.gameDownloadTips?.visibility = View.GONE
-                    holder.gameDownloadBtn.buttonStyle =
-                        DownloadButton.ButtonStyle.DOWNLOADING_NORMAL
+                    holder.gameDownloadBtn.buttonStyle = DownloadButton.ButtonStyle.DOWNLOADING_NORMAL
                     holder.gameDownloadBtn.progress = (downloadEntity.percent * 10).toInt()
                     holder.gameDownloadBtn.text = downloadEntity.percent.toString() + "%"
                 }
@@ -580,15 +540,13 @@ object DownloadItemUtils {
             DownloadStatus.diskioerror,
             DownloadStatus.diskisfull,
             DownloadStatus.subscribe,
-            DownloadStatus.overflow,
-                -> {
+            DownloadStatus.overflow -> {
                 if (isMultiVersion) {
                     holder.gameDownloadTips?.visibility = View.VISIBLE
                     holder.gameDownloadTips?.setDownloadTipsAnimation(false)
                 }
                 holder.gameDownloadBtn.buttonStyle = DownloadButton.ButtonStyle.NORMAL
-                holder.gameDownloadBtn.text =
-                    context.getString(com.gh.gamecenter.feature.R.string.resume)
+                holder.gameDownloadBtn.text = context.getString(com.gh.gamecenter.feature.R.string.resume)
             }
 
             DownloadStatus.done -> {
@@ -621,7 +579,7 @@ object DownloadItemUtils {
         holder: GameViewHolder,
         briefStyle: String?,
         recommendStyle: LinkEntity?,
-        isShowRecommendStar: Boolean = false,
+        isShowRecommendStar: Boolean = false
     ) {
         holder.gameDownloadTips?.visibility = View.GONE
         // 推荐指数优先，现暂时为游戏单详情列表游戏使用
@@ -660,11 +618,7 @@ object DownloadItemUtils {
         }
 
         // 缺省情况下回落到游戏简介
-        if (TextUtils.isEmpty(briefStyle)
-            || briefStyle!!.contains("brief")
-            || briefStyle.contains("recommend")
-            || briefStyle.contains("test&appointment")
-        ) {
+        if (TextUtils.isEmpty(briefStyle) || briefStyle!!.contains("brief") || briefStyle.contains("recommend")) {
             holder.gameDes?.visibility = View.VISIBLE
         } else {
             holder.gameDes?.visibility = View.GONE
@@ -680,7 +634,7 @@ object DownloadItemUtils {
         adapter: RecyclerView.Adapter<out RecyclerView.ViewHolder?>?,
         entrance: String,
         location: String,
-        sourceEntrance: String = "其他",
+        sourceEntrance: String = "其他"
     ) {
         setOnClickListener(
             context,
@@ -769,7 +723,7 @@ object DownloadItemUtils {
         traceEvent: ExposureEvent?,
         clickCallback: EmptyCallback?,
         refreshCallback: EmptyCallback?,
-        allStateClickCallback: EmptyCallback?,
+        allStateClickCallback: EmptyCallback?
     ) {
         // 为 downloadButton 添加游戏实体，供点击的时候上报用
         downloadBtn.putObject(gameEntity)
@@ -1005,10 +959,9 @@ object DownloadItemUtils {
         entrance: String,
         location: String,
         traceEvent: ExposureEvent? = null,
-        refreshCallback: EmptyCallback? = null,
+        refreshCallback: EmptyCallback? = null
     ) {
-        val str =
-            if (downloadBtn is DownloadButton) downloadBtn.text else context.getString(com.gh.gamecenter.feature.R.string.download)
+        val str = if (downloadBtn is DownloadButton) downloadBtn.text else context.getString(com.gh.gamecenter.feature.R.string.download)
         if (gameEntity.getApk().isEmpty()) return
         val apk = gameEntity.getApk().safelyGetInRelease(0) ?: return
 
@@ -1027,16 +980,7 @@ object DownloadItemUtils {
                 addHandler(CheckDownloadHandler())
             }
                 .setProcessEndCallback(gameEntity.id) { asVGame, isSubscribe ->
-                    download(
-                        context,
-                        gameEntity,
-                        downloadBtn,
-                        entrance,
-                        location,
-                        asVGame,
-                        isSubscribe as Boolean,
-                        traceEvent
-                    )
+                    download(context, gameEntity, downloadBtn, entrance, location, asVGame, isSubscribe as Boolean, traceEvent)
                 }
                 .buildHandlerChain()
                 ?.handleRequest(context, gameEntity, shouldPerformAsVGame)
@@ -1055,16 +999,7 @@ object DownloadItemUtils {
                 addHandler(CheckDownloadHandler())
             }
                 .setProcessEndCallback(gameEntity.id) { asVGame, isSubscribe ->
-                    download(
-                        context,
-                        gameEntity,
-                        downloadBtn,
-                        entrance,
-                        location,
-                        asVGame,
-                        isSubscribe as Boolean,
-                        traceEvent
-                    )
+                    download(context, gameEntity, downloadBtn, entrance, location, asVGame, isSubscribe as Boolean, traceEvent)
                 }
                 .buildHandlerChain()
                 ?.handleRequest(context, gameEntity, shouldPerformAsVGame)
@@ -1083,16 +1018,7 @@ object DownloadItemUtils {
                 addHandler(CheckDownloadHandler())
             }
                 .setProcessEndCallback(gameEntity.id) { asVGame, isSubscribe ->
-                    download(
-                        context,
-                        gameEntity,
-                        downloadBtn,
-                        entrance,
-                        location,
-                        asVGame,
-                        isSubscribe as Boolean,
-                        traceEvent
-                    )
+                    download(context, gameEntity, downloadBtn, entrance, location, asVGame, isSubscribe as Boolean, traceEvent)
                 }
                 .buildHandlerChain()
                 ?.handleRequest(context, gameEntity, shouldPerformAsVGame)
@@ -1114,17 +1040,15 @@ object DownloadItemUtils {
             val downloadEntity = SimulatorGameManager.findDownloadEntityByUrl(apk.url)
 
             com.gh.gamecenter.common.utils.NewFlatLogUtils.logGameInstall(
-                gameId = gameEntity.id,
-                gameName = gameEntity.name ?: "",
+                gameId = downloadEntity?.gameId ?: "",
+                gameName = downloadEntity?.name ?: "",
                 trigger = "主动安装"
             )
 
             SensorsBridge.trackInstallGameClick(
-                gameId = gameEntity.id,
-                gameName = gameEntity.name ?: "",
-                action = "主动安装",
-                isDspGame = gameEntity.isDspGame,
-                dspAdId = gameEntity.dspAdId
+                gameId = downloadEntity?.gameId ?: "",
+                gameName = downloadEntity?.name ?: "",
+                action = "主动安装"
             )
 
             if (gameEntity.simulator != null) {
@@ -1250,7 +1174,7 @@ object DownloadItemUtils {
         location: String,
         asVGame: Boolean,
         isSubscribe: Boolean,
-        traceEvent: ExposureEvent?,
+        traceEvent: ExposureEvent?
     ) {
         if (gameEntity.getApk().isEmpty()) return
 
@@ -1294,7 +1218,7 @@ object DownloadItemUtils {
         entrance: String,
         location: String,
         isSubscribe: Boolean,
-        traceEvent: ExposureEvent?,
+        traceEvent: ExposureEvent?
     ) {
         val msg = FileUtils.isCanDownload(context, gameEntity.getApk().firstOrNull()?.size ?: "")
         if (TextUtils.isEmpty(msg)) {
@@ -1321,7 +1245,7 @@ object DownloadItemUtils {
         gameEntity: GameEntity,
         position: Int,
         adapter: RecyclerView.Adapter<out RecyclerView.ViewHolder?>?,
-        refreshCallback: EmptyCallback?,
+        refreshCallback: EmptyCallback?
     ) {
         val apkEntity = gameEntity.getApk().firstOrNull()
         val downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity)
@@ -1364,7 +1288,7 @@ object DownloadItemUtils {
         location: String,
         asVGame: Boolean,
         isSubscribe: Boolean,
-        traceEvent: ExposureEvent?,
+        traceEvent: ExposureEvent?
     ) {
 
         // 执行更新操作前，先清理历史下载任务，避免冲突

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

@@ -14,16 +14,15 @@ import com.gh.gamecenter.common.base.GlobalActivityManager.getLastPageEntity
 import com.gh.gamecenter.common.base.activity.BaseActivity
 import com.gh.gamecenter.common.callback.ConfirmListener
 import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.entity.LinkEntity
 import com.gh.gamecenter.common.entity.SimpleGameEntity
 import com.gh.gamecenter.common.entity.SuggestType
 import com.gh.gamecenter.common.eventbus.EBShowDialog
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.common.utils.NewFlatLogUtils
 import com.gh.gamecenter.core.utils.GsonUtils
+import com.gh.gamecenter.core.utils.MtaHelper
 import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.core.utils.ToastUtils
-import com.gh.gamecenter.dsp.DspReportHelper
 import com.gh.gamecenter.eventbus.EBDownloadStatus
 import com.gh.gamecenter.feature.entity.CustomPageTrackData
 import com.gh.gamecenter.feature.entity.GameEntity
@@ -282,10 +281,11 @@ object DownloadObserver {
 
     private fun performDownloadCompleteAction(
         downloadEntity: DownloadEntity,
-        downloadManager: DownloadManager,
+        downloadManager: DownloadManager
     ) {
         if (downloadEntity.name.contains(mApplication.getString(R.string.app_name))) {
             statDoneEvent(downloadEntity)
+            MtaHelper.onEvent("软件更新", "下载完成")
             // 会有 ActivityNotFoundException 异常，catch 掉不管了
             tryWithDefaultCatch {
                 if (Constants.SILENT_UPDATE != downloadEntity.getMetaExtra(Constants.EXTRA_DOWNLOAD_TYPE)) {
@@ -298,9 +298,7 @@ object DownloadObserver {
                     SensorsBridge.trackInstallGameClick(
                         gameName = downloadEntity.name,
                         gameId = downloadEntity.gameId,
-                        action = "自动安装",
-                        isDspGame = downloadEntity.getMetaExtra(Constants.DSP_GAME) == "true",
-                        dspAdId = downloadEntity.getMetaExtra(Constants.DSP_AD_ID)
+                        action = "自动安装"
                     )
 
                     // TODO 在 Android 11 上没有授权安装未知应用的权限前第一次调用这个方法系统会杀掉我们的进程...
@@ -397,9 +395,7 @@ object DownloadObserver {
                                     SensorsBridge.trackInstallGameClick(
                                         gameId = downloadEntity.gameId,
                                         gameName = downloadEntity.name,
-                                        action = "自动安装",
-                                        isDspGame = downloadEntity.getMetaExtra(Constants.DSP_GAME) == "true",
-                                        dspAdId = downloadEntity.getMetaExtra(Constants.DSP_AD_ID)
+                                        action = "自动安装"
                                     )
                                     PackageInstaller.install(mApplication, downloadEntity, false, ignoreAsVGame = false)
                                 }
@@ -508,8 +504,7 @@ object DownloadObserver {
                 gameVersion = downloadEntity.versionName ?: "",
                 isPlatformRecommend = isPlatformRecommend,
                 adIconActive = downloadEntity.meta[Constants.AD_ICON_ACTIVE].toBoolean(),
-                isAdData = downloadEntity.meta[Constants.IS_AD_DATA].toBoolean(),
-                downloadUrl = downloadEntity.meta[Constants.DOWNLOAD_URL]
+                isAdData = downloadEntity.meta[Constants.IS_AD_DATA].toBoolean()
             ),
             downloadEntity.platform,
             downloadEntity.exposureTrace,
@@ -561,81 +556,24 @@ object DownloadObserver {
             } else {
                 arrayOf()
             }
-
-            val pushMessageId = (HaloApp.get(Constants.PUSH_MESSAGE_ID, false) as? String) ?: ""
-            val pushLinkId = (HaloApp.get(Constants.PUSH_LINK_ENTITY, false) as? LinkEntity)?.link ?: ""
-            val isFromPush = pushMessageId.isNotEmpty()
-
-            if (downloadEntity.getMetaExtra(Constants.DSP_GAME) != "true") {
-                SensorsBridge.trackEventWithExposureSource(
-                    "DownloadProcessFinish",
-                    exposureEvent?.source,
-                    "game_id",
-                    downloadEntity.gameId,
-                    "game_name",
-                    downloadEntity.meta[Constants.GAME_NAME] ?: "",
-                    "game_type",
-                    downloadEntity.meta[Constants.GAME_CATEGORY_IN_CHINESE] ?: "",
-                    "game_label",
-                    downloadEntity.tags.joinToString(","),
-                    "game_schema_type",
-                    if (downloadEntity.getMetaExtra(Constants.KEY_BIT) == "32") "32位" else "64位",
-                    "page_name",
-                    getCurrentPageEntity().pageName,
-                    "page_id",
-                    getCurrentPageEntity().pageId,
-                    "page_business_id",
-                    getCurrentPageEntity().pageBusinessId,
-                    "last_page_name",
-                    getLastPageEntity().pageName,
-                    "last_page_id",
-                    getLastPageEntity().pageId,
-                    "last_page_business_id",
-                    getLastPageEntity().pageBusinessId,
-                    "download_status",
-                    downloadEntity.meta[Constants.DOWNLOAD_STATUS_IN_CHINESE] ?: "",
-                    "download_type",
-                    if (downloadEntity.asVGame()) "畅玩下载" else "本地下载",
-                    "is_from_push_notifications",
-                    isFromPush,
-                    "message_id",
-                    pushMessageId,
-                    "link_id",
-                    pushLinkId,
-                    *kvs
-                )
-            } else {
-                val searchContent = downloadEntity.getMetaExtra(Constants.SEARCH_KEY)
-
-                SensorsBridge.trackEventWithExposureSource(
-                    "DspAdDownloadFinish",
-                    exposureEvent?.source,
-                    "ad_id", downloadEntity.getMetaExtra(Constants.DSP_AD_ID),
-                    "search_content", searchContent,
-                    "game_column_name", downloadEntity.getMetaExtra(Constants.SUBJECT_NAME),
-                    "game_column_id", downloadEntity.getMetaExtra(Constants.SUBJECT_ID),
-                    "game_id", downloadEntity.gameId,
-                    "game_name", downloadEntity.meta[Constants.GAME_NAME] ?: "",
-                    "game_type", downloadEntity.meta[Constants.GAME_CATEGORY_IN_CHINESE] ?: "",
-                    "game_label", downloadEntity.tags.joinToString(","),
-                    "game_schema_type", if (downloadEntity.getMetaExtra(Constants.KEY_BIT) == "32") "32位" else "64位",
-                    "page_name", getCurrentPageEntity().pageName,
-                    "page_id", getCurrentPageEntity().pageId,
-                    "page_business_id", getCurrentPageEntity().pageBusinessId,
-                    "last_page_name", getLastPageEntity().pageName,
-                    "last_page_id", getLastPageEntity().pageId,
-                    "last_page_business_id", getLastPageEntity().pageBusinessId,
-                    "download_status", downloadEntity.meta[Constants.DOWNLOAD_STATUS_IN_CHINESE] ?: "",
-                    "download_type", if (downloadEntity.asVGame()) "畅玩下载" else "本地下载",
-                    "is_from_push_notifications", isFromPush,
-                    "message_id", pushMessageId,
-                    "link_id", pushLinkId,
-                    "location", if (searchContent.isEmpty()) "自定义页面" else "游戏搜索结果列表",
-                    *kvs
-                )
-
-                DspReportHelper.report(downloadEntity.getMetaExtra(Constants.DOWNLOAD_URL))
-            }
+            SensorsBridge.trackEventWithExposureSource(
+                "DownloadProcessFinish",
+                exposureEvent?.source,
+                "game_id", downloadEntity.gameId,
+                "game_name", downloadEntity.meta[Constants.GAME_NAME] ?: "",
+                "game_type", downloadEntity.meta[Constants.GAME_CATEGORY_IN_CHINESE] ?: "",
+                "game_label", downloadEntity.tags.joinToString(","),
+                "game_schema_type", if (downloadEntity.getMetaExtra(Constants.KEY_BIT) == "32") "32位" else "64位",
+                "page_name", getCurrentPageEntity().pageName,
+                "page_id", getCurrentPageEntity().pageId,
+                "page_business_id", getCurrentPageEntity().pageBusinessId,
+                "last_page_name", getLastPageEntity().pageName,
+                "last_page_id", getLastPageEntity().pageId,
+                "last_page_business_id", getLastPageEntity().pageBusinessId,
+                "download_status", downloadEntity.meta[Constants.DOWNLOAD_STATUS_IN_CHINESE] ?: "",
+                "download_type", if (downloadEntity.asVGame()) "畅玩下载" else "本地下载",
+                *kvs
+            )
         }
 
         DataCollectionUtils.uploadDownload(mApplication, downloadEntity, "完成")

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

@@ -25,10 +25,7 @@ object GameUtils {
     /**
      * 去除与重复sourceList相同的数据
      */
-    fun removeDuplicateData(
-        sourceList: MutableList<GameEntity>?,
-        rawList: MutableList<GameEntity>?
-    ): MutableList<GameEntity>? {
+    fun removeDuplicateData(sourceList: MutableList<GameEntity>?, rawList: MutableList<GameEntity>?): MutableList<GameEntity>? {
         if (sourceList.isNullOrEmpty() || rawList.isNullOrEmpty()) {
             return rawList
         }
@@ -55,8 +52,7 @@ object GameUtils {
         context: Context,
         gameEntity: GameEntity,
         downloadBtn: DownloadButton,
-        pluginLocation: PluginLocation?,
-        listener: DownloadButton.OnUpdateListener? = null
+        pluginLocation: PluginLocation?
     ) {
         // getDownloadBtnText 里包括查询数据库、根据包名读取包体 meta 信息等
         lightWeightIoExecutor.execute {
@@ -77,7 +73,6 @@ object GameUtils {
                 } else {
                     downloadBtn.buttonStyle = DownloadButton.ButtonStyle.NORMAL
                 }
-                listener?.completion(downloadBtn.text)
             }
         }
     }
@@ -90,13 +85,11 @@ object GameUtils {
      */
     @WorkerThread
     @JvmStatic
-    fun getDownloadBtnText(
-        context: Context,
-        gameEntity: GameEntity,
-        isFromList: Boolean,
-        fixedAsVGame: Boolean,
-        pluginLocation: PluginLocation?
-    ): String {
+    fun getDownloadBtnText(context: Context,
+                           gameEntity: GameEntity,
+                           isFromList: Boolean,
+                           fixedAsVGame: Boolean,
+                           pluginLocation: PluginLocation?): String {
         if (gameEntity.getApk().size > 1) {
             return ""
         }
@@ -111,12 +104,7 @@ object GameUtils {
         var gh_id: Any?
         apkFor@ for (apkEntity in gameEntity.getApk()) {
 
-            val isInstalledLocally =
-                if (gameEntity.isDspGame) {
-                    PackageHelper.validLocalPackageNameSet.contains(apkEntity.packageName)
-                } else {
-                    PackagesManager.isInstalled(apkEntity.packageName)
-                }
+            val isInstalledLocally = PackagesManager.isInstalled(apkEntity.packageName)
 
             // filter by packageName
             val settings = Config.getSettings()
@@ -150,8 +138,7 @@ object GameUtils {
             } else if (!isFromList) {
                 if (!performAsVGame
                     && gameEntity.isDualBtnModeEnabled()
-                    && downloadEntity?.isVGameDownloadInDualDownloadMode() == true
-                ) {
+                    && downloadEntity?.isVGameDownloadInDualDownloadMode() == true) {
                     // 下载的任务是由畅玩触发的，并且双下载按钮启用，游戏详情页不需判定为需要安装
                     downloadEntity = null
                 } else if (performAsVGame && downloadEntity?.isLocalDownloadInDualDownloadMode() == true) {

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

@@ -14,26 +14,25 @@ import androidx.core.content.ContextCompat;
 import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.adapter.LibaoDetailAdapter;
-import com.gh.gamecenter.common.constant.Constants;
-import com.gh.gamecenter.common.entity.NotificationUgc;
-import com.gh.gamecenter.common.eventbus.EBReuse;
-import com.gh.gamecenter.common.retrofit.JSONObjectResponse;
-import com.gh.gamecenter.common.retrofit.Response;
 import com.gh.gamecenter.common.utils.DialogHelper;
 import com.gh.gamecenter.common.utils.ExtensionsKt;
 import com.gh.gamecenter.common.utils.NotificationHelper;
 import com.gh.gamecenter.common.utils.SensorsBridge;
 import com.gh.gamecenter.core.utils.ToastUtils;
 import com.gh.gamecenter.core.utils.UrlFilterUtils;
-import com.gh.gamecenter.eventbus.EBUISwitch;
 import com.gh.gamecenter.feature.entity.ApkEntity;
 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.common.entity.NotificationUgc;
 import com.gh.gamecenter.feature.entity.UserDataLibaoEntity;
+import com.gh.gamecenter.common.eventbus.EBReuse;
+import com.gh.gamecenter.eventbus.EBUISwitch;
 import com.gh.gamecenter.feature.utils.PlatformUtils;
 import com.gh.gamecenter.geetest.GeetestUtils;
 import com.gh.gamecenter.login.user.UserManager;
+import com.gh.gamecenter.common.retrofit.JSONObjectResponse;
+import com.gh.gamecenter.common.retrofit.Response;
 import com.gh.gamecenter.retrofit.RetrofitManager;
 import com.halo.assistant.HaloApp;
 import com.lightgame.utils.Utils;
@@ -481,7 +480,7 @@ public class LibaoUtils {
                 UserDataLibaoEntity me = new UserDataLibaoEntity(libaoCode, "ling", Utils.getTime(context));
                 initLibaoCode(libaoEntity, me);
                 if (adapter != null) adapter.initLibaoCode(me);
-                EventBus.getDefault().post(new EBReuse(Constants.LIBAO_CHANGED_TAG));
+                EventBus.getDefault().post(new EBReuse("libaoChanged"));
                 if (listener != null) listener.onLibaoStatusChange();
                 uploadEvent(libaoEntity, true, entrance);
                 String des;
@@ -621,7 +620,7 @@ public class LibaoUtils {
                 UserDataLibaoEntity me = new UserDataLibaoEntity(libaoCode, "ling", Utils.getTime(context));
                 initLibaoCode(libaoEntity, me);
                 if (listener != null) listener.onLibaoStatusChange();
-                EventBus.getDefault().post(new EBReuse(Constants.LIBAO_CHANGED_TAG));
+                EventBus.getDefault().post(new EBReuse("libaoChanged"));
                 uploadEvent(libaoEntity, false, entrance);
 
                 if (adapter != null) {

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

@@ -2,29 +2,21 @@ package com.gh.common.util
 
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
-import com.gh.common.dialog.AccelerateExpirationDialogFragment
 import com.gh.download.DownloadManager
 import com.gh.download.PackageObserver
 import com.gh.gamecenter.DownloadManagerActivity
-import com.gh.gamecenter.R
 import com.gh.gamecenter.common.utils.NewFlatLogUtils
 import com.gh.gamecenter.common.utils.SensorsBridge
-import com.gh.gamecenter.core.provider.IAcceleratorProvider
 import com.gh.gamecenter.core.utils.CurrentActivityHolder
 import com.gh.gamecenter.eventbus.EBPackage
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.hud.HeadUpDisplayHelper
-import com.gh.gamecenter.hud.HeadUpDisplayLogHelper
 import com.gh.gamecenter.manager.PackagesManager
 import com.gh.gamecenter.packagehelper.PackageRepository
-import com.halo.assistant.HaloApp
-import com.halo.assistant.accelerator.repository.AcceleratorDataHolder
 
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.utils.getMetaExtra
-import com.gh.gamecenter.dsp.DspReportHelper
+import com.gh.gamecenter.R
+import com.gh.gamecenter.hud.HeadUpDisplayLogHelper
 import com.lightgame.utils.Utils
-import com.therouter.TheRouter
 import org.greenrobot.eventbus.EventBus
 
 object PackageChangeHelper : DefaultLifecycleObserver {
@@ -35,13 +27,12 @@ object PackageChangeHelper : DefaultLifecycleObserver {
     private const val UNINSTALL_PENDING = 2
     private const val UPDATE_PENDING = 3
 
-    // <包名，pending 类型，应用版本，光环ID> 的 pending 集合
-    private var pendingPackageMap: HashMap<String, PackageEntity> = hashMapOf()
+    // <包名，pending 类型，应用版本> Triple
+    private var pendingPackageTriple: Triple<String, Int, String>? = null
+    private var pendingGhId: String? = null
 
     private var pendingHUDShowed: Boolean = false
 
-    private var isLaunching = true
-
     /**
      * 添加一个等待中，待确定是否已成功安装的应用
      */
@@ -52,21 +43,24 @@ object PackageChangeHelper : DefaultLifecycleObserver {
             Utils.log(TAG, "添加了: $packageName 包名等待安装成功")
 
             pendingHUDShowed = false
-            pendingPackageMap[packageName] = PackageEntity(packageName, INSTALL_PENDING, "")
+            pendingPackageTriple = Triple(packageName, INSTALL_PENDING, "")
         } else {
             Utils.log(TAG, "添加了: $packageName 包名等待安装更新成功")
 
+            val ghId = PackageUtils.getGhId(packageName)
+
             // 记录光环插件相关信息，用于安装成功后的处理
-            val ghId = PackageUtils.getGhId(packageName)?.toString() ?: ""
+            if (ghId != null) {
+                pendingGhId = ghId.toString()
+            }
 
             pendingHUDShowed = false
-            pendingPackageMap[packageName] =
-                PackageEntity(packageName, UPDATE_PENDING, installData.version, ghId)
+            pendingPackageTriple = Triple(packageName, UPDATE_PENDING, installData.version)
         }
     }
 
     fun isInstallPendingPackage(packageName: String): Boolean {
-        return pendingPackageMap[packageName]?.packageName == packageName
+        return pendingPackageTriple?.first == packageName
     }
 
     /**
@@ -74,159 +68,87 @@ object PackageChangeHelper : DefaultLifecycleObserver {
      */
     fun addUninstallPendingPackage(packageName: String) {
         Utils.log(TAG, "添加了: $packageName 包名等待卸载成功")
-        pendingPackageMap[packageName] = PackageEntity(packageName, UNINSTALL_PENDING, "")
-    }
-
-    override fun onCreate(owner: LifecycleOwner) {
-        super.onCreate(owner)
-        isLaunching = true
+        pendingPackageTriple = Triple(packageName, UNINSTALL_PENDING, "")
     }
 
     override fun onResume(owner: LifecycleOwner) {
         super.onResume(owner)
 
-        if (pendingPackageMap.size > 0) {
-            calculateAndDispatchPackageChanges()
-        }
+        if (pendingPackageTriple != null) {
+            val packageName = pendingPackageTriple?.first ?: return
+            val isInstallPending = pendingPackageTriple?.second == INSTALL_PENDING
+            val isUninstallPending = pendingPackageTriple?.second == UNINSTALL_PENDING
+            val isUpdatePending = pendingPackageTriple?.second == UPDATE_PENDING
 
-        refreshVipStatus()
-    }
-
-    /**
-     * 应用从后台切到前台，如果是登录状态，需要刷新用户的vip状态
-     */
-    private fun refreshVipStatus() {
-        val iAcceleratorProvider = TheRouter.get(IAcceleratorProvider::class.java)
-        if (iAcceleratorProvider?.hasToken() == true &&
-            AcceleratorDataHolder.instance.enableRefresh &&
-            AcceleratorDataHolder.instance.vipEntity != null &&
-            !isLaunching
-        ) {
-            iAcceleratorProvider.loadQyUserPermissionData {
-                val vip = AcceleratorDataHolder.instance.vipEntity
-                if (vip != null && !vip.vipStatus && !vip.isNewUser && !vip.isVipRefundUser && !vip.isDurationRefundUser) {
-                    // 获取当前
-                    val currentActivity = CurrentActivityHolder.getCurrentActivity()
-                    val reminder = AccelerateExpirationDialogFragment.ExpirationReminder.TimeRunsOut("")
-                    if (currentActivity != null && HaloApp.getInstance().isRunningForeground) {
-                        AccelerateExpirationDialogFragment.checkDialogShown(currentActivity, reminder)
-                    }
-
-                }
-            }
-        }
-    }
-
-    /**
-     * 计算并分发包名的安装状态
-     */
-    private fun calculateAndDispatchPackageChanges() {
-        val completeList = arrayListOf<PackageEntity>()
-        val pendingHudPackageList = arrayListOf<String>()
-
-        for (packageEntity in pendingPackageMap.values) {
-            val packageName = packageEntity.packageName
-            val pendingVersion = packageEntity.version
-            val pendingGhId = packageEntity.ghId
+            val pendingVersion = pendingPackageTriple?.third ?: ""
 
             val installedVersionName = PackageUtils.getVersionNameByPackageName(packageName)
             val isInstalled = installedVersionName != null
 
-            if (packageEntity.isInstallPending()) {
+            if (isInstallPending) {
                 if (isInstalled) {
-                    completeList += packageEntity
+                    pendingPackageTriple = null
+                    pendingGhId = null
 
-                    PackageRepository.addInstalledGame(
-                        PackageRepository.packageFilterManager,
-                        packageName
-                    )
+                    PackageRepository.addInstalledGame(PackageRepository.packageFilterManager, packageName)
 
                     // 添加到额外的包名白名单，下次启动同时查询此包的安装情况
-                    PackageHelper.updateAdditionalWhiteListPackageName(
-                        packageName = packageName,
-                        isAdd = true
-                    )
+                    PackageHelper.updateAdditionalWhiteListPackageName(packageName = packageName, isAdd = true)
 
                     performInstallSuccessAction(packageName)
                 } else {
-                    // 任务不存在了，将等待更新安装结果的 packageEntity 置为 null
-                    if (DownloadManager.getInstance()
-                            .getDownloadEntitySnapshotByPackageName(packageName) == null
-                    ) {
-                        completeList += packageEntity
+                    // 任务不存在了，将等待更新安装结果的 triple 置为 null
+                    if (DownloadManager.getInstance().getDownloadEntitySnapshotByPackageName(packageName) == null) {
+                        pendingPackageTriple = null
                     } else {
-                        pendingHudPackageList.add(packageName)
+                        showHUDIfNeeded(packageName)
                     }
                 }
-            } else if (packageEntity.isUninstallPending() && !isInstalled) {
-                completeList += packageEntity
+            } else if (isUninstallPending && !isInstalled) {
+                pendingPackageTriple = null
+                pendingGhId = null
 
                 // 从额外的包名白名单移除，下次启动时不再查询此包的安装情况
-                PackageHelper.updateAdditionalWhiteListPackageName(
-                    packageName = packageName,
-                    isAdd = false
-                )
+                PackageHelper.updateAdditionalWhiteListPackageName(packageName = packageName, isAdd = false)
 
                 performUninstallSuccessAction(packageName)
-            } else if (packageEntity.isUpdatePending()) {
+            } else if (isUpdatePending) {
                 val isUpdateValid = if (installedVersionName != pendingVersion) {
                     true
                 } else {
-                    pendingGhId.isNotEmpty()
-                            && pendingGhId != PackageUtils.getGhId(packageName).toString()
+                    !pendingGhId.isNullOrEmpty() && pendingGhId != PackageUtils.getGhId(packageName).toString()
                 }
 
+                pendingPackageTriple = null
+                pendingGhId = null
+
                 if (isUpdateValid) {
                     performUninstallSuccessAction(packageName)
                     performInstallSuccessAction(packageName)
-
-                    completeList += packageEntity
                 } else {
-                    // 任务不存在了，将等待更新安装结果的 packageEntity 置为 null
-                    if (DownloadManager.getInstance()
-                            .getDownloadEntitySnapshotByPackageName(packageName) == null
-                    ) {
-                        completeList += packageEntity
+                    // 任务不存在了，将等待更新安装结果的 triple 置为 null
+                    if (DownloadManager.getInstance().getDownloadEntitySnapshotByPackageName(packageName) == null) {
+                        pendingPackageTriple = null
                     } else {
-                        pendingHudPackageList.add(packageName)
+                        showHUDIfNeeded(packageName)
                     }
                 }
 
                 // 添加到额外的包名白名单，下次启动同时查询此包的安装情况
-                PackageHelper.updateAdditionalWhiteListPackageName(
-                    packageName = packageName,
-                    isAdd = true
-                )
+                PackageHelper.updateAdditionalWhiteListPackageName(packageName = packageName, isAdd = true)
             }
         }
-
-        for (invalidPackage in completeList) {
-            pendingPackageMap.remove(invalidPackage.packageName)
-        }
-
-        if (pendingHudPackageList.isNotEmpty()) {
-            showHUDIfNeeded(pendingHudPackageList.last())
-        }
-    }
-
-    override fun onStop(owner: LifecycleOwner) {
-        super.onStop(owner)
-        isLaunching = false
     }
 
     private fun showHUDIfNeeded(packageName: String) {
         if (pendingHUDShowed) return
 
-        val downloadEntity =
-            DownloadManager.getInstance().getDownloadEntitySnapshotByPackageName(packageName)
-                ?: return
-        if (downloadEntity.gameId == Constants.GHZS_GAME_ID) return
+        val downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshotByPackageName(packageName) ?: return
         val activity = CurrentActivityHolder.getCurrentActivity() ?: return
         if (activity is DownloadManagerActivity) return
 
         pendingHUDShowed = true
-        HeadUpDisplayHelper.showHUD(
-            activity,
+        HeadUpDisplayHelper.showHUD(activity,
             downloadEntity.icon ?: "",
             activity.getString(R.string.hud_has_pending_install_game),
             activity.getString(R.string.hud_head_to_download_manager),
@@ -267,26 +189,16 @@ object PackageChangeHelper : DefaultLifecycleObserver {
     private fun performInstallSuccessAction(
         packageName: String,
         cachedGameEntity: GameEntity? = null,
-        withLog: Boolean = true,
+        withLog: Boolean = true
     ) {
         Utils.log(TAG, "安装了: $packageName 包名的程序")
-        val downloadEntity =
-            DownloadManager.getInstance().getDownloadEntitySnapshotByPackageName(packageName)
-        val gameId = downloadEntity?.gameId ?: ""
-        val gameName = downloadEntity?.name ?: ""
+        val downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshotByPackageName(packageName)
+        val gameId = if (downloadEntity != null && downloadEntity.gameId != null) downloadEntity.gameId else ""
+        val gameName = if (downloadEntity != null && downloadEntity.name != null) downloadEntity.name else ""
 
-        if (withLog && gameId.isNotEmpty()) {
+        if (withLog) {
             NewFlatLogUtils.logGameInstallComplete(gameId, gameName)
-            SensorsBridge.trackInstallGameFinish(
-                gameId,
-                gameName,
-                downloadEntity?.getMetaExtra(Constants.DSP_GAME) == "true",
-                downloadEntity?.getMetaExtra(Constants.DSP_AD_ID) ?: ""
-            )
-
-            if (downloadEntity?.getMetaExtra(Constants.DSP_GAME) == "true") {
-                DspReportHelper.report(downloadEntity.getMetaExtra(Constants.INSTALL_URL))
-            }
+            SensorsBridge.trackInstallGameFinish(gameId, gameName)
         }
 
         InstallUtils.getInstance().removeInstall(packageName)
@@ -325,23 +237,4 @@ object PackageChangeHelper : DefaultLifecycleObserver {
         EventBus.getDefault().post(uninstallEb)
     }
 
-    private class PackageEntity(
-        val packageName: String,
-        val type: Int,
-        val version: String,
-        val ghId: String = "",
-    ) {
-        fun isInstallPending(): Boolean {
-            return type == INSTALL_PENDING
-        }
-
-        fun isUninstallPending(): Boolean {
-            return type == UNINSTALL_PENDING
-        }
-
-        fun isUpdatePending(): Boolean {
-            return type == UPDATE_PENDING
-        }
-    }
-
 }

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

@@ -12,7 +12,6 @@ import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import com.gh.common.constant.Config
-import com.gh.download.server.BrowserInstallHelper
 import com.gh.gamecenter.common.retrofit.BiResponse
 import com.gh.gamecenter.common.utils.DialogHelper
 import com.gh.gamecenter.common.utils.PermissionHelper
@@ -25,6 +24,7 @@ import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.entity.WhitePackageListEntity
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.entity.SettingsEntity
+import com.gh.gamecenter.feature.utils.SentryHelper
 import com.gh.gamecenter.manager.PackagesManager
 import com.gh.gamecenter.packagehelper.PackageRepository
 import com.gh.gamecenter.retrofit.RetrofitManager
@@ -459,9 +459,6 @@ object PackageHelper {
         PackageRepository.initData {
             refreshLocalPackageList()
             refreshPackageNameList()
-
-            // 初始化使用浏览器安装的条件
-            BrowserInstallHelper.initIfConditionMatched(Config.getNewSettingsEntity())
         }
     }
 

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

@@ -69,24 +69,18 @@ object PackageInstaller {
         val isDownloadAsVGame = downloadEntity.getMetaExtra(Constants.EXTRA_DOWNLOAD_TYPE) == Constants.VGAME
                 || downloadEntity.getMetaExtra(Constants.EXTRA_DOWNLOAD_TYPE) == Constants.DUAL_DOWNLOAD_VGAME
 
-        val properContext = if (context is AppCompatActivity && !context.isFinishing) {
-            context
-        } else {
-            AppManager.getInstance().currentActivity()
-        }
-
-        properContext ?: return
+        val currentActivity = AppManager.getInstance().currentActivity() ?: return
 
         if (!ignoreAsVGame && isDownloadAsVGame) {
-            VHelper.install(properContext, downloadEntity)
+            VHelper.install(currentActivity, downloadEntity)
             return
         }
 
         // 已知问题
         // 1. 此处可能遇到 activity 是 WXEntryActivity，因为 WXEntryActivity 不是 AppCompatActivity 调不起弹窗
         // 2. 当 activity 全部出栈，但是应用还在下载游戏，下载完会唤不起安装
-        if (properContext is AppCompatActivity && !properContext.isFinishing) {
-            InstallPermissionDialogFragment.show(properContext, downloadEntity) { isFromPermissionGrantedCallback ->
+        if (currentActivity is AppCompatActivity && !currentActivity.isFinishing) {
+            InstallPermissionDialogFragment.show(currentActivity, downloadEntity) { isFromPermissionGrantedCallback ->
                 // 取消状态栏下载完成的通知，若存在
                 downloadEntity.meta[Constants.MARK_ALREADY_TRIGGERED_INSTALLATION] = "YES"
                 DownloadNotificationHelper.addOrUpdateDownloadNotification(downloadEntity)

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

@@ -95,8 +95,7 @@ object ReservationHelper {
                             it.categoryChinese,
                             data.wechatConfig.isReminderEnable,
                             if (data.hasSmsConfig) data.smsConfig.notice else null,
-                            if (data.isEnableAutoDownload) data.wifiAutoDownload else null,
-                            if (data.hasCalendarConfig) false else null
+                            if (data.isEnableAutoDownload) data.wifiAutoDownload else null
                         )
                     }
 

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

@@ -32,7 +32,6 @@ import okhttp3.RequestBody
 import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.ResponseBody
 import org.json.JSONArray
-import org.json.JSONException
 import org.json.JSONObject
 import java.util.*
 
@@ -230,19 +229,15 @@ object UsageStatsHelper {
         mApi.getUsageStatusUpdateTime(HaloApp.getInstance().gid)
             .subscribe(object : BiResponse<ResponseBody>() {
                 override fun onSuccess(data: ResponseBody) {
-                    try {
-                        val body = JSONObject(data.string())
-                        val lastPostTime = body.getLong("update_time") * 1000
+                    val body = JSONObject(data.string())
+                    val lastPostTime = body.getLong("update_time") * 1000
 
-                        val beginTime = if (lastPostTime == 0L) {
-                            getDefaultBeginTime()
-                        } else {
-                            lastPostTime
-                        }
-                        postUsageStats(beginTime)
-                    } catch (e: JSONException) {
-                        Utils.log("UsageStats: 获取上次上传时间失败，错误信息：${e.message}")
+                    val beginTime = if (lastPostTime == 0L) {
+                        getDefaultBeginTime()
+                    } else {
+                        lastPostTime
                     }
+                    postUsageStats(beginTime)
                 }
             })
     }

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

@@ -2,10 +2,12 @@ package com.gh.common.util
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
+import com.therouter.TheRouter
 import com.gh.common.iinterface.ISuperiorChain
 import com.gh.gamecenter.amway.AmwayFragment
 import com.gh.gamecenter.category2.CategoryV2Fragment
 import com.gh.gamecenter.common.constant.EntranceConsts
+import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.entity.LinkEntity
 import com.gh.gamecenter.common.provider.IHelpAndFeedbackProvider
 import com.gh.gamecenter.discovery.DiscoveryFragment
@@ -17,7 +19,7 @@ import com.gh.gamecenter.game.columncollection.detail.ColumnCollectionDetailFrag
 import com.gh.gamecenter.game.commoncollection.detail.CustomCommonCollectionDetailFragment
 import com.gh.gamecenter.gamecollection.hotlist.GameCollectionHotListWrapperFragment
 import com.gh.gamecenter.gamecollection.square.GameCollectionSquareFragment
-import com.gh.gamecenter.gamedetail.GameDetailWrapperFragment
+import com.gh.gamecenter.gamedetail.GameDetailFragment
 import com.gh.gamecenter.info.InfoWrapperFragment
 import com.gh.gamecenter.libao.LibaoDetailFragment
 import com.gh.gamecenter.libao.LibaoFragment
@@ -36,7 +38,6 @@ import com.gh.gamecenter.toolbox.ToolboxFragment
 import com.gh.gamecenter.video.detail.HomeVideoFragment
 import com.gh.gamecenter.wrapper.ToolbarWrapperFragment
 import com.halo.assistant.fragment.WebFragment
-import com.therouter.TheRouter
 
 /**
  * 通用跳转Fragment方法
@@ -87,7 +88,7 @@ object ViewPagerFragmentHelper {
             // 游戏详情页
             TYPE_GAME -> {
                 bundle.putString(EntranceConsts.KEY_GAMEID, linkEntity.link)
-                GameDetailWrapperFragment().with(bundle)
+                GameDetailFragment().with(bundle)
             }
             // 我的光环
             TYPE_MY_HALO -> {
@@ -147,21 +148,12 @@ object ViewPagerFragmentHelper {
                 bundle.putString(EntranceConsts.KEY_QUESTIONS_ID, linkEntity.link)
                 NewQuestionDetailFragment().with(bundle)
             }
-            // 专题合集详情页
-            TYPE_COLUMN_COLLECTION -> {
-                bundle.putString(EntranceConsts.KEY_COLLECTION_ID, linkEntity.link)
-                bundle.putInt(EntranceConsts.KEY_POSITION, 0)
-                bundle.putString(EntranceConsts.KEY_COLUMNNAME, linkEntity.text)
-                bundle.putBoolean(EntranceConsts.KEY_IS_COLUMN_COLLECTION, true)
-                bundle.putString(EntranceConsts.KEY_SUBJECT_TYPE, "tab")
-                ColumnCollectionDetailFragment().with(bundle)
-            }
             // 其他原来带Toolbar的Fragment
-            else -> createToolbarWrapperFragment(bundle, linkEntity, isTabWrapper)
+            else -> createToolbarWrapperFragment(parentFragment, bundle, linkEntity, isTabWrapper)
         }
     }
 
-    private fun createToolbarWrapperFragment(bundle: Bundle, entity: LinkEntity, isTabWrapper: Boolean): Fragment {
+    private fun createToolbarWrapperFragment(parentFragment: Fragment?, bundle: Bundle, entity: LinkEntity, isTabWrapper: Boolean): Fragment {
         var className = ReloadFragment::class.java.name
 
         when (entity.type) {
@@ -185,6 +177,15 @@ object ViewPagerFragmentHelper {
                 bundle.putString(EntranceConsts.KEY_SUBJECT_TYPE, "detail")
                 bundle.putBoolean(EntranceConsts.KEY_SHOW_DOWNLOAD_MENU, !isTabWrapper)
             }
+            // 专题合集详情页
+            TYPE_COLUMN_COLLECTION -> {
+                className = ColumnCollectionDetailFragment::class.java.name
+                bundle.putString(EntranceConsts.KEY_COLLECTION_ID, entity.link)
+                bundle.putInt(EntranceConsts.KEY_POSITION, 0)
+                bundle.putString(EntranceConsts.KEY_COLUMNNAME, entity.text)
+                bundle.putBoolean(EntranceConsts.KEY_IS_COLUMN_COLLECTION, true)
+                bundle.putString(EntranceConsts.KEY_SUBJECT_TYPE, "tab")
+            }
             // 开服表
             TYPE_SERVER -> {
                 className = GameServersPublishFragment::class.java.name
@@ -199,8 +200,8 @@ object ViewPagerFragmentHelper {
             // 分类2.0
             TYPE_CATEGORY_V2 -> {
                 className = CategoryV2Fragment::class.java.name
-                bundle.putString(EntranceConsts.KEY_PAGE_ID, entity.link)
-                bundle.putString(EntranceConsts.KEY_PAGE_NAME, entity.text)
+                bundle.putString(EntranceConsts.KEY_CATEGORY_ID, entity.link)
+                bundle.putString(EntranceConsts.KEY_CATEGORY_TITLE, entity.text)
                 bundle.putBoolean(EntranceConsts.KEY_SHOW_DOWNLOAD_MENU, !isTabWrapper)
             }
             // 通用内容合集详情页

app/src/main/java/com/gh/common/view/CategoryFilterView.kt

@@ -1,48 +1,38 @@
 package com.gh.common.view
 
-import android.annotation.SuppressLint
 import android.content.Context
-import android.content.res.ColorStateList
-import android.graphics.Typeface
+import android.graphics.Color
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.CompoundButton
+import android.widget.LinearLayout
 import android.widget.PopupWindow
-import android.widget.RadioButton
+import android.widget.TextView
 import androidx.annotation.ColorInt
-import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.core.view.forEach
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.RecyclerView
+import androidx.core.content.ContextCompat
 import com.gh.gamecenter.R
-import com.gh.gamecenter.common.utils.*
-import com.gh.gamecenter.databinding.LayoutCategoryFilterBinding
-import com.gh.gamecenter.databinding.LayoutCategoryFilterSizeBinding
-import com.gh.gamecenter.databinding.PopCategoryFilterSizeBinding
-import com.gh.gamecenter.databinding.PopCategoryFilterTypeBinding
+import com.gh.gamecenter.common.utils.dip2px
+import com.gh.gamecenter.common.utils.setDrawableEnd
+import com.gh.gamecenter.common.utils.toColor
 import com.gh.gamecenter.entity.SubjectSettingEntity
+import com.google.android.flexbox.FlexboxLayout
 
 class CategoryFilterView @JvmOverloads constructor(
     context: Context,
     attrs: AttributeSet? = null,
     defStyleAttr: Int = 0
-) : ConstraintLayout(context, attrs, defStyleAttr) {
+) : LinearLayout(context, attrs, defStyleAttr) {
 
-    private val binding: LayoutCategoryFilterBinding
+    private var mTypeTv: TextView
+    private var mCatalogTv: TextView
+    private var mSizeTv: TextView
+    private var mTypeContainer: View
+    private var mCatalogContainer: View
+    private var mSizeContainer: View
 
-    private val mTypeFilterArray = arrayOf(SortType.RECOMMENDED, SortType.NEWEST, SortType.RATING)
-    private val sizeFilterArray by lazy {
-        listOf(
-            SubjectSettingEntity.Size(min = -1, max = -1, text = "全部大小"),
-            SubjectSettingEntity.Size(min = -1, max = 100, text = "100M以下"),
-            SubjectSettingEntity.Size(min = 100, max = 300, text = "100-300M"),
-            SubjectSettingEntity.Size(min = 300, max = 500, text = "300-500M"),
-            SubjectSettingEntity.Size(min = 500, max = 1000, text = "500M-1G"),
-            SubjectSettingEntity.Size(min = 1000, max = -1, text = "1G以上")
-        )
-    }
+    private var mTypeFilterArray = arrayOf(SortType.RECOMMENDED, SortType.NEWEST, SortType.RATING)
+    private var sizeFilterArray: ArrayList<SubjectSettingEntity.Size>? = null
 
     private var mOnCategoryFilterSetupListener: OnCategoryFilterSetupListener? = null
     private var mOnFilterClickListener: OnFilterClickListener? = null
@@ -51,28 +41,29 @@ class CategoryFilterView @JvmOverloads constructor(
     private var mSizePopupWindow: PopupWindow? = null
 
     init {
+        View.inflate(context, R.layout.layout_category_filter, this)
 
-        val inflater = LayoutInflater.from(context)
-        binding = LayoutCategoryFilterBinding.inflate(inflater, this, true)
+        mTypeTv = findViewById(R.id.type_tv)
+        mCatalogTv = findViewById(R.id.catalog_tv)
+        mSizeTv = findViewById(R.id.size_tv)
+        mTypeContainer = findViewById(R.id.container_type)
+        mCatalogContainer = findViewById(R.id.container_category)
+        mSizeContainer = findViewById(R.id.container_size)
+        mTypeTv.text = mTypeFilterArray[0].value
 
-        binding.ivTypeArrow.setImageResource(R.drawable.ic_arrow_down)
-        binding.ivTypeArrow.imageTintList =
-            ColorStateList.valueOf(com.gh.gamecenter.common.R.color.text_neutral.toColor(context))
-
-        binding.ivSizeArrow.setImageResource(R.drawable.ic_arrow_down)
-        binding.ivSizeArrow.imageTintList =
-            ColorStateList.valueOf(com.gh.gamecenter.common.R.color.text_neutral.toColor(context))
-
-        binding.tvType.text = mTypeFilterArray[0].value
-
-        binding.llTypeContainer.setOnClickListener {
+        mTypeContainer.setOnClickListener {
             mOnFilterClickListener?.onTypeClick()
-            showSelectTypePopupWindow()
+            showSelectTypePopupWindow(this, mTypeTv, mTypeTv.text.toString())
         }
 
-        binding.llSizeContainer.setOnClickListener {
+        mCatalogContainer.setOnClickListener {
+            mOnFilterClickListener?.onCategoryClick()
+            mOnCategoryFilterSetupListener?.onSetupSortCategory()
+        }
+
+        mSizeContainer.setOnClickListener {
             mOnFilterClickListener?.onSizeClick()
-            showSelectSizePopupWindow()
+            showSelectSizePopupWindow(this, mSizeTv, mSizeTv.text.toString())
         }
     }
 
@@ -85,133 +76,154 @@ class CategoryFilterView @JvmOverloads constructor(
     }
 
     fun resetSortSize() {
-        binding.tvType.text = R.string.size.toResString()
+        mSizeTv.text = "全部大小"
     }
 
-    private fun showSelectTypePopupWindow() {
-        binding.tvType.setTextColor(com.gh.gamecenter.common.R.color.text_primary.toColor(context))
+    private fun toggleHighlightedTextView(targetTextView: TextView, highlightIt: Boolean) {
+        if (highlightIt) {
+            targetTextView.background = ContextCompat.getDrawable(targetTextView.context, R.drawable.bg_tag_text)
+            targetTextView.setTextColor(Color.WHITE)
+        } else {
+            targetTextView.background = null
+            targetTextView.setTextColor(ContextCompat.getColor(targetTextView.context, com.gh.gamecenter.common.R.color.text_757575))
+        }
+    }
 
-        binding.ivTypeArrow.setImageResource(R.drawable.ic_arrow_up)
-        binding.ivTypeArrow.imageTintList =
-            ColorStateList.valueOf(com.gh.gamecenter.common.R.color.text_primary.toColor(context))
+    private fun showSelectTypePopupWindow(containerView: View, typeTv: TextView, typeText: String) {
+        typeTv.setTextColor(com.gh.gamecenter.common.R.color.text_theme.toColor(context))
+        typeTv.setDrawableEnd(R.drawable.ic_filter_arrow_up)
 
-        val inflater = LayoutInflater.from(context)
-        val typeBinding = PopCategoryFilterTypeBinding.inflate(inflater, null, false)
-        val windowWidth = resources.displayMetrics.widthPixels - 80F.dip2px()
-        val windowHeight = mOnCategoryFilterSetupListener?.getPopHeight() ?: 0
+        val inflater = LayoutInflater.from(typeTv.context)
+        val layout = inflater.inflate(R.layout.layout_filter_size, null)
+        val windowWidth = typeTv.context.resources.displayMetrics.widthPixels - 80F.dip2px()
         val popupWindow = PopupWindow(
-            typeBinding.root,
+            layout,
             windowWidth,
-            if (windowHeight == 0) ViewGroup.LayoutParams.WRAP_CONTENT else (windowHeight - height)
+            LayoutParams.WRAP_CONTENT
         ).apply { mTypePopupWindow = this }
 
+        val flexboxLayout = layout.findViewById<FlexboxLayout>(R.id.flexbox)
+        val backgroundView = layout.findViewById<View>(R.id.background)
 
-        typeBinding.root.setOnClickListener {
+        backgroundView.setOnClickListener {
             popupWindow.dismiss()
         }
 
-        val checkedId = when (binding.tvType.text.toString()) {
-            "最新" -> R.id.rb_newest
-            "评分" -> R.id.rb_score
-            else -> R.id.rb_popular
-        }
+        for (type in mTypeFilterArray) {
+            val item = inflater.inflate(R.layout.item_filter_size, flexboxLayout, false)
 
-        val checkButton = typeBinding.root.findViewById<RadioButton>(checkedId)
-        checkButton.setTypeface(checkButton.typeface, Typeface.BOLD)
-        checkButton.setTextColor(com.gh.gamecenter.common.R.color.text_primary.toColor(context))
-        checkButton.setDrawableEnd(R.drawable.ic_basic_checkmark_circle_fill)
+            // 单列 3 个，强行设置宽度为屏幕的 1/3
+            val width = windowWidth / 3
+            val height = item.layoutParams.height
 
-        val onCheckedChangeListener = CompoundButton.OnCheckedChangeListener { button, isChecked ->
-            if (isChecked) {
-                button.setTypeface(button.typeface, Typeface.BOLD)
-                button.setTextColor(com.gh.gamecenter.common.R.color.text_primary.toColor(context))
-                button.setDrawableEnd(R.drawable.ic_basic_checkmark_circle_fill)
+            item.layoutParams = ViewGroup.LayoutParams(width, height)
+            flexboxLayout.addView(item)
 
-                val type = when (button.id) {
-                    R.id.rb_newest -> SortType.NEWEST
-                    R.id.rb_score -> SortType.RATING
-                    else -> SortType.RECOMMENDED
-                }
-                binding.tvType.text = type.value
-                mOnCategoryFilterSetupListener?.onSetupSortType(type)
+            val tv = item.findViewById<TextView>(R.id.size_tv)
+            tv.text = type.value
+
+            toggleHighlightedTextView(tv, typeText == type.value)
+
+            tv.tag = type.value
+
+            item.setOnClickListener {
+                toggleHighlightedTextView(tv, true)
                 popupWindow.dismiss()
-            } else {
-                button.setTypeface(button.typeface, Typeface.NORMAL)
-                button.setTextColor(com.gh.gamecenter.common.R.color.text_secondary.toColor(context))
-                button.setDrawableEnd(null)
-            }
-        }
-        typeBinding.rgFilter.forEach {
-            if (it is RadioButton) {
-                it.setOnCheckedChangeListener(onCheckedChangeListener)
+                typeTv.text = type.value
+
+                mOnCategoryFilterSetupListener?.onSetupSortType(type)
             }
         }
 
         popupWindow.setOnDismissListener {
-            binding.tvType.setTextColor(com.gh.gamecenter.common.R.color.text_tertiary.toColor(context))
-            binding.ivTypeArrow.setImageResource(R.drawable.ic_arrow_down)
-            binding.ivTypeArrow.imageTintList =
-                ColorStateList.valueOf(com.gh.gamecenter.common.R.color.text_neutral.toColor(context))
+            typeTv.setTextColor(com.gh.gamecenter.common.R.color.text_757575.toColor(context))
+            typeTv.setDrawableEnd(R.drawable.ic_filter_arrow_down)
             mTypePopupWindow = null
         }
 
         popupWindow.isTouchable = true
         popupWindow.isFocusable = true
         popupWindow.animationStyle = 0
-        popupWindow.showAsDropDown(this, 0, 0)
+        popupWindow.showAsDropDown(containerView, 0, 0)
     }
 
-    private fun showSelectSizePopupWindow() {
-        binding.tvSize.setTextColor(com.gh.gamecenter.common.R.color.text_primary.toColor(context))
-        binding.ivSizeArrow.setImageResource(R.drawable.ic_arrow_up)
-        binding.ivSizeArrow.imageTintList =
-            ColorStateList.valueOf(com.gh.gamecenter.common.R.color.text_primary.toColor(context))
+    private fun showSelectSizePopupWindow(containerView: View, sizeTv: TextView, sizeText: String) {
+        sizeTv.setTextColor(com.gh.gamecenter.common.R.color.text_theme.toColor(context))
+        sizeTv.setDrawableEnd(R.drawable.ic_filter_arrow_up)
 
-        val inflater = LayoutInflater.from(context)
-        val sizeBinding = PopCategoryFilterSizeBinding.inflate(inflater, null, false)
-        val windowWidth = context.resources.displayMetrics.widthPixels - 80F.dip2px()
-        val windowHeight = mOnCategoryFilterSetupListener?.getPopHeight() ?: 0
+        val inflater = LayoutInflater.from(sizeTv.context)
+        val layout = inflater.inflate(R.layout.layout_filter_size, null)
+        val windowWidth = sizeTv.context.resources.displayMetrics.widthPixels - 80F.dip2px()
         val popupWindow = PopupWindow(
-            sizeBinding.root,
+            layout,
             windowWidth,
-            if (windowHeight == 0) ViewGroup.LayoutParams.WRAP_CONTENT else (windowHeight - height)
+            LayoutParams.WRAP_CONTENT
         ).apply { mSizePopupWindow = this }
 
-        sizeBinding.root.setOnClickListener {
-            popupWindow.dismiss()
-        }
-        sizeBinding.rvSize.setOnClickListener {
-            // do  nothing
-        }
+        val flexboxLayout = layout.findViewById<FlexboxLayout>(R.id.flexbox)
+        val backgroundView = layout.findViewById<View>(R.id.background)
 
-        val sizeAdapter = CategoryFilterSizeAdapter {
-            if (it.min == INVALID_SIZE && it.max == INVALID_SIZE) {
-                binding.tvSize.text = R.string.size.toResString()
-            } else {
-                binding.tvSize.text = it.text
+        sizeFilterArray = if (sizeFilterArray == null) {
+            getDefaultSizeFilterArray()
+        } else {
+            sizeFilterArray?.apply {
+                if (firstOrNull()?.text != "全部大小") {
+                    add(0, SubjectSettingEntity.Size(min = -1, max = -1, text = "全部大小"))
+                }
             }
-            popupWindow.dismiss()
-            mOnCategoryFilterSetupListener?.onSetupSortSize(it)
         }
-        sizeBinding.rvSize.layoutManager = GridLayoutManager(context, 3, RecyclerView.VERTICAL, false)
-        sizeBinding.rvSize.adapter = sizeAdapter
-        val selectedPosition =
-            sizeFilterArray.indexOfFirst { it.text?.contains(binding.tvSize.text.toString()) == true }
 
-        sizeAdapter.setData(sizeFilterArray, selectedPosition)
+        backgroundView.setOnClickListener {
+            popupWindow.dismiss()
+        }
+
+        for (size in sizeFilterArray!!) {
+            val item = inflater.inflate(R.layout.item_filter_size, flexboxLayout, false)
+
+            // 单列 3 个，强行设置宽度为屏幕的 1/3
+            val width = windowWidth / 3
+            val height = item.layoutParams.height
+
+            item.layoutParams = ViewGroup.LayoutParams(width, height)
+            flexboxLayout.addView(item)
+
+            val tv = item.findViewById<TextView>(R.id.size_tv)
+            tv.text = size.text
+
+            toggleHighlightedTextView(tv, sizeText == size.text)
+
+            tv.tag = size.text
+
+            item.setOnClickListener {
+                toggleHighlightedTextView(tv, true)
+                popupWindow.dismiss()
+                sizeTv.text = size.text
+
+                mOnCategoryFilterSetupListener?.onSetupSortSize(size)
+            }
+        }
 
         popupWindow.setOnDismissListener {
-            binding.tvSize.setTextColor(com.gh.gamecenter.common.R.color.text_tertiary.toColor(context))
-            binding.ivSizeArrow.setImageResource(R.drawable.ic_arrow_down)
-            binding.ivSizeArrow.imageTintList =
-                ColorStateList.valueOf(com.gh.gamecenter.common.R.color.text_neutral.toColor(context))
+            sizeTv.setTextColor(com.gh.gamecenter.common.R.color.text_757575.toColor(context))
+            sizeTv.setDrawableEnd(R.drawable.ic_filter_arrow_down)
             mSizePopupWindow = null
         }
 
         popupWindow.isTouchable = true
         popupWindow.isFocusable = true
         popupWindow.animationStyle = 0
-        popupWindow.showAsDropDown(this, 0, 0)
+        popupWindow.showAsDropDown(containerView, 0, 0)
+    }
+
+    private fun getDefaultSizeFilterArray(): ArrayList<SubjectSettingEntity.Size> {
+        return arrayListOf<SubjectSettingEntity.Size>().apply {
+            add(SubjectSettingEntity.Size(min = -1, max = -1, text = "全部大小"))
+            add(SubjectSettingEntity.Size(min = -1, max = 100, text = "100M以下"))
+            add(SubjectSettingEntity.Size(min = 100, max = 300, text = "100-300M"))
+            add(SubjectSettingEntity.Size(min = 300, max = 500, text = "300-500M"))
+            add(SubjectSettingEntity.Size(min = 500, max = 1000, text = "500M-1G"))
+            add(SubjectSettingEntity.Size(min = 1000, max = -1, text = "1G以上"))
+        }
     }
 
     fun setRootBackgroundColor(@ColorInt color: Int) {
@@ -219,23 +231,21 @@ class CategoryFilterView @JvmOverloads constructor(
     }
 
     fun setItemTextColor(@ColorInt color: Int) {
-        val colorInt = com.gh.gamecenter.common.R.color.text_neutral.toColor(context)
-        binding.tvType.setTextColor(color)
-        binding.tvSize.setTextColor(color)
-        binding.ivTypeArrow.imageTintList = ColorStateList.valueOf(colorInt)
-        binding.ivSizeArrow.imageTintList = ColorStateList.valueOf(colorInt)
+        mTypeTv.setTextColor(color)
+        mCatalogTv.setTextColor(color)
+        mSizeTv.setTextColor(color)
     }
 
     fun updatePopupWindow() {
         when {
             mTypePopupWindow != null && mTypePopupWindow!!.isShowing -> {
                 mTypePopupWindow?.dismiss()
-                showSelectTypePopupWindow()
+                showSelectTypePopupWindow(this, mTypeTv, mTypeTv.text.toString())
             }
 
             mSizePopupWindow != null && mSizePopupWindow!!.isShowing -> {
                 mSizePopupWindow?.dismiss()
-                showSelectSizePopupWindow()
+                showSelectSizePopupWindow(this, mSizeTv, mSizeTv.text.toString())
             }
         }
     }
@@ -243,69 +253,18 @@ class CategoryFilterView @JvmOverloads constructor(
     interface OnCategoryFilterSetupListener {
         fun onSetupSortSize(sortSize: SubjectSettingEntity.Size)
         fun onSetupSortType(sortType: SortType)
-        fun getPopHeight(): Int
+        fun onSetupSortCategory()
     }
 
     interface OnFilterClickListener {
+        fun onCategoryClick()
         fun onTypeClick()
         fun onSizeClick()
     }
 
     enum class SortType(val value: String) {
-        RECOMMENDED("热门"),
-        NEWEST("最新"),
-        RATING("评分")
-    }
-
-    class CategoryFilterSizeAdapter(private val itemClick: (SubjectSettingEntity.Size) -> Unit) :
-        RecyclerView.Adapter<CategoryFilterSizeAdapter.SizeViewHolder>() {
-
-        private val dataList = arrayListOf<SubjectSettingEntity.Size>()
-        private var selectedPosition = 0
-
-        @SuppressLint("NotifyDataSetChanged")
-        fun setData(data: List<SubjectSettingEntity.Size>, position: Int) {
-            dataList.clear()
-            dataList.addAll(data)
-            selectedPosition = position
-            notifyDataSetChanged()
-        }
-
-        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SizeViewHolder {
-            return SizeViewHolder(parent.toBinding())
-        }
-
-        override fun getItemCount(): Int {
-            return dataList.size
-        }
-
-        override fun onBindViewHolder(holder: SizeViewHolder, position: Int) {
-            val item = dataList[position]
-            val context = holder.binding.root.context
-            if (selectedPosition == position) {
-                holder.binding.root.setTextColor(com.gh.gamecenter.common.R.color.text_theme.toColor(context))
-                holder.binding.root.setBackgroundResource(R.drawable.shape_category_filter_size_item_selected)
-            } else {
-                holder.binding.root.setTextColor(com.gh.gamecenter.common.R.color.text_secondary.toColor(context))
-                holder.binding.root.setBackgroundResource(R.drawable.shape_category_filter_size_item_normal)
-            }
-            holder.binding.root.text = item.text
-            holder.binding.root.setOnClickListener {
-                if (selectedPosition == holder.bindingAdapterPosition) {
-                    return@setOnClickListener
-                }
-                val lastPosition = selectedPosition
-                selectedPosition = holder.bindingAdapterPosition
-                notifyItemChanged(lastPosition)
-                notifyItemChanged(selectedPosition)
-                itemClick(item)
-            }
-        }
-
-        class SizeViewHolder(val binding: LayoutCategoryFilterSizeBinding) : RecyclerView.ViewHolder(binding.root)
-    }
-
-    companion object {
-        private const val INVALID_SIZE = -1
+        RECOMMENDED("热门推荐"),
+        NEWEST("最新上线"),
+        RATING("最高评分")
     }
 }

app/src/main/java/com/gh/common/view/ConfigFilterView.kt

@@ -1,23 +1,18 @@
 package com.gh.common.view
 
 import android.content.Context
-import android.graphics.Typeface
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.CheckedTextView
 import android.widget.LinearLayout
 import android.widget.PopupWindow
 import android.widget.TextView
 import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.core.view.forEach
-import androidx.core.view.setPadding
 import com.gh.gamecenter.R
-import com.gh.gamecenter.common.utils.dip2px
-import com.gh.gamecenter.common.utils.goneIf
 import com.gh.gamecenter.common.utils.setDrawableEnd
 import com.gh.gamecenter.common.utils.toColor
+import com.gh.gamecenter.common.utils.toDrawable
 import com.gh.gamecenter.entity.SubjectSettingEntity
 import com.google.android.flexbox.FlexboxLayout
 
@@ -35,15 +30,11 @@ class ConfigFilterView @JvmOverloads constructor(
     var recommendedTv: TextView
     var updateTv: TextView //更新
     var container: View
-    private var dot1: View
-    private var dot2: View
-    private var dot3: View
 
-    private var sizeFilterArray: ArrayList<SubjectSettingEntity.Size>? = null
+    var sizeFilterArray: ArrayList<SubjectSettingEntity.Size>? = null
 
     private var mOnConfigFilterSetupListener: OnConfigFilterSetupListener? = null
     private var mSelectionTvList: ArrayList<TextView>
-    private var highlightedSortedType: SortType? = null
 
     init {
         View.inflate(context, R.layout.layout_config_filter, this)
@@ -54,9 +45,6 @@ class ConfigFilterView @JvmOverloads constructor(
         updateTv = findViewById(R.id.updateTv)
         recommendedTv = findViewById(R.id.recommended_tv)
         container = findViewById(R.id.config_controller)
-        dot1 = findViewById(R.id.dot1)
-        dot2 = findViewById(R.id.dot2)
-        dot3 = findViewById(R.id.dot3)
 
         mSelectionTvList = arrayListOf(newestTv, ratingTv, updateTv, recommendedTv)
 
@@ -66,30 +54,24 @@ class ConfigFilterView @JvmOverloads constructor(
         }
 
         ratingTv.setOnClickListener {
-            highlightedSortedType = SortType.RATING
             mOnConfigFilterSetupListener?.onSetupSortType(SortType.RATING)
             updateHighlightedTextView(ratingTv)
         }
 
         updateTv.setOnClickListener {
-            highlightedSortedType = SortType.UPDATE
             mOnConfigFilterSetupListener?.onSetupSortType(SortType.UPDATE)
             updateHighlightedTextView(updateTv)
         }
 
         newestTv.setOnClickListener {
-            highlightedSortedType = SortType.NEWEST
             mOnConfigFilterSetupListener?.onSetupSortType(SortType.NEWEST)
             updateHighlightedTextView(newestTv)
         }
 
         recommendedTv.setOnClickListener {
-            highlightedSortedType = SortType.RECOMMENDED
             mOnConfigFilterSetupListener?.onSetupSortType(SortType.RECOMMENDED)
             updateHighlightedTextView(recommendedTv)
         }
-
-        updateAllTextView(SortType.UPDATE)
     }
 
     private fun updateHighlightedTextView(highlightedTv: TextView) {
@@ -98,17 +80,14 @@ class ConfigFilterView @JvmOverloads constructor(
         }
     }
 
-    fun updateAllTextView(sortType: SortType? = highlightedSortedType) {
-        highlightedSortedType = sortType
-        sortType?.let {
-            when (it) {
-                SortType.RECOMMENDED -> updateHighlightedTextView(recommendedTv)
-                SortType.NEWEST -> updateHighlightedTextView(newestTv)
-                SortType.RATING -> updateHighlightedTextView(ratingTv)
-                SortType.UPDATE -> updateHighlightedTextView(updateTv)
-            }
-            mSizeTv.setTextColor(com.gh.gamecenter.common.R.color.text_tertiary.toColor(context))
+    fun updateAllTextView(sortType: SortType) {
+        when (sortType) {
+            SortType.RECOMMENDED -> updateHighlightedTextView(recommendedTv)
+            SortType.NEWEST -> updateHighlightedTextView(newestTv)
+            SortType.RATING -> updateHighlightedTextView(ratingTv)
+            SortType.UPDATE -> updateHighlightedTextView(updateTv)
         }
+        mSizeTv.setTextColor(com.gh.gamecenter.common.R.color.text_757575.toColor(context))
     }
 
     fun setOnConfigSetupListener(onConfigFilterSetupListener: OnConfigFilterSetupListener) {
@@ -117,11 +96,11 @@ class ConfigFilterView @JvmOverloads constructor(
 
     private fun toggleHighlightedTextView(targetTextView: TextView, highlightIt: Boolean) {
         if (highlightIt) {
-            targetTextView.setTextColor(com.gh.gamecenter.common.R.color.text_secondary.toColor(context))
-            targetTextView.setTypeface(Typeface.DEFAULT, Typeface.BOLD)
+            targetTextView.background = R.drawable.bg_tag_text.toDrawable()
+            targetTextView.setTextColor(com.gh.gamecenter.common.R.color.text_white.toColor(context))
         } else {
-            targetTextView.setTextColor(com.gh.gamecenter.common.R.color.text_tertiary.toColor(context))
-            targetTextView.setTypeface(Typeface.DEFAULT, Typeface.NORMAL)
+            targetTextView.background = null
+            targetTextView.setTextColor(com.gh.gamecenter.common.R.color.text_757575.toColor(context))
         }
     }
 
@@ -133,8 +112,8 @@ class ConfigFilterView @JvmOverloads constructor(
     }
 
     private fun showSelectionPopupWindow(containerView: View, sizeTv: TextView, sizeText: String) {
-        sizeTv.setTextColor(com.gh.gamecenter.common.R.color.text_primary.toColor(sizeTv.context))
-        sizeTv.setDrawableEnd(R.drawable.ic_auxiliary_arrow_up_primary_8)
+        sizeTv.setTextColor(com.gh.gamecenter.common.R.color.text_theme.toColor(sizeTv.context))
+        sizeTv.setDrawableEnd(R.drawable.ic_filter_arrow_up)
 
         val inflater = LayoutInflater.from(sizeTv.context)
         val layout = inflater.inflate(R.layout.layout_filter_size, null)
@@ -157,39 +136,43 @@ class ConfigFilterView @JvmOverloads constructor(
             }
         }
 
-        flexboxLayout.setOnClickListener {  }
         backgroundView.setOnClickListener {
             popupWindow.dismiss()
         }
 
         for (size in sizeFilterArray!!) {
-            val item = inflater.inflate(R.layout.item_config_filter_size, flexboxLayout, false)
+            val item = inflater.inflate(R.layout.item_filter_size, flexboxLayout, false)
 
             // 单列 4 个，强行设置宽度为屏幕的 1/4
-            val width = (sizeTv.context.resources.displayMetrics.widthPixels - 56F.dip2px()) / 4
+            val width = sizeTv.context.resources.displayMetrics.widthPixels / 4
             val height = item.layoutParams.height
 
             item.layoutParams = ViewGroup.LayoutParams(width, height)
             flexboxLayout.addView(item)
 
-            val tv = item.findViewById<CheckedTextView>(R.id.size_tv)
+            val tv = item.findViewById<TextView>(R.id.size_tv)
             tv.text = size.text
-            tv.isChecked = sizeText == size.text
+
+            if (sizeText == size.text) {
+                toggleHighlightedTextView(tv, true)
+            } else {
+                toggleHighlightedTextView(tv, false)
+            }
+
             tv.tag = size.text
 
-            tv.setOnClickListener {
-                flexboxLayout.forEach { checkedTv ->
-                    (checkedTv as CheckedTextView).isChecked = checkedTv == tv
-                }
+            item.setOnClickListener {
+                toggleHighlightedTextView(tv, true)
                 popupWindow.dismiss()
                 sizeTv.text = size.text
+
                 mOnConfigFilterSetupListener?.onSetupSortSize(size)
             }
         }
 
         popupWindow.setOnDismissListener {
-            sizeTv.setTextColor(com.gh.gamecenter.common.R.color.text_tertiary.toColor(sizeTv.context))
-            sizeTv.setDrawableEnd(R.drawable.ic_auxiliary_arrow_down_8)
+            sizeTv.setTextColor(com.gh.gamecenter.common.R.color.text_757575.toColor(sizeTv.context))
+            sizeTv.setDrawableEnd(R.drawable.ic_filter_arrow_down)
             mPopupWindow = null
         }
 
@@ -210,49 +193,6 @@ class ConfigFilterView @JvmOverloads constructor(
         }
     }
 
-    fun initSubjectFilterView(subjectSetting: SubjectSettingEntity) {
-        ratingTv.visibility = View.VISIBLE
-
-        if (subjectSetting.filterOptions.size > 1) {
-            // 重排序
-            subjectSetting.filterOptions.forEachIndexed { index, s ->
-                when (index) {
-                    0 -> updateTv.text = s
-                    1 -> recommendedTv.text = s
-                    2 -> newestTv.text = s
-                    3 -> ratingTv.text = s
-                }
-            }
-        } else {
-            updateTv.setPadding(0)
-            updateTv.setTypeface(Typeface.DEFAULT, Typeface.NORMAL)
-            updateTv.isClickable = false
-            updateTv.text = when (subjectSetting.filterOptions.first()) {
-                "推荐" -> "根据光环推荐排序"
-                "最新" -> "根据游戏上新排序"
-                "评分" -> "根据游戏评分排序"
-                "更新" -> "根据更新时间排序"
-                else -> subjectSetting.filterOptions.first()
-            }
-        }
-
-        // 隐藏相关选项
-        updateTv.goneIf(subjectSetting.filterOptions.isEmpty())
-        recommendedTv.goneIf(subjectSetting.filterOptions.size <= 1)
-        dot1.goneIf(subjectSetting.filterOptions.size <= 1)
-        newestTv.goneIf(subjectSetting.filterOptions.size <= 2)
-        dot2.goneIf(subjectSetting.filterOptions.size <= 2)
-        ratingTv.goneIf(subjectSetting.filterOptions.size <= 3)
-        dot3.goneIf(subjectSetting.filterOptions.size <= 3)
-        sizeFilterArray = subjectSetting.filterSizes
-
-        if (subjectSetting.filterOptions.size == 1) {
-            updateTv.setTextColor(com.gh.gamecenter.common.R.color.text_tertiary.toColor(context))
-            updateTv.setTypeface(Typeface.DEFAULT, Typeface.NORMAL)
-            highlightedSortedType = null
-        }
-    }
-
     interface OnConfigFilterSetupListener {
         fun onShowSortSize()
         fun onSetupSortSize(sortSize: SubjectSettingEntity.Size)

app/src/main/java/com/gh/common/view/FlexLinearLayout.kt

@@ -32,7 +32,6 @@ class FlexLinearLayout @JvmOverloads constructor(context: Context, attrs: Attrib
     private var mLastItemWidth = 0//最后更多按钮宽度
     private var mTotalWidth = 0
     private var mStrokeWidth = 0
-    private var mShowMore = true
     var onClickListener: OnItemClickListener? = null
 
     init {
@@ -45,12 +44,11 @@ class FlexLinearLayout @JvmOverloads constructor(context: Context, attrs: Attrib
         mTextSize = ta.getDimension(R.styleable.FlexLinearLayout_itemTextSize, 10F.sp2px().toFloat())
         mLastItemWidth = ta.getDimensionPixelSize(R.styleable.FlexLinearLayout_lastItemWidth, 18F.dip2px())
         mStrokeWidth = ta.getDimensionPixelSize(R.styleable.FlexLinearLayout_strokeWidth, 0.5F.dip2px())
-        mShowMore = ta.getBoolean(R.styleable.FlexLinearLayout_showMore, true)
 
         ta.recycle()
     }
 
-    fun setTags(tags: List<TagStyleEntity>) {
+    fun setTags(tags: ArrayList<TagStyleEntity>) {
         mTags.clear()
         mTotalCount = tags.size
         mTotalWidth = measuredWidth
@@ -88,7 +86,7 @@ class FlexLinearLayout @JvmOverloads constructor(context: Context, attrs: Attrib
         mTags.forEachIndexed { index, tag ->
             addView(createView(tag, index))
         }
-        if (mShowMore && mTotalCount != mTags.size) {
+        if (mTotalCount != mTags.size) {
             val imageView = ImageView(context).apply {
                 val params = LayoutParams(mLastItemWidth, mItemHeight)
                 layoutParams = params

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

@@ -3,15 +3,9 @@ package com.gh.common.xapk
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
-import android.net.Uri
 import android.os.Build
 import android.os.Environment
-import android.provider.DocumentsContract
 import android.provider.Settings
-import androidx.activity.result.ActivityResultLauncher
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.app.AppCompatActivity
-import androidx.documentfile.provider.DocumentFile
 import com.gh.common.constant.Config
 import com.gh.common.util.DirectUtils
 import com.gh.common.util.DownloadNotificationHelper
@@ -30,7 +24,6 @@ import com.gh.gamecenter.xapk.core.XApkUnZipCallback
 import com.gh.gamecenter.xapk.core.XApkUnZipEntry
 import com.gh.gamecenter.xapk.core.XApkUnZipOutputFactory
 import com.gh.gamecenter.xapk.io.NonSplitApksOutput
-import com.gh.gamecenter.xapk.io.OBBDocOutput
 import com.gh.gamecenter.xapk.io.OBBFileOutput
 import com.gh.gamecenter.xapk.io.SplitApksOutput
 import com.gh.gamecenter.xapk.io.XApkFileOutput
@@ -41,8 +34,6 @@ import com.lightgame.download.DownloadEntity
 import com.lightgame.utils.Utils
 import java.io.File
 import java.util.*
-import androidx.core.net.toUri
-import com.gh.gamecenter.core.utils.SPUtils
 
 /**
  * 目前已知的Xapk内容是:只有一个apk包和一个或做多个obb数据包(多余文件不解压,如果存在多个apk包,则以下安装无效)
@@ -74,10 +65,6 @@ object XapkInstaller : XApkUnZipCallback, XApkUnZipOutputFactory {
         systemMatched && fileListMatched
     }
 
-    // 是否使用 DocumentUi 的方式访问 obb 文件夹
-    private var useDocStyleToUnzip = false
-    private var tempLauncher: ActivityResultLauncher<Uri>? = null
-
     private const val GUIDE_TYPE_MIUI_OPTIMIZATION = "miui_optimization"
     private const val MIUI_OPTIMIZATION_WARNING_DIALOG_ENTRANCE = "MIUI优化关闭提示弹窗"
 
@@ -134,39 +121,13 @@ object XapkInstaller : XApkUnZipCallback, XApkUnZipOutputFactory {
             }
 
             PermissionHelper.checkManageAllFilesOrStoragePermissionBeforeAction(context) {
-                val unzipAction = {
-                    DownloadManager.getInstance().getDownloadEntitySnapshot(downloadEntity.url, downloadEntity.gameId)
-                        ?.let {
-                            unzipXapkFile(it)
-                            if (showUnzipToast) {
-                                Utils.toast(mContext, "解压过程请勿退出光环助手！")
-                            }
+                DownloadManager.getInstance().getDownloadEntitySnapshot(downloadEntity.url, downloadEntity.gameId)
+                    ?.let {
+                        unzipXapkFile(it)
+                        if (showUnzipToast) {
+                            Utils.toast(mContext, "解压过程请勿退出光环助手！")
                         }
-                }
-
-                // XAPK (apks) 格式，不在乎 obb 文件夹是否可读
-                if (downloadEntity.format == Constants.XAPK_APKS_FORMAT) {
-                    unzipAction.invoke()
-                    return@checkManageAllFilesOrStoragePermissionBeforeAction
-                }
-
-                // 以 file 的方式访问 obb 文件夹是否可行
-                val isFileStyleObbFolderReadable =
-                    if (systemHasFlaw) {
-                        File(Environment.getExternalStorageDirectory().path, "\u200bAndroid/obb").list() != null
-                    } else {
-                        File(Environment.getExternalStorageDirectory().path, "Android/obb").list() != null
                     }
-
-                // 如果是文件夹风格的 obb 文件夹可读，或当前上下文不是 AppCompatActivity，或当前上下文已经被销毁，则直接解压
-                if (isFileStyleObbFolderReadable
-                    || context !is AppCompatActivity
-                    || context.isFinishing
-                ) {
-                    unzipAction.invoke()
-                } else {
-                    unzipWithCulpritHandled(context, downloadEntity.url, unzipAction)
-                }
             }
         } else {
             throwExceptionInDebug("如果是Apk包请使用PackageInstaller进行安装")
@@ -174,82 +135,6 @@ object XapkInstaller : XApkUnZipCallback, XApkUnZipOutputFactory {
         }
     }
 
-    /**
-     * 兜底解压方案，适用于一些奇葩系统
-     */
-    private fun unzipWithCulpritHandled(activity: AppCompatActivity, xApkUrl: String, unzipAction: () -> Unit?) {
-        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.R
-            || Build.VERSION.SDK_INT == Build.VERSION_CODES.S
-        ) {
-            val isDocStyleObbFolderReadable = isDocStyleObbFolderReadable(activity)
-
-            if (isDocStyleObbFolderReadable) {
-                useDocStyleToUnzip = true
-                unzipAction.invoke()
-            } else {
-                DialogHelper.showDialog(
-                    context = activity,
-                    title = "安装提示",
-                    content = "为了安装 XAPK 文件，请授予 OBB 文件夹的访问权限",
-                    confirmText = "确定",
-                    cancelText = "取消",
-                    confirmClickCallback = {
-                        val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE)
-                        intent.setFlags(
-                            Intent.FLAG_GRANT_READ_URI_PERMISSION
-                                    and Intent.FLAG_GRANT_WRITE_URI_PERMISSION
-                                    and Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION
-                                    and Intent.FLAG_GRANT_PREFIX_URI_PERMISSION
-                        )
-
-                        val obbUri = OBBDocOutput.ANDROID_OBB_DOC_STYLE_URI.toUri()
-                        val df = DocumentFile.fromTreeUri(activity, obbUri)
-                        if (df != null) {
-                            intent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, df.uri)
-                        }
-
-                        tempLauncher =
-                            activity.registerActivityResultLauncher(ActivityResultContracts.OpenDocumentTree()) { uri ->
-                                if (uri != null) {
-                                    activity.contentResolver.takePersistableUriPermission(
-                                        uri,
-                                        Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION
-                                    )
-
-                                    useDocStyleToUnzip = true
-                                    unzipAction.invoke()
-                                }
-
-                                tempLauncher?.unregister()
-                            }
-
-                        tempLauncher?.launch(obbUri)
-                    },
-                    cancelClickCallback = {
-                        unzipAction.invoke()
-                    }
-                )
-            }
-        } else {
-            PermissionHelper.checkStoragePermissionBeforeAction(activity) {
-                // 设备大于 12，需要重启才能生效 （是的，我们又重启了！）
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-                    // 记录应用重启前需要重解压的信息
-                    SPUtils.setString(Constants.SP_XAPK_UNZIP_ACTIVITY, activity.javaClass.name)
-                    SPUtils.setString(Constants.SP_XAPK_URL, xApkUrl)
-
-                    val pm = activity.packageManager
-                    val intent = pm.getLaunchIntentForPackage(activity.packageName)
-                    val mainIntent = Intent.makeRestartActivityTask(intent!!.component)
-                    activity.startActivity(mainIntent)
-                    Runtime.getRuntime().exit(0)
-                } else {
-                    unzipAction.invoke()
-                }
-            }
-        }
-    }
-
     private fun unzipXapkFile(downloadEntity: DownloadEntity) {
         mXApkUnZipper.unzip(
             XApkUnZipEntry(
@@ -306,14 +191,21 @@ object XapkInstaller : XApkUnZipCallback, XApkUnZipOutputFactory {
             DownloadNotificationHelper.addOrUpdateDownloadNotification(downloadEntity)
             NDataChanger.notifyDataChanged(downloadEntity)
             DownloadManager.getInstance().updateDownloadEntity(downloadEntity)
+            // 仅官网渠道上报 XAPK 异常信息
+            if (HaloApp.getInstance().channel == "GH_206") {
+                SentryHelper.onEvent(
+                    "XAPK_UNZIP_ERROR",
+                    "gameName", downloadEntity.name,
+                    "errorDigest", exception.localizedMessage
+                )
+            }
 
             DownloadDataHelper.uploadDownloadStatusEvent(downloadEntity, "xapk解压失败")
 
             SensorsBridge.trackGameDecompressionFailed(
                 downloadEntity.gameId,
                 downloadEntity.name,
-                downloadEntity.categoryChinese,
-                exception.localizedMessage ?: "unknown error"
+                downloadEntity.categoryChinese
             )
         }
 
@@ -432,7 +324,7 @@ object XapkInstaller : XApkUnZipCallback, XApkUnZipOutputFactory {
     }
 
     override fun onCreateOBBOutput(apk: XApkFile): XApkFileOutput<Unit> {
-        return if (useDocStyleToUnzip) OBBDocOutput(mContext) else OBBFileOutput()
+        return OBBFileOutput()
     }
 
     override fun onCreateApkOutput(apk: XApkFile): XApkFileOutput<IPackageInstaller> {
@@ -448,16 +340,6 @@ object XapkInstaller : XApkUnZipCallback, XApkUnZipOutputFactory {
         }
     }
 
-    /**
-     * 是否能以 DocumentUi 的方式访问 obb 文件夹
-     */
-    private fun isDocStyleObbFolderReadable(context: Context): Boolean {
-        return context
-            .contentResolver
-            .persistedUriPermissions
-            .any { it.uri == OBBDocOutput.ANDROID_OBB_URI.toUri() }
-    }
-
     private class SplitApksInstaller(
         private val xApkFile: XApkFile,
         private val sessionId: Int,
@@ -469,12 +351,7 @@ object XapkInstaller : XApkUnZipCallback, XApkUnZipOutputFactory {
 
             mPendingSessionInfoMap[downloadEntity.path] = XapkPendingSessionInfo(downloadEntity.path, sessionId)
             AppExecutor.ioExecutor.execute {// 有可能卡顿造成anr
-                PackageInstaller.installMultiple(
-                    applicationContext,
-                    downloadEntity.packageName,
-                    downloadEntity.path,
-                    sessionId
-                )
+                PackageInstaller.installMultiple(applicationContext, downloadEntity.packageName, downloadEntity.path, sessionId)
                 NDataChanger.notifyDataChanged(downloadEntity)
             }
         }

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

@@ -17,6 +17,15 @@ import androidx.collection.ArrayMap;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 
+import com.gh.gamecenter.common.base.GlobalActivityManager;
+import com.gh.gamecenter.common.utils.ExtensionsKt;
+import com.gh.gamecenter.common.utils.SensorsBridge;
+import com.gh.gamecenter.core.AppExecutor;
+import com.gh.gamecenter.common.constant.Constants;
+import com.gh.gamecenter.core.GHThreadFactory;
+import com.gh.gamecenter.feature.entity.TagStyleEntity;
+import com.gh.gamecenter.feature.entity.CustomPageTrackData;
+import com.gh.gamecenter.feature.exposure.ExposureEvent;
 import com.gh.common.exposure.ExposureUtils;
 import com.gh.common.history.HistoryHelper;
 import com.gh.common.simulator.SimulatorGameManager;
@@ -27,17 +36,10 @@ import com.gh.common.util.LunchType;
 import com.gh.common.util.PackageInstaller;
 import com.gh.common.util.PackageUtils;
 import com.gh.gamecenter.BuildConfig;
-import com.gh.gamecenter.common.base.GlobalActivityManager;
-import com.gh.gamecenter.common.constant.Constants;
-import com.gh.gamecenter.common.entity.LinkEntity;
 import com.gh.gamecenter.common.exposure.meta.MetaUtil;
 import com.gh.gamecenter.common.utils.DeviceUtils;
-import com.gh.gamecenter.common.utils.ExtensionsKt;
 import com.gh.gamecenter.common.utils.FileUtils;
 import com.gh.gamecenter.common.utils.NetworkUtils;
-import com.gh.gamecenter.common.utils.SensorsBridge;
-import com.gh.gamecenter.core.AppExecutor;
-import com.gh.gamecenter.core.GHThreadFactory;
 import com.gh.gamecenter.core.utils.GsonUtils;
 import com.gh.gamecenter.core.utils.PageSwitchDataHelper;
 import com.gh.gamecenter.core.utils.SPUtils;
@@ -46,11 +48,8 @@ import com.gh.gamecenter.entity.GameUpdateEntity;
 import com.gh.gamecenter.entity.HomePluggableFilterEntity;
 import com.gh.gamecenter.eventbus.EBDownloadStatus;
 import com.gh.gamecenter.feature.entity.ApkEntity;
-import com.gh.gamecenter.feature.entity.CustomPageTrackData;
 import com.gh.gamecenter.feature.entity.GameEntity;
 import com.gh.gamecenter.feature.entity.PluginLocation;
-import com.gh.gamecenter.feature.entity.TagStyleEntity;
-import com.gh.gamecenter.feature.exposure.ExposureEvent;
 import com.gh.gamecenter.feature.utils.SentryHelper;
 import com.gh.gamecenter.login.user.UserManager;
 import com.gh.gamecenter.manager.PackagesManager;
@@ -361,17 +360,6 @@ public class DownloadManager implements DownloadStatusListener {
             ExtensionsKt.addMetaExtra(downloadEntity, VHelper.KEY_REQUIRED_G_APPS, gameEntity.getGAppsSwitch());
         }
 
-        if (gameEntity.isDspGame()) {
-            ExtensionsKt.addMetaExtra(downloadEntity, Constants.DSP_GAME, "true");
-            ExtensionsKt.addMetaExtra(downloadEntity, Constants.SEARCH_KEY, gameEntity.getSearchKey());
-            ExtensionsKt.addMetaExtra(downloadEntity, Constants.SUBJECT_NAME, gameEntity.getSubjectName());
-            ExtensionsKt.addMetaExtra(downloadEntity, Constants.SUBJECT_ID, gameEntity.getSubjectId());
-
-            ExtensionsKt.addMetaExtra(downloadEntity, Constants.INSTALL_URL, gameEntity.getInstallUrl());
-            ExtensionsKt.addMetaExtra(downloadEntity, Constants.DOWNLOAD_URL, gameEntity.getDownloadUrl());
-            ExtensionsKt.addMetaExtra(downloadEntity, Constants.DSP_AD_ID, gameEntity.getDspAdId());
-        }
-
         ExtensionsKt.addMetaExtra(downloadEntity, Constants.KEY_BIT, apkEntity.getBit());
 
         // 记录是否为双下载按钮模式
@@ -463,15 +451,8 @@ public class DownloadManager implements DownloadStatusListener {
             trackDownloadType = "本地下载";
         }
 
-        String pushMessageId = HaloApp.get(Constants.PUSH_MESSAGE_ID, false) instanceof String
-                ? (String) HaloApp.get(Constants.PUSH_MESSAGE_ID, false)
-                : "";
-        String pushLinkId = HaloApp.get(Constants.PUSH_LINK_ENTITY, false) instanceof LinkEntity
-                ? ((LinkEntity) HaloApp.get(Constants.PUSH_LINK_ENTITY, false)).getLink()
-                : "";
-        boolean isFromPush = !pushMessageId.isEmpty();
 
-        Object[] arrayKv = {
+        String[] arrayKv = {
                 "game_id", gameEntity.getId(),
                 "game_name", gameEntity.getName(),
                 "game_type", gameEntity.getCategoryChinese(),
@@ -484,49 +465,17 @@ public class DownloadManager implements DownloadStatusListener {
                 "last_page_id", GlobalActivityManager.getLastPageEntity().getPageId(),
                 "last_page_business_id", GlobalActivityManager.getLastPageEntity().getPageBusinessId(),
                 "download_status", gameEntity.getDownloadStatusChinese(),
-                "download_type", trackDownloadType,
-                "is_from_push_notifications", isFromPush,
-                "message_id", pushMessageId,
-                "link_id", pushLinkId,
+                "download_type", trackDownloadType
         };
 
-        List<Object> kvs = new ArrayList<>(Arrays.asList(arrayKv));
-
+        List<String> kvs = new ArrayList<>(Arrays.asList(arrayKv));
         if (customPageTrackData != null) {
             kvs.addAll(Arrays.asList(customPageTrackData.toKV()));
         }
 
-        if (!gameEntity.isDspGame()) {
-            SensorsBridge.trackEventWithExposureSource(
-                    "DownloadProcessBegin",
-                    downloadExposureEvent.getSource(), kvs.toArray(new Object[0])
-            );
-        } else {
-            String searchKey = gameEntity.getSearchKey();
-            String loc;
-
-            if (TextUtils.isEmpty(searchKey)) {
-                loc = "自定义页面";
-            } else {
-                loc = "游戏搜索结果列表";
-            }
-
-            kvs.add("ad_id");
-            kvs.add(gameEntity.getDspAdId());
-            kvs.add("search_content");
-            kvs.add(searchKey);
-            kvs.add("game_column_name");
-            kvs.add(gameEntity.getSubjectName());
-            kvs.add("game_column_id");
-            kvs.add(gameEntity.getSubjectId());
-            kvs.add("location");
-            kvs.add(loc);
-
-            SensorsBridge.trackEventWithExposureSource(
-                    "DspAdDownloadBegin",
-                    downloadExposureEvent.getSource(), kvs.toArray(new Object[0])
-            );
-        }
+        SensorsBridge.trackEventWithExposureSource("DownloadProcessBegin",
+                downloadExposureEvent.getSource(), kvs.toArray(new String[0])
+        );
 
         //TODO remove
         DownloadManager.getInstance().putStatus(downloadEntity.getUrl(), DownloadStatus.downloading);
@@ -1347,7 +1296,7 @@ public class DownloadManager implements DownloadStatusListener {
         getInstance().packageExecutor.execute(() -> {
             boolean markHasChanged = false;
 
-            List<GameUpdateEntity> updates = PackageRepository.INSTANCE.getGameUpdate();
+            ArrayList<GameUpdateEntity> updates = PackageRepository.INSTANCE.getGameUpdate();
             for (GameUpdateEntity update : updates) {
                 if (update == null) continue;
                 String mark = update.getId() + update.getPackageName();
@@ -1368,7 +1317,7 @@ public class DownloadManager implements DownloadStatusListener {
      * 将可用更新标记为已读的事件
      */
     public void saveUpdateMarkToStorage() {
-        List<GameUpdateEntity> updates = PackageRepository.INSTANCE.getGameUpdate();
+        ArrayList<GameUpdateEntity> updates = PackageRepository.INSTANCE.getGameUpdate();
         if (updates.size() == mUpdateMarks.size()) {
             SPUtils.setStringSet(UPDATE_IS_READ_MARK, mUpdateMarks);
             return;

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

@@ -175,9 +175,7 @@ object PackageObserver {
                     SensorsBridge.trackInstallGameClick(
                         gameId = mDownloadEntity.gameId,
                         gameName = mDownloadEntity.name,
-                        action = "自动安装",
-                        isDspGame = mDownloadEntity.getMetaExtra(Constants.DSP_GAME) == "true",
-                        dspAdId = mDownloadEntity.getMetaExtra(Constants.DSP_AD_ID)
+                        action = "自动安装"
                     )
                     PackageInstaller.install(application, mDownloadEntity)
                 }

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

@@ -15,8 +15,7 @@ import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.*
 import androidx.recyclerview.widget.RecyclerView.SmoothScroller
-import com.gh.common.util.DialogUtils
-import com.gh.common.util.DirectUtils
+import com.gh.common.util.*
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.BuildConfig
 import com.gh.gamecenter.R
@@ -31,9 +30,9 @@ import com.gh.gamecenter.core.AppExecutor
 import com.gh.gamecenter.core.utils.TimeElapsedHelper
 import com.gh.gamecenter.databinding.DialogDownloadBinding
 import com.gh.gamecenter.entity.GamePlatform
-import com.gh.gamecenter.eventbus.EBPackage
 import com.gh.gamecenter.feature.entity.ApkEntity
 import com.gh.gamecenter.feature.entity.GameEntity
+import com.gh.gamecenter.eventbus.EBPackage
 import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.halo.assistant.HaloApp
 import com.lightgame.download.DataWatcher
@@ -71,8 +70,6 @@ class DownloadDialog : BaseDraggableDialogFragment() {
     private var mEntrance: String = "" // 入口位置
     private var mLocation: String = "" // 最终位置
 
-    private var onDownloadClickAction: ((Boolean) -> Unit)? = null
-
 
     private val mDataWatcher = object : DataWatcher() {
         override fun onDataChanged(downloadEntity: DownloadEntity) {
@@ -125,7 +122,7 @@ class DownloadDialog : BaseDraggableDialogFragment() {
         }
         mViewModel.listLiveData.observeNonNull(this, callback = { itemList ->
             mAdapter =
-                DownloadDialogAdapter(requireContext(), mViewModel, itemList, false, mTraceEvent, mEntrance, mLocation, onDownloadClickAction)
+                DownloadDialogAdapter(requireContext(), mViewModel, itemList, false, mTraceEvent, mEntrance, mLocation)
             mBinding.contentList.layoutManager = createLayoutManager(itemList)
             mBinding.contentList.adapter = mAdapter
             performAutoDownload(itemList, mBinding.contentList)
@@ -164,8 +161,7 @@ class DownloadDialog : BaseDraggableDialogFragment() {
                     true,
                     mTraceEvent,
                     mEntrance,
-                    mLocation,
-                    onDownloadClickAction
+                    mLocation
                 )
                 mBinding.collectionList.layoutManager = createLayoutManager(itemList)
                 mBinding.collectionList.adapter = mCollectionAdapter
@@ -430,8 +426,7 @@ class DownloadDialog : BaseDraggableDialogFragment() {
             gameEntity: GameEntity,
             traceEvent: ExposureEvent?,
             entrance: String?,
-            location: String?,
-            onDownloadClickAction: ((Boolean) -> Unit)? = null
+            location: String?
         ) {
             val fragmentActivity: FragmentActivity = if (context is FragmentActivity) {
                 context
@@ -457,7 +452,6 @@ class DownloadDialog : BaseDraggableDialogFragment() {
                 bundle.putParcelable(EntranceConsts.KEY_TRACE_EVENT, traceEvent)
                 arguments = bundle
             }
-            downloadDialog.onDownloadClickAction = onDownloadClickAction
             downloadDialog.show(fragmentActivity.supportFragmentManager, DownloadDialog::class.java.name)
         }
 

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

@@ -24,8 +24,7 @@ class DownloadDialogAdapter(
     val isCollectionPage: Boolean,
     private val mTraceEvent: ExposureEvent?,
     private val mEntrance: String,
-    private val mLocation: String,
-    private val onDownloadClickAction: ((Boolean) -> Unit)? = null
+    private val mLocation: String
 ) : BaseRecyclerAdapter<RecyclerView.ViewHolder>(context) {
 
     private val mPath = if (isCollectionPage) {
@@ -171,8 +170,7 @@ class DownloadDialogAdapter(
                     mTraceEvent,
                     mEntrance,
                     mPath,
-                    mLocation,
-                    onDownloadClickAction
+                    mLocation
                 )
             }
         }

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

@@ -41,8 +41,7 @@ class DownloadDialogItemViewHolder(val binding: DownloadDialogItemBinding) : Bas
         traceEvent: ExposureEvent?,
         entrance: String,
         path: String,
-        location: String,
-        onDownloadClickAction: ((Boolean) -> Unit)? = null
+        location: String
     ) {
 
         val apkEntity = listData[position].normal!!
@@ -182,7 +181,7 @@ class DownloadDialogItemViewHolder(val binding: DownloadDialogItemBinding) : Bas
             }
         }
 
-        setDownloadClickListener(itemView, apkEntity, viewModel, traceEvent, entrance, path, location, onDownloadClickAction)
+        setDownloadClickListener(itemView, apkEntity, viewModel, traceEvent, entrance, path, location)
     }
 
     private fun changeRecommendUI(apkEntity: ApkEntity, listData: List<DownloadDialogItemData>, position: Int) {
@@ -227,8 +226,7 @@ class DownloadDialogItemViewHolder(val binding: DownloadDialogItemBinding) : Bas
             traceEvent: ExposureEvent?,
             entrance: String,
             path: String,
-            location: String,
-            onDownloadClickAction: ((Boolean) -> Unit)? = null
+            location: String
         ) {
 
             val gameEntity = viewModel.gameEntity
@@ -236,7 +234,6 @@ class DownloadDialogItemViewHolder(val binding: DownloadDialogItemBinding) : Bas
                 when (itemView.getTag(DownloadDialogAdapter.ITEM_TAG_KEY)) {
                     DownloadDialogItemStatus.DOWNLOAD -> {
                         createDownloadTask(it.context, apkEntity, gameEntity, traceEvent, entrance, location)
-                        onDownloadClickAction?.invoke(false)
                     }
                     DownloadDialogItemStatus.LAUNCH -> {
                         PackageLauncher.launchApp(it.context, gameEntity, apkEntity.packageName)
@@ -294,7 +291,6 @@ class DownloadDialogItemViewHolder(val binding: DownloadDialogItemBinding) : Bas
                     }
                     DownloadDialogItemStatus.UPDATE -> {
                         createDownloadTask(it.context, apkEntity, gameEntity, traceEvent, entrance, location)
-                        onDownloadClickAction?.invoke(true)
                     }
                     DownloadDialogItemStatus.COLLECTION -> {
                         val apkCollection = apkEntity.apkCollection

app/src/main/java/com/gh/download/server/BrowserInstallHelper.kt

@@ -3,7 +3,6 @@ package com.gh.download.server
 import android.content.Context
 import android.os.Build
 import android.util.Base64
-import androidx.annotation.WorkerThread
 import com.gh.common.constant.Config
 import com.gh.common.util.DirectUtils
 import com.gh.common.util.LogUtils
@@ -247,19 +246,6 @@ object BrowserInstallHelper {
         }
     }
 
-    /**
-     * 初始化是否满足开启浏览器安装的条件（后续会使用缓存来判断）
-     * @param settingsEntity 服务器返回的配置
-     *
-     * 因为可能需要查询已安装的应用，所以需要在子线程中调用
-     */
-    @WorkerThread
-    fun initIfConditionMatched(settingsEntity: NewSettingsEntity?) {
-        settingsEntity?.let {
-            isConditionMatched(it)
-        }
-    }
-
     /**
      * 是否满足开启浏览器安装的条件
      */

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

@@ -0,0 +1,81 @@
+package com.gh.gamecenter
+
+import android.os.Bundle
+import android.widget.Button
+import androidx.appcompat.app.AppCompatActivity
+import com.gh.gamecenter.common.retrofit.Response
+import com.gh.gamecenter.core.provider.IAcceleratorProvider
+import com.gh.gamecenter.feature.entity.BaseEntity
+import com.gh.gamecenter.login.retrofit.RetrofitManager
+import com.gh.gamecenter.login.user.UserManager
+import com.therouter.TheRouter
+import io.reactivex.Observable
+import io.reactivex.Single
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.schedulers.Schedulers
+import retrofit2.HttpException
+
+
+/**
+ * 奇游用户批量注册
+ */
+class BatchRegisterActivity : AppCompatActivity() {
+
+    private val userIds = listOf(
+        ""
+    )
+    private var iAcceleratorProvider: IAcceleratorProvider? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_batch_register)
+
+        iAcceleratorProvider = TheRouter.get(IAcceleratorProvider::class.java)
+        val btnRegister = findViewById<Button>(R.id.btn_register)
+        btnRegister.setOnClickListener {
+            doRegister()
+        }
+    }
+
+    private fun doRegister() {
+        println("kayn -->doRegister:${userIds.size}")
+        Observable.fromIterable(userIds)
+            .flatMap({ userId ->
+                RetrofitManager.getInstance().newApi
+                    .getQyToken(userId, "gjonline_vip")
+                    .onErrorReturnItem(BaseEntity())
+                    .flatMap { entity ->
+                        val token = entity.data?.token ?: ""
+                        Single.create<Pair<Boolean, String>> {
+                            if (token.isBlank()) {
+                                it.onSuccess(false to userId)
+                            } else {
+                                iAcceleratorProvider?.setQyUserToken(token) { isSuccess ->
+                                    it.onSuccess(isSuccess to userId)
+                                }
+                            }
+                        }
+                    }.toObservable()
+
+            })
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(object : Response<Pair<Boolean, String>>() {
+                override fun onNext(response: Pair<Boolean, String>) {
+                    super.onNext(response)
+                    val (isSuccess, userId) = response
+                    println("kayn -->isSuccess:$isSuccess --userId:$userId")
+                }
+
+                override fun onFailure(e: HttpException?) {
+                    super.onFailure(e)
+                }
+
+                override fun onComplete() {
+                    super.onComplete()
+                }
+            })
+
+
+    }
+}

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

@@ -5,10 +5,15 @@ import android.content.ContextWrapper
 import android.content.Intent
 import android.os.Bundle
 import android.view.View
+import com.therouter.router.Autowired
+import com.therouter.router.Route
+import com.therouter.TheRouter
 import com.gh.base.DownloadToolbarActivity
 import com.gh.common.exposure.ExposureManager
 import com.gh.common.exposure.ExposureTraceUtils.appendTrace
 import com.gh.gamecenter.common.base.GlobalActivityManager
+import com.gh.gamecenter.common.base.activity.ToolBarActivity.NORMAL_FRAGMENT_BUNDLE
+import com.gh.gamecenter.common.base.activity.ToolBarActivity.NORMAL_FRAGMENT_NAME
 import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.utils.toArrayList
@@ -19,11 +24,7 @@ import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.gh.gamecenter.feature.exposure.ExposureEvent.Companion.createEvent
 import com.gh.gamecenter.feature.exposure.ExposureType
-import com.gh.gamecenter.gamedetail.GameDetailWrapperFragment
-import com.gh.gamecenter.gamedetail.entity.GameDetailTabEntity
-import com.therouter.TheRouter
-import com.therouter.router.Autowired
-import com.therouter.router.Route
+import com.gh.gamecenter.gamedetail.GameDetailFragment
 
 @Route(
     path = RouteConsts.activity.gameDetailActivity,
@@ -73,11 +74,11 @@ class GameDetailActivity : DownloadToolbarActivity() {
         generateDataFromRoute()
 
         super.onCreate(savedInstanceState)
-        DisplayUtils.setStatusBarColor(this, com.gh.gamecenter.common.R.color.transparent, !mIsDarkModeOn)
+        DisplayUtils.transparentStatusBar(this)
     }
 
     override fun provideNormalIntent(): Intent {
-        return getTargetIntent(this, GameDetailActivity::class.java, GameDetailWrapperFragment::class.java)
+        return getTargetIntent(this, GameDetailActivity::class.java, GameDetailFragment::class.java)
     }
 
     override fun getLayoutId() = R.layout.activity_game_detail
@@ -114,6 +115,7 @@ class GameDetailActivity : DownloadToolbarActivity() {
             view,
             listOf(
                 R.id.menu_download_iv,
+                R.id.gameBigEvent,
                 R.id.cardContainer,
                 R.id.iv_reserve,
                 R.id.iv_concern,
@@ -125,15 +127,10 @@ class GameDetailActivity : DownloadToolbarActivity() {
     private fun generateDataFromRoute() {
         val bundle = intent.extras
 
-        intent?.putExtra(NORMAL_FRAGMENT_NAME, GameDetailWrapperFragment::class.java.canonicalName)
+        intent?.putExtra(NORMAL_FRAGMENT_NAME, GameDetailFragment::class.java.canonicalName)
         intent?.putExtra(NORMAL_FRAGMENT_BUNDLE, bundle)
     }
 
-    override fun onDarkModeChanged() {
-        super.onDarkModeChanged()
-        DisplayUtils.setStatusBarColor(this, com.gh.gamecenter.common.R.color.transparent, !mIsDarkModeOn)
-    }
-
     companion object {
 
         @JvmStatic
@@ -193,12 +190,12 @@ class GameDetailActivity : DownloadToolbarActivity() {
             }
 
             if (scrollToLibao) {
-                bundle.putString(EntranceConsts.KEY_TARGET, GameDetailTabEntity.TYPE_DETAIL)
+                bundle.putString(EntranceConsts.KEY_TARGET, EntranceConsts.TAB_TYPE_DESC)
                 bundle.putBoolean(EntranceConsts.KEY_SCROLL_TO_LIBAO, true)
             }
 
             if (scrollToServer) {
-                bundle.putString(EntranceConsts.KEY_TARGET, GameDetailTabEntity.TYPE_DETAIL)
+                bundle.putString(EntranceConsts.KEY_TARGET, EntranceConsts.TAB_TYPE_DESC)
                 bundle.putBoolean(EntranceConsts.KEY_SCROLL_TO_SERVER, true)
             }
 
@@ -305,7 +302,7 @@ class GameDetailActivity : DownloadToolbarActivity() {
             }
             if (openVideoStreaming) {
                 bundle.putBoolean(EntranceConsts.KEY_OPEN_VIDEO_STREAMING, true)
-                bundle.putString(EntranceConsts.KEY_TARGET, GameDetailTabEntity.TYPE_DETAIL)
+                bundle.putString(EntranceConsts.KEY_TARGET, EntranceConsts.TAB_TYPE_DESC)
             }
             if (openPlatformWindow) {
                 bundle.putBoolean(EntranceConsts.KEY_OPEN_PLATFORM_WINDOW, true)
@@ -319,7 +316,7 @@ class GameDetailActivity : DownloadToolbarActivity() {
                 }
             }
             if (scrollToLibao) {
-                bundle.putString(EntranceConsts.KEY_TARGET, GameDetailTabEntity.TYPE_DETAIL)
+                bundle.putString(EntranceConsts.KEY_TARGET, EntranceConsts.TAB_TYPE_DESC)
                 bundle.putBoolean(EntranceConsts.KEY_SCROLL_TO_LIBAO, true)
             }
             bundle.putString(EntranceConsts.KEY_GAME_ID, gameId)

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

@@ -119,7 +119,6 @@ import com.sina.weibo.sdk.auth.AuthInfo;
 import com.sina.weibo.sdk.openapi.IWBAPI;
 import com.sina.weibo.sdk.openapi.WBAPIFactory;
 
-import com.therouter.TheRouter;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 import org.jetbrains.annotations.NotNull;
@@ -137,7 +136,6 @@ import io.reactivex.SingleSource;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.functions.Function;
 import io.reactivex.schedulers.Schedulers;
-import kotlin.Pair;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function0;
 import okhttp3.RequestBody;
@@ -183,6 +181,7 @@ public class MainActivity extends BaseActivity {
                 .get(MainWrapperViewModel.class);
 
         DisplayUtils.transparentStatusBar(this);
+        DisplayUtils.updateGlobalScreen(this);
 
         super.onCreate(savedInstanceState);
         setStatusBarColor(Color.TRANSPARENT);
@@ -223,7 +222,7 @@ public class MainActivity extends BaseActivity {
                 DialogHelper.showCenterWarningDialog(this, "发生闪退", "光环助手发生了闪退，建议安装到最新版本修复异常"
                         , "马上反馈", "马上安装修复",
                         () -> {
-                            DirectUtils.directToGameDetail(this, Constants.GHZS_GAME_ID, "", "crash", true, "desc", null, "");
+                            DirectUtils.directToGameDetail(this, Constants.GHZS_GAME_ID, "", "crash", true, "desc", null);
                             return null;
                         },
                         () -> {
@@ -256,12 +255,9 @@ public class MainActivity extends BaseActivity {
 
         // 跳转至其它页面
         if (getIntent() != null
-                && getIntent().getExtras() != null) {
-            if (getIntent().getBooleanExtra(EntranceConsts.KEY_REQUIRE_REDIRECT, false)) {
-                doSkip();
-            } else if (!TextUtils.isEmpty(getIntent().getStringExtra(EntranceConsts.KEY_THE_ROUTER_PATH))) {
-                doRedirect(getIntent().getStringExtra(EntranceConsts.KEY_THE_ROUTER_PATH));
-            }
+                && getIntent().getExtras() != null
+                && getIntent().getBooleanExtra(EntranceConsts.KEY_REQUIRE_REDIRECT, false)) {
+            doSkip();
         }
 
         // debug 模式下的快速跳转页面
@@ -460,10 +456,6 @@ public class MainActivity extends BaseActivity {
 
         handler.removeCallbacksAndMessages(null);
         releaseExoSourceCache();
-
-        // 移除推送触发启动记录
-        HaloApp.remove(Constants.PUSH_MESSAGE_ID);
-        HaloApp.remove(Constants.PUSH_LINK_ENTITY);
     }
 
     /**
@@ -828,19 +820,6 @@ public class MainActivity extends BaseActivity {
         }, 500);
     }
 
-    /**
-     * 重定向至 TheRouter 配置的页面
-     */
-    private void doRedirect(String path) {
-        if (getIntent().getExtras() != null) {
-            // 更新 intent 数据，避免页面重建重新跳转
-            getIntent().getExtras().putString(EntranceConsts.KEY_THE_ROUTER_PATH, "");
-            AppExecutor.getUiExecutor().executeWithDelay(() -> {
-                TheRouter.build(path).navigation(this);
-            }, 500L);
-        }
-    }
-
     @NonNull
     private Function0<Unit> launchGame(String gamePackageName) {
         return () -> {
@@ -944,9 +923,7 @@ public class MainActivity extends BaseActivity {
                                 SensorsBridge.trackInstallGameClick(
                                         finalDownloadEntity.getGameId(),
                                         finalDownloadEntity.getName(),
-                                        "主动安装",
-                                        "true".equals(ExtensionsKt.getMetaExtra(finalDownloadEntity, Constants.DSP_GAME)),
-                                        ExtensionsKt.getMetaExtra(finalDownloadEntity, Constants.DSP_AD_ID)
+                                        "主动安装"
                                 );
                                 PackageInstaller.install(MainActivity.this, finalDownloadEntity);
                             }, 200);
@@ -1067,9 +1044,7 @@ public class MainActivity extends BaseActivity {
                     SensorsBridge.trackInstallGameClick(
                             downloadEntity.getGameId(),
                             downloadEntity.getName(),
-                            "自动安装",
-                            "true".equals(ExtensionsKt.getMetaExtra(downloadEntity, Constants.DSP_GAME)),
-                            ExtensionsKt.getMetaExtra(downloadEntity, Constants.DSP_AD_ID)
+                            "自动安装"
                     );
                     PackageInstaller.install(this, downloadEntity, false, false);
                 }
@@ -1109,12 +1084,4 @@ public class MainActivity extends BaseActivity {
             }
         }
     }
-
-    @Override
-    public Pair<String, String> getBusinessId() {
-        if (mMainWrapperFragment != null) {
-            return mMainWrapperFragment.getBusinessId();
-        }
-        return super.getBusinessId();
-    }
 }

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

@@ -91,6 +91,7 @@ open class SearchActivity : BaseActivity() {
         mSourceEntrance = intent.getStringExtra(EntranceConsts.KEY_SOURCE_ENTRANCE) ?: ""
         val hint = intent.getStringExtra(EntranceConsts.KEY_HINT)
         val searchImmediately = intent.getBooleanExtra(KEY_SEARCH_IMMEDIATELY, false)
+        var ignoreTextChanges = savedInstanceState != null
 
         mPublishSubject = PublishSubject.create()
 
@@ -101,9 +102,12 @@ open class SearchActivity : BaseActivity() {
             .subscribe {
                 if (searchEt.text.isNotEmpty()
                     && searchEt.text != searchEt.hint
+                    && !ignoreTextChanges
                 ) {
                     search(SearchType.AUTO, it)
                 }
+
+                ignoreTextChanges = false
             }
 
         initSearchBar()
@@ -198,6 +202,7 @@ open class SearchActivity : BaseActivity() {
 
     protected open fun handleEmptySearch(newSearchKey: String) {
         popBackToFragment(SearchDefaultFragment::class.java.name)// 回退到搜索首页
+        updateDisplayType(DisplayType.DEFAULT)
         mPublishSubject?.onNext(newSearchKey)
     }
 

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

@@ -5,12 +5,11 @@ import android.content.Intent
 import android.os.Bundle
 import android.os.Parcelable
 import android.view.View
-import com.gh.gamecenter.amway.AmwaySuccessFragment
 import com.gh.gamecenter.common.base.activity.ToolBarActivity
 import com.gh.gamecenter.common.base.fragment.BaseFragment
 import com.gh.gamecenter.common.constant.EntranceConsts
-import com.gh.gamecenter.gamedetail.cloudarchive.CloudArchiveFragment
-import com.gh.gamecenter.gamedetail.libao.LibaoListFragment
+import com.gh.gamecenter.amway.AmwaySuccessFragment
+import com.gh.gamecenter.gamedetail.LibaoListFragment
 import com.halo.assistant.fragment.SwitchInstallMethodFragment
 import com.halo.assistant.fragment.user.ManuallyRealNameFragment
 import com.halo.assistant.fragment.user.RealNameInfoFragment
@@ -39,7 +38,6 @@ class ShellActivity : ToolBarActivity() {
             Type.REAL_NAME_INFO -> startFragment(RealNameInfoFragment().with(bundle))
             Type.MANUALLY_REAL_NAME -> startFragment(ManuallyRealNameFragment().with(extraData))
             Type.SIMPLE_LIBAO_LIST -> startFragment(LibaoListFragment.newInstance(extraData))
-            Type.CLOUD_ARCHIVE -> startFragment(CloudArchiveFragment().with(extraData))
         }
     }
 
@@ -74,8 +72,7 @@ class ShellActivity : ToolBarActivity() {
         SWITCH_INSTALL_METHOD("switch_install_method"),
         REAL_NAME_INFO("real_name_info"),
         MANUALLY_REAL_NAME("manually_real_name"),
-        SIMPLE_LIBAO_LIST("simple_libao_list"),
-        CLOUD_ARCHIVE("cloud_archive");
+        SIMPLE_LIBAO_LIST("simple_libao_list");
 
         companion object {
             fun fromString(typeString: String): Type {

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

@@ -1,7 +1,6 @@
 package com.gh.gamecenter;
 
 import static com.gh.gamecenter.common.constant.EntranceConsts.ENTRANCE_BROWSER;
-import static com.gh.gamecenter.common.constant.EntranceConsts.ENTRANCE_OTHER;
 import static com.gh.gamecenter.common.constant.EntranceConsts.ENTRANCE_PUSH;
 import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_ANSWER;
 import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_ARCHIVE_LOGIN;
@@ -36,7 +35,6 @@ import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_VIDEO_STREAM
 import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_VIDEO_STREAMING_HOME;
 import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_WEB;
 import static com.gh.gamecenter.common.constant.EntranceConsts.KEY_DATA;
-import static com.gh.gamecenter.common.constant.EntranceConsts.KEY_FROM;
 import static com.gh.gamecenter.common.constant.EntranceConsts.KEY_GAME_NAME;
 import static com.gh.gamecenter.common.constant.EntranceConsts.KEY_NAME;
 import static com.gh.gamecenter.common.constant.EntranceConsts.KEY_PACKAGENAME;
@@ -102,6 +100,7 @@ public class SkipActivity extends BaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
         Uri uri = getIntent().getData();
         Bundle bundle;
         if (uri != null) {
@@ -161,8 +160,7 @@ public class SkipActivity extends BaseActivity {
                             DirectUtils.directToArticle(this, path, entrance);
                             break;
                         case HOST_GAME:
-                            String from = uri.getQueryParameter(KEY_FROM);
-                            DirectUtils.directToGameDetail(this, path, "", entrance, "true".equals(uri.getQueryParameter("auto_download")), to, null, from);
+                            DirectUtils.directToGameDetail(this, path, "", entrance, "true".equals(uri.getQueryParameter("auto_download")), to, null);
                             break;
                         case HOST_COLUMN:
                             DirectUtils.directToSubject(this, path, uri.getQueryParameter(KEY_NAME), entrance, null, SubjectData.SubjectType.NORMAL);
@@ -182,7 +180,7 @@ public class SkipActivity extends BaseActivity {
                             DirectUtils.directToAnswerDetail(this, path, entrance, pathName);
                             break;
                         case HOST_QUESTION:
-                            DirectUtils.directToQuestionDetail(this, path, entrance, pathName, isFromPush ? ENTRANCE_PUSH : ENTRANCE_OTHER);
+                            DirectUtils.directToQuestionDetail(this, path, entrance, pathName, "");
                             break;
                         case HOST_TOOLBOX:
                             DirectUtils.directToToolbox(this, uri.getQueryParameter("gameId"), uri.getQueryParameter("toolboxUrl"), entrance);
@@ -192,7 +190,7 @@ public class SkipActivity extends BaseActivity {
                             break;
                         // 社区文章格式一
                         case "community.article":
-                            DirectUtils.directToCommunityArticle(this, uri.getQueryParameter("articleId"), uri.getQueryParameter("communityId"), entrance, pathName, isFromPush ? ENTRANCE_PUSH : ENTRANCE_OTHER);
+                            DirectUtils.directToCommunityArticle(this, uri.getQueryParameter("articleId"), uri.getQueryParameter("communityId"), entrance, pathName, "");
                             break;
                         // 社区文章格式二
                         case "communities":
@@ -213,13 +211,13 @@ public class SkipActivity extends BaseActivity {
                                 }
                             }
                             if ("articles".equals(type)) {
-                                DirectUtils.directToCommunityArticle(this, typeId, communityId, entrance, pathName, isFromPush ? ENTRANCE_PUSH : ENTRANCE_OTHER);
+                                DirectUtils.directToCommunityArticle(this, typeId, communityId, entrance, pathName, "");
                                 break;
                             }
                             break;
                         case HOST_VIDEO:
                             DirectUtils.directToVideoDetail(this, path, VideoDetailContainerViewModel.Location.HOTTEST_GAME_VIDEO.getValue(),
-                                    false, id, entrance, pathName, TextUtils.isEmpty(referer) ? "" : referer, isFromPush ? ENTRANCE_PUSH : ENTRANCE_OTHER);
+                                    false, id, entrance, pathName, TextUtils.isEmpty(referer) ? "" : referer, "");
                             break;
                         case HOST_UPLOAD_VIDEO://跳转上传视频
                             String titleParameter = uri.getQueryParameter("title");
@@ -239,7 +237,7 @@ public class SkipActivity extends BaseActivity {
                             break;
                         case HOST_VIDEO_SINGLE:
                             DirectUtils.directToVideoDetail(this, path, VideoDetailContainerViewModel.Location.SINGLE_VIDEO.getValue(),
-                                    false, "", entrance, pathName, TextUtils.isEmpty(referer) ? "" : referer, isFromPush ? ENTRANCE_PUSH : ENTRANCE_OTHER);
+                                    false, "", entrance, pathName, TextUtils.isEmpty(referer) ? "" : referer, "");
                             break;
                         case HOST_VIDEO_MORE:
                             gameId = uri.getQueryParameter("gameId");
@@ -296,7 +294,7 @@ public class SkipActivity extends BaseActivity {
                             EntranceUtils.jumpActivityCompat(this, bundle);
                             break;
                         case EntranceConsts.HOST_VIDEO_DETAIL:
-                            DirectUtils.directToVideoDetail(this, path, entrance, "", isFromPush ? ENTRANCE_PUSH : ENTRANCE_OTHER);
+                            DirectUtils.directToVideoDetail(this, path, entrance, "", "");
                             break;
                         case HOST_LIBAO:
                             DirectUtils.directToGiftDetail(this, path, entrance);
@@ -317,7 +315,7 @@ public class SkipActivity extends BaseActivity {
                             break;
 
                         case HOST_COLUMN_COLLECTION:
-                            DirectUtils.directToColumnCollection(this, path, -1, entrance, "", "", "", "", null, false);
+                            DirectUtils.directToColumnCollection(this, path, -1, entrance, "", "", "", "", null,false);
                             break;
                         case EntranceConsts.HOST_BLOCK:
                             name = uri.getQueryParameter("name");
@@ -359,7 +357,7 @@ public class SkipActivity extends BaseActivity {
                                     byte[] linkData = Base64.decode(dataString, Base64.DEFAULT);
                                     String linkDataString = new String(linkData, "UTF-8");
                                     LaunchRedirect launchRedirect = GsonUtils.fromJson(linkDataString, LaunchRedirect.class);
-                                    DirectUtils.directToLinkPage(this, launchRedirect, entrance, "", isFromPush ? ENTRANCE_PUSH : ENTRANCE_OTHER);
+                                    DirectUtils.directToLinkPage(this, launchRedirect, entrance, "", "");
                                 }
                             } catch (Exception e) {
                                 e.printStackTrace();
@@ -416,13 +414,13 @@ public class SkipActivity extends BaseActivity {
                             break;
                         case HOST_ARCHIVE_LOGIN:
                             String gamePkg = uri.getQueryParameter(EntranceConsts.KEY_GAME_PKG);
-                            if (CheckLoginUtils.isLogin()) {
+                            if(CheckLoginUtils.isLogin()) {
                                 VHelper.INSTANCE.updateAuthorizeInfo(true);
                             } else {
                                 Bundle newBundle = new Bundle();
                                 newBundle.putString(EntranceConsts.KEY_TO, LoginActivity.class.getName());
                                 EntranceUtils.jumpActivityCompat(this, newBundle, null, (resultCode, data) -> {
-                                    if (CheckLoginUtils.isLogin()) {
+                                    if(CheckLoginUtils.isLogin()) {
                                         VHelper.INSTANCE.updateAuthorizeInfo(true);
                                     }
                                     VHelper.launch(this, gamePkg, false, false);

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

@@ -5,7 +5,6 @@ import android.app.NotificationManager
 import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
-import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.preference.PreferenceManager
@@ -15,8 +14,6 @@ import androidx.core.app.NotificationCompat
 import androidx.core.text.bold
 import androidx.core.text.buildSpannedString
 import androidx.core.text.color
-import com.therouter.TheRouter
-import com.therouter.router.Route
 import com.gh.common.dialog.NewPrivacyPolicyDialogFragment
 import com.gh.common.util.DeviceTokenUtils
 import com.gh.common.util.DialogUtils
@@ -27,22 +24,20 @@ import com.gh.common.util.UsageStatsHelper.checkAndPostUsageStats
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.common.base.activity.BaseActivity
 import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.constant.EntranceConsts
-import com.gh.gamecenter.common.constant.EntranceConsts.KEY_FROM
-import com.gh.gamecenter.common.constant.EntranceConsts.KEY_GAMEID
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.tracker.TrackerLogger
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.core.iinterface.ISplashScreen
 import com.gh.gamecenter.core.provider.IAppProvider
 import com.gh.gamecenter.core.provider.IPackageUtilsProvider
-import com.gh.gamecenter.core.provider.IPushProvider
 import com.gh.gamecenter.core.runOnIoThread
 import com.gh.gamecenter.core.utils.DisplayUtils
 import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.feature.utils.PlatformUtils
 import com.gh.gamecenter.pkg.PkgHelper
 import com.halo.assistant.HaloApp
+import com.therouter.TheRouter
+import com.therouter.router.Route
 import org.json.JSONObject
 import splitties.systemservices.notificationManager
 import java.text.SimpleDateFormat
@@ -136,6 +131,7 @@ class SplashScreenActivity : BaseActivity(), ISplashScreen {
         } else {
             launchMainActivity()
         }
+
         if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.R) {
             SPUtils.setString(Constants.SP_XAPK_UNZIP_ACTIVITY, "")
             SPUtils.setString(Constants.SP_XAPK_URL, "")
@@ -150,10 +146,6 @@ class SplashScreenActivity : BaseActivity(), ISplashScreen {
         val trackEvent = JSONObject()
         // 是否首次使用神策
         val isFirstTime = SPUtils.getBoolean(Constants.SP_SENSORS_IS_FIRST_TIME, true)
-        val therouterPath = intent.extras?.getString(EntranceConsts.KEY_THE_ROUTER_PATH) ?: ""
-        val uri = Uri.parse(therouterPath)
-        val isFromWechat = WECHAT_APPOINTMENT == if (!uri.isOpaque) uri.getQueryParameter(KEY_FROM) else false
-        val gameId = if (!uri.isOpaque) uri.getQueryParameter(KEY_GAMEID) else ""
         tryCatchInRelease {
             trackEvent.run {
                 put("\$is_first_time", isFirstTime)
@@ -163,10 +155,6 @@ class SplashScreenActivity : BaseActivity(), ISplashScreen {
                 put("signature", signatureHash)
                 put("app_name", appProvider?.getAppName())
                 put("install_first_time", if (HaloApp.getInstance().isBrandNewInstall) "是" else "否")
-                if (isFromWechat) {
-                    put("source_entrance", WECHAT_NOTIFICATION)
-                    put("page_business_id", gameId)
-                }
             }
         }
         SensorsBridge.trackEvent("AppLaunch", trackEvent)
@@ -337,9 +325,6 @@ class SplashScreenActivity : BaseActivity(), ISplashScreen {
         const val HONOR_CULPRIT_ID = 12324
         const val HONOR_CULPRIT_CHANNEL = "荣耀通道"
 
-        private const val WECHAT_APPOINTMENT = "wechat_appointment"
-        private const val WECHAT_NOTIFICATION = "微信通知"
-
         @JvmStatic
         fun getSplashScreenIntent(context: Context?, bundle: Bundle?): Intent {
             val intent = Intent(context, SplashScreenActivity::class.java)

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

@@ -6,17 +6,19 @@ import android.os.Bundle
 import android.text.TextUtils
 import android.view.KeyEvent
 import android.view.View
-import com.therouter.router.Route
+import com.gh.common.constant.Config
 import com.gh.gamecenter.common.base.activity.ToolBarActivity
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.common.entity.ToolBoxEntity
 import com.gh.gamecenter.common.utils.EnvHelper
 import com.gh.gamecenter.common.utils.updateStatusBarColor
 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
+import com.halo.assistant.member.MemberActivity
+import com.therouter.router.Route
 
 @Route(path = RouteConsts.activity.webActivity)
 open class WebActivity : ToolBarActivity() {
@@ -29,6 +31,8 @@ open class WebActivity : ToolBarActivity() {
             val mIsBackpressRequireConfirmation =
                 bundle.getBoolean(WebFragment.KEY_REQUIRE_BACK_CONFIRMATION, false)
             mIsFullScreen = !TextUtils.isEmpty(mGameName) && mIsBackpressRequireConfirmation
+            mIsFullScreen = true
+
             if (mIsFullScreen) {
                 setTheme(R.style.AppFullScreenTheme)
             }
@@ -305,5 +309,17 @@ open class WebActivity : ToolBarActivity() {
             intent.putExtra(NORMAL_FRAGMENT_BUNDLE, bundle)
             return intent
         }
+
+        @JvmStatic
+        fun getMyAssetsIntent(context: Context): Intent {
+            val intent = Intent(context, MemberActivity::class.java)
+            val url = if (EnvHelper.isDevEnv) {
+                Constants.MY_ASSETS_DEV
+            } else {
+                Constants.MY_ASSETS
+            }
+            intent.putExtra(EntranceConsts.KEY_URL, url)
+            return intent
+        }
     }
 }

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

@@ -2,7 +2,6 @@ package com.gh.gamecenter.adapter;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.content.Intent;
 import android.text.Html;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
@@ -13,7 +12,6 @@ import android.text.style.ClickableSpan;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.LinearLayout;
 
 import androidx.annotation.NonNull;
 import androidx.core.content.ContextCompat;
@@ -22,14 +20,9 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.RecyclerView.ViewHolder;
 
-import com.facebook.drawee.drawable.ScalingUtils;
-import com.facebook.drawee.generic.GenericDraweeHierarchyBuilder;
-import com.facebook.drawee.generic.RoundingParams;
-import com.facebook.drawee.view.SimpleDraweeView;
 import com.gh.common.util.DirectUtils;
 import com.gh.common.util.LibaoUtils;
 import com.gh.gamecenter.GameDetailActivity;
-import com.gh.gamecenter.ImageViewerActivity;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.adapter.viewholder.LibaoDetailContentViewHolder;
 import com.gh.gamecenter.adapter.viewholder.LibaoDetailTopViewHolder;
@@ -38,7 +31,6 @@ import com.gh.gamecenter.common.entity.SimpleGameEntity;
 import com.gh.gamecenter.common.entity.SuggestType;
 import com.gh.gamecenter.common.retrofit.Response;
 import com.gh.gamecenter.common.utils.ExtensionsKt;
-import com.gh.gamecenter.common.utils.ImageUtils;
 import com.gh.gamecenter.common.utils.PicassoImageGetter;
 import com.gh.gamecenter.common.viewholder.FooterViewHolder;
 import com.gh.gamecenter.core.utils.DisplayUtils;
@@ -87,7 +79,6 @@ public class LibaoDetailAdapter extends BaseRecyclerAdapter<ViewHolder> {
     private String mEntrance;
     private final int TYPE_FOOTER = 100;
     public LibaoDetailTopViewHolder libaoDetailTopViewHolder;
-    private ArrayList<View> mImageViewList = new ArrayList<>();
 
     public LibaoDetailAdapter(Context context, OnRequestCallBackListener onRequestCallBackListener,
                               OnCodeScrollListener onCodeScrollListener, LibaoEntity libaoEntity,
@@ -326,35 +317,6 @@ public class LibaoDetailAdapter extends BaseRecyclerAdapter<ViewHolder> {
             holder.binding.libaodetailContentLl.setVisibility(View.VISIBLE);
             holder.binding.libaodetailContent.setText(Html.fromHtml(mLibaoEntity.getContent()));
         }
-        if (mLibaoEntity.getMaterials().isEmpty()) {
-            holder.binding.horizontalScrollView.setVisibility(View.GONE);
-        } else {
-            holder.binding.horizontalScrollView.setVisibility(View.VISIBLE);
-            holder.binding.imagesContainer.removeAllViews();
-            mImageViewList.clear();
-            for (int i = 0; i < mLibaoEntity.getMaterials().size(); i++) {
-                String imageUrl = mLibaoEntity.getMaterials().get(i).getImg();
-                SimpleDraweeView imageView = new SimpleDraweeView(mContext);
-                RoundingParams roundingParams = new RoundingParams();
-                roundingParams.setCornersRadius(DisplayUtils.dip2px(4F));
-                roundingParams.setOverlayColor(ContextCompat.getColor(mContext, com.gh.gamecenter.common.R.color.ui_surface));
-                imageView.setHierarchy(new GenericDraweeHierarchyBuilder(mContext.getResources())
-                        .setFadeDuration(500)
-                        .setRoundingParams(roundingParams)
-                        .setPlaceholderImage(com.gh.gamecenter.common.R.drawable.occupy, ScalingUtils.ScaleType.FIT_XY)
-                        .build());
-                ImageUtils.display(imageView, imageUrl);
-                final int index = i;
-                imageView.setOnClickListener(v -> {
-                    Intent intent = ImageViewerActivity.getIntent(mContext, mLibaoEntity.getMaterialImgList(), index, mImageViewList, mEntrance);
-                    mContext.startActivity(intent);
-                });
-                mImageViewList.add(imageView);
-                LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(DisplayUtils.dip2px(24F), DisplayUtils.dip2px(24F));
-                layoutParams.setMargins(DisplayUtils.dip2px(i == 0 ? 8F : 16F), 0, 0, 0);
-                holder.binding.imagesContainer.addView(imageView, layoutParams);
-            }
-        }
         if (mLibaoDetailEntity != null) {
             holder.binding.libaodetailTimeLl.setVisibility(View.VISIBLE);
 

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

@@ -23,7 +23,6 @@ import com.gh.common.simulator.NewSimulatorGameManager
 import com.gh.common.simulator.SimulatorDownloadManager
 import com.gh.common.simulator.SimulatorGameManager
 import com.gh.common.util.*
-import com.gh.common.util.GameUtils.getDownloadBtnText
 import com.gh.common.util.LogUtils
 import com.gh.common.xapk.XapkInstaller
 import com.gh.common.xapk.XapkUnzipStatus
@@ -36,6 +35,7 @@ import com.gh.gamecenter.common.base.GlobalActivityManager.getCurrentPageEntity
 import com.gh.gamecenter.common.base.GlobalActivityManager.getLastPageEntity
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.constant.EntranceConsts
+import com.gh.gamecenter.common.eventbus.EBReuse
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.common.utils.NewFlatLogUtils
 import com.gh.gamecenter.core.runOnIoThread
@@ -45,14 +45,12 @@ import com.gh.gamecenter.core.utils.StringUtils
 import com.gh.gamecenter.core.utils.ToastUtils
 import com.gh.gamecenter.eventbus.EBScroll
 import com.gh.gamecenter.feature.entity.GameEntity
-import com.gh.gamecenter.feature.entity.PluginLocation
 import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.gh.gamecenter.feature.view.DownloadButton
 import com.gh.gamecenter.feature.view.DownloadButton.ButtonStyle
-import com.gh.gamecenter.gamedetail.GameDetailViewModel
+import com.gh.gamecenter.gamedetail.GameDetailFragment
 import com.gh.gamecenter.gamedetail.accelerator.GameDetailAcceleratorUiHelper
 import com.gh.gamecenter.gamedetail.dialog.GamePermissionDialogFragment
-import com.gh.gamecenter.gamedetail.entity.GameDetailTabEntity
 import com.gh.gamecenter.teenagermode.TeenagerModeActivity.Companion.getIntent
 import com.gh.vspace.VHelper
 import com.lightgame.download.DownloadEntity
@@ -63,7 +61,6 @@ import java.io.File
 // 虽然叫 ViewHolder，但其实就是一个用来临时放 View 和相关操作的包裹类
 class DetailViewHolder(
     view: View,
-    val viewModel: GameDetailViewModel?,
     val gameEntity: GameEntity,
     val isNewsDetail: Boolean, // 新闻详情不显示下载的游戏名, 只显示下载状态
     entrance: String?,
@@ -71,8 +68,7 @@ class DetailViewHolder(
     title: String?,
     val traceEvent: ExposureEvent?,
     val isSupportDualButton: Boolean = false, // 是否支持双下载按钮，不支持的时候跟普通列表意义选用优先级高的那个来显示,
-    val acceleratorUiHelper: GameDetailAcceleratorUiHelper? = null,  // 网速加速，只有游戏详情才有
-    onDownloadClickAction: ((Boolean) -> Unit)? = null
+    val acceleratorUiHelper: GameDetailAcceleratorUiHelper? = null  // 网速加速，只有游戏详情才有
 ) {
     var context: Context
     var downloadBottom: View
@@ -104,23 +100,17 @@ class DetailViewHolder(
     val speedContainer: ConstraintLayout?
     private val ivFreeVipTag: ImageView?
     private val gMoreZone: Group?
-    private val gUpdate: Group?
-    private val ivUpdate: ImageView?
-    private val tvSize: TextView?
-    private val vUpdate: View?
-    private val tvUpdate: TextView?
 
-    private var isShowVaUpdate = true
 
     // 注意 View 的命名
     init {
         downloadBottom = view.findViewById(R.id.detail_ll_bottom)
-        downloadPb = downloadBottom.findViewById(R.id.detail_progressbar)
-        downloadTips = downloadBottom.findViewById(R.id.downloadTipsLottie)
+        downloadPb = view.findViewById(R.id.detail_progressbar)
+        downloadTips = view.findViewById(R.id.downloadTipsLottie)
         overlayTv = view.findViewById(R.id.overlayTv)
         overlayContainer = view.findViewById(R.id.overlayContainer)
         extraOverlayTv = view.findViewById(R.id.extraOverlayTv)
-        multiVersionDownloadTv = downloadBottom.findViewById(R.id.multiVersionDownloadTv)
+        multiVersionDownloadTv = view.findViewById(R.id.multiVersionDownloadTv)
         localDownloadContainer = view.findViewById(R.id.localDownloadContainer)
         localDownloadSizeTv = view.findViewById(R.id.localDownloadSizeTv)
         localDownloadTitleTv = view.findViewById(R.id.localDownloadTitleTv)
@@ -129,14 +119,8 @@ class DetailViewHolder(
         speedContainer = view.findViewById(R.id.cl_speed_container)
         ivFreeVipTag = view.findViewById(R.id.iv_free_vip_tag)
         gMoreZone = view.findViewById(R.id.g_more_zone)
-        gUpdate = view.findViewById(R.id.g_update)
-        ivUpdate = view.findViewById(R.id.iv_update)
-        tvSize = view.findViewById(R.id.tv_size)
-        vUpdate = view.findViewById(R.id.v_update)
-        tvUpdate = view.findViewById(R.id.tv_update)
 
         context = view.context
-        com.gh.gamecenter.common.R.color.text_aw_primary.toColor()
 
         var gameDownloadMode = gameEntity.getGameDownloadButtonMode()
 
@@ -147,8 +131,7 @@ class DetailViewHolder(
             mTitle = title ?: "",
             mAsVGame = false,
             mShowDualDownloadButton = gameDownloadMode == GameEntity.GAME_DOWNLOAD_BUTTON_MODE_DUAL,
-            mTraceEvent = traceEvent,
-            onDownloadClickAction = onDownloadClickAction
+            mTraceEvent = traceEvent
         )
 
         val vGameDownloadListener = OnDetailDownloadClickListener(
@@ -158,8 +141,7 @@ class DetailViewHolder(
             mTitle = title ?: "",
             mAsVGame = true,
             mShowDualDownloadButton = gameDownloadMode == GameEntity.GAME_DOWNLOAD_BUTTON_MODE_DUAL,
-            mTraceEvent = traceEvent,
-            onDownloadClickAction = onDownloadClickAction
+            mTraceEvent = traceEvent
         )
 
         // 不支持双下载按钮的情况时，优选一个下载方式显示
@@ -195,19 +177,8 @@ class DetailViewHolder(
                         com.gh.gamecenter.feature.R.string.download_local
                     )
                 )
-
-                vUpdate?.setOnClickListener {
-                    if (isShowVaUpdate) {
-                        vGameDownloadListener.onClick(vUpdate)
-                    } else {
-                        localDownloadListener.onClick(vUpdate)
-                    }
-                }
             }
         }
-
-
-
         downloadPb.putWidgetBusinessName("游戏详情页")
         // "DownLoadbuttonClick" 埋点需要上报traceEvent信息
 
@@ -217,90 +188,18 @@ class DetailViewHolder(
     }
 
     private fun restoreDialogFragment() {
-        val gamePermissionDialogFragment = (context.getActivity() as? AppCompatActivity)?.supportFragmentManager?.findFragmentByTag(
+        val gamePermissionDialogFragment = (context as AppCompatActivity).supportFragmentManager.findFragmentByTag(
             GamePermissionDialogFragment::class.java.name
         ) as DialogFragment?
         gamePermissionDialogFragment?.dismissAllowingStateLoss()
     }
 
+    fun hideSpeedUi() {
+        acceleratorUiHelper?.showSpeedUi = false
+    }
 
-    fun checkIfShowSpeedUi(showVGame: Boolean, showDualDownloadButton: Boolean) {
-        acceleratorUiHelper?.let {
-            val showSpeedUi = when {
-                gameEntity.canSpeed && showDualDownloadButton -> {  // 双按钮
-                    val localText = getDownloadBtnText(context, gameEntity, false, false, PluginLocation.only_game);
-                    val downloadText =
-                        getDownloadBtnText(context, gameEntity, false, true, PluginLocation.only_game)
-                    when {
-                        localText.contains(com.gh.gamecenter.feature.R.string.update.toResString()) -> {  // 本地游戏需要更新
-                            localDownloadContainer?.goneIf(true)
-                            downloadPb.goneIf(true)
-                            overlayTv?.goneIf(true)
-
-                            gUpdate?.visibility = View.VISIBLE
-                            ivUpdate?.goneIf(true)
-                            tvSize?.goneIf(false)
-                            tvSize?.text =
-                                DetailDownloadUtils.convertSizeString(gameEntity.getApk().firstOrNull()?.size ?: "")
-                            tvUpdate?.setText(R.string.update)
-                            isShowVaUpdate = false
-                            true
-                        }
-
-                        localText.contains(com.gh.gamecenter.feature.R.string.launch.toResString()) && downloadText == "更新" -> {    // 畅玩游戏需要更新:显示 加速/更新
-                            localDownloadContainer?.goneIf(true)
-                            downloadPb.goneIf(true)
-                            overlayTv?.goneIf(true)
-
-                            gUpdate?.visibility = View.VISIBLE
-                            ivUpdate?.goneIf(false)
-                            tvSize?.goneIf(true)
-                            tvUpdate?.setText(R.string.update)
-                            isShowVaUpdate = true
-                            true
-                        }
-
-                        localText.contains(com.gh.gamecenter.feature.R.string.launch.toResString()) -> {  // 本地游戏为启动状态：显示 加速/畅玩
-                            localDownloadContainer?.goneIf(true)
-                            downloadPb.goneIf(true)
-                            overlayTv?.goneIf(true)
-
-                            gUpdate?.visibility = View.VISIBLE
-                            tvUpdate?.setText(R.string.v_play)
-                            tvSize?.goneIf(true)
-                            isShowVaUpdate = true
-                            true
-                        }
-
-                        else -> {
-                            gUpdate?.visibility = View.GONE
-                            tvSize?.goneIf(true)
-                            false
-                        }
-                    }
-                }
-
-                gameEntity.canSpeed && !showVGame -> {
-                    gUpdate?.visibility = View.GONE
-                    val downloadText = getDownloadBtnText(context, gameEntity, false, false, PluginLocation.only_game)
-                    when {
-                        downloadText.contains(com.gh.gamecenter.feature.R.string.launch.toResString()) -> {
-                            localDownloadContainer?.goneIf(true)
-                            downloadPb.goneIf(true)
-                            true
-                        }
-
-                        downloadText.contains(R.string.update.toResString()) -> true
-
-                        else -> false
-                    }
-                }
-
-                else -> false
-            }
-            it.checkIfShowSpeedUi(showSpeedUi, showDualDownloadButton)
-
-        }
+    fun showAcceleratorGuideLayer() {
+        acceleratorUiHelper?.checkIfShowGuideLayer(context)
     }
 
     fun setSpeedViewsVisible(isVisible: Boolean) {
@@ -315,8 +214,7 @@ class DetailViewHolder(
         private val mTitle: String,
         private val mAsVGame: Boolean,
         private val mShowDualDownloadButton: Boolean,
-        private val mTraceEvent: ExposureEvent?,
-        private val onDownloadClickAction: ((Boolean) -> Unit)? = null
+        private val mTraceEvent: ExposureEvent?
     ) : View.OnClickListener {
 
         private val mGameEntity: GameEntity = mViewHolder.gameEntity
@@ -394,9 +292,7 @@ class DetailViewHolder(
                                 SensorsBridge.trackInstallGameClick(
                                     mGameEntity.id,
                                     mGameEntity.name ?: "",
-                                    "主动安装",
-                                    mGameEntity.isDspGame,
-                                    mGameEntity.dspAdId
+                                    "主动安装"
                                 )
                                 PackageInstaller.install(mViewHolder.context, mDownloadEntity)
                             }
@@ -416,13 +312,11 @@ class DetailViewHolder(
                                     showLandPageAddressDialogIfNeeded()
                                 }
                             }
-
                             "toast" -> {
-                                mViewHolder.viewModel?.performTabSelected(GameDetailTabEntity.TYPE_COMMENT)
+                                EventBus.getDefault().post(EBReuse(GameDetailFragment.SKIP_RATING))
                                 ToastUtils.toast("该游戏因故暂不提供下载，具体详情可在相关评论中查看，敬请谅解～")
                                 showLandPageAddressDialogIfNeeded()
                             }
-
                             "third_party" -> {
                                 showLandPageAddressDialogIfNeeded()
                             }
@@ -503,8 +397,7 @@ class DetailViewHolder(
                                 gameEntity = mGameEntity,
                                 traceEvent = mTraceEvent,
                                 entrance = StringUtils.buildString(mEntrance, "+(", mName, "[", mTitle, "])"),
-                                location = "$mName:$mTitle",
-                                onDownloadClickAction = onDownloadClickAction
+                                location = "$mName:$mTitle"
                             )
                         }
                     }
@@ -521,9 +414,7 @@ class DetailViewHolder(
                     SensorsBridge.trackInstallGameClick(
                         gameId = mGameEntity.id,
                         gameName = mGameEntity.name ?: "",
-                        action = "主动安装",
-                        isDspGame = mGameEntity.isDspGame,
-                        dspAdId = mGameEntity.dspAdId
+                        action = "主动安装"
                     )
                     val url = mGameEntity.getApk().firstOrNull()?.url
                     val downloadEntity = SimulatorGameManager.findDownloadEntityByUrl(url)
@@ -824,7 +715,6 @@ class DetailViewHolder(
                 builder.addHandler(OverseaDownloadHandler())
                 builder.addHandler(CheckDownloadHandler())
                 builder.setProcessEndCallback(mGameEntity.id) { asVGame: Boolean, isSubscribe: Any? ->
-                    performDownloadClickAction()
                     download(asVGame, isSubscribe as Boolean)
                 }
             } else {
@@ -842,8 +732,7 @@ class DetailViewHolder(
                             mTitle,
                             "])"
                         ),
-                        "$mName:$mTitle",
-                        onDownloadClickAction
+                        "$mName:$mTitle"
                     )
                 }
             }
@@ -854,20 +743,5 @@ class DetailViewHolder(
                 mAsVGame
             )
         }
-
-        private fun performDownloadClickAction() {
-            val buttonText = if (mShowDualDownloadButton && !mAsVGame) {
-                mViewHolder.localDownloadTitleTv?.text?.ifEmpty {
-                    mViewHolder.downloadPb.text.ifEmpty {
-                        mViewHolder.overlayTv?.text ?: ""
-                    }
-                }
-            } else {
-                mViewHolder.downloadPb.text.ifEmpty { mViewHolder.overlayTv?.text ?: "" }
-            }
-            val isUpdate =
-                buttonText?.contains(mViewHolder.context.getString(com.gh.gamecenter.feature.R.string.update)) == true
-            onDownloadClickAction?.invoke(isUpdate)
-        }
     }
 }

app/src/main/java/com/gh/gamecenter/authorization/AuthorizationActivity.kt

@@ -1,7 +1,5 @@
 package com.gh.gamecenter.authorization
 
-import android.app.Activity
-import android.app.Application.ActivityLifecycleCallbacks
 import android.app.Dialog
 import android.content.Intent
 import android.os.Build
@@ -24,7 +22,6 @@ import com.gh.gamecenter.login.user.UserManager
 import com.gh.gamecenter.login.user.UserRepository
 import com.gh.gamecenter.login.view.LoginActivity
 import com.gh.vspace.VHelper
-import com.halo.assistant.HaloApp
 import com.lightgame.utils.Utils
 
 /**
@@ -142,7 +139,7 @@ class AuthorizationActivity : ToolBarActivity() {
     override fun onRestart() {
         super.onRestart()
         if (!CheckLoginUtils.isLogin()) {
-            finishAndRemoveTask()
+            finish()
         } else {
             initUserInfo()
             initData()
@@ -153,12 +150,12 @@ class AuthorizationActivity : ToolBarActivity() {
     private fun checkParam() {
         val uri = intent.data
         if (uri == null) {
-            finishAndRemoveTask()
+            finish()
             return
         }
         val host = uri.host
         if (host != "authorize") {
-            finishAndRemoveTask()
+            finish()
             return
         }
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
@@ -171,7 +168,7 @@ class AuthorizationActivity : ToolBarActivity() {
         gameName = uri.getQueryParameter(EntranceConsts.KEY_GAME_NAME) ?: ""
         gameUid = uri.getQueryParameter(EntranceConsts.KEY_UID)?.toIntOrNull() ?: -1
         if (mRemotePkgName == null) {
-            finishAndRemoveTask()
+            finish()
             return
         }
     }
@@ -224,7 +221,7 @@ class AuthorizationActivity : ToolBarActivity() {
         val remotePkgName = mRemotePkgName
         if (remotePkgName == null) {
             logAuthResult(false)
-            finishAndRemoveTask()
+            finish()
             return
         }
         if (mToken.isEmpty()) {
@@ -245,44 +242,13 @@ class AuthorizationActivity : ToolBarActivity() {
         intent.putExtra(EntranceConsts.KEY_USER_NAME, username)
         intent.putExtra(EntranceConsts.KEY_USER_AVATAR, userAvatar)
         if (gameUid != -1 && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            try {
-                sendBroadcastAsUser(intent, UserHandle.getUserHandleForUid(gameUid))
-            } catch (e: Exception) {
-                // 双开/分身游戏进行授权时，如果无 INTERACT_ACROSS_USERS 权限，则使用Activity传递授权结果
-                authByActivity(intent)
-                return
-            }
+            sendBroadcastAsUser(intent, UserHandle.getUserHandleForUid(gameUid))
         } else {
             sendBroadcast(intent)
         }
         logAuthResult(true)
         backToLaunchApp()
-        finishAndRemoveTask()
-    }
-
-    private fun authByActivity(intent: Intent) {
-        intent.setClassName(mRemotePkgName!!, AUTHORIZATION_RESULT_ACTIVITY)
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-        HaloApp.getInstance().registerActivityLifecycleCallbacks(object : ActivityLifecycleCallbacks {
-            override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {}
-            override fun onActivityStarted(activity: Activity) {}
-            override fun onActivityResumed(activity: Activity) {}
-            override fun onActivityPaused(activity: Activity) {}
-            override fun onActivityStopped(activity: Activity) {
-                if (activity == this@AuthorizationActivity) {
-                    HaloApp.getInstance().unregisterActivityLifecycleCallbacks(this)
-                    finishAndRemoveTask()
-                }
-            }
-            override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {}
-            override fun onActivityDestroyed(activity: Activity) {
-                if (activity == this@AuthorizationActivity) {
-                    HaloApp.getInstance().unregisterActivityLifecycleCallbacks(this)
-                }
-            }
-        })
-        startActivity(intent)
-        logAuthResult(true)
+        finish()
     }
 
     private fun logAuthResult(isSuccess: Boolean) {
@@ -311,7 +277,7 @@ class AuthorizationActivity : ToolBarActivity() {
     }
 
     override fun onBackPressed() {
-        finishAndRemoveTask()
+        super.onBackPressed()
 
         backToLaunchApp(false)
 
@@ -326,7 +292,6 @@ class AuthorizationActivity : ToolBarActivity() {
         private const val BUTTON_TYPE_CONFIRM = "确定"
         private const val BUTTON_TYPE_BACK = "返回"
         private const val TYPE_PLUGIN = "plugin"
-        private const val AUTHORIZATION_RESULT_ACTIVITY = "com.gh.plugin.AuthorizationResultActivity"
     }
 
 }

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

@@ -1,89 +1,82 @@
 package com.gh.gamecenter.category2
 
-import android.annotation.SuppressLint
+import android.content.Context
 import android.view.ViewGroup
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import androidx.recyclerview.widget.RecyclerView.ViewHolder
-import com.gh.gamecenter.common.utils.toBinding
+import com.gh.gamecenter.common.base.BaseRecyclerViewHolder
+import com.gh.gamecenter.common.utils.dip2px
 import com.gh.gamecenter.common.view.GridSpacingItemColorDecoration
+import com.gh.gamecenter.common.utils.toColor
 import com.gh.gamecenter.databinding.CategoryDirectoryItemBinding
 import com.gh.gamecenter.entity.CategoryEntity
+import com.lightgame.adapter.BaseRecyclerAdapter
 
 class CategoryDirectoryAdapter(
-    private val listener: SearchCategoryPop.OnSearchCategoryListener
-) : RecyclerView.Adapter<CategoryDirectoryAdapter.CategoryDirectoryItemViewHolder>() {
+    context: Context,
+    private val mViewModel: CategoryV2ViewModel,
+    private var mList: List<CategoryEntity>
+) : BaseRecyclerAdapter<CategoryDirectoryAdapter.CategoryDirectoryItemViewHolder>(context) {
 
-    private val data = arrayListOf<CategoryEntity>()
+    val width = mContext.resources.displayMetrics.widthPixels * 260 / 360
 
-    @SuppressLint("NotifyDataSetChanged")
-    fun setListData(newData: List<CategoryEntity>) {
-        data.clear()
-        data.addAll(newData)
+    fun setListData(list: List<CategoryEntity>) {
+        mList = list
         notifyDataSetChanged()
     }
 
-    override fun getItemCount() = data.size
+    override fun getItemCount() = mList.size
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) =
-        CategoryDirectoryItemViewHolder(listener, parent.toBinding())
+        CategoryDirectoryItemViewHolder(CategoryDirectoryItemBinding.inflate(mLayoutInflater))
 
     override fun onBindViewHolder(holder: CategoryDirectoryItemViewHolder, position: Int) {
-        holder.onBind(position, data[position])
-    }
+        holder.binding.run {
+            root.layoutParams = root.layoutParams?.apply {
+                width = mContext.resources.displayMetrics.widthPixels * 260 / 360
+            } ?: RecyclerView.LayoutParams(width, RecyclerView.LayoutParams.WRAP_CONTENT)
 
-    override fun onBindViewHolder(holder: CategoryDirectoryItemViewHolder, position: Int, payloads: MutableList<Any>) {
-        if (payloads.isEmpty()) {
-            super.onBindViewHolder(holder, position, payloads)
-        } else {
-            holder.notifyItemSelectedChanged()
-        }
+            val padTop = if (position == 0) 16F.dip2px() else 24F.dip2px()
+            root.setPadding(16F.dip2px(), padTop, 16F.dip2px(), 0)
 
-    }
+            val entity = mList[position]
+            title.text = entity.name
+            title.setTextColor(com.gh.gamecenter.common.R.color.text_primary.toColor(mContext))
 
-    fun notifyItemSelectedChanged(parentId: String) {
-        val position = data.indexOfFirst { it.id == parentId }
-        if (position != -1) {
-            notifyItemChanged(position, "")
-        }
-    }
-
-    class CategoryDirectoryItemViewHolder(
-        private val listener: SearchCategoryPop.OnSearchCategoryListener,
-        val binding: CategoryDirectoryItemBinding
-    ) :
-        ViewHolder(binding.root) {
-
-        private val childAdapter by lazy {
-            SubCategoryAdapter(listener)
-        }
-
-        fun onBind(position: Int, item: CategoryEntity) {
-
-            val context = binding.root.context
-            binding.title.text = item.name
-
-            if (binding.subCategoryRv.adapter == null) {
-                binding.subCategoryRv.layoutManager = object : GridLayoutManager(context, 4) {
-                    override fun canScrollVertically(): Boolean {
-                        return false
+            subCategoryRv.run {
+                if (adapter is SubCategoryAdapter) {
+                    layoutManager = GridLayoutManager(mContext, 3)
+                    adapter = entity.data?.let {
+                        SubCategoryAdapter(
+                            mContext,
+                            mViewModel,
+                            it,
+                            position
+                        )
                     }
-                }
-                binding.subCategoryRv.adapter = childAdapter
-                binding.subCategoryRv.addItemDecoration(
-                    GridSpacingItemColorDecoration(
-                        context,
-                        8,
-                        8,
-                        com.gh.gamecenter.common.R.color.transparent
+                } else {
+                    layoutManager = GridLayoutManager(mContext, 3)
+                    adapter = entity.data?.let {
+                        SubCategoryAdapter(
+                            mContext,
+                            mViewModel,
+                            it,
+                            position
+                        )
+                    }
+                    addItemDecoration(
+                        GridSpacingItemColorDecoration(
+                            mContext,
+                            6,
+                            6,
+                            com.gh.gamecenter.common.R.color.transparent
+                        )
                     )
-                )
+                }
             }
-            childAdapter.setData(position, item)
-        }
-
-        fun notifyItemSelectedChanged() {
-            childAdapter.notifyItemRangeChanged(0, childAdapter.itemCount, "")
         }
     }
+
+    class CategoryDirectoryItemViewHolder(val binding: CategoryDirectoryItemBinding) :
+        BaseRecyclerViewHolder<Any>(binding.root)
 }

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

@@ -37,8 +37,8 @@ class CategoryV2Activity : DownloadToolbarActivity() {
     companion object {
         fun getIntent(context: Context, catalogId: String, catalogTitle: String, entrance: String): Intent {
             val bundle = Bundle()
-            bundle.putString(EntranceConsts.KEY_PAGE_ID, catalogId)
-            bundle.putString(EntranceConsts.KEY_PAGE_NAME, catalogTitle)
+            bundle.putString(EntranceConsts.KEY_CATEGORY_ID, catalogId)
+            bundle.putString(EntranceConsts.KEY_CATEGORY_TITLE, catalogTitle)
             bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance)
             return getTargetIntent(context, CategoryV2Activity::class.java, CategoryV2Fragment::class.java, bundle)
         }

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

@@ -1,7 +1,6 @@
 package com.gh.gamecenter.category2
 
 import android.content.Context
-import android.graphics.Typeface
 import android.view.View
 import android.view.ViewGroup
 import com.gh.gamecenter.common.base.BaseRecyclerViewHolder
@@ -14,13 +13,11 @@ import com.lightgame.adapter.BaseRecyclerAdapter
 
 class CategoryV2Adapter(
     context: Context,
+    private val mFragment: CategoryV2Fragment,
     private val mViewModel: CategoryV2ViewModel,
     private val mList: List<SidebarsEntity.SidebarEntity>
 ) : BaseRecyclerAdapter<CategoryV2Adapter.CategoryV2ItemViewHolder>(context) {
 
-    var selectedPosition = 0
-        private set
-
     override fun getItemCount() = mList.size
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) =
@@ -31,35 +28,25 @@ class CategoryV2Adapter(
             val catalogEntity = mList[position]
             catalogName.text = catalogEntity.name
             recommendTag.goneIf(!catalogEntity.recommended)
-            if (position == selectedPosition) {
+            if (catalogEntity.name == mViewModel.selectedCategoryName) {
                 selectedTag.visibility = View.VISIBLE
-                catalogName.setTextColor(com.gh.gamecenter.common.R.color.text_primary.toColor(mContext))
-                catalogName.setTypeface(null, Typeface.BOLD)
+                catalogName.setTextColor(com.gh.gamecenter.common.R.color.text_theme.toColor(mContext))
                 root.setBackgroundColor(com.gh.gamecenter.common.R.color.ui_surface.toColor(mContext))
             } else {
                 selectedTag.visibility = View.GONE
-                catalogName.setTextColor(com.gh.gamecenter.common.R.color.text_tertiary.toColor(mContext))
-                catalogName.setTypeface(null, Typeface.NORMAL)
+                catalogName.setTextColor(com.gh.gamecenter.common.R.color.text_primary.toColor(mContext))
                 root.setBackgroundColor(com.gh.gamecenter.common.R.color.ui_background.toColor(mContext))
             }
             root.setOnClickListener {
-                if (position != selectedPosition) {
+                if (catalogEntity.name != mViewModel.selectedCategoryName) {
+                    mViewModel.selectedCategoryName = catalogEntity.name
+                    mFragment.changeCategory(position)
                     mViewModel.logClickSide()
-                    mViewModel.selectSidebarsPosition(position)
+                    notifyDataSetChanged()
                 }
             }
         }
     }
 
-    fun selectPosition(newPosition: Int) {
-        if (selectedPosition == newPosition) {
-            return
-        }
-        val oldSelection = selectedPosition
-        selectedPosition = newPosition
-        notifyItemChanged(oldSelection)
-        notifyItemChanged(newPosition)
-    }
-
     class CategoryV2ItemViewHolder(val binding: CategoryV2ItemBinding) : BaseRecyclerViewHolder<Any>(binding.root)
 }

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

@@ -1,14 +1,14 @@
 package com.gh.gamecenter.category2
 
-import android.content.res.ColorStateList
-import android.graphics.Typeface
 import android.os.Bundle
-import android.view.Gravity
 import android.view.MenuItem
 import android.view.View
+import android.view.ViewGroup
 import androidx.core.os.bundleOf
-import androidx.core.widget.TextViewCompat
-import androidx.fragment.app.viewModels
+import androidx.core.view.GravityCompat
+import androidx.drawerlayout.widget.DrawerLayout
+import androidx.lifecycle.Observer
+import androidx.recyclerview.widget.LinearLayoutManager
 import com.gh.common.util.LogUtils
 import com.gh.gamecenter.R
 import com.gh.gamecenter.SearchActivity
@@ -22,49 +22,35 @@ import com.gh.gamecenter.common.view.FixLinearLayoutManager
 import com.gh.gamecenter.core.utils.PageSwitchDataHelper
 import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.databinding.FragmentCategoryBinding
+import com.gh.gamecenter.entity.CategoryEntity
 import com.gh.gamecenter.entity.SidebarsEntity
-import com.gh.gamecenter.livedata.EventObserver
 import com.gh.gamecenter.wrapper.SearchToolbarTabWrapperViewModel
 
 class CategoryV2Fragment : LazyFragment() {
 
     private var mBinding: FragmentCategoryBinding? = null
-
-    private val viewModel by viewModels<CategoryV2ViewModel>()
-
+    private var mViewModel: CategoryV2ViewModel? = null
     private var mHomeViewModel: SearchToolbarTabWrapperViewModel? = null
     private var mEntity: SidebarsEntity? = null
+    private var mSpecialCatalogFragment: SpecialCatalogFragment? = null
+    private var mCategoryV2ListFragment: CategoryV2ListFragment? = null
     private var mLastPageDataMap: HashMap<String, String>? = null
 
-    private var pageId: String = ""
-    private var pageName: String = ""
+    private var mCategoryId: String = ""
+    private var mCategoryTitle: String = ""
     private var mLastSelectedPosition = -1
 
-    private var searchCategoryPop: SearchCategoryPop? = null
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        pageId = arguments?.getString(EntranceConsts.KEY_PAGE_ID) ?: ""
-        pageName = arguments?.getString(EntranceConsts.KEY_PAGE_NAME) ?: ""
-        mLastPageDataMap = PageSwitchDataHelper.popLastPageData()
         savedInstanceState?.run {
             mLastSelectedPosition = getInt(EntranceConsts.KEY_LAST_SELECTED_POSITION)
         }
-
-        // 除了这里以外，下面还有一个判断是否为首页 tab 栏的赋值
-        var entrance = if (mEntrance.contains("首页")) "首页" else "板块"
-
-        val multiTabNavId = arguments?.getString(EntranceConsts.KEY_MULTI_TAB_NAV_ID, "") ?: ""
-        if (arguments?.getBoolean(EntranceConsts.KEY_IS_HOME) == true && multiTabNavId.isNotEmpty()) {
-            mHomeViewModel =
-                viewModelProviderFromParent(SearchToolbarTabWrapperViewModel.Factory(multiTabNavId, ""), multiTabNavId)
-            entrance = "首页Tab栏"
-        }
-        viewModel.init(entrance)
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
-        outState.putInt(EntranceConsts.KEY_LAST_SELECTED_POSITION, viewModel.selectedSidebarsPosition.value ?: 0)
+        mViewModel?.run {
+            outState.putInt(EntranceConsts.KEY_LAST_SELECTED_POSITION, selectedCategoryPosition)
+        }
         super.onSaveInstanceState(outState)
     }
 
@@ -75,40 +61,100 @@ class CategoryV2Fragment : LazyFragment() {
     }
 
     override fun onFragmentFirstVisible() {
+        mCategoryId = arguments?.getString(EntranceConsts.KEY_CATEGORY_ID) ?: ""
+        mCategoryTitle = arguments?.getString(EntranceConsts.KEY_CATEGORY_TITLE) ?: ""
+        mLastPageDataMap = PageSwitchDataHelper.popLastPageData()
+        mViewModel = viewModelProviderFromParent(CategoryV2ViewModel.Factory(mCategoryId, mCategoryTitle), mCategoryId)
 
-        viewModel.logAppearance()
+        // 除了这里以外，下面还有一个判断是否为首页 tab 栏的赋值
+        mViewModel?.entrance = if (mEntrance.contains("首页")) "首页" else "板块"
+
+        val multiTabNavId = arguments?.getString(EntranceConsts.KEY_MULTI_TAB_NAV_ID, "") ?: ""
+        if (arguments?.getBoolean(EntranceConsts.KEY_IS_HOME) == true && multiTabNavId.isNotEmpty()) {
+            mHomeViewModel = viewModelProviderFromParent(SearchToolbarTabWrapperViewModel.Factory(multiTabNavId, ""), multiTabNavId)
+            mViewModel?.entrance = "首页Tab栏"
+        }
+        mViewModel?.logAppearance()
 
         super.onFragmentFirstVisible()
-
-        viewModel.loadData(pageId, pageName)
     }
 
-
     override fun initRealView() {
         super.initRealView()
         initMenu(R.menu.menu_search)
-        setNavigationTitle(pageName)
+        setNavigationTitle(mCategoryTitle)
 
         mBinding?.run {
-            tvMoreCategory.setTextColor(com.gh.gamecenter.common.R.color.text_primary.toColor(requireContext()))
-            tvTagNumber.typeface =
-                Typeface.createFromAsset(requireContext().assets, Constants.DIN_FONT_PATH)
+            val width = resources.displayMetrics.widthPixels * 260 / 360
+            drawerLayout.setScrimColor(com.gh.gamecenter.common.R.color.black_alpha_30.toColor())
+            // 关闭手势滑动
+            drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED)
+            drawerLayout.addDrawerListener(object : DrawerLayout.DrawerListener {
+                override fun onDrawerStateChanged(newState: Int) {
+                }
+
+                override fun onDrawerSlide(drawerView: View, slideOffset: Float) {
+                }
+
+                override fun onDrawerClosed(drawerView: View) {
+                    showGuide()
+                }
+
+                override fun onDrawerOpened(drawerView: View) {
+                }
+
+            })
+            directoryContainer.layoutParams.width = width
+            directoryRv.layoutParams.width = width
+
+            // 嵌入在首页时特殊处理
+            if (arguments?.getBoolean(EntranceConsts.KEY_IS_HOME) == true) {
+                root.setBackgroundColor(com.gh.gamecenter.common.R.color.ui_surface.toColor(requireContext()))
+                root.setPadding(0, 8F.dip2px(), 0, 0)
+                directoryRv.isNestedScrollingEnabled = false
+                categoryRv.setBackgroundColor(com.gh.gamecenter.common.R.color.ui_background.toColor(requireContext()))
+            }
         }
 
-        viewModel.sidebarsLiveData.observe(viewLifecycleOwner) { sidebars ->
+        mViewModel?.directoriesLiveData?.observeNonNull(viewLifecycleOwner) {
+            initDirectoryView(it)
+        }
+
+        mViewModel?.selectedCountLiveData?.observeNonNull(viewLifecycleOwner) {
+            mBinding?.run {
+                if (it == 0) {
+                    confirmTv.text = "确定"
+                } else {
+                    mViewModel?.run {
+                        if (selectedCategoryName != "全部") {
+                            selectedCategoryName = "全部"
+                            selectedCategoryPosition = if (mEntity?.hasSpecial == true) 1 else 0
+                            categoryRv.adapter?.notifyDataSetChanged()
+                            mCategoryV2ListFragment?.updateSubCategoryId("all")
+                        }
+                    }
+
+                    confirmTv.text = "确定(已选${it})"
+                }
+            }
+        }
+
+        mViewModel?.sidebarsLiveData?.observe(viewLifecycleOwner, Observer {
             mBinding?.run {
                 reuseLoading.root.visibility = View.GONE
-                if (sidebars != null) {
+                if (it != null) {
                     reuseNoConnection.root.visibility = View.GONE
                     categoryContainer.visibility = View.VISIBLE
                     reuseNoneData.root.visibility = View.GONE
-                    mEntity = sidebars
-                    (sidebars.sidebars as ArrayList).run {
+                    mEntity = it
+                    (mEntity!!.sidebars as ArrayList).run {
                         val allEntity = SidebarsEntity.SidebarEntity(name = "全部", categoryId = "all")
-                        add(0, allEntity)
-                        if (sidebars.hasSpecial) {
+                        if (mEntity!!.hasSpecial) {
                             val specialEntity = SidebarsEntity.SidebarEntity(name = "精选")
-                            add(1, specialEntity)
+                            add(0, specialEntity)
+                            add(1, allEntity)
+                        } else {
+                            add(0, allEntity)
                         }
                     }
                     initView()
@@ -119,70 +165,12 @@ class CategoryV2Fragment : LazyFragment() {
                     reuseNoConnection.root.setOnClickListener {
                         reuseNoConnection.root.visibility = View.GONE
                         reuseLoading.root.visibility = View.VISIBLE
-                        viewModel.loadData(pageId, pageName)
+                        mViewModel?.getSidebars()
+                        mViewModel?.getCategoryDirectories()
                     }
                 }
             }
-        }
-
-        viewModel.directoriesLiveData.observe(viewLifecycleOwner) {
-            searchCategoryPop?.setData(it)
-        }
-
-        viewModel.selectedSubCategories.observe(viewLifecycleOwner) { selectedList ->
-            searchCategoryPop?.updateCategorySelected(selectedList)
-            updateMoreCategory(selectedList.size)
-        }
-
-        viewModel.selectedSidebarsPosition.observe(viewLifecycleOwner) {
-            mLastSelectedPosition = it
-            onSelectedPositionChanged(it)
-
-            val adapter = mBinding?.categoryRv?.adapter
-            if (adapter is CategoryV2Adapter) {
-                adapter.selectPosition(it)
-            }
-        }
-
-        viewModel.notifySubCategorySelected.observe(
-            viewLifecycleOwner,
-            EventObserver {
-                searchCategoryPop?.notifyItemSelectedChanged(it)
-            })
-    }
-
-    private fun createSearchPop(isAutoRequestFocus: Boolean): SearchCategoryPop {
-        val height = mBinding!!.root.height
-        return SearchCategoryPop.newInstance(requireContext(), height, isAutoRequestFocus, pageId, pageName).apply {
-            val data = viewModel.directoriesLiveData.value ?: listOf()
-            setData(data)
-            val selectedList = viewModel.selectedSubCategories.value
-            updateCategorySelected(selectedList)
-            setOnSearchCategoryListener(object : SearchCategoryPop.OnSearchCategoryListener {
-                override fun isEnableSelected(): Boolean {
-                    val size = viewModel.selectedSubCategories.value?.size ?: 0
-                    return size < 5
-                }
-
-                override fun onItemSelected(selected: CategoryV2ViewModel.SelectedTags) {
-                    viewModel.addSubCategorySelected(selected)
-                }
-
-                override fun onItemRemoved(parentId: String, subCategoryId: String) {
-                    viewModel.removeSubCategorySelected(parentId, subCategoryId, "全部游戏")
-                }
-
-                override fun onResetSelected() {
-                    viewModel.clearSelectedTag()
-                    viewModel.updateGameFiltered()
-                }
-
-                override fun onSubmit() {
-                    viewModel.logClickDetermine()
-                }
-
-            })
-        }
+        })
     }
 
     fun removeGuide() {
@@ -193,7 +181,15 @@ class CategoryV2Fragment : LazyFragment() {
     }
 
     private fun showGuide() {
+        if (!isAdded) return
         mBinding?.run {
+            val isShow = SPUtils.getBoolean(Constants.SP_SHOW_CATEGORY_GUIDE)
+            if (isShow) return
+
+            guideContainer.layoutParams = (guideContainer.layoutParams as ViewGroup.MarginLayoutParams).apply {
+                val screenWidth = resources.displayMetrics.widthPixels
+                leftMargin = screenWidth * 66F.dip2px() / 360F.dip2px()
+            }
             guideContainer.visibility = View.VISIBLE
 
             postDelayedRunnable({
@@ -208,7 +204,7 @@ class CategoryV2Fragment : LazyFragment() {
     override fun onMenuItemClick(menuItem: MenuItem?) {
         menuItem?.run {
             if (itemId == R.id.menu_search) {
-                LogUtils.uploadSearchGame("access_to_search", pageName, "", "")
+                LogUtils.uploadSearchGame("access_to_search", mCategoryTitle, "", "")
                 val intent = SearchActivity.getIntent(
                     requireContext(),
                     false,
@@ -221,64 +217,63 @@ class CategoryV2Fragment : LazyFragment() {
         }
     }
 
-    private fun initView() {
-        if (mEntity?.sidebars.isNullOrEmpty()) return
-        initSelectedCategory()
-        initCategoryRv()
-
+    private fun initDirectoryView(list: List<CategoryEntity>) {
         mBinding?.run {
-
-            vSearchCategory.setOnClickListener {
-                SensorsBridge.logClassificationSearch(pageId, pageName)
-                removeGuide()
-                showSearchPop(true)
-            }
-
-            vMoreCategory.setOnClickListener {
-                removeGuide()
-                showSearchPop(false)
-            }
-        }
-
-        val isShow = SPUtils.getBoolean(Constants.SP_SHOW_CATEGORY_GUIDE)
-        if (!isShow) {
-            postDelayedRunnable({
-                showSearchPop(false)
-                searchCategoryPop?.setOnDismissListener {
-                    showGuide()
+            mViewModel?.run {
+                if (directoryRv.adapter != null) {
+                    (directoryRv.adapter as? CategoryDirectoryAdapter)?.setListData(list)
+                } else {
+                    directoryRv.layoutManager = FixLinearLayoutManager(requireContext())
+                    directoryRv.adapter = CategoryDirectoryAdapter(
+                        requireContext(),
+                        this,
+                        list
+                    )
                 }
-            }, 200)
-        }
+            }
 
+            resetTv.setOnClickListener {
+                mViewModel?.logClickReset("全部类别")
+                confirmTv.text = "确定"
+                mViewModel?.resetDirectoryList()
+                mCategoryV2ListFragment?.changeCategoryTab()
+            }
+
+            confirmTv.setOnClickListener {
+                mViewModel?.logClickDetermine()
+                drawerLayout.closeDrawer(GravityCompat.START)
+            }
+        }
     }
 
-    private fun showSearchPop(isAutoRequestFocus: Boolean) {
-        mBinding?.run {
-            val location = IntArray(2)
-            vSearchCategory.getLocationOnScreen(location)
-
-            val popTop = location[1] - 8F.dip2px()
-            searchCategoryPop = createSearchPop(isAutoRequestFocus)
-            searchCategoryPop?.showAtLocation(vSearchCategory, Gravity.TOP, 0, popTop)
-        }
+    private fun initView() {
+        if (mEntity?.sidebars?.isNullOrEmpty() == true || mViewModel == null) return
+        initSelectedCategory()
+        initCategoryRv()
+        initContentFragment()
     }
 
     private fun initSelectedCategory() {
-        if (mLastSelectedPosition != -1) {
-            viewModel.selectSidebarsPosition(mLastSelectedPosition)
-        } else {
-            // 默认选中第 0 个 位置
-            viewModel.selectSidebarsPosition(0)
+        mEntity?.run {
+            mViewModel?.run {
+                if (mLastSelectedPosition != -1) {
+                    selectedCategoryPosition = mLastSelectedPosition
+                    selectedCategoryName = sidebars[mLastSelectedPosition].name
+                } else {
+                    selectedCategoryPosition = 0
+                    selectedCategoryName = sidebars[0].name
+                }
+            }
         }
-
     }
 
     private fun initCategoryRv() {
         mEntity?.run {
-            viewModel.run {
+            mViewModel?.run {
                 mBinding?.categoryRv?.layoutManager = FixLinearLayoutManager(requireContext())
                 mBinding?.categoryRv?.adapter = CategoryV2Adapter(
                     requireContext(),
+                    this@CategoryV2Fragment,
                     this,
                     sidebars
                 )
@@ -286,93 +281,226 @@ class CategoryV2Fragment : LazyFragment() {
         }
     }
 
-    private fun onSelectedPositionChanged(position: Int) {
-        mEntity?.run {
-            viewModel.run {
-                clearSelectedTag()
-                childFragmentManager.fragments.find { it.isAdded }
-                val targetFragment =
-                    if (hasSpecial && position == 1) {
-                        val fragment = childFragmentManager.findFragmentByTag(SpecialCatalogFragment::class.java.name)
-                            ?: SpecialCatalogFragment()
-                        fragment.arguments = bundleOf(
-                            EntranceConsts.KEY_IS_CATEGORY_V2 to true,
-                            EntranceConsts.KEY_CATALOG_ID to pageId,
-                            EntranceConsts.KEY_CATALOG_TITLE to pageName,
-                            EntranceConsts.KEY_EXPOSURE_SOURCE_LIST to arguments?.getParcelableArrayList<ExposureSource>(
-                                EntranceConsts.KEY_EXPOSURE_SOURCE_LIST
-                            ),
-                            EntranceConsts.KEY_LAST_PAGE_DATA to mLastPageDataMap
-                        )
-                        fragment
+    private fun initContentFragment() {
+        mEntity?.apply {
+            mViewModel?.apply {
+                if (hasSpecial && selectedCategoryPosition == 0) {
+                    initSpecialCatalogFragment()
+                } else {
+                    initCategoryV2ListFragment()
 
-                    } else {
-                        val fragment = (childFragmentManager.findFragmentByTag(CategoryV2ListFragment::class.java.name)
-                            ?: CategoryV2ListFragment())
-                        fragment.arguments = bundleOf(
-                            EntranceConsts.KEY_PAGE_ID to id,
-                            EntranceConsts.KEY_PAGE_NAME to pageName,
-                            EntranceConsts.KEY_EXPOSURE_SOURCE_LIST to arguments?.getParcelableArrayList<ExposureSource>(
-                                EntranceConsts.KEY_EXPOSURE_SOURCE_LIST
-                            ),
-                            EntranceConsts.KEY_LAST_PAGE_DATA to mLastPageDataMap
-                        )
-                        fragment
+                    // 第一次点"全部"tab展开全部类别选择框
+                    // 加延迟是为了防止卡顿
+                    if (SPUtils.getBoolean(Constants.SP_FIRST_ENTER_CATEGORY_V2, true)) {
+                        SPUtils.setBoolean(Constants.SP_FIRST_ENTER_CATEGORY_V2, false)
+                        mBinding?.drawerLayout?.postDelayed({
+                            tryCatchInRelease { openDrawer() }
+                        }, 500L)
                     }
+                }
+            }
+        }
+    }
 
+    private fun initSpecialCatalogFragment() {
+        mEntity?.run {
+            mSpecialCatalogFragment = childFragmentManager
+                .findFragmentByTag(SpecialCatalogFragment::class.java.name)
+                    as? SpecialCatalogFragment ?: SpecialCatalogFragment()
+            mSpecialCatalogFragment?.arguments = bundleOf(
+                EntranceConsts.KEY_IS_CATEGORY_V2 to true,
+                EntranceConsts.KEY_CATALOG_ID to id,
+                EntranceConsts.KEY_CATALOG_TITLE to mCategoryTitle,
+                EntranceConsts.KEY_EXPOSURE_SOURCE_LIST to arguments?.getParcelableArrayList<ExposureSource>(
+                    EntranceConsts.KEY_EXPOSURE_SOURCE_LIST
+                ),
+                EntranceConsts.KEY_LAST_PAGE_DATA to mLastPageDataMap
+            )
+            childFragmentManager
+                .beginTransaction()
+                .replace(
+                    R.id.gamesContainer,
+                    mSpecialCatalogFragment!!,
+                    SpecialCatalogFragment::class.java.name
+                )
+                .commitAllowingStateLoss()
+        }
+    }
+
+    private fun initCategoryV2ListFragment() {
+        mEntity?.run {
+            mViewModel?.run {
+                mCategoryV2ListFragment = childFragmentManager
+                    .findFragmentByTag(CategoryV2ListFragment::class.java.name)
+                        as? CategoryV2ListFragment ?: CategoryV2ListFragment()
+                mCategoryV2ListFragment?.arguments = bundleOf(
+                    EntranceConsts.KEY_CATEGORY_ID to id,
+                    EntranceConsts.KEY_SUB_CATEGORY_ID to sidebars[selectedCategoryPosition].categoryId,
+                    EntranceConsts.KEY_CATEGORY_TITLE to mCategoryTitle,
+                    EntranceConsts.KEY_EXPOSURE_SOURCE_LIST to arguments?.getParcelableArrayList<ExposureSource>(
+                        EntranceConsts.KEY_EXPOSURE_SOURCE_LIST
+                    ),
+                    EntranceConsts.KEY_LAST_PAGE_DATA to mLastPageDataMap
+                )
                 childFragmentManager
                     .beginTransaction()
-                    .replace(R.id.gamesContainer, targetFragment, targetFragment::class.java.name)
+                    .replace(
+                        R.id.gamesContainer,
+                        mCategoryV2ListFragment!!,
+                        CategoryV2ListFragment::class.java.name
+                    )
                     .commitAllowingStateLoss()
             }
         }
     }
 
-    private fun updateMoreCategory(size: Int) {
-        mBinding?.run {
-            if (size > 0) {
-                vMoreCategory.setBackgroundResource(R.drawable.bg_more_category_filtered)
-                TextViewCompat.setCompoundDrawableTintList(
-                    tvMoreCategory,
-                    ColorStateList.valueOf(com.gh.gamecenter.common.R.color.text_theme.toColor(requireContext()))
-                )
-                tvMoreCategory.setTextColor(com.gh.gamecenter.common.R.color.text_theme.toColor(requireContext()))
-                tvTagNumber.goneIf(false) {
-                    tvTagNumber.text = "$size"
+    fun changeCategory(position: Int) {
+        mEntity?.run {
+            mViewModel?.run {
+                resetDirectoryList()
+
+                if (hasSpecial) {
+                    if (selectedCategoryPosition == 0) {
+                        mCategoryV2ListFragment = childFragmentManager
+                            .findFragmentByTag(CategoryV2ListFragment::class.java.name)
+                                as? CategoryV2ListFragment ?: CategoryV2ListFragment()
+                        mCategoryV2ListFragment?.arguments = bundleOf(
+                            EntranceConsts.KEY_CATEGORY_ID to id,
+                            EntranceConsts.KEY_SUB_CATEGORY_ID to sidebars[position].categoryId,
+                            EntranceConsts.KEY_CATALOG_TITLE to mCategoryTitle,
+                            EntranceConsts.KEY_EXPOSURE_SOURCE_LIST to arguments?.getParcelableArrayList<ExposureSource>(
+                                EntranceConsts.KEY_EXPOSURE_SOURCE_LIST
+                            ),
+                            EntranceConsts.KEY_LAST_PAGE_DATA to mLastPageDataMap
+                        )
+                        childFragmentManager
+                            .beginTransaction()
+                            .replace(
+                                R.id.gamesContainer,
+                                mCategoryV2ListFragment!!,
+                                CategoryV2ListFragment::class.java.name
+                            )
+                            .commitAllowingStateLoss()
+                    } else {
+                        if (position == 0) {
+                            removeGuide()
+
+                            mSpecialCatalogFragment = childFragmentManager
+                                .findFragmentByTag(SpecialCatalogFragment::class.java.name)
+                                    as? SpecialCatalogFragment ?: SpecialCatalogFragment()
+                            mSpecialCatalogFragment?.arguments = bundleOf(
+                                EntranceConsts.KEY_IS_CATEGORY_V2 to true,
+                                EntranceConsts.KEY_CATALOG_ID to id,
+                                EntranceConsts.KEY_CATALOG_TITLE to mCategoryTitle,
+                                EntranceConsts.KEY_EXPOSURE_SOURCE_LIST to arguments?.getParcelableArrayList<ExposureSource>(
+                                    EntranceConsts.KEY_EXPOSURE_SOURCE_LIST
+                                ),
+                                EntranceConsts.KEY_LAST_PAGE_DATA to mLastPageDataMap
+                            )
+                            childFragmentManager
+                                .beginTransaction()
+                                .replace(
+                                    R.id.gamesContainer,
+                                    mSpecialCatalogFragment!!,
+                                    SpecialCatalogFragment::class.java.name
+                                )
+                                .commitAllowingStateLoss()
+                        } else {
+                            if (mCategoryV2ListFragment?.isStateSaved == false) {
+                                mCategoryV2ListFragment?.arguments = bundleOf(
+                                    EntranceConsts.KEY_CATEGORY_ID to id,
+                                    EntranceConsts.KEY_SUB_CATEGORY_ID to sidebars[position].categoryId,
+                                    EntranceConsts.KEY_CATALOG_TITLE to mCategoryTitle,
+                                    EntranceConsts.KEY_EXPOSURE_SOURCE_LIST to arguments?.getParcelableArrayList<ExposureSource>(
+                                        EntranceConsts.KEY_EXPOSURE_SOURCE_LIST
+                                    ),
+                                    EntranceConsts.KEY_LAST_PAGE_DATA to mLastPageDataMap
+                                )
+                            }
+                            mCategoryV2ListFragment?.changeCategoryTab(sidebars[position].categoryId)
+                        }
+                    }
+
+                    // 第一次点"全部"tab展开全部类别选择框
+                    // 加延迟是为了防止卡顿
+                    if (position == 1 && SPUtils.getBoolean(Constants.SP_FIRST_ENTER_CATEGORY_V2, true)) {
+                        SPUtils.setBoolean(Constants.SP_FIRST_ENTER_CATEGORY_V2, false)
+                        mBinding?.drawerLayout?.postDelayed({
+                            tryCatchInRelease { openDrawer() }
+                        }, 200L)
+                    }
+                } else {
+                    if (mCategoryV2ListFragment?.isStateSaved == false) {
+                        mCategoryV2ListFragment?.arguments = bundleOf(
+                            EntranceConsts.KEY_CATEGORY_ID to id,
+                            EntranceConsts.KEY_SUB_CATEGORY_ID to sidebars[position].categoryId,
+                            EntranceConsts.KEY_CATALOG_TITLE to mCategoryTitle,
+                            EntranceConsts.KEY_EXPOSURE_SOURCE_LIST to arguments?.getParcelableArrayList<ExposureSource>(
+                                EntranceConsts.KEY_EXPOSURE_SOURCE_LIST
+                            ),
+                            EntranceConsts.KEY_LAST_PAGE_DATA to mLastPageDataMap
+                        )
+                    }
+                    mCategoryV2ListFragment?.changeCategoryTab(sidebars[position].categoryId)
                 }
-            } else {
-                vMoreCategory.setBackgroundResource(R.drawable.bg_more_category_default)
-                TextViewCompat.setCompoundDrawableTintList(
-                    tvMoreCategory,
-                    ColorStateList.valueOf(com.gh.gamecenter.common.R.color.text_primary.toColor(requireContext()))
-                )
-                tvMoreCategory.setTextColor(com.gh.gamecenter.common.R.color.text_primary.toColor(requireContext()))
-                tvTagNumber.goneIf(true)
+                selectedCategoryPosition = position
             }
         }
     }
 
+    fun openDirectoryLayout() {
+        mBinding?.run {
+            var i = 0
+            mViewModel?.run {
+                mEntity?.run {
+                    val sidebar = sidebars[selectedCategoryPosition]
+                    if (sidebar.name != "全部") {
+                        directories.forEachIndexed { index, entity ->
+                            if (sidebar.type == "level_one") {
+                                if (sidebar.categoryId == entity.id) {
+                                    i = index
+                                    return@run
+                                }
+                            } else {
+                                if (sidebar.parentId == entity.id) {
+                                    i = index
+                                    return@run
+                                }
+                            }
+                        }
+                    } else if (sidebar.name == "全部" && selectedCategoryList.isNotEmpty()) {
+                        i = selectedCategoryList[0].primaryIndex
+                    }
+                }
+            }
+            openDrawer()
+            (directoryRv.layoutManager as? LinearLayoutManager)?.scrollToPositionWithOffset(i, 0)
+        }
+    }
+
+    private fun openDrawer() {
+        mBinding?.drawerLayout?.openDrawer(GravityCompat.START)
+
+        mHomeViewModel?.let {
+            mBinding?.directoryContainer?.setPadding(
+                0,
+                0,
+                0,
+                requireContext().resources.getDimension(com.gh.gamecenter.common.R.dimen.main_bottom_tab_height).toInt() - it.appBarOffset
+            )
+        }
+    }
+
     override fun onDarkModeChanged() {
         super.onDarkModeChanged()
         getItemMenu(R.id.menu_search)?.setIcon(R.drawable.ic_column_search)
-        mBinding?.run {
-            categoryRv.adapter?.run {
-                categoryRv.recycledViewPool.clear()
-                notifyItemRangeChanged(0, itemCount, "")
-            }
-
-            val selectedTagsSize = viewModel.selectedSubCategories.value?.size ?: 0
-            updateMoreCategory(selectedTagsSize)
-
-            context?.let {
-                ivSearchCategory.imageTintList =
-                    ColorStateList.valueOf(com.gh.gamecenter.common.R.color.text_instance.toColor(it))
-            }
+        mBinding?.categoryRv?.adapter?.run {
+            mBinding?.categoryRv?.recycledViewPool?.clear()
+            notifyItemRangeChanged(0, itemCount)
+        }
+        mBinding?.directoryRv?.adapter?.run {
+            mBinding?.directoryRv?.recycledViewPool?.clear()
+            notifyItemRangeChanged(0, itemCount)
         }
     }
-
-    companion object {
-
-        private const val SPECIAL_CATEGORY_POSITION = 1
-    }
 }

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

@@ -76,15 +76,8 @@ class CategoryV2ListAdapter(
             ItemViewType.GAME_NORMAL -> {
                 CategoryGameItemViewHolder(parent.toBinding())
             }
-
             else -> {
-                FooterViewHolder(
-                    mLayoutInflater.inflate(
-                        com.gh.gamecenter.common.R.layout.refresh_footerview,
-                        parent,
-                        false
-                    )
-                )
+                FooterViewHolder(mLayoutInflater.inflate(com.gh.gamecenter.common.R.layout.refresh_footerview, parent, false))
             }
         }
     }
@@ -101,12 +94,20 @@ class CategoryV2ListAdapter(
             holder.bindGameItem(gameEntity)
             holder.initServerType(gameEntity)
 
-            val categoryTitle = mCategoryViewModel.pageName
-            val selectedCategoryName = mCategoryViewModel.selectedSidebarsName
-            val selectedSubCatalogName =
-                mCategoryViewModel.selectedSubCategories.value?.joinToString("-") { it.category.name ?: "" }
-            val sortType = mViewModel.gameFiltered.sortType.value
-            val sortSize = mViewModel.gameFiltered.size.text
+            val categoryTitle = mCategoryViewModel.categoryTitle
+            val selectedCategoryName = mCategoryViewModel.selectedCategoryName
+            val builder = StringBuilder()
+            mCategoryViewModel.selectedCategoryList.run {
+                forEachIndexed { index, entity ->
+                    builder.append(entity.name)
+                    if (index != size - 1) {
+                        builder.append("_")
+                    }
+                }
+            }
+            val selectedSubCatalogName = builder.toString()
+            val sortType = mViewModel.sortType.value
+            val sortSize = mViewModel.sortSize.text
 
             val exposureSources = ArrayList<ExposureSource>()
             if (!mViewModel.exposureSourceList.isNullOrEmpty()) {
@@ -171,13 +172,8 @@ class CategoryV2ListAdapter(
             ) {
                 val trackEvent = JSONObject()
                 try {
-                    trackEvent.put("navigation_bar_name", mCategoryViewModel.selectedSidebarsName)
-                    trackEvent.put(
-                        "game_tag",
-                        (mCategoryViewModel.selectedSubCategories.value ?: listOf())
-                            .map {
-                                it.category.name
-                            })
+                    trackEvent.put("navigation_bar_name", mCategoryViewModel.selectedCategoryName)
+                    trackEvent.put("game_tag", mCategoryViewModel.selectedCategoryList.map { it.name })
                     trackEvent.put("game_status", gameEntity.category)
                     trackEvent.put(
                         "inclusion_size",
@@ -246,7 +242,7 @@ class CategoryV2ListAdapter(
                 gameIconView.displayGameIcon(gameEntity)
                 gameRating.textSize = if (gameEntity.commentCount > 3) 12F else 10F
                 BindingAdapters.setGameName(gameName, gameEntity, false)
-                BindingAdapters.setGameTags(labelList, gameEntity, "")
+                BindingAdapters.setGameTags(labelList, gameEntity)
                 gameRating.setDrawableStart(if (gameEntity.commentCount > 3) com.gh.gamecenter.feature.R.drawable.game_horizontal_rating.toDrawable() else null)
                 gameRating.text = if (gameEntity.commentCount > 3) {
                     if (gameEntity.star == 10.0F) "10" else gameEntity.star.toString()
@@ -270,24 +266,18 @@ class CategoryV2ListAdapter(
                     binding.gameKaifuType.visibility = View.GONE
                     binding.gameKaifuType.text = ""
                 }
-
                 serverLabel != null -> {
                     binding.gameKaifuType.visibility = View.VISIBLE
                     binding.gameKaifuType.text = serverLabel.value
                     if (gameEntity.isUseDefaultServerStyle()) {
                         binding.gameKaifuType.background =
                             com.gh.gamecenter.feature.R.drawable.server_label_default_bg.toDrawable(binding.root.context)
-                        binding.gameKaifuType.setTextColor(
-                            com.gh.gamecenter.common.R.color.text_secondary.toColor(
-                                binding.root.context
-                            )
-                        )
+                        binding.gameKaifuType.setTextColor(com.gh.gamecenter.common.R.color.text_secondary.toColor(binding.root.context))
                     } else {
                         binding.gameKaifuType.background = DrawableView.getServerDrawable(serverLabel.color)
                         binding.gameKaifuType.setTextColor(com.gh.gamecenter.common.R.color.white.toColor(binding.root.context))
                     }
                 }
-
                 else -> binding.gameKaifuType.visibility = View.GONE
             }
 

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

@@ -2,10 +2,9 @@ package com.gh.gamecenter.category2
 
 import android.os.Bundle
 import android.view.View
-import androidx.fragment.app.viewModels
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
+import android.view.ViewGroup
 import com.ethanhua.skeleton.Skeleton
+import com.gh.gamecenter.common.constant.Constants
 import com.gh.common.exposure.ExposureListener
 import com.gh.common.util.DialogUtils
 import com.gh.common.view.CategoryFilterView
@@ -14,17 +13,16 @@ 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.common.constant.Constants
 import com.gh.gamecenter.common.constant.EntranceConsts
-import com.gh.gamecenter.common.utils.goneIf
-import com.gh.gamecenter.common.utils.observeNonNull
-import com.gh.gamecenter.common.utils.toColor
-import com.gh.gamecenter.common.utils.viewModelProvider
+import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.databinding.FragmentCategoryListBinding
+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.feature.entity.GameEntity
+import com.google.android.flexbox.FlexboxLayout
 import com.lightgame.download.DataWatcher
 import com.lightgame.download.DownloadEntity
 import org.greenrobot.eventbus.Subscribe
@@ -32,18 +30,13 @@ import org.greenrobot.eventbus.ThreadMode
 
 class CategoryV2ListFragment : ListFragment<GameEntity, CategoryV2ListViewModel>() {
 
-    private var pageId: String = ""
-    private var pageName: String = ""
-    private val parentViewModel by viewModels<CategoryV2ViewModel>(
-        ownerProducer = { parentFragment ?: this }
-    )
-
-    override fun isAutomaticLoad(): Boolean {
-        return false
-    }
-
+    private var mCategoryId: String = ""
+    private var mSubCategoryId: String = ""
+    private var mCategoryTitle: String = ""
     private var mAdapter: CategoryV2ListAdapter? = null
+    private var mSelectedViewList = ArrayList<View>()
     private var mBinding: FragmentCategoryListBinding? = null
+    private var mCategoryViewModel: CategoryV2ViewModel? = null
     private var mLastPageDataMap: HashMap<String, String>? = null
     private val mDataWatcher = object : DataWatcher() {
         override fun onDataChanged(downloadEntity: DownloadEntity) {
@@ -59,12 +52,6 @@ class CategoryV2ListFragment : ListFragment<GameEntity, CategoryV2ListViewModel>
         }
     }
 
-    private val selectedTagsAdapter by lazy {
-        SelectedTagsAdapter {
-            parentViewModel.removeSubCategorySelected(it.parentId, it.category.id, "游戏列表")
-        }
-    }
-
     override fun getLayoutId() = 0
 
     override fun getInflatedLayout() =
@@ -73,7 +60,8 @@ class CategoryV2ListFragment : ListFragment<GameEntity, CategoryV2ListViewModel>
     override fun provideListViewModel() =
         viewModelProvider<CategoryV2ListViewModel>(
             CategoryV2ListViewModel.Factory(
-                pageId,
+                mCategoryId,
+                mSubCategoryId,
                 arguments?.getParcelableArrayList(EntranceConsts.KEY_EXPOSURE_SOURCE_LIST)
             )
         )
@@ -82,7 +70,12 @@ class CategoryV2ListFragment : ListFragment<GameEntity, CategoryV2ListViewModel>
         ?: CategoryV2ListAdapter(
             requireContext(),
             mListViewModel ?: provideListViewModel(),
-            parentViewModel,
+            mCategoryViewModel ?: viewModelProviderFromParent(
+                CategoryV2ViewModel.Factory(
+                    mCategoryId,
+                    mCategoryTitle
+                ), mCategoryId
+            ),
             mEntrance,
             mLastPageDataMap
         ).apply { mAdapter = this }
@@ -90,10 +83,12 @@ class CategoryV2ListFragment : ListFragment<GameEntity, CategoryV2ListViewModel>
     override fun getItemDecoration() = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        pageId = arguments?.getString(EntranceConsts.KEY_PAGE_ID) ?: ""
-        pageName = arguments?.getString(EntranceConsts.KEY_PAGE_NAME) ?: ""
+        mCategoryId = arguments?.getString(EntranceConsts.KEY_CATEGORY_ID) ?: ""
+        mSubCategoryId = arguments?.getString(EntranceConsts.KEY_SUB_CATEGORY_ID) ?: ""
+        mCategoryTitle = arguments?.getString(EntranceConsts.KEY_CATEGORY_TITLE) ?: ""
         mLastPageDataMap = arguments?.getSerializable(EntranceConsts.KEY_LAST_PAGE_DATA) as? HashMap<String, String>
-
+        mCategoryViewModel =
+            viewModelProviderFromParent(CategoryV2ViewModel.Factory(mCategoryId, mCategoryTitle), mCategoryId)
         mEntrance = arguments?.getString(EntranceConsts.KEY_ENTRANCE) ?: Constants.ENTRANCE_UNKNOWN
 
         super.onCreate(savedInstanceState)
@@ -109,8 +104,19 @@ class CategoryV2ListFragment : ListFragment<GameEntity, CategoryV2ListViewModel>
 
         initFilterView()
 
-        mListViewModel?.refresh?.observeNonNull(viewLifecycleOwner) {
-            onRefresh()
+        mListViewModel?.refresh?.observeNonNull(viewLifecycleOwner) { onRefresh() }
+        mCategoryViewModel?.run {
+            categoryPositionLiveData.observeNonNull(viewLifecycleOwner) {
+                directories[it.first].data?.get(it.second)?.run {
+                    mBinding?.selectedCategoryContainer?.visibility = View.VISIBLE
+
+                    if (selected) {
+                        addCategory(this)
+                    } else {
+                        removeCategory(this)
+                    }
+                }
+            }
         }
 
         mListRv.addOnScrollListener(ExposureListener(this, provideListAdapter()))
@@ -126,40 +132,19 @@ class CategoryV2ListFragment : ListFragment<GameEntity, CategoryV2ListViewModel>
             .show()
 
         mBinding?.reuseNoneData?.reuseResetLoadTv?.setOnClickListener {
-            // 重试时，
-            // 清空所有筛选条件
-            with(parentViewModel) {
+            mCategoryViewModel?.run {
                 logClickReset("游戏列表")
-                clearSelectedTag()
-                // 移除大小限制
-                mBinding?.filterContainer?.resetSortSize()
-                val size = SubjectSettingEntity.Size()
-                updateGameFiltered(size)
-            }
-
-        }
-
-        with(parentViewModel) {
-            gameFiltered.observe(viewLifecycleOwner) {
-                mListViewModel.updateSortConfig(it)
-            }
-
-            selectedSubCategories.observe(viewLifecycleOwner) {
-                updateSelectedTags(it)
+                resetDirectoryList()
             }
+            resetSortSize()
+            changeCategoryTab()
+//            openDirectoryLayout()
         }
     }
 
-    private fun updateSelectedTags(selectedTags: List<CategoryV2ViewModel.SelectedTags>) {
-        mBinding?.run {
-            flTagsContainer.goneIf(selectedTags.isEmpty()) {
-                if (rvTags.adapter == null) {
-                    rvTags.layoutManager = LinearLayoutManager(requireContext(), RecyclerView.HORIZONTAL, false)
-                    rvTags.adapter = selectedTagsAdapter
-                }
-                selectedTagsAdapter.submitList(selectedTags)
-            }
-        }
+    private fun resetSortSize() {
+        mBinding?.filterContainer?.resetSortSize()
+        mListViewModel?.sortSize = SubjectSettingEntity.Size(min = -1, max = -1, text = "全部大小")
 
     }
 
@@ -169,19 +154,22 @@ class CategoryV2ListFragment : ListFragment<GameEntity, CategoryV2ListViewModel>
 
             setOnConfigSetupListener(object : CategoryFilterView.OnCategoryFilterSetupListener {
                 override fun onSetupSortSize(sortSize: SubjectSettingEntity.Size) {
-                    parentViewModel.updateGameFiltered(size = sortSize)
+                    mListViewModel?.updateSortConfig(sortSize = sortSize)
                 }
 
                 override fun onSetupSortType(sortType: CategoryFilterView.SortType) {
-                    parentViewModel.updateGameFiltered(sortType = sortType)
+                    mListViewModel?.updateSortConfig(sortType = sortType)
                 }
 
-                override fun getPopHeight(): Int {
-                    return (mBinding?.root?.height ?: 0) - (mBinding?.flTagsContainer?.height ?: 0)
+                override fun onSetupSortCategory() {
+                    openDirectoryLayout()
                 }
             })
 
             setOnFilterClickListener(object : CategoryFilterView.OnFilterClickListener {
+                override fun onCategoryClick() {
+                    removeGuide()
+                }
 
                 override fun onTypeClick() {
                     removeGuide()
@@ -195,6 +183,101 @@ class CategoryV2ListFragment : ListFragment<GameEntity, CategoryV2ListViewModel>
         }
     }
 
+    fun updateSubCategoryId(id: String) {
+        mSubCategoryId = id
+    }
+
+    fun changeCategoryTab(categoryId: String? = null) {
+        mSelectedViewList.clear()
+        mBinding?.selectedCategoryContainer?.run {
+            removeAllViews()
+            visibility = View.GONE
+        }
+        if (categoryId != null) mSubCategoryId = categoryId
+        mListViewModel?.updateSortConfig(categoryIds = mSubCategoryId)
+    }
+
+    private fun addCategory(entity: CategoryEntity) {
+        addCategoryView(entity)
+        mCategoryViewModel?.selectedCategoryList?.add(entity)
+        updateCategoryGame()
+    }
+
+    private fun removeCategory(entity: CategoryEntity) {
+        mCategoryViewModel?.selectedCategoryList?.run {
+            if (isEmpty()) return
+
+            removeCategoryView(entity.name ?: "")
+            remove(entity)
+            if (size == 0) {
+                mBinding?.selectedCategoryContainer?.visibility = View.GONE
+                mListViewModel?.updateSortConfig(categoryIds = mSubCategoryId)
+            } else {
+                updateCategoryGame()
+            }
+        }
+    }
+
+    private fun addCategoryView(entity: CategoryEntity) {
+        val binding = LayoutSelectedCategoryBinding.inflate(layoutInflater).apply {
+            val params =
+                FlexboxLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+            params.setMargins(0, 8F.dip2px(), 8F.dip2px(), 0)
+            params.height = 24F.dip2px()
+            root.layoutParams = params
+
+            name.text = entity.name
+            root.setOnClickListener {
+                removeCategoryAndNotify(entity)
+            }
+        }
+
+        mSelectedViewList.add(binding.root)
+        mBinding?.selectedCategoryContainer?.addView(binding.root)
+    }
+
+    private fun removeCategoryView(categoryName: String) {
+        mCategoryViewModel?.selectedCategoryList?.run {
+            var i = 0
+            forEachIndexed { index, categoryEntity ->
+                if (categoryName == categoryEntity.name) {
+                    i = index
+                }
+            }
+
+            if (i < mSelectedViewList.size) {
+                mBinding?.selectedCategoryContainer?.removeView(mSelectedViewList[i])
+                mSelectedViewList.removeAt(i)
+            }
+        }
+    }
+
+    private fun removeCategoryAndNotify(entity: CategoryEntity) {
+        removeCategory(entity)
+        entity.selected = false
+        mCategoryViewModel?.run {
+            if (selectedCount > 0) {
+                selectedCount--
+                postSelectedCount()
+                postCategoryDirectoryList()
+                logClickClassificationDelete(entity.primaryIndex, entity.name ?: "", "游戏列表")
+            }
+        }
+    }
+
+    private fun updateCategoryGame() {
+        mCategoryViewModel?.selectedCategoryList?.run {
+            val categoryIds = StringBuilder()
+            forEachIndexed { index, s ->
+                categoryIds.append(s.id)
+                if (index != size - 1) {
+                    categoryIds.append("-")
+                }
+            }
+            mListViewModel?.updateSortConfig(categoryIds = categoryIds.toString())
+        }
+    }
+
     private fun removeGuide() {
         (parentFragment as? CategoryV2Fragment)?.removeGuide()
     }
@@ -245,6 +328,10 @@ class CategoryV2ListFragment : ListFragment<GameEntity, CategoryV2ListViewModel>
         }
     }
 
+    fun openDirectoryLayout() {
+        (parentFragment as? CategoryV2Fragment)?.openDirectoryLayout()
+    }
+
     override fun onDarkModeChanged() {
         super.onDarkModeChanged()
         mBinding?.filterContainer?.run {

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

@@ -4,13 +4,14 @@ import android.app.Application
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
+import com.gh.gamecenter.common.entity.ExposureEntity
 import com.gh.common.exposure.ExposureUtils
+import com.gh.gamecenter.core.utils.UrlFilterUtils
 import com.gh.common.view.CategoryFilterView
 import com.gh.gamecenter.common.baselist.ListViewModel
-import com.gh.gamecenter.common.entity.ExposureEntity
 import com.gh.gamecenter.common.exposure.ExposureSource
-import com.gh.gamecenter.core.utils.UrlFilterUtils
 import com.gh.gamecenter.feature.entity.GameEntity
+import com.gh.gamecenter.entity.SubjectSettingEntity
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.halo.assistant.HaloApp
 import io.reactivex.Observable
@@ -19,13 +20,14 @@ import io.reactivex.Single
 class CategoryV2ListViewModel(
     application: Application,
     val categoryId: String,
+    var categoryIds: String,
     var exposureSourceList: List<ExposureSource>?
 ) : ListViewModel<GameEntity, GameEntity>(application) {
 
     val refresh = MutableLiveData<Boolean>()
 
-    var gameFiltered = CategoryV2ViewModel.GameFiltered()
-        private set
+    var sortType = CategoryFilterView.SortType.RECOMMENDED
+    var sortSize = SubjectSettingEntity.Size()
 
     override fun provideDataObservable(page: Int): Observable<List<GameEntity>>? = null
 
@@ -49,36 +51,52 @@ class CategoryV2ListViewModel(
     }
 
     fun updateSortConfig(
-        gameFiltered: CategoryV2ViewModel.GameFiltered
+        sortSize: SubjectSettingEntity.Size? = null,
+        sortType: CategoryFilterView.SortType? = null,
+        categoryIds: String? = null
     ) {
-        this.gameFiltered = gameFiltered
-        refresh.postValue(true)
+        when {
+            sortSize != null && sortSize != this.sortSize -> {
+                this.sortSize = sortSize
+                refresh.postValue(true)
+            }
+
+            sortType != null && sortType != this.sortType -> {
+                this.sortType = sortType
+                refresh.postValue(true)
+            }
+
+            categoryIds != null && categoryIds != this.categoryIds -> {
+                this.categoryIds = categoryIds
+                refresh.postValue(true)
+            }
+        }
     }
 
     private fun getFilter(): String? {
-
         return UrlFilterUtils.getFilterQuery(
-            "category_ids", gameFiltered.categoryIds.ifBlank { gameFiltered.sidebarCategoryId },
-            "min_size", gameFiltered.size.min.toString(),
-            "max_size", gameFiltered.size.max.toString()
+            "category_ids", categoryIds,
+            "min_size", sortSize.min.toString(),
+            "max_size", sortSize.max.toString()
         )
 
     }
 
     private fun getSortType(): String? {
-        return when (gameFiltered.sortType) {
+        return when (sortType) {
             CategoryFilterView.SortType.RECOMMENDED -> "download:-1"
             CategoryFilterView.SortType.NEWEST -> "publish:-1"
             CategoryFilterView.SortType.RATING -> "star:-1"
         }
     }
 
-    class Factory(val categoryId: String, val exposureSourceList: List<ExposureSource>?) :
+    class Factory(val categoryId: String, val categoryIds: String, val exposureSourceList: List<ExposureSource>?) :
         ViewModelProvider.NewInstanceFactory() {
         override fun <T : ViewModel> create(modelClass: Class<T>): T {
             return CategoryV2ListViewModel(
                 HaloApp.getInstance().application,
                 categoryId,
+                categoryIds,
                 exposureSourceList
             ) as T
         }

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

@@ -1,214 +1,160 @@
 package com.gh.gamecenter.category2
 
-import androidx.lifecycle.LiveData
+import android.annotation.SuppressLint
+import android.app.Application
+import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
 import com.gh.common.util.LogUtils
-import com.gh.common.view.CategoryFilterView
-import com.gh.gamecenter.common.retrofit.BiResponse
-import com.gh.gamecenter.common.utils.singleToMain
 import com.gh.gamecenter.entity.CategoryEntity
 import com.gh.gamecenter.entity.SidebarsEntity
-import com.gh.gamecenter.entity.SubjectSettingEntity
-import com.gh.gamecenter.livedata.Event
+import com.gh.gamecenter.common.retrofit.BiResponse
 import com.gh.gamecenter.retrofit.RetrofitManager
-import io.reactivex.disposables.CompositeDisposable
+import com.halo.assistant.HaloApp
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.schedulers.Schedulers
 
-class CategoryV2ViewModel : ViewModel() {
+class CategoryV2ViewModel(
+    application: Application,
+    private val mCategoryId: String,
+    val categoryTitle: String
+) : AndroidViewModel(application) {
 
-    private val compositeDisposable = CompositeDisposable()
     private val api = RetrofitManager.getInstance().api
-    var sidebarsLiveData = MutableLiveData<SidebarsEntity?>()
+    var sidebarsLiveData = MutableLiveData<SidebarsEntity>()
+    var directories = ArrayList<CategoryEntity>()
     var directoriesLiveData = MutableLiveData<List<CategoryEntity>>()
+    var selectedCount = 0
+    var selectedCountLiveData = MutableLiveData<Int>()
+    var categoryPositionLiveData = MutableLiveData<Pair<Int, Int>>()
 
+    var selectedCategoryName: String = ""
+    var selectedCategoryPosition: Int = 0
+    var selectedCategoryList = ArrayList<CategoryEntity>()
     var entrance: String = ""
-    private var pageId = ""
-    var pageName = ""
-        private set
 
-    fun init(entrance: String) {
-        this.entrance = entrance
+    init {
+        getSidebars()
+        getCategoryDirectories()
     }
 
-    fun loadData(pageId: String, pageName: String) {
-        this.pageId = pageId
-        this.pageName = pageName
-
-        val sidebarsObservable = api.getSidebars(pageId)
-        val directoriesObservable = api.getCategoryDirectories(pageId)
-            .onErrorReturnItem(listOf())
-        sidebarsObservable.zipWith(directoriesObservable) { t1, t2 ->
-            t1 to t2
-        }.compose(singleToMain())
-            .subscribe(object : BiResponse<Pair<SidebarsEntity, List<CategoryEntity>>>() {
-                override fun onSuccess(data: Pair<SidebarsEntity, List<CategoryEntity>>) {
-                    val (sidebarsData, directories) = data
-                    directoriesLiveData.value = directories
-                    sidebarsLiveData.value = sidebarsData
+    @SuppressLint("CheckResult")
+    fun getSidebars() {
+        api.getSidebars(mCategoryId)
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(object : BiResponse<SidebarsEntity>() {
+                override fun onSuccess(data: SidebarsEntity) {
+                    sidebarsLiveData.postValue(data)
                 }
 
                 override fun onFailure(exception: Exception) {
                     super.onFailure(exception)
                     sidebarsLiveData.postValue(null)
                 }
-
-            }).let(compositeDisposable::add)
+            })
     }
 
-    fun clearSelectedTag() {
-        logClickReset("全部类别")
-        val filteredList = _selectedSubCategories.value
-        if (!filteredList.isNullOrEmpty()) {
-            _selectedSubCategories.value = mutableListOf()
-
-            val directories = directoriesLiveData.value ?: return
-            directories.forEach {
-                it.data?.forEach { child ->
-                    child.selected = false
+    @SuppressLint("CheckResult")
+    fun getCategoryDirectories() {
+        api.getCategoryDirectories(mCategoryId)
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(object : BiResponse<List<CategoryEntity>>() {
+                override fun onSuccess(data: List<CategoryEntity>) {
+                    directories = ArrayList(data)
+                    postCategoryDirectoryList()
                 }
+            })
+    }
+
+    fun postSelectedCount() {
+        selectedCountLiveData.postValue(selectedCount)
+    }
+
+    fun postCategoryPosition(primaryIndex: Int, subIndex: Int) {
+        categoryPositionLiveData.postValue(Pair(primaryIndex, subIndex))
+    }
+
+    fun postCategoryDirectoryList() {
+        directoriesLiveData.postValue(directories)
+    }
+
+    fun resetDirectoryList() {
+        selectedCount = 0
+        selectedCategoryList.clear()
+        directories.forEach {
+            it.data?.forEach { entity ->
+                entity.selected = false
             }
-            directoriesLiveData.value = directories
         }
+        postSelectedCount()
+        postCategoryDirectoryList()
     }
 
     fun logAppearance() {
-        LogUtils.logCategoryV2AppearanceEvent(entrance, pageName)
+        LogUtils.logCategoryV2AppearanceEvent(entrance, categoryTitle)
     }
 
     fun logClickSide() {
-        val sidebars = sidebarsLiveData.value?.sidebars
-        val selectedPosition = selectedSidebarsPosition.value ?: 0
-        val selectedCategoryName = sidebars?.getOrNull(selectedPosition)?.name ?: ""
-        LogUtils.logCategoryV2ClickSideEvent(entrance, pageName, selectedCategoryName, selectedPosition)
+        LogUtils.logCategoryV2ClickSideEvent(entrance, categoryTitle, selectedCategoryName, selectedCategoryPosition)
     }
 
-    private fun logClickClassification(selected: SelectedTags) {
+    fun logClickClassification(primaryIndex: Int, categoryName: String, position: Int) {
         LogUtils.logCategoryV2ClickClassificationEvent(
             entrance,
-            pageName,
-            selectedSidebarsName,
-            selected.parentName,
-            selected.category.name ?: "",
-            selected.parentPosition,
-            selected.position
+            categoryTitle,
+            selectedCategoryName,
+            directories[primaryIndex].name,
+            categoryName,
+            primaryIndex,
+            position
         )
     }
 
-    private fun logClickClassificationDelete(directoryName: String, categoryName: String, location: String) {
+    fun logClickClassificationDelete(primaryIndex: Int, categoryName: String, location: String) {
         LogUtils.logCategoryV2ClickClassificationDeleteEvent(
             entrance,
-            pageName,
-            directoryName,
+            categoryTitle,
+            directories[primaryIndex].name,
             categoryName,
             location
         )
     }
 
     fun logClickDetermine() {
-        val categoryNames = selectedSubCategories.value?.joinToString("+") { it.category.name ?: "" }
-        LogUtils.logCategoryV2ClickDetermineEvent(entrance, pageName, categoryNames ?: "")
+        val categoryName = StringBuilder()
+        selectedCategoryList.forEachIndexed { index, s ->
+            categoryName.append(s.name)
+            if (index != selectedCategoryList.size - 1) {
+                categoryName.append("+")
+            }
+        }
+        LogUtils.logCategoryV2ClickDetermineEvent(entrance, categoryTitle, categoryName.toString())
     }
 
     fun logClickReset(location: String) {
-        val categoryName = selectedSubCategories.value?.joinToString("+") { it.category.name ?: "" }
-        LogUtils.logCategoryV2ClickResetEvent(entrance, pageName, categoryName ?: "", location)
-    }
-
-    private val _notifySubCategorySelected = MutableLiveData<Event<String>>()
-    val notifySubCategorySelected: LiveData<Event<String>> = _notifySubCategorySelected
-
-    private val _selectedSubCategories = MutableLiveData<List<SelectedTags>>()
-    val selectedSubCategories: LiveData<List<SelectedTags>> = _selectedSubCategories
-    fun addSubCategorySelected(selected: SelectedTags) {
-        val list = _selectedSubCategories.value
-        val newData = if (list == null) {
-            mutableListOf(selected)
-        } else {
-            list + selected
-        }
-        selected.category.selected = true
-        _selectedSubCategories.value = newData
-
-        // 当搜索条件发生变化时，侧边栏默认选中 “全部”
-        selectSidebarsPosition(0, false)
-
-        updateGameFiltered()
-        _notifySubCategorySelected.value = Event(selected.parentId)
-        logClickClassification(selected)
-    }
-
-    fun removeSubCategorySelected(parentId: String, categoryId: String, location: String) {
-        val list = _selectedSubCategories.value ?: return
-        val position = list.indexOfFirst {
-            it.parentId == parentId && categoryId == it.category.id
-        }
-        if (position != -1) {
-            val item = list[position]
-
-            item.category.selected = false
-            _selectedSubCategories.value = list - item
-
-            updateGameFiltered()
-            _notifySubCategorySelected.value = Event(parentId)
-
-            logClickClassificationDelete(item.parentName, item.category.name ?: "", location)
-        }
-
-    }
-
-    private val _selectedSidebarsPosition = MutableLiveData<Int>()
-    val selectedSidebarsPosition: LiveData<Int> = _selectedSidebarsPosition
-    val selectedSidebarsName: String
-        get() = sidebarsLiveData.value?.sidebars?.getOrNull(selectedSidebarsPosition.value ?: 0)?.name ?: ""
-
-    fun selectSidebarsPosition(position: Int, triggerSearch: Boolean = true) {
-        val oldPosition = _selectedSidebarsPosition.value ?: INVALID_POSITION
-        if (position != oldPosition) {
-            _selectedSidebarsPosition.value = position
-            // 如果是点击搜索而被动切换到 “全部” tab，则这里不需要更新筛选条件
-            if (triggerSearch && position != 1) {
-                updateGameFiltered()
+        val categoryName = StringBuilder()
+        selectedCategoryList.forEachIndexed { index, s ->
+            categoryName.append(s.name)
+            if (index != selectedCategoryList.size - 1) {
+                categoryName.append("+")
             }
         }
+        LogUtils.logCategoryV2ClickResetEvent(entrance, categoryTitle, categoryName.toString(), location)
     }
 
-    private val _gameFiltered = MutableLiveData<GameFiltered>()
-    val gameFiltered: LiveData<GameFiltered> = _gameFiltered
-    fun updateGameFiltered(
-        size: SubjectSettingEntity.Size? = null,
-        sortType: CategoryFilterView.SortType? = null
-    ) {
-        val oldFiltered = _gameFiltered.value
-        val newSize = size ?: oldFiltered?.size ?: SubjectSettingEntity.Size()
-        val newSortType = sortType ?: oldFiltered?.sortType ?: CategoryFilterView.SortType.RECOMMENDED
-        val selectedSidebarPosition = selectedSidebarsPosition.value ?: 0
-        val categoryIds = selectedSubCategories.value?.joinToString("-") { it.category.id } ?: ""
-        val sidebarCategoryId =
-            sidebarsLiveData.value?.sidebars?.getOrNull(selectedSidebarPosition)?.categoryId ?: "all"
-        _gameFiltered.value = GameFiltered(newSize, newSortType, categoryIds, sidebarCategoryId)
+    class Factory(
+        private val categoryId: String,
+        private val categoryTitle: String
+    ) : ViewModelProvider.NewInstanceFactory() {
+        override fun <T : ViewModel> create(modelClass: Class<T>): T {
+            return CategoryV2ViewModel(
+                HaloApp.getInstance().application,
+                categoryId,
+                categoryTitle
+            ) as T
+        }
     }
-
-    override fun onCleared() {
-        super.onCleared()
-        compositeDisposable.clear()
-    }
-
-    companion object {
-        private const val INVALID_POSITION = -1
-    }
-
-    data class SelectedTags(
-        val parentId: String,
-        val parentName: String,
-        val parentPosition: Int,
-        val category: CategoryEntity,
-        val position: Int
-    )
-
-    data class GameFiltered(
-        val size: SubjectSettingEntity.Size = SubjectSettingEntity.Size(),
-        val sortType: CategoryFilterView.SortType = CategoryFilterView.SortType.RECOMMENDED,
-        val categoryIds: String = "",
-        val sidebarCategoryId: String = "全部"
-    )
 }

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

@@ -1,292 +0,0 @@
-package com.gh.gamecenter.category2
-
-import android.content.Context
-import android.graphics.Color
-import android.graphics.Typeface
-import android.graphics.drawable.ColorDrawable
-import android.os.Handler
-import android.os.Looper
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.view.WindowManager
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.blankj.utilcode.util.KeyboardUtils
-import com.gh.gamecenter.R
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.retrofit.BiResponse
-import com.gh.gamecenter.common.utils.SensorsBridge
-import com.gh.gamecenter.common.utils.goneIf
-import com.gh.gamecenter.common.utils.singleToMain
-import com.gh.gamecenter.common.utils.toResString
-import com.gh.gamecenter.common.view.BugFixedPopupWindow
-import com.gh.gamecenter.core.utils.ToastUtils
-import com.gh.gamecenter.databinding.PopSearchCategoryBinding
-import com.gh.gamecenter.entity.CategoryEntity
-import io.reactivex.Single
-import io.reactivex.disposables.CompositeDisposable
-import me.xdrop.fuzzywuzzy.FuzzySearch
-
-class SearchCategoryPop(
-    height: Int,
-    private val isAutoRequestFocus: Boolean,
-    private val pageId: String,
-    private val pageName: String,
-    private val binding: PopSearchCategoryBinding
-) : BugFixedPopupWindow(binding.root, ViewGroup.LayoutParams.MATCH_PARENT, height) {
-
-    private var listener: OnSearchCategoryListener? = null
-    private val handler = Handler(Looper.getMainLooper())
-    private var searchDataList: List<CategoryV2ViewModel.SelectedTags>? = null
-
-    private val compositeDisposable = CompositeDisposable()
-
-    private var isSearching = false
-
-    private val adapter by lazy {
-        CategoryDirectoryAdapter(object : OnSearchCategoryListener {
-            override fun isEnableSelected(): Boolean {
-                return listener?.isEnableSelected() ?: false
-            }
-
-            override fun onItemSelected(selected: CategoryV2ViewModel.SelectedTags) {
-                listener?.onItemSelected(selected)
-
-            }
-
-            override fun onItemRemoved(parentId: String, subCategoryId: String) {
-                listener?.onItemRemoved(parentId, subCategoryId)
-            }
-
-            override fun onResetSelected() {
-                listener?.onResetSelected()
-            }
-
-            override fun onSubmit() {
-                listener?.onSubmit()
-            }
-
-        })
-    }
-
-    private val resultAdapter by lazy {
-        SearchCategoryResultsAdapter {
-            SensorsBridge.logClassificationSearchReturnClick(
-                pageId,
-                pageName,
-                binding.searchView.searchKey,
-                it.category.name ?: ""
-            )
-            if (listener?.isEnableSelected() == true) {
-                clearSearchKey()
-                listener?.onItemSelected(it)
-            } else {
-                ToastUtils.toast(R.string.selected_category_tags_max_toast.toResString())
-            }
-
-        }
-    }
-
-    private val selectedTagAdapter by lazy {
-        SelectedTagsAdapter {
-            listener?.onItemRemoved(it.parentId, it.category.id)
-        }
-    }
-
-    init {
-        isOutsideTouchable = true
-        setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
-        isFocusable = true
-        inputMethodMode = INPUT_METHOD_NEEDED
-        softInputMode = WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING
-
-        initView()
-
-    }
-
-    private fun initView() {
-        binding.rvCategory.layoutManager = LinearLayoutManager(binding.root.context)
-        binding.rvCategory.adapter = adapter
-
-        binding.tvSelectedNumber.typeface =
-            Typeface.createFromAsset(binding.root.context.assets, Constants.DIN_FONT_PATH)
-
-        binding.root.setOnClickListener {
-            dismiss()
-        }
-
-        binding.clContent.setOnClickListener {
-            // 不需要具体实现，只是为了拦截 root 的点击事件
-        }
-
-        binding.tvReset.setOnClickListener {
-            listener?.onResetSelected()
-        }
-
-        binding.vSubmit.setOnClickListener {
-            dismiss()
-            listener?.onSubmit()
-        }
-
-        binding.searchView.addTextChangedListener {
-            handler.removeCallbacksAndMessages(null)
-            val key = it?.toString() ?: ""
-            if (key.isEmpty()) {
-                changeToSearching(false)
-            } else {
-                handler.postDelayed({
-                    search(it?.toString() ?: "")
-                }, SEARCH_DELAY_DURATION)
-            }
-        }
-
-        if (!isAutoRequestFocus) {
-            binding.searchView.setEditTextOnFocusChangeListener { _, hasFocus ->
-                if (hasFocus) {
-                    SensorsBridge.logClassificationSearch(pageId, pageName)
-                }
-            }
-        }
-
-    }
-
-    fun setData(data: List<CategoryEntity>) {
-        searchDataList = data
-            .asSequence()
-            .mapIndexed { index, parent ->
-                parent.data?.mapIndexed { childIndex, child ->
-                    CategoryV2ViewModel.SelectedTags(parent.id, parent.name ?: "", index, child, childIndex)
-                } ?: listOf()
-            }
-            .flatten()
-            .toList()
-
-        adapter.setListData(data)
-    }
-
-    fun updateCategorySelected(selectedList: List<CategoryV2ViewModel.SelectedTags>?) {
-        val size = selectedList?.size ?: 0
-        binding.tvSelectedNumber.goneIf(size == 0) {
-            binding.tvSelectedNumber.text = "$size"
-        }
-
-        if (binding.rvSelected.adapter == null) {
-            binding.rvSelected.layoutManager =
-                LinearLayoutManager(binding.root.context, RecyclerView.HORIZONTAL, false)
-            binding.rvSelected.adapter = selectedTagAdapter
-        }
-        selectedTagAdapter.submitList(selectedList)
-        binding.rvSelected.goneIf(selectedList.isNullOrEmpty())
-
-        if (isSearching) {
-            search(binding.searchView.searchKey)
-        }
-    }
-
-    private fun search(key: String) {
-        Single.create {
-            val data = searchDataList?.filterNot { item -> item.category.selected } ?: emptyList()
-            val resultList = FuzzySearch.extractSorted(key, data, { item -> item.category.name ?: "" }, 1)
-                .map { item -> item.referent }
-            it.onSuccess(resultList)
-        }.compose(singleToMain())
-            .subscribe(object : BiResponse<List<CategoryV2ViewModel.SelectedTags>>() {
-                override fun onSuccess(data: List<CategoryV2ViewModel.SelectedTags>) {
-                    val hasResult = data.isNotEmpty()
-                    SensorsBridge.logClassificationSearchReturn(pageId, pageName, key, hasResult)
-                    changeToSearching(true, key, data)
-                }
-
-                override fun onFailure(exception: Exception) {
-                    SensorsBridge.logClassificationSearchReturn(pageId, pageName, key, false)
-                    changeToSearching(true, key)
-                }
-            }).let(compositeDisposable::add)
-    }
-
-    private fun clearSearchKey() {
-        binding.searchView.clear()
-    }
-
-    private fun changeToSearching(
-        isSearching: Boolean,
-        key: String = "",
-        results: List<CategoryV2ViewModel.SelectedTags>? = null
-    ) {
-        this.isSearching = isSearching
-        binding.rvCategory.goneIf(isSearching)
-        binding.rvResults.goneIf(results.isNullOrEmpty()) {
-            if (binding.rvResults.adapter == null) {
-                binding.rvResults.layoutManager = LinearLayoutManager(binding.rvResults.context)
-                binding.rvResults.adapter = resultAdapter
-            }
-        }
-        resultAdapter.setData(results ?: listOf(), key)
-        binding.reuseNoConnection.root.goneIf(!isSearching || !results.isNullOrEmpty()) {
-            binding.reuseNoConnection.reuseNoneDataTv.text = R.string.no_relevant_content_found.toResString()
-            binding.reuseNoConnection.reuseNoneDataDescTv.goneIf(false)
-            binding.reuseNoConnection.reuseNoneDataDescTv.text = R.string.try_a_different_search_term.toResString()
-        }
-    }
-
-    fun setOnSearchCategoryListener(listener: OnSearchCategoryListener) {
-        this.listener = listener
-    }
-
-    fun notifyItemSelectedChanged(parentId: String) {
-        adapter.notifyItemSelectedChanged(parentId)
-    }
-
-    override fun showAtLocation(parent: View?, gravity: Int, x: Int, y: Int) {
-        super.showAtLocation(parent, gravity, x, y)
-        if (isAutoRequestFocus) {
-            binding.searchView.requestFocus()
-            handler.removeCallbacksAndMessages(null)
-            // 在某些机型上延时一下才能弹起软键盘
-            handler.postDelayed({
-                KeyboardUtils.showSoftInput()
-            }, SHOW_SOFT_INPUT_DELAY)
-        }
-    }
-
-    override fun dismiss() {
-        super.dismiss()
-        clearSearchKey()
-        handler.removeCallbacksAndMessages(null)
-        compositeDisposable.clear()
-    }
-
-
-    companion object {
-
-        private const val SEARCH_DELAY_DURATION = 300L
-        private const val SHOW_SOFT_INPUT_DELAY = 200L
-
-        fun newInstance(
-            context: Context,
-            height: Int,
-            isAutoRequestFocus: Boolean,
-            pageId: String,
-            pageName: String
-        ): SearchCategoryPop {
-            val inflater = LayoutInflater.from(context)
-            val binding = PopSearchCategoryBinding.inflate(inflater)
-            return SearchCategoryPop(height, isAutoRequestFocus, pageId, pageName, binding)
-        }
-    }
-
-    interface OnSearchCategoryListener {
-
-        fun isEnableSelected(): Boolean
-
-        fun onItemSelected(selected: CategoryV2ViewModel.SelectedTags)
-
-        fun onItemRemoved(parentId: String, subCategoryId: String)
-
-        fun onResetSelected()
-
-        fun onSubmit()
-
-    }
-}

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

@@ -1,57 +0,0 @@
-package com.gh.gamecenter.category2
-
-import android.annotation.SuppressLint
-import android.text.Spannable
-import android.text.SpannableString
-import android.text.style.ForegroundColorSpan
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import com.gh.gamecenter.common.utils.toBinding
-import com.gh.gamecenter.common.utils.toColor
-import com.gh.gamecenter.databinding.RecyclerSearchCategoryResultBinding
-
-class SearchCategoryResultsAdapter(val clickListener: (CategoryV2ViewModel.SelectedTags) -> Unit) :
-    RecyclerView.Adapter<SearchCategoryResultsAdapter.ResultViewHolder>() {
-    private val dataList = arrayListOf<CategoryV2ViewModel.SelectedTags>()
-    private var key = ""
-
-    @SuppressLint("NotifyDataSetChanged")
-    fun setData(data: List<CategoryV2ViewModel.SelectedTags>, newKey: String) {
-        key = newKey
-        dataList.clear()
-        dataList.addAll(data)
-        notifyDataSetChanged()
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ResultViewHolder {
-        return ResultViewHolder(parent.toBinding())
-    }
-
-    override fun getItemCount() = dataList.size
-
-    override fun onBindViewHolder(holder: ResultViewHolder, position: Int) {
-        val item = dataList[position]
-        val text = item.category.name ?: ""
-        val spannableString = SpannableString(text)
-        val highlightColor = com.gh.gamecenter.common.R.color.text_theme.toColor(holder.itemView.context)
-        text.forEachIndexed { index, char ->
-            if (key.contains(char)) {
-                // 需要高亮
-                spannableString.setSpan(
-                    ForegroundColorSpan(highlightColor),
-                    index,
-                    index + 1,
-                    Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
-                )
-            }
-        }
-        holder.binding.root.text = spannableString
-        holder.itemView.setOnClickListener {
-            clickListener(item)
-        }
-    }
-
-    class ResultViewHolder(val binding: RecyclerSearchCategoryResultBinding) : RecyclerView.ViewHolder(binding.root) {
-
-    }
-}

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

@@ -1,48 +0,0 @@
-package com.gh.gamecenter.category2
-
-import android.view.ViewGroup
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.ListAdapter
-import androidx.recyclerview.widget.RecyclerView
-import com.gh.gamecenter.common.utils.toBinding
-import com.gh.gamecenter.databinding.RecyclerCategorySelectedTagBinding
-
-class SelectedTagsAdapter(val click: (CategoryV2ViewModel.SelectedTags) -> Unit) :
-    ListAdapter<CategoryV2ViewModel.SelectedTags, SelectedTagsAdapter.TagsViewHolder>(
-        createDiffUtil()
-    ) {
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TagsViewHolder {
-        return TagsViewHolder(parent.toBinding())
-    }
-
-    override fun onBindViewHolder(holder: TagsViewHolder, position: Int) {
-        val item = getItem(position)
-        holder.binding.root.setText(item.category.name ?: "")
-        holder.itemView.setOnClickListener {
-            click(item)
-        }
-    }
-
-    companion object {
-
-        private fun createDiffUtil() = object : DiffUtil.ItemCallback<CategoryV2ViewModel.SelectedTags>() {
-            override fun areItemsTheSame(
-                oldItem: CategoryV2ViewModel.SelectedTags,
-                newItem: CategoryV2ViewModel.SelectedTags
-            ): Boolean {
-                return oldItem.category.id == newItem.category.id
-            }
-
-            override fun areContentsTheSame(
-                oldItem: CategoryV2ViewModel.SelectedTags,
-                newItem: CategoryV2ViewModel.SelectedTags
-            ): Boolean {
-                return oldItem == newItem
-            }
-
-        }
-    }
-
-    class TagsViewHolder(val binding: RecyclerCategorySelectedTagBinding) : RecyclerView.ViewHolder(binding.root)
-}

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

@@ -1,94 +1,84 @@
 package com.gh.gamecenter.category2
 
-import android.annotation.SuppressLint
+import android.content.Context
+import android.view.View
 import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import androidx.recyclerview.widget.RecyclerView.ViewHolder
-import com.gh.gamecenter.R
-import com.gh.gamecenter.common.utils.*
+import com.gh.gamecenter.common.base.BaseRecyclerViewHolder
 import com.gh.gamecenter.core.utils.ToastUtils
+import com.gh.gamecenter.common.utils.goneIf
+import com.gh.gamecenter.common.utils.toColor
+import com.gh.gamecenter.R
+import com.gh.gamecenter.common.utils.toDrawable
 import com.gh.gamecenter.databinding.SubCategoryItemBinding
 import com.gh.gamecenter.entity.CategoryEntity
+import com.lightgame.adapter.BaseRecyclerAdapter
 
 class SubCategoryAdapter(
-    private val listener: SearchCategoryPop.OnSearchCategoryListener,
-) : RecyclerView.Adapter<SubCategoryAdapter.SubCategoryItemViewHolder>() {
+    context: Context,
+    private val mViewModel: CategoryV2ViewModel,
+    private val mList: List<CategoryEntity>,
+    private val mPrimaryIndex: Int
+) : BaseRecyclerAdapter<SubCategoryAdapter.SubCategoryItemViewHolder>(context) {
 
-    private lateinit var itemData: CategoryEntity
-    private val data: List<CategoryEntity>
-        get() = itemData.data ?: emptyList()
-
-    private var directoryPosition = 0
-
-    @SuppressLint("NotifyDataSetChanged")
-    fun setData(directoryPosition: Int, newItem: CategoryEntity) {
-        this.directoryPosition = directoryPosition
-        itemData = newItem
-        notifyDataSetChanged()
-    }
-
-    override fun getItemCount() = data.size
+    override fun getItemCount() = mList.size
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) =
-        SubCategoryItemViewHolder(parent.toBinding())
-
-    override fun onBindViewHolder(holder: SubCategoryItemViewHolder, position: Int, payloads: MutableList<Any>) {
-        if (payloads.isEmpty()) {
-            super.onBindViewHolder(holder, position, payloads)
-        } else {
-            val item = data[position]
-            updateSelectedState(item.selected, holder.binding)
-        }
-    }
+        SubCategoryItemViewHolder(SubCategoryItemBinding.inflate(mLayoutInflater))
 
     override fun onBindViewHolder(holder: SubCategoryItemViewHolder, position: Int) {
         holder.binding.run {
-            val categoryEntity = data[position]
-            tvName.text = categoryEntity.name
+            val categoryEntity = mList[position]
+            name.text = categoryEntity.name
             recommendIv.goneIf(categoryEntity.recommend == false)
 
-            updateSelectedState(categoryEntity.selected, this)
+            if (categoryEntity.selected) {
+                selectedIv.visibility = View.VISIBLE
+                container.background = R.drawable.bg_category_selected.toDrawable(mContext)
+                name.setTextColor(com.gh.gamecenter.common.R.color.text_theme.toColor(mContext))
+            } else {
+                selectedIv.visibility = View.GONE
+                container.background = com.gh.gamecenter.common.R.drawable.bg_shape_space_radius_8.toDrawable(mContext)
+                name.setTextColor(com.gh.gamecenter.common.R.color.text_primary.toColor(mContext))
+            }
 
             root.setOnClickListener {
                 when {
-                    !categoryEntity.selected && !listener.isEnableSelected() -> {
-                        ToastUtils.toast(R.string.selected_category_tags_max_toast.toResString())
-                    }
+                    mViewModel.selectedCount >= 5 && !categoryEntity.selected -> ToastUtils.toast("最多只能选择5个类别")
 
                     categoryEntity.selected -> {
-
-                        listener.onItemRemoved(itemData.id, categoryEntity.id)
+                        categoryEntity.selected = false
+                        selectedIv.visibility = View.GONE
+                        container.background = com.gh.gamecenter.common.R.drawable.bg_shape_space_radius_8.toDrawable(mContext)
+                        name.setTextColor(com.gh.gamecenter.common.R.color.text_primary.toColor(mContext))
+                        mViewModel.run {
+                            if (selectedCount > 0) {
+                                selectedCount--
+                                postSelectedCount()
+                                postCategoryPosition(mPrimaryIndex, position)
+                                logClickClassificationDelete(mPrimaryIndex, categoryEntity.name ?: "", "全部类别")
+                            }
+                        }
                     }
 
                     !categoryEntity.selected -> {
-
-                        listener.onItemSelected(
-                            CategoryV2ViewModel.SelectedTags(
-                                itemData.id,
-                                itemData.name ?: "",
-                                directoryPosition,
-                                categoryEntity,
-                                position
-                            )
-                        )
+                        categoryEntity.selected = true
+                        categoryEntity.primaryIndex = mPrimaryIndex
+                        selectedIv.visibility = View.VISIBLE
+                        container.background = R.drawable.bg_category_selected.toDrawable(mContext)
+                        name.setTextColor(com.gh.gamecenter.common.R.color.text_theme.toColor(mContext))
+                        mViewModel.run {
+                            if (selectedCount < 5) {
+                                selectedCount++
+                                logClickClassification(mPrimaryIndex, categoryEntity.name ?: "", position)
+                                postSelectedCount()
+                                postCategoryPosition(mPrimaryIndex, position)
+                            }
+                        }
                     }
                 }
             }
         }
     }
 
-    private fun updateSelectedState(isSelected: Boolean, binding: SubCategoryItemBinding) {
-        with(binding) {
-            val context = root.context
-            if (isSelected) {
-                container.background = R.drawable.bg_category_selected.toDrawable(context)
-                tvName.setTextColor(com.gh.gamecenter.common.R.color.text_theme.toColor(context))
-            } else {
-                container.background = com.gh.gamecenter.common.R.drawable.bg_shape_space_radius_8.toDrawable(context)
-                tvName.setTextColor(com.gh.gamecenter.common.R.color.text_secondary.toColor(context))
-            }
-        }
-    }
-
-    class SubCategoryItemViewHolder(val binding: SubCategoryItemBinding) : ViewHolder(binding.root)
+    class SubCategoryItemViewHolder(val binding: SubCategoryItemBinding) : BaseRecyclerViewHolder<Any>(binding.root)
 }

app/src/main/java/com/gh/gamecenter/cloudarchive/BaseCloudArchiveViewModel.kt

@@ -2,30 +2,17 @@ package com.gh.gamecenter.cloudarchive
 
 import android.app.Application
 import com.gh.gamecenter.common.baselist.ListViewModel
-import com.gh.gamecenter.common.utils.toRequestBody
 import com.gh.gamecenter.entity.ArchiveEntity
-import com.gh.gamecenter.retrofit.RetrofitManager
 import com.lightgame.utils.Utils
 import io.reactivex.Observable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
 import okhttp3.*
-import retrofit2.HttpException
 import java.io.IOException
 
-open class BaseCloudArchiveViewModel(
-    application: Application,
-    private val mGameId: String,
-    private var mConfigUrl: String
-) : ListViewModel<ArchiveEntity, ArchiveEntity>(application) {
+open class BaseCloudArchiveViewModel(application: Application, private val mConfigUrl: String): ListViewModel<ArchiveEntity, ArchiveEntity>(application) {
     private var mArchiveConfigStr = ""
 
     init {
-        if (mConfigUrl.isEmpty()) {
-            getArchiveConfigUrl()
-        } else {
-            getArchiveConfigString()
-        }
+        getArchiveConfigString()
     }
 
     // 通过url获取config字符串内容
@@ -54,27 +41,6 @@ open class BaseCloudArchiveViewModel(
         }
     }
 
-    // 获取游戏存档配置url
-    private fun getArchiveConfigUrl() {
-        val map = mapOf(
-            "game_ids" to listOf(mGameId)
-        )
-        RetrofitManager.getInstance().newApi.getGamesArchiveConfigs(map.toRequestBody())
-            .subscribeOn(Schedulers.io())
-            .observeOn(AndroidSchedulers.mainThread())
-            .subscribe(object : com.gh.gamecenter.common.retrofit.Response<List<ArchiveEntity>>() {
-                override fun onResponse(response: List<ArchiveEntity>?) {
-                    mConfigUrl = response?.find { it.gameId == mGameId }?.configUrl ?: return
-                    getArchiveConfigString()
-                }
-
-                override fun onFailure(e: HttpException?) {
-                    super.onFailure(e)
-                    Utils.toast(getApplication(), "获取存档配置失败")
-                }
-            })
-    }
-
     override fun provideDataObservable(page: Int): Observable<List<ArchiveEntity>>? = null
 
     override fun mergeResultLiveData() {}

app/src/main/java/com/gh/gamecenter/cloudarchive/CloudArchiveManagerActivity.kt

@@ -216,7 +216,7 @@ class CloudArchiveManagerActivity : BaseActivity_TabLayout(), ArchiveLimitSelect
 
     private fun initDownloadBtn() {
         mGameEntity?.let { gameEntity ->
-            DownloadItemUtils.updateDownloadButton(this, mBinding.downloadBtn, gameEntity, listener = null)
+            DownloadItemUtils.updateDownloadButton(this, mBinding.downloadBtn, gameEntity)
             DownloadItemUtils.setOnClickListener(this, mBinding.downloadBtn, gameEntity, 0, null, mEntrance, "")
         }
     }

app/src/main/java/com/gh/gamecenter/cloudarchive/CloudArchiveManagerViewModel.kt

@@ -8,6 +8,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import com.gh.common.util.NewFlatLogUtils
 import com.gh.gamecenter.common.retrofit.BiResponse
+import com.gh.gamecenter.common.utils.toJson
 import com.gh.gamecenter.common.utils.toRequestBody
 import com.gh.gamecenter.core.utils.GsonUtils
 import com.gh.gamecenter.entity.ArchiveEntity
@@ -21,7 +22,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.disposables.Disposable
 import io.reactivex.schedulers.Schedulers
-import okhttp3.ResponseBody
+import okhttp3.*
 import retrofit2.HttpException
 
 class CloudArchiveManagerViewModel(
@@ -29,7 +30,7 @@ class CloudArchiveManagerViewModel(
     val gameId: String,
     val gameName: String,
     configUrl: String
-) : BaseCloudArchiveViewModel(application, gameId, configUrl) {
+) : BaseCloudArchiveViewModel(application, configUrl) {
 
     companion object {
         private const val SORT_TYPE_CREATE = "time.create:-1"

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

@@ -318,9 +318,7 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter<ViewHolder> {
                                         SensorsBridge.trackInstallGameClick(
                                                 downloadEntity.getGameId(),
                                                 downloadEntity.getName(),
-                                                "主动安装",
-                                                false,
-                                                ""
+                                                "主动安装"
                                         );
                                         PackageInstaller.install(mContext, downloadEntity);
                                     }
@@ -399,9 +397,7 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter<ViewHolder> {
                                                 SensorsBridge.trackInstallGameClick(
                                                         downloadEntity.getGameId(),
                                                         downloadEntity.getName(),
-                                                        "主动安装",
-                                                        "true".equals(ExtensionsKt.getMetaExtra(downloadEntity, Constants.DSP_GAME)),
-                                                        ExtensionsKt.getMetaExtra(downloadEntity, Constants.DSP_AD_ID)
+                                                        "主动安装"
                                                 );
                                                 PackageInstaller.install(mContext, downloadEntity);
                                             }

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

@@ -15,7 +15,6 @@ import com.gh.gamecenter.common.base.BaseSimpleDao
 import com.gh.gamecenter.common.base.GlobalActivityManager.getCurrentPageEntity
 import com.gh.gamecenter.common.base.GlobalActivityManager.getLastPageEntity
 import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.entity.LinkEntity
 import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.core.utils.GsonUtils.toJson
@@ -143,8 +142,6 @@ class UpdatableGameViewModel(
 
         // 按包名分
         for (update in updatableList) {
-            if (update.id == Constants.GHZS_GAME_ID) continue
-
             var list = packageNameAndUpdateListMap[update.packageName]
             if (list == null) {
                 list = arrayListOf()
@@ -632,7 +629,6 @@ class UpdatableGameViewModel(
         downloadEntity.addMetaExtra(Constants.APK_MD5, update.md5)
         downloadEntity.addMetaExtra(Constants.GAME_NAME, update.name)
         downloadEntity.addMetaExtra(Constants.GAME_CATEGORY_IN_CHINESE, update.categoryChinese)
-        downloadEntity.addMetaExtra(Constants.DOWNLOAD_STATUS_IN_CHINESE, update.downloadStatusChinese)
         downloadEntity.putGameCategory(update.category ?: "")
         if (update.isModdedGame) {
             downloadEntity.addMetaExtra(Constants.EXTRA_IS_MODDED_GAME, "true")
@@ -689,9 +685,6 @@ class UpdatableGameViewModel(
         // 收集下载数据
         DataCollectionUtils.uploadDownload(getApplication(), downloadEntity, "开始")
 
-        val pushMessageId = (HaloApp.get(Constants.PUSH_MESSAGE_ID, false) as? String) ?: ""
-        val pushLinkId = (HaloApp.get(Constants.PUSH_LINK_ENTITY, false) as? LinkEntity)?.link ?: ""
-        val isFromPush = pushMessageId.isNotEmpty()
         SensorsBridge.trackEventWithExposureSource(
             "DownloadProcessBegin",
             event.source,
@@ -707,9 +700,6 @@ class UpdatableGameViewModel(
             "last_page_business_id", getLastPageEntity().pageBusinessId,
             "download_status", update.downloadStatusChinese,
             "download_type", "本地下载",
-            "is_from_push_notifications", isFromPush,
-            "message_id", pushMessageId,
-            "link_id", pushLinkId,
         )
     }
 

app/src/main/java/com/gh/gamecenter/dsp/DspReportHelper.kt

@@ -1,46 +0,0 @@
-package com.gh.gamecenter.dsp
-
-import com.gh.gamecenter.common.utils.FixedSizeLinkedHashSet
-import com.gh.gamecenter.core.AppExecutor
-import com.lightgame.utils.Utils
-import okhttp3.OkHttpClient
-import okhttp3.Request
-
-object DspReportHelper {
-
-    private const val TAG = "DspReportHelper"
-    private val reportCache by lazy { FixedSizeLinkedHashSet<String>(100) }
-
-    fun report(url: String?) {
-        url ?: return
-
-        AppExecutor.logExecutor.execute {
-            if (reportCache.contains(url)) {
-                Utils.log(TAG, "遇到重复上报，自动过滤 （$url）")
-                return@execute
-            }
-
-            try {
-                val client = OkHttpClient()
-                val request = Request.Builder()
-                    .url(url)
-                    .build()
-
-                Utils.log(TAG, "Report is executing: $url")
-
-                val response = client.newCall(request).execute()
-                if (response.isSuccessful) {
-                    // Add the URL to the cache to prevent duplicate reports
-                    reportCache.add(url)
-
-                    Utils.log(TAG, "Report successful: ${response.body?.string()}")
-                } else {
-                    Utils.log(TAG, "Request failed with code: ${response.code}")
-                }
-            } catch (e: Exception) {
-                Utils.log(TAG, "Request failed: ${e.message}")
-            }
-        }
-    }
-
-}

app/src/main/java/com/gh/gamecenter/dsp/data/GameSubjectDSPRemoteDataSource.kt

@@ -1,36 +0,0 @@
-package com.gh.gamecenter.dsp.data
-
-import com.gh.gamecenter.common.exposure.meta.MetaUtil
-import com.gh.gamecenter.common.utils.toRequestBody
-import com.gh.gamecenter.feature.entity.GameEntity
-import com.gh.gamecenter.retrofit.RetrofitManager
-import com.gh.gamecenter.retrofit.service.DspApiService
-import io.reactivex.Single
-
-class GameSubjectDSPRemoteDataSource(private val api: DspApiService = RetrofitManager.getInstance().dspApiService) {
-
-    fun getDspGames(type: String, count: Int): Single<List<GameEntity>> {
-        val meta = MetaUtil.getMeta()
-        val request = mapOf(
-            "device" to mapOf(
-                "oaid" to (meta.oaid ?: ""),
-                "brand" to (meta.manufacturer ?: ""),
-                "model" to (meta.model ?: ""),
-                "osv" to (MetaUtil.getAndroidVersion()),
-            ),
-            "count" to count,
-            "scene" to 3,
-            "busid" to "guanghuan1205"
-        )
-        return api.fetch(request.toRequestBody())
-            .map {
-                val gameEntityList = mutableListOf<GameEntity>()
-                for (bidEntity in it.bidList) {
-                    val gameEntity = bidEntity.toGameEntity()
-                    gameEntityList.add(gameEntity)
-                }
-                gameEntityList
-            }
-    }
-
-}

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

@@ -2,22 +2,16 @@ package com.gh.gamecenter.entity
 
 import android.os.Parcelable
 import com.google.gson.annotations.SerializedName
-import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class CategoryEntity(
     @SerializedName("_id")
-    private var _id: String? = null,
+    var id: String? = "",
     var icon: String? = "",
     var name: String? = "",
     var recommend: Boolean? = false,
-    var data: List<CategoryEntity>? = null
-) : Parcelable {
-
-    val id: String
-        get() = _id ?: ""
-
-    @IgnoredOnParcel
-    var selected: Boolean = false
-}
+    var data: List<CategoryEntity>? = null,
+    var selected: Boolean = false,
+    var primaryIndex: Int = -1
+) : Parcelable

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

@@ -7,8 +7,5 @@ class GameColumnCollection(
     val id: String = "",
     val name: String = "",
     // 取值为 "1-1" 或 "1-2" 或 "top" 相应地代表 1行1个 或 1行2个 或 排行榜
-    val style: String = "",
-    val custom: Boolean = false, // 自定义设置
-    @SerializedName("custom_size")
-    val customSize: Int = 0 // 默认显示前X个专题
+    val style: String = ""
 )

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

@@ -1,10 +1,10 @@
 package com.gh.gamecenter.entity
 
-import com.gh.gamecenter.feature.entity.Count
 import com.gh.gamecenter.feature.entity.SimpleGame
+import com.gh.gamecenter.feature.entity.Count
 import com.google.gson.annotations.SerializedName
 
-data class GameDetailRecommendGameCollectionEntity(
+data class GameDetailRecommendGameEntity(
     @SerializedName("_id")
     val id: String = "",
     val cover: String = "",

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

@@ -1,11 +0,0 @@
-package com.gh.gamecenter.entity
-
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-
-@Entity
-data class HistoryGameDetailEntity(
-    @PrimaryKey
-    var id: String = "",
-    var name: String? = "",
-)

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

@@ -11,8 +11,6 @@ class ReserveReminderEntity(
     private var _smsConfig: SmsConfig? = null,
     @SerializedName("wechat_config")
     private var _wechatConfig: WechatConfigEntity? = null,
-    @SerializedName("calendar_config")
-    private var _calendarConfig: CalendarConfig? = null,
     @SerializedName("mirror_type")
     private val _mirrorType: String? = null,
     @SerializedName("wifi_auto_download")
@@ -36,14 +34,8 @@ class ReserveReminderEntity(
             _wechatConfig = value
         }
 
-    val hasCalendarConfig: Boolean
-        get() = _calendarConfig != null
-
-    var calendarConfig: CalendarConfig
-        get() = _calendarConfig ?: CalendarConfig()
-        set(value) {
-            _calendarConfig = value
-        }
+    val onlyShowWechatReminder: Boolean
+        get() = _smsConfig == null
 
     val mirrorType: String
         get() = _mirrorType ?: ""
@@ -89,39 +81,4 @@ class ReserveReminderEntity(
             }
 
     }
-
-    @Parcelize
-    class CalendarConfig(
-        @SerializedName("notice")
-        private val _notice: Boolean? = null,
-        @SerializedName("title")
-        private val _title: String? = null,
-        @SerializedName("time_start")
-        private val _timeStart: Long? = null,
-        @SerializedName("time_end")
-        private val _timeEnd: Long? = null,
-        @SerializedName("advance_seconds")
-        private val _advanceSeconds: Long? = null,
-        @SerializedName("remark")
-        private val _remark: String? = null
-    ) : Parcelable {
-
-        val notice: Boolean
-            get() = _notice ?: false
-
-        val title: String
-            get() = _title ?: ""
-
-        val timeStart: Long
-            get() = _timeStart ?: 0L
-
-        val timeEnd: Long
-            get() = _timeEnd ?: 0L
-
-        val advanceSeconds: Long
-            get() = _advanceSeconds ?: 0L
-
-        val remark: String
-            get() = _remark ?: ""
-    }
 }

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

@@ -3,7 +3,6 @@ package com.gh.gamecenter.entity
 import android.os.Parcelable
 import com.gh.common.filter.RegionSettingHelper
 import com.gh.gamecenter.feature.entity.GameEntity
-import com.gh.gamecenter.personalhome.home.UserHistoryViewModel
 import com.google.gson.annotations.SerializedName
 import kotlinx.parcelize.Parcelize
 
@@ -20,20 +19,11 @@ data class SearchSubjectEntity(
     val adIconActive: Boolean = false,
     // 本地字段，标记是否为微信小游戏CPM专题
     var isWGameSubjectCPM: Boolean = false,
-    // 本地字段，标记是否为DSP专题
-    var isDspSubject: Boolean = false,
-    val type: String = "",
-
-    @SerializedName("column_type")
-    val columnType: String = "", // DSP 专题类型 (DSP专题类型（apk：下载应用、mini_game：微信小程序/小游戏）
-    @SerializedName("show_download") // 下载/秒玩按钮（true：显示、false：不显示）（专题类型为apk，则为下载按钮；专题类型为mini_game，则为秒完按钮）
-    val showDownload: Boolean = false,
-    val size: Int = -1, // 专题游戏数量
+    val type: String = ""
 ) : Parcelable {
 
     companion object {
         const val TYPE_WECHAT_GAME_CPM_COLUMN = "wechat_game_cpm_column"
-        const val TYPE_DSP_GAME_COLUMN = "dsp_game_column"
     }
 
     fun getFilterGame() = RegionSettingHelper.filterGame(games)

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

@@ -7,7 +7,7 @@ import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-data class SubjectData(
+class SubjectData(
     // 入口必填
     var subjectId: String?,
     var subjectName: String?,
@@ -21,28 +21,13 @@ data class SubjectData(
     var subjectStyle: String = "",
     var showDetailSubtitle: Boolean = false,
     var showDetailIconSubscript: Boolean = false,
-    var customLimit: String = "", // unlimited（无限制）、forbidden（禁止移出）
 
     var requireUpdateSetting: Boolean = false, // 多专题页面需要专题页面自行获取专题配置
     var isAdData: Boolean = false,
     var adId: String = "", // 广告ID(本地字段)，不为空时为广告专题
-    var codeId: String = "", // 广告CODE_ID(本地字段)，不为空时为广告专题
-    var tag: String = "" // 分类标签，埋点用
+    var codeId: String = "" // 广告CODE_ID(本地字段)，不为空时为广告专题
 ) : Parcelable, Cloneable {
 
-    @IgnoredOnParcel
-    val isForbidden
-        get() = customLimit == "forbidden"
-
-    @IgnoredOnParcel
-    val sortChinese
-        get() = when {
-            sort.contains("publish") -> "最新"
-            sort.contains("star") -> "评分"
-            sort.contains("update") -> "更新"
-            else -> "推荐"
-        }
-
     @IgnoredOnParcel
     val subjectStyleChinese: String
         get() = CustomPageItem.subjectTypeToComponentStyle[subjectStyle] ?: ""

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

@@ -117,12 +117,7 @@ data class SubjectEntity(
     @SerializedName("show_index_icon_subscript")
     val showIndexIconSubscript: Boolean = false,
     @SerializedName("welfare_info")
-    val welfareInfo: WelfareInfo? = null,
-
-    @SerializedName("column_type")
-    private val _columnType: String? = null,
-    @SerializedName("size")
-    private val _size: Size? = null
+    val welfareInfo: WelfareInfo? = null
 ) : Parcelable {
 
     @IgnoredOnParcel
@@ -135,13 +130,12 @@ data class SubjectEntity(
     @IgnoredOnParcel
     private var filteredData: MutableList<GameEntity>? = null
 
-    val subjectType: SubjectData.SubjectType
-        get() = when {
-            isQQColumn -> SubjectData.SubjectType.QQ_GAME
-            isWechatColumnCPM -> SubjectData.SubjectType.WECHAT_GAME_CPM
-            isWechatColumn -> SubjectData.SubjectType.WECHAT_GAME
-            else -> SubjectData.SubjectType.NORMAL
-        }
+    val subjectType: SubjectData.SubjectType get() = when {
+        isQQColumn -> SubjectData.SubjectType.QQ_GAME
+        isWechatColumnCPM -> SubjectData.SubjectType.WECHAT_GAME_CPM
+        isWechatColumn -> SubjectData.SubjectType.WECHAT_GAME
+        else -> SubjectData.SubjectType.NORMAL
+    }
 
     val isMiniGame: Boolean get() = isQQColumn || isWechatColumn
 
@@ -154,28 +148,4 @@ data class SubjectEntity(
 
     val list: Int
         get() = max(min(_list ?: 0, data?.size ?: 0), 1)
-
-    val columnType: String
-        get() = _columnType ?: ""
-
-    val size: Size
-        get() = _size ?: Size()
-
-    var isDspSubject: Boolean = false
-
-    companion object {
-        const val SUBJECT_TAG_UPDATE = "update" // 更新时间
-        const val SUBJECT_TAG_TYPE = "type" // 游戏标签
-        const val SUBJECT_TAG_TEST = "test" // 开测时间
-        const val SUBJECT_TAG_SELLING_POINT = "selling_points&type" // 卖点文案+游戏标签
-    }
-
-    @Parcelize
-    data class Size(
-        @SerializedName("index")
-        private val _index: Int? = null
-    ) : Parcelable {
-        val index: Int
-            get() = _index ?: 0
-    }
 }

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

@@ -13,7 +13,7 @@ class SubjectSettingEntity(
     @SerializedName("type")
     var typeEntity: TypeEntity = TypeEntity(),
     var tag: String = "",
-    var filter: String = "", // off/on
+    var filter: String = "", // rows: off/on
     var order: Boolean = false, // 是否显示序号
 
     @SerializedName("brief_style")
@@ -34,9 +34,6 @@ class SubjectSettingEntity(
     private val _showDetailIconSubscript: Boolean? = null
 ) : Parcelable {
 
-    val isFilterEnabled: Boolean
-        get() = filter == "on"
-
     val showDetailSubtitle: Boolean
         get() = _showDetailSubtitle ?: false
 

app/src/main/java/com/gh/gamecenter/eventbus/EBStartupAcceleration.kt

@@ -1,5 +0,0 @@
-package com.gh.gamecenter.eventbus
-
-import com.gh.gamecenter.feature.entity.AcctGameInfo
-
-class EBStartupAcceleration(val acctGameInfo: AcctGameInfo)

app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListFragment.kt

@@ -23,6 +23,7 @@ import com.gh.gamecenter.eventbus.EBUserFollow
 import com.gh.gamecenter.feature.entity.AnswerEntity
 import com.gh.gamecenter.forum.home.ForumScrollCalculatorHelper
 import com.gh.gamecenter.video.detail.CustomManager
+import com.shuyu.gsyvideoplayer.video.base.GSYVideoView
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 
@@ -124,6 +125,10 @@ class ForumArticleAskListFragment : LazyListFragment<AnswerEntity, ForumArticleA
     override fun onFragmentPause() {
         super.onFragmentPause()
         pauseVideo()
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
         mScrollCalculatorHelper?.currentPlayer?.release()
     }
 
@@ -258,7 +263,9 @@ class ForumArticleAskListFragment : LazyListFragment<AnswerEntity, ForumArticleA
                     mBaseHandler.postDelayed({
                         tryCatchInRelease {
                             if (position != 0L) {
-                                currentPlayer?.startPlayLogic(true)
+                                if (currentPlayer?.currentState == GSYVideoView.CURRENT_STATE_PAUSE) {
+                                    currentPlayer?.startPlayLogic(true)
+                                }
                             } else {
                                 currentPlayer?.release()
                             }

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

@@ -160,15 +160,12 @@ class ArticleItemVideoView @JvmOverloads constructor(context: Context, attrs: At
     }
 
     //监控播放错误
-    override fun onError(what: Int, extra: Int) {
-        super.onError(what, extra)
+//    override fun onError(what: Int, extra: Int) {
+//        super.onError(what, extra)
 //        Utils.toast(context, "网络错误，视频播放失败")
 //        setViewShowState(mStartButton, View.INVISIBLE)
-//        errorContainer.visibility = View.VISIBLE
-
-        // 部分设备由于MediaCodec实例达到上限导致 CodecException: Error 0xfffffff4，在此处尝试释放所有视频
-        CustomManager.clearAllVideo()
-    }
+////        errorContainer.visibility = View.VISIBLE
+//    }
 
     override fun releaseVideos() {
         CustomManager.releaseAllVideos(getKey())