From e234a15b428267997c903a4ed42536c5d9f14a1f Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期一, 10 十一月 2025 13:10:42 +0800
Subject: [PATCH] 2025.11.10 1. 新增巡查场景历史详情相关数据逻辑; 2. 新增工地施工阶段修改界面；
---
app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneHistoryActivity.kt | 126 +++++++++++++++---------------------------
1 files changed, 45 insertions(+), 81 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 9cc8097..931d99e 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
@@ -3,14 +3,13 @@
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.databinding.SceneHistoryViewModel
import cn.flightfeather.thirdappmodule.module.base.BaseActivity
import kotlinx.android.synthetic.main.dialog_scene_history.*
-import kotlinx.android.synthetic.main.fragment_analysis_over_view.*
/**
* 鍦烘櫙鍘嗗彶鎯呭喌鎻愮ず鐣岄潰
@@ -24,12 +23,12 @@
override fun getLayoutId(): Int = R.layout.dialog_scene_history
- lateinit var viewModel: MenuSceneHistoryViewModel
+ lateinit var viewModel: SceneHistoryViewModel
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
- viewModel = ViewModelProviders.of(this).get(MenuSceneHistoryViewModel::class.java)
+ viewModel = ViewModelProviders.of(this).get(SceneHistoryViewModel::class.java)
scene = intent.getSerializableExtra("scene") as Scense?
@@ -37,95 +36,60 @@
initObserver()
initListener()
-// viewModel.getSceneStatus {
-// scene?.let { viewModel.getSceneDetail(it) }
-// }
+ scene?.let {
+ viewModel.fetchChangeInfoList(it.guid)
+ viewModel.fetchProblemRecurrence(it.guid)
+ viewModel.fetchInspectionKeyPoint(it.guid)
+ }
}
private fun initUI() {
- // 缁熻椤圭洰
- 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_title.text = it.name
- }
+ // 榛樿鍏堝皢涓夊潡鍐呭闅愯棌
+ cl_risk_warn.visibility = View.GONE
+ cl_inspection_key_point.visibility = View.GONE
+ cl_temp_inspection.visibility = View.GONE
+ tv_change_rate.visibility = View.GONE
+ tv_change_efficiency.visibility = View.GONE
+ tv_problem_recurrence.visibility = View.GONE
}
private fun initObserver() {
- // 鍘嗗彶璇勪及鎯呭喌
- viewModel.evaluationList.observe(this, Observer {
-
+ // 椋庨櫓鎻愮ず
+ viewModel.changeInfoTxt.observe(this, Observer {
+ it?.let {
+ tv_change_rate.text = it
+ tv_change_rate.visibility = View.VISIBLE
+ cl_risk_warn.visibility = View.VISIBLE
+ }
})
-
- // 鍏稿瀷鍦烘櫙鎯呭喌
- viewModel.typicalScene.observe(this, Observer {
-
+ viewModel.changeEfficiencyTxt.observe(this, Observer {
+ it?.let {
+ tv_change_efficiency.text = it
+ tv_change_efficiency.visibility = View.VISIBLE
+ cl_risk_warn.visibility = View.VISIBLE
+ }
})
- tv_title_2.setTextColor(ContextCompat.getColor(this, R.color.red_btn_bg_color))
- // 閲嶇偣鍖哄煙锛堝湪鍥芥帶鐐广�佸競鎺х偣鍛ㄨ竟锛�
- viewModel.keyArea.observe(this, Observer {
-
+ viewModel.problemRecurrenceTxt.observe(this, Observer {
+ it?.let {
+ tv_problem_recurrence.text = it
+ tv_problem_recurrence.visibility = View.VISIBLE
+ cl_risk_warn.visibility = View.VISIBLE
+ }
})
- tv_title_3.setTextColor(ContextCompat.getColor(this, R.color.red_btn_bg_color))
- // 鑱斿悎鎵ф硶
- viewModel.jointLawEnforcement.observe(this, Observer {
-
+ // 宸℃煡瑕佺偣
+ viewModel.inspectionKeyPointTxt.observe(this, Observer {
+ it?.let {
+ tv_key_point.text = it
+ cl_inspection_key_point.visibility = View.VISIBLE
+ }
})
- 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 {
-
+ viewModel.tempInspectionTxt.observe(this, Observer {
+ it?.let {
+ tv_temp_inspection.text = it
+ cl_temp_inspection.visibility = View.VISIBLE
+ }
})
- tv_title_9.setTextColor(ContextCompat.getColor(this, R.color.main_color_3))
}
private fun initListener() {
--
Gitblit v1.9.3