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 b4f3eb9..5e6c9cc 100644 --- a/app/src/main/java/com/casic/detector/view/MainActivity.kt +++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt @@ -1760,17 +1760,18 @@ lifecycleScope.launch(Dispatchers.IO) { val dataPoints = ArrayList() DataBaseManager.get.loadTaskLabels().forEach { - val angle = location.calculateAngle( - LatLng(it.lat.toDouble(), it.lng.toDouble()) - ) - //单位:米 val distance = AMapUtils.calculateLineDistance( LatLng(latitude, longitude), LatLng(it.lat.toDouble(), it.lng.toDouble()) ) if (distance <= LocaleConstant.MAX_DISTANCE) { - dataPoints.add(RadarScanView.DataPoint(angle, distance)) + val angle = location.calculateAngle( + LatLng(it.lat.toDouble(), it.lng.toDouble()) + ) + + val formatDistance = String.format("%.2f", distance) + dataPoints.add(RadarScanView.DataPoint(angle, formatDistance.toFloat())) } } withContext(Dispatchers.Main) {