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-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 @@
+
+
+
+
+
+
+
+
\ 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/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/mogo-module-smp/build.gradle b/modules/mogo-module-smp/build.gradle
index c182940292..35c4c4d4a3 100644
--- a/modules/mogo-module-smp/build.gradle
+++ b/modules/mogo-module-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/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java
index c3be13474a..e93b828326 100644
--- a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java
+++ b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java
@@ -24,9 +24,9 @@ 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.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;
diff --git a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapProvider.java b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapProvider.java
index 8b126f32f0..abae2ac2a5 100644
--- a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapProvider.java
+++ b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapProvider.java
@@ -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/res/layout/module_small_map_view.xml b/modules/mogo-module-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/modules/mogo-module-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" />
- -->
-
+