From 250d4832a30eee801aeaf8b0211e45b9adae679d Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Sat, 13 Jul 2024 21:45:10 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E7=A4=BC=E7=89=A9=E5=A2=99=20?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adapter/GiftWallMainTab2ListAdapter.java  |   4 +-
 .../dialog_gift_wall_tab2_classic_info.xml    | 293 ++++++++++--------
 2 files changed, 165 insertions(+), 132 deletions(-)

diff --git a/common/src/main/java/com/yunbao/common/adapter/GiftWallMainTab2ListAdapter.java b/common/src/main/java/com/yunbao/common/adapter/GiftWallMainTab2ListAdapter.java
index 300b1619a..d355f4d35 100644
--- a/common/src/main/java/com/yunbao/common/adapter/GiftWallMainTab2ListAdapter.java
+++ b/common/src/main/java/com/yunbao/common/adapter/GiftWallMainTab2ListAdapter.java
@@ -142,8 +142,8 @@ public class GiftWallMainTab2ListAdapter extends RecyclerView.Adapter<GiftWallMa
                 imageView8.setVisibility(View.VISIBLE);
                 tv_wait.setVisibility(View.GONE);
                 gift_number.setText(String.format(Locale.getDefault(), "%d", giftData.getNeedCoinTotal()));
-                ImgLoader.display(mContext, giftData.getNamingLiveAvatar(), user1Avatar, 35, 35);
-                ImgLoader.display(mContext, giftData.getNamingUserAvatar(), user2Avatar, 35, 35);
+                //ImgLoader.display(mContext, giftData.getNamingLiveAvatar(), user1Avatar, 35, 35);
+               // ImgLoader.display(mContext, giftData.getNamingUserAvatar(), user2Avatar, 35, 35);
                 anchor_nickname.setText(giftData.getNamingLiveNicename());
                 user_nickname.setText(giftData.getNamingUserNicename());
                 ViewClicksAntiShake.clicksAntiShake(itemView, () -> {
diff --git a/common/src/main/res/layout/dialog_gift_wall_tab2_classic_info.xml b/common/src/main/res/layout/dialog_gift_wall_tab2_classic_info.xml
index 21f4d5955..5def1ed82 100644
--- a/common/src/main/res/layout/dialog_gift_wall_tab2_classic_info.xml
+++ b/common/src/main/res/layout/dialog_gift_wall_tab2_classic_info.xml
@@ -166,90 +166,101 @@
 
                 <LinearLayout
                     android:id="@+id/topLayout"
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="10dp"
-                    android:layout_marginEnd="10dp"
-                    android:gravity="bottom"
+                    android:layout_marginStart="8dp"
+                    android:layout_marginEnd="15dp"
+                    android:gravity="bottom|center"
                     android:orientation="horizontal"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/imageView7">
 
-                    <RelativeLayout
+                    <androidx.constraintlayout.widget.ConstraintLayout
                         android:id="@+id/two_layout"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="bottom">
+                        android:layout_weight="1">
 
                         <ImageView
                             android:id="@+id/imageView17"
-                            android:layout_width="match_parent"
+                            android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_alignParentBottom="true"
                             android:adjustViewBounds="true"
-                            android:scaleType="centerCrop"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
                             app:srcCompat="@mipmap/gift_wall_tab2_classic_info_bg_two" />
 
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentBottom="true"
-                            android:layout_marginEnd="10dp"
-                            android:gravity="center_horizontal"
-                            android:orientation="vertical">
-
-                            <androidx.constraintlayout.widget.ConstraintLayout
-                                android:id="@+id/userAvatar2Layout"
-                                android:layout_width="58dp"
-                                android:layout_height="58dp"
-                                android:layout_marginTop="41dp"
-                                android:background="@mipmap/gift_wall_tab2_classic_info_avatar1">
-
-                                <com.makeramen.roundedimageview.RoundedImageView
-                                    android:id="@+id/user_avatar_2"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginEnd="1dp"
-                                    android:src="@mipmap/icon_avatar_placeholder"
-                                    app:layout_constraintBottom_toBottomOf="parent"
-                                    app:layout_constraintEnd_toEndOf="parent"
-                                    app:layout_constraintStart_toStartOf="parent"
-                                    app:layout_constraintTop_toTopOf="parent"
-                                    app:riv_oval="true" />
-                            </androidx.constraintlayout.widget.ConstraintLayout>
+                        <androidx.constraintlayout.widget.ConstraintLayout
+                            android:id="@+id/userAvatar2Layout"
+                            android:layout_width="0dp"
+                            android:layout_height="0dp"
+                            android:layout_marginTop="40dp"
+                            android:layout_marginBottom="50dp"
+                            app:layout_constraintBottom_toBottomOf="@+id/user_name_2"
+                            app:layout_constraintEnd_toEndOf="@+id/imageView17"
+                            app:layout_constraintStart_toStartOf="@+id/imageView17"
+                            app:layout_constraintTop_toTopOf="@+id/imageView17">
 
                             <ImageView
-                                android:id="@+id/imageView12"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginBottom="5dp"
-                                app:srcCompat="@mipmap/gift_wall_tab2_classic_info_twwo" />
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                android:src="@mipmap/gift_wall_tab2_classic_info_avatar1"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                app:layout_constraintStart_toStartOf="parent"
+                                app:layout_constraintTop_toTopOf="parent" />
 
-                            <TextView
-                                android:id="@+id/user_name_2"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_above="@+id/user_value_2"
-                                android:ellipsize="end"
-                                android:gravity="center"
-                                android:maxLines="1"
-                                android:text="TextView"
-                                android:textColor="#FFFFFF"
-                                android:textSize="14sp" />
+                            <com.makeramen.roundedimageview.RoundedImageView
+                                android:id="@+id/user_avatar_2"
+                                android:layout_width="0dp"
+                                android:layout_height="0dp"
+                                android:src="@mipmap/icon_avatar_placeholder"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                app:layout_constraintStart_toStartOf="parent"
+                                app:layout_constraintTop_toTopOf="parent"
+                                app:riv_oval="true" />
+                        </androidx.constraintlayout.widget.ConstraintLayout>
 
-                            <TextView
-                                android:id="@+id/user_value_2"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_alignParentBottom="true"
-                                android:layout_marginBottom="5dp"
-                                android:text="TextView"
-                                android:textColor="#FFFFFF"
-                                android:textSize="20sp" />
+                        <ImageView
+                            android:id="@+id/imageView12"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            app:layout_constraintEnd_toEndOf="@+id/userAvatar2Layout"
+                            app:layout_constraintStart_toStartOf="@+id/userAvatar2Layout"
+                            app:layout_constraintTop_toBottomOf="@+id/userAvatar2Layout"
+                            app:srcCompat="@mipmap/gift_wall_tab2_classic_info_twwo" />
 
-                        </LinearLayout>
+                        <TextView
+                            android:id="@+id/user_name_2"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginEnd="10dp"
+                            android:ellipsize="end"
+                            android:gravity="center"
+                            android:maxLines="1"
+                            android:text="TextView"
+                            android:textColor="#FFFFFF"
+                            android:textSize="14sp"
+                            app:layout_constraintBottom_toTopOf="@+id/user_value_2"
+                            app:layout_constraintEnd_toEndOf="@+id/imageView17"
+                            app:layout_constraintStart_toStartOf="@+id/imageView17"/>
 
-                    </RelativeLayout>
+                        <TextView
+                            android:id="@+id/user_value_2"
+                            android:layout_width="wrap_content"
+                            android:layout_height="0dp"
+                            android:layout_marginBottom="5dp"
+                            android:text="TextView"
+                            android:textColor="#FFFFFF"
+                            android:textSize="20sp"
+                            app:layout_constraintBottom_toBottomOf="@+id/imageView17"
+                            app:layout_constraintEnd_toEndOf="@+id/user_name_2"
+                            app:layout_constraintStart_toStartOf="@+id/user_name_2" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
 
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:id="@+id/one_layout"
@@ -270,17 +281,28 @@
 
                         <androidx.constraintlayout.widget.ConstraintLayout
                             android:id="@+id/userAvatar1Layout"
-                            android:layout_width="70dp"
-                            android:layout_height="70dp"
-                            android:background="@mipmap/gift_wall_tab2_classic_info_avatar1"
-                            app:layout_constraintBottom_toTopOf="@+id/imageView11"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent">
+                            android:layout_width="0dp"
+                            android:layout_height="0dp"
+                            android:layout_marginTop="70dp"
+                            android:layout_marginBottom="90dp"
+                            app:layout_constraintBottom_toBottomOf="@+id/user_value_1"
+                            app:layout_constraintEnd_toEndOf="@+id/imageView9"
+                            app:layout_constraintStart_toStartOf="@+id/imageView9"
+                            app:layout_constraintTop_toTopOf="@+id/imageView9">
+
+                            <ImageView
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                android:src="@mipmap/gift_wall_tab2_classic_info_avatar1"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                app:layout_constraintStart_toStartOf="parent"
+                                app:layout_constraintTop_toTopOf="parent" />
 
                             <com.makeramen.roundedimageview.RoundedImageView
                                 android:id="@+id/user_avatar_1"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
+                                android:layout_width="0dp"
+                                android:layout_height="0dp"
                                 android:src="@mipmap/icon_avatar_placeholder"
                                 app:layout_constraintBottom_toBottomOf="parent"
                                 app:layout_constraintEnd_toEndOf="parent"
@@ -293,10 +315,9 @@
                             android:id="@+id/imageView11"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginBottom="10dp"
-                            app:layout_constraintBottom_toTopOf="@+id/user_name_1"
                             app:layout_constraintEnd_toEndOf="@+id/userAvatar1Layout"
                             app:layout_constraintStart_toStartOf="@+id/userAvatar1Layout"
+                            app:layout_constraintTop_toBottomOf="@+id/userAvatar1Layout"
                             app:srcCompat="@mipmap/gift_wall_tab2_classic_info_one" />
 
                         <TextView
@@ -329,78 +350,90 @@
 
                     </androidx.constraintlayout.widget.ConstraintLayout>
 
-                    <RelativeLayout
+                    <androidx.constraintlayout.widget.ConstraintLayout
                         android:id="@+id/three_layout"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginEnd="5dp"
                         android:layout_weight="1">
 
                         <ImageView
                             android:id="@+id/imageView16"
-                            android:layout_width="match_parent"
+                            android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_alignParentBottom="true"
                             android:adjustViewBounds="true"
-                            android:scaleType="centerCrop"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
                             app:srcCompat="@mipmap/gift_wall_tab2_classic_info_bg_three" />
 
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:paddingStart="10dp"
-                            android:layout_alignParentBottom="true"
-                            android:gravity="center_horizontal"
-                            android:orientation="vertical">
-
-                            <androidx.constraintlayout.widget.ConstraintLayout
-                                android:id="@+id/userAvatar3Layout"
-                                android:layout_width="44dp"
-                                android:layout_height="44dp"
-                                android:layout_marginTop="39dp"
-                                android:background="@mipmap/gift_wall_tab2_classic_info_avatar1">
-
-                                <com.makeramen.roundedimageview.RoundedImageView
-                                    android:id="@+id/user_avatar_3"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:src="@mipmap/icon_avatar_placeholder"
-                                    app:layout_constraintBottom_toBottomOf="parent"
-                                    app:layout_constraintEnd_toEndOf="parent"
-                                    app:layout_constraintStart_toStartOf="parent"
-                                    app:layout_constraintTop_toTopOf="parent"
-                                    app:riv_oval="true" />
-                            </androidx.constraintlayout.widget.ConstraintLayout>
+                        <androidx.constraintlayout.widget.ConstraintLayout
+                            android:id="@+id/userAvatar3Layout"
+                            android:layout_width="0dp"
+                            android:layout_height="0dp"
+                            android:layout_marginTop="45dp"
+                            android:layout_marginBottom="70dp"
+                            app:layout_constraintBottom_toBottomOf="@+id/user_value_3"
+                            app:layout_constraintEnd_toEndOf="@+id/imageView16"
+                            app:layout_constraintStart_toStartOf="@+id/imageView16"
+                            app:layout_constraintTop_toTopOf="@+id/imageView16">
 
                             <ImageView
-                                android:id="@+id/imageView13"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginBottom="3dp"
-                                app:srcCompat="@mipmap/gift_wall_tab2_classic_info_three" />
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                android:src="@mipmap/gift_wall_tab2_classic_info_avatar1"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                app:layout_constraintStart_toStartOf="parent"
+                                app:layout_constraintTop_toTopOf="parent" />
 
-                            <TextView
-                                android:id="@+id/user_name_3"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:ellipsize="end"
-                                android:gravity="center"
-                                android:maxLines="1"
-                                android:text="TextView"
-                                android:textColor="#FFFFFF"
-                                android:textSize="14sp" />
+                            <com.makeramen.roundedimageview.RoundedImageView
+                                android:id="@+id/user_avatar_3"
+                                android:layout_width="0dp"
+                                android:layout_height="0dp"
+                                android:src="@mipmap/icon_avatar_placeholder"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                app:layout_constraintStart_toStartOf="parent"
+                                app:layout_constraintTop_toTopOf="parent"
+                                app:riv_oval="true" />
+                        </androidx.constraintlayout.widget.ConstraintLayout>
 
-                            <TextView
-                                android:id="@+id/user_value_3"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginBottom="5dp"
-                                android:text="TextView"
-                                android:textColor="#FFFFFF"
-                                android:textSize="20sp" />
-                        </LinearLayout>
+                        <ImageView
+                            android:id="@+id/imageView13"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            app:layout_constraintEnd_toEndOf="@+id/userAvatar3Layout"
+                            app:layout_constraintStart_toStartOf="@+id/userAvatar3Layout"
+                            app:layout_constraintTop_toBottomOf="@+id/userAvatar3Layout"
+                            app:srcCompat="@mipmap/gift_wall_tab2_classic_info_three" />
 
-                    </RelativeLayout>
+                        <TextView
+                            android:id="@+id/user_name_3"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="10dp"
+                            android:ellipsize="end"
+                            android:gravity="center"
+                            android:maxLines="1"
+                            android:text="TextView"
+                            android:textColor="#FFFFFF"
+                            android:textSize="14sp"
+                            app:layout_constraintBottom_toTopOf="@+id/user_value_3"
+                            app:layout_constraintEnd_toEndOf="@+id/imageView16"
+                            app:layout_constraintStart_toStartOf="@+id/imageView16" />
+
+                        <TextView
+                            android:id="@+id/user_value_3"
+                            android:layout_width="wrap_content"
+                            android:layout_height="0dp"
+                            android:layout_marginBottom="5dp"
+                            android:text="TextView"
+                            android:textColor="#FFFFFF"
+                            android:textSize="20sp"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="@+id/user_name_3"
+                            app:layout_constraintStart_toStartOf="@+id/user_name_3" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
 
                 </LinearLayout>