From a8178c51a052946f756e6cb7a33c8db5b2b9c5e2 Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Sat, 8 Apr 2023 14:57:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=9B=B4=E6=92=AD=E9=97=B4UI?=
 =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E8=BF=9B=E5=85=A5=E7=9B=B4=E6=92=AD?=
 =?UTF-8?q?=E9=97=B4=E5=BF=AB=E9=80=9F=E9=80=80=E5=87=BA=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E7=9A=84=E9=97=AA=E9=80=80=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yunbao/live/views/LiveRoomViewHolder.java  |  2 +-
 .../com/yunbao/live/views/PortraitLiveManager.java | 14 ++++++++++----
 .../main/res/layout/sim_live_room_anchor_say.xml   |  4 ++--
 live/src/main/res/layout/view_live_audience.xml    |  4 ++--
 live/src/main/res/layout/view_live_room.xml        | 13 ++++++-------
 .../res/layout/view_live_top_banner_call_me.xml    | 14 +++++---------
 .../main/res/layout/view_live_top_banner_wish.xml  |  4 ++--
 7 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
index 2771f691b..cc6c52fc1 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
@@ -1449,7 +1449,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
             public void onAnimationEnd(Animation animation) {
                 if (hide) {
                     mAnchorSayImage.setTag(mAnchorSay.getX());
-                    mAnchorSay.setX(-DpUtil.dp2px(45));
+                    mAnchorSay.setX(-DpUtil.dp2px(53));
                     mAnchorSayImage.setVisibility(View.INVISIBLE);
                     mAnchorSayText.setVisibility(View.INVISIBLE);
                     mAnchorSayHide.setImageResource(R.mipmap.ic_live_anchor_say_hide);
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 60f7c90fb..ebd5a1044 100644
--- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
+++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
@@ -254,7 +254,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
             loading.setVisibility(View.GONE);
             enterRoomLeaveHandler.post(enterRoomLeaveRunnable);
             if (topBannerRunnable != null) {
-                topBannerHandler.postDelayed(topBannerRunnable, 6000);
+                topBannerHandler.postDelayed(topBannerRunnable, 1000);
             }
         }
     };
@@ -417,7 +417,12 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
                         }
                         mLivePlayViewHolder.setAnchorPlayModel(anchorClarityType);
                         //是否热度卡加成
-                        liveHandler.postDelayed(() -> mLiveRoomViewHolder.getIsHot(data.getIsUseHotCard()), 700);
+                        liveHandler.postDelayed(() -> {
+                            if(mLiveRoomViewHolder==null){
+                                return;
+                            }
+                            mLiveRoomViewHolder.getIsHot(data.getIsUseHotCard());
+                        }, 700);
 
                         //延时1秒发送
                         liveHandler.postDelayed(sendFIm, 700);
@@ -1945,11 +1950,12 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
         }
     }
 
