diff --git a/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt index 9e09df1..d917007 100644 --- a/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt +++ b/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt @@ -276,7 +276,8 @@ val objectId = SaveKeyValues.getValue(LocaleConstant.OBJECT_ID, "") as String val marker = MarkerBean() - marker.objectType = binding.objectInclude.objectTypeSpinner.selectedItem.toString() + marker.objectType = + binding.objectInclude.objectTypeSpinner.selectedItem.toString().toObjectType() marker.pipelineType = binding.objectInclude.pipeInclude.markerObjectTypeView.text.toString() marker.pipelineMaterial = binding.objectInclude.pipeInclude.materialSpinner.selectedItem.toString() diff --git a/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt index 9e09df1..d917007 100644 --- a/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt +++ b/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt @@ -276,7 +276,8 @@ val objectId = SaveKeyValues.getValue(LocaleConstant.OBJECT_ID, "") as String val marker = MarkerBean() - marker.objectType = binding.objectInclude.objectTypeSpinner.selectedItem.toString() + marker.objectType = + binding.objectInclude.objectTypeSpinner.selectedItem.toString().toObjectType() marker.pipelineType = binding.objectInclude.pipeInclude.markerObjectTypeView.text.toString() marker.pipelineMaterial = binding.objectInclude.pipeInclude.materialSpinner.selectedItem.toString() diff --git a/app/src/main/java/com/casic/common/detector/gd/view/MainActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/MainActivity.kt index a77b27e..e99a083 100644 --- a/app/src/main/java/com/casic/common/detector/gd/view/MainActivity.kt +++ b/app/src/main/java/com/casic/common/detector/gd/view/MainActivity.kt @@ -732,6 +732,9 @@ return } val first = markers.first() + if (first.lat.isEmpty() || first.lng.isEmpty()) { + return + } val defaultLatLng = LatLng(first.lat.toDouble(), first.lng.toDouble()) //移动到指定经纬度 val cameraPosition = CameraPosition(defaultLatLng, 14f, 0f, 0f)