diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
index 1d1af8189c..3167458fd6 100644
--- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
+++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
@@ -15,7 +15,6 @@ import androidx.annotation.Nullable;
 
 import com.amap.api.maps.model.LatLng;
 import com.mogo.aicloud.services.socket.MogoAiCloudSocketManager;
-import com.mogo.cloud.commons.utils.CoordinateUtils;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.module.intent.IMogoIntentListener;
 import com.mogo.commons.module.intent.IntentManager;
@@ -35,6 +34,7 @@ import com.mogo.eagle.core.network.utils.GsonUtil;
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
+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.bus.passenger.R;
diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java
index 041657e1a7..2e21bd4ea7 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java
@@ -16,7 +16,6 @@ import com.alibaba.android.arouter.launcher.ARouter;
 import com.amap.api.maps.model.LatLng;
 import com.elegant.network.utils.GsonUtil;
 import com.mogo.aicloud.services.socket.IMogoOnMessageListener;
-import com.mogo.cloud.commons.utils.CoordinateUtils;
 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.commons.module.status.IMogoStatusChangedListener;
 import com.mogo.commons.module.status.MogoStatusManager;
@@ -33,6 +32,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListener
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager;
 import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListenerManager;
 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.eagle.core.utilcode.util.UiThreadHandler;
diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.java
index eaefe8db87..a8af2bdb38 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.java
@@ -2,14 +2,13 @@ package com.mogo.och.bus.util;
 
 import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS;
 
-import android.annotation.SuppressLint;
 import android.text.TextUtils;
 
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.eagle.core.data.app.AppConfigInfo;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
-import com.mogo.eagle.core.function.call.analytics.AnalyticsManager;
+import com.mogo.commons.utils.MogoAnalyticUtils;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.util.DateTimeUtils;
@@ -60,7 +59,7 @@ public class BusAnalyticsManager {
                 , CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState() ==
                         IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING);
 
-        AnalyticsManager.INSTANCE.track(mStartAutopilotKey, mStartAutopilotParams);
+        MogoAnalyticUtils.INSTANCE.track(mStartAutopilotKey, mStartAutopilotParams);
 
         clearStartAutopilotParams();//清空参数数据，防止误传
     }
@@ -111,7 +110,7 @@ public class BusAnalyticsManager {
             clearStartAutopilotFailureMSG();
             removeWaitingCallback();
             mStartAutopilotParams.put(BusConst.EVENT_PARAM_START_RESULT, true);
-            AnalyticsManager.INSTANCE.track(mStartAutopilotKey, mStartAutopilotParams);
+            MogoAnalyticUtils.INSTANCE.track(mStartAutopilotKey, mStartAutopilotParams);
 
             clearStartAutopilotParams();//清空参数数据，防止误传
         } else {
@@ -143,6 +142,6 @@ public class BusAnalyticsManager {
         params.put(BusConst.EVENT_PARAM_END_NAME, endName);
         params.put(BusConst.EVENT_PARAM_LINE_ID, lineId);
         params.put(BusConst.EVENT_PARAM_UNABLE_START_REASON, reason);
-        AnalyticsManager.INSTANCE.track(BusConst.EVENT_KEY_AP_UNABLE_START_REASON, params);
+        MogoAnalyticUtils.INSTANCE.track(BusConst.EVENT_KEY_AP_UNABLE_START_REASON, params);
     }
 }
diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/CoordinateCalculateRouteUtil.java b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/CoordinateCalculateRouteUtil.java
index b09a1dbc29..9ba9f943fd 100644
--- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/CoordinateCalculateRouteUtil.java
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/CoordinateCalculateRouteUtil.java
@@ -5,9 +5,9 @@ import android.location.Location;
 
 import com.amap.api.maps.CoordinateConverter;
 import com.amap.api.maps.model.LatLng;
-import com.mogo.cloud.commons.utils.CoordinateUtils;
 import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
+import com.mogo.eagle.core.utilcode.util.CoordinateUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperOrderModel.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperOrderModel.java
index fc5b4c548e..2754b324a4 100644
--- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperOrderModel.java
+++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperOrderModel.java
@@ -10,7 +10,6 @@ import androidx.annotation.Nullable;
 
 import com.amap.api.maps.model.LatLng;
 import com.elegant.network.utils.GsonUtil;
-import com.mogo.cloud.commons.utils.CoordinateUtils;
 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.commons.module.status.IMogoStatusChangedListener;
 import com.mogo.commons.module.status.MogoStatusManager;
@@ -28,6 +27,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84Lis
 import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListenerManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
+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.utils.CoordinateCalculateRouteUtil;
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperAnalyticsManager.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperAnalyticsManager.java
index 76f43e4388..16832a6c2b 100644
--- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperAnalyticsManager.java
+++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperAnalyticsManager.java
@@ -6,7 +6,7 @@ import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.eagle.core.data.app.AppConfigInfo;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
-import com.mogo.eagle.core.function.call.analytics.AnalyticsManager;
+import com.mogo.commons.utils.MogoAnalyticUtils;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
 import com.mogo.eagle.core.utilcode.util.DateTimeUtils;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
