diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 97086bb5cb..44426b771a 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -19,6 +19,7 @@
             <option value="$PROJECT_DIR$/core" />
             <option value="$PROJECT_DIR$/core/function-impl" />
             <option value="$PROJECT_DIR$/core/function-impl/mogo-core-function-hmi" />
+            <option value="$PROJECT_DIR$/core/function-impl/mogo-core-function-smp" />
             <option value="$PROJECT_DIR$/core/mogo-core-data" />
             <option value="$PROJECT_DIR$/core/mogo-core-function-api" />
             <option value="$PROJECT_DIR$/core/mogo-core-function-call" />
@@ -56,7 +57,6 @@
             <option value="$PROJECT_DIR$/modules/mogo-module-search" />
             <option value="$PROJECT_DIR$/modules/mogo-module-service" />
             <option value="$PROJECT_DIR$/modules/mogo-module-share" />
-            <option value="$PROJECT_DIR$/modules/mogo-module-smp" />
             <option value="$PROJECT_DIR$/modules/mogo-module-v2x" />
             <option value="$PROJECT_DIR$/modules/mogo-module-widgets" />
             <option value="$PROJECT_DIR$/modules/tanlulib" />
diff --git a/app/build.gradle b/app/build.gradle
index bdc09bbd56..436151bc23 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -187,7 +187,7 @@ dependencies {
         implementation project(':modules:mogo-module-monitor')
         implementation project(':modules:mogo-module-extensions')
         implementation project(':modules:mogo-module-map')
-        implementation project(':modules:mogo-module-smp')
+        implementation project(':core:function-impl:mogo-core-function-smp')
         implementation project(':modules:mogo-module-obu-mogo')
         implementation project(':modules:mogo-module-adas')
         implementation project(':modules:mogo-module-back')
diff --git a/modules/mogo-module-smp/.gitignore b/core/function-impl/mogo-core-function-smp/.gitignore
similarity index 100%
rename from modules/mogo-module-smp/.gitignore
rename to core/function-impl/mogo-core-function-smp/.gitignore
diff --git a/modules/mogo-module-smp/build.gradle b/core/function-impl/mogo-core-function-smp/build.gradle
similarity index 97%
rename from modules/mogo-module-smp/build.gradle
rename to core/function-impl/mogo-core-function-smp/build.gradle
index c182940292..35c4c4d4a3 100644
--- a/modules/mogo-module-smp/build.gradle
+++ b/core/function-impl/mogo-core-function-smp/build.gradle
@@ -50,7 +50,10 @@ dependencies {
     } else {
         api project(":foudations:mogo-commons")
         api project(':services:mogo-service-api')
+
         implementation project(':modules:mogo-module-common')
+
+        implementation project(':core:mogo-core-res')
         implementation project(':core:mogo-core-data')
     }
 }
diff --git a/modules/mogo-module-smp/consumer-rules.pro b/core/function-impl/mogo-core-function-smp/consumer-rules.pro
similarity index 100%
rename from modules/mogo-module-smp/consumer-rules.pro
rename to core/function-impl/mogo-core-function-smp/consumer-rules.pro
diff --git a/modules/mogo-module-smp/gradle.properties b/core/function-impl/mogo-core-function-smp/gradle.properties
similarity index 100%
rename from modules/mogo-module-smp/gradle.properties
rename to core/function-impl/mogo-core-function-smp/gradle.properties
diff --git a/modules/mogo-module-smp/proguard-rules.pro b/core/function-impl/mogo-core-function-smp/proguard-rules.pro
similarity index 100%
rename from modules/mogo-module-smp/proguard-rules.pro
rename to core/function-impl/mogo-core-function-smp/proguard-rules.pro
diff --git a/modules/mogo-module-smp/src/main/AndroidManifest.xml b/core/function-impl/mogo-core-function-smp/src/main/AndroidManifest.xml
similarity index 71%
rename from modules/mogo-module-smp/src/main/AndroidManifest.xml
rename to core/function-impl/mogo-core-function-smp/src/main/AndroidManifest.xml
index 3f004d131a..efe7036eb4 100644
--- a/modules/mogo-module-smp/src/main/AndroidManifest.xml
+++ b/core/function-impl/mogo-core-function-smp/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mogo.module.small.map">
+    package="com.mogo.eagle.core.function.smp">
 
 </manifest>
