From 3883c934fcc65614f6420e1d5633ddf71e105993 Mon Sep 17 00:00:00 2001 From: qiji4215 Date: Fri, 14 Jul 2023 16:40:14 +0800 Subject: [PATCH] merge code --- .../omqs/ui/activity/map/MainViewModel.kt | 15 +++++++-------- .../{mipmap-xxhdpi => mipmap-hdpi}/icon_gps.png | Bin .../icon_gps_1.png | Bin .../icon_nilocation.png | Bin .../icon_nilocation_1.png | Bin 5 files changed, 7 insertions(+), 8 deletions(-) rename collect-library/src/main/res/{mipmap-xxhdpi => mipmap-hdpi}/icon_gps.png (100%) rename collect-library/src/main/res/{mipmap-xxhdpi => mipmap-hdpi}/icon_gps_1.png (100%) rename collect-library/src/main/res/{mipmap-xxhdpi => mipmap-hdpi}/icon_nilocation.png (100%) rename collect-library/src/main/res/{mipmap-xxhdpi => mipmap-hdpi}/icon_nilocation_1.png (100%) diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt index 427a2321..47c105fc 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt @@ -266,23 +266,22 @@ class MainViewModel @Inject constructor( location.taskId = id.toString() //增加间距判断 if (lastNiLocaion != null) { - val disance = GeometryTools.distanceToDouble( - GeoPoint(location.latitude, location.longitude), GeoPoint( - lastNiLocaion!!.latitude, lastNiLocaion!!.longitude - ) - ) - //相距差距大于0.5米以上进行存储 - if (disance > 0.5) { + val disance = GeometryTools.getDistance( + location.latitude, location.longitude, + lastNiLocaion!!.latitude, lastNiLocaion!!.longitude) + //相距差距大于2.5米以上进行存储 + if (disance > 2.5) { traceDataBase.niLocationDao.insert(location) mapController.markerHandle.addNiLocationMarkerItem(location) + mapController.mMapView.vtmMap.updateMap(true) } } else { traceDataBase.niLocationDao.insert(location) mapController.markerHandle.addNiLocationMarkerItem(location) + mapController.mMapView.vtmMap.updateMap(true) } lastNiLocaion = location - //mapController.mMapView.vtmMap.updateMap(true) } } //用于定位点捕捉道路 diff --git a/collect-library/src/main/res/mipmap-xxhdpi/icon_gps.png b/collect-library/src/main/res/mipmap-hdpi/icon_gps.png similarity index 100% rename from collect-library/src/main/res/mipmap-xxhdpi/icon_gps.png rename to collect-library/src/main/res/mipmap-hdpi/icon_gps.png diff --git a/collect-library/src/main/res/mipmap-xxhdpi/icon_gps_1.png b/collect-library/src/main/res/mipmap-hdpi/icon_gps_1.png similarity index 100% rename from collect-library/src/main/res/mipmap-xxhdpi/icon_gps_1.png rename to collect-library/src/main/res/mipmap-hdpi/icon_gps_1.png diff --git a/collect-library/src/main/res/mipmap-xxhdpi/icon_nilocation.png b/collect-library/src/main/res/mipmap-hdpi/icon_nilocation.png similarity index 100% rename from collect-library/src/main/res/mipmap-xxhdpi/icon_nilocation.png rename to collect-library/src/main/res/mipmap-hdpi/icon_nilocation.png diff --git a/collect-library/src/main/res/mipmap-xxhdpi/icon_nilocation_1.png b/collect-library/src/main/res/mipmap-hdpi/icon_nilocation_1.png similarity index 100% rename from collect-library/src/main/res/mipmap-xxhdpi/icon_nilocation_1.png rename to collect-library/src/main/res/mipmap-hdpi/icon_nilocation_1.png