From 01093d39c5cc8d4a86f58d8c9536b5d85cf9a412 Mon Sep 17 00:00:00 2001
From: max <mxruan@163.com>
Date: Tue, 14 May 2024 15:30:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=8E=BB=E6=8E=89=E6=92=AD=E6=94=BE?=
 =?UTF-8?q?=E7=A4=BC=E7=89=A9=E7=89=B9=E6=95=88=E7=9A=84=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=EF=BC=88=E4=BB=B7=E5=80=BC=E5=A4=A7=E4=BA=8E?=
 =?UTF-8?q?520=E3=80=81=E7=89=B9=E6=95=88=E6=A0=87=E8=AF=86=EF=BC=89?=
 =?UTF-8?q?=EF=BC=8C=E6=94=B9=E4=B8=BA=E6=98=AF=E5=90=A6=E6=9C=89=E7=89=B9?=
 =?UTF-8?q?=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/chwl/app/avroom/widget/GiftV2View.java |  4 ++--
 .../main/java/com/chwl/core/gift/bean/GiftInfo.java | 13 +++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

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