feat：完成房间底部菜单UI调整

app/src/main/java/com/chwl/app/avroom/widget/BottomView.java

@@ -155,9 +155,9 @@ public class BottomView extends LinearLayout implements View.OnClickListener {
             int newOption = (int) SharedPreferenceUtils.get(SH_NEW_OPTION, 0);
 
             if (newOption == NEW_OPTION) {
-                sendMagic.setImageResource(R.drawable.icon_send_magic);
+                sendMagic.setImageResource(R.drawable.room_menu_ic_more);
             } else {
-                sendMagic.setImageResource(R.drawable.icon_send_magic);
+                sendMagic.setImageResource(R.drawable.room_menu_ic_more);
             }
             sendMagic.setClickable(true);
             sendMagic.setOnClickListener(this);
@@ -178,11 +178,11 @@ public class BottomView extends LinearLayout implements View.OnClickListener {
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onFirstRechargeEvent(FirstChargeEvent event) {
-        sendGift.setImageResource(R.drawable.icon_room_send_gift);
+//        sendGift.setImageResource(R.drawable.icon_room_send_gift);
     }
 
     public void setRoomMessageUnread(int count) {
-        iconRoomMsg.setImageResource(count > 0 ? R.drawable.icon_room_send_msg_point : R.drawable.icon_room_send_msg);
+        iconRoomMsg.setImageResource(count > 0 ? R.drawable.room_menu_ic_message_new : R.drawable.room_menu_ic_message);
     }
 
     public void setBottomViewListener(BottomViewListenerWrapper wrapper) {
@@ -201,17 +201,17 @@ public class BottomView extends LinearLayout implements View.OnClickListener {
 
     public void setMicBtnOpen(boolean isOpen) {
         if (isOpen) {
-            openMic.setImageResource(R.drawable.icon_room_open_mic);
+            openMic.setImageResource(R.drawable.room_menu_ic_mic_open);
         } else {
-            openMic.setImageResource(R.drawable.icon_room_close_mic);
+            openMic.setImageResource(R.drawable.room_menu_ic_mic_close);
         }
     }
 
     public void setRemoteMuteOpen(boolean isOpen) {
         if (isOpen) {
-            remoteMute.setImageResource(R.drawable.icon_remote_mute_close);
+            remoteMute.setImageResource(R.drawable.room_menu_ic_vocality_open);
         } else {
-            remoteMute.setImageResource(R.drawable.icon_remote_mute_open);
+            remoteMute.setImageResource(R.drawable.room_menu_ic_vocality_close);
         }
     }
 
@@ -254,8 +254,8 @@ public class BottomView extends LinearLayout implements View.OnClickListener {
     }
 
     public void setQueuingMicButtonBackground(boolean isEmpty) {
-        iconMicQueue.setImageResource(isEmpty ? R.drawable.icon_room_mic_queue :
-                R.drawable.icon_room_mic_queue_not_empty);
+        iconMicQueue.setImageResource(isEmpty ? R.drawable.room_menu_ic_mic_queue :
+                R.drawable.room_menu_ic_mic_queue_new);
     }
 
 

app/src/main/res/drawable/bg_room_bottom.xml

@@ -2,11 +2,11 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="#26ffffff" />
+    <solid android:color="#33ffffff" />
     <corners
         android:bottomLeftRadius="0dp"
         android:bottomRightRadius="0dp"
-        android:topLeftRadius="25dp"
-        android:topRightRadius="25dp" />
+        android:topLeftRadius="@dimen/dp_23"
+        android:topRightRadius="@dimen/dp_23" />
 
 </shape>

app/src/main/res/drawable/shape_190b032d_14dp.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="14dp" />
+    <solid android:color="#190B032D" />
+</shape>

app/src/main/res/layout/layout_bottom_view.xml

@@ -1,144 +1,150 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="52dp"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="@drawable/bg_room_bottom"
-    android:orientation="horizontal">
+    android:layout_height="@dimen/dp_61"
+    android:background="@drawable/bg_room_bottom">
 
-    <HorizontalScrollView
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginEnd="@dimen/dp_10"
-        android:layout_weight="1"
-        android:overScrollMode="never"
-        android:scrollbars="none">
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_gravity="center">
 
-        <LinearLayout
-            android:layout_width="wrap_content"
+        <HorizontalScrollView
+            android:id="@+id/layout_menus"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:orientation="horizontal"
-            tools:background="@color/blue">
-
-            <View
-                android:layout_width="@dimen/dp_15"
-                android:layout_height="0dp" />
-
-            <TextView
-                android:id="@+id/tv_room_send_msg_input"
-                android:layout_width="80dp"
-                android:layout_height="30dp"
-                android:background="@drawable/bg_say_something"
-                android:gravity="center"
-                android:paddingStart="5dp"
-                android:paddingEnd="5dp"
-                android:maxLines="1"
-                app:autoSizeMaxTextSize="@dimen/sp_14"
-                app:autoSizeMinTextSize="@dimen/sp_8"
-                app:autoSizeStepGranularity="1sp"
-                app:autoSizeTextType="uniform"
-                android:autoSizeMaxTextSize="@dimen/sp_14"
-                android:autoSizeMinTextSize="@dimen/sp_8"
-                android:autoSizeStepGranularity="1sp"
-                android:autoSizeTextType="uniform"
-                android:text="@string/room_say_something"
-                android:textColor="@color/white"
-                android:visibility="visible"
-                tools:visibility="visible" />
+            android:overScrollMode="never"
+            android:scrollbars="none"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/icon_room_send_gift"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintWidth_default="wrap">
 
             <LinearLayout
-                android:id="@+id/room_mic_layout"
-                android:layout_width="30dp"
-                android:layout_height="30dp"
-                android:layout_marginStart="@dimen/dp_9"
-                android:gravity="center">
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/tv_room_send_msg_input"
+                    android:layout_width="@dimen/dp_90"
+                    android:layout_height="@dimen/dp_28"
+                    android:layout_marginStart="@dimen/dp_15"
+                    android:background="@drawable/shape_190b032d_14dp"
+                    android:gravity="center"
+                    android:maxLines="1"
+                    android:paddingStart="@dimen/dp_3"
+                    android:paddingEnd="@dimen/dp_3"
+                    android:text="@string/room_say_something"
+                    android:textColor="@color/white"
+                    android:visibility="visible"
+                    app:autoSizeMaxTextSize="@dimen/dp_10"
+                    app:autoSizeMinTextSize="@dimen/dp_7"
+                    app:autoSizeStepGranularity="1px"
+                    app:autoSizeTextType="uniform"
+                    tools:visibility="visible" />
+
+                <LinearLayout
+                    android:id="@+id/room_mic_layout"
+                    android:layout_width="@dimen/dp_29"
+                    android:layout_height="@dimen/dp_29"
+                    android:layout_marginStart="@dimen/dp_13"
+                    android:gravity="center">
+
+                    <ImageView
+                        android:id="@+id/icon_room_open_mic"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:scaleType="fitXY"
+                        android:src="@drawable/room_menu_ic_mic_open" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="@dimen/dp_29"
+                    android:layout_height="@dimen/dp_29"
+                    android:layout_marginStart="@dimen/dp_11"
+                    android:gravity="center">
+
+                    <ImageView
+                        android:id="@+id/icon_room_open_remote_mic"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:scaleType="fitXY"
+                        android:src="@drawable/room_menu_ic_vocality_open" />
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/room_face_layout"
+                    android:layout_width="@dimen/dp_29"
+                    android:layout_height="@dimen/dp_29"
+                    android:layout_marginStart="@dimen/dp_11"
+                    android:gravity="center">
+
+                    <ImageView
+                        android:id="@+id/icon_room_face"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:scaleType="fitXY"
+                        android:src="@drawable/room_menu_ic_emoji" />
+                </LinearLayout>
 
                 <ImageView
-                    android:id="@+id/icon_room_open_mic"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
+                    android:id="@+id/icon_mic_queue"
+                    android:layout_width="@dimen/dp_29"
+                    android:layout_height="@dimen/dp_29"
+                    android:layout_marginStart="@dimen/dp_11"
                     android:scaleType="fitXY"
-                    android:src="@drawable/icon_room_open_mic" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="30dp"
-                android:layout_height="30dp"
-                android:layout_marginStart="@dimen/dp_9"
-                android:gravity="center">
+                    android:src="@drawable/room_menu_ic_mic_queue" />
 
                 <ImageView
-                    android:id="@+id/icon_room_open_remote_mic"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
+                    android:id="@+id/iv_room_message"
+                    android:layout_width="@dimen/dp_29"
+                    android:layout_height="@dimen/dp_29"
+                    android:layout_marginStart="@dimen/dp_11"
                     android:scaleType="fitXY"
-                    android:src="@drawable/icon_remote_mute_close" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/room_face_layout"
-                android:layout_width="30dp"
-                android:layout_height="30dp"
-                android:layout_marginStart="@dimen/dp_9"
-                android:gravity="center">
+                    android:src="@drawable/room_menu_ic_message" />
 
                 <ImageView
-                    android:id="@+id/icon_room_face"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
+                    android:id="@+id/icon_room_send_magic"
+                    android:layout_width="@dimen/dp_29"
+                    android:layout_height="@dimen/dp_29"
+                    android:layout_marginStart="@dimen/dp_11"
                     android:scaleType="fitXY"
-                    android:src="@drawable/icon_face_btn" />
+                    android:src="@drawable/room_menu_ic_more" />
+
+                <ImageView
+                    android:id="@+id/icon_room_game"
+                    android:layout_width="@dimen/dp_29"
+                    android:layout_height="@dimen/dp_29"
+                    android:layout_marginStart="@dimen/dp_11"
+                    android:scaleType="fitXY"
+                    android:src="@drawable/room_menu_ic_playlist" />
             </LinearLayout>
 
-            <ImageView
-                android:id="@+id/icon_mic_queue"
-                android:layout_width="30dp"
-                android:layout_height="30dp"
-                android:layout_marginStart="@dimen/dp_9"
-                android:scaleType="fitXY"
-                android:src="@drawable/icon_room_mic_queue" />
+        </HorizontalScrollView>
 
-            <ImageView
-                android:id="@+id/iv_room_message"
-                android:layout_width="30dp"
-                android:layout_height="30dp"
-                android:layout_marginStart="@dimen/dp_9"
-                android:scaleType="fitXY"
-                android:src="@drawable/icon_room_send_msg" />
+        <com.opensource.svgaplayer.SVGAImageView
+            android:id="@+id/icon_room_send_gift"
+            android:layout_width="@dimen/dp_32"
+            android:layout_height="@dimen/dp_32"
+            android:layout_marginStart="@dimen/dp_11"
+            android:layout_marginEnd="@dimen/dp_15"
+            android:scaleType="fitXY"
+            app:autoPlay="true"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/layout_menus"
+            app:layout_constraintTop_toTopOf="parent"
+            app:loopCount="-1"
+            app:source="svga/room_menu_gift.svga" />
 
-            <ImageView
-                android:id="@+id/icon_room_send_magic"
-                android:layout_width="30dp"
-                android:layout_height="30dp"
-                android:layout_marginStart="@dimen/dp_9"
-                android:scaleType="fitXY"
-                android:src="@drawable/icon_send_magic" />
-
-        </LinearLayout>
-
-    </HorizontalScrollView>
-
-    <ImageView
-        android:id="@+id/icon_room_game"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:layout_gravity="center_vertical|end"
-        android:layout_marginEnd="@dimen/dp_10"
-        android:scaleType="fitXY"
-        android:src="@drawable/room_bottom_ic_game" />
-
-    <ImageView
-        android:id="@+id/icon_room_send_gift"
-        android:layout_width="38dp"
-        android:layout_height="38dp"
-        android:layout_gravity="center_vertical|end"
-        android:layout_marginEnd="@dimen/dp_15"
-        android:scaleType="fitXY"
-        android:src="@drawable/icon_room_send_gift" />
-
-</LinearLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>