From 613185db40a4bceb1043ce67deb6fdb241b106ee Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Tue, 4 Jul 2023 16:36:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BA=A2=E5=8C=85=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/layout/item_red_packet.xml   | 14 +++--
 .../main/res/layout/item_user_red_packet.xml  | 52 +++++++++++--------
 .../live/views/PortraitLiveManager.java       |  8 +--
 .../adapter/RedPacketListRecyclerAdapter.java |  2 +-
 4 files changed, 45 insertions(+), 31 deletions(-)

diff --git a/common/src/main/res/layout/item_red_packet.xml b/common/src/main/res/layout/item_red_packet.xml
index 130bb6199..0c50148ac 100644
--- a/common/src/main/res/layout/item_red_packet.xml
+++ b/common/src/main/res/layout/item_red_packet.xml
@@ -29,7 +29,13 @@
             android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="TextView"
+            android:ellipsize="marquee"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:marqueeRepeatLimit="marquee_forever"
+            android:maxEms="13"
+            android:singleLine="true"
+            android:text="攢人氣紅包 - 测试5.3版主播1的直播間123123123123"
             android:textColor="#000000"
             android:textSize="14sp" />
 
@@ -58,9 +64,9 @@
     <View
         android:layout_width="0dp"
         android:layout_height="1dp"
-        android:background="?android:attr/listDivider"
         android:layout_marginTop="5dp"
-        app:layout_constraintTop_toBottomOf="@+id/linearLayout"
+        android:background="?android:attr/listDivider"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="@+id/linearLayout" />
+        app:layout_constraintStart_toStartOf="@+id/linearLayout"
+        app:layout_constraintTop_toBottomOf="@+id/linearLayout" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/common/src/main/res/layout/item_user_red_packet.xml b/common/src/main/res/layout/item_user_red_packet.xml
index 3a11a1cd2..1b148d1fc 100644
--- a/common/src/main/res/layout/item_user_red_packet.xml
+++ b/common/src/main/res/layout/item_user_red_packet.xml
@@ -9,8 +9,8 @@
         android:id="@+id/avatar"
         android:layout_width="40dp"
         android:layout_height="40dp"
-        android:scaleType="centerCrop"
         android:layout_marginTop="10dp"
+        android:scaleType="centerCrop"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:riv_border_color="#FFFFFF"
@@ -18,16 +18,6 @@
         app:riv_oval="true" />
 
 
-
-    <ImageView
-        android:id="@+id/icon2"
-        android:layout_width="20dp"
-        android:layout_height="20dp"
-        app:layout_constraintEnd_toStartOf="@+id/money"
-        android:layout_marginEnd="2dp"
-        app:layout_constraintTop_toTopOf="@+id/money"
-        app:srcCompat="@mipmap/gold_coin" />
-
     <LinearLayout
         android:id="@+id/linearLayout"
         android:layout_width="wrap_content"
@@ -56,25 +46,41 @@
             android:textSize="12sp" />
     </LinearLayout>
 
-    <TextView
-        android:id="@+id/money"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="100dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
-        android:text="TextView"
-        android:textColor="#000000"
-        android:textSize="14sp"
-        android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:id="@+id/icon2"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:layout_marginEnd="2dp"
+            app:layout_constraintEnd_toStartOf="@+id/money"
+            app:layout_constraintTop_toTopOf="@+id/money"
+            app:srcCompat="@mipmap/gold_coin" />
+
+        <TextView
+            android:id="@+id/money"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:text="TextView"
+            android:textColor="#000000"
+            android:textSize="14sp"
+            android:textStyle="bold" />
+    </LinearLayout>
+
 
     <View
-        android:visibility="gone"
         android:layout_width="0dp"
         android:layout_height="1dp"
-        android:background="?android:attr/listDivider"
         android:layout_marginTop="5dp"
-        app:layout_constraintTop_toBottomOf="@+id/linearLayout"
+        android:background="?android:attr/listDivider"
+        android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="@+id/linearLayout" />
+        app:layout_constraintStart_toStartOf="@+id/linearLayout"
+        app:layout_constraintTop_toBottomOf="@+id/linearLayout" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
index d6d874917..5f32fae2e 100644
--- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
+++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
@@ -687,7 +687,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
 //                                    .setRedPacketQuantity(100)
 //                                    .setRedPacketRemain(6)
 //                                    .setCountdown(360));
-                        }else {
+                        } else {
                             mLiveRoomViewHolder.hindeRedPacket();
                         }
                     }
@@ -2051,12 +2051,14 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
             mLiveRoomViewHolder.blindBoxAllServerNotify(event);
         }
     }
-    public void redPacketManage(RedPacketModel redPacket)  {
+
+    public void redPacketManage(RedPacketModel redPacket) {
         if (mLiveRoomViewHolder != null) {
             mLiveRoomViewHolder.redPacketManage(redPacket);
         }
     }
-    public void setRedPacketInfoModel(RedPacketInfoModel redPacket)  {
+
+    public void setRedPacketInfoModel(RedPacketInfoModel redPacket) {
         if (mLiveRoomViewHolder != null) {
             mLiveRoomViewHolder.setRedPacketInfoModel(redPacket);
         }
diff --git a/main/src/main/java/com/yunbao/main/adapter/RedPacketListRecyclerAdapter.java b/main/src/main/java/com/yunbao/main/adapter/RedPacketListRecyclerAdapter.java
index 3dfa1bc92..8f56dd2dc 100644
--- a/main/src/main/java/com/yunbao/main/adapter/RedPacketListRecyclerAdapter.java
+++ b/main/src/main/java/com/yunbao/main/adapter/RedPacketListRecyclerAdapter.java
@@ -66,7 +66,7 @@ public class RedPacketListRecyclerAdapter extends RecyclerView.Adapter<RedPacket
 
         @SuppressLint("SetTextI18n")
         private void setData(RedPacketListBean bean) {
-            title.setText(bean.getLiveNicename()+"|"+bean.getId());
+            title.setText(bean.getLiveNicename());
             timer.setText(bean.getCreateTime());
             money.setText("-" + bean.getAmountDiamond());
             money.setTextColor(Color.parseColor("#000000"));