diff --git a/app/tmp/full-r8-config.txt b/app/tmp/full-r8-config.txt
index a9c636796..b0731b31e 100644
--- a/app/tmp/full-r8-config.txt
+++ b/app/tmp/full-r8-config.txt
@@ -421,7 +421,7 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 
 
 # End of content from D:\AndroidProject\pandorapan\app\proguard-rules.pro
-# The proguard configuration file for the following section is D:\AndroidProject\pandorapan\app\build\intermediates\aapt_proguard_file\google_testRelease\processGoogle_testReleaseResources\aapt_rules.txt
+# The proguard configuration file for the following section is D:\AndroidProject\pandorapan\app\build\intermediates\aapt_proguard_file\link_testRelease\processLink_testReleaseResources\aapt_rules.txt
 -keep class androidx.core.app.CoreComponentFactory { <init>(); }
 -keep class androidx.core.content.FileProvider { <init>(); }
 -keep class androidx.core.content.FileProvider4Utils { <init>(); }
@@ -1094,10 +1094,10 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 -keepclassmembers class * { *** videoEditClick(android.view.View); }
 
 
-# End of content from D:\AndroidProject\pandorapan\app\build\intermediates\aapt_proguard_file\google_testRelease\processGoogle_testReleaseResources\aapt_rules.txt
-# The proguard configuration file for the following section is D:\AndroidProject\pandorapan\lib_faceunity\build\intermediates\consumer_proguard_dir\google_testRelease\exportGoogle_testReleaseConsumerProguardFiles\lib0\proguard.txt
+# End of content from D:\AndroidProject\pandorapan\app\build\intermediates\aapt_proguard_file\link_testRelease\processLink_testReleaseResources\aapt_rules.txt
+# The proguard configuration file for the following section is D:\AndroidProject\pandorapan\lib_faceunity\build\intermediates\consumer_proguard_dir\link_testRelease\exportLink_testReleaseConsumerProguardFiles\lib0\proguard.txt
 
-# End of content from D:\AndroidProject\pandorapan\lib_faceunity\build\intermediates\consumer_proguard_dir\google_testRelease\exportGoogle_testReleaseConsumerProguardFiles\lib0\proguard.txt
+# End of content from D:\AndroidProject\pandorapan\lib_faceunity\build\intermediates\consumer_proguard_dir\link_testRelease\exportLink_testReleaseConsumerProguardFiles\lib0\proguard.txt
 # The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\8d3e3177c15403546de73d87508067d6\transformed\jetified-XPopup-2.10.0\proguard.txt
 # Generated keep rule for Lifecycle observer adapter.
 -if class com.lxj.xpopup.core.BasePopupView {
@@ -1157,9 +1157,9 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 
 
 # End of content from C:\Users\CVB88\.gradle\caches\transforms-3\a1df9a6aa192455030f7c9970b70e0e9\transformed\material-1.4.0\proguard.txt
-# The proguard configuration file for the following section is D:\AndroidProject\pandorapan\lib_google\build\intermediates\consumer_proguard_dir\google_testRelease\exportGoogle_testReleaseConsumerProguardFiles\lib0\proguard.txt
+# The proguard configuration file for the following section is D:\AndroidProject\pandorapan\lib_google\build\intermediates\consumer_proguard_dir\link_testRelease\exportLink_testReleaseConsumerProguardFiles\lib0\proguard.txt
 
-# End of content from D:\AndroidProject\pandorapan\lib_google\build\intermediates\consumer_proguard_dir\google_testRelease\exportGoogle_testReleaseConsumerProguardFiles\lib0\proguard.txt
+# End of content from D:\AndroidProject\pandorapan\lib_google\build\intermediates\consumer_proguard_dir\link_testRelease\exportLink_testReleaseConsumerProguardFiles\lib0\proguard.txt
 # The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\2929985d9627ba3bb45a0ebd18eaf9d3\transformed\jetified-linesdk-5.0.1\proguard.txt
 -keepattributes *Annotation*
 
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 ab456fbad..a752444c5 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveEndViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveEndViewHolder.java
@@ -386,6 +386,7 @@ public class LiveEndViewHolder extends AbsViewHolder implements View.OnClickList
                             +"Lv."+level+" | "+(WordUtil.isNewZh()?"差 "+levelExp+" 經驗升級":levelExp+" experience points to level up");
                 }
                 anchor_level.setText(tips +"2132141242353454356465465464564564575GHFHFGHFGHFGHFGHFGHFG4");
