From c6737617f7cffcbb28eeec0bafb6b8904d1cdd82 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Tue, 16 May 2023 18:47:29 +0800 Subject: [PATCH] [3.2.0] add func of trafficlight support daylightmode and fix passport sn and token get problem --- .../res/layout/bus_p_base_fragment.xml | 2 +- .../res/layout/bus_p_base_fragment.xml | 2 +- .../hmi/ui/widget/SingleTrafficLightView.kt | 26 ++++++++++++++++++- .../drawable/traffic_light_bg_day_light.xml | 7 +++++ .../res/layout/hmi_view_traffic_light.xml | 3 --- .../src/main/res/values/color.xml | 1 + gradle.properties | 18 ++++++------- 7 files changed, 44 insertions(+), 15 deletions(-) create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/traffic_light_bg_day_light.xml diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml index 5f48333a3d..7354a3d725 100644 --- a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml +++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml @@ -52,7 +52,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> - - { + hmi_traffic_light_bg.setBackgroundResource(R.drawable.traffic_light_bg) + hmi_traffic_light_source.setTextColor(resources.getColor(R.color.color_FFFFFF)) + hmi_traffic_light_divider.setBackgroundColor(resources.getColor(R.color.color_FFFFFF)) + } + 1 -> { + hmi_traffic_light_bg.setBackgroundResource(R.drawable.traffic_light_bg_day_light) + hmi_traffic_light_source.setTextColor(resources.getColor(R.color.color_2D3E5F)) + hmi_traffic_light_divider.setBackgroundColor(resources.getColor(R.color.color_2D3E5F)) + } + } + } + } + /** * 展示红绿灯预警 * diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/traffic_light_bg_day_light.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/traffic_light_bg_day_light.xml new file mode 100644 index 0000000000..574797906a --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/traffic_light_bg_day_light.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_traffic_light.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_traffic_light.xml index f49e4c473d..cd31442233 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_traffic_light.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_traffic_light.xml @@ -12,7 +12,6 @@ android:layout_height="@dimen/hmi_traffic_light_bg_height" android:layout_marginStart="@dimen/hmi_traffic_light_bg_margin_left" android:layout_marginTop="@dimen/hmi_traffic_light_bg_margin_top" - android:background="@drawable/traffic_light_bg" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -41,7 +40,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" tools:text="自车感知" - android:textColor="@color/color_FFFFFF" android:textSize="@dimen/hmi_traffic_light_source_size" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" @@ -53,7 +51,6 @@ android:id="@+id/hmi_traffic_light_divider" android:layout_width="@dimen/dp_1" android:layout_height="@dimen/dp_47" - android:background="@color/color_FFFFFF" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toLeftOf="@id/hmi_traffic_light_source" 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 ff8c61e6bf..72ea2d92b5 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 @@ -21,6 +21,7 @@ #0099dd #FFFFFF #2C2E30 + #2D3E5F #D4D8DC #27FFFFFF #1E111111 diff --git a/gradle.properties b/gradle.properties index 4665e5d4c0..4ae3edb87c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -66,23 +66,23 @@ SERVICE_BIZ_VERSION=1.2.4 LOGLIB_VERSION=1.5.27 ######## MogoAiCloudSDK Version ######## # 网络请求LOGLIB_VERSION -MOGO_NETWORK_VERSION=1.4.6.7 +MOGO_NETWORK_VERSION=1.4.6.8 # 鉴权 -MOGO_PASSPORT_VERSION=1.4.6.7 +MOGO_PASSPORT_VERSION=1.4.6.8 # 常链接 -MOGO_SOCKET_VERSION=1.4.6.7 +MOGO_SOCKET_VERSION=1.4.6.8 # 数据采集 -MOGO_REALTIME_VERSION=1.4.6.7 +MOGO_REALTIME_VERSION=1.4.6.8 # 探路，道路事件发布，获取 -MOGO_TANLU_VERSION=1.4.6.7 +MOGO_TANLU_VERSION=1.4.6.8 # 直播推流 -MOGO_LIVE_VERSION=1.4.6.7 +MOGO_LIVE_VERSION=1.4.6.8 # 直播拉流 -MOGO_TRAFFICLIVE_VERSION=1.4.6.7 +MOGO_TRAFFICLIVE_VERSION=1.4.6.8 # 定位服务 -MOGO_LOCATION_VERSION=1.4.6.7 +MOGO_LOCATION_VERSION=1.4.6.8 # 远程通讯模块 -MOGO_TELEMATIC_VERSION=1.4.6.7 +MOGO_TELEMATIC_VERSION=1.4.6.8 ######## MogoAiCloudSDK Version ######## # 自研地图 MAP_SDK_VERSION=2.12.1.1