From 8d7c6036f1ade8593aa7d929ae7201217e913c46 Mon Sep 17 00:00:00 2001
From: qiji4215 <qiji4215@navinfo.com>
Date: Thu, 10 Aug 2023 13:43:36 +0800
Subject: [PATCH] merge code

---
 .../main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt  | 1 +
 .../main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
index c3a6fc33..e8a995d8 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
@@ -424,6 +424,7 @@ class MainActivity : BaseActivity() {
                 editText.text = null
                 //清理已绘制线
                 mapController.lineHandler.removeLine()
+                mapController.markerHandle.removeMarker("location")
                 when (p0.position) {
                     0 -> editText.hint = "请输入LinkPid例如：12345678"
                     1 -> editText.hint = "请输入MarkId例如：123456789"
diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
index f75fa3f1..143f8379 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
@@ -583,6 +583,7 @@ class MainViewModel @Inject constructor(
      * 点击我的位置，回到我的位置
      */
     fun onClickLocationButton() {
+        mapController.markerHandle.removeMarker("location")
         mapController.locationLayerHandler.animateToCurrentPosition()
     }
 
@@ -1113,6 +1114,7 @@ class MainViewModel @Inject constructor(
                         val x = parts[0].toDouble()
                         val y = parts[1].toDouble()
                         mapController.animationHandler.animationByLatLon(y, x)
+                        mapController.markerHandle.addMarker(GeoPoint(y,x),"location")
                         dialog.dismiss()
                     } else {
                         Toast.makeText(mapController.mMapView.context, "输入格式不正确", Toast.LENGTH_SHORT).show()