diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index afee79145e..c6183ce37c 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -19,6 +19,7 @@
+
@@ -56,7 +57,6 @@
-
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 100%
rename from modules/mogo-module-smp/build.gradle
rename to core/function-impl/mogo-core-function-smp/build.gradle
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 @@
+ package="com.mogo.eagle.core.function.smp">
\ 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 e93b828326..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.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 99%
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 abae2ac2a5..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;
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">
- coordinates) {
+ getMogoSmallMapProvider().drawablePolyline(coordinates);
+ }
+
+ /**
+ * 清除路径线
+ */
+ public static void clearPolyline() {
+ getMogoSmallMapProvider().clearPolyline();
+ }
+}
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/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-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/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 coordinates = TestOnLineCarUtils.getTestCoordinates();
- V2XServiceManager.getMogoSmallMapProvider().drawablePolyline(coordinates);
+ CallerSmpManager.drawablePolyline(coordinates);
} else if (sceneType == 21) {// 小地图清除绘制线
- V2XServiceManager.getMogoSmallMapProvider().clearPolyline();
+ CallerSmpManager.clearPolyline();
}
}
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'