From ef8f6592e8dbb081e853258c8519c8798ce75c4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Fri, 17 Sep 2021 19:38:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E7=A0=94OBU?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E9=80=BB=E8=BE=91=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 董宏宇 <martindhy@gmail.com>
---
 .idea/gradle.xml                                    |   2 +-
 app/build.gradle                                    |   4 ++--
 .../mogo-core-function-obu-mogo}/.gitignore         |   0
 .../mogo-core-function-obu-mogo}/README.md          |   0
 .../mogo-core-function-obu-mogo}/build.gradle       |   0
 .../mogo-core-function-obu-mogo}/consumer-rules.pro |   0
 .../ALPSALPINE CV2X AMI Specification v1.0.7.pdf    | Bin
 .../doc/AMI通讯协议.docx                            | Bin
 .../doc/CV2X_HLI_v1.0.1.pdf                         | Bin
 .../doc/HLI通讯协议.docx                            | Bin
 .../mogo-core-function-obu-mogo}/gradle.properties  |   0
 .../mogo-core-function-obu-mogo}/proguard-rules.pro |   0
 .../src/main/AndroidManifest.xml                    |   0
 .../com/mogo/module/obu/mogo/MoGoObuProvider.kt     |   2 +-
 .../java/com/mogo/module/obu/mogo/MogoObuConst.java |   0
 .../mogo/module/obu/mogo/MogoPrivateObuManager.kt   |   0
 .../obu/mogo/receiver/ObuRsuTestTriggerReceiver.kt  |   0
 .../obu/mogo/receiver/ObuTestTriggerReceiver.kt     |   0
 .../receiver/ObuTestTriggerRecognizedReceiver.kt    |   0
 .../obu/mogo/utils/TrafficDataConvertUtils.kt       |   0
 .../core/function/api}/obu/IMoGoObuProvider.java    |   2 +-
 modules.txt                                         |   2 +-
 .../java/com/mogo/service/IMogoServiceApis.java     |   2 +-
 .../java/com/mogo/service/impl/MogoServiceApis.java |   2 +-
 settings.gradle                                     |   3 ++-
 25 files changed, 10 insertions(+), 9 deletions(-)
 rename {modules/mogo-module-obu-mogo => core/function-impl/mogo-core-function-obu-mogo}/.gitignore (100%)
 rename {modules/mogo-module-obu-mogo => core/function-impl/mogo-core-function-obu-mogo}/README.md (100%)
 rename {modules/mogo-module-obu-mogo => core/function-impl/mogo-core-function-obu-mogo}/build.gradle (100%)
 rename {modules/mogo-module-obu-mogo => core/function-impl/mogo-core-function-obu-mogo}/consumer-rules.pro (100%)
 rename {modules/mogo-module-obu-mogo => core/function-impl/mogo-core-function-obu-mogo}/doc/ALPSALPINE CV2X AMI Specification v1.0.7.pdf (100%)
 rename {modules/mogo-module-obu-mogo => core/function-impl/mogo-core-function-obu-mogo}/doc/AMI通讯协议.docx (100%)
 rename {modules/mogo-module-obu-mogo => core/function-impl/mogo-core-function-obu-mogo}/doc/CV2X_HLI_v1.0.1.pdf (100%)
 rename {modules/mogo-module-obu-mogo => core/function-impl/mogo-core-function-obu-mogo}/doc/HLI通讯协议.docx (100%)
 rename {modules/mogo-module-obu-mogo => core/function-impl/mogo-core-function-obu-mogo}/gradle.properties (100%)
 rename {modules/mogo-module-obu-mogo => core/function-impl/mogo-core-function-obu-mogo}/proguard-rules.pro (100%)
 rename {modules/mogo-module-obu-mogo => core/function-impl/mogo-core-function-obu-mogo}/src/main/AndroidManifest.xml (100%)
 rename {modules/mogo-module-obu-mogo => core/function-impl/mogo-core-function-obu-mogo}/src/main/java/com/mogo/module/obu/mogo/MoGoObuProvider.kt (90%)
 rename {modules/mogo-module-obu-mogo => core/function-impl/mogo-core-function-obu-mogo}/src/main/java/com/mogo/module/obu/mogo/MogoObuConst.java (100%)
 rename {modules/mogo-module-obu-mogo => core/function-impl/mogo-core-function-obu-mogo}/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt (100%)
 rename {modules/mogo-module-obu-mogo => core/function-impl/mogo-core-function-obu-mogo}/src/main/java/com/mogo/module/obu/mogo/receiver/ObuRsuTestTriggerReceiver.kt (100%)
 rename {modules/mogo-module-obu-mogo => core/function-impl/mogo-core-function-obu-mogo}/src/main/java/com/mogo/module/obu/mogo/receiver/ObuTestTriggerReceiver.kt (100%)
 rename {modules/mogo-module-obu-mogo => core/function-impl/mogo-core-function-obu-mogo}/src/main/java/com/mogo/module/obu/mogo/receiver/ObuTestTriggerRecognizedReceiver.kt (100%)
 rename {modules/mogo-module-obu-mogo => core/function-impl/mogo-core-function-obu-mogo}/src/main/java/com/mogo/module/obu/mogo/utils/TrafficDataConvertUtils.kt (100%)
 rename {services/mogo-service-api/src/main/java/com/mogo/service => core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api}/obu/IMoGoObuProvider.java (82%)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index c6183ce37c..7b6fd7b2be 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-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" />
