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 6735e53e8c..ece99da0cc 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
@@ -117,6 +117,17 @@
app:layout_goneMarginEnd="40dp"
app:layout_goneMarginTop="@dimen/dp_236" />
+
+
+
+
+
+
+
+
+
+ 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 63694ef4cf..6e3572c52a 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
@@ -206,7 +206,7 @@ class RoadV2NEventWindowView @JvmOverloads constructor(
} else {
val layoutParam =
roundRoadV2NEventContainer.layoutParams as ConstraintLayout.LayoutParams
- layoutParam.width = AutoSizeUtils.dp2px(context, (600 + 0 + 0).toFloat())
+ layoutParam.width = AutoSizeUtils.dp2px(context, (654 + 0 + 0).toFloat())
layoutParam.height = ConstraintLayout.LayoutParams.WRAP_CONTENT
roundRoadV2NEventContainer.layoutParams = layoutParam
roundRoadV2NEventContainer.background =
@@ -219,23 +219,23 @@ class RoadV2NEventWindowView @JvmOverloads constructor(
containerIconHintLayoutParams.width = LayoutParams.MATCH_PARENT
containerIconHintLayoutParams.height = LayoutParams.WRAP_CONTENT
containerIconHintLayoutParams.setMargins(
- AutoSizeUtils.dp2px(context, 30f - 22f),
- AutoSizeUtils.dp2px(context, 31f - 15f),
- AutoSizeUtils.dp2px(context, 30f - 22f),
+ AutoSizeUtils.dp2px(context, 30f - 16f),
+ AutoSizeUtils.dp2px(context, 30f - 14f),
+ AutoSizeUtils.dp2px(context, 30f - 16f),
0
)
containerIconHint.layoutParams = containerIconHintLayoutParams
val ivV2XImageLayoutParams = ivV2XImage.layoutParams as RelativeLayout.LayoutParams
- ivV2XImageLayoutParams.width = AutoSizeUtils.dp2px(context, 84f + 22f + 22f)
- ivV2XImageLayoutParams.height = AutoSizeUtils.dp2px(context, 84f + 15f + 29f)
+ ivV2XImageLayoutParams.width = AutoSizeUtils.dp2px(context, 120f + 16f + 16f)
+ ivV2XImageLayoutParams.height = AutoSizeUtils.dp2px(context, 120f + 16f + 16f)
ivV2XImage.layoutParams = ivV2XImageLayoutParams
val tvV2XHintContentLayoutParams =
tvV2XHintContent.layoutParams as RelativeLayout.LayoutParams
tvV2XHintContentLayoutParams.setMargins(
- AutoSizeUtils.dp2px(context, 20f - 22f),
- AutoSizeUtils.dp2px(context, (42f + 15f) - (46f / 2f)),
+ AutoSizeUtils.dp2px(context, 30f - 14f),
+ AutoSizeUtils.dp2px(context, (60f + 16f) - (50f / 2f)),
AutoSizeUtils.dp2px(context, 5f),
0
)
@@ -249,11 +249,11 @@ class RoadV2NEventWindowView @JvmOverloads constructor(
val containerImageAndLiveVideoLayoutParams =
containerImageAndLiveVideo.layoutParams as ConstraintLayout.LayoutParams
- containerImageAndLiveVideoLayoutParams.width = AutoSizeUtils.dp2px(context, 540f)
- containerImageAndLiveVideoLayoutParams.height = AutoSizeUtils.dp2px(context, 300f)
+ containerImageAndLiveVideoLayoutParams.width = AutoSizeUtils.dp2px(context, 593f)
+ containerImageAndLiveVideoLayoutParams.height = AutoSizeUtils.dp2px(context, 330f)
containerImageAndLiveVideoLayoutParams.setMargins(
AutoSizeUtils.dp2px(context, 30f),
- AutoSizeUtils.dp2px(context, 30f - 29f),
+ AutoSizeUtils.dp2px(context, 20f - 16f),
AutoSizeUtils.dp2px(context, 30f),
0
)
@@ -266,16 +266,16 @@ class RoadV2NEventWindowView @JvmOverloads constructor(
tvV2XTimeStrLayoutParams.width = LayoutParams.MATCH_PARENT
tvV2XTimeStrLayoutParams.height = LayoutParams.WRAP_CONTENT
tvV2XTimeStrLayoutParams.setMargins(
- AutoSizeUtils.dp2px(context, 29f),
- AutoSizeUtils.dp2px(context, 25f),
- AutoSizeUtils.dp2px(context, 29f),
- AutoSizeUtils.dp2px(context, 30f)
+ AutoSizeUtils.dp2px(context, 30f),
+ AutoSizeUtils.dp2px(context, 12f),
+ AutoSizeUtils.dp2px(context, 30f),
+ AutoSizeUtils.dp2px(context, 24f)
)
tvV2XTimeStr.layoutParams = tvV2XTimeStrLayoutParams
- tvV2XTimeStr.setTextColor(Color.parseColor("#66FFFFFF"))
+ tvV2XTimeStr.setTextColor(Color.parseColor("#999999"))
tvV2XTimeStr.setTextSize(
TypedValue.COMPLEX_UNIT_PX,
- AutoSizeUtils.dp2px(context, 22f).toFloat()
+ AutoSizeUtils.dp2px(context, 26f).toFloat()
)
ivClose.setImageResource(R.drawable.hmi_v2n_event_icon_close_driver)
@@ -285,6 +285,8 @@ class RoadV2NEventWindowView @JvmOverloads constructor(
ivCloseLayoutParams.height = AutoSizeUtils.dp2px(context, 50f)
ivCloseLayoutParams.setMargins(0, 0, 0, 0)
ivClose.layoutParams = ivCloseLayoutParams
+ // 6.7.0 UI 没设计关闭按钮
+ ivClose.visibility = View.GONE
containerEventContent.requestLayout()
roundRoadV2NEventContainer.requestLayout()
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
new file mode 100644
index 0000000000..b74233c31f
Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/hmi_v2n_event_bg_driver.9.png 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
deleted file mode 100644
index 32d41221e1..0000000000
Binary files a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/hmi_v2n_event_bg_driver.png and /dev/null differ
diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_shigong_driver.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_shigong_driver.png
index 0d49df45b7..85f5c25486 100644
Binary files a/core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_shigong_driver.png and b/core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_shigong_driver.png differ
diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_shigu_driver.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_shigu_driver.png
index 37e3993814..b3c122482a 100644
Binary files a/core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_shigu_driver.png and b/core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_shigu_driver.png differ
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 79ea2f61d9..0512a36df7 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 b1dfaea874..bd6c0c8489 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
diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_xingren_hengchuan_driver.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_xingren_hengchuan_driver.png
index 126550b8f3..8a714c85a5 100644
Binary files a/core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_xingren_hengchuan_driver.png and b/core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_xingren_hengchuan_driver.png differ