[dev_arch_opt_3.0] 修改obu直连的数据结构和和回调方法

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

@@ -55,20 +55,18 @@ dependencies {
     implementation rootProject.ext.dependencies.androidxroomktx
 
     implementation rootProject.ext.dependencies.mogoaicloudtelematic
-
-    implementation rootProject.ext.dependencies.mogoobu
     implementation rootProject.ext.dependencies.amapnavi3dmap
+    implementation project(':libraries:mogo-obu')
+    implementation project(':libraries:mogo-adas')
+    implementation project(':libraries:mogo-adas-data')
 
     if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
         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-utils')
         implementation project(':core:mogo-core-function-call')
-        implementation project(':libraries:mogo-adas')
         implementation project(':foudations:mogo-commons')
     }
 }

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

@@ -47,11 +47,11 @@ class ObuTestNewObuReceiver : BroadcastReceiver() {
         val warningList = listOf(warningData1)
         warningMsg.warningData = warningList
 
-        val cvxHvInfoIndInfo = MogoObuRvWarningData(0, vehBasicsMsg, warningMsg)
+//        val cvxHvInfoIndInfo = MogoRvWarningData(0, vehBasicsMsg, warningMsg)
 
-        MogoPrivateObuNewManager.INSTANCE
-            .getMogoObuListener()
-            .onMogoObuRvWarning(cvxHvInfoIndInfo)
+//        MogoPrivateObuNewManager.INSTANCE
+//            .getMogoObuListener()
+//            .onGnssInfo(cvxHvInfoIndInfo)
 
     }
 

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

@@ -41,11 +41,11 @@ class ObuTestNewObuRsiReceiver : BroadcastReceiver() {
 
         val rsiWarningList = listOf(rsiWarning) //TODO
 
-        val cvxObuRsiInfo = MogoObuRsiWarningData(obuStatus, 1, rsiWarningList)
-
-        MogoPrivateObuNewManager.INSTANCE
-            .getMogoObuListener()
-            .onMogoObuRsiWarning(cvxObuRsiInfo)
+//        val cvxObuRsiInfo = MogoObuRsiWarningData(obuStatus, 1, rsiWarningList)
+//
+//        MogoPrivateObuNewManager.INSTANCE
+//            .getMogoObuListener()
+//            .onObuRsiWarning(cvxObuRsiInfo)
 
     }
 

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

@@ -4,6 +4,8 @@ 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
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OBU
+import com.mogo.support.obu.ObuBase
+import com.mogo.support.obu.ObuScene
 import com.mogo.support.obu.model.MogoObuRsiWarningData
 import com.mogo.support.obu.model.MogoObuRsmWarningData
 import com.mogo.support.obu.model.MogoObuRvWarningData
