From 40a64996d710e93548d1604e8d2b010d17e3b491 Mon Sep 17 00:00:00 2001
From: lyr <15622190878@163.com>
Date: Fri, 25 Sep 2020 11:00:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=AA=E4=BA=BA=E4=B8=BB?=
 =?UTF-8?q?=E9=A1=B5=E5=92=8C=E4=B8=AA=E6=80=A7=E7=AD=BE=E5=90=8D=E7=9A=84?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/gh/gamecenter/entity/PersonalEntity.kt    | 4 +++-
 app/src/main/res/layout/fragment_home.xml                   | 6 +++---
 app/src/main/res/layout/fragment_personal.xml               | 5 ++++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/gh/gamecenter/entity/PersonalEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/PersonalEntity.kt
index c5dd6d5cd4..064dc16061 100644
--- a/app/src/main/java/com/gh/gamecenter/entity/PersonalEntity.kt
+++ b/app/src/main/java/com/gh/gamecenter/entity/PersonalEntity.kt
@@ -54,17 +54,19 @@ data class RegulationTest(
 // 最近访客
 @Parcelize
 data class LastVisitor(
+        @SerializedName("_id")
         var id: String = "",
         var name: String = "",
         var icon: String = "") : Parcelable
 
+// 徽章
 @Parcelize
 data class Badge(
         var name: String = "",
         var icon: String = "",
         var actions: List<BadgeAction>? = null) : Parcelable
 
-// 领取条件
+// 徽章领取条件
 @Parcelize
 data class BadgeAction(
         var text: String = "") : Parcelable
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index f469074c82..69d462b5ec 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -341,11 +341,11 @@
 
                         <TextView
                             android:id="@+id/user_introduce"
-                            android:layout_width="wrap_content"
+                            android:layout_width="170dp"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="12dp"
+                            android:paddingTop="12dp"
+                            android:paddingBottom="12dp"
                             android:layout_marginLeft="16dp"
-                            android:maxEms="12"
                             android:lines="1"
                             android:ellipsize="end"
                             android:textColor="@color/white"
diff --git a/app/src/main/res/layout/fragment_personal.xml b/app/src/main/res/layout/fragment_personal.xml
index 0908f8ec86..3dafe5385e 100644
--- a/app/src/main/res/layout/fragment_personal.xml
+++ b/app/src/main/res/layout/fragment_personal.xml
@@ -153,7 +153,10 @@
                             android:id="@+id/personal_home"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginRight="6dp"
+                            android:paddingTop="15dp"
+                            android:paddingLeft="15dp"
+                            android:paddingBottom="15dp"
+                            android:paddingRight="6dp"
                             android:text="个人主页"
                             android:textColor="@color/white"
                             android:textSize="12sp"