From a2112675178a789632b9fb1153c2c623fd48c7f7 Mon Sep 17 00:00:00 2001
From: Max <mxruan@163.com>
Date: Wed, 1 Nov 2023 11:22:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E9=BA=A6=E4=BD=8D?=
 =?UTF-8?q?=E9=AD=85=E5=8A=9B=E5=80=BC=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=88=E4=B8=BB=E9=BA=A6=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/item_boss_micro.xml | 163 ++++++++++----------
 1 file changed, 82 insertions(+), 81 deletions(-)

diff --git a/app/src/main/res/layout/item_boss_micro.xml b/app/src/main/res/layout/item_boss_micro.xml
index dce927298..c3ec2b58f 100644
--- a/app/src/main/res/layout/item_boss_micro.xml
+++ b/app/src/main/res/layout/item_boss_micro.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:clipChildren="false"
     android:clipToPadding="false"
     android:paddingTop="11dp"
@@ -11,9 +11,11 @@
 
     <FrameLayout
         android:id="@+id/micro_layout"
-        android:layout_marginStart="@dimen/dp_10"
         android:layout_width="@dimen/dp_room_boss_mic_header_wear_radius"
-        android:layout_height="@dimen/dp_room_boss_mic_header_wear_radius">
+        android:layout_height="@dimen/dp_room_boss_mic_header_wear_radius"
+        android:layout_marginStart="@dimen/dp_10"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
         <com.opensource.svgaplayer.SVGAImageView
             android:id="@+id/iv_halo"
@@ -102,7 +104,7 @@
 
         </RelativeLayout>
 
-         <ImageView
+        <ImageView
             android:id="@+id/iv_face"
             android:layout_width="80dp"
             android:layout_height="80dp"
@@ -123,99 +125,96 @@
         android:textColor="@color/color_FFFFFF"
         android:textSize="9sp"
         android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         tools:text="@string/layout_item_boss_micro_01" />
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/ll_nick"
-        android:layout_width="52dp"
+    <ImageView
+        android:id="@+id/iv_tag"
+        android:layout_width="wrap_content"
+        android:layout_height="15dp"
+        android:layout_marginEnd="@dimen/dp_5"
+        android:visibility="gone"
+        app:layout_constraintEnd_toStartOf="@+id/nick"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintStart_toStartOf="@id/micro_layout"
+        app:layout_constraintTop_toBottomOf="@id/micro_layout"
+        tools:layout_width="15dp"
+        tools:visibility="visible" />
+
+    <TextView
+        android:id="@+id/nick"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_20"
-        android:layout_below="@+id/micro_layout"
-        android:gravity="center_vertical">
+        android:ellipsize="end"
+        android:gravity="center_vertical"
+        android:maxWidth="52dp"
+        android:maxLines="1"
+        android:singleLine="true"
+        android:text=""
+        android:textColor="@color/white"
+        android:textSize="@dimen/sp_10"
+        app:layout_constraintEnd_toEndOf="@id/micro_layout"
+        app:layout_constraintStart_toEndOf="@+id/iv_tag"
+        app:layout_constraintTop_toTopOf="@id/iv_tag"
+        tools:text="Name" />
+
+    <LinearLayout
+        android:id="@+id/ll_charm_click"
+        android:layout_width="wrap_content"
+        android:layout_height="16dp"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="@dimen/dp_6"
+        android:background="@drawable/shape_bg_of_mic_charm"
+        android:orientation="horizontal"
+        android:paddingStart="4dp"
+        android:paddingEnd="4dp"
+        app:layout_constraintEnd_toEndOf="@id/micro_layout"
+        app:layout_constraintStart_toStartOf="@id/micro_layout"
+        app:layout_constraintTop_toBottomOf="@+id/nick">
 
         <ImageView
-            android:id="@+id/iv_tag"
-            android:layout_width="wrap_content"
-            android:layout_height="15dp"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:visibility="gone"
-            app:layout_constraintHorizontal_chainStyle="packed"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/nick"
-            app:layout_constraintTop_toTopOf="parent" />
+            android:layout_width="11dp"
+            android:layout_height="11dp"
+            android:layout_gravity="center_vertical"
+            android:scaleType="center"
+            android:src="@drawable/icon_gift_value" />
 
         <TextView
-            android:id="@+id/nick"
+            android:id="@+id/tv_charm_value"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:gravity="center_vertical"
-            android:maxWidth="52dp"
-            android:maxLines="1"
-            android:singleLine="true"
-            android:text=""
-            android:textColor="@color/white"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="3dp"
+            android:gravity="center"
+            android:text="0"
+            android:textColor="@color/color_white"
             android:textSize="@dimen/sp_10"
