From 121f07fa458b7d2d3f83947ffb2ece5189a65c38 Mon Sep 17 00:00:00 2001
From: ningwenqiang <gongduoxiang@163.com>
Date: Mon, 7 Oct 2024 14:46:04 +0800
Subject: [PATCH] =?UTF-8?q?start=20=E6=9B=BF=E6=8D=A2=20left=20end=20?=
 =?UTF-8?q?=E5=96=9C=E6=AC=A2Right?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yunbao/live/views/LiveEndViewHolder.java  |  2 +-
 live/src/main/res/layout/view_live_end.xml    |  2 +-
 live/src/main/res/layout/view_live_room.xml   | 35 +++++++++----------
 3 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/live/src/main/java/com/yunbao/live/views/LiveEndViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveEndViewHolder.java
index 51c8ba892..ab456fbad 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveEndViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveEndViewHolder.java
@@ -385,7 +385,7 @@ public class LiveEndViewHolder extends AbsViewHolder implements View.OnClickList
                     tips = mContext.getResources().getString(R.string.live_user_level_anchor)
                             +"Lv."+level+" | "+(WordUtil.isNewZh()?"差 "+levelExp+" 經驗升級":levelExp+" experience points to level up");
                 }
-                anchor_level.setText(tips);
+                anchor_level.setText(tips +"2132141242353454356465465464564564575GHFHFGHFGHFGHFGHFGHFG4");
             }
             if(!StringUtil.isEmpty(hot_strategy)){
                 List<HotStrategyBean> hotStrategyBeanList = JSON.parseArray(hot_strategy, HotStrategyBean.class);
diff --git a/live/src/main/res/layout/view_live_end.xml b/live/src/main/res/layout/view_live_end.xml
index 6b9a9f8c8..12b0b9668 100644
--- a/live/src/main/res/layout/view_live_end.xml
+++ b/live/src/main/res/layout/view_live_end.xml
@@ -454,7 +454,7 @@
                         android:layout_weight="1"
                         tools:text="主播等级Lv.1 | 差600經驗升級"
                         android:textColor="#898989"
-                        android:textSize="10sp" />
+                        android:textSize="9sp" />
 
                     <TextView
                         android:id="@+id/my_level"
diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml
index a600fbfc3..fd00bfabd 100644
--- a/live/src/main/res/layout/view_live_room.xml
+++ b/live/src/main/res/layout/view_live_room.xml
@@ -204,7 +204,6 @@
             android:layout_alignParentBottom="true"
             android:layout_marginTop="385dp"
             android:overScrollMode="never"
-            android:layout_marginEnd="85dp"
             android:scrollbars="none" />
 
         <LinearLayout
@@ -979,7 +978,7 @@
         android:layout_width="96dp"
         android:layout_height="30dp"
         android:layout_below="@id/live_time"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
         android:layout_marginTop="10dp"
         android:background="@drawable/bg_live_room_random_pk_timer"
         android:gravity="center"
@@ -1167,7 +1166,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="2dp"
-                android:gravity="right"
+                android:gravity="end"
                 android:text="@string/room_msg"
                 android:textColor="#99ffffff"
                 android:textSize="12sp" />
@@ -1304,7 +1303,7 @@
                 android:layout_marginLeft="9dp"
                 android:layout_marginRight="9dp"
                 android:background="@drawable/bg_live_gift_tip"
-                android:gravity="center|left"
+                android:gravity="center|start"
                 android:orientation="horizontal">
                 <!--盲盒头条-->
                 <View
@@ -1381,13 +1380,13 @@
                 android:layout_marginLeft="9dp"
                 android:layout_marginRight="9dp"
                 android:background="@drawable/bg_live_gift_tip_blue"
-                android:gravity="center|left"
+                android:gravity="center|start"
                 android:orientation="horizontal">
 
                 <View
                     android:layout_width="63dp"
                     android:layout_height="18sp"
-                    android:layout_marginLeft="18dp"
+                    android:layout_marginStart="18dp"
                     android:background="@mipmap/guard_notice" />
 
                 <TextView
@@ -1457,7 +1456,7 @@
                 android:layout_marginLeft="9dp"
                 android:layout_marginRight="9dp"
                 android:background="@mipmap/background_all_server_notify_star_zh"
-                android:gravity="center|left"
+                android:gravity="center|start"
                 android:orientation="horizontal">
 
 
@@ -1544,7 +1543,7 @@
                 android:layout_marginLeft="9dp"
                 android:layout_marginTop="3dp"
                 android:layout_marginRight="9dp"
-                android:gravity="center|left"
+                android:gravity="center|start"
                 android:orientation="horizontal">
 
 
@@ -1637,7 +1636,7 @@
             <TextView
                 android:layout_width="50dp"
                 android:layout_height="25dp"
-                android:layout_gravity="right|center"
+                android:layout_gravity="end|center"
                 android:layout_marginRight="5dp"
                 android:background="@drawable/bg_all_server_icon"
                 android:gravity="center"
@@ -1711,7 +1710,7 @@
                 android:layout_marginLeft="9dp"
                 android:layout_marginRight="9dp"
                 android:background="@drawable/bg_vip"
-                android:gravity="center|left"
+                android:gravity="center|start"
                 android:orientation="horizontal">
 
                 <View
@@ -2652,7 +2651,7 @@
             android:id="@+id/lt_trickery"
             android:layout_width="50dp"
             android:layout_height="50dp"
-            android:layout_gravity="right"
+            android:layout_gravity="end"
             android:layout_marginEnd="16dp"
             android:layout_marginBottom="5dp"
             android:background="@mipmap/img_buoy"
@@ -2678,7 +2677,7 @@
             android:layout_height="50dp"
             android:layout_alignParentEnd="true"
             android:layout_alignParentBottom="true"
-            android:layout_gravity="right"
+            android:layout_gravity="end"
             android:layout_marginEnd="16dp"
             android:layout_marginBottom="5dp"
             android:gravity="center_horizontal"
@@ -2701,7 +2700,7 @@
             android:layout_height="90dp"
             android:layout_alignParentEnd="true"
             android:layout_alignParentBottom="true"
-            android:layout_gravity="right"
+            android:layout_gravity="end"
             android:layout_marginRight="5dp"
             android:layout_marginBottom="5dp"
             android:background="@mipmap/live_mission_box"
@@ -2725,7 +2724,7 @@
         <LinearLayout
             android:layout_width="68dp"
             android:layout_height="68dp"
-            android:layout_gravity="right"
+            android:layout_gravity="end"
             android:layout_marginRight="5dp"
             android:layout_marginBottom="5dp"
             android:gravity="center_horizontal"
@@ -2748,7 +2747,7 @@
             android:id="@+id/btn_event"
             android:layout_width="68dp"
             android:layout_height="68dp"
-            android:layout_gravity="right"
+            android:layout_gravity="end"
             android:layout_marginRight="10dp"
             android:layout_marginBottom="5dp"
             android:gravity="center_horizontal"
@@ -2768,7 +2767,7 @@
             android:layout_height="50dp"
             android:layout_alignParentEnd="true"
             android:layout_alignParentBottom="true"
-            android:layout_gravity="right"
+            android:layout_gravity="end"
             android:layout_marginEnd="16dp"
             android:layout_marginBottom="5dp"
             android:gravity="center_horizontal"
@@ -3164,7 +3163,7 @@
                 android:layout_height="18dp"
                 android:layout_toEndOf="@+id/tricky_text_name"
                 android:layout_centerVertical="true"
-                android:layout_marginLeft="10dp"
+                android:layout_marginStart="10dp"
                 android:layout_marginEnd="14dp"
                 android:background="@drawable/bg_live_room_tricky_hint_join"
                 android:ellipsize="end"
@@ -3222,7 +3221,7 @@
                 android:layout_height="18dp"
                 android:layout_toEndOf="@+id/sud_text_name"
                 android:layout_centerVertical="true"
-                android:layout_marginLeft="10dp"
+                android:layout_marginStart="10dp"
                 android:layout_marginEnd="14dp"
                 android:background="@drawable/bg_live_room_sud_hint_join"
                 android:ellipsize="end"