diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/constant/BusConst.kt b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/constant/BusConst.kt index 686e08b4e4..e98439b8f1 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/constant/BusConst.kt +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/constant/BusConst.kt @@ -63,6 +63,7 @@ class BusConst { const val EVENT_PARAM_END_NAME = "end_name" const val EVENT_PARAM_LINE_ID = "line_id" const val EVENT_PARAM_START_RESULT = "start_autopilot" // true/false + const val EVENT_PARAM_START_FAILURE_CODE = "start_autopilot_failure_code" // 启动自驾失败code const val EVENT_PARAM_START_FAILURE_MSG = "start_autopilot_failure_msg" // 启动自驾失败原因 const val EVENT_PARAM_PLATE_NUM = "plate_number" // 车牌号 const val EVENT_PARAM_ENV_ONLINE = "env_online" // 是否线上环境：true/false diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java index e46780606e..d8e6827166 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java @@ -68,6 +68,8 @@ import com.mogo.och.common.module.utils.PinYinUtil; import com.mogo.och.common.module.utils.ToastUtilsOch; import com.mogo.och.common.module.voice.VoiceNotice; +import org.jetbrains.annotations.NotNull; + import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -369,8 +371,8 @@ public class BusOrderModel { private final OchAdasStartFailureCallback mAdasStartFailureListener = new OchAdasStartFailureCallback() { @Override - public void onStartAutopilotFailure(@NonNull String startFailedMessage) { - BusAnalyticsManager.getInstance().triggerStartAutopilotFailureEventByAdas(startFailedMessage); + public void onStartAutopilotFailure(@NotNull String startFailedCode, @NonNull String startFailedMessage) { + BusAnalyticsManager.getInstance().triggerStartAutopilotFailureEventByAdas(startFailedCode, startFailedMessage); if (mADASStatusCallback != null && !FunctionBuildConfig.isDemoMode){ CallerLogger.INSTANCE.e( M_BUS + TAG, "mAdasStartFailureListener = "+startFailedMessage ); mADASStatusCallback.onStartAdasFailure(); @@ -439,6 +441,7 @@ public class BusOrderModel { clearAutopilotControlParameters(); closeBeautificationMode(); clearStartAutopilotTag(); + removeTipRunnables(); return; } CallerLogger.INSTANCE.d(M_BUS + TAG, "获取到小巴路线数据: " + data); @@ -644,22 +647,23 @@ public class BusOrderModel { @Override public void onSuccess(BaseData o) { CallerLogger.INSTANCE.d(M_BUS + TAG, "行程日志-arriveSiteStation success"); - queryBusRoutes(); - - arriveStationSuccess(arrivedStationIndex, departureStopName, arriveStation); - + if (o != null && o.code == 0){ + queryBusRoutes(); + isArrivedStation = true; + isGoingToNextStation = false; + arriveStationSuccess(arrivedStationIndex, departureStopName, arriveStation); + } //5s轮询核销乘客 // startOrStopQueryPassengerWriteOff(true); } @Override public void onFail(int code, String failMsg) { - isArrivedStation = false; - isGoingToNextStation = true; if (ToastUtilsOch.isCustomFastClick(5000)) { if (!NetworkUtils.isConnected(mContext)) { ToastUtils.showShort("网络异常，请稍后重试"); } else { + if (isArrivedStation) return; ToastUtils.showShort(failMsg); } } @@ -1012,13 +1016,10 @@ public class BusOrderModel { } if (isArrivedStation) return; - isArrivedStation = true; CallerLogger.INSTANCE.d(M_BUS + TAG, "行程日志-当前==backgroundCurrentStationIndex=" + backgroundCurrentStationIndex); - isGoingToNextStation = false; - arriveSiteStation(); } diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.java index 1b28355846..5cc16e22cb 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.java @@ -38,21 +38,21 @@ public class BusAnalyticsManager { private Runnable startAutopilotRunnable = () -> { // 15s内未开启，上报失败埋点 - triggerStartAutopilotFailureEvent("15s后app等待超时"); + triggerStartAutopilotFailureEvent("", "15s后app等待超时"); }; - public void triggerStartAutopilotFailureEventByAdas(String failMsg){ + public void triggerStartAutopilotFailureEventByAdas(String failCode, String failMsg){ removeWaitingCallback(); - triggerStartAutopilotFailureEvent(failMsg); + triggerStartAutopilotFailureEvent(failCode, failMsg); } - private void triggerStartAutopilotFailureEvent(String failMsg){ + private void triggerStartAutopilotFailureEvent(String failCode, String failMsg){ CallerLogger.INSTANCE.e( M_BUS + "triggerStartAutopilotFailureEvent", failMsg ); mStartAutopilotParams.put(BusConst.EVENT_PARAM_START_RESULT , CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState() == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING); - mStartAutopilotParams.put(BusConst.EVENT_PARAM_START_FAILURE_MSG, - failMsg); + mStartAutopilotParams.put(BusConst.EVENT_PARAM_START_FAILURE_CODE, failCode); + mStartAutopilotParams.put(BusConst.EVENT_PARAM_START_FAILURE_MSG, failMsg); AnalyticsManager.INSTANCE.track(mStartAutopilotKey, mStartAutopilotParams); } diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/callback/OchAdasStartFailureCallback.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/callback/OchAdasStartFailureCallback.kt index b66f82d19a..e723b6248d 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/callback/OchAdasStartFailureCallback.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/callback/OchAdasStartFailureCallback.kt @@ -5,5 +5,5 @@ package com.mogo.och.common.module.callback * @date: 2022/11/9 */ interface OchAdasStartFailureCallback { - fun onStartAutopilotFailure(startFailedMessage : String) + fun onStartAutopilotFailure(startFailedCode : String, startFailedMessage : String) } \ No newline at end of file diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/OCHAdasAbilityManager.java b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/OCHAdasAbilityManager.java index 33d7fead37..fda4e3fa53 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/OCHAdasAbilityManager.java +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/OCHAdasAbilityManager.java @@ -28,6 +28,7 @@ public class OCHAdasAbilityManager implements IMoGoAutopilotActionsListener, IMo private boolean isAutopilotAbility = true; private String autopilotAbilityReason = ""; + private String startFailedCode = ""; private String startFailedMessage = ""; private OchAdasStartFailureCallback failureCallback = null; @@ -56,6 +57,10 @@ public class OCHAdasAbilityManager implements IMoGoAutopilotActionsListener, IMo return autopilotAbilityReason; } + public String getStartFailedCode() { + return startFailedCode; + } + public String getStartFailedMessage() { return startFailedMessage; } @@ -111,9 +116,11 @@ public class OCHAdasAbilityManager implements IMoGoAutopilotActionsListener, IMo if (statistics == null) return; Logger.d(TAG, "AutopilotStatistics= " + statistics.status); if (failureCallback != null && 1 == statistics.status){ + startFailedCode = statistics.failedMessage.getCode(); startFailedMessage = statistics.failedMessage.getMsg(); - failureCallback.onStartAutopilotFailure(startFailedMessage); - Logger.d(TAG, "statistics-startFailedMessage= " + startFailedMessage); + failureCallback.onStartAutopilotFailure(startFailedCode, startFailedMessage); + Logger.d(TAG, String.format("statistics-startFailedCode = s%; startFailedMessage = s%", + startFailedCode, startFailedMessage)); } } diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiConst.kt b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiConst.kt index 68f2379a42..21372d9fb7 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiConst.kt +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiConst.kt @@ -65,6 +65,7 @@ class TaxiConst { const val EVENT_PARAM_END_NAME = "end_name" const val EVENT_PARAM_ORDER_NUMBER = "order_num" const val EVENT_PARAM_START_RESULT = "start_autopilot" // true/false + const val EVENT_PARAM_START_FAILURE_CODE = "start_autopilot_failure_code" // 启动自驾失败code const val EVENT_PARAM_START_FAILURE_MSG = "start_autopilot_failure_msg" // 启动自驾失败原因 const val EVENT_PARAM_PLATE_NUM = "plate_number" // 车牌号 const val EVENT_PARAM_ENV_ONLINE = "env_online" // 是否线上环境：true/false diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java index c114157434..384020964e 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java @@ -1030,8 +1030,8 @@ public class TaxiModel { private final OchAdasStartFailureCallback mAdasStartFailureListener = new OchAdasStartFailureCallback() { @Override - public void onStartAutopilotFailure(@NonNull String startFailedMessage) { - TaxiAnalyticsManager.getInstance().triggerStartAutopilotFailureEventByAdas(startFailedMessage); + public void onStartAutopilotFailure(@NotNull String startFailedCode, @NonNull String startFailedMessage) { + TaxiAnalyticsManager.getInstance().triggerStartAutopilotFailureEventByAdas(startFailedCode, startFailedMessage); if (mADASStatusCallback != null && !FunctionBuildConfig.isDemoMode){ CallerLogger.INSTANCE.e(M_TAXI + TAG, "mAdasStartFailureListener = "+startFailedMessage); mADASStatusCallback.onStartAdasFailure(); diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.java index b6180d52d5..d54c098b4f 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.java @@ -36,12 +36,12 @@ public class TaxiAnalyticsManager { private Runnable startAutopilotRunnable = () -> { // 15s内未开启，上报失败埋点 - triggerStartAutopilotFailureEvent("15s后app等待超时"); + triggerStartAutopilotFailureEvent("", "15s后app等待超时"); }; - public void triggerStartAutopilotFailureEventByAdas(String failMsg){ + public void triggerStartAutopilotFailureEventByAdas(String failCode, String failMsg){ removeWaitingCallback(); - triggerStartAutopilotFailureEvent(failMsg); + triggerStartAutopilotFailureEvent(failCode, failMsg); } private void removeWaitingCallback() { @@ -51,9 +51,10 @@ public class TaxiAnalyticsManager { } } - private void triggerStartAutopilotFailureEvent(String failMsg){ + private void triggerStartAutopilotFailureEvent(String failCode, String failMsg){ CallerLogger.INSTANCE.e(M_TAXI + "triggerStartAutopilotFailureEvent", failMsg); mStartAutopilotParams.put(TaxiConst.EVENT_PARAM_START_RESULT, false); + mStartAutopilotParams.put(TaxiConst.EVENT_PARAM_START_FAILURE_CODE, failCode); mStartAutopilotParams.put(TaxiConst.EVENT_PARAM_START_FAILURE_MSG, failMsg); AnalyticsManager.INSTANCE.track(mStartAutopilotKey, mStartAutopilotParams); 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 4ea178bc6d..8ce2536cf9 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 @@ -20,6 +20,7 @@ import androidx.core.view.* import androidx.lifecycle.lifecycleScope import com.alibaba.android.arouter.facade.annotation.Route import com.alibaba.android.arouter.launcher.ARouter +import com.mogo.commons.context.ContextHolderUtil import com.mogo.commons.mvp.BaseFragment import com.mogo.commons.mvp.MvpFragment import com.mogo.commons.voice.* @@ -1463,11 +1464,13 @@ class MoGoHmiFragment : MvpFragment(), content: String, installType: String ) { - if (upgradeAppDialog == null) { - upgradeAppDialog = context?.let { UpgradeAppDialog(it) } + if (ContextHolderUtil.getContext() != null) { + if (upgradeAppDialog == null) { + upgradeAppDialog = UpgradeAppDialog(ContextHolderUtil.getContext()) + } + upgradeAppDialog!!.setCanceledOnTouchOutside(false) + upgradeAppDialog!!.showUpgradeAppDialog(name, url, title, content, installType) } - upgradeAppDialog!!.setCanceledOnTouchOutside(false) - upgradeAppDialog!!.showUpgradeAppDialog(name, url, title, content, installType) } /** diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index 2a0d1868dd..b36220de4e 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt @@ -1145,7 +1145,7 @@ class DebugSettingView @JvmOverloads constructor( * 限速数据，优先使用obu，默认打开 */ tbRoadLimitSpeed.setOnCheckedChangeListener { _, isChecked -> - HmiBuildConfig.isShowObuLimitSpeedView = !isChecked + HmiBuildConfig.isShowObuLimitSpeedView = isChecked } /** diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt index b3f44f967d..c4c112f21d 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt @@ -2,6 +2,7 @@ package com.mogo.eagle.core.function.hmi.ui.setting import android.content.Context import android.util.AttributeSet +import android.util.Log import android.view.LayoutInflater import android.view.View import androidx.constraintlayout.widget.ConstraintLayout @@ -94,6 +95,11 @@ class SOPSettingView @JvmOverloads constructor( } } + tbRoadLimitSpeedSop.setOnCheckedChangeListener { _, isChecked -> + //默认关闭 + HmiBuildConfig.isShowObuLimitSpeedView = isChecked + } + //红绿灯标识 tbTrafficLight.isChecked = HmiBuildConfig.isShowTrafficLightView tbTrafficLight.setOnCheckedChangeListener { _, isChecked -> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml index 4ec2b8f47a..7a32567b16 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml @@ -1082,8 +1082,8 @@ android:layout_columnWeight="1" android:layout_margin="2dp" android:gravity="center" - android:textOff="关闭路侧限速" - android:textOn="获取路侧限速" + android:textOff="获取路侧限速提醒" + android:textOn="关闭路侧限速提醒" android:textSize="@dimen/dp_24" /> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml index 5546db154c..906309f37f 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml @@ -167,12 +167,24 @@ app:layout_constraintTop_toBottomOf="@id/tbCloudWeaknessTrafficSop" /> + + { - //显示警告红边 TODO 需要确定是什么值 -// CallerHmiManager.showWarning(direction) - + ObuConstants.STATUS.ADD -> { //不显示弹框，其它保留 + CallerLogger.d("$M_OBU${MogoObuConst.TAG_MOGO_OBU}", "old onCvxRtiThreatIndInfo ------> appId = $appId --- alertContent = $alertContent --- ttsContent = $ttsContent ") CallerMsgBoxManager.saveMsgBox( MsgBoxBean( MsgBoxType.OBU, @@ -401,6 +397,12 @@ class MogoPrivateObuManager private constructor() { true, 5000L ) + } + + ObuConstants.STATUS.UPDATE -> { + //显示警告红边 TODO 需要确定是什么值 +// CallerHmiManager.showWarning(direction) + // 更新数据 TrafficDataConvertUtils.cvxRtiThreatIndInfo2TrafficData(info)?.let { CallerObuListenerManager.invokeTrackerWarningInfo(it) @@ -408,6 +410,7 @@ class MogoPrivateObuManager private constructor() { ?.updateITrafficThreatLevelInfo(it) } } + // 删除 ObuConstants.STATUS.DELETE -> { // 关闭警告红边 @@ -500,12 +503,11 @@ class MogoPrivateObuManager private constructor() { when (info.status) { // 添加 - ObuConstants.STATUS.ADD, - ObuConstants.STATUS.UPDATE// 更新 - -> { -// if (level == 2 || level == 3) { //不考虑level + ObuConstants.STATUS.ADD -> { + // if (level == 2 || level == 3) { //不考虑level //显示警告红边 CallerHmiManager.showWarning(direction) + CallerLogger.d("$M_OBU${MogoObuConst.TAG_MOGO_OBU}", "old onCvxPtcThreatIndInfo ------> v2xType = $v2xType --- alertContent = $alertContent --- ttsContent = $ttsContent ") CallerMsgBoxManager.saveMsgBox( MsgBoxBean( MsgBoxType.OBU, @@ -529,6 +531,7 @@ class MogoPrivateObuManager private constructor() { 5000L ) // } + // 更新数据 TrafficDataConvertUtils.cvxPtcThreatIndInfo2TrafficData(info)?.let { CallerObuListenerManager.invokeTrackerWarningInfo(it) @@ -536,6 +539,10 @@ class MogoPrivateObuManager private constructor() { ?.updateITrafficThreatLevelInfo(it) } } + + ObuConstants.STATUS.UPDATE -> { + } + // 删除 ObuConstants.STATUS.DELETE -> { // 关闭警告红边 @@ -721,6 +728,7 @@ class MogoPrivateObuManager private constructor() { 0x2 -> {//闯红灯 V2I_RLVW_VIOLATION_TYPE_RUNNING_RED_LIGHT ttsContent = EventTypeEnum.getWarningTts(appId.toString()) alertContent = EventTypeEnum.getWarningContent(appId.toString()) + CallerLogger.d("$M_OBU${MogoObuConst.TAG_MOGO_OBU}", "old changeTrafficLightStatus ------> appId.toString() = ${appId.toString()} --- alertContent = $alertContent --- ttsContent = $ttsContent ") CallerMsgBoxManager.saveMsgBox( MsgBoxBean( MsgBoxType.OBU, @@ -794,6 +802,7 @@ class MogoPrivateObuManager private constructor() { val maxSpeed = currentLight.glosa_suggested_speed_max.toInt() if (maxSpeed > 0) { + CallerLogger.d("$M_OBU${MogoObuConst.TAG_MOGO_OBU}", "old changeTrafficLightStatus ------> TYPE_USECASE_ID_IVP_GREEN --- alertContent = $alertContent --- ttsContent = $ttsContent ") CallerMsgBoxManager.saveMsgBox( MsgBoxBean( MsgBoxType.OBU, @@ -926,6 +935,9 @@ class MogoPrivateObuManager private constructor() { ) if (level == 2 || level == 3) { //不显示顶部弹框，其它保留 + CallerLogger.d("$M_OBU${MogoObuConst.TAG_MOGO_OBU}", + "old handleSdkObu appId2 = $appId --- level = $level ---ttsContent = $ttsContent --- alertContent = $alertContent --- direction = $direction" + ) CallerMsgBoxManager.saveMsgBox( MsgBoxBean( MsgBoxType.OBU, 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 349c1798fe..fcae6b1da0 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 @@ -252,27 +252,27 @@ class MogoPrivateObuNewManager private constructor() { MogoObuConstants.RSI_SCENE_TYPE.HLW.toString() -> { when (data.warningMsg[0].eventSerialNum) { MogoObuConstants.RTE.RTI_TYPE_BREAKDOWN -> {//车辆故障 - appId = V2iEventTypeEnum.TYPE_USECASE_ID_BREAKDOWN_WARNING.poiType + appId = EventTypeEnumNew.TYPE_USECASE_ID_BREAKDOWN_WARNING.poiType } MogoObuConstants.RTE.RTI_TYPE_ROAD_WATER -> { //道路积水 - appId = V2iEventTypeEnum.FOURS_PONDING.poiType + appId = EventTypeEnumNew.FOURS_PONDING.poiType } MogoObuConstants.RTE.RTI_TYPE_PARKING_VIOLATION -> { //异常停车 - appId = V2iEventTypeEnum.TYPE_USECASE_ID_ROAD_PARKING.poiType + appId = EventTypeEnumNew.TYPE_USECASE_ID_ROAD_PARKING.poiType } // MogoObuConstants.RTE.RTI_TYPE_CONSTRUCTION_RTE -> { //施工占道，和标牌重复 -// appId = V2iEventTypeEnum.FOURS_ROAD_WORK.poiType +// appId = EventTypeEnumNew.FOURS_ROAD_WORK.poiType // } MogoObuConstants.RTE.RTI_TYPE_SPEEDING -> { //超速行驶 - appId = V2iEventTypeEnum.TYPE_USECASE_ID_SLW.poiType + appId = EventTypeEnumNew.TYPE_USECASE_ID_SLW.poiType } MogoObuConstants.RTE.RTI_TYPE_RETRIGRADE -> { //车辆逆行 appId = - V2iEventTypeEnum.TYPE_USECASE_ID_ROAD_VEHICLE_RETROGRADE.poiType + EventTypeEnumNew.TYPE_USECASE_ID_ROAD_VEHICLE_RETROGRADE.poiType } } - alertContent = V2iEventTypeEnum.getWarningContent(appId) - ttsContent = V2iEventTypeEnum.getWarningTts(appId) + alertContent = EventTypeEnumNew.getWarningContent(appId) + ttsContent = EventTypeEnumNew.getWarningTts(appId) alertContent = String.format( //事件才有影响范围 alertContent, Math.round(data.warningMsg[0].distance).toString(), @@ -289,80 +289,80 @@ class MogoPrivateObuNewManager private constructor() { MogoObuConstants.RSI_SCENE_TYPE.IVS.toString() -> { when (data.warningMsg[0].signSerialNum) { // MogoObuConstants.RTS.RTI_TYPE_INTERSECTION -> { //十字路口 -// appId = V2iEventTypeEnum.TYPE_ID_NTERSECTION.poiType +// appId = EventTypeEnumNew.TYPE_ID_NTERSECTION.poiType // } MogoObuConstants.RTS.RTI_TYPE_SHAPR_TURNS -> { //急转弯 - appId = V2iEventTypeEnum.TYPE_ID_SHAPR_TURNS.poiType + appId = EventTypeEnumNew.TYPE_ID_SHAPR_TURNS.poiType } MogoObuConstants.RTS.RTI_TYPE_BRIDGE -> { //桥梁 - appId = V2iEventTypeEnum.TYPE_ID_BRIDGE.poiType + appId = EventTypeEnumNew.TYPE_ID_BRIDGE.poiType } MogoObuConstants.RTS.RTI_TYPE_PEDESTRIAN -> { //行人 - appId = V2iEventTypeEnum.TYPE_ID_PEDESTRIAN.poiType + appId = EventTypeEnumNew.TYPE_ID_PEDESTRIAN.poiType } MogoObuConstants.RTS.RTI_TYPE_SLIPPERY_ROAD -> { //路滑 - appId = V2iEventTypeEnum.TYPE_ID_SLIPPERY_ROAD.poiType + appId = EventTypeEnumNew.TYPE_ID_SLIPPERY_ROAD.poiType } MogoObuConstants.RTS.RTI_TYPE_TUNNEL -> { //隧道 - appId = V2iEventTypeEnum.TYPE_ID_TUNNEL.poiType + appId = EventTypeEnumNew.TYPE_ID_TUNNEL.poiType } MogoObuConstants.RTS.RTI_TYPE_FERRY -> { //渡轮 - appId = V2iEventTypeEnum.TYPE_ID_FERRY.poiType + appId = EventTypeEnumNew.TYPE_ID_FERRY.poiType } MogoObuConstants.RTS.RTI_TYPE_UNEVEN_ROAD -> { //路面不平 - appId = V2iEventTypeEnum.TYPE_ID_UNEVEN_ROAD.poiType + appId = EventTypeEnumNew.TYPE_ID_UNEVEN_ROAD.poiType } MogoObuConstants.RTS.RTI_TYPE_NON_MOTOR_VEHICLE -> { //非机动车 - appId = V2iEventTypeEnum.TYPE_ID_NON_MOTOR_VEHICLE.poiType + appId = EventTypeEnumNew.TYPE_ID_NON_MOTOR_VEHICLE.poiType } MogoObuConstants.RTS.RTI_TYPE_OBSTACLE -> { //障碍 - appId = V2iEventTypeEnum.TYPE_ID_OBSTACLE.poiType + appId = EventTypeEnumNew.TYPE_ID_OBSTACLE.poiType } MogoObuConstants.RTS.RTI_TYPE_CONSTRUCTION -> { //施工 - appId = V2iEventTypeEnum.TYPE_FOURS_ROAD_WORK.poiType + appId = EventTypeEnumNew.TYPE_FOURS_ROAD_WORK.poiType } MogoObuConstants.RTS.RTI_TYPE_VEHICLE_QUEUE -> { //车队 - appId = V2iEventTypeEnum.TYPE_VEHICLE_QUEUE.poiType + appId = EventTypeEnumNew.TYPE_VEHICLE_QUEUE.poiType } MogoObuConstants.RTS.RTI_TYPE_NO_PASSING -> { //不通 - appId = V2iEventTypeEnum.TYPE_NO_PASSING.poiType + appId = EventTypeEnumNew.TYPE_NO_PASSING.poiType } MogoObuConstants.RTS.RTI_TYPE_NO_TURNING_AROUND -> { //禁止掉头 - appId = V2iEventTypeEnum.TYPE_NO_TURNING_AROUND.poiType + appId = EventTypeEnumNew.TYPE_NO_TURNING_AROUND.poiType } MogoObuConstants.RTS.RTI_TYPE_NO_STOPPING -> { //禁止停车 - appId = V2iEventTypeEnum.TYPE_USECASE_ID_ROAD_NO_PARKING.poiType + appId = EventTypeEnumNew.TYPE_USECASE_ID_ROAD_NO_PARKING.poiType } MogoObuConstants.RTS.RTI_TYPE_NO_TOOTING -> { //禁止鸣笛 - appId = V2iEventTypeEnum.TYPE_USECASE_ID_ROAD_NO_TOOTING.poiType + appId = EventTypeEnumNew.TYPE_USECASE_ID_ROAD_NO_TOOTING.poiType } MogoObuConstants.RTS.RTI_TYPE_SPEED_LIMIT -> { //限速 - appId = V2iEventTypeEnum.TYPE_USECASE_ID_ROAD_SPEED_LIMIT.poiType + appId = EventTypeEnumNew.TYPE_USECASE_ID_ROAD_SPEED_LIMIT.poiType } // MogoObuConstants.RTS.RTI_TYPE_GO_STRAIGHT_TURN_RIGHT -> { //直行或右转 // appId = -// V2iEventTypeEnum.TYPE_USECASE_ID_GO_STRAIGHT_TURN_RIGHT.poiType +// EventTypeEnumNew.TYPE_USECASE_ID_GO_STRAIGHT_TURN_RIGHT.poiType // } MogoObuConstants.RTS.RTI_TYPE_BUS_WARNING -> { //公交提醒 - appId = V2iEventTypeEnum.TYPE_USECASE_ID_BUS_WARNING.poiType + appId = EventTypeEnumNew.TYPE_USECASE_ID_BUS_WARNING.poiType } MogoObuConstants.RTS.RTI_TYPE_NARROW_RIGHT -> { //右侧变窄/车道数减少 - appId = V2iEventTypeEnum.TYPE_USECASE_ID_NARROW_RIGHT.poiType + appId = EventTypeEnumNew.TYPE_USECASE_ID_NARROW_RIGHT.poiType } MogoObuConstants.RTS.RTI_TYPE_GAS_STATION -> { //加油站 - appId = V2iEventTypeEnum.TYPE_USECASE_ID_GAS_STATION.poiType + appId = EventTypeEnumNew.TYPE_USECASE_ID_GAS_STATION.poiType } MogoObuConstants.RTS.RTI_TYPE_SCHOOL -> { //学校 appId = - V2iEventTypeEnum.TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType + EventTypeEnumNew.TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType } MogoObuConstants.RTS.RTI_TYPE_ACCIDENT -> { //事故 - appId = V2iEventTypeEnum.TYPE_USECASE_ID_ACCIDENT.poiType + appId = EventTypeEnumNew.TYPE_USECASE_ID_ACCIDENT.poiType } } - alertContent = V2iEventTypeEnum.getWarningContent(appId) - ttsContent = V2iEventTypeEnum.getWarningTts(appId) + alertContent = EventTypeEnumNew.getWarningContent(appId) + ttsContent = EventTypeEnumNew.getWarningTts(appId) alertContent = String.format( //标牌是没有影响范围的 alertContent, Math.round(data.warningMsg[0].distance).toString() @@ -375,10 +375,10 @@ class MogoPrivateObuNewManager private constructor() { // 拥堵 MogoObuConstants.RSI_SCENE_TYPE.TJW.toString() -> { - appId = V2iEventTypeEnum.TYPE_USECASE_ID_TJW.poiType + appId = EventTypeEnumNew.TYPE_USECASE_ID_TJW.poiType - alertContent = V2iEventTypeEnum.getWarningContent(appId) - ttsContent = V2iEventTypeEnum.getWarningTts(appId) + alertContent = EventTypeEnumNew.getWarningContent(appId) + ttsContent = EventTypeEnumNew.getWarningTts(appId) alertContent = String.format( //事件才有影响范围 alertContent, Math.round(data.warningMsg[0].distance).toString(), @@ -393,14 +393,14 @@ class MogoPrivateObuNewManager private constructor() { //限速预警, ADD处理一次 MogoObuConstants.RSI_SCENE_TYPE.SLW.toString() -> { - alertContent = V2iEventTypeEnum.getWarningContent(appId) - ttsContent = V2iEventTypeEnum.getWarningTts(appId) + alertContent = EventTypeEnumNew.getWarningContent(appId) + ttsContent = EventTypeEnumNew.getWarningTts(appId) } } CallerLogger.d( "$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}", - "ttsContent = $ttsContent --alertContent = $alertContent --appId = $appId ---direction = ${direction.direction} --distance = ${Math.round(data.warningMsg[0].distance)} ---eventRadius = ${Math.round(data.warningMsg[0].eventRadius)} --speedMaxLimit = ${data.warningMsg[0].speedMaxLimit.toInt()}" + "new onMogoObuRsiWarning ttsContent = $ttsContent --alertContent = $alertContent --appId = $appId ---direction = ${direction.direction} --distance = ${Math.round(data.warningMsg[0].distance)} ---eventRadius = ${Math.round(data.warningMsg[0].eventRadius)} --speedMaxLimit = ${data.warningMsg[0].speedMaxLimit.toInt()}" ) when (status) { MogoObuConstants.STATUS.ADD -> { // 添加 @@ -483,25 +483,25 @@ class MogoPrivateObuNewManager private constructor() { var v2xType = "" if (data.participant.ptcType == 1) { //机动车 v2xType = - EventTypeEnumWeaknessTraffic.TYPE_USECASE_ID_VRUCW_MOTOR_VEHICLES.poiType + EventTypeEnumNew.TYPE_USECASE_ID_VRUCW_MOTOR_VEHICLES.poiType } else if (data.participant.ptcType == 2) { //非机动车 v2xType = - EventTypeEnumWeaknessTraffic.TYPE_USECASE_ID_VRUCW_NOT_MOTOR_VEHICLES.poiType + EventTypeEnumNew.TYPE_USECASE_ID_VRUCW_NOT_MOTOR_VEHICLES.poiType } else if (data.participant.ptcType == 3) { //行人 v2xType = - EventTypeEnumWeaknessTraffic.TYPE_USECASE_ID_VRUCW_PERSON.poiType + EventTypeEnumNew.TYPE_USECASE_ID_VRUCW_PERSON.poiType } else { //未知 - v2xType = EventTypeEnumWeaknessTraffic.TYPE_ERROR.poiType + v2xType = EventTypeEnumNew.TYPE_ERROR.poiType } - val ttsContent = EventTypeEnumWeaknessTraffic.getWarningTts(v2xType) + val ttsContent = EventTypeEnumNew.getWarningTts(v2xType) val alertContent = - EventTypeEnumWeaknessTraffic.getWarningContent(v2xType) + EventTypeEnumNew.getWarningContent(v2xType) var level = -1 val direction = getMessageDirection(data.participant.targetPosition) if (data.warningMsg != null && data.warningMsg.warningData != null && data.warningMsg.warningData.size > 0) { level = data.warningMsg.warningData[0].warningLevel //默认是1个 CallerLogger.d("$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}", - "onMogoObuRsmWarning ---status---> ${data.status} ---data.warningMsg.warningData[0].status = ${data.warningMsg.warningData[0].status}" + "new onMogoObuRsmWarning ---status---> ${data.status} ---data.warningMsg.warningData[0].status = ${data.warningMsg.warningData[0].status} ---v2xType = $v2xType ---alertContent = $alertContent ---ttsContent = $ttsContent " ) when (data.warningMsg.warningData[0].status) { @@ -735,7 +735,7 @@ class MogoPrivateObuNewManager private constructor() { MogoObuConstants.STATUS.UPDATE -> { CallerLogger.d( "$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}", - "appId2 = $appId --- level = $level ---ttsContent = $ttsContent --- alertContent = $alertContent --- direction = $direction" + "new handleSdkObu appId2 = $appId --- level = $level ---ttsContent = $ttsContent --- alertContent = $alertContent --- direction = $direction" ) if (level == 2 || level == 3) { //不显示弹框，其它保留 @@ -818,12 +818,16 @@ class MogoPrivateObuNewManager private constructor() { // 移除顶部弹窗 CallerHmiManager.disableWarningTrafficLight() CallerHmiManager.disableWarningV2X(appId.toString()) + isShowGreenWave = false + isShowRunRedLight = false } } } private var isRedLight = false private var isGreenLight = false + private var isShowGreenWave = false + private var isShowRunRedLight = false /** * 修改红绿灯 @@ -846,60 +850,66 @@ class MogoPrivateObuNewManager private constructor() { 0x0 -> {//不可用 V2I_RLVW_VIOLATION_TYPE_UNAVAILABLE 无效 } - 0x1 -> {//闯红灯 V2I_RLVW_VIOLATION_TYPE_RUNNING_RED_LIGHT TODO 需要约束一个红灯周期只显示一次 -// CallerHmiManager.disableWarningV2X(0x2.toString()) -// CallerLogger.d("$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}","changeTrafficLightStatus 闯红灯 --------> ") -// ttsContent = EventTypeEnumTrafficLight.getWarningTts(appId.toString()) -// alertContent = EventTypeEnumTrafficLight.getWarningContent(appId.toString()) -// CallerHmiManager.warningV2X( -// appId.toString(), alertContent, ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒 -// appId.toString(), null, true, 5000L) + 0x1 -> {//闯红灯 V2I_RLVW_VIOLATION_TYPE_RUNNING_RED_LIGHT 一个红灯周期只显示一次 + if (!isShowRunRedLight) { + isShowRunRedLight = true + CallerHmiManager.disableWarningV2X(0x2.toString()) + CallerLogger.d("$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}","changeTrafficLightStatus 闯红灯 --------> ") + ttsContent = EventTypeEnumNew.getWarningTts(appId.toString()) + alertContent = EventTypeEnumNew.getWarningContent(appId.toString()) + CallerHmiManager.warningV2X( + appId.toString(), alertContent, ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒 + appId.toString(), null, true, 5000L) + } } - 0x2 -> { //绿波通行引导 V2I_RLVW_VIOLATION_TYPE_NO_VIOLATION TODO 需要约束一个绿灯周期只显示一次 -// CallerHmiManager.disableWarningV2X(0x1.toString()) -// CallerLogger.d( -// "$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}", -// "speed_min = ${currentLight.suggestMinSpeed} --speed_max = ${currentLight.suggestMaxSpeed}" -// ) -// val adviceSpeed = -// "${currentLight.suggestMinSpeed} - ${currentLight.suggestMaxSpeed}" -// val adviceSpeedTts = -// "${currentLight.suggestMinSpeed}到${currentLight.suggestMaxSpeed}" -// ttsContent = -// String.format( -// EventTypeEnumTrafficLight.getWarningTts(appId.toString()), -// adviceSpeedTts -// ) -// alertContent = -// String.format( -// EventTypeEnumTrafficLight.getWarningContent(appId.toString()), -// adviceSpeed -// ) -// -// val maxSpeed = currentLight.suggestMaxSpeed -// if (maxSpeed > 0) { -// CallerMsgBoxManager.saveMsgBox( -// MsgBoxBean( -// MsgBoxType.OBU, -// V2XMsg( -// EventTypeEnumNew.TYPE_USECASE_ID_IVP_GREEN.poiType, -// alertContent, -// ttsContent -// ) -// ) -// ) -// -// CallerHmiManager.warningV2X( -// EventTypeEnumNew.TYPE_USECASE_ID_IVP_GREEN.poiType, -// alertContent, -// ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒 -// appId.toString(), -// null, -// true, -// 5000L -// ) -// } + 0x2 -> { //绿波通行引导 V2I_RLVW_VIOLATION_TYPE_NO_VIOLATION 一个绿灯周期只显示一次 100m的时候 + if (!isShowGreenWave) { + isShowGreenWave = true + CallerHmiManager.disableWarningV2X(0x1.toString()) + CallerLogger.d( + "$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}", + "new changeTrafficLightStatus speed_min = ${currentLight.suggestMinSpeed} --speed_max = ${currentLight.suggestMaxSpeed} --TYPE_USECASE_ID_IVP_GREEN ---alertContent = $alertContent ---ttsContent = $ttsContent" + ) + val adviceSpeed = + "${currentLight.suggestMinSpeed} - ${currentLight.suggestMaxSpeed}" + val adviceSpeedTts = + "${currentLight.suggestMinSpeed}到${currentLight.suggestMaxSpeed}" + ttsContent = + String.format( + EventTypeEnumNew.getWarningTts(appId.toString()), + adviceSpeedTts + ) + alertContent = + String.format( + EventTypeEnumNew.getWarningContent(appId.toString()), + adviceSpeed + ) + + val maxSpeed = currentLight.suggestMaxSpeed + if (maxSpeed > 0) { + CallerMsgBoxManager.saveMsgBox( + MsgBoxBean( + MsgBoxType.OBU, + V2XMsg( + EventTypeEnumNew.TYPE_USECASE_ID_IVP_GREEN.poiType, + alertContent, + ttsContent + ) + ) + ) + + CallerHmiManager.warningV2X( + EventTypeEnumNew.TYPE_USECASE_ID_IVP_GREEN.poiType, + alertContent, + ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒 + appId.toString(), + null, + true, + 5000L + ) + } + } } } diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HmiBuildConfig.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HmiBuildConfig.kt index b626dab4b5..e05da17109 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HmiBuildConfig.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HmiBuildConfig.kt @@ -98,6 +98,6 @@ object HmiBuildConfig { */ @JvmField @Volatile - var isShowObuLimitSpeedView = true + var isShowObuLimitSpeedView = false } \ No newline at end of file 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 901bb2aae1..989a74e40a 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 @@ -5,7 +5,8 @@ import com.mogo.eagle.core.data.config.CloudPoiManager /** - * OBU、V2N事件类型枚举类 + * OBU、V2N事件类型枚举类, 自研sdk版本的OBU + * */ enum class EventTypeEnumNew( val poiType: String, val poiTypeStr: String = "", @@ -132,110 +133,116 @@ enum class EventTypeEnumNew( // 违章停车 ALERT_ILLEGAL_PARK("99992"), - TYPE_USECASE_ID_EBW( - 6.toString(), - "紧急制动预警", - poiTypeSrcVr = R.drawable.icon_warning_v2x_emergency_brake, - content = "前车急刹车", - tts = "前车急刹车" - ), + //-------------v2n start ------------> TYPE_USECASE_ID_FCW( - 0.toString(), + 2000.toString(), "前向碰撞预警", poiTypeSrcVr = R.drawable.icon_warning_v2x_collision_warning, content = "前车碰撞预警", tts = "小心前车" ), -// TYPE_USECASE_ID_ICW( -// 1.toString(), -// "交叉路口碰撞预警", -// poiTypeSrcVr = R.drawable.icon_warning_v2x_collision_warning, -// content = "交叉路口碰撞预警", -// tts = "注意交叉路口车辆" -// ), - TYPE_USECASE_ID_AVW( - 7.toString(), - "异常车辆提醒", - poiTypeSrcVr = R.drawable.icon_warning_v2x_abnormal_vehicle, - content = "%s车异常", - tts = "小心%s异常车辆" + // TYPE_USECASE_ID_ICW( + // 1.toString(), + // "交叉路口碰撞预警", + // poiTypeSrcVr = R.drawable.icon_warning_v2x_collision_warning, + // content = "交叉路口碰撞预警", + // tts = "注意交叉路口车辆" + // ), + TYPE_USECASE_ID_LTA( + 2001.toString(), + "左转辅助", + poiTypeSrcVr = R.drawable.icon_warning_v2x_collision_warning, + content = "左转碰撞预警", + tts = "注意路口对向来车" ), TYPE_USECASE_ID_BSW( - 3.toString(), + 2002.toString(), "盲区预警", poiTypeSrcVr = R.drawable.icon_warning_v2x_blind_area_collision, content = "%s后盲区预警", tts = "注意%s后车辆" ), TYPE_USECASE_ID_LCW( - 4.toString(), + 2003.toString(), "变道预警", poiTypeSrcVr = R.drawable.icon_warning_v2x_reverse_overtaking, content = "%s向变道预警", tts = "注意%s后车辆" ),//注意左后车辆/注意右后车辆 - - TYPE_USECASE_ID_EVW( - 9.toString(), - "紧急车辆提醒", - poiTypeSrcVr = R.drawable.icon_warning_v2x_special_vehicle_access, - content = "注意特种车辆通行", - tts = "请避让特种车辆" - ), - TYPE_USECASE_ID_CLW( - 8.toString(), - "车辆失控预警", - poiTypeSrcVr = R.drawable.icon_warning_v2x_vehicle_control, - content = "前%s失控预警", - tts = "小心%s失控车辆" - ), TYPE_USECASE_ID_DNPW( - 5.toString(), + 2004.toString(), "逆向超车预警", poiTypeSrcVr = R.drawable.icon_warning_v2x_reverse_overtaking, content = "逆向超车预警", tts = "注意对向来车" ), - TYPE_USECASE_ID_ROAD_GIVE_WAY( - 0x2C11.toString(), - "减速慢行", - poiTypeSrcVr = R.drawable.icon_warning_v2x_give_way, - content = "注意路况复杂，减速慢行", - tts = "路况复杂，减速慢行" - ), - TYPE_USECASE_ID_ROAD_TURN_RIGHT_SHARP( - 0x2C03.toString(), - "前方右转急弯", - poiTypeSrcVr = R.drawable.icon_warning_v2x_turn_right_sharp, - content = "注意前方右转急弯", - tts = "前方路口右转急弯，减速慢行" - ), - TYPE_USECASE_ID_ROAD_TURN_LEFT_SHARP( - 0x2C02.toString(), - "前方左转急弯", - poiTypeSrcVr = R.drawable.icon_warning_v2x_turn_left_sharp, - content = "注意前方左转急弯", - tts = "前方路口左转急弯，减速慢行", + TYPE_USECASE_ID_EBW( + 2005.toString(), + "紧急制动预警", + poiTypeSrcVr = R.drawable.icon_warning_v2x_emergency_brake, + content = "前车急刹车", + tts = "前车急刹车" ), - TYPE_USECASE_ID_LTA( - 2.toString(), - "左转辅助", - poiTypeSrcVr = R.drawable.icon_warning_v2x_collision_warning, - content = "左转碰撞预警", - tts = "注意路口对向来车" + TYPE_USECASE_ID_AVW( + 2006.toString(), + "异常车辆提醒", + poiTypeSrcVr = R.drawable.icon_warning_v2x_abnormal_vehicle, + content = "%s车异常", + tts = "小心%s异常车辆" ), - - TYPE_USECASE_ID_TJW( //TODO - 4.toString(), - "前方拥堵提醒", - poiTypeSrcVr = R.drawable.icon_warning_v2x_congestion, - content = "前方%d米道路拥堵", - tts = "前方拥堵，减速慢行" + TYPE_USECASE_ID_CLW( + 2007.toString(), + "车辆失控预警", + poiTypeSrcVr = R.drawable.icon_warning_v2x_vehicle_control, + content = "前%s失控预警", + tts = "小心%s失控车辆" ), + TYPE_USECASE_ID_EVW( + 2008.toString(), + "紧急车辆提醒", + poiTypeSrcVr = R.drawable.icon_warning_v2x_special_vehicle_access, + content = "注意特种车辆通行", + tts = "请避让特种车辆" + ), + //-------------v2n end ------------> - TYPE_USECASE_ID_IVP( - 0x1.toString(), + + //---------弱势交通参与者 start ------> + TYPE_USECASE_ID_VRUCW_MOTOR_VEHICLES( + 1001.toString(), + "弱势交通参与者碰撞预警", + poiTypeSrcVr = R.drawable.icon_warning_v2x_motorcycle_collision, + content = "注意机动车", + tts = "注意机动车" + ), + TYPE_USECASE_ID_VRUCW_NOT_MOTOR_VEHICLES( + 1002.toString(), + "弱势交通参与者碰撞预警", + poiTypeSrcVr = R.drawable.icon_warning_v2x_motobike, + content = "注意非机动车", + tts = "注意非机动车" + ), + TYPE_USECASE_ID_VRUCW_PERSON( + 1003.toString(), + "弱势交通参与者碰撞预警", + poiTypeSrcVr = R.drawable.icon_warning_v2x_pedestrian_crossing, + content = "注意行人", + tts = "注意行人" + ), + TYPE_ERROR_WEAKNESS( + 1006.toString(), + "未知/错误/异常", + poiTypeSrcVr = R.drawable.icon_warning_v2x_abnormal_vehicle, + content = "前方有未知障碍物", + tts = "前方有未知障碍物" + ), + //---------弱势交通参与者 end --------> + + + //--------------红绿灯 start -------> TODO 修改重复 + TYPE_USECASE_ID_IVP_RED( + 1666.toString(), "闯红灯预警", poiTypeSrcVr = R.drawable.icon_warning_v2x_traffic_lights_red, content = "路口红灯，禁止通行", @@ -243,52 +250,210 @@ enum class EventTypeEnumNew( ), TYPE_USECASE_ID_IVP_GREEN( - 0x2.toString(), + 1667.toString(), "绿波通行", poiTypeSrcVr = R.drawable.icon_warning_v2x_traffic_lights_green, content = "建议车速 %s KM/H", tts = "建议车速 %s KM/H" ), + //-------------红绿灯 end ----------> - //6种智行杯的场景需添加 - TYPE_USECASE_ID_ROAD_VEHICLE_RETROGRADE( - 904.toString(), - "注意逆行车辆", - poiTypeSrcVr = R.drawable.icon_warning_v2x_school, - content = "注意逆行车辆", - tts = "注意逆行车辆" + //-----------道路危险情况预警 start ---------------> + TYPE_USECASE_ID_BREAKDOWN_WARNING( //故障车辆 + 101.toString(), + "车辆故障", + poiTypeSrcVr = R.drawable.icon_warning_v2x_collision_warning, + content = "前方%s米有故障车辆，影响路段%s米", + tts = "前方%s米有故障车辆，影响路段%s米" ), - - TYPE_USECASE_ID_SLW( + TYPE_FOURS_PONDING( //积水 + 407.toString(), + "道路积水", + poiTypeSrcVr = R.drawable.v2x_icon_jishui_vr, + content = "前方%s米道路积水，影响路段%s米", + tts ="前方%s米道路积水，影响路段%s米" + ), + TYPE_USECASE_ID_ROAD_PARKING( //异常停车 + 412.toString(), + "异常停车", + poiTypeSrcVr = R.drawable.icon_warning_v2x_no_parking, + content = "前方%s米异常停车，影响路段%s米", + tts = "前方%s米异常停车，影响路段%s米" + ), + TYPE_USECASE_ID_TJW( //%d + 707.toString(), + "拥堵", + poiTypeSrcVr = R.drawable.icon_warning_v2x_congestion, + content = "前方%s米拥堵，影响路段%s米", + tts = "前方%s米拥堵，影响路段%s米" + ), + TYPE_USECASE_ID_SLW( //超速行驶 901.toString(), - "注意超速车辆", + "超速行驶", poiTypeSrcVr = R.drawable.icon_warning_v2x_over_speed, - content = "注意超速车辆", - tts = "注意超速车辆" + content = "前方%s米超速行驶，影响路段%s米", + tts = "前方%s米超速行驶，影响路段%s米" ), - - TYPE_USECASE_ID_ROAD_TRAMCAR( - 0x2C01.toString(), - "前方有轨电车提醒", - poiTypeSrcVr = R.drawable.icon_warning_v2x_tramcar, - content = "注意前方有轨电车", - tts = "注意前方有轨电车驶过" + TYPE_USECASE_ID_ROAD_VEHICLE_RETROGRADE( //车辆逆行 + 904.toString(), + "逆行车辆", + poiTypeSrcVr = R.drawable.icon_default, + content = "前方%s米逆行车辆，影响路段%s米", + tts = "前方%s米逆行车辆，影响路段%s米" ), + TYPE_USECASE_ID_ROAD_SPEED_LIMIT( //--> + 6666.toString(), + "超速", + poiTypeSrcVr = R.drawable.icon_warning_v2x_over_speed, + content = "您已超速，请减速行驶", + tts = "您已超速，请减速行驶" + ), + //------------道路危险情况预警 end -----------> - TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING( - 0x2C04.toString(), - "人行横道", + + //------------车内标牌 start --------------> + TYPE_ID_SHAPR_TURNS( + 2.toString(), + "急转弯", + poiTypeSrcVr = R.drawable.icon_warning_v2x_turn_left_sharp, + content = "前方%s米急转弯", + tts = "前方%s米急转弯" + ), + TYPE_ID_BRIDGE( + 8.toString(), + "桥梁", + poiTypeSrcVr = R.drawable.icon_warning_v2x_hump_bridge, + content = "前方%s米桥梁", + tts = "前方%s米桥梁" + ), + TYPE_ID_PEDESTRIAN( + 10.toString(), + "行人", poiTypeSrcVr = R.drawable.icon_warning_v2x_pedestrian_crossing, - content = "注意前方人行横道", - tts = "前方人行横道，减速慢行" + content = "前方%s米行人", + tts = "前方%s米行人" + ), + TYPE_ID_SLIPPERY_ROAD( + 17.toString(), + "路滑", + poiTypeSrcVr = R.drawable.v2x_icon_jiebing_vr, + content = "前方%s米路滑", + tts = "前方%s米路滑" + ), + TYPE_ID_TUNNEL( + 21.toString(), + "隧道", + poiTypeSrcVr = R.drawable.icon_default, + content = "前方%s米隧道", + tts = "前方%s米隧道" + ), + TYPE_ID_FERRY( + 22.toString(), + "渡轮", + poiTypeSrcVr = R.drawable.icon_default, + content = "前方%s米渡轮", + tts = "前方%s米渡轮" + ), + TYPE_ID_UNEVEN_ROAD( + 24.toString(), + "路面不平", + poiTypeSrcVr = R.drawable.icon_warning_road_hollow, + content = "前方%s米路面不平", + tts = "前方%s米路面不平" + ), + TYPE_ID_NON_MOTOR_VEHICLE( + 32.toString(), + "非机动车", + poiTypeSrcVr = R.drawable.icon_warning_v2x_motobike, + content = "前方%s米有非机动车", + tts = "前方%s米有非机动车" + ), + TYPE_ID_OBSTACLE( + 36.toString(), + "障碍", + poiTypeSrcVr = R.drawable.icon_default, + content = "前方%s米障碍", + tts = "前方%s米障碍" + ), + TYPE_FOURS_ROAD_WORK( + 38.toString(), + "施工", + poiTypeSrcVr = R.drawable.icon_warning_v2x_road_construction, + content = "前方%s米施工", + tts = "前方%s米施工" + ), + TYPE_VEHICLE_QUEUE( + 47.toString(), + "车队", + poiTypeSrcVr = R.drawable.icon_default, + content = "前方%s米车队", + tts = "前方%s米车队" + ), + TYPE_NO_PASSING( + 51.toString(), + "不通", + poiTypeSrcVr = R.drawable.v2x_icon_fenglu_vr, + content = "前方%s米不通", + tts = "前方%s米不通" + ), + TYPE_NO_TURNING_AROUND( + 75.toString(), + "禁止掉头", + poiTypeSrcVr = R.drawable.icon_default, + content = "前方%s米禁止掉头", + tts = "前方%s米禁止掉头" ), TYPE_USECASE_ID_ROAD_NO_PARKING( - 0x2C10.toString(), + 78.toString(), "禁止停车", poiTypeSrcVr = R.drawable.icon_warning_v2x_no_parking, - content = "注意当前路段禁止停车", - tts = "当前路段，禁止停车" + content = "前方%s米禁止停车", + tts = "前方%s米禁止停车" ), + TYPE_USECASE_ID_ROAD_NO_TOOTING( + 80.toString(), + "禁止鸣笛", + poiTypeSrcVr = R.drawable.icon_warning_v2x_no_tooting, + content = "前方%s米禁止鸣笛", + tts = "前方%s米禁止鸣笛" + ), + TYPE_USECASE_ID_BUS_WARNING( + 123.toString(), + "公交提醒", + poiTypeSrcVr = R.drawable.icon_warning_v2x_tramcar, + content = "前方%s米公交提醒", + tts = "前方%s米公交提醒" + ), + TYPE_USECASE_ID_NARROW_RIGHT( + 163.toString(), + "右侧变窄/车道数减少", + poiTypeSrcVr = R.drawable.icon_default, + content = "前方%s米右侧变窄/车道数减少", + tts = "前方%s米右侧变窄/车道数减少" + ), + TYPE_USECASE_ID_GAS_STATION( + 201.toString(), + "加油站", + poiTypeSrcVr = R.drawable.icon_warning_gas_station, + content = "前方%s米加油站", + tts = "前方%s米加油站" + ), + TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL( + 242.toString(), + "学校", + poiTypeSrcVr = R.drawable.icon_warning_v2x_school, + content = "前方%s米学校", + tts = "前方%s米学校" + ), + TYPE_USECASE_ID_ACCIDENT( + 244.toString(), + "事故", + poiTypeSrcVr = R.drawable.v2x_icon_jiaotongshigu_vr, + content = "前方%s米事故", + tts = "前方%s米事故" + ), + //------------车内标牌 end --------------> + TYPE_ERROR( 0.toString(), @@ -640,12 +805,66 @@ 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 + } + //绿波通行 + TYPE_USECASE_ID_IVP_GREEN.poiType -> { + R.drawable.icon_warning_v2x_traffic_lights_green + } + + //机动车 + TYPE_USECASE_ID_VRUCW_MOTOR_VEHICLES.poiType -> { + R.drawable.icon_warning_v2x_motorcycle_collision + } + TYPE_USECASE_ID_VRUCW_NOT_MOTOR_VEHICLES.poiType -> { + R.drawable.icon_warning_v2x_motobike + } + TYPE_USECASE_ID_VRUCW_PERSON.poiType -> { + R.drawable.icon_warning_v2x_pedestrian_crossing + } + TYPE_ERROR_WEAKNESS.poiType -> { + R.drawable.icon_warning_v2x_abnormal_vehicle + } + + TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiTypeSrcVr + TYPE_USECASE_ID_ROAD_NO_PARKING.poiType -> TYPE_USECASE_ID_ROAD_NO_PARKING.poiTypeSrcVr + TYPE_USECASE_ID_SLW.poiType -> TYPE_USECASE_ID_SLW.poiTypeSrcVr + TYPE_USECASE_ID_TJW.poiType -> TYPE_USECASE_ID_TJW.poiTypeSrcVr + TYPE_USECASE_ID_BREAKDOWN_WARNING.poiType -> TYPE_USECASE_ID_BREAKDOWN_WARNING.poiTypeSrcVr + FOURS_PONDING.poiType -> FOURS_PONDING.poiTypeSrcVr + TYPE_USECASE_ID_ROAD_PARKING.poiType -> TYPE_USECASE_ID_ROAD_PARKING.poiTypeSrcVr + TYPE_USECASE_ID_ROAD_VEHICLE_RETROGRADE.poiType -> TYPE_USECASE_ID_ROAD_VEHICLE_RETROGRADE.poiTypeSrcVr + TYPE_ID_SHAPR_TURNS.poiType -> TYPE_ID_SHAPR_TURNS.poiTypeSrcVr + TYPE_ID_BRIDGE.poiType -> TYPE_ID_BRIDGE.poiTypeSrcVr + TYPE_ID_PEDESTRIAN.poiType -> TYPE_ID_PEDESTRIAN.poiTypeSrcVr + TYPE_ID_SLIPPERY_ROAD.poiType -> TYPE_ID_SLIPPERY_ROAD.poiTypeSrcVr + TYPE_ID_TUNNEL.poiType -> TYPE_ID_TUNNEL.poiTypeSrcVr + TYPE_ID_FERRY.poiType -> TYPE_ID_FERRY.poiTypeSrcVr + TYPE_ID_UNEVEN_ROAD.poiType -> TYPE_ID_UNEVEN_ROAD.poiTypeSrcVr + TYPE_ID_NON_MOTOR_VEHICLE.poiType -> TYPE_ID_NON_MOTOR_VEHICLE.poiTypeSrcVr + TYPE_ID_OBSTACLE.poiType -> TYPE_ID_OBSTACLE.poiTypeSrcVr + TYPE_FOURS_ROAD_WORK.poiType -> TYPE_FOURS_ROAD_WORK.poiTypeSrcVr + TYPE_VEHICLE_QUEUE.poiType -> TYPE_VEHICLE_QUEUE.poiTypeSrcVr + TYPE_NO_PASSING.poiType -> TYPE_NO_PASSING.poiTypeSrcVr + TYPE_NO_TURNING_AROUND.poiType -> TYPE_NO_TURNING_AROUND.poiTypeSrcVr + TYPE_USECASE_ID_ROAD_NO_PARKING.poiType -> TYPE_USECASE_ID_ROAD_NO_PARKING.poiTypeSrcVr + TYPE_USECASE_ID_ROAD_NO_TOOTING.poiType -> TYPE_USECASE_ID_ROAD_NO_TOOTING.poiTypeSrcVr + TYPE_USECASE_ID_ROAD_SPEED_LIMIT.poiType -> TYPE_USECASE_ID_ROAD_SPEED_LIMIT.poiTypeSrcVr + TYPE_USECASE_ID_BUS_WARNING.poiType -> TYPE_USECASE_ID_BUS_WARNING.poiTypeSrcVr + TYPE_USECASE_ID_NARROW_RIGHT.poiType -> TYPE_USECASE_ID_NARROW_RIGHT.poiTypeSrcVr + TYPE_USECASE_ID_GAS_STATION.poiType -> TYPE_USECASE_ID_GAS_STATION.poiTypeSrcVr + TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiTypeSrcVr + TYPE_USECASE_ID_ACCIDENT.poiType -> TYPE_USECASE_ID_ACCIDENT.poiTypeSrcVr + else -> 0 } } - //===================告警类事件=================== + //===================告警类事件=================== @JvmStatic fun getWarningIcon(poiType: String?): Int { return when (poiType) { @@ -658,22 +877,51 @@ enum class EventTypeEnumNew( TYPE_USECASE_ID_BSW.poiType -> TYPE_USECASE_ID_BSW.poiTypeSrcVr TYPE_USECASE_ID_LCW.poiType -> TYPE_USECASE_ID_LCW.poiTypeSrcVr TYPE_USECASE_ID_EVW.poiType -> TYPE_USECASE_ID_EVW.poiTypeSrcVr - TYPE_USECASE_ID_SLW.poiType -> TYPE_USECASE_ID_SLW.poiTypeSrcVr TYPE_USECASE_ID_LTA.poiType -> TYPE_USECASE_ID_LTA.poiTypeSrcVr - TYPE_USECASE_ID_TJW.poiType -> TYPE_USECASE_ID_TJW.poiTypeSrcVr - TYPE_USECASE_ID_IVP.poiType -> TYPE_USECASE_ID_IVP.poiTypeSrcVr - TYPE_USECASE_ID_IVP_GREEN.poiType -> TYPE_USECASE_ID_IVP_GREEN.poiTypeSrcVr - TYPE_USECASE_ID_ROAD_TRAMCAR.poiType -> TYPE_USECASE_ID_ROAD_TRAMCAR.poiTypeSrcVr - TYPE_USECASE_ID_ROAD_TURN_LEFT_SHARP.poiType -> TYPE_USECASE_ID_ROAD_TURN_LEFT_SHARP.poiTypeSrcVr - TYPE_USECASE_ID_ROAD_TURN_RIGHT_SHARP.poiType -> TYPE_USECASE_ID_ROAD_TURN_RIGHT_SHARP.poiTypeSrcVr - TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.poiType -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.poiTypeSrcVr - TYPE_USECASE_ID_ROAD_NO_PARKING.poiType -> TYPE_USECASE_ID_ROAD_NO_PARKING.poiTypeSrcVr - TYPE_USECASE_ID_ROAD_GIVE_WAY.poiType -> TYPE_USECASE_ID_ROAD_GIVE_WAY.poiTypeSrcVr TYPE_VIP_IDENTIFICATION.poiType -> TYPE_VIP_IDENTIFICATION.poiTypeSrcVr TYPE_ERROR.poiType -> TYPE_ERROR.poiTypeSrcVr TYPE_OPTIMAL_ROUTE_RECOMMEND.poiType -> TYPE_OPTIMAL_ROUTE_RECOMMEND.poiTypeSrcVr GHOST_PROBE.poiType -> GHOST_PROBE.poiTypeSrcVr AI_ROAD_WORK.poiType -> AI_ROAD_WORK.poiTypeSrcVr + + TYPE_USECASE_ID_IVP_RED.poiType -> TYPE_USECASE_ID_IVP_RED.poiTypeSrcVr + TYPE_USECASE_ID_IVP_GREEN.poiType -> TYPE_USECASE_ID_IVP_GREEN.poiTypeSrcVr + + TYPE_USECASE_ID_VRUCW_PERSON.poiType -> TYPE_USECASE_ID_VRUCW_PERSON.poiTypeSrcVr + TYPE_USECASE_ID_VRUCW_NOT_MOTOR_VEHICLES.poiType -> TYPE_USECASE_ID_VRUCW_NOT_MOTOR_VEHICLES.poiTypeSrcVr + TYPE_USECASE_ID_VRUCW_NOT_MOTOR_VEHICLES.poiType -> TYPE_USECASE_ID_VRUCW_NOT_MOTOR_VEHICLES.poiTypeSrcVr + TYPE_ERROR_WEAKNESS.poiType -> TYPE_ERROR_WEAKNESS.poiTypeSrcVr + + TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiTypeSrcVr + TYPE_USECASE_ID_ROAD_NO_PARKING.poiType -> TYPE_USECASE_ID_ROAD_NO_PARKING.poiTypeSrcVr + TYPE_USECASE_ID_SLW.poiType -> TYPE_USECASE_ID_SLW.poiTypeSrcVr + TYPE_USECASE_ID_TJW.poiType -> TYPE_USECASE_ID_TJW.poiTypeSrcVr + TYPE_USECASE_ID_BREAKDOWN_WARNING.poiType -> TYPE_USECASE_ID_BREAKDOWN_WARNING.poiTypeSrcVr + FOURS_PONDING.poiType -> FOURS_PONDING.poiTypeSrcVr + TYPE_USECASE_ID_ROAD_PARKING.poiType -> TYPE_USECASE_ID_ROAD_PARKING.poiTypeSrcVr + TYPE_USECASE_ID_ROAD_VEHICLE_RETROGRADE.poiType -> TYPE_USECASE_ID_ROAD_VEHICLE_RETROGRADE.poiTypeSrcVr + TYPE_ID_SHAPR_TURNS.poiType -> TYPE_ID_SHAPR_TURNS.poiTypeSrcVr + TYPE_ID_BRIDGE.poiType -> TYPE_ID_BRIDGE.poiTypeSrcVr + TYPE_ID_PEDESTRIAN.poiType -> TYPE_ID_PEDESTRIAN.poiTypeSrcVr + TYPE_ID_SLIPPERY_ROAD.poiType -> TYPE_ID_SLIPPERY_ROAD.poiTypeSrcVr + TYPE_ID_TUNNEL.poiType -> TYPE_ID_TUNNEL.poiTypeSrcVr + TYPE_ID_FERRY.poiType -> TYPE_ID_FERRY.poiTypeSrcVr + TYPE_ID_UNEVEN_ROAD.poiType -> TYPE_ID_UNEVEN_ROAD.poiTypeSrcVr + TYPE_ID_NON_MOTOR_VEHICLE.poiType -> TYPE_ID_NON_MOTOR_VEHICLE.poiTypeSrcVr + TYPE_ID_OBSTACLE.poiType -> TYPE_ID_OBSTACLE.poiTypeSrcVr + TYPE_FOURS_ROAD_WORK.poiType -> TYPE_FOURS_ROAD_WORK.poiTypeSrcVr + TYPE_VEHICLE_QUEUE.poiType -> TYPE_VEHICLE_QUEUE.poiTypeSrcVr + TYPE_NO_PASSING.poiType -> TYPE_NO_PASSING.poiTypeSrcVr + TYPE_NO_TURNING_AROUND.poiType -> TYPE_NO_TURNING_AROUND.poiTypeSrcVr + TYPE_USECASE_ID_ROAD_NO_PARKING.poiType -> TYPE_USECASE_ID_ROAD_NO_PARKING.poiTypeSrcVr + TYPE_USECASE_ID_ROAD_NO_TOOTING.poiType -> TYPE_USECASE_ID_ROAD_NO_TOOTING.poiTypeSrcVr + TYPE_USECASE_ID_ROAD_SPEED_LIMIT.poiType -> TYPE_USECASE_ID_ROAD_SPEED_LIMIT.poiTypeSrcVr + TYPE_USECASE_ID_BUS_WARNING.poiType -> TYPE_USECASE_ID_BUS_WARNING.poiTypeSrcVr + TYPE_USECASE_ID_NARROW_RIGHT.poiType -> TYPE_USECASE_ID_NARROW_RIGHT.poiTypeSrcVr + TYPE_USECASE_ID_GAS_STATION.poiType -> TYPE_USECASE_ID_GAS_STATION.poiTypeSrcVr + TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiTypeSrcVr + TYPE_USECASE_ID_ACCIDENT.poiType -> TYPE_USECASE_ID_ACCIDENT.poiTypeSrcVr + else -> TYPE_ERROR.poiTypeSrcVr } } @@ -690,23 +938,53 @@ enum class EventTypeEnumNew( TYPE_USECASE_ID_BSW.poiType -> TYPE_USECASE_ID_BSW.content TYPE_USECASE_ID_LCW.poiType -> TYPE_USECASE_ID_LCW.content TYPE_USECASE_ID_EVW.poiType -> TYPE_USECASE_ID_EVW.content - TYPE_USECASE_ID_SLW.poiType -> TYPE_USECASE_ID_SLW.content TYPE_USECASE_ID_LTA.poiType -> TYPE_USECASE_ID_LTA.content - TYPE_USECASE_ID_TJW.poiType -> TYPE_USECASE_ID_TJW.content - TYPE_USECASE_ID_IVP.poiType -> TYPE_USECASE_ID_IVP.content - TYPE_USECASE_ID_IVP_GREEN.poiType -> TYPE_USECASE_ID_IVP_GREEN.content - TYPE_USECASE_ID_ROAD_TRAMCAR.poiType -> TYPE_USECASE_ID_ROAD_TRAMCAR.content - TYPE_USECASE_ID_ROAD_TURN_LEFT_SHARP.poiType -> TYPE_USECASE_ID_ROAD_TURN_LEFT_SHARP.content - TYPE_USECASE_ID_ROAD_TURN_RIGHT_SHARP.poiType -> TYPE_USECASE_ID_ROAD_TURN_RIGHT_SHARP.content - TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.poiType -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.content - TYPE_USECASE_ID_ROAD_NO_PARKING.poiType -> TYPE_USECASE_ID_ROAD_NO_PARKING.content - TYPE_USECASE_ID_ROAD_GIVE_WAY.poiType -> TYPE_USECASE_ID_ROAD_GIVE_WAY.content TYPE_VIP_IDENTIFICATION.poiType -> TYPE_VIP_IDENTIFICATION.content FOURS_ROAD_WORK.poiType -> FOURS_ROAD_WORK.content AI_ROAD_WORK.poiType -> AI_ROAD_WORK.content TYPE_ERROR.poiType -> TYPE_ERROR.content TYPE_OPTIMAL_ROUTE_RECOMMEND.poiType -> TYPE_OPTIMAL_ROUTE_RECOMMEND.content GHOST_PROBE.poiType -> GHOST_PROBE.content + + TYPE_USECASE_ID_IVP_RED.poiType -> TYPE_USECASE_ID_IVP_RED.content + TYPE_USECASE_ID_IVP_GREEN.poiType -> TYPE_USECASE_ID_IVP_GREEN.content + + TYPE_USECASE_ID_VRUCW_PERSON.poiType -> TYPE_USECASE_ID_VRUCW_PERSON.content + TYPE_USECASE_ID_VRUCW_MOTOR_VEHICLES.poiType -> TYPE_USECASE_ID_VRUCW_MOTOR_VEHICLES.content + TYPE_USECASE_ID_VRUCW_NOT_MOTOR_VEHICLES.poiType -> TYPE_USECASE_ID_VRUCW_NOT_MOTOR_VEHICLES.content + TYPE_ERROR_WEAKNESS.poiType -> TYPE_ERROR_WEAKNESS.content + + TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.content + TYPE_USECASE_ID_ROAD_NO_PARKING.poiType -> TYPE_USECASE_ID_ROAD_NO_PARKING.content + TYPE_FOURS_ROAD_WORK.poiType -> TYPE_FOURS_ROAD_WORK.content + TYPE_USECASE_ID_SLW.poiType -> TYPE_USECASE_ID_SLW.content + TYPE_USECASE_ID_TJW.poiType -> TYPE_USECASE_ID_TJW.content + TYPE_USECASE_ID_BREAKDOWN_WARNING.poiType -> TYPE_USECASE_ID_BREAKDOWN_WARNING.content + FOURS_PONDING.poiType -> FOURS_PONDING.content + TYPE_USECASE_ID_ROAD_PARKING.poiType -> TYPE_USECASE_ID_ROAD_PARKING.content + TYPE_USECASE_ID_ROAD_VEHICLE_RETROGRADE.poiType -> TYPE_USECASE_ID_ROAD_VEHICLE_RETROGRADE.content + TYPE_ID_SHAPR_TURNS.poiType -> TYPE_ID_SHAPR_TURNS.content + TYPE_ID_BRIDGE.poiType -> TYPE_ID_BRIDGE.content + TYPE_ID_PEDESTRIAN.poiType -> TYPE_ID_PEDESTRIAN.content + TYPE_ID_SLIPPERY_ROAD.poiType -> TYPE_ID_SLIPPERY_ROAD.content + TYPE_ID_TUNNEL.poiType -> TYPE_ID_TUNNEL.content + TYPE_ID_FERRY.poiType -> TYPE_ID_FERRY.content + TYPE_ID_UNEVEN_ROAD.poiType -> TYPE_ID_UNEVEN_ROAD.content + TYPE_ID_NON_MOTOR_VEHICLE.poiType -> TYPE_ID_NON_MOTOR_VEHICLE.content + TYPE_ID_OBSTACLE.poiType -> TYPE_ID_OBSTACLE.content + TYPE_FOURS_ROAD_WORK.poiType -> TYPE_FOURS_ROAD_WORK.content + TYPE_VEHICLE_QUEUE.poiType -> TYPE_VEHICLE_QUEUE.content + TYPE_NO_PASSING.poiType -> TYPE_NO_PASSING.content + TYPE_NO_TURNING_AROUND.poiType -> TYPE_NO_TURNING_AROUND.content + TYPE_USECASE_ID_ROAD_NO_PARKING.poiType -> TYPE_USECASE_ID_ROAD_NO_PARKING.content + TYPE_USECASE_ID_ROAD_NO_TOOTING.poiType -> TYPE_USECASE_ID_ROAD_NO_TOOTING.content + TYPE_USECASE_ID_ROAD_SPEED_LIMIT.poiType -> TYPE_USECASE_ID_ROAD_SPEED_LIMIT.content + TYPE_USECASE_ID_BUS_WARNING.poiType -> TYPE_USECASE_ID_BUS_WARNING.content + TYPE_USECASE_ID_NARROW_RIGHT.poiType -> TYPE_USECASE_ID_NARROW_RIGHT.content + TYPE_USECASE_ID_GAS_STATION.poiType -> TYPE_USECASE_ID_GAS_STATION.content + TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.content + TYPE_USECASE_ID_ACCIDENT.poiType -> TYPE_USECASE_ID_ACCIDENT.content + else -> TYPE_ERROR.content } } @@ -723,23 +1001,53 @@ enum class EventTypeEnumNew( TYPE_USECASE_ID_BSW.poiType -> TYPE_USECASE_ID_BSW.tts TYPE_USECASE_ID_LCW.poiType -> TYPE_USECASE_ID_LCW.tts TYPE_USECASE_ID_EVW.poiType -> TYPE_USECASE_ID_EVW.tts - TYPE_USECASE_ID_SLW.poiType -> TYPE_USECASE_ID_SLW.tts TYPE_USECASE_ID_LTA.poiType -> TYPE_USECASE_ID_LTA.tts - TYPE_USECASE_ID_TJW.poiType -> TYPE_USECASE_ID_TJW.tts - TYPE_USECASE_ID_IVP.poiType -> TYPE_USECASE_ID_IVP.tts - TYPE_USECASE_ID_IVP_GREEN.poiType -> TYPE_USECASE_ID_IVP_GREEN.tts - TYPE_USECASE_ID_ROAD_TRAMCAR.poiType -> TYPE_USECASE_ID_ROAD_TRAMCAR.tts - TYPE_USECASE_ID_ROAD_TURN_LEFT_SHARP.poiType -> TYPE_USECASE_ID_ROAD_TURN_LEFT_SHARP.tts - TYPE_USECASE_ID_ROAD_TURN_RIGHT_SHARP.poiType -> TYPE_USECASE_ID_ROAD_TURN_RIGHT_SHARP.tts - TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.poiType -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.tts - TYPE_USECASE_ID_ROAD_NO_PARKING.poiType -> TYPE_USECASE_ID_ROAD_NO_PARKING.tts - TYPE_USECASE_ID_ROAD_GIVE_WAY.poiType -> TYPE_USECASE_ID_ROAD_GIVE_WAY.tts TYPE_VIP_IDENTIFICATION.poiType -> TYPE_VIP_IDENTIFICATION.tts FOURS_ROAD_WORK.poiType -> FOURS_ROAD_WORK.tts AI_ROAD_WORK.poiType -> AI_ROAD_WORK.tts TYPE_ERROR.poiType -> TYPE_ERROR.tts TYPE_OPTIMAL_ROUTE_RECOMMEND.poiType -> TYPE_OPTIMAL_ROUTE_RECOMMEND.tts GHOST_PROBE.poiType -> GHOST_PROBE.tts + + TYPE_USECASE_ID_IVP_RED.poiType -> TYPE_USECASE_ID_IVP_RED.tts + TYPE_USECASE_ID_IVP_GREEN.poiType -> TYPE_USECASE_ID_IVP_GREEN.tts + + TYPE_USECASE_ID_VRUCW_PERSON.poiType -> TYPE_USECASE_ID_VRUCW_PERSON.tts + TYPE_USECASE_ID_VRUCW_MOTOR_VEHICLES.poiType -> TYPE_USECASE_ID_VRUCW_MOTOR_VEHICLES.tts + TYPE_USECASE_ID_VRUCW_NOT_MOTOR_VEHICLES.poiType -> TYPE_USECASE_ID_VRUCW_NOT_MOTOR_VEHICLES.tts + TYPE_ERROR_WEAKNESS.poiType -> TYPE_ERROR_WEAKNESS.tts + + TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.tts + TYPE_USECASE_ID_ROAD_NO_PARKING.poiType -> TYPE_USECASE_ID_ROAD_NO_PARKING.tts + TYPE_FOURS_ROAD_WORK.poiType -> TYPE_FOURS_ROAD_WORK.tts + TYPE_USECASE_ID_SLW.poiType -> TYPE_USECASE_ID_SLW.tts + TYPE_USECASE_ID_TJW.poiType -> TYPE_USECASE_ID_TJW.tts + TYPE_USECASE_ID_BREAKDOWN_WARNING.poiType -> TYPE_USECASE_ID_BREAKDOWN_WARNING.tts + FOURS_PONDING.poiType -> FOURS_PONDING.tts + TYPE_USECASE_ID_ROAD_PARKING.poiType -> TYPE_USECASE_ID_ROAD_PARKING.tts + TYPE_USECASE_ID_ROAD_VEHICLE_RETROGRADE.poiType -> TYPE_USECASE_ID_ROAD_VEHICLE_RETROGRADE.tts + TYPE_ID_SHAPR_TURNS.poiType -> TYPE_ID_SHAPR_TURNS.tts + TYPE_ID_BRIDGE.poiType -> TYPE_ID_BRIDGE.tts + TYPE_ID_PEDESTRIAN.poiType -> TYPE_ID_PEDESTRIAN.tts + TYPE_ID_SLIPPERY_ROAD.poiType -> TYPE_ID_SLIPPERY_ROAD.tts + TYPE_ID_TUNNEL.poiType -> TYPE_ID_TUNNEL.tts + TYPE_ID_FERRY.poiType -> TYPE_ID_FERRY.tts + TYPE_ID_UNEVEN_ROAD.poiType -> TYPE_ID_UNEVEN_ROAD.tts + TYPE_ID_NON_MOTOR_VEHICLE.poiType -> TYPE_ID_NON_MOTOR_VEHICLE.tts + TYPE_ID_OBSTACLE.poiType -> TYPE_ID_OBSTACLE.tts + TYPE_FOURS_ROAD_WORK.poiType -> TYPE_FOURS_ROAD_WORK.tts + TYPE_VEHICLE_QUEUE.poiType -> TYPE_VEHICLE_QUEUE.tts + TYPE_NO_PASSING.poiType -> TYPE_NO_PASSING.tts + TYPE_NO_TURNING_AROUND.poiType -> TYPE_NO_TURNING_AROUND.tts + TYPE_USECASE_ID_ROAD_NO_PARKING.poiType -> TYPE_USECASE_ID_ROAD_NO_PARKING.tts + TYPE_USECASE_ID_ROAD_NO_TOOTING.poiType -> TYPE_USECASE_ID_ROAD_NO_TOOTING.tts + TYPE_USECASE_ID_ROAD_SPEED_LIMIT.poiType -> TYPE_USECASE_ID_ROAD_SPEED_LIMIT.tts + TYPE_USECASE_ID_BUS_WARNING.poiType -> TYPE_USECASE_ID_BUS_WARNING.tts + TYPE_USECASE_ID_NARROW_RIGHT.poiType -> TYPE_USECASE_ID_NARROW_RIGHT.tts + TYPE_USECASE_ID_GAS_STATION.poiType -> TYPE_USECASE_ID_GAS_STATION.tts + TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.tts + TYPE_USECASE_ID_ACCIDENT.poiType -> TYPE_USECASE_ID_ACCIDENT.tts + else -> TYPE_ERROR.tts } } diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumTrafficLight.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumTrafficLight.kt deleted file mode 100644 index 4b3af24b5d..0000000000 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumTrafficLight.kt +++ /dev/null @@ -1,71 +0,0 @@ -package com.mogo.eagle.core.data.enums - -import com.mogo.eagle.core.data.R - - -/** - * 交通信号灯 - */ -enum class EventTypeEnumTrafficLight( - val poiType: String, val poiTypeStr: String = "", - val poiTypeStrVr: String = "", - val poiTypeSrcVr: Int = R.drawable.v2x_icon_live_logo, - val content: String = "", val tts: String = "" -) { - - TYPE_USECASE_ID_IVP_RED( - 0x1.toString(), - "闯红灯预警", - poiTypeSrcVr = R.drawable.icon_warning_v2x_traffic_lights_red, - content = "路口红灯，禁止通行", - tts = "路口红灯，禁止通行" - ), - TYPE_USECASE_ID_IVP_GREEN( - 0x2.toString(), - "绿波通行", - poiTypeSrcVr = R.drawable.icon_warning_v2x_traffic_lights_green, - content = "建议车速 %s KM/H", - tts = "建议车速 %s KM/H" - ), - - TYPE_ERROR( - 0.toString(), - "未知/错误/异常", - poiTypeSrcVr = R.drawable.icon_warning_v2x_abnormal_vehicle, - content = "", - tts = "" - ); - - - companion object { - @JvmStatic - fun getWarningIcon(poiType: String?): Int { - return when (poiType) { - TYPE_USECASE_ID_IVP_RED.poiType -> TYPE_USECASE_ID_IVP_RED.poiTypeSrcVr - TYPE_USECASE_ID_IVP_GREEN.poiType -> TYPE_USECASE_ID_IVP_GREEN.poiTypeSrcVr - - else -> TYPE_ERROR.poiTypeSrcVr - } - } - - @JvmStatic - fun getWarningContent(poiType: String?): String { - return when (poiType) { - TYPE_USECASE_ID_IVP_RED.poiType -> TYPE_USECASE_ID_IVP_RED.content - TYPE_USECASE_ID_IVP_GREEN.poiType -> TYPE_USECASE_ID_IVP_GREEN.content - - else -> TYPE_ERROR.content - } - } - - @JvmStatic - fun getWarningTts(poiType: String?): String { - return when (poiType) { - TYPE_USECASE_ID_IVP_RED.poiType -> TYPE_USECASE_ID_IVP_RED.tts - TYPE_USECASE_ID_IVP_GREEN.poiType -> TYPE_USECASE_ID_IVP_GREEN.tts - else -> TYPE_ERROR.tts - } - } - } - -} \ No newline at end of file diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumWeaknessTraffic.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumWeaknessTraffic.kt deleted file mode 100644 index 8ca4806dc1..0000000000 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumWeaknessTraffic.kt +++ /dev/null @@ -1,80 +0,0 @@ -package com.mogo.eagle.core.data.enums - -import com.mogo.eagle.core.data.R - - -/** - * 弱势交通分类 - */ -enum class EventTypeEnumWeaknessTraffic( - val poiType: String, val poiTypeStr: String = "", - val poiTypeStrVr: String = "", - val poiTypeSrcVr: Int = R.drawable.v2x_icon_live_logo, - val content: String = "", val tts: String = "" -) { - - TYPE_USECASE_ID_VRUCW_MOTOR_VEHICLES( - 1.toString(), - "弱势交通参与者碰撞预警", - poiTypeSrcVr = R.drawable.icon_warning_v2x_motorcycle_collision, - content = "注意机动车", - tts = "注意机动车" - ), - TYPE_USECASE_ID_VRUCW_NOT_MOTOR_VEHICLES( - 2.toString(), - "弱势交通参与者碰撞预警", - poiTypeSrcVr = R.drawable.icon_warning_v2x_motobike, - content = "注意非机动车", - tts = "注意非机动车" - ), - TYPE_USECASE_ID_VRUCW_PERSON( - 3.toString(), - "弱势交通参与者碰撞预警", - poiTypeSrcVr = R.drawable.icon_warning_v2x_pedestrian_crossing, - content = "注意行人", - tts = "注意行人" - ), - - TYPE_ERROR( - 0.toString(), - "未知/错误/异常", - poiTypeSrcVr = R.drawable.icon_warning_v2x_abnormal_vehicle, - content = "前方有未知障碍物", - tts = "前方有未知障碍物" - ); - - - companion object { - @JvmStatic - fun getWarningIcon(poiType: String?): Int { - return when (poiType) { - TYPE_USECASE_ID_VRUCW_PERSON.poiType -> TYPE_USECASE_ID_VRUCW_PERSON.poiTypeSrcVr - TYPE_USECASE_ID_VRUCW_NOT_MOTOR_VEHICLES.poiType -> TYPE_USECASE_ID_VRUCW_NOT_MOTOR_VEHICLES.poiTypeSrcVr - TYPE_USECASE_ID_VRUCW_NOT_MOTOR_VEHICLES.poiType -> TYPE_USECASE_ID_VRUCW_NOT_MOTOR_VEHICLES.poiTypeSrcVr - - else -> TYPE_ERROR.poiTypeSrcVr - } - } - - @JvmStatic - fun getWarningContent(poiType: String?): String { - return when (poiType) { - TYPE_USECASE_ID_VRUCW_PERSON.poiType -> TYPE_USECASE_ID_VRUCW_PERSON.content - TYPE_USECASE_ID_VRUCW_MOTOR_VEHICLES.poiType -> TYPE_USECASE_ID_VRUCW_MOTOR_VEHICLES.content - TYPE_USECASE_ID_VRUCW_NOT_MOTOR_VEHICLES.poiType -> TYPE_USECASE_ID_VRUCW_NOT_MOTOR_VEHICLES.content - else -> TYPE_ERROR.content - } - } - - @JvmStatic - fun getWarningTts(poiType: String?): String { - return when (poiType) { - TYPE_USECASE_ID_VRUCW_PERSON.poiType -> TYPE_USECASE_ID_VRUCW_PERSON.tts - TYPE_USECASE_ID_VRUCW_MOTOR_VEHICLES.poiType -> TYPE_USECASE_ID_VRUCW_MOTOR_VEHICLES.tts - TYPE_USECASE_ID_VRUCW_NOT_MOTOR_VEHICLES.poiType -> TYPE_USECASE_ID_VRUCW_NOT_MOTOR_VEHICLES.tts - else -> TYPE_ERROR.tts - } - } - } - -} \ No newline at end of file diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/V2iEventTypeEnum.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/V2iEventTypeEnum.kt deleted file mode 100644 index a08eb1494d..0000000000 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/V2iEventTypeEnum.kt +++ /dev/null @@ -1,410 +0,0 @@ -package com.mogo.eagle.core.data.enums - -import com.mogo.eagle.core.data.R - -/** - * OBU、V2i事件类型枚举类 - */ -enum class V2iEventTypeEnum( - val poiType: String, val poiTypeStr: String = "", - val poiTypeStrVr: String = "", - val poiTypeSrcVr: Int = R.drawable.v2x_icon_live_logo, - val content: String = "", val tts: String = "" -) { - - //-----------道路危险情况预警 start ---------------> - TYPE_USECASE_ID_BREAKDOWN_WARNING( //故障车辆 - 101.toString(), - "车辆故障", - poiTypeSrcVr = R.drawable.icon_warning_v2x_collision_warning, - content = "前方%s米有故障车辆，影响路段%s米", - tts = "前方%s米有故障车辆，影响路段%s米" - ), - FOURS_PONDING( //积水 - 407.toString(), - "道路积水", - poiTypeSrcVr = R.drawable.v2x_icon_jishui_vr, - content = "前方%s米道路积水，影响路段%s米", - tts ="前方%s米道路积水，影响路段%s米" - ), - TYPE_USECASE_ID_ROAD_PARKING( //异常停车 - 412.toString(), - "异常停车", - poiTypeSrcVr = R.drawable.icon_warning_v2x_no_parking, - content = "前方%s米异常停车，影响路段%s米", - tts = "前方%s米异常停车，影响路段%s米" - ), - TYPE_USECASE_ID_TJW( //%d - 707.toString(), - "拥堵", - poiTypeSrcVr = R.drawable.icon_warning_v2x_congestion, - content = "前方%s米拥堵，影响路段%s米", - tts = "前方%s米拥堵，影响路段%s米" - ), - TYPE_USECASE_ID_SLW( //超速行驶 - 901.toString(), - "超速行驶", - poiTypeSrcVr = R.drawable.icon_warning_v2x_over_speed, - content = "前方%s米超速行驶，影响路段%s米", - tts = "前方%s米超速行驶，影响路段%s米" - ), - TYPE_USECASE_ID_ROAD_VEHICLE_RETROGRADE( //车辆逆行 - 904.toString(), - "逆行车辆", - poiTypeSrcVr = R.drawable.icon_warning_v2x_school, - content = "前方%s米逆行车辆，影响路段%s米", - tts = "前方%s米逆行车辆，影响路段%s米" - ), - TYPE_USECASE_ID_ROAD_SPEED_LIMIT( - 1.toString(), - "超速", - poiTypeSrcVr = R.drawable.icon_warning_v2x_over_speed, - content = "您已超速，请减速行驶", - tts = "您已超速，请减速行驶" - ), - - //------------道路危险情况预警 end -----------> - - //------------车内标牌 start --------------> -// TYPE_ID_NTERSECTION( -// 1.toString(), -// "十字路口", -// poiTypeSrcVr = R.drawable.icon_warning_v2x_tramcar, -// content = "前方%s米十字路口，影响路段%s米", -// tts = "前方%s米十字路口，影响路段%s米" -// ), - TYPE_ID_SHAPR_TURNS( - 2.toString(), - "急转弯", - poiTypeSrcVr = R.drawable.icon_warning_v2x_turn_left_sharp, - content = "前方%s米急转弯", - tts = "前方%s米急转弯" - ), - TYPE_ID_BRIDGE( - 8.toString(), - "桥梁", - poiTypeSrcVr = R.drawable.icon_warning_v2x_tramcar, - content = "前方%s米桥梁", - tts = "前方%s米桥梁" - ), - TYPE_ID_PEDESTRIAN( - 10.toString(), - "行人", - poiTypeSrcVr = R.drawable.icon_warning_v2x_pedestrian_crossing, - content = "前方%s米行人", - tts = "前方%s米行人" - ), - TYPE_ID_SLIPPERY_ROAD( - 17.toString(), - "路滑", - poiTypeSrcVr = R.drawable.icon_warning_v2x_tramcar, - content = "前方%s米路滑", - tts = "前方%s米路滑" - ), - TYPE_ID_TUNNEL( - 21.toString(), - "隧道", - poiTypeSrcVr = R.drawable.icon_warning_v2x_tramcar, - content = "前方%s米隧道", - tts = "前方%s米隧道" - ), - TYPE_ID_FERRY( - 22.toString(), - "渡轮", - poiTypeSrcVr = R.drawable.icon_warning_v2x_tramcar, - content = "前方%s米渡轮", - tts = "前方%s米渡轮" - ), - TYPE_ID_UNEVEN_ROAD( - 24.toString(), - "路面不平", - poiTypeSrcVr = R.drawable.icon_warning_v2x_tramcar, - content = "前方%s米路面不平", - tts = "前方%s米路面不平" - ), - TYPE_ID_NON_MOTOR_VEHICLE( - 32.toString(), - "非机动车", - poiTypeSrcVr = R.drawable.icon_warning_v2x_tramcar, - content = "前方%s米有非机动车", - tts = "前方%s米有非机动车" - ), - TYPE_ID_OBSTACLE( - 36.toString(), - "障碍", - poiTypeSrcVr = R.drawable.icon_warning_v2x_tramcar, - content = "前方%s米障碍", - tts = "前方%s米障碍" - ), - TYPE_FOURS_ROAD_WORK( - 38.toString(), - "施工", - poiTypeSrcVr = R.drawable.icon_warning_v2x_road_construction, - content = "前方%s米施工", - tts = "前方%s米施工" - ), - TYPE_VEHICLE_QUEUE( - 47.toString(), - "车队", - poiTypeSrcVr = R.drawable.icon_warning_v2x_road_construction, - content = "前方%s米车队", - tts = "前方%s米车队" - ), - TYPE_NO_PASSING( - 51.toString(), - "不通", - poiTypeSrcVr = R.drawable.icon_warning_v2x_road_construction, - content = "前方%s米不通", - tts = "前方%s米不通" - ), - TYPE_NO_TURNING_AROUND( - 75.toString(), - "禁止掉头", - poiTypeSrcVr = R.drawable.icon_warning_v2x_road_construction, - content = "前方%s米禁止掉头", - tts = "前方%s米禁止掉头" - ), - TYPE_USECASE_ID_ROAD_NO_PARKING( - 78.toString(), - "禁止停车", - poiTypeSrcVr = R.drawable.icon_warning_v2x_no_parking, - content = "前方%s米禁止停车", - tts = "前方%s米禁止停车" - ), - TYPE_USECASE_ID_ROAD_NO_TOOTING( - 80.toString(), - "禁止鸣笛", - poiTypeSrcVr = R.drawable.icon_warning_v2x_no_parking, - content = "前方%s米禁止鸣笛", - tts = "前方%s米禁止鸣笛" - ), - -// TYPE_USECASE_ID_GO_STRAIGHT_TURN_RIGHT( -// 100.toString(), -// "直行或右转", -// poiTypeSrcVr = R.drawable.icon_warning_v2x_no_parking, -// content = "前方%s米直行或右转", -// tts = "前方%s米直行或右转" -// ), - TYPE_USECASE_ID_BUS_WARNING( - 123.toString(), - "公交提醒", - poiTypeSrcVr = R.drawable.icon_warning_v2x_no_parking, - content = "前方%s米公交提醒", - tts = "前方%s米公交提醒" - ), - TYPE_USECASE_ID_NARROW_RIGHT( - 163.toString(), - "右侧变窄/车道数减少", - poiTypeSrcVr = R.drawable.icon_warning_v2x_no_parking, - content = "前方%s米右侧变窄/车道数减少", - tts = "前方%s米右侧变窄/车道数减少" - ), - TYPE_USECASE_ID_GAS_STATION( - 201.toString(), - "加油站", - poiTypeSrcVr = R.drawable.icon_warning_v2x_no_parking, - content = "前方%s米加油站", - tts = "前方%s米加油站" - ), - TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL( - 242.toString(), - "学校", - poiTypeSrcVr = R.drawable.icon_warning_v2x_school, - content = "前方%s米学校", - tts = "前方%s米学校" - ), - - TYPE_USECASE_ID_ACCIDENT( - 244.toString(), - "事故", - poiTypeSrcVr = R.drawable.icon_warning_v2x_school, - content = "前方%s米事故", - tts = "前方%s米事故" - ), - - //------------车内标牌 end --------------> - - TYPE_USECASE_ID_IVP( - 0x2.toString(), - "闯红灯预警", - poiTypeSrcVr = R.drawable.icon_warning_v2x_traffic_lights_red, - content = "路口红灯，禁止通行", - tts = "路口红灯，禁止通行" - ), - TYPE_USECASE_ID_IVP_GREEN( - 0x2B091.toString(), - "绿波通行", - poiTypeSrcVr = R.drawable.icon_warning_v2x_traffic_lights_green, - content = "建议车速 %s KM/H", - tts = "建议车速 %s KM/H" - ), - - TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING( - 0x2C04.toString(), - "人行横道", - poiTypeSrcVr = R.drawable.icon_warning_v2x_pedestrian_crossing, - content = "注意前方人行横道", - tts = "前方人行横道，减速慢行" - ), - - TYPE_ERROR( - 0.toString(), - "未知/错误/异常", - poiTypeSrcVr = R.drawable.icon_warning_v2x_abnormal_vehicle, - content = "", - tts = "" - ), - - TYPE_VIP_IDENTIFICATION("10022", "", "", R.drawable.icon_warning_v2x_vip_turn_light, "VIP车辆优先通行", "已为您变灯，请优先通行"), - TYPE_OPTIMAL_ROUTE_RECOMMEND("2000", "", "", R.drawable.icon_warning_v2x_optimal_route, "为您推荐最优路线", "已为您选择最优路线"); - - - companion object { - //===================告警类事件=================== - - @JvmStatic - fun getTts(poiType: String?): String { - return when (poiType) { - TYPE_FOURS_ROAD_WORK.poiType -> TYPE_FOURS_ROAD_WORK.tts - else -> "道路事件" - } - } - - @JvmStatic - fun getWarningIcon(poiType: String?): Int { - return when (poiType) { - TYPE_USECASE_ID_SLW.poiType -> TYPE_USECASE_ID_SLW.poiTypeSrcVr - TYPE_USECASE_ID_TJW.poiType -> TYPE_USECASE_ID_TJW.poiTypeSrcVr - TYPE_USECASE_ID_IVP.poiType -> TYPE_USECASE_ID_IVP.poiTypeSrcVr - TYPE_USECASE_ID_IVP_GREEN.poiType -> TYPE_USECASE_ID_IVP_GREEN.poiTypeSrcVr - TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.poiType -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.poiTypeSrcVr - TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiTypeSrcVr - TYPE_USECASE_ID_ROAD_NO_PARKING.poiType -> TYPE_USECASE_ID_ROAD_NO_PARKING.poiTypeSrcVr - TYPE_VIP_IDENTIFICATION.poiType -> TYPE_VIP_IDENTIFICATION.poiTypeSrcVr - TYPE_ERROR.poiType -> TYPE_ERROR.poiTypeSrcVr - TYPE_OPTIMAL_ROUTE_RECOMMEND.poiType -> TYPE_OPTIMAL_ROUTE_RECOMMEND.poiTypeSrcVr - TYPE_USECASE_ID_BREAKDOWN_WARNING.poiType -> TYPE_USECASE_ID_BREAKDOWN_WARNING.poiTypeSrcVr - FOURS_PONDING.poiType -> FOURS_PONDING.poiTypeSrcVr - TYPE_USECASE_ID_ROAD_PARKING.poiType -> TYPE_USECASE_ID_ROAD_PARKING.poiTypeSrcVr - TYPE_USECASE_ID_ROAD_VEHICLE_RETROGRADE.poiType -> TYPE_USECASE_ID_ROAD_VEHICLE_RETROGRADE.poiTypeSrcVr -// TYPE_ID_NTERSECTION.poiType -> TYPE_ID_NTERSECTION.poiTypeSrcVr - TYPE_ID_SHAPR_TURNS.poiType -> TYPE_ID_SHAPR_TURNS.poiTypeSrcVr - TYPE_ID_BRIDGE.poiType -> TYPE_ID_BRIDGE.poiTypeSrcVr - TYPE_ID_PEDESTRIAN.poiType -> TYPE_ID_PEDESTRIAN.poiTypeSrcVr - TYPE_ID_SLIPPERY_ROAD.poiType -> TYPE_ID_SLIPPERY_ROAD.poiTypeSrcVr - TYPE_ID_TUNNEL.poiType -> TYPE_ID_TUNNEL.poiTypeSrcVr - TYPE_ID_FERRY.poiType -> TYPE_ID_FERRY.poiTypeSrcVr - TYPE_ID_UNEVEN_ROAD.poiType -> TYPE_ID_UNEVEN_ROAD.poiTypeSrcVr - TYPE_ID_NON_MOTOR_VEHICLE.poiType -> TYPE_ID_NON_MOTOR_VEHICLE.poiTypeSrcVr - TYPE_ID_OBSTACLE.poiType -> TYPE_ID_OBSTACLE.poiTypeSrcVr - TYPE_FOURS_ROAD_WORK.poiType -> TYPE_FOURS_ROAD_WORK.poiTypeSrcVr - TYPE_VEHICLE_QUEUE.poiType -> TYPE_VEHICLE_QUEUE.poiTypeSrcVr - TYPE_NO_PASSING.poiType -> TYPE_NO_PASSING.poiTypeSrcVr - TYPE_NO_TURNING_AROUND.poiType -> TYPE_NO_TURNING_AROUND.poiTypeSrcVr - TYPE_USECASE_ID_ROAD_NO_PARKING.poiType -> TYPE_USECASE_ID_ROAD_NO_PARKING.poiTypeSrcVr - TYPE_USECASE_ID_ROAD_NO_TOOTING.poiType -> TYPE_USECASE_ID_ROAD_NO_TOOTING.poiTypeSrcVr - TYPE_USECASE_ID_ROAD_SPEED_LIMIT.poiType -> TYPE_USECASE_ID_ROAD_SPEED_LIMIT.poiTypeSrcVr -// TYPE_USECASE_ID_GO_STRAIGHT_TURN_RIGHT.poiType -> TYPE_USECASE_ID_GO_STRAIGHT_TURN_RIGHT.poiTypeSrcVr - TYPE_USECASE_ID_BUS_WARNING.poiType -> TYPE_USECASE_ID_BUS_WARNING.poiTypeSrcVr - TYPE_USECASE_ID_NARROW_RIGHT.poiType -> TYPE_USECASE_ID_NARROW_RIGHT.poiTypeSrcVr - TYPE_USECASE_ID_GAS_STATION.poiType -> TYPE_USECASE_ID_GAS_STATION.poiTypeSrcVr - TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiTypeSrcVr - TYPE_USECASE_ID_ACCIDENT.poiType -> TYPE_USECASE_ID_ACCIDENT.poiTypeSrcVr - else -> TYPE_ERROR.poiTypeSrcVr - } - } - - @JvmStatic - fun getWarningContent(poiType: String?): String { - return when (poiType) { - TYPE_USECASE_ID_SLW.poiType -> TYPE_USECASE_ID_SLW.content - TYPE_USECASE_ID_TJW.poiType -> TYPE_USECASE_ID_TJW.content - TYPE_USECASE_ID_IVP.poiType -> TYPE_USECASE_ID_IVP.content - TYPE_USECASE_ID_IVP_GREEN.poiType -> TYPE_USECASE_ID_IVP_GREEN.content - TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.poiType -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.content - TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.content - TYPE_USECASE_ID_ROAD_NO_PARKING.poiType -> TYPE_USECASE_ID_ROAD_NO_PARKING.content - TYPE_VIP_IDENTIFICATION.poiType -> TYPE_VIP_IDENTIFICATION.content - TYPE_ERROR.poiType -> TYPE_ERROR.content - TYPE_FOURS_ROAD_WORK.poiType -> TYPE_FOURS_ROAD_WORK.content - TYPE_OPTIMAL_ROUTE_RECOMMEND.poiType -> TYPE_OPTIMAL_ROUTE_RECOMMEND.content - TYPE_USECASE_ID_BREAKDOWN_WARNING.poiType -> TYPE_USECASE_ID_BREAKDOWN_WARNING.content - FOURS_PONDING.poiType -> FOURS_PONDING.content - TYPE_USECASE_ID_ROAD_PARKING.poiType -> TYPE_USECASE_ID_ROAD_PARKING.content - TYPE_USECASE_ID_ROAD_VEHICLE_RETROGRADE.poiType -> TYPE_USECASE_ID_ROAD_VEHICLE_RETROGRADE.content -// TYPE_ID_NTERSECTION.poiType -> TYPE_ID_NTERSECTION.content - TYPE_ID_SHAPR_TURNS.poiType -> TYPE_ID_SHAPR_TURNS.content - TYPE_ID_BRIDGE.poiType -> TYPE_ID_BRIDGE.content - TYPE_ID_PEDESTRIAN.poiType -> TYPE_ID_PEDESTRIAN.content - TYPE_ID_SLIPPERY_ROAD.poiType -> TYPE_ID_SLIPPERY_ROAD.content - TYPE_ID_TUNNEL.poiType -> TYPE_ID_TUNNEL.content - TYPE_ID_FERRY.poiType -> TYPE_ID_FERRY.content - TYPE_ID_UNEVEN_ROAD.poiType -> TYPE_ID_UNEVEN_ROAD.content - TYPE_ID_NON_MOTOR_VEHICLE.poiType -> TYPE_ID_NON_MOTOR_VEHICLE.content - TYPE_ID_OBSTACLE.poiType -> TYPE_ID_OBSTACLE.content - TYPE_FOURS_ROAD_WORK.poiType -> TYPE_FOURS_ROAD_WORK.content - TYPE_VEHICLE_QUEUE.poiType -> TYPE_VEHICLE_QUEUE.content - TYPE_NO_PASSING.poiType -> TYPE_NO_PASSING.content - TYPE_NO_TURNING_AROUND.poiType -> TYPE_NO_TURNING_AROUND.content - TYPE_USECASE_ID_ROAD_NO_PARKING.poiType -> TYPE_USECASE_ID_ROAD_NO_PARKING.content - TYPE_USECASE_ID_ROAD_NO_TOOTING.poiType -> TYPE_USECASE_ID_ROAD_NO_TOOTING.content - TYPE_USECASE_ID_ROAD_SPEED_LIMIT.poiType -> TYPE_USECASE_ID_ROAD_SPEED_LIMIT.content -// TYPE_USECASE_ID_GO_STRAIGHT_TURN_RIGHT.poiType -> TYPE_USECASE_ID_GO_STRAIGHT_TURN_RIGHT.content - TYPE_USECASE_ID_BUS_WARNING.poiType -> TYPE_USECASE_ID_BUS_WARNING.content - TYPE_USECASE_ID_NARROW_RIGHT.poiType -> TYPE_USECASE_ID_NARROW_RIGHT.content - TYPE_USECASE_ID_GAS_STATION.poiType -> TYPE_USECASE_ID_GAS_STATION.content - TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.content - TYPE_USECASE_ID_ACCIDENT.poiType -> TYPE_USECASE_ID_ACCIDENT.content - - else -> TYPE_ERROR.content - } - } - - @JvmStatic - fun getWarningTts(poiType: String?): String { - return when (poiType) { - TYPE_USECASE_ID_SLW.poiType -> TYPE_USECASE_ID_SLW.tts - TYPE_USECASE_ID_TJW.poiType -> TYPE_USECASE_ID_TJW.tts - TYPE_USECASE_ID_IVP.poiType -> TYPE_USECASE_ID_IVP.tts - TYPE_USECASE_ID_IVP_GREEN.poiType -> TYPE_USECASE_ID_IVP_GREEN.tts - TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.poiType -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.tts - TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.tts - TYPE_USECASE_ID_ROAD_NO_PARKING.poiType -> TYPE_USECASE_ID_ROAD_NO_PARKING.tts - TYPE_VIP_IDENTIFICATION.poiType -> TYPE_VIP_IDENTIFICATION.tts - TYPE_ERROR.poiType -> TYPE_ERROR.tts - TYPE_FOURS_ROAD_WORK.poiType -> TYPE_FOURS_ROAD_WORK.tts - TYPE_OPTIMAL_ROUTE_RECOMMEND.poiType -> TYPE_OPTIMAL_ROUTE_RECOMMEND.tts - TYPE_USECASE_ID_BREAKDOWN_WARNING.poiType -> TYPE_USECASE_ID_BREAKDOWN_WARNING.tts - FOURS_PONDING.poiType -> FOURS_PONDING.tts - TYPE_USECASE_ID_ROAD_PARKING.poiType -> TYPE_USECASE_ID_ROAD_PARKING.tts - TYPE_USECASE_ID_ROAD_VEHICLE_RETROGRADE.poiType -> TYPE_USECASE_ID_ROAD_VEHICLE_RETROGRADE.tts -// TYPE_ID_NTERSECTION.poiType -> TYPE_ID_NTERSECTION.tts - TYPE_ID_SHAPR_TURNS.poiType -> TYPE_ID_SHAPR_TURNS.tts - TYPE_ID_BRIDGE.poiType -> TYPE_ID_BRIDGE.tts - TYPE_ID_PEDESTRIAN.poiType -> TYPE_ID_PEDESTRIAN.tts - TYPE_ID_SLIPPERY_ROAD.poiType -> TYPE_ID_SLIPPERY_ROAD.tts - TYPE_ID_TUNNEL.poiType -> TYPE_ID_TUNNEL.tts - TYPE_ID_FERRY.poiType -> TYPE_ID_FERRY.tts - TYPE_ID_UNEVEN_ROAD.poiType -> TYPE_ID_UNEVEN_ROAD.tts - TYPE_ID_NON_MOTOR_VEHICLE.poiType -> TYPE_ID_NON_MOTOR_VEHICLE.tts - TYPE_ID_OBSTACLE.poiType -> TYPE_ID_OBSTACLE.tts - TYPE_FOURS_ROAD_WORK.poiType -> TYPE_FOURS_ROAD_WORK.tts - TYPE_VEHICLE_QUEUE.poiType -> TYPE_VEHICLE_QUEUE.tts - TYPE_NO_PASSING.poiType -> TYPE_NO_PASSING.tts - TYPE_NO_TURNING_AROUND.poiType -> TYPE_NO_TURNING_AROUND.tts - TYPE_USECASE_ID_ROAD_NO_PARKING.poiType -> TYPE_USECASE_ID_ROAD_NO_PARKING.tts - TYPE_USECASE_ID_ROAD_NO_TOOTING.poiType -> TYPE_USECASE_ID_ROAD_NO_TOOTING.tts - TYPE_USECASE_ID_ROAD_SPEED_LIMIT.poiType -> TYPE_USECASE_ID_ROAD_SPEED_LIMIT.tts -// TYPE_USECASE_ID_GO_STRAIGHT_TURN_RIGHT.poiType -> TYPE_USECASE_ID_GO_STRAIGHT_TURN_RIGHT.tts - TYPE_USECASE_ID_BUS_WARNING.poiType -> TYPE_USECASE_ID_BUS_WARNING.tts - TYPE_USECASE_ID_NARROW_RIGHT.poiType -> TYPE_USECASE_ID_NARROW_RIGHT.tts - TYPE_USECASE_ID_GAS_STATION.poiType -> TYPE_USECASE_ID_GAS_STATION.tts - TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.tts - TYPE_USECASE_ID_ACCIDENT.poiType -> TYPE_USECASE_ID_ACCIDENT.tts - else -> TYPE_ERROR.tts - } - } - } - -} \ No newline at end of file diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_warning_gas_station.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_warning_gas_station.png new file mode 100755 index 0000000000..ca5494879d Binary files /dev/null and b/core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_warning_gas_station.png differ diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_warning_road_hollow.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_warning_road_hollow.png new file mode 100755 index 0000000000..9cb6f7b9ac Binary files /dev/null and b/core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_warning_road_hollow.png differ diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_warning_v2x_no_tooting.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_warning_v2x_no_tooting.png new file mode 100755 index 0000000000..32c0216294 Binary files /dev/null and b/core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_warning_v2x_no_tooting.png differ diff --git a/gradle.properties b/gradle.properties index d83654b400..0b041116c8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -85,8 +85,8 @@ MOGO_LOCATION_VERSION=1.4.3.27 MOGO_TELEMATIC_VERSION=1.4.3.27 ######## MogoAiCloudSDK Version ######## # 自研地图 -MAP_SDK_VERSION=2.7.0.10 -MAP_SDK_OPERATION_VERSION=1.1.3.5 +MAP_SDK_VERSION=2.8.0.8 +MAP_SDK_OPERATION_VERSION=1.1.4.1 # websocket WEBSOCKET_VERSION=1.1.7 ## 产品库必备配置，产品库自动对versionCode和versionName版本进行升级