From 3c839068707554b1a9cfff4863ed7528b26b0a16 Mon Sep 17 00:00:00 2001
From: lzl <1239365383@qq.com>
Date: Fri, 21 Nov 2025 10:23:36 +0800
Subject: [PATCH] user home

---
 .../user/fragment/UserHomepageFragment.java   |  7 +-
 .../res/layout/fragment_room_user_info.xml    | 12 ++--
 MainModule/src/main/res/layout/user_top.xml   | 69 ++++++++++++++++---
 3 files changed, 69 insertions(+), 19 deletions(-)

diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/UserHomepageFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/UserHomepageFragment.java
index 355384f1..4eda8c9a 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/UserHomepageFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/UserHomepageFragment.java
@@ -196,9 +196,9 @@ public class UserHomepageFragment extends BaseMvpFragment<UserHomepagePresenter,
         mBinding.headerInfo.tvGsSx.setOnClickListener(this::onClick);
         refreshView();
         if (userInfo.getGuild() == null || userInfo.getGuild().isEmpty()) {
-            mBinding.headerInfo.tvGH.setVisibility(View.GONE);
+            mBinding.headerInfo.ctlGuild.setVisibility(View.GONE);
         } else {
-            mBinding.headerInfo.tvGH.setVisibility(View.VISIBLE);
+            mBinding.headerInfo.ctlGuild.setVisibility(View.VISIBLE);
             mBinding.headerInfo.tvGH.setText(userInfo.getGuild());
         }
 
@@ -278,6 +278,9 @@ public class UserHomepageFragment extends BaseMvpFragment<UserHomepagePresenter,
                     break;
             }
             mBinding.headerInfo.llCpAnimAvatar.setLayoutParams(params);
+        }else {
+            mBinding.headerInfo.llCp.setVisibility(GONE);
+            mBinding.headerInfo.rlCpAnim.setVisibility(GONE);
         }
     }
     private void refreshView() {
diff --git a/MainModule/src/main/res/layout/fragment_room_user_info.xml b/MainModule/src/main/res/layout/fragment_room_user_info.xml
index 0a9d7529..7f19114f 100644
--- a/MainModule/src/main/res/layout/fragment_room_user_info.xml
+++ b/MainModule/src/main/res/layout/fragment_room_user_info.xml
@@ -81,7 +81,7 @@
                 android:layout_marginTop="@dimen/dp_13"
                 android:text="Lv.1"
                 android:textColor="@color/colorWhite65"
-                android:textSize="@dimen/sp_12"
+                android:textSize="@dimen/sp_10"
                 app:layout_constraintStart_toStartOf="@+id/tv_name"
                 app:layout_constraintTop_toBottomOf="@+id/tv_name" />
 
@@ -95,7 +95,7 @@
                 android:maxWidth="@dimen/dp_140"
                 android:text="所属公会:"
                 android:textColor="@color/colorWhite65"
-                android:textSize="@dimen/sp_12"
+                android:textSize="@dimen/sp_10"
                 app:layout_constraintStart_toStartOf="@+id/tv_id"
                 app:layout_constraintTop_toBottomOf="@+id/tv_id" />
 
@@ -106,7 +106,7 @@
                 android:layout_marginStart="@dimen/dp_5"
                 android:text="立即加入"
                 android:textColor="#FF52FF96"
-                android:textSize="@dimen/sp_13"
+                android:textSize="@dimen/sp_12"
                 app:layout_constraintBottom_toBottomOf="@+id/tv_gh"
                 app:layout_constraintStart_toEndOf="@+id/tv_gh" />
 
@@ -300,11 +300,11 @@
 
                 <com.xscm.moduleutil.widget.AvatarFrameView
                     android:id="@+id/cp_anim"
-                    android:layout_width="@dimen/dp_85"
-                    android:layout_height="match_parent"
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintDimensionRatio="115:210"
+                    app:layout_constraintDimensionRatio="0.94:2"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
diff --git a/MainModule/src/main/res/layout/user_top.xml b/MainModule/src/main/res/layout/user_top.xml
index fb9bbeaf..66baa687 100644
--- a/MainModule/src/main/res/layout/user_top.xml
+++ b/MainModule/src/main/res/layout/user_top.xml
@@ -77,7 +77,7 @@
                 android:layout_marginTop="@dimen/dp_6"
                 android:layout_marginEnd="@dimen/dp_10"
                 android:background="@mipmap/gsui"
-                app:layout_constraintEnd_toStartOf="@id/tv_g_h"
+                app:layout_constraintEnd_toStartOf="@id/ctl_guild"
                 app:layout_constraintTop_toTopOf="parent" />
 
 
@@ -143,20 +143,67 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/ll_id" />
 
-            <TextView
-                android:id="@+id/tv_g_h"
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/ctl_guild"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                android:layout_marginTop="@dimen/dp_6"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+
+                <androidx.constraintlayout.widget.Guideline
+                    android:id="@+id/gl_start"
+                    android:layout_width="wrap_content"
+                    android:orientation="vertical"
+                    app:layout_constraintGuide_percent="0.06"
+                    android:layout_height="wrap_content"/>
+
+                <androidx.constraintlayout.widget.Guideline
+                    android:id="@+id/gl_end"
+                    android:layout_width="wrap_content"
+                    android:orientation="vertical"
+                    app:layout_constraintGuide_percent="0.72"
+                    android:layout_height="wrap_content"/>
+                <ImageView
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    android:src="@mipmap/icon_guild_bg"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"/>
+                <TextView
+                    android:id="@+id/tv_g_h"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/dp_6"
+                    android:maxLength="6"
+                    android:lines="1"
+                    android:gravity="center"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintStart_toStartOf="@+id/gl_start"
+                    app:layout_constraintEnd_toEndOf="@+id/gl_end"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/sp_10"
+                    tools:text="所属公会所属公会所属" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+
+            <ImageView
+                android:id="@+id/view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_6"
-                android:background="@mipmap/icon_guild_bg"
+                android:src="@mipmap/icon_guild_bg"
                 android:paddingStart="@dimen/dp_11"
                 android:paddingTop="@dimen/dp_4"
                 android:paddingEnd="@dimen/dp_10"
+                android:visibility="invisible"
+                tools:visibility="gone"
                 android:textColor="@color/white"
                 android:textSize="@dimen/sp_10"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:text="所属公会：" />
+                app:layout_constraintTop_toTopOf="parent"/>
 
             <TextView
                 android:id="@+id/tv_jj"
@@ -171,7 +218,7 @@
                 app:layout_constraintEnd_toStartOf="@+id/rl_cp_anim"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/flex_entry"
-                tools:text="时光会教会你所有的过去，但你只能看到现在，所以好好" />
+                tools:text="时光会教会你所有的过去，但你只能看到现在但你只能看到现在，所以好好" />
 
             <com.google.android.flexbox.FlexboxLayout
                 android:id="@+id/flex_text"
@@ -202,7 +249,7 @@
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@+id/guideline"
-                app:layout_constraintTop_toBottomOf="@+id/tv_g_h">
+                app:layout_constraintTop_toBottomOf="@+id/view">
 
                 <androidx.constraintlayout.widget.Guideline
                     android:id="@+id/top_guideline"
@@ -220,10 +267,10 @@
 
                 <com.xscm.moduleutil.widget.AvatarFrameView
                     android:id="@+id/cp_anim"
-                    android:layout_width="@dimen/dp_85"
-                    android:layout_height="match_parent"
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
                     app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintDimensionRatio="1:2"
+                    app:layout_constraintDimensionRatio="0.94:2"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />