diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java
index 5d09d9cbba..0505f0343f 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java
@@ -31,7 +31,7 @@ import com.mogo.och.bus.fragment.OchBusFragment;
 import com.mogo.och.bus.net.IOchBusApiService;
 import com.mogo.service.adas.IMogoAdasOCHCallback;
 import com.mogo.eagle.core.data.autopilot.AutopilotControlPam;
-import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo;
+import com.mogo.eagle.core.data.autopilot.AutopilotStationsInfo;
 import com.mogo.utils.logger.Logger;
 import com.mogo.utils.network.RequestOptions;
 import com.mogo.utils.network.utils.GsonUtil;
@@ -354,7 +354,7 @@ public class OchBusPresenter extends Presenter< OchBusFragment > implements IMog
     }
 
     @Override
-    public void onArriveAt( AutopilotStationInfo data ) {
+    public void onArriveAt( AutopilotStationsInfo data ) {
         if ( currentStationIndex >= stationList.size() - 1 ) {
             Logger.e( TAG, "到站异常，取消后续操作" );
             return;
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java
index 7978e5bb74..a03caa51e8 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java
@@ -16,7 +16,7 @@ import com.mogo.module.common.constants.HostConst;
 import com.mogo.och.taxi.ui.OCHTaxiUiController;
 import com.mogo.service.adas.IMogoAdasOCHCallback;
 import com.mogo.eagle.core.data.autopilot.AutopilotControlPam;
-import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo;
+import com.mogo.eagle.core.data.autopilot.AutopilotStationsInfo;
 import com.mogo.service.cloud.socket.IMogoLifecycleListener;
 import com.mogo.service.cloud.socket.IMogoOnMessageListener;
 import com.mogo.service.intent.IMogoIntentListener;
@@ -714,7 +714,7 @@ class MogoOCHTaxiModel {
      */
     private class OCHArriveNotifyCallback implements IMogoAdasOCHCallback {
         @Override
-        public void onArriveAt( AutopilotStationInfo data ) {
+        public void onArriveAt( AutopilotStationsInfo data ) {
             if ( data == null ) {
                 return;
             }
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java
index af01af3462..430e3479db 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java
@@ -26,7 +26,7 @@ import com.mogo.och.taxi.R;
 import com.mogo.och.view.SlidePanelView;
 import com.mogo.service.adas.IMogoAdasOCHCallback;
 import com.mogo.service.adas.IMogoAdasRouteCallBack;
-import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo;
+import com.mogo.eagle.core.data.autopilot.AutopilotStationsInfo;
 import com.mogo.service.statusmanager.IMogoStatusChangedListener;
 import com.mogo.service.statusmanager.StatusDescriptor;
 import com.mogo.utils.logger.Logger;
@@ -524,7 +524,7 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i
     }
 
     @Override
-    public void onArriveAt(AutopilotStationInfo data) {
+    public void onArriveAt(AutopilotStationsInfo data) {
         Logger.d( TAG, "行程结束");
         MogoApisHandler.getInstance().getApis().getAdasControllerApi().cancelAutopilot();
     }
diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutoPilotProvider.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotsProvider.kt
similarity index 96%
rename from core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutoPilotProvider.kt
rename to core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotsProvider.kt
index 87c1fdf69e..e7ab2b0646 100644
--- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutoPilotProvider.kt
+++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotsProvider.kt
@@ -5,7 +5,7 @@ import com.alibaba.android.arouter.facade.annotation.Route
 import com.mogo.eagle.core.data.autopilot.AutopilotControlCmdPam
 import com.mogo.eagle.core.data.autopilot.AutopilotControlPam
 import com.mogo.eagle.core.data.constants.MogoServicePaths
-import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotProvider
+import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotsProvider
 import com.mogo.eagle.core.utilcode.util.GsonUtils
 import com.mogo.eagle.core.utilcode.util.LogUtils
 import com.zhidao.support.adas.high.AdasManager
@@ -16,8 +16,8 @@ import com.zhidao.support.adas.high.AdasManager
  * 域控制器
  */
 @Route(path = MogoServicePaths.PATH_AUTO_PILOT)
-class MoGoAutopilotProvider :
-    IMoGoAutopilotProvider {
+class MoGoAutopilotsProvider :
+    IMoGoAutopilotsProvider {
     private val TAG = "MoGoAutoPilotProvider"
 
     override val functionName: String
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
index cf5ef26e06..e9e9bfdd3d 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
@@ -11,7 +11,7 @@ import com.mogo.eagle.core.data.autopilot.*
 import com.mogo.eagle.core.data.constants.MoGoConfig
 import com.mogo.eagle.core.data.obu.ObuStatusInfo
 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.api.obu.IMoGoObuStatusListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
@@ -38,7 +38,7 @@ class DebugSettingView @JvmOverloads constructor(
     attrs: AttributeSet? = null,
     defStyleAttr: Int = 0
 ) : ConstraintLayout(context, attrs, defStyleAttr), IMoGoObuStatusListener,
-    IMoGoAutopilotStatusListener {
+    IMoGoAutopilotsStatusListener {
 
     private val TAG = "DebugSettingView"
 
@@ -107,11 +107,11 @@ class DebugSettingView @JvmOverloads constructor(
         tvObuInfo.text = GsonUtils.toJson(obuStatusInfo)
     }
 
-    override fun onAutopilotStatusResponse(autoPilotStatusInfo: AutopilotStatusInfo) {
-        tvAutopilotInfo.text = GsonUtils.toJson(autoPilotStatusInfo)
+    override fun onAutopilotStatusResponse(autoPilotStatussInfo: AutopilotStatussInfo) {
+        tvAutopilotInfo.text = GsonUtils.toJson(autoPilotStatussInfo)
     }
 
-    override fun onAutopilotArriveAtStation(autopilotWayArrive: AutopilotStationInfo?) {
+    override fun onAutopilotArriveAtStation(autopilotWayArrive: AutopilotStationsInfo?) {
 
     }
 
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt
index dfcd3ae0df..5ea0049bc3 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt
@@ -6,7 +6,7 @@ import android.view.LayoutInflater
 import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.mogo.eagle.core.data.autopilot.AutopilotControlPam
-import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo
+import com.mogo.eagle.core.data.autopilot.AutopilotStationsInfo
 import com.mogo.eagle.core.function.call.hmi.CallerHmiListenerManager
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.utilcode.util.LogUtils
@@ -103,7 +103,7 @@ class AutoPilotStatusView @JvmOverloads constructor(
         }
     }
 
-    override fun onArriveAt(data: AutopilotStationInfo?) {
+    override fun onArriveAt(data: AutopilotStationsInfo?) {
 
     }
 
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml
index 3b910a2110..efe0099b9e 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml
@@ -25,7 +25,7 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <com.mogo.eagle.core.function.hmi.ui.widget.AutoPilotStatusView
-        android:id="@+id/autopilotStatus"
+        android:id="@+id/autopilotStatusBean"
         android:layout_width="@dimen/module_mogo_autopilot_status_bg_width"
         android:layout_height="@dimen/module_mogo_autopilot_status_bg_height"
         android:layout_marginTop="@dimen/module_mogo_autopilot_status_margin_top"
diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutoPilotStationInfo.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStationsInfo.java
similarity index 89%
rename from core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutoPilotStationInfo.java
rename to core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStationsInfo.java
index 2e803bcd48..2beb7d9bc6 100644
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutoPilotStationInfo.java
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStationsInfo.java
@@ -7,13 +7,13 @@ package com.mogo.eagle.core.data.autopilot;
  * 自动驾驶网约车回调数据
  *
  */
-public class AutopilotStationInfo {
+public class AutopilotStationsInfo {
 
     private int type;
     private double lon;
     private double lat;
 
-    public AutopilotStationInfo(int type, double lon, double lat) {
+    public AutopilotStationsInfo(int type, double lon, double lat) {
         this.type = type;
         this.lon = lon;
         this.lat = lat;
diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatus.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatusBean.java
similarity index 97%
rename from core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatus.java
rename to core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatusBean.java
index a60de52967..a1e247f532 100644
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatus.java
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatusBean.java
@@ -7,7 +7,7 @@ import java.io.Serializable;
  * @des
  * @date 2020/7/14
  */
-public class AutopilotStatus implements Serializable {
+public class AutopilotStatusBean implements Serializable {
 
     /**
      * action : autopilotstate
diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutoPilotStatusInfo.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatussInfo.kt
similarity index 96%
rename from core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutoPilotStatusInfo.kt
rename to core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatussInfo.kt
index 276b8f62d8..add9a74a4d 100644
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutoPilotStatusInfo.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatussInfo.kt
@@ -9,7 +9,7 @@ import java.io.Serializable
  * 不建议自己初始化此对象，建议使用 CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo();
  *
  */
-class AutopilotStatusInfo : Serializable {
+class AutopilotStatussInfo : Serializable {
     /**
      * 当前链接的IP地址, 默认地址 192.168.1.102
      */
diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutoPilotProvider.java b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotsProvider.java
similarity index 90%
rename from core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutoPilotProvider.java
rename to core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotsProvider.java
index 60594e45d3..295e519403 100644
--- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutoPilotProvider.java
+++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotsProvider.java
@@ -9,7 +9,7 @@ import com.mogo.eagle.core.function.api.base.IMoGoFunctionServerProvider;
  * 自动驾驶节点
  *
  */
-public interface IMoGoAutopilotProvider extends IMoGoFunctionServerProvider {
+public interface IMoGoAutopilotsProvider extends IMoGoFunctionServerProvider {
 
     /**
      * 连接自动驾驶域控制器
diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotStatusListener.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotsStatusListener.kt
similarity index 91%
rename from core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotStatusListener.kt
rename to core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotsStatusListener.kt
index 3057c92488..77f0f378f5 100644
--- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotStatusListener.kt
+++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotsStatusListener.kt
@@ -8,21 +8,21 @@ import com.mogo.eagle.core.data.traffic.TrafficData
  * @date 2021/9/22 8:59 下午
  * 自动驾驶状态回调监听
  */
-interface IMoGoAutopilotStatusListener {
+interface IMoGoAutopilotsStatusListener {
 
     /**
      * 自动驾驶状态信息
      *
-     * @param autoPilotStatusInfo 状态信息
+     * @param autoPilotStatussInfo 状态信息
      */
-    fun onAutopilotStatusResponse(autoPilotStatusInfo: AutopilotStatusInfo)
+    fun onAutopilotStatusResponse(autoPilotStatussInfo: AutopilotStatussInfo)
 
     /**
      * 自动驾驶到站
      *
      * @param autopilotWayArrive 所到车站的简单信息
      */
-    fun onAutopilotArriveAtStation(autopilotWayArrive: AutopilotStationInfo?)
+    fun onAutopilotArriveAtStation(autopilotWayArrive: AutopilotStationsInfo?)
 
 
     /**
diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotManager.kt
index 16c059c7ea..e53a0d7da4 100644
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotManager.kt
@@ -1,7 +1,7 @@
 package com.mogo.eagle.core.function.call.autopilot
 
 import com.mogo.eagle.core.data.constants.MogoServicePaths
-import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotProvider
+import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotsProvider
 import com.mogo.eagle.core.function.call.base.CallerBase
 
 /**
@@ -10,9 +10,9 @@ import com.mogo.eagle.core.function.call.base.CallerBase
  * 域控制器管理
  */
 object CallerAutoPilotManager {
-    private val providerApi: IMoGoAutopilotProvider
+    private val providerApi: IMoGoAutopilotsProvider
         get() = CallerBase.getApiInstance(
-            IMoGoAutopilotProvider::class.java,
+            IMoGoAutopilotsProvider::class.java,
             MogoServicePaths.PATH_AUTO_PILOT
         )
 
diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt
index c30492d5eb..81441ca782 100644
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt
@@ -3,7 +3,7 @@ package com.mogo.eagle.core.function.call.autopilot
 import androidx.annotation.Nullable
 import com.mogo.eagle.core.data.autopilot.*
 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.api.obu.IMoGoObuStatusListener
 import com.mogo.eagle.core.function.call.base.CallerBase
 import com.mogo.eagle.core.utilcode.util.GsonUtils
@@ -18,24 +18,24 @@ object CallerAutoPilotStatusListenerManager : CallerBase() {
     private val TAG = "CallerAutoPilotStatusListenerManager"
 
     // 存储最后一次回调的数据，当有新当位置注册了监听将此数据回调过去，防止有些模块注册顺序问题导致无法获取最新状态
-    private var mAutopilotStatusInfo: AutopilotStatusInfo = AutopilotStatusInfo()
+    private var mAutopilotStatussInfo: AutopilotStatussInfo = AutopilotStatussInfo()
 
     // 存储所有注册了监听的对象，invokeXXXX进行遍历回调，将信息同步
-    private val M_AUTOPILOT_STATUS_LISTENERS: HashMap<String, IMoGoAutopilotStatusListener> =
+    private val M_AUTOPILOTS_STATUS_LISTENERS: HashMap<String, IMoGoAutopilotsStatusListener> =
         HashMap()
 
     /**
      * 查询AutoPilot状态
      */
-    fun getAutoPilotStatusInfo(): AutopilotStatusInfo {
-        return mAutopilotStatusInfo
+    fun getAutoPilotStatusInfo(): AutopilotStatussInfo {
+        return mAutopilotStatussInfo
     }
 
     /**
      * 查询AutoPilot状态
      */
     fun getAutoPilotStatusInfoJsonString(): String {
-        return GsonUtils.toJson(mAutopilotStatusInfo)
+        return GsonUtils.toJson(mAutopilotStatussInfo)
     }
 
     /**
@@ -45,10 +45,10 @@ object CallerAutoPilotStatusListenerManager : CallerBase() {
      */
     fun addListener(
         @Nullable tag: String,
-        @Nullable listener: IMoGoAutopilotStatusListener
+        @Nullable listener: IMoGoAutopilotsStatusListener
     ) {
-        M_AUTOPILOT_STATUS_LISTENERS[tag] = listener
-        listener.onAutopilotStatusResponse(mAutopilotStatusInfo)
+        M_AUTOPILOTS_STATUS_LISTENERS[tag] = listener
+        listener.onAutopilotStatusResponse(mAutopilotStatussInfo)
     }
 
     /**
@@ -56,7 +56,7 @@ object CallerAutoPilotStatusListenerManager : CallerBase() {
      * @param tag 标记，用来注销监听使用
      */
     fun removeListener(@Nullable tag: String) {
-        M_AUTOPILOT_STATUS_LISTENERS.remove(tag)
+        M_AUTOPILOTS_STATUS_LISTENERS.remove(tag)
     }
 
     /**
@@ -64,9 +64,9 @@ object CallerAutoPilotStatusListenerManager : CallerBase() {
      * @param listener 要删除的监听对象
      */
     fun removeListener(@Nullable listener: IMoGoObuStatusListener) {
-        M_AUTOPILOT_STATUS_LISTENERS.forEach {
+        M_AUTOPILOTS_STATUS_LISTENERS.forEach {
             if (it.value == listener) {
-                M_AUTOPILOT_STATUS_LISTENERS.remove(it.key)
+                M_AUTOPILOTS_STATUS_LISTENERS.remove(it.key)
             }
         }
     }
@@ -76,38 +76,38 @@ object CallerAutoPilotStatusListenerManager : CallerBase() {
      */
     @Synchronized
     fun invokeAutoPilotStatus() {
-        LogUtils.dTag(TAG, "$mAutopilotStatusInfo")
-        invokeAutoPilotStatus(mAutopilotStatusInfo)
+        LogUtils.dTag(TAG, "$mAutopilotStatussInfo")
+        invokeAutoPilotStatus(mAutopilotStatussInfo)
     }
 
     /**
      * 自动驾驶状态信息 回调
-     * @param autopilotStatusInfo 自动驾驶状态信息
+     * @param autopilotStatussInfo 自动驾驶状态信息
      */
     @Synchronized
-    fun invokeAutoPilotStatus(autopilotStatusInfo: AutopilotStatusInfo) {
-        LogUtils.dTag(TAG, "$autopilotStatusInfo")
-        mAutopilotStatusInfo = autopilotStatusInfo
-        M_AUTOPILOT_STATUS_LISTENERS.forEach {
+    fun invokeAutoPilotStatus(autopilotStatussInfo: AutopilotStatussInfo) {
+        LogUtils.dTag(TAG, "$autopilotStatussInfo")
+        mAutopilotStatussInfo = autopilotStatussInfo
+        M_AUTOPILOTS_STATUS_LISTENERS.forEach {
             val tag = it.key
             val listener = it.value
             LogUtils.dTag(TAG, "tag:$tag listener:$listener")
-            listener.onAutopilotStatusResponse(mAutopilotStatusInfo)
+            listener.onAutopilotStatusResponse(mAutopilotStatussInfo)
         }
     }
 
     /**
      * 自动驾驶站点信息  回调
-     * @param autopilotStationInfo 自动驾驶网约车回调数据
+     * @param autopilotStationsInfo 自动驾驶网约车回调数据
      */
     @Synchronized
-    fun invokeArriveAtStation(autopilotStationInfo: AutopilotStationInfo) {
-        LogUtils.dTag(TAG, "$autopilotStationInfo")
-        M_AUTOPILOT_STATUS_LISTENERS.forEach {
+    fun invokeArriveAtStation(autopilotStationsInfo: AutopilotStationsInfo) {
+        LogUtils.dTag(TAG, "$autopilotStationsInfo")
+        M_AUTOPILOTS_STATUS_LISTENERS.forEach {
             val tag = it.key
             val listener = it.value
             LogUtils.dTag(TAG, "tag:$tag listener:$listener")
-            listener.onAutopilotArriveAtStation(autopilotStationInfo)
+            listener.onAutopilotArriveAtStation(autopilotStationsInfo)
         }
     }
 
@@ -118,7 +118,7 @@ object CallerAutoPilotStatusListenerManager : CallerBase() {
     @Synchronized
     fun invokeAutopilotCarStateData(autoPilotCarStateInfo: AutopilotCarStateInfo?) {
         LogUtils.dTag(TAG, "$autoPilotCarStateInfo")
-        M_AUTOPILOT_STATUS_LISTENERS.forEach {
+        M_AUTOPILOTS_STATUS_LISTENERS.forEach {
             val tag = it.key
             val listener = it.value
             LogUtils.dTag(TAG, "tag:$tag listener:$listener")
@@ -133,7 +133,7 @@ object CallerAutoPilotStatusListenerManager : CallerBase() {
     @Synchronized
     fun invokeAutopilotRoute(routeInfo: AutopilotRouteInfo?) {
         LogUtils.dTag(TAG, "$routeInfo")
-        M_AUTOPILOT_STATUS_LISTENERS.forEach {
+        M_AUTOPILOTS_STATUS_LISTENERS.forEach {
             val tag = it.key
             val listener = it.value
             LogUtils.dTag(TAG, "tag:$tag listener:$listener")
@@ -147,7 +147,7 @@ object CallerAutoPilotStatusListenerManager : CallerBase() {
     @Synchronized
     fun invokeAutopilotSNRequest() {
         LogUtils.dTag(TAG, "")
-        M_AUTOPILOT_STATUS_LISTENERS.forEach {
+        M_AUTOPILOTS_STATUS_LISTENERS.forEach {
             val tag = it.key
             val listener = it.value
             LogUtils.dTag(TAG, "tag:$tag listener:$listener")
@@ -161,7 +161,7 @@ object CallerAutoPilotStatusListenerManager : CallerBase() {
     @Synchronized
     fun invokeAutopilotGuardian(guardianInfo: AutopilotGuardianStatusInfo?) {
         LogUtils.dTag(TAG, "$guardianInfo")
-        M_AUTOPILOT_STATUS_LISTENERS.forEach {
+        M_AUTOPILOTS_STATUS_LISTENERS.forEach {
             val tag = it.key
             val listener = it.value
             LogUtils.dTag(TAG, "tag:$tag listener:$listener")
@@ -175,7 +175,7 @@ object CallerAutoPilotStatusListenerManager : CallerBase() {
     @Synchronized
     fun invokeIdentifyDataUpdate(trafficData: List<TrafficData>?) {
         LogUtils.dTag(TAG, "$trafficData")
-        M_AUTOPILOT_STATUS_LISTENERS.forEach {
+        M_AUTOPILOTS_STATUS_LISTENERS.forEach {
             val tag = it.key
             val listener = it.value
             LogUtils.dTag(TAG, "tag:$tag listener:$listener")
@@ -189,7 +189,7 @@ object CallerAutoPilotStatusListenerManager : CallerBase() {
     @Synchronized
     fun invokeAutopilotWarnMessage(autopilotWarnMessage: AutopilotWarnMessage?) {
         LogUtils.dTag(TAG, "$autopilotWarnMessage")
-        M_AUTOPILOT_STATUS_LISTENERS.forEach {
+        M_AUTOPILOTS_STATUS_LISTENERS.forEach {
             val tag = it.key
             val listener = it.value
             LogUtils.dTag(TAG, "tag:$tag listener:$listener")
diff --git 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
index c79e2b33c3..4f562a5f87 100644
--- 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.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);
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 e6fa375d17..64fcb14e27 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
@@ -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();
diff --git 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
index 6865de8633..28cac69222 100644
--- 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,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) {
     }
 
 }
diff --git 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
index 9931b3e9e6..1304fd7158 100644
--- 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,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);
                 }
diff --git 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
index 8fc5663dce..1eea8bce0c 100644
--- 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.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;
     }
diff --git 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
index b5d733503d..b30954ec5a 100644
--- 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.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<>();
diff --git 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
index 10ca090421..5a9344d8fc 100644
--- 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.AutopilotStatusInfo;
+import com.mogo.eagle.core.data.autopilot.AutopilotStatussInfo;
 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) {
             //测试面板状态同步
-            AutopilotStatusInfo autopilotStatusInfo = CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo();
-            autopilotStatusInfo.setLocationLat(lat);
-            autopilotStatusInfo.setLocationLon(lon);
+            AutopilotStatussInfo autopilotStatussInfo = CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo();
+            autopilotStatussInfo.setLocationLat(lat);
+            autopilotStatussInfo.setLocationLon(lon);
             CallerAutoPilotStatusListenerManager.INSTANCE.invokeAutoPilotStatus();
 
             DebugConfig.setStatusData(DebugConfig.sLon, lon);
diff --git 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
index 9b1f3b06c6..91a85c9f07 100644
--- 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,7 +10,7 @@ import android.os.Handler;
 import android.os.Message;
 
 import com.mogo.cloud.commons.utils.CoordinateUtils;
-import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo;
+import com.mogo.eagle.core.data.autopilot.AutopilotStationsInfo;
 import com.mogo.eagle.core.data.autopilot.AutopilotControlPam;
 import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.eagle.core.function.api.hmi.autopilot.IMoGoCheckAutoPilotBtnListener;
@@ -191,7 +191,7 @@ public class DispatchAutoPilotManager implements IMogoOnMessageListener<Dispatch
     }
 
     @Override
-    public void onArriveAt(AutopilotStationInfo data) {
+    public void onArriveAt(AutopilotStationsInfo data) {
         Logger.d(TAG, "onArriveAt data : " + data.toString());
         double endLat = data.getLat();
         double endLon = data.getLon();
diff --git 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
index 75259d6df9..9258ac8e43 100644
--- 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.AutopilotStatus;
+import com.mogo.eagle.core.data.autopilot.AutopilotStatusBean;
 
 /**
  * 上报自动驾驶规划的路径
  */
 public class ReportedRoute {
     private String sn;
-    private AutopilotStatus.ValuesBean bean;
+    private AutopilotStatusBean.ValuesBean bean;
     private String siteList;
 
-    public ReportedRoute(String sn, AutopilotStatus.ValuesBean bean) {
+    public ReportedRoute(String sn, AutopilotStatusBean.ValuesBean bean) {
         this.sn = sn;
         this.bean = bean;
     }
diff --git 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
index 1829ee6566..cb94f24acb 100644
--- 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,9 +6,9 @@ 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.module.common.MogoApisHandler;
 import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo;
-import com.mogo.eagle.core.data.autopilot.AutopilotStatus;
 import com.mogo.module.service.dispatch.bean.ReportDispatchResult;
 import com.mogo.module.service.dispatch.bean.ReportedRoute;
 import com.mogo.utils.logger.Logger;
@@ -53,15 +53,15 @@ public class DispatchServiceModel {
      * 上报自动驾驶状态
      */
     public void uploadAutopilotStatus(int state, String reason) {
-        AutopilotStatus autopilotStatus = new AutopilotStatus();
-        autopilotStatus.setAction("autopilotstate");
-        AutopilotStatus.ValuesBean valuesBean = new AutopilotStatus.ValuesBean();
+        AutopilotStatusBean autopilotStatusBean = new AutopilotStatusBean();
+        autopilotStatusBean.setAction("autopilotstate");
+        AutopilotStatusBean.ValuesBean valuesBean = new AutopilotStatusBean.ValuesBean();
         valuesBean.setState(state);
         valuesBean.setReason(reason);
-        autopilotStatus.setValues(valuesBean);
+        autopilotStatusBean.setValues(valuesBean);
         String sn = MoGoAiCloudClientConfig.getInstance().getSn();
 
-        ReportedRoute reportedRoute = new ReportedRoute(sn, autopilotStatus.getValues());
+        ReportedRoute reportedRoute = new ReportedRoute(sn, autopilotStatusBean.getValues());
         Map<String, Object> map = new HashMap<>();
         map.put("sn", sn);
         map.put("data", GsonUtil.jsonFromObject(reportedRoute));
diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoAdasOCHCallback.java b/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoAdasOCHCallback.java
index 0a16fc0848..99b9a7a5c3 100644
--- a/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoAdasOCHCallback.java
+++ b/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoAdasOCHCallback.java
@@ -1,6 +1,6 @@
 package com.mogo.service.adas;
 
-import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo;
+import com.mogo.eagle.core.data.autopilot.AutopilotStationsInfo;
 
 public
 /**
@@ -29,7 +29,7 @@ interface IMogoAdasOCHCallback {
      * 到站
      * @param data 所到车站的简单信息
      */
-    void onArriveAt( AutopilotStationInfo data );
+    void onArriveAt( AutopilotStationsInfo data );
 
     /**
      * 自动驾驶状态发生改变
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 eb619424bc..e0443d66a8 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
@@ -15,8 +15,8 @@ import com.mogo.eagle.core.data.autopilot.AutopilotCarStateInfo;
 import com.mogo.eagle.core.data.autopilot.AutopilotControlCmdPam;
 import com.mogo.eagle.core.data.autopilot.AutopilotControlPam;
 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.constants.MogoServicePaths;
 import com.mogo.eagle.core.data.map.MogoLatLng;
@@ -280,7 +280,7 @@ public class MogoADASController implements IMogoADASController {
                 }
 
                 @Override
-                public void autopilotArrive(AutopilotStationInfo autopilotArriveModel) {
+                public void autopilotArrive(AutopilotStationsInfo autopilotArriveModel) {
                     Logger.d(TAG, "autopilotArriveModel " + autopilotArriveModel);
                     if (autopilotArriveModel == null) {
                         Logger.d(TAG, "autopilotArrive autopilotArriveModel is null");
@@ -289,7 +289,7 @@ public class MogoADASController implements IMogoADASController {
                     Logger.d(TAG, "autopilotArrive : " + autopilotArriveModel.toString());
                     if (!mAdasOCHCallback.isEmpty()) {
                         for (IMogoAdasOCHCallback cb : mAdasOCHCallback) {
-                            cb.onArriveAt(new AutopilotStationInfo(
+                            cb.onArriveAt(new AutopilotStationsInfo(
                                     autopilotArriveModel.getType(),
                                     autopilotArriveModel.getLon(),
                                     autopilotArriveModel.getLat())
@@ -324,7 +324,7 @@ public class MogoADASController implements IMogoADASController {
                 }
 
                 @Override
-                public void notifyAutopilotState(AutopilotStatusInfo autopilotStatus) {
+                public void notifyAutopilotState(AutopilotStatussInfo autopilotStatus) {
                     Logger.d(TAG, "notifyAutopilotState: " + GsonUtil.jsonFromObject(autopilotStatus));
                     DebugConfig.setAutoPilotStatus(autopilotStatus.getState() + "");
 
@@ -577,7 +577,7 @@ public class MogoADASController implements IMogoADASController {
     public void onAutopilotArriveLike(int carType) {
         if (!mAdasOCHCallback.isEmpty()) {
             for (IMogoAdasOCHCallback cb : mAdasOCHCallback) {
-                cb.onArriveAt(new AutopilotStationInfo(
+                cb.onArriveAt(new AutopilotStationsInfo(
                         carType,
                         116.09888888,
                         39.999999)
@@ -607,7 +607,7 @@ public class MogoADASController implements IMogoADASController {
         if (state == -1) {
             if (!mAdasOCHCallback.isEmpty()) {
                 for (IMogoAdasOCHCallback cb : mAdasOCHCallback) {
-                    cb.onArriveAt(new AutopilotStationInfo(1, 1d, 1d));
+                    cb.onArriveAt(new AutopilotStationsInfo(1, 1d, 1d));
                 }
             }
         } else {