From 9cc44d9d511f1d711185af279ac86fd674386aed Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Tue, 10 Jan 2023 11:52:09 +0800 Subject: [PATCH] =?UTF-8?q?[2.13.2]=20=E5=90=88=E5=B9=B6EventTypeEnumNew?= =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E6=8E=89obu=E9=BB=98=E8=AE=A4=E5=85=B3?= =?UTF-8?q?=E9=97=AD=E7=9A=84=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../receiver/V2XWarningBroadcastReceiver.kt | 4 +- .../core/function/hmi/ui/MoGoHmiFragment.kt | 16 +-- .../adapter/DriverMsgBoxBubbleAdapter.kt | 3 +- .../msgbox/adapter/DriverMsgBoxListAdapter.kt | 3 +- .../adapter/PassengerMsgBoxBubbleAdapter.kt | 3 +- .../adapter/PassengerMsgBoxListAdapter.kt | 3 +- .../impl/marker/drawer/MarkerDrawer.java | 4 +- .../obu/mogo/MogoPrivateObuManager.kt | 17 ++- .../obu/mogo/MogoPrivateObuNewManager.kt | 17 ++- .../function/v2x/events/V2XEventManager.kt | 32 ++--- .../v2x/events/alarm/V2XAlarmServer.java | 4 +- .../entity/panel/SurroundingConstruction.java | 5 +- .../manager/impl/MoGoV2XMarkerManager.java | 4 +- .../v2x/events/marker/V2XMarkerAdapter.java | 19 ++- .../events/marker/V2XMarkerRoadEventView.kt | 10 +- .../receiver/TestPanelBroadcastReceiver.kt | 6 +- .../scene/road/V2XRoadEventMarker.java | 7 +- .../scene/road/V2XRoadEventScenario.java | 7 +- .../function/v2x/events/utils/EntityUtils.kt | 2 +- .../redlightwarning/RedLightWarningManager.kt | 26 ++-- .../core/function/v2x/vip/VipCarManager.kt | 34 ++--- .../core/data/config/CloudPoiManager.java | 34 ++--- .../eagle/core/data/enums/EventTypeEnumNew.kt | 117 +++++++++++++----- .../eagle/core/data/enums/EventTypeHelper.kt | 68 +++++----- .../data/map/entity/V2XRoadEventEntity.java | 14 +-- 25 files changed, 252 insertions(+), 207 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XWarningBroadcastReceiver.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XWarningBroadcastReceiver.kt index 6207e5eb1b..d9a344736a 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XWarningBroadcastReceiver.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XWarningBroadcastReceiver.kt @@ -8,7 +8,7 @@ import com.mogo.eagle.core.function.call.hmi.CallerHmiManager import com.mogo.eagle.core.function.hmi.WaringConst import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI -import com.mogo.eagle.core.data.enums.EventTypeEnum +import com.mogo.eagle.core.data.enums.EventTypeEnumNew import com.mogo.eagle.core.data.msgbox.MsgBoxBean import com.mogo.eagle.core.data.msgbox.MsgBoxType import com.mogo.eagle.core.data.msgbox.V2XMsg @@ -75,7 +75,7 @@ class V2XWarningBroadcastReceiver : BroadcastReceiver() { ttsContent: String?, tag: String? ) { - if (EventTypeEnum.TYPE_USECASE_ID_IVP.poiType == v2xType.toString()) { + if (EventTypeEnumNew.TYPE_USECASE_ID_IVP_RED.poiType == v2xType.toString()) { CallerHmiManager.showLimitingVelocity(1) } if (alertContent.isNullOrEmpty() || ttsContent.isNullOrEmpty()) { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt index ccf6614c2a..0cb68e6d83 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt @@ -33,7 +33,7 @@ import com.mogo.eagle.core.data.config.HmiBuildConfig import com.mogo.eagle.core.data.constants.MoGoFragmentPaths import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_RTS import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.V2I -import com.mogo.eagle.core.data.enums.EventTypeEnum +import com.mogo.eagle.core.data.enums.EventTypeEnumNew import com.mogo.eagle.core.data.enums.SidePattern import com.mogo.eagle.core.data.enums.SidePattern.* import com.mogo.eagle.core.data.enums.WarningDirectionEnum @@ -821,7 +821,7 @@ class MoGoHmiFragment : MvpFragment(), playTts && !AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode) activity?.let { val warningContent = alertContent - ?: EventTypeEnum.getWarningContent(v2xType) + ?: EventTypeEnumNew.getWarningContent(v2xType) //占道施工预警 if (v2xType.equals("10006") || v2xType.equals("100061")) { @@ -842,7 +842,7 @@ class MoGoHmiFragment : MvpFragment(), return } val content = mViewNotificationProvider?.getNotificationView() ?: return - content.setWarningIcon(EventTypeEnum.getWarningIcon(v2xType)) + content.setWarningIcon(EventTypeEnumNew.getWarningIcon(v2xType)) content.setWarningContent(warningContent) CallerLogger.d( "$M_HMI$TAG", @@ -945,7 +945,7 @@ class MoGoHmiFragment : MvpFragment(), playTts && !AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode) activity?.let { val warningContent = alertContent - ?: EventTypeEnum.getWarningContent(v2xType) + ?: EventTypeEnumNew.getWarningContent(v2xType) //占道施工预警 if (v2xType.equals("10006") || v2xType.equals("100061")) { @@ -1593,10 +1593,10 @@ class MoGoHmiFragment : MvpFragment(), EXIT_AUTOPILOT_FOR_CHASSIS, EXIT_AUTOPILOT_FOR_DISTANCE -> { warningV2X( - EventTypeEnum.TAKE_OVER_EVENT.poiType, - EventTypeEnum.TAKE_OVER_EVENT.content, - EventTypeEnum.TAKE_OVER_EVENT.tts, - EventTypeEnum.TAKE_OVER_EVENT.poiType, + EventTypeEnumNew.TAKE_OVER_EVENT.poiType, + EventTypeEnumNew.TAKE_OVER_EVENT.content, + EventTypeEnumNew.TAKE_OVER_EVENT.tts, + EventTypeEnumNew.TAKE_OVER_EVENT.poiType, object : IMoGoWarningStatusListener { override fun onShow() { takeOver = true diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxBubbleAdapter.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxBubbleAdapter.kt index ab7bab281e..e6917eee75 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxBubbleAdapter.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxBubbleAdapter.kt @@ -8,7 +8,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.mogo.eagle.core.data.enums.EventTypeEnum import com.mogo.eagle.core.data.enums.EventTypeEnumNew import com.mogo.eagle.core.data.msgbox.* import com.mogo.eagle.core.data.report.ReportEntity @@ -129,7 +128,7 @@ class DriverMsgBoxBubbleAdapter(private val activity: Activity) : RecyclerView.A EventTypeEnumNew.getUpdateIconRes(v2XMsg.type))) }else{ holder.ivV2XImage.setImageDrawable(activity.resources.getDrawable( - EventTypeEnum.getUpdateIconRes(v2XMsg.type))) + EventTypeEnumNew.getUpdateIconRes(v2XMsg.type))) } } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxListAdapter.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxListAdapter.kt index 65a914808d..5e02c0c918 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxListAdapter.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxListAdapter.kt @@ -9,7 +9,6 @@ import android.widget.ImageView import android.widget.TextView import androidx.core.view.isVisible import androidx.recyclerview.widget.RecyclerView -import com.mogo.eagle.core.data.enums.EventTypeEnum import com.mogo.eagle.core.data.enums.EventTypeEnumNew import com.mogo.eagle.core.data.msgbox.* import com.mogo.eagle.core.data.report.ReportEntity @@ -219,7 +218,7 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : RecyclerView.Ada EventTypeEnumNew.getUpdateIconRes(v2XMsg.type))) }else{ holder.ivV2XImage.setImageDrawable(activity.resources.getDrawable( - EventTypeEnum.getUpdateIconRes(v2XMsg.type))) + EventTypeEnumNew.getUpdateIconRes(v2XMsg.type))) } } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/PassengerMsgBoxBubbleAdapter.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/PassengerMsgBoxBubbleAdapter.kt index 6b0c6750a6..08ebe71499 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/PassengerMsgBoxBubbleAdapter.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/PassengerMsgBoxBubbleAdapter.kt @@ -8,7 +8,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.mogo.eagle.core.data.enums.EventTypeEnum import com.mogo.eagle.core.data.enums.EventTypeEnumNew import com.mogo.eagle.core.data.msgbox.MsgBoxBean import com.mogo.eagle.core.data.msgbox.MsgBoxType @@ -101,7 +100,7 @@ class PassengerMsgBoxBubbleAdapter(private val activity: Activity): RecyclerView EventTypeEnumNew.getUpdateIconRes(v2XMsg.type))) }else{ holder.ivPassengerV2XImage.setImageDrawable(activity.resources.getDrawable( - EventTypeEnum.getUpdateIconRes(v2XMsg.type))) + EventTypeEnumNew.getUpdateIconRes(v2XMsg.type))) } } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/PassengerMsgBoxListAdapter.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/PassengerMsgBoxListAdapter.kt index 50c635e49c..4c1b79d4b0 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/PassengerMsgBoxListAdapter.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/PassengerMsgBoxListAdapter.kt @@ -7,7 +7,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.mogo.eagle.core.data.enums.EventTypeEnum import com.mogo.eagle.core.data.enums.EventTypeEnumNew import com.mogo.eagle.core.data.msgbox.MsgBoxBean import com.mogo.eagle.core.data.msgbox.MsgBoxType @@ -93,7 +92,7 @@ class PassengerMsgBoxListAdapter(private val activity: Activity): RecyclerView.A EventTypeEnumNew.getUpdateIconRes(v2XMsg.type))) }else{ holder.ivPassengerV2XImage.setImageDrawable(activity.resources.getDrawable( - EventTypeEnum.getUpdateIconRes(v2XMsg.type))) + EventTypeEnumNew.getUpdateIconRes(v2XMsg.type))) } } } diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/drawer/MarkerDrawer.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/drawer/MarkerDrawer.java index 63bba6385f..7195182391 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/drawer/MarkerDrawer.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/drawer/MarkerDrawer.java @@ -5,6 +5,7 @@ import android.text.TextUtils; import com.mogo.cloud.commons.utils.CoordinateUtils; import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.module.status.MogoStatusManager; +import com.mogo.eagle.core.data.enums.EventTypeEnumNew; import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.eagle.core.data.map.entity.MarkerExploreWay; import com.mogo.eagle.core.data.map.entity.MarkerNoveltyInfo; @@ -19,7 +20,6 @@ import com.mogo.map.MogoMarkerManager; import com.mogo.map.marker.IMogoMarker; import com.mogo.map.marker.IMogoMarkerClickListener; import com.mogo.map.marker.MogoMarkerOptions; -import com.mogo.eagle.core.data.enums.EventTypeEnum; /** * @author congtaowang @@ -81,7 +81,7 @@ public class MarkerDrawer { Object bindObj = markerShowEntity.getBindObj(); if (bindObj instanceof MarkerExploreWay && ((MarkerExploreWay) bindObj).getPoiType() != null) { String poiType = ((MarkerExploreWay) bindObj).getPoiType(); - options.icon3DRes(EventTypeEnum.getMarker3DRes(poiType)); + options.icon3DRes(EventTypeEnumNew.getMarker3DRes(poiType)); } } diff --git a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt index d687259f9d..b0ad3af2fe 100644 --- a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt +++ b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt @@ -233,7 +233,7 @@ class MogoPrivateObuManager private constructor() { // (3) 道路事件预警信息：CVX_RTI_THREAT_IND override fun onCvxRtiThreatIndInfo(info: CvxRtiThreatIndInfo?) { - if (HmiBuildConfig.isShowObuV2iView) { +// if (HmiBuildConfig.isShowObuV2iView) { CallerLogger.d( "$M_OBU${MogoObuConst.TAG_MOGO_OBU}", "onCvxRtiThreatIndInfo ------> $info" @@ -433,8 +433,7 @@ class MogoPrivateObuManager private constructor() { } } } - } - +// } } // (4) V2I预警信息：CVX_IVP_THREAT_IND，红绿灯 @@ -448,20 +447,20 @@ class MogoPrivateObuManager private constructor() { && info.ext_info.lights != null && info.ext_info.lights.isNotEmpty() ) { - if (HmiBuildConfig.isShowObuV2iView) { +// if (HmiBuildConfig.isShowObuV2iView) { handlerTrafficLight( info.threat_info.app_id, info.status, info.ext_info.lights, info.ext_info.index ) - } +// } } } // (2) 弱势交通参与者预警信息：CVX_PTC_THREAT_IND override fun onCvxPtcThreatIndInfo(info: CvxPtcThreatIndInfo?) { - if (HmiBuildConfig.isShowObuV2iView) { +// if (HmiBuildConfig.isShowObuV2iView) { CallerLogger.d( "$M_OBU${MogoObuConst.TAG_MOGO_OBU}", "onCvxPtcInfoIndInfo ------> $info" @@ -559,7 +558,7 @@ class MogoPrivateObuManager private constructor() { } } - } +// } } // (5) 限速预警信息：CVX_SLW_THREAT_IND @@ -592,7 +591,7 @@ class MogoPrivateObuManager private constructor() { // (1) V2V预警信息：CVX_V2V_THREAT_IND override fun onCvxV2vThreatIndInfo(info: CvxV2vThreatIndInfo?) { - if (HmiBuildConfig.isShowObuV2vView) { +// if (HmiBuildConfig.isShowObuV2vView) { CallerLogger.d( "$M_OBU${MogoObuConst.TAG_MOGO_OBU}", "onCvxV2vThreatIndInfo ------> $info" @@ -620,7 +619,7 @@ class MogoPrivateObuManager private constructor() { } } } - } +// } } /** diff --git a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuNewManager.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuNewManager.kt index dc66e9ec3b..c37886b8bf 100644 --- a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuNewManager.kt +++ b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuNewManager.kt @@ -171,7 +171,7 @@ class MogoPrivateObuNewManager private constructor() { */ override fun onMogoObuRvWarning(data: MogoObuRvWarningData) { super.onMogoObuRvWarning(data) - if (HmiBuildConfig.isShowObuV2vView) { +// if (HmiBuildConfig.isShowObuV2vView) { //TODO 临时需要关闭v2v开关 mObuStatusInfo.obuRvStatus = true CallerObuListenerManager.invokeListener(mObuStatusInfo) @@ -211,7 +211,7 @@ class MogoPrivateObuNewManager private constructor() { } } } - } +// } } /** @@ -221,13 +221,13 @@ class MogoPrivateObuNewManager private constructor() { super.onMogoObuSpatWarning(data) if (data?.lights != null && data.lights.isNotEmpty() ) { - if (HmiBuildConfig.isShowObuV2iView) { +// if (HmiBuildConfig.isShowObuV2iView) { handlerTrafficLight( data.warningType, data.status, data.lights ) - } +// } } } @@ -236,7 +236,7 @@ class MogoPrivateObuNewManager private constructor() { */ override fun onMogoObuRsiWarning(data: MogoObuRsiWarningData) { super.onMogoObuRsiWarning(data) - if (HmiBuildConfig.isShowObuV2iView) { +// if (HmiBuildConfig.isShowObuV2iView) { CallerLogger.d( "$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}", "onMogoObuRsiWarning ------> $data" @@ -469,8 +469,7 @@ class MogoPrivateObuNewManager private constructor() { } } } - } - +// } } /** @@ -486,7 +485,7 @@ class MogoPrivateObuNewManager private constructor() { data: MogoObuRsmWarningData? ) { super.onMogoObuRsmWarning(data) - if (HmiBuildConfig.isShowObuV2iView) { +// if (HmiBuildConfig.isShowObuV2iView) { if (HmiBuildConfig.isShowObuWeaknessTrafficView) { CallerLogger.d( "$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}", @@ -587,7 +586,7 @@ class MogoPrivateObuNewManager private constructor() { } } } - } +// } } /** diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/V2XEventManager.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/V2XEventManager.kt index b5520f7be9..7605e99bc7 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/V2XEventManager.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/V2XEventManager.kt @@ -13,7 +13,7 @@ import com.mogo.commons.module.ServiceConst.CARD_TYPE_ROAD_CONDITION import com.mogo.commons.module.status.IMogoStatusChangedListener import com.mogo.commons.module.status.MogoStatusManager import com.mogo.commons.module.status.StatusDescriptor -import com.mogo.eagle.core.data.enums.EventTypeEnum +import com.mogo.eagle.core.data.enums.EventTypeEnumNew import com.mogo.eagle.core.data.enums.EventTypeHelper import com.mogo.commons.network.* import com.mogo.eagle.core.data.config.FunctionBuildConfig @@ -366,7 +366,7 @@ object V2XEventManager : IMoGoMapLocationListener, IMoGoTokenCallback, IV2XCallb ) if (v2XRoadEventEntity != null) { val distance = v2XRoadEventEntity.distance - val min = if (EventTypeEnum.AI_ROAD_WORK.poiType == v2XRoadEventEntity.poiType) 0 else 5 + val min = if (EventTypeEnumNew.AI_ROAD_WORK.poiType == v2XRoadEventEntity.poiType) 0 else 5 CallerLogger.d( "$M_V2X$TAG", "--- trigger show before ---:data=>[${location.longitude}, ${location.latitude}, ${location.speed}], distance: $distance, minDistance: $min, poiType: ${v2XRoadEventEntity.poiType}" @@ -477,10 +477,10 @@ object V2XEventManager : IMoGoMapLocationListener, IMoGoTokenCallback, IV2XCallb // 1004 -> { //V2N_RSM,静止事件，包括异常停车、异常静止障碍物 // } 1005 -> { //V2N_RSI,施工事件，包括锥桶或者挡板围城的施工场景，是个多边形包围区域 - EventTypeEnum.AI_ROAD_WORK.poiType + EventTypeEnumNew.AI_ROAD_WORK.poiType } 1007 -> { //三角牌 - EventTypeEnum.FOURS_ACCIDENT_04.poiType + EventTypeEnumNew.FOURS_ACCIDENT_04.poiType } else -> { return @@ -564,31 +564,31 @@ object V2XEventManager : IMoGoMapLocationListener, IMoGoTokenCallback, IV2XCallb 1003 -> { // 交叉路口碰撞预警 changeVisualAngle = true - tempAppId = EventTypeEnum.TYPE_USECASE_ID_ICW.poiType.toInt() - tempTts = EventTypeEnum.TYPE_USECASE_ID_ICW.tts - tempContent = EventTypeEnum.TYPE_USECASE_ID_ICW.content + tempAppId = EventTypeEnumNew.TYPE_USECASE_ID_ICW.poiType.toInt() + tempTts = EventTypeEnumNew.TYPE_USECASE_ID_ICW.tts + tempContent = EventTypeEnumNew.TYPE_USECASE_ID_ICW.content } 1004 -> { // 交叉路口碰撞预警 changeVisualAngle = true - tempAppId = EventTypeEnum.TYPE_USECASE_ID_BSW.poiType.toInt() + tempAppId = EventTypeEnumNew.TYPE_USECASE_ID_BSW.poiType.toInt() tempTts = String.format( - EventTypeEnum.TYPE_USECASE_ID_BSW.tts, + EventTypeEnumNew.TYPE_USECASE_ID_BSW.tts, getWarningDirection() ) - tempContent = EventTypeEnum.TYPE_USECASE_ID_BSW.content + tempContent = EventTypeEnumNew.TYPE_USECASE_ID_BSW.content } 1006 -> { // 逆向超车预警 - tempAppId = EventTypeEnum.TYPE_USECASE_ID_DNPW.poiType.toInt() - tempTts = EventTypeEnum.TYPE_USECASE_ID_DNPW.tts - tempContent = EventTypeEnum.TYPE_USECASE_ID_DNPW.content + tempAppId = EventTypeEnumNew.TYPE_USECASE_ID_DNPW.poiType.toInt() + tempTts = EventTypeEnumNew.TYPE_USECASE_ID_DNPW.tts + tempContent = EventTypeEnumNew.TYPE_USECASE_ID_DNPW.content } 1005 -> { // 闯红灯预警 - tempAppId = EventTypeEnum.TYPE_USECASE_ID_IVP.poiType.toInt() - tempTts = EventTypeEnum.TYPE_USECASE_ID_IVP.tts - tempContent = EventTypeEnum.TYPE_USECASE_ID_IVP.content + tempAppId = EventTypeEnumNew.TYPE_USECASE_ID_IVP_RED.poiType.toInt() + tempTts = EventTypeEnumNew.TYPE_USECASE_ID_IVP_RED.tts + tempContent = EventTypeEnumNew.TYPE_USECASE_ID_IVP_RED.content } 2001 -> { // 最优车道100061 diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/alarm/V2XAlarmServer.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/alarm/V2XAlarmServer.java index 1d822f9a92..32217ef98e 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/alarm/V2XAlarmServer.java +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/alarm/V2XAlarmServer.java @@ -1,10 +1,10 @@ package com.mogo.eagle.core.function.v2x.events.alarm; +import com.mogo.eagle.core.data.enums.EventTypeEnumNew; import com.mogo.eagle.core.data.map.MogoLocation; import com.mogo.eagle.core.data.map.entity.MarkerLocation; import com.mogo.eagle.core.data.map.entity.V2XRoadEventEntity; import com.mogo.eagle.core.function.v2x.events.utils.DrivingDirectionUtils; -import com.mogo.eagle.core.data.enums.EventTypeEnum; import java.util.Iterator; import java.util.concurrent.CopyOnWriteArrayList; import io.netty.util.internal.ConcurrentSet; @@ -58,7 +58,7 @@ public class V2XAlarmServer { // 1、判断是否到达了触发距离,20 ~ 500, double distance = v2XRoadEventEntity.getDistance(); if (distance <= 500) { - if (EventTypeEnum.GHOST_PROBE.getPoiType().equals(v2XRoadEventEntity.getPoiType())) { + if (EventTypeEnumNew.GHOST_PROBE.getPoiType().equals(v2XRoadEventEntity.getPoiType())) { if (distance > 25) { continue; } diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/entity/panel/SurroundingConstruction.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/entity/panel/SurroundingConstruction.java index 00af59ade0..fb476713ce 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/entity/panel/SurroundingConstruction.java +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/entity/panel/SurroundingConstruction.java @@ -1,8 +1,7 @@ package com.mogo.eagle.core.function.v2x.events.entity.panel; +import com.mogo.eagle.core.data.enums.EventTypeEnumNew; import com.mogo.eagle.core.data.map.entity.MarkerExploreWay; -import com.mogo.eagle.core.data.enums.EventTypeEnum; - import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -39,7 +38,7 @@ public class SurroundingConstruction implements Serializable { public String getTypeNameTTS(String type) { String typeName = "请查看周边的"; - typeName += EventTypeEnum.getTypeNameTTS(type); + typeName += EventTypeEnumNew.getTypeNameTTS(type); return typeName + "信息"; } } diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoV2XMarkerManager.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoV2XMarkerManager.java index 83ed3ee04d..8e8ad1a041 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoV2XMarkerManager.java +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoV2XMarkerManager.java @@ -10,6 +10,7 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.mogo.cloud.commons.utils.CoordinateUtils; import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.module.status.MogoStatusManager; +import com.mogo.eagle.core.data.enums.EventTypeEnumNew; import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.eagle.core.data.map.MogoLocation; import com.mogo.eagle.core.data.map.entity.MarkerExploreWay; @@ -32,7 +33,6 @@ import com.mogo.map.marker.IMogoMarker; import com.mogo.map.marker.IMogoMarkerClickListener; import com.mogo.map.marker.IMogoMarkerManager; import com.mogo.map.marker.MogoMarkerOptions; -import com.mogo.eagle.core.data.enums.EventTypeEnum; import com.mogo.v2x.V2XManager; import com.mogo.v2x.data.V2XMarkerCardResult; import com.mogo.v2x.data.V2XMarkerExploreWay; @@ -112,7 +112,7 @@ public class MoGoV2XMarkerManager implements IMoGoV2XMarkerManager { List exploreWayList = markerCardResult.getExploreWay(); if (exploreWayList != null) { for (V2XMarkerExploreWay markerExploreWay : exploreWayList) { - if (EventTypeEnum.isRoadEvent(markerExploreWay.getPoiType())) { + if (EventTypeEnumNew.isRoadEvent(markerExploreWay.getPoiType())) { V2XMarkerLocation markerLocation = markerExploreWay.getLocation(); // 记录道路事件 V2XRoadEventEntity v2XRoadEventEntity = new V2XRoadEventEntity(); diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/marker/V2XMarkerAdapter.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/marker/V2XMarkerAdapter.java index 215745c444..ed35d062a8 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/marker/V2XMarkerAdapter.java +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/marker/V2XMarkerAdapter.java @@ -3,10 +3,9 @@ package com.mogo.eagle.core.function.v2x.events.marker; import android.content.Context; import android.graphics.Bitmap; +import com.mogo.eagle.core.data.enums.EventTypeEnumNew; import com.mogo.eagle.core.data.map.entity.V2XRoadEventEntity; import com.mogo.eagle.core.function.v2x.R; -import com.mogo.eagle.core.data.enums.EventTypeEnum; - import java.util.ArrayList; /** @@ -30,10 +29,10 @@ public class V2XMarkerAdapter { */ public static Bitmap getV2XRoadEventViewPng(Context context, V2XRoadEventEntity alarmInfo) { Bitmap bitmap; - if (EventTypeEnum.ALERT_TRAFFIC_LIGHT_SUGGEST.getPoiType().equals(alarmInfo.getPoiType()) - || EventTypeEnum.ALERT_TRAFFIC_LIGHT_WARNING.getPoiType().equals(alarmInfo.getPoiType()) - || EventTypeEnum.FOURS_BLOCK_UP.getPoiType().equals(alarmInfo.getPoiType()) - || EventTypeEnum.ALERT_CAR_TROUBLE_WARNING.getPoiType().equals(alarmInfo.getPoiType())) { + if (EventTypeEnumNew.ALERT_TRAFFIC_LIGHT_SUGGEST.getPoiType().equals(alarmInfo.getPoiType()) + || EventTypeEnumNew.ALERT_TRAFFIC_LIGHT_WARNING.getPoiType().equals(alarmInfo.getPoiType()) + || EventTypeEnumNew.FOURS_BLOCK_UP.getPoiType().equals(alarmInfo.getPoiType()) + || EventTypeEnumNew.ALERT_CAR_TROUBLE_WARNING.getPoiType().equals(alarmInfo.getPoiType())) { bitmap = getV2XRoadEventMarkerView( context, alarmInfo, @@ -52,10 +51,10 @@ public class V2XMarkerAdapter { */ public static ArrayList getV2XRoadEventViewGif(Context context, V2XRoadEventEntity alarmInfo) { ArrayList bitmapArrayList; - if (EventTypeEnum.ALERT_TRAFFIC_LIGHT_SUGGEST.getPoiType().equals(alarmInfo.getPoiType()) - || EventTypeEnum.ALERT_TRAFFIC_LIGHT_WARNING.getPoiType().equals(alarmInfo.getPoiType()) - || EventTypeEnum.FOURS_BLOCK_UP.getPoiType().equals(alarmInfo.getPoiType()) - || EventTypeEnum.ALERT_CAR_TROUBLE_WARNING.getPoiType().equals(alarmInfo.getPoiType())) { + if (EventTypeEnumNew.ALERT_TRAFFIC_LIGHT_SUGGEST.getPoiType().equals(alarmInfo.getPoiType()) + || EventTypeEnumNew.ALERT_TRAFFIC_LIGHT_WARNING.getPoiType().equals(alarmInfo.getPoiType()) + || EventTypeEnumNew.FOURS_BLOCK_UP.getPoiType().equals(alarmInfo.getPoiType()) + || EventTypeEnumNew.ALERT_CAR_TROUBLE_WARNING.getPoiType().equals(alarmInfo.getPoiType())) { bitmapArrayList = getV2XRoadEventOrangeMarkerView(context, alarmInfo); } else { bitmapArrayList = getV2XRoadEventRedMarkerView(context, alarmInfo); diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/marker/V2XMarkerRoadEventView.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/marker/V2XMarkerRoadEventView.kt index 2fe26980a0..26e860d73d 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/marker/V2XMarkerRoadEventView.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/marker/V2XMarkerRoadEventView.kt @@ -8,7 +8,7 @@ import androidx.constraintlayout.widget.ConstraintLayout import com.mogo.eagle.core.data.map.entity.V2XRoadEventEntity import com.mogo.eagle.core.function.v2x.R import com.mogo.eagle.core.utilcode.util.ViewUtils -import com.mogo.eagle.core.data.enums.EventTypeEnum +import com.mogo.eagle.core.data.enums.EventTypeEnumNew import kotlinx.android.synthetic.main.view_marker_event_car.view.* /** @@ -30,8 +30,8 @@ class V2XMarkerRoadEventView(context: Context, alarmInfo: V2XRoadEventEntity) : } fun initView(context: Context, alarmInfo: V2XRoadEventEntity) { - if (alarmInfo.poiType == EventTypeEnum.ALERT_FRONT_CAR.poiType || - alarmInfo.poiType == EventTypeEnum.ALERT_CAR_TROUBLE_WARNING.poiType + if (alarmInfo.poiType == EventTypeEnumNew.ALERT_FRONT_CAR.poiType || + alarmInfo.poiType == EventTypeEnumNew.ALERT_CAR_TROUBLE_WARNING.poiType ) { LayoutInflater.from(context) .inflate(R.layout.view_marker_event_car, this) @@ -43,11 +43,11 @@ class V2XMarkerRoadEventView(context: Context, alarmInfo: V2XRoadEventEntity) : } /** - * @see EventTypeEnum + * @see EventTypeEnumNew */ private fun updateIcon(alarmInfo: V2XRoadEventEntity) { // 道路施工、积水、路面结冰、浓雾、事故、拥堵 - val iconResId = EventTypeEnum.getUpdateIconRes(alarmInfo.poiType) + val iconResId = EventTypeEnumNew.getUpdateIconRes(alarmInfo.poiType) if (iconResId != 0) { ivCar.setImageResource(iconResId) } diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/receiver/TestPanelBroadcastReceiver.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/receiver/TestPanelBroadcastReceiver.kt index eedf86e930..b97eee7287 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/receiver/TestPanelBroadcastReceiver.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/receiver/TestPanelBroadcastReceiver.kt @@ -6,7 +6,7 @@ import android.content.Intent import android.util.Log import androidx.localbroadcastmanager.content.LocalBroadcastManager import com.mogo.commons.module.status.MogoStatusManager -import com.mogo.eagle.core.data.enums.EventTypeEnum +import com.mogo.eagle.core.data.enums.EventTypeEnumNew import com.mogo.eagle.core.data.map.entity.MarkerExploreWay import com.mogo.eagle.core.data.map.entity.V2XMessageEntity import com.mogo.eagle.core.data.map.entity.V2XRoadEventEntity @@ -166,7 +166,7 @@ class TestPanelBroadcastReceiver : BroadcastReceiver() { val v2XMessageEntity = V2XMessageEntity() v2XMessageEntity.type = V2XMessageEntity.V2XTypeEnum.ALERT_ROAD_WARNING v2XMessageEntity.content = - trackedObj.toRoadMarker(EventTypeEnum.FOURS_ACCIDENT_04.poiType).toV2XRoadEventEntity() + trackedObj.toRoadMarker(EventTypeEnumNew.FOURS_ACCIDENT_04.poiType).toV2XRoadEventEntity() v2XMessageEntity.isShowState = true V2XScenarioManager.getInstance().handlerMessage(v2XMessageEntity) } @@ -199,7 +199,7 @@ class TestPanelBroadcastReceiver : BroadcastReceiver() { val v2XMessageEntity = V2XMessageEntity() v2XMessageEntity.type = V2XMessageEntity.V2XTypeEnum.ALERT_ROAD_WARNING v2XMessageEntity.content = - trackedObj.toRoadMarker(EventTypeEnum.AI_ROAD_WORK.poiType).toV2XRoadEventEntity() + trackedObj.toRoadMarker(EventTypeEnumNew.AI_ROAD_WORK.poiType).toV2XRoadEventEntity() v2XMessageEntity.isShowState = true V2XScenarioManager.getInstance().handlerMessage(v2XMessageEntity) } diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XRoadEventMarker.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XRoadEventMarker.java index bb7d2c4c06..e63a5cc18c 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XRoadEventMarker.java +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XRoadEventMarker.java @@ -2,6 +2,7 @@ package com.mogo.eagle.core.function.v2x.events.scenario.scene.road; import androidx.core.util.Pair; +import com.mogo.eagle.core.data.enums.EventTypeEnumNew; import com.mogo.eagle.core.data.map.entity.MarkerExploreWay; import com.mogo.eagle.core.data.map.entity.MarkerLocation; import com.mogo.eagle.core.data.map.entity.V2XRoadEventEntity; @@ -10,8 +11,6 @@ import com.mogo.eagle.core.function.v2x.events.manager.IMoGoV2XMarkerManager; import com.mogo.eagle.core.function.v2x.events.manager.IMoGoV2XPolylineManager; import com.mogo.eagle.core.function.v2x.events.scenario.scene.airoad.AiRoadMarker; import com.mogo.eagle.core.function.v2x.events.scenario.view.IV2XMarker; -import com.mogo.eagle.core.data.enums.EventTypeEnum; - import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -32,8 +31,8 @@ public class V2XRoadEventMarker implements IV2XMarker { if (marker != null) { marker.clearAlarmPOI(); if (entity != null) { - if (!Objects.equals(entity.getPoiType(), EventTypeEnum.AI_ROAD_WORK.getPoiType()) - && !Objects.equals(entity.getPoiType(), EventTypeEnum.FOURS_ACCIDENT_04.getPoiType())) { + if (!Objects.equals(entity.getPoiType(), EventTypeEnumNew.AI_ROAD_WORK.getPoiType()) + && !Objects.equals(entity.getPoiType(), EventTypeEnumNew.FOURS_ACCIDENT_04.getPoiType())) { AiRoadMarker.Marker prev = mMarker; if (prev != null) { AiRoadMarker.INSTANCE.unMarker(prev); diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XRoadEventScenario.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XRoadEventScenario.java index cf448413a1..045fe265b5 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XRoadEventScenario.java +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XRoadEventScenario.java @@ -5,6 +5,7 @@ import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_V2X import android.util.Log; import com.mogo.commons.analytics.AnalyticsUtils; +import com.mogo.eagle.core.data.enums.EventTypeEnumNew; import com.mogo.eagle.core.data.enums.WarningDirectionEnum; import com.mogo.eagle.core.data.map.entity.MarkerExploreWay; import com.mogo.eagle.core.data.map.entity.V2XMessageEntity; @@ -22,8 +23,6 @@ import com.mogo.eagle.core.function.v2x.events.scenario.impl.AbsV2XScenario; import com.mogo.eagle.core.function.v2x.events.scenario.view.IV2XMarker; import com.mogo.eagle.core.network.utils.GsonUtil; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; -import com.mogo.eagle.core.data.enums.EventTypeEnum; - import java.util.HashMap; import java.util.Map; import java.util.concurrent.TimeUnit; @@ -150,7 +149,7 @@ public class V2XRoadEventScenario extends AbsV2XScenario imp V2XRoadEventEntity content = entity.getContent(); if (content != null) { MarkerExploreWay noveltyInfo = content.getNoveltyInfo(); - if (noveltyInfo != null && EventTypeEnum.FOURS_FOG.getPoiType().equals(content.getNoveltyInfo().getPoiType())) { + if (noveltyInfo != null && EventTypeEnumNew.FOURS_FOG.getPoiType().equals(content.getNoveltyInfo().getPoiType())) { CallerHmiManager.INSTANCE.displayEffects(); } } @@ -163,7 +162,7 @@ public class V2XRoadEventScenario extends AbsV2XScenario imp if (content == null) { return true; } - return !EventTypeEnum.GHOST_PROBE.getPoiType().equals(content.getPoiType()); + return !EventTypeEnumNew.GHOST_PROBE.getPoiType().equals(content.getPoiType()); } @Override diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/utils/EntityUtils.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/utils/EntityUtils.kt index c52c20373c..08ecd097e8 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/utils/EntityUtils.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/utils/EntityUtils.kt @@ -1,7 +1,7 @@ package com.mogo.eagle.core.function.v2x.events.utils import androidx.core.util.Pair -import com.mogo.eagle.core.data.enums.EventTypeEnum.Companion.isRoadEvent +import com.mogo.eagle.core.data.enums.EventTypeEnumNew.Companion.isRoadEvent import com.mogo.eagle.core.data.map.entity.MarkerExploreWay import com.mogo.eagle.core.data.map.entity.MarkerLocation import com.mogo.eagle.core.data.map.entity.MarkerUserInfo diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/redlightwarning/RedLightWarningManager.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/redlightwarning/RedLightWarningManager.kt index 49004bae3e..93f23984b6 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/redlightwarning/RedLightWarningManager.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/redlightwarning/RedLightWarningManager.kt @@ -20,7 +20,7 @@ import com.mogo.eagle.core.function.v2x.trafficlight.core.MogoTrafficLightManage import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_V2X import com.mogo.eagle.core.utilcode.util.ThreadUtils -import com.mogo.eagle.core.data.enums.EventTypeEnum +import com.mogo.eagle.core.data.enums.EventTypeEnumNew import com.mogo.eagle.core.data.msgbox.MsgBoxBean import com.mogo.eagle.core.data.msgbox.MsgBoxType import com.mogo.eagle.core.data.msgbox.V2XMsg @@ -208,16 +208,16 @@ class RedLightWarningManager : IMoGoTrafficLightListener, IMoGoVipSetListener, CallerMsgBoxManager.saveMsgBox( MsgBoxBean( MsgBoxType.V2X, - V2XMsg(EventTypeEnum.TYPE_USECASE_ID_IVP.poiType, - EventTypeEnum.TYPE_USECASE_ID_IVP.content, - EventTypeEnum.TYPE_USECASE_ID_IVP.tts) + V2XMsg(EventTypeEnumNew.TYPE_USECASE_ID_IVP_RED.poiType, + EventTypeEnumNew.TYPE_USECASE_ID_IVP_RED.content, + EventTypeEnumNew.TYPE_USECASE_ID_IVP_RED.tts) ) ) CallerHmiManager.warningV2X( - EventTypeEnum.TYPE_USECASE_ID_IVP.poiType, - EventTypeEnum.TYPE_USECASE_ID_IVP.content, - EventTypeEnum.TYPE_USECASE_ID_IVP.tts, - EventTypeEnum.TYPE_USECASE_ID_IVP.poiType, + EventTypeEnumNew.TYPE_USECASE_ID_IVP_RED.poiType, + EventTypeEnumNew.TYPE_USECASE_ID_IVP_RED.content, + EventTypeEnumNew.TYPE_USECASE_ID_IVP_RED.tts, + EventTypeEnumNew.TYPE_USECASE_ID_IVP_RED.poiType, null, true, 5000L @@ -233,11 +233,11 @@ class RedLightWarningManager : IMoGoTrafficLightListener, IMoGoVipSetListener, CallerLogger.d("$M_V2X$TAG", "=====绿灯通行预警=====") ThreadUtils.runOnUiThread { val content = String.format( - EventTypeEnum.getWarningContent(EventTypeEnum.TYPE_USECASE_ID_IVP_GREEN.poiType), + EventTypeEnumNew.getWarningContent(EventTypeEnumNew.TYPE_USECASE_ID_IVP_GREEN.poiType), speed ) val tts = String.format( - EventTypeEnum.getWarningTts(EventTypeEnum.TYPE_USECASE_ID_IVP_GREEN.poiType), + EventTypeEnumNew.getWarningTts(EventTypeEnumNew.TYPE_USECASE_ID_IVP_GREEN.poiType), speed ) if (content.isNullOrEmpty() || tts.isNullOrEmpty()) { @@ -246,16 +246,16 @@ class RedLightWarningManager : IMoGoTrafficLightListener, IMoGoVipSetListener, CallerMsgBoxManager.saveMsgBox( MsgBoxBean( MsgBoxType.V2X, - V2XMsg(EventTypeEnum.TYPE_USECASE_ID_IVP_GREEN.poiType, + V2XMsg(EventTypeEnumNew.TYPE_USECASE_ID_IVP_GREEN.poiType, content, tts) ) ) CallerHmiManager.warningV2X( - EventTypeEnum.TYPE_USECASE_ID_IVP_GREEN.poiType, + EventTypeEnumNew.TYPE_USECASE_ID_IVP_GREEN.poiType, content, tts, - EventTypeEnum.TYPE_USECASE_ID_IVP_GREEN.poiType, + EventTypeEnumNew.TYPE_USECASE_ID_IVP_GREEN.poiType, null, true, 5000L diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt index 61bd434cb7..5320af1324 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt @@ -10,7 +10,7 @@ import com.mogo.aicloud.services.socket.MogoAiCloudSocketManager import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_VIP import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.V2N -import com.mogo.eagle.core.data.enums.EventTypeEnum +import com.mogo.eagle.core.data.enums.EventTypeEnumNew import com.mogo.eagle.core.data.msgbox.MsgBoxBean import com.mogo.eagle.core.data.msgbox.MsgBoxType import com.mogo.eagle.core.data.msgbox.V2XMsg @@ -211,17 +211,17 @@ class VipCarManager : IMogoOnMessageListener, IMoGoTrafficLightListe val light = this.result?.currentRoadTrafficLight() if (light != null && light.isGreen()) { showWarning( - EventTypeEnum.TYPE_VIP_IDENTIFICATION_EXTEND.poiType, - EventTypeEnum.TYPE_VIP_IDENTIFICATION_EXTEND.content, - EventTypeEnum.TYPE_VIP_IDENTIFICATION_EXTEND.tts, - EventTypeEnum.TYPE_VIP_IDENTIFICATION_EXTEND.poiType + EventTypeEnumNew.TYPE_VIP_IDENTIFICATION_EXTEND.poiType, + EventTypeEnumNew.TYPE_VIP_IDENTIFICATION_EXTEND.content, + EventTypeEnumNew.TYPE_VIP_IDENTIFICATION_EXTEND.tts, + EventTypeEnumNew.TYPE_VIP_IDENTIFICATION_EXTEND.poiType ) } else { showWarning( - EventTypeEnum.TYPE_VIP_IDENTIFICATION_PASS.poiType, - EventTypeEnum.TYPE_VIP_IDENTIFICATION_PASS.content, - EventTypeEnum.TYPE_VIP_IDENTIFICATION_PASS.tts, - EventTypeEnum.TYPE_VIP_IDENTIFICATION_PASS.poiType + EventTypeEnumNew.TYPE_VIP_IDENTIFICATION_PASS.poiType, + EventTypeEnumNew.TYPE_VIP_IDENTIFICATION_PASS.content, + EventTypeEnumNew.TYPE_VIP_IDENTIFICATION_PASS.tts, + EventTypeEnumNew.TYPE_VIP_IDENTIFICATION_PASS.poiType ) } return@turnLightToGreen @@ -230,10 +230,10 @@ class VipCarManager : IMogoOnMessageListener, IMoGoTrafficLightListe // 请求变灯失败，根据灯态来提示。 此处灯态未获取到 if (this.result == null || this.result?.currentRoadTrafficLight() == null) { showWarning( - EventTypeEnum.TYPE_VIP_ERROR_IDENTIFICATION.poiType, - EventTypeEnum.TYPE_VIP_ERROR_IDENTIFICATION.content + ", 稍后重试", - EventTypeEnum.TYPE_VIP_ERROR_IDENTIFICATION.tts, - EventTypeEnum.TYPE_VIP_ERROR_IDENTIFICATION.poiType + EventTypeEnumNew.TYPE_VIP_ERROR_IDENTIFICATION.poiType, + EventTypeEnumNew.TYPE_VIP_ERROR_IDENTIFICATION.content + ", 稍后重试", + EventTypeEnumNew.TYPE_VIP_ERROR_IDENTIFICATION.tts, + EventTypeEnumNew.TYPE_VIP_ERROR_IDENTIFICATION.poiType ) return@turnLightToGreen } @@ -251,10 +251,10 @@ class VipCarManager : IMogoOnMessageListener, IMoGoTrafficLightListe "${temp}秒后重试" } showWarning( - EventTypeEnum.TYPE_VIP_ERROR_IDENTIFICATION.poiType, - EventTypeEnum.TYPE_VIP_ERROR_IDENTIFICATION.content + time, - EventTypeEnum.TYPE_VIP_ERROR_IDENTIFICATION.tts, - EventTypeEnum.TYPE_VIP_ERROR_IDENTIFICATION.poiType + EventTypeEnumNew.TYPE_VIP_ERROR_IDENTIFICATION.poiType, + EventTypeEnumNew.TYPE_VIP_ERROR_IDENTIFICATION.content + time, + EventTypeEnumNew.TYPE_VIP_ERROR_IDENTIFICATION.tts, + EventTypeEnumNew.TYPE_VIP_ERROR_IDENTIFICATION.poiType ) } else { CallerLogger.d( diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/CloudPoiManager.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/CloudPoiManager.java index 540ffc7574..1569fa8a1b 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/CloudPoiManager.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/CloudPoiManager.java @@ -6,7 +6,7 @@ import android.util.ArrayMap; import com.elegant.network.utils.GsonUtil; import com.mogo.eagle.core.data.R; -import com.mogo.eagle.core.data.enums.EventTypeEnum; +import com.mogo.eagle.core.data.enums.EventTypeEnumNew; import com.mogo.eagle.core.data.map.PoiWrapper; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr; @@ -38,37 +38,37 @@ public class CloudPoiManager { public void generateDefault() { if (poiWrapper.isEmpty()) { - poiWrapper.put(EventTypeEnum.TRAFFIC_CHECK.getPoiType(), new PoiWrapper(EventTypeEnum.TRAFFIC_CHECK.getPoiType(), + poiWrapper.put(EventTypeEnumNew.TRAFFIC_CHECK.getPoiType(), new PoiWrapper(EventTypeEnumNew.TRAFFIC_CHECK.getPoiType(), R.drawable.module_common_icon_map_marker_road_check2, R.drawable.module_common_icon_map_marker_road_check2_white, "交通检查")); - poiWrapper.put(EventTypeEnum.ROAD_CLOSED.getPoiType(), new PoiWrapper(EventTypeEnum.ROAD_CLOSED.getPoiType(), + poiWrapper.put(EventTypeEnumNew.ROAD_CLOSED.getPoiType(), new PoiWrapper(EventTypeEnumNew.ROAD_CLOSED.getPoiType(), R.drawable.module_common_icon_map_marker_road_block_off2, R.drawable.module_common_icon_map_marker_road_block_off2_white, "封路")); - poiWrapper.put(EventTypeEnum.FOURS_ROAD_WORK.getPoiType(), new PoiWrapper(EventTypeEnum.FOURS_ROAD_WORK.getPoiType(), + poiWrapper.put(EventTypeEnumNew.FOURS_ROAD_WORK.getPoiType(), new PoiWrapper(EventTypeEnumNew.FOURS_ROAD_WORK.getPoiType(), R.drawable.module_common_icon_map_marker_road_work2, R.drawable.module_common_icon_map_marker_road_work2_white, "施工")); - poiWrapper.put(EventTypeEnum.AI_ROAD_WORK.getPoiType(), new PoiWrapper(EventTypeEnum.AI_ROAD_WORK.getPoiType(), + poiWrapper.put(EventTypeEnumNew.AI_ROAD_WORK.getPoiType(), new PoiWrapper(EventTypeEnumNew.AI_ROAD_WORK.getPoiType(), R.drawable.module_common_icon_map_marker_road_work2, R.drawable.module_common_icon_map_marker_road_work2_white, "施工")); - poiWrapper.put(EventTypeEnum.FOURS_BLOCK_UP.getPoiType(), new PoiWrapper(EventTypeEnum.FOURS_BLOCK_UP.getPoiType(), + poiWrapper.put(EventTypeEnumNew.FOURS_BLOCK_UP.getPoiType(), new PoiWrapper(EventTypeEnumNew.FOURS_BLOCK_UP.getPoiType(), R.drawable.module_common_icon_map_marker_road_block_up2, R.drawable.module_common_icon_map_marker_road_block_up2_white, "拥堵")); - poiWrapper.put(EventTypeEnum.FOURS_PONDING.getPoiType(), new PoiWrapper(EventTypeEnum.FOURS_PONDING.getPoiType(), + poiWrapper.put(EventTypeEnumNew.FOURS_PONDING.getPoiType(), new PoiWrapper(EventTypeEnumNew.FOURS_PONDING.getPoiType(), R.drawable.module_common_icon_map_marker_pondingl2, R.drawable.module_common_icon_map_marker_pondingl2_white, "积水")); - poiWrapper.put(EventTypeEnum.FOURS_FOG.getPoiType(), new PoiWrapper(EventTypeEnum.FOURS_FOG.getPoiType(), + poiWrapper.put(EventTypeEnumNew.FOURS_FOG.getPoiType(), new PoiWrapper(EventTypeEnumNew.FOURS_FOG.getPoiType(), R.drawable.module_common_ic_rc_dark_frog2, R.drawable.module_common_ic_rc_dark_frog2_white, "浓雾")); - poiWrapper.put(EventTypeEnum.FOURS_ICE.getPoiType(), new PoiWrapper(EventTypeEnum.FOURS_ICE.getPoiType(), + poiWrapper.put(EventTypeEnumNew.FOURS_ICE.getPoiType(), new PoiWrapper(EventTypeEnumNew.FOURS_ICE.getPoiType(), R.drawable.module_common_ic_rc_freeze2, R.drawable.module_common_ic_rc_freeze2_white, "结冰")); - poiWrapper.put(EventTypeEnum.FOURS_ACCIDENT.getPoiType(), new PoiWrapper(EventTypeEnum.FOURS_ACCIDENT.getPoiType(), + poiWrapper.put(EventTypeEnumNew.FOURS_ACCIDENT.getPoiType(), new PoiWrapper(EventTypeEnumNew.FOURS_ACCIDENT.getPoiType(), R.drawable.module_common_ic_rc_accident3, R.drawable.module_common_ic_rc_accident3_white, "事故")); - poiWrapper.put(EventTypeEnum.FOURS_ACCIDENT_01.getPoiType(), new PoiWrapper(EventTypeEnum.FOURS_ACCIDENT_01.getPoiType(), + poiWrapper.put(EventTypeEnumNew.FOURS_ACCIDENT_01.getPoiType(), new PoiWrapper(EventTypeEnumNew.FOURS_ACCIDENT_01.getPoiType(), R.drawable.module_common_ic_rc_accident3, R.drawable.module_common_ic_rc_accident3_white, "重大事故")); - poiWrapper.put(EventTypeEnum.FOURS_ACCIDENT_02.getPoiType(), new PoiWrapper(EventTypeEnum.FOURS_ACCIDENT_02.getPoiType(), + poiWrapper.put(EventTypeEnumNew.FOURS_ACCIDENT_02.getPoiType(), new PoiWrapper(EventTypeEnumNew.FOURS_ACCIDENT_02.getPoiType(), R.drawable.module_common_ic_rc_accident3, R.drawable.module_common_ic_rc_accident3_white, "特大事故")); - poiWrapper.put(EventTypeEnum.FOURS_ACCIDENT_03.getPoiType(), new PoiWrapper(EventTypeEnum.FOURS_ACCIDENT_03.getPoiType(), + poiWrapper.put(EventTypeEnumNew.FOURS_ACCIDENT_03.getPoiType(), new PoiWrapper(EventTypeEnumNew.FOURS_ACCIDENT_03.getPoiType(), R.drawable.module_common_ic_rc_accident3, R.drawable.module_common_ic_rc_accident3_white, "较大事故")); - poiWrapper.put(EventTypeEnum.FOURS_ACCIDENT_04.getPoiType(), new PoiWrapper(EventTypeEnum.FOURS_ACCIDENT_04.getPoiType(), + poiWrapper.put(EventTypeEnumNew.FOURS_ACCIDENT_04.getPoiType(), new PoiWrapper(EventTypeEnumNew.FOURS_ACCIDENT_04.getPoiType(), R.drawable.module_common_ic_rc_accident3, R.drawable.module_common_ic_rc_accident3_white, "一般事故")); - poiWrapper.put(EventTypeEnum.FOURS_ACCIDENT_05.getPoiType(), new PoiWrapper(EventTypeEnum.FOURS_ACCIDENT_05.getPoiType(), + poiWrapper.put(EventTypeEnumNew.FOURS_ACCIDENT_05.getPoiType(), new PoiWrapper(EventTypeEnumNew.FOURS_ACCIDENT_05.getPoiType(), R.drawable.module_common_ic_rc_accident3, R.drawable.module_common_ic_rc_accident3_white, "轻微事故")); - poiWrapper.put(EventTypeEnum.FOURS_LIVING.getPoiType(), new PoiWrapper(EventTypeEnum.FOURS_LIVING.getPoiType(), + poiWrapper.put(EventTypeEnumNew.FOURS_LIVING.getPoiType(), new PoiWrapper(EventTypeEnumNew.FOURS_LIVING.getPoiType(), R.drawable.module_common_icon_map_marker_living, R.drawable.module_common_icon_map_marker_living_white, "实时路况")); - poiWrapper.put(EventTypeEnum.ILLEGAL_PARK_LIVING.getPoiType(), new PoiWrapper(EventTypeEnum.ILLEGAL_PARK_LIVING.getPoiType(), + poiWrapper.put(EventTypeEnumNew.ILLEGAL_PARK_LIVING.getPoiType(), new PoiWrapper(EventTypeEnumNew.ILLEGAL_PARK_LIVING.getPoiType(), R.drawable.module_common_ic_rc_illegal_park, R.drawable.module_common_ic_rc_illegal_park_white, "违章停车")); // 分享里用到的故障求助 poiWrapper.put("9999", new PoiWrapper("9999", diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt index 68da05ad2a..5e3ac7422e 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt @@ -112,6 +112,12 @@ enum class EventTypeEnumNew( GHOST_PROBE("10024", "前方盲区行人预警", "前方盲区行人预警", R.drawable.icon_warning_v2x_pedestrian_crossing, "前方盲区行人通行，请注意", "前方盲区即将有行人通过，请减速慢行"), + //接管 + TAKE_OVER_EVENT( + "20000", "注意周围、立即接管", "注意周围、立即接管", R.drawable.icon_warning_take_over, + "注意周围、立即接管", "自动驾驶退出请立即接管" + ), + // 前方静止or慢速车辆报警 ALERT_FRONT_CAR("99999"), @@ -133,6 +139,15 @@ enum class EventTypeEnumNew( // 违章停车 ALERT_ILLEGAL_PARK("99992"), + //TODO 这个确认值 + TYPE_USECASE_OPTIMAL_LANE( + 0x2B06.toString(), + "最优车道", + poiTypeSrcVr = R.drawable.v2x_icon_live_logo, + content = "最优车道", + tts = "最优车道" + ), + //-------------obu v2n start ------------> TYPE_USECASE_ID_FCW( 2000.toString(), @@ -141,13 +156,13 @@ enum class EventTypeEnumNew( content = "前车碰撞预警", tts = "小心前车" ), - // TYPE_USECASE_ID_ICW( - // 1.toString(), - // "交叉路口碰撞预警", - // poiTypeSrcVr = R.drawable.icon_warning_v2x_collision_warning, - // content = "交叉路口碰撞预警", - // tts = "注意交叉路口车辆" - // ), + TYPE_USECASE_ID_ICW( + 2009.toString(), + "交叉路口碰撞预警", + poiTypeSrcVr = R.drawable.icon_warning_v2x_collision_warning, + content = "交叉路口碰撞预警", + tts = "注意交叉路口车辆" + ), TYPE_USECASE_ID_LTA( 2001.toString(), "左转辅助", @@ -459,8 +474,9 @@ enum class EventTypeEnumNew( tts = "" ), - TYPE_VIP_IDENTIFICATION("10022", "", "", R.drawable.icon_warning_v2x_vip_turn_light, "VIP车辆优先通行", "已为您变灯，请优先通行"), - + TYPE_VIP_IDENTIFICATION_PASS("10022", "", "", R.drawable.icon_warning_v2x_vip_turn_light, "VIP车辆优先通行，已为您变为绿灯", "VIP车辆优先通行，已为您变为绿灯"), + TYPE_VIP_IDENTIFICATION_EXTEND("10023", "", "", R.drawable.icon_warning_v2x_vip_turn_light, "VIP车辆优先通行，已为您延长绿灯", "VIP车辆优先通行，已为您延长绿灯"), + TYPE_VIP_ERROR_IDENTIFICATION("10024", "", "", R.drawable.icon_warning_v2x_vip_turn_light, "请求失败，", "请求失败,稍后重试"), TYPE_OPTIMAL_ROUTE_RECOMMEND("2000", "", "", R.drawable.icon_warning_v2x_optimal_route, "为您推荐最优路线", "已为您选择最优路线"); @@ -712,7 +728,7 @@ enum class EventTypeEnumNew( fun getMarker3DRes(poiType: String?): Int { return when (poiType) { FOURS_BLOCK_UP.poiType -> R.raw.v2x_yongdu - FOURS_ACCIDENT.poiType -> R.raw.v2x_shigu + FOURS_ACCIDENT.poiType,FOURS_ACCIDENT_04.poiType -> R.raw.v2x_shigu FOURS_LIVING.poiType -> R.raw.v2x_shishilukuang FOURS_FOG.poiType -> R.raw.v2x_nongwu TRAFFIC_CHECK.poiType -> R.raw.v2x_jiaotongjiancha @@ -747,39 +763,59 @@ enum class EventTypeEnumNew( return when (poiType) { //交通检查 TRAFFIC_CHECK.poiType -> { - R.drawable.v_to_x_marker_2 + R.drawable.v2x_icon_jiaotongjiancha_vr } //封路 ROAD_CLOSED.poiType -> { - R.drawable.v_to_x_marker_16 + R.drawable.v2x_icon_fenglu_vr } //施工 FOURS_ROAD_WORK.poiType -> { - R.drawable.v_to_x_marker_11 + R.drawable.icon_warning_v2x_road_construction } //AI施工 AI_ROAD_WORK.poiType -> { - R.drawable.v_to_x_marker_11 + R.drawable.icon_warning_v2x_road_construction } //拥堵 FOURS_BLOCK_UP.poiType -> { - R.drawable.v_to_x_marker_5 + R.drawable.icon_warning_v2x_congestion } //积水 FOURS_PONDING.poiType -> { - R.drawable.v_to_x_marker_6 + R.drawable.v2x_icon_jishui_vr } //浓雾 FOURS_FOG.poiType -> { - R.drawable.v_to_x_marker_9 + R.drawable.v2x_icon_nongwu_vr } //结冰 FOURS_ICE.poiType -> { - R.drawable.v_to_x_marker_8 + R.drawable.v2x_icon_jiebing_vr } //事故 FOURS_ACCIDENT.poiType -> { - R.drawable.v_to_x_marker_7 + R.drawable.v2x_icon_jiaotongshigu_vr + } + //重大事故 + FOURS_ACCIDENT_01.poiType -> { + R.drawable.v2x_icon_jiaotongshigu_vr + } + //特大事故 + FOURS_ACCIDENT_02.poiType -> { + R.drawable.v2x_icon_jiaotongshigu_vr + } + //较大事故 + FOURS_ACCIDENT_03.poiType -> { + R.drawable.v2x_icon_jiaotongshigu_vr + } + //一般事故 + FOURS_ACCIDENT_04.poiType -> { + R.drawable.v2x_icon_jiaotongshigu_vr + } + //轻微事故 + FOURS_ACCIDENT_05.poiType -> { + R.drawable.v2x_icon_jiaotongshigu_vr } //事故 FOURS_LIVING.poiType -> { @@ -801,16 +837,34 @@ enum class EventTypeEnumNew( ALERT_CAR_TROUBLE_WARNING.poiType -> { R.drawable.icon_car_red } - - //闯红灯预警 - TYPE_USECASE_ID_IVP_RED.poiType -> { - R.drawable.icon_warning_v2x_traffic_lights_red + //VIP车辆优先通行，已为您变为绿灯 + TYPE_VIP_IDENTIFICATION_PASS.poiType -> { + R.drawable.icon_warning_v2x_vip_turn_light + } + //VIP车辆优先通行，已为您延长绿灯 + TYPE_VIP_IDENTIFICATION_EXTEND.poiType -> { + R.drawable.icon_warning_v2x_vip_turn_light + } + //VIP变灯请求失败 + TYPE_VIP_ERROR_IDENTIFICATION.poiType -> { + R.drawable.icon_warning_v2x_vip_turn_light + } + //最优路线 + TYPE_OPTIMAL_ROUTE_RECOMMEND.poiType -> { + R.drawable.icon_warning_v2x_optimal_route } //绿波通行 TYPE_USECASE_ID_IVP_GREEN.poiType -> { R.drawable.icon_warning_v2x_traffic_lights_green } - + //鬼探头类型 + GHOST_PROBE.poiType -> { + R.drawable.icon_warning_v2x_pedestrian_crossing + } + //接管 + TAKE_OVER_EVENT.poiType -> { + R.drawable.icon_warning_take_over + } //机动车 TYPE_USECASE_ID_VRUCW_MOTOR_VEHICLES.poiType -> { R.drawable.icon_warning_v2x_motorcycle_collision @@ -868,7 +922,7 @@ enum class EventTypeEnumNew( return when (poiType) { TYPE_USECASE_ID_EBW.poiType -> TYPE_USECASE_ID_EBW.poiTypeSrcVr TYPE_USECASE_ID_FCW.poiType -> TYPE_USECASE_ID_FCW.poiTypeSrcVr -// TYPE_USECASE_ID_ICW.poiType -> TYPE_USECASE_ID_ICW.poiTypeSrcVr + TYPE_USECASE_ID_ICW.poiType -> TYPE_USECASE_ID_ICW.poiTypeSrcVr TYPE_USECASE_ID_CLW.poiType -> TYPE_USECASE_ID_CLW.poiTypeSrcVr TYPE_USECASE_ID_DNPW.poiType -> TYPE_USECASE_ID_DNPW.poiTypeSrcVr TYPE_USECASE_ID_AVW.poiType -> TYPE_USECASE_ID_AVW.poiTypeSrcVr @@ -876,7 +930,8 @@ enum class EventTypeEnumNew( TYPE_USECASE_ID_LCW.poiType -> TYPE_USECASE_ID_LCW.poiTypeSrcVr TYPE_USECASE_ID_EVW.poiType -> TYPE_USECASE_ID_EVW.poiTypeSrcVr TYPE_USECASE_ID_LTA.poiType -> TYPE_USECASE_ID_LTA.poiTypeSrcVr - TYPE_VIP_IDENTIFICATION.poiType -> TYPE_VIP_IDENTIFICATION.poiTypeSrcVr + TYPE_VIP_IDENTIFICATION_PASS.poiType -> TYPE_VIP_IDENTIFICATION_PASS.poiTypeSrcVr + TYPE_VIP_IDENTIFICATION_EXTEND.poiType -> TYPE_VIP_IDENTIFICATION_EXTEND.poiTypeSrcVr TYPE_ERROR.poiType -> TYPE_ERROR.poiTypeSrcVr TYPE_OPTIMAL_ROUTE_RECOMMEND.poiType -> TYPE_OPTIMAL_ROUTE_RECOMMEND.poiTypeSrcVr GHOST_PROBE.poiType -> GHOST_PROBE.poiTypeSrcVr @@ -929,7 +984,7 @@ enum class EventTypeEnumNew( return when (poiType) { TYPE_USECASE_ID_EBW.poiType -> TYPE_USECASE_ID_EBW.content TYPE_USECASE_ID_FCW.poiType -> TYPE_USECASE_ID_FCW.content -// TYPE_USECASE_ID_ICW.poiType -> TYPE_USECASE_ID_ICW.content + TYPE_USECASE_ID_ICW.poiType -> TYPE_USECASE_ID_ICW.content TYPE_USECASE_ID_CLW.poiType -> TYPE_USECASE_ID_CLW.content TYPE_USECASE_ID_DNPW.poiType -> TYPE_USECASE_ID_DNPW.content TYPE_USECASE_ID_AVW.poiType -> TYPE_USECASE_ID_AVW.content @@ -937,7 +992,8 @@ enum class EventTypeEnumNew( TYPE_USECASE_ID_LCW.poiType -> TYPE_USECASE_ID_LCW.content TYPE_USECASE_ID_EVW.poiType -> TYPE_USECASE_ID_EVW.content TYPE_USECASE_ID_LTA.poiType -> TYPE_USECASE_ID_LTA.content - TYPE_VIP_IDENTIFICATION.poiType -> TYPE_VIP_IDENTIFICATION.content + TYPE_VIP_IDENTIFICATION_PASS.poiType -> TYPE_VIP_IDENTIFICATION_PASS.content + TYPE_VIP_IDENTIFICATION_EXTEND.poiType -> TYPE_VIP_IDENTIFICATION_EXTEND.content FOURS_ROAD_WORK.poiType -> FOURS_ROAD_WORK.content AI_ROAD_WORK.poiType -> AI_ROAD_WORK.content TYPE_ERROR.poiType -> TYPE_ERROR.content @@ -992,7 +1048,7 @@ enum class EventTypeEnumNew( return when (poiType) { TYPE_USECASE_ID_EBW.poiType -> TYPE_USECASE_ID_EBW.tts TYPE_USECASE_ID_FCW.poiType -> TYPE_USECASE_ID_FCW.tts -// TYPE_USECASE_ID_ICW.poiType -> TYPE_USECASE_ID_ICW.tts + TYPE_USECASE_ID_ICW.poiType -> TYPE_USECASE_ID_ICW.tts TYPE_USECASE_ID_CLW.poiType -> TYPE_USECASE_ID_CLW.tts TYPE_USECASE_ID_DNPW.poiType -> TYPE_USECASE_ID_DNPW.tts TYPE_USECASE_ID_AVW.poiType -> TYPE_USECASE_ID_AVW.tts @@ -1000,7 +1056,8 @@ enum class EventTypeEnumNew( TYPE_USECASE_ID_LCW.poiType -> TYPE_USECASE_ID_LCW.tts TYPE_USECASE_ID_EVW.poiType -> TYPE_USECASE_ID_EVW.tts TYPE_USECASE_ID_LTA.poiType -> TYPE_USECASE_ID_LTA.tts - TYPE_VIP_IDENTIFICATION.poiType -> TYPE_VIP_IDENTIFICATION.tts + TYPE_VIP_IDENTIFICATION_PASS.poiType -> TYPE_VIP_IDENTIFICATION_PASS.tts + TYPE_VIP_IDENTIFICATION_EXTEND.poiType -> TYPE_VIP_IDENTIFICATION_EXTEND.tts FOURS_ROAD_WORK.poiType -> FOURS_ROAD_WORK.tts AI_ROAD_WORK.poiType -> AI_ROAD_WORK.tts TYPE_ERROR.poiType -> TYPE_ERROR.tts diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeHelper.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeHelper.kt index 8f8cd1ff35..b1da3cc519 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeHelper.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeHelper.kt @@ -29,20 +29,20 @@ class EventTypeHelper { when { direction.isLeft() -> { data.invoke( - EventTypeEnum.getWarningContent(appId.toString() + "左"), - EventTypeEnum.getWarningTts(appId.toString() + "左") + EventTypeEnumNew.getWarningContent(appId.toString() + "左"), + EventTypeEnumNew.getWarningTts(appId.toString() + "左") ) } direction.isRight() -> { data.invoke( - EventTypeEnum.getWarningContent(appId.toString() + "右"), - EventTypeEnum.getWarningTts(appId.toString() + "右") + EventTypeEnumNew.getWarningContent(appId.toString() + "右"), + EventTypeEnumNew.getWarningTts(appId.toString() + "右") ) } else -> { data.invoke( - EventTypeEnum.getWarningContent(appId.toString()), - EventTypeEnum.getWarningTts(appId.toString()) + EventTypeEnumNew.getWarningContent(appId.toString()), + EventTypeEnumNew.getWarningTts(appId.toString()) ) } } @@ -56,8 +56,8 @@ class EventTypeHelper { data: ((alert: String, tts: String) -> Unit) ) { data.invoke( - EventTypeEnum.getWarningContent(appId.toString() + direction.desc), - EventTypeEnum.getWarningContent(appId.toString() + direction.desc) + EventTypeEnumNew.getWarningContent(appId.toString() + direction.desc), + EventTypeEnumNew.getWarningContent(appId.toString() + direction.desc) ) } @@ -65,8 +65,8 @@ class EventTypeHelper { @BizConfig(V2V, "", BIZ_LTA) fun getLTA(appId: Int, data: ((alert: String, tts: String) -> Unit)) { data.invoke( - EventTypeEnum.getWarningContent(appId.toString()), - EventTypeEnum.getWarningTts(appId.toString()) + EventTypeEnumNew.getWarningContent(appId.toString()), + EventTypeEnumNew.getWarningTts(appId.toString()) ) } @@ -78,8 +78,8 @@ class EventTypeHelper { data: ((alert: String, tts: String) -> Unit) ) { data.invoke( - EventTypeEnum.getWarningContent(appId.toString() + direction.desc), - EventTypeEnum.getWarningTts(appId.toString() + direction.desc) + EventTypeEnumNew.getWarningContent(appId.toString() + direction.desc), + EventTypeEnumNew.getWarningTts(appId.toString() + direction.desc) ) } @@ -93,22 +93,22 @@ class EventTypeHelper { when { direction.isLeft() -> { data.invoke( - EventTypeEnum.getWarningContent(appId.toString() + "左"), - EventTypeEnum.getWarningTts(appId.toString() + "左"), + EventTypeEnumNew.getWarningContent(appId.toString() + "左"), + EventTypeEnumNew.getWarningTts(appId.toString() + "左"), true ) } direction.isRight() -> { data.invoke( - EventTypeEnum.getWarningContent(appId.toString() + "右"), - EventTypeEnum.getWarningTts(appId.toString() + "右"), + EventTypeEnumNew.getWarningContent(appId.toString() + "右"), + EventTypeEnumNew.getWarningTts(appId.toString() + "右"), true ) } else -> { data.invoke( - EventTypeEnum.getWarningContent(appId.toString()), - EventTypeEnum.getWarningTts(appId.toString()), + EventTypeEnumNew.getWarningContent(appId.toString()), + EventTypeEnumNew.getWarningTts(appId.toString()), false ) } @@ -119,9 +119,9 @@ class EventTypeHelper { @BizConfig(V2N, "", BIZ_VRU) fun getVRU(data: ((appId: Int, tts: String, content: String) -> Unit)) { data.invoke( - EventTypeEnum.TYPE_USECASE_ID_VRUCW_PERSON.poiType.toInt(), - EventTypeEnum.TYPE_USECASE_ID_VRUCW_PERSON.tts, - EventTypeEnum.TYPE_USECASE_ID_VRUCW_PERSON.content + EventTypeEnumNew.TYPE_USECASE_ID_VRUCW_PERSON.poiType.toInt(), + EventTypeEnumNew.TYPE_USECASE_ID_VRUCW_PERSON.tts, + EventTypeEnumNew.TYPE_USECASE_ID_VRUCW_PERSON.content ) } @@ -129,7 +129,7 @@ class EventTypeHelper { @BizConfig(V2N, "", BIZ_VRU_RI) fun getVRURI(data: ((appId: Int, tts: String, content: String) -> Unit)) { data.invoke( - EventTypeEnum.TYPE_USECASE_ID_VRUCW_PERSON.poiType.toInt(), + EventTypeEnumNew.TYPE_USECASE_ID_VRUCW_PERSON.poiType.toInt(), "行人逆行预警", "行人逆行预警" ) @@ -139,18 +139,18 @@ class EventTypeHelper { @BizConfig(V2N, "", BIZ_OPT_LINE) fun getOptLine(data: ((appId: Int, tts: String, content: String) -> Unit)) { data.invoke( - EventTypeEnum.TYPE_USECASE_OPTIMAL_LANE.poiType.toInt(), - EventTypeEnum.TYPE_USECASE_OPTIMAL_LANE.tts, - EventTypeEnum.TYPE_USECASE_OPTIMAL_LANE.content + EventTypeEnumNew.TYPE_USECASE_OPTIMAL_LANE.poiType.toInt(), + EventTypeEnumNew.TYPE_USECASE_OPTIMAL_LANE.tts, + EventTypeEnumNew.TYPE_USECASE_OPTIMAL_LANE.content ) } //前方道路拥堵预警 fun getTJW(data: ((appId: Int, tts: String, content: String) -> Unit)) { data.invoke( - EventTypeEnum.FOURS_BLOCK_UP.poiType.toInt(), - EventTypeEnum.FOURS_BLOCK_UP.tts, - EventTypeEnum.FOURS_BLOCK_UP.content + EventTypeEnumNew.FOURS_BLOCK_UP.poiType.toInt(), + EventTypeEnumNew.FOURS_BLOCK_UP.tts, + EventTypeEnumNew.FOURS_BLOCK_UP.content ) } @@ -158,8 +158,8 @@ class EventTypeHelper { @BizConfig(V2V, "", BIZ_EBW) fun getEBW(appId: Int, data: ((tts: String, content: String) -> Unit)) { data.invoke( - EventTypeEnum.getWarningContent(appId.toString()), - EventTypeEnum.getWarningTts(appId.toString()) + EventTypeEnumNew.getWarningContent(appId.toString()), + EventTypeEnumNew.getWarningTts(appId.toString()) ) } @@ -167,8 +167,8 @@ class EventTypeHelper { @BizConfig(V2V, "", BIZ_FCW) fun getFCW(appId: Int, data: ((tts: String, content: String) -> Unit)) { data.invoke( - EventTypeEnum.getWarningContent(appId.toString()), - EventTypeEnum.getWarningTts(appId.toString()) + EventTypeEnumNew.getWarningContent(appId.toString()), + EventTypeEnumNew.getWarningTts(appId.toString()) ) } @@ -176,8 +176,8 @@ class EventTypeHelper { @BizConfig(V2V, "", BIZ_DNPW) fun getDNPW(appId: Int, data: ((tts: String, content: String) -> Unit)) { data.invoke( - EventTypeEnum.getWarningContent(appId.toString()), - EventTypeEnum.getWarningTts(appId.toString()) + EventTypeEnumNew.getWarningContent(appId.toString()), + EventTypeEnumNew.getWarningTts(appId.toString()) ) } diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/entity/V2XRoadEventEntity.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/entity/V2XRoadEventEntity.java index eea9b6b93e..2aba9f30fc 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/entity/V2XRoadEventEntity.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/entity/V2XRoadEventEntity.java @@ -1,9 +1,7 @@ package com.mogo.eagle.core.data.map.entity; import android.text.TextUtils; - - -import com.mogo.eagle.core.data.enums.EventTypeEnum; +import com.mogo.eagle.core.data.enums.EventTypeEnumNew; import java.io.Serializable; import java.util.Objects; @@ -57,12 +55,12 @@ public class V2XRoadEventEntity implements Serializable { } public String getTts(boolean haveLiveCar) { - if (EventTypeEnum.GHOST_PROBE.getPoiType().equals(poiType)) { - tts = EventTypeEnum.GHOST_PROBE.getTts(); + if (EventTypeEnumNew.GHOST_PROBE.getPoiType().equals(poiType)) { + tts = EventTypeEnumNew.GHOST_PROBE.getTts(); return tts; } tts = "前方#" + (int) getDistance() + "米#"; - tts += EventTypeEnum.getTts(getPoiType()); + tts += EventTypeEnumNew.getTts(getPoiType()); if (haveLiveCar) { tts += "，查看实况请说确定。"; setShowEventButton(true); @@ -78,7 +76,7 @@ public class V2XRoadEventEntity implements Serializable { */ public String getTtsWithFeedback() { tts = "检测到附近"; - tts += EventTypeEnum.getTtsWithFeedback(getPoiType()); + tts += EventTypeEnumNew.getTtsWithFeedback(getPoiType()); tts += "，确认该信息是否正确？您可以说“正确”或“错误”帮助其他车友。"; return tts; } @@ -100,7 +98,7 @@ public class V2XRoadEventEntity implements Serializable { } public String getAlarmContent() { - alarmContent = EventTypeEnum.getAlarmContent(getPoiType()); + alarmContent = EventTypeEnumNew.getAlarmContent(getPoiType()); return alarmContent; }