-    public void wishListProgress(WishModel wishListProgress, String userNiceName,int level) {
+    public void wishListProgress(WishModel wishListProgress, String userNiceName, int level) {
         if (mLiveRoomViewHolder != null) {
-            mLiveRoomViewHolder.wishListProgress(wishListProgress, userNiceName,level);
+            mLiveRoomViewHolder.wishListProgress(wishListProgress, userNiceName, level);
         }
     }
+
     public void showXydComplete(XydCompleteModel model) {
         if (mLiveRoomViewHolder != null) {
             mLiveRoomViewHolder.showXydComplete(model);
diff --git a/live/src/main/res/layout/sim_live_room_anchor_say.xml b/live/src/main/res/layout/sim_live_room_anchor_say.xml
index 57aca08c6..efb47c6f6 100644
--- a/live/src/main/res/layout/sim_live_room_anchor_say.xml
+++ b/live/src/main/res/layout/sim_live_room_anchor_say.xml
@@ -41,8 +41,8 @@
 
     <ImageView
         android:id="@+id/anchor_say_hide"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@mipmap/ic_live_anchor_say_show" />
diff --git a/live/src/main/res/layout/view_live_audience.xml b/live/src/main/res/layout/view_live_audience.xml
index e4267d176..c178ed41e 100644
--- a/live/src/main/res/layout/view_live_audience.xml
+++ b/live/src/main/res/layout/view_live_audience.xml
@@ -315,8 +315,8 @@
 
                 <TextView
                     android:id="@+id/red_point"
-                    android:layout_width="wrap_content"
-                    android:layout_height="14dp"
+                    android:layout_width="6dp"
+                    android:layout_height="6dp"
                     android:layout_alignTop="@id/rt_msg"
                     android:layout_alignRight="@id/rt_msg"
                     android:layout_marginTop="5dp"
diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml
index 47d7ff78c..3c315a548 100644
--- a/live/src/main/res/layout/view_live_room.xml
+++ b/live/src/main/res/layout/view_live_room.xml
@@ -227,7 +227,7 @@
 
     <FrameLayout
         android:id="@+id/hour_rank_layout"
-        android:layout_width="wrap_content"
+        android:layout_width="70dp"
         android:layout_height="20dp"
         android:layout_below="@id/lin"
         android:layout_marginLeft="10dp"
@@ -701,9 +701,8 @@
         android:layout_width="52dp"
         android:layout_height="76dp"
         android:layout_below="@+id/live_rank_pk"
-        android:layout_alignEnd="@+id/live_rank_pk"
-        android:layout_marginLeft="5dp"
-        android:layout_marginTop="40dp"
+        android:layout_marginTop="20dp"
+        android:layout_alignParentRight="true"
         android:layout_marginRight="5dp"
         app:delay_time="5000"
         app:indicator_height="8dp"
@@ -1299,10 +1298,10 @@
         android:layout_width="67dp"
         android:layout_height="wrap_content"
         android:layout_alignBottom="@+id/live_video"
-        android:layout_marginStart="14dp"
-        android:layout_marginBottom="50dp"
+        android:layout_marginStart="5dp"
+        android:layout_marginBottom="-30dp"
         android:background="@color/white"
-        android:visibility="invisible" />
+        android:visibility="visible" />
 
 
     <ImageView
diff --git a/live/src/main/res/layout/view_live_top_banner_call_me.xml b/live/src/main/res/layout/view_live_top_banner_call_me.xml
index 0f37b8cbf..b9298a2e5 100644
--- a/live/src/main/res/layout/view_live_top_banner_call_me.xml
+++ b/live/src/main/res/layout/view_live_top_banner_call_me.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="wrap_content"
+    android:layout_width="52dp"
     android:layout_height="wrap_content">
 
     <ImageView
         android:id="@+id/imageView7"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_width="52dp"
+        android:layout_height="52dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -16,9 +15,8 @@
 
     <com.opensource.svgaplayer.SVGAImageView
         android:id="@+id/svga"
-        android:layout_width="38dp"
-        android:layout_height="38dp"
-        android:layout_marginTop="5dp"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
         android:visibility="visible"
         app:autoPlay="true"
         app:layout_constraintEnd_toEndOf="parent"
@@ -30,7 +28,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
-        android:layout_marginBottom="5dp"
         android:background="@drawable/bg_live_top_banner_text"
         android:paddingStart="5dp"
         android:paddingTop="2dp"
@@ -39,7 +36,6 @@
         android:text="@string/live_ready_anchor_call_me"
         android:textColor="@color/white"
         android:textSize="10sp"
-        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/svga" />
diff --git a/live/src/main/res/layout/view_live_top_banner_wish.xml b/live/src/main/res/layout/view_live_top_banner_wish.xml
index 01e7b3e51..5687723ff 100644
--- a/live/src/main/res/layout/view_live_top_banner_wish.xml
+++ b/live/src/main/res/layout/view_live_top_banner_wish.xml
@@ -6,7 +6,7 @@
 
     <FrameLayout
         android:layout_width="52dp"
-        android:layout_height="64dp"
+        android:layout_height="54dp"
         android:background="@mipmap/bg_xyd">
 
         <ImageView
@@ -29,7 +29,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|center_horizontal"
-            android:layout_marginBottom="5dp"
+            android:layout_marginBottom="3dp"
             android:text="sjhasdjkjk"
             android:textColor="@color/white"
             android:textSize="8sp" />