@@ -39,7 +39,7 @@ public class SweeperAnalyticsManager {
         mStartAutopilotParams.put(SweeperConst.EVENT_PARAM_START_RESULT
                 , CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState() ==
                         IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING);
-        AnalyticsManager.INSTANCE.track(mStartAutopilotKey, mStartAutopilotParams);
+        MogoAnalyticUtils.INSTANCE.track(mStartAutopilotKey, mStartAutopilotParams);
     };
 
     /**
@@ -73,7 +73,7 @@ public class SweeperAnalyticsManager {
                 UiThreadHandler.removeCallbacks(startAutopilotRunnable);
             }
             mStartAutopilotParams.put(SweeperConst.EVENT_PARAM_START_RESULT, true);
-            AnalyticsManager.INSTANCE.track(mStartAutopilotKey, mStartAutopilotParams);
+            MogoAnalyticUtils.INSTANCE.track(mStartAutopilotKey, mStartAutopilotParams);
         } else {
             UiThreadHandler.postDelayed(startAutopilotRunnable, SweeperConst.LOOP_PERIOD_15S);
         }
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 8f52315f09..bfef8a0271 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.cloud.commons.utils.CoordinateUtils;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.module.intent.IMogoIntentListener;
 import com.mogo.commons.module.intent.IntentManager;
@@ -41,6 +40,7 @@ import com.mogo.eagle.core.function.call.v2x.CallerLimitingVelocityListenerManag
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
+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.eagle.core.utilcode.util.UiThreadHandler;
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.java
index 4ce2b41afb..5b55a89cca 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.java
@@ -8,7 +8,7 @@ import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.eagle.core.data.app.AppConfigInfo;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
-import com.mogo.eagle.core.function.call.analytics.AnalyticsManager;
+import com.mogo.commons.utils.MogoAnalyticUtils;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.util.DateTimeUtils;
@@ -63,7 +63,7 @@ public class TaxiPassengerAnalyticsManager {
                 , CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState() ==
                         IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING);
 
-        AnalyticsManager.INSTANCE.track(mStartAutopilotKey, mStartAutopilotParams);
+        MogoAnalyticUtils.INSTANCE.track(mStartAutopilotKey, mStartAutopilotParams);
 
         clearStartAutopilotParams();//清空参数数据，防止误传
     }
@@ -114,7 +114,7 @@ public class TaxiPassengerAnalyticsManager {
             clearStartAutopilotFailureMSG();
             removeWaitingCallback();
             mStartAutopilotParams.put(TaxiPassengerConst.EVENT_PARAM_START_RESULT, true);
-            AnalyticsManager.INSTANCE.track(mStartAutopilotKey, mStartAutopilotParams);
+            MogoAnalyticUtils.INSTANCE.track(mStartAutopilotKey, mStartAutopilotParams);
 
             clearStartAutopilotParams();
         } else {
@@ -146,6 +146,6 @@ public class TaxiPassengerAnalyticsManager {
         params.put(TaxiPassengerConst.EVENT_PARAM_END_NAME, endName);
         params.put(TaxiPassengerConst.EVENT_PARAM_ORDER_NUMBER, orderNo);
         params.put(TaxiPassengerConst.EVENT_PARAM_UNABLE_START_REASON, reason);
-        AnalyticsManager.INSTANCE.track(TaxiPassengerConst.EVENT_KEY_AP_UNABLE_START_REASON, params);
+        MogoAnalyticUtils.INSTANCE.track(TaxiPassengerConst.EVENT_KEY_AP_UNABLE_START_REASON, params);
     }
 }
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 188faf6027..8fd06b5aa6 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
@@ -16,7 +16,6 @@ import com.alibaba.android.arouter.launcher.ARouter;
 import com.amap.api.maps.model.LatLng;
 import com.elegant.network.utils.GsonUtil;
 import com.mogo.aicloud.services.socket.IMogoOnMessageListener;
-import com.mogo.cloud.commons.utils.CoordinateUtils;
 import com.mogo.commons.module.intent.IMogoIntentListener;
 import com.mogo.commons.module.intent.IntentManager;
 import com.mogo.commons.module.status.IMogoStatusChangedListener;
@@ -36,6 +35,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02Lis
 import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListenerManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
+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.eagle.core.utilcode.util.UiThreadHandler;
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.java
index dbdce513fa..51b18b574f 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.java
@@ -7,7 +7,7 @@ import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.eagle.core.data.app.AppConfigInfo;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
-import com.mogo.eagle.core.function.call.analytics.AnalyticsManager;
+import com.mogo.commons.utils.MogoAnalyticUtils;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.util.DateTimeUtils;
@@ -66,7 +66,7 @@ public class TaxiAnalyticsManager {
         mStartAutopilotParams.put(TaxiConst.EVENT_PARAM_START_RESULT,
                 CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState() ==
                 IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING);
-        AnalyticsManager.INSTANCE.track(mStartAutopilotKey, mStartAutopilotParams);
+        MogoAnalyticUtils.INSTANCE.track(mStartAutopilotKey, mStartAutopilotParams);
 
         clearStartAutopilotParams();//清空参数数据，防止误传
     }
@@ -112,7 +112,7 @@ public class TaxiAnalyticsManager {
             clearStartAutopilotFailureMSG();
             removeWaitingCallback();
             mStartAutopilotParams.put(TaxiConst.EVENT_PARAM_START_RESULT, true);
-            AnalyticsManager.INSTANCE.track(mStartAutopilotKey, mStartAutopilotParams);
+            MogoAnalyticUtils.INSTANCE.track(mStartAutopilotKey, mStartAutopilotParams);
 
             clearStartAutopilotParams();//清空参数数据，防止误传
         } else {
@@ -144,6 +144,6 @@ public class TaxiAnalyticsManager {
         params.put(TaxiConst.EVENT_PARAM_END_NAME, endName);
         params.put(TaxiConst.EVENT_PARAM_ORDER_NUMBER, orderNo);
         params.put(TaxiConst.EVENT_PARAM_UNABLE_START_REASON, reason);
-        AnalyticsManager.INSTANCE.track(TaxiConst.EVENT_KEY_AP_UNABLE_START_REASON, params);
+        MogoAnalyticUtils.INSTANCE.track(TaxiConst.EVENT_KEY_AP_UNABLE_START_REASON, params);
     }
 }
diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/DispatchAutoPilotManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/DispatchAutoPilotManager.kt
index 78070b1ec4..c7c48c012e 100644
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/DispatchAutoPilotManager.kt
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/DispatchAutoPilotManager.kt
@@ -5,7 +5,6 @@ import android.os.Handler
 import android.os.Message
 import com.mogo.aicloud.services.socket.IMogoOnMessageListener
 import com.mogo.aicloud.services.socket.MogoAiCloudSocketManager
-import com.mogo.cloud.commons.utils.CoordinateUtils
 import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters
 import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo
 import com.mogo.eagle.core.data.dispatch.DispatchAdasAutoPilotLocReceiverBean
@@ -21,6 +20,7 @@ import com.mogo.eagle.core.function.call.hmi.CallerHmiListenerManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
+import com.mogo.eagle.core.utilcode.util.CoordinateUtils
 import com.mogo.eagle.function.biz.dispatch.network.DispatchServiceModel.Companion.DISPATCH_RESULT_AFFIRM
 import com.mogo.eagle.function.biz.dispatch.network.DispatchServiceModel.Companion.DISPATCH_RESULT_MANUAL_CANCEL
 import com.mogo.eagle.function.biz.dispatch.network.DispatchServiceModel.Companion.DISPATCH_RESULT_TIMER_CANCEL
diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/notice/network/NoticeNetWorkManager.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/notice/network/NoticeNetWorkManager.java
index 7234f941ad..9ea866b68c 100644
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/notice/network/NoticeNetWorkManager.java
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/notice/network/NoticeNetWorkManager.java
@@ -2,7 +2,6 @@ package com.mogo.eagle.function.biz.notice.network;
 
 import android.util.ArrayMap;
 
-import com.mogo.cloud.network.NetConstants;
 import com.mogo.cloud.network.RetrofitFactory;
 import com.mogo.cloud.passport.MoGoAiCloudClient;
 import com.mogo.commons.constants.HostConst;
diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/impl/MoGoV2XMarkerManager.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/impl/MoGoV2XMarkerManager.java
index b8d394e893..006662d122 100644
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/impl/MoGoV2XMarkerManager.java
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/impl/MoGoV2XMarkerManager.java
@@ -6,7 +6,6 @@ import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_V2X
 import android.content.Context;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
-import com.mogo.cloud.commons.utils.CoordinateUtils;
 import com.mogo.eagle.core.data.enums.EventTypeEnumNew;
 import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.eagle.core.data.map.MogoLocation;
@@ -22,6 +21,7 @@ import com.mogo.eagle.function.biz.v2x.v2n.marker.V2XMarkerAdapter;
 import com.mogo.eagle.function.biz.v2x.v2n.utils.MapUtils;
 import com.mogo.eagle.core.data.v2x.V2XMarkerCardResult;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
+import com.mogo.eagle.core.utilcode.util.CoordinateUtils;
 import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.marker.IMogoMarkerClickListener;
 import com.mogo.map.marker.MogoMarkerOptions;
diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/remove/MarkerRemoveManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/remove/MarkerRemoveManager.kt
index cc40d5d4ff..ee8a0c7372 100644
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/remove/MarkerRemoveManager.kt
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/remove/MarkerRemoveManager.kt
@@ -3,10 +3,10 @@ package com.mogo.eagle.function.biz.v2x.v2n.remove
 import android.os.Handler
 import android.os.HandlerThread
 import android.util.Log
-import com.mogo.cloud.commons.utils.CoordinateUtils
 import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager
+import com.mogo.eagle.core.utilcode.util.CoordinateUtils
 import com.mogo.eagle.core.utilcode.util.DrivingDirectionUtils
 import com.mogo.map.marker.IMogoMarker
 import com.mogo.map.overlay.IMogoPolyline
diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt
index 91f0bbbf7a..279ec76a4e 100644
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt
@@ -6,7 +6,6 @@ import android.os.Handler
 import android.os.Looper
 import android.view.animation.DecelerateInterpolator
 import androidx.core.util.Pair
-import com.mogo.cloud.commons.utils.*
 import com.mogo.eagle.core.data.map.MogoLatLng
 import com.mogo.eagle.core.data.map.entity.V2XRoadEventEntity
 import com.mogo.eagle.core.function.call.autopilot.*
@@ -22,6 +21,7 @@ import java.util.concurrent.atomic.AtomicReference
 import java.util.concurrent.ConcurrentHashMap
 import com.mogo.eagle.function.biz.v2x.v2n.remove.MarkerRemoveManager
 import com.mogo.eagle.function.biz.v2x.v2n.remove.MarkerWrapper
+import com.mogo.eagle.core.utilcode.util.CoordinateUtils
 
 /**
  * Ai云道路施工事件，道路颜色标记类
diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XWarningMarker.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XWarningMarker.java
index 8ad6643354..1fcf53c350 100644
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XWarningMarker.java
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XWarningMarker.java
@@ -4,7 +4,6 @@ import static com.mogo.eagle.core.data.constants.DataTypes.TYPE_MARKER_CLOUD_STO
 import static com.mogo.eagle.core.data.constants.DataTypes.TYPE_MARKER_CLOUD_WARN_DATA;
 import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_V2X;
 
-import com.mogo.cloud.commons.utils.CoordinateUtils;
 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.commons.module.status.MogoStatusManager;
 import com.mogo.commons.utils.Trigonometric;
@@ -22,6 +21,7 @@ import com.mogo.eagle.core.data.v2x.V2XLocation;
 import com.mogo.eagle.core.data.v2x.V2XWarningTarget;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.mogo.thread.WorkThreadHandler;
+import com.mogo.eagle.core.utilcode.util.CoordinateUtils;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
 import com.mogo.map.marker.IMogoMarkerManager;
 import com.mogo.map.overlay.IMogoPolyline;
diff --git a/core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/analytics/ChatAnalyticsFacade.kt b/core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/analytics/ChatAnalyticsFacade.kt
index 089872c90a..405ecd2ff8 100644
--- a/core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/analytics/ChatAnalyticsFacade.kt
+++ b/core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/analytics/ChatAnalyticsFacade.kt
@@ -1,11 +1,11 @@
 package com.mogo.eagle.core.function.chat.facade.analytics
 
-import com.mogo.commons.analytics.AnalyticsUtils
+import com.mogo.commons.utils.MogoAnalyticUtils
 import com.mogo.eagle.core.function.api.chat.biz.IMoGoAnalyticsFacade
 
 object ChatAnalyticsFacade: IMoGoAnalyticsFacade {
 
-    override fun track(eventType: String, data: Map<String, Any>?) {
-        AnalyticsUtils.track(eventType, data)
+    override fun track(eventType: String, data: MutableMap<String, Any>) {
+        MogoAnalyticUtils.track(eventType, data)
     }
 }
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/build.gradle b/core/function-impl/mogo-core-function-hmi/build.gradle
index 5229ec0dd4..51edc43054 100644
--- a/core/function-impl/mogo-core-function-hmi/build.gradle
+++ b/core/function-impl/mogo-core-function-hmi/build.gradle
@@ -87,7 +87,7 @@ dependencies {
         api project(':test:crashreport-apmbyte')
 
         compileOnly project(':core:function-impl:mogo-core-function-datacenter')
-        compileOnly project(':foudations:mogo-commons')
+        implementation project(':foudations:mogo-commons')
         api project(':core:mogo-core-res')
         compileOnly project(':core:mogo-core-utils')
         compileOnly project(':core:mogo-core-function-call')
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/traffic/NoticeTrafficDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/traffic/NoticeTrafficDialog.kt
index 0b1490ef68..732f534784 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/traffic/NoticeTrafficDialog.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/traffic/NoticeTrafficDialog.kt
@@ -8,7 +8,6 @@ import android.widget.TextView
 import androidx.lifecycle.LifecycleObserver
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.StaggeredGridLayoutManager
-import com.mogo.cloud.commons.utils.CoordinateUtils
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
 import com.mogo.commons.module.status.IMogoStatusChangedListener
 import com.mogo.commons.module.status.MogoStatusManager
@@ -31,6 +30,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.e
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.util.BitmapHelper
+import com.mogo.eagle.core.utilcode.util.CoordinateUtils
 import com.mogo.eagle.core.utilcode.util.DateTimeUtils
 import com.mogo.eagle.core.widget.media.video.NoticeSimpleSmallVideoPlayer
 import com.shuyu.gsyvideoplayer.GSYVideoManager
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt
index 7cd3cc458d..814487cf90 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt
@@ -14,7 +14,7 @@ import com.kwai.koom.nativeoom.leakmonitor.LeakListener
 import com.kwai.koom.nativeoom.leakmonitor.LeakMonitor.start
 import com.kwai.koom.nativeoom.leakmonitor.LeakMonitorConfig
 import com.kwai.koom.nativeoom.leakmonitor.LeakRecord
-import com.mogo.commons.analytics.AnalyticsUtils
+import com.mogo.commons.utils.MogoAnalyticUtils
 import com.mogo.commons.context.ContextHolderUtil
 import com.mogo.commons.debug.DebugConfig
 import com.mogo.commons.module.status.MogoStatusManager
@@ -169,7 +169,7 @@ open class MainActivity : MvpActivity<MainView?, MainPresenter?>(), MainView,
                     properties["app_launch_hotStartTime"] = hotStartTime
                 }
             }
-            AnalyticsUtils.track("app_launch_time", properties)
+            MogoAnalyticUtils.track("app_launch_time", properties)
         }
     }
 
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java
index 1a12130971..1e80ca8ec3 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java
@@ -9,8 +9,10 @@ import android.os.Process;
 import com.bytedance.boost_multidex.BoostMultiDex;
 import com.mogo.cloud.socket.SocketBuildConfig;
 import com.mogo.commons.AbsMogoApplication;
+import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.module.MogoModule;
 import com.mogo.commons.module.MogoModulePaths;
+import com.mogo.commons.utils.MogoAnalyticUtils;
 import com.mogo.eagle.core.data.config.FunctionBuildConfig;
 import com.mogo.eagle.core.data.constants.MogoServicePaths;
 import com.mogo.eagle.core.function.api.chat.biz.ChatConsts;
@@ -111,6 +113,8 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
         } catch (Exception e) {
             e.printStackTrace();
         }
+        // 初始化埋点
+        MogoAnalyticUtils.INSTANCE.init(this, DebugConfig.isDebug());
         SocketBuildConfig.isPrintLog = false;
         // 初始化DevaTools,开始链路记录
         CallerDevaToolsManager.INSTANCE.init();
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackObj.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackObj.java
index 512ef7bc19..0a1d3829b7 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackObj.java
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackObj.java
@@ -4,12 +4,12 @@ import static com.mogo.eagle.core.function.business.identify.TrackManager.LIMIT_
 
 import android.annotation.SuppressLint;
 
-import com.mogo.cloud.commons.utils.CoordinateUtils;
 import com.mogo.eagle.core.data.enums.TrafficTypeEnum;
 import com.mogo.eagle.core.data.map.CenterLine;
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
 import com.mogo.eagle.core.utilcode.geometry.S2CellId;
 import com.mogo.eagle.core.utilcode.geometry.S2LatLng;
+import com.mogo.eagle.core.utilcode.util.CoordinateUtils;
 
 import java.util.Arrays;
 import java.util.Comparator;
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/drawer/MarkerDrawer.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/drawer/MarkerDrawer.java
index 7195182391..30e4103320 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/drawer/MarkerDrawer.java
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/drawer/MarkerDrawer.java
@@ -2,7 +2,6 @@ package com.mogo.eagle.core.function.impl.marker.drawer;
 
 import android.text.TextUtils;
 
-import com.mogo.cloud.commons.utils.CoordinateUtils;
 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.commons.module.status.MogoStatusManager;
 import com.mogo.eagle.core.data.enums.EventTypeEnumNew;
@@ -16,6 +15,7 @@ import com.mogo.eagle.core.function.impl.marker.view.EmptyMarkerView;
 import com.mogo.eagle.core.function.impl.marker.view.IMarkerView;
 import com.mogo.eagle.core.function.impl.marker.view.MapMarkerAdapter;
 import com.mogo.eagle.core.function.impl.marker.view.OnlineCarMarkerView;
+import com.mogo.eagle.core.utilcode.util.CoordinateUtils;
 import com.mogo.map.MogoMarkerManager;
 import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.marker.IMogoMarkerClickListener;
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/MarkerDrawerManager.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/MarkerDrawerManager.kt
index 9ce14cf8ba..f78a2c274e 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/MarkerDrawerManager.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/MarkerDrawerManager.kt
@@ -4,7 +4,7 @@ import android.content.Context
 import android.util.Log
 import com.amap.api.maps.CoordinateConverter
 import com.amap.api.maps.model.LatLng
-import com.mogo.cloud.commons.utils.CoordinateUtils
+import com.mogo.eagle.core.utilcode.util.CoordinateUtils
 import io.reactivex.Observable
 import io.reactivex.ObservableOnSubscribe
 import io.reactivex.android.schedulers.AndroidSchedulers
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/view/SmallMapView.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/view/SmallMapView.kt
index a452a17994..3578eb3ce4 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/view/SmallMapView.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/view/SmallMapView.kt
@@ -10,7 +10,6 @@ import android.widget.RelativeLayout
 import androidx.annotation.UiThread
 import com.amap.api.maps.*
 import com.amap.api.maps.model.*
-import com.mogo.cloud.commons.utils.CoordinateUtils
 import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.map.MogoLatLng
@@ -27,6 +26,7 @@ import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.mogo.MapAssetStyleUtils
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 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.UiThreadHandler
 import mogo.telematics.pad.MessagePad
 import kotlin.math.floor
diff --git a/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt b/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt
index 9437ee5b85..8f4b6de3f7 100644
--- a/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt
+++ b/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt
@@ -11,6 +11,7 @@ import com.mogo.cloud.passport.IMoGoTokenCallback
 import com.mogo.cloud.passport.MoGoAiCloudClient
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
 import com.mogo.commons.AbsMogoApplication
+import com.mogo.commons.utils.MogoAnalyticUtils
 import com.mogo.commons.constants.SharedPrefsConstants
 import com.mogo.commons.debug.DebugConfig
 import com.mogo.commons.module.status.MogoStatusManager
@@ -23,7 +24,6 @@ import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_CL
 import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_CONNECT_STATUS
 import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener
-import com.mogo.eagle.core.function.call.analytics.AnalyticsManager
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
 import com.mogo.eagle.core.function.call.cloud.CallerCloudListenerManager
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
@@ -217,15 +217,13 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
         ThreadPoolService.execute {
             //初始化网络配置
             NetConfigUtils.init()
-            // 初始化埋点
-            AnalyticsManager.init(context, DebugConfig.isDebug())
             // 加入启动统计
             val mStartParams: HashMap<String, Any> = HashMap()
             mStartParams["start_time"] = TimeUtils.getNowMills()
             mStartParams["app_version"] = AppUtils.getAppVersionName()
-            mStartParams["app_flavor"] = DebugConfig.getProductFlavor();
+            mStartParams["app_flavor"] = DebugConfig.getProductFlavor()
             mStartParams["app_identity_mode"] = FunctionBuildConfig.appIdentityMode
-            AnalyticsManager.track("app_start_time", mStartParams)
+            MogoAnalyticUtils.track("app_start_time", mStartParams)
         }
     }
 
diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/chat/biz/IMoGoChatFacade.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/chat/biz/IMoGoChatFacade.kt
index e77c682d31..321527e84d 100644
--- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/chat/biz/IMoGoChatFacade.kt
+++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/chat/biz/IMoGoChatFacade.kt
@@ -200,5 +200,5 @@ interface IMoGoMediaFacade {
 
 interface IMoGoAnalyticsFacade {
 
-    fun track(eventType: String, data: Map<String, Any>? = hashMapOf())
+    fun track(eventType: String, data: MutableMap<String, Any> = hashMapOf())
 }
\ No newline at end of file
diff --git a/core/mogo-core-function-call/build.gradle b/core/mogo-core-function-call/build.gradle
index f256ef0177..343680a5b4 100644
--- a/core/mogo-core-function-call/build.gradle
+++ b/core/mogo-core-function-call/build.gradle
@@ -46,16 +46,13 @@ dependencies {
     implementation rootProject.ext.dependencies.arouter
     kapt rootProject.ext.dependencies.aroutercompiler
 
-    // MoGo 数据埋点工具
-    implementation rootProject.ext.dependencies.analytics
-
     if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
         implementation rootProject.ext.dependencies.mogo_core_data
         implementation rootProject.ext.dependencies.mogo_core_utils
         implementation rootProject.ext.dependencies.mogocommons
     } else {
-        implementation project(':core:mogo-core-utils')
-        implementation project(':foudations:mogo-commons')
+        compileOnly project(':core:mogo-core-utils')
+        compileOnly project(':core:mogo-core-data')
         compileOnly project(':libraries:mogo-adas')
         compileOnly project(':libraries:mogo-obu')
         api project(':libraries:mogo-map-api')
diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerChassisLocationGCJ02ListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerChassisLocationGCJ02ListenerManager.kt
index 1edd553d64..671a05f57a 100644
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerChassisLocationGCJ02ListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerChassisLocationGCJ02ListenerManager.kt
@@ -6,7 +6,6 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Liste
 import com.mogo.eagle.core.function.call.base.CallerBase
 import com.mogo.eagle.core.utilcode.mogo.logger.Logger
 import com.mogo.eagle.core.utilcode.util.CoordinateTransform
-import com.mogo.eagle.core.utilcode.util.FileUtils
 import com.mogo.eagle.core.utilcode.util.TimeUtils
 
 /**
diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/CoordinateUtils.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/CoordinateUtils.java
new file mode 100644
index 0000000000..ffe4576d6d
--- /dev/null
+++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/CoordinateUtils.java
@@ -0,0 +1,132 @@
+package com.mogo.eagle.core.utilcode.util;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.math.BigDecimal;
+
+/**
+ * @author donghongyu
+ */
+public class CoordinateUtils {
+
+    /**
+     * @param lon1
+     * @param lat1
+     * @param lon2
+     * @param lat2
+     * @return 两坐标的距离 单位：米（M）
+     */
+    public static float calculateLineDistance( double lon1, double lat1, double lon2, double lat2 ) {
+        try {
+            double var2 = lon1;
+            double var4 = lat1;
+            double var6 = lon2;
+            double var8 = lat2;
+            var2 *= 0.01745329251994329D;
+            var4 *= 0.01745329251994329D;
+            var6 *= 0.01745329251994329D;
+            var8 *= 0.01745329251994329D;
+            double var10 = Math.sin( var2 );
+            double var12 = Math.sin( var4 );
+            double var14 = Math.cos( var2 );
+            double var16 = Math.cos( var4 );
+            double var18 = Math.sin( var6 );
+            double var20 = Math.sin( var8 );
+            double var22 = Math.cos( var6 );
+            double var24 = Math.cos( var8 );
+            double[] var28 = new double[3];
+            double[] var29 = new double[3];
+            var28[0] = var16 * var14;
+            var28[1] = var16 * var10;
+            var28[2] = var12;
+            var29[0] = var24 * var22;
+            var29[1] = var24 * var18;
+            var29[2] = var20;
+            return ( float ) ( Math.asin( Math.sqrt( ( var28[0] - var29[0] ) * ( var28[0] - var29[0] ) + ( var28[1] - var29[1] ) * ( var28[1] - var29[1] ) + ( var28[2] - var29[2] ) * ( var28[2] - var29[2] ) ) / 2.0D ) * 1.27420015798544E7D );
+        } catch ( Throwable var26 ) {
+            var26.printStackTrace();
+            return 0.0F;
+        }
+    }
+
+
+    // ------
+    private static final double x_PI = 52.35987755982988D;
+    private static final double PI = 3.141592653589793D;
+    private static final double a = 6378245.0D;
+    private static final double ee = 0.006693421622965943D;
+
+    public static final boolean outOfChina( double lat, double lng ) {
+        return lng <= 73.66D || lng >= 135.05D || lat <= 3.86D || lat >= 53.55D;
+    }
+
+    private static final double transformLat( double lng, double lat ) {
+        double ret = -100.0D + 2.0D * lng + 3.0D * lat + 0.2D * lat * lat + 0.1D * lng * lat + 0.2D * Math.sqrt( Math.abs( lng ) );
+        ret += ( 20.0D * Math.sin( 6.0D * lng * 3.141592653589793D ) + 20.0D * Math.sin( 2.0D * lng * 3.141592653589793D ) ) * 2.0D / 3.0D;
+        ret += ( 20.0D * Math.sin( lat * 3.141592653589793D ) + 40.0D * Math.sin( lat / 3.0D * 3.141592653589793D ) ) * 2.0D / 3.0D;
+        ret += ( 160.0D * Math.sin( lat / 12.0D * 3.141592653589793D ) + ( double ) 320 * Math.sin( lat * 3.141592653589793D / 30.0D ) ) * 2.0D / 3.0D;
+        return ret;
+    }
+
+    private static final double transformLon( double lng, double lat ) {
+        double ret = 300.0D + lng + 2.0D * lat + 0.1D * lng * lng + 0.1D * lng * lat + 0.1D * Math.sqrt( Math.abs( lng ) );
+        ret += ( 20.0D * Math.sin( 6.0D * lng * 3.141592653589793D ) + 20.0D * Math.sin( 2.0D * lng * 3.141592653589793D ) ) * 2.0D / 3.0D;
+        ret += ( 20.0D * Math.sin( lng * 3.141592653589793D ) + 40.0D * Math.sin( lng / 3.0D * 3.141592653589793D ) ) * 2.0D / 3.0D;
+        ret += ( 150.0D * Math.sin( lng / 12.0D * 3.141592653589793D ) + 300.0D * Math.sin( lng / 30.0D * 3.141592653589793D ) ) * 2.0D / 3.0D;
+        return ret;
+    }
+
+    @NotNull
+    // World Geodetic System ==> Mars Geodetic System
+    public static final double[] transformWgsToGcj( double wgLat, double wgLon ) {
+        double[] point = new double[2];
+        if ( outOfChina( wgLat, wgLon ) ) {
+            point[0] = wgLon;
+            point[1] = wgLat;
+            return point;
+        } else {
+            double dLat = transformLat( wgLon - 105.0D, wgLat - 35.0D );
+            double dLon = transformLon( wgLon - 105.0D, wgLat - 35.0D );
+            double radLat = wgLat / 180.0D * 3.141592653589793D;
+            double magic = Math.sin( radLat );
+            magic = ( double ) 1 - 0.006693421622965943D * magic * magic;
+            double sqrtMagic = Math.sqrt( magic );
+            dLat = dLat * 180.0D / ( 6335552.717000426D / ( magic * sqrtMagic ) * 3.141592653589793D );
+            dLon = dLon * 180.0D / ( 6378245.0D / sqrtMagic * Math.cos( radLat ) * 3.141592653589793D );
+            double mgLat = wgLat + dLat;
+            double mgLon = wgLon + dLon;
+            point[0] = dealRound( mgLon );
+            point[1] = dealRound( mgLat );
+            return point;
+        }
+    }
+
+    @NotNull
+    public static final double[] transformGcj02toWgs84( double lat, double lng ) {
+        double[] var10000;
+        if ( outOfChina( lat, lng ) ) {
+            var10000 = new double[]{lng, lat};
+        } else {
+            double dlat = transformLat( lng - 105.0D, lat - 35.0D );
+            double dlng = transformLon( lng - 105.0D, lat - 35.0D );
+            double radlat = lat / 180.0D * 3.141592653589793D;
+            double magic = Math.sin( radlat );
+            magic = ( double ) 1 - 0.006693421622965943D * magic * magic;
+            double sqrtmagic = Math.sqrt( magic );
+            dlat = dlat * 180.0D / ( 6335552.717000426D / ( magic * sqrtmagic ) * 3.141592653589793D );
+            dlng = dlng * 180.0D / ( 6378245.0D / sqrtmagic * Math.cos( radlat ) * 3.141592653589793D );
+            double mglat = lat + dlat;
+            double mglng = lng + dlng;
+            var10000 = new double[]{dealRound( lng * ( double ) 2 - mglng ), dealRound( lat * ( double ) 2 - mglat )};
+        }
+
+        return var10000;
+    }
+
+    private static final double dealRound( double value ) {
+        BigDecimal bg = new BigDecimal( value );
+        double result = bg.setScale( 6, 4 ).doubleValue();
+        return result;
+    }
+
+}
diff --git a/foudations/mogo-commons/build.gradle b/foudations/mogo-commons/build.gradle
index 296811e92f..40dba94f37 100644
--- a/foudations/mogo-commons/build.gradle
+++ b/foudations/mogo-commons/build.gradle
@@ -1,4 +1,10 @@
-apply plugin: 'com.android.library'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-android-extensions'
+    id 'kotlin-kapt'
+    id 'com.alibaba.arouter'
+}
 
 android {
     compileSdkVersion rootProject.ext.android.compileSdkVersion
@@ -36,13 +42,18 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation rootProject.ext.dependencies.kotlinstdlibjdk7
+
     implementation rootProject.ext.dependencies.androidxappcompat
-    implementation rootProject.ext.dependencies.analytics
     implementation rootProject.ext.dependencies.arouter
     annotationProcessor rootProject.ext.dependencies.aroutercompiler
     implementation rootProject.ext.dependencies.rxjava
-    implementation rootProject.ext.dependencies.mogoaicloudrealtime
+
     implementation rootProject.ext.dependencies.amapnavi3dmap
+    implementation rootProject.ext.dependencies.analytics
+    
+    api 'org.greenrobot:eventbus:3.1.1'
+    api rootProject.ext.dependencies.androidautoSize
 
     if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
         api rootProject.ext.dependencies.mogoaicloudservicesdk
@@ -60,8 +71,7 @@ dependencies {
         api project(':core:mogo-core-network')
 
     }
-    api 'org.greenrobot:eventbus:3.1.1'
-    api rootProject.ext.dependencies.androidautoSize
+
 }
 
 apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()
