diff --git a/app/src/main/java/com/yizhuan/erban/avroom/redpackage/open/RedPackageOpenDialog2.kt b/app/src/main/java/com/yizhuan/erban/avroom/redpackage/open/RedPackageOpenDialog2.kt
index 90b779bb3..076e597a7 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/redpackage/open/RedPackageOpenDialog2.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/redpackage/open/RedPackageOpenDialog2.kt
@@ -4,14 +4,16 @@ package com.yizhuan.erban.avroom.redpackage.open
 import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
 import android.animation.ObjectAnimator
+import android.animation.ValueAnimator
 import android.annotation.SuppressLint
 import android.view.View
 import android.view.WindowManager
 import android.view.animation.AccelerateDecelerateInterpolator
+import androidx.core.view.isVisible
 import com.yizhuan.erban.R
 import com.yizhuan.erban.base.BaseDialog
-import com.yizhuan.erban.databinding.DialogRedPackageOpenBinding
 import com.yizhuan.erban.databinding.RedPackageOpenDialogBinding
+import com.yizhuan.erban.ui.utils.loadAvatar
 import com.yizhuan.xchat_android_core.redpackage.*
 import com.yizhuan.xchat_android_library.annatation.ActLayoutRes
 import com.yizhuan.xchat_android_library.utils.SingleToastUtil