\ No newline at end of file
diff --git a/modules/mogo-module-smp/src/main/assets/small_map_style.data b/core/function-impl/mogo-core-function-smp/src/main/assets/small_map_style.data
similarity index 100%
rename from modules/mogo-module-smp/src/main/assets/small_map_style.data
rename to core/function-impl/mogo-core-function-smp/src/main/assets/small_map_style.data
diff --git a/modules/mogo-module-smp/src/main/assets/small_map_style_extra.data b/core/function-impl/mogo-core-function-smp/src/main/assets/small_map_style_extra.data
similarity index 100%
rename from modules/mogo-module-smp/src/main/assets/small_map_style_extra.data
rename to core/function-impl/mogo-core-function-smp/src/main/assets/small_map_style_extra.data
diff --git a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java b/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java
similarity index 97%
rename from modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java
rename to core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java
index c3be13474a..dd6cb6f74f 100644
--- a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java
+++ b/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java
@@ -1,4 +1,4 @@
-package com.mogo.module.small.map;
+package com.mogo.eagle.core.function.smp;
 
 import android.content.Context;
 import android.graphics.BitmapFactory;
@@ -24,12 +24,12 @@ import com.amap.api.navi.AMapNaviViewOptions;
 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.eagle.core.data.map.MogoLatLng;
+import com.mogo.eagle.core.function.smp.animation.DirectionRotateAnimation;
+import com.mogo.eagle.core.function.smp.utils.MapAssetStyleUtils;
+import com.mogo.eagle.core.function.smp.view.ISmallMapDirectionView;
+import com.mogo.eagle.core.view.RoundLayout;
 import com.mogo.map.navi.IMogoCarLocationChangedListener2;
 import com.mogo.module.common.MogoApisHandler;
-import com.mogo.module.common.view.RoundLayout;
-import com.mogo.module.small.map.animation.DirectionRotateAnimation;
-import com.mogo.module.small.map.utils.MapAssetStyleUtils;
-import com.mogo.module.small.map.view.ISmallMapDirectionView;
 
 import java.math.RoundingMode;
 import java.text.NumberFormat;
diff --git a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapFragment.java b/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapFragment.java
similarity index 94%
rename from modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapFragment.java
rename to core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapFragment.java
index 4d9a283e37..ec91113186 100644
--- a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapFragment.java
+++ b/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapFragment.java
@@ -1,4 +1,4 @@
-package com.mogo.module.small.map;
+package com.mogo.eagle.core.function.smp;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -11,6 +11,7 @@ import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
 import com.mogo.eagle.core.data.map.MogoLatLng;
+import com.mogo.eagle.core.function.smp.R;
 
 import java.util.List;
 
diff --git a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapProvider.java b/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapProvider.java
similarity index 97%
rename from modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapProvider.java
rename to core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapProvider.java
index 8b126f32f0..489d3ace6c 100644
--- a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapProvider.java
+++ b/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapProvider.java
@@ -1,4 +1,4 @@
-package com.mogo.module.small.map;
+package com.mogo.eagle.core.function.smp;
 
 import android.content.Context;
 import android.util.Log;
@@ -10,7 +10,7 @@ import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.service.MogoServicePaths;
 import com.mogo.service.adas.IMogoAdasRouteCallBack;
-import com.mogo.service.smp.IMogoSmallMapProvider;
+import com.mogo.eagle.core.function.api.map.smp.IMogoSmallMapProvider;
 import com.mogo.service.statusmanager.IMogoStatusChangedListener;
 import com.mogo.service.statusmanager.StatusDescriptor;
 
diff --git a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmpServiceManager.java b/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmpServiceManager.java
similarity index 96%
rename from modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmpServiceManager.java
rename to core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmpServiceManager.java
index 75e01881ca..ee0cad4d93 100644
--- a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmpServiceManager.java
+++ b/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmpServiceManager.java
@@ -1,4 +1,4 @@
-package com.mogo.module.small.map;
+package com.mogo.eagle.core.function.smp;
 
 import android.content.Context;
 
diff --git a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/animation/DirectionRotateAnimation.java b/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/animation/DirectionRotateAnimation.java
similarity index 97%
rename from modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/animation/DirectionRotateAnimation.java
rename to core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/animation/DirectionRotateAnimation.java
index ba84112955..0e12997e9e 100644
--- a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/animation/DirectionRotateAnimation.java
+++ b/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/animation/DirectionRotateAnimation.java
@@ -1,4 +1,5 @@
-package com.mogo.module.small.map.animation;
+package com.mogo.eagle.core.function.smp.animation;
+
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/utils/MapAssetStyleUtils.java b/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/utils/MapAssetStyleUtils.java
similarity index 96%
rename from modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/utils/MapAssetStyleUtils.java
rename to core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/utils/MapAssetStyleUtils.java
index 4f640ea613..6111bba679 100644
--- a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/utils/MapAssetStyleUtils.java
+++ b/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/utils/MapAssetStyleUtils.java
@@ -1,4 +1,5 @@
-package com.mogo.module.small.map.utils;
+package com.mogo.eagle.core.function.smp.utils;
+
 
 import android.content.Context;
 
