From e786ae16c22cfa6fa5f48c3b430f56ea16155f8b Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Tue, 11 Jul 2023 10:13:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/common/src/main/res/values-en-rUS/string.xml b/common/src/main/res/values-en-rUS/string.xml
index 98be91513..97bf9fc7d 100644
--- a/common/src/main/res/values-en-rUS/string.xml
+++ b/common/src/main/res/values-en-rUS/string.xml
@@ -327,7 +327,7 @@
     <string name="live_send_gift_2">Pieces</string>
     <string name="live_send_gift_3">I sent one.</string>
     <string name="live_gift_send">Give</string>
-    <string name="live_gift_send_lian">Continuous delivery</string>
+    <string name="live_gift_send_lian">Continuous</string>
     <string name="live_gift_send_lian_2">x</string>
     <string name="live_gift_send_lian_3">Sending x</string>
     <string name="live_liang">Pretty</string>
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index 60f31bd30..3822f159a 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -327,7 +327,7 @@
     <string name="live_send_gift_2">Pieces</string>
     <string name="live_send_gift_3">I sent one.</string>
     <string name="live_gift_send">Give</string>
-    <string name="live_gift_send_lian">Continuous delivery</string>
+    <string name="live_gift_send_lian">Continuous</string>
     <string name="live_gift_send_lian_2">x</string>
     <string name="live_gift_send_lian_3">Sending x</string>
     <string name="live_liang">Pretty</string>
diff --git a/live/src/main/java/com/yunbao/live/dialog/ReceiveRendPacketPopup.java b/live/src/main/java/com/yunbao/live/dialog/ReceiveRendPacketPopup.java
index c599db1af..4dbd9a207 100644
--- a/live/src/main/java/com/yunbao/live/dialog/ReceiveRendPacketPopup.java
+++ b/live/src/main/java/com/yunbao/live/dialog/ReceiveRendPacketPopup.java
@@ -29,6 +29,7 @@ import com.yunbao.common.views.weight.CircleProgress;
 import com.yunbao.common.views.weight.ClipPathCircleImage;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;
 import com.yunbao.live.R;
+import com.yunbao.live.activity.LiveAudienceActivity;
 import com.yunbao.live.adapter.RedPacketGiftAdapter;
 import com.yunbao.live.views.LiveRoomViewHolder;
 
@@ -178,7 +179,7 @@ public class ReceiveRendPacketPopup extends CenterPopupView {
                             }
                         });
             } else {
-                if (TextUtils.equals(redPacketInfoModel.getConditions(), "1")) {
+                if (TextUtils.equals(redPacketInfoModel.getConditions(), "1") && LiveAudienceActivity.isattention == 0) {
                     LiveRoomViewHolder.follow();
                 }
 
diff --git a/live/src/main/java/com/yunbao/live/dialog/SendRendPacketPopup.java b/live/src/main/java/com/yunbao/live/dialog/SendRendPacketPopup.java
index 558618776..74529d058 100644
--- a/live/src/main/java/com/yunbao/live/dialog/SendRendPacketPopup.java
+++ b/live/src/main/java/com/yunbao/live/dialog/SendRendPacketPopup.java
@@ -200,7 +200,7 @@ public class SendRendPacketPopup extends CenterPopupView {
                                     conditions, new HttpCallback<String>() {
                                         @Override
                                         public void onSuccess(String data) {
-                                            ToastUtil.show(R.string.red_envelope_released_successfully);
+                                            ToastUtil.show(getContext().getString(R.string.red_envelope_released_successfully));
                                             dismiss();
                                         }