diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt
index b08d83a15e..91f8852cab 100644
--- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt
+++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt
@@ -59,12 +59,12 @@ import com.mogo.och.common.module.biz.constant.OchCommonConst
 import com.mogo.och.common.module.biz.network.OchCommonServiceCallback
 import com.mogo.och.common.module.manager.AbnormalFactorsLoopManager.startLoopAbnormalFactors
 import com.mogo.och.common.module.manager.AbnormalFactorsLoopManager.stopLoopAbnormalFactors
-import com.mogo.och.common.module.manager.trajectorymamager.IDistanceListener
-import com.mogo.och.common.module.manager.trajectorymamager.ITrajectoryListener
-import com.mogo.och.common.module.manager.trajectorymamager.TrajectoryAndDistanceManager.addDistanceListener
-import com.mogo.och.common.module.manager.trajectorymamager.TrajectoryAndDistanceManager.addTrajectoryListener
-import com.mogo.och.common.module.manager.trajectorymamager.TrajectoryAndDistanceManager.setStationPoint
-import com.mogo.och.common.module.manager.trajectorymamager.TrajectoryAndDistanceManager.suspendCalculate
+import com.mogo.och.common.module.manager.distancemamager.IDistanceListener
+import com.mogo.och.common.module.manager.distancemamager.ITrajectoryListener
+import com.mogo.och.common.module.manager.distancemamager.TrajectoryAndDistanceManager.addDistanceListener
+import com.mogo.och.common.module.manager.distancemamager.TrajectoryAndDistanceManager.addTrajectoryListener
+import com.mogo.och.common.module.manager.distancemamager.TrajectoryAndDistanceManager.setStationPoint
+import com.mogo.och.common.module.manager.distancemamager.TrajectoryAndDistanceManager.suspendCalculate
 import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil.calculateRouteSumLength
 import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil.coordinateConverterWgsToGcjLocations
 import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil.getArrivedPointIndexNew
diff --git a/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/model/OrderModel.java b/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/model/OrderModel.java
index 3e0a97a21b..5153efce75 100644
--- a/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/model/OrderModel.java
+++ b/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/model/OrderModel.java
@@ -63,8 +63,8 @@ import com.mogo.och.common.module.biz.provider.LoginService;
 import com.mogo.och.common.module.callback.OchAdasStartFailureCallback;
 import com.mogo.och.common.module.manager.AbnormalFactorsLoopManager;
 import com.mogo.och.common.module.manager.OCHAdasAbilityManager;
-import com.mogo.och.common.module.manager.trajectorymamager.ITrajectoryListener;
-import com.mogo.och.common.module.manager.trajectorymamager.TrajectoryAndDistanceManager;
+import com.mogo.och.common.module.manager.distancemamager.ITrajectoryListener;
+import com.mogo.och.common.module.manager.distancemamager.TrajectoryAndDistanceManager;
 import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil;
 import com.mogo.och.common.module.utils.DateTimeUtil;
 import com.mogo.och.common.module.utils.NumberFormatUtil;
diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/trajectorymamager/DistanceDegree.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/DistanceDegree.kt
similarity index 85%
rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/trajectorymamager/DistanceDegree.kt
rename to OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/DistanceDegree.kt
index d0c11e1810..205510c9da 100644
--- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/trajectorymamager/DistanceDegree.kt
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/DistanceDegree.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.common.module.manager.trajectorymamager
+package com.mogo.och.common.module.manager.distancemamager
 
 data class DistanceDegree(var distance:Float,var degree:Double?,var isNext:Boolean?):Comparable<DistanceDegree>{
     override fun compareTo(other: DistanceDegree): Int {
diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/trajectorymamager/IDistanceListener.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/IDistanceListener.kt
similarity index 94%
rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/trajectorymamager/IDistanceListener.kt
rename to OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/IDistanceListener.kt
index bac719a509..d199f69d5b 100644
--- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/trajectorymamager/IDistanceListener.kt
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/IDistanceListener.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.common.module.manager.trajectorymamager
+package com.mogo.och.common.module.manager.distancemamager
 
 import com.mogo.eagle.core.data.map.MogoLocation
 
diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/trajectorymamager/StationAndIndex.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/StationAndIndex.kt
similarity index 84%
rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/trajectorymamager/StationAndIndex.kt
rename to OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/StationAndIndex.kt
index 696f3f1343..9b76dcc949 100644
--- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/trajectorymamager/StationAndIndex.kt
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/StationAndIndex.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.common.module.manager.trajectorymamager
+package com.mogo.och.common.module.manager.distancemamager
 
 import com.mogo.eagle.core.data.map.MogoLocation
 
diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/trajectorymamager/TrajectoryAndDistanceManager.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt
similarity index 99%
rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/trajectorymamager/TrajectoryAndDistanceManager.kt
rename to OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt
index 2825ff7206..8d80a3f7be 100644
--- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/trajectorymamager/TrajectoryAndDistanceManager.kt
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.common.module.manager.trajectorymamager
+package com.mogo.och.common.module.manager.distancemamager
 
 import com.mogo.commons.AbsMogoApplication
 import com.mogo.eagle.core.data.deva.chain.ChainConstant
diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/CoordinateCalculateRouteUtil.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/CoordinateCalculateRouteUtil.kt
index 9c5326d1d2..79444f76f5 100644
--- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/CoordinateCalculateRouteUtil.kt
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/CoordinateCalculateRouteUtil.kt
@@ -9,7 +9,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.Logger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.util.CoordinateUtils
 import com.mogo.eagle.core.utilcode.util.DrivingDirectionUtils
-import com.mogo.och.common.module.manager.trajectorymamager.DistanceDegree
+import com.mogo.och.common.module.manager.distancemamager.DistanceDegree
 import mogo.telematics.pad.MessagePad
 import java.util.TreeMap
 import kotlin.math.acos
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java
index c5101319c1..f95bba5744 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java
@@ -14,7 +14,6 @@ import com.amap.api.maps.model.LatLng;
 import com.amap.api.navi.model.NaviLatLng;
 import com.elegant.network.utils.GsonUtil;
 import com.mogo.aicloud.services.socket.MogoAiCloudSocketManager;
-import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.module.intent.IMogoIntentListener;
 import com.mogo.commons.module.intent.IntentManager;
 import com.mogo.commons.module.status.IMogoStatusChangedListener;
@@ -48,9 +47,9 @@ import com.mogo.och.common.module.biz.network.OchCommonServiceCallback;
 import com.mogo.och.common.module.callback.OchAdasStartFailureCallback;
 import com.mogo.och.common.module.manager.AbnormalFactorsLoopManager;
 import com.mogo.och.common.module.manager.OCHAdasAbilityManager;
-import com.mogo.och.common.module.manager.trajectorymamager.IDistanceListener;
-import com.mogo.och.common.module.manager.trajectorymamager.ITrajectoryListener;
-import com.mogo.och.common.module.manager.trajectorymamager.TrajectoryAndDistanceManager;
+import com.mogo.och.common.module.manager.distancemamager.IDistanceListener;
+import com.mogo.och.common.module.manager.distancemamager.ITrajectoryListener;
+import com.mogo.och.common.module.manager.distancemamager.TrajectoryAndDistanceManager;
 import com.mogo.och.common.module.map.AmapNaviToDestinationModel;
 import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil;
 import com.mogo.och.common.module.utils.PinYinUtil;
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
index 2667c72c42..edae674246 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
@@ -50,9 +50,9 @@ import com.mogo.och.common.module.biz.provider.LoginService;
 import com.mogo.och.common.module.callback.OchAdasStartFailureCallback;
 import com.mogo.och.common.module.manager.AbnormalFactorsLoopManager;
 import com.mogo.och.common.module.manager.OCHAdasAbilityManager;
-import com.mogo.och.common.module.manager.trajectorymamager.IDistanceListener;
-import com.mogo.och.common.module.manager.trajectorymamager.ITrajectoryListener;
-import com.mogo.och.common.module.manager.trajectorymamager.TrajectoryAndDistanceManager;
+import com.mogo.och.common.module.manager.distancemamager.IDistanceListener;
+import com.mogo.och.common.module.manager.distancemamager.ITrajectoryListener;
+import com.mogo.och.common.module.manager.distancemamager.TrajectoryAndDistanceManager;
 import com.mogo.och.common.module.map.AmapNaviToDestinationModel;
 import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil;
 import com.mogo.och.common.module.utils.PinYinUtil;
@@ -91,7 +91,6 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 
 import io.reactivex.exceptions.UndeliverableException;
 import io.reactivex.functions.Consumer;