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

规范自动驾驶命名

Browse Source 
Signed-off-by: 董宏宇 <martindhy@gmail.com>
This commit is contained in:
董宏宇
2021-10-13 15:01:01 +08:00
parent 78daacaae7
commit ef0c6da1d8
19 changed files with 79 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java
View File

@@ -1,7 +1,7 @@
package com.mogo.service.adas;
import com.alibaba.android.arouter.facade.template.IProvider;
import com.mogo.eagle.core.data.autopilot.RemoteControlAutoPilotParameters;
import com.mogo.eagle.core.data.autopilot.AutoPilotControlParameters;
import com.mogo.map.uicontroller.EnumMapUI;
import com.mogo.service.adas.entity.ADASRecognizedResult;
@@ -78,7 +78,7 @@ public interface IMogoADASController extends IProvider {
*
* @param result
*/
void aiCloudToAdasData(RemoteControlAutoPilotParameters result);
void aiCloudToAdasData(AutoPilotControlParameters result);
/**

4
services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoAdasOCHCallback.java
View File

@@ -1,6 +1,6 @@
package com.mogo.service.adas;
import com.mogo.eagle.core.data.autopilot.AdasOCHData;
import com.mogo.eagle.core.data.autopilot.AutoPilotStationInfo;
public
/**
@@ -29,7 +29,7 @@ interface IMogoAdasOCHCallback {
* 到站
* @param data 所到车站的简单信息
*/
void onArriveAt( AdasOCHData data );
void onArriveAt( AutoPilotStationInfo data );
/**
* 自动驾驶状态发生改变

16
services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
View File

@@ -13,7 +13,7 @@ import com.alibaba.android.arouter.launcher.ARouter;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
import com.mogo.commons.AbsMogoApplication;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.eagle.core.data.autopilot.AdasControlCommandParameter;
import com.mogo.eagle.core.data.autopilot.AutoPilotControlCmdParameter;
import com.mogo.eagle.core.data.map.MogoLatLng;
import com.mogo.map.uicontroller.EnumMapUI;
import com.mogo.module.adas.AdasProvider;
@@ -27,11 +27,11 @@ import com.mogo.service.adas.IMogoAdasOCHCallback;
import com.mogo.service.adas.IMogoAdasRecognizedDataCallback;
import com.mogo.service.adas.IMogoAdasRouteCallBack;
import com.mogo.service.adas.IMogoAdasWarnMessageCallback;
import com.mogo.eagle.core.data.autopilot.RemoteControlAutoPilotParameters;
import com.mogo.eagle.core.data.autopilot.AutoPilotControlParameters;
import com.mogo.service.adas.entity.ADASCarStateInfo;
import com.mogo.service.adas.entity.ADASRecognizedResult;
import com.mogo.service.adas.entity.ADASWarnMessage;
import com.mogo.eagle.core.data.autopilot.AdasOCHData;
import com.mogo.eagle.core.data.autopilot.AutoPilotStationInfo;
import com.mogo.service.adas.entity.CarModelListResponse;
import com.mogo.service.datamanager.IMogoDataManager;
import com.mogo.service.impl.singleton.SingletonsHolder;
@@ -358,7 +358,7 @@ public class MogoADASController implements IMogoADASController {
Logger.d(TAG,"autopilotArrive : " + autopilotArriveModel.toString());
if (!mAdasOCHCallback.isEmpty()) {
for (IMogoAdasOCHCallback cb : mAdasOCHCallback) {
cb.onArriveAt(new AdasOCHData(
cb.onArriveAt(new AutoPilotStationInfo(
autopilotArriveModel.getCarType(),
autopilotArriveModel.getLon(),
autopilotArriveModel.getLat())
@@ -545,7 +545,7 @@ public class MogoADASController implements IMogoADASController {
}
@Override
public void aiCloudToAdasData(RemoteControlAutoPilotParameters result) {
public void aiCloudToAdasData(AutoPilotControlParameters result) {
try {
syncControlCmdToADAS("aiCloudToStartAutopilot", result);
} catch (Exception e) {
@@ -558,7 +558,7 @@ public class MogoADASController implements IMogoADASController {
* @param result
*/
private void syncControlCmdToADAS(String action, Object result) {
AdasControlCommandParameter parameter = new AdasControlCommandParameter(action, result);
AutoPilotControlCmdParameter parameter = new AutoPilotControlCmdParameter(action, result);
//位置信息 action是aiCloudToStartAutopilot
try {
adasProvider.sendWsMessage(GsonUtil.jsonFromObject(parameter));
@@ -711,7 +711,7 @@ public class MogoADASController implements IMogoADASController {
public void onAutopilotArriveLike(int carType) {
if (!mAdasOCHCallback.isEmpty()) {
for (IMogoAdasOCHCallback cb : mAdasOCHCallback) {
cb.onArriveAt(new AdasOCHData(
cb.onArriveAt(new AutoPilotStationInfo(
carType,
116.09888888,
39.999999)
@@ -741,7 +741,7 @@ public class MogoADASController implements IMogoADASController {
if (state == -1) {
if (!mAdasOCHCallback.isEmpty()) {
for (IMogoAdasOCHCallback cb : mAdasOCHCallback) {
cb.onArriveAt(new AdasOCHData(1, 1d, 1d));
cb.onArriveAt(new AutoPilotStationInfo(1, 1d, 1d));
}
}
} else {