diff --git a/app/src/main/java/com/gh/common/util/DialogUtils.java b/app/src/main/java/com/gh/common/util/DialogUtils.java index be6d4f06bc..6751486caa 100644 --- a/app/src/main/java/com/gh/common/util/DialogUtils.java +++ b/app/src/main/java/com/gh/common/util/DialogUtils.java @@ -1084,6 +1084,8 @@ public class DialogUtils { if ("self".equals(badge.getReceive().getType())) { receiveTv.setText(R.string.receive_badge); + } else if ("auto".equals(badge.getReceive().getType())) { + receiveTv.setText(R.string.view_badge); } else { receiveTv.setText(R.string.apply_badge); } diff --git a/app/src/main/java/com/gh/gamecenter/personal/HaloPersonalFragment.kt b/app/src/main/java/com/gh/gamecenter/personal/HaloPersonalFragment.kt index eb3f133b64..60baeedd2c 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/HaloPersonalFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personal/HaloPersonalFragment.kt @@ -385,6 +385,14 @@ class HaloPersonalFragment : BaseLazyFragment() { TimeUtils.getStartTimeOfDay(System.currentTimeMillis() + 86400000 * 6) ) DialogUtils.showReceiveBadgeDialog(requireContext(), badge) { + if ("auto" == badge.receive?.type) { + DirectUtils.directToBadgeDetail( + requireContext(), + mUserInfoEntity?.userId, + badge.id + ) + return@showReceiveBadgeDialog + } mHaloPersonalViewModel.applyOrReceiveBadge(badge.id, { if ("self" == badge.receive?.type) { ToastUtils.showToast("领取成功") diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1aaa2963b1..bd42d2e1af 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -346,6 +346,7 @@ 徽章中心 领取徽章 申请领取 + 前往查看 最近来访 今日来访