feat: 从SD卡兼容所有文件管理权限

feat: 游戏详情-内容卡片 红点显示优化—客户端 https://jira.shanqu.cc/browse/GHZSCY-7890

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

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

@@ -3,9 +3,14 @@ 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
@@ -37,6 +42,9 @@ class InstallExternalGameFragment : ToolbarFragment(), OnItemClickListener {
 
     private var uninstallDisposable: Disposable? = null
 
+
+    private var shouldScan = false
+
     override fun getLayoutId() = 0
 
     override fun getInflatedLayout() =
@@ -74,7 +82,24 @@ class InstallExternalGameFragment : ToolbarFragment(), OnItemClickListener {
             adapter.notifyDataSetChanged()
         }
 
-        requestStoragePermission()
+
+        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()
+        }
+
+
     }
 
     private fun requestStoragePermission() {
@@ -96,6 +121,12 @@ class InstallExternalGameFragment : ToolbarFragment(), OnItemClickListener {
         }
     }
 
+    override fun onStart() {
+        super.onStart()
+        if (shouldScan) {
+            mViewModel.scanPaths()
+        }
+    }
 
     private fun initView() {
         dialog = DialogUtils.showWaitDialog(requireContext(), "")
@@ -152,7 +183,7 @@ class InstallExternalGameFragment : ToolbarFragment(), OnItemClickListener {
         }, true)
 
         VHelper.newCwValidateVspaceBeforeAction(
-            requireContext(),null,
+            requireContext(), null,
         ) {
             dialog.show()
         }

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

@@ -55,6 +55,8 @@ public class DetailDownloadUtils {
         }
 
         viewHolder.setSpeedViewsVisible(false);
