diff --git a/app/src/main/java/com/casic/detector/common/view/SearchMarkerActivity.kt b/app/src/main/java/com/casic/detector/common/view/SearchMarkerActivity.kt index ff661ef..8b46830 100644 --- a/app/src/main/java/com/casic/detector/common/view/SearchMarkerActivity.kt +++ b/app/src/main/java/com/casic/detector/common/view/SearchMarkerActivity.kt @@ -363,7 +363,9 @@ ) + Math.PI val formatAngle = "%.2f".format(angle).toDouble() - dataPoints.add(RadarScanView.DataPoint(formatAngle, formatDistance)) + dataPoints.add( + RadarScanView.DataPoint(it.markerId, formatAngle, formatDistance) + ) } } withContext(Dispatchers.Main) { diff --git a/app/src/main/java/com/casic/detector/common/view/SearchMarkerActivity.kt b/app/src/main/java/com/casic/detector/common/view/SearchMarkerActivity.kt index ff661ef..8b46830 100644 --- a/app/src/main/java/com/casic/detector/common/view/SearchMarkerActivity.kt +++ b/app/src/main/java/com/casic/detector/common/view/SearchMarkerActivity.kt @@ -363,7 +363,9 @@ ) + Math.PI val formatAngle = "%.2f".format(angle).toDouble() - dataPoints.add(RadarScanView.DataPoint(formatAngle, formatDistance)) + dataPoints.add( + RadarScanView.DataPoint(it.markerId, formatAngle, formatDistance) + ) } } withContext(Dispatchers.Main) { diff --git a/app/src/main/java/com/casic/detector/common/widgets/RadarScanView.kt b/app/src/main/java/com/casic/detector/common/widgets/RadarScanView.kt index fc4ef74..f1798c5 100644 --- a/app/src/main/java/com/casic/detector/common/widgets/RadarScanView.kt +++ b/app/src/main/java/com/casic/detector/common/widgets/RadarScanView.kt @@ -439,8 +439,9 @@ /** * 数据点 + * @param markerId ID * @param angle 数据点和圆心的方位角 * @param distance 数据点和圆心的相对距离 * */ - data class DataPoint(var angle: Double, var distance: Float) + data class DataPoint(var markerId: String, var angle: Double, var distance: Float) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/detector/common/view/SearchMarkerActivity.kt b/app/src/main/java/com/casic/detector/common/view/SearchMarkerActivity.kt index ff661ef..8b46830 100644 --- a/app/src/main/java/com/casic/detector/common/view/SearchMarkerActivity.kt +++ b/app/src/main/java/com/casic/detector/common/view/SearchMarkerActivity.kt @@ -363,7 +363,9 @@ ) + Math.PI val formatAngle = "%.2f".format(angle).toDouble() - dataPoints.add(RadarScanView.DataPoint(formatAngle, formatDistance)) + dataPoints.add( + RadarScanView.DataPoint(it.markerId, formatAngle, formatDistance) + ) } } withContext(Dispatchers.Main) { diff --git a/app/src/main/java/com/casic/detector/common/widgets/RadarScanView.kt b/app/src/main/java/com/casic/detector/common/widgets/RadarScanView.kt index fc4ef74..f1798c5 100644 --- a/app/src/main/java/com/casic/detector/common/widgets/RadarScanView.kt +++ b/app/src/main/java/com/casic/detector/common/widgets/RadarScanView.kt @@ -439,8 +439,9 @@ /** * 数据点 + * @param markerId ID * @param angle 数据点和圆心的方位角 * @param distance 数据点和圆心的相对距离 * */ - data class DataPoint(var angle: Double, var distance: Float) + data class DataPoint(var markerId: String, var angle: Double, var distance: Float) } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_search_marker_audit.xml b/app/src/main/res/layout/activity_search_marker_audit.xml index ff93885..19e1d69 100644 --- a/app/src/main/res/layout/activity_search_marker_audit.xml +++ b/app/src/main/res/layout/activity_search_marker_audit.xml @@ -69,7 +69,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:background="@mipmap/bg_large_text_yellow" + android:background="@mipmap/bg_large_text_green" android:fontFamily="@font/fzdhjt" android:paddingHorizontal="@dimen/dp_20" android:paddingVertical="@dimen/dp_15"