From 09c70e244882f2f9b25a1a874b1590dc828d0f67 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 22 Nov 2023 11:46:25 +0800 Subject: [PATCH] =?UTF-8?q?[6.2.0]=20[common]=20[=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E8=87=AA=E9=A9=BE=E8=B7=9D=E7=A6=BB=E6=9D=A1=E4=BB=B6]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TrajectoryAndDistanceManager.kt | 16 ++++++++----- .../mogo/och/common/module/ExampleUnitTest.kt | 24 +++++++++++++++++++ 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt index fa3ebe8443..a6f8d1af51 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt @@ -670,18 +670,24 @@ object TrajectoryAndDistanceManager : IMoGoPlanningRottingListener { return if (redCatche.isNullOrEmpty()) { distanceWithStartStation() } else { - distanceWithTrajectory(redCatche) + val currentPoint = + CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02() + distanceWithTrajectory(redCatche,currentPoint) } } else { return if (this.lineId == 0L || this.lineId == null) { - distanceWithTrajectory(mRoutePoints!!) + val currentPoint = + CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02() + distanceWithTrajectory(mRoutePoints!!,currentPoint) } else { if (lineId != this.lineId) { // 判断距离起始站的距离 distanceWithStartStation() } else { - distanceWithTrajectory(mRoutePoints!!) + val currentPoint = + CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02() + distanceWithTrajectory(mRoutePoints!!,currentPoint) } } } @@ -715,9 +721,7 @@ object TrajectoryAndDistanceManager : IMoGoPlanningRottingListener { /** * 距离轨迹的距离 */ - private fun distanceWithTrajectory(redCatche: MutableList): String { - val currentPoint = - CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02() + fun distanceWithTrajectory(redCatche: MutableList,currentPoint:MogoLocation): String { // 判断距离轨迹的距离 val carLocationInfo: Triple = CoordinateCalculateRouteUtil.getNearestPointInfo( diff --git a/OCH/mogo-och-common-module/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt b/OCH/mogo-och-common-module/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt index b7c293b91d..7e94c0008a 100644 --- a/OCH/mogo-och-common-module/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt +++ b/OCH/mogo-och-common-module/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt @@ -1,6 +1,7 @@ package com.mogo.och.common.module import com.mogo.eagle.core.utilcode.util.CoordinateTransform +import com.mogo.eagle.core.utilcode.util.CoordinateUtils import com.zhidao.thirdlogin.utils.Aes import org.junit.Assert.* import org.junit.Test @@ -23,6 +24,29 @@ class ExampleUnitTest { } @Test + fun resetDataOnlyOne(){ + val wgS84ToGCJ021 = CoordinateTransform.WGS84ToGCJ02(112.5772511,26.8197711) + val wgS84ToGCJ022 = CoordinateTransform.WGS84ToGCJ02(112.57299,26.90656) + println("${wgS84ToGCJ021[1]},${wgS84ToGCJ021[0]}----") + println("${wgS84ToGCJ022[1]},${wgS84ToGCJ022[0]}----") + } + @Test + fun distance(){ + var calculateLineDistance = CoordinateUtils.calculateLineDistance( + 112.58247531316542, + 26.816166375096863, + 112.57772263629191, + 26.820325512385274, + ) + + println("两点间的距离----${calculateLineDistance}") + } + + fun distanceWithLine(){ + val trajectory = "[{\"longitude\": 112.57772263629191,\"latitude\": 26.820325512385274},{\"longitude\": 112.57733952292816,\"latitude\": 26.820086860498055},{\"longitude\": 112.57713187192141,\"latitude\": 26.819922535836973},{\"longitude\": 112.57687967215642,\"latitude\": 26.819757579900877},{\"longitude\": 112.57667290445619,\"latitude\": 26.819600692538735},{\"longitude\": 112.57600316737123,\"latitude\": 26.819207067510625},{\"longitude\": 112.57561035288818,\"latitude\": 26.81900279871554},{\"longitude\": 112.57558037336332,\"latitude\": 26.818966108431482},{\"longitude\": 112.57559098043983,\"latitude\": 26.81892857807131},{\"longitude\": 112.57563832555716,\"latitude\": 26.818914326240712},{\"longitude\": 112.5757263009867,\"latitude\": 26.818938218858673},{\"longitude\": 112.5760904817954,\"latitude\": 26.819123661927083},{\"longitude\": 112.57710749410802,\"latitude\": 26.819729688873934},{\"longitude\": 112.5781189448959,\"latitude\": 26.820349534555618},{\"longitude\": 112.57880950115879,\"latitude\": 26.82077191558511},{\"longitude\": 112.57891627406968,\"latitude\": 26.820859317924043},{\"longitude\": 112.57899124671509,\"latitude\": 26.820952771743375},{\"longitude\": 112.57902679239179,\"latitude\": 26.82105955898617},{\"longitude\": 112.5789976321119,\"latitude\": 26.821174514978136},{\"longitude\": 112.578555064057,\"latitude\": 26.821797859429427},{\"longitude\": 112.57795642245695,\"latitude\": 26.822651023971133},{\"longitude\": 112.57733398244369,\"latitude\": 26.823600617560405},{\"longitude\": 112.57677698354983,\"latitude\": 26.824516415313433},{\"longitude\": 112.57624233641295,\"latitude\": 26.825455697778107},{\"longitude\": 112.57572875484072,\"latitude\": 26.826426121249938},{\"longitude\": 112.57529684590179,\"latitude\": 26.82731548434467},{\"longitude\": 112.57487816185596,\"latitude\": 26.82823230612025},{\"longitude\": 112.57463521393927,\"latitude\": 26.828711441576548},{\"longitude\": 112.57445099019914,\"latitude\": 26.829153818846464},{\"longitude\": 112.57406353796681,\"latitude\": 26.830165910173097},{\"longitude\": 112.57371302449874,\"latitude\": 26.83118853798091},{\"longitude\": 112.57338387275718,\"latitude\": 26.832247994256267},{\"longitude\": 112.57307958518875,\"latitude\": 26.833370768025308},{\"longitude\": 112.572834054213,\"latitude\": 26.83439802847452},{\"longitude\": 112.5726240938361,\"latitude\": 26.835436070947082},{\"longitude\": 112.57244067196883,\"latitude\": 26.83653646301533},{\"longitude\": 112.57229840576085,\"latitude\": 26.837591814988336},{\"longitude\": 112.57219224700401,\"latitude\": 26.83866241432575},{\"longitude\": 112.57208269994098,\"latitude\": 26.839687671321613},{\"longitude\": 112.57196832043626,\"latitude\": 26.840657505753878},{\"longitude\": 112.57183107427981,\"latitude\": 26.84163940384966},{\"longitude\": 112.57167950832878,\"latitude\": 26.842619338785447},{\"longitude\": 112.57151899030735,\"latitude\": 26.84355752405859},{\"longitude\": 112.57133064671739,\"latitude\": 26.84458007352469},{\"longitude\": 112.57110517173845,\"latitude\": 26.84569641611358},{\"longitude\": 112.57087545672542,\"latitude\": 26.846714804989112},{\"longitude\": 112.57063274366729,\"latitude\": 26.847725291109366},{\"longitude\": 112.57035230745373,\"latitude\": 26.848831468150028},{\"longitude\": 112.57005107335495,\"latitude\": 26.850008806882695},{\"longitude\": 112.5697934329309,\"latitude\": 26.851078499034774},{\"longitude\": 112.56952126531716,\"latitude\": 26.852085033298675},{\"longitude\": 112.56925385510193,\"latitude\": 26.853129564440273},{\"longitude\": 112.56899055077214,\"latitude\": 26.854169635736156},{\"longitude\": 112.56873836559927,\"latitude\": 26.855166275733453},{\"longitude\": 112.5684541330425,\"latitude\": 26.856277134305266},{\"longitude\": 112.56820124728208,\"latitude\": 26.857425874261235},{\"longitude\": 112.5680109279962,\"latitude\": 26.858409844914863},{\"longitude\": 112.5678627931869,\"latitude\": 26.859355934968004},{\"longitude\": 112.56773433742133,\"latitude\": 26.860385951422927},{\"longitude\": 112.56762980043118,\"latitude\": 26.861493391573035},{\"longitude\": 112.56756490747725,\"latitude\": 26.86257607810979},{\"longitude\": 112.56753533982277,\"latitude\": 26.86373469925572},{\"longitude\": 112.56754895675328,\"latitude\": 26.864817185301575},{\"longitude\": 112.56758307888657,\"latitude\": 26.865847160718477},{\"longitude\": 112.56762731433868,\"latitude\": 26.86711946545191},{\"longitude\": 112.56766684892891,\"latitude\": 26.868319641814267},{\"longitude\": 112.56769897930359,\"latitude\": 26.86936239451234},{\"longitude\": 112.56773981647314,\"latitude\": 26.870450862240844},{\"longitude\": 112.56778419400631,\"latitude\": 26.871696138656716},{\"longitude\": 112.56782685460598,\"latitude\": 26.872276153580753},{\"longitude\": 112.56789777230162,\"latitude\": 26.87281429005142},{\"longitude\": 112.56800242632866,\"latitude\": 26.87337009061124},{\"longitude\": 112.56811271678804,\"latitude\": 26.873808867065463},{\"longitude\": 112.568291993152,\"latitude\": 26.874421884078924},{\"longitude\": 112.56846704929232,\"latitude\": 26.87488405491067},{\"longitude\": 112.56869634262367,\"latitude\": 26.87542008503841},{\"longitude\": 112.56896049990331,\"latitude\": 26.875948819391375},{\"longitude\": 112.56925249751414,\"latitude\": 26.87646116970037},{\"longitude\": 112.56956700289011,\"latitude\": 26.8769447572142},{\"longitude\": 112.56989914660946,\"latitude\": 26.877395979702843},{\"longitude\": 112.57027260460708,\"latitude\": 26.877859648801568},{\"longitude\": 112.57098894427915,\"latitude\": 26.878664247706066},{\"longitude\": 112.57126442805652,\"latitude\": 26.87899598188578},{\"longitude\": 112.57160829718538,\"latitude\": 26.87945564329532},{\"longitude\": 112.57216252059992,\"latitude\": 26.88038117364182},{\"longitude\": 112.57241764199154,\"latitude\": 26.880900596583857},{\"longitude\": 112.57259927098444,\"latitude\": 26.881330561822715},{\"longitude\": 112.57280424282287,\"latitude\": 26.881922521716476},{\"longitude\": 112.57294742360097,\"latitude\": 26.8824512874619},{\"longitude\": 112.57305757966559,\"latitude\": 26.8830138917276},{\"longitude\": 112.57313388300817,\"latitude\": 26.88360739818577},{\"longitude\": 112.57317430439731,\"latitude\": 26.884731612696353},{\"longitude\": 112.57319235439246,\"latitude\": 26.885953683698922},{\"longitude\": 112.57320731756178,\"latitude\": 26.887107100581485},{\"longitude\": 112.57322224838643,\"latitude\": 26.88819625521858},{\"longitude\": 112.57323291894362,\"latitude\": 26.88917081837399},{\"longitude\": 112.57324729869111,\"latitude\": 26.890161389324707},{\"longitude\": 112.57326116800273,\"latitude\": 26.89123952388697},{\"longitude\": 112.57327433068929,\"latitude\": 26.89225244212013},{\"longitude\": 112.5732909635451,\"latitude\": 26.893386941944204},{\"longitude\": 112.57330605502305,\"latitude\": 26.894564402445766},{\"longitude\": 112.57331916719527,\"latitude\": 26.895756960489745},{\"longitude\": 112.57329858435462,\"latitude\": 26.89693388431065},{\"longitude\": 112.57324698305418,\"latitude\": 26.898028857659792},{\"longitude\": 112.57319171668158,\"latitude\": 26.8990588250119},{\"longitude\": 112.57314083346539,\"latitude\": 26.90003216219406},{\"longitude\": 112.57308903159071,\"latitude\": 26.900982522153537},{\"longitude\": 112.57306533719523,\"latitude\": 26.901433105371172},{\"longitude\": 112.57308213757469,\"latitude\": 26.90196652783364},{\"longitude\": 112.5730349779171,\"latitude\": 26.902991601760412},{\"longitude\": 112.57298079301792,\"latitude\": 26.9040641167899},{\"longitude\": 112.57292622754801,\"latitude\": 26.905121206439922},{\"longitude\": 112.57290202419351,\"latitude\": 26.90567325452591},{\"longitude\": 112.57292602660397,\"latitude\": 26.906095263476384},{\"longitude\": 112.57299859001606,\"latitude\": 26.906568446270473}]" + + } + fun resetData(){ val mutableListOf = mutableListOf() mutableListOf.add(Data(26.81618164239085,112.58250175297606,55.55709771386404 ,0.046407543))