修改守护列表页标签展示

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;

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:scaleType="fitXY" />
-                    android:src="@mipmap/tequan_1" />
 
                 <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:scaleType="fitXY" />
-                    android:src="@mipmap/tequan_1" />
 
                 <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:scaleType="fitXY" />
-                    android:src="@mipmap/tequan_1" />
 
                 <TextView
                     android:id="@+id/rewards_text3"

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,6 +200,12 @@ public class LiveGuardDialog extends AbsDialogPopupWindow {
             @Override
             public void onSuccess(GuardGetGuardUserInfoModel data) {
                 getGuardUserInfoModel = data;
+                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 {
                     if (data.getGuardType() == 0) {
                         guardianTask.setVisibility(GONE);
                         myGraudGrade.setVisibility(GONE);
@@ -232,6 +239,8 @@ public class LiveGuardDialog extends AbsDialogPopupWindow {
                                 break;
                         }
                     }
+                }
+
                 if (data.getEndtime() == 0) {
                     guard_time.setVisibility(GONE);
                 } else {

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();
             }
         });