Merge remote-tracking branch 'origin/release' into dev

# Conflicts:
#	dependencies.gradle
This commit is contained in:
chenjuntao
2024-04-16 17:01:37 +08:00
7 changed files with 35 additions and 31 deletions

View File

@ -365,7 +365,7 @@ class ConcernAdapter extends BaseRecyclerAdapter<ViewHolder> {
if (concernEntity.getGame() != null) {
viewHolder.binding.newsDigestThumb.displayGameIcon(concernEntity.getGame().getIcon(), concernEntity.getGame().getIconSubscript(), concernEntity.getGame().getIconFloat());
} else {
viewHolder.binding.newsDigestThumb.displayGameIcon(concernEntity.getGameIcon(), null, concernEntity.getGame().getIconFloat());
viewHolder.binding.newsDigestThumb.displayGameIcon(concernEntity.getGameIcon(), null, null);
}
viewHolder.binding.newsDigestTitle.setText(concernEntity.getGameName());