From c0ac4beda6724c6a9d362965de49fe3f0336590c Mon Sep 17 00:00:00 2001 From: renwj Date: Wed, 23 Mar 2022 17:34:34 +0800 Subject: [PATCH] =?UTF-8?q?[UiFix]=E4=BF=AE=E6=AD=A3UI=E8=B5=B0=E6=9F=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feedback/biz/FeedBackView.kt | 2 +- .../src/main/res/layout/layout_fb_badcase.xml | 3 +- .../hmi/ui/tools/AutoPilotAndCheckView.kt | 3 + .../hmi/ui/tools/SpeedKeyboardView.kt | 3 + .../function/hmi/ui/widget/CheckStatusView.kt | 6 + .../hmi/ui/widget/SystemVersionView.kt | 6 + .../main/res/layout/view_auto_pilot_check.xml | 30 +- .../src/main/assets/loc.txt | 63141 ++++++++++++---- 8 files changed, 47758 insertions(+), 15436 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/feedback/biz/FeedBackView.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/feedback/biz/FeedBackView.kt index d772dac0a7..d9f0d42445 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/feedback/biz/FeedBackView.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/feedback/biz/FeedBackView.kt @@ -97,7 +97,7 @@ internal class FeedBackView : ConstraintLayout { transitionTo(0) } else { editOutRect.run { - transitionTo(-( it - top + height() + 240.PX)) + transitionTo(-( it - top + height() + 300.PX)) } } }.also { diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_fb_badcase.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_fb_badcase.xml index f455ace3e0..ec0017f310 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_fb_badcase.xml +++ b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_fb_badcase.xml @@ -96,7 +96,8 @@ android:layout_height="wrap_content" android:textSize="28px" android:layout_gravity="end" - tools:text="126/200"/> + tools:text="126/200" + android:layout_marginBottom="30px"/> 0) { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/CheckStatusView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/CheckStatusView.kt index bae066eb4c..740d3f9fb6 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/CheckStatusView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/CheckStatusView.kt @@ -45,12 +45,18 @@ class CheckStatusView @JvmOverloads constructor( override fun onAttachedToWindow() { super.onAttachedToWindow() //车辆监控 + if (isInEditMode) { + return + } CallerCheckManager.registerVehicleMonitoringListener(TAG, this) } override fun onDetachedFromWindow() { super.onDetachedFromWindow() //车辆监控 + if (isInEditMode) { + return + } CallerCheckManager.unregisterListener(TAG) } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt index 6549db378f..735fa690f6 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt @@ -266,11 +266,17 @@ class SystemVersionView @JvmOverloads constructor( override fun onAttachedToWindow() { super.onAttachedToWindow() + if (isInEditMode) { + return + } CallerAutoPilotStatusListenerManager.addListener(TAG, this) } override fun onDetachedFromWindow() { super.onDetachedFromWindow() + if (isInEditMode) { + return + } CallerAutoPilotStatusListenerManager.removeListener(TAG) } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_auto_pilot_check.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_auto_pilot_check.xml index c9c6fb2903..99ffdd2b3c 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_auto_pilot_check.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_auto_pilot_check.xml @@ -3,8 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="960px" - android:layout_height="match_parent" - android:background="@color/notice_check_dialog_bg_color"> + android:layout_height="match_parent"> + android:layout_height="wrap_content"> - + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + android:layout_marginStart="142px"> - - +