diff --git a/gradle.properties b/gradle.properties index e850a38e3..3265ac671 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,6 +21,6 @@ android.enableJetifier=true systemProp.http.proxyHost=127.0.0.1 systemProp.https.proxyHost=127.0.0.1 -systemProp.https.proxyPort=10809 -systemProp.http.proxyPort=10809 +systemProp.https.proxyPort=7890 +systemProp.http.proxyPort=7890 #android.enableR8.fullMode=true \ No newline at end of file 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 fc6da76a3..f71ff4532 100644 --- a/live/src/main/java/com/yunbao/live/dialog/ReceiveRendPacketPopup.java +++ b/live/src/main/java/com/yunbao/live/dialog/ReceiveRendPacketPopup.java @@ -25,6 +25,7 @@ import com.yunbao.common.interfaces.CommonCallback; import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.utils.TimeUtils; 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.ClipPathCircleImage; import com.yunbao.common.views.weight.ViewClicksAntiShake; @@ -46,7 +47,7 @@ public class ReceiveRendPacketPopup extends CenterPopupView { private ImageView isAttention; private RedPacketInfoModel redPacketInfoModel; private boolean isSuperJackpot; - private boolean isFans=false; + private boolean isFans = false; public ReceiveRendPacketPopup(@NonNull Context context, int time, String mLiveUid, String stream, String redPacketId, RedPacketInfoModel redPacketInfoModel, @@ -61,7 +62,7 @@ public class ReceiveRendPacketPopup extends CenterPopupView { this.redPacketId = redPacketId; this.redPacketInfoModel = redPacketInfoModel; this.isSuperJackpot = isSuperJackpot; - this.isFans=isFans; + this.isFans = isFans; } // 返回自定义弹窗的布局离开 @@ -98,10 +99,10 @@ public class ReceiveRendPacketPopup extends CenterPopupView { } userID = redPacketInfoModel.getUserId(); - if(redPacketInfoModel.getIsFans()){ - ToastUtil.show("粉丝团红包"); - }else{ - ToastUtil.show("普通红包"); + if (redPacketInfoModel.getIsFans()) { + if (!isFans) { + ToastUtil.show(R.string.live_rad_pack_join_fans_group_tip); + } } } @@ -187,6 +188,10 @@ public class ReceiveRendPacketPopup extends CenterPopupView { } }); } 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) { LiveRoomViewHolder.follow(); } diff --git a/live/src/main/res/values-en/strings.xml b/live/src/main/res/values-en/strings.xml index 35b74993a..f7a06979e 100644 --- a/live/src/main/res/values-en/strings.xml +++ b/live/src/main/res/values-en/strings.xml @@ -115,4 +115,6 @@ %s Diamond Welcome,Fan Club Members Fan group level Of Lv%s Can send this gift + Join the fan group can be opened [Join] + Join the fan group to open \ No newline at end of file diff --git a/live/src/main/res/values/strings.xml b/live/src/main/res/values/strings.xml index 0fcc61a5b..6032e4436 100644 --- a/live/src/main/res/values/strings.xml +++ b/live/src/main/res/values/strings.xml @@ -113,4 +113,6 @@ %s鑽購買 粉絲團成員歡迎進房 粉絲團等級達到 Lv%s 可送出該禮物 + 加入粉絲團可開啟【加入】 + 加入粉絲團可開啟