From 4fabf3aba3f66104db267e8e6017719a1c0ab0b1 Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Wed, 20 Mar 2024 13:40:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adapter/DragonSendMoneyListAdapter.java   |  8 +-
 .../common/dialog/GuardBuyTipsDialog.java     | 64 ++++++++++++----
 .../common/http/live/LiveNetManager.java      | 11 ++-
 .../views/DragonSendMoneyListViewHolder.java  |  2 +-
 .../main/res/layout/dialog_guard_buy_tips.xml | 51 ++++++++++---
 .../src/main/res/layout/dragon_rule_popup.xml |  2 +-
 common/src/main/res/values-en-rUS/string.xml  |  2 +
 common/src/main/res/values-zh-rHK/strings.xml |  2 +
 common/src/main/res/values-zh-rTW/strings.xml |  2 +
 common/src/main/res/values-zh/strings.xml     |  2 +
 common/src/main/res/values/strings.xml        |  2 +
 .../yunbao/live/dialog/DragonExpirePopup.java | 18 ++++-
 .../live/dialog/DragonSendMoneyListPopup.java | 75 ++++++++++++-------
 .../live/dialog/DragonSendsMoneyPopup.java    | 27 ++++---
 .../live/dialog/LiveBuyGuardDialog.java       | 23 +++++-
 .../yunbao/live/dialog/LiveGuardDialog.java   | 20 ++++-
 .../yunbao/live/views/LiveRoomViewHolder.java |  6 +-
 .../src/main/res/layout/dialog_live_guard.xml |  3 +-
 18 files changed, 238 insertions(+), 82 deletions(-)

