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 | 72 +++++++++++++++++++++++++++++-------
1 files changed, 58 insertions(+), 14 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..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
@@ -1,27 +1,34 @@
package cn.flightfeather.thirdappmodule.module.inspection
+import android.arch.lifecycle.Observer
import android.arch.lifecycle.ViewModelProviders
import android.os.Bundle
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 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
- lateinit var viewModel: MenuSceneHistoryViewModel
+ lateinit var viewModel: SceneHistoryViewModel
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
- viewModel = ViewModelProviders.of(this).get(SceneDetailViewModel::class.java)
+ viewModel = ViewModelProviders.of(this).get(SceneHistoryViewModel::class.java)
scene = intent.getSerializableExtra("scene") as Scense?
@@ -29,26 +36,63 @@
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() {
- view_waiting.visibility = View.VISIBLE
- scene?.let {
- tv_status.text = StringBuilder(it.type + getString(R.string.scene_status))
- }
+ // 榛樿鍏堝皢涓夊潡鍐呭闅愯棌
+ 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.changeInfoTxt.observe(this, Observer {
+ it?.let {
+ tv_change_rate.text = it
+ tv_change_rate.visibility = View.VISIBLE
+ cl_risk_warn.visibility = View.VISIBLE
+ }
+ })
+ viewModel.changeEfficiencyTxt.observe(this, Observer {
+ it?.let {
+ tv_change_efficiency.text = it
+ tv_change_efficiency.visibility = View.VISIBLE
+ cl_risk_warn.visibility = View.VISIBLE
+ }
+ })
+ viewModel.problemRecurrenceTxt.observe(this, Observer {
+ it?.let {
+ tv_problem_recurrence.text = it
+ tv_problem_recurrence.visibility = View.VISIBLE
+ cl_risk_warn.visibility = View.VISIBLE
+ }
+ })
+ // 宸℃煡瑕佺偣
+ viewModel.inspectionKeyPointTxt.observe(this, Observer {
+ it?.let {
+ tv_key_point.text = it
+ cl_inspection_key_point.visibility = View.VISIBLE
+ }
+ })
+ // 搴旀�ュ贰鏌�
+ viewModel.tempInspectionTxt.observe(this, Observer {
+ it?.let {
+ tv_temp_inspection.text = it
+ cl_temp_inspection.visibility = View.VISIBLE
+ }
+ })
}
private fun initListener() {
-
-
-
fab_close.setOnClickListener {
this.finish()
}
--
Gitblit v1.9.3