From b3b2bebd09f2e548386a4a7567484eb8d255b1b5 Mon Sep 17 00:00:00 2001
From: huangjian <huangjian@xuanyinyy.com>
Date: Thu, 16 Dec 2021 14:06:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5UI=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erban/ui/user/UserInfoActivity.java       |  13 -
 .../main/res/layout/activity_user_info.xml    | 292 ++++++++----------
 2 files changed, 125 insertions(+), 180 deletions(-)

diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java b/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java
index d4231665d..e3b3921fb 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java
@@ -327,13 +327,6 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
                                 .load(hallInfo.getOwnerAvatar())
                                 .placeholder(R.drawable.default_avatar)
                                 .into(mBinding.ivHallAvatar);
-                        if (clanInfo == null || clanInfo.getId() <= 0) {
-                            mBinding.llHall.setBackgroundResource(R.drawable.bg_secondary_radius_10);
-                            mBinding.flRoomBg.setVisibility(View.GONE);
-                        } else {
-                            mBinding.llHall.setBackgroundResource(R.drawable.bg_3c3c4e_radius_10);
-                            mBinding.flRoomBg.setVisibility(View.VISIBLE);
-                        }
                         if (showApply) {
                             mBinding.tvApplyHall.setVisibility(View.VISIBLE);
                             mBinding.tvApplyHall.setOnClickListener(v -> applyJoinHall(hallInfo.getHallId()));
@@ -358,12 +351,6 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
                                 .load(clanInfo.getLevelIcon())
                                 .placeholder(R.drawable.default_cover)
                                 .into(mBinding.ivClanLevel);
-
-                        if (hallInfo != null && hallInfo.getHallId() > 0) {
-                            mBinding.llModuleHall.setBackgroundResource(R.drawable.bg_secondary_radius_top_10);
-                        } else {
-                            mBinding.llModuleHall.setBackgroundResource(R.drawable.bg_secondary_radius_10);
-                        }
                     } else {
                         mBinding.llModuleHall.setVisibility(View.GONE);
                     }
diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml
index 86c205cf7..443c40955 100644
--- a/app/src/main/res/layout/activity_user_info.xml
+++ b/app/src/main/res/layout/activity_user_info.xml
@@ -238,9 +238,128 @@
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
-                <androidx.constraintlayout.widget.ConstraintLayout
+                <LinearLayout
+                    android:id="@+id/ll_module_hall"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/dp_15"
+                    android:layout_marginTop="@dimen/dp_14"
+                    android:layout_marginEnd="@dimen/dp_15"
+                    android:background="@drawable/bg_secondary_radius_10"
+                    android:orientation="vertical"
+                    android:paddingStart="2dp"
+                    android:paddingTop="1dp"
+                    android:paddingEnd="2dp"
+                    android:paddingBottom="5dp"
+                    android:visibility="gone"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:visibility="visible">
+
+                    <TextView
+                        android:id="@+id/tv_hall_detail"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:paddingStart="@dimen/dp_15"
+                        android:paddingTop="@dimen/dp_15"
+                        android:paddingEnd="@dimen/dp_15"
+                        android:text="所属公会"
+                        android:textColor="@color/text_normal_c6c6e9"
+                        android:textSize="@dimen/sp_13" />
+
+                    <LinearLayout
+                        android:id="@+id/ll_clan"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:paddingTop="@dimen/dp_15"
+                        android:paddingBottom="@dimen/dp_5">
+
+                        <com.yizhuan.erban.common.widget.RectRoundImageView
+                            android:id="@+id/iv_clan_avatar"
+                            android:layout_width="70dp"
+                            android:layout_height="70dp"
+                            android:layout_marginStart="@dimen/dp_15"
+                            android:layout_marginEnd="@dimen/dp_8"
+                            android:src="@drawable/default_cover"
+                            app:borderRadius="8dp"
+                            app:type="round" />
+
+                        <LinearLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:orientation="vertical"
+                            android:paddingEnd="10dp">
+
+                            <TextView
+                                android:id="@+id/tv_clan_name"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:ellipsize="end"
+                                android:includeFontPadding="false"
+                                android:lines="1"
+                                android:maxLength="9"
+                                android:textColor="@color/text_title_white"
+                                android:textSize="@dimen/dp_16"
+                                tools:text="忘忧忘忧忘忧忘忧阁忘忧阁阁阁忘忧阁阁" />
+
+                            <TextView
+                                android:id="@+id/tv_clan_id"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="@dimen/dp_3"
+                                android:ellipsize="end"
+                                android:lines="1"
+                                android:textColor="@color/text_normal_c6c6e9"
+                                android:textSize="@dimen/dp_11"
+                                android:visibility="gone"
+                                tools:text="公会ID：123456" />
+
+                            <TextView
+                                android:id="@+id/tv_clan_member_num"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="6dp"
+                                android:ellipsize="end"
+                                android:lines="1"
+                                android:textColor="@color/text_normal_c6c6e9"
+                                android:textSize="@dimen/dp_11"
+                                tools:text="公会人数：123" />
+
+                            <TextView
+                                android:id="@+id/tv_clan_hall_num"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="6dp"
+                                android:ellipsize="end"
+                                android:lines="1"
+                                android:textColor="@color/text_normal_c6c6e9"
+                                android:textSize="@dimen/dp_11"
+                                tools:text="公会数量：123" />
+
+                        </LinearLayout>
+
+
+                        <View
+                            android:layout_width="0dp"
+                            android:layout_height="0dp"
+                            android:layout_weight="1" />
+
+                        <ImageView
+                            android:id="@+id/iv_clan_level"
+                            android:layout_width="70dp"
+                            android:layout_height="65dp"
+                            android:layout_marginEnd="24dp"
+                            android:src="@drawable/default_cover" />
+
+
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:layout_marginEnd="20dp"
+                            android:src="@drawable/arrow_right"
+                            android:visibility="gone" />
+                    </LinearLayout>
 
                     <LinearLayout
                         android:id="@+id/ll_hall"
