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

2023-04-18 10:56:43 +08:00
parent dfa2d9b568 67e0181fa5
commit 1f9cee2823
16 changed files with 105 additions and 42 deletions
--- a/app/src/main/java/com/gh/common/util/DialogUtils.java
+++ b/app/src/main/java/com/gh/common/util/DialogUtils.java
@ -1005,7 +1005,7 @@ public class DialogUtils {
        SimpleDraweeView badgeView = contentView.findViewById(R.id.dialog_badge);
        ImageView badgeLightBg = contentView.findViewById(R.id.dialog_badge_light_bg);

-        ImageUtils.display(badgeView, badge.getIcon());
+        ImageUtils.display(badgeView, badge.getMIcon());
        titleTv.setText(badge.getName());

        // 领取条件文本超过一行就不显示