From 314ce6007d349af49cf9b5ecf7de08ffcfdf5a48 Mon Sep 17 00:00:00 2001
From: lzl <1239365383@qq.com>
Date: Tue, 9 Dec 2025 19:04:19 +0800
Subject: [PATCH] fix bugs. 1

---
 .../activity/room/activity/RoomActivity.kt    |   1 +
 .../res/layout/fragment_friendship_room.xml   |   2 +-
 .../layout/layout_room_mentorship_wheat.xml   | 158 ++++++++++--------
 3 files changed, 88 insertions(+), 73 deletions(-)

diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt
index 198789da..b9e69c68 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt
@@ -2531,6 +2531,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
         pitBean.nickname = messageEvent.text.fromUserInfo.nickname
         pitBean.sex = messageEvent.text.fromUserInfo.sex.toString() + ""
         pitBean.charm = messageEvent.text.fromUserInfo.charm
+        pitBean.dress = messageEvent.text.fromUserInfo.dress
         pitBean.is_online = messageEvent.text.fromUserInfo.is_online
         return pitBean
     }
diff --git a/MainModule/src/main/res/layout/fragment_friendship_room.xml b/MainModule/src/main/res/layout/fragment_friendship_room.xml
index a14c5588..ca14806e 100644
--- a/MainModule/src/main/res/layout/fragment_friendship_room.xml
+++ b/MainModule/src/main/res/layout/fragment_friendship_room.xml
@@ -6,7 +6,7 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_330">
+        android:layout_height="@dimen/dp_340">
 
 
         <com.xscm.moduleutil.widget.RoomFriendshipWheatView
diff --git a/MainModule/src/main/res/layout/layout_room_mentorship_wheat.xml b/MainModule/src/main/res/layout/layout_room_mentorship_wheat.xml
index 436807e8..531615cc 100644
--- a/MainModule/src/main/res/layout/layout_room_mentorship_wheat.xml
+++ b/MainModule/src/main/res/layout/layout_room_mentorship_wheat.xml
@@ -17,26 +17,95 @@
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
+            android:clipChildren="false"
+            android:clipToPadding="false"
             app:layout_constraintDimensionRatio="0dp"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            android:clipChildren="false"
-            android:clipToPadding="false">
+            app:layout_constraintTop_toTopOf="parent">
 
-
-            <!-- 用户头像 -->
-            <com.xscm.moduleutil.widget.CircularImage
-                android:id="@+id/riv"
-                android:layout_width="0dp"
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
                 android:layout_height="0dp"
-                android:scaleType="fitCenter"
-                android:src="@mipmap/room_ic_wheat_default"
-                app:layout_constraintBottom_toBottomOf="@id/gl_center"
+                android:clipChildren="false"
+                android:clipToPadding="false"
                 app:layout_constraintDimensionRatio="1:1"
