From 1fa0f6dde4ca56a36009eabd180b5f84ee5c804c Mon Sep 17 00:00:00 2001
From: YANG JIANKUAN <tim.yee@hotmail.com>
Date: Wed, 15 Apr 2026 12:07:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=97=B6=E9=97=B4=E7=BA=BF=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

第一行改为显示操作环节名称（status 映射）加时间，
第二行改为灰色小字展示操作内容（content）。

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../aerologic/page/log/detail/LogDetailActivity.kt       | 3 ++-
 .../page/log/detail/LogDetailTimelineAdapter.kt          | 9 ++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/lukouguoji/aerologic/page/log/detail/LogDetailActivity.kt b/app/src/main/java/com/lukouguoji/aerologic/page/log/detail/LogDetailActivity.kt
index 91b6efd..0ef3c5d 100644
--- a/app/src/main/java/com/lukouguoji/aerologic/page/log/detail/LogDetailActivity.kt
+++ b/app/src/main/java/com/lukouguoji/aerologic/page/log/detail/LogDetailActivity.kt
@@ -44,7 +44,8 @@ class LogDetailActivity : BaseBindingActivity<ActivityLogDetailBinding, LogDetai
         viewModel.latestStepCode.observe(this) { rebuildSteps() }
 
         viewModel.statusLogList.observe(this) { list ->
-            timelineAdapter.setData(list)
+            val stepMap = viewModel.allSteps.value?.associate { it.code to it.name } ?: emptyMap()
+            timelineAdapter.setData(list, stepMap)
         }
 
         viewModel.initOnCreated(intent)
diff --git a/app/src/main/java/com/lukouguoji/aerologic/page/log/detail/LogDetailTimelineAdapter.kt b/app/src/main/java/com/lukouguoji/aerologic/page/log/detail/LogDetailTimelineAdapter.kt
index 2a8c286..d75e064 100644
--- a/app/src/main/java/com/lukouguoji/aerologic/page/log/detail/LogDetailTimelineAdapter.kt
+++ b/app/src/main/java/com/lukouguoji/aerologic/page/log/detail/LogDetailTimelineAdapter.kt
@@ -11,9 +11,11 @@ import com.lukouguoji.module_base.bean.StatusLogBean
 class LogDetailTimelineAdapter : RecyclerView.Adapter<LogDetailTimelineAdapter.TimelineViewHolder>() {
 
     private var items: List<StatusLogBean> = emptyList()
+    private var statusNameMap: Map<String, String> = emptyMap()
 
-    fun setData(list: List<StatusLogBean>) {
+    fun setData(list: List<StatusLogBean>, stepMap: Map<String, String> = emptyMap()) {
         items = list
+        statusNameMap = stepMap
         notifyDataSetChanged()
     }
 
@@ -28,8 +30,9 @@ class LogDetailTimelineAdapter : RecyclerView.Adapter<LogDetailTimelineAdapter.T
         val isFirst = position == 0
         val isLast = position == items.size - 1
 
-        holder.tvContent.text = item.content
-        holder.tvTime.text = item.opDate
+        val statusName = statusNameMap[item.status] ?: item.status
+        holder.tvContent.text = if (statusName.isNotEmpty()) "$statusName  ${item.opDate}" else item.opDate
+        holder.tvTime.text = item.content
 
         // 最后一项（当前步骤）用绿色圆点
         holder.dotView.setBackgroundResource(