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 ed894c65ad..92784cab63 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 @@ -106,40 +106,40 @@ class RoadV2NEventWindowView @JvmOverloads constructor( containerIconHintLayoutParams.width = LayoutParams.MATCH_PARENT containerIconHintLayoutParams.height = LayoutParams.WRAP_CONTENT containerIconHintLayoutParams.setMargins( - AutoSizeUtils.dp2px(context, 50f - 17f), //乘客屏icon ivV2XImage带了白边, 高度、margin需要计算调整 - AutoSizeUtils.dp2px(context, 40f), - AutoSizeUtils.dp2px(context, 50f), + AutoSizeUtils.dp2px(context, 36f - 14f), //乘客屏icon ivV2XImage带了白边, 高度、margin需要计算调整 + AutoSizeUtils.dp2px(context, 30f), + AutoSizeUtils.dp2px(context, 36f), 0 ) containerIconHint.layoutParams = containerIconHintLayoutParams val ivV2XImageLayoutParams = ivV2XImage.layoutParams as RelativeLayout.LayoutParams ivV2XImageLayoutParams.width = - AutoSizeUtils.dp2px(context, 69f + 34f) //乘客屏icon ivV2XImage带了白边, 高度、margin需要计算调整 + AutoSizeUtils.dp2px(context, 69f + 14f + 14f) //乘客屏icon ivV2XImage带了白边, 高度、margin需要计算调整 ivV2XImageLayoutParams.height = - AutoSizeUtils.dp2px(context, 69f + 34f) //乘客屏icon ivV2XImage带了白边, 高度、margin需要计算调整 + AutoSizeUtils.dp2px(context, 69f + 14f + 14f) //乘客屏icon ivV2XImage带了白边, 高度、margin需要计算调整 ivV2XImage.layoutParams = ivV2XImageLayoutParams val tvV2XHintContentLayoutParams = tvV2XHintContent.layoutParams as RelativeLayout.LayoutParams tvV2XHintContentLayoutParams.setMargins( - AutoSizeUtils.dp2px(context, 30f - 17f), //乘客屏icon ivV2XImage带了白边, 高度、margin需要计算调整 + AutoSizeUtils.dp2px(context, 30f - 14f), //乘客屏icon ivV2XImage带了白边, 高度、margin需要计算调整 0, - AutoSizeUtils.dp2px(context, 15f), + AutoSizeUtils.dp2px(context, 5f), 0 ) tvV2XHintContent.layoutParams = tvV2XHintContentLayoutParams tvV2XHintContent.setTextColor(Color.parseColor("#131415")) - tvV2XHintContent.setPadding(0, 0, 0, AutoSizeUtils.dp2px(context, 16f)) + tvV2XHintContent.setPadding(0, 0, 0, AutoSizeUtils.dp2px(context, 28f)) val containerImageAndLiveVideoLayoutParams = containerImageAndLiveVideo.layoutParams as ConstraintLayout.LayoutParams - containerImageAndLiveVideoLayoutParams.width = AutoSizeUtils.dp2px(context, 498f) - containerImageAndLiveVideoLayoutParams.height = AutoSizeUtils.dp2px(context, 298f) + containerImageAndLiveVideoLayoutParams.width = AutoSizeUtils.dp2px(context, 480f) + containerImageAndLiveVideoLayoutParams.height = AutoSizeUtils.dp2px(context, 280f) containerImageAndLiveVideoLayoutParams.setMargins( - AutoSizeUtils.dp2px(context, 51f), + AutoSizeUtils.dp2px(context, 40f), AutoSizeUtils.dp2px(context, 0f), //乘客屏icon ivV2XImage带了白边 - AutoSizeUtils.dp2px(context, 51f), + AutoSizeUtils.dp2px(context, 40f), 0 ) containerImageAndLiveVideo.layoutParams = containerImageAndLiveVideoLayoutParams @@ -151,10 +151,10 @@ class RoadV2NEventWindowView @JvmOverloads constructor( tvV2XTimeStrLayoutParams.width = LayoutParams.MATCH_PARENT tvV2XTimeStrLayoutParams.height = LayoutParams.WRAP_CONTENT tvV2XTimeStrLayoutParams.setMargins( - AutoSizeUtils.dp2px(context, 51f), + AutoSizeUtils.dp2px(context, 40f), AutoSizeUtils.dp2px(context, 20f), - AutoSizeUtils.dp2px(context, 51f), - AutoSizeUtils.dp2px(context, 33f) + AutoSizeUtils.dp2px(context, 40f), + AutoSizeUtils.dp2px(context, 19f) ) tvV2XTimeStr.layoutParams = tvV2XTimeStrLayoutParams tvV2XTimeStr.setTextColor(Color.parseColor("#131415")) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_road_v2n_event_window.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_road_v2n_event_window.xml index af748a80fc..e4501b9200 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_road_v2n_event_window.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_road_v2n_event_window.xml @@ -47,7 +47,7 @@ android:layout_toRightOf="@+id/ivV2XImage" android:ellipsize="end" android:gravity="start|top" - android:maxLines="2" + android:maxLines="1" android:textColor="#131415" android:textSize="@dimen/dp_32" android:textStyle="bold" diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_v2x_bus_station_driver.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_v2x_bus_station_driver.png index 66d7e44475..79ea2f61d9 100644 Binary files a/core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_v2x_bus_station_driver.png and b/core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_v2x_bus_station_driver.png differ diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_v2x_other_retrograde_vehicle_driver.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_v2x_other_retrograde_vehicle_driver.png index 993ffed9ba..b1dfaea874 100644 Binary files a/core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_v2x_other_retrograde_vehicle_driver.png and b/core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_v2x_other_retrograde_vehicle_driver.png differ