diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/ChangeNicknameActivity.java b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/ChangeNicknameActivity.java
index 8b7317b9..961d3f88 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/ChangeNicknameActivity.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/ChangeNicknameActivity.java
@@ -15,6 +15,8 @@ import com.xscm.moduleutil.utils.SpUtil;
 
 import org.greenrobot.eventbus.EventBus;
 
+import java.util.Objects;
+
 /**
  *@author qx
  *@data 2025/5/21
@@ -33,8 +35,10 @@ public class ChangeNicknameActivity extends BaseMvpActivity<ChangeNicknamePresen
         mBinding.topBar.setRightText("保存");
         mBinding.topBar.setRightColor(Color.parseColor("#FF8ACC"));
         mBinding.topBar.getTvRight().setOnClickListener(v -> {
-          if (!TextUtils.isEmpty(mBinding.edNickName.getText().toString())){
+          if (!TextUtils.isEmpty(Objects.requireNonNull(mBinding.edNickName.getText()).toString().trim())){
             MvpPre.editUserInfo(mBinding.edNickName.getText().toString(),"","","","","","");
+          }else {
+              ToastUtils.showShort("请输入有效的昵称");
           }
         });
         userInfo= SpUtil.getUserInfo();
diff --git a/MainModule/src/main/res/layout/activity_room_details.xml b/MainModule/src/main/res/layout/activity_room_details.xml
index 503f68f5..4d03db3c 100644
--- a/MainModule/src/main/res/layout/activity_room_details.xml
+++ b/MainModule/src/main/res/layout/activity_room_details.xml
@@ -122,7 +122,7 @@
                         android:layout_marginTop="@dimen/dp_5"
                         android:drawableLeft="@mipmap/im_zs"
                         android:drawablePadding="@dimen/dp_5"
-                        android:text="10000"
+                        tools:text="10000"
                         android:textColor="@color/color_FF333333"
                         android:textSize="23sp" />
 
@@ -146,7 +146,7 @@
                         android:layout_marginTop="@dimen/dp_3"
                         android:paddingBottom="@dimen/dp_3"
                         android:drawableLeft="@mipmap/jinb"
-                        android:text="10000"
+                        tools:text="10000"
                         android:textColor="@color/color_FF333333"
                         android:textSize="14sp" />
 
diff --git a/MainModule/src/main/res/layout/dialog_emotion_picker.xml b/MainModule/src/main/res/layout/dialog_emotion_picker.xml
index 0043e643..7dfa91cf 100644
--- a/MainModule/src/main/res/layout/dialog_emotion_picker.xml
+++ b/MainModule/src/main/res/layout/dialog_emotion_picker.xml
@@ -1,62 +1,60 @@
 <?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:app="http://schemas.android.com/apk/res-auto">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@drawable/bg_rounded_top_white">
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/bg_rounded_top_white">
 
 
         <!-- TabLayout -->
         <com.google.android.material.tabs.TabLayout
-                android:id="@+id/tab_layout"
-                android:layout_width="wrap_content"
-                android:layout_height="48dp"
-                android:layout_marginTop="16dp"
-                android:layout_marginStart="@dimen/dp_16"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:tabIndicatorColor="@color/white"
-                app:tabSelectedTextColor="@color/white"
-                app:tabIndicatorHeight="2dp"
-                app:tabTextColor="#999999"
-                app:tabTextAppearance="@style/CustomTextAppearanceTab"
-               />
+            android:id="@+id/tab_layout"
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:layout_marginHorizontal="@dimen/dp_16"
+            android:layout_marginTop="16dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:tabIndicatorColor="@color/white"
+            app:tabIndicatorHeight="2dp"
+            app:tabMode="scrollable"
+            app:tabSelectedTextColor="@color/white"
+            app:tabTextAppearance="@style/CustomTextAppearanceTab"
+            app:tabTextColor="#999999" />
 
         <!-- 分割线 -->
         <View
-                android:id="@+id/divider"
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="#2C2A38"
-                android:layout_marginStart="@dimen/dp_16"
-                android:layout_marginEnd="@dimen/dp_16"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/tab_layout"/>
+            android:id="@+id/divider"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginStart="@dimen/dp_16"
+            android:layout_marginEnd="@dimen/dp_16"
+            android:background="#2C2A38"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tab_layout" />
 
         <!-- 表情列表 -->
         <com.scwang.smartrefresh.layout.SmartRefreshLayout
-                android:id="@+id/swipe_refresh_layout"
-                android:layout_width="match_parent"
-                android:layout_height="300dp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/divider"
-                android:paddingEnd="@dimen/dp_28"
-                android:paddingStart="@dimen/dp_28"
-                app:srlEnableLoadMore="false"
-                app:srlEnableRefresh="false"
-                >
+            android:id="@+id/swipe_refresh_layout"
+            android:layout_width="match_parent"
+            android:layout_height="300dp"
+            android:paddingStart="@dimen/dp_28"
+            android:paddingEnd="@dimen/dp_28"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/divider"
+            app:srlEnableLoadMore="false"
+            app:srlEnableRefresh="false">
 
             <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/rv_emotions"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:overScrollMode="never"/>
+                android:id="@+id/rv_emotions"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:overScrollMode="never" />
         </com.scwang.smartrefresh.layout.SmartRefreshLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/MainModule/src/main/res/layout/item_emotion.xml b/MainModule/src/main/res/layout/item_emotion.xml
index 8c97ed19..32908721 100644
--- a/MainModule/src/main/res/layout/item_emotion.xml
+++ b/MainModule/src/main/res/layout/item_emotion.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="@dimen/dp_60"
     android:layout_height="@dimen/dp_85"
+    android:layout_marginVertical="@dimen/dp_5"
     xmlns:tools="http://schemas.android.com/tools"
     >