-            android:paddingBottom="@dimen/dp_6"
-            app:layout_constraintStart_toEndOf="@+id/iv_tag"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_goneMarginStart="0dp"
-            tools:text="1" />
+            tools:text="10000" />
 
-        <LinearLayout
-            android:id="@+id/ll_charm_click"
-            android:layout_width="wrap_content"
-            android:layout_height="16dp"
-            android:layout_gravity="center_horizontal"
-            android:background="@drawable/shape_bg_of_mic_charm"
-            android:orientation="horizontal"
-            android:paddingStart="4dp"
-            android:paddingEnd="4dp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/nick">
-
-            <ImageView
-                android:layout_width="11dp"
-                android:layout_height="11dp"
-                android:layout_gravity="center_vertical"
-                android:scaleType="center"
-                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:gravity="center"
-                android:text="0"
-                android:textColor="@color/color_white"
-                android:textSize="@dimen/sp_10" />
-
-        </LinearLayout>
-
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
+    </LinearLayout>
 
     <FrameLayout
         android:id="@+id/fr_title"
+        android:layout_width="0dp"
+        android:layout_height="76dp"
+        android:layout_marginStart="@dimen/dp_20"
         android:layout_marginTop="@dimen/dp_10"
         android:layout_marginEnd="80dp"
-        android:layout_marginStart="@dimen/dp_20"
-        android:background="@drawable/bg_micro_title"
         android:layout_toEndOf="@+id/micro_layout"
-        android:layout_width="match_parent"
-        android:layout_height="76dp">
+        android:background="@drawable/bg_micro_title"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/micro_layout"
+        app:layout_constraintTop_toTopOf="parent">
 
         <TextView
             android:id="@+id/tv_room_desc"
-            android:textColor="@color/color_75FBE2"
-            android:textSize="@dimen/sp_10"
-            android:layout_gravity="center"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:textColor="@color/color_75FBE2"
+            android:textSize="@dimen/sp_10" />
 
     </FrameLayout>
 
@@ -223,10 +222,12 @@
         android:id="@+id/iv_red_package"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_marginStart="15dp"
         android:scaleType="centerInside"
         android:src="@drawable/room_red_package_in"
-        android:visibility="gone" />
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="gone" />
 
-</RelativeLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From b63b4ba07a2bf17e4e5b878ad7372c5f892f7d5c Mon Sep 17 00:00:00 2001
From: Max <mxruan@163.com>
Date: Wed, 1 Nov 2023 11:34:43 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=B9=B8=E8=BF=90?=
 =?UTF-8?q?=E7=A4=BC=E7=89=A9=E9=87=8D=E5=A4=8D=E5=8A=A8=E6=95=88=EF=BC=88?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=9C=AC=E5=9C=B0=E8=87=AA=E5=B7=B1=E6=92=AD?=
 =?UTF-8?q?=E7=9A=84=E4=B8=80=E4=B8=AAsvga=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erban/avroom/widget/GiftV2View.java       | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/GiftV2View.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/GiftV2View.java
index 09c1f352c..e15c3fc08 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/widget/GiftV2View.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/GiftV2View.java
@@ -296,17 +296,16 @@ public class GiftV2View extends FrameLayout implements GiftEffectView.GiftEffect
         if (roomInfo != null) {
             List<GiftReceiver> targetUsers = new ArrayList<>();
             int totalCoin = 0;
-
-            if (AvRoomDataManager.get().mIsNeedGiftEffect &&
-                    !AvRoomDataManager.get().isSelfGamePlaying()) {
-                SVGAImageView imageView = playLuckyBagAnim(svgaUrl);
-                handler.postDelayed(() -> {
-                    removeView(imageView);
-                    imageView.stopAnimation(true);
-                }, 1800);
-            }
-
-            handler.postDelayed(() -> drawLuckyGiftAnimation(roomInfo, giftReceiveInfos, totalCoin, targetUsers, giftReceiveType, isShowAnimation, pos), 1200);
+            drawLuckyGiftAnimation(roomInfo, giftReceiveInfos, totalCoin, targetUsers, giftReceiveType, isShowAnimation, pos);
+//            if (AvRoomDataManager.get().mIsNeedGiftEffect &&
+//                    !AvRoomDataManager.get().isSelfGamePlaying()) {
+//                SVGAImageView imageView = playLuckyBagAnim(svgaUrl);
+//                handler.postDelayed(() -> {
+//                    removeView(imageView);
+//                    imageView.stopAnimation(true);
+//                }, 1800);
+//            }
+//            handler.postDelayed(() -> drawLuckyGiftAnimation(roomInfo, giftReceiveInfos, totalCoin, targetUsers, giftReceiveType, isShowAnimation, pos), 1200);
         }
     }