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 19:53:42 +08:00
parent 1f4f906748
commit cf9767436f
26 changed files with 122 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasAutoPilotManager.java
View File

@@ -13,7 +13,7 @@ import android.os.Handler;
import android.os.Message;
import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo;
import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo;
import com.mogo.eagle.core.data.autopilot.AutopilotStatussInfo;
import com.mogo.eagle.core.data.map.MogoLatLng;
import com.mogo.map.location.MogoLocation;
import com.mogo.map.navi.IMogoCarLocationChangedListener2;
@@ -31,7 +31,6 @@ import com.mogo.service.cloud.socket.IMogoOnMessageListener;
import com.mogo.utils.logger.Logger;
import com.mogo.utils.network.utils.GsonUtil;
import com.zhidao.support.adas.high.bean.AutopilotRoute;
import com.zhidao.support.adas.high.bean.AutopilotStatus;
import java.util.ArrayList;
import java.util.List;
@@ -131,7 +130,7 @@ public class AdasAutoPilotManager implements IMogoOnMessageListener<DispatchAdas
}
@Override
public void notifyAutopilotState(AutopilotStatusInfo autopilotStatus) {
public void notifyAutopilotState(AutopilotStatussInfo autopilotStatus) {
AdasServiceModel.getInstance().uploadAutopilotStatus(autopilotStatus);
}
@@ -228,7 +227,7 @@ public class AdasAutoPilotManager implements IMogoOnMessageListener<DispatchAdas
}
public void testNotifyAutopilotState() {
AutopilotStatusInfo autopilotStatus = new AutopilotStatusInfo();
AutopilotStatussInfo autopilotStatus = new AutopilotStatussInfo();
autopilotStatus.setReason("123");
autopilotStatus.setSpeed(123);
autopilotStatus.setState(0);

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

@@ -7,11 +7,11 @@ import com.google.gson.Gson;
import com.mogo.eagle.core.data.autopilot.AutopilotCarStateInfo;
import com.mogo.eagle.core.data.autopilot.AutopilotGuardianStatusInfo;
import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo;
import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo;
import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo;
import com.mogo.eagle.core.data.autopilot.AutopilotStationsInfo;
import com.mogo.eagle.core.data.autopilot.AutopilotStatussInfo;
import com.mogo.eagle.core.data.autopilot.AutopilotWarnMessage;
import com.mogo.eagle.core.data.traffic.TrafficData;
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotsStatusListener;
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
import com.mogo.module.adas.model.AdasServiceModel;
import com.mogo.utils.logger.Logger;
@@ -32,7 +32,7 @@ import io.reactivex.schedulers.Schedulers;
/**
* Created by XuYong on 2021/4/25 14:43
*/
public class AdasEventManager implements OnAdasMsgConnectStatusListener, IMoGoAutopilotStatusListener {
public class AdasEventManager implements OnAdasMsgConnectStatusListener, IMoGoAutopilotsStatusListener {
private final String TAG = "AdasEventManager";
@@ -47,7 +47,7 @@ public class AdasEventManager implements OnAdasMsgConnectStatusListener, IMoGoAu
//自动驾驶车速度
private float mCurrentAutopilotSpeed = 0;
//自动驾驶状态
private AutopilotStatusInfo mAutopilotValuesStatus = null;
private AutopilotStatussInfo mAutopilotValuesStatus = null;
private IAdasProviderBizListener providerBizListener;
@@ -165,22 +165,22 @@ public class AdasEventManager implements OnAdasMsgConnectStatusListener, IMoGoAu
}
@Override
public void onAutopilotStatusResponse(@NonNull AutopilotStatusInfo autoPilotStatusInfo) {
Logger.d(TAG, "autopilotStatus " + autoPilotStatusInfo);
int state = autoPilotStatusInfo.getState();
float speed = autoPilotStatusInfo.getSpeed();
public void onAutopilotStatusResponse(@NonNull AutopilotStatussInfo autoPilotStatussInfo) {
Logger.d(TAG, "autopilotStatus " + autoPilotStatussInfo);
int state = autoPilotStatussInfo.getState();
float speed = autoPilotStatussInfo.getSpeed();
mCurrentAutopilotStatus = state;
mCurrentAutopilotSpeed = speed;
this.mAutopilotValuesStatus = autoPilotStatusInfo;
this.mAutopilotValuesStatus = autoPilotStatussInfo;
for (IAdasDataListener listener : iAdasEventListeners) {
if (listener != null) {
listener.notifyAutopilotState(autoPilotStatusInfo);
listener.notifyAutopilotState(autoPilotStatussInfo);
}
}
}
@Override
public void onAutopilotArriveAtStation(AutopilotStationInfo autopilotWayArrive) {
public void onAutopilotArriveAtStation(AutopilotStationsInfo autopilotWayArrive) {
Logger.d(TAG, "autopilotArrive " + autopilotWayArrive);
if (autopilotWayArrive != null) {
double lon = autopilotWayArrive.getLon();

15
modules/mogo-module-adas/src/main/java/com/mogo/module/adas/IAdasDataListener.java
View File

@@ -1,15 +1,10 @@
package com.mogo.module.adas;
import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo;
import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo;
import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo;
import com.mogo.eagle.core.data.autopilot.AutopilotStationsInfo;
import com.mogo.eagle.core.data.autopilot.AutopilotStatussInfo;
import com.mogo.eagle.core.data.autopilot.AutopilotWarnMessage;
import com.mogo.eagle.core.data.traffic.TrafficData;
import com.zhidao.autopilotservice.model.AdasAIDLAutopilotArriveModel;
import com.zhidao.support.adas.high.bean.AutopilotRoute;
import com.zhidao.support.adas.high.bean.AutopilotStatus;
import com.zhidao.support.adas.high.bean.RectInfo;
import com.zhidao.support.adas.high.bean.WarnMessageInfo;
import java.util.List;
@@ -34,7 +29,7 @@ public interface IAdasDataListener {
*
* @param autopilotWayArrive
*/
default void autopilotArrive(AutopilotStationInfo autopilotWayArrive) {
default void autopilotArrive(AutopilotStationsInfo autopilotWayArrive) {
}
/**
@@ -57,9 +52,9 @@ public interface IAdasDataListener {
/**
* 自动驾驶状态信息
*
* @param autopilotStatus {@link AutopilotStatusInfo}
* @param autopilotStatus {@link AutopilotStatussInfo}
*/
default void notifyAutopilotState(AutopilotStatusInfo autopilotStatus) {
default void notifyAutopilotState(AutopilotStatussInfo autopilotStatus) {
}
}

26
modules/mogo-module-adas/src/main/java/com/mogo/module/adas/OnAdasListenerAdapter.java
View File

@@ -3,8 +3,8 @@ package com.mogo.module.adas;
import com.mogo.eagle.core.data.autopilot.AutopilotCarStateInfo;
import com.mogo.eagle.core.data.autopilot.AutopilotGuardianStatusInfo;
import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo;
import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo;
import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo;
import com.mogo.eagle.core.data.autopilot.AutopilotStationsInfo;
import com.mogo.eagle.core.data.autopilot.AutopilotStatussInfo;
import com.mogo.eagle.core.data.autopilot.AutopilotWarnMessage;
import com.mogo.eagle.core.data.traffic.TrafficData;
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
@@ -59,17 +59,17 @@ public class OnAdasListenerAdapter implements OnAdasListener {
if (autopilotStatusValues != null) {
// 初始化自动驾驶状态信息
AutopilotStatusInfo autopilotStatusInfo = CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo();
autopilotStatusInfo.setState(autopilotStatusValues.getState());
autopilotStatusInfo.setPilotmode(autopilotStatusValues.getPilotmode());
autopilotStatusInfo.setReason(autopilotStatusValues.getReason());
autopilotStatusInfo.setCamera(autopilotStatusValues.getCamera());
autopilotStatusInfo.setRtk(autopilotStatusValues.getRtk());
autopilotStatusInfo.setRadar(autopilotStatusValues.getRadar());
autopilotStatusInfo.setSpeed(autopilotStatusValues.getSpeed());
AutopilotStatussInfo autopilotStatussInfo = CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo();
autopilotStatussInfo.setState(autopilotStatusValues.getState());
autopilotStatussInfo.setPilotmode(autopilotStatusValues.getPilotmode());
autopilotStatussInfo.setReason(autopilotStatusValues.getReason());
autopilotStatussInfo.setCamera(autopilotStatusValues.getCamera());
autopilotStatussInfo.setRtk(autopilotStatusValues.getRtk());
autopilotStatussInfo.setRadar(autopilotStatusValues.getRadar());
autopilotStatussInfo.setSpeed(autopilotStatusValues.getSpeed());
// 初始化自动驾驶状态信息
autopilotStatusInfo.setVersion(AdasManager.getInstance().getAdasConfig().getVersion());
autopilotStatusInfo.setConnectIP(AdasManager.getInstance().getAdasConfig().getAddress());
autopilotStatussInfo.setVersion(AdasManager.getInstance().getAdasConfig().getVersion());
autopilotStatussInfo.setConnectIP(AdasManager.getInstance().getAdasConfig().getAddress());
CallerAutoPilotStatusListenerManager.INSTANCE.invokeAutoPilotStatus();
}
@@ -82,7 +82,7 @@ public class OnAdasListenerAdapter implements OnAdasListener {
if (result != null) {
AutopilotWayArrive.ResultBean.EndLatLonBean endLatLon = result.getEndLatLon();
if (endLatLon != null) {
AutopilotStationInfo stationInfo = new AutopilotStationInfo(result.getCarType(), endLatLon.getLon(), endLatLon.getLat());
AutopilotStationsInfo stationInfo = new AutopilotStationsInfo(result.getCarType(), endLatLon.getLon(), endLatLon.getLat());
CallerAutoPilotStatusListenerManager.INSTANCE.invokeArriveAtStation(stationInfo);
}

6
modules/mogo-module-adas/src/main/java/com/mogo/module/adas/entity/ReportedRoute.java
View File

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

4
modules/mogo-module-adas/src/main/java/com/mogo/module/adas/model/AdasServiceModel.java
View File

@@ -3,7 +3,7 @@ package com.mogo.module.adas.model;
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.AutopilotStatusInfo;
import com.mogo.eagle.core.data.autopilot.AutopilotStatussInfo;
import com.mogo.module.adas.entity.AutonomousDriveStatusBean;
import com.mogo.module.adas.entity.ReportDispatchResult;
import com.mogo.module.adas.entity.ReportSiteBean;
@@ -60,7 +60,7 @@ public class AdasServiceModel {
*
* @param autopilotStatus {@link AutopilotStatus}
*/
public void uploadAutopilotStatus(AutopilotStatusInfo autopilotStatus) {
public void uploadAutopilotStatus(AutopilotStatussInfo autopilotStatus) {
String sn = MoGoAiCloudClientConfig.getInstance().getSn();
ReportedRoute reportedRoute = new ReportedRoute(sn, autopilotStatus);
Map<String, Object> map = new HashMap<>();