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 4ff6fe5a29..7a68f3ca41 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 @@ -6,6 +6,7 @@ import android.util.AttributeSet import android.util.TypedValue import android.view.LayoutInflater import android.view.View +import android.widget.RelativeLayout import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.content.ContextCompat import com.mogo.commons.voice.AIAssist @@ -17,7 +18,8 @@ import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.util.DateTimeUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler -import kotlinx.android.synthetic.main.hmi_view_road_v2n_event_window.view.containerEvent +import kotlinx.android.synthetic.main.hmi_view_road_v2n_event_window.view.containerEventContent +import kotlinx.android.synthetic.main.hmi_view_road_v2n_event_window.view.containerIconHint import kotlinx.android.synthetic.main.hmi_view_road_v2n_event_window.view.containerLivePlay import kotlinx.android.synthetic.main.hmi_view_road_v2n_event_window.view.ivClose import kotlinx.android.synthetic.main.hmi_view_road_v2n_event_window.view.ivV2XImage @@ -54,7 +56,7 @@ class RoadV2NEventWindowView @JvmOverloads constructor( val layoutParam = roundRoadV2NEventContainer.layoutParams as ConstraintLayout.LayoutParams layoutParam.width = AutoSizeUtils.dp2px( - context, (600 + 37 + 37).toFloat() + context, (580 + 37 + 37).toFloat() ) layoutParam.height = ConstraintLayout.LayoutParams.WRAP_CONTENT roundRoadV2NEventContainer.layoutParams = layoutParam @@ -66,7 +68,7 @@ class RoadV2NEventWindowView @JvmOverloads constructor( roundRoadV2NEventContainer.setPadding(padding, padding, padding, padding) val containerEventLayoutParams = - containerEvent.layoutParams as ConstraintLayout.LayoutParams + containerIconHint.layoutParams as ConstraintLayout.LayoutParams containerEventLayoutParams.width = LayoutParams.MATCH_PARENT containerEventLayoutParams.height = LayoutParams.WRAP_CONTENT containerEventLayoutParams.setMargins( @@ -75,17 +77,15 @@ class RoadV2NEventWindowView @JvmOverloads constructor( AutoSizeUtils.dp2px(context, 50f), 0 ) - containerEvent.layoutParams = containerEventLayoutParams + containerIconHint.layoutParams = containerEventLayoutParams - val ivV2XImageLayoutParams = ivV2XImage.layoutParams as ConstraintLayout.LayoutParams + val ivV2XImageLayoutParams = ivV2XImage.layoutParams as RelativeLayout.LayoutParams ivV2XImageLayoutParams.width = AutoSizeUtils.dp2px(context, 69f) ivV2XImageLayoutParams.height = AutoSizeUtils.dp2px(context, 69f) ivV2XImage.layoutParams = ivV2XImageLayoutParams val tvV2XHintContentLayoutParams = - tvV2XHintContent.layoutParams as ConstraintLayout.LayoutParams - tvV2XHintContentLayoutParams.width = 0 - tvV2XHintContentLayoutParams.height = LayoutParams.WRAP_CONTENT + tvV2XHintContent.layoutParams as RelativeLayout.LayoutParams tvV2XHintContentLayoutParams.setMargins( AutoSizeUtils.dp2px(context, 30f), 0, 0, 0 ) @@ -121,6 +121,13 @@ class RoadV2NEventWindowView @JvmOverloads constructor( AutoSizeUtils.dp2px(context, 24f).toFloat() ) + ivClose.setImageResource(R.drawable.hmi_v2n_event_icon_close_passenger) + ivClose.setPadding( + AutoSizeUtils.dp2px(context, 2f), + AutoSizeUtils.dp2px(context, 2f), + AutoSizeUtils.dp2px(context, 2f), + AutoSizeUtils.dp2px(context, 2f) + ) val ivCloseLayoutParams = ivClose.layoutParams as ConstraintLayout.LayoutParams ivCloseLayoutParams.width = AutoSizeUtils.dp2px(context, 32f) ivCloseLayoutParams.height = AutoSizeUtils.dp2px(context, 32f) @@ -130,14 +137,8 @@ class RoadV2NEventWindowView @JvmOverloads constructor( AutoSizeUtils.dp2px(context, 20f), 0 ) ivClose.layoutParams = ivCloseLayoutParams - ivClose.setPadding( - AutoSizeUtils.dp2px(context, 2f), - AutoSizeUtils.dp2px(context, 2f), - AutoSizeUtils.dp2px(context, 2f), - AutoSizeUtils.dp2px(context, 2f) - ) - ivClose.setImageResource(R.drawable.hmi_v2n_event_icon_close_passenger) + containerEventContent.requestLayout() roundRoadV2NEventContainer.requestLayout() } else { val layoutParam = @@ -146,12 +147,12 @@ class RoadV2NEventWindowView @JvmOverloads constructor( layoutParam.height = ConstraintLayout.LayoutParams.WRAP_CONTENT roundRoadV2NEventContainer.layoutParams = layoutParam roundRoadV2NEventContainer.background = - ContextCompat.getDrawable(context, R.drawable.bg_v2n_event_driver) + ContextCompat.getDrawable(context, R.drawable.hmi_v2n_event_bg_driver) val padding = AutoSizeUtils.dp2px(context, 0f) roundRoadV2NEventContainer.setPadding(padding, padding, padding, padding) val containerEventLayoutParams = - containerEvent.layoutParams as ConstraintLayout.LayoutParams + containerIconHint.layoutParams as ConstraintLayout.LayoutParams containerEventLayoutParams.width = LayoutParams.MATCH_PARENT containerEventLayoutParams.height = LayoutParams.WRAP_CONTENT containerEventLayoutParams.setMargins( @@ -160,17 +161,15 @@ class RoadV2NEventWindowView @JvmOverloads constructor( AutoSizeUtils.dp2px(context, 30f), 0 ) - containerEvent.layoutParams = containerEventLayoutParams + containerIconHint.layoutParams = containerEventLayoutParams - val ivV2XImageLayoutParams = ivV2XImage.layoutParams as ConstraintLayout.LayoutParams + val ivV2XImageLayoutParams = ivV2XImage.layoutParams as RelativeLayout.LayoutParams ivV2XImageLayoutParams.width = AutoSizeUtils.dp2px(context, 84f) ivV2XImageLayoutParams.height = AutoSizeUtils.dp2px(context, 84f) ivV2XImage.layoutParams = ivV2XImageLayoutParams val tvV2XHintContentLayoutParams = - tvV2XHintContent.layoutParams as ConstraintLayout.LayoutParams - tvV2XHintContentLayoutParams.width = 0 - tvV2XHintContentLayoutParams.height = LayoutParams.WRAP_CONTENT + tvV2XHintContent.layoutParams as RelativeLayout.LayoutParams tvV2XHintContentLayoutParams.setMargins( AutoSizeUtils.dp2px(context, 32f), 0, @@ -209,14 +208,15 @@ class RoadV2NEventWindowView @JvmOverloads constructor( AutoSizeUtils.dp2px(context, 22f).toFloat() ) + ivClose.setImageResource(R.drawable.hmi_v2n_event_icon_close_driver) + ivClose.setPadding(0, 0, 0, 0) val ivCloseLayoutParams = ivClose.layoutParams as ConstraintLayout.LayoutParams ivCloseLayoutParams.width = AutoSizeUtils.dp2px(context, 50f) ivCloseLayoutParams.height = AutoSizeUtils.dp2px(context, 50f) ivCloseLayoutParams.setMargins(0, 0, 0, 0) ivClose.layoutParams = ivCloseLayoutParams - ivClose.setPadding(0, 0, 0, 0) - ivClose.setImageResource(R.drawable.hmi_v2n_event_icon_close_driver) + containerEventContent.requestLayout() roundRoadV2NEventContainer.requestLayout() } 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..32d41221e1 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-xhdpi/hmi_v2n_event_icon_close_driver.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/hmi_v2n_event_icon_close_driver.png index 5bfef0a9f2..fd167f3a89 100644 Binary files a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/hmi_v2n_event_icon_close_driver.png and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/hmi_v2n_event_icon_close_driver.png differ 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 367fd1ab83..696cd2f07f 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 @@ -9,6 +9,7 @@ android:padding="@dimen/dp_37"> - @@ -31,36 +32,25 @@ android:id="@+id/ivV2XImage" android:layout_width="@dimen/dp_69" android:layout_height="@dimen/dp_69" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintHorizontal_bias="0" - app:layout_constraintHorizontal_chainStyle="packed" - app:layout_constraintLeft_toLeftOf="parent" - app:layout_constraintRight_toLeftOf="@id/tvV2XHintContent" - app:layout_constraintTop_toTopOf="parent" + android:layout_alignParentStart="true" + android:layout_centerVertical="true" tools:src="@drawable/v2x_icon_shigong_zhandao" /> - - + + app:layout_constraintTop_toBottomOf="@id/containerIconHint" />