@@ -249,7 +368,6 @@
                         android:layout_marginStart="15dp"
                         android:layout_marginTop="15dp"
                         android:layout_marginEnd="15dp"
-                        android:background="@drawable/bg_3c3c4e_radius_10"
                         android:gravity="center_vertical"
                         android:orientation="vertical"
                         android:paddingStart="2dp"
@@ -257,15 +375,12 @@
                         android:paddingEnd="2dp"
                         android:paddingBottom="5dp"
                         android:visibility="gone"
-                        app:layout_constraintTop_toBottomOf="@id/line_1"
                         tools:visibility="visible">
 
                         <TextView
                             android:id="@+id/tv_only_hall_detail"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:paddingStart="@dimen/dp_15"
-                            android:paddingTop="@dimen/dp_20"
                             android:paddingEnd="@dimen/dp_15"
                             android:text="所属房间"
                             android:textColor="@color/text_normal_c6c6e9"
@@ -274,7 +389,6 @@
                         <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginStart="@dimen/dp_15"
                             android:layout_marginTop="@dimen/dp_6"
                             android:layout_marginBottom="@dimen/dp_5"
                             android:gravity="center_vertical"
@@ -376,165 +490,9 @@
 
                     </LinearLayout>
 
-                    <LinearLayout
-                        android:id="@+id/ll_module_hall"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/dp_15"
-                        android:layout_marginTop="@dimen/dp_14"
-                        android:layout_marginEnd="@dimen/dp_15"
-                        android:background="@drawable/bg_secondary_radius_top_10"
-                        android:orientation="vertical"
-                        android:paddingStart="2dp"
-                        android:paddingTop="1dp"
-                        android:paddingEnd="2dp"
-                        android:paddingBottom="5dp"
-                        android:visibility="gone"
-                        app:layout_constraintTop_toTopOf="parent"
-                        tools:visibility="visible">
 
-                        <TextView
-                            android:id="@+id/tv_hall_detail"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:paddingStart="@dimen/dp_15"
-                            android:paddingTop="@dimen/dp_15"
-                            android:paddingEnd="@dimen/dp_15"
-                            android:text="所属公会"
-                            android:textColor="@color/text_normal_c6c6e9"
-                            android:textSize="@dimen/sp_13" />
+                </LinearLayout>
 
