From d2bf4ae00db6d2d84457353f519532f034b9eebb Mon Sep 17 00:00:00 2001
From: Max <mxruan@163.com>
Date: Wed, 13 Dec 2023 15:39:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5peko=EF=BC=9A=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E4=B8=AA=E6=92=AD=E5=B0=8F=E6=97=B6=E6=A6=9C=E9=A3=98?=
 =?UTF-8?q?=E7=AA=97=E6=97=A0=E6=B3=95=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chwl/app/avroom/widget/RoomEffectView.kt  |  23 +++-
 .../layout/layout_single_room_rank_notify.xml | 108 +++++++++++-------
 2 files changed, 86 insertions(+), 45 deletions(-)

diff --git a/app/src/main/java/com/chwl/app/avroom/widget/RoomEffectView.kt b/app/src/main/java/com/chwl/app/avroom/widget/RoomEffectView.kt
index 83b559466..2f6f4d19f 100644
--- a/app/src/main/java/com/chwl/app/avroom/widget/RoomEffectView.kt
+++ b/app/src/main/java/com/chwl/app/avroom/widget/RoomEffectView.kt
@@ -230,7 +230,7 @@ class RoomEffectView @JvmOverloads constructor(
 
                     RoomEvent.ROOM_PK_NOTIFY -> addRoomPKNotify(roomEvent.chatRoomMessage)
                     RoomEvent.SINGLE_ROOM_PK_NOTIFY -> addSingleRoomPKNotify(roomEvent.chatRoomMessage)
-                    RoomEvent.SINGLE_ROOM_RANK_TOP_NOTIFY -> showRoomRankNotify(roomEvent.chatRoomMessage)
+                    RoomEvent.SINGLE_ROOM_RANK_TOP_NOTIFY -> showSingleRoomRankNotify(roomEvent.chatRoomMessage)
                     RoomEvent.ROOM_RANK_TOP_NOTIFY -> showRoomRankNotify(roomEvent.chatRoomMessage)
                     RoomEvent.ROOM_CAR_EFFECT_HIDE -> {
                         isHideCarEffect = true
@@ -1907,6 +1907,27 @@ class RoomEffectView @JvmOverloads constructor(
         )
     }
 
+    private fun showSingleRoomRankNotify(chatRoomMessage: ChatRoomMessage) {
+        if (binding.clNotify.visibility == GONE) {
+            binding.clNotify.visibility = VISIBLE
+        }
+        val roomPkBean = (chatRoomMessage.attachment as SingleRoomRankAttachment).msgBean
+        val rootView =
+            LayoutInflater.from(mContext).inflate(R.layout.layout_single_room_rank_notify, null)
+        (rootView.findViewById<View>(R.id.tv_nick) as TextView).text =
+            roomPkBean.nick.subAndReplaceDot(6)
+        (rootView.findViewById<View>(R.id.tv_desc) as TextView).text = roomPkBean.desc
+        rootView.findViewById<ImageView>(R.id.iv_avatar).load(roomPkBean.avatar)
+        rootView.setOnClickListener { AVRoomActivity.start(context, roomPkBean.uid) }
+        binding.flSingleRoomRankNotify.addView(rootView)
+        animationLuckyGift = AnimationUtils.loadAnimation(mContext, R.anim.anim_box_notify)
+        rootView.startAnimation(animationLuckyGift)
+        binding.flSingleRoomRankNotify.postDelayed({
+            binding.flSingleRoomRankNotify.removeView(
+                rootView
+            )
+        }, SHOW_TIME.toLong())
+    }
 
     private fun showRoomRankNotify(chatRoomMessage: ChatRoomMessage) {
         if (binding.clNotify.visibility == GONE) {
diff --git a/app/src/main/res/layout/layout_single_room_rank_notify.xml b/app/src/main/res/layout/layout_single_room_rank_notify.xml
index f5207b3c4..e432b8de8 100644
--- a/app/src/main/res/layout/layout_single_room_rank_notify.xml
+++ b/app/src/main/res/layout/layout_single_room_rank_notify.xml
@@ -5,54 +5,74 @@
     android:layout_height="match_parent"
     android:layout_gravity="center_horizontal"
     android:background="@drawable/room_bg_rank_notice"
-    android:gravity="center"
+    android:gravity="center_vertical"
     android:orientation="horizontal"
     android:paddingTop="4dp"
     tools:layout_height="60dp">
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:includeFontPadding="false"
-        android:text="@string/layout_layout_single_room_rank_notify_01"
-        android:textColor="@color/white"
-        android:textSize="@dimen/sp_13" />
-
-    <com.chwl.app.common.widget.CircleImageView
-        android:id="@+id/iv_avatar"
-        android:layout_width="22dp"
-        android:layout_height="22dp"
-        android:layout_marginStart="3dp"
-        android:layout_marginEnd="3dp"
-        android:includeFontPadding="false"
-        android:src="@drawable/default_avatar" />
-
-    <TextView
-        android:id="@+id/tv_nick"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:includeFontPadding="false"
-        android:textColor="#FFFFFC4C"
-        android:textSize="@dimen/sp_13"
-        tools:text="@string/layout_layout_single_room_rank_notify_02" />
-
-    <TextView
-        android:id="@+id/tv_desc"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:includeFontPadding="false"
-        android:textColor="@color/white"
-        android:textSize="@dimen/sp_13"
-        tools:text="@string/layout_layout_single_room_rank_notify_03" />
-
-    <TextView
-        android:id="@+id/tv_top"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_marginStart="65dp"
+        android:layout_weight="1"
         android:gravity="center"
-        android:includeFontPadding="false"
-        android:text="TOP1"
-        android:textColor="#FFFFFC4C"
-        android:textSize="13sp" />
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:includeFontPadding="false"
+            android:text="@string/layout_layout_single_room_rank_notify_01"
+            android:textColor="@color/white"
+            android:textSize="@dimen/sp_13" />
+
+        <com.chwl.app.common.widget.CircleImageView
+            android:id="@+id/iv_avatar"
+            android:layout_width="22dp"
+            android:layout_height="22dp"
+            android:layout_marginStart="3dp"
+            android:layout_marginEnd="3dp"
+            android:includeFontPadding="false"
+            android:src="@drawable/default_avatar" />
+
+        <TextView
+            android:id="@+id/tv_nick"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:includeFontPadding="false"
+            android:singleLine="true"
+            android:textColor="#FFFFFC4C"
+            android:textSize="@dimen/sp_13"
+            tools:text="Name" />
+
+        <TextView
+            android:id="@+id/tv_desc"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:includeFontPadding="false"
+            android:singleLine="true"
+            android:textColor="@color/white"
+            android:textSize="@dimen/sp_13"
+            tools:text="@string/layout_layout_single_room_rank_notify_03" />
+
+        <TextView
+            android:id="@+id/tv_top"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:includeFontPadding="false"
+            android:singleLine="true"
+            android:text="TOP1"
+            android:textColor="#FFFFFC4C"
+            android:textSize="13sp" />
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/iv_go_room"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="5dp"
+        android:layout_marginEnd="7dp"
+        android:src="@drawable/room_bg_rank_go_room" />
 
 </LinearLayout>
\ No newline at end of file