From 7b006926864828eb7f76a16452c0b7d994891b89 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Mon, 5 Jul 2021 16:25:05 +0800 Subject: [PATCH] update adas version and add getSn --- modules/mogo-module-adas/build.gradle | 2 +- .../com/mogo/module/adas/AdasEventManager.java | 18 +++++++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/modules/mogo-module-adas/build.gradle b/modules/mogo-module-adas/build.gradle index 75fa6cc4e6..9cff527003 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.1" + api "com.zhidao.support.adas:high:1.2.0.2" annotationProcessor rootProject.ext.dependencies.aroutercompiler if (Boolean.valueOf(RELEASE)) { diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java index c248d7a868..a8faba737a 100644 --- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java +++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java @@ -1,5 +1,6 @@ package com.mogo.module.adas; +import com.alibaba.android.arouter.launcher.ARouter; import com.google.gson.Gson; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; import com.mogo.commons.data.BaseData; @@ -56,6 +57,7 @@ public class AdasEventManager implements OnAdasListener, OnAdasMsgConnectStatusL private final ArrayList iAdasEventListeners = new ArrayList<>(); private final ArrayList iAdasStatusListeners = new ArrayList<>(); private IAdasApiService mAdasApiService; + private AdasProvider adasProvider; private Disposable uploadAutopilotStatus; //自动驾驶状态 private int mCurrentAutopilotStatus = -1; @@ -68,6 +70,7 @@ public class AdasEventManager implements OnAdasListener, OnAdasMsgConnectStatusL private AdasEventManager() { gson = GsonUtil.getGson(); mAdasApiService = MogoApisHandler.getInstance().getApis().getNetworkApi().create(IAdasApiService.class, getBaseUrl()); + adasProvider = ARouter.getInstance().navigation(AdasProvider.class); } public static AdasEventManager getInstance() { @@ -236,10 +239,10 @@ public class AdasEventManager implements OnAdasListener, OnAdasMsgConnectStatusL @Override public void onAutopilotRoute(AutopilotRoute autopilotRoute) { if (autopilotRoute.getModels() == null || autopilotRoute.getModels().size() == 0) { - Logger.d(TAG,"onAutopilotRoute is null !"); + Logger.d(TAG, "onAutopilotRoute is null !"); return; } - Logger.d(TAG,"onAutopilotRoute : " + autopilotRoute.toString()); + Logger.d(TAG, "onAutopilotRoute : " + autopilotRoute.toString()); for (IAdasDataListener listener : iAdasEventListeners) { if (listener != null) { listener.autopilotRoute(autopilotRoute); @@ -247,6 +250,15 @@ public class AdasEventManager implements OnAdasListener, OnAdasMsgConnectStatusL } } + @Override + public void onAutopilotSNRequest() { + if (adasProvider != null) { + adasProvider.setBasicInfo(); + } else { + Logger.e(TAG, "onAutopilotSNRequest adasProvider is null"); + } + } + @Override public void onWebSocketConnectSuccess() { Logger.d(TAG, "webSocket 连接成功"); @@ -328,7 +340,7 @@ public class AdasEventManager implements OnAdasListener, OnAdasMsgConnectStatusL }); } - public AutopilotStatus.ValuesBean getAutopilotValuesStatus(){ + public AutopilotStatus.ValuesBean getAutopilotValuesStatus() { return mAutopilotValuesStatus; }