From ed00694ffefde24b89d1cab3fc460d11bb891819 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Sun, 7 Jul 2024 13:28:41 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[6.5.0]=E5=A2=9E=E5=8A=A0=E7=BA=A2=E7=BB=BF?= =?UTF-8?q?=E7=81=AF=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/layout/taxi_base_fragment.xml | 12 +++++++++++ .../main/res/layout/taxi_p_base_fragment.xml | 20 +++++++++++++++---- .../layout/unmanned_taxi_base_fragment.xml | 12 +++++++++++ .../res/layout/taxt_u_p_base_fragment.xml | 20 ++++++++++++++++--- 4 files changed, 57 insertions(+), 7 deletions(-) diff --git a/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml b/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml index f41ff6699a..37dd353921 100644 --- a/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml +++ b/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml @@ -161,6 +161,18 @@ android:visibility="gone" /> + + + + + + + + + + + + + Date: Sun, 7 Jul 2024 13:41:17 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[6.5.0]Taxi=E5=8F=B8=E4=B9=98=E7=AB=AF?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=9B=92=E5=AD=90=E5=8E=BB=E6=8E=89=E6=B0=94?= =?UTF-8?q?=E6=B3=A1=E6=80=81V2X=E6=B6=88=E6=81=AF=E7=9B=92=E5=AD=90?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt | 4 ++++ .../core/function/hmi/ui/msgbox/PassengerMsgBoxBubbleView.kt | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt index 65f8f87276..b601e39bc2 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt @@ -160,6 +160,10 @@ class DriverMsgBoxBubbleView @JvmOverloads constructor( isShowSummary = false } }else{ + if(msgBoxBean.type == MsgBoxType.V2X){ + //鹰眼650需求，不再展示气泡态V2X消息 + return@post + } showData(msgBoxBean) CallerMsgBoxEventListenerManager.invokeUpdateTipListener(true) } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/PassengerMsgBoxBubbleView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/PassengerMsgBoxBubbleView.kt index 2183bb7ebc..45ecdb4cb4 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/PassengerMsgBoxBubbleView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/PassengerMsgBoxBubbleView.kt @@ -70,8 +70,7 @@ class PassengerMsgBoxBubbleView @JvmOverloads constructor( override fun onDataChanged(category: MsgCategory, msgBoxList: MsgBoxBean) { UiThreadHandler.post({ if(category == MsgCategory.NOTICE){ - if(msgBoxList.type == MsgBoxType.NOTICE || msgBoxList.type == MsgBoxType.V2X - || msgBoxList.type == MsgBoxType.OBU){ + if(msgBoxList.type == MsgBoxType.NOTICE || msgBoxList.type == MsgBoxType.OBU){ if(isCacheMsg){ //将消息缓存到未播放列表等待小智语音播放完成后取出播放 MsgBoxConfig.unPlayList.add(msgBoxList) From 50e53a4269f0db7e853c9d88054162492dd9832c Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Sun, 7 Jul 2024 14:05:17 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[6.5.0]=E8=B5=B7=E6=AD=A5=E6=8F=90=E9=86=92?= =?UTF-8?q?/=E6=8F=90=E5=89=8D=E5=87=8F=E9=80=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datacenter/v2x/TrafficLightDispatcher.kt | 22 ++++++++++++++++++- .../hmi/ui/widget/FusionTrafficLightView.kt | 3 +++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt index e33751bd52..f93fdb1125 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt @@ -4,6 +4,7 @@ import android.content.Context import android.os.CountDownTimer import android.os.Handler import android.util.Log +import com.mogo.commons.voice.AIAssist import com.mogo.eagle.core.data.biz.trafficlight.TrafficLightResult import com.mogo.eagle.core.data.biz.trafficlight.TrafficLightStatus import com.mogo.eagle.core.data.biz.trafficlight.currentRoadTrafficLight @@ -172,6 +173,26 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight onTrafficLightPrompt(convert(light.state),light.duration,convert(light.nextState),light.nextDuration, convert(light.nextTwoState),light.nextTwoDuration) } + /** + * 司机端提示： + * 车辆等红灯，在红/黄灯剩余5s且下一灯态为绿灯时，提示“红灯即将变绿”；并在变为绿灯时有提示起步的动效 + * 车辆行驶中，若判断当前绿灯自车无法通过，在绿灯剩余5s且下一灯态为红/黄灯时，提示“蘑菇提醒您及时减速，避免路口急刹” + * 车辆行驶中，若判断当前绿灯自车基于当前速度需提速10%以上才可通过时，提示“蘑菇提醒您及时减速，避免路口急刹” + * 车辆行驶中，若判断当前红灯自车基于当前速度需降低60%以上才可通过时，提示“蘑菇提醒您及时减速，避免路口急刹” + */ + if(AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){ + if((light.state == FusionTrafficLightOuterClass.FusionLightState.STATE_YELLOW_FUSION || light.state ==FusionTrafficLightOuterClass.FusionLightState.STATE_RED_FUSION) + && light.duration < 5 && light.nextState == FusionTrafficLightOuterClass.FusionLightState.STATE_GREEN_FUSION){ + //语音播放 + AIAssist.getInstance(mContext).speakTTSVoice("红灯即将变绿") + } + //TODO 需要知道当前车速和当前位置距离路口的距离 +// if(light.state == FusionTrafficLightOuterClass.FusionLightState.STATE_GREEN_FUSION && light.duration < 5){ +// +// } + } + + } } } @@ -280,7 +301,6 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight if (filterTelematicUnion(sourceType)) { return } - Log.i("xuxinchao","hide msg="+msg+" sourceType="+sourceType) CallerTrafficLightListenerManager.disableTrafficLight() } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/FusionTrafficLightView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/FusionTrafficLightView.kt index 77a32e388a..f907296d4a 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/FusionTrafficLightView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/FusionTrafficLightView.kt @@ -7,6 +7,7 @@ import android.view.View import android.widget.ImageView import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.content.ContextCompat +import com.mogo.eagle.core.data.autopilot.AutopilotSummaryInfo import com.mogo.eagle.core.data.enums.DataSourceType import com.mogo.eagle.core.data.enums.TrafficLightEnum import com.mogo.eagle.core.function.api.datacenter.union.IMoGoTrafficLightListener @@ -101,6 +102,8 @@ class FusionTrafficLightView @JvmOverloads constructor( //如果当前红绿灯视图为隐藏状态则设置为显示状态 if(this@FusionTrafficLightView.visibility == View.GONE){ this@FusionTrafficLightView.visibility = View.VISIBLE + AutopilotSummaryInfo.intersectionServicesNum++ + AutopilotSummaryInfo.lightServicesNum++ //首次展示，需要将当前、下一、下二灯态的时间占比绘制出来，只绘制一次 val proportionList = ArrayList(3) proportionList.add(0)