From 382fd6a36bc98744bc8e3ad73fc925dc6b733186 Mon Sep 17 00:00:00 2001
From: xuxinchao <13522809046@163.com>
Date: Mon, 25 Apr 2022 19:19:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
版本信息增加版本构建时间
---
app/build.gradle | 13 +++++++++++++
.../java/com/mogo/launcher/MogoApplication.java | 1 +
.../function/hmi/ui/setting/DebugSettingView.kt | 1 +
.../src/main/res/layout/view_debug_setting.xml | 11 +++++++++++
.../com/mogo/eagle/core/data/app/AppConfigInfo.kt | 1 +
5 files changed, 27 insertions(+)
diff --git a/app/build.gradle b/app/build.gradle
index 8cd6cdab96..aed4fbd960 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
apply plugin: 'com.android.application'
apply plugin: 'com.alibaba.arouter'
apply plugin: 'kotlin-android'
@@ -180,6 +182,7 @@ android {
buildConfigField 'String', 'SOCKET_APP_ID', '\"com.mogo.launcher\"'
buildConfigField 'String', 'WORKING_BRANCH_NAME', getWorkingBranchName()
buildConfigField 'String', 'WORKING_BRANCH_HASH', getWorkingBranchHash()
+ buildConfigField 'String', 'APP_BUILD_TIME', getBuildTime()
// 是否支持目的地导航策略
buildConfigField 'boolean', 'IS_SUPPORT_SCHEDULE_CALCULATE_NOT_HOME_COMPANY_DISTANCE_FOR_PUSH', 'false'
}
@@ -331,6 +334,16 @@ def getWorkingBranchHash() {
return "\"${workingBranchHash}\""
}
+static def getBuildTime() {
+ def buildTimeFormat = "yyyy-MM-dd HH:mm:ss"
+ //设置时间格式
+ SimpleDateFormat formatter = new SimpleDateFormat(buildTimeFormat, Locale.getDefault())
+ //获取当前时间
+ Date curDate = new Date(System.currentTimeMillis())
+ def buildTime = formatter.format(curDate)
+ return "\"${buildTime}\""
+}
+
boolean isAndroidTestBuild() {
for (String s : gradle.startParameter.taskNames) {
diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java
index 7ea1b64e0d..ba92b0d487 100644
--- a/app/src/main/java/com/mogo/launcher/MogoApplication.java
+++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java
@@ -73,6 +73,7 @@ public class MogoApplication extends MainMoGoApplication {
// 初始化构建APP的时候的分支及提交HASH,用于辅助定位问题
AppConfigInfo.INSTANCE.setWorkingBranchName(BuildConfig.WORKING_BRANCH_NAME);
AppConfigInfo.INSTANCE.setWorkingBranchHash(BuildConfig.WORKING_BRANCH_HASH);
+ AppConfigInfo.INSTANCE.setAppBuildTime(BuildConfig.APP_BUILD_TIME);
// 使用与渠道配置一样的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 99fb82b0f5..9207392d7d 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
@@ -1424,6 +1424,7 @@ class DebugSettingView @JvmOverloads constructor(
}
tvMoGoMapVersion.text = "HD-Map版本:${MogoMap.getInstance().mogoMap.mapVersion}"
tvGitBranchInfo.text = "Git分支:${AppConfigInfo.workingBranchName}"
+ tvAppBuildTimeInfo.text = "版本构建时间:${AppConfigInfo.appBuildTime}"
tvGitHashInfo.text = "Git-Hash:${AppConfigInfo.workingBranchHash}"
tvAndroidSystemVersion.text = "Android系统版本:" + DeviceUtils.getSDKVersionName()
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
index df3a586bdc..afaac05e7f 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
@@ -300,6 +300,17 @@
android:layout_height="1dp"
android:background="#F0F0F0" />
+
+
+
+