From 43ea5777e1687d0be31aaacfd64d4e82bf629537 Mon Sep 17 00:00:00 2001 From: donghongyu Date: Wed, 21 Sep 2022 19:23:27 +0800 Subject: [PATCH] =?UTF-8?q?[Change]=20A=E3=80=81=E8=BF=98=E5=8E=9F?= =?UTF-8?q?=E6=94=B9=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- .../autopilot/adapter/MoGoAdasListenerImpl.kt | 15 --------------- .../main/java/com/mogo/map/AMapViewWrapper.java | 13 +++++++++++++ 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt index d43b686d7e..65d1aa08fa 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt @@ -133,21 +133,6 @@ class MoGoAdasListenerImpl : OnAdasListener { gnssInfo.longitude, gnssInfo.latitude ) - - // 直接将工控机惯导数据同步给各个模块 - val sysLocation = Location("GNSS") - sysLocation.altitude = gnssInfo.altitude - sysLocation.latitude = gnssInfo.latitude - sysLocation.longitude = gnssInfo.longitude - sysLocation.provider = "GNSS" - sysLocation.accuracy = gnssInfo.acceleration.toFloat() - sysLocation.time = gnssInfo.satelliteTime.toLong() - sysLocation.bearing = gnssInfo.heading.toFloat() - sysLocation.speed = gnssInfo.gnssSpeed.toFloat() - - if (MogoCarLocationChangedListenerRegister.getInstance().listener != null) { - MogoCarLocationChangedListenerRegister.getInstance().listener.onCarLocationChanged2(sysLocation) - } } } } diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java index 8c47f680c6..6a64322c93 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java @@ -757,7 +757,20 @@ public class AMapViewWrapper implements IMogoMapView, .putString(SharedPrefsConstants.LOCATION_LONGITUDE, String.valueOf(location.getLon())); } + // 同步给各个模块 + Location sysLocation = new Location(location.getProvider()); + sysLocation.setAltitude(location.getAltitude()); + sysLocation.setLatitude(location.getLat()); + sysLocation.setLongitude(location.getLon()); + sysLocation.setProvider(location.getProvider()); + sysLocation.setAccuracy(location.getAcceleration()); + sysLocation.setTime(location.duration); + sysLocation.setBearing((float) location.getHeading()); + sysLocation.setSpeed(location.getSpeed()); + if (MogoCarLocationChangedListenerRegister.getInstance().getListener() != null) { + MogoCarLocationChangedListenerRegister.getInstance().getListener().onCarLocationChanged2(sysLocation); + } if (checkAMapView() && mMapLoaded) { // 地图初始化完成后，每隔5s自动判断当前地图的模式 if (mIsFirstLocated) {