diff --git a/app/build.gradle b/app/build.gradle index 5b03364..ed738e9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -76,7 +76,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.9' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10' implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.appcompat:appcompat:1.6.1' //Google官方授权框架 diff --git a/app/build.gradle b/app/build.gradle index 5b03364..ed738e9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -76,7 +76,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.9' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10' implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.appcompat:appcompat:1.6.1' //Google官方授权框架 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 4654886..836b6f6 100644 --- a/app/src/main/java/com/casic/detector/view/MainActivity.kt +++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt @@ -40,7 +40,6 @@ import com.casic.detector.base.SerialPortActivity import com.casic.detector.bean.MarkerLocalBean import com.casic.detector.bean.TaskLocalBean -import com.casic.detector.bean.TaskMarkerLocalBean import com.casic.detector.callback.OnGetLocationListener import com.casic.detector.callback.OnImageCompressListener import com.casic.detector.cluster.ClusterItem @@ -1566,18 +1565,23 @@ ) if (distance <= LocaleConstant.MAX_DISTANCE) { - val angle = location.calculateAngle( + var angle = location.calculateAngle( LatLng(it.lat.toDouble(), it.lng.toDouble()) ) + //TODO + angle = if (true) { + angle - 90 + } else { + angle + 90 + } val formatDistance = String.format("%.2f", distance) dataPoints.add(RadarScanView.DataPoint(angle, formatDistance.toFloat())) } } withContext(Dispatchers.Main) { binding.radarScanView.renderPointData( - dataPoints, - object : RadarScanView.OnGetNearestPointCallback { + dataPoints, object : RadarScanView.OnGetNearestPointCallback { override fun getNearestPoint(point: RadarScanView.DataPoint?) { if (point == null) { binding.distanceValueView.text = "大于550cm" @@ -1593,7 +1597,8 @@ binding.distancePgBar.progress = progress.toInt() } } - }) + } + ) } } } diff --git a/app/build.gradle b/app/build.gradle index 5b03364..ed738e9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -76,7 +76,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.9' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10' implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.appcompat:appcompat:1.6.1' //Google官方授权框架 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 4654886..836b6f6 100644 --- a/app/src/main/java/com/casic/detector/view/MainActivity.kt +++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt @@ -40,7 +40,6 @@ import com.casic.detector.base.SerialPortActivity import com.casic.detector.bean.MarkerLocalBean import com.casic.detector.bean.TaskLocalBean -import com.casic.detector.bean.TaskMarkerLocalBean import com.casic.detector.callback.OnGetLocationListener import com.casic.detector.callback.OnImageCompressListener import com.casic.detector.cluster.ClusterItem @@ -1566,18 +1565,23 @@ ) if (distance <= LocaleConstant.MAX_DISTANCE) { - val angle = location.calculateAngle( + var angle = location.calculateAngle( LatLng(it.lat.toDouble(), it.lng.toDouble()) ) + //TODO + angle = if (true) { + angle - 90 + } else { + angle + 90 + } val formatDistance = String.format("%.2f", distance) dataPoints.add(RadarScanView.DataPoint(angle, formatDistance.toFloat())) } } withContext(Dispatchers.Main) { binding.radarScanView.renderPointData( - dataPoints, - object : RadarScanView.OnGetNearestPointCallback { + dataPoints, object : RadarScanView.OnGetNearestPointCallback { override fun getNearestPoint(point: RadarScanView.DataPoint?) { if (point == null) { binding.distanceValueView.text = "大于550cm" @@ -1593,7 +1597,8 @@ binding.distancePgBar.progress = progress.toInt() } } - }) + } + ) } } } diff --git a/app/src/main/res/layout/dialog_search_marker_new.xml b/app/src/main/res/layout/dialog_search_marker_new.xml index 42604bc..7349134 100644 --- a/app/src/main/res/layout/dialog_search_marker_new.xml +++ b/app/src/main/res/layout/dialog_search_marker_new.xml @@ -13,7 +13,7 @@ android:layout_width="320dp" android:layout_height="wrap_content" android:layout_gravity="center" - android:layout_marginVertical="@dimen/dp_10" + android:layout_marginTop="@dimen/dp_10" android:ellipsize="marquee" android:gravity="center" android:singleLine="true" @@ -24,6 +24,7 @@