+                anchor_level.invalidate();
             }
             if(!StringUtil.isEmpty(hot_strategy)){
                 List<HotStrategyBean> hotStrategyBeanList = JSON.parseArray(hot_strategy, HotStrategyBean.class);
diff --git a/live/src/main/res/layout/dialog_user_more_list.xml b/live/src/main/res/layout/dialog_user_more_list.xml
index ed4733010..f381770c9 100644
--- a/live/src/main/res/layout/dialog_user_more_list.xml
+++ b/live/src/main/res/layout/dialog_user_more_list.xml
@@ -154,7 +154,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:text="@string/enjoy_a_lot"
             android:textColor="#ffc2dff0"
             android:textSize="12sp" />
@@ -163,7 +163,7 @@
             android:id="@+id/btn"
             android:layout_width="93dp"
             android:layout_height="33dp"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:layout_centerInParent="true"
             android:layout_marginLeft="20dp"
             android:layout_marginRight="20dp"
diff --git a/live/src/main/res/layout/item_live_chat.xml b/live/src/main/res/layout/item_live_chat.xml
index 07281f1cc..266226d9f 100644
--- a/live/src/main/res/layout/item_live_chat.xml
+++ b/live/src/main/res/layout/item_live_chat.xml
@@ -270,7 +270,7 @@
                 android:layout_marginEnd="11dp"
                 android:layout_weight="0"
                 android:clickable="false"
-                android:src="@mipmap/btn_attention" />
+                android:src="@mipmap/live_icon_focus" />
 
         </androidx.appcompat.widget.LinearLayoutCompat>
 
diff --git a/live/src/main/res/layout/view_live_end.xml b/live/src/main/res/layout/view_live_end.xml
index 12b0b9668..b880b9313 100644
--- a/live/src/main/res/layout/view_live_end.xml
+++ b/live/src/main/res/layout/view_live_end.xml
@@ -36,9 +36,9 @@
             android:layout_width="match_parent"
             android:layout_height="180dp"
             android:layout_below="@id/text_1"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="100dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:background="@drawable/bg_live_end"
             android:orientation="vertical">
 
@@ -156,9 +156,9 @@
             android:layout_width="match_parent"
             android:layout_height="48dp"
             android:layout_below="@id/group"
-            android:layout_marginLeft="50dp"
+            android:layout_marginStart="50dp"
             android:layout_marginTop="50dp"
-            android:layout_marginRight="50dp"
+            android:layout_marginEnd="50dp"
             android:background="@drawable/login_btn"
             android:gravity="center"
             android:text="@string/live_back"
@@ -431,7 +431,7 @@
                     android:id="@+id/anchor_name"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="14dp"
+                    android:layout_marginStart="14dp"
                     android:layout_toEndOf="@+id/image_anchorLayout"
                     tools:text="用户名称"
                     android:textColor="@color/white"
@@ -450,18 +450,18 @@
                         android:id="@+id/anchor_level"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="14dp"
+                        android:layout_marginStart="14dp"
                         android:layout_weight="1"
                         tools:text="主播等级Lv.1 | 差600經驗升級"
                         android:textColor="#898989"
-                        android:textSize="9sp" />
+                        android:textSize="10sp" />
 
                     <TextView
                         android:id="@+id/my_level"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_below="@+id/live_duration_anchor"
-                        android:layout_marginLeft="14dp"
+                        android:layout_marginStart="14dp"
                         android:layout_toEndOf="@+id/image_anchorLayout"
                         android:text="@string/live_end_level"
                         android:textColor="@color/white"
@@ -495,9 +495,9 @@
                 android:layout_height="wrap_content"
                 android:layout_below="@id/level_progress"
                 android:layout_centerHorizontal="true"
-                android:layout_marginLeft="16dp"
+                android:layout_marginStart="16dp"
                 android:layout_marginTop="25dp"
-                android:layout_marginRight="16dp"
+                android:layout_marginEnd="16dp"
                 android:orientation="vertical"
                 android:visibility="gone"
                 tools:visibility="visible">
@@ -530,7 +530,7 @@
                     <TextView
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="10dp"
+                        android:layout_marginStart="10dp"
                         android:layout_weight="1"
                         android:text="@string/live_end_view_ban_reason"
                         android:textColor="#E5E5E5"
@@ -541,7 +541,7 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="10dp"
-                        android:layout_marginRight="17dp"
+                        android:layout_marginEnd="17dp"
                         android:layout_marginBottom="10dp"
                         android:layout_weight="1.5"
                         android:gravity="end"
@@ -562,7 +562,7 @@
                     <TextView
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="10dp"
+                        android:layout_marginStart="10dp"
                         android:layout_weight="1"
                         android:text="@string/live_end_view_ban_content"
                         android:textColor="#E5E5E5"
@@ -572,7 +572,7 @@
                         android:id="@+id/ban_content"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginRight="17dp"
+                        android:layout_marginEnd="17dp"
                         android:gravity="end"
                         android:text="123\n45678"
                         android:textColor="#E5E5E5"
@@ -590,7 +590,7 @@
                     <TextView
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="10dp"
+                        android:layout_marginStart="10dp"
                         android:layout_weight="1"
                         android:text="@string/live_end_view_ban_timer"
                         android:textColor="#E5E5E5"
@@ -600,7 +600,7 @@
                         android:id="@+id/ban_timer"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginRight="17dp"
+                        android:layout_marginEnd="17dp"
                         android:gravity="end"
                         android:text="123\n45678"
                         android:textColor="#E5E5E5"
@@ -661,7 +661,7 @@
                         android:id="@+id/count3"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="10dp"
+                        android:layout_marginStart="10dp"
                         android:layout_weight="1"
                         tools:text="0"
                         android:textColor="@color/white"
@@ -693,7 +693,7 @@
                     <TextView
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="10dp"
+                        android:layout_marginStart="10dp"
                         android:layout_weight="1"
                         android:text="@string/live_data_accept"
                         android:textColor="#92949A"
@@ -728,7 +728,7 @@
                         android:id="@+id/count6"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="10dp"
+                        android:layout_marginStart="10dp"
                         android:layout_weight="1"
                         tools:text="0"
                         android:textColor="@color/white"
@@ -760,7 +760,7 @@
                     <TextView
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="10dp"
+                        android:layout_marginStart="10dp"
                         android:layout_weight="1"
                         android:text="@string/live_data_attention_rate"
                         android:textColor="#92949A"
@@ -794,7 +794,7 @@
                     <TextView
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="10dp"
+                        android:layout_marginStart="10dp"
                         android:layout_weight="1"
                         tools:text="0"
                         android:textColor="@color/white"
@@ -827,7 +827,7 @@
                     <TextView
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="10dp"
+                        android:layout_marginStart="10dp"
                         android:layout_weight="1"
                         android:text="打賞人數"
                         android:textColor="#92949A"
@@ -922,7 +922,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="40dp"
                     android:layout_gravity="center"
-                    android:layout_marginLeft="37dp"
+                    android:layout_marginStart="37dp"
                     android:background="@drawable/backgroud_live_end_1"
                     android:gravity="center"
                     android:minWidth="115dp"