diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt index 262e87b6cb..ee7d9ab73f 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt @@ -632,7 +632,7 @@ class MoGoHmiFragment : MvpFragment(), * 闪动动画 */ fun flicker(view: View) { - val alphaAnimation = AlphaAnimation(0f, 1.0f) + val alphaAnimation = AlphaAnimation(0f, 0.88f) alphaAnimation.setDuration(600) alphaAnimation.setInterpolator(LinearInterpolator()) alphaAnimation.setRepeatCount(Animation.INFINITE) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/V2XWarningView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/V2XWarningView.kt index ae8b2f47b3..2b29e5ceba 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/V2XWarningView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/V2XWarningView.kt @@ -130,7 +130,7 @@ class V2XWarningView @JvmOverloads constructor( hmiWarningLeftImg.visibility = View.GONE hmiWarningLeftTopImg.visibility = View.GONE hmiWarningLeftBottomImg.visibility = View.GONE - hmiWarningRightTopImg.visibility = View.VISIBLE + hmiWarningRightTopImg.visibility = View.GONE hmiWarningRightBottomImg.visibility = View.VISIBLE } ALERT_WARNING_BOTTOM_LEFT -> { @@ -174,7 +174,11 @@ class V2XWarningView @JvmOverloads constructor( removeCallbacks(closeWarningTask) when (direction) { ALERT_WARNING_TOP -> { - hmiWarningTopImg.visibility = View.GONE +// hmiWarningTopImg.visibility = View.GONE + hmiWarningRightTopImg.visibility = View.GONE +// hmiWarningLeftTopImg.visibility = View.GONE +// hmiWarningLeftBottomImg.visibility = View.GONE +// hmiWarningRightBottomImg.visibility = View.GONE } ALERT_WARNING_RIGHT -> { hmiWarningRightImg.visibility = View.GONE diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_hmi_warning_v2x.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_hmi_warning_v2x.xml index 218813fdb9..462b2e76ad 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_hmi_warning_v2x.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_hmi_warning_v2x.xml @@ -8,7 +8,7 @@ @@ -16,7 +16,7 @@ @@ -74,7 +74,7 @@ - - - - \ No newline at end of file diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_warning_bkg_left_top.xml b/core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_warning_bkg_left_top.xml deleted file mode 100644 index 3c96aa5ca2..0000000000 --- a/core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_warning_bkg_left_top.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - \ No newline at end of file diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_warning_bkg_right_bottom.xml b/core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_warning_bkg_right_bottom.xml index 8fc2c3946b..4a643eb15b 100644 --- a/core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_warning_bkg_right_bottom.xml +++ b/core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_warning_bkg_right_bottom.xml @@ -1,14 +1,19 @@ - - - - \ No newline at end of file + + + + + + + + + + + \ No newline at end of file diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_warning_bkg_right_top.xml b/core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_warning_bkg_right_top.xml index 077c625cc3..7da82a936d 100644 --- a/core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_warning_bkg_right_top.xml +++ b/core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_warning_bkg_right_top.xml @@ -1,14 +1,16 @@ - - - - \ No newline at end of file + + + + + + + + + \ No newline at end of file diff --git a/core/mogo-core-res/src/main/res/drawable-xxhdpi/bottom_left.png b/core/mogo-core-res/src/main/res/drawable-xxhdpi/bottom_left.png new file mode 100644 index 0000000000..0dff4373e6 Binary files /dev/null and b/core/mogo-core-res/src/main/res/drawable-xxhdpi/bottom_left.png differ diff --git a/core/mogo-core-res/src/main/res/drawable-xxhdpi/bottom_right.png b/core/mogo-core-res/src/main/res/drawable-xxhdpi/bottom_right.png new file mode 100644 index 0000000000..2d2869dcb0 Binary files /dev/null and b/core/mogo-core-res/src/main/res/drawable-xxhdpi/bottom_right.png differ diff --git a/core/mogo-core-res/src/main/res/drawable-xxhdpi/top_left.png b/core/mogo-core-res/src/main/res/drawable-xxhdpi/top_left.png new file mode 100644 index 0000000000..8505d7d4a2 Binary files /dev/null and b/core/mogo-core-res/src/main/res/drawable-xxhdpi/top_left.png differ diff --git a/core/mogo-core-res/src/main/res/values/color.xml b/core/mogo-core-res/src/main/res/values/color.xml index a9120176a9..9e148a32fd 100644 --- a/core/mogo-core-res/src/main/res/values/color.xml +++ b/core/mogo-core-res/src/main/res/values/color.xml @@ -6,8 +6,8 @@ #323C6F #FFFFFF - #727F2503 - #007F2503 + #FFED6515 + #0F7F2503 \ No newline at end of file diff --git a/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1600/dimens.xml b/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1600/dimens.xml index d01d8415ac..d4ea57c92c 100644 --- a/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1600/dimens.xml +++ b/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1600/dimens.xml @@ -15,6 +15,7 @@ 144px 186px 300px + 328px 730px 1600px