From 1b67ff5d1271dae27766a4dd449a21bd0c8503bf Mon Sep 17 00:00:00 2001
From: lyr <15622190878@163.com>
Date: Mon, 26 Apr 2021 16:13:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=89=E7=8E=AF=E5=8A=A9=E6=89=8BV4.9.0-?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=E4=BC=98=E5=8C=96=EF=BC=88?=
 =?UTF-8?q?=E7=AC=AC2=E6=9C=9F=EF=BC=89(20210426UI=E6=B5=8B=E8=AF=95)=20ht?=
 =?UTF-8?q?tps://git.ghzs.com/pm/halo-app-issues/-/issues/1203#note=5F9908?=
 =?UTF-8?q?5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../personalhome/UserHomeFragment.kt          |  2 +-
 .../home/UserCommentHistoryFragment.kt        |  2 +-
 app/src/main/res/layout/fragment_home.xml     | 37 ++++++++++---------
 .../layout/fragment_user_comment_history.xml  | 15 ++++----
 4 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt b/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt
index 45bcbba203..ec4599b11f 100644
--- a/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt
@@ -308,7 +308,7 @@ class UserHomeFragment : NormalFragment() {
                 ?: UserVideoHistoryFragment.getInstance(mUserHomeViewModel.userId, count)
 
         val fragmentList = listOf(commentFragment, qaFragment, videoFragment)
-        val titleList = listOf("游戏评论", "我的论坛", "视频")
+        val titleList = listOf("游戏评论", "论坛", "视频")
         val countList = listOf(count.gameComment, count.getQaCount(), count.video)
 
         viewpager.offscreenPageLimit = fragmentList.size
diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/home/UserCommentHistoryFragment.kt b/app/src/main/java/com/gh/gamecenter/personalhome/home/UserCommentHistoryFragment.kt
index 3c9b44bd16..a2f1d6ddc6 100644
--- a/app/src/main/java/com/gh/gamecenter/personalhome/home/UserCommentHistoryFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/personalhome/home/UserCommentHistoryFragment.kt
@@ -101,7 +101,7 @@ class UserCommentHistoryFragment : ListFragment<UserCommentHistoryItemData, User
                     sizeTv.setTextColor(R.color.theme_font.toColor())
                     sizeTv.setBackgroundResource(R.drawable.button_round_ebf5ff)
                 } else {
-                    sizeTv.setTextColor(R.color.text_999999.toColor())
+                    sizeTv.setTextColor(R.color.text_333333.toColor())
                     sizeTv.setBackgroundResource(R.drawable.button_round_f5f5f5)
                 }
             }
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 80ed6688cd..bd2e4528a9 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -79,7 +79,7 @@
                             android:id="@+id/user_icon"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginBottom="192dp"
+                            android:layout_marginBottom="182dp"
                             app:avatar_width="64dp"
                             app:badge_width="18dp"
                             app:layout_constraintLeft_toLeftOf="parent"
@@ -107,8 +107,8 @@
                             android:id="@+id/user_name"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            android:layout_marginTop="92dp"
                             android:layout_marginLeft="16dp"
-                            android:layout_marginBottom="180dp"
                             android:clickable="true"
                             android:focusable="true"
                             android:includeFontPadding="false"
@@ -118,17 +118,17 @@
                             android:textSize="16sp"
                             tools:text="我的名字很长的哟"
                             app:layout_constraintLeft_toLeftOf="parent"
-                            app:layout_constraintBottom_toBottomOf="@+id/user_background_container" />
+                            app:layout_constraintTop_toTopOf="@+id/user_icon" />
 
                         <LinearLayout
                             android:id="@+id/regulation_and_badge_container"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="16dp"
-                            android:layout_marginBottom="154dp"
+                            android:layout_marginTop="12dp"
                             android:orientation="horizontal"
                             app:layout_constraintLeft_toLeftOf="parent"
-                            app:layout_constraintBottom_toBottomOf="@+id/user_background_container">
+                            app:layout_constraintTop_toBottomOf="@+id/user_name">
 
                             <LinearLayout
                                 tools:visibility="visible"
@@ -246,11 +246,11 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="16dp"
-                            android:layout_marginBottom="130dp"
+                            android:layout_marginTop="12dp"
                             android:gravity="center_vertical"
                             android:orientation="horizontal"
                             app:layout_constraintLeft_toLeftOf="parent"
-                            app:layout_constraintBottom_toBottomOf="@+id/user_background_container">
+                            app:layout_constraintTop_toBottomOf="@+id/regulation_and_badge_container">
 
                             <ImageView
                                 android:layout_width="12dp"
@@ -273,7 +273,7 @@
                             android:id="@+id/user_introduce"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="66dp"
+                            android:layout_marginTop="16dp"
                             android:layout_marginLeft="16dp"
                             android:layout_marginRight="16dp"
                             android:includeFontPadding="false"
@@ -285,14 +285,15 @@
                             android:text='@{TextUtils.isEmpty(entity.introduce)?"这是一个很神秘的崽~":entity.introduce}'
                             tools:text="这是我的个性签名呀欢迎大家来撩，特别长的签名，很长很长,这是我的个性签名呀欢迎大家来撩，特别长的签名，很长很长,这是我的个性签名呀欢迎大家来撩，特别长的签名，很长很长这是我的个性签名呀欢迎大家来撩，特别长的签名，很长很长这是我的个性签名呀欢迎大家来撩，特别长的签名，很长很长这是我的个性签名呀欢迎大家来撩，特别长的签名，很长很长"
                             app:layout_constraintLeft_toLeftOf="parent"
