From 0ec519710d177b37794e1bc7509769474be1653b Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Tue, 1 Apr 2025 11:51:17 +0800 Subject: [PATCH] =?UTF-8?q?[7.0.0]=20=E4=BC=98=E5=8C=96=E8=B0=83=E8=AF=95?= =?UTF-8?q?=E7=AA=97=20=E5=9F=9F=E6=8E=A7=E8=BF=9E=E6=8E=A5=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=98=BE=E7=A4=BA=E5=8C=BA=E5=9F=9F=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hmi/ui/setting/DebugSettingView.kt | 20 +++++++++---------- .../main/res/layout/view_debug_setting.xml | 10 ++++++++-- 2 files changed, 18 insertions(+), 12 deletions(-) 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 843b61846f..715abf4fd8 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 @@ -2326,16 +2326,16 @@ internal class DebugSettingView @JvmOverloads constructor( val msg = Html.fromHtml("工控机连接状态:${color}${AppConfigInfo.connectStatusDescribe}") ThreadUtils.runOnUiThread { tvAutopilotConnectStatus.text = msg - if (status == AdasConstants.IpcConnectionStatus.CONNECTED || - status == AdasConstants.IpcConnectionStatus.CONNECTING || - status == AdasConstants.IpcConnectionStatus.RECONNECTING_TIMER || - status == AdasConstants.IpcConnectionStatus.RECONNECTING_NETWORK || - status == AdasConstants.IpcConnectionStatus.SEARCH_ADDRESS - ) { - tvIpcConnectStatus.minLines = 1 - } else { - tvIpcConnectStatus.minLines = 4 - } +// if (status == AdasConstants.IpcConnectionStatus.CONNECTED || +// status == AdasConstants.IpcConnectionStatus.CONNECTING || +// status == AdasConstants.IpcConnectionStatus.RECONNECTING_TIMER || +// status == AdasConstants.IpcConnectionStatus.RECONNECTING_NETWORK || +// status == AdasConstants.IpcConnectionStatus.SEARCH_ADDRESS +// ) { +// tvIpcConnectStatus.minLines = 1 +// } else { +// tvIpcConnectStatus.minLines = 4 +// } tvIpcConnectStatus.text = msg //如果是乘客端,则不显示工控机连接状态 if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) { 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 093800dad4..06b854a1a6 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 @@ -188,7 +188,10 @@ android:id="@+id/tvIpcConnectStatus" style="@style/DebugSettingText" android:layout_width="match_parent" - android:layout_height="wrap_content" /> + android:layout_height="wrap_content" + android:ellipsize="end" + android:maxLines="2" + android:minLines="2" /> + android:layout_height="wrap_content" + android:ellipsize="end" + android:maxLines="2" + android:minLines="2" />