From 32e17591ca41ba7b79514f0cb2e2ef6eb3e5a384 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期六, 10 十月 2020 16:45:11 +0800
Subject: [PATCH] 20201010
---
app/src/main/java/cn/flightfeather/thirdapp/module/inspection/InspectionDetailActivity.kt | 93 ++++++++++++++++++++++++++++------------------
1 files changed, 57 insertions(+), 36 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..dbf4b7d 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
@@ -13,6 +13,7 @@
import android.view.View
import android.view.animation.AnimationUtils
import android.widget.LinearLayout
+import cn.flightfeather.thirdapp.CommonApplication
import cn.flightfeather.thirdapp.R
import cn.flightfeather.thirdapp.activity.GradeActivity
import cn.flightfeather.thirdapp.activity.MapActivity
@@ -58,7 +59,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,28 +137,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 ->
- str2.toDoubleOrNull() ?: 0.0
- }.takeIf { l-> l.size == 2 }.let {latLng->
- LatLng(latLng?.get(1) ?: 0.0, latLng?.get(0) ?: 0.0)
- }
- }
- drawPolyline(list)
- list.firstOrNull()?.let {p->
- myLatLngList.add(
- MyLatLng(
- p,
- drawableId = R.drawable.icon_mark_start_blue,
- selected = true
- )
- )
- }
- }
onDataLoaded(0)
}
})
@@ -162,7 +148,7 @@
viewModel.subTask.observe(this, Observer {
it?.let {
updateUIBySubTask(it)
- refreshMenuStatus(it.status)
+ taskStatus = it.status
onDataLoaded(1)
}
})
@@ -325,9 +311,36 @@
result = result.and(it)
}
if (result) {
- menuList.forEach {
- it.setOnClickListener(this)
+ showMenu()
+ refreshMenuStatus(taskStatus)
+
+ viewModel.inspection.value?.extension1?.let{
+ val list = it.split(";").map{str ->
+ str.split(",").map {str2 ->
+ str2.toDoubleOrNull() ?: 0.0
+ }.takeIf { l-> l.size == 2 }.let {latLng->
+ LatLng(latLng?.get(1) ?: 0.0, latLng?.get(0) ?: 0.0)
+ }
+ }
+ //閬撹矾鐩戞祴鐐瑰拰閬撹矾绫诲瀷鐨勫満鏅紝鐩存帴灞曠ず杞ㄨ抗锛涘叾浣欏満鏅彧鏈夌鐞嗗憳鍜屾斂搴滈儴闂ㄥ彲浠ユ煡鐪�
+ if (
+ (viewModel.scene.value?.typeid?.toString() == Constant.SCENE_TYPE9 || viewModel.scene.value?.typeid?.toString() == Constant.SCENE_TYPE10)
+ || (CommonApplication.getInstance().currentUser.usertypeid == 0.toByte() || CommonApplication.getInstance().currentUser.usertypeid == 2.toByte())
+ ) {
+ drawPolyline(list)
+ }
+
+ list.firstOrNull()?.let {p->
+ myLatLngList.add(
+ MyLatLng(
+ p,
+ drawableId = R.drawable.icon_mark_start_blue,
+ selected = true
+ )
+ )
+ }
}
+
} else {
toast("璇风瓑寰呮暟鎹姞杞藉畬鎴�")
}
@@ -385,7 +398,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,13 +582,13 @@
}
private fun startTracking() {
- if (viewModel.scene.value?.typeid?.toString() != Constant.SCENE_TYPE9
- || viewModel.subTask.value?.status != Domain.TASK_STATUS_RUNNING) return
+ if (
+ viewModel.subTask.value == null ||
+ viewModel.subTask.value?.status != Domain.TASK_STATUS_RUNNING
+ ) return
//褰撶户缁墽琛屾鍦ㄨ繘琛屼腑鐨勪换鍔℃椂锛屾牴鎹槸鍚︽湁鍘嗗彶杞ㄨ抗璁板綍鏉ュ垽鏂槸鍚﹀紑鍚�
- if (viewModel.inspection.value?.extension1 != null) {
- needTracking = true
- }
+ needTracking = true
if (!needTracking || timerTaskRunning) return
@@ -613,7 +626,13 @@
val distance = AMapUtils.calculateLineDistance(l1, l2)
if (distance >= 5) {
extension1 = "${extension1};${lng},${lat}"
- drawPolyline(LatLng(lat, lng))
+ //閬撹矾鐩戞祴鐐瑰拰閬撹矾绫诲瀷鐨勫満鏅紝鐩存帴灞曠ず杞ㄨ抗锛涘叾浣欏満鏅彧鏈夌鐞嗗憳鍜屾斂搴滈儴闂ㄥ彲浠ユ煡鐪�
+ if (
+ (viewModel.scene.value?.typeid?.toString() == Constant.SCENE_TYPE9 || viewModel.scene.value?.typeid?.toString() == Constant.SCENE_TYPE10)
+ || (CommonApplication.getInstance().currentUser.usertypeid == 0.toByte() || CommonApplication.getInstance().currentUser.usertypeid == 2.toByte())
+ ) {
+ drawPolyline(LatLng(lat, lng))
+ }
}
}
}
@@ -623,7 +642,7 @@
}
private fun trackingDone() {
- if (!needTracking || !timerTaskRunning) return
+ if (!timerTaskRunning) return
aMap.moveCamera(CameraUpdateFactory.zoomTo(zoomLevel))
@@ -648,6 +667,7 @@
} else {
it.problemcount + 1
}
+ // fixme: 2020/9/1 姝ゅ鍘熸湰鐨勯�昏緫鏄柊澧炰竴涓棶棰樺悗锛屽悓姝ユ洿鏂板贰鏌ヤ俊鎭腑鐨勯棶棰樻暟锛岄敊璇紝搴旇灏嗘鏇存柊鎿嶄綔鐩存帴鐢辨柊澧為棶棰樻帴鍙ｇ粺涓�瀹屾垚
viewModel.updateInspection(it)
}
@@ -716,8 +736,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 +747,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 +856,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