yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复

Browse Source
This commit is contained in:
18401019693 2023-07-11 10:13:29 +08:00
parent 1d447b0a90
commit e786ae16c2
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/res/values-en-rUS/string.xml
View File

@ -327,7 +327,7 @@
<string name="live_send_gift_2">Pieces</string> <string name="live_send_gift_2">Pieces</string>
<string name="live_send_gift_3">I sent one.</string> <string name="live_send_gift_3">I sent one.</string>
<string name="live_gift_send">Give</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_2">x</string>
<string name="live_gift_send_lian_3">Sending x</string> <string name="live_gift_send_lian_3">Sending x</string>
<string name="live_liang">Pretty</string> <string name="live_liang">Pretty</string>

2
common/src/main/res/values/strings.xml
View File

@ -327,7 +327,7 @@
<string name="live_send_gift_2">Pieces</string> <string name="live_send_gift_2">Pieces</string>
<string name="live_send_gift_3">I sent one.</string> <string name="live_send_gift_3">I sent one.</string>
<string name="live_gift_send">Give</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_2">x</string>
<string name="live_gift_send_lian_3">Sending x</string> <string name="live_gift_send_lian_3">Sending x</string>
<string name="live_liang">Pretty</string> <string name="live_liang">Pretty</string>

3
live/src/main/java/com/yunbao/live/dialog/ReceiveRendPacketPopup.java
View File

@ -29,6 +29,7 @@ import com.yunbao.common.views.weight.CircleProgress;
import com.yunbao.common.views.weight.ClipPathCircleImage; import com.yunbao.common.views.weight.ClipPathCircleImage;
import com.yunbao.common.views.weight.ViewClicksAntiShake; import com.yunbao.common.views.weight.ViewClicksAntiShake;
import com.yunbao.live.R; import com.yunbao.live.R;
import com.yunbao.live.activity.LiveAudienceActivity;
import com.yunbao.live.adapter.RedPacketGiftAdapter; import com.yunbao.live.adapter.RedPacketGiftAdapter;
import com.yunbao.live.views.LiveRoomViewHolder; import com.yunbao.live.views.LiveRoomViewHolder;
@ -178,7 +179,7 @@ public class ReceiveRendPacketPopup extends CenterPopupView {
} }
}); });
} else { } else {
if (TextUtils.equals(redPacketInfoModel.getConditions(), "1")) { if (TextUtils.equals(redPacketInfoModel.getConditions(), "1") && LiveAudienceActivity.isattention == 0) {
LiveRoomViewHolder.follow(); LiveRoomViewHolder.follow();
} }

2
live/src/main/java/com/yunbao/live/dialog/SendRendPacketPopup.java
View File

@ -200,7 +200,7 @@ public class SendRendPacketPopup extends CenterPopupView {
conditions, new HttpCallback<String>() { conditions, new HttpCallback<String>() {
@Override @Override
public void onSuccess(String data) { public void onSuccess(String data) {
ToastUtil.show(R.string.red_envelope_released_successfully); ToastUtil.show(getContext().getString(R.string.red_envelope_released_successfully));
dismiss(); dismiss();
} }