diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/exam/ExamControlWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/exam/ExamControlWindow.kt index 8d88cdd528..81e38db78d 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/exam/ExamControlWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/exam/ExamControlWindow.kt @@ -89,8 +89,8 @@ class ExamControlWindow constructor(activity: Activity): View.OnTouchListener{ it.format = PixelFormat.RGBA_8888 it.flags = WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL it.gravity = Gravity.START or Gravity.TOP - it.width = 844 - it.height = 1114 + it.width = 906 + it.height = 1176 it.alpha = 1.0f } } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bg_exam_control.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bg_exam_control.png index a40da16f09..ad6d51ad00 100644 Binary files a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bg_exam_control.png and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bg_exam_control.png differ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bg_exam_control_title.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bg_exam_control_title.png deleted file mode 100644 index 585ffb61a2..0000000000 Binary files a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bg_exam_control_title.png and /dev/null differ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_aeb_normal.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_aeb_normal.png index a07aa3594c..801c6cfbdd 100644 Binary files a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_aeb_normal.png and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_aeb_normal.png differ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_lane_change_normal.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_lane_change_normal.png index 4cbbd6bda0..3692dcd9c6 100644 Binary files a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_lane_change_normal.png and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_lane_change_normal.png differ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_map_speed_normal.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_map_speed_normal.png index d397e04bd9..a914eb77ee 100644 Binary files a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_map_speed_normal.png and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_map_speed_normal.png differ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_ramp_normal.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_ramp_normal.png index fe542d8ecc..172e09b156 100644 Binary files a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_ramp_normal.png and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_ramp_normal.png differ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_ramp_pressed.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_ramp_pressed.png index 18200a09fc..d953d14cff 100644 Binary files a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_ramp_pressed.png and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_ramp_pressed.png differ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_stop_yield_normal.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_stop_yield_normal.png index b1b8bbe519..bd181e0866 100644 Binary files a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_stop_yield_normal.png and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_stop_yield_normal.png differ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/seat_driver_press_bg.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/seat_driver_press_bg.png index 55670d81d3..317f4a21eb 100644 Binary files a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/seat_driver_press_bg.png and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/seat_driver_press_bg.png differ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_exam_control.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_exam_control.xml index 30f6ada4eb..f87e7f04f6 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_exam_control.xml +++ b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_exam_control.xml @@ -1,38 +1,27 @@ - - @@ -197,7 +187,7 @@ app:layout_constraintTop_toBottomOf="@id/viewVehicleModeBg" app:layout_constraintLeft_toLeftOf="parent" android:layout_marginTop="@dimen/dp_40" - android:layout_marginLeft="@dimen/dp_47" + android:layout_marginLeft="@dimen/dp_78" android:background="@drawable/bg_exam_seat_status" /> @@ -269,7 +259,7 @@ app:layout_constraintRight_toRightOf="parent" android:src="@drawable/exam_line_to_right_selector" android:layout_marginTop="@dimen/dp_40" - android:layout_marginRight="@dimen/dp_47" + android:layout_marginRight="@dimen/dp_78" android:contentDescription="@string/exam_line_to_right" /> @@ -340,6 +330,7 @@ app:layout_constraintBottom_toBottomOf="parent" android:src="@drawable/exam_emergency_stop_selector" android:contentDescription="@string/exam_emergency_stop" + android:layout_marginBottom="@dimen/dp_31" /> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_single_traffic_light_bg.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_single_traffic_light_bg.png new file mode 100644 index 0000000000..48e32f5c4e Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_single_traffic_light_bg.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_single_traffic_light_perception_bg.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_single_traffic_light_perception_bg.png new file mode 100644 index 0000000000..24114d6604 Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_single_traffic_light_perception_bg.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml index 1a533a43cd..d5639346ad 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml @@ -98,6 +98,8 @@ 再按一次退出应用 %s-%s + + 红绿灯灯态 云端下发 自车感知 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 0eacc22ee8..1c4d3ab30b 100644 --- a/core/mogo-core-res/src/main/res/values/dimens.xml +++ b/core/mogo-core-res/src/main/res/values/dimens.xml @@ -1039,6 +1039,7 @@ 1137dp 1158dp 1170dp + 1176dp 1200dp 1241dp 1250dp @@ -1096,6 +1097,7 @@ 69dp 72dp 76dp + 80dp 90dp 94dp 102dp