From 4a4a52aa6164120bbc431a8684c1b0ef339f4ebe Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Fri, 29 Mar 2024 15:16:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=88=E6=8A=A4=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E6=A0=87=E7=AD=BE=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bean/GuardGetGuardUserInfoModel.java      | 11 ++++
 .../main/res/layout/guard_upgrade_popup.xml   |  9 +--
 .../yunbao/live/dialog/LiveGuardDialog.java   | 61 +++++++++++--------
 .../live/presenter/LiveGiftAnimPresenter.java |  1 +
 4 files changed, 50 insertions(+), 32 deletions(-)

diff --git a/common/src/main/java/com/yunbao/common/bean/GuardGetGuardUserInfoModel.java b/common/src/main/java/com/yunbao/common/bean/GuardGetGuardUserInfoModel.java
index 7a8fcd48c..b1225176d 100644
--- a/common/src/main/java/com/yunbao/common/bean/GuardGetGuardUserInfoModel.java
+++ b/common/src/main/java/com/yunbao/common/bean/GuardGetGuardUserInfoModel.java
@@ -38,6 +38,17 @@ public class GuardGetGuardUserInfoModel extends BaseModel {
     private String userLanguage;
     @SerializedName("live_language")
     private String liveLanguage;
+    @SerializedName("is_open")
+    private String isOpen;
+
+    public String getIsOpen() {
+        return isOpen;
+    }
+
+    public GuardGetGuardUserInfoModel setIsOpen(String isOpen) {
+        this.isOpen = isOpen;
+        return this;
+    }
 
     public String getUid() {
         return uid;
diff --git a/common/src/main/res/layout/guard_upgrade_popup.xml b/common/src/main/res/layout/guard_upgrade_popup.xml
index 2bb16b8d9..eb3d3fdf2 100644
--- a/common/src/main/res/layout/guard_upgrade_popup.xml
+++ b/common/src/main/res/layout/guard_upgrade_popup.xml
@@ -58,8 +58,7 @@
                     android:id="@+id/rewards_img1"
                     android:layout_width="80dp"
                     android:layout_height="80dp"
-                    android:scaleType="fitXY"
-                    android:src="@mipmap/tequan_1" />
+                    android:scaleType="fitXY" />
 
                 <TextView
                     android:id="@+id/rewards_text1"
@@ -86,8 +85,7 @@
                     android:id="@+id/rewards_img2"
                     android:layout_width="80dp"
                     android:layout_height="80dp"
-                    android:scaleType="fitXY"
-                    android:src="@mipmap/tequan_1" />
+                    android:scaleType="fitXY" />
 
                 <TextView
                     android:id="@+id/rewards_text2"
@@ -112,8 +110,7 @@
                     android:id="@+id/rewards_img3"
                     android:layout_width="80dp"
                     android:layout_height="80dp"
-                    android:scaleType="fitXY"
-                    android:src="@mipmap/tequan_1" />
+                    android:scaleType="fitXY" />
 
                 <TextView
                     android:id="@+id/rewards_text3"
diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveGuardDialog.java b/live/src/main/java/com/yunbao/live/dialog/LiveGuardDialog.java
index 28e221ab9..37f2dc48e 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveGuardDialog.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveGuardDialog.java
@@ -2,6 +2,7 @@ package com.yunbao.live.dialog;
 
 import android.content.Context;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
@@ -199,39 +200,47 @@ public class LiveGuardDialog extends AbsDialogPopupWindow {
             @Override
             public void onSuccess(GuardGetGuardUserInfoModel data) {
                 getGuardUserInfoModel = data;
-                if (data.getGuardType() == 0) {
+                if (TextUtils.equals(data.getIsOpen(), "0")) {
                     guardianTask.setVisibility(GONE);
                     myGraudGrade.setVisibility(GONE);
                     btnGuardOpen.setText(WordUtil.isNewZh() ? "開通守護" : "Open Guard");
                     guard_hint.setText(WordUtil.getNewString(R.string.guardian_for_your_favorite_anchor));
                 } else {
-                    guardianTask.setVisibility(VISIBLE);
-                    myGraudGrade.setVisibility(VISIBLE);
-                    btnGuardOpen.setText(WordUtil.isNewZh() ? "續費守護" : "Renewal Guard");
-                    StringBuffer stringBuffer = new StringBuffer();
-                    stringBuffer.append(WordUtil.isNewZh() ? "您是當前主播的" : "You are the current anchor's ")
-                            .append("【");
-                    switch (data.getGuardType()) {
-                        case 1:
-                            stringBuffer.append(WordUtil.isNewZh() ? "星之守護" : "Star Guardian")
-                                    .append("】");
-                            guard_hint.setText(stringBuffer.toString());
-                            break;
-                        case 2:
-                            stringBuffer.append(WordUtil.isNewZh() ? "王之守護" : "King Guardian")
-                                    .append("】");
-                            guard_hint.setText(stringBuffer.toString());
-                            break;
-                        case 3:
-                            stringBuffer.append(WordUtil.isNewZh() ? "神之守護" : "God Guardian")
-                                    .append("】");
-                            guard_hint.setText(stringBuffer.toString());
-                            break;
-                        default:
-                            guard_hint.setText(WordUtil.getNewString(R.string.guardian_for_your_favorite_anchor));
-                            break;
+                    if (data.getGuardType() == 0) {
+                        guardianTask.setVisibility(GONE);
+                        myGraudGrade.setVisibility(GONE);
+                        btnGuardOpen.setText(WordUtil.isNewZh() ? "開通守護" : "Open Guard");
+                        guard_hint.setText(WordUtil.getNewString(R.string.guardian_for_your_favorite_anchor));
+                    } else {
+                        guardianTask.setVisibility(VISIBLE);
+                        myGraudGrade.setVisibility(VISIBLE);
+                        btnGuardOpen.setText(WordUtil.isNewZh() ? "續費守護" : "Renewal Guard");
+                        StringBuffer stringBuffer = new StringBuffer();
+                        stringBuffer.append(WordUtil.isNewZh() ? "您是當前主播的" : "You are the current anchor's ")
+                                .append("【");
+                        switch (data.getGuardType()) {
+                            case 1:
+                                stringBuffer.append(WordUtil.isNewZh() ? "星之守護" : "Star Guardian")
+                                        .append("】");
+                                guard_hint.setText(stringBuffer.toString());
+                                break;
+                            case 2:
+                                stringBuffer.append(WordUtil.isNewZh() ? "王之守護" : "King Guardian")
+                                        .append("】");
+                                guard_hint.setText(stringBuffer.toString());
+                                break;
+                            case 3:
+                                stringBuffer.append(WordUtil.isNewZh() ? "神之守護" : "God Guardian")
+                                        .append("】");
+                                guard_hint.setText(stringBuffer.toString());
+                                break;
+                            default:
+                                guard_hint.setText(WordUtil.getNewString(R.string.guardian_for_your_favorite_anchor));
+                                break;
+                        }
                     }
                 }
+
                 if (data.getEndtime() == 0) {
                     guard_time.setVisibility(GONE);
                 } else {
diff --git a/live/src/main/java/com/yunbao/live/presenter/LiveGiftAnimPresenter.java b/live/src/main/java/com/yunbao/live/presenter/LiveGiftAnimPresenter.java
index eefb2de90..349f5c481 100644
--- a/live/src/main/java/com/yunbao/live/presenter/LiveGiftAnimPresenter.java
+++ b/live/src/main/java/com/yunbao/live/presenter/LiveGiftAnimPresenter.java
@@ -1105,6 +1105,7 @@ public class LiveGiftAnimPresenter {
         ViewClicksAntiShake.clicksAntiShake(mIvLookBuyGuardNew, new ViewClicksAntiShake.ViewClicksCallBack() {
             @Override
             public void onViewClicks() {
+                mIvLookBuyGuardNew.setVisibility(View.GONE);
                 changeLiveRoom();
             }
         });