supervision-android.git

			@@ -12,7 +12,7 @@
			import cn.flightfeather.thirdapp.R
			import cn.flightfeather.thirdapp.adapter.DomainItemListAdapter
			import cn.flightfeather.thirdapp.adapter.ProblemTypeListAdapter
			import cn.flightfeather.thirdapp.bean.*
			import cn.flightfeather.thirdapp.bean.entity.*
			import cn.flightfeather.thirdapp.model.event.ProblemEvent
			import cn.flightfeather.thirdapp.module.base.BaseTakePicActivity
			import cn.flightfeather.thirdapp.util.DateFormatter
			@@ -135,8 +135,13 @@
			viewModel.suggestionList.observe(this, Observer {
			it.let {
			sp_take_evidence_select_suggestion.adapter = ArrayAdapter(this, R.layout.item_spinner_drop_down, it)
			onSuggestionLoaded()
			}
			})
			}

			open fun onSuggestionLoaded() {

			}

			protected fun updateUIByProblemType(visible: Int) {
			@@ -153,7 +158,7 @@
			toast("当前巡查状态错误，无法上传问题，请尝试重新启动")
			}

			val problemType = sp_take_evidence_select_problem_type.selectedItem.toString()
			val problemType = sp_take_evidence_select_problem_type.selectedItem?.toString()

			val pro = Problemlist().apply {
			guid = UUIDGenerator.generate16ShortUUID()
			@@ -166,26 +171,26 @@
			val p = sp_take_evidence_select_problem.selectedItem
			if (p is Problemtype) {
			ptguid = p.guid
			var problemDes = et_take_evidence_problem_des.text.toString()
			var problemDes = et_take_evidence_problem_des?.text.toString()
			if (problemDes.isNotEmpty()) {
			problemDes = "($problemDes)"
			}
			problemname = p.name + problemDes
			}

			var adviceDes = et_take_evidence_suggestion.text.toString()
			var adviceDes = et_take_evidence_suggestion?.text.toString()
			if (adviceDes.isNotEmpty()) {
			adviceDes = "($adviceDes)"
			}
			advise = sp_take_evidence_select_suggestion.selectedItem.toString() + adviceDes
			advise = sp_take_evidence_select_suggestion.selectedItem?.toString() + adviceDes
			latitude = lat
			longitude = lng

			val l = sp_take_evidence_select_location.selectedItem
			if (l is Domainitem) {
			if (problemType != "态度") {
			var locationRemark = et_take_evidence_location.text.toString()
			if (locationRemark.isNotEmpty()) {
			var locationRemark = et_take_evidence_location.text?.toString()
			if (locationRemark?.isNotEmpty() == true) {
			locationRemark = "($locationRemark)"
			}
			locationid = l.index.toByte()