-                app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="@id/gl_center"
-                app:layout_constraintWidth_percent="0.9" />
+                app:layout_constraintTop_toTopOf="parent">
+
+                <!-- 用户头像 -->
+                <com.xscm.moduleutil.widget.CircularImage
+                    android:id="@+id/riv"
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    android:scaleType="fitCenter"
+                    android:src="@mipmap/room_ic_wheat_default"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintDimensionRatio="1:1"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintWidth_percent="0.8" />
+
+
+                <!-- 头像框 - 包裹头像 -->
+                <com.xscm.moduleutil.widget.AvatarFrameView
+                    android:id="@+id/iv_frame"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:adjustViewBounds="true"
+                    android:scaleType="fitCenter"
+                    android:visibility="gone"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintDimensionRatio="1:1"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:visibility="visible" />
+
+                <!-- 离线状态 - 与头像框同样大小 -->
+                <ImageView
+                    android:id="@+id/iv_online"
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    android:src="@mipmap/room_ic_owner_offline"
+                    android:visibility="gone"
+                    app:layout_constraintBottom_toBottomOf="@id/riv"
+                    app:layout_constraintEnd_toEndOf="@id/riv"
+                    app:layout_constraintStart_toStartOf="@id/riv"
+                    app:layout_constraintTop_toTopOf="@id/riv"
+                    tools:visibility="visible" />
+
+                <!-- 麦圈 - 在头像框上面展示 -->
+                <com.opensource.svgaplayer.SVGAImageView
+                    android:id="@+id/iv_ripple"
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    android:layout_marginStart="-4dp"
+                    android:layout_marginTop="-4dp"
+                    android:layout_marginEnd="-4dp"
+                    android:layout_marginBottom="-4dp"
+                    app:autoPlay="false"
+                    app:layout_constraintWidth_percent="0.85"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintDimensionRatio="1:1"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:loopCount="0"
+                    app:source="mic.svga" />
+                <!-- 角色标签 - 头像下方覆盖部分头像 -->
+                <ImageView
+                    android:id="@+id/iv_tag_type"
+                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/dp_13"
+                    android:scaleType="fitCenter"
+                    android:src="@mipmap/zc"
+                    android:visibility="gone"
+                    app:layout_constraintBottom_toBottomOf="@id/riv"
+                    app:layout_constraintEnd_toEndOf="@id/riv"
+                    app:layout_constraintStart_toStartOf="@id/riv" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
 
 
             <androidx.constraintlayout.widget.Guideline
@@ -47,51 +116,6 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
-
-            <!-- 头像框 - 包裹头像 -->
-            <com.xscm.moduleutil.widget.AvatarFrameView
-                android:id="@+id/iv_frame"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:adjustViewBounds="true"
-                android:scaleType="fitCenter"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="@id/gl_center"
-                app:layout_constraintDimensionRatio="1.1"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="@id/gl_center"
-                app:layout_constraintWidth_percent="1"
-                tools:visibility="visible" />
-
-            <!-- 离线状态 - 与头像框同样大小 -->
-            <ImageView
-                android:id="@+id/iv_online"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:src="@mipmap/room_ic_owner_offline"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="@id/iv_frame"
-                app:layout_constraintEnd_toEndOf="@id/iv_frame"
-                app:layout_constraintStart_toStartOf="@id/iv_frame"
-                app:layout_constraintTop_toTopOf="@id/iv_frame"
-                tools:visibility="visible" />
-
-            <!-- 麦圈 - 在头像框上面展示 -->
-            <com.opensource.svgaplayer.SVGAImageView
-                android:id="@+id/iv_ripple"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                app:autoPlay="false"
-                app:layout_constraintBottom_toBottomOf="@id/gl_center"
-                app:layout_constraintDimensionRatio="1:1"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="@id/gl_center"
-                app:layout_constraintWidth_percent="1"
-                app:loopCount="0"
-                app:source="mic.svga" />
-
             <!-- 麦克风状态 - 头像框右下角 -->
             <ImageView
                 android:id="@+id/iv_shutup"
@@ -127,12 +151,12 @@
             <com.xscm.moduleutil.widget.WheatCharmView
                 android:id="@+id/charm_view"
                 android:layout_width="wrap_content"
-                android:minWidth="@dimen/dp_20"
                 android:layout_height="@dimen/dp_12"
+                android:backgroundTint="@color/transparent"
                 android:clipChildren="false"
                 android:clipToPadding="false"
+                android:minWidth="@dimen/dp_20"
                 android:visibility="gone"
-                android:backgroundTint="@color/transparent"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent" />
@@ -148,17 +172,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="@id/gl_center" />
 
-            <!-- 角色标签 - 头像下方覆盖部分头像 -->
-            <ImageView
-                android:id="@+id/iv_tag_type"
-                android:layout_width="wrap_content"
-                android:layout_height="@dimen/dp_13"
-                android:scaleType="fitCenter"
-                android:src="@mipmap/zc"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="@id/riv"
-                app:layout_constraintEnd_toEndOf="@id/riv"
-                app:layout_constraintStart_toStartOf="@id/riv" />
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>