From e32e6f95b0af5a26866adb94bdc2e54d310c5fbb Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Tue, 8 Aug 2023 17:09:35 +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

---
 .../common/views/DayWishItemViewHolder.java       |  9 ++++++---
 .../common/views/LunarWishItemViewHolder.java     |  9 ++++++---
 .../common/views/SeasonalWishItemViewHolder.java  |  9 ++++++---
 .../common/views/WeekWishItemViewHolder.java      |  9 ++++++---
 .../main/res/layout/dialog_live_gift_popup.xml    | 15 ++++++++++++---
 .../com/yunbao/live/views/LiveGiftViewHolder.java |  5 ++++-
 6 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/common/src/main/java/com/yunbao/common/views/DayWishItemViewHolder.java b/common/src/main/java/com/yunbao/common/views/DayWishItemViewHolder.java
index 335b71651..677c2d632 100644
--- a/common/src/main/java/com/yunbao/common/views/DayWishItemViewHolder.java
+++ b/common/src/main/java/com/yunbao/common/views/DayWishItemViewHolder.java
@@ -80,10 +80,13 @@ public class DayWishItemViewHolder extends RecyclerView.ViewHolder {
                 @Override
                 public void onViewClicks() {
                     int number = model.wishProgress();
-                    model.setWishlistNum(String.valueOf(number - 1));
-                    if (listener != null) {
-                        listener.onUpdate(model, index);
+                    if (number>1){
+                        model.setWishlistNum(String.valueOf(number - 1));
+                        if (listener != null) {
+                            listener.onUpdate(model, index);
+                        }
                     }
+
                 }
             });
         } else {
diff --git a/common/src/main/java/com/yunbao/common/views/LunarWishItemViewHolder.java b/common/src/main/java/com/yunbao/common/views/LunarWishItemViewHolder.java
index 756685745..01d3d65ea 100644
--- a/common/src/main/java/com/yunbao/common/views/LunarWishItemViewHolder.java
+++ b/common/src/main/java/com/yunbao/common/views/LunarWishItemViewHolder.java
@@ -77,10 +77,13 @@ public class LunarWishItemViewHolder extends RecyclerView.ViewHolder {
                 @Override
                 public void onViewClicks() {
                     int number = model.wishProgress();
-                    model.setWishlistNum(String.valueOf(number - 1));
-                    if (listener != null) {
-                        listener.onUpdate(model, index);
+                    if (number>1){
+                        model.setWishlistNum(String.valueOf(number - 1));
+                        if (listener != null) {
+                            listener.onUpdate(model, index);
+                        }
                     }
+
                 }
             });
         } else {
diff --git a/common/src/main/java/com/yunbao/common/views/SeasonalWishItemViewHolder.java b/common/src/main/java/com/yunbao/common/views/SeasonalWishItemViewHolder.java
index b0578cc45..be93e658d 100644
--- a/common/src/main/java/com/yunbao/common/views/SeasonalWishItemViewHolder.java
+++ b/common/src/main/java/com/yunbao/common/views/SeasonalWishItemViewHolder.java
@@ -77,10 +77,13 @@ public class SeasonalWishItemViewHolder extends RecyclerView.ViewHolder {
                 @Override
                 public void onViewClicks() {
                     int number = model.wishProgress();
-                    model.setWishlistNum(String.valueOf(number - 1));
-                    if (listener != null) {
-                        listener.onUpdate(model, index);
+                    if (number>1){
+                        model.setWishlistNum(String.valueOf(number - 1));
+                        if (listener != null) {
+                            listener.onUpdate(model, index);
+                        }
                     }
+
                 }
             });
         } else {
diff --git a/common/src/main/java/com/yunbao/common/views/WeekWishItemViewHolder.java b/common/src/main/java/com/yunbao/common/views/WeekWishItemViewHolder.java
index 422c2e304..63d1f533e 100644
--- a/common/src/main/java/com/yunbao/common/views/WeekWishItemViewHolder.java
+++ b/common/src/main/java/com/yunbao/common/views/WeekWishItemViewHolder.java
@@ -77,10 +77,13 @@ public class WeekWishItemViewHolder extends RecyclerView.ViewHolder {
                 @Override
                 public void onViewClicks() {
                     int number = model.wishProgress();
-                    model.setWishlistNum(String.valueOf(number - 1));
-                    if (listener != null) {
-                        listener.onUpdate(model, index);
+                    if (number>1){
+                        model.setWishlistNum(String.valueOf(number - 1));
+                        if (listener != null) {
+                            listener.onUpdate(model, index);
+                        }
                     }
+
                 }
             });
         } else {
diff --git a/common/src/main/res/layout/dialog_live_gift_popup.xml b/common/src/main/res/layout/dialog_live_gift_popup.xml
index e51c57a5d..66284053c 100644
--- a/common/src/main/res/layout/dialog_live_gift_popup.xml
+++ b/common/src/main/res/layout/dialog_live_gift_popup.xml
@@ -92,7 +92,7 @@
     <RelativeLayout
         android:id="@+id/gift_list"
         android:layout_width="match_parent"
-        android:layout_height="351dp"
+        android:layout_height="361dp"
         android:animateLayoutChanges="true"
         android:orientation="vertical">
 
@@ -157,14 +157,23 @@
                         android:progress="0"
                         android:progressDrawable="@drawable/progress_bg_user" />
 
-                    <TextView
+                    <com.yunbao.common.views.weight.MarqueeTextView
                         android:id="@+id/leave_hint"
-                        android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
                         android:layout_marginTop="2dp"
+                        android:ellipsize="marquee"
+                        android:focusable="true"
+                        android:focusableInTouchMode="true"
+                        android:gravity="center"
+                        android:marqueeRepeatLimit="marquee_forever"
+                        android:scrollHorizontally="true"
+                        android:singleLine="true"
                         android:text="@string/leveling_points"
                         android:textColor="#BBBBBB"
                         android:textSize="9sp" />
+
                 </LinearLayout>
 
                 <ImageView
diff --git a/live/src/main/java/com/yunbao/live/views/LiveGiftViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveGiftViewHolder.java
index a36e27ca8..8d5168ed4 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveGiftViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveGiftViewHolder.java
@@ -178,7 +178,10 @@ public class LiveGiftViewHolder extends AbsViewHolder {
             mGiftCount.setText(new LiveTextRender().renderGiftCount(mLianCount));
         }
         mLastGiftKey = bean.getKey();
-        if (!TextUtils.equals(bean.getNamingLiveuid(), "0") && !TextUtils.equals(bean.getNamingUid(), "0")) {
+        if (!TextUtils.isEmpty(bean.getNamingLiveuid()) &&
+                !TextUtils.isEmpty(bean.getNamingUid()) &&
+                !TextUtils.equals(bean.getNamingLiveuid(), "0") &&
+                !TextUtils.equals(bean.getNamingUid(), "0")) {
             root_back.setBackgroundResource(R.drawable.background_naming);
             findViewById(R.id.naming_icon).setVisibility(View.VISIBLE);
         } else {