From 7226add4829eb3fee34dedfbb9fafddb57a105a6 Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Tue, 15 Aug 2023 11:29:39 +0800
Subject: [PATCH] =?UTF-8?q?6.5.4=E7=A4=BC=E7=89=A9=E5=86=A0=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yunbao/common/bean/GiftWallGiftDetail.java  |  6 +++---
 config.gradle                                       |  4 ++--
 .../com/yunbao/live/dialog/GiftWallItemPopup.java   |  4 ++--
 .../com/yunbao/live/views/FrameGiftViewHolder.java  | 13 ++++++-------
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/common/src/main/java/com/yunbao/common/bean/GiftWallGiftDetail.java b/common/src/main/java/com/yunbao/common/bean/GiftWallGiftDetail.java
index 7c069265f..35d6cf855 100644
--- a/common/src/main/java/com/yunbao/common/bean/GiftWallGiftDetail.java
+++ b/common/src/main/java/com/yunbao/common/bean/GiftWallGiftDetail.java
@@ -11,7 +11,7 @@ public class GiftWallGiftDetail extends BaseModel {
     @SerializedName("avatar")
     private String avatar;
     @SerializedName("naming_coin")
-    private int namingCoin;
+    private String namingCoin;
 
     public int getUid() {
         return uid;
@@ -40,11 +40,11 @@ public class GiftWallGiftDetail extends BaseModel {
         return this;
     }
 
-    public int getNamingCoin() {
+    public String getNamingCoin() {
         return namingCoin;
     }
 
-    public GiftWallGiftDetail setNamingCoin(int namingCoin) {
+    public GiftWallGiftDetail setNamingCoin(String namingCoin) {
         this.namingCoin = namingCoin;
         return this;
     }
diff --git a/config.gradle b/config.gradle
index 16ea83058..04f3e33df 100644
--- a/config.gradle
+++ b/config.gradle
@@ -9,9 +9,9 @@ ext {
     ]
     manifestPlaceholders = [
             //正式、
-            serverHost       : "https://napi.yaoulive.com",
+//            serverHost       : "https://napi.yaoulive.com",
 //            测试
-//            serverHost       : "https://ceshi.yaoulive.com",
+            serverHost       : "https://ceshi.yaoulive.com",
 
 
 
diff --git a/live/src/main/java/com/yunbao/live/dialog/GiftWallItemPopup.java b/live/src/main/java/com/yunbao/live/dialog/GiftWallItemPopup.java
index 6da7e16ba..f9dbe6165 100644
--- a/live/src/main/java/com/yunbao/live/dialog/GiftWallItemPopup.java
+++ b/live/src/main/java/com/yunbao/live/dialog/GiftWallItemPopup.java
@@ -74,7 +74,7 @@ public class GiftWallItemPopup extends CenterPopupView {
             giftDetailsBtn.setBackgroundResource(R.drawable.background_skip_button);
             giftDetailsBtn.setEnabled(true);
             giftDetailsBtn.setTextColor(Color.parseColor("#F16D00"));
-        }else {
+        } else {
             giftDetailsBtn.setBackgroundResource(R.drawable.background_skip_unselect_button);
             giftDetailsBtn.setEnabled(false);
             giftDetailsBtn.setTextColor(Color.parseColor("#F2F2F2"));
@@ -112,7 +112,7 @@ public class GiftWallItemPopup extends CenterPopupView {
                             vacantPositionAwaits.setText(data.getUserNicename());
                             vacantPosition.setText(giftWallModel.getGiftname());
                         }
-                        if (data.getNamingCoin() == 0) {
+                        if (TextUtils.isEmpty(data.getNamingCoin()) || TextUtils.equals(data.getNamingCoin(), "0")) {
                             distanceNaming.setVisibility(GONE);
                         } else {
                             distanceNaming.setVisibility(VISIBLE);
diff --git a/live/src/main/java/com/yunbao/live/views/FrameGiftViewHolder.java b/live/src/main/java/com/yunbao/live/views/FrameGiftViewHolder.java
index e89387d4e..e67b1baef 100644
--- a/live/src/main/java/com/yunbao/live/views/FrameGiftViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/FrameGiftViewHolder.java
@@ -2,7 +2,6 @@ package com.yunbao.live.views;
 
 import android.content.Context;
 import android.graphics.Color;
-import android.text.TextUtils;
 import android.util.TypedValue;
 import android.view.View;
 import android.view.animation.AccelerateDecelerateInterpolator;
@@ -74,7 +73,7 @@ public class FrameGiftViewHolder extends RecyclerView.ViewHolder {
                 } else {
                     giftHeight = contextLayoutGiftHeight;
                 }
-                linearParams.height = (giftHeight-30) / 2;
+                linearParams.height = (giftHeight - 30) / 2;
                 itemView.setLayoutParams(linearParams);
             }
         });
@@ -84,11 +83,11 @@ public class FrameGiftViewHolder extends RecyclerView.ViewHolder {
         }
         ImgLoader.display(mContext, model.getIcon(), giftIcon);
         ImgLoader.display(mContext, model.getCornerMark(), cornerMark);
-        if (!TextUtils.equals(model.getNamingLiveuid(), "0") && !TextUtils.equals(model.getNamingUid(), "0")) {
-            giftName.setText(model.getNamingUserName());
-        } else {
-            giftName.setText(model.getName());
-        }
+//        if (!TextUtils.equals(model.getNamingLiveuid(), "0") && !TextUtils.equals(model.getNamingUid(), "0")) {
+//            giftName.setText(model.getNamingUserName());
+//        } else {
+        giftName.setText(model.getName());
+//        }
 
         //特殊礼物红包
         if (model.getType() == 9999999) {