yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update adas version and add getSn

Browse Source
This commit is contained in:
zhongchao
2021-07-05 16:25:05 +08:00
parent 20a5b7b95e
commit 7b00692686
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/mogo-module-adas/build.gradle
View File

@@ -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)) {

18
modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java
View File

@@ -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<IAdasDataListener> iAdasEventListeners = new ArrayList<>();
private final ArrayList<AdasStatusListener> 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;
}