diff --git a/app/build.gradle b/app/build.gradle
index 436151bc23..42d1a5fd35 100644
--- a/app/build.gradle
+++ b/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')
 
     }
diff --git a/modules/mogo-module-obu-mogo/.gitignore b/core/function-impl/mogo-core-function-obu-mogo/.gitignore
similarity index 100%
rename from modules/mogo-module-obu-mogo/.gitignore
rename to core/function-impl/mogo-core-function-obu-mogo/.gitignore
diff --git a/modules/mogo-module-obu-mogo/README.md b/core/function-impl/mogo-core-function-obu-mogo/README.md
similarity index 100%
rename from modules/mogo-module-obu-mogo/README.md
rename to core/function-impl/mogo-core-function-obu-mogo/README.md
diff --git a/modules/mogo-module-obu-mogo/build.gradle b/core/function-impl/mogo-core-function-obu-mogo/build.gradle
similarity index 100%
rename from modules/mogo-module-obu-mogo/build.gradle
rename to core/function-impl/mogo-core-function-obu-mogo/build.gradle
diff --git a/modules/mogo-module-obu-mogo/consumer-rules.pro b/core/function-impl/mogo-core-function-obu-mogo/consumer-rules.pro
similarity index 100%
rename from modules/mogo-module-obu-mogo/consumer-rules.pro
rename to core/function-impl/mogo-core-function-obu-mogo/consumer-rules.pro
diff --git a/modules/mogo-module-obu-mogo/doc/ALPSALPINE CV2X AMI Specification v1.0.7.pdf b/core/function-impl/mogo-core-function-obu-mogo/doc/ALPSALPINE CV2X AMI Specification v1.0.7.pdf
similarity index 100%
rename from modules/mogo-module-obu-mogo/doc/ALPSALPINE CV2X AMI Specification v1.0.7.pdf
rename to core/function-impl/mogo-core-function-obu-mogo/doc/ALPSALPINE CV2X AMI Specification v1.0.7.pdf
diff --git a/modules/mogo-module-obu-mogo/doc/AMI通讯协议.docx b/core/function-impl/mogo-core-function-obu-mogo/doc/AMI通讯协议.docx
similarity index 100%
rename from modules/mogo-module-obu-mogo/doc/AMI通讯协议.docx
rename to core/function-impl/mogo-core-function-obu-mogo/doc/AMI通讯协议.docx
diff --git a/modules/mogo-module-obu-mogo/doc/CV2X_HLI_v1.0.1.pdf b/core/function-impl/mogo-core-function-obu-mogo/doc/CV2X_HLI_v1.0.1.pdf
similarity index 100%
rename from modules/mogo-module-obu-mogo/doc/CV2X_HLI_v1.0.1.pdf
rename to core/function-impl/mogo-core-function-obu-mogo/doc/CV2X_HLI_v1.0.1.pdf
diff --git a/modules/mogo-module-obu-mogo/doc/HLI通讯协议.docx b/core/function-impl/mogo-core-function-obu-mogo/doc/HLI通讯协议.docx
similarity index 100%
rename from modules/mogo-module-obu-mogo/doc/HLI通讯协议.docx
rename to core/function-impl/mogo-core-function-obu-mogo/doc/HLI通讯协议.docx
diff --git a/modules/mogo-module-obu-mogo/gradle.properties b/core/function-impl/mogo-core-function-obu-mogo/gradle.properties
similarity index 100%
rename from modules/mogo-module-obu-mogo/gradle.properties
rename to core/function-impl/mogo-core-function-obu-mogo/gradle.properties
diff --git a/modules/mogo-module-obu-mogo/proguard-rules.pro b/core/function-impl/mogo-core-function-obu-mogo/proguard-rules.pro
similarity index 100%
rename from modules/mogo-module-obu-mogo/proguard-rules.pro
rename to core/function-impl/mogo-core-function-obu-mogo/proguard-rules.pro
diff --git a/modules/mogo-module-obu-mogo/src/main/AndroidManifest.xml b/core/function-impl/mogo-core-function-obu-mogo/src/main/AndroidManifest.xml
similarity index 100%
rename from modules/mogo-module-obu-mogo/src/main/AndroidManifest.xml
rename to core/function-impl/mogo-core-function-obu-mogo/src/main/AndroidManifest.xml
diff --git a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MoGoObuProvider.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MoGoObuProvider.kt
similarity index 90%
rename from modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MoGoObuProvider.kt
rename to core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MoGoObuProvider.kt
index c7bbd7d9bf..fb3290c6dd 100644
--- a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MoGoObuProvider.kt
+++ b/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
diff --git a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoObuConst.java b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoObuConst.java
similarity index 100%
rename from modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoObuConst.java
rename to core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoObuConst.java
diff --git a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt
similarity index 100%
rename from modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt
rename to core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt
diff --git a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuRsuTestTriggerReceiver.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuRsuTestTriggerReceiver.kt
similarity index 100%
rename from modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuRsuTestTriggerReceiver.kt
rename to core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuRsuTestTriggerReceiver.kt
diff --git a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuTestTriggerReceiver.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuTestTriggerReceiver.kt
similarity index 100%
rename from modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuTestTriggerReceiver.kt
rename to core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuTestTriggerReceiver.kt
diff --git a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuTestTriggerRecognizedReceiver.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuTestTriggerRecognizedReceiver.kt
similarity index 100%
rename from modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuTestTriggerRecognizedReceiver.kt
rename to core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuTestTriggerRecognizedReceiver.kt
diff --git a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/utils/TrafficDataConvertUtils.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/module/obu/mogo/utils/TrafficDataConvertUtils.kt
similarity index 100%
rename from modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/utils/TrafficDataConvertUtils.kt
rename to core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/module/obu/mogo/utils/TrafficDataConvertUtils.kt
diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/obu/IMoGoObuProvider.java b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/obu/IMoGoObuProvider.java
similarity index 82%
rename from services/mogo-service-api/src/main/java/com/mogo/service/obu/IMoGoObuProvider.java
rename to core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/obu/IMoGoObuProvider.java
index 1973bcec9e..50628c05e5 100644
--- a/services/mogo-service-api/src/main/java/com/mogo/service/obu/IMoGoObuProvider.java
+++ b/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;
 
diff --git a/modules.txt b/modules.txt
index cdd8052e78..4694fc9807 100644
--- a/modules.txt
+++ b/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
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 b914a6ff9b..57bb7559bc 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
@@ -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;
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 447ba7224a..5e74afb2bf 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
@@ -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;
diff --git a/settings.gradle b/settings.gradle
index c50c163d4f..26ca74ca97 100644
--- a/settings.gradle
+++ b/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'