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-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt index 379e51d974..bcf11f56ee 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt @@ -44,8 +44,6 @@ class MoGoAdasMsgConnectStatusListenerImpl : OnAdasConnectStatusListener, CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().connectPort = AdasManager.getInstance().ipcConnectedPort CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().connectStatus = true - CallerAutoPilotStatusListenerManager.invokeAutoPilotStatus() - // 同步SN给工控机 syncBasicInfoToAutopilot() // 开启轮询上传自动驾驶状态 @@ -69,7 +67,6 @@ class MoGoAdasMsgConnectStatusListenerImpl : OnAdasConnectStatusListener, mCurrentAutopilotSpeed = 0.0f CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().state = 0 CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().pilotmode = 0 - CallerAutoPilotStatusListenerManager.invokeAutoPilotStatus() } else if (ipcConnectionStatus == Constants.IPC_CONNECTION_STATUS.CONNECTING) { CallerLogger.d("$M_ADAS_IMPL$TAG", "webSocket 正在连接") } else if (ipcConnectionStatus == Constants.IPC_CONNECTION_STATUS.SEARCH_ADDRESS) { @@ -77,6 +74,8 @@ class MoGoAdasMsgConnectStatusListenerImpl : OnAdasConnectStatusListener, } else if (ipcConnectionStatus == Constants.IPC_CONNECTION_STATUS.NOT_FOUND_ADDRESS) { CallerLogger.d("$M_ADAS_IMPL$TAG", "webSocket 找不到可用IP 传入的IP不可用或固定IP列表中所有IP不可用") } + CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().connectStatusDescribe=reason + CallerAutoPilotStatusListenerManager.invokeAutoPilotStatus() } /** 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 e14efe0062..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 @@ -1177,8 +1177,9 @@ class DebugSettingView @JvmOverloads constructor( it.iterator().forEach {map -> val name = if(map.key.contains("{")) map.key.replace("{","") else map.key val url = if(map.value.contains("}")) map.value.replace("}","") else map.value - upgradeVersionList.add(UpgradeVersionEntity(name,url)) + upgradeVersionList.add(UpgradeVersionEntity(name.trim(),url)) } + upgradeVersionList.sortByDescending { upgradeVersionEntity ->upgradeVersionEntity.name } upgradeListAdapter?.setDada(dataFilter(upgradeVersionList)) upgradeListAdapter?.notifyDataSetChanged() } @@ -1423,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() @@ -1476,11 +1478,17 @@ class DebugSettingView @JvmOverloads constructor( ) tvAutopilotConnectStatus.text = Html.fromHtml( - "Autopilot系统连接状态:${ + "工控机连接状态:${ if (AppConfigInfo.isConnectAutopilot) { "正常" } else { - "异常" + "异常 原因:${ + if(AppConfigInfo.connectStatusDescribe.isNullOrEmpty()){ + "主动断开连接" + }else{ + AppConfigInfo.connectStatusDescribe + } + }" } }" ) @@ -1577,14 +1585,16 @@ class DebugSettingView @JvmOverloads constructor( override fun onAutopilotStatusResponse(autoPilotStatusInfo: AutopilotStatusInfo) { mAutoPilotStatusInfo = autoPilotStatusInfo AppConfigInfo.isConnectAutopilot = autoPilotStatusInfo.connectStatus - if (autoPilotStatusInfo.connectStatus) { - adasConnectStatus = true - } + AppConfigInfo.connectStatusDescribe = autoPilotStatusInfo.connectStatusDescribe + +// if (autoPilotStatusInfo.connectStatus) { +// adasConnectStatus = true +// } //ADAS断开连接,提示异常 - if (adasConnectStatus && !autoPilotStatusInfo.connectStatus) { - adasConnectStatus = false - toastMsg("Autopilot系统连接状态异常") - } +// if (adasConnectStatus && !autoPilotStatusInfo.connectStatus) { +// adasConnectStatus = false +// toastMsg("工控机连接断开") +// } } override fun onAutopilotCarStateData(gnssInfo: MessagePad.GnssInfo?) { 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" /> + + + +