房间底部更多弹窗UI修改,个播UI修改

app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationDialog.java

@@ -99,7 +99,6 @@ public class RoomOperationDialog extends BottomSheetDialog {
     }
 
     private void init() {
-
         rvOPtList.addItemDecoration(new ColorDecoration(
                 Color.TRANSPARENT,
                 Utils.dip2px(getContext(), 10),
@@ -107,22 +106,22 @@ public class RoomOperationDialog extends BottomSheetDialog {
                 true));
         rvOPtList.setLayoutManager(new FullyGridLayoutManager(getContext(), 5));
         optAdapter = new OptAdapter(context, null);
+        addDatingAction(optAdapter);
         addPKAction(optAdapter);
         addRoomPKAction(optAdapter);
         addSingleRoomPKAction(optAdapter);
-        addDatingAction(optAdapter);
+        addInviteFansOptAdapter();
+        addSendBroadcastAction(optAdapter);
+        addVipSendBroadcastAction(optAdapter);
         addRedPacketAction(optAdapter);
         addRoomLimit(optAdapter);
         addGiftEffectAction(optAdapter);
-        addOpenOrClosePublicScreenAction(optAdapter);
-        addGiftValueAction(optAdapter);
         addRoomSettingAction(optAdapter);
+        addOpenOrClosePublicScreenAction(optAdapter);
         addRedPackageSwitch();
-        addInviteFansOptAdapter();
-        addSuperAdminAction(optAdapter);
-        addSendBroadcastAction(optAdapter);
-        addVipSendBroadcastAction(optAdapter);
         addCleanScreenAction(optAdapter);
+        addGiftValueAction(optAdapter);
+        addSuperAdminAction(optAdapter);
         rvOPtList.setAdapter(optAdapter);
     }
 
@@ -613,7 +612,7 @@ public class RoomOperationDialog extends BottomSheetDialog {
         if (!AvRoomDataManager.get().isManager()) {
             return;
         }
-        optAdapter.addData(new OptAction(R.drawable.icon_room_vip_send_broadcast,
+        optAdapter.addData(new OptAction(R.drawable.icon_room_clean_screen,
                 "清空公屏",
                 () -> new DialogManager(context)
                         .showOkCancelDialog("确定要清空公屏消息吗(清空后不可恢复哦~)", () ->

app/src/main/java/com/yizhuan/erban/avroom/fragment/SingleRoomFragment.kt

@@ -234,31 +234,6 @@ class SingleRoomFragment : BaseRoomFragment<ISingleRoomView?, SingleRoomPresente
         }
     }
 
-    private fun showSingleRoomGiftValue() {
-        if (!AvRoomDataManager.get().isShowGiftValue) {
-            gameBinding.tvSingleRoomGiftValue.visibility = View.GONE
-            return
-        }
-        if (gameBinding.tvSingleRoomGiftValue.isVisible || !AvRoomDataManager.get().isSingleRoom) return
-        val roomQueueInfo = AvRoomDataManager.get().getRoomQueueMemberInfoByMicPosition(-1)
-        if (roomQueueInfo != null) {
-            roomQueueInfo.giftValueData.ldValue.observe(this) {
-                it?.let {
-                    gameBinding.tvSingleRoomGiftValue.text = GiftValueFormat.longToString(it)
-                }
-            }
-            gameBinding.tvSingleRoomGiftValue.visibility = View.VISIBLE
-            gameBinding.tvSingleRoomGiftValue.setOnClickListener {
-                AvRoomDataManager.get().mCurrentRoomInfo?.let { roomInfo ->
-                    DialogWebViewActivity.start(
-                        mContext,
-                        UriProvider.getPersonalCharismaRank() + "?uid=" + roomInfo.uid
-                    )
-                }
-            }
-        }
-    }
-
     //显示请求上麦弹窗
     private fun showInviteDialog(userInfo: UserInfo) {
         if (!this::upMicDialog.isInitialized) {
@@ -277,7 +252,6 @@ class SingleRoomFragment : BaseRoomFragment<ISingleRoomView?, SingleRoomPresente
 
     override fun updateView() {
         super.updateView()
-        showSingleRoomGiftValue()
         if (AvRoomDataManager.get().isOpenAnotherPKMode && gameBinding.microView.adapter !is SingleRoomPKMicroViewAdapter) {
             gameBinding.microView.bindAdapter(SingleRoomPKMicroViewAdapter(context))
             gameBinding.viewPkBoard.isVisible = true

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

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:angle="180"
+        android:endColor="#9C4D00C7"
+        android:startColor="#00AF7CFF"
+        android:type="linear"
+        android:useLevel="true" />
+    <corners
+        android:bottomLeftRadius="0dp"
+        android:bottomRightRadius="12dp"
+        android:topLeftRadius="0dp"
+        android:topRightRadius="12dp" />
+</shape>

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

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <solid android:color="@color/color_0C0B0D_transparent_90"/>
+    <solid android:color="#F20D0C11" />
 
-    <corners android:topLeftRadius="14dp"
+    <corners
         android:bottomLeftRadius="0dp"
-        android:topRightRadius="14dp"
-        android:bottomRightRadius="0dp"/>
+        android:bottomRightRadius="0dp"
+        android:topLeftRadius="8dp"
+        android:topRightRadius="8dp" />
 
 </shape>

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

@@ -3,8 +3,8 @@
     android:shape="rectangle">
     <gradient
         android:angle="180"
-        android:endColor="#ff322bff"
-        android:startColor="#ff49acff"
+        android:endColor="#8C2B00CA"
+        android:startColor="#33170ACD"
         android:type="linear"
         android:useLevel="true" />
 

app/src/module_mini_world/res/layout/fragment_single_room.xml

@@ -44,15 +44,32 @@
         <LinearLayout
             android:id="@+id/contribute_list"
             android:layout_width="wrap_content"
-            android:layout_height="22dp"
-            android:layout_marginTop="75dp"
-            android:background="@drawable/bg_contribute_entrance"
-            android:gravity="center"
+            android:layout_height="24dp"
+            android:layout_marginTop="85dp"
+            android:background="@drawable/bg_contribute_entrance_single_room"
+            android:gravity="center_vertical"
             android:onClick="@{click}"
             android:orientation="horizontal"
-            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
+            <ImageView
+                android:id="@+id/iv_rank_0"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:src="@drawable/default_avatar" />
+
+            <ImageView
+                android:id="@+id/iv_rank_1"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:src="@drawable/default_avatar" />
+
+            <ImageView
+                android:id="@+id/iv_rank_2"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:src="@drawable/default_avatar" />
+
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -64,8 +81,9 @@
             <ImageView
                 android:layout_width="20dp"
                 android:layout_height="20dp"
-                android:layout_marginStart="2dp"
-                android:src="@drawable/icon_contribute_left" />
+                android:layout_marginStart="5dp"
+                android:scaleType="center"
+                android:src="@drawable/arrow_right_white" />
 
         </LinearLayout>
 
@@ -125,38 +143,18 @@
 
         <TextView
             android:id="@+id/tv_hour_rank"
-            android:layout_width="wrap_content"
+            android:layout_width="76dp"
             android:layout_height="22dp"
             android:layout_marginTop="6dp"
             android:background="@drawable/bg_single_room_rank_entrance"
             android:drawableStart="@drawable/ic_single_room_rank"
             android:drawablePadding="4dp"
-            android:gravity="center"
+            android:gravity="center_vertical"
             android:includeFontPadding="false"
-            android:paddingStart="6dp"
-            android:paddingEnd="6dp"
             android:text="小时榜"
             android:textColor="@color/white"
             android:textSize="12dp"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@id/fl_fans_team" />
-
-        <TextView
-            android:id="@+id/tv_single_room_gift_value"
-            android:layout_width="wrap_content"
-            android:layout_height="22dp"
-            android:layout_marginStart="8dp"
-            android:background="@drawable/shape_bg_of_mic_charm_single_anchor"
-            android:drawableStart="@drawable/icon_single_room_gift_value"
-            android:drawablePadding="3dp"
-            android:gravity="center"
-            android:includeFontPadding="false"
-            android:paddingStart="4dp"
-            android:paddingEnd="6dp"
-            android:text="0"
-            android:textColor="@color/white"
-            android:visibility="gone"
-            app:layout_constraintStart_toEndOf="@id/contribute_list"
             app:layout_constraintTop_toTopOf="@id/contribute_list" />
 
         <FrameLayout
@@ -298,7 +296,7 @@
             android:id="@+id/vs_music_player"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:layout_marginTop="75dp"
+            android:layout_marginTop="125dp"
             android:layout="@layout/avroom_music_player_layout"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -309,8 +307,8 @@
             android:id="@+id/vip_broadcast_view"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:visibility="gone"
             android:layout_marginTop="100dp"
+            android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/micro_view" />

app/src/module_music/res/drawable/bg_room_music_player.xml

@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-
-    <solid android:color="@color/white_transparent_20" />
+    <gradient
+        android:angle="180"
+        android:endColor="#8000c0c7"
+        android:startColor="#1affffff"
+        android:type="linear"
+        android:useLevel="true" />
     <corners
-        android:topLeftRadius="12dp"
-        android:bottomLeftRadius="12dp" />
-</shape>
+        android:bottomLeftRadius="100dp"
+        android:bottomRightRadius="0dp"
+        android:topLeftRadius="100dp"
+        android:topRightRadius="0dp" />
+</shape>

app/src/module_music/res/layout/layout_music_player_view.xml

@@ -14,10 +14,9 @@
 
         <ImageView
             android:id="@+id/music_flag"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
+            android:layout_width="22dp"
+            android:layout_height="22dp"
             android:layout_gravity="start|center_vertical"
-            android:layout_marginStart="1dp"
             android:layout_marginEnd="2dp"
             android:src="@drawable/icon_music_flag" />
 
@@ -25,7 +24,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginStart="24dp"
+            android:layout_marginStart="25dp"
             android:lines="1"
             android:text="播放音乐"
             android:textColor="@color/white"