+        // 默认为显示状态
+        viewHolder.getDownloadPb().setVisibility(View.VISIBLE);
 
         // 根据预置的配置更新 ViewHolder 的状态 (譬如青少年模式、下载内容为空等)
         if (updateViewHolderWithPredefinedConfig(viewHolder, gameEntity)) {

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

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

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

@@ -217,7 +217,7 @@ class DetailViewHolder(
     }
 
     private fun restoreDialogFragment() {
-        val gamePermissionDialogFragment = (context as AppCompatActivity).supportFragmentManager.findFragmentByTag(
+        val gamePermissionDialogFragment = (context.getActivity() as? AppCompatActivity)?.supportFragmentManager?.findFragmentByTag(
             GamePermissionDialogFragment::class.java.name
         ) as DialogFragment?
         gamePermissionDialogFragment?.dismissAllowingStateLoss()
@@ -233,7 +233,6 @@ class DetailViewHolder(
                         getDownloadBtnText(context, gameEntity, false, true, PluginLocation.only_game)
                     when {
                         localText.contains(com.gh.gamecenter.feature.R.string.update.toResString()) -> {  // 本地游戏需要更新
-                            localDownloadButton?.goneIf(true)
                             localDownloadContainer?.goneIf(true)
                             downloadPb.goneIf(true)
                             overlayTv?.goneIf(true)
@@ -250,7 +249,6 @@ class DetailViewHolder(
 
                         localText.contains(com.gh.gamecenter.feature.R.string.launch.toResString()) && downloadText == "更新" -> {    // 畅玩游戏需要更新:显示 加速/更新
                             localDownloadContainer?.goneIf(true)
-                            localDownloadButton?.goneIf(true)
                             downloadPb.goneIf(true)
                             overlayTv?.goneIf(true)
 
@@ -263,7 +261,6 @@ class DetailViewHolder(
                         }
 
                         localText.contains(com.gh.gamecenter.feature.R.string.launch.toResString()) -> {  // 本地游戏为启动状态：显示 加速/畅玩
-                            localDownloadButton?.goneIf(true)
                             localDownloadContainer?.goneIf(true)
                             downloadPb.goneIf(true)
                             overlayTv?.goneIf(true)
@@ -288,20 +285,20 @@ class DetailViewHolder(
                     val downloadText = getDownloadBtnText(context, gameEntity, false, false, PluginLocation.only_game)
                     when {
                         downloadText.contains(com.gh.gamecenter.feature.R.string.launch.toResString()) -> {
-                            localDownloadButton?.goneIf(true)
                             localDownloadContainer?.goneIf(true)
                             downloadPb.goneIf(true)
                             true
                         }
 
-                        downloadText == com.gh.gamecenter.feature.R.string.launch.toResString() -> true
+                        downloadText.contains(R.string.update.toResString()) -> true
+
                         else -> false
                     }
                 }
 
                 else -> false
             }
-            it.checkIfShowSpeedUi(showSpeedUi)
+            it.checkIfShowSpeedUi(showSpeedUi, showDualDownloadButton)
 
         }
     }

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

@@ -37,7 +37,6 @@ import com.gh.gamecenter.gamedetail.detail.viewholder.GameDetailContentRecommend
 import com.gh.gamecenter.gamedetail.entity.*
 import com.gh.gamecenter.livedata.Event
 import com.gh.gamecenter.login.user.UserManager
-import com.gh.gamecenter.login.user.UserRepository
 import com.gh.gamecenter.manager.PackagesManager
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.gh.vspace.VHelper
@@ -105,7 +104,7 @@ class GameDetailViewModel(
     private var relatedGameList = arrayListOf<GameEntity>()
 
     // 内容卡片相关
-    private var contentCardList: List<ContentCardEntity>?= null
+    private var contentCardList: List<ContentCardEntity>? = null
     private val contentCardSp by lazy {
         HaloApp.getInstance().getSharedPreferences(SP_CONTENT_CARD, Context.MODE_PRIVATE)
     }
@@ -134,9 +133,9 @@ class GameDetailViewModel(
     private var isGameUpdatable = false
 
     private val compositeDisposable = CompositeDisposable()
-    
+
     private var userRelatedInfoReceivedCallback: (() -> Unit)? = null
-    
+
     init {
         loadData()
     }
@@ -1117,6 +1116,14 @@ class GameDetailViewModel(
         compositeDisposable.clear()
     }
 
+    fun markContentCardRedDot(contentCardEntity: ContentCardEntity) {
+        SPUtils.setString(contentCardSp, RED_DOT_PREFIX + (gameId ?: "") + contentCardEntity.link.type, contentCardEntity.redDot.toString())
+    }
+
+    fun shouldShowContentCardRedDot(contentCardEntity: ContentCardEntity): Boolean {
+        return SPUtils.getString(contentCardSp, RED_DOT_PREFIX + (gameId ?: "") + contentCardEntity.link.type) != contentCardEntity.redDot.toString()
+    }
+
     class Factory(
         private val application: Application,
         private val gameId: String?,
@@ -1133,6 +1140,7 @@ class GameDetailViewModel(
     companion object {
         const val SP_CONTENT_CARD = "content_card"
         const val TAG = "GameDetailViewModel"
+        const val RED_DOT_PREFIX = "red_dot_"
 
         //[已领取/已淘号/再领/再淘]的礼包置底显示
         fun sortLibaoList(libaoList: ArrayList<LibaoEntity>?) {

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

@@ -635,7 +635,7 @@ class GameDetailWrapperFragment : BaseLazyFragment(), IScrollable {
         DialogHelper.showDialogWithHtmlContent(
             requireContext(),
             dialog.title,
-            dialog.content,
+            dialog.content.replaceLineBreakWithBr(),
             dialog.confirmButton.text.toString(),
             dialog.closeButtonText,
             {
@@ -669,7 +669,8 @@ class GameDetailWrapperFragment : BaseLazyFragment(), IScrollable {
                     "game_type", gameEntity?.categoryChinese ?: "",
                     "button_name", "关闭弹窗"
                 )
-            }
+            },
+            extraConfig = DialogHelper.Config(centerTitle = true)
         )
     }
 

app/src/main/java/com/gh/gamecenter/gamedetail/accelerator/GameDetailAcceleratorUiHelper.kt

@@ -55,6 +55,8 @@ class GameDetailAcceleratorUiHelper(private val binding: DetailDownloadItemBindi
 
     private var hasAnyAcctRecord = false
 
+    private var showDualDownloadButton: Boolean = false
+
     private val accelerationListener = object : OnAccelerateListener {
         override fun onStateChanged(state: AccelerateState) {
             when (state) {
@@ -131,13 +133,17 @@ class GameDetailAcceleratorUiHelper(private val binding: DetailDownloadItemBindi
 
         val isCurrentGameAccelerating = AcceleratorDataHolder.instance.isCurrentGameAccelerating(game.id)
 
-        when {
-            isCurrentGameAccelerating -> {// 如果当前游戏正处于加速状态，则需要隐藏当前下载按钮
-                binding.detailProgressbar.goneIf(true)
-            }
+        if (!showDualDownloadButton) {
+            when {
+                isCurrentGameAccelerating -> {// 如果当前游戏正处于加速状态，则需要隐藏当前下载按钮
+                    binding.detailProgressbar.goneIf(true)
+                }
 
-            binding.detailProgressbar.text == "更新" -> { // 游戏没有处于加速状态，如果 下载按钮为 “更新” 状态，则需要显示出来
-                binding.detailProgressbar.goneIf(false)
+                binding.detailProgressbar.text == "更新" -> { // 游戏没有处于加速状态，如果 下载按钮为 “更新” 状态，则需要显示出来
+                    binding.detailProgressbar.setBackgroundResource(com.gh.gamecenter.common.R.drawable.bg_common_button_light_fill_blue)
+                    binding.detailProgressbar.setTextColor(com.gh.gamecenter.common.R.color.text_theme.toColor(context))
+                    binding.detailProgressbar.goneIf(false)
+                }
             }
         }
 
@@ -152,7 +158,8 @@ class GameDetailAcceleratorUiHelper(private val binding: DetailDownloadItemBindi
         } ?: R.string.network_acceleration.toResString()
     }
 
-    fun checkIfShowSpeedUi(show: Boolean) {
+    fun checkIfShowSpeedUi(show: Boolean, showDualDownloadButton: Boolean) {
+        this.showDualDownloadButton = showDualDownloadButton
         if (!isInit) {
             return
         }

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

@@ -684,7 +684,7 @@ class GameDetailFragment : LazyFragment(), IScrollable {
                         null,
                         gameStatus = gameStatus
                     )
-                    GameFunctionDialogFragment.show(requireContext(), gameDetailInfoTag.infoTags)
+                    GameFunctionDialogFragment.show(requireContext(), gameEntity, gameDetailInfoTag.infoTags, gameDetailInfoTag.link)
                 }
             }
         }

app/src/main/java/com/gh/gamecenter/gamedetail/detail/adapter/GameDetailCoverAdapter.kt

@@ -127,6 +127,7 @@ class GameDetailCoverAdapter(
 
         holder.binding.player.viewModel = viewModel
         holder.binding.player.showOrHideCoverFilter = showOrHideCoverFilter
+        holder.binding.player.scrollCalculatorHelper = scrollCalculatorHelper
         holder.binding.player.video = topVideo
         holder.binding.player.updateThumb(topVideo.poster)
 

app/src/main/java/com/gh/gamecenter/gamedetail/detail/viewholder/GameDetailContentCardSingleItemViewHolder.kt

@@ -1,6 +1,7 @@
 package com.gh.gamecenter.gamedetail.detail.viewholder
 
 import android.content.Context
+import android.widget.TextView
 import androidx.core.view.isVisible
 import androidx.lifecycle.LifecycleOwner
 import com.gh.common.constant.Config
@@ -131,11 +132,9 @@ class GameDetailContentCardSingleItemViewHolder(
                     contentBannerView.startBannerLoop()
                 }
 
-                redDotTv.goneIf(!((contentCardEntity.link.type == TYPE_SERVER && contentCardEntity.server?.total != 0) || contentCardEntity.link.type == TYPE_GIFT)) {
-                    if ((contentCardEntity.link.type == TYPE_SERVER) && (contentCardEntity.server?.calendar?.isNotEmpty() == true))
-                        redDotTv.text = contentCardEntity.server?.total.toString()
-                    if ((contentCardEntity.link.type == TYPE_GIFT) && (contentCardEntity.libao != null))
-                        redDotTv.text = contentCardEntity.libao?.total.toString()
+                val showRedDot = contentCardEntity.redDot != 0 && viewModel.shouldShowContentCardRedDot(contentCardEntity)
+                redDotTv.goneIf(!showRedDot) {
+                    redDotTv.text = contentCardEntity.redDot.toString()
                 }
 
                 val showNewTag = contentCardEntity.link.type == TYPE_ARCHIVE && contentCardEntity.archive != null && contentCardEntity.showNewTag
@@ -173,11 +172,11 @@ class GameDetailContentCardSingleItemViewHolder(
                             confirmText = context.getString(com.gh.gamecenter.common.R.string.confirm),
                             cancelText = context.getString(com.gh.gamecenter.common.R.string.cancel),
                             confirmClickCallback = {
-                                jumpToContentCardLink(context, contentCardEntity, viewModel)
+                                jumpToContentCardLink(context, contentCardEntity, viewModel, redDotTv)
                             }
                         )
                     } else {
-                        jumpToContentCardLink(context, contentCardEntity, viewModel)
+                        jumpToContentCardLink(context, contentCardEntity, viewModel, redDotTv)
                     }
                 }
 
@@ -189,11 +188,16 @@ class GameDetailContentCardSingleItemViewHolder(
             }
         }
 
-        fun jumpToContentCardLink(context: Context, contentCardEntity: ContentCardEntity, viewModel: GameDetailViewModel) {
+        fun jumpToContentCardLink(context: Context, contentCardEntity: ContentCardEntity, viewModel: GameDetailViewModel, redDotTv: TextView) {
             val path = "游戏详情->内容卡片"
             when (contentCardEntity.link.type) {
                 TYPE_GIFT,
                 TYPE_ARCHIVE -> {
+                    if (contentCardEntity.link.type == TYPE_GIFT) {
+                        viewModel.markContentCardRedDot(contentCardEntity)
+                        redDotTv.isVisible = false
+                    }
+
                     val type = if (contentCardEntity.link.type == TYPE_GIFT) GameDetailTabEntity.TYPE_GIFT else GameDetailTabEntity.TYPE_ARCHIVE
                     val tabList = viewModel.gameDetailTabListLiveData.value?.data
                     if (tabList?.find { it.type == type } != null) {
@@ -208,6 +212,8 @@ class GameDetailContentCardSingleItemViewHolder(
 
                 TYPE_SERVER -> {
                     if (viewModel.game != null && contentCardEntity.server != null) {
+                        viewModel.markContentCardRedDot(contentCardEntity)
+                        redDotTv.isVisible = false
                         context.startActivity(
                             ServersCalendarActivity.getIntent(
                                 context,

app/src/main/java/com/gh/gamecenter/gamedetail/detail/viewholder/GameDetailContentCardTripleItemViewHolder.kt

@@ -10,8 +10,6 @@ import com.gh.gamecenter.gamedetail.GameDetailViewModel
 import com.gh.gamecenter.gamedetail.detail.viewholder.GameDetailContentCardSingleItemViewHolder.Companion.jumpToContentCardLink
 import com.gh.gamecenter.gamedetail.entity.ContentCardEntity
 import com.gh.gamecenter.gamedetail.entity.ContentCardEntity.Companion.TYPE_ARCHIVE
-import com.gh.gamecenter.gamedetail.entity.ContentCardEntity.Companion.TYPE_GIFT
-import com.gh.gamecenter.gamedetail.entity.ContentCardEntity.Companion.TYPE_SERVER
 import com.gh.gamecenter.gamedetail.entity.GameDetailData
 
 class GameDetailContentCardTripleItemViewHolder(
@@ -74,11 +72,9 @@ class GameDetailContentCardTripleItemViewHolder(
                 titleTv.text = contentCardEntity.title
                 ImageUtils.display(iconIv, contentCardEntity.icon)
 
-                redDotTv.goneIf(!((contentCardEntity.link.type == TYPE_SERVER && contentCardEntity.server?.total != 0) || contentCardEntity.link.type == TYPE_GIFT)) {
-                    if ((contentCardEntity.link.type == TYPE_SERVER) && (contentCardEntity.server?.calendar?.isNotEmpty() == true))
-                        redDotTv.text = contentCardEntity.server?.total.toString()
-                    if ((contentCardEntity.link.type == TYPE_GIFT) && (contentCardEntity.libao != null))
-                        redDotTv.text = contentCardEntity.libao?.total.toString()
+                val showRedDot = contentCardEntity.redDot != 0 && viewModel.shouldShowContentCardRedDot(contentCardEntity)
+                redDotTv.goneIf(!showRedDot) {
+                    redDotTv.text = contentCardEntity.redDot.toString()
                 }
 
                 val showNewTag = contentCardEntity.link.type == TYPE_ARCHIVE && contentCardEntity.archive != null && contentCardEntity.showNewTag
@@ -116,11 +112,11 @@ class GameDetailContentCardTripleItemViewHolder(
                             confirmText = context.getString(com.gh.gamecenter.common.R.string.confirm),
                             cancelText = context.getString(com.gh.gamecenter.common.R.string.cancel),
                             confirmClickCallback = {
-                                jumpToContentCardLink(context, contentCardEntity, viewModel)
+                                jumpToContentCardLink(context, contentCardEntity, viewModel, redDotTv)
                             }
                         )
                     } else {
-                        jumpToContentCardLink(context, contentCardEntity, viewModel)
+                        jumpToContentCardLink(context, contentCardEntity, viewModel, redDotTv)
                     }
                 }
 

app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameFunctionDialogFragment.kt

@@ -9,19 +9,29 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.LinearLayoutManager
+import com.gh.common.util.DirectUtils
 import com.gh.gamecenter.BuildConfig
 import com.gh.gamecenter.common.base.fragment.BaseBottomDialogFragment
+import com.gh.gamecenter.common.constant.EntranceConsts
+import com.gh.gamecenter.common.entity.LinkEntity
+import com.gh.gamecenter.common.utils.SensorsBridge
+import com.gh.gamecenter.common.utils.goneIf
 import com.gh.gamecenter.databinding.DialogGameDetailRecyclerViewBinding
+import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.gamedetail.entity.GameDetailInfoTag
 import com.lightgame.utils.AppManager
 
 class GameFunctionDialogFragment: BaseBottomDialogFragment<DialogGameDetailRecyclerViewBinding>() {
     private var infoTags: List<GameDetailInfoTag.InfoTag> = arrayListOf()
+    private var linkEntity: LinkEntity? = null
+    private var gameEntity: GameEntity? = null
     private val adapter by lazy { GameFunctionAdapter(requireContext(), infoTags) }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        gameEntity = arguments?.getParcelable(EntranceConsts.KEY_GAME_ENTITY)
         infoTags = arguments?.getParcelableArrayList(KEY_INFO_TAG) ?: arrayListOf()
+        linkEntity = arguments?.getParcelable(EntranceConsts.KEY_LINK)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -30,6 +40,28 @@ class GameFunctionDialogFragment: BaseBottomDialogFragment<DialogGameDetailRecyc
         mBinding.closeIv.setOnClickListener {
             dismissAllowingStateLoss()
         }
+        mBinding.subtitleTv.goneIf(linkEntity == null) {
+            mBinding.subtitleTv.text = linkEntity?.text
+            mBinding.subtitleTv.setOnClickListener { _ ->
+                linkEntity?.let {
+                    DirectUtils.directToLinkPage(requireContext(), it, "游戏详情-功能说明", "")
+                    SensorsBridge.trackGameDetailModuleClick(
+                        gameEntity?.id,
+                        gameEntity?.name,
+                        gameEntity?.categoryChinese,
+                        "组件内容",
+                        "功能标签",
+                        "功能标签",
+                        null,
+                        subModuleName = "跳转入口",
+                        linkType = it.type,
+                        linkId = it.link,
+                        linkText = it.text,
+                        gameStatus = null
+                    )
+                }
+            }
+        }
         mBinding.recyclerView.run {
             layoutManager = LinearLayoutManager(requireContext())
             adapter = this@GameFunctionDialogFragment.adapter
@@ -46,7 +78,7 @@ class GameFunctionDialogFragment: BaseBottomDialogFragment<DialogGameDetailRecyc
         const val KEY_INFO_TAG = "info_tag"
 
         @JvmStatic
-        fun show(context: Context?, infoTags: List<GameDetailInfoTag.InfoTag>) {
+        fun show(context: Context?, gameEntity: GameEntity?, infoTags: List<GameDetailInfoTag.InfoTag>, linkEntity: LinkEntity?) {
             val fragmentActivity: FragmentActivity = if (context is FragmentActivity) {
                 context
             } else if (BuildConfig.DEBUG) {
@@ -65,7 +97,9 @@ class GameFunctionDialogFragment: BaseBottomDialogFragment<DialogGameDetailRecyc
 
             val dialogFragment = GameFunctionDialogFragment()
             dialogFragment.arguments = bundleOf(
-                KEY_INFO_TAG to infoTags
+                EntranceConsts.KEY_GAME_ENTITY to gameEntity,
+                KEY_INFO_TAG to infoTags,
+                EntranceConsts.KEY_LINK to linkEntity
             )
             dialogFragment.show(fragmentActivity.supportFragmentManager, GameFunctionDialogFragment::class.java.name)
         }

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

@@ -31,6 +31,13 @@ class ContentCardEntity(
     var showNewTag: Boolean = false,
 ) {
 
+    val redDot
+        get() = when (link.type) {
+            TYPE_SERVER -> server?.total ?: 0
+            TYPE_GIFT -> libao?.total ?: 0
+            else -> 0
+        }
+
     @Keep
     class Dialog(
         @SerializedName("_id")

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

@@ -219,7 +219,9 @@ data class GameDetailInfoTag(
     @SerializedName("info_tags")
     val infoTags: List<InfoTag> = listOf(), // 功能标签
     @SerializedName("request_speed_status")
-    val requestSpeedStatus: String = "" // 求加速状态, on/off
+    val requestSpeedStatus: String = "", // 求加速状态, on/off
+    @SerializedName("plugin_tutorial_link")
+    val link: LinkEntity? = null, // 插件教程链接
 ) {
     @Parcelize
     data class InfoTag(

app/src/main/java/com/gh/gamecenter/gamedetail/video/TopVideoView.kt

@@ -50,6 +50,7 @@ class TopVideoView @JvmOverloads constructor(context: Context, attrs: AttributeS
     private var mLastGetContentLengthTime = 0L
 
     var showOrHideCoverFilter: ((Boolean) -> Unit)? = null
+    var scrollCalculatorHelper: GameDetailScrollCalculatorHelper? = null
 
     init {
         post {
@@ -256,6 +257,7 @@ class TopVideoView @JvmOverloads constructor(context: Context, attrs: AttributeS
 
     // 不需要弹弹窗，直接播放
     override fun showWifiDialog() {
+        scrollCalculatorHelper?.currentPlayer = this
         startPlayLogic(false)
         //val trafficVideo = PreferenceManager.getDefaultSharedPreferences(context).getBoolean(SettingsFragment.TRAFFIC_VIDEO_SP_KEY, false)
         //if (trafficVideo) {

app/src/main/java/com/gh/gamecenter/home/custom/adapter/CustomGamePluginAdapter.kt

@@ -91,7 +91,8 @@ class CustomGamePluginAdapter(
         binding.gameRating.textSize =
             (if (gameEntity.commentCount > 3) 12 else 10).toFloat()
         BindingAdapters.setGameName(binding.gameName, gameEntity, true)
-        BindingAdapters.setGameTags(binding.labelList, gameEntity, "")
+        binding.gamePlayCount.visibility = View.GONE
+        BindingAdapters.setGameTagsWithSellingPoint(binding.labelList, binding.layoutSellingPoints, gameEntity, "")
         binding.gameRating.setDrawableStart(
             if (gameEntity.commentCount > 3) com.gh.gamecenter.feature.R.drawable.game_horizontal_rating.toDrawable() else null,
             null,

app/src/main/java/com/gh/gamecenter/home/custom/adapter/CustomGameRefreshVerticalAdapter.kt

@@ -133,7 +133,8 @@ class CustomGameRefreshVerticalAdapter(
             with(ui) {
                 gameNameTv.setTextColor(com.gh.gamecenter.common.R.color.text_primary.toColor(context))
                 serverTypeTv.setTextColor(com.gh.gamecenter.common.R.color.primary_theme.toColor(context))
-                downloadTv.background = com.gh.gamecenter.common.R.drawable.download_button_normal_style.toDrawable(context)
+                downloadTv.background =
+                    com.gh.gamecenter.common.R.drawable.download_button_normal_style.toDrawable(context)
                 gameDesTv.setTextColor(com.gh.gamecenter.common.R.color.text_tertiary.toColor(context))
 
                 BindingAdapters.setGameName(
@@ -142,7 +143,7 @@ class CustomGameRefreshVerticalAdapter(
                     false
                 )
                 BindingAdapters.setGame(iconIv, gameEntity)
-                BindingAdapters.setGameTags(gameTagContainer, gameEntity, "")
+                BindingAdapters.setGameTagsWithSellingPoint(gameTagContainer, sellingPointsBinding, gameEntity, "")
                 GameItemViewHolder.initServerType(gameNameTv, serverTypeTv, gameEntity)
                 gameDesTv.text = gameEntity.decoratedDes
                 GameItemViewHolder.initGameSubtitleAndAdLabel(

app/src/main/java/com/gh/gamecenter/minigame/wechat/WGameSubjectCPMRemoteDataSource.kt

@@ -47,8 +47,16 @@ class WGameSubjectCPMRemoteDataSource(
                             miniGameExtData = info.extData,
                             miniGameRecommendId = info.recommendID,
                             mTagStyle = arrayListOf(
-                                TagStyleEntity(name = info.categoryName),
-                                TagStyleEntity(name = info.subcategoryName)
+                                TagStyleEntity(
+                                    name = info.categoryName,
+                                    color = TAG_COLOR,
+                                    background = TAG_BACKGROUND
+                                ),
+                                TagStyleEntity(
+                                    name = info.subcategoryName,
+                                    color = TAG_COLOR,
+                                    background = TAG_BACKGROUND
+                                )
                             )
                         )
                     }.toMutableList()
@@ -101,4 +109,10 @@ class WGameSubjectCPMRemoteDataSource(
                 }
             }
     }
+
+    companion object {
+
+        private const val TAG_COLOR = "999999"
+        private const val TAG_BACKGROUND = "F5F5F5"
+    }
 }

app/src/main/java/com/gh/gamecenter/search/SearchGameResultAdapter.kt

@@ -527,7 +527,7 @@ class SearchGameResultAdapter(
         for (key in positionAndPackageMap.keys) {
             if (key.contains(download.packageName) && key.contains(download.gameId)) {
                 val position = positionAndPackageMap[key]
-                if (position != null && getItemViewType(position) == ItemViewType.GAME_SUBJECT) {
+                if (position != null && position < itemCount && getItemViewType(position) == ItemViewType.GAME_SUBJECT) {
                     val view = _recyclerView?.layoutManager?.findViewByPosition(position)
                     val adapter = view?.findViewById<RecyclerView>(R.id.subjectRv)?.adapter
                     if (adapter != null && adapter is SearchSubjectAdapter) {

app/src/main/java/com/gh/gamecenter/search/SearchGameResultViewModel.kt

@@ -97,9 +97,11 @@ class SearchGameResultViewModel(
                 // 数据源来自于第三方的专题列表，包括 CPM 专题和 DSP 专题
                 val thirdPartySearchSubjectList = mutableListOf<SearchSubjectEntity>()
 
-                // 避免重复添加同一个 location 位置的专题
                 for (item in mutableList) {
-                    if (!mSearchSubjects.any { it.location == item.location }) {
+                    // 避免同一个位置重复的专题
+                    if (!mSearchSubjects.any {
+                        it.location == item.location && it.columnId == item.columnId
+                    }) {
                         mSearchSubjects.add(item)
                     }
                 }

app/src/main/res/layout/dialog_game_detail_recycler_view.xml

@@ -25,7 +25,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-            android:layout_marginLeft="16dp"
             android:gravity="center"
             android:textColor="@color/text_primary"
             android:textSize="@dimen/secondary_title_text_size"
@@ -35,6 +34,27 @@
             app:layout_constraintTop_toTopOf="@+id/closeIv"
             tools:text="其他2款游戏" />
 
+        <TextView
+            android:id="@+id/subtitleTv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="4dp"
+            android:layout_marginEnd="16dp"
+            android:ellipsize="end"
+            android:includeFontPadding="false"
+            android:lines="1"
+            android:textColor="@color/text_theme"
+            android:textSize="@dimen/secondary_size"
+            android:visibility="gone"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintBottom_toBottomOf="@+id/titleTv"
+            app:layout_constraintEnd_toStartOf="@+id/closeIv"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toEndOf="@+id/titleTv"
+            app:layout_constraintTop_toTopOf="@+id/titleTv"
+            tools:text="使用教程使用教程使用教程使用教程使用教程使用教程使用教程使用教程"
+            tools:visibility="visible" />
+
         <View
             android:id="@+id/divider"
             android:layout_width="0dp"

module_common/src/main/java/com/gh/gamecenter/common/utils/DialogHelper.kt

@@ -8,7 +8,6 @@ import android.graphics.Color
 import android.graphics.Paint
 import android.graphics.Typeface
 import android.graphics.drawable.ColorDrawable
-import android.os.Build
 import android.text.Html
 import android.text.Spannable
 import android.text.SpannableStringBuilder
@@ -23,11 +22,9 @@ import androidx.constraintlayout.widget.ConstraintSet
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentActivity
 import androidx.viewbinding.ViewBinding
-import com.therouter.TheRouter
 import com.gh.gamecenter.common.R
 import com.gh.gamecenter.common.base.TrackableDialog
 import com.gh.gamecenter.common.callback.ConfirmListener
-import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.databinding.DialogAlertDefaultBinding
 import com.gh.gamecenter.common.databinding.DialogGuideBinding
 import com.gh.gamecenter.common.databinding.DialogProgressBinding
@@ -41,6 +38,7 @@ import com.google.android.material.imageview.ShapeableImageView
 import com.lightgame.download.DownloadEntity
 import com.lightgame.utils.AppManager
 import com.lightgame.view.CheckableLinearLayout
+import com.therouter.TheRouter
 import splitties.systemservices.layoutInflater
 
 object DialogHelper {
@@ -642,7 +640,8 @@ object DialogHelper {
         cancelText: String,
         confirmClickCallback: (() -> Unit)? = null,
         cancelClickCallback: (() -> Unit)? = null,
-        touchOutsideCallback: (() -> Unit)? = null
+        touchOutsideCallback: (() -> Unit)? = null,
+        extraConfig: Config? = null
     ) {
         val webContent = Html.fromHtml(content)
         showDialog(
@@ -653,7 +652,8 @@ object DialogHelper {
             cancelText,
             confirmClickCallback,
             cancelClickCallback,
-            touchOutsideCallback = touchOutsideCallback
+            touchOutsideCallback = touchOutsideCallback,
+            extraConfig = extraConfig
         )
     }
 

module_common/src/main/java/com/gh/gamecenter/common/utils/Extensions.kt

@@ -6,6 +6,7 @@ import android.app.Activity
 import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
+import android.content.ContextWrapper
 import android.content.res.Configuration
 import android.graphics.Bitmap
 import android.graphics.Canvas
@@ -424,6 +425,13 @@ fun Context.ifLogin(entrance: String, action: (() -> Unit)? = null) {
     checkLoginConfig?.checkLogin(this, entrance, action)
 }
 
+fun Context.getActivity(): Activity? {
+    return when (this) {
+        is Activity -> this
+        is ContextWrapper -> this.baseContext.getActivity()
+        else -> null
+    }
+}
 
 /**
  * Gson related extensions.
@@ -1832,4 +1840,7 @@ fun ViewPager.setRestoredCurItem(defaultPosition: Int) {
 // RGBA转换为ARGB格式颜色字符串
 fun String.RGBAToARGB(): String = if (length == 9) {
     substring(0, 1) + substring(7, 9) + substring(1, 7)
-} else this
+} else this
+
+// 换行符替换为Html的<br>换行
+fun String.replaceLineBreakWithBr(): String = replace("\n", "<br>")

module_login/src/main/java/com/gh/gamecenter/login/user/UserRepository.java

@@ -662,7 +662,7 @@ public class UserRepository {
             String userInfo = mPreferences.getString(Constants.USER_INFO_KEY, null);
             if (!TextUtils.isEmpty(userInfo)) {
                 UserInfoEntity infoEntity = GsonUtils.fromJson(userInfo, UserInfoEntity.class);
-                setAcceleratorToken(infoEntity.getUserId(), null);
+                setAcceleratorToken(infoEntity.getUserId(), () -> null);
             }
 
         }