merge code

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"

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()