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

修改类文件名称大小写问题2

Browse Source 
Signed-off-by: 董宏宇 <martindhy@gmail.com>
This commit is contained in:
董宏宇
2021-10-18 20:01:06 +08:00
parent cf9767436f
commit b31f2b64c7
36 changed files with 191 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/mogo-module-service/src/main/java/com/mogo/module/service/autopilot/AutoPilotRemoteController.java
View File

@@ -2,7 +2,7 @@ package com.mogo.module.service.autopilot;
import com.mogo.commons.AbsMogoApplication;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.eagle.core.data.autopilot.AutopilotControlPam;
import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters;
import com.mogo.service.cloud.socket.IMogoOnMessageListener;
import com.mogo.service.cloud.socket.IMogoSocketManager;
import com.mogo.utils.logger.Logger;
@@ -23,14 +23,14 @@ class AutoPilotRemoteController {
private IMogoSocketManager mMogoSocketManager;
private IMogoOnMessageListener<AutopilotControlPam> mParametersListener = new IMogoOnMessageListener<AutopilotControlPam>() {
private IMogoOnMessageListener<AutopilotControlParameters> mParametersListener = new IMogoOnMessageListener<AutopilotControlParameters>() {
@Override
public Class<AutopilotControlPam> target() {
return AutopilotControlPam.class;
public Class<AutopilotControlParameters> target() {
return AutopilotControlParameters.class;
}
@Override
public void onMsgReceived( AutopilotControlPam obj ) {
public void onMsgReceived( AutopilotControlParameters obj ) {
if ( obj == null ) {
Logger.e( TAG, "远端控制参数为null", new NullPointerException() );
return;

16
modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchAutoPilotManager.java
View File

@@ -10,8 +10,8 @@ import android.os.Handler;
import android.os.Message;
import com.mogo.cloud.commons.utils.CoordinateUtils;
import com.mogo.eagle.core.data.autopilot.AutopilotStationsInfo;
import com.mogo.eagle.core.data.autopilot.AutopilotControlPam;
import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo;
import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters;
import com.mogo.eagle.core.data.map.MogoLatLng;
import com.mogo.eagle.core.function.api.hmi.autopilot.IMoGoCheckAutoPilotBtnListener;
import com.mogo.eagle.core.function.call.hmi.CallerHmiListenerManager;
@@ -137,17 +137,17 @@ public class DispatchAutoPilotManager implements IMogoOnMessageListener<Dispatch
}
private void startAutoPilot() {
AutopilotControlPam currentAutopilot = new AutopilotControlPam();
AutopilotControlParameters currentAutopilot = new AutopilotControlParameters();
currentAutopilot.isSpeakVoice = false;
List<AutopilotControlPam.AutoPilotLonLat> wayLatLon = new ArrayList<>();
List<AutopilotControlParameters.AutoPilotLonLat> wayLatLon = new ArrayList<>();
if (receiverBean!=null && receiverBean.getStopsList()!= null){
for (MogoLatLng mogoLatLng : receiverBean.getStopsList()) {
wayLatLon.add(new AutopilotControlPam.AutoPilotLonLat(mogoLatLng.lat, mogoLatLng.lon));
wayLatLon.add(new AutopilotControlParameters.AutoPilotLonLat(mogoLatLng.lat, mogoLatLng.lon));
}
}
currentAutopilot.wayLatLons = wayLatLon;
currentAutopilot.startLatLon = new AutopilotControlPam.AutoPilotLonLat(receiverBean.getStartLat(), receiverBean.getStartLon());
currentAutopilot.endLatLon = new AutopilotControlPam.AutoPilotLonLat(receiverBean.getEndLat(), receiverBean.getEndLon());
currentAutopilot.startLatLon = new AutopilotControlParameters.AutoPilotLonLat(receiverBean.getStartLat(), receiverBean.getStartLon());
currentAutopilot.endLatLon = new AutopilotControlParameters.AutoPilotLonLat(receiverBean.getEndLat(), receiverBean.getEndLon());
currentAutopilot.vehicleType = 10;
Logger.d(TAG, "开启自动驾驶====" + currentAutopilot);
mApis.getAdasControllerApi().aiCloudToAdasData(currentAutopilot);
@@ -191,7 +191,7 @@ public class DispatchAutoPilotManager implements IMogoOnMessageListener<Dispatch
}
@Override
public void onArriveAt(AutopilotStationsInfo data) {
public void onArriveAt(AutopilotStationInfo data) {
Logger.d(TAG, "onArriveAt data : " + data.toString());
double endLat = data.getLat();
double endLon = data.getLon();

6
modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/bean/ReportedRoute.java
View File

@@ -1,17 +1,17 @@
package com.mogo.module.service.dispatch.bean;
import com.mogo.eagle.core.data.autopilot.AutopilotStatusBean;
import com.mogo.eagle.core.data.autopilot.AutopilotStatus;
/**
* 上报自动驾驶规划的路径
*/
public class ReportedRoute {
private String sn;
private AutopilotStatusBean.ValuesBean bean;
private AutopilotStatus.ValuesBean bean;
private String siteList;
public ReportedRoute(String sn, AutopilotStatusBean.ValuesBean bean) {
public ReportedRoute(String sn, AutopilotStatus.ValuesBean bean) {
this.sn = sn;
this.bean = bean;
}

12
modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/model/DispatchServiceModel.java
View File

@@ -6,7 +6,7 @@ import static com.mogo.module.common.constants.HostConst.DATA_SERVICE_HOST;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
import com.mogo.commons.data.BaseData;
import com.mogo.commons.network.SubscribeImpl;
import com.mogo.eagle.core.data.autopilot.AutopilotStatusBean;
import com.mogo.eagle.core.data.autopilot.AutopilotStatus;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo;
import com.mogo.module.service.dispatch.bean.ReportDispatchResult;
@@ -53,15 +53,15 @@ public class DispatchServiceModel {
* 上报自动驾驶状态
*/
public void uploadAutopilotStatus(int state, String reason) {
AutopilotStatusBean autopilotStatusBean = new AutopilotStatusBean();
autopilotStatusBean.setAction("autopilotstate");
AutopilotStatusBean.ValuesBean valuesBean = new AutopilotStatusBean.ValuesBean();
AutopilotStatus autopilotStatus = new AutopilotStatus();
autopilotStatus.setAction("autopilotstate");
AutopilotStatus.ValuesBean valuesBean = new AutopilotStatus.ValuesBean();
valuesBean.setState(state);
valuesBean.setReason(reason);
autopilotStatusBean.setValues(valuesBean);
autopilotStatus.setValues(valuesBean);
String sn = MoGoAiCloudClientConfig.getInstance().getSn();
ReportedRoute reportedRoute = new ReportedRoute(sn, autopilotStatusBean.getValues());
ReportedRoute reportedRoute = new ReportedRoute(sn, autopilotStatus.getValues());
Map<String, Object> map = new HashMap<>();
map.put("sn", sn);
map.put("data", GsonUtil.jsonFromObject(reportedRoute));

8
modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java
View File

@@ -18,7 +18,7 @@ import com.mogo.cloud.socket.entity.SocketDownDataHelper;
import com.mogo.commons.AbsMogoApplication;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.commons.voice.AIAssist;
import com.mogo.eagle.core.data.autopilot.AutopilotControlPam;
import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters;
import com.mogo.eagle.core.data.map.MogoLatLng;
import com.mogo.eagle.core.data.traffic.TrafficData;
import com.mogo.map.marker.IMogoMarker;
@@ -523,10 +523,10 @@ public class MockIntentHandler implements IntentHandler {
.onAutopilotArriveLike(intent.getIntExtra("type", 8));
break;
case 44:// 控制自动驾驶
AutopilotControlPam parameters = new AutopilotControlPam();
AutopilotControlParameters parameters = new AutopilotControlParameters();
parameters.vehicleType = 9;
parameters.startLatLon = new AutopilotControlPam.AutoPilotLonLat(40.1690522746, 116.567374558);
parameters.endLatLon = new AutopilotControlPam.AutoPilotLonLat(40.1651999405, 116.567217441);
parameters.startLatLon = new AutopilotControlParameters.AutoPilotLonLat(40.1690522746, 116.567374558);
parameters.endLatLon = new AutopilotControlParameters.AutoPilotLonLat(40.1651999405, 116.567217441);
MogoApisHandler.getInstance()
.getApis()
.getAdasControllerApi()