From e48d090eb3ab30d4de37792be92f96f3309dfb8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8F=B6=E5=AD=90=E7=BB=B4?= <yeziwei@ghzhushou.com>
Date: Tue, 21 Mar 2023 15:42:46 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=BE=BD=E7=AB=A0=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BC=98=E5=8C=96=E2=80=94=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E7=AB=AF=20https://jira.shanqu.cc/browse/GHZS-1746?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/gh/common/util/DialogUtils.java     | 2 ++
 .../com/gh/gamecenter/personal/HaloPersonalFragment.kt    | 8 ++++++++
 app/src/main/res/values/strings.xml                       | 1 +
 3 files changed, 11 insertions(+)

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 @@
     <string name="badge_center">徽章中心</string>
     <string name="receive_badge">领取徽章</string>
     <string name="apply_badge">申请领取</string>
+    <string name="view_badge">前往查看</string>
 
     <string name="recent_visit">最近来访</string>
     <string name="today_visit">今日来访</string>