From b334ff38b807a1f35033db24454f5c4a92c5df48 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Thu, 20 Jul 2023 17:14:40 +0800 Subject: [PATCH] =?UTF-8?q?[3.4.0]Taxi=E4=B9=98=E5=AE=A2=E5=B1=8F=E8=BD=AC?= =?UTF-8?q?=E5=90=91=E7=81=AF+=E8=BD=AC=E5=90=91=E7=81=AF=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E9=9A=90=E8=97=8F=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/layout/taxi_p_base_fragment.xml | 13 ++++- .../core/function/hmi/ui/MoGoHmiProvider.kt | 18 ++++++ .../hmi/ui/vehicle/TurnLightViewStatus.kt | 47 +++++++++++++--- .../module_arrow_left_nor_taxi_p.png | Bin 0 -> 1322 bytes .../module_arrow_left_select_nor_taxi_p.png | Bin 0 -> 3433 bytes .../module_arrow_right_nor_taxi_p.png | Bin 0 -> 1314 bytes .../module_arrow_right_select_nor_taxi_p.png | Bin 0 -> 3366 bytes .../drawable/turn_light_background_taxi_p.xml | 5 ++ .../layout/view_turn_light_status_taxi_p.xml | 53 ++++++++++++++++++ .../src/main/res/values/attr.xml | 3 + .../src/main/res/values/color.xml | 1 + .../eagle/core/data/config/HmiBuildConfig.kt | 6 ++ .../union/IMoGoTurnLightListener.kt | 9 +++ .../api/hmi/warning/IMoGoHmiProvider.kt | 10 ++++ .../function/call/hmi/CallerHmiManager.kt | 14 +++++ .../v2x/CallerTurnLightListenerManager.kt | 20 +++++++ 16 files changed, 189 insertions(+), 10 deletions(-) create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/module_arrow_left_nor_taxi_p.png create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/module_arrow_left_select_nor_taxi_p.png create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/module_arrow_right_nor_taxi_p.png create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/module_arrow_right_select_nor_taxi_p.png create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/turn_light_background_taxi_p.xml create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_turn_light_status_taxi_p.xml create mode 100644 core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/union/IMoGoTurnLightListener.kt create mode 100644 core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/v2x/CallerTurnLightListenerManager.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml index c23c84fd25..4e8829db31 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml @@ -85,12 +85,23 @@ android:id="@+id/traffic_light_view" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/dp_95" + android:layout_marginTop="@dimen/dp_100" android:layout_marginRight="@dimen/taxi_p_traffic_light_layout_margin_right" android:visibility="gone" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" /> + + + { + LayoutInflater.from(context) + .inflate(R.layout.view_turn_light_status_taxi_p, this, true) + } + } + }else{ + if (dayLight) { + LayoutInflater.from(context) + .inflate(R.layout.view_turn_light_status_daytime, this, true) + } else { + LayoutInflater.from(context).inflate(R.layout.view_turn_light_status, this, true) + } } visible = typedArray.getBoolean(R.styleable.TurnLightView_visible, false) if (visible) { @@ -59,18 +73,33 @@ open class TurnLightViewStatus @JvmOverloads constructor( override fun onAttachedToWindow() { super.onAttachedToWindow() CallerChassisLamplightListenerManager.addListener(TAG, this) + CallerTurnLightListenerManager.addListener(TAG,this) } override fun onDetachedFromWindow() { super.onDetachedFromWindow() CallerChassisLamplightListenerManager.removeListener(TAG) + CallerTurnLightListenerManager.removeListener(TAG) + } + + override fun hideTurnLightView() { + ThreadUtils.runOnUiThread{ + if (!isDisappear) { + isDisappear = true + isLeftLight = false + isRightLight = false + animationDisappear() + } + } } override fun onAutopilotLightSwitchData(lightSwitch: Chassis.LightSwitch?) { super.onAutopilotLightSwitchData(lightSwitch) - lightSwitch?.let { - ThreadUtils.runOnUiThread { - setTurnLight(it) + if(HmiBuildConfig.isShowTurnLightView){ + lightSwitch?.let { + ThreadUtils.runOnUiThread { + setTurnLight(it) + } } } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/module_arrow_left_nor_taxi_p.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/module_arrow_left_nor_taxi_p.png new file mode 100644 index 0000000000000000000000000000000000000000..77a52782c27d218d6783f29af7da416b5a702519 GIT binary patch literal 1322 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 + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_turn_light_status_taxi_p.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_turn_light_status_taxi_p.xml new file mode 100644 index 0000000000..5636c0fdf1 --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_turn_light_status_taxi_p.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/attr.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/attr.xml index 71ab960a6e..edfb6e9642 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/attr.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/attr.xml @@ -72,6 +72,9 @@ + + + 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 72ea2d92b5..4db8ecf5b7 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 @@ -52,6 +52,7 @@ #000000 #E6FFFFFF + #FFCEDCF7 #FFFFA28B #FFDA1100 diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HmiBuildConfig.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HmiBuildConfig.kt index e86241a695..38e4c34485 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HmiBuildConfig.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HmiBuildConfig.kt @@ -77,5 +77,11 @@ object HmiBuildConfig { @Volatile var isShowRunRedLightView = false + /** + * 是否展示转向灯 + */ + @JvmField + @Volatile + var isShowTurnLightView = true } \ No newline at end of file diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/union/IMoGoTurnLightListener.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/union/IMoGoTurnLightListener.kt new file mode 100644 index 0000000000..b4d69330f4 --- /dev/null +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/union/IMoGoTurnLightListener.kt @@ -0,0 +1,9 @@ +package com.mogo.eagle.core.function.api.datacenter.union + +/** + * 转向灯监听接口 + */ +interface IMoGoTurnLightListener { + + fun hideTurnLightView(){} +} \ No newline at end of file diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoHmiProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoHmiProvider.kt index 171fd86b84..b24a274343 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoHmiProvider.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoHmiProvider.kt @@ -159,4 +159,14 @@ interface IMoGoHmiProvider :IProvider{ * 隐藏红绿灯 */ fun hideTrafficLightView() + + /** + * 展示转向灯 + */ + fun showTurnLightView() + + /** + * 隐藏转向灯 + */ + fun hideTurnLightView() } \ No newline at end of file diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt index 29a017aeca..1dcc6dbb61 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt @@ -238,4 +238,18 @@ object CallerHmiManager { hmiProviderApi?.hideTrafficLightView() } + /** + * 展示转向灯 + */ + fun showTurnLightView(){ + hmiProviderApi?.showTurnLightView() + } + + /** + * 隐藏转向灯 + */ + fun hideTurnLightView(){ + hmiProviderApi?.hideTurnLightView() + } + } \ No newline at end of file diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/v2x/CallerTurnLightListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/v2x/CallerTurnLightListenerManager.kt new file mode 100644 index 0000000000..3f61fdbd7a --- /dev/null +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/v2x/CallerTurnLightListenerManager.kt @@ -0,0 +1,20 @@ +package com.mogo.eagle.core.function.call.v2x + +import com.mogo.eagle.core.function.api.datacenter.union.IMoGoTurnLightListener +import com.mogo.eagle.core.function.call.base.CallerBase + +/** + * 转向灯事件管理 + */ +object CallerTurnLightListenerManager: CallerBase() { + + /** + * 隐藏转向灯 + */ + fun invokeHideTurnLightView(){ + M_LISTENERS.forEach { + val listener = it.value + listener.hideTurnLightView() + } + } +} \ No newline at end of file