@@ -20,18 +22,18 @@ object TrafficDataConvertUtilsNew {
     /**
      * OBU 远车 转换交通元素数据,是否需要
      */
-    fun cvxRvInfoIndInfo2TrafficData(info: MogoObuRvWarningData): TrafficData? {
-        if (info.vehBasicsMsg == null) {
+    fun cvxRvInfoIndInfo2TrafficData(info: ObuBase.VehicleBasics): TrafficData? {
+        if (info == null) {
             CallerLogger.e("$M_OBU$TAG", "cvxRvInfoIndInfo2TrafficData  数据转换异常，请检查参数是否齐全")
             return null
         }
         val trafficData = TrafficData()
         trafficData.type = TrafficTypeEnum.TYPE_TRAFFIC_ID_TA_CHE
-        trafficData.uuid = info.vehBasicsMsg.id
-        trafficData.lat = info.vehBasicsMsg.latitude
-        trafficData.lon = info.vehBasicsMsg.longitude
-        trafficData.heading = info.vehBasicsMsg.heading
-        trafficData.speed = info.vehBasicsMsg.speed
+        trafficData.uuid = info.id
+        trafficData.lat = info.latitude
+        trafficData.lon = info.longitude
+        trafficData.heading = info.heading
+        trafficData.speed = info.speed
 
         return trafficData
     }
@@ -39,25 +41,25 @@ object TrafficDataConvertUtilsNew {
     /**
      * OBU RSU道路事件预警信息 转换交通元素数据  标牌 为何要显示level
      */
-    fun cvxRtiThreatIndInfo2TrafficData(info: MogoObuRsiWarningData): TrafficData? {
-        if (info.warningMsg == null || info.warningMsg.size < 1 || info.warningMsg[0].position == null) {
+    fun cvxRtiThreatIndInfo2TrafficData(info: ObuScene.RsiWarningData): TrafficData? {
+        if (info.warningMsgList == null || info.warningMsgList.size < 1 || info.warningMsgList[0].position == null) {
             CallerLogger.e("$M_OBU$TAG", "数据转换异常，请检查参数是否齐全")
             return null
         }
         val trafficData = TrafficData()
         trafficData.type = TrafficTypeEnum.TYPE_TRAFFIC_ID_DAO_LU_SHI_GONG
-        trafficData.uuid = info.warningMsg[0].signSerialNum.toString()
-        trafficData.lat = info.warningMsg[0].position.latitude
-        trafficData.lon = info.warningMsg[0].position.longitude
-        trafficData.threatLevel = info.warningMsg[0].warningLevel
+        trafficData.uuid = info.warningMsgList[0].signSerialNum.toString()
+        trafficData.lat = info.warningMsgList[0].position.position.positionLatLon.latitude
+        trafficData.lon = info.warningMsgList[0].position.position.positionLatLon.longitude
+        trafficData.threatLevel = info.warningMsgList[0].warningLevel
         return trafficData
     }
 
     /**
      * OBU 预警事件 转换交通元素数据 他车预警
      */
-    fun cvxV2vThreatIndInfo2TrafficData(info: MogoObuRvWarningData): TrafficData? {
-        if (info == null || info.vehBasicsMsg == null || info.warningMsg == null) {
+    fun cvxV2vThreatIndInfo2TrafficData(info: ObuScene.RvWarningData): TrafficData? {
+        if (info?.vehBasicsMsg == null || info.warningMsg == null) {
             CallerLogger.e("$M_OBU$TAG", "数据转换异常，请检查参数是否齐全")
             return null
         }
@@ -68,8 +70,8 @@ object TrafficDataConvertUtilsNew {
         trafficData.heading = info.vehBasicsMsg.heading
         trafficData.speed = info.vehBasicsMsg.speed
         // 判断车辆V2X预警级别，调整车辆颜色
-        if (info.warningMsg.warningData != null) {
-            trafficData.threatLevel = info.warningMsg.warningData[0].warningLevel
+        if (info.warningMsg.warningDataList != null) {
+            trafficData.threatLevel = info.warningMsg.warningDataList[0].warningLevel
         } else {
             trafficData.threatLevel = 1
         }
@@ -81,7 +83,7 @@ object TrafficDataConvertUtilsNew {
     /**
      * OBU 弱势交通参与者信息 转换交通元素数据
      */
-    fun cvxPtcThreatIndInfo2TrafficData(info: MogoObuRsmWarningData): TrafficData? {
+    fun cvxPtcThreatIndInfo2TrafficData(info: ObuScene.RsmWarningData): TrafficData? {
         if (info.participant == null) {
             CallerLogger.e("$M_OBU$TAG", "数据转换异常，请检查参数是否齐全")
             return null
@@ -121,8 +123,8 @@ object TrafficDataConvertUtilsNew {
         }
 
         // 判断车辆V2X预警级别，调整车辆颜色
-        if (info.warningMsg != null && info.warningMsg.warningData != null) {
-            trafficData.threatLevel = info.warningMsg.warningData[0].warningLevel
+        if (info.warningMsg != null && info.warningMsg.warningDataList != null) {
+            trafficData.threatLevel = info.warningMsg.warningDataList[0].warningLevel
         } else {
             trafficData.threatLevel = 1
         }

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

@@ -68,8 +68,7 @@ dependencies {
 
 //    debugImplementation rootProject.ext.dependencies.debugleakcanary
 //    releaseImplementation rootProject.ext.dependencies.releaseleakcanary
-
-    implementation rootProject.ext.dependencies.mogoobu
+    implementation project(':libraries:mogo-obu')
     implementation rootProject.ext.dependencies.arouter
     kapt rootProject.ext.dependencies.aroutercompiler