From 6fe11bf8a1e14a0dd34584d419c09a356eae4247 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Wed, 21 Oct 2020 17:56:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9adas=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../autopilot/AutoPilotRemoteController.java | 2 +- .../service/adas/IMogoADASController.java | 2 +- .../service/impl/adas/MogoADASController.java | 20 +++++++++++++++++-- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/autopilot/AutoPilotRemoteController.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/autopilot/AutoPilotRemoteController.java index c0ce944161..3fae17a77c 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/autopilot/AutoPilotRemoteController.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/autopilot/AutoPilotRemoteController.java @@ -36,7 +36,7 @@ class AutoPilotRemoteController { } String json = GsonUtil.jsonFromObject( obj ); Logger.d( TAG, json ); - MogoApisHandler.getInstance().getApis().getAdasControllerApi().notifyAdas( json ); + MogoApisHandler.getInstance().getApis().getAdasControllerApi().aiCloudToAdasData( json ); } }; diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java b/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java index 0953142c53..a51931a0e1 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java @@ -74,5 +74,5 @@ public interface IMogoADASController extends IProvider { * * @param json */ - void notifyAdas( String json ); + void aiCloudToAdasData( String json ); } 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 378b075b59..c2fdf21450 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 @@ -212,14 +212,30 @@ public class MogoADASController implements IMogoADASController { } @Override - public void notifyAdas( String json ) { + public void aiCloudToAdasData( String json ) { try { - AutopilotServiceManage.getInstance().aiCloudToAdasData( json ); + syncControlCmdToADAS( "aiCloudToStartAutopilot", json ); } catch ( Exception e ) { Logger.e( TAG, e, "notifyAdas" ); } } + /** + * @param action 操作执行 + * @param json 指令数据 + */ + private void syncControlCmdToADAS( String action, String json ) { + JSONObject jsonObject = new JSONObject(); + //位置信息 action是aiCloudToStartAutopilot + try { + jsonObject.put( "action", action ); + jsonObject.put( "result", json ); + AutopilotServiceManage.getInstance().aiCloudToAdasData( jsonObject.toString() ); + } catch ( Exception e ) { + e.printStackTrace(); + } + } + @Override public void release() { mIsReleased = true;