From 1acbead0015fdcbea025e7db04a60bf4a582bbd4 Mon Sep 17 00:00:00 2001
From: max <mxruan@163.com>
Date: Mon, 3 Jun 2024 19:18:47 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=B8=B8=E6=88=8F=E9=BA=A6=E4=BD=8D?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA9=E9=BA=A6=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E7=A4=BC=E7=89=A9=E5=80=BC=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../avroom/adapter/GameMicroViewAdapter.kt    |  2 +-
 app/src/main/res/layout/item_micro_game.xml   | 89 ++++++-------------
 .../chwl/core/manager/AvRoomDataManager.java  |  2 +-
 3 files changed, 28 insertions(+), 65 deletions(-)

diff --git a/app/src/main/java/com/chwl/app/avroom/adapter/GameMicroViewAdapter.kt b/app/src/main/java/com/chwl/app/avroom/adapter/GameMicroViewAdapter.kt
index cb855e427..fd9d85c59 100644
--- a/app/src/main/java/com/chwl/app/avroom/adapter/GameMicroViewAdapter.kt
+++ b/app/src/main/java/com/chwl/app/avroom/adapter/GameMicroViewAdapter.kt
@@ -54,7 +54,7 @@ class GameMicroViewAdapter(context: Context?) : BaseMicroViewAdapter(context) {
                 width = when (itemCount) {
                     6 -> ScreenUtil.screenWidth / 6
                     7 -> ScreenUtil.screenWidth / 7
-                    else -> (ScreenUtil.screenWidth / 7.5f).toInt()
+                    else -> (ScreenUtil.screenWidth / 6f).toInt()
                 }
             }
             super.bind(info, position)
diff --git a/app/src/main/res/layout/item_micro_game.xml b/app/src/main/res/layout/item_micro_game.xml
index 20a165336..d0a627ad0 100644
--- a/app/src/main/res/layout/item_micro_game.xml
+++ b/app/src/main/res/layout/item_micro_game.xml
@@ -177,74 +177,37 @@
 
     </LinearLayout>
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/cl_parent_gift_value"
-        android:layout_width="0dp"
-        android:layout_height="@dimen/dp_50"
+    <LinearLayout
+        android:id="@+id/ll_charm_click"
+        android:layout_width="wrap_content"
+        android:layout_height="14dp"
+        android:layout_marginTop="@dimen/dp_3"
+        android:background="@drawable/shape_bg_of_mic_charm"
+        android:orientation="horizontal"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintTop_toBottomOf="@id/ll_nick">
 
-        <View
-            android:id="@+id/view_center"
-            android:layout_width="1dp"
-            android:layout_height="1dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+        <ImageView
+            android:id="@+id/iv_value_icon"
+            android:layout_width="8dp"
+            android:layout_height="8dp"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="3dp"
+            android:scaleType="fitCenter"
+            android:src="@drawable/icon_gift_value" />
 
-        <View
-            android:id="@+id/view_center_of_charm"
-            android:layout_width="1dp"
-            android:layout_height="1dp"
-            android:layout_marginStart="18dp"
-            android:layout_marginTop="15dp"
-            app:layout_constraintStart_toEndOf="@id/view_center"
-            app:layout_constraintTop_toBottomOf="@id/view_center"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <LinearLayout
-            android:id="@+id/ll_charm_click"
+        <TextView
+            android:id="@+id/tv_charm_value"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="5dp"
-            android:orientation="horizontal"
-            android:paddingTop="@dimen/dp_5"
-            android:paddingBottom="@dimen/dp_5"
-            app:layout_constraintBottom_toBottomOf="@id/view_center_of_charm"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@id/view_center_of_charm">
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="14dp"
-                android:background="@drawable/shape_bg_of_mic_charm"
-                android:orientation="horizontal">
-
-                <ImageView
-                    android:id="@+id/iv_value_icon"
-                    android:layout_width="8dp"
-                    android:layout_height="8dp"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginStart="3dp"
-                    android:scaleType="fitCenter"
-                    android:src="@drawable/icon_gift_value" />
-
-                <TextView
-                    android:id="@+id/tv_charm_value"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginStart="3dp"
-                    android:layout_marginEnd="3dp"
-                    android:gravity="center"
-                    android:textColor="@color/color_white"
-                    android:textSize="10dp"
-                    tools:text="126" />
-            </LinearLayout>
-
-        </LinearLayout>
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="3dp"
+            android:layout_marginEnd="3dp"
+            android:gravity="center"
+            android:textColor="@color/color_white"
+            android:textSize="10dp"
+            tools:text="126" />
+    </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core/src/main/java/com/chwl/core/manager/AvRoomDataManager.java b/core/src/main/java/com/chwl/core/manager/AvRoomDataManager.java
index d1c0c5972..87c7a71cb 100644
--- a/core/src/main/java/com/chwl/core/manager/AvRoomDataManager.java
+++ b/core/src/main/java/com/chwl/core/manager/AvRoomDataManager.java
@@ -88,7 +88,7 @@ public final class AvRoomDataManager {
     /**
      * 游戏房最小坑位数
      */
-    public static final int GAME_DEF_MIC_COUNT = 6;
+    public static final int GAME_DEF_MIC_COUNT = 9;
 
     /************************************************公屏数据****************************************************/