diff --git a/modules/mogo-module-adas/build.gradle b/modules/mogo-module-adas/build.gradle index cacf6404ca..69de80c052 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.1.7.4" + api "com.zhidao.support.adas:high:1.1.8.3" 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 559b83797c..1e94b4749c 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 @@ -24,7 +24,7 @@ import java.util.ArrayList; */ public class AdasEventManager implements OnAdasListener, OnAdasMsgConnectStatusListener { - private final String TAG = "AdasEventManager"; + private final String TAG = "\\"; private Gson gson; @@ -67,7 +67,7 @@ public class AdasEventManager implements OnAdasListener, OnAdasMsgConnectStatusL @Override public void onWarnMessage(WarnMessageInfo warnMessageInfo) { - Logger.d(TAG,"onWarnMessage"); + Logger.d(TAG,"onWarnMessage " + warnMessageInfo); //报警model WarnMessageModel warnMessageModel = null; for (AdasDataListener listener:iAdasEventListeners) { @@ -93,7 +93,7 @@ public class AdasEventManager implements OnAdasListener, OnAdasMsgConnectStatusL @Override public void onRectData(RectInfo rectInfo) { - Logger.d(TAG,"onRectData"); + Logger.d(TAG,"onRectData " + rectInfo); for (AdasDataListener listener:iAdasEventListeners) { if (listener != null) { @@ -104,7 +104,7 @@ public class AdasEventManager implements OnAdasListener, OnAdasMsgConnectStatusL @Override public void onCarStateData(CarStateInfo carStateInfo) { - Logger.d(TAG,"onCarStateData"); + Logger.d(TAG,"onCarStateData " + carStateInfo); for (AdasDataListener listener:iAdasEventListeners) { if (listener != null) { listener.ownerCarStateInfo(gson.toJson(carStateInfo)); @@ -114,7 +114,7 @@ public class AdasEventManager implements OnAdasListener, OnAdasMsgConnectStatusL @Override public void onLightStateData(LightStatueInfo lightStatueInfo) { - Logger.d(TAG,"onLightStateData"); + Logger.d(TAG,"onLightStateData " + lightStatueInfo); for (AdasDataListener listener:iAdasEventListeners) { if (listener != null) { } @@ -123,7 +123,7 @@ public class AdasEventManager implements OnAdasListener, OnAdasMsgConnectStatusL @Override public void onObstaclesInfo(ObstaclesInfo obstaclesInfo) { - Logger.d(TAG,"onObstaclesInfo"); + Logger.d(TAG,"onObstaclesInfo " + obstaclesInfo); for (AdasDataListener listener:iAdasEventListeners) { if (listener != null) { } @@ -132,7 +132,7 @@ public class AdasEventManager implements OnAdasListener, OnAdasMsgConnectStatusL @Override public void onCarLaneInfo(CarLaneInfo carLaneInfo) { - Logger.d(TAG,"onCarLaneInfo"); + Logger.d(TAG,"onCarLaneInfo " + carLaneInfo); for (AdasDataListener listener:iAdasEventListeners) { if (listener != null) { } @@ -141,6 +141,7 @@ public class AdasEventManager implements OnAdasListener, OnAdasMsgConnectStatusL @Override public void autopilotStatus(AutopilotStatus autopilotStatus) { + Logger.d(TAG,"autopilotStatus " + autopilotStatus); AutopilotStatus.ValuesBean autopilotStatusValues = autopilotStatus.getValues(); AutopilotStatus.ValuesBean mAutopilotStatus; @@ -165,7 +166,7 @@ public class AdasEventManager implements OnAdasListener, OnAdasMsgConnectStatusL @Override public void autopilotArrive(AutopilotWayArrive autopilotWayArrive) { - Logger.d(TAG,"autopilotArrive"); + Logger.d(TAG,"autopilotArrive " + autopilotWayArrive); if (autopilotWayArrive != null) { AutopilotWayArrive.ResultBean result = autopilotWayArrive.getResult(); if (result != null) { 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 4068ba4914..8d9ef6d66d 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 @@ -305,11 +305,14 @@ public class MogoADASController implements IMogoADASController { @Override public void onServiceConnected() { super.onServiceConnected(); + Logger.d( TAG, "adas statuslistener connected & send sn"); + AutopilotServiceManage.getInstance().aiCloudToAdasData(Utils.getSn()); invokeShowADASOperation(); } @Override public void onServiceDisconnected() { + Logger.d( TAG, "adas statuslistener disconnected"); super.onServiceDisconnected(); } }); @@ -319,6 +322,7 @@ public class MogoADASController implements IMogoADASController { mAdasDataListener = new AdasDataListener() { @Override public void sendMsg( String msg ) { + Logger.d( TAG, "adas AdasDataListener sendmsg " + msg); for ( IMogoAdasDataCallback callback : mAdasDataCallbackList ) { try { callback.onAdasDataCallback( msg ); @@ -330,7 +334,7 @@ public class MogoADASController implements IMogoADASController { @Override public void cameraEyeDetectResult( String detectResult ) { - + Logger.d( TAG, "detectResult " + detectResult); try { JSONObject jsonObjectWs = new JSONObject( detectResult ); String action = jsonObjectWs.optString( "action" ); @@ -356,6 +360,7 @@ public class MogoADASController implements IMogoADASController { @Override public void requestGetCarModelListInfo() { + Logger.d( TAG, "requestGetCarModelListInfo "); if ( DebugConfig.isMapBased() ) { Logger.d( TAG, "requestGetCarModelListInfo" ); // 向adas发送车模list @@ -385,6 +390,7 @@ public class MogoADASController implements IMogoADASController { @Override public void autopilotArrive( AdasAIDLAutopilotArriveModel autopilotArriveModel ) { + Logger.d( TAG, "autopilotArriveModel " + autopilotArriveModel); if ( autopilotArriveModel == null ) { return; } @@ -399,6 +405,7 @@ public class MogoADASController implements IMogoADASController { @Override public void ownerCarStateInfo( String ownerCarStateInfo ) { + Logger.d( TAG, "ownerCarStateInfo " + ownerCarStateInfo); Message message = mAdasLocationRecHandler.obtainMessage(); message.obj = ownerCarStateInfo; message.sendToTarget(); @@ -406,6 +413,7 @@ public class MogoADASController implements IMogoADASController { @Override public void notifyOwnerCarState( AdasAIDLOwnerCarStateModel ownerCarStateModel ) { + Logger.d( TAG, "AdasAIDLOwnerCarStateModel " + ownerCarStateModel); ADASCarStateInfo stateInf = new ADASCarStateInfo(); stateInf.setAction( "state" ); ADASCarStateInfo.ValuesBean bean = new ADASCarStateInfo.ValuesBean();