update 6.5.5
This commit is contained in:
parent
7f11195ede
commit
cee1476ab1
@ -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
|
@ -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;
|
||||
@ -99,9 +100,9 @@ public class ReceiveRendPacketPopup extends CenterPopupView {
|
||||
|
||||
userID = redPacketInfoModel.getUserId();
|
||||
if (redPacketInfoModel.getIsFans()) {
|
||||
ToastUtil.show("粉丝团红包");
|
||||
}else{
|
||||
ToastUtil.show("普通红包");
|
||||
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();
|
||||
}
|
||||
|
@ -115,4 +115,6 @@
|
||||
<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_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>
|
@ -113,4 +113,6 @@
|
||||
<string name="live_fans_group_buy_buy">%s鑽購買</string>
|
||||
<string name="live_fans_group_enter_room">粉絲團成員歡迎進房</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>
|
||||
|
Loading…
Reference in New Issue
Block a user