yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

送福袋礼物不弹出赠送横幅

Browse Source
This commit is contained in:
oujunhui
2020-08-20 11:30:58 +08:00
parent 4f81a47abd
commit 359bbe5697
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/yizhuan/erban/avroom/widget/GiftEffectView.java
View File

@@ -121,7 +121,7 @@ public class GiftEffectView extends RelativeLayout implements SVGACallback {
} }
if (giftInfo != null) { if (giftInfo != null) {
int totalCoin = giftInfo.getGoldPrice() * giftEffectInfo.getGiftNum() * giftEffectInfo.getTargetUsers().size(); int totalCoin = giftInfo.getGoldPrice() * giftEffectInfo.getGiftNum() * giftEffectInfo.getTargetUsers().size();
if (totalCoin >= 520) {//礼物栏 if (totalCoin >= 520 && giftEffectInfo.getGiftReceiveType() != GiftEffectInfo.GIFT_RECEIVE_TYPE_LUCKY) {//礼物栏
ImageLoadUtils.loadImage(benefactorAvatar.getContext(), giftEffectInfo.getAvatar(), benefactorAvatar); ImageLoadUtils.loadImage(benefactorAvatar.getContext(), giftEffectInfo.getAvatar(), benefactorAvatar);
ImageLoadUtils.loadImage(giftImg.getContext(), giftInfo.getGiftUrl(), giftImg); ImageLoadUtils.loadImage(giftImg.getContext(), giftInfo.getGiftUrl(), giftImg);
benefactorNick.setText(giftEffectInfo.getNick()); benefactorNick.setText(giftEffectInfo.getNick());

2
app/src/main/java/com/yizhuan/erban/avroom/widget/GiftV2View.java
View File

@@ -458,7 +458,7 @@ public class GiftV2View extends FrameLayout implements GiftEffectView.GiftEffect
giftReceiveInfo.setGiftValueVos(giftMultiReceiverInfo.getGiftValueVos()); giftReceiveInfo.setGiftValueVos(giftMultiReceiverInfo.getGiftValueVos());
giftReceiveInfo.setCurrentTime(giftMultiReceiverInfo.getCurrentTime()); giftReceiveInfo.setCurrentTime(giftMultiReceiverInfo.getCurrentTime());
// giftReceiveInfos.add(giftReceiveInfo); // giftReceiveInfos.add(giftReceiveInfo);
drawLuckyGift(giftReceiveInfo, GiftEffectInfo.GIFT_RECEIVE_TYPE_MULTI,giftMultiReceiverInfo.isShowAnimation()); drawLuckyGift(giftReceiveInfo, GiftEffectInfo.GIFT_RECEIVE_TYPE_LUCKY,giftMultiReceiverInfo.isShowAnimation());
} }
} }

1
core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftEffectInfo.java
View File

@@ -14,6 +14,7 @@ public class GiftEffectInfo implements Serializable {
public final static int GIFT_RECEIVE_TYPE_SINGLE = 1;////送礼物的类型单人 public final static int GIFT_RECEIVE_TYPE_SINGLE = 1;////送礼物的类型单人
public final static int GIFT_RECEIVE_TYPE_MULTI = 2;//送礼物的类型多人 public final static int GIFT_RECEIVE_TYPE_MULTI = 2;//送礼物的类型多人
public final static int GIFT_RECEIVE_TYPE_ALL = 3;//送礼物的类型全麦 public final static int GIFT_RECEIVE_TYPE_ALL = 3;//送礼物的类型全麦
public final static int GIFT_RECEIVE_TYPE_LUCKY = 4;//福袋礼物
private long uid; private long uid;
private String nick; private String nick;