From b07dd902d1500cfe236ddfa0b8ee96a1ec631a2f Mon Sep 17 00:00:00 2001 From: donghongyu Date: Wed, 2 Mar 2022 14:01:35 +0800 Subject: [PATCH] =?UTF-8?q?[Change]=20=E4=BF=AE=E5=A4=8D=E6=95=B0=E5=AD=97?= =?UTF-8?q?=E7=89=88=E6=9D=83ID=E5=8A=A0=E5=AF=86=E9=80=A0=E6=88=90?= =?UTF-8?q?=E7=9A=84=E5=8D=A1=E9=A1=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- app/productFlavors/fPadLenovo.gradle | 2 +- .../hmi/ui/setting/DebugSettingView.kt | 20 ++++++++++++++----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/app/productFlavors/fPadLenovo.gradle b/app/productFlavors/fPadLenovo.gradle index cd72bc87d6..31335d67d8 100644 --- a/app/productFlavors/fPadLenovo.gradle +++ b/app/productFlavors/fPadLenovo.gradle @@ -29,7 +29,7 @@ project.android.productFlavors { // 构建的应用身份类型，司机｜乘客 buildConfigField 'int', 'APP_IDENTITY_MODE', "0x02" // 连接的工控机IP地址 - buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.102\"" + buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.104\"" // 构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'true' } 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 5058f75ed1..fb7ea4c1ec 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 @@ -411,11 +411,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()) - AppConfigInfo.widevineIDMd5 = DeviceIdUtils.getWidevineIDWithMd5(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()