[2.15.0] 30秒间隔只针对obu类型事件类型有效

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/redlightwarning/RedLightWarningManager.kt

@@ -215,11 +215,7 @@ class RedLightWarningManager : IMoGoTrafficLightListener, IMoGoVipSetListener,
                     )
                 )
             )
-            CallerHmiManager.warningV2X(
-                EventTypeEnumNew.TYPE_USECASE_ID_IVP_RED.poiType,
-                EventTypeEnumNew.TYPE_USECASE_ID_IVP_RED.content,
-                EventTypeEnumNew.TYPE_USECASE_ID_IVP_RED.tts
-            )
+            CallerHmiManager.warningV2X(EventTypeEnumNew.TYPE_USECASE_ID_IVP_RED.poiType, EventTypeEnumNew.TYPE_USECASE_ID_IVP_RED.content, EventTypeEnumNew.TYPE_USECASE_ID_IVP_RED.tts, isFromObu = false)
         }
     }
 
@@ -251,11 +247,7 @@ class RedLightWarningManager : IMoGoTrafficLightListener, IMoGoVipSetListener,
                     )
                 )
             )
-            CallerHmiManager.warningV2X(
-                EventTypeEnumNew.TYPE_USECASE_ID_IVP_GREEN.poiType,
-                content,
-                tts
-            )
+            CallerHmiManager.warningV2X(EventTypeEnumNew.TYPE_USECASE_ID_IVP_GREEN.poiType, content, tts, isFromObu = false)
         }
     }
 

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt

@@ -1,6 +1,5 @@
 package com.mogo.eagle.function.biz.v2x.v2n
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.os.Handler
@@ -10,7 +9,6 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_CLOUD_V2N
 import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_CLOUD
 import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_CLOUD_V2N
-import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.enums.EventTypeEnumNew
 import com.mogo.eagle.core.data.enums.EventTypeHelper
 import com.mogo.eagle.core.data.enums.TrafficTypeEnum
@@ -29,7 +27,6 @@ import com.mogo.eagle.core.function.api.map.angle.*
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotIdentifyListenerManager
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
-import com.mogo.eagle.core.function.call.map.CallerMapIdentifyManager
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
 import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager
 import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager
@@ -51,7 +48,6 @@ import com.mogo.eagle.core.utilcode.mogo.logger.Logger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_V2X
 import com.mogo.eagle.core.utilcode.util.Utils
 import com.mogo.eagle.function.biz.v2x.v2n.network.callback.IV2XCallback
-import com.mogo.eagle.function.biz.v2x.v2n.utils.toV2XRoadEventEntity
 import com.zhjt.service.chain.ChainLog
 import com.zhjt.service.chain.TracingConstants
 import kotlinx.coroutines.CoroutineScope
@@ -60,7 +56,6 @@ import kotlinx.coroutines.android.asCoroutineDispatcher
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import java.util.concurrent.atomic.AtomicBoolean
-import mogo.telematics.pad.MessagePad
 import mogo.telematics.pad.MessagePad.PlanningObject
 
 object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IV2XCallback,
@@ -199,15 +194,7 @@ object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IV2XCallback,
                         }
                     }
                     Logger.d("$M_V2X$TAG", "poiType : $poiType , 触发道路事件")
-                    val trackedObj =
-                        CallerMapIdentifyManager.getIdentifyObj(first.uuid.toString())
-                    trackedObj?.let { t ->
-                        Logger.d("$M_V2X$TAG", "polygon size : ${(t.polygonList.size)}")
-                        val v2XMessageEntity = V2XMessageEntity<V2XRoadEventEntity>()
-                        v2XMessageEntity.type = V2XMessageEntity.V2XTypeEnum.ALERT_ROAD_WARNING
-                        v2XMessageEntity.content = t.toRoadMarker(poiType).toV2XRoadEventEntity()
-                        V2XScenarioManager.getInstance().handlerMessage(v2XMessageEntity)
-                    }
+                    CallerHmiManager.warningV2X(poiType, )
                 }
             }
         }
@@ -321,25 +308,20 @@ object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IV2XCallback,
                             )
                         )
                     )
-                    CallerHmiManager.warningV2X(
-                        tempAppId.toString(),
-                        tempContent,
-                        tempTts,
-                        object : IMoGoWarningStatusListener {
-                            val change = changeVisualAngle
-                            override fun onShow() {
-                                if (change) {
-                                    CallerVisualAngleManager.changeAngle(TooClose)
-                                }
-                            }
-
-                            override fun onDismiss() {
-                                if (change) {
-                                    CallerVisualAngleManager.changeAngle(Default())
-                                }
+                    CallerHmiManager.warningV2X(tempAppId.toString(), tempContent, tempTts, object : IMoGoWarningStatusListener {
+                        val change = changeVisualAngle
+                        override fun onShow() {
+                            if (change) {
+                                CallerVisualAngleManager.changeAngle(TooClose)
                             }
                         }
-                    )
+
+                        override fun onDismiss() {
+                            if (change) {
+                                CallerVisualAngleManager.changeAngle(Default())
+                            }
+                        }
+                    }, isFromObu = false)
                     CallerMapUIServiceManager.getMarkerService()?.updateITrafficInfo(trafficData)
                 }
                 2 -> {

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt

@@ -79,7 +79,7 @@ internal object V2NIdentifyDrawer {
                                 super.onDismiss()
                                 CallerVisualAngleManager.changeAngle(Default())
                             }
-                        }, ALERT_WARNING_TOP, 10000)
+                        }, ALERT_WARNING_TOP, 10000, false)
                     }
                 }.receive()
             }

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventScenario.java

@@ -129,7 +129,7 @@ public class V2XRoadEventScenario extends AbsV2XScenario<V2XRoadEventEntity> imp
             );
             CallerHmiManager.INSTANCE.warningV2X(poiType, alarmText,
                     ttsText, this,WarningDirectionEnum.ALERT_WARNING_TOP,
-                    TimeUnit.SECONDS.toMillis(5));
+                    TimeUnit.SECONDS.toMillis(5), false);
         }
     }
 

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XFrontWarningScenario.java

@@ -84,7 +84,7 @@ public class V2XFrontWarningScenario extends AbsV2XScenario implements IMoGoChas
                 CallerHmiManager.INSTANCE.warningV2X(v2xType + "",
                         getAlertContentForFrontWarning(mMarkerEntity), mMarkerEntity.getTts(),
                         this,getDirection(),
-                        TimeUnit.SECONDS.toMillis(5));
+                        TimeUnit.SECONDS.toMillis(5), false);
             }
         }
     }

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/vip/VipCarManager.kt

@@ -274,7 +274,7 @@ class VipCarManager : IMogoOnMessageListener<VipMessage>, IMoGoTrafficLightListe
         CallerMsgBoxManager.saveMsgBox(
             MsgBoxBean(MsgBoxType.V2X, V2XMsg(v2xType, alertContent.toString(), ttsContent))
         )
-        CallerHmiManager.warningV2X(v2xType, alertContent, ttsContent)
+        CallerHmiManager.warningV2X(v2xType, alertContent, ttsContent, isFromObu = false)
     }
 
     fun destroy() {