From f88356cea2a9066771e860f67c4fb6b685211c0c Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Wed, 10 Apr 2024 10:31:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/yunbao/common/dialog/GuardBuyTipsDialog.java   | 6 +++---
 common/src/main/res/values-en-rUS/string.xml                | 2 +-
 common/src/main/res/values/strings.xml                      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/src/main/java/com/yunbao/common/dialog/GuardBuyTipsDialog.java b/common/src/main/java/com/yunbao/common/dialog/GuardBuyTipsDialog.java
index 04ebc92ec..25a7e4f61 100644
--- a/common/src/main/java/com/yunbao/common/dialog/GuardBuyTipsDialog.java
+++ b/common/src/main/java/com/yunbao/common/dialog/GuardBuyTipsDialog.java
@@ -73,10 +73,10 @@ public class GuardBuyTipsDialog {
                         buyTypeTextView.setVisibility(View.GONE);
                         content2.setVisibility(View.VISIBLE);
 
-                    } else if (guardType == mGuardUserInfoModel.getGuardType()) {
-                        content1.setVisibility(View.GONE);
-                    } else {
+                    } else if (TextUtils.equals(mGuardUserInfoModel.getIsOpen(), "1") && guardType > mGuardUserInfoModel.getGuardType()) {
                         content1.setVisibility(View.VISIBLE);
+                    } else {
+                        content1.setVisibility(View.GONE);
                     }
                 } else {
                     content1.setVisibility(View.GONE);
diff --git a/common/src/main/res/values-en-rUS/string.xml b/common/src/main/res/values-en-rUS/string.xml
index b1f00db6d..98f09ea64 100644
--- a/common/src/main/res/values-en-rUS/string.xml
+++ b/common/src/main/res/values-en-rUS/string.xml
@@ -1466,7 +1466,7 @@ Limited ride And limited avatar frame</string>
     <string name="six_month">6 month</string>
     <string name="one_two_month">12 month</string>
     <string name="guardian_for_your_favorite_anchor">Quickly activate guardian for your favorite anchor！</string>
-    <string name="guardian_task">Guardian Task</string>
+    <string name="guardian_task">Guard tasks</string>
     <string name="my_graud_grade">My level ></string>
     <string name="no_one_guarding_the_anchor_yet">No one is guarding the anchor yet, come and guard it now~</string>
     <string name="this_week_contribution">Contribution/week</string>
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index 1a36a41c6..0d8d52e82 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -1469,7 +1469,7 @@ Limited ride And limited avatar frame</string>
     <string name="six_month">6 month</string>
     <string name="one_two_month">12 month</string>
     <string name="guardian_for_your_favorite_anchor">Quickly activate guardian for your favorite anchor！</string>
-    <string name="guardian_task">Guardian Task</string>
+    <string name="guardian_task">Guard tasks</string>
     <string name="my_graud_grade">My level ></string>
     <string name="no_one_guarding_the_anchor_yet">No one is guarding the anchor yet, come and guard it now~</string>
     <string name="this_week_contribution">Contribution/week</string>