1. 新增问题和删除修改功能（调试中） 2. 轨迹记录功能开放为所有类型的场景都记录

riku

2020-08-28 e3864138492d1d3280710a1ba7162d9dd7542404

 app/src/main/java/cn/flightfeather/thirdapp/module/inspection/InspectionDetailActivity.kt

@@ -58,7 +58,10 @@
        const val PROBLEM_RECHECK = 102//问题复核
        const val PROBLEM_CHECK = 103//问题审核
        const val CHANGE_CHECK = 104//整改审核
        const val PROBLEM_DELETE = 105
    }

    private var taskStatus: String = Domain.TASK_STATUS_FINISHED

    /**
     * 加载完成状态，
@@ -133,9 +136,10 @@
        iv_patrol_back.setOnClickListener(this)
        ll_patrol_task_detail.visibility = View.GONE

        hideMenu()

        viewModel.inspection.observe(this, Observer {
            it?.apply {
                showMenu()
                if (extension1 != null) {
                    val list = extension1.split(";").map{str ->
                        str.split(",").map {str2 ->
@@ -162,7 +166,7 @@
        viewModel.subTask.observe(this, Observer {
            it?.let {
                updateUIBySubTask(it)
                refreshMenuStatus(it.status)
                taskStatus = it.status
                onDataLoaded(1)
            }
        })
@@ -325,9 +329,8 @@
            result = result.and(it)
        }
        if (result) {
            menuList.forEach {
                it.setOnClickListener(this)
            }
            showMenu()
            refreshMenuStatus(taskStatus)
        } else {
            toast("请等待数据加载完成")
        }
@@ -385,7 +388,7 @@
        val address = s.cityname + s.districtname + " " + s.location
        tv_scense_address.text = address

        val contact1 = s.contacts + " " + s.contactst
        val contact1 = s.contacts ?: "" + " " + s.contactst ?: ""
        tv_scense_contact1.text = contact1
        tv_call_contact1.setOnClickListener {
            //打电话
@@ -569,8 +572,10 @@
    }

    private fun startTracking() {
        if (viewModel.scene.value?.typeid?.toString() != Constant.SCENE_TYPE9
                || viewModel.subTask.value?.status != Domain.TASK_STATUS_RUNNING) return
        if (
//                viewModel.scene.value?.typeid?.toString() != Constant.SCENE_TYPE9 ||
                viewModel.subTask.value?.status != Domain.TASK_STATUS_RUNNING
        ) return

        //当继续执行正在进行中的任务时，根据是否有历史轨迹记录来判断是否开启
        if (viewModel.inspection.value?.extension1 != null) {
@@ -716,8 +721,9 @@
                val intent = Intent(this, MenuProblemListActivity::class.java).apply {
                    putExtra("subTask", viewModel.subTask.value)
                    putExtra("inspection", viewModel.inspection.value)
                    putExtra("scenseLat", viewModel.scene.value?.latitude)
                    putExtra("scenseLng", viewModel.scene.value?.longitude)
                    putExtra("scene", viewModel.scene.value)
                    putExtra("lat", viewModel.scene.value?.latitude)
                    putExtra("lng", viewModel.scene.value?.longitude)
                }
                startActivity(intent)
            }
@@ -726,8 +732,8 @@
                val intent = Intent(this, MenuChangeActivity::class.java).apply {
                    putExtra("subTask", viewModel.subTask.value)
                    putExtra("inspection", viewModel.inspection.value)
                    putExtra("scenseLat", viewModel.scene.value?.latitude)
                    putExtra("scenseLng", viewModel.scene.value?.longitude)
                    putExtra("lat", viewModel.scene.value?.latitude)
                    putExtra("lng", viewModel.scene.value?.longitude)
                }
                startActivity(intent)
            }
@@ -835,7 +841,7 @@
                }
                startActivity(intent)
            }
            //问题审核
            //整改审核
            R.id.ln_patrol_change_check -> {
                val intent = Intent(this, MenuChangeCheckActivity::class.java).apply {
                    putExtra("subTask", viewModel.subTask.value)