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 - 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() { private var items: List = emptyList() + private var statusNameMap: Map = emptyMap() - fun setData(list: List) { + fun setData(list: List, stepMap: Map = emptyMap()) { items = list + statusNameMap = stepMap notifyDataSetChanged() } @@ -28,8 +30,9 @@ class LogDetailTimelineAdapter : RecyclerView.Adapter