feat: 【光环助手】部分专题封面图不展示问题 https://jira.shanqu.cc/browse/GHZSCY-5775

This commit is contained in:
曾祥俊
2024-06-20 14:24:30 +08:00
parent 2fe8051280
commit 95721268f7
4 changed files with 16 additions and 6 deletions

View File

@ -72,6 +72,7 @@ android_build:
only:
- dev
- release
- feature-GHZS-5775
# 代码检查
sonarqube_analysis:
@ -152,4 +153,5 @@ oss-upload&send-email:
- /usr/local/bin/python /ci-android-mail-jira-comment.py
only:
- dev
- release
- release
- feature-GHZS-5775

View File

@ -271,8 +271,8 @@ abstract class CustomPageItem(
CUSTOM_LINK_TYPE_QUESTION to "内容卡片",
CUSTOM_LINK_TYPE_PLUGIN_AREA to "插件化区域",
CUSTOM_LINK_TYPE_CWZS_RECENTLY_PLAYED to "最近在玩",
CUSTOM_LINK_TYPE_QQ_GAME_RECENTLY_PLAYED to "QQ小游戏-最近在玩",
CUSTOM_LINK_TYPE_WECHAT_GAME_RECENTLY_PLAYED to "微信小游戏-最近在玩",
CUSTOM_LINK_TYPE_QQ_GAME_RECENTLY_PLAYED to "最近在玩",
CUSTOM_LINK_TYPE_WECHAT_GAME_RECENTLY_PLAYED to "最近在玩",
CUSTOM_LINK_TYPE_QQ_MINI_GAME_COLUMN_DETAIL to "QQ小游戏专题",
CUSTOM_LINK_TYPE_WECHAT_MINI_GAME_COLUMN_DETAIL to "微信小游戏专题",
CUSTOM_LINK_TYPE_HALO_RECOMMEND to "光环推荐",

View File

@ -110,7 +110,11 @@ class CustomHomeGameItemViewHolder(
}
binding.gameBrief.text = game.recommendText
binding.gameImage.visibleIf(game.showImage) {
ImageUtils.display(binding.gameImage, game.homeSetting.image)
if (game.isWechatMiniGame()) {
ImageUtils.display(binding.gameImage, game.banner)
} else {
ImageUtils.display(binding.gameImage, game.homeSetting.image)
}
val hierarchy = binding.gameImage.hierarchy
try {
hierarchy.setPlaceholderImage(ColorDrawable(game.homeSetting.placeholderColor.hexStringToIntColor()))

View File

@ -1016,8 +1016,12 @@ data class GameEntity(
}
val showImage: Boolean
get() = DISPLAY_CONTENT_IMAGE.equals(displayContent, true) &&
homeSetting.image.isNotBlank()
get() {
if (!DISPLAY_CONTENT_IMAGE.equals(displayContent, true)) {
return false
}
return (isWechatMiniGame() && banner.isNotBlank()) || homeSetting.image.isNotBlank()
}
companion object {
const val TAG: String = "GameEntity"