From e9982453402480dee7a53265cac55bdd3ed31b39 Mon Sep 17 00:00:00 2001
From: max <mxruan@163.com>
Date: Thu, 23 May 2024 15:06:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=9B=A0=E6=97=B6?=
 =?UTF-8?q?=E5=8C=BA=E5=AF=BC=E8=87=B4=E7=94=9F=E6=97=A5=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/chwl/app/ui/user/activity/UserInfoModifyActivity.kt | 2 +-
 .../com/chwl/app/ui/user/fragment/UserInfoInfoFragment.kt   | 2 +-
 app/src/main/res/layout/fragment_userinfo_userinfo.xml      | 1 +
 .../src/com/netease/nim/uikit/common/util/sys/TimeUtil.java | 6 ++++++
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/chwl/app/ui/user/activity/UserInfoModifyActivity.kt b/app/src/main/java/com/chwl/app/ui/user/activity/UserInfoModifyActivity.kt
index 2fbfc04e8..50fef1c18 100644
--- a/app/src/main/java/com/chwl/app/ui/user/activity/UserInfoModifyActivity.kt
+++ b/app/src/main/java/com/chwl/app/ui/user/activity/UserInfoModifyActivity.kt
@@ -115,7 +115,7 @@ class UserInfoModifyActivity : BaseViewBindingActivity<ActivityUserInfoModifyBin
             )
             binding.tvAvatarAuditing.visibility = if (userInfo.isReview) View.VISIBLE else View.GONE
             binding.ivAvatarAuditing.visibility = if (userInfo.isReview) View.VISIBLE else View.GONE
-            val birth = TimeUtil.getDateTimeString(userInfo.birth, "yyyy-MM-dd")
+            val birth = TimeUtil.getChinaDateTimeString(userInfo.birth, "yyyy-MM-dd")
             binding.tvBirth.text = birth
             binding.tvNick.text = RegexUtil.getPrintableString(userInfo.nick)
             setTvDesc(userInfo.userDesc)
diff --git a/app/src/main/java/com/chwl/app/ui/user/fragment/UserInfoInfoFragment.kt b/app/src/main/java/com/chwl/app/ui/user/fragment/UserInfoInfoFragment.kt
index b68052979..9b9291d7b 100644
--- a/app/src/main/java/com/chwl/app/ui/user/fragment/UserInfoInfoFragment.kt
+++ b/app/src/main/java/com/chwl/app/ui/user/fragment/UserInfoInfoFragment.kt
@@ -49,7 +49,7 @@ class UserInfoInfoFragment : BaseViewBindingFragment<FragmentUserinfoUserinfoBin
     }
 
     private fun initInfoData(bean: UserDetailInfo.DataBean) {
-        val birth = TimeUtil.getDateTimeString(bean.birth, "yyyy-MM-dd")
+        val birth = TimeUtil.getChinaDateTimeString(bean.birth, "yyyy-MM-dd")
         binding.tvBirth.text = birth
         binding.tvArea.text = bean.region
     }
diff --git a/app/src/main/res/layout/fragment_userinfo_userinfo.xml b/app/src/main/res/layout/fragment_userinfo_userinfo.xml
index 46aeef12d..b329f85b4 100644
--- a/app/src/main/res/layout/fragment_userinfo_userinfo.xml
+++ b/app/src/main/res/layout/fragment_userinfo_userinfo.xml
@@ -144,6 +144,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/tvAssociation"
+                    android:gravity="center_vertical"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/dp_10"
diff --git a/nim_uikit/src/com/netease/nim/uikit/common/util/sys/TimeUtil.java b/nim_uikit/src/com/netease/nim/uikit/common/util/sys/TimeUtil.java
index 5f9d4833d..1391acc54 100644
--- a/nim_uikit/src/com/netease/nim/uikit/common/util/sys/TimeUtil.java
+++ b/nim_uikit/src/com/netease/nim/uikit/common/util/sys/TimeUtil.java
@@ -111,6 +111,12 @@ public class TimeUtil {
         return formatter.format(date);
     }
 
+    public static String getChinaDateTimeString(long milliseconds, String format) {
+        Date date = new Date(milliseconds);
+        SimpleDateFormat formatter = new SimpleDateFormat(format, Locale.ENGLISH);
+        formatter.setTimeZone(TimeZone.getTimeZone("GMT+8"));
+        return formatter.format(date);
+    }
 
     public static String getFavoriteCollectTime(long milliseconds) {
         String showDataString = "";