diff --git a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/view/ISmallMapDirectionView.java b/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/view/ISmallMapDirectionView.java
similarity index 87%
rename from modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/view/ISmallMapDirectionView.java
rename to core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/view/ISmallMapDirectionView.java
index 52008b8e98..671c0a17b3 100644
--- a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/view/ISmallMapDirectionView.java
+++ b/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/view/ISmallMapDirectionView.java
@@ -1,4 +1,4 @@
-package com.mogo.module.small.map.view;
+package com.mogo.eagle.core.function.smp.view;
 
 import com.mogo.eagle.core.data.map.MogoLatLng;
 
diff --git a/modules/mogo-module-smp/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_dir_end.png b/core/function-impl/mogo-core-function-smp/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_dir_end.png
similarity index 100%
rename from modules/mogo-module-smp/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_dir_end.png
rename to core/function-impl/mogo-core-function-smp/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_dir_end.png
diff --git a/modules/mogo-module-smp/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_dir_start.png b/core/function-impl/mogo-core-function-smp/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_dir_start.png
similarity index 100%
rename from modules/mogo-module-smp/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_dir_start.png
rename to core/function-impl/mogo-core-function-smp/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_dir_start.png
diff --git a/modules/mogo-module-smp/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_end.png b/core/function-impl/mogo-core-function-smp/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_end.png
similarity index 100%
rename from modules/mogo-module-smp/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_end.png
rename to core/function-impl/mogo-core-function-smp/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_end.png
diff --git a/modules/mogo-module-smp/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_my_location_logo.png b/core/function-impl/mogo-core-function-smp/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_my_location_logo.png
similarity index 100%
rename from modules/mogo-module-smp/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_my_location_logo.png
rename to core/function-impl/mogo-core-function-smp/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_my_location_logo.png
diff --git a/modules/mogo-module-smp/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_start.png b/core/function-impl/mogo-core-function-smp/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_start.png
similarity index 100%
rename from modules/mogo-module-smp/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_start.png
rename to core/function-impl/mogo-core-function-smp/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_start.png
diff --git a/modules/mogo-module-smp/src/main/res/drawable-xhdpi/icon_module_small_map_four_corners.png b/core/function-impl/mogo-core-function-smp/src/main/res/drawable-xhdpi/icon_module_small_map_four_corners.png
similarity index 100%
rename from modules/mogo-module-smp/src/main/res/drawable-xhdpi/icon_module_small_map_four_corners.png
rename to core/function-impl/mogo-core-function-smp/src/main/res/drawable-xhdpi/icon_module_small_map_four_corners.png
diff --git a/modules/mogo-module-smp/src/main/res/drawable-xhdpi/module_small_map_view_border.png b/core/function-impl/mogo-core-function-smp/src/main/res/drawable-xhdpi/module_small_map_view_border.png
similarity index 100%
rename from modules/mogo-module-smp/src/main/res/drawable-xhdpi/module_small_map_view_border.png
rename to core/function-impl/mogo-core-function-smp/src/main/res/drawable-xhdpi/module_small_map_view_border.png
diff --git a/modules/mogo-module-smp/src/main/res/drawable-xhdpi/module_small_map_view_border_north.png b/core/function-impl/mogo-core-function-smp/src/main/res/drawable-xhdpi/module_small_map_view_border_north.png
similarity index 100%
rename from modules/mogo-module-smp/src/main/res/drawable-xhdpi/module_small_map_view_border_north.png
rename to core/function-impl/mogo-core-function-smp/src/main/res/drawable-xhdpi/module_small_map_view_border_north.png
diff --git a/modules/mogo-module-smp/src/main/res/drawable-xhdpi/module_small_map_view_my_location_logo.png b/core/function-impl/mogo-core-function-smp/src/main/res/drawable-xhdpi/module_small_map_view_my_location_logo.png
similarity index 100%
rename from modules/mogo-module-smp/src/main/res/drawable-xhdpi/module_small_map_view_my_location_logo.png
rename to core/function-impl/mogo-core-function-smp/src/main/res/drawable-xhdpi/module_small_map_view_my_location_logo.png
diff --git a/modules/mogo-module-smp/src/main/res/drawable/bg_module_small_map_view_border.xml b/core/function-impl/mogo-core-function-smp/src/main/res/drawable/bg_module_small_map_view_border.xml
similarity index 100%
rename from modules/mogo-module-smp/src/main/res/drawable/bg_module_small_map_view_border.xml
rename to core/function-impl/mogo-core-function-smp/src/main/res/drawable/bg_module_small_map_view_border.xml
diff --git a/modules/mogo-module-smp/src/main/res/layout/module_small_map_fragment.xml b/core/function-impl/mogo-core-function-smp/src/main/res/layout/module_small_map_fragment.xml
similarity index 90%
rename from modules/mogo-module-smp/src/main/res/layout/module_small_map_fragment.xml
rename to core/function-impl/mogo-core-function-smp/src/main/res/layout/module_small_map_fragment.xml
index ca1c4d7159..c6eeac2db7 100644
--- a/modules/mogo-module-smp/src/main/res/layout/module_small_map_fragment.xml
+++ b/core/function-impl/mogo-core-function-smp/src/main/res/layout/module_small_map_fragment.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.mogo.module.small.map.SmallMapDirectionView
+    <com.mogo.eagle.core.function.smp.SmallMapDirectionView
         android:id="@+id/smallMapDirectionView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/modules/mogo-module-smp/src/main/res/layout/module_small_map_view.xml b/core/function-impl/mogo-core-function-smp/src/main/res/layout/module_small_map_view.xml
