diff --git a/.idea/misc.xml b/.idea/misc.xml index 9d33ffd4e5..f0f919b061 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -14,7 +14,7 @@ - + diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt index 1acb90b84d..8564f0990f 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt @@ -40,6 +40,7 @@ class AutoPilotStatusView @JvmOverloads constructor( } private fun initView(context: Context) { + setBackgroundResource(R.drawable.module_hmi_autopilot_status_bg) LayoutInflater.from(context).inflate(R.layout.view_autopilot_status, this, true) val lp = LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT) @@ -100,17 +101,17 @@ class AutoPilotStatusView @JvmOverloads constructor( mAutopilotStatus = autopilotStatus when (autopilotStatus) { IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE -> {// 不可自动驾驶,adas与工控机没有链接,或工控机异常 - clAutopilotStatus.setBackgroundResource(R.drawable.module_hmi_autopilot_status_disabled_bg) + setBackgroundResource(R.drawable.module_hmi_autopilot_status_disabled_bg) tvStatusDes.setTextColor(resources.getColor(R.color.module_mogo_autopilot_status_disable)) ivStatusIcon.setImageResource(R.drawable.icon_autopilot_status_disabled) } IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE -> {// 可自动驾驶,目前处于人工干预状态 - clAutopilotStatus.setBackgroundResource(R.drawable.module_hmi_autopilot_status_enable_bg) + setBackgroundResource(R.drawable.module_hmi_autopilot_status_enable_bg) tvStatusDes.setTextColor(resources.getColor(R.color.module_mogo_autopilot_status_enable)) ivStatusIcon.setImageResource(R.drawable.icon_autopilot_status) } IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING -> {// 自动驾驶中 - clAutopilotStatus.setBackgroundResource(R.drawable.module_hmi_autopilot_status_checked_bg) + setBackgroundResource(R.drawable.module_hmi_autopilot_status_checked_bg) tvStatusDes.setTextColor(resources.getColor(R.color.module_mogo_autopilot_status_enable)) ivStatusIcon.setImageResource(R.drawable.icon_autopilot_status) } 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 af1370e06a..7c1472fa11 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 @@ -25,6 +25,8 @@ class CheckStatusView @JvmOverloads constructor( init { LayoutInflater.from(context).inflate(R.layout.view_check_status, this, true) + setBackgroundResource(R.drawable.module_ext_check) + setOnClickListener { // 启动检测页面 CallerCheckManager.startCheckActivity(getContext()) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml index cd9c84cbd3..4e3202d87f 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml @@ -31,7 +31,8 @@ android:layout_marginTop="@dimen/module_mogo_autopilot_status_margin_top" android:elevation="@dimen/dp_10" app:layout_constraintLeft_toLeftOf="@+id/viewSpeedChart" - app:layout_constraintTop_toBottomOf="@+id/viewSpeedChart" /> + app:layout_constraintTop_toBottomOf="@+id/viewSpeedChart" + app:layout_goneMarginStart="@dimen/module_mogo_autopilot_status_margin_left" /> @@ -75,10 +78,12 @@ android:id="@+id/viewCheckStatus" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="25dp" - app:layout_constraintBottom_toBottomOf="@+id/viewPerspectiveSwitch" + android:layout_marginLeft="25px" + android:layout_marginBottom="40px" + android:elevation="@dimen/dp_10" + app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@+id/viewPerspectiveSwitch" - app:layout_constraintTop_toTopOf="@+id/viewPerspectiveSwitch" /> + app:layout_goneMarginStart="50px" /> \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_autopilot_status.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_autopilot_status.xml index 3fd449accb..4fb61803e9 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_autopilot_status.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_autopilot_status.xml @@ -1,7 +1,6 @@ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_check_status.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_check_status.xml index f544ecb001..811aec84da 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_check_status.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_check_status.xml @@ -14,7 +14,7 @@ android:gravity="center" android:text="检测" android:textColor="#fff" - android:textSize="@dimen/dp_38" + android:textSize="@dimen/module_switch_text_size" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" /> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_perspective_switch.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_perspective_switch.xml index 7551320016..a71a8d7f20 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_perspective_switch.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_perspective_switch.xml @@ -23,7 +23,6 @@ android:id="@+id/textSwitch" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:gravity="right|center" android:paddingLeft="@dimen/module_switch_margin_left" android:text="@string/module_map_model_normal" android:textColor="@color/module_ext_color_voice_text" diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable/module_ext_check.xml b/core/mogo-core-res/src/main/function-hmi-res/drawable/module_ext_check.xml index 23c6cfb635..42243b1d96 100644 --- a/core/mogo-core-res/src/main/function-hmi-res/drawable/module_ext_check.xml +++ b/core/mogo-core-res/src/main/function-hmi-res/drawable/module_ext_check.xml @@ -1,46 +1,13 @@ - - - - - - - - - - - - - - - - - - - - + diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable/module_switch_map_bg.xml b/core/mogo-core-res/src/main/function-hmi-res/drawable/module_switch_map_bg.xml index c3e3441d02..284844ec7c 100644 --- a/core/mogo-core-res/src/main/function-hmi-res/drawable/module_switch_map_bg.xml +++ b/core/mogo-core-res/src/main/function-hmi-res/drawable/module_switch_map_bg.xml @@ -1,40 +1,6 @@ - - - - - - - - - - - - - - - - - - - - - - 30px 70px - 138px + 120px 368px 60px 44px diff --git a/core/mogo-core-res/src/main/res/values/dimens.xml b/core/mogo-core-res/src/main/res/values/dimens.xml index 97e63fb5b4..d47f1eb453 100644 --- a/core/mogo-core-res/src/main/res/values/dimens.xml +++ b/core/mogo-core-res/src/main/res/values/dimens.xml @@ -28,7 +28,7 @@ 20px 50px - 138px + 76px 368px 38px 33px