From 3d462539d682f887313b6500f05a138b5a935389 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Mon, 23 May 2022 14:12:47 +0800 Subject: [PATCH 1/5] =?UTF-8?q?[taxi/bus-d=20270]=20bus=20=E4=B9=98?= =?UTF-8?q?=E5=AE=A2=E5=B1=8FUI=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/layout/bus_p_base_fragment.xml | 21 ++++++++++++------- .../src/main/res/values-sw320dp/dimens.xml | 1 + .../src/main/res/values/colors.xml | 1 + .../src/main/res/values/dimens.xml | 3 ++- 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml index 523a6fc82d..fd30dd553b 100644 --- a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml +++ b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml @@ -8,7 +8,7 @@ android:id="@+id/steering_wheel" android:layout_width="@dimen/dp_300" android:layout_height="@dimen/dp_300" - android:layout_marginLeft="@dimen/dp_90" + android:layout_marginLeft="@dimen/dp_50" android:layout_marginTop="@dimen/dp_112" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -20,24 +20,29 @@ android:layout_marginLeft="@dimen/bus_p_curent_station_panel_margin" android:layout_marginTop="@dimen/dp_112" android:scaleType="fitXY" - android:visibility="invisible" + android:visibility="gone" android:layout_gravity="center_horizontal" android:src="@drawable/bus_p_un_auto_nor" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent"/> - + app:bgColor="@color/bus_p_panel_cur_station_panel_color" + app:blurRadius="@dimen/dp_12" + app:shadowRadius="@dimen/dp_20" + app:shadowColor="@color/bus_p_panel_edge_shadow" + app:xOffset="0px" + app:yOffset="0px"> + + + 638px 316px 50px + 38px 44px 55px 40px diff --git a/OCH/mogo-och-bus-passenger/src/main/res/values/colors.xml b/OCH/mogo-och-bus-passenger/src/main/res/values/colors.xml index 06035c5d4b..8e63faf83d 100644 --- a/OCH/mogo-och-bus-passenger/src/main/res/values/colors.xml +++ b/OCH/mogo-och-bus-passenger/src/main/res/values/colors.xml @@ -26,4 +26,5 @@ #E6E9EFFC #33394C63 #2D3E5F + #33394C63 \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/main/res/values/dimens.xml b/OCH/mogo-och-bus-passenger/src/main/res/values/dimens.xml index 6ad2fdc16a..c32aec9eff 100644 --- a/OCH/mogo-och-bus-passenger/src/main/res/values/dimens.xml +++ b/OCH/mogo-och-bus-passenger/src/main/res/values/dimens.xml @@ -50,7 +50,8 @@ 638px 316px - 50px + 38px + 38px 44px 55px 40px From 8ecaa6dbd15d46d1a5c444d5c6bf8f34a332b520 Mon Sep 17 00:00:00 2001 From: xuxinchao <13522809046@163.com> Date: Mon, 23 May 2022 14:33:23 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=B0=B4=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修改文字色号 --- .../src/main/res/layout/view_version_name.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_version_name.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_version_name.xml index d281975a87..7b15e0d1f0 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_version_name.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_version_name.xml @@ -9,7 +9,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="14sp" - android:textColor="#9EFFFFFF" + android:textColor="#FFBEC6EF" /> \ No newline at end of file From 34f5472288def8f99f8271d52df5fd92cf9aaa20 Mon Sep 17 00:00:00 2001 From: xuxinchao <13522809046@163.com> Date: Mon, 23 May 2022 15:56:03 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=B0=B4=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修改排列方式为横向 --- .../mogo/eagle/core/function/hmi/ui/widget/VersionNameView.kt | 2 +- .../src/main/res/layout/view_version_name.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VersionNameView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VersionNameView.kt index 8aff937915..6408ce2e05 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VersionNameView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VersionNameView.kt @@ -58,7 +58,7 @@ class VersionNameView @JvmOverloads constructor( UiThreadHandler.post { tvMapVersionName?.let { if (!dockerVersion.isNullOrEmpty()) { - it.text = "MAP:${dockerVersion}" + it.text = " ; MAP:${dockerVersion}" } } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_version_name.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_version_name.xml index 7b15e0d1f0..1a3e0229dc 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_version_name.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_version_name.xml @@ -2,7 +2,7 @@ + android:orientation="horizontal"> Date: Mon, 23 May 2022 17:59:57 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E7=BA=A2=E7=BB=BF=E7=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修改AI云隐藏红绿灯逻辑，兼容感知红绿灯 --- .../trafficlight/core/MogoTrafficLightManager.kt | 14 +++++++++----- .../trafficlight/core/TrafficLightDispatcher.kt | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/MogoTrafficLightManager.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/MogoTrafficLightManager.kt index ae399ce8ad..2adcd9609a 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/MogoTrafficLightManager.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/MogoTrafficLightManager.kt @@ -4,6 +4,7 @@ import android.content.Context import android.location.Location import android.os.Handler import android.os.Looper +import android.util.Log import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_V2X import com.mogo.eagle.core.data.trafficlight.RoadIDResult import com.mogo.eagle.core.data.trafficlight.TrafficLightDetail @@ -39,6 +40,7 @@ class MogoTrafficLightManager : IMogoCarLocationChangedListener2 { private var trafficLightResult: TrafficLightResult? = null private var inRange: Boolean = false + private var firstLoopCrossRoad: Boolean = true //开启循环请求路口 private var mThreadHandler: Handler? = null @@ -48,11 +50,12 @@ class MogoTrafficLightManager : IMogoCarLocationChangedListener2 { .registerCenterApi.registerCarLocationChangedListener(TAG, this) mThreadHandler = TrafficLightThreadHandler(Looper.getMainLooper(), { - //查询路口时，如果红绿灯显示，则隐藏掉 -// if (TrafficLightHMIManager.INSTANCE.isWarningTrafficLightShow()) { -// TrafficLightHMIManager.INSTANCE.hideTrafficLight() -// CallTrafficLightListenerManager.resetTrafficLightData() -// } + //第一次查询路口时，如果红绿灯显示，则隐藏掉 + if(firstLoopCrossRoad && TrafficLightHMIManager.INSTANCE.isWarningTrafficLightShow()){ + TrafficLightHMIManager.INSTANCE.hideTrafficLight() + CallTrafficLightListenerManager.resetTrafficLightData() + } + firstLoopCrossRoad = false mLocation?.let { it -> val tileId = CallerMapUIServiceManager.getMapUIController()?.getTileId(it.longitude, it.latitude) ?: 0 trafficLightNetWorkModel.requestRoadID( @@ -134,6 +137,7 @@ class MogoTrafficLightManager : IMogoCarLocationChangedListener2 { CallTrafficLightListenerManager.invokeEnterCrossRoad(false) inRange = false trafficLightResult = null + firstLoopCrossRoad = true mThreadHandler?.sendEmptyMessage(MSG_WHAT_STOP_SEARCH_TRAFFIC_LIGHT) TrafficLightHMIManager.INSTANCE.hideTrafficLight() CallTrafficLightListenerManager.resetTrafficLightData() diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/TrafficLightDispatcher.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/TrafficLightDispatcher.kt index e140dee55d..d1fb850bd2 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/TrafficLightDispatcher.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/TrafficLightDispatcher.kt @@ -59,7 +59,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener , IMoGoTrafficLigh } if(light == null){ //隐藏红绿灯显示 - CallerHmiManager.showWarningTrafficLight(0) + TrafficLightHMIManager.INSTANCE.hideTrafficLight() }else{ when (light.state) { TrafficLightOuterClass.LightState.STATE_RED -> { From 30a3c879e557d2b1bd52efc6bd16cd0c649a003d Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 23 May 2022 18:09:44 +0800 Subject: [PATCH 5/5] =?UTF-8?q?UI-bus=E4=B8=8B=E6=96=B9=E5=90=91=E7=9B=98?= =?UTF-8?q?=E5=A4=96=E5=85=89=E5=9C=88=E6=A8=A1=E7=B3=8A=E6=B8=90=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/hmi/ui/widget/SteeringWheelView.java | 13 +++++++++---- .../src/main/res/layout/hmi_steering_wheel_bus.xml | 4 ++-- .../src/main/res/layout/hmi_steering_wheel_taxi.xml | 6 +++--- .../src/main/res/values/color.xml | 7 ++++--- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java index 88512fac87..fddda077d6 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java @@ -81,10 +81,10 @@ public class SteeringWheelView extends ConstraintLayout { steeringCircularV.setProgress((int) (180 * 100) / 360, 1000); if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) { steeringCircularVAlpha = findViewById(R.id.steering_circular_alpha); - steeringCircularVAlpha.setBackWidth(12); - steeringCircularVAlpha.setBlurMaskFilter(BlurMaskFilter.Blur.NORMAL, 12); + steeringCircularVAlpha.setBackWidth(8); steeringCircularVAlpha.setBackColor(R.color.hmi_clear_00); - steeringCircularVAlpha.setProgColor(R.color.hmi_light_blue_alpha); + steeringCircularVAlpha.setProgColor(R.color.hmi_light_blue_alpha_00, R.color.hmi_light_blue_alpha_ff); + steeringCircularVAlpha.setBlurMaskFilter(BlurMaskFilter.Blur.NORMAL, 12); steeringCircularVAlpha.setProgress((int) (180 * 100) / 360, 1000); } } @@ -185,7 +185,12 @@ public class SteeringWheelView extends ConstraintLayout { Log.d(TAG, "onAutopilotSteeringData error"); } animationWithSteeringData(steering); - steeringCircularV.setProgress((int) (-steering * 100) / 360, 1000); + if (steeringCircularV != null) { + steeringCircularV.setProgress((int) (-steering * 100) / 360, 1000); + } + if (steeringCircularVAlpha != null) { + steeringCircularVAlpha.setProgress((int) (-steering * 100) / 360, 1000); + } } }); diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_bus.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_bus.xml index 258956925c..7e523648ba 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_bus.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_bus.xml @@ -25,7 +25,7 @@ android:layout_marginTop="@dimen/dp_50" android:layout_marginRight="-10px" android:gravity="right" - android:text="-18°" + android:text="180°" android:textColor="#415479" android:textSize="@dimen/dp_26" android:visibility="invisible" @@ -39,7 +39,7 @@ android:layout_marginLeft="-10px" android:layout_marginTop="@dimen/dp_50" android:gravity="left" - android:text="18°" + android:text="180°" android:textColor="#415479" android:textSize="@dimen/dp_26" app:layout_constraintLeft_toRightOf="@+id/autopilot_iv" diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_taxi.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_taxi.xml index 2166c95c20..b61a1e2afc 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_taxi.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_taxi.xml @@ -24,7 +24,7 @@ android:layout_marginTop="@dimen/dp_130" android:layout_marginRight="-10px" android:gravity="right" - android:text="-18°" + android:text="180°" android:textColor="#FFFFFFFF" android:textSize="@dimen/dp_37" android:visibility="invisible" @@ -38,7 +38,7 @@ android:layout_marginLeft="-10px" android:layout_marginTop="@dimen/dp_130" android:gravity="left" - android:text="18°" + android:text="180°" android:textColor="#FFFFFFFF" android:textSize="@dimen/dp_37" app:layout_constraintLeft_toRightOf="@+id/autopilot_iv" @@ -90,6 +90,6 @@ android:layout_marginTop="@dimen/dp_30" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" - app:layout_constraintTop_toBottomOf="@+id/steering_circular" /> + app:layout_constraintTop_toBottomOf="@+id/steering_circular_alpha" /> \ 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 85d44ba7f9..f055c0f405 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 @@ -55,8 +55,9 @@ #FFFFE198 #FFFF9B00 #45D3FF - #1B5BFF + #3261B6 #1EBBCFF6 - #6C79C4 - #0045D3FF + #D945D3FF + #D93261B6 + #00FFFFFF \ No newline at end of file