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

Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-10-18 20:01:06 +08:00
parent cf9767436f
commit b31f2b64c7
36 changed files with 191 additions and 191 deletions
--- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasAutoPilotManager.java
+++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasAutoPilotManager.java
@@ -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.AutopilotStatussInfo;
+import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo;
 import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.location.MogoLocation;
 import com.mogo.map.navi.IMogoCarLocationChangedListener2;
@@ -130,7 +130,7 @@ public class AdasAutoPilotManager implements IMogoOnMessageListener<DispatchAdas
    }

    @Override
-    public void notifyAutopilotState(AutopilotStatussInfo autopilotStatus) {
+    public void notifyAutopilotState(AutopilotStatusInfo autopilotStatus) {
        AdasServiceModel.getInstance().uploadAutopilotStatus(autopilotStatus);
    }

@@ -227,7 +227,7 @@ public class AdasAutoPilotManager implements IMogoOnMessageListener<DispatchAdas
    }

    public void testNotifyAutopilotState() {
-        AutopilotStatussInfo autopilotStatus = new AutopilotStatussInfo();
+        AutopilotStatusInfo autopilotStatus = new AutopilotStatusInfo();
        autopilotStatus.setReason("123");
        autopilotStatus.setSpeed(123);
        autopilotStatus.setState(0);
--- 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
@@ -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.AutopilotStationsInfo;
-import com.mogo.eagle.core.data.autopilot.AutopilotStatussInfo;
-import com.mogo.eagle.core.data.autopilot.AutopilotWarnMessage;
+import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo;
+import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo;
+import com.mogo.eagle.core.data.autopilot.AutoPilotWarnMessage;
 import com.mogo.eagle.core.data.traffic.TrafficData;
-import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotsStatusListener;
+import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
 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, IMoGoAutopilotsStatusListener {
+public class AdasEventManager implements OnAdasMsgConnectStatusListener, IMoGoAutopilotStatusListener {

    private final String TAG = "AdasEventManager";

@@ -47,7 +47,7 @@ public class AdasEventManager implements OnAdasMsgConnectStatusListener, IMoGoAu
    //自动驾驶车速度
    private float mCurrentAutopilotSpeed = 0;
    //自动驾驶状态
-    private AutopilotStatussInfo mAutopilotValuesStatus = null;
+    private AutopilotStatusInfo mAutopilotValuesStatus = null;

    private IAdasProviderBizListener providerBizListener;

@@ -165,22 +165,22 @@ public class AdasEventManager implements OnAdasMsgConnectStatusListener, IMoGoAu
    }

    @Override
-    public void onAutopilotStatusResponse(@NonNull AutopilotStatussInfo autoPilotStatussInfo) {
-        Logger.d(TAG, "autopilotStatus " + autoPilotStatussInfo);
-        int state = autoPilotStatussInfo.getState();
-        float speed = autoPilotStatussInfo.getSpeed();
+    public void onAutopilotStatusResponse(@NonNull AutopilotStatusInfo autoPilotStatusInfo) {
+        Logger.d(TAG, "autopilotStatus " + autoPilotStatusInfo);
+        int state = autoPilotStatusInfo.getState();
+        float speed = autoPilotStatusInfo.getSpeed();
        mCurrentAutopilotStatus = state;
        mCurrentAutopilotSpeed = speed;
-        this.mAutopilotValuesStatus = autoPilotStatussInfo;
+        this.mAutopilotValuesStatus = autoPilotStatusInfo;
        for (IAdasDataListener listener : iAdasEventListeners) {
            if (listener != null) {
-                listener.notifyAutopilotState(autoPilotStatussInfo);
+                listener.notifyAutopilotState(autoPilotStatusInfo);
            }
        }
    }

    @Override
-    public void onAutopilotArriveAtStation(AutopilotStationsInfo autopilotWayArrive) {
+    public void onAutopilotArriveAtStation(AutopilotStationInfo autopilotWayArrive) {
        Logger.d(TAG, "autopilotArrive " + autopilotWayArrive);
        if (autopilotWayArrive != null) {
            double lon = autopilotWayArrive.getLon();
@@ -246,7 +246,7 @@ public class AdasEventManager implements OnAdasMsgConnectStatusListener, IMoGoAu
    }

    @Override
-    public void onAutopilotWarnMessage(@Nullable AutopilotWarnMessage autopilotWarnMessage) {
+    public void onAutopilotWarnMessage(@Nullable AutoPilotWarnMessage autopilotWarnMessage) {
        Logger.d(TAG, "onWarnMessage " + autopilotWarnMessage);
        //报警model
        for (IAdasDataListener listener : iAdasEventListeners) {
--- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasObjectUtils.kt
+++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasObjectUtils.kt
@@ -1,7 +1,7 @@
 package com.mogo.module.adas

 import android.util.Log
-import com.mogo.eagle.core.data.autopilot.AutopilotWarnMessage
+import com.mogo.eagle.core.data.autopilot.AutoPilotWarnMessage
 import com.mogo.eagle.core.data.autopilot.AutopilotCarStateInfo
 import com.mogo.eagle.core.data.autopilot.AutopilotGuardianStatusInfo
 import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo
@@ -45,12 +45,12 @@ object AdasObjectUtils {
        )
    }

-    fun fromAdasObject(info: WarnMessageInfo?): AutopilotWarnMessage? {
+    fun fromAdasObject(info: WarnMessageInfo?): AutoPilotWarnMessage? {
        if (info == null) {
            return null
        }
        val warnMessage =
-            AutopilotWarnMessage()
+            AutoPilotWarnMessage()
        warnMessage.content = info.content
        warnMessage.level = info.level
        try {
--- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/IAdasDataListener.java
+++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/IAdasDataListener.java
@@ -1,9 +1,9 @@
 package com.mogo.module.adas;

 import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo;
-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.autopilot.AutopilotStationInfo;
+import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo;
+import com.mogo.eagle.core.data.autopilot.AutoPilotWarnMessage;
 import com.mogo.eagle.core.data.traffic.TrafficData;

 import java.util.List;
@@ -19,7 +19,7 @@ public interface IAdasDataListener {

    }

-    default void onWarnMessage(AutopilotWarnMessage autopilotWarnMessage) {
+    default void onWarnMessage(AutoPilotWarnMessage autopilotWarnMessage) {

    }

@@ -29,7 +29,7 @@ public interface IAdasDataListener {
     *
     * @param autopilotWayArrive
     */
-    default void autopilotArrive(AutopilotStationsInfo autopilotWayArrive) {
+    default void autopilotArrive(AutopilotStationInfo autopilotWayArrive) {
    }

    /**
@@ -52,9 +52,9 @@ public interface IAdasDataListener {
    /**
     * 自动驾驶状态信息
     *
-     * @param autopilotStatus {@link AutopilotStatussInfo}
+     * @param autopilotStatus {@link AutopilotStatusInfo}
     */
-    default void notifyAutopilotState(AutopilotStatussInfo autopilotStatus) {
+    default void notifyAutopilotState(AutopilotStatusInfo autopilotStatus) {
    }

 }
--- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/OnAdasListenerAdapter.java
+++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/OnAdasListenerAdapter.java
@@ -3,9 +3,9 @@ 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.AutopilotStationsInfo;
-import com.mogo.eagle.core.data.autopilot.AutopilotStatussInfo;
-import com.mogo.eagle.core.data.autopilot.AutopilotWarnMessage;
+import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo;
+import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo;
+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;
 import com.mogo.utils.logger.Logger;
@@ -59,17 +59,17 @@ public class OnAdasListenerAdapter implements OnAdasListener {

        if (autopilotStatusValues != null) {
            // 初始化自动驾驶状态信息
-            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 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.setVersion(AdasManager.getInstance().getAdasConfig().getVersion());
-            autopilotStatussInfo.setConnectIP(AdasManager.getInstance().getAdasConfig().getAddress());
+            autopilotStatusInfo.setVersion(AdasManager.getInstance().getAdasConfig().getVersion());
+            autopilotStatusInfo.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) {
-                    AutopilotStationsInfo stationInfo = new AutopilotStationsInfo(result.getCarType(), endLatLon.getLon(), endLatLon.getLat());
+                    AutopilotStationInfo stationInfo = new AutopilotStationInfo(result.getCarType(), endLatLon.getLon(), endLatLon.getLat());

                    CallerAutoPilotStatusListenerManager.INSTANCE.invokeArriveAtStation(stationInfo);
                }
@@ -127,7 +127,7 @@ public class OnAdasListenerAdapter implements OnAdasListener {

    @Override
    public void onWarnMessage(WarnMessageInfo warnMessageInfo) {
-        final AutopilotWarnMessage warnMessage = AdasObjectUtils.INSTANCE.fromAdasObject(warnMessageInfo);
+        final AutoPilotWarnMessage warnMessage = AdasObjectUtils.INSTANCE.fromAdasObject(warnMessageInfo);
        CallerAutoPilotStatusListenerManager.INSTANCE.invokeAutopilotWarnMessage(warnMessage);

    }
--- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/entity/ReportedRoute.java
+++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/entity/ReportedRoute.java
@@ -1,17 +1,17 @@
 package com.mogo.module.adas.entity;


-import com.mogo.eagle.core.data.autopilot.AutopilotStatussInfo;
+import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo;

 /**
 * 上报自动驾驶规划的路径
 */
 public class ReportedRoute {
    private String sn;
-    private AutopilotStatussInfo bean;
+    private AutopilotStatusInfo bean;
    private String siteList;

-    public ReportedRoute(String sn, AutopilotStatussInfo bean) {
+    public ReportedRoute(String sn, AutopilotStatusInfo bean) {
        this.sn = sn;
        this.bean = bean;
    }
--- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/model/AdasServiceModel.java
+++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/model/AdasServiceModel.java
@@ -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.AutopilotStatussInfo;
+import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo;
 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(AutopilotStatussInfo autopilotStatus) {
+    public void uploadAutopilotStatus(AutopilotStatusInfo autopilotStatus) {
        String sn = MoGoAiCloudClientConfig.getInstance().getSn();
        ReportedRoute reportedRoute = new ReportedRoute(sn, autopilotStatus);
        Map<String, Object> map = new HashMap<>();
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/datacenter/SnapshotLocationDataCenter.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/datacenter/SnapshotLocationDataCenter.java
@@ -2,7 +2,7 @@ package com.mogo.module.common.datacenter;

 import com.mogo.commons.FunctionBuildConfig;
 import com.mogo.commons.debug.DebugConfig;
-import com.mogo.eagle.core.data.autopilot.AutopilotStatussInfo;
+import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.service.cloud.location.CloudLocationInfo;
@@ -94,9 +94,9 @@ public class SnapshotLocationDataCenter {
        // 使用与渠道配置一样的gps提供者提供的数据
        if (gpsProvider == FunctionBuildConfig.gpsProvider) {
            //测试面板状态同步
-            AutopilotStatussInfo autopilotStatussInfo = CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo();
-            autopilotStatussInfo.setLocationLat(lat);
-            autopilotStatussInfo.setLocationLon(lon);
+            AutopilotStatusInfo autopilotStatusInfo = CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo();
+            autopilotStatusInfo.setLocationLat(lat);
+            autopilotStatusInfo.setLocationLon(lon);
            CallerAutoPilotStatusListenerManager.INSTANCE.invokeAutoPilotStatus();

            DebugConfig.setStatusData(DebugConfig.sLon, lon);
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/AdasNoticeHelper.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/AdasNoticeHelper.java
@@ -15,7 +15,7 @@ import com.mogo.module.extensions.navi.VrModeNavInfoView;
 import com.mogo.realtime.socket.IMogoCloudOnMsgListener;
 import com.mogo.service.adas.IMogoAdasWarnMessageCallback;
 import com.mogo.eagle.core.data.autopilot.MogoADASWarnType;
-import com.mogo.eagle.core.data.autopilot.AutopilotWarnMessage;
+import com.mogo.eagle.core.data.autopilot.AutoPilotWarnMessage;
 import com.mogo.utils.logger.Logger;

 import org.json.JSONArray;
@@ -92,7 +92,7 @@ public class AdasNoticeHelper implements IMogoAdasWarnMessageCallback, IMogoLoca
    }

    @Override
-    public void onReceiveData(AutopilotWarnMessage msg) {
+    public void onReceiveData(AutoPilotWarnMessage msg) {
        Logger.d(TAG, "收到adas warn message, isVrMode: " + isVrMode + " msg: " + msg);
        if (!isVrMode) {
            return;
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/autopilot/AutoPilotRemoteController.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/autopilot/AutoPilotRemoteController.java
@@ -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;
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchAutoPilotManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchAutoPilotManager.java
@@ -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();
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/bean/ReportedRoute.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/bean/ReportedRoute.java
@@ -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;
    }
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/model/DispatchServiceModel.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/model/DispatchServiceModel.java
@@ -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));
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java
@@ -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()