From 17eb1d06e104bc1cd93498fe3a3eaecf14c9d734 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 12 十一月 2020 13:57:35 +0800
Subject: [PATCH] 1. 修复现场整改时,问题状态是‘问题审核通过’而不是“整改未审核”的问题; 2. 修改任意拍照界面的多图片展示方式为Glide,减少内存溢出的可能性; 3. 新增图片类型枚举类,罗列原有的图片类型,并新增“铭牌”和“监测设备”; 4. 修复导航功能可能导致空指针的问题; 5. 任意拍界面新增按分类拍摄功能; 6. 修复现场整改界面打开崩溃问题;

---
 app/src/main/java/cn/flightfeather/thirdapp/module/inspection/InspectionDetailActivity.kt |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 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 dbf4b7d..f50135a 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
@@ -684,10 +684,16 @@
 
     //寮�濮嬪鑸�
     private fun startNavi() {
-        val sourceLatLng = LatLng(viewModel.scene.value?.getLatitude()!!, viewModel.scene.value?.getLongitude()!!)
-
-        val amapNavi = AmapNavi(this)
-        amapNavi.startNavi(sourceLatLng.latitude, sourceLatLng.longitude)
+        if (viewModel.scene.value != null) {
+            val sourceLatLng = LatLng(
+                    viewModel.scene.value!!.latitude,
+                    viewModel.scene.value!!.longitude
+            )
+            val amapNavi = AmapNavi(this)
+            amapNavi.startNavi(sourceLatLng.latitude, sourceLatLng.longitude)
+        } else {
+            toast("瀵艰埅鐩墠涓嶅彲鐢紝璇风◢鍚庡啀璇�")
+        }
     }
 
     override fun onClick(v: View?) {

--
Gitblit v1.9.3