-                        <LinearLayout
-                            android:id="@+id/ll_clan"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:paddingTop="@dimen/dp_15"
-                            android:paddingBottom="@dimen/dp_5">
-
-                            <com.yizhuan.erban.common.widget.RectRoundImageView
-                                android:id="@+id/iv_clan_avatar"
-                                android:layout_width="70dp"
-                                android:layout_height="70dp"
-                                android:layout_marginStart="@dimen/dp_15"
-                                android:layout_marginEnd="@dimen/dp_8"
-                                android:src="@drawable/default_cover"
-                                app:borderRadius="8dp"
-                                app:type="round" />
-
-                            <LinearLayout
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_vertical"
-                                android:orientation="vertical"
-                                android:paddingEnd="10dp">
-
-                                <TextView
-                                    android:id="@+id/tv_clan_name"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:ellipsize="end"
-                                    android:includeFontPadding="false"
-                                    android:lines="1"
-                                    android:maxLength="9"
-                                    android:textColor="@color/text_title_white"
-                                    android:textSize="@dimen/dp_16"
-                                    tools:text="忘忧忘忧忘忧忘忧阁忘忧阁阁阁忘忧阁阁" />
-
-                                <TextView
-                                    android:id="@+id/tv_clan_id"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginTop="@dimen/dp_3"
-                                    android:ellipsize="end"
-                                    android:lines="1"
-                                    android:textColor="@color/text_normal_c6c6e9"
-                                    android:textSize="@dimen/dp_11"
-                                    android:visibility="gone"
-                                    tools:text="公会ID：123456" />
-
-                                <TextView
-                                    android:id="@+id/tv_clan_member_num"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginTop="6dp"
-                                    android:ellipsize="end"
-                                    android:lines="1"
-                                    android:textColor="@color/text_normal_c6c6e9"
-                                    android:textSize="@dimen/dp_11"
-                                    tools:text="公会人数：123" />
-
-                                <TextView
-                                    android:id="@+id/tv_clan_hall_num"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginTop="6dp"
-                                    android:ellipsize="end"
-                                    android:lines="1"
-                                    android:textColor="@color/text_normal_c6c6e9"
-                                    android:textSize="@dimen/dp_11"
-                                    tools:text="公会数量：123" />
-
-                            </LinearLayout>
-
-
-                            <View
-                                android:layout_width="0dp"
-                                android:layout_height="0dp"
-                                android:layout_weight="1" />
-
-                            <ImageView
-                                android:id="@+id/iv_clan_level"
-                                android:layout_width="70dp"
-                                android:layout_height="65dp"
-                                android:layout_marginEnd="24dp"
-                                android:src="@drawable/default_cover" />
-
-
-                            <ImageView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_vertical"
-                                android:layout_marginEnd="20dp"
-                                android:src="@drawable/arrow_right"
-                                android:visibility="gone" />
-                        </LinearLayout>
-
-                    </LinearLayout>
-
-                    <View
-                        android:id="@+id/line_1"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="25dp"
-                        app:layout_constraintBottom_toBottomOf="@id/ll_module_hall"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_goneMarginBottom="0dp" />
-
-                    <FrameLayout
-                        android:id="@+id/fl_room_bg"
-                        android:layout_width="match_parent"
-                        android:layout_height="20dp"
-                        android:layout_marginStart="100dp"
-                        android:layout_marginEnd="15dp"
-                        android:visibility="gone"
-                        app:layout_constraintTop_toBottomOf="@id/ll_module_hall"
-                        tools:visibility="visible">
-
-                        <View
-                            android:layout_width="10dp"
-                            android:layout_height="20dp"
-                            android:background="@drawable/bg_user_info_room" />
-
-                        <View
-                            android:layout_width="match_parent"
-                            android:layout_height="20dp"
-                            android:layout_marginStart="10dp"
-                            android:background="@color/bg_secondary_2a2a39" />
-
-                    </FrameLayout>
-
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -602,8 +560,8 @@
 
                 </LinearLayout>
 
-
             </LinearLayout>
+
         </androidx.core.widget.NestedScrollView>
 
         <ViewStub
@@ -617,8 +575,8 @@
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/tb_user_info"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:layout_marginTop="30dp"
+            android:layout_height="wrap_content"
+            android:paddingTop="30dp"
             android:visibility="visible"
             app:contentInsetStart="0dp"
             app:layout_collapseMode="pin">