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

update 6.5.5

Browse Source
This commit is contained in:
zlzw 2023-08-24 14:26:38 +08:00
parent 7f11195ede
commit cee1476ab1
4 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gradle.properties
View File

@ -21,6 +21,6 @@ android.enableJetifier=true
systemProp.http.proxyHost=127.0.0.1 systemProp.http.proxyHost=127.0.0.1
systemProp.https.proxyHost=127.0.0.1 systemProp.https.proxyHost=127.0.0.1
systemProp.https.proxyPort=10809 systemProp.https.proxyPort=7890
systemProp.http.proxyPort=10809 systemProp.http.proxyPort=7890
#android.enableR8.fullMode=true #android.enableR8.fullMode=true

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

@ -25,6 +25,7 @@ import com.yunbao.common.interfaces.CommonCallback;
import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.TimeUtils; import com.yunbao.common.utils.TimeUtils;
import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.weight.CircleProgress; 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;
@ -46,7 +47,7 @@ public class ReceiveRendPacketPopup extends CenterPopupView {
private ImageView isAttention; private ImageView isAttention;
private RedPacketInfoModel redPacketInfoModel; private RedPacketInfoModel redPacketInfoModel;
private boolean isSuperJackpot; private boolean isSuperJackpot;
private boolean isFans=false; private boolean isFans = false;
public ReceiveRendPacketPopup(@NonNull Context context, int time, String mLiveUid, String stream, public ReceiveRendPacketPopup(@NonNull Context context, int time, String mLiveUid, String stream,
String redPacketId, RedPacketInfoModel redPacketInfoModel, String redPacketId, RedPacketInfoModel redPacketInfoModel,
@ -61,7 +62,7 @@ public class ReceiveRendPacketPopup extends CenterPopupView {
this.redPacketId = redPacketId; this.redPacketId = redPacketId;
this.redPacketInfoModel = redPacketInfoModel; this.redPacketInfoModel = redPacketInfoModel;
this.isSuperJackpot = isSuperJackpot; this.isSuperJackpot = isSuperJackpot;
this.isFans=isFans; this.isFans = isFans;
} }
// 返回自定义弹窗的布局离开 // 返回自定义弹窗的布局离开
@ -98,10 +99,10 @@ public class ReceiveRendPacketPopup extends CenterPopupView {
} }
userID = redPacketInfoModel.getUserId(); userID = redPacketInfoModel.getUserId();
if(redPacketInfoModel.getIsFans()){ if (redPacketInfoModel.getIsFans()) {
ToastUtil.show("粉丝团红包"); if (!isFans) {
}else{ ToastUtil.show(R.string.live_rad_pack_join_fans_group_tip);
ToastUtil.show("普通红包"); }
} }
} }
@ -187,6 +188,10 @@ public class ReceiveRendPacketPopup extends CenterPopupView {
} }
}); });
} else { } else {
if (!isFans && redPacketInfoModel.getIsFans()) {
ToastUtil.show(R.string.live_rad_pack_join_fans_group_click_tip);
return;
}
if (TextUtils.equals(redPacketInfoModel.getConditions(), "1") && LiveAudienceActivity.isattention == 0) { if (TextUtils.equals(redPacketInfoModel.getConditions(), "1") && LiveAudienceActivity.isattention == 0) {
LiveRoomViewHolder.follow(); LiveRoomViewHolder.follow();
} }

2
live/src/main/res/values-en/strings.xml
View File

@ -115,4 +115,6 @@
<string name="live_fans_group_buy_buy">%s Diamond</string> <string name="live_fans_group_buy_buy">%s Diamond</string>
<string name="live_fans_group_enter_room">Welcome,Fan Club Members</string> <string name="live_fans_group_enter_room">Welcome,Fan Club Members</string>
<string name="live_fans_group_send_gift_tips">Fan group level Of Lv%s Can send this gift</string> <string name="live_fans_group_send_gift_tips">Fan group level Of Lv%s Can send this gift</string>
<string name="live_rad_pack_join_fans_group_tip">Join the fan group can be opened [Join]</string>
<string name="live_rad_pack_join_fans_group_click_tip">Join the fan group to open</string>
</resources> </resources>

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

@ -113,4 +113,6 @@
<string name="live_fans_group_buy_buy">%s鑽購買</string> <string name="live_fans_group_buy_buy">%s鑽購買</string>
<string name="live_fans_group_enter_room">粉絲團成員歡迎進房</string> <string name="live_fans_group_enter_room">粉絲團成員歡迎進房</string>
<string name="live_fans_group_send_gift_tips">粉絲團等級達到 Lv%s 可送出該禮物</string> <string name="live_fans_group_send_gift_tips">粉絲團等級達到 Lv%s 可送出該禮物</string>
<string name="live_rad_pack_join_fans_group_tip">加入粉絲團可開啟【加入】</string>
<string name="live_rad_pack_join_fans_group_click_tip">加入粉絲團可開啟</string>
</resources> </resources>