From 29c6cb0031e3d1aac2e326b3a83fa78bcd380890 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期一, 21 十二月 2020 10:57:07 +0800
Subject: [PATCH] 1. 修改巡查界面刚进入快速点击巡查功能按钮导致崩溃问题； 2. 修复技防措施的地址记录信息有加号的问题
---
app/src/main/java/cn/flightfeather/thirdapp/model/enumreation/MediaFileType.kt | 3 +++
app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuNewGitActivity.kt | 2 +-
app/src/main/java/cn/flightfeather/thirdapp/module/inspection/InspectionDetailActivity.kt | 9 +++++----
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/model/enumreation/MediaFileType.kt b/app/src/main/java/cn/flightfeather/thirdapp/model/enumreation/MediaFileType.kt
index 68b41c4..19817ac 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/model/enumreation/MediaFileType.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/model/enumreation/MediaFileType.kt
@@ -7,10 +7,13 @@
enum class MediaFileType(val value: Int, val des: String) {
Problem(1, "闂"),
TechnicalPrevention(2,"鎶�闃叉帾鏂�"),
+
MonitorDevice(3, "鐩戞祴璁惧"),
ManageDevice(4, "娌荤悊璁惧"),
+
RoutineRecord(5, "甯歌璁板綍"),
Signature(6, "绛惧瓧"),
+
Nameplate(7, "閾墝"),
Others(99,"鍏朵粬")
}
\ No newline at end of file
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 f50135a..3cde748 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
@@ -130,7 +130,7 @@
super.onCreate(savedInstanceState)
- initIconViewPager()
+// initIconViewPager()
initLocation()
ll_show_hide_detail.setOnClickListener(this)
@@ -311,6 +311,7 @@
result = result.and(it)
}
if (result) {
+ initIconViewPager()
showMenu()
refreshMenuStatus(taskStatus)
@@ -604,8 +605,8 @@
timerTaskRunning = true
}
- val lng = round(longitudeCurrent * 1000) / 1000
- val lat = round(latitudeCurrent * 1000) / 1000
+ val lng = round(longitudeCurrent * 1000000) / 1000000
+ val lat = round(latitudeCurrent * 1000000) / 1000000
viewModel.inspection.value?.apply {
if (extension1 == null) {
@@ -624,7 +625,7 @@
val l1 = LatLng(lat, lng)
val l2 = LatLng(last[1], last[0])
val distance = AMapUtils.calculateLineDistance(l1, l2)
- if (distance >= 5) {
+ if (distance >= 1) {
extension1 = "${extension1};${lng},${lat}"
//閬撹矾鐩戞祴鐐瑰拰閬撹矾绫诲瀷鐨勫満鏅紝鐩存帴灞曠ず杞ㄨ抗锛涘叾浣欏満鏅彧鏈夌鐞嗗憳鍜屾斂搴滈儴闂ㄥ彲浠ユ煡鐪�
if (
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuNewGitActivity.kt b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuNewGitActivity.kt
index adc2d2a..915986e 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuNewGitActivity.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuNewGitActivity.kt
@@ -92,7 +92,7 @@
intent.putExtra("gitlistVo", viewModel.gitList.value?.get(position))
intent.putExtra("subTask", subTask)
intent.putExtra("inspectionGuid", inspection?.guid)
- intent.putExtra("scenseAddress", "${scene?.cityname ?: ""} + ${scene?.districtname?:""} + ${scene?.townname?:""} + ${scene?.location?:""}")
+ intent.putExtra("scenseAddress", "${scene?.cityname ?: ""}${scene?.districtname?:""}${scene?.townname?:""}${scene?.location?:""}")
startActivity(intent)
}
--
Gitblit v1.9.3