diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java
index a176100b6f..811191f6cf 100644
--- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java
+++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java
@@ -54,6 +54,7 @@ import com.mogo.och.bus.util.BusAnalyticsManager;
 import com.mogo.och.bus.util.BusSendTripInfoManager;
 import com.mogo.och.bus.util.BusTrajectoryManager;
 import com.mogo.och.bus.util.BusVoiceManager;
+import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager;
 import com.mogo.och.common.module.manager.socket.lan.LanSocketManager;
 import com.mogo.och.common.module.manager.socket.lan.bean.AppConnectMsg;
 import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager;
@@ -661,7 +662,7 @@ public class OrderModel {
             return;
         }
 
-        CallerAutoPilotControlManager.INSTANCE.startAutoPilot(parameters);
+        OchAutoPilotManager.startAutoPilot(parameters);
 
         CallerLogger.d(M_BUS + TAG, "行程日志-开启自动驾驶====" + GsonUtil.jsonFromObject(parameters)
                 + " startLatLon=" + parameters.startName + "，endLatLon=" + parameters.endName +
diff --git a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
index a25907c539..9ff6ca3c7c 100644
--- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
+++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
@@ -27,7 +27,6 @@ import com.mogo.eagle.core.data.msgbox.OperationMsg
 import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener
 import com.mogo.eagle.core.function.api.telematic.IReceivedMsgListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
-import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager.startAutoPilot
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
 import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager
@@ -52,6 +51,7 @@ import com.mogo.och.common.module.manager.CharterSendTripInfoManager.ARRIVE_STAT
 import com.mogo.och.common.module.manager.CharterSendTripInfoManager.END_TRIP
 import com.mogo.och.common.module.manager.CharterSendTripInfoManager.START_TRIP
 import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager
+import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager
 import com.mogo.och.common.module.manager.device.LightAirconditionDoorManager
 import com.mogo.och.common.module.manager.device.LightAirconditionDoorStatusManager
 import com.mogo.och.common.module.manager.socket.cloud.data.OperateDoorMsg
@@ -492,7 +492,7 @@ class DriverM1Model {
             d(SceneConstant.M_CHARTER_D + TAG, "行程日志-AutopilotControlParameters is empty.")
             return
         }
-        startAutoPilot(parameters)
+        OchAutoPilotManager.startAutoPilot(parameters)
         d(
             SceneConstant.M_CHARTER_D + TAG, "行程日志-开启自动驾驶====" + GsonUtil.jsonFromObject(parameters)
                     + " startLatLon=" + parameters.startName + "，endLatLon=" + parameters.endName
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt
index 4a15123396..30937cc124 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt
@@ -11,12 +11,9 @@ import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters
 import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters.AutoPilotLine
 import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters.AutoPilotLonLat
 import com.mogo.eagle.core.data.map.MogoLocation
-import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.api.autopilot.IMoGoPlanningRottingListener
 import com.mogo.eagle.core.function.call.autopilot.*
-import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager.startAutoPilot
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager.updateAutopilotControlParameters
-import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager
 import com.mogo.eagle.core.network.utils.GsonUtil
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.e
@@ -47,6 +44,7 @@ import com.mogo.och.common.module.manager.CharterSendTripInfoManager.LEAVE_STATI
 import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager
 import com.mogo.och.common.module.manager.autopilot.autopilot.ArrivedStation
 import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener
+import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager
 import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager
 import com.mogo.och.common.module.manager.beautifymode.BeautifyManager
 import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
@@ -1142,7 +1140,7 @@ object CharterPassengerModel {
             }
             ToastCharterUtils.showToastShort("启动自动驾驶中")
             cleanRoutePoints()
-            startAutoPilot(parameters)
+            OchAutoPilotManager.startAutoPilot(parameters)
             d(
                 SceneConstant.M_BUS + TAG,
                 "行程日志-开启自动驾驶====" + GsonUtil.jsonFromObject(parameters)
diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutoPilotManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutoPilotManager.kt
new file mode 100644
index 0000000000..8961fa1af5
--- /dev/null
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutoPilotManager.kt
@@ -0,0 +1,18 @@
+package com.mogo.och.common.module.manager.autopilot.autopilot
+
+import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
+
+object OchAutoPilotManager {
+
+    const val TAG = "OchAutoPilotManager"
+    init {shoulong
+
+    }
+
+    @JvmStatic
+    fun startAutoPilot(controlParameters: AutopilotControlParameters?) {
+        CallerAutoPilotControlManager.startAutoPilot(controlParameters)
+    }
+
+}
\ No newline at end of file
diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/OrderModel.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/OrderModel.java
index 6ffbc83096..bc8feab771 100644
--- a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/OrderModel.java
+++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/OrderModel.java
@@ -20,6 +20,7 @@ import com.mogo.eagle.core.data.BaseData;
 import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters;
 import com.mogo.eagle.core.data.config.FunctionBuildConfig;
 import com.mogo.eagle.core.data.map.MogoLocation;
+import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager;
 import com.mogo.och.common.module.manager.socket.lan.LanSocketManager;
 import com.mogo.och.shuttle.bean.BusRoutesResponse;
 import com.mogo.och.shuttle.util.ShuttleVoiceManager;
@@ -634,7 +635,7 @@ public class OrderModel {
             return;
         }
 
-        CallerAutoPilotControlManager.INSTANCE.startAutoPilot(parameters);
+        OchAutoPilotManager.startAutoPilot(parameters);
 
         CallerLogger.d(M_BUS + TAG, "行程日志-开启自动驾驶====" + GsonUtil.jsonFromObject(parameters)
                 + " startLatLon=" + parameters.startName + "，endLatLon=" + parameters.endName +
diff --git a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/model/SweeperOperateTaskModel.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/model/SweeperOperateTaskModel.java
index ed4bb935ef..8d1050caa0 100644
--- a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/model/SweeperOperateTaskModel.java
+++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/model/SweeperOperateTaskModel.java
@@ -33,6 +33,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.util.CoordinateUtils;
 import com.mogo.eagle.core.utilcode.util.NetworkUtils;
 import com.mogo.eagle.core.utilcode.util.ToastUtils;
+import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager;
 import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager;
 import com.mogo.och.common.module.manager.socket.cloud.data.OCHOperationalMessage;
 import com.mogo.och.common.module.network.OchCommonServiceCallback;
@@ -430,7 +431,7 @@ public class SweeperOperateTaskModel {
             DebugView.Companion.printErrorMsg("[启自驾]行程日志-AutopilotControlParameters is empty");
             return;
         }
-        CallerAutoPilotControlManager.INSTANCE.startAutoPilot(parameters);
+        OchAutoPilotManager.startAutoPilot(parameters);
         DebugView.Companion.printInfoMsg("[启自驾] 调用成功");
         CallerLogger.d(M_SWEEPER + TAG, "行程日志-开启自动驾驶====" + GsonUtil.jsonFromObject(parameters)
                 + " startLatLon=" + parameters.startName + "，endLatLon=" + parameters.endName +
diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
index 4a8101eda0..692bf33b14 100644
--- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
+++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
@@ -41,6 +41,7 @@ import com.mogo.eagle.core.utilcode.util.ToastUtils;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
 import com.mogo.och.common.module.manager.autopilot.autopilot.ArrivedStation;
 import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener;
+import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager;
 import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager;
 import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager;
 import com.mogo.och.common.module.manager.socket.cloud.data.OCHOperationalMessage;
@@ -975,7 +976,8 @@ public class TaxiModel {
             return;
         }
 
-        CallerAutoPilotControlManager.INSTANCE.startAutoPilot(parameters);
+        OchAutoPilotManager.startAutoPilot(parameters);
+
         CallerLogger.d(M_TAXI + TAG, "start autopilot with parameter: %s",
                 GsonUtil.jsonFromObject(parameters)
                         + " ,startSiteName=" + mCurrentOCHOrder.startSiteAddr
diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt
index a2cf6f1491..9ee9938add 100644
--- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt
+++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt
@@ -15,6 +15,7 @@ import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.och.common.module.network.OchCommonServiceCallback
 import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager
 import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener
+import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager
 import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager
 import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager
 import com.mogo.och.common.module.utils.PinYinUtil
@@ -82,7 +83,7 @@ object AutopilotManager : IOchAutopilotStatusListener {
             )
             return "自动化驾驶参数异常"
         }
-        CallerAutoPilotControlManager.startAutoPilot(parameters)
+        OchAutoPilotManager.startAutoPilot(parameters);
         CallerLogger.d(
             SceneConstant.M_TAXI_P + TAG,
             "start autopilot with parameter: %s",
diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingModel.kt
index 9c12f59933..568e7a4f39 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingModel.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingModel.kt
@@ -8,10 +8,8 @@ import com.mogo.eagle.core.data.BaseData
 import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.map.MogoLocation
-import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
-import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
 import com.mogo.eagle.core.network.utils.GsonUtil
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
@@ -25,6 +23,7 @@ import com.mogo.och.common.module.network.OchCommonServiceCallback
 import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager
 import com.mogo.och.common.module.manager.autopilot.autopilot.ArrivedStation
 import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener
+import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager
 import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager
 import com.mogo.och.common.module.utils.OCHThreadPoolManager
 import com.mogo.och.taxi.bean.ContrailBean
@@ -40,9 +39,6 @@ import com.mogo.och.taxi.callback.ITaxiRoutingCallback
 import com.mogo.och.taxi.constant.TaxiUnmannedConst
 import com.mogo.och.taxi.network.TaxiRoutingServiceManager
 import com.mogo.och.taxi.ui.debug.DebugView
-import com.zhjt.mogo.adas.data.AdasConstants
-import mogo.telematics.pad.MessagePad
-import mogo_msg.MogoReportMsg
 import java.util.concurrent.ConcurrentHashMap
 
 object TaxiRoutingModel {
@@ -494,7 +490,8 @@ object TaxiRoutingModel {
             return
         }
 
-        CallerAutoPilotControlManager.startAutoPilot(parameters)
+        OchAutoPilotManager.startAutoPilot(parameters);
+
         DebugView.printInfoMsg("[启自驾] 调用成功")
         CallerLogger.d(
             TAG, "start autopilot with parameter: %s",
diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt
index 5909042538..af67e9edb5 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt
@@ -47,6 +47,7 @@ import com.mogo.och.common.module.manager.socket.cloud.AbnormalFactorsLoopManage
 import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager
 import com.mogo.och.common.module.manager.autopilot.autopilot.ArrivedStation
 import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener
+import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager
 import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager
 import com.mogo.och.common.module.manager.distance.IDistanceListener
 import com.mogo.och.common.module.manager.distance.ITrajectoryListener
@@ -1258,7 +1259,7 @@ object TaxiTaskModel {
             return
         }
 
-        CallerAutoPilotControlManager.startAutoPilot(parameters)
+        OchAutoPilotManager.startAutoPilot(parameters);
         DebugView.printInfoMsg("[启自驾] 调用成功")
         d(
             TAG, "start autopilot with parameter: %s",
diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt
index da6efdac28..a92eb094c3 100644
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt
@@ -13,6 +13,7 @@ import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.och.common.module.network.OchCommonServiceCallback
 import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager
 import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener
+import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager
 import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager
 import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
 import com.mogo.och.common.module.voice.VoiceNotice
@@ -78,7 +79,7 @@ object AutopilotManager : IOchAutopilotStatusListener {
             )
             return "自动化驾驶参数异常"
         }
-        CallerAutoPilotControlManager.startAutoPilot(parameters)
+        OchAutoPilotManager.startAutoPilot(parameters);
         CallerLogger.d(
             SceneConstant.M_TAXI_P + TAG,
             "start autopilot with parameter: %s",