From beace99a8026d5f8d8f04bc07afdd183e0b30ce4 Mon Sep 17 00:00:00 2001
From: ningwenqiang <gongduoxiang@163.com>
Date: Mon, 7 Oct 2024 17:16:29 +0800
Subject: [PATCH] =?UTF-8?q?oppo=E8=8B=B1=E6=96=87=E7=89=88=E5=AD=97?=
 =?UTF-8?q?=E6=8C=A1=E5=9B=BE=E6=A0=87=E8=B4=B5=E6=97=8F=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dialog/LiveUserMoreDialogFragment.java    |  5 +-
 .../main/res/layout/view_live_room_part2.xml  |  9 +-
 main/src/main/res/layout/view_main_me.xml     | 93 ++++++++-----------
 3 files changed, 48 insertions(+), 59 deletions(-)

diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveUserMoreDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveUserMoreDialogFragment.java
index 3efeed357..99024371e 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveUserMoreDialogFragment.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveUserMoreDialogFragment.java
@@ -384,21 +384,22 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie
         params.bottomMargin = DpUtil.dp2px(65);
         if(Tips.equals("1")){
             if (noble){
+                bottom_msg.setVisibility(View.GONE);
                 tags.setText(R.string.enjoy_a_lot);
                 btn.setBackgroundResource(R.mipmap.btn_openvip);
                 btn.setText(R.string.live_ktgz);
                 setTextColor(gz_view,audience_btn, guard_btn, fans_btn, weekRank, dayRank);
                 userMoreInfoAdapter.type = "1";
                 type = "guanzhong";
-                bottom_msg.setVisibility(View.GONE);
+
             }else {
+                bottom_msg.setVisibility(View.GONE);
                 tags.setText(R.string.enjoy_a_lot);
                 btn.setBackgroundResource(R.mipmap.btn_openvip);
                 btn.setText(R.string.live_ktgz);
                 setTextColor(audience_btn, guard_btn, fans_btn, weekRank, dayRank,gz_view);
                 userMoreInfoAdapter.type = "1";
                 type = "guanzhong";
-                bottom_msg.setVisibility(View.GONE);
             }
         }else if (Tips.equals("2")) {
             tags.setText(R.string.guard_for_your);
diff --git a/live/src/main/res/layout/view_live_room_part2.xml b/live/src/main/res/layout/view_live_room_part2.xml
index b3ea4a719..cbf8a94ac 100644
--- a/live/src/main/res/layout/view_live_room_part2.xml
+++ b/live/src/main/res/layout/view_live_room_part2.xml
@@ -76,7 +76,7 @@
         app:layout_constraintBottom_toBottomOf="@+id/newRedPacketImg"
         app:layout_constraintDimensionRatio="2.5"
         app:layout_constraintEnd_toEndOf="@+id/newRedPacketImg"
-        app:layout_constraintHeight_percent="0.3"
+        app:layout_constraintHeight_percent="0.33"
         tools:text="16:36" />
 
     <androidx.constraintlayout.widget.Group
@@ -104,13 +104,16 @@
         android:layout_height="0dp"
         android:background="@mipmap/bg_live_room_red_time"
         android:gravity="center"
-        android:textColor="@color/white"
+        android:autoSizeMinTextSize="5sp"
+        android:autoSizeMaxTextSize="7sp"
+        android:autoSizeTextType="uniform"
         android:textSize="7sp"
+        android:textColor="@color/white"
         android:visibility="visible"
         app:layout_constraintBottom_toBottomOf="@+id/newDragonImg"
         app:layout_constraintDimensionRatio="2.5"
         app:layout_constraintEnd_toEndOf="@+id/newDragonImg"
-        app:layout_constraintHeight_percent="0.3"
+        app:layout_constraintHeight_percent="0.33"
         tools:text="16:36" />
 
     <androidx.constraintlayout.widget.Group
diff --git a/main/src/main/res/layout/view_main_me.xml b/main/src/main/res/layout/view_main_me.xml
index 51e45af5f..122fc91c7 100644
--- a/main/src/main/res/layout/view_main_me.xml
+++ b/main/src/main/res/layout/view_main_me.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
     android:background="@color/gray2"
     android:orientation="vertical"
     android:paddingBottom="50dp">
@@ -498,7 +499,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
 
-                    <FrameLayout
+                    <androidx.constraintlayout.widget.ConstraintLayout
                         android:id="@+id/lt_noble"
                         android:layout_width="0dp"
                         android:layout_height="81dp"
@@ -511,66 +512,50 @@
                         android:focusableInTouchMode="true"
                         android:gravity="center"
                         android:orientation="horizontal">
-
-                        <LinearLayout
-                            android:layout_width="wrap_content"
-                            android:layout_height="match_parent"
-                            android:layout_gravity="end"
+                        <ImageView
                             android:layout_marginTop="4dp"
+                            android:id="@+id/user_noble_ico"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"
                             android:layout_marginEnd="14dp"
-                            android:clickable="false"
-                            android:focusable="false"
-                            android:focusableInTouchMode="false">
+                            android:layout_width="48dp"
+                            android:layout_height="45dp"
+                            android:src="@mipmap/icon_vip_gold" />
 
-                            <ImageView
-                                android:id="@+id/user_noble_ico"
-                                android:layout_width="48dp"
-                                android:layout_height="45dp"
-                                android:src="@mipmap/icon_vip_gold" />
-                        </LinearLayout>
+                        <TextView
+                            android:id="@+id/user_noble_text"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:gravity="center|start"
+                            android:layout_marginStart="16dp"
+                            android:layout_marginEnd="6dp"
+                            android:textColor="#000000"
+                            android:textSize="16sp"
+                            android:textStyle="bold"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toStartOf="@+id/user_noble_ico"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"
+                            app:layout_constraintVertical_bias="0.26"
+                            tools:text="dsfsdfd" />
 
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:layout_weight="1"
-                            android:clickable="false"
-                            android:focusable="false"
-                            android:focusableInTouchMode="false"
-                            android:orientation="vertical"
-                            android:paddingLeft="18dp"
-                            android:paddingRight="6dp">
 
-                            <TextView
-                                android:id="@+id/user_noble_text"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="15dp"
-                                android:text=""
-                                android:textColor="#000000"
-                                android:textSize="16sp"
-                                android:textStyle="bold" />
+                        <TextView
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintStart_toStartOf="@+id/user_noble_text"
+                            android:id="@+id/user_noble_time"
+                            android:layout_width="0dp"
+                            android:layout_marginBottom="2dp"
+                            android:layout_marginEnd="6dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="12dp"
+                            android:text="@string/open_noble_text"
+                            android:textColor="#000000"
+                            android:textSize="12sp" />
 
-                            <TextView
-                                android:id="@+id/user_noble_time"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="12dp"
-                                android:text="@string/open_noble_text"
-                                android:textColor="#000000"
-                                android:textSize="12sp" />
-                        </LinearLayout>
+                    </androidx.constraintlayout.widget.ConstraintLayout>
 
-                        <View
-                            android:id="@+id/v_noble"
-                            android:layout_width="18dp"
-                            android:layout_height="18dp"
-                            android:layout_marginRight="30dp"
-                            android:background="@mipmap/icon_more_gray"
-                            android:clickable="false"
-                            android:focusable="false"
-                            android:focusableInTouchMode="false"
-                            android:visibility="gone" />
-                    </FrameLayout>
 
                     <View
                         android:layout_width="18dp"