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 @@
Pieces
I sent one.
Give
- Continuous delivery
+ Continuous
x
Sending x
Pretty
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 @@
Pieces
I sent one.
Give
- Continuous delivery
+ Continuous
x
Sending x
Pretty
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() {
@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();
}