修改自研OBU业务逻辑目录

Signed-off-by: 董宏宇 <martindhy@gmail.com>

.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-obu-mogo" />
             <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" />
@@ -50,7 +51,6 @@
             <option value="$PROJECT_DIR$/modules/mogo-module-map" />
             <option value="$PROJECT_DIR$/modules/mogo-module-monitor" />
             <option value="$PROJECT_DIR$/modules/mogo-module-obu" />
-            <option value="$PROJECT_DIR$/modules/mogo-module-obu-mogo" />
             <option value="$PROJECT_DIR$/modules/mogo-module-push" />
             <option value="$PROJECT_DIR$/modules/mogo-module-push-base" />
             <option value="$PROJECT_DIR$/modules/mogo-module-push-noop" />

app/build.gradle

@@ -187,8 +187,6 @@ dependencies {
         implementation project(':modules:mogo-module-monitor')
         implementation project(':modules:mogo-module-extensions')
         implementation project(':modules:mogo-module-map')
-        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')
         implementation project(':modules:mogo-module-widgets')
@@ -200,6 +198,8 @@ dependencies {
         implementation project(':test:crashreport-upgrade')
         implementation project(':test:crashreport-bugly')
 
+        implementation project(':core:function-impl:mogo-core-function-obu-mogo')
+        implementation project(':core:function-impl:mogo-core-function-smp')
         implementation project(':core:function-impl:mogo-core-function-hmi')
 
     }

core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MoGoObuProvider.kt

@@ -4,7 +4,7 @@ import android.content.Context
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.mogo.eagle.core.utilcode.util.LogUtils
 import com.mogo.service.MogoServicePaths
-import com.mogo.service.obu.IMoGoObuProvider
+import com.mogo.eagle.core.function.api.obu.IMoGoObuProvider
 
 /**
  * @author xiaoyuzhou

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/obu/IMoGoObuProvider.java

@@ -1,4 +1,4 @@
-package com.mogo.service.obu;
+package com.mogo.eagle.core.function.api.obu;
 
 import com.alibaba.android.arouter.facade.template.IProvider;
 

modules.txt

@@ -27,7 +27,7 @@
 :test:crashreport-upgrade
 :skin:mogo-skin-light
 :modules:mogo-module-obu
-:modules:mogo-module-obu-mogo
+:core:function-impl:mogo-core-function-obu-mogo
 :modules:mogo-module-adas
 :services:mogo-service
 :modules:mogo-module-map

services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java

@@ -20,7 +20,7 @@ import com.mogo.service.launcher.IMogoLauncher;
 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.eagle.core.function.api.obu.IMoGoObuProvider;
 import com.mogo.eagle.core.function.api.map.smp.IMogoSmallMapProvider;
 import com.mogo.service.module.IMogoActionManager;
 import com.mogo.service.module.IMogoMarkerService;

services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java

@@ -28,7 +28,7 @@ import com.mogo.service.launcher.IMogoLauncher;
 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.eagle.core.function.api.obu.IMoGoObuProvider;
 import com.mogo.eagle.core.function.api.map.smp.IMogoSmallMapProvider;
 import com.mogo.service.module.IMogoActionManager;
 import com.mogo.service.module.IMogoMarkerService;

settings.gradle

@@ -21,6 +21,8 @@ include ':core:mogo-core-function-call'
 include ':core:function-impl:mogo-core-function-hmi'
 // 小地图控件
 include ':core:function-impl:mogo-core-function-smp'
+// 自研OBU业务
+include ':core:function-impl:mogo-core-function-obu-mogo'
 
 
 // 服务
@@ -40,7 +42,6 @@ include ':libraries:mogo-map'
 
 // OLD业务模块
 include ':modules:tanlulib'
-include ':modules:mogo-module-obu-mogo'
 include ':modules:mogo-module-widgets'
 include ':modules:mogo-module-monitor'
 include ':modules:mogo-module-left-panel-noop'