diff --git a/common/src/main/java/com/yunbao/common/adapter/DragonSendMoneyListAdapter.java b/common/src/main/java/com/yunbao/common/adapter/DragonSendMoneyListAdapter.java
index b51d454d3..fd0eddc56 100644
--- a/common/src/main/java/com/yunbao/common/adapter/DragonSendMoneyListAdapter.java
+++ b/common/src/main/java/com/yunbao/common/adapter/DragonSendMoneyListAdapter.java
@@ -20,12 +20,18 @@ public class DragonSendMoneyListAdapter extends RecyclerView.Adapter {
     RecyclerView send_money_list;
     boolean isAnchor;
     SparseArray<CountDownTimer> countDownMap;
+    boolean isAttention;
 
     public DragonSendMoneyListAdapter setAnchor(boolean anchor) {
         isAnchor = anchor;
         return this;
     }
 
+    public DragonSendMoneyListAdapter setAttention(boolean attention) {
+        isAttention = attention;
+        return this;
+    }
+
     public List<sendMoneyLongListModel> getMoneyLongListModels() {
         return moneyLongListModels;
     }
@@ -70,7 +76,7 @@ public class DragonSendMoneyListAdapter extends RecyclerView.Adapter {
 //        if (time > 0) {
 //
 //        }
-        sendMoneyListViewHolder.setData(moneyLongListModels.get(position), callBack, isAnchor);
+        sendMoneyListViewHolder.setData(moneyLongListModels.get(position), callBack, isAnchor,isAttention);
 
 
     }
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 4db488c31..2f1e3a7f7 100644
--- a/common/src/main/java/com/yunbao/common/dialog/GuardBuyTipsDialog.java
+++ b/common/src/main/java/com/yunbao/common/dialog/GuardBuyTipsDialog.java
@@ -5,21 +5,25 @@ import android.app.Dialog;
 import android.content.Context;
 import android.text.TextUtils;
 import android.view.View;
+import android.widget.Button;
 import android.widget.TextView;
 
 import com.yunbao.common.R;
+import com.yunbao.common.bean.GuardGetGuardUserInfoModel;
 import com.yunbao.common.utils.DialogUitl;
+import com.yunbao.common.utils.WordUtil;
 
 public class GuardBuyTipsDialog {
 
     /**
-     *
      * @param context
-     * @param coin 钻石
-     * @param content 购买类型名称
+     * @param coin           钻石
+     * @param content        购买类型名称
      * @param simpleCallback
      */
-    public static void showBuyOrRenewDialog(Context context, String coin, String content, boolean isOpen,DialogUitl.SimpleCallback simpleCallback) {
+    public static void showBuyOrRenewDialog(Context context, String coin, String content,
+                                            boolean isOpen, GuardGetGuardUserInfoModel mGuardUserInfoModel, int guardType,
+                                            DialogUitl.SimpleCallback simpleCallback) {
         if (context instanceof Activity) {
             if (((Activity) context).isDestroyed() || ((Activity) context).isFinishing()) {
                 return;
@@ -30,25 +34,49 @@ public class GuardBuyTipsDialog {
         dialog.setContentView(R.layout.dialog_guard_buy_tips);
         dialog.setCancelable(true);
         dialog.setCanceledOnTouchOutside(true);
-        if (!isOpen){
+        Button btn_confirm = dialog.findViewById(R.id.btn_confirm);
+        TextView content1 = dialog.findViewById(R.id.content1);
+        TextView content2 = dialog.findViewById(R.id.content2);
+        TextView contentTextView = dialog.findViewById(R.id.content);
+        TextView buyTypeTextView = dialog.findViewById(R.id.buyType);
+        content1.setVisibility(View.VISIBLE);
+        contentTextView.setVisibility(View.VISIBLE);
+        buyTypeTextView.setVisibility(View.VISIBLE);
+        content2.setVisibility(View.GONE);
+        if (!isOpen) {
             if (!TextUtils.isEmpty(coin)) {
-                TextView contentTextView = dialog.findViewById(R.id.content);
                 contentTextView.setText(context.getString(R.string.guard_buy_tips_1, coin));
             }
             if (!TextUtils.isEmpty(content)) {
-                TextView buyTypeTextView = dialog.findViewById(R.id.buyType);
-                buyTypeTextView.setText("【"+content+"】");
+                buyTypeTextView.setText("【" + content + "】");
             }
-        }else {
+        } else {
             if (!TextUtils.isEmpty(coin)) {
-                TextView contentTextView = dialog.findViewById(R.id.content);
                 contentTextView.setText(context.getString(R.string.guard_buy_tips_2, coin));
             }
             if (!TextUtils.isEmpty(content)) {
-                TextView buyTypeTextView = dialog.findViewById(R.id.buyType);
-                buyTypeTextView.setText("【"+content+"】");
+                buyTypeTextView.setText("【" + content + "】");
             }
         }
+        if (mGuardUserInfoModel != null) {
+            if (mGuardUserInfoModel.getGuardType() != 0) {
+                if (guardType < mGuardUserInfoModel.getGuardType()) {
+                    content1.setVisibility(View.GONE);
+                    contentTextView.setVisibility(View.GONE);
+                    buyTypeTextView.setVisibility(View.GONE);
+                    content2.setVisibility(View.VISIBLE);
+
+                } else if (guardType==mGuardUserInfoModel.getGuardType()){
+                    content1.setVisibility(View.GONE);
+                }else {
+                    content1.setVisibility(View.VISIBLE);
+                }
+            } else {
+                content1.setVisibility(View.GONE);
+            }
+        } else {
+            content1.setVisibility(View.GONE);
+        }
 
         dialog.findViewById(R.id.btn_cancel).setOnClickListener(new View.OnClickListener() {
             @Override
@@ -56,11 +84,17 @@ public class GuardBuyTipsDialog {
                 dialog.dismiss();
             }
         });
-        dialog.findViewById(R.id.btn_confirm).setOnClickListener(new View.OnClickListener() {
+        btn_confirm.setText(WordUtil.isNewZh() ? "確認" : "Confirm");
+        btn_confirm.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                simpleCallback.onConfirmClick(dialog, "");
-                dialog.dismiss();
+                if (content2.getVisibility()==View.VISIBLE){
+                    dialog.dismiss();
+                }else {
+                    simpleCallback.onConfirmClick(dialog, "");
+                    dialog.dismiss();
+                }
+
             }
         });
         dialog.show();
diff --git a/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java b/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
index 4c7420f1e..2da882d1f 100644
--- a/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
+++ b/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
@@ -2993,7 +2993,12 @@ public class LiveNetManager {
                     @Override
                     public void accept(ResponseModel<Object> stringResponseModel) throws Exception {
                         if (callback != null) {
-                            callback.onSuccess(stringResponseModel.getData().getMsg());
+                            if (stringResponseModel.getData().getCode() == 0) {
+                                callback.onSuccess(stringResponseModel.getData().getMsg());
+                            } else {
+                                callback.onError(stringResponseModel.getData().getMsg());
+                            }
+
                         }
                     }
                 }, new Consumer<Throwable>() {
@@ -3129,9 +3134,9 @@ public class LiveNetManager {
 
     }
 
-    public void guardGetRewards( String liveUid,HttpCallback<CheckUpgradesModel> callback) {
+    public void guardGetRewards(String liveUid, HttpCallback<CheckUpgradesModel> callback) {
         API.get().pdLiveApi(mContext)
-                .guardGetRewards("2",liveUid)
+                .guardGetRewards("2", liveUid)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Consumer<ResponseModel<CheckUpgradesModel>>() {
diff --git a/common/src/main/java/com/yunbao/common/views/DragonSendMoneyListViewHolder.java b/common/src/main/java/com/yunbao/common/views/DragonSendMoneyListViewHolder.java
index 0c714056d..ca5f0d7d8 100644
--- a/common/src/main/java/com/yunbao/common/views/DragonSendMoneyListViewHolder.java
+++ b/common/src/main/java/com/yunbao/common/views/DragonSendMoneyListViewHolder.java
@@ -39,7 +39,7 @@ public class DragonSendMoneyListViewHolder extends RecyclerView.ViewHolder {
         send_benefits = itemView.findViewById(R.id.send_benefits);
     }
 
-    public void setData(sendMoneyLongListModel model, DragonSendMoneyListClicksCallBack callBack,boolean isAnchor) {
+    public void setData(sendMoneyLongListModel model, DragonSendMoneyListClicksCallBack callBack,boolean isAnchor,  boolean isAttention) {
         ImgLoader.display(itemView.getContext(), model.getUserAvatar(), live_avatar);
         user_nicename.setText(String.valueOf(model.getUserNicename()));
         gold_num.setText(String.valueOf(model.getGoldNum()));
diff --git a/common/src/main/res/layout/dialog_guard_buy_tips.xml b/common/src/main/res/layout/dialog_guard_buy_tips.xml
index fd56edb3d..7f6c3be40 100644
--- a/common/src/main/res/layout/dialog_guard_buy_tips.xml
+++ b/common/src/main/res/layout/dialog_guard_buy_tips.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="300dp"
-    android:layout_height="220dp"
+    android:layout_width="310dp"
+    android:layout_height="250dp"
     android:gravity="center_horizontal"
     android:orientation="vertical">
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="200dp"
+        android:layout_height="250dp"
         android:background="@drawable/guard_buy_tips_bg">
 
         <ImageView
@@ -35,18 +35,19 @@
 
         <TextView
             android:id="@+id/content"
-            android:gravity="center"
-            android:layout_marginStart="20dp"
-            android:layout_marginEnd="20dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@+id/title"
             android:layout_centerHorizontal="true"
-            android:layout_marginTop="30dp"
+            android:layout_marginStart="20dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginEnd="20dp"
+            android:gravity="center"
             android:letterSpacing="0.1"
             android:text="@string/guard_buy_tips_1"
             android:textColor="#FFE0BF"
-            android:textSize="14dp" />
+            android:textSize="14dp"
+            android:visibility="invisible" />
 
         <TextView
             android:id="@+id/buyType"
@@ -55,13 +56,43 @@
             android:layout_below="@+id/content"
             android:layout_centerHorizontal="true"
             android:layout_marginTop="10dp"
-            android:layout_marginBottom="50dp"
             android:letterSpacing="0.1"
             android:text="@string/guard_buy_type_1"
             android:textColor="#FFB974"
             android:textSize="15dp"
-            android:textStyle="italic|bold" />
+            android:textStyle="italic|bold"
+            android:visibility="invisible" />
 
+        <TextView
+            android:id="@+id/content1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/buyType"
+            android:layout_centerHorizontal="true"
+            android:layout_marginStart="20dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginEnd="20dp"
+            android:gravity="center"
+            android:letterSpacing="0.1"
+            android:text="@string/according_to_the_rules"
+            android:textColor="#FFE0BF"
+            android:textSize="12dp"
+            android:visibility="invisible" />
+
+        <TextView
+            android:id="@+id/content2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true"
+            android:layout_marginStart="20dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginEnd="20dp"
+            android:gravity="center"
+            android:letterSpacing="0.1"
+            android:text="@string/current_guard_expires"
+            android:textColor="#FFE0BF"
+            android:textSize="17dp" />
     </RelativeLayout>
 
     <Button
diff --git a/common/src/main/res/layout/dragon_rule_popup.xml b/common/src/main/res/layout/dragon_rule_popup.xml
index 4552f17fa..d83b99982 100644
--- a/common/src/main/res/layout/dragon_rule_popup.xml
+++ b/common/src/main/res/layout/dragon_rule_popup.xml
@@ -6,7 +6,7 @@
     android:orientation="vertical">
 
     <FrameLayout
-        android:layout_width="320dp"
+        android:layout_width="300dp"
         android:layout_height="320dp">
 
         <ImageView
diff --git a/common/src/main/res/values-en-rUS/string.xml b/common/src/main/res/values-en-rUS/string.xml
index 3051d2ce9..9f552bd6c 100644
--- a/common/src/main/res/values-en-rUS/string.xml
+++ b/common/src/main/res/values-en-rUS/string.xml
@@ -1494,4 +1494,6 @@ Limited ride And limited avatar frame</string>
     <string name="guard_buy_tips_2">You will spend %s diamonds to renew the anchor</string>
     <string name="participate">Participate</string>
     <string name="send_benefits">Send benefits</string>
+    <string name="according_to_the_rules">(The original protection level will be retained, and the remaining validity period will be added to the new protection validity period according to the rules)</string>
+    <string name="current_guard_expires">We are currently unable to activate this guard. Please try again after the current guard expires</string>
 </resources>
diff --git a/common/src/main/res/values-zh-rHK/strings.xml b/common/src/main/res/values-zh-rHK/strings.xml
index d2bdc0c99..8d471916f 100644
--- a/common/src/main/res/values-zh-rHK/strings.xml
+++ b/common/src/main/res/values-zh-rHK/strings.xml
@@ -1493,4 +1493,6 @@
     <string name="guard_buy_tips_2">您將花費%s鑽石為主播續費</string>
     <string name="participate">點擊參加</string>
     <string name="send_benefits">發放福利</string>
+    <string name="according_to_the_rules">（原有的守護等級將會保留，剩餘有效期將按規則補充至新守護有效期中）</string>
+    <string name="current_guard_expires">暫時無法開通該守護，請當前守護到期後嘗試</string>
 </resources>
diff --git a/common/src/main/res/values-zh-rTW/strings.xml b/common/src/main/res/values-zh-rTW/strings.xml
index 9acdd7ccf..0ec599fa3 100644
--- a/common/src/main/res/values-zh-rTW/strings.xml
+++ b/common/src/main/res/values-zh-rTW/strings.xml
@@ -1492,5 +1492,7 @@
     <string name="guard_buy_tips_2">您將花費%s鑽石為主播續費</string>
     <string name="participate">點擊參加</string>
     <string name="send_benefits">發放福利</string>
+    <string name="according_to_the_rules">（原有的守護等級將會保留，剩餘有效期將按規則補充至新守護有效期中）</string>
+    <string name="current_guard_expires">暫時無法開通該守護，請當前守護到期後嘗試</string>
 
 </resources>
diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml
index 935980bae..2dd80b96e 100644
--- a/common/src/main/res/values-zh/strings.xml
+++ b/common/src/main/res/values-zh/strings.xml
@@ -1489,5 +1489,7 @@
     <string name="guard_buy_tips_2">您將花費%s鑽石為主播續費</string>
     <string name="participate">點擊參加</string>
     <string name="send_benefits">發放福利</string>
+    <string name="according_to_the_rules">（原有的守護等級將會保留，剩餘有效期將按規則補充至新守護有效期中）</string>
+    <string name="current_guard_expires">暫時無法開通該守護，請當前守護到期後嘗試</string>
 
 </resources>
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index fdc70c15f..be3703a27 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -1498,5 +1498,7 @@ Limited ride And limited avatar frame</string>
     <string name="guard_buy_tips_2">You will spend %s diamonds to renew the anchor</string>
     <string name="participate">Participate</string>
     <string name="send_benefits">Send benefits</string>
+    <string name="according_to_the_rules">(The original protection level will be retained, and the remaining validity period will be added to the new protection validity period according to the rules)</string>
+    <string name="current_guard_expires">We are currently unable to activate this guard. Please try again after the current guard expires</string>
 
 </resources>
diff --git a/live/src/main/java/com/yunbao/live/dialog/DragonExpirePopup.java b/live/src/main/java/com/yunbao/live/dialog/DragonExpirePopup.java
index 83fabba3e..02dac6218 100644
--- a/live/src/main/java/com/yunbao/live/dialog/DragonExpirePopup.java
+++ b/live/src/main/java/com/yunbao/live/dialog/DragonExpirePopup.java
@@ -8,8 +8,11 @@ import androidx.fragment.app.FragmentActivity;
 
 import com.lxj.xpopup.core.CenterPopupView;
 import com.makeramen.roundedimageview.RoundedImageView;
+import com.yunbao.common.bean.GuardGetGuardUserInfoModel;
 import com.yunbao.common.bean.GuardMaturityDateRemindModel;
 import com.yunbao.common.glide.ImgLoader;
+import com.yunbao.common.http.base.HttpCallback;
+import com.yunbao.common.http.live.LiveNetManager;
 import com.yunbao.common.utils.WordUtil;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;
 import com.yunbao.live.R;
@@ -28,6 +31,7 @@ public class DragonExpirePopup extends CenterPopupView {
     TextView dueIn;
     TextView dueInGuard2;
     GuardMaturityDateRemindModel maturityDateRemindModel;
+    GuardGetGuardUserInfoModel getGuardUserInfoModel = null;
 
     public DragonExpirePopup(@NonNull Context context, String liveUid, GuardMaturityDateRemindModel maturityDateRemindModel, String stream) {
         super(context);
@@ -60,6 +64,18 @@ public class DragonExpirePopup extends CenterPopupView {
         ImgLoader.display(getContext(), maturityDateRemindModel.getUserAvatar(), userAvatar);
         ImgLoader.display(getContext(), maturityDateRemindModel.getLiveAvatar(), liveAvatar);
 
+        LiveNetManager.get(getContext()).getGuardUserInfo(mLiveUid, new HttpCallback<GuardGetGuardUserInfoModel>() {
+            @Override
+            public void onSuccess(GuardGetGuardUserInfoModel data) {
+                getGuardUserInfoModel = data;
+            }
+
+            @Override
+            public void onError(String error) {
+
+            }
+        });
+
 
         String guardName = WordUtil.isNewZh() ? "星之守護" : "Star Guardian";
         switch (maturityDateRemindModel.getGuardType()) {
@@ -107,7 +123,7 @@ public class DragonExpirePopup extends CenterPopupView {
             @Override
             public void onViewClicks() {
                 dismiss();
-                new LiveBuyGuardDialog(activity, mLiveUid,mStream).showDialog();
+                new LiveBuyGuardDialog(activity, mLiveUid, mStream, getGuardUserInfoModel).showDialog();
             }
         });
     }
diff --git a/live/src/main/java/com/yunbao/live/dialog/DragonSendMoneyListPopup.java b/live/src/main/java/com/yunbao/live/dialog/DragonSendMoneyListPopup.java
index 783dd31a0..1b400ae38 100644
--- a/live/src/main/java/com/yunbao/live/dialog/DragonSendMoneyListPopup.java
+++ b/live/src/main/java/com/yunbao/live/dialog/DragonSendMoneyListPopup.java
@@ -1,6 +1,7 @@
 package com.yunbao.live.dialog;
 
 import android.content.Context;
+import android.text.TextUtils;
 
 import androidx.annotation.NonNull;
 import androidx.fragment.app.FragmentActivity;
@@ -16,6 +17,7 @@ import com.yunbao.common.dialog.DragonRulePopup;
 import com.yunbao.common.http.base.HttpCallback;
 import com.yunbao.common.http.live.LiveNetManager;
 import com.yunbao.common.utils.ToastUtil;
+import com.yunbao.common.utils.WordUtil;
 import com.yunbao.common.views.DragonSendMoneyListViewHolder;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;
 import com.yunbao.live.R;
@@ -30,12 +32,14 @@ public class DragonSendMoneyListPopup extends AbsDialogPopupWindow {
     RecyclerView send_money_list;
     boolean isAnchor;
     GradientTextView title;
+    boolean isAttention;
 
-    public DragonSendMoneyListPopup(@NonNull Context context, String liveUid, boolean isAnchor) {
+    public DragonSendMoneyListPopup(@NonNull Context context, String liveUid, boolean isAnchor, boolean isAttention) {
         super(context);
         activity = (FragmentActivity) context;
         mLiveUid = liveUid;
         this.isAnchor = isAnchor;
+        this.isAttention = isAttention;
     }
 
     @Override
@@ -59,34 +63,42 @@ public class DragonSendMoneyListPopup extends AbsDialogPopupWindow {
 
         send_money_list.setAdapter(dragonSendMoneyListAdapter);
         dragonSendMoneyListAdapter.setAnchor(isAnchor);
+        dragonSendMoneyListAdapter.setAttention(isAttention);
         dragonSendMoneyListAdapter.setCallBack(new DragonSendMoneyListViewHolder.DragonSendMoneyListClicksCallBack() {
             @Override
             public void onParticipate(sendMoneyLongListModel moneyLongListModel) {
-                LiveNetManager.get(mContext)
-                        .participateMoneyLong(mLiveUid, moneyLongListModel.getSendMoneyLongKey(), new HttpCallback<String>() {
-                            @Override
-                            public void onSuccess(String data) {
-                                ToastUtil.show(data);
-                                LiveNetManager.get(mContext)
-                                        .sendMoneyLongList(mLiveUid, new HttpCallback<List<sendMoneyLongListModel>>() {
-                                            @Override
-                                            public void onSuccess(List<sendMoneyLongListModel> data) {
-                                                dragonSendMoneyListAdapter.setMoneyLongListModels(data);
-                                                send_money_list.getRecycledViewPool().setMaxRecycledViews(0, data.size());
-                                            }
+                if (isAttention) {
+                    LiveNetManager.get(mContext)
+                            .participateMoneyLong(mLiveUid, moneyLongListModel.getSendMoneyLongKey(), new HttpCallback<String>() {
+                                @Override
+                                public void onSuccess(String data) {
+                                    ToastUtil.show(data);
+                                    LiveNetManager.get(mContext)
+                                            .sendMoneyLongList(mLiveUid, new HttpCallback<List<sendMoneyLongListModel>>() {
+                                                @Override
+                                                public void onSuccess(List<sendMoneyLongListModel> data) {
+                                                    dragonSendMoneyListAdapter.setMoneyLongListModels(data);
+                                                    send_money_list.getRecycledViewPool().setMaxRecycledViews(0, data.size());
+                                                    title.removeCallbacks(refreshRunnable);
+                                                    title.postDelayed(refreshRunnable, 1000);
+                                                }
 
-                                            @Override
-                                            public void onError(String error) {
-                                                ToastUtil.show(error);
-                                            }
-                                        });
-                            }
+                                                @Override
+                                                public void onError(String error) {
+                                                    ToastUtil.show(error);
+                                                }
+                                            });
+                                }
+
+                                @Override
+                                public void onError(String error) {
+                                    ToastUtil.show(error);
+                                }
+                            });
+                } else {
+                    ToastUtil.show(WordUtil.isNewZh() ? "關注主播後可參與活動" : "Follow the anchor can participate in the activity");
+                }
 
-                            @Override
-                            public void onError(String error) {
-                                ToastUtil.show(error);
-                            }
-                        });
             }
         });
         LiveNetManager.get(mContext)
@@ -127,13 +139,18 @@ public class DragonSendMoneyListPopup extends AbsDialogPopupWindow {
             List<sendMoneyLongListModel> moneyLongListModels = dragonSendMoneyListAdapter.getMoneyLongListModels();
             List<sendMoneyLongListModel> models = new ArrayList<>();
             for (sendMoneyLongListModel listModel : moneyLongListModels) {
-                String countdown = listModel.getCountdown();
-                long countdownNumber = Long.parseLong(countdown);
-                countdownNumber = countdownNumber - 1;
-                if (countdownNumber > 0) {
-                    listModel.setCountdown(String.valueOf(countdownNumber));
+                if (TextUtils.equals("0", listModel.getParticipate())) {
                     models.add(listModel);
+                } else {
+                    String countdown = listModel.getCountdown();
+                    long countdownNumber = Long.parseLong(countdown);
+                    countdownNumber = countdownNumber - 1;
+                    if (countdownNumber > 0) {
+                        listModel.setCountdown(String.valueOf(countdownNumber));
+                        models.add(listModel);
+                    }
                 }
+
             }
             dragonSendMoneyListAdapter.setMoneyLongListModels(models);
             title.postDelayed(refreshRunnable, 1000);
diff --git a/live/src/main/java/com/yunbao/live/dialog/DragonSendsMoneyPopup.java b/live/src/main/java/com/yunbao/live/dialog/DragonSendsMoneyPopup.java
index 1c4566119..d3f83f708 100644
--- a/live/src/main/java/com/yunbao/live/dialog/DragonSendsMoneyPopup.java
+++ b/live/src/main/java/com/yunbao/live/dialog/DragonSendsMoneyPopup.java
@@ -67,19 +67,24 @@ public class DragonSendsMoneyPopup extends CenterPopupView {
                 if (!TextUtils.isEmpty(dragonMoney)) {
                     long money = Long.parseLong(dragonMoney);
                     if (goldMoney > money) {
-                        LiveNetManager.get(getContext())
-                                .sendMoneyLong(mLiveUid, String.valueOf(money), new com.yunbao.common.http.base.HttpCallback<String>() {
-                                    @Override
-                                    public void onSuccess(String data) {
-                                        dismiss();
+                        if (money >= 1000) {
+                            LiveNetManager.get(getContext())
+                                    .sendMoneyLong(mLiveUid, String.valueOf(money), new com.yunbao.common.http.base.HttpCallback<String>() {
+                                        @Override
+                                        public void onSuccess(String data) {
+                                            dismiss();
 
-                                    }
+                                        }
+
+                                        @Override
+                                        public void onError(String error) {
+                                            ToastUtil.show(error);
+                                        }
+                                    });
+                        } else {
+                            ToastUtil.show(WordUtil.isNewZh() ? "金豆數量不低於1000" : "The number of golden beans is not less than 1000");
+                        }
 
-                                    @Override
-                                    public void onError(String error) {
-                                        ToastUtil.show(error);
-                                    }
-                                });
                     } else {
                         ToastUtil.show(WordUtil.isNewZh() ? "輸入數量不能大於自己的金豆總數量" : "The input quantity cannot be greater than the total number of gold beans");
                     }
diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveBuyGuardDialog.java b/live/src/main/java/com/yunbao/live/dialog/LiveBuyGuardDialog.java
index 91f47433b..073e8f2dc 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveBuyGuardDialog.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveBuyGuardDialog.java
@@ -31,6 +31,7 @@ import com.yunbao.common.adapter.LiveBuyGuardPrivilegeAdapter;
 import com.yunbao.common.bean.CheckUpgradesModel;
 import com.yunbao.common.bean.GuardDataTipModel;
 import com.yunbao.common.bean.GuardGetGuardOpenInfoModel;
+import com.yunbao.common.bean.GuardGetGuardUserInfoModel;
 import com.yunbao.common.bean.GuardPriceModel;
 import com.yunbao.common.dialog.AbsDialogPopupWindow;
 import com.yunbao.common.dialog.GuardBuyTipsDialog;
@@ -74,12 +75,14 @@ public class LiveBuyGuardDialog extends AbsDialogPopupWindow {
     LiveBuyGuardPrivilegeAdapter buyGuardPrivilegeAdapter;
     List<String> guardPrivilegeStrings = new ArrayList<>();
     GuardDataTipModel dataTipModel;
+    GuardGetGuardUserInfoModel mGuardUserInfoModel;
 
-    public LiveBuyGuardDialog(@NonNull Context context, String liveUid, String stream) {
+    public LiveBuyGuardDialog(@NonNull Context context, String liveUid, String stream, GuardGetGuardUserInfoModel guardUserInfoModel) {
         super(context);
         activity = (FragmentActivity) context;
         mLiveUid = liveUid;
         mStream = stream;
+        mGuardUserInfoModel = guardUserInfoModel;
     }
 
     @Override
@@ -145,6 +148,18 @@ public class LiveBuyGuardDialog extends AbsDialogPopupWindow {
                 buyGuardBanner.setBannerData(R.layout.banner_item_buy_guard, buyGuardBannerModels);
                 buyGuardBanner.setIsClipChildrenMode(true);
                 guardPrivilegeStrings = data.getGuardData().get(0).getGuardPrivilege();
+                buyGuardBanner.postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        if (mGuardUserInfoModel != null) {
+                            if (mGuardUserInfoModel.getGuardType()!=0){
+                                buyGuardBanner.setBannerCurrentItem(mGuardUserInfoModel.getGuardType() - 1);
+                            }
+
+                        }
+                    }
+                }, 500);
+
 
             }
 
@@ -246,6 +261,7 @@ public class LiveBuyGuardDialog extends AbsDialogPopupWindow {
 
             }
         });
+
         ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.guard_month_linear), new ViewClicksAntiShake.ViewClicksCallBack() {
             @Override
             public void onViewClicks() {
@@ -316,7 +332,8 @@ public class LiveBuyGuardDialog extends AbsDialogPopupWindow {
                 GuardBuyTipsDialog
                         .showBuyOrRenewDialog(mContext,
                                 discountPrice.getText().toString(),
-                                dataTipModel.getGuardName(), dataTipModel.isOpen(),new DialogUitl.SimpleCallback2() {
+                                dataTipModel.getGuardName(), dataTipModel.isOpen(),
+                                mGuardUserInfoModel, dataTipModel.getGuardType(), new DialogUitl.SimpleCallback2() {
                                     @Override
                                     public void onCancelClick() {
                                         dismiss();
@@ -333,7 +350,7 @@ public class LiveBuyGuardDialog extends AbsDialogPopupWindow {
                                                             public void onSuccess(String data) {
                                                                 ToastUtil.show(data);
                                                                 dismiss();
-                                                                if (dataTipModel.getGuardType()==3){
+                                                                if (dataTipModel.getGuardType() == 3) {
                                                                     new XPopup.Builder(mContext)
                                                                             .asCustom(new DragonSendsMoneyPopup(mContext, mLiveUid))
                                                                             .show();
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 1e7e465ec..57a89ba6f 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveGuardDialog.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveGuardDialog.java
@@ -3,6 +3,7 @@ package com.yunbao.live.dialog;
 import android.content.Context;
 import android.text.TextUtils;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -27,6 +28,7 @@ import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.http.LiveHttpUtil;
 import com.yunbao.common.http.live.LiveNetManager;
 import com.yunbao.common.utils.CommonIconUtil;
+import com.yunbao.common.utils.DpUtil;
 import com.yunbao.common.utils.TimeUtils;
 import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.utils.WordUtil;
@@ -60,6 +62,8 @@ public class LiveGuardDialog extends AbsDialogPopupWindow {
     TextView btnGuardOpen;
     TextView guard_hint;
     TextView guard_time;
+    View guardian_task_view;
+    GuardGetGuardUserInfoModel getGuardUserInfoModel = null;
 
     public LiveGuardDialog(@NonNull Context context, boolean isEmpty, String liveUid, String stream) {
         super(context);
@@ -88,6 +92,7 @@ public class LiveGuardDialog extends AbsDialogPopupWindow {
         guardingTheAnchor = findViewById(R.id.guarding_the_anchor);
         guard_time = findViewById(R.id.guard_time);
         guard_hint = findViewById(R.id.guard_hint);
+        guardian_task_view = findViewById(R.id.guardian_task_view);
 
         mRefreshView = findViewById(R.id.refreshView);
         mRefreshView.setLayoutManager(new LinearLayoutManager(mContext, LinearLayoutManager.VERTICAL, false));
@@ -102,6 +107,16 @@ public class LiveGuardDialog extends AbsDialogPopupWindow {
         guardIcon = findViewById(R.id.guard_imageView);
         giftSvga = findViewById(R.id.gift_svga);
         btnGuardOpen = findViewById(R.id.btn_guard_open);
+        if (WordUtil.isNewZh()) {
+            ViewGroup.LayoutParams layoutParams = guardian_task_view.getLayoutParams();
+            layoutParams.width = DpUtil.dp2px(50);
+            guardian_task_view.setLayoutParams(layoutParams);
+        } else {
+            ViewGroup.LayoutParams layoutParams = guardian_task_view.getLayoutParams();
+            layoutParams.width = DpUtil.dp2px(78);
+            guardian_task_view.setLayoutParams(layoutParams);
+
+        }
         mRefreshView.setDataHelper(new CommonRefreshView.DataHelper<GuardUserModel>() {
             @Override
             public RefreshAdapter<GuardUserModel> getAdapter() {
@@ -162,7 +177,7 @@ public class LiveGuardDialog extends AbsDialogPopupWindow {
             public void onViewClicks() {
                 MobclickAgent.onEvent(mContext, "guardian_renew_btn", "守护席开通守护/续费守护按钮点击次数及人数");
                 dismiss();
-                new LiveBuyGuardDialog(mContext, mLiveUid, mStream).showDialog();
+                new LiveBuyGuardDialog(mContext, mLiveUid, mStream, getGuardUserInfoModel).showDialog();
             }
         });
         //神龙送财
@@ -176,6 +191,7 @@ public class LiveGuardDialog extends AbsDialogPopupWindow {
         LiveNetManager.get(mContext).getGuardUserInfo(mLiveUid, new com.yunbao.common.http.base.HttpCallback<GuardGetGuardUserInfoModel>() {
             @Override
             public void onSuccess(GuardGetGuardUserInfoModel data) {
+                getGuardUserInfoModel = data;
                 if (data.getGuardType() == 0) {
                     guardianTask.setVisibility(GONE);
                     myGraudGrade.setVisibility(GONE);
@@ -213,7 +229,7 @@ public class LiveGuardDialog extends AbsDialogPopupWindow {
                     guard_time.setVisibility(GONE);
                 } else {
 
-                    guard_time.setText(String.format(WordUtil.getNewString(R.string.guardiandate), TimeUtils.getDateToString(data.getEndtime()*1000, "yyyy-MM-dd")));
+                    guard_time.setText(String.format(WordUtil.getNewString(R.string.guardiandate), TimeUtils.getDateToString(data.getEndtime() * 1000, "yyyy-MM-dd")));
                 }
 
             }
diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
index c38e78a66..404a7af30 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
@@ -165,7 +165,6 @@ import com.yunbao.live.bean.WishlistItemModel;
 import com.yunbao.live.custom.LiveLightView;
 import com.yunbao.live.custom.RightGradual;
 import com.yunbao.live.dialog.DragonSendMoneyListPopup;
-import com.yunbao.live.dialog.DragonSendsMoneyPopup;
 import com.yunbao.live.dialog.GiftWallDialog;
 import com.yunbao.live.dialog.LiveContactDetailsSendGiftDialog;
 import com.yunbao.live.dialog.LiveFaceUnityDialogFragment;
@@ -636,7 +635,6 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
         mLiveGiftAnimPresenter.showGifGift(liveReceiveGiftBean);
 
 
-
     }
 
     List<XydCompleteModel> xydCompleteModels = new ArrayList<>();
@@ -1596,7 +1594,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
         ViewClicksAntiShake.clicksAntiShake(dragonImmediateParticipation, new ViewClicksAntiShake.ViewClicksCallBack() {
             @Override
             public void onViewClicks() {
-                new DragonSendMoneyListPopup(mContext, mLiveUid, false).showDialog();
+                new DragonSendMoneyListPopup(mContext, mLiveUid, false, isAttention != 0).showDialog();
 //                new XPopup.Builder(mContext)
 //                        .asCustom(new GuardUpgradePopup(mContext, mLiveUid))
 //                        .show();
@@ -1612,7 +1610,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
         ViewClicksAntiShake.clicksAntiShake(dragonImmediateParticipationTime, new ViewClicksAntiShake.ViewClicksCallBack() {
             @Override
             public void onViewClicks() {
-                new DragonSendMoneyListPopup(mContext, mLiveUid, true).showDialog();
+                new DragonSendMoneyListPopup(mContext, mLiveUid, true, isAttention != 0).showDialog();
 //                new XPopup.Builder(mContext)
 //                        .asCustom(new GuardUpgradePopup(mContext, mLiveUid))
 //                        .show();
diff --git a/live/src/main/res/layout/dialog_live_guard.xml b/live/src/main/res/layout/dialog_live_guard.xml
index a858e9fdd..7139fa51a 100644
--- a/live/src/main/res/layout/dialog_live_guard.xml
+++ b/live/src/main/res/layout/dialog_live_guard.xml
@@ -92,7 +92,8 @@
                 android:textSize="12sp" />
 
             <View
-                android:layout_width="53dp"
+                android:id="@+id/guardian_task_view"
+                android:layout_width="50dp"
                 android:layout_height="1dp"
                 android:layout_gravity="bottom|center_horizontal"
                 android:background="#E8C7F9" />