diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index 358b8c8a73..279169c410 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/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() diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/AppConfigInfo.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/AppConfigInfo.kt index d8bfadb408..9c93745808 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/AppConfigInfo.kt +++ b/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}
" + "OBU-SDK版本:${obuSdkVersion}
" + "------------------鉴权信息---------------------
" + + "数字版权ID:${widevineIDMd5}
" + "PAD唯一标志:${uniqueDeviceId}
" + //"mogoToken:${mogoToken}
"+ "中台分配的SN:${mogoSN}
" + diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/TrafficTypeEnum.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/TrafficTypeEnum.kt index f0b13e9086..7398bfa135 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/TrafficTypeEnum.kt +++ b/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, diff --git a/core/mogo-core-res/src/main/res/raw/fangkuang.nt3d b/core/mogo-core-res/src/main/res/raw/fangkuang.nt3d new file mode 100644 index 0000000000..7c10670e2f Binary files /dev/null and b/core/mogo-core-res/src/main/res/raw/fangkuang.nt3d differ diff --git a/core/mogo-core-res/src/main/res/raw/traffic_unkonwn.nt3d b/core/mogo-core-res/src/main/res/raw/traffic_unkonwn.nt3d index 7c10670e2f..b68c360d5e 100644 Binary files a/core/mogo-core-res/src/main/res/raw/traffic_unkonwn.nt3d and b/core/mogo-core-res/src/main/res/raw/traffic_unkonwn.nt3d differ