diff --git a/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml b/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml index fbba636209..4f62ea025e 100644 --- a/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml +++ b/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml @@ -105,8 +105,8 @@ android:id="@+id/roadV2NEventWindowView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="@dimen/dp_23" - android:layout_marginTop="@dimen/dp_39" + android:layout_marginRight="@dimen/dp_3" + android:layout_marginTop="@dimen/dp_24" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" android:visibility="gone"/> diff --git a/OCH/shuttle/driver/src/main/res/layout/shuttle_base_fragment.xml b/OCH/shuttle/driver/src/main/res/layout/shuttle_base_fragment.xml index b66b6090fb..01bd3f07ef 100644 --- a/OCH/shuttle/driver/src/main/res/layout/shuttle_base_fragment.xml +++ b/OCH/shuttle/driver/src/main/res/layout/shuttle_base_fragment.xml @@ -102,8 +102,8 @@ android:id="@+id/roadV2NEventWindowView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="@dimen/dp_23" - android:layout_marginTop="@dimen/dp_39" + android:layout_marginRight="@dimen/dp_3" + android:layout_marginTop="@dimen/dp_24" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" android:visibility="gone"/> diff --git a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml index 0092351e4a..99437f779d 100644 --- a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml +++ b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml @@ -95,8 +95,8 @@ android:id="@+id/roadV2NEventWindowView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="@dimen/dp_23" - android:layout_marginTop="@dimen/dp_39" + android:layout_marginRight="@dimen/dp_3" + android:layout_marginTop="@dimen/dp_24" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" android:visibility="gone"/> diff --git a/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml b/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml index ae38e5beab..99d848f0f6 100644 --- a/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml +++ b/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml @@ -120,8 +120,8 @@ android:id="@+id/roadV2NEventWindowView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="@dimen/dp_23" - android:layout_marginTop="@dimen/dp_39" + android:layout_marginRight="@dimen/dp_3" + android:layout_marginTop="@dimen/dp_24" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" android:visibility="gone"/> diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml index ffa90b553b..455dfdd732 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml @@ -168,8 +168,8 @@ android:id="@+id/roadV2NEventWindowView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="@dimen/dp_23" - android:layout_marginTop="@dimen/dp_39" + android:layout_marginRight="@dimen/dp_3" + android:layout_marginTop="@dimen/dp_24" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" android:visibility="gone"/> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/v2n/RoadV2NEventWindowView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/v2n/RoadV2NEventWindowView.kt index fbca9dc9e9..2bf68e4695 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/v2n/RoadV2NEventWindowView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/v2n/RoadV2NEventWindowView.kt @@ -173,7 +173,8 @@ class RoadV2NEventWindowView @JvmOverloads constructor( val containerImageAndLiveVideoLayoutParams = containerImageAndLiveVideo.layoutParams as ConstraintLayout.LayoutParams - containerImageAndLiveVideoLayoutParams.width = AutoSizeUtils.dp2px(context, 480f + 18f) //乘客屏视频加载里面背景切图包含了白边 + containerImageAndLiveVideoLayoutParams.width = + AutoSizeUtils.dp2px(context, 480f + 18f) //乘客屏视频加载里面背景切图包含了白边 containerImageAndLiveVideoLayoutParams.height = AutoSizeUtils.dp2px(context, 280f) containerImageAndLiveVideoLayoutParams.setMargins( AutoSizeUtils.dp2px(context, 40f), @@ -253,7 +254,10 @@ class RoadV2NEventWindowView @JvmOverloads constructor( containerIconHintLayoutParams.width = LayoutParams.MATCH_PARENT containerIconHintLayoutParams.height = LayoutParams.WRAP_CONTENT containerIconHintLayoutParams.setMargins( - AutoSizeUtils.dp2px(context, 20f - 19.4f * (54f / 69f)), //乘客屏icon ivV2XImage带了白边, 高度、margin需要计算调整 + AutoSizeUtils.dp2px( + context, + 20f - 19.4f * (54f / 69f) + ), //乘客屏icon ivV2XImage带了白边, 高度、margin需要计算调整 AutoSizeUtils.dp2px(context, 27f - 10.7f * (54f / 69f)), AutoSizeUtils.dp2px(context, 20f), 0 @@ -276,7 +280,10 @@ class RoadV2NEventWindowView @JvmOverloads constructor( val tvV2XHintContentLayoutParams = tvV2XHintContent.layoutParams as RelativeLayout.LayoutParams tvV2XHintContentLayoutParams.setMargins( - AutoSizeUtils.dp2px(context, 21f - 19.7f * (54f / 69f)), //乘客屏icon ivV2XImage带了白边, 高度、margin需要计算调整 + AutoSizeUtils.dp2px( + context, + 21f - 19.7f * (54f / 69f) + ), //乘客屏icon ivV2XImage带了白边, 高度、margin需要计算调整 AutoSizeUtils.dp2px(context, (20f + 14f * (54f / 69f)) - (40f / 2f)), AutoSizeUtils.dp2px(context, 5f), 0 @@ -292,7 +299,8 @@ class RoadV2NEventWindowView @JvmOverloads constructor( val containerImageAndLiveVideoLayoutParams = containerImageAndLiveVideo.layoutParams as ConstraintLayout.LayoutParams - containerImageAndLiveVideoLayoutParams.width = AutoSizeUtils.dp2px(context, 350f + 18f * (350f / 480f)) //乘客屏视频加载里面背景切图包含了白边 + containerImageAndLiveVideoLayoutParams.width = + AutoSizeUtils.dp2px(context, 350f + 18f * (350f / 480f)) //乘客屏视频加载里面背景切图包含了白边 containerImageAndLiveVideoLayoutParams.height = AutoSizeUtils.dp2px(context, 197f) containerImageAndLiveVideoLayoutParams.setMargins( AutoSizeUtils.dp2px(context, 20f), @@ -348,13 +356,18 @@ class RoadV2NEventWindowView @JvmOverloads constructor( private fun setDriverScreenView() { val layoutParam = roundRoadV2NEventContainer.layoutParams as ConstraintLayout.LayoutParams - layoutParam.width = AutoSizeUtils.dp2px(context, (654 + 0 + 0).toFloat()) + layoutParam.width = AutoSizeUtils.dp2px(context, (654 + 20 + 20).toFloat()) layoutParam.height = ConstraintLayout.LayoutParams.WRAP_CONTENT roundRoadV2NEventContainer.layoutParams = layoutParam + // 切图 694*613px, 标注的实际内容 654*573px 其余为白边,白边 左上右下 20px 15px 20px 25px roundRoadV2NEventContainer.background = ContextCompat.getDrawable(context, R.drawable.hmi_v2n_event_bg_driver) - val padding = AutoSizeUtils.dp2px(context, 0f) - roundRoadV2NEventContainer.setPadding(padding, padding, padding, padding) + roundRoadV2NEventContainer.setPadding( + AutoSizeUtils.dp2px(context, 20f), + AutoSizeUtils.dp2px(context, 15f), + AutoSizeUtils.dp2px(context, 20f), + AutoSizeUtils.dp2px(context, 25f) + ) val containerIconHintLayoutParams = containerIconHint.layoutParams as ConstraintLayout.LayoutParams @@ -364,19 +377,19 @@ class RoadV2NEventWindowView @JvmOverloads constructor( AutoSizeUtils.dp2px(context, 30f - 16f), AutoSizeUtils.dp2px(context, 30f - 14f), AutoSizeUtils.dp2px(context, 30f - 16f), - 0 + AutoSizeUtils.dp2px(context, 20f - 18f) ) containerIconHint.layoutParams = containerIconHintLayoutParams val ivV2XImageLayoutParams = ivV2XImage.layoutParams as RelativeLayout.LayoutParams ivV2XImageLayoutParams.width = AutoSizeUtils.dp2px(context, 120f + 16f + 16f) - ivV2XImageLayoutParams.height = AutoSizeUtils.dp2px(context, 120f + 16f + 16f) + ivV2XImageLayoutParams.height = AutoSizeUtils.dp2px(context, 120f + 14f + 18f) ivV2XImage.layoutParams = ivV2XImageLayoutParams val tvV2XHintContentLayoutParams = tvV2XHintContent.layoutParams as RelativeLayout.LayoutParams tvV2XHintContentLayoutParams.setMargins( - AutoSizeUtils.dp2px(context, 30f - 14f), + AutoSizeUtils.dp2px(context, 20f - 16f), AutoSizeUtils.dp2px(context, (60f + 16f) - (50f / 2f)), AutoSizeUtils.dp2px(context, 5f), 0 @@ -395,7 +408,7 @@ class RoadV2NEventWindowView @JvmOverloads constructor( containerImageAndLiveVideoLayoutParams.height = AutoSizeUtils.dp2px(context, 330f) containerImageAndLiveVideoLayoutParams.setMargins( AutoSizeUtils.dp2px(context, 30f), - AutoSizeUtils.dp2px(context, 20f - 16f), + AutoSizeUtils.dp2px(context, 0f), AutoSizeUtils.dp2px(context, 30f), 0 ) @@ -409,9 +422,9 @@ class RoadV2NEventWindowView @JvmOverloads constructor( tvV2XTimeStrLayoutParams.height = LayoutParams.WRAP_CONTENT tvV2XTimeStrLayoutParams.setMargins( AutoSizeUtils.dp2px(context, 30f), - AutoSizeUtils.dp2px(context, 12f), + AutoSizeUtils.dp2px(context, 20f), AutoSizeUtils.dp2px(context, 30f), - AutoSizeUtils.dp2px(context, 24f) + AutoSizeUtils.dp2px(context, 30f) ) tvV2XTimeStr.layoutParams = tvV2XTimeStrLayoutParams tvV2XTimeStr.setTextColor(Color.parseColor("#999999")) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/hmi_v2n_event_bg_driver.9.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/hmi_v2n_event_bg_driver.9.png deleted file mode 100644 index b74233c31f..0000000000 Binary files a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/hmi_v2n_event_bg_driver.9.png and /dev/null differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/hmi_v2n_event_bg_driver.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/hmi_v2n_event_bg_driver.png new file mode 100644 index 0000000000..0fbb2662f6 Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/hmi_v2n_event_bg_driver.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_fsm_status_detail_close.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_fsm_status_detail_close.xml index 1d9b7398e3..830917c1b7 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_fsm_status_detail_close.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_fsm_status_detail_close.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_fsm_item_layout.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_fsm_item_layout.xml index ad87fa36f5..6044325daa 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_fsm_item_layout.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_fsm_item_layout.xml @@ -1,29 +1,40 @@ - + android:layout_height="wrap_content"> - + + + + + android:textSize="@dimen/sp_34" + app:layout_constraintLeft_toRightOf="@id/imageContainer" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toTopOf="@id/imageContainer" + tools:text="未收到全局轨迹状态 + 档位不是D + 主车制动未释放 + 未收到SsmPilotState未收到" /> - \ No newline at end of file + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_fsm_layout.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_fsm_layout.xml index 3e0d736fcb..be6e83f206 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_fsm_layout.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_fsm_layout.xml @@ -20,6 +20,7 @@ android:text="" android:textColor="#FF4E41" android:textSize="@dimen/sp_46" + android:textStyle="bold" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent"