diff --git a/.idea/GitCommitMessageStorage.xml b/.idea/GitCommitMessageStorage.xml
index 3b56900..e4fd56a 100644
--- a/.idea/GitCommitMessageStorage.xml
+++ b/.idea/GitCommitMessageStorage.xml
@@ -2,19 +2,7 @@
 <project version="4">
   <component name="GitCommitMessageStorage">
     <option name="messageStorage">
-      <MessageStorage>
-        <option name="commitTemplate">
-          <CommitTemplate>
-            <option name="body" value="" />
-            <option name="changes" value="" />
-            <option name="closes" value="" />
-            <option name="scope" value="" />
-            <option name="skipCi" value="" />
-            <option name="subject" value="" />
-            <option name="type" value="feat" />
-          </CommitTemplate>
-        </option>
-      </MessageStorage>
+      <MessageStorage />
     </option>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/src/main/java/com/kaixed/kchat/ui/activity/LaunchActivity.kt b/app/src/main/java/com/kaixed/kchat/ui/activity/LaunchActivity.kt
index 6f8c931..2544b26 100644
--- a/app/src/main/java/com/kaixed/kchat/ui/activity/LaunchActivity.kt
+++ b/app/src/main/java/com/kaixed/kchat/ui/activity/LaunchActivity.kt
@@ -39,7 +39,6 @@ class LaunchActivity : BaseActivity<ActivityLaunchBinding>() {
 
     }
 
-
     @SuppressLint("DiscouragedApi", "InternalInsetResource")
     private fun getStatusBarHeight(): Int {
         var result = 0
@@ -51,7 +50,6 @@ class LaunchActivity : BaseActivity<ActivityLaunchBinding>() {
         return result
     }
 
-
     private fun navigateToMain() {
         val intent = Intent(this, MainActivity::class.java)
         startActivity(intent)
@@ -67,4 +65,4 @@ class LaunchActivity : BaseActivity<ActivityLaunchBinding>() {
             startActivity(Intent(this, RegisterActivity::class.java))
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/res/layout/chat_recycle_item_custom_mine.xml b/app/src/main/res/layout/chat_recycle_item_custom_mine.xml
deleted file mode 100644
index f0c4fa2..0000000
--- a/app/src/main/res/layout/chat_recycle_item_custom_mine.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/main"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingBottom="10dp">
-
-    <TextView
-        android:id="@+id/tv_timer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:paddingTop="20dp"
-        android:text="昨天"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <androidx.constraintlayout.utils.widget.ImageFilterView
-        android:id="@+id/ifv_avatar"
-        android:layout_width="35dp"
-        android:layout_height="35dp"
-        android:layout_marginVertical="20dp"
-        android:layout_marginEnd="10dp"
-        android:src="@drawable/ic_avatar"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tv_timer"
-        app:roundPercent="0.3" />
-
-    <TextView
-        android:id="@+id/tv_message_content"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="10dp"
-        android:background="@drawable/chat_send_btn_bac_mine"
-        android:gravity="center_vertical"
-        android:maxWidth="250dp"
-        android:minHeight="35dp"
-        android:paddingHorizontal="12dp"
-        android:paddingVertical="6dp"
-        android:text="haha"
-        android:textColor="@color/white"
-        android:textColorHighlight="#CCCCCC"
-        android:textIsSelectable="true"
-        android:textSize="17sp"
-        app:layout_constraintEnd_toStartOf="@id/ifv_avatar"
-        app:layout_constraintTop_toTopOf="@id/ifv_avatar"
-        app:layout_goneMarginEnd="10dp" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_recycle_item_custom_normal.xml b/app/src/main/res/layout/chat_recycle_item_custom_normal.xml
index dfec6b1..02fd07d 100644
--- a/app/src/main/res/layout/chat_recycle_item_custom_normal.xml
+++ b/app/src/main/res/layout/chat_recycle_item_custom_normal.xml
@@ -16,6 +16,18 @@
         android:textSize="12sp"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <TextView
+        android:id="@+id/tv_nickname"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="10dp"
+        android:text="糕小菜菜"
+        android:textColor="@color/black"
+        android:textSize="11sp"
+        android:visibility="gone"
+        app:layout_constraintStart_toEndOf="@id/ifv_avatar"
+        app:layout_constraintTop_toTopOf="@id/ifv_avatar" />
+
     <androidx.constraintlayout.utils.widget.ImageFilterView
         android:id="@+id/ifv_avatar"
         android:layout_width="35dp"
@@ -32,26 +44,27 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
+        android:layout_marginTop="3dp"
         android:background="@drawable/chat_send_btn_bac_mine"
         android:gravity="center_vertical"
         android:maxWidth="250dp"
         android:minHeight="35dp"
         android:paddingHorizontal="12dp"
         android:paddingVertical="6dp"
-        android:text="haha"
         android:textColor="@color/white"
         android:textColorHighlight="#CCCCCC"
         android:textIsSelectable="true"
         android:textSize="17sp"
         app:layout_constraintStart_toEndOf="@id/ifv_avatar"
-        app:layout_constraintTop_toTopOf="@id/ifv_avatar" />
+        app:layout_constraintTop_toBottomOf="@id/tv_nickname"
+        app:layout_goneMarginTop="0dp" />
 
     <androidx.constraintlayout.utils.widget.ImageFilterView
         android:id="@+id/ifv_avatar_mine"
         android:layout_width="35dp"
         android:layout_height="35dp"
-        android:layout_marginEnd="10dp"
         android:layout_marginVertical="20dp"
+        android:layout_marginEnd="10dp"
         android:src="@drawable/ic_avatar"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tv_timer"
@@ -61,13 +74,13 @@
         android:id="@+id/tv_msg_content_mine"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="10dp"
         android:background="@drawable/chat_send_btn_bac_mine"
         android:gravity="center_vertical"
         android:maxWidth="250dp"
         android:minHeight="35dp"
         android:paddingHorizontal="12dp"
         android:paddingVertical="6dp"
-        android:layout_marginEnd="10dp"
         android:text="haha"
         android:textColor="@color/white"
         android:textColorHighlight="#CCCCCC"
diff --git a/app/src/main/res/layout/chat_recycle_item_custom_other.xml b/app/src/main/res/layout/chat_recycle_item_custom_other.xml
deleted file mode 100644
index 2415113..0000000
--- a/app/src/main/res/layout/chat_recycle_item_custom_other.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/main"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingBottom="10dp">
-
-    <TextView
-        android:id="@+id/tv_timer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:paddingTop="20dp"
-        android:text="昨天"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <androidx.constraintlayout.utils.widget.ImageFilterView
-        android:id="@+id/ifv_avatar"
-        android:layout_width="35dp"
-        android:layout_height="35dp"
-        android:layout_marginVertical="20dp"
-        android:layout_marginStart="10dp"
-        android:src="@drawable/ic_avatar"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tv_timer"
-        app:roundPercent="0.3" />
-
-    <TextView
-        android:id="@+id/tv_message_content"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="10dp"
-        android:layout_marginEnd="10dp"
-        android:background="@drawable/chat_send_btn_bac_mine"
-        android:gravity="center_vertical"
-        android:maxWidth="250dp"
-        android:minHeight="35dp"
-        android:paddingHorizontal="8dp"
-        android:paddingVertical="3dp"
-        android:text="你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好"
-        android:textColor="@color/white"
-        android:textColorHighlight="#CCCCCC"
-        android:textIsSelectable="true"
-        android:textSize="17sp"
-        app:layout_constraintStart_toEndOf="@id/ifv_avatar"
-        app:layout_constraintTop_toTopOf="@id/ifv_avatar" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_recycle_item_image_mine.xml b/app/src/main/res/layout/chat_recycle_item_image_mine.xml
deleted file mode 100644
index 710dfdd..0000000
--- a/app/src/main/res/layout/chat_recycle_item_image_mine.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingVertical="10dp">
-
-    <TextView
-        android:id="@+id/tv_timer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:paddingTop="20dp"
-        android:text="昨天"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <androidx.constraintlayout.utils.widget.ImageFilterView
-        android:id="@+id/ifv_avatar"
-        android:layout_width="35dp"
-        android:layout_height="35dp"
-        android:layout_marginVertical="20dp"
-        android:layout_marginEnd="10dp"
-        android:src="@drawable/ic_avatar"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tv_timer"
-        app:roundPercent="0.3" />
-
-    <androidx.constraintlayout.utils.widget.ImageFilterView
-        android:id="@+id/image"
-        android:layout_width="150dp"
-        android:layout_height="100dp"
-        android:layout_marginEnd="10dp"
-        android:scaleType="centerCrop"
-        app:layout_constraintEnd_toStartOf="@id/ifv_avatar"
-        app:layout_constraintTop_toTopOf="@id/ifv_avatar"
-        app:roundPercent="0.2" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_recycle_item_image_normal.xml b/app/src/main/res/layout/chat_recycle_item_image_normal.xml
index d50bd64..b95beab 100644
--- a/app/src/main/res/layout/chat_recycle_item_image_normal.xml
+++ b/app/src/main/res/layout/chat_recycle_item_image_normal.xml
@@ -21,19 +21,33 @@
         android:layout_height="35dp"
         android:layout_marginVertical="20dp"
         android:layout_marginStart="10dp"
-        app:layout_constraintStart_toStartOf="parent"
         android:src="@drawable/ic_avatar"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tv_timer"
         app:roundPercent="0.3" />
 
+    <TextView
+        android:id="@+id/tv_nickname"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="10dp"
+        android:text="糕小菜菜"
+        android:textColor="@color/black"
+        android:textSize="11sp"
+        android:visibility="gone"
+        app:layout_constraintStart_toEndOf="@id/ifv_avatar"
+        app:layout_constraintTop_toTopOf="@id/ifv_avatar" />
+
     <androidx.constraintlayout.utils.widget.ImageFilterView
         android:id="@+id/image"
         android:layout_width="150dp"
         android:layout_height="100dp"
         android:layout_marginStart="10dp"
+        android:layout_marginTop="3dp"
         android:scaleType="centerCrop"
         app:layout_constraintStart_toEndOf="@id/ifv_avatar"
-        app:layout_constraintTop_toTopOf="@id/ifv_avatar"
+        app:layout_constraintTop_toBottomOf="@id/tv_nickname"
+        app:layout_goneMarginTop="0dp"
         app:roundPercent="0.15" />
 
     <androidx.constraintlayout.utils.widget.ImageFilterView
@@ -42,8 +56,8 @@
         android:layout_height="35dp"
         android:layout_marginVertical="20dp"
         android:layout_marginEnd="10dp"
-        app:layout_constraintEnd_toEndOf="parent"
         android:src="@drawable/ic_avatar"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tv_timer"
         app:roundPercent="0.3" />
 
diff --git a/app/src/main/res/layout/chat_recycle_item_image_other.xml b/app/src/main/res/layout/chat_recycle_item_image_other.xml
deleted file mode 100644
index e33695e..0000000
--- a/app/src/main/res/layout/chat_recycle_item_image_other.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingVertical="10dp">
-
-    <TextView
-        android:id="@+id/tv_timer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:paddingTop="20dp"
-        android:text="昨天"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <androidx.constraintlayout.utils.widget.ImageFilterView
-        android:id="@+id/ifv_avatar"
-        android:layout_width="35dp"
-        android:layout_height="35dp"
-        android:layout_marginVertical="20dp"
-        android:layout_marginStart="10dp"
-        android:src="@drawable/ic_avatar"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tv_timer"
-        app:roundPercent="0.3" />
-
-    <androidx.constraintlayout.utils.widget.ImageFilterView
-        android:id="@+id/image"
-        android:layout_width="150dp"
-        android:layout_height="100dp"
-        android:layout_marginStart="10dp"
-        android:scaleType="centerCrop"
-        app:layout_constraintStart_toEndOf="@id/ifv_avatar"
-        app:layout_constraintTop_toTopOf="@id/ifv_avatar"
-        app:roundPercent="0.2" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_recycle_item_location_mine.xml b/app/src/main/res/layout/chat_recycle_item_location_mine.xml
deleted file mode 100644
index b464f46..0000000
--- a/app/src/main/res/layout/chat_recycle_item_location_mine.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingVertical="10dp">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="这是一个小tip"
-        android:textColor="@color/black"
-        android:textSize="12sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_recycle_item_location_other.xml b/app/src/main/res/layout/chat_recycle_item_location_other.xml
deleted file mode 100644
index b464f46..0000000
--- a/app/src/main/res/layout/chat_recycle_item_location_other.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingVertical="10dp">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="这是一个小tip"
-        android:textColor="@color/black"
-        android:textSize="12sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_recycle_item_red_packet_mine.xml b/app/src/main/res/layout/chat_recycle_item_red_packet_mine.xml
deleted file mode 100644
index b464f46..0000000
--- a/app/src/main/res/layout/chat_recycle_item_red_packet_mine.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingVertical="10dp">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="这是一个小tip"
-        android:textColor="@color/black"
-        android:textSize="12sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_recycle_item_red_packet_other.xml b/app/src/main/res/layout/chat_recycle_item_red_packet_other.xml
deleted file mode 100644
index b464f46..0000000
--- a/app/src/main/res/layout/chat_recycle_item_red_packet_other.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingVertical="10dp">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="这是一个小tip"
-        android:textColor="@color/black"
-        android:textSize="12sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_recycle_item_voice_mine.xml b/app/src/main/res/layout/chat_recycle_item_voice_mine.xml
deleted file mode 100644
index 26dc561..0000000
--- a/app/src/main/res/layout/chat_recycle_item_voice_mine.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingVertical="10dp">
-
-    <androidx.constraintlayout.utils.widget.ImageFilterView
-        android:id="@+id/ifv_avatar"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:layout_marginEnd="10dp"
-        android:src="@drawable/ic_avatar"
-        app:layout_constraintTop_toTopOf="parent"
-        app:roundPercent="0.3" />
-
-    <ImageView
-        android:id="@+id/iv_content"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="10dp"
-        android:maxWidth="200dp"
-        android:maxHeight="200dp"
-        app:layout_constraintStart_toEndOf="@id/ifv_avatar"
-        app:layout_constraintTop_toTopOf="@id/ifv_avatar" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_recycle_item_voice_other.xml b/app/src/main/res/layout/chat_recycle_item_voice_other.xml
deleted file mode 100644
index 26dc561..0000000
--- a/app/src/main/res/layout/chat_recycle_item_voice_other.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingVertical="10dp">
-
-    <androidx.constraintlayout.utils.widget.ImageFilterView
-        android:id="@+id/ifv_avatar"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:layout_marginEnd="10dp"
-        android:src="@drawable/ic_avatar"
-        app:layout_constraintTop_toTopOf="parent"
-        app:roundPercent="0.3" />
-
-    <ImageView
-        android:id="@+id/iv_content"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="10dp"
-        android:maxWidth="200dp"
-        android:maxHeight="200dp"
-        app:layout_constraintStart_toEndOf="@id/ifv_avatar"
-        app:layout_constraintTop_toTopOf="@id/ifv_avatar" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file