From 9e02ad51196528e236f35d91f4f89b90abacb061 Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Thu, 13 Oct 2022 13:52:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yunbao/live/views/LiveRoomViewHolder.java |  12 +-
 .../res/layout/dialog_live_chat_input.xml     |   2 +-
 live/src/main/res/layout/view_live_room.xml   | 243 +++++++++---------
 3 files changed, 126 insertions(+), 131 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 07b48d443..a38fda842 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
@@ -1063,11 +1063,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
             return;
         }
         btn_event2.setVisibility(View.VISIBLE);
-        if (btn_event3.getVisibility() == View.VISIBLE) {
-            RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) btn_event3.getLayoutParams();
-            layoutParams.bottomMargin = DpUtil.dp2px(150);
-            btn_event3.setLayoutParams(layoutParams);
-        }
+
         if (mBannerList2.size() == 1) {
             mBanner2.setAutoPlay(false)
                     .setPages(mBannerList2, new CustomViewHolder())
@@ -2891,11 +2887,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
         if (mBannerList3 == null || mBannerList3.size() == 0 || mBanner3 == null || bean1 == null) {
             return;
         }
-        if (btn_event2.getVisibility() == View.VISIBLE) {
-            RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) btn_event3.getLayoutParams();
-            layoutParams.bottomMargin = DpUtil.dp2px(150);
-            btn_event3.setLayoutParams(layoutParams);
-        }
+
         mBanner3.setAutoPlay(true)
                 .setPages(mBannerList3, new Banner3CustomViewHolder())
                 .setDelayTime(3000)
diff --git a/live/src/main/res/layout/dialog_live_chat_input.xml b/live/src/main/res/layout/dialog_live_chat_input.xml
index b99e0c3b7..a59c7bed7 100644
--- a/live/src/main/res/layout/dialog_live_chat_input.xml
+++ b/live/src/main/res/layout/dialog_live_chat_input.xml
@@ -99,7 +99,7 @@
             android:layout_weight="1"
             android:background="@drawable/bg_live_input"
             android:gravity="center_vertical"
-            android:hint="@string/live_say_something_a"
+            android:hint="@string/live_say_something"
             android:imeActionLabel="@string/send"
             android:imeOptions="actionSend"
             android:maxLength="50"
diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml
index 7a65a0988..1573027ca 100644
--- a/live/src/main/res/layout/view_live_room.xml
+++ b/live/src/main/res/layout/view_live_room.xml
@@ -9,85 +9,6 @@
 
     android:paddingTop="15dp">
 
-    <LinearLayout
-        android:id="@+id/bannerLayout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentBottom="true"
-        android:gravity="bottom"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:id="@+id/lt_trickery"
-            android:layout_width="75dp"
-            android:layout_height="75dp"
-            android:layout_gravity="right"
-            android:layout_marginRight="5dp"
-            android:layout_marginBottom="5dp"
-            android:background="@mipmap/img_buoy"
-            android:gravity="center"
-            android:orientation="vertical"
-            android:visibility="gone">
-
-            <TextView
-                android:id="@+id/tv_trickery_time"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="9dp"
-                android:text="60"
-                android:textColor="@color/white"
-                android:textSize="18sp"
-                android:textStyle="bold" />
-
-        </LinearLayout>
-
-
-        <LinearLayout
-            android:id="@+id/btn_event1"
-            android:layout_width="68dp"
-            android:layout_height="68dp"
-            android:layout_gravity="right"
-            android:layout_marginRight="10dp"
-            android:layout_marginBottom="5dp"
-            android:gravity="center_horizontal"
-            android:orientation="vertical"
-            android:visibility="gone">
-
-            <com.ms.banner.Banner
-                android:id="@+id/banner1"
-                android:layout_width="68dp"
-                android:layout_height="68dp"
-                android:layout_marginBottom="5dp"
-                app:delay_time="5000"
-                app:indicator_height="8dp"
-                app:indicator_width="8dp" />
-
-        </LinearLayout>
-
-
-        <LinearLayout
-            android:id="@+id/btn_event"
-            android:layout_width="68dp"
-            android:layout_height="68dp"
-            android:layout_gravity="right"
-            android:layout_marginRight="10dp"
-            android:layout_marginBottom="5dp"
-            android:gravity="center_horizontal"
-            android:orientation="vertical"
-            android:visibility="gone">
-
-            <ImageView
-                android:id="@+id/img_event"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:src="@drawable/live_turntable" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="30dp"></LinearLayout>
-    </LinearLayout>
 
     <LinearLayout
         android:id="@+id/lin"
@@ -2074,54 +1995,136 @@
         android:layout_below="@id/live_wks_layout"
         android:layout_marginTop="10dp" />
 
