2025.11.10 1. 新增巡查场景历史详情相关数据逻辑; 2. 新增工地施工阶段修改界面；

riku

2025-11-10 e234a15b428267997c903a4ed42536c5d9f14a1f

 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() {