From df3af70b33eb6372b56075bc9e45c23ccf3f82c6 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 28 十月 2025 17:40:38 +0800
Subject: [PATCH] 2025.10.28 1. 新增巡查场景历史详情界面出版（完成）； 2. 巡查任务日历界面，任务条目中新增风险提示、巡查要点、应急巡查3种提示信息的提示图标逻辑（待完成）；
---
app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneHistoryActivity.kt | 100 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 90 insertions(+), 10 deletions(-)
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneHistoryActivity.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneHistoryActivity.kt
index 2c6ef7a..9cc8097 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneHistoryActivity.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneHistoryActivity.kt
@@ -1,17 +1,25 @@
package cn.flightfeather.thirdappmodule.module.inspection
+import android.arch.lifecycle.Observer
import android.arch.lifecycle.ViewModelProviders
import android.os.Bundle
+import android.support.v4.content.ContextCompat
import android.view.View
+import android.widget.TextView
import cn.flightfeather.thirdappmodule.R
import cn.flightfeather.thirdappmodule.bean.entity.Scense
import cn.flightfeather.thirdappmodule.module.base.BaseActivity
-import cn.flightfeather.thirdappmodule.module.task.SceneDetailViewModel
import kotlinx.android.synthetic.main.dialog_scene_history.*
import kotlinx.android.synthetic.main.fragment_analysis_over_view.*
+/**
+ * 鍦烘櫙鍘嗗彶鎯呭喌鎻愮ず鐣岄潰
+ * Date: 2025/10/27
+ */
class MenuSceneHistoryActivity : BaseActivity() {
+ inner class HistoryItemView(val title: String, val show: Boolean, val parentView: View, val titleView: TextView)
+ // 浼犲叆鐨勫満鏅璞�
private var scene: Scense? = null
override fun getLayoutId(): Int = R.layout.dialog_scene_history
@@ -21,7 +29,7 @@
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
- viewModel = ViewModelProviders.of(this).get(SceneDetailViewModel::class.java)
+ viewModel = ViewModelProviders.of(this).get(MenuSceneHistoryViewModel::class.java)
scene = intent.getSerializableExtra("scene") as Scense?
@@ -29,26 +37,98 @@
initObserver()
initListener()
- viewModel.getSceneStatus {
- scene?.let { viewModel.getSceneDetail(it) }
- }
+// viewModel.getSceneStatus {
+// scene?.let { viewModel.getSceneDetail(it) }
+// }
}
private fun initUI() {
- view_waiting.visibility = View.VISIBLE
+ // 缁熻椤圭洰
+ val itemList = listOf(
+ HistoryItemView("鐜板満璇勫垎", true, cl_1, tv_title_1),
+ HistoryItemView("鍏稿瀷宸ュ湴", true, cl_2, tv_title_2),
+ HistoryItemView("閲嶇偣鍖哄煙", true, cl_3, tv_title_3),
+ HistoryItemView("鑱斿悎鎵ф硶", true, cl_4, tv_title_4),
+ HistoryItemView("鏁存敼鏁堢巼", true, cl_5, tv_title_5),
+ HistoryItemView("闂澶嶅彂", true, cl_6, tv_title_6),
+ HistoryItemView("鏂藉伐闃舵", true, cl_7, tv_title_7),
+ HistoryItemView("鐩戞祴鏁版嵁", true, cl_8, tv_title_8),
+ HistoryItemView("搴旀�ュ贰鏌�", false, cl_9, tv_title_9)
+ )
+
+ // 鏄剧ず 鍔犺浇鍥炬爣
+ view_waiting.visibility = View.GONE
+
+ // 鏍规嵁閰嶇疆鏄剧ず瀵瑰簲鐨勯」鐩紝骞惰嚜鍔ㄥ尮閰嶅簭鍙�
+ var index = 1
+ itemList.forEach { item ->
+ if (item.show) {
+ val title = "${index}. ${item.title}"
+ item.parentView.visibility = View.VISIBLE
+ item.titleView.text = title
+ index++
+ } else {
+ item.parentView.visibility = View.GONE
+ }
+ }
+
+ // 鏄剧ず 鍦烘櫙鍚嶇О
scene?.let {
- tv_status.text = StringBuilder(it.type + getString(R.string.scene_status))
+ tv_title.text = it.name
}
}
private fun initObserver() {
+ // 鍘嗗彶璇勪及鎯呭喌
+ viewModel.evaluationList.observe(this, Observer {
+ })
+
+ // 鍏稿瀷鍦烘櫙鎯呭喌
+ viewModel.typicalScene.observe(this, Observer {
+
+ })
+ tv_title_2.setTextColor(ContextCompat.getColor(this, R.color.red_btn_bg_color))
+ // 閲嶇偣鍖哄煙锛堝湪鍥芥帶鐐广�佸競鎺х偣鍛ㄨ竟锛�
+ viewModel.keyArea.observe(this, Observer {
+
+ })
+ tv_title_3.setTextColor(ContextCompat.getColor(this, R.color.red_btn_bg_color))
+ // 鑱斿悎鎵ф硶
+ viewModel.jointLawEnforcement.observe(this, Observer {
+
+ })
+ tv_title_4.setTextColor(ContextCompat.getColor(this, R.color.main_color_3))
+ tv_summary_4.setTextColor(ContextCompat.getColor(this, R.color.main_color_3))
+ // 鏁存敼鏁堢巼
+ viewModel.changeRate.observe(this, Observer {
+
+ })
+ tv_title_5.setTextColor(ContextCompat.getColor(this, R.color.red_btn_bg_color))
+ // 闂澶嶅彂
+ viewModel.problemRecurrence.observe(this, Observer {
+
+ })
+ tv_title_6.setTextColor(ContextCompat.getColor(this, R.color.red_btn_bg_color))
+ // 鏂藉伐闃舵
+ viewModel.constructionPhase.observe(this, Observer {
+
+ })
+ tv_title_7.setTextColor(ContextCompat.getColor(this, R.color.main_color_2))
+ // 鍦ㄧ嚎鐩戞祴鏁版嵁
+ viewModel.monitorData.observe(this, Observer {
+
+ })
+ tv_title_8.setTextColor(ContextCompat.getColor(this, R.color.main_color_3))
+ tv_summary_8.setTextColor(ContextCompat.getColor(this, R.color.main_color_3))
+ // 搴旀�ュ贰鏌�
+ viewModel.emergencyInspection.observe(this, Observer {
+
+ })
+ tv_title_9.setTextColor(ContextCompat.getColor(this, R.color.main_color_3))
}
private fun initListener() {
-
-
-
fab_close.setOnClickListener {
this.finish()
}
--
Gitblit v1.9.3