Merge branch 'dev_robotaxi-p-app_254_220228_2.5.4'

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt

@@ -468,10 +468,21 @@ class DebugSettingView @JvmOverloads constructor(
     private fun drawAppInfo() {
         AppConfigInfo.appName = AppUtils.getAppName()
         AppConfigInfo.appName = AppUtils.getAppName()
-        AppConfigInfo.appVersionCode = AppUtils.getAppVersionCode()
-        AppConfigInfo.appVersionName = AppUtils.getAppVersionName()
-        AppConfigInfo.appPackageName = AppUtils.getAppPackageName()
-        AppConfigInfo.uniqueDeviceId = DeviceIdUtils.getDeviceId(AbsMogoApplication.getApp())
+        if (AppConfigInfo.appVersionCode == 0) {
+            AppConfigInfo.appVersionCode = AppUtils.getAppVersionCode()
+        }
+        if (AppConfigInfo.appVersionName.isNullOrEmpty()) {
+            AppConfigInfo.appVersionName = AppUtils.getAppVersionName()
+        }
+        if (AppConfigInfo.appPackageName.isNullOrEmpty()) {
+            AppConfigInfo.appPackageName = AppUtils.getAppPackageName()
+        }
+        if (AppConfigInfo.uniqueDeviceId.isNullOrEmpty()) {
+            AppConfigInfo.uniqueDeviceId = DeviceIdUtils.getDeviceId(AbsMogoApplication.getApp())
+        }
+        if (AppConfigInfo.widevineIDMd5.isNullOrEmpty()) {
+            AppConfigInfo.widevineIDMd5 = DeviceIdUtils.getWidevineIDWithMd5(AbsMogoApplication.getApp())
+        }
         AppConfigInfo.mogoSN = MoGoAiCloudClient.getInstance().aiCloudClientConfig.sn
         AppConfigInfo.mogoToken = MoGoAiCloudClient.getInstance().aiCloudClientConfig.token
         AppConfigInfo.netMode = DebugConfig.getNetMode()

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

@@ -16,6 +16,7 @@ object AppConfigInfo {
     var appVersionName: String? = null
     var appPackageName: String? = null
     var uniqueDeviceId: String? = null
+    var widevineIDMd5: String? = null
 
     // 高精地图版本
     var mapSdkVersion: String? = null
@@ -58,6 +59,7 @@ object AppConfigInfo {
                 "ADAS-SDK版本：${adasSdkVersion}<br/>" +
                 "OBU-SDK版本：${obuSdkVersion}<br/>" +
                 "<font color='red' size='30'>------------------鉴权信息---------------------</font><br/>" +
+                "数字版权ID：${widevineIDMd5}<br/>" +
                 "PAD唯一标志：${uniqueDeviceId}<br/>" +
                 //"mogoToken：${mogoToken}<br/>"+
                 "中台分配的SN：${mogoSN}<br/>" +

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/TrafficTypeEnum.kt

@@ -18,8 +18,8 @@ enum class TrafficTypeEnum(
     TYPE_TRAFFIC_ID_WEI_ZHI(
         100,
         "未知数据",
-        R.raw.special_vehicle,
-        R.raw.special_vehicle
+        R.raw.fangkuang,
+        R.raw.fangkuang
     ),
     TYPE_TRAFFIC_ID_PEOPLE(
         1,