From b94d638928d6e569f8cec64c748a7b370305b2ca Mon Sep 17 00:00:00 2001
From: HuanCheng65 <22636177+HuanCheng65@users.noreply.github.com>
Date: Fri, 24 Jun 2022 07:30:28 +0800
Subject: [PATCH] =?UTF-8?q?pref:=20=E4=BC=98=E5=8C=96=20IP=20=E5=B1=9E?=
 =?UTF-8?q?=E5=9C=B0=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tieba/post/adapters/ThreadMainPostAdapter.kt | 13 +++++++++----
 .../tieba/post/adapters/ThreadReplyAdapter.kt    | 16 ++++++++++------
 app/src/main/res/values/strings.xml              |  5 +++--
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/huanchengfly/tieba/post/adapters/ThreadMainPostAdapter.kt b/app/src/main/java/com/huanchengfly/tieba/post/adapters/ThreadMainPostAdapter.kt
index 3883e682..55ba2b00 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/adapters/ThreadMainPostAdapter.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/adapters/ThreadMainPostAdapter.kt
@@ -200,13 +200,18 @@ class ThreadMainPostAdapter(
             ImageUtil.LOAD_TYPE_AVATAR,
             user.portrait
         )
-        holder.setText(
-            R.id.thread_list_item_user_time,
+        var timeText =
             context.getString(
                 R.string.tip_thread_item_thread,
-                DateTimeUtils.getRelativeTimeString(context, threadBean.createTime!!),
-                user.ipAddress
+                DateTimeUtils.getRelativeTimeString(context, threadBean.createTime!!)
             )
+        if (user.ipAddress?.isNotEmpty() == true) {
+            timeText += " "
+            timeText += context.getString(R.string.text_ip_location, user.ipAddress)
+        }
+        holder.setText(
+            R.id.thread_list_item_user_time,
+            timeText
         )
         holder.setText(R.id.thread_list_item_content_title, title)
         if (threadPostBean != null) {
diff --git a/app/src/main/java/com/huanchengfly/tieba/post/adapters/ThreadReplyAdapter.kt b/app/src/main/java/com/huanchengfly/tieba/post/adapters/ThreadReplyAdapter.kt
index f67c20c9..d138319d 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/adapters/ThreadReplyAdapter.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/adapters/ThreadReplyAdapter.kt
@@ -610,14 +610,18 @@ class ThreadReplyAdapter(context: Context) :
             )
         }
         initContentView(viewHolder, item)
+        var timeText = context.getString(
+            R.string.tip_thread_item,
+            item.floor,
+            getRelativeTimeString(context, item.time!!)
+        )
+        if (userInfoBean?.ipAddress?.isNotEmpty() == true) {
+            timeText += " "
+            timeText += context.getString(R.string.text_ip_location, userInfoBean.ipAddress)
+        }
         viewHolder.setText(
             R.id.thread_list_item_user_time,
-            context.getString(
-                R.string.tip_thread_item,
-                item.floor,
-                getRelativeTimeString(context, item.time!!),
-                userInfoBean?.ipAddress
-            )
+            timeText
         )
         initFloorView(viewHolder, item)
         if (isPureRead) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 82b910e8..3832fa4b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -172,7 +172,8 @@
     <string name="menu_save_photo">保存图片</string>
     <string name="toast_play_failed">播放失败</string>
     <string name="toast_cannot_view">抱歉，当前暂时无法浏览本吧</string>
-    <string name="tip_thread_item">第 %1$s 楼 %2$s 来自%3$s</string>
+    <string name="tip_thread_item">第 %1$s 楼 %2$s</string>
+    <string name="text_ip_location">来自%1$s</string>
     <string name="tip_floor_more_count">查看更多回复(%1$s)</string>
     <string name="update_tip_title">发现新版本 %1$s(%2$s)</string>
     <string name="update_tip_header">更新 · %1$s</string>
@@ -409,7 +410,7 @@
     <string name="text_badge_history_forum">贴吧</string>
     <string name="title_history_thread">贴子记录</string>
     <string name="title_history_forum">经过贴吧</string>
-    <string name="tip_thread_item_thread">%1$s 来自%2$s</string>
+    <string name="tip_thread_item_thread">%1$s</string>
     <string name="title_all_reply">全部</string>
     <string name="title_thread_header">回复 %1$s</string>
     <string name="btn_agree_post">%1$s 赞</string>