From 1105391ecac1aa82ed57cab1910ab80a3cc71b7a Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Fri, 8 Apr 2022 17:27:43 +0800 Subject: [PATCH] add bus brake white ui --- .../bindingcar/BindingcarProvider.java | 9 ++-- .../hmi/ui/turnlight/BrakeViewStatus.kt | 9 +++- .../drawable-xhdpi/bus_shache_nor_daytime.png | Bin 0 -> 8298 bytes .../brakelight_background_daytime.xml | 5 ++ .../view_brake_light_status_daytime.xml | 44 ++++++++++++++++++ .../src/main/res/values/color.xml | 1 + .../src/main/res/values/dimens.xml | 2 + 7 files changed, 66 insertions(+), 4 deletions(-) create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bus_shache_nor_daytime.png create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/brakelight_background_daytime.xml create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_brake_light_status_daytime.xml diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java index 90e5188004..4bf44658d8 100644 --- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java @@ -10,6 +10,7 @@ import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.eagle.core.function.api.bindingcar.BindingcarCallBack; import com.mogo.eagle.core.function.api.bindingcar.IMoGoBindingcarProvider; import com.mogo.eagle.core.function.bindingcar.network.BindingcarNetWorkManager; +import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils; import org.jetbrains.annotations.NotNull; @@ -66,11 +67,13 @@ public class BindingcarProvider implements IMoGoBindingcarProvider { private int getScreenType() { int screenType = -1; - if (FunctionBuildConfig.appIdentityMode == 0 || FunctionBuildConfig.appIdentityMode == 0xA0) { + if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) { screenType = 1; //司机屏 - } else if (FunctionBuildConfig.appIdentityMode == 1 || FunctionBuildConfig.appIdentityMode == 0xA1) { - screenType = 2; //乘客屏 } + +// if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) { +// screenType = 2; //乘客屏 +// } return screenType; } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/turnlight/BrakeViewStatus.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/turnlight/BrakeViewStatus.kt index d128c5e257..56f19763b4 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/turnlight/BrakeViewStatus.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/turnlight/BrakeViewStatus.kt @@ -10,7 +10,9 @@ import android.view.animation.AlphaAnimation import android.view.animation.Animation import android.view.animation.DecelerateInterpolator import androidx.constraintlayout.widget.ConstraintLayout +import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.function.hmi.R +import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import kotlinx.android.synthetic.main.view_brake_light_status.view.* import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope @@ -28,7 +30,12 @@ class BrakeViewStatus @JvmOverloads constructor( defStyleAttr: Int = 0 ) : ConstraintLayout(context, attrs, defStyleAttr) { init { - LayoutInflater.from(context).inflate(R.layout.view_brake_light_status, this, true) + //bus乘客端 + if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode) && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) { + LayoutInflater.from(context).inflate(R.layout.view_brake_light_status_daytime, this, true) + } else { + LayoutInflater.from(context).inflate(R.layout.view_brake_light_status, this, true) + } } private var isBrake: Boolean = false diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bus_shache_nor_daytime.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bus_shache_nor_daytime.png new file mode 100644 index 0000000000000000000000000000000000000000..d16d1ce1418c79d78707e920b13d5122e78ce659 GIT binary patch literal 8298 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 literal 0 HcmV?d00001 diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/brakelight_background_daytime.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/brakelight_background_daytime.xml new file mode 100644 index 0000000000..6c257d12d7 --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/brakelight_background_daytime.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_brake_light_status_daytime.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_brake_light_status_daytime.xml new file mode 100644 index 0000000000..1996b061ac --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_brake_light_status_daytime.xml @@ -0,0 +1,44 @@ + + + + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml index 5bc14b5b52..7218d86231 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml @@ -46,6 +46,7 @@ #3B4577 #000000 + #E6FFFFFF #FFFFA28B #FFDA1100 diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/dimens.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/dimens.xml index 9283e77555..3641ccb612 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/dimens.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/dimens.xml @@ -41,6 +41,8 @@ 120px 460px 120px + 220px + 120px 225px 154px