\ No newline at end of file
diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/analytics/AnalyticsUtils.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/analytics/AnalyticsUtils.java
deleted file mode 100644
index de9951913a..0000000000
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/analytics/AnalyticsUtils.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.mogo.commons.analytics;
-
-
-import android.content.Context;
-
-import com.elegant.analytics.Analytics;
-import com.elegant.analytics.AnalyticsConfig;
-import com.elegant.analytics.IAnalyticsParamsProvider;
-import com.elegant.analytics.UploadMode;
-import com.mogo.commons.AbsMogoApplication;
-import com.mogo.commons.debug.DebugConfig;
-import com.mogo.commons.network.ParamsUtil;
-
-import java.util.Map;
-
-import androidx.annotation.Keep;
-
-/**
- * @author congtaowang
- * @since 2019-12-23
- * <p>
- * 埋点
- */
-public class AnalyticsUtils {
-
-    @Keep
-    public static void init( Context context ) {
-        // 1 - debug 近实时上报，积累一条埋点上报，或者积累3秒上报一次。
-        // 2 - 本地缓存，聚合上报，积累30条埋点上报，或者积累60秒上报一次。
-        AnalyticsConfig.getInstance( context ).setAppKey( "0915430e5fdcbb553391f2a35cb8489f" );
-        AnalyticsConfig.getInstance( context ).setUploadMode( DebugConfig.isDebug() ? UploadMode.instant : UploadMode.cache );
-        AnalyticsConfig.getInstance( context ).setShouldLog( DebugConfig.isDebug() );
-        AnalyticsConfig.getInstance( AbsMogoApplication.getApp() ).setParamsProvider(new IAnalyticsParamsProvider() {
-            @Override
-            public Map< String, Object > staticParams() {
-                return ParamsUtil.getAnalyticsCustomParams();
-            }
-
-            @Override
-            public Map< String, Object > dynamicParams() {
-                return null;
-            }
-        } );
-        Analytics.getInstance().start( context );
-    }
-
-    /**
-     * 埋点
-     *
-     * @param event      事件名称
-     * @param properties 事件参数
-     */
-    public static void track( String event, Map< String, Object > properties ) {
-        Analytics.getInstance().track( event, properties );
-    }
-}
diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/analytics/AnalyticsManager.kt b/foudations/mogo-commons/src/main/java/com/mogo/commons/utils/MogoAnalyticUtils.kt
similarity index 93%
rename from core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/analytics/AnalyticsManager.kt
rename to foudations/mogo-commons/src/main/java/com/mogo/commons/utils/MogoAnalyticUtils.kt
index 7fb33492fb..14a63addb2 100644
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/analytics/AnalyticsManager.kt
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/utils/MogoAnalyticUtils.kt
@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.call.analytics
+package com.mogo.commons.utils
 
 import android.content.Context
 import androidx.annotation.Keep
