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 e9679415fd..70dc99933d 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 @@ -2,6 +2,7 @@ package com.mogo.eagle.core.function.hmi.ui.v2n import android.content.Context import android.graphics.Color +import android.graphics.Typeface import android.text.TextUtils import android.util.AttributeSet import android.util.TypedValue @@ -112,8 +113,8 @@ class RoadV2NEventWindowView @JvmOverloads constructor( containerIconHintLayoutParams.width = LayoutParams.MATCH_PARENT containerIconHintLayoutParams.height = LayoutParams.WRAP_CONTENT containerIconHintLayoutParams.setMargins( - AutoSizeUtils.dp2px(context, 36f - 14f), //乘客屏icon ivV2XImage带了白边, 高度、margin需要计算调整 - AutoSizeUtils.dp2px(context, 30f - 14f), + AutoSizeUtils.dp2px(context, 36f - 19.4f), //乘客屏icon ivV2XImage带了白边, 高度、margin需要计算调整 + AutoSizeUtils.dp2px(context, 30f - 10.7f), AutoSizeUtils.dp2px(context, 36f), 0 ) @@ -135,8 +136,8 @@ class RoadV2NEventWindowView @JvmOverloads constructor( val tvV2XHintContentLayoutParams = tvV2XHintContent.layoutParams as RelativeLayout.LayoutParams tvV2XHintContentLayoutParams.setMargins( - AutoSizeUtils.dp2px(context, 30f - 14f), //乘客屏icon ivV2XImage带了白边, 高度、margin需要计算调整 - AutoSizeUtils.dp2px(context, 16f), + AutoSizeUtils.dp2px(context, 30f - 19.7f), //乘客屏icon ivV2XImage带了白边, 高度、margin需要计算调整 + AutoSizeUtils.dp2px(context, (34f + 14f) - (46f / 2f)), AutoSizeUtils.dp2px(context, 5f), 0 ) @@ -146,6 +147,7 @@ class RoadV2NEventWindowView @JvmOverloads constructor( TypedValue.COMPLEX_UNIT_PX, AutoSizeUtils.dp2px(context, 28f).toFloat() ) + tvV2XHintContent.setTypeface(null, Typeface.NORMAL) tvV2XHintContent.setPadding(0, 0, 0, AutoSizeUtils.dp2px(context, 28f)) val containerImageAndLiveVideoLayoutParams = @@ -168,7 +170,7 @@ class RoadV2NEventWindowView @JvmOverloads constructor( tvV2XTimeStrLayoutParams.height = LayoutParams.WRAP_CONTENT tvV2XTimeStrLayoutParams.setMargins( AutoSizeUtils.dp2px(context, 40f), - AutoSizeUtils.dp2px(context, 20f), + AutoSizeUtils.dp2px(context, 19f), AutoSizeUtils.dp2px(context, 40f), AutoSizeUtils.dp2px(context, 19f) ) @@ -191,8 +193,9 @@ class RoadV2NEventWindowView @JvmOverloads constructor( ivCloseLayoutParams.height = AutoSizeUtils.dp2px(context, 32f) ivCloseLayoutParams.setMargins( 0, - AutoSizeUtils.dp2px(context, 20f), - AutoSizeUtils.dp2px(context, 20f), 0 + AutoSizeUtils.dp2px(context, 24f), + AutoSizeUtils.dp2px(context, 24f), + 0 ) ivClose.layoutParams = ivCloseLayoutParams @@ -236,6 +239,7 @@ class RoadV2NEventWindowView @JvmOverloads constructor( ) tvV2XHintContent.layoutParams = tvV2XHintContentLayoutParams tvV2XHintContent.setTextColor(Color.parseColor("#FFFFFF")) + tvV2XHintContent.setTypeface(null, Typeface.BOLD) tvV2XHintContent.setTextSize( TypedValue.COMPLEX_UNIT_PX, AutoSizeUtils.dp2px(context, 32f).toFloat()