From 6a67cccb808ffafe4423efb3296f093684d274da Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Wed, 14 Jul 2021 17:49:12 +0800
Subject: [PATCH] opt obu

---
 .../java/com/mogo/module/v2x/V2XObuManager.java   |  6 +++---
 .../scenario/scene/obu/V2XObuEventScenario.java   | 15 +++++++++++++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XObuManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XObuManager.java
index 13b25d00e9..b423f23c4d 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XObuManager.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XObuManager.java
@@ -120,9 +120,9 @@ public class V2XObuManager implements IObuCallback, Handler.Callback {
 
         //TODO 测试
 //        UiThreadHandler.postDelayed( () -> {
-//        MogoObuManager.getInstance().test(icw_data);
+////        MogoObuManager.getInstance().test(icw_data);
 //            MarkerServiceHandler.getApis().getV2XListenerManager().warningChangedForListenerWithDirection(3, MogoReceiver.ACTION_V2X_FRONT_WARNING);
-//            handleSdkObu(1);
+//            handleSdkObu(105);
 //
 //        }, 5_000L );
 
@@ -200,7 +200,7 @@ public class V2XObuManager implements IObuCallback, Handler.Callback {
             Logger.e("liyz", "onCvxV2vThreatIndInfo ------> " + info.toString());
             //预警类型 threat_level 3
             if (info != null) {
-                if (info.getThreat_info() != null /*&& info.getControl() != null*/ &&
+                if (info.getThreat_info() != null && info.getThreat_info().getThreat_level() == 2 &&
                         info.getThreat_info().getThreat_level() == 3) { //看看2的情况
                     //预警方位
                     int direction = info.getExt_info().getTarget_classification();
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/obu/V2XObuEventScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/obu/V2XObuEventScenario.java
index 596734eb33..1c31e14dc8 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/obu/V2XObuEventScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/obu/V2XObuEventScenario.java
@@ -112,15 +112,23 @@ public class V2XObuEventScenario extends AbsV2XScenario<V2XObuEventEntity> imple
             } else {
                 optimalSpeedMarker.clearPOI();
             }
-        } else if (v2XMessageEntity.getContent().getType() == ObuConstant.TYPE_CROSS_COLLISION_WARNING) {
+        } else if (v2XMessageEntity.getContent().getType() == ObuConstant.TYPE_CROSS_COLLISION_WARNING && !isCrossWarning) {
             AIAssist.getInstance(V2XServiceManager.getContext()).speakTTSVoice(URGENCY_CROING_WARN_TEXT);
-        } else if (v2XMessageEntity.getContent().getType() == ObuConstant.TYPE_URGENCY_COLLISION_WARNING) {
+            Log.d("liyz", "jiao cha lu kou---->");
+            isCrossWarning = true;
+        } else if (v2XMessageEntity.getContent().getType() == ObuConstant.TYPE_URGENCY_COLLISION_WARNING && !isUrgenchyWarning) {
             AIAssist.getInstance(V2XServiceManager.getContext()).speakTTSVoice(URGENCY_COLLISION_WARN_TEXT_ONE);
+            Log.d("liyz", " jin ji zhi dong---->");
+            isUrgenchyWarning = true;
         }
 
         show();
     }
 
+    private boolean isCrossWarning;
+    private boolean isUrgenchyWarning;
+
+
     /**
      * 展示场景
      * <p>
@@ -298,6 +306,9 @@ public class V2XObuEventScenario extends AbsV2XScenario<V2XObuEventEntity> imple
         if (msg.what == MSG_CLOSE_OBU_WINDOW) {
             Logger.d(MODULE_NAME, "V2X Obu scenario expire===");
             closeWindow();
+            isCrossWarning = false;
+            isUrgenchyWarning = false;
+
             return true;
         }
         return false;