@@ -15,7 +15,7 @@ import com.mogo.eagle.core.utilcode.util.AppUtils
  * 埋点&数据统计 管理
  * @author donghongyu
  */
-object AnalyticsManager {
+object MogoAnalyticUtils {
 
     @Keep
     fun init(context: Context?, isDebug: Boolean) {
@@ -45,7 +45,7 @@ object AnalyticsManager {
      * @param event      事件名称
      * @param properties 事件参数
      */
-    fun track(event: String?, properties: HashMap<String, Any>) {
+    fun track(event: String?, properties: MutableMap<String, Any>) {
         Analytics.getInstance().track(event, properties)
     }
 
diff --git a/gradle.properties b/gradle.properties
index dd72d41281..d9fedbc60f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -66,23 +66,23 @@ SERVICE_BIZ_VERSION=1.2.4
 LOGLIB_VERSION=1.5.10
 ######## MogoAiCloudSDK Version ########
 # 网络请求LOGLIB_VERSION
-MOGO_NETWORK_VERSION=1.4.4.2
+MOGO_NETWORK_VERSION=1.4.4.4
 # 鉴权
-MOGO_PASSPORT_VERSION=1.4.4.2
+MOGO_PASSPORT_VERSION=1.4.4.4
 # 常链接
-MOGO_SOCKET_VERSION=1.4.4.2
+MOGO_SOCKET_VERSION=1.4.4.4
 # 数据采集
-MOGO_REALTIME_VERSION=1.4.4.2
+MOGO_REALTIME_VERSION=1.4.4.4
 # 探路，道路事件发布，获取
-MOGO_TANLU_VERSION=1.4.4.2
+MOGO_TANLU_VERSION=1.4.4.4
 # 直播推流
-MOGO_LIVE_VERSION=1.4.4.2
+MOGO_LIVE_VERSION=1.4.4.4
 # 直播拉流
-MOGO_TRAFFICLIVE_VERSION=1.4.4.2
+MOGO_TRAFFICLIVE_VERSION=1.4.4.4
 # 定位服务
-MOGO_LOCATION_VERSION=1.4.4.2
+MOGO_LOCATION_VERSION=1.4.4.4
 # 远程通讯模块
-MOGO_TELEMATIC_VERSION=1.4.4.2
+MOGO_TELEMATIC_VERSION=1.4.4.4
 ######## MogoAiCloudSDK Version ########
 # 自研地图
 MAP_SDK_VERSION=2.10.0.2_test_01
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/utils/PointInterpolatorUtil.java b/libraries/mogo-map/src/main/java/com/mogo/map/utils/PointInterpolatorUtil.java
index 063da4fb7c..a985d9b90c 100644
--- a/libraries/mogo-map/src/main/java/com/mogo/map/utils/PointInterpolatorUtil.java
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/utils/PointInterpolatorUtil.java
@@ -1,9 +1,9 @@
 package com.mogo.map.utils;
 
-import com.mogo.cloud.commons.utils.CoordinateUtils;
 import com.mogo.eagle.core.data.map.LonLatPoint;
 import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
+import com.mogo.eagle.core.utilcode.util.CoordinateUtils;
 
 import java.util.ArrayList;
 import java.util.List;