[dev_arch_opt_3.0]

[Change]
[
1、迁移mogo-core-function-obu-mogo工程到MoGoEagleEye.core.function-impl.mogo-core-function-datacenter，后续进行数据及视图拆离
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>

core/function-impl/mogo-core-function-datacenter/build.gradle

@@ -57,13 +57,16 @@ dependencies {
     implementation rootProject.ext.dependencies.mogoami
     implementation rootProject.ext.dependencies.mogoaicloudtelematic
 
+    implementation rootProject.ext.dependencies.mogoobuold
+    implementation rootProject.ext.dependencies.mogoobu
+
     if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
         implementation rootProject.ext.dependencies.mogo_core_data
         implementation rootProject.ext.dependencies.mogo_core_utils
         implementation rootProject.ext.dependencies.mogo_core_function_call
 
         implementation project(':libraries:mogo-adas')
-
+        implementation rootProject.ext.dependencies.mogocommons
     } else {
         implementation project(':core:mogo-core-data')
         implementation project(':core:mogo-core-utils')
@@ -71,8 +74,6 @@ dependencies {
 
         implementation project(':libraries:mogo-adas')
         implementation project(':foudations:mogo-commons')
-
-
     }
 }
 

core/function-impl/mogo-core-function-datacenter/src/main/AndroidManifest.xml

@@ -1,6 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.mogo.eagle.core.function.datacenter">
+
     <application>
+        <receiver android:name=".obu.receiver.ObuTestTriggerReceiver">
+            <intent-filter>
+                <action android:name="com.obu.test_trigger" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </receiver>
+        <receiver android:name=".obu.receiver.ObuTestTriggerRecognizedReceiver">
+            <intent-filter>
+                <action android:name="com.obu.test_trigger_recognized" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </receiver>
+
+        <receiver android:name=".obu.receiver.ObuRsuTestTriggerReceiver">
+            <intent-filter>
+                <action android:name="com.obu.test_light_recognized" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </receiver>
+
+        <receiver android:name=".obu.receiver.ObuTestNewObuReceiver">
+            <intent-filter>
+                <action android:name="com.obu.test_newobu" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </receiver>
+
+        <receiver android:name=".obu.receiver.ObuTestNewObuRsiReceiver">
+            <intent-filter>
+                <action android:name="com.obu.test_newobu_rsi" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </receiver>
+
     </application>
 </manifest>

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotProvider.kt

@@ -62,9 +62,9 @@ import java.util.concurrent.TimeUnit
 
 
 /**
+ *  域控制器
  * @author xiaoyuzhou
  * @date 2021/9/22 8:43 下午
- * 域控制器
  */
 @Route(path = MogoServicePaths.PATH_AUTO_PILOT)
 class MoGoAutopilotProvider :

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

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.obu.mogo
+package com.mogo.eagle.core.function.datacenter.obu
 
 import android.content.Context
 import com.alibaba.android.arouter.facade.annotation.Route

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuConst.java

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.obu.mogo;
+package com.mogo.eagle.core.function.datacenter.obu;
 
 /**
  * author : lxiiaopeng

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.obu.mogo
+package com.mogo.eagle.core.function.datacenter.obu
 
 import android.content.Context
 import com.mogo.eagle.core.data.config.HmiBuildConfig

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuManager.kt

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.obu.mogo
+package com.mogo.eagle.core.function.datacenter.obu
 
 import android.content.Context
 import android.util.Log
@@ -20,7 +20,7 @@ import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager.Scene.Defa
 import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager.Scene.TooClose
 import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager
 import com.mogo.eagle.core.function.call.obu.CallerObuListenerManager
-import com.mogo.eagle.core.function.obu.mogo.utils.TrafficDataConvertUtils
+import com.mogo.eagle.core.function.datacenter.obu.utils.TrafficDataConvertUtils
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OBU
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.obu.mogo
+package com.mogo.eagle.core.function.datacenter.obu
 
 import android.content.Context
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
@@ -19,7 +19,7 @@ import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager
 import com.mogo.eagle.core.function.call.obu.CallerObuListenerManager
 import com.mogo.eagle.core.function.call.obu.CallerObuTrafficLightListenerManager
 import com.mogo.eagle.core.function.call.v2x.CallObuLimitingSpeedListenerManager
-import com.mogo.eagle.core.function.obu.mogo.utils.TrafficDataConvertUtilsNew
+import com.mogo.eagle.core.function.datacenter.obu.utils.TrafficDataConvertUtilsNew
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OBU
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/receiver/ObuRsuTestTriggerReceiver.kt

@@ -1,10 +1,10 @@
-package com.mogo.eagle.core.function.obu.mogo.receiver
+package com.mogo.eagle.core.function.datacenter.obu.receiver
 
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 //import com.mogo.eagle.core.function.obu.mogo.MogoObuConst
-//import com.mogo.eagle.core.function.obu.mogo.MogoPrivateObuManager
+//import com.mogo.eagle.core.function.datacenter.obu.MogoPrivateObuManager
 //import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 //import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OBU
 //import com.zhidao.support.obu.constants.ObuConstants

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/receiver/ObuTestNewObuReceiver.kt

@@ -1,10 +1,9 @@
-package com.mogo.eagle.core.function.obu.mogo.receiver
+package com.mogo.eagle.core.function.datacenter.obu.receiver
 
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import android.util.Log
-import com.mogo.eagle.core.function.obu.mogo.MogoPrivateObuNewManager
+import com.mogo.eagle.core.function.datacenter.obu.MogoPrivateObuNewManager
 import com.mogo.support.obu.model.MogoObuRvWarningData
 import com.mogo.support.obu.model.advance.V2xWarning
 import com.mogo.support.obu.model.advance.VehBasics

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/receiver/ObuTestNewObuRsiReceiver.kt

@@ -1,16 +1,11 @@
-package com.mogo.eagle.core.function.obu.mogo.receiver
+package com.mogo.eagle.core.function.datacenter.obu.receiver
 
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import android.util.Log
-import com.mogo.eagle.core.function.obu.mogo.MogoPrivateObuNewManager
+import com.mogo.eagle.core.function.datacenter.obu.MogoPrivateObuNewManager
 import com.mogo.support.obu.model.MogoObuRsiWarningData
-import com.mogo.support.obu.model.MogoObuRvWarningData
 import com.mogo.support.obu.model.advance.RsiWarning
-import com.mogo.support.obu.model.advance.V2xWarning
-import com.mogo.support.obu.model.advance.VehBasics
-import com.mogo.support.obu.model.advance.WarningData
 
 /**
  * @author lixiaopeng

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/receiver/ObuTestTriggerReceiver.kt

@@ -1,10 +1,10 @@
-package com.mogo.eagle.core.function.obu.mogo.receiver
+package com.mogo.eagle.core.function.datacenter.obu.receiver
 
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 //import com.mogo.eagle.core.function.obu.mogo.MogoObuConst
-//import com.mogo.eagle.core.function.obu.mogo.MogoPrivateObuManager
+//import com.mogo.eagle.core.function.datacenter.obu.MogoPrivateObuManager
 //import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 //import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OBU
 //import com.zhidao.support.obu.constants.ObuConstants

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/receiver/ObuTestTriggerRecognizedReceiver.kt

@@ -1,10 +1,10 @@
-package com.mogo.eagle.core.function.obu.mogo.receiver
+package com.mogo.eagle.core.function.datacenter.obu.receiver
 
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 //import com.mogo.eagle.core.function.obu.mogo.MogoObuConst
-//import com.mogo.eagle.core.function.obu.mogo.MogoPrivateObuManager
+//import com.mogo.eagle.core.function.datacenter.obu.MogoPrivateObuManager
 //import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 //import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OBU
 //import com.zhidao.support.obu.model.CvxHvInfoIndInfo

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/utils/TrafficDataConvertUtils.kt

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.obu.mogo.utils
+package com.mogo.eagle.core.function.datacenter.obu.utils
 
 import com.mogo.eagle.core.data.traffic.TrafficData
 import com.mogo.eagle.core.data.enums.TrafficTypeEnum

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/utils/TrafficDataConvertUtilsNew.kt

@@ -1,6 +1,5 @@
-package com.mogo.eagle.core.function.obu.mogo.utils
+package com.mogo.eagle.core.function.datacenter.obu.utils
 
-import android.util.Log
 import com.mogo.eagle.core.data.enums.TrafficTypeEnum
 import com.mogo.eagle.core.data.traffic.TrafficData
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger

core/function-impl/mogo-core-function-hmi/build.gradle

@@ -88,7 +88,6 @@ dependencies {
         api rootProject.ext.dependencies.mogo_core_data
         api rootProject.ext.dependencies.mogo_core_utils
         api rootProject.ext.dependencies.mogo_core_network
-        api rootProject.ext.dependencies.mogo_core_function_obu_mogo
         api rootProject.ext.dependencies.mogo_core_function_map
         api rootProject.ext.dependencies.mogo_core_function_v2x
         api rootProject.ext.dependencies.mogo_core_function_devatools
@@ -104,7 +103,6 @@ dependencies {
         api project(':core:mogo-core-res')
         api project(':core:mogo-core-data')
         api project(':core:mogo-core-utils')
-        api project(':core:function-impl:mogo-core-function-obu-mogo')
         api project(':core:function-impl:mogo-core-function-map')
         api project(':core:function-impl:mogo-core-function-v2x')
         api project(':core:function-impl:mogo-core-function-devatools')

core/function-impl/mogo-core-function-obu-mogo/.gitignore

@@ -1 +0,0 @@
-/build

core/function-impl/mogo-core-function-obu-mogo/build.gradle

@@ -1,67 +0,0 @@
-plugins {
-    id 'com.android.library'
-    id 'kotlin-android'
-    id 'kotlin-android-extensions'
-    id 'kotlin-kapt'
-    id 'com.alibaba.arouter'
-}
-
-android {
-    compileSdkVersion rootProject.ext.android.compileSdkVersion
-    defaultConfig {
-        minSdkVersion rootProject.ext.android.minSdkVersion
-        targetSdkVersion rootProject.ext.android.targetSdkVersion
-        versionCode Integer.valueOf(VERSION_CODE)
-        versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION")
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles 'consumer-rules.pro'
-
-        //ARouter apt 参数
-        kapt {
-            useBuildCache = false
-            arguments {
-                arg("AROUTER_MODULE_NAME", project.getName())
-            }
-        }
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
-}
-
-dependencies {
-
-    implementation rootProject.ext.dependencies.androidxappcompat
-    implementation rootProject.ext.dependencies.androidxconstraintlayout
-    implementation rootProject.ext.dependencies.arouter
-    implementation rootProject.ext.dependencies.rxandroid
-
-    kapt rootProject.ext.dependencies.aroutercompiler
-
-    if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
-        implementation rootProject.ext.dependencies.mogo_core_data
-        implementation rootProject.ext.dependencies.mogo_core_utils
-    } else {
-        implementation project(':core:mogo-core-data')
-        implementation project(':core:mogo-core-utils')
-        implementation project(':core:mogo-core-function-call')
-    }
-
-    implementation rootProject.ext.dependencies.mogoobuold
-    implementation rootProject.ext.dependencies.mogoobu
-
-}
-
-apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()

core/function-impl/mogo-core-function-obu-mogo/gradle.properties

@@ -1,3 +0,0 @@
-GROUP=com.mogo.eagle.core.function.impl
-POM_ARTIFACT_ID=obu-mogo
-VERSION_CODE=1

core/function-impl/mogo-core-function-obu-mogo/proguard-rules.pro

@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile

core/function-impl/mogo-core-function-obu-mogo/src/main/AndroidManifest.xml

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mogo.eagle.core.function.obu.mogo">
-
-
-    <application>
-        <receiver android:name="com.mogo.eagle.core.function.obu.mogo.receiver.ObuTestTriggerReceiver">
-            <intent-filter>
-                <action android:name="com.obu.test_trigger" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </receiver>
-        <receiver android:name="com.mogo.eagle.core.function.obu.mogo.receiver.ObuTestTriggerRecognizedReceiver">
-            <intent-filter>
-                <action android:name="com.obu.test_trigger_recognized" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </receiver>
-
-        <receiver android:name="com.mogo.eagle.core.function.obu.mogo.receiver.ObuRsuTestTriggerReceiver">
-            <intent-filter>
-                <action android:name="com.obu.test_light_recognized" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </receiver>
-
-        <receiver android:name="com.mogo.eagle.core.function.obu.mogo.receiver.ObuTestNewObuReceiver">
-            <intent-filter>
-                <action android:name="com.obu.test_newobu" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </receiver>
-
-        <receiver android:name="com.mogo.eagle.core.function.obu.mogo.receiver.ObuTestNewObuRsiReceiver">
-            <intent-filter>
-                <action android:name="com.obu.test_newobu_rsi" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </receiver>
-
-    </application>
-
-</manifest>

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoRoboBusJinlvM1StatesListener.kt

@@ -1,6 +1,5 @@
 package com.mogo.eagle.core.function.api.autopilot
 
-import chassis.ChassisStatesOuterClass
 import chassis.VehicleStateOuterClass
 
 /**

core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt

@@ -10,9 +10,9 @@ import mogo_msg.MogoReportMsg
 import system_master.SystemStatusInfo
 
 /**
- * @author xiaoyuzhou
- * @date 2021/9/30 5:48 下午
  * 域控制器相关的回调监听
+ * @date 2021/9/30 5:48 下午
+ * @author xiaoyuzhou
  */
 object CallerAutoPilotStatusListenerManager : CallerBase<IMoGoAutopilotStatusListener>() {
 

core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/REEADME.md

@@ -1,6 +1,58 @@
-#### CallerAutoPilotStatusListenerManager  管理自动驾驶中的状态及参数信息
+#### 管理与工控机相关的数据回掉
+
+``` kotlin
+/**
+ * 添加 监听
+ * @param tag 标记，用来注销监听使用
+ * @param listener 监听回调
+ */
+fun addListener(
+        tag: String,
+        listener: T
+)
+
+/**
+ * 在添加了监听后执行
+ */
+open fun doSomeAfterAddListener(tag: String, listener: T) 
+
+/**
+ * 删除监听
+ * @param tag 标记，用来注销监听使用
+ */
+fun removeListener(tag: String) 
+
+/**
+ * 删除监听
+ * @param listener 要删除的监听对象
+ */
+fun removeListener(listener: T) 
+```
+
+CallerAutopilotActionsListenerManager
+CallerAutopilotCarConfigListenerManager
+CallerAutopilotIdentifyListenerManager
+CallerAutoPilotManager
+CallerAutopilotPointCloudListenerManager
+CallerAutopilotRecordListenerManager
+CallerAutopilotStatisticsListenerManager
+CallerAutoPilotStatusListenerManager
+CallerAutopilotVehicleStateListenerManager
+CallerBatteryManagementSystemListenerManager
+CallerChassisAccStateListenerManager
+CallerChassisBrakeStateListenerManager
+CallerChassisGearStateListenerManager
+CallerChassisLamplightListenerManager
+CallerChassisLocationGCJ20ListenerManager
+CallerChassisLocationWGS84ListenerManager
+CallerChassisSteeringStateListenerManager
+CallerChassisThrottleStateListenerManager
+CallerPlanningActionsListenerManager
+CallerPlanningRottingListenerManager
+CallerPlanningTrajectoryListenerManager
+CallerRoboBusJinlvM1StatesListenerManager
+CallerStartAutopilotFailedListenerManager
+CallerSweeperFutianCleanSystemListenerManager
+
+
 
-AutopilotStatusInfo：
-连接信息
-实时经纬度、速度、车辆硬件状态
-最后一次启动自动驾驶时候的启动参数 AutopilotControlParameters

modules.txt

@@ -18,7 +18,7 @@
 :test:crashreport-apm
 :test:crashreport-noop
 :test:crashreport-upgrade
-:core:function-impl:mogo-core-function-obu-mogo
+:core:function-impl:mogo-core-function-datacenter
 :core:function-impl:mogo-core-function-hmi
 :core:function-impl:mogo-core-function-map
 :core:function-impl:mogo-core-function-v2x

settings.gradle

@@ -28,13 +28,11 @@ include ':core:function-impl:mogo-core-function-hmi'
 include ':core:function-impl:mogo-core-function-map'
 // v2x预警业务，本地+云端预警
 include ':core:function-impl:mogo-core-function-v2x'
-// 自研OBU业务
-include ':core:function-impl:mogo-core-function-obu-mogo'
 // 车聊聊业务
 include ':core:function-impl:mogo-core-function-chat'
 // 业务biz
 include ':core:function-impl:mogo-core-function-biz'
-// 消息盒子
+// 消息盒子、自研OBU业务
 include ':core:function-impl:mogo-core-function-datacenter'
 
 // 模块