Merge branch 'dev_arch_opt_3.0' into 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0'

Dev arch opt 3.0

See merge request zhjt/AndroidApp/MoGoEagleEye!523

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/AppConfigInfo.kt

@@ -28,6 +28,7 @@ object AppConfigInfo {
 
     // 高精地图版本
     var mapSdkVersion: String? = null
+
     // 高精地图采集版本
     var mapSdkOptVersion: String? = null
     var adasSdkVersion: String? = null
@@ -40,12 +41,15 @@ object AppConfigInfo {
     //车牌号
     @Volatile
     var plateNumber: String? = null
+
     //工控机MAC地址
     @Volatile
     var iPCMacAddress: String? = null
+
     //工控机DockerVersion
     @Volatile
     var dockerVersion: String? = null
+
     //工控机协议版本
     var protocolVersionNumber: Int = 0
 
@@ -168,11 +172,17 @@ object AppConfigInfo {
                         "<font color='red'>"
                     }
                 }${isConnectedNetty}</font><br/>" +
-                "<font color='red' size='30'>------------------工控机感知&规控数据---------------------</font><br/>"
+                "<font color='red' size='30'>------------------工控机数据---------------------</font><br/>"+
+                "车牌：${plateNumber}<br/>" +
+                "mac：${iPCMacAddress}<br/>" +
+                "docker version：${dockerVersion}<br/>" +
+                "protocol：${protocolVersionNumber}<br/>" +
+                "<font color='red' size='30'>------------------业务信息---------------------</font><br/>"+
+                "角色：$role , isDriver : $isDriver <br/>"
     }
 }
 
-fun AppConfigInfo.toConfigUpload():ConfigUpload{
+fun AppConfigInfo.toConfigUpload(): ConfigUpload {
     val configUpload = ConfigUpload()
     configUpload.adasSdkVersion = adasSdkVersion
     configUpload.appBuildTime = appBuildTime
@@ -199,12 +209,11 @@ fun AppConfigInfo.toConfigUpload():ConfigUpload{
     configUpload.protocolVersionNumber = protocolVersionNumber
     configUpload.role = role
     configUpload.serverSn = serverSn
-    configUpload.iPCMacAddress = iPCMacAddress
     configUpload.teleTimeStamp = teleTimeStamp
     configUpload.timeStamp = System.currentTimeMillis()
     configUpload.uniqueDeviceId = uniqueDeviceId
     configUpload.widevineIDMd5 = widevineIDMd5
     configUpload.workingBranchHash = workingBranchHash
     configUpload.workingBranchName = workingBranchName
-        return configUpload
+    return configUpload
 }

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt

@@ -89,6 +89,14 @@ object FunctionBuildConfig {
     @JvmField
     var isFusionColor = false
 
+    /**
+     * 是否开启obu rv预警感知物融合功能 , 仅大理，烟台交付项目
+     * 默认关闭
+     */
+    @Volatile
+    @JvmField
+    var isObuWarningFusionUnion = false
+
     /**
      * 当前APP的身份模式
      *