From dded7fe1d51cb3da855d02201ca150c9b7fd0495 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 15 九月 2020 10:41:52 +0800
Subject: [PATCH] 修复一键分享功能中，整改建议 没有显示的问题
---
app/src/main/java/cn/flightfeather/thirdapp/module/inspection/InspectionDetailActivity.kt | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/InspectionDetailActivity.kt b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/InspectionDetailActivity.kt
index 252856b..8eeb114 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/InspectionDetailActivity.kt
+++ b/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) {
@@ -648,6 +653,7 @@
} else {
it.problemcount + 1
}
+ // fixme: 2020/9/1 姝ゅ鍘熸湰鐨勯�昏緫鏄柊澧炰竴涓棶棰樺悗锛屽悓姝ユ洿鏂板贰鏌ヤ俊鎭腑鐨勯棶棰樻暟锛岄敊璇紝搴旇灏嗘鏇存柊鎿嶄綔鐩存帴鐢辨柊澧為棶棰樻帴鍙ｇ粺涓�瀹屾垚
viewModel.updateInspection(it)
}
@@ -716,8 +722,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 +733,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 +842,7 @@
}
startActivity(intent)
}
- //闂瀹℃牳
+ //鏁存敼瀹℃牳
R.id.ln_patrol_change_check -> {
val intent = Intent(this, MenuChangeCheckActivity::class.java).apply {
putExtra("subTask", viewModel.subTask.value)
--
Gitblit v1.9.3