diff --git a/app/src/main/java/com/chwl/app/avroom/widget/GiftV2View.java b/app/src/main/java/com/chwl/app/avroom/widget/GiftV2View.java index e21864a78..9f01f67a7 100644 --- a/app/src/main/java/com/chwl/app/avroom/widget/GiftV2View.java +++ b/app/src/main/java/com/chwl/app/avroom/widget/GiftV2View.java @@ -275,7 +275,7 @@ public class GiftV2View extends FrameLayout implements GiftEffectView.GiftEffect } GiftReceiveInfo giftReceiveInfo = giftReceiveInfos.get(0); GiftInfo giftInfo = giftReceiveInfo.getGift(); - if (totalCoin >= 520 || (giftInfo != null && giftInfo.isHasEffect())) { + if (giftInfo != null && giftInfo.isEffectGift()) { Message msg = Message.obtain(); msg.what = 0; GiftEffectInfo giftEffectInfo = new GiftEffectInfo(); @@ -364,7 +364,7 @@ public class GiftV2View extends FrameLayout implements GiftEffectView.GiftEffect targetUsers.add(giftReceiver); if (!isShowAnimation) return; giftInfo = giftReceiveInfo.getDisplayGift().get(pos); - if (giftInfo != null && giftInfo.isHasEffect()) { + if (giftInfo != null && giftInfo.isEffectGift()) { Message msg = Message.obtain(); msg.what = 0; GiftEffectInfo giftEffectInfo = new GiftEffectInfo(); diff --git a/core/src/main/java/com/chwl/core/gift/bean/GiftInfo.java b/core/src/main/java/com/chwl/core/gift/bean/GiftInfo.java index 0d24441e9..9002f3130 100644 --- a/core/src/main/java/com/chwl/core/gift/bean/GiftInfo.java +++ b/core/src/main/java/com/chwl/core/gift/bean/GiftInfo.java @@ -1,8 +1,12 @@ package com.chwl.core.gift.bean; +import android.text.TextUtils; + import com.google.gson.annotations.SerializedName; +import com.netease.nim.uikit.common.util.string.StringUtil; import java.io.Serializable; +import java.net.MalformedURLException; import lombok.Data; @@ -111,4 +115,13 @@ public class GiftInfo implements Serializable { mFreeGiftProgress = freeGiftProgress; } + + public boolean isEffectGift() { + if (getOtherViewType() == 1 && !TextUtils.isEmpty(getViewUrl())) { + return true; + } else if (isHasVggPic() && !StringUtil.isEmpty(getVggUrl())) { + return true; + } + return false; + } } \ No newline at end of file