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 6 month 12 month Quickly activate guardian for your favorite anchor! - Guardian Task + Guard tasks My level > No one is guarding the anchor yet, come and guard it now~ Contribution/week 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 6 month 12 month Quickly activate guardian for your favorite anchor! - Guardian Task + Guard tasks My level > No one is guarding the anchor yet, come and guard it now~ Contribution/week