diff --git a/app/src/main/java/com/casic/detector/extensions/AMapLocation.kt b/app/src/main/java/com/casic/detector/extensions/AMapLocation.kt
index cc5d228..27e0d7c 100644
--- a/app/src/main/java/com/casic/detector/extensions/AMapLocation.kt
+++ b/app/src/main/java/com/casic/detector/extensions/AMapLocation.kt
@@ -38,15 +38,10 @@
 
     //弧度转角度，度=弧度×180°/π
     val angle = (radian * 180) / Math.PI
-    return angle.toInt()
-//    val direction = if (target.longitude > this.longitude && target.latitude > this.latitude) {
-//        angle.toInt()
-//    } else if (target.longitude > this.longitude && target.latitude < this.latitude) {
-//        (angle + 90).toInt()
-//    } else if (target.longitude < this.longitude && target.latitude < this.latitude) {
-//        (angle + 180).toInt()
-//    } else {
-//        (angle + 270).toInt()
-//    }
-//    return direction
+    val direction = if (target.longitude > this.longitude) {
+        (angle + 180).toInt()
+    } else {
+        angle.toInt()
+    }
+    return direction
 }
\ No newline at end of file

diff --git a/app/src/main/java/com/casic/detector/extensions/AMapLocation.kt b/app/src/main/java/com/casic/detector/extensions/AMapLocation.kt
index cc5d228..27e0d7c 100644
--- a/app/src/main/java/com/casic/detector/extensions/AMapLocation.kt
+++ b/app/src/main/java/com/casic/detector/extensions/AMapLocation.kt
@@ -38,15 +38,10 @@
 
     //弧度转角度，度=弧度×180°/π
     val angle = (radian * 180) / Math.PI
-    return angle.toInt()
-//    val direction = if (target.longitude > this.longitude && target.latitude > this.latitude) {
-//        angle.toInt()
-//    } else if (target.longitude > this.longitude && target.latitude < this.latitude) {
-//        (angle + 90).toInt()
-//    } else if (target.longitude < this.longitude && target.latitude < this.latitude) {
-//        (angle + 180).toInt()
-//    } else {
-//        (angle + 270).toInt()
-//    }
-//    return direction
+    val direction = if (target.longitude > this.longitude) {
+        (angle + 180).toInt()
+    } else {
+        angle.toInt()
+    }
+    return direction
 }
\ No newline at end of file
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 4b0146b..db26823 100644
--- a/app/src/main/java/com/casic/detector/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt
@@ -1583,9 +1583,9 @@
                             LatLng(it.lat.toDouble(), it.lng.toDouble())
                         )
 
-//                        withContext(Dispatchers.Main){
-//                            "$angle".show(context)
-//                        }
+                        withContext(Dispatchers.Main){
+                            "$angle".show(context)
+                        }
                         val formatDistance = String.format("%.2f", distance)
                         dataPoints.add(RadarScanView.DataPoint(angle, formatDistance.toFloat()))
                     }

diff --git a/app/src/main/java/com/casic/detector/extensions/AMapLocation.kt b/app/src/main/java/com/casic/detector/extensions/AMapLocation.kt
index cc5d228..27e0d7c 100644
--- a/app/src/main/java/com/casic/detector/extensions/AMapLocation.kt
+++ b/app/src/main/java/com/casic/detector/extensions/AMapLocation.kt
@@ -38,15 +38,10 @@
 
     //弧度转角度，度=弧度×180°/π
     val angle = (radian * 180) / Math.PI
-    return angle.toInt()
-//    val direction = if (target.longitude > this.longitude && target.latitude > this.latitude) {
-//        angle.toInt()
-//    } else if (target.longitude > this.longitude && target.latitude < this.latitude) {
-//        (angle + 90).toInt()
-//    } else if (target.longitude < this.longitude && target.latitude < this.latitude) {
-//        (angle + 180).toInt()
-//    } else {
-//        (angle + 270).toInt()
-//    }
-//    return direction
+    val direction = if (target.longitude > this.longitude) {
+        (angle + 180).toInt()
+    } else {
+        angle.toInt()
+    }
+    return direction
 }
\ No newline at end of file
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 4b0146b..db26823 100644
--- a/app/src/main/java/com/casic/detector/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt
@@ -1583,9 +1583,9 @@
                             LatLng(it.lat.toDouble(), it.lng.toDouble())
                         )
 
-//                        withContext(Dispatchers.Main){
-//                            "$angle".show(context)
-//                        }
+                        withContext(Dispatchers.Main){
+                            "$angle".show(context)
+                        }
                         val formatDistance = String.format("%.2f", distance)
                         dataPoints.add(RadarScanView.DataPoint(angle, formatDistance.toFloat()))
                     }
diff --git a/app/src/main/java/com/casic/detector/vm/TaskViewModel.kt b/app/src/main/java/com/casic/detector/vm/TaskViewModel.kt
index 33b8390..3c09f98 100644
--- a/app/src/main/java/com/casic/detector/vm/TaskViewModel.kt
+++ b/app/src/main/java/com/casic/detector/vm/TaskViewModel.kt
@@ -204,7 +204,8 @@
     })
 
     fun uploadMarker(context: Context, marker: TaskMarkerLocalBean) = launch({
-        RetrofitServiceManager.uploadMarker(marker.markerId)
+        //主键ID代替MarkerId
+        RetrofitServiceManager.uploadMarker(marker.id.toString())
         "标识器${marker.markerId}已探测！".show(context)
         DataBaseManager.get.updateLocalTaskMarkerState(marker)
     }, {