diff --git a/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt b/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt index 70cc28725c..afc38df8b6 100644 --- a/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt +++ b/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt @@ -36,6 +36,7 @@ object ConfigStartUp { AppConfigInfo.workingBranchName = BuildConfig.WORKING_BRANCH_NAME AppConfigInfo.workingBranchHash = BuildConfig.WORKING_BRANCH_HASH AppConfigInfo.appBuildTime = BuildConfig.APP_BUILD_TIME + AppConfigInfo.flavor = BuildConfig.FLAVOR // 使用与渠道配置一样的gps提供者提供的数据,app/productFlavors/fPadLenovo.gradle GPS_PROVIDER 0-Android系统,1-工控机,2-OBU FunctionBuildConfig.gpsProvider = BuildConfig.GPS_PROVIDER // 演示模式,上一次勾选的数据 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 62e8fb2254..9d8a58dba7 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 @@ -1520,8 +1520,8 @@ internal class DebugSettingView @JvmOverloads constructor( /** * 版本信息 */ - tvAppVersionName.text = "鹰眼版本:${AppUtils.getAppVersionName()} Git Hash:${AppConfigInfo.workingBranchHash}" - tvAppVersionNameKey.text = "鹰眼版本:${AppUtils.getAppVersionName()} Git Hash:${AppConfigInfo.workingBranchHash}" + tvAppVersionName.text = "鹰眼版本:${AppUtils.getAppVersionName()} Git Hash:${AppConfigInfo.workingBranchHash} \n渠道信息:${AppConfigInfo.flavor}" + tvAppVersionNameKey.text = "鹰眼版本:${AppUtils.getAppVersionName()} Git Hash:${AppConfigInfo.workingBranchHash}\n渠道信息:${AppConfigInfo.flavor}" tvAutopilotProtocolVersionInfo.text = "Autopilot协议版本:${CallerAutoPilotControlManager.getProtocolVersion()}" 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 b200715c08..1a4d759209 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 @@ -22,6 +22,7 @@ object AppConfigInfo { val appPackageName: String = AppUtils.getAppPackageName() var uniqueDeviceId: String = "" var widevineIDMd5: String = "" + var flavor: String = "" // 高精地图版本 var mapSdkVersion: String = "" @@ -92,6 +93,7 @@ object AppConfigInfo { "应用名称:${appName}
" + "应用版本号:${appVersionCode}
" + "应用版本名称:${appVersionName}
" + + "应用版本渠道:${flavor}
" + "------------------Git信息---------------------
" + "Git分支名称:
${workingBranchName}
" + "Git分支HASH:${workingBranchHash}
" + @@ -190,7 +192,7 @@ fun AppConfigInfo.toConfigUpload(): ConfigUpload { configUpload.appPackageName = appPackageName configUpload.appFotaVersion = Build.VERSION.RELEASE configUpload.appVersionCode = appVersionCode - configUpload.appVersionName = appVersionName + configUpload.flavor = flavor configUpload.connectStatusDescribe = connectStatusDescribe configUpload.dockerVersion = dockerVersion configUpload.iPCMacAddress = iPCMacAddress diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/ConfigUpload.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/ConfigUpload.kt index 04870277a0..dc91c795a2 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/ConfigUpload.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/ConfigUpload.kt @@ -11,6 +11,7 @@ class ConfigUpload( var appVersionCode: Int = 0, var appVersionName: String? = null, var appPackageName: String? = null, + var flavor: String? = null, var uniqueDeviceId: String? = null, var widevineIDMd5: String? = null, var mapSdkVersion: String? = null,