-    <LinearLayout
-        android:id="@+id/btn_event2"
-        android:layout_width="70dp"
-        android:layout_height="93dp"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"
-        android:layout_gravity="right"
-        android:layout_marginEnd="15dp"
-        android:layout_marginBottom="35dp"
-        android:gravity="center_horizontal"
-        android:orientation="vertical"
-        android:visibility="gone">
 
-        <com.ms.banner.Banner
-            android:id="@+id/banner2"
+    <LinearLayout
+        android:id="@+id/bannerLayout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentBottom="true"
+        android:gravity="bottom"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:id="@+id/lt_trickery"
+            android:layout_width="75dp"
+            android:layout_height="75dp"
+            android:layout_gravity="right"
+            android:layout_marginRight="5dp"
+            android:layout_marginBottom="5dp"
+            android:background="@mipmap/img_buoy"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:visibility="gone">
+
+            <TextView
+                android:id="@+id/tv_trickery_time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="9dp"
+                android:text="60"
+                android:textColor="@color/white"
+                android:textSize="18sp"
+                android:textStyle="bold" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/btn_event3"
+            android:layout_width="67dp"
+            android:layout_height="90dp"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentBottom="true"
+            android:layout_gravity="right"
+            android:layout_marginRight="5dp"
+            android:layout_marginBottom="5dp"
+            android:background="@mipmap/live_mission_box"
+            android:gravity="center_horizontal"
+            android:orientation="vertical"
+            android:visibility="gone">
+
+            <com.ms.banner.Banner
+                android:id="@+id/banner3"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="5dp"
+                android:layout_marginTop="5dp"
+                android:layout_marginRight="5dp"
+                app:delay_time="5000"
+                app:indicator_height="8dp"
+                app:indicator_width="8dp" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/btn_event1"
+            android:layout_width="68dp"
+            android:layout_height="68dp"
+            android:layout_gravity="right"
+            android:layout_marginRight="5dp"
+            android:layout_marginBottom="5dp"
+            android:gravity="center_horizontal"
+            android:orientation="vertical"
+            android:visibility="gone">
+
+            <com.ms.banner.Banner
+                android:id="@+id/banner1"
+                android:layout_width="68dp"
+                android:layout_height="68dp"
+                android:layout_marginBottom="5dp"
+                app:delay_time="5000"
+                app:indicator_height="8dp"
+                app:indicator_width="8dp" />
+
+        </LinearLayout>
+
+
+        <LinearLayout
+            android:id="@+id/btn_event"
+            android:layout_width="68dp"
+            android:layout_height="68dp"
+            android:layout_gravity="right"
+            android:layout_marginRight="10dp"
+            android:layout_marginBottom="5dp"
+            android:gravity="center_horizontal"
+            android:orientation="vertical"
+            android:visibility="gone">
+
+            <ImageView
+                android:id="@+id/img_event"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@drawable/live_turntable" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/btn_event2"
             android:layout_width="70dp"
             android:layout_height="93dp"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentBottom="true"
+            android:layout_gravity="right"
+            android:layout_marginEnd="5dp"
             android:layout_marginBottom="5dp"
-            app:delay_time="5000"
-            app:indicator_height="8dp"
-            app:indicator_width="8dp" />
+            android:gravity="center_horizontal"
+            android:orientation="vertical"
+            android:visibility="visible">
 
-    </LinearLayout>
+            <com.ms.banner.Banner
+                android:id="@+id/banner2"
+                android:layout_width="70dp"
+                android:layout_height="93dp"
+                android:layout_marginBottom="5dp"
+                app:delay_time="5000"
+                app:indicator_height="8dp"
+                app:indicator_width="8dp" />
 
-    <LinearLayout
-        android:id="@+id/btn_event3"
-        android:layout_width="67dp"
-        android:layout_height="90dp"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"
-        android:layout_gravity="right"
-        android:layout_marginRight="10dp"
-        android:layout_marginBottom="5dp"
-        android:background="@mipmap/live_mission_box"
-        android:gravity="center_horizontal"
-        android:orientation="vertical"
-        android:visibility="gone">
+        </LinearLayout>
 
-        <com.ms.banner.Banner
-            android:id="@+id/banner3"
+
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginLeft="5dp"
-            android:layout_marginTop="5dp"
-            android:layout_marginRight="5dp"
-            app:delay_time="5000"
-            app:indicator_height="8dp"
-            app:indicator_width="8dp" />
-
+            android:visibility="visible"
+            android:layout_height="30dp"></LinearLayout>
     </LinearLayout>
 </RelativeLayout>
\ No newline at end of file