From a7e154d6d2487af8fecec575a0f10dc0a4e597bc Mon Sep 17 00:00:00 2001
From: huangjian <huangjian@xuanyinyy.com>
Date: Fri, 24 Dec 2021 18:35:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E6=B8=B8=E6=88=8F=E9=BA=A6=E4=BD=8D?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E9=80=82=E9=85=8D=E6=A8=A1=E6=8B=9F=E5=99=A8?=
 =?UTF-8?q?=E5=B9=B3=E6=9D=BF=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yizhuan/erban/avroom/fragment/GameRoomFragment.kt   | 6 ++++++
 .../java/com/yizhuan/erban/avroom/widget/MicroView.java     | 6 ++++--
 .../erban/ui/widget/dynamicface/DynamicFaceDialog.java      | 4 +++-
 app/src/module_mini_world/res/layout/fragment_game_room.xml | 2 +-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/GameRoomFragment.kt b/app/src/main/java/com/yizhuan/erban/avroom/fragment/GameRoomFragment.kt
index 3793b25fe..69956b91f 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/GameRoomFragment.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/GameRoomFragment.kt
@@ -93,6 +93,9 @@ class GameRoomFragment : BaseRoomFragment<IGameRoomView?, GameRoomPresenter?>(),
             gameBinding.microView.bindAdapter(GameMiniMicroViewAdapter(context).apply {
                 setOnClick { gameBinding.ivShowMic.callOnClick() }
             })
+            gameBinding.llMicView.updateLayoutParams<LinearLayout.LayoutParams> {
+                width = LinearLayout.LayoutParams.WRAP_CONTENT
+            }
             gameBinding.tvShowMiniMic.isVisible = false
             gameBinding.microView.postDelayed({
                 gameBinding.ivShowMic.isVisible = true
@@ -106,6 +109,9 @@ class GameRoomFragment : BaseRoomFragment<IGameRoomView?, GameRoomPresenter?>(),
                 marginStart = ScreenUtil.dip2px(10f)
                 marginEnd = ScreenUtil.dip2px(10f)
             }
+            gameBinding.llMicView.updateLayoutParams<LinearLayout.LayoutParams> {
+                width = LinearLayout.LayoutParams.MATCH_PARENT
+            }
             gameBinding.microView.bindAdapter(GameMicroViewAdapter(context))
             gameBinding.tvShowMiniMic.isVisible = true
             gameBinding.llMicView.background = null
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/MicroView.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/MicroView.java
index ef8d47900..8a066972d 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/widget/MicroView.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/MicroView.java
@@ -362,10 +362,12 @@ public class MicroView extends FrameLayout implements View.OnLayoutChangeListene
         if (adapter instanceof GameMicroViewAdapter) {
             giftWidth = UIUtil.dip2px(mContext, 60);
             giftHeight = UIUtil.dip2px(mContext, 60);
-        }
-        if (adapter instanceof GameMiniMicroViewAdapter) {
+        } else if (adapter instanceof GameMiniMicroViewAdapter) {
             giftWidth = UIUtil.dip2px(mContext, 16);
             giftHeight = UIUtil.dip2px(mContext, 16);
+        } else {
+            giftWidth = UIUtil.dip2px(mContext, 80);
+            giftHeight = UIUtil.dip2px(mContext, 80);
         }
         if (adapter instanceof DatingMicroViewAdapter) {
             if (datingItemDecoration == null) datingItemDecoration = new DatingItemDecoration();
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dynamicface/DynamicFaceDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/dynamicface/DynamicFaceDialog.java
index d2a4e7937..1772b9e3c 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/dynamicface/DynamicFaceDialog.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/dynamicface/DynamicFaceDialog.java
@@ -209,7 +209,9 @@ public class DynamicFaceDialog extends BottomSheetDialog
      * @return 返回格式是 List<List<FaceInfo>>, 子元素是一个个的列表，每一个子列表代表的是表情面板上看到的每一页
      */
     private List<List<FaceInfo>> resolveData(List<FaceInfo> faceInfos) {
-        int size = faceInfos.size();
+      if (ListUtils.isListEmpty(faceInfos)){
+          return new ArrayList<>();
+      }
         List<List<FaceInfo>> results = new ArrayList<>();
         // 动画完成后直接消失的表情
         List<FaceInfo> normalFaceList = new ArrayList<>();
diff --git a/app/src/module_mini_world/res/layout/fragment_game_room.xml b/app/src/module_mini_world/res/layout/fragment_game_room.xml
index 66d947773..4a9e5dfcd 100644
--- a/app/src/module_mini_world/res/layout/fragment_game_room.xml
+++ b/app/src/module_mini_world/res/layout/fragment_game_room.xml
@@ -74,7 +74,7 @@
 
             <LinearLayout
                 android:id="@+id/ll_mic_view"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
                 android:gravity="end|center_vertical"