-                            app:layout_constraintTop_toBottomOf="@+id/user_name" />
+                            app:layout_constraintTop_toBottomOf="@+id/auth_container" />
 
                         <RelativeLayout
+                            tools:visibility="visible"
                             android:visibility="gone"
                             android:id="@+id/recent_visit_container"
                             android:layout_width="80dp"
                             android:layout_height="42dp"
-                            android:paddingLeft="12dp"
+                            android:paddingLeft="14dp"
                             android:clickable="true"
                             android:focusable="true"
                             android:background="@drawable/bg_recent_visit"
@@ -317,7 +318,7 @@
                                 android:layout_width="12dp"
                                 android:layout_height="12dp"
                                 android:layout_marginTop="8dp"
-                                android:layout_marginLeft="4dp"
+                                android:layout_marginLeft="8dp"
                                 style="@style/frescoCircleStyle"
                                 imageUrl="@{entity.lastVisitor.icon}" />
 
@@ -328,7 +329,7 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_marginTop="8dp"
-                                android:layout_marginLeft="4dp"
+                                android:layout_marginLeft="8dp"
                                 android:includeFontPadding="false"
                                 android:textColor="@color/white"
                                 android:textSize="10sp"
@@ -365,10 +366,10 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="16dp"
-                            android:layout_marginBottom="48dp"
+                            android:layout_marginTop="24dp"
                             android:orientation="horizontal"
                             android:gravity="center_vertical"
-                            app:layout_constraintBottom_toBottomOf="@+id/user_background_container"
+                            app:layout_constraintTop_toBottomOf="@+id/user_introduce"
                             app:layout_constraintLeft_toLeftOf="parent">
 
                             <LinearLayout
@@ -554,7 +555,7 @@
                                 android:layout_marginTop="16dp"
                                 android:text="玩过的游戏"
                                 android:textColor="@color/text_333333"
-                                android:textSize="14sp"
+                                android:textSize="16sp"
                                 android:textStyle="bold"
                                 app:layout_constraintLeft_toLeftOf="parent"
                                 app:layout_constraintTop_toTopOf="parent" />
@@ -564,7 +565,7 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_marginRight="15dp"
-                                android:text="查看更多 >"
+                                android:text="更多 >"
                                 android:textColor="@color/text_999999"
                                 android:textSize="12sp"
                                 app:layout_constraintBottom_toBottomOf="@id/playedGameTitleTv"
@@ -576,7 +577,7 @@
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:clipToPadding="false"
-                                android:paddingLeft="18dp"
+                                android:paddingLeft="16dp"
                                 android:paddingTop="16dp"
                                 android:paddingBottom="16dp"
                                 app:layout_constraintTop_toBottomOf="@id/playedGameTitleTv" />
@@ -699,7 +700,7 @@
                         <com.google.android.material.tabs.TabLayout
                             android:id="@+id/tabLayout"
                             android:layout_width="match_parent"
-                            android:layout_height="38dp"
+                            android:layout_height="42dp"
                             app:layout_constraintLeft_toLeftOf="parent"
                             app:layout_constraintTop_toTopOf="parent"
                             app:tabTextAppearance="@style/TabLayoutTextAppearance" />
diff --git a/app/src/main/res/layout/fragment_user_comment_history.xml b/app/src/main/res/layout/fragment_user_comment_history.xml
index eb6470b86a..c403a66a4c 100644
--- a/app/src/main/res/layout/fragment_user_comment_history.xml
+++ b/app/src/main/res/layout/fragment_user_comment_history.xml
@@ -16,7 +16,7 @@
         <TextView
             android:id="@+id/allType"
             android:layout_width="48dp"
-            android:layout_height="24dp"
+            android:layout_height="28dp"
             android:gravity="center"
             android:background="@drawable/button_round_ebf5ff"
             android:textColor="@color/theme_font"
@@ -26,27 +26,27 @@
         <TextView
             android:id="@+id/excellentType"
             android:layout_width="48dp"
-            android:layout_height="24dp"
+            android:layout_height="28dp"
             android:layout_marginLeft="8dp"
             android:gravity="center"
             android:background="@drawable/button_round_f5f5f5"
-            android:textColor="@color/text_999999"
+            android:textColor="@color/text_333333"
             android:textSize="12sp"
             android:text="精彩" />
 
         <TextView
             android:id="@+id/anliType"
             android:layout_width="60dp"
-            android:layout_height="24dp"
+            android:layout_height="28dp"
             android:layout_marginLeft="8dp"
             android:gravity="center"
             android:background="@drawable/button_round_f5f5f5"
-            android:textColor="@color/text_999999"
+            android:textColor="@color/text_333333"
             android:textSize="12sp"
             android:text="安利墙" />
     </LinearLayout>
 
-    <FrameLayout
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@+id/typeContainer">
@@ -57,7 +57,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
-
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/list_rv"
                 android:layout_width="match_parent"
@@ -74,6 +73,6 @@
         <include layout="@layout/reuse_no_connection" />
 
         <include layout="@layout/reuse_none_data" />
-    </FrameLayout>
+    </RelativeLayout>
 
 </RelativeLayout>
\ No newline at end of file