@@ -33,13 +35,24 @@ class RedPackageOpenDialog2 : BaseDialog<RedPackageOpenDialogBinding>() {
 
     override fun init() {
         dialog?.setCanceledOnTouchOutside(false)
+
+        binding.ivClose.setOnClickListener {
+            dismissAllowingStateLoss()
+        }
+
+        binding.layoutBtn.setOnClickListener {
+            startRedPacketAnim(it)
+        }
     }
 
+
     @SuppressLint("CheckResult")
     private fun startRedPacketAnim(v: View) {
         mObjectAnimator = ObjectAnimator.ofFloat(v, "rotationY", 0f, 360f)
         mObjectAnimator?.let {
             it.duration = 1500
+            it.repeatCount = ValueAnimator.INFINITE
+            it.repeatMode = ValueAnimator.RESTART
             it.interpolator = AccelerateDecelerateInterpolator()
             it.addListener(object : AnimatorListenerAdapter() {
 
@@ -69,4 +82,28 @@ class RedPackageOpenDialog2 : BaseDialog<RedPackageOpenDialogBinding>() {
         dismissAllowingStateLoss()
     }
 
+    /**
+     * 待领取状态
+     */
+    private fun switchToPending(data: RedPackageNotifyInfo) {
+        binding.layoutContent.setBackgroundResource(R.drawable.red_package_open_bg)
+        binding.groupOpened.isVisible = false
+        binding.groupOpen.isVisible = true
+
+        binding.ivSendAvatar.loadAvatar(data.sendUserAvatar)
+        binding.tvSendName.text = data.sendUserNick
+    }
+
+    /**
+     * 打开状态
+     */
+    private fun switchToOpened(data: RedPackageInfo) {
+        binding.layoutContent.setBackgroundResource(R.drawable.red_package_opened_bg)
+        binding.groupOpen.isVisible = false
+        binding.groupOpened.isVisible = true
+
+        binding.ivOpenedSendAvatar.loadAvatar(data.redEnvelopeVO?.userVO?.avatar)
+        binding.tvOpenedSendName.text = data.redEnvelopeVO?.userVO?.nick ?: ""
+        binding.tvMoney.text = ""
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_e03654_28.xml b/app/src/main/res/drawable/shape_e03654_28.xml
new file mode 100644
index 000000000..be05b6928
--- /dev/null
+++ b/app/src/main/res/drawable/shape_e03654_28.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="28dp"/>
+    <solid android:color="#FFE03654"/>
+</shape>
diff --git a/app/src/main/res/layout/red_package_open_dialog.xml b/app/src/main/res/layout/red_package_open_dialog.xml
index c10c7cc44..cae0ac16e 100644
--- a/app/src/main/res/layout/red_package_open_dialog.xml
+++ b/app/src/main/res/layout/red_package_open_dialog.xml
@@ -85,14 +85,16 @@
                 android:layout_height="36dp"
                 android:background="@drawable/red_package_open_tips_bg"
                 android:gravity="center"
+                android:paddingHorizontal="5dp"
                 android:textColor="@color/white"
                 android:textSize="11dp"
-                android:paddingHorizontal="5dp"
+                android:visibility="gone"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="@id/line_tips_top"
                 app:layout_constraintWidth_percent="0.7064"
-                tools:text="恭喜发财！" />
+                tools:text="恭喜发财！"
+                tools:visibility="visible" />
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/layout_btn"
@@ -287,11 +289,15 @@
                 android:layout_height="0dp"
                 android:layout_marginTop="8dp"
                 android:layout_marginBottom="5dp"
+                android:background="@drawable/shape_e03654_28"
+                android:orientation="vertical"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                 app:layout_constraintBottom_toTopOf="@id/tv_count"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tv_message"
-                app:layout_constraintWidth_percent="0.6819" />
+                app:layout_constraintWidth_percent="0.6819"
+                tools:listitem="@layout/red_package_open_item_record" />
 
             <androidx.constraintlayout.widget.Group
                 android:id="@+id/group_opened"
diff --git a/app/src/main/res/layout/red_package_open_item_record.xml b/app/src/main/res/layout/red_package_open_item_record.xml
new file mode 100644
index 000000000..6bc14e474
--- /dev/null
+++ b/app/src/main/res/layout/red_package_open_item_record.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout 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">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/layout_root"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        tools:background="@color/black">
+
+        <com.yizhuan.erban.common.widget.CircleImageView
+            android:id="@+id/iv_avatar"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:layout_marginStart="15dp"
+            app:cborder_color="@color/white"
+            app:cborder_width="1dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:src="@drawable/default_avatar" />
+
+        <TextView
+            android:id="@+id/tv_name"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="5dp"
+            android:layout_marginEnd="10dp"
+            android:ellipsize="end"
+            android:textColor="@color/color_white"
+            android:textSize="12dp"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toTopOf="@id/tv_time"
+            app:layout_constraintEnd_toStartOf="@id/iv_money"
+            app:layout_constraintStart_toEndOf="@id/iv_avatar"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_chainStyle="packed"
+            tools:text="Name" />
+
+        <TextView
+            android:id="@+id/tv_time"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textColor="@color/color_white_60"
+            android:textSize="9dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="@id/tv_name"
+            app:layout_constraintStart_toStartOf="@id/tv_name"
+            app:layout_constraintTop_toBottomOf="@id/tv_name"
+            tools:text="10月23日 12:00" />
+
+        <TextView
+            android:id="@+id/tv_money"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="15dp"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textColor="@color/white"
+            android:textSize="16dp"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="0" />
+
+        <ImageView
+            android:id="@+id/iv_money"
+            android:layout_width="19dp"
+            android:layout_height="19dp"
+            android:layout_marginEnd="1dp"
+            android:src="@drawable/red_package_send_ic_diamond"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/tv_money"
+            app:layout_constraintTop_toTopOf="parent" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/red_package_private_item_type.xml b/app/src/main/res/layout/red_package_private_item_type.xml
index 11495e7cf..9f321ede9 100644
--- a/app/src/main/res/layout/red_package_private_item_type.xml
+++ b/app/src/main/res/layout/red_package_private_item_type.xml
@@ -7,8 +7,7 @@
         android:id="@+id/layout_root"
         android:background="@drawable/shape_f8f8fa_8"
         android:layout_width="94dp"
-        android:layout_height="62dp"
-        android:orientation="vertical">
+        android:layout_height="62dp">
 
         <TextView
             android:id="@+id/tv_name"
@@ -16,7 +15,7 @@
             android:layout_height="wrap_content"
             android:gravity="center"
             android:textColor="@color/color_767585"
-            android:textSize="12sp"
+            android:textSize="12dp"
             app:layout_constraintBottom_toTopOf="@id/tv_tips"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintVertical_chainStyle="packed"
@@ -28,7 +27,7 @@
             android:layout_height="wrap_content"
             android:gravity="center"
             android:textColor="@color/color_94959C"
-            android:textSize="10sp"
+            android:textSize="10dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tv_name"
             tools:text="Tips" />