From 0fea60b5f1c40603ced6c5b69c8bc454117a798d Mon Sep 17 00:00:00 2001 From: lianglihui Date: Wed, 27 Oct 2021 10:44:40 +0800 Subject: [PATCH] =?UTF-8?q?eagle=20=E5=B0=8F=E5=9C=B0=E5=9B=BE=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E5=B7=B2=E8=A1=8C=E8=BF=9B=E8=B7=AF=E5=BE=84=E6=93=A6?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt | 4 ++-- .../mogo/eagle/core/function/smp/SmallMapDirectionView.java | 2 +- modules/mogo-module-adas/build.gradle | 2 +- .../module/service/routeoverlay/MogoRouteOverlayManager.java | 4 ++-- .../java/com/mogo/service/impl/adas/MogoADASController.java | 5 +++-- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt index 9c9da2e412..76b5bf0cf1 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt @@ -67,13 +67,13 @@ class AutoPilotStatusView @JvmOverloads constructor( CallerHmiListenerManager.invokeCheckAutoPilotBtnListener(false) } } - startAutoPilot(); +// startAutoPilot(); } private fun startAutoPilot() { val currentAutopilot = RemoteControlAutoPilotParameters() currentAutopilot.isSpeakVoice = false currentAutopilot.startLatLon = RemoteControlAutoPilotParameters.AutoPilotLonLat(40.199157289445921,116.73675895051454); - currentAutopilot.endLatLon = RemoteControlAutoPilotParameters.AutoPilotLonLat(40.199255159538758,116.73274535677977); + currentAutopilot.endLatLon = RemoteControlAutoPilotParameters.AutoPilotLonLat(40.198749735647674,116.72147484033961); currentAutopilot.vehicleType = 10 MogoApisHandler.getInstance().apis.adasControllerApi.aiCloudToAdasData(currentAutopilot) } diff --git a/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java b/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java index 3510b0f2b6..f095b4a695 100644 --- a/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java +++ b/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java @@ -201,7 +201,7 @@ public class SmallMapDirectionView // MogoLatLng mogoLatLng = new MogoLatLng(lng.latitude, lng.longitude); // mCoordinatesLatLngCurrent.add(mogoLatLng); // } - removeLoction(latLng); +// removeLoction(latLng); // 结束位置 LatLng endLatLng = mCoordinatesLatLng.get(mCoordinatesLatLng.size() - 1); diff --git a/modules/mogo-module-adas/build.gradle b/modules/mogo-module-adas/build.gradle index 950dd3274d..05ffff771f 100644 --- a/modules/mogo-module-adas/build.gradle +++ b/modules/mogo-module-adas/build.gradle @@ -45,7 +45,7 @@ dependencies { // 现有的ADAS的通讯SDK，需要将里面的东西融合到我们项目中 compileOnly rootProject.ext.dependencies.adasapi - api "com.zhidao.support.adas:high:1.2.0.8" + api "com.zhidao.support.adas:high:1.2.0.9" implementation rootProject.ext.dependencies.mogoami // implementation "com.zhidao.support.adas:high:1.2.0.7" diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java index f0c4ac03ac..a7468d00ea 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java @@ -32,6 +32,7 @@ public class MogoRouteOverlayManager implements IMogoCarLocationChangedListener2 @Override public void routeResult(List routeList) { + Log.e("lianglihui","routeResult:"+routeList.size()); RouteOverlayDrawer.getInstance(mContext).putRouteList(routeList); } }); @@ -39,11 +40,10 @@ public class MogoRouteOverlayManager implements IMogoCarLocationChangedListener2 @Override public void onAutopilotTrajectory(List trajectoryInfos) { -// Log.e("lianglihui","onAutopilotTrajectory"); if (trajectoryInfos == null || trajectoryInfos.size() == 0){ return; } -// Log.e("lianglihui","trajectoryInfos:"+trajectoryInfos.size()); + Log.e("lianglihui","trajectoryInfos:"+trajectoryInfos.size()); List mogoLatLngs = new ArrayList<>(); for (ADASTrajectoryInfo a:trajectoryInfos) { mogoLatLngs.add(new MogoLatLng(a.getLat(),a.getLon())); diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java index e45e4470f7..309473206c 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java @@ -381,8 +381,8 @@ public class MogoADASController implements IMogoADASController { public void onAutopilotTrajectory(List trajectorys) { if(trajectorys != null && trajectorys.size() > 0){ List trajectoryInfoArrayList = new ArrayList<>(); - TrajectoryInfo t= trajectorys.get(0); - Log.e("lianglihui","trajectorys:"+ t.getLat()+"-"+t.getLon()+"-"+System.currentTimeMillis()); +// TrajectoryInfo t= trajectorys.get(0); + Log.e("lianglihui","time:"+ System.currentTimeMillis()); for (TrajectoryInfo trajectory : trajectorys){ ADASTrajectoryInfo adasTrajectoryInfo = new ADASTrajectoryInfo(); adasTrajectoryInfo.setLat(trajectory.getLat()); @@ -394,6 +394,7 @@ public class MogoADASController implements IMogoADASController { adasTrajectoryInfo.setAlt(trajectory.getAlt()); adasTrajectoryInfo.setKappa(trajectory.getKappa()); adasTrajectoryInfo.setTheta(trajectory.getTheta()); + Log.e("lianglihui","trajectory:"+ trajectory.getLat()+"-"+trajectory.getLon()); trajectoryInfoArrayList.add(adasTrajectoryInfo); }