Merge remote-tracking branch 'supervision/master'

riku

2020-10-10 5771916ffb24807dd57c1969baa6371611c334da

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

@@ -78,6 +78,36 @@
        problemVo = intent.getSerializableExtra("problemlistVo") as ProblemlistVo
    }

    override fun onSuggestionLoaded() {
        super.onSuggestionLoaded()
        if (problemVo != null && viewModel.suggestionList.value?.isNotEmpty() == true) {
            //整改建议
            var advice = problemVo!!.advise
            var getSuggestion = false
            for (i in viewModel.suggestionList.value?.indices ?: 0..0) {
                val s = viewModel.suggestionList.value?.get(i)
                if (s != null && advice.contains(s)) {
                    advice = advice.replace(s, "")
                    sp_take_evidence_select_suggestion.setSelection(i)
                    getSuggestion = true
                    break
                }
            }
            //整改建议备注
            if (getSuggestion) {
                var suggestionRemark = advice.removeRange(0, 1)//删除第一个字符，括号“（”
                suggestionRemark = suggestionRemark.dropLast(1)//删除最后一个字符，括号“）”
                et_take_evidence_suggestion.setText(suggestionRemark)
            }
        }
        sp_take_evidence_select_problem_type.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
            override fun onNothingSelected(parent: AdapterView<*>?) = Unit
            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
                onProblemTypeSelected(position)
            }
        }
    }

    override fun initObserver() {
        super.initObserver()
        viewModel.loadingOver.observe(this, Observer {
@@ -131,22 +161,6 @@
                    locationRemark = locationRemark.dropLast(1)//删除最后一个字符，括号“）”
                }
                et_take_evidence_location.setText(locationRemark)

                //整改建议
                var advice = problemVo!!.advise
                var suggestion = ""
                for (i in viewModel.suggestionList.value?.indices ?: 0..0) {
                    val s = viewModel.suggestionList.value?.get(i)
                    if (s != null && advice.contains(s)) {
                        advice = advice.replace(s, "")
                        sp_take_evidence_select_suggestion.setSelection(i)
                        break
                    }
                }
                //整改建议备注
                var suggestionRemark = advice.removeRange(0, 1)//删除第一个字符，括号“（”
                suggestionRemark = suggestionRemark.dropLast(1)//删除最后一个字符，括号“）”
                et_take_evidence_suggestion.setText(suggestionRemark)
            }
        })