From a22040885305442d3ca9907367adae9e2a79ecfa Mon Sep 17 00:00:00 2001
From: ningwenqiang <gongduoxiang@163.com>
Date: Tue, 22 Oct 2024 18:21:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=95=B0=E6=8D=AE=20?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=9A=84=E5=9B=BE=E6=A0=87=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yunbao/common/bean/SendFreeGiftBean.java  | 32 -------------------
 .../com/yunbao/common/http/PDLiveApi.java     |  2 +-
 .../res/layout/dialog_live_interaction.xml    |  8 ++---
 .../yunbao/live/dialog/LiveGiftPopup2.java    |  9 ++----
 4 files changed, 7 insertions(+), 44 deletions(-)
 delete mode 100644 common/src/main/java/com/yunbao/common/bean/SendFreeGiftBean.java

diff --git a/common/src/main/java/com/yunbao/common/bean/SendFreeGiftBean.java b/common/src/main/java/com/yunbao/common/bean/SendFreeGiftBean.java
deleted file mode 100644
index a3b87253b..000000000
--- a/common/src/main/java/com/yunbao/common/bean/SendFreeGiftBean.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.yunbao.common.bean;
-
-import com.google.gson.annotations.SerializedName;
-
-import java.util.List;
-
-public class SendFreeGiftBean  extends BaseModel{
-    //"code":0,"msg":"","info":[]},"msg":""
-    @SerializedName("code")
-    private int code;
-    @SerializedName("msg")
-    private String msg;
-
-
-    public int getCode() {
-        return code;
-    }
-
-    public void setCode(int code) {
-        this.code = code;
-    }
-
-    public String getMsg() {
-        return msg;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
-    }
-
-
-}
diff --git a/common/src/main/java/com/yunbao/common/http/PDLiveApi.java b/common/src/main/java/com/yunbao/common/http/PDLiveApi.java
index cf984ecbc..75e75eb77 100644
--- a/common/src/main/java/com/yunbao/common/http/PDLiveApi.java
+++ b/common/src/main/java/com/yunbao/common/http/PDLiveApi.java
@@ -222,7 +222,7 @@ public interface PDLiveApi {
      * @param liveuid 直播间id
      */
     @GET("/api/public/?service=Tasknew.sendFreeGift")
-    Observable<ResponseModel<SendFreeGiftBean>> sendFreeGift(@Query("liveuid") String liveuid);
+    Observable<ResponseModel<List<BaseModel>>> sendFreeGift(@Query("liveuid") String liveuid);
 
     /**
      * 清除系统消息的未读数
diff --git a/common/src/main/res/layout/dialog_live_interaction.xml b/common/src/main/res/layout/dialog_live_interaction.xml
index f596d478b..b4610918b 100644
--- a/common/src/main/res/layout/dialog_live_interaction.xml
+++ b/common/src/main/res/layout/dialog_live_interaction.xml
@@ -211,8 +211,8 @@
                 android:orientation="vertical">
 
                 <ImageView
-                    android:layout_width="50dp"
-                    android:layout_height="50dp"
+                    android:layout_width="31dp"
+                    android:layout_height="40dp"
                     android:src="@mipmap/icon_interaction_live_data" />
 
                 <TextView
@@ -234,8 +234,8 @@
                 android:orientation="vertical">
 
                 <ImageView
-                    android:layout_width="50dp"
-                    android:layout_height="50dp"
+                    android:layout_width="31dp"
+                    android:layout_height="40dp"
                     android:src="@mipmap/icon_interaction_robot" />
 
                 <TextView
diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup2.java b/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup2.java
index a23399c0c..590049715 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup2.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup2.java
@@ -17,17 +17,14 @@ import android.text.TextUtils;
 import android.text.style.ForegroundColorSpan;
 import android.util.Log;
 import android.view.Gravity;
-import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.ViewTreeObserver;
 import android.view.Window;
 import android.view.WindowManager;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 
 import android.widget.ProgressBar;
-import android.widget.RadioButton;
 import android.widget.TextView;
 
 import androidx.core.content.ContextCompat;
@@ -86,7 +83,6 @@ import com.yunbao.live.activity.LiveActivity;
 import com.yunbao.live.activity.LiveAudienceActivity;
 import com.yunbao.live.adapter.FrameGiftNewAdapter;
 import com.yunbao.live.adapter.GiftTitleAdapter;
-import com.yunbao.live.adapter.LiveGiftFragmentPagerAdapter;
 import com.yunbao.live.bean.CoinModel;
 import com.yunbao.live.bean.GiftTopBean;
 import com.yunbao.live.bean.LiveGuardInfo;
@@ -94,7 +90,6 @@ import com.yunbao.live.event.GiftTitleEvent;
 import com.yunbao.live.event.LiveAudienceEvent;
 import com.yunbao.live.event.LiveGiftItemEvent;
 import com.yunbao.live.event.LiveParcelItemRefreshEvent;
-import com.yunbao.live.views.LiveGiftFragment;
 
 
 import org.greenrobot.eventbus.EventBus;
@@ -754,10 +749,10 @@ public class LiveGiftPopup2 extends AbsDialogFragment {
         }
         if (liveGiftModel.getTag() != null) {
             if (mCount.equals("1")) {
-                API.get().pdLiveApi(mContext).sendFreeGift(mLiveUid).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(listResponseModel -> {
+                API.get().pdLiveApi(mContext).sendFreeGift(mLiveUid).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe( listResponseModel -> {
                     EventBus.getDefault().post("stop_svga_new_user_gif");
                     EventBus.getDefault().post("stop_new_user_gif");
-                    if (listResponseModel.getData() != null && listResponseModel.getData().getCode() == 0) {
+                    if (listResponseModel.getData().getCode()==0) {
                         EventBus.getDefault().post("stop_new_user_gif1");
                     }
                     dismiss();