similarity index 94%
rename from modules/mogo-module-smp/src/main/res/layout/module_small_map_view.xml
rename to core/function-impl/mogo-core-function-smp/src/main/res/layout/module_small_map_view.xml
index e243671e27..fdf0e6dddc 100644
--- a/modules/mogo-module-smp/src/main/res/layout/module_small_map_view.xml
+++ b/core/function-impl/mogo-core-function-smp/src/main/res/layout/module_small_map_view.xml
@@ -12,7 +12,7 @@
         android:layout_centerInParent="true"
         android:background="@drawable/module_small_map_view_border" />
 
-    <com.mogo.module.common.view.RoundLayout
+    <com.mogo.eagle.core.view.RoundLayout
         android:id="@+id/rlSmallMapBorder"
         android:layout_width="@dimen/module_small_map_view_width"
         android:layout_height="@dimen/module_small_map_view_width"
@@ -28,7 +28,7 @@
             android:id="@+id/aMapNaviView"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />-->
-    </com.mogo.module.common.view.RoundLayout>
+    </com.mogo.eagle.core.view.RoundLayout>
 
     <ImageView
         android:id="@+id/ivMapBorder"
diff --git a/modules/mogo-module-smp/src/main/res/values-xhdpi-2560x1440/dimens.xml b/core/function-impl/mogo-core-function-smp/src/main/res/values-xhdpi-2560x1440/dimens.xml
similarity index 100%
rename from modules/mogo-module-smp/src/main/res/values-xhdpi-2560x1440/dimens.xml
rename to core/function-impl/mogo-core-function-smp/src/main/res/values-xhdpi-2560x1440/dimens.xml
diff --git a/modules/mogo-module-smp/src/main/res/values-xhdpi/dimens.xml b/core/function-impl/mogo-core-function-smp/src/main/res/values-xhdpi/dimens.xml
similarity index 100%
rename from modules/mogo-module-smp/src/main/res/values-xhdpi/dimens.xml
rename to core/function-impl/mogo-core-function-smp/src/main/res/values-xhdpi/dimens.xml
diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/MogoLatLng.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/MogoLatLng.java
index 8c47532497..951c21a907 100644
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/MogoLatLng.java
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/MogoLatLng.java
@@ -14,13 +14,10 @@ import java.util.Objects;
 public class MogoLatLng implements Parcelable {
 
     public final double lat;
-    @Deprecated
-    public final double lng;
     public final double lon;
 
     public MogoLatLng( double lat, double lon ) {
         this.lat = lat;
-        this.lng = lon;
         this.lon = lon;
     }
 
@@ -28,16 +25,6 @@ public class MogoLatLng implements Parcelable {
         return lat;
     }
 
-    /**
-     * Deprecated, use {@link #getLon()} instead.
-     *
-     * @return
-     */
-    @Deprecated
-    public double getLng() {
-        return lng;
-    }
-
     public double getLon() {
         return lon;
     }
@@ -53,7 +40,7 @@ public class MogoLatLng implements Parcelable {
 
     @Override
     public int hashCode() {
-        return Objects.hash( lat, lng, lon );
+        return Objects.hash( lat, lon );
     }
 
     @Override
@@ -72,13 +59,11 @@ public class MogoLatLng implements Parcelable {
     @Override
     public void writeToParcel( Parcel dest, int flags ) {
         dest.writeDouble( this.lat );
-        dest.writeDouble( this.lng );
         dest.writeDouble( this.lon );
     }
 
     protected MogoLatLng( Parcel in ) {
         this.lat = in.readDouble();
-        this.lng = in.readDouble();
         this.lon = in.readDouble();
     }
 
diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/smp/IMogoSmallMapProvider.java b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/smp/IMogoSmallMapProvider.java
similarity index 94%
rename from services/mogo-service-api/src/main/java/com/mogo/service/smp/IMogoSmallMapProvider.java
rename to core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/smp/IMogoSmallMapProvider.java
index 8485cae808..f6468c625e 100644
--- a/services/mogo-service-api/src/main/java/com/mogo/service/smp/IMogoSmallMapProvider.java
+++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/smp/IMogoSmallMapProvider.java
@@ -1,4 +1,4 @@
-package com.mogo.service.smp;
+package com.mogo.eagle.core.function.api.map.smp;
 
 import androidx.annotation.IdRes;
 import androidx.fragment.app.FragmentActivity;
diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerSmpManager.java b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerSmpManager.java
new file mode 100644
index 0000000000..ea3c7aaa04
--- /dev/null
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerSmpManager.java
@@ -0,0 +1,32 @@
+package com.mogo.eagle.core.function.call.map;
+
+import com.mogo.eagle.core.data.map.MogoLatLng;
+import com.mogo.eagle.core.function.api.map.smp.IMogoSmallMapProvider;
+import com.mogo.eagle.core.function.call.base.CallerBase;
+import com.mogo.service.MogoServicePaths;
+
+import java.util.List;
+
+/**
+ * @author xiaoyuzhou
+ * @date 2021/9/17 6:15 下午
+ */
+public class CallerSmpManager extends CallerBase {
+    private static IMogoSmallMapProvider getMogoSmallMapProvider() {
+        return getApiInstance(IMogoSmallMapProvider.class, MogoServicePaths.PATH_SMALL_MAP);
+    }
+
+    /**
+     * 绘制路径线
+     */
+    public static void drawablePolyline(List<MogoLatLng> coordinates) {
+        getMogoSmallMapProvider().drawablePolyline(coordinates);
+    }
+
+    /**
+     * 清除路径线
+     */
+    public static void clearPolyline() {
+        getMogoSmallMapProvider().clearPolyline();
+    }
+}
diff --git a/core/mogo-core-res/src/main/function-common-res/values/styles.xml b/core/mogo-core-res/src/main/function-common-res/values/styles.xml
new file mode 100644
index 0000000000..e727caa8e8
--- /dev/null
+++ b/core/mogo-core-res/src/main/function-common-res/values/styles.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <declare-styleable name="RoundLayout">
+        <attr name="roundLayoutRadius" format="dimension" />
+    </declare-styleable>
+
+</resources>
\ No newline at end of file
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/view/RoundLayout.java b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/view/RoundLayout.java
similarity index 91%
rename from modules/mogo-module-common/src/main/java/com/mogo/module/common/view/RoundLayout.java
rename to core/mogo-core-res/src/main/java/com/mogo/eagle/core/view/RoundLayout.java
index 20150f4a19..2158c157e5 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/view/RoundLayout.java
+++ b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/view/RoundLayout.java
@@ -1,4 +1,4 @@
-package com.mogo.module.common.view;
+package com.mogo.eagle.core.view;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -10,9 +10,8 @@ import android.graphics.RectF;
 import android.util.AttributeSet;
 import android.widget.RelativeLayout;
 
-import com.mogo.module.common.R;
-import com.mogo.skin.support.IMogoSkinCompatSupportable;
-import com.mogo.skin.support.helper.MogoSkinCompatBackgroundHelperDelegate;
+import com.mogo.eagle.core.function.call.api.R;
+
 
 /**
  * author : donghongyu
diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
index 376bd68a9a..1949915969 100644
--- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
+++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
@@ -436,7 +436,7 @@ public class AMapViewWrapper implements IMogoMapView,
     @Override
     public void moveToCenter(MogoLatLng latLng, boolean animate) {
         Logger.d(TAG, "move to center %s", latLng);
-        if (latLng == null || latLng.lat == 0.0d || latLng.lng == 0.0d) {
+        if (latLng == null || latLng.lat == 0.0d || latLng.lon == 0.0d) {
             Logger.e(TAG, "latlng = null or is illegal");
             return;
         }
diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/MogoMapUtils.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/MogoMapUtils.java
index a6e709160c..a818446f4f 100644
--- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/MogoMapUtils.java
+++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/MogoMapUtils.java
@@ -53,24 +53,24 @@ public class MogoMapUtils {
 
         if ( latLngBounds.getNortheast() == null ) {
             dLat = Math.abs( carPosition.lat - latLngBounds.getSouthwest().getLatitude() );
-            dLon = Math.abs( carPosition.lng - latLngBounds.getSouthwest().getLongitude() );
+            dLon = Math.abs( carPosition.lon - latLngBounds.getSouthwest().getLongitude() );
         } else if ( latLngBounds.getSouthwest() == null ) {
             dLat = Math.abs( carPosition.lat - latLngBounds.getNortheast().getLatitude() );
-            dLon = Math.abs( carPosition.lng - latLngBounds.getNortheast().getLongitude() );
+            dLon = Math.abs( carPosition.lon - latLngBounds.getNortheast().getLongitude() );
         } else {
             final double dLat1 = Math.abs( carPosition.lat - latLngBounds.getSouthwest().getLatitude() );
-            final double dLon1 = Math.abs( carPosition.lng - latLngBounds.getSouthwest().getLongitude() );
+            final double dLon1 = Math.abs( carPosition.lon - latLngBounds.getSouthwest().getLongitude() );
             final double dLat2 = Math.abs( carPosition.lat - latLngBounds.getNortheast().getLatitude() );
-            final double dLon2 = Math.abs( carPosition.lng - latLngBounds.getNortheast().getLongitude() );
+            final double dLon2 = Math.abs( carPosition.lon - latLngBounds.getNortheast().getLongitude() );
             dLat = dLat1 > dLat2 ? dLat1 : dLat2;
             dLon = dLon1 > dLon2 ? dLon1 : dLon2;
         }
 
         west = carPosition.lat - dLat;
-        south = carPosition.lng + dLon;
+        south = carPosition.lon + dLon;
 
         east = carPosition.lat + dLat;
-        north = carPosition.lng - dLon;
+        north = carPosition.lon - dLon;
 
         if ( south == 0.0 || west == 0.0 || east == 0.0 || north == 0.0 ) {
             return null;
diff --git a/main-extensions/mogo-module-main-launcher/build.gradle b/main-extensions/mogo-module-main-launcher/build.gradle
index bda491d407..26dc22b75a 100644
--- a/main-extensions/mogo-module-main-launcher/build.gradle
+++ b/main-extensions/mogo-module-main-launcher/build.gradle
@@ -49,7 +49,7 @@ dependencies {
         api project(":modules:mogo-module-main")
         implementation project(":OCH:mogo-och")
         implementation project(':modules:mogo-module-service')
-        implementation project(':modules:mogo-module-smp')
+        implementation project(':core:function-impl:mogo-core-function-smp')
     }
 }
 
diff --git a/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java b/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java
index b892b3df2d..30310154e1 100644
--- a/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java
+++ b/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java
@@ -28,7 +28,7 @@ import com.mogo.module.main.cards.MogoModulesManager;
 import com.mogo.module.service.receiver.MogoReceiver;
 import com.mogo.och.IMogoOCH;
 import com.mogo.service.intent.IMogoIntentListener;
-import com.mogo.service.smp.IMogoSmallMapProvider;
+import com.mogo.eagle.core.function.api.map.smp.IMogoSmallMapProvider;
 import com.mogo.service.statusmanager.StatusDescriptor;
 import com.mogo.service.v2x.IV2XWarningListener;
 import com.mogo.utils.logger.Logger;
diff --git a/modules.txt b/modules.txt
index a742e2f2a4..cdd8052e78 100644
--- a/modules.txt
+++ b/modules.txt
@@ -31,7 +31,7 @@
 :modules:mogo-module-adas
 :services:mogo-service
 :modules:mogo-module-map
-:modules:mogo-module-smp
+:core:function-impl:mogo-core-function-smp
 :modules:mogo-module-apps
 :modules:mogo-module-service
 :modules:mogo-module-authorize
diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/bean/EntityConvertUtils.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/bean/EntityConvertUtils.java
index 67e79545d7..13a0e1bd28 100644
--- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/bean/EntityConvertUtils.java
+++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/bean/EntityConvertUtils.java
@@ -79,7 +79,7 @@ public class EntityConvertUtils {
         double lng = 0.0;
         if ( MogoTip.getPoint() != null ) {
             lat = MogoTip.getPoint().getLat();
-            lng = MogoTip.getPoint().getLng();
+            lng = MogoTip.getPoint().getLon();
         }
         return new SearchPoi( MogoTip.getPoiID(),
                 MogoTip.getName(),
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
index 3e220c7e9f..e8a1953100 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
@@ -509,7 +509,7 @@ public class MogoServices implements IMogoMapListener,
      */
     private float getMapCameraFactWidth() {
         try {
-            return Utils.calculateLineDistance( mCameraNorthEastPosition, new MogoLatLng( mCameraNorthEastPosition.lat, mCameraSouthWestPosition.lng ) );
+            return Utils.calculateLineDistance( mCameraNorthEastPosition, new MogoLatLng( mCameraNorthEastPosition.lat, mCameraSouthWestPosition.lon ) );
         } catch ( Exception e ) {
             return ServiceConst.DEFAULT_AUTO_REFRESH_DATA_RADIUS;
         }
@@ -520,7 +520,7 @@ public class MogoServices implements IMogoMapListener,
      */
     private float getMapCameraFactHeight() {
         try {
-            return Utils.calculateLineDistance( mCameraSouthWestPosition, new MogoLatLng( mCameraNorthEastPosition.lat, mCameraSouthWestPosition.lng ) );
+            return Utils.calculateLineDistance( mCameraSouthWestPosition, new MogoLatLng( mCameraNorthEastPosition.lat, mCameraSouthWestPosition.lon ) );
         } catch ( Exception e ) {
             return ServiceConst.DEFAULT_AUTO_REFRESH_DATA_RADIUS;
         }
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshModel.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshModel.java
index 161ab53eb6..0ad608281c 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshModel.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshModel.java
@@ -47,7 +47,7 @@ public class RefreshModel {
             final Map< String, Object > query = new ParamsProvider.Builder( mContext ).build();
             final RefreshBody refreshBody = new RefreshBody();
             refreshBody.limit = limit;
-            refreshBody.location = new RefreshBody.LatLon( latLng.lat, latLng.lng );
+            refreshBody.location = new RefreshBody.LatLon( latLng.lat, latLng.lon );
             refreshBody.radius = radius;
             refreshBody.viewPush = true;
             refreshBody.dataType.add( ServiceConst.CARD_TYPE_ROAD_CONDITION );
@@ -93,7 +93,7 @@ public class RefreshModel {
             final Map< String, Object > query = new ParamsProvider.Builder( mContext ).build();
             final RefreshBody refreshBody = new RefreshBody();
             refreshBody.limit = limit;
-            refreshBody.location = new RefreshBody.LatLon( latLng.lat, latLng.lng );
+            refreshBody.location = new RefreshBody.LatLon( latLng.lat, latLng.lon );
             refreshBody.radius = radius;
             refreshBody.dataType.add( ServiceConst.CARD_TYPE_ROAD_CONDITION );
             refreshBody.dataType.add( ServiceConst.CARD_TYPE_USER_DATA );
@@ -157,7 +157,7 @@ public class RefreshModel {
                 refreshBody.limit = limit;
             }
             refreshBody.radius = radius;
-            refreshBody.location = new RefreshBody.LatLon( latLng.lat, latLng.lng );
+            refreshBody.location = new RefreshBody.LatLon( latLng.lat, latLng.lon );
             refreshBody.onlyFocus = onlyFocus;
             refreshBody.onlySameCity = onlySameCity;
             refreshBody.onlyRealUser = onlyRealUser;
diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java
index 178d489cf8..c5f888c3df 100644
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java
@@ -180,7 +180,7 @@ public class TanluManager implements IMogoMarkerClickListener,
                     lat = TanluServiceManager.getLocationClient().getLastKnowLocation().getLatitude();
                 } else {
                     Logger.d(TAG, "其他 ---1----");
-                    longit = latLon.lng;
+                    longit = latLon.lon;
                     lat = latLon.lat;
                 }
                 Logger.d(TAG, "geoSearch keywords =" + mKeywords + ">>longitude= " + longit + "--latitude= " + lat);
@@ -546,7 +546,7 @@ public class TanluManager implements IMogoMarkerClickListener,
                     lat = TanluServiceManager.getLocationClient().getLastKnowLocation().getLatitude();
                 } else {
                     Logger.d(TAG, "其他 -onPoiSearched---1----");
-                    longit = latLon.lng;
+                    longit = latLon.lon;
                     lat = latLon.lat;
                 }
 //                getVoiceControlRoadData(mKeywords, lat, longit);
diff --git a/modules/mogo-module-v2x/build.gradle b/modules/mogo-module-v2x/build.gradle
index d057417b04..e7604d5f7a 100644
--- a/modules/mogo-module-v2x/build.gradle
+++ b/modules/mogo-module-v2x/build.gradle
@@ -86,6 +86,7 @@ dependencies {
         implementation project(':modules:mogo-module-obu')
 
         implementation project(':core:mogo-core-data')
+        implementation project(':core:mogo-core-function-call')
     }
 
     annotationProcessor rootProject.ext.dependencies.aroutercompiler
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java
index 0637f57d49..e6f18b471c 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java
@@ -34,7 +34,7 @@ import com.mogo.service.module.IMogoSearchManager;
 import com.mogo.service.share.IMogoShareManager;
 import com.mogo.service.share.IMogoTanluProvider;
 import com.mogo.service.share.IMogoTrafficUploadProvider;
-import com.mogo.service.smp.IMogoSmallMapProvider;
+import com.mogo.eagle.core.function.api.map.smp.IMogoSmallMapProvider;
 import com.mogo.service.statusmanager.IMogoStatusManager;
 import com.mogo.service.strategy.IMogoOnlineCarListPanelProvider;
 import com.mogo.service.strategy.IMogoRefreshStrategyController;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/TestPanelBroadcastReceiver.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/TestPanelBroadcastReceiver.java
index 4d560c2dc8..21d5e95e22 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/TestPanelBroadcastReceiver.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/TestPanelBroadcastReceiver.java
@@ -7,6 +7,7 @@ import android.content.Intent;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.mogo.eagle.core.data.map.MogoLatLng;
+import com.mogo.eagle.core.function.call.map.CallerSmpManager;
 import com.mogo.module.common.entity.MarkerExploreWay;
 import com.mogo.module.common.entity.V2XMessageEntity;
 import com.mogo.module.common.entity.V2XPushMessageEntity;
@@ -167,9 +168,9 @@ public class TestPanelBroadcastReceiver extends BroadcastReceiver {
             V2XServiceManager.getMoGoStatusManager().setSeekHelping(MODULE_NAME, true);
         } else if (sceneType == 20) {// 小地图绘制线
             List<MogoLatLng> coordinates = TestOnLineCarUtils.getTestCoordinates();
-            V2XServiceManager.getMogoSmallMapProvider().drawablePolyline(coordinates);
+            CallerSmpManager.drawablePolyline(coordinates);
         } else if (sceneType == 21) {// 小地图清除绘制线
-            V2XServiceManager.getMogoSmallMapProvider().clearPolyline();
+            CallerSmpManager.clearPolyline();
         }
     }
 
diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java b/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java
index 737247d0e7..b914a6ff9b 100644
--- a/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java
+++ b/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java
@@ -21,7 +21,7 @@ import com.mogo.service.cloud.location.IMogoLocationInfoService;
 import com.mogo.service.map.IMogoMapFrameController;
 import com.mogo.service.map.IMogoMapService;
 import com.mogo.service.obu.IMoGoObuProvider;
-import com.mogo.service.smp.IMogoSmallMapProvider;
+import com.mogo.eagle.core.function.api.map.smp.IMogoSmallMapProvider;
 import com.mogo.service.module.IMogoActionManager;
 import com.mogo.service.module.IMogoMarkerService;
 import com.mogo.service.module.IMogoRegisterCenter;
diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java b/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java
index 6e2cd88503..447ba7224a 100644
--- a/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java
+++ b/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java
@@ -29,7 +29,7 @@ import com.mogo.service.cloud.location.IMogoLocationInfoService;
 import com.mogo.service.map.IMogoMapFrameController;
 import com.mogo.service.map.IMogoMapService;
 import com.mogo.service.obu.IMoGoObuProvider;
-import com.mogo.service.smp.IMogoSmallMapProvider;
+import com.mogo.eagle.core.function.api.map.smp.IMogoSmallMapProvider;
 import com.mogo.service.module.IMogoActionManager;
 import com.mogo.service.module.IMogoMarkerService;
 import com.mogo.service.module.IMogoRegisterCenter;
diff --git a/settings.gradle b/settings.gradle
index 1b008e95f7..c50c163d4f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -17,7 +17,10 @@ include ':core:mogo-core-function-api'
 // 模块对外暴露等调用接口
 include ':core:mogo-core-function-call'
 // 业务实现
+// UI 展示及交互
 include ':core:function-impl:mogo-core-function-hmi'
+// 小地图控件
+include ':core:function-impl:mogo-core-function-smp'
 
 
 // 服务
@@ -43,7 +46,6 @@ include ':modules:mogo-module-monitor'
 include ':modules:mogo-module-left-panel-noop'
 include ':modules:mogo-module-left-panel'
 include ':modules:mogo-module-obu'
-include ':modules:mogo-module-smp'
 include ':modules:mogo-module-adas'
 include ':modules:mogo-module-check'
 include ':modules:mogo-module-map'