diff --git a/app/src/main/java/com/casic/detector/view/MainActivity.kt b/app/src/main/java/com/casic/detector/view/MainActivity.kt
index dd2a5c8..92fd34e 100644
--- a/app/src/main/java/com/casic/detector/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt
@@ -808,11 +808,8 @@
             "已完成全部巡检".show(this)
             return
         }
-        if (latitude != 0.0 && longitude != 0.0) {
-            navigatePageTo<UploadEventActivity>()
-        } else {
-            "定位中，请稍后再试...".show(this)
-        }
+
+        navigatePageTo<UploadEventActivity>()
     }
 
     //标识器补全
@@ -997,19 +994,23 @@
                     return@setOnClickListener
                 }
 
-                if (binding.objectInclude.pipeInclude.pipelineDiameterView.text.isNullOrBlank()) {
-                    "请输入管径".show(context)
-                    return@setOnClickListener
+                if (binding.objectInclude.objectTypeSpinner.selectedItem == "管线") {
+                    if (binding.objectInclude.pipeInclude.pipelineDiameterView.text.isNullOrBlank()) {
+                        "请输入管径".show(context)
+                        return@setOnClickListener
+                    }
+
+                    if (binding.objectInclude.pipeInclude.buryDeepView.text.isNullOrBlank()) {
+                        "请输入埋深".show(context)
+                        return@setOnClickListener
+                    }
                 }
 
-                if (binding.objectInclude.pipeInclude.buryDeepView.text.isNullOrBlank()) {
-                    "请输入埋深".show(context)
-                    return@setOnClickListener
-                }
-
-                if (binding.objectInclude.pipeCrossInclude.bottomPipeDiameterView.text.isNullOrBlank()) {
-                    "请输入下层管管径".show(context)
-                    return@setOnClickListener
+                if (binding.objectInclude.objectTypeSpinner.selectedItem == "交叉穿越点") {
+                    if (binding.objectInclude.pipeCrossInclude.bottomPipeDiameterView.text.isNullOrBlank()) {
+                        "请输入下层管管径".show(context)
+                        return@setOnClickListener
+                    }
                 }
 
                 if (binding.objectInclude.areaView.text.isNullOrBlank()) {

diff --git a/app/src/main/java/com/casic/detector/view/MainActivity.kt b/app/src/main/java/com/casic/detector/view/MainActivity.kt
index dd2a5c8..92fd34e 100644
--- a/app/src/main/java/com/casic/detector/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt
@@ -808,11 +808,8 @@
             "已完成全部巡检".show(this)
             return
         }
-        if (latitude != 0.0 && longitude != 0.0) {
-            navigatePageTo<UploadEventActivity>()
-        } else {
-            "定位中，请稍后再试...".show(this)
-        }
+
+        navigatePageTo<UploadEventActivity>()
     }
 
     //标识器补全
@@ -997,19 +994,23 @@
                     return@setOnClickListener
                 }
 
-                if (binding.objectInclude.pipeInclude.pipelineDiameterView.text.isNullOrBlank()) {
-                    "请输入管径".show(context)
-                    return@setOnClickListener
+                if (binding.objectInclude.objectTypeSpinner.selectedItem == "管线") {
+                    if (binding.objectInclude.pipeInclude.pipelineDiameterView.text.isNullOrBlank()) {
+                        "请输入管径".show(context)
+                        return@setOnClickListener
+                    }
+
+                    if (binding.objectInclude.pipeInclude.buryDeepView.text.isNullOrBlank()) {
+                        "请输入埋深".show(context)
+                        return@setOnClickListener
+                    }
                 }
 
-                if (binding.objectInclude.pipeInclude.buryDeepView.text.isNullOrBlank()) {
-                    "请输入埋深".show(context)
-                    return@setOnClickListener
-                }
-
-                if (binding.objectInclude.pipeCrossInclude.bottomPipeDiameterView.text.isNullOrBlank()) {
-                    "请输入下层管管径".show(context)
-                    return@setOnClickListener
+                if (binding.objectInclude.objectTypeSpinner.selectedItem == "交叉穿越点") {
+                    if (binding.objectInclude.pipeCrossInclude.bottomPipeDiameterView.text.isNullOrBlank()) {
+                        "请输入下层管管径".show(context)
+                        return@setOnClickListener
+                    }
                 }
 
                 if (binding.objectInclude.areaView.text.isNullOrBlank()) {
diff --git a/app/src/main/java/com/casic/detector/view/UploadEventActivity.kt b/app/src/main/java/com/casic/detector/view/UploadEventActivity.kt
index 704fb3b..79c973d 100644
--- a/app/src/main/java/com/casic/detector/view/UploadEventActivity.kt
+++ b/app/src/main/java/com/casic/detector/view/UploadEventActivity.kt
@@ -125,8 +125,8 @@
             eventModel.description = binding.eventDescriptionView.text.toString()
             eventModel.createTime = binding.uploadTimeView.text.toString()
 
-            eventModel.latitude = binding.lngView.text.toString().toDouble()
-            eventModel.longitude = binding.latView.text.toString().toDouble()
+            eventModel.latitude = binding.latView.text.toString().toDouble()
+            eventModel.longitude = binding.lngView.text.toString().toDouble()
 
             taskViewModel.uploadEvent(taskId, eventModel.toJson(), realPaths)
         }