diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/entity/DetailEntity.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/entity/DetailEntity.kt index 0f5dd46c95..018c99fa46 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/entity/DetailEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/entity/DetailEntity.kt @@ -87,6 +87,9 @@ class DetailEntity( // 仅用于镜像 @SerializedName("update_time") var updateTime: Long = 0, + // 仅用于镜像 + @SerializedName("content_card_status") + var contentCardStatus: String = "off", //on(生效)/off(不生效) @SerializedName("detail_dialogs") var detailDialogs: ArrayList = arrayListOf(), diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/entity/NewGameDetailEntity.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/entity/NewGameDetailEntity.kt index 183bae241d..44ddc9d3ba 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/entity/NewGameDetailEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/entity/NewGameDetailEntity.kt @@ -46,8 +46,6 @@ class NewGameDetailEntity( var certificateTag: Screenshot? = null, @SerializedName("content_card") var contentCard: ArrayList = ArrayList(), - @SerializedName("content_card_status") - var contentCardStatus: String = "off", //on(生效)/off(不生效) @SerializedName("smooth_relation_game") var smoothRelatedGame: SimpleGame? = null, @@ -58,7 +56,7 @@ class NewGameDetailEntity( var archiveTab: ArchiveTab = ArchiveTab() ) { fun isShowContentCard(gameEntity: GameEntity?): Boolean { - return contentCard.size > 1 && (gameEntity?.shouldUseMirrorInfo() == false || (gameEntity?.shouldUseMirrorInfo() == true && contentCardStatus == "on")) + return contentCard.size > 1 && (gameEntity?.shouldUseMirrorInfo() == false || (gameEntity?.shouldUseMirrorInfo() == true && mirrorData?.contentCardStatus == "on")) } } diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameIndexAdapter.kt b/app/src/main/java/com/gh/gamecenter/search/SearchGameIndexAdapter.kt index 97d58ddaab..254afd8f9c 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameIndexAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameIndexAdapter.kt @@ -172,7 +172,7 @@ class SearchGameIndexAdapter( || gameEntity.contentTag!!.server || gameEntity.contentTag!!.isBbsExists) val isShowTagByMirror = - if (gameEntity.shouldUseMirrorInfo()) isShowTag && gameEntity.contentTagStatus == "on" else isShowTag + if (gameEntity.shouldUseMirrorInfo()) isShowTag && gameEntity.mirrorData?.contentTagStatus == "on" else isShowTag tagContainer.goneIf(!isShowTagByMirror) if (isShowTagByMirror) { val screenWidth = mContext.resources.displayMetrics.widthPixels diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameResultAdapter.kt b/app/src/main/java/com/gh/gamecenter/search/SearchGameResultAdapter.kt index 8edb9bdade..ac1962b2bd 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameResultAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameResultAdapter.kt @@ -152,7 +152,7 @@ class SearchGameResultAdapter( || gameEntity.contentTag!!.isLibaoExists || gameEntity.contentTag!!.server) val isShowTagByMirror = - if (gameEntity.shouldUseMirrorInfo()) isShowTag && gameEntity.contentTagStatus == "on" else isShowTag + if (gameEntity.shouldUseMirrorInfo()) isShowTag && gameEntity.mirrorData?.contentTagStatus == "on" else isShowTag if (isShowTagByMirror) { topDivider.visibility = View.GONE } else { @@ -244,7 +244,7 @@ class SearchGameResultAdapter( || gameEntity.contentTag!!.server || gameEntity.contentTag!!.isBbsExists) val isShowTagByMirror = - if (gameEntity.shouldUseMirrorInfo()) isShowTag && gameEntity.contentTagStatus == "on" else isShowTag + if (gameEntity.shouldUseMirrorInfo()) isShowTag && gameEntity.mirrorData?.contentTagStatus == "on" else isShowTag tagContainer.goneIf(!isShowTagByMirror) if (isShowTagByMirror && gameEntity.contentTag != holder.contentTag) { holder.contentTag = gameEntity.contentTag diff --git a/module_core_feature/src/main/java/com/gh/gamecenter/feature/entity/GameEntity.kt b/module_core_feature/src/main/java/com/gh/gamecenter/feature/entity/GameEntity.kt index 3693698bc1..700a397fd1 100644 --- a/module_core_feature/src/main/java/com/gh/gamecenter/feature/entity/GameEntity.kt +++ b/module_core_feature/src/main/java/com/gh/gamecenter/feature/entity/GameEntity.kt @@ -260,9 +260,6 @@ data class GameEntity( @SerializedName("content_tag") val contentTag: ContentTag? = null, - @SerializedName("content_tag_status") - val contentTagStatus: String = "off",//on(生效)/off(不生效) - @SerializedName("update_time") val updateTime: Long = 0L, @@ -306,6 +303,10 @@ data class GameEntity( @SerializedName("icon_float") var mIconFloat: IconFloat? = null,//图标浮层 + // 镜像字段 + @SerializedName("content_tag_status") + val contentTagStatus: String = "off",//on(生效)/off(不生效) + // 专题id,用于曝光使用 var subjectId: String? = null, // 专题名字,用于曝光使用