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 ed4b9da724..52f7723cad 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
@@ -848,8 +848,8 @@ public class BusOrderModel {
         removeTipRunnables();
 
         long taskTime = busRoutesResult.getTaskTime();
-        long tip3Time = taskTime-3000 - DateTimeUtil.getCurrentTimeStamp(); // 首站离开前3分钟提示
-        long tip1Time = taskTime-1000 - DateTimeUtil.getCurrentTimeStamp(); // 首站离开前1分钟提示
+        long tip3Time = taskTime- 3*60*1000 - DateTimeUtil.getCurrentTimeStamp(); // 首站离开前3分钟提示
+        long tip1Time = taskTime-60*1000 - DateTimeUtil.getCurrentTimeStamp(); // 首站离开前1分钟提示
 
         if (tip3Time > 0){
             UiThreadHandler.postDelayed(tip3Runnable,tip3Time);
diff --git a/app/src/main/java/com/mogo/launcher/stageone/HttpDnsStartUp.kt b/app/src/main/java/com/mogo/launcher/stageone/HttpDnsStartUp.kt
index 4cde3d6fdf..0410fe2886 100644
--- a/app/src/main/java/com/mogo/launcher/stageone/HttpDnsStartUp.kt
+++ b/app/src/main/java/com/mogo/launcher/stageone/HttpDnsStartUp.kt
@@ -205,7 +205,7 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
                     clientConfig.token = token
                     // 由于存在token过期问题，在更新后会回调至此处，增加二次判定
                     if(!gotToken){
-                        CallerLogger.d(SceneConstant.M_MAP + TAG, "onTokenGot ")
+                        CallerLogger.d(SceneConstant.M_MAIN + TAG, "onTokenGot ")
                         CallerCloudListenerManager.invokeCloudTokenGot(token)
                         // 异步初始化NetConfig
                         asyncInit()
@@ -219,7 +219,7 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
 
                 override fun onError(code: Int, msg: String) {
                     CallerLogger.d(
-                        SceneConstant.M_HMI + TAG,
+                        SceneConstant.M_MAIN + TAG,
                         "初始化MogoAiCloudSdk failed ,reason : $msg , 未能开启长链服务和初始化Modules服务"
                     )
                 }
@@ -272,7 +272,7 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
                     HttpDnsConst.HTTP_DNS_ADDRESS_TYPE_HTTP
                 ) ?: return
                 if (dnsCacheIp != cacheIp) {
-                    CallerLogger.d("TEST_SOCKET", "获取缓存Dns IP : $dnsCacheIp , 原缓存 IP ： $cacheIp")
+                    CallerLogger.d(SceneConstant.M_MAIN + TAG, "获取缓存Dns IP : $dnsCacheIp , 原缓存 IP ： $cacheIp")
                     startSocketService()
                     cacheIp = dnsCacheIp
                 }
@@ -297,7 +297,7 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
     }
 
     private fun startSocketService() {
-        CallerLogger.d(SceneConstant.M_HMI + TAG, "startSocketService")
+        CallerLogger.d(SceneConstant.M_MAIN + TAG, "startSocketService")
         val location =
             CallerMapUIServiceManager.getSingletonLocationClient(AbsMogoApplication.getApp())!!
                 .lastKnowLocation
@@ -315,7 +315,7 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
                     clientPkFileName = "sn"
                 )
                 override fun onConnectFailure() {
-                    CallerLogger.d(SceneConstant.M_HMI + TAG, "socket-onConnectFailure")
+                    CallerLogger.d(SceneConstant.M_MAIN + TAG, "socket-onConnectFailure")
                     DebugConfig.setDownloadSnapshot(false)
                 }
 
@@ -328,7 +328,7 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
                     clientPkFileName = "sn"
                 )
                 override fun onConnectSuccess() {
-                    CallerLogger.d(SceneConstant.M_HMI + TAG, "socket-onConnectSuccess")
+                    CallerLogger.d(SceneConstant.M_MAIN + TAG, "socket-onConnectSuccess")
                     DebugConfig.setDownloadSnapshot(true)
                 }
 
@@ -341,7 +341,7 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
                     clientPkFileName = "sn"
                 )
                 override fun onConnectLost() {
-                    CallerLogger.d(SceneConstant.M_HMI + TAG, "socket-onConnectLost")
+                    CallerLogger.d(SceneConstant.M_MAIN + TAG, "socket-onConnectLost")
                     DebugConfig.setDownloadSnapshot(false)
                 }
 
@@ -354,7 +354,7 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
                     clientPkFileName = "sn"
                 )
                 override fun onError(code: String, msg: String?) {
-                    CallerLogger.d(SceneConstant.M_HMI + TAG, "socket-onConnectLost")
+                    CallerLogger.d(SceneConstant.M_MAIN + TAG, "socket-onError code : $code , msg : $msg")
                 }
             })
         // 开启Socket长链服务
diff --git a/app_ipc_monitoring/build.gradle b/app_ipc_monitoring/build.gradle
index 4687bb6a0f..5b806618c1 100644
--- a/app_ipc_monitoring/build.gradle
+++ b/app_ipc_monitoring/build.gradle
@@ -86,11 +86,12 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     implementation rootProject.ext.dependencies.gson
     implementation project(':libraries:mogo-adas')
+    implementation project(':libraries:mogo-adas-data')
     implementation project(':libraries:mogo-adas-other')
 //    implementation 'com.zhidao.support.adas:high:2.8.0.0'
 //    implementation 'com.zhjt.mogo.adas.data:adas-data:2.6.6.0'
-    compileOnly project(':core:mogo-core-data')
-    implementation project(':core:mogo-core-utils')
+//    compileOnly project(':core:mogo-core-data')
+//    implementation project(':core:mogo-core-utils')
     implementation 'org.greenrobot:eventbus:3.2.0'
     implementation 'com.android.support:multidex:1.0.3'
     implementation 'com.mogo.cloud:telematic:1.3.59'
diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/FloatWindow.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/FloatWindow.java
index e8a067571f..9724db97c4 100644
--- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/FloatWindow.java
+++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/FloatWindow.java
@@ -1,7 +1,6 @@
 package com.zhidao.adas.client.ui;
 
 import android.app.Activity;
-import android.content.Context;
 import android.graphics.PixelFormat;
 import android.util.DisplayMetrics;
 import android.view.Gravity;
@@ -12,14 +11,12 @@ import android.view.WindowManager;
 
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.mogo.eagle.core.utilcode.util.BarUtils;
 import com.zhidao.adas.client.R;
 import com.zhidao.adas.client.adapter.ConnectStatusAdapter;
-import com.zhidao.adas.client.adapter.DataShowAdapter;
 import com.zhidao.adas.client.bean.IPCConnectState;
 import com.zhidao.adas.client.utils.MyLinearLayoutManager;
+import com.zhidao.adas.client.utils.SysBarUtil;
 
-import java.lang.reflect.Field;
 import java.util.List;
 
 /**
@@ -49,8 +46,9 @@ public class FloatWindow implements View.OnTouchListener {
         this.list = list;
         initFloatWindow();
     }
-    public void refreshView(){
-        if (adapter!=null){
+
+    public void refreshView() {
+        if (adapter != null) {
             adapter.refreshView();
         }
     }
@@ -109,14 +107,14 @@ public class FloatWindow implements View.OnTouchListener {
                 mInViewY = motionEvent.getY();
                 // 获取相对屏幕的坐标，即以屏幕左上角为原点
                 mDownInScreenX = motionEvent.getRawX();
-                mDownInScreenY = motionEvent.getRawY() - BarUtils.getStatusBarHeight();
+                mDownInScreenY = motionEvent.getRawY() - SysBarUtil.getSysBarHeight(mContext);
                 mInScreenX = motionEvent.getRawX();
-                mInScreenY = motionEvent.getRawY() - BarUtils.getStatusBarHeight();
+                mInScreenY = motionEvent.getRawY() - SysBarUtil.getSysBarHeight(mContext);
                 break;
             case MotionEvent.ACTION_MOVE:
                 // 更新浮动窗口位置参数
                 mInScreenX = motionEvent.getRawX();
-                mInScreenY = motionEvent.getRawY() - BarUtils.getStatusBarHeight();
+                mInScreenY = motionEvent.getRawY() - SysBarUtil.getSysBarHeight(mContext);
                 mWindowParams.x = (int) (mInScreenX - mInViewX);
                 mWindowParams.y = (int) (mInScreenY - mInViewY);
                 // 手指移动的时候更新小悬浮窗的位置
@@ -156,6 +154,5 @@ public class FloatWindow implements View.OnTouchListener {
             mFloatLayout.setAlpha(1);
     }
 
-    private int sbar = -1;
 
 }
diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/special/SpecialVehicleFloatWindow.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/special/SpecialVehicleFloatWindow.java
index 3b29b45006..31fa4fad1b 100644
--- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/special/SpecialVehicleFloatWindow.java
+++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/special/SpecialVehicleFloatWindow.java
@@ -22,13 +22,12 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.widget.AppCompatButton;
 
-import com.mogo.eagle.core.utilcode.util.BarUtils;
 import com.zhidao.adas.client.R;
 import com.zhidao.adas.client.bean.SpecialVehicleBean;
 import com.zhidao.adas.client.bean.SpecialVehicleOption;
+import com.zhidao.adas.client.utils.SysBarUtil;
 
 import java.lang.ref.WeakReference;
-import java.lang.reflect.Field;
 
 
 /**
@@ -130,9 +129,9 @@ public class SpecialVehicleFloatWindow extends LinearLayout {
                 mInViewY = event.getY();
                 // 获取相对屏幕的坐标，即以屏幕左上角为原点
                 mDownInScreenX = event.getRawX();
-                mDownInScreenY = event.getRawY() - BarUtils.getStatusBarHeight();
+                mDownInScreenY = event.getRawY() - SysBarUtil.getSysBarHeight(getContext());
                 mInScreenX = event.getRawX();
-                mInScreenY = event.getRawY() - BarUtils.getStatusBarHeight();
+                mInScreenY = event.getRawY() - SysBarUtil.getSysBarHeight(getContext());
 
                 if (!isMaximize) {
                     btn_maximize.setPressed(true);
@@ -143,7 +142,7 @@ public class SpecialVehicleFloatWindow extends LinearLayout {
             case MotionEvent.ACTION_MOVE:
                 // 更新浮动窗口位置参数
                 mInScreenX = event.getRawX();
-                mInScreenY = event.getRawY() - BarUtils.getStatusBarHeight();
+                mInScreenY = event.getRawY() - SysBarUtil.getSysBarHeight(getContext());
                 wmParams.x = (int) (mInScreenX - mInViewX);
                 wmParams.y = (int) (mInScreenY - mInViewY);
                 updateViewLayout();
@@ -197,7 +196,6 @@ public class SpecialVehicleFloatWindow extends LinearLayout {
     private int sbar = -1;
 
 
-
     /*****************************业务逻辑*******************************************/
 
 
diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/utils/SysBarUtil.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/utils/SysBarUtil.java
new file mode 100644
index 0000000000..8bdc4c294f
--- /dev/null
+++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/utils/SysBarUtil.java
@@ -0,0 +1,30 @@
+package com.zhidao.adas.client.utils;
+
+import android.content.Context;
+
+import java.lang.reflect.Field;
+
+public class SysBarUtil {
+    private static int sbar = -1;
+
+    // 获取系统状态栏高度
+    public static int getSysBarHeight(Context contex) {
+        if (sbar == -1) {
+            Class<?> c;
+            Object obj;
+            Field field;
+            int x;
+            sbar = 0;
+            try {
+                c = Class.forName("com.android.internal.R$dimen");
+                obj = c.newInstance();
+                field = c.getField("status_bar_height");
+                x = Integer.parseInt(field.get(obj).toString());
+                sbar = contex.getResources().getDimensionPixelSize(x);
+            } catch (Exception e1) {
+                e1.printStackTrace();
+            }
+        }
+        return sbar;
+    }
+}
diff --git a/app_mogo_magic_ring/build.gradle b/app_mogo_magic_ring/build.gradle
index cb85630fe3..969761002c 100644
--- a/app_mogo_magic_ring/build.gradle
+++ b/app_mogo_magic_ring/build.gradle
@@ -65,8 +65,9 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     implementation rootProject.ext.dependencies.gson
     implementation project(':libraries:mogo-adas')
-    compileOnly project(':core:mogo-core-data')
-    implementation project(':core:mogo-core-utils')
+    implementation project(':libraries:mogo-adas-data')
+//    compileOnly project(':core:mogo-core-data')
+//    implementation project(':core:mogo-core-utils')
     implementation 'org.greenrobot:eventbus:3.2.0'
     implementation 'com.android.support:multidex:1.0.3'
 }
diff --git a/app_mogo_magic_ring/src/main/java/com/zhidao/adas/magic/ui/FloatWindow.java b/app_mogo_magic_ring/src/main/java/com/zhidao/adas/magic/ui/FloatWindow.java
index 7e732899c0..f584c4d892 100644
--- a/app_mogo_magic_ring/src/main/java/com/zhidao/adas/magic/ui/FloatWindow.java
+++ b/app_mogo_magic_ring/src/main/java/com/zhidao/adas/magic/ui/FloatWindow.java
@@ -1,7 +1,6 @@
 package com.zhidao.adas.magic.ui;
 
 import android.app.Activity;
-import android.content.Context;
 import android.graphics.PixelFormat;
 import android.util.DisplayMetrics;
 import android.view.Gravity;
@@ -12,13 +11,12 @@ import android.view.WindowManager;
 
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.mogo.eagle.core.utilcode.util.BarUtils;
 import com.zhidao.adas.magic.R;
 import com.zhidao.adas.magic.adapter.ConnectStatusAdapter;
 import com.zhidao.adas.magic.bean.IPCConnectState;
 import com.zhidao.adas.magic.utils.MyLinearLayoutManager;
+import com.zhidao.adas.magic.utils.SysBarUtil;
 
-import java.lang.reflect.Field;
 import java.util.List;
 
 /**
@@ -109,14 +107,14 @@ public class FloatWindow implements View.OnTouchListener {
                 mInViewY = motionEvent.getY();
                 // 获取相对屏幕的坐标，即以屏幕左上角为原点
                 mDownInScreenX = motionEvent.getRawX();
-                mDownInScreenY = motionEvent.getRawY() - BarUtils.getStatusBarHeight();
+                mDownInScreenY = motionEvent.getRawY() - SysBarUtil.getSysBarHeight(mContext);
                 mInScreenX = motionEvent.getRawX();
-                mInScreenY = motionEvent.getRawY() - BarUtils.getStatusBarHeight();
+                mInScreenY = motionEvent.getRawY() - SysBarUtil.getSysBarHeight(mContext);
                 break;
             case MotionEvent.ACTION_MOVE:
                 // 更新浮动窗口位置参数
                 mInScreenX = motionEvent.getRawX();
-                mInScreenY = motionEvent.getRawY() - BarUtils.getStatusBarHeight();
+                mInScreenY = motionEvent.getRawY() - SysBarUtil.getSysBarHeight(mContext);
                 mWindowParams.x = (int) (mInScreenX - mInViewX);
                 mWindowParams.y = (int) (mInScreenY - mInViewY);
                 // 手指移动的时候更新小悬浮窗的位置
diff --git a/app_mogo_magic_ring/src/main/java/com/zhidao/adas/magic/ui/MainActivity.java b/app_mogo_magic_ring/src/main/java/com/zhidao/adas/magic/ui/MainActivity.java
index 911d98547a..c995bae83d 100644
--- a/app_mogo_magic_ring/src/main/java/com/zhidao/adas/magic/ui/MainActivity.java
+++ b/app_mogo_magic_ring/src/main/java/com/zhidao/adas/magic/ui/MainActivity.java
@@ -33,7 +33,6 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.SimpleItemAnimator;
 
-import com.mogo.eagle.core.utilcode.util.ToastUtils;
 import com.zhidao.adas.magic.R;
 import com.zhidao.adas.magic.adapter.InfoTitleAdapter;
 import com.zhidao.adas.magic.base.BaseActivity;
diff --git a/app_mogo_magic_ring/src/main/java/com/zhidao/adas/magic/utils/SysBarUtil.java b/app_mogo_magic_ring/src/main/java/com/zhidao/adas/magic/utils/SysBarUtil.java
new file mode 100644
index 0000000000..1d2979e612
--- /dev/null
+++ b/app_mogo_magic_ring/src/main/java/com/zhidao/adas/magic/utils/SysBarUtil.java
@@ -0,0 +1,30 @@
+package com.zhidao.adas.magic.utils;
+
+import android.content.Context;
+
+import java.lang.reflect.Field;
+
+public class SysBarUtil {
+    private static int sbar = -1;
+
+    // 获取系统状态栏高度
+    public static int getSysBarHeight(Context contex) {
+        if (sbar == -1) {
+            Class<?> c;
+            Object obj;
+            Field field;
+            int x;
+            sbar = 0;
+            try {
+                c = Class.forName("com.android.internal.R$dimen");
+                obj = c.newInstance();
+                field = c.getField("status_bar_height");
+                x = Integer.parseInt(field.get(obj).toString());
+                sbar = contex.getResources().getDimensionPixelSize(x);
+            } catch (Exception e1) {
+                e1.printStackTrace();
+            }
+        }
+        return sbar;
+    }
+}
diff --git a/config.gradle b/config.gradle
index 6c32c17051..752b3f9a7c 100644
--- a/config.gradle
+++ b/config.gradle
@@ -97,7 +97,7 @@ ext {
             // obu sdk
             obusdk                       : "com.zhidao.enterprise.smartv2x:smartv2x:1.0.0.3",
             mogoobuold                   : 'com.zhidao.support.obu:mogoobu:1.0.0.33',
-            mogoobu                      : 'com.mogo.support.obu:mogo-obu:1.0.3',
+            mogoobu                      : 'com.mogo.support.obu:mogo-obu:1.0.4',
             mogoami                      : 'com.zhidao.support.obu.ami:mogoami:1.0.0.24',
 
             // google
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 2f88146da9..7d0d1bd056 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
@@ -570,10 +570,11 @@ class DebugSettingView @JvmOverloads constructor(
             }
         }
 
-        Log.i(
-            "1026-emArrow",
-            "debug setting  FunctionBuildConfig.isDemoMode : ${FunctionBuildConfig.isDemoMode}"
-        )
+        btnDrawFusion.isChecked = FunctionBuildConfig.isFusionColor
+        btnDrawFusion.setOnCheckedChangeListener{_, isChecked ->
+            FunctionBuildConfig.isFusionColor = isChecked
+        }
+
         // 演示模式,上一次勾选的数据
         tbIsDemoMode.isChecked = FunctionBuildConfig.isDemoMode
 
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/BusOperationView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/BusOperationView.kt
index 9b96532be3..c1bbe984c0 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/BusOperationView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/BusOperationView.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
+import com.mogo.commons.debug.DebugConfig
 import com.mogo.eagle.core.data.temp.EventLogout
 import com.mogo.eagle.core.function.api.hmi.view.IOchBusView
 import com.mogo.eagle.core.function.hmi.R
@@ -31,6 +32,14 @@ class BusOperationView @JvmOverloads constructor(
             clickPersonalRightView();
         }
 
+    private fun initPersonalIcon() {
+        if("fPadLenovoOchTaxi" == DebugConfig.getProductFlavor()){
+            ivGotoPersonalInfo.visibility = VISIBLE
+        }else{
+            ivGotoPersonalInfo.visibility = GONE
+        }
+    }
+
     private fun clickPersonalRightView() {
         ivGotoPersonalInfo.onClick {
             EventBus.getDefault().post(EventLogout(EventLogout.PERSONAL_TYPE))
@@ -39,6 +48,7 @@ class BusOperationView @JvmOverloads constructor(
 
     override fun showBusOperation() {
         ochBusOperationStatus.visibility = View.VISIBLE
+        initPersonalIcon()
     }
 
     override fun changerOperationStatus(isOut: Boolean) {
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/turnlight/TurnLightViewStatus.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/turnlight/TurnLightViewStatus.kt
index 50f2e8a817..a507b08ac2 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/turnlight/TurnLightViewStatus.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/turnlight/TurnLightViewStatus.kt
@@ -62,7 +62,7 @@ class TurnLightViewStatus @JvmOverloads constructor(
         if (directionLight == 1 || directionLight == 2) {
             if (!isVisualAngleChanged) {
                 isVisualAngleChanged = true
-                CallerVisualAngleManager.changeVisualAngle(Turning)
+                CallerVisualAngleManager.changeVisualAngle(Turning(true))
             }
         }
 
@@ -96,7 +96,7 @@ class TurnLightViewStatus @JvmOverloads constructor(
         } else { //消失
             if (isVisualAngleChanged) {
                 isVisualAngleChanged = false
-                CallerVisualAngleManager.changeVisualAngle(Default())
+                CallerVisualAngleManager.changeVisualAngle(Turning(false))
             }
             if (!isDisappare) {
                 isDisappare = true
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java
index 4b4f375eca..10dde30c6f 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java
@@ -36,6 +36,7 @@ import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
 import com.mogo.eagle.core.utilcode.util.ToastUtils;
+import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
 import com.rousetime.android_startup.model.CostTimesModel;
 import com.zhjt.service.chain.ChainLog;
 import com.zhjt.service.chain.TracingConstants;
@@ -68,6 +69,20 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
 
     private BluetoothMonitorReceiver mBluetoothReceiver = null;
     private BluetoothAdapter mBluetoothAdapter;
+    private boolean isShowToast = false; //toast 控制
+    private long startPressTime = 0; //开始按减时间
+    private boolean isPressEnd = false; //按键是否结束
+    private volatile int isCombinationKey = 0; //是否是组合按键 1单击，2长按，3组合
+    private long pressADownTime = 0;
+    private long pressAUpTime = 0;
+    private long pressBDownTime = 0;
+    private long pressBUpTime = 0;
+    private long pressCDownTime = 0;
+    private long pressCUpTime = 0;
+    private long pressDDownTime = 0;
+    private long pressDUpTime = 0;
+    private long pressEDownTime = 0;
+    private long pressEUpTime = 0;
 
 
     @Override
@@ -225,24 +240,8 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
         return super.onKeyDown(keyCode, event);
     }
 
-    private long startPressTime = 0; //开始按减时间
-    private boolean isPressEnd = false; //按键是否结束
-    private boolean isCombinationKey = false; //是否是组合按键
-
-    private long pressADownTime = 0;
-    private long pressAUpTime = 0;
-    private long pressBDownTime = 0;
-    private long pressBUpTime = 0;
-    private long pressCDownTime = 0;
-    private long pressCUpTime = 0;
-    private long pressDDownTime = 0;
-    private long pressDUpTime = 0;
-    private long pressEDownTime = 0;
-    private long pressEUpTime = 0;
-
-
     /**
-     * 魔方按键分发  提测前注释 ToastUtils TODO
+     * 魔方按键分发
      *
      * @param event
      * @return
@@ -264,26 +263,40 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
                 if (event.getAction() == KeyEvent.ACTION_DOWN) {
                     pressADownTime = System.currentTimeMillis();
                     Log.d(TAG, "dispatchKeyEvent A down pressADownTime = " + pressADownTime + "---" + (pressADownTime - startPressTime) + "----isCombinationKey = " + isCombinationKey + "--pressBDownTime = " + pressBDownTime);
-                    if ((pressADownTime - startPressTime) > 320 && (pressADownTime - startPressTime) < 1600 && pressBDownTime > 0) {
-                        ToastUtils.showShort("方块 A 按AB组合 -2 ");
+                    if ((pressADownTime - startPressTime) > 320 && (pressADownTime - startPressTime) < 1300 && pressBDownTime > 0) {
+                        if (isShowToast) {
+                            ToastUtils.showShort("方块 A 按AB组合 -2 ");
+                        }
                         sendAcc(true, -2);
-                        isCombinationKey = true;
+                        isCombinationKey = 3;
                     }
-                    if (!isCombinationKey) {
-                        if ((pressADownTime - startPressTime) > 1700) {
-                            ToastUtils.showShort("方块 长按A 无 操作 ");
+
+                    if (isCombinationKey != 3 && isCombinationKey != 1) {
+                        if ((pressADownTime - startPressTime) > 1320) {
+                            if (isShowToast) {
+                                ToastUtils.showShort("方块 长按A 无 操作 ");
+                            }
+                            isCombinationKey = 2;
                         }
                     }
                 } else if (event.getAction() == KeyEvent.ACTION_UP) {
                     pressAUpTime = System.currentTimeMillis();
                     Log.e(TAG, "dispatchKeyEvent A up    pressAUpTime = " + pressAUpTime + "---" + (pressAUpTime - startPressTime) + "--pressBDownTime = " + pressBDownTime);
-                    if ((pressAUpTime - startPressTime) < 300 && !isCombinationKey) {
-                        ToastUtils.showShort("方块 单击A -1 ");
+                    if ((pressAUpTime - startPressTime) < 300 && isCombinationKey != 3) {
+                        isCombinationKey = 1;
+                        if (isShowToast) {
+                            ToastUtils.showShort("方块 单击A -1 ");
+                        }
                         sendAcc(true, -1);
                     }
                     pressADownTime = 0;
                     isPressEnd = false;
-                    isCombinationKey = false;
+                    UiThreadHandler.postDelayed(new Runnable() {
+                        @Override
+                        public void run() {
+                            isCombinationKey = 0;
+                        }
+                    }, 300);
                 }
 
                 return true;
@@ -291,44 +304,59 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
                 if (event.getAction() == KeyEvent.ACTION_DOWN) {
                     pressBDownTime = System.currentTimeMillis();
                     Log.d(TAG, "dispatchKeyEvent B down pressBDownTime = " + pressBDownTime + "--差-" + (pressBDownTime - startPressTime) + "---isCombinationKey = " + isCombinationKey + "--pressADownTime = " + pressADownTime);
-                    if ((pressBDownTime - startPressTime) > 320 && (pressBDownTime - startPressTime) < 1600 && pressADownTime > 0) {
-                        ToastUtils.showShort("方块 B 按AB组合  ");
+                    if ((pressBDownTime - startPressTime) > 320 && (pressBDownTime - startPressTime) < 1300 && pressADownTime > 0) {
+                        if (isShowToast) {
+                            ToastUtils.showShort("方块 B 按AB组合  ");
+                        }
                         sendAcc(true, -2);
-                        isCombinationKey = true;
+                        isCombinationKey = 3;
                     }
-                    if (!isCombinationKey) {
-                        if ((pressBDownTime - startPressTime) > 1700) {
-                            ToastUtils.showShort("方块 长按B =1 ");
+                    if (isCombinationKey != 3 && isCombinationKey != 1) {
+                        if ((pressBDownTime - startPressTime) > 1320) {
+                            if (isShowToast) {
+                                ToastUtils.showShort("方块 长按B +1 ");
+                            }
                             sendAcc(true, +1);
+                            isCombinationKey = 2;
                         }
                     }
                 } else if (event.getAction() == KeyEvent.ACTION_UP) {
                     pressBUpTime = System.currentTimeMillis();
                     Log.e(TAG, "dispatchKeyEvent B up   pressBUpTime = " + pressBUpTime + "--差-" + (pressBUpTime - startPressTime) + "--pressADownTime = " + pressADownTime);
-                    if ((pressBUpTime - startPressTime) < 300 && !isCombinationKey) {
-                        ToastUtils.showShort("方块 单击B  0 ");
+                    if ((pressBUpTime - startPressTime) < 300 && isCombinationKey != 3) {
+                        if (isShowToast) {
+                            ToastUtils.showShort("方块 单击B  0 ");
+                        }
                         sendAcc(false, 0.0);
+                        isCombinationKey = 1;
                     }
                     pressBDownTime = 0;
                     isPressEnd = false;
-                    isCombinationKey = false;
+
+                    UiThreadHandler.postDelayed(new Runnable() {
+                        @Override
+                        public void run() {
+                            isCombinationKey = 0;
+                        }
+                    }, 300);
                 }
 
                 return true;
             } else if (event.getKeyCode() == KeyEvent.KEYCODE_C) { //单击左变道，长按无操作
                 if (event.getAction() == KeyEvent.ACTION_DOWN) {
                     pressCDownTime = System.currentTimeMillis();
-                    if (!isCombinationKey) {
-                        if ((pressCDownTime - startPressTime) > 1700) {
+                    if ((pressCDownTime - startPressTime) > 1320) {
+                        if (isShowToast) {
                             ToastUtils.showShort("方块 长按C 无操作 ");
                         }
                     }
                 } else if (event.getAction() == KeyEvent.ACTION_UP) {
                     pressCUpTime = System.currentTimeMillis();
                     isPressEnd = false;
-                    isCombinationKey = false;
                     if ((pressCUpTime - startPressTime) < 300) {
-                        ToastUtils.showShort("方块 单击C ← 向左变道 ");
+                        if (isShowToast) {
+                            ToastUtils.showShort("方块 单击C ← 向左变道 ");
+                        }
                         CallerAutoPilotManager.INSTANCE.sendOperatorChangeLaneLeft();
                     }
                 }
@@ -336,17 +364,18 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
             } else if (event.getKeyCode() == KeyEvent.KEYCODE_D) { //单击向右变道，双击无操作
                 if (event.getAction() == KeyEvent.ACTION_DOWN) {
                     pressDDownTime = System.currentTimeMillis();
-                    if (!isCombinationKey) {
-                        if ((pressDDownTime - startPressTime) > 1700) {
+                    if ((pressDDownTime - startPressTime) > 1320) {
+                        if (isShowToast) {
                             ToastUtils.showShort("方块 长按D 无操作 ");
                         }
                     }
                 } else if (event.getAction() == KeyEvent.ACTION_UP) {
                     pressDUpTime = System.currentTimeMillis();
                     isPressEnd = false;
-                    isCombinationKey = false;
                     if ((pressDUpTime - startPressTime) < 300) {
-                        ToastUtils.showShort("方块 单击D → 向右变道 ");
+                        if (isShowToast) {
+                            ToastUtils.showShort("方块 单击D → 向右变道 ");
+                        }
                         CallerAutoPilotManager.INSTANCE.sendOperatorChangeLaneRight();
                     }
                 }
@@ -355,28 +384,29 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
             } else if (event.getKeyCode() == KeyEvent.KEYCODE_E) { //单击启动自驾，长按鸣笛
                 if (event.getAction() == KeyEvent.ACTION_DOWN) {
                     pressEDownTime = System.currentTimeMillis();
-                    if (!isCombinationKey) {
-                        if ((pressEDownTime - startPressTime) > 1700) {
+                    if ((pressEDownTime - startPressTime) > 1320) {
+                        if (isShowToast) {
                             ToastUtils.showShort("方块 长按E 鸣笛 ");
-                            CallerAutoPilotManager.INSTANCE.sendOperatorSetHorn(1);
-                            if (timerHorn == null) {
-                                timerHorn = new Timer();
-                            }
-                            timerHorn.schedule(new TimerTask() {
-                                @Override
-                                public void run() {
-                                    CallerAutoPilotManager.INSTANCE.sendOperatorSetHorn(2);
-                                    timerHorn = null;
-                                }
-                            }, 500);
                         }
+                        CallerAutoPilotManager.INSTANCE.sendOperatorSetHorn(1);
+                        if (timerHorn == null) {
+                            timerHorn = new Timer();
+                        }
+                        timerHorn.schedule(new TimerTask() {
+                            @Override
+                            public void run() {
+                                CallerAutoPilotManager.INSTANCE.sendOperatorSetHorn(2);
+                                timerHorn = null;
+                            }
+                        }, 500);
                     }
                 } else if (event.getAction() == KeyEvent.ACTION_UP) {
                     pressEUpTime = System.currentTimeMillis();
                     isPressEnd = false;
-                    isCombinationKey = false;
                     if ((pressEUpTime - startPressTime) < 300) {
-                        ToastUtils.showShort("方块 单击E 开启自动驾驶 ");
+                        if (isShowToast) {
+                            ToastUtils.showShort("方块 单击E 开启自动驾驶 ");
+                        }
                         CallerAutoPilotManager.INSTANCE.startAutoPilot(CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getAutopilotControlParameters());
                     }
                 }
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/och_arrow_right.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/och_arrow_right.png
new file mode 100644
index 0000000000..b83a8dd6aa
Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/och_arrow_right.png differ
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 b25b5cb22b..6a2021f4bd 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
@@ -1508,6 +1508,20 @@
                         app:layout_constraintRight_toLeftOf="@id/btnDrawTrolley"
                         app:layout_constraintTop_toBottomOf="@id/reset_changesight" />
 
+                    <ToggleButton
+                        android:id="@+id/btnDrawFusion"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="2dp"
+                        android:gravity="center"
+                        android:padding="@dimen/dp_20"
+                        android:textOff="打开fusion融合颜色替换"
+                        android:textOn="关闭fusion融合颜色替换"
+                        android:textSize="@dimen/dp_24"
+                        app:layout_constraintLeft_toRightOf="@id/changesight_cross_btn"
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/reset_changesight" />
+
                     <Button
                         android:id="@+id/btnDrawTrolley"
                         android:layout_width="0dp"
@@ -1862,7 +1876,7 @@
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
                             android:padding="@dimen/dp_10"
-                            android:text="融合感知数据"
+                            android:text="车端感知数据"
                             android:textColor="#000"
                             android:textSize="@dimen/dp_24" />
 
@@ -1882,7 +1896,7 @@
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
                             android:padding="@dimen/dp_10"
-                            android:text="融合V2I感知数据"
+                            android:text="V2I感知数据"
                             android:textColor="#000"
                             android:textSize="@dimen/dp_24" />
 
@@ -1892,7 +1906,7 @@
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
                             android:padding="@dimen/dp_10"
-                            android:text="融合V2N-RSM感知数据"
+                            android:text="V2N-RSM感知数据"
                             android:textColor="#000"
                             android:textSize="@dimen/dp_24" />
 
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_och_bus_operation.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_och_bus_operation.xml
index 54a43d8601..d0d583b144 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_och_bus_operation.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_och_bus_operation.xml
@@ -63,9 +63,11 @@
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/ivGotoPersonalInfo"
-        android:layout_width="@dimen/dp_17"
-        android:layout_height="@dimen/dp_32"
-        android:src="@drawable/icon_right"
+        android:layout_width="@dimen/dp_64"
+        android:layout_height="@dimen/dp_64"
+        android:src="@drawable/och_arrow_right"
+        android:visibility="gone"
+        android:scaleType="center"
         android:layout_marginRight="@dimen/dp_40"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="@+id/actvAccountPhone"
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceColorHelper.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceColorHelper.kt
index 4a9acd8673..68abd5926b 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceColorHelper.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceColorHelper.kt
@@ -9,9 +9,9 @@ object TrackerSourceColorHelper {
 
     @SuppressLint("NewApi")
     fun filterData(data: TrackedObject): Boolean {
-        if (!FunctionBuildConfig.isDrawUnknownIdentifyData
-            && data.type == TrafficTypeEnum.TYPE_TRAFFIC_ID_WEI_ZHI.type
-        ) {
+        if (!FunctionBuildConfig.isDrawUnknownIdentifyData && data.type == TrafficTypeEnum.TYPE_TRAFFIC_ID_WEI_ZHI.type
+            || data.type == TrafficTypeEnum.TYPE_TRAFFIC_ID_501.type ||  data.type == TrafficTypeEnum.TYPE_TRAFFIC_ID_502.type
+                ) {
             return true
         }
         var trackIPCFilter = true
@@ -96,7 +96,7 @@ object TrackerSourceColorHelper {
      * 是否为融合数据,融合数据来源size >=2
      */
     fun isFusion(data: TrackedObject): Boolean {
-        return data.trackedSourceList.size > 1
+        return FunctionBuildConfig.isFusionColor && data.trackedSourceList.size > 1
     }
 
     /**
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/overview/OverViewConst.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/overview/OverViewConst.kt
new file mode 100644
index 0000000000..cefa2c5968
--- /dev/null
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/overview/OverViewConst.kt
@@ -0,0 +1,7 @@
+package com.mogo.eagle.core.function.overview
+
+class OverViewConst {
+    companion object {
+        const val CLOUD_HOST = "https://eagle-qa.zhidaozhixing.com"
+    }
+}
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/overview/remote/OverViewServiceApi.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/overview/remote/OverViewServiceApi.kt
new file mode 100644
index 0000000000..64b96e4c72
--- /dev/null
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/overview/remote/OverViewServiceApi.kt
@@ -0,0 +1,11 @@
+package com.mogo.eagle.core.function.overview.remote
+
+import io.reactivex.Observable
+import retrofit2.http.GET
+import retrofit2.http.Query
+
+interface OverViewServiceApi {
+
+    @GET("/eagleEye-mis/config/queryV2NInformation")
+    fun queryAllV2XEventsByLineId(@Query("lineId") lineId: String, @Query("sn") sn: String): Observable<V2XEventResult>
+}
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/overview/remote/V2XEventResult.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/overview/remote/V2XEventResult.kt
new file mode 100644
index 0000000000..e57241ae53
--- /dev/null
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/overview/remote/V2XEventResult.kt
@@ -0,0 +1,70 @@
+package com.mogo.eagle.core.function.overview.remote
+
+import androidx.annotation.Keep
+
+import com.google.gson.annotations.SerializedName
+import com.mogo.eagle.core.data.BaseData
+
+
+@Keep
+data class V2XEventResult (
+    @SerializedName("result")
+    var result: Result?
+): BaseData()
+
+@Keep
+data class Result(
+    @SerializedName("eventList")
+    var v2XEventList: List<V2XEvent>?
+)
+
+@Keep
+data class V2XEvent(
+    @SerializedName("receiveTime")
+    var receiveTime: Long,
+
+    @SerializedName("detectTime")
+    var detectTime: Long,
+
+    @SerializedName("id")
+    var id: String?,
+
+    @SerializedName("center")
+    var center: Center?,
+
+    @SerializedName("centerRoad")
+    var centerRoad: CenterRoad?,
+
+    @SerializedName("radius")
+    var radius: Double,
+
+    @SerializedName("type")
+    var type: Int
+)
+
+@Keep
+data class Center(
+    @SerializedName("lat")
+    var lat: Double,
+
+    @SerializedName("lon")
+    var lon: Double
+)
+
+@Keep
+data class CenterRoad(
+    @SerializedName("bearing")
+    var bearing: Double,
+
+    @SerializedName("laneNo")
+    var laneNo: Long,
+
+    @SerializedName("roadId")
+    var roadId: String?,
+
+    @SerializedName("roadName")
+    var roadName: String?,
+
+    @SerializedName("tileId")
+    var tileId: Long
+)
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/overview/vm/OverViewModel.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/overview/vm/OverViewModel.kt
index 59440482c8..f6102fc24c 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/overview/vm/OverViewModel.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/overview/vm/OverViewModel.kt
@@ -1,16 +1,26 @@
 package com.mogo.eagle.core.function.overview.vm
 
 import androidx.lifecycle.*
-import com.amap.api.maps.model.LatLng
 import com.mogo.eagle.core.data.map.Infrastructure
+import com.mogo.eagle.core.function.overview.OverViewConst
 import com.mogo.eagle.core.function.overview.OverviewDao
-import io.reactivex.disposables.CompositeDisposable
+import com.mogo.eagle.core.function.overview.remote.OverViewServiceApi
+import com.mogo.eagle.core.function.overview.remote.V2XEvent
+import com.mogo.eagle.core.network.MoGoRetrofitFactory
+import io.reactivex.Observable
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.disposables.Disposable
+import io.reactivex.functions.Consumer
+import io.reactivex.schedulers.Schedulers
 import kotlinx.coroutines.launch
+import java.util.concurrent.TimeUnit
 
 class OverViewModel(
     private val overviewDao: OverviewDao
 ) : ViewModel() {
     private val _infStructures = MutableLiveData<List<Infrastructure>>()
+    private val _V2XEvents = MutableLiveData<List<V2XEvent>>()
+    private var disposable: Disposable? = null
 
     val infStructures
         get() = _infStructures
@@ -64,4 +74,34 @@ class OverViewModel(
             }
         }
     }
+
+    fun getAllV2XEventsByLineId(lineId: String, sn: String) {
+        // 1分钟查询一次
+        disposable = Observable.interval(0, 60000, TimeUnit.SECONDS)
+            .flatMap {
+                MoGoRetrofitFactory.getInstance(OverViewConst.CLOUD_HOST)
+                    .create(OverViewServiceApi::class.java)
+                    .queryAllV2XEventsByLineId(lineId, sn)
+                    .map {
+                        if (it.code == 200 || it.code == 0) {
+                            return@map it.result?.v2XEventList
+                        } else {
+                            return@map null
+                        }
+                    }
+            }
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe {
+                it?.apply {
+                    _V2XEvents.value = this
+                }
+            }
+    }
+
+    fun getV2XEventLiveData() = _V2XEvents
+
+    fun stopQueryV2XEvents() {
+        disposable?.dispose()
+    }
 }
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/AMapCustomView.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/AMapCustomView.java
index 2159ede25a..4535ce2b35 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/AMapCustomView.java
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/AMapCustomView.java
@@ -39,6 +39,8 @@ import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
 import com.mogo.eagle.core.function.call.map.CallerMapLocationListenerManager;
 import com.mogo.eagle.core.function.map.R;
 import com.mogo.eagle.core.function.overview.InfStructureManager;
+import com.mogo.eagle.core.function.overview.remote.Center;
+import com.mogo.eagle.core.function.overview.remote.V2XEvent;
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils;
 import com.mogo.eagle.core.utilcode.mogo.MapAssetStyleUtils;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
@@ -96,6 +98,8 @@ public class AMapCustomView
     private boolean isFirstLocation = true;
     CustomMapStyleOptions mCustomMapStyleOptions;
 
+    ArrayList<Marker> currMarkerList;
+
     public AMapCustomView(Context context) {
         this(context, null);
     }
@@ -254,6 +258,51 @@ public class AMapCustomView
         });
     }
 
+    public void showV2XEventMarkers(List<V2XEvent> v2XEvents) {
+        if (v2XEvents == null || v2XEvents.size() <= 0) return;
+        ArrayList<MarkerOptions> markerOptionsList = new ArrayList<>();
+        for (V2XEvent event : v2XEvents) {
+            if (event.getType() != 10006) {
+                continue;
+            }
+            Center center = event.getCenter();
+            if (center != null) {
+                center.getLon();
+                MarkerOptions markerOption = new MarkerOptions();
+                LatLng latLng = new LatLng(center.getLat(),
+                        center.getLon());
+                markerOption.position(latLng);
+                markerOption.icon(BitmapDescriptorFactory.fromResource(R.drawable.icon_warning_v2x_road_construction));
+                markerOptionsList.add(markerOption);
+            }
+        }
+        if (markerOptionsList.size() > 0) {
+            drawV2XMarkers(markerOptionsList);
+        }
+    }
+
+    public void drawV2XMarkers(ArrayList<MarkerOptions> markerOptionsList) {
+        currMarkerList = mAMap.addMarkers(markerOptionsList, false);
+        mAMap.setOnMarkerClickListener(marker -> {
+            List<Infrastructure> infList = posInfMap.get(marker.getPosition());
+            // 如果是摄像头
+            if (infList != null) {
+                CallerHmiManager.INSTANCE.showVideoDialog(infList);
+                return true;
+            }
+            return false;
+        });
+    }
+
+    public void clearV2XMarkers() {
+        if (currMarkerList != null) {
+            for (Marker marker : currMarkerList) {
+                marker.destroy();
+            }
+            currMarkerList = null;
+        }
+    }
+
     @Override
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/OverviewMapFragment.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/OverviewMapFragment.java
index 86e3cbf6e5..3b626ed794 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/OverviewMapFragment.java
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/OverviewMapFragment.java
@@ -2,19 +2,26 @@ package com.mogo.eagle.core.function.smp;
 
 import android.content.Context;
 import android.os.Bundle;
+import android.os.Looper;
 import android.view.View;
 
 import androidx.annotation.Nullable;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
+import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
 import com.mogo.commons.mvp.BaseFragment;
+import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters;
 import com.mogo.eagle.core.data.constants.MoGoFragmentPaths;
 import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.eagle.core.function.api.map.smp.IMogoSmallMapProvider;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager;
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotPlanningListenerManager;
 import com.mogo.eagle.core.function.map.R;
 import com.mogo.eagle.core.function.overview.InfStructureManager;
+import com.mogo.eagle.core.function.overview.ViewModelExtKt;
+import com.mogo.eagle.core.function.overview.vm.OverViewModel;
+import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
 
 import java.util.List;
 
@@ -28,6 +35,7 @@ public class OverviewMapFragment extends BaseFragment
         implements IMogoSmallMapProvider {
     private final String TAG = "SmallMapFragment";
     protected AMapCustomView mAMapCustomView;
+    private OverViewModel mViewModel;
 
     @Override
     public void onAttach(Context context) {
@@ -70,6 +78,18 @@ public class OverviewMapFragment extends BaseFragment
         }
     }
 
+    @Override
+    public void clearV2XMarkers() {
+        if (Thread.currentThread() != Looper.getMainLooper().getThread()) {
+            UiThreadHandler.post(() -> {
+                mAMapCustomView.clearV2XMarkers();
+            });
+        } else {
+            mAMapCustomView.clearV2XMarkers();
+        }
+        mViewModel.stopQueryV2XEvents();
+    }
+
     @Override
     public void drawablePolyline(List<MogoLatLng> coordinates) {
     }
@@ -92,17 +112,36 @@ public class OverviewMapFragment extends BaseFragment
         super.onActivityCreated(savedInstanceState);
         // 主动查一次全局路径规划的数据
         CallerAutoPilotManager.INSTANCE.getGlobalPath();
-//        queryInfStructure();
+        queryV2XEvents();
     }
 
-//    private void queryInfStructure() {
-//        mViewModel = ViewModelExtKt.obtainViewModel(this, OverViewModel.class);
-//        mViewModel.getInfStructuresMap().observe(this.getViewLifecycleOwner(), map -> {
-//            mAMapCustomView.updateInfStructures(map);
-//        });
-//        // 本地数据库查询
-//        mViewModel.fetchInfStructures();
-//    }
+    private void queryV2XEvents() {
+        mViewModel = ViewModelExtKt.obtainViewModel(this, OverViewModel.class);
+        mViewModel.getV2XEventLiveData().observe(this.getViewLifecycleOwner(), v2XEvents -> {
+            mAMapCustomView.showV2XEventMarkers(v2XEvents);
+        });
+
+        long lineId = getLineId();
+        if (lineId > 0) {
+            mViewModel.getAllV2XEventsByLineId("" + lineId, MoGoAiCloudClientConfig.getInstance().getSn());
+        }
+    }
+
+    /**
+     *
+     * @return Taxi的下发的轨迹id
+     */
+    private long getLineId() {
+        long lineId = -1;
+        AutopilotControlParameters parameter = CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo()
+                .getAutopilotControlParameters();
+        if (parameter != null) {
+            if (parameter.autoPilotLine != null) {
+                lineId = parameter.autoPilotLine.getLineId();
+            }
+        }
+        return lineId;
+    }
 
     @Override
     public void onPause() {
diff --git a/core/function-impl/mogo-core-function-msgbox/src/main/java/com/mogo/eagle/core/function/msgbox/DataManager.kt b/core/function-impl/mogo-core-function-msgbox/src/main/java/com/mogo/eagle/core/function/msgbox/DataManager.kt
index 5822ad2128..967608f8d8 100644
--- a/core/function-impl/mogo-core-function-msgbox/src/main/java/com/mogo/eagle/core/function/msgbox/DataManager.kt
+++ b/core/function-impl/mogo-core-function-msgbox/src/main/java/com/mogo/eagle/core/function/msgbox/DataManager.kt
@@ -130,15 +130,7 @@ object DataManager {
     }
 
     fun removeRecordInfo(key: String, value: Any) {
-        if (Thread.currentThread() == Looper.getMainLooper().thread) {
-            scope.launch {
-                withContext(Dispatchers.Default) {
-                    removedRecordMap[key] = value
-                }
-            }
-        } else {
-            removedRecordMap[key] = value
-        }
+        removedRecordMap[key] = value
     }
 
     /**
diff --git a/core/function-impl/mogo-core-function-msgbox/src/main/java/com/mogo/eagle/core/function/msgbox/MsgBoxProvider.kt b/core/function-impl/mogo-core-function-msgbox/src/main/java/com/mogo/eagle/core/function/msgbox/MsgBoxProvider.kt
index b7a05e8ac8..cafb85c7b0 100644
--- a/core/function-impl/mogo-core-function-msgbox/src/main/java/com/mogo/eagle/core/function/msgbox/MsgBoxProvider.kt
+++ b/core/function-impl/mogo-core-function-msgbox/src/main/java/com/mogo/eagle/core/function/msgbox/MsgBoxProvider.kt
@@ -42,11 +42,8 @@ class MsgBoxProvider : IMsgBoxProvider {
         return DataManager.getRecordBagData()
     }
 
-    override fun removeRecordInfo(key: String, value: Any) {
-        return DataManager.removeRecordInfo(key, value)
-    }
-
-    override fun deleteBoxBean(context: Context, msgBoxBean: MsgBoxBean) {
+    override fun removeRecordInfo(context: Context, msgBoxBean: MsgBoxBean, key: String) {
+        DataManager.removeRecordInfo(key, key)
         DataManager.delMsgBoxBean(context, msgBoxBean)
     }
 
diff --git a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MoGoObuProvider.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MoGoObuProvider.kt
index b07406da29..9d8693a859 100644
--- a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MoGoObuProvider.kt
+++ b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MoGoObuProvider.kt
@@ -21,12 +21,9 @@ class MoGoObuProvider : IMoGoObuProvider {
     private val TAG = "MoGoObuProvider"
 
     private var mContext: Context? = null
-
     private val busObuIp = "192.168.8.199"
     private val taxiObuIp = "192.168.1.199"
 
-//    private val taxiObuIp = "192.168.1.186"
-
     override val functionName: String
         get() = TAG
 
@@ -35,7 +32,7 @@ class MoGoObuProvider : IMoGoObuProvider {
     }
 
     override fun init(context: Context) {
-        CallerLogger.d("$M_OBU$TAG", "初始化蘑菇自研OBU…… localIp = " + CommonUtils.getLocalIPAddress())
+        CallerLogger.d("$M_OBU$TAG", "初始化蘑菇自研OBU…… localIp = " + CommonUtils.getLocalIPAddress() + "--")
         //bus乘客版本obu功能去掉
         if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode) && AppIdentityModeUtils.isPassenger(
                 FunctionBuildConfig.appIdentityMode
@@ -46,30 +43,33 @@ class MoGoObuProvider : IMoGoObuProvider {
             mContext = context
             mContext?.let {
                 if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) { //bus 司机端
-                    //mogo obu
-                    MogoPrivateObuNewManager.INSTANCE.connectObu(
-                        it,
-                        busObuIp,
-                        CommonUtils.getIpAddressString()
-                    )
-
-                    //old obu
                     val ipAddress =
                         SharedPrefsMgr.getInstance(context).getString(MoGoConfig.OBU_IP, busObuIp)
-                    MogoPrivateObuManager.INSTANCE.init(context, ipAddress)
 
-                } else if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) { //taxi 司机端和乘客端
                     //mogo obu
                     MogoPrivateObuNewManager.INSTANCE.connectObu(
                         it,
-                        taxiObuIp,
+                        ipAddress,
                         CommonUtils.getIpAddressString()
                     )
 
                     //old obu
+                    MogoPrivateObuManager.INSTANCE.init(context, ipAddress)
+                    CallerLogger.d("$M_OBU$TAG", "bus 司机 ipAddress = $ipAddress ---localIp = ${CommonUtils.getIpAddressString()}")
+
+                } else if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) { //taxi 司机端和乘客端
                     val ipAddress =
                         SharedPrefsMgr.getInstance(context).getString(MoGoConfig.OBU_IP, taxiObuIp)
+                    //mogo obu
+                    MogoPrivateObuNewManager.INSTANCE.connectObu(
+                        it,
+                        ipAddress,
+                        CommonUtils.getIpAddressString()
+                    )
+
+                    //old obu
                     MogoPrivateObuManager.INSTANCE.init(context, ipAddress)
+                    CallerLogger.d("$M_OBU$TAG", "taxi 司机端和乘客端 ipAddress = $ipAddress ---localIp = ${CommonUtils.getIpAddressString()}")
                 }
             }
         }
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 f9aab04f50..b5bb3413eb 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
@@ -18,11 +18,13 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OBU
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
 import com.mogo.eagle.core.data.enums.EventTypeEnumNew
+import com.mogo.eagle.core.data.enums.EventTypeEnumWeaknessTraffic
 import com.mogo.eagle.core.data.enums.V2iEventTypeEnum
 import com.mogo.eagle.core.data.msgbox.MsgBoxBean
 import com.mogo.eagle.core.data.msgbox.MsgBoxType
 import com.mogo.eagle.core.data.msgbox.V2XMsg
 import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager
+import com.mogo.eagle.core.function.obu.mogo.MogoObuConst.TAG_MOGO_OBU
 import com.mogo.support.obu.MogoObuManager
 import com.mogo.support.obu.OnMogoObuListener
 import com.mogo.support.obu.constants.MogoObuComType
@@ -48,7 +50,6 @@ class MogoPrivateObuNewManager private constructor() {
     }
 
     private var mContext: Context? = null
-    private val TAG = "ObuNewManager"
     private var mObuStatusInfo = CallerObuListenerManager.getObuStatusInfo()
 
 
@@ -122,12 +123,12 @@ class MogoPrivateObuNewManager private constructor() {
          */
         override fun onMogoObuHvBasics(p0: MogoObuHvBasicsData?) {
             Log.d(
-                TAG,
+                TAG_MOGO_OBU,
                 "onMogoObuHvBasics ------ p0 = ${p0.toString()}" + "-----FunctionBuildConfig.gpsProvider = " + FunctionBuildConfig.gpsProvider
             )
             if (p0 != null && p0.vehBasicsMsg != null) {
                 Log.d(
-                    TAG,
+                    TAG_MOGO_OBU,
                     "onMogoObuHvBasics  lon = ${p0.vehBasicsMsg.longitude} --- lat = ${p0.vehBasicsMsg.latitude} ---speed = ${p0.vehBasicsMsg.speed} ---heading = ${p0.vehBasicsMsg.heading} --acceleration = ${p0.vehBasicsMsg.accFourAxes.accLat} --yawRate = ${p0.vehBasicsMsg.accFourAxes.accYaw}"
                 )
                 val data = JSONObject()
@@ -178,7 +179,7 @@ class MogoPrivateObuNewManager private constructor() {
                 CallerMapUIServiceManager.getMarkerService()?.updateITrafficLocationInfo(it)
             }
 
-            Log.d(TAG, data.toString())
+            Log.d(TAG_MOGO_OBU, data.toString())
             data.let {
                 //预警信息,预警类型 threat_level 2、3
                 var status = data.status
@@ -204,7 +205,7 @@ class MogoPrivateObuNewManager private constructor() {
                     )
 
                     Log.e(
-                        TAG,
+                        TAG_MOGO_OBU,
                         "onMogoObuRvWarning target_classification =  ${
                             getMessageDirection(data.vehBasicsMsg.targetPosition)
                         } --- direction = $direction --- appId = $appId ---level = $level -- status = $status"
@@ -256,8 +257,7 @@ class MogoPrivateObuNewManager private constructor() {
 
                 when (appId) {
                     // 道路危险情况预警
-                    V2iEventTypeEnum.TYPE_USECASE_ID_HLW.poiType
-                    -> {
+                    MogoObuConstants.RSI_SCENE_TYPE.HLW.toString() -> {
                         when (data.warningMsg[0].eventSerialNum) {
                             MogoObuConstants.RTE.RTI_TYPE_BREAKDOWN -> {//车辆故障
                                 appId = V2iEventTypeEnum.TYPE_USECASE_ID_BREAKDOWN_WARNING.poiType
@@ -271,9 +271,6 @@ class MogoPrivateObuNewManager private constructor() {
 //                            MogoObuConstants.RTE.RTI_TYPE_CONSTRUCTION_RTE -> { //施工占道，和标牌重复
 //                                appId = V2iEventTypeEnum.FOURS_ROAD_WORK.poiType
 //                            }
-                            MogoObuConstants.RTE.RTI_TYPE_TJW -> { // 拥堵
-                                appId = V2iEventTypeEnum.TYPE_USECASE_ID_TJW.poiType
-                            }
                             MogoObuConstants.RTE.RTI_TYPE_SPEEDING -> { //超速行驶
                                 appId = V2iEventTypeEnum.TYPE_USECASE_ID_SLW.poiType
                             }
@@ -282,11 +279,10 @@ class MogoPrivateObuNewManager private constructor() {
                                     V2iEventTypeEnum.TYPE_USECASE_ID_ROAD_VEHICLE_RETROGRADE.poiType
                             }
                         }
-
                     }
 
                     //车内标牌
-                    V2iEventTypeEnum.TYPE_USECASE_ID_IVS.poiType -> {
+                    MogoObuConstants.RSI_SCENE_TYPE.IVS.toString() -> {
                         when (data.warningMsg[0].eventSerialNum) {
 //                            MogoObuConstants.RTS.RTI_TYPE_INTERSECTION -> { //十字路口
 //                                appId = V2iEventTypeEnum.TYPE_ID_NTERSECTION.poiType
@@ -356,19 +352,25 @@ class MogoPrivateObuNewManager private constructor() {
                                 appId =
                                     V2iEventTypeEnum.TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType
                             }
-
                             MogoObuConstants.RTS.RTI_TYPE_ACCIDENT -> { //事故
                                 appId = V2iEventTypeEnum.TYPE_USECASE_ID_ACCIDENT.poiType
                             }
                         }
                     }
 
-                    //限速预警 TODO 参考之前的
+                    // 拥堵
+                    MogoObuConstants.RSI_SCENE_TYPE.TJW.toString() -> {
+                        appId = V2iEventTypeEnum.TYPE_USECASE_ID_TJW.poiType
+                    }
+
+                    //限速预警, ADD处理一次
+                    MogoObuConstants.RSI_SCENE_TYPE.SLW.toString() -> {
+
+                    }
                 }
 
                 alertContent = V2iEventTypeEnum.getWarningContent(appId)
                 ttsContent = V2iEventTypeEnum.getWarningTts(appId)
-
                 alertContent = String.format(
                     alertContent,
                     data.warningMsg[0].distance.toString(),
@@ -387,83 +389,119 @@ class MogoPrivateObuNewManager private constructor() {
 
                 when (status) {
                     // 添加
-                    MogoObuConstants.STATUS.ADD,
-                    MogoObuConstants.STATUS.UPDATE// 更新
-                    -> {
-                        //显示警告红边
+                    MogoObuConstants.STATUS.ADD -> {
+                        if (appId == "1") { //限速预警 TODO
+                            CallerHmiManager.showLimitingVelocity((data.warningMsg[0].speedMaxLimit*3.6).toInt())
+                        } else {
+                            //显示警告红边
 //                        CallerHmiManager.showWarning(direction)
-                        //不显示弹框，语音提示,数据在消息盒子里面展示，此处不在处理弹框
-                        CallerMsgBoxManager.saveMsgBox(
-                            MsgBoxBean(
-                                MsgBoxType.OBU,
-                                V2XMsg(appId,
-                                    alertContent,
-                                    ttsContent)
+                            //不显示弹框，语音提示,数据在消息盒子里面展示，此处不在处理弹框
+                            CallerMsgBoxManager.saveMsgBox(
+                                MsgBoxBean(
+                                    MsgBoxType.OBU,
+                                    V2XMsg(
+                                        appId,
+                                        alertContent,
+                                        ttsContent
+                                    )
+                                )
                             )
-                        )
-                        CallerHmiManager.warningV2X(
-                            appId,
-                            alertContent,
-                            ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒
-                            (appId + direction.direction),//使用当前事件类型+方向记录tag，当发生变化的时候关闭当前弹出新的
-                            object : IMoGoWarningStatusListener {
-                                override fun onDismiss() {
-                                    // 关闭警告红边
-                                    CallerHmiManager.showWarning(WarningDirectionEnum.ALERT_WARNING_NON)
+                            CallerHmiManager.warningV2X(
+                                appId,
+                                alertContent,
+                                ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒
+                                (appId + direction.direction),//使用当前事件类型+方向记录tag，当发生变化的时候关闭当前弹出新的
+                                object : IMoGoWarningStatusListener {
+                                    override fun onDismiss() {
+                                        // 关闭警告红边
+                                        CallerHmiManager.showWarning(WarningDirectionEnum.ALERT_WARNING_NON)
+                                    }
+                                },
+                                true,
+                                3000L
+                            )
+
+                            // 更新数据
+                            TrafficDataConvertUtilsNew.cvxRtiThreatIndInfo2TrafficData(data)?.let {
+                                    CallerMapUIServiceManager.getMarkerService()
+                                        ?.updateITrafficThreatLevelInfo(it)
                                 }
-                            },
-                            true,
-                            3000L
-                        )
-                        // 更新数据
-                        TrafficDataConvertUtilsNew.cvxRtiThreatIndInfo2TrafficData(data)?.let {
-                            CallerMapUIServiceManager.getMarkerService()
-                                ?.updateITrafficThreatLevelInfo(it)
-                        }
+                            }
+//                        }
                     }
+
+                    MogoObuConstants.STATUS.UPDATE -> { // 更新
+
+                    }
+
                     // 删除
                     MogoObuConstants.STATUS.DELETE -> {
-                        // 关闭警告红边
+                        if (appId == "1") { //限速预警
+                            CallerHmiManager.disableLimitingVelocity();
+                        } else {
+                            // 关闭警告红边
 //                        CallerHmiManager.showWarning(WarningDirectionEnum.ALERT_WARNING_NON)
-                        // 移除顶部弹窗
+                            // 移除顶部弹窗
 //                        CallerHmiManager.disableWarningV2X((appId + direction.direction))
-                        // 更新数据
-                        TrafficDataConvertUtilsNew.cvxRtiThreatIndInfo2TrafficData(data)?.let {
-                            // 事件结束，还原车辆颜色
-                            it.threatLevel = 0x01
-                            CallerMapUIServiceManager.getMarkerService()?.updateITrafficInfo(it)
+                            // 更新数据
+                            TrafficDataConvertUtilsNew.cvxRtiThreatIndInfo2TrafficData(data)
+                                ?.let {
+                                    // 事件结束，还原车辆颜色
+                                    it.threatLevel = 0x01
+                                    CallerMapUIServiceManager.getMarkerService()
+                                        ?.updateITrafficInfo(it)
+                                }
                         }
+
                     }
                 }
             }
+
         }
 
         /**
          * RSM预警信息  CvxPtcThreatIndInfo  CvxPtcInfoIndInfo（主车与弱势交通参与者之间的预警（如：弱势交通参与者碰撞预警））
          */
-        override fun onMogoObuRsmWarning(data: MogoObuRsmWarningData?) {
+        override fun onMogoObuRsmWarning(
+            data: MogoObuRsmWarningData?
+        ) {
             super.onMogoObuRsmWarning(data)
-
             if (HmiBuildConfig.isShowObuWeaknessTrafficView) {
                 CallerLogger.d(
                     "$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
                     "onMogoObuRsmWarning ------> $data"
                 )
-                Log.d(TAG, "data = ${data.toString()}")
+                Log.d(TAG_MOGO_OBU, "data = ${data.toString()}")
                 // 交通参与者类型 0x0:未知 UNKNOWN | 1机动车  2:非机动车 NON_MOTOR | 3:行人 PEDESTRIAN 4:obu
                 if (data != null && data.participant != null && (data.participant.ptcType == 1 || data.participant.ptcType == 3)) {
                     CallerLogger.d(
                         "$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
                         "onMogoObuRsmWarning ---status---> ${data.status}"
                     )
+                    /**
+                     * 交通参与者类型
+                     * 0：未知
+                     * 1：机动车
+                     * 2：非机动车
+                     * 3：行人
+                     * 4：OBU自身
+                     */
                     var v2xType = ""
-                    if (data.participant.ptcType == 1) { //摩托车
-                        v2xType = EventTypeEnumNew.TYPE_USECASE_ID_VRUCW_MOTORBIKE.poiType
-                    } else if (data.participant.ptcType == 2) { //行人
-                        v2xType = EventTypeEnumNew.TYPE_USECASE_ID_VRUCW_PERSON.poiType
+                    if (data.participant.ptcType == 1) { //机动车
+                        v2xType =
+                            EventTypeEnumWeaknessTraffic.TYPE_USECASE_ID_VRUCW_MOTOR_VEHICLES.poiType
+                    } else if (data.participant.ptcType == 2) { //非机动车
+                        v2xType =
+                            EventTypeEnumWeaknessTraffic.TYPE_USECASE_ID_VRUCW_NOT_MOTOR_VEHICLES.poiType
+                    } else if (data.participant.ptcType == 3) { //行人
+                        v2xType =
+                            EventTypeEnumWeaknessTraffic.TYPE_USECASE_ID_VRUCW_PERSON.poiType
+                    } else { //未知
+                        v2xType = EventTypeEnumWeaknessTraffic.TYPE_ERROR.poiType
                     }
-                    val ttsContent = EventTypeEnumNew.getWarningTts(v2xType)
-                    val alertContent = EventTypeEnumNew.getWarningContent(v2xType)
+                    val ttsContent = EventTypeEnumWeaknessTraffic.getWarningTts(v2xType)
+                    val alertContent =
+                        EventTypeEnumWeaknessTraffic.getWarningContent(v2xType)
                     var level = -1
                     val direction = getMessageDirection(data.participant.targetPosition)
                     if (data.warningMsg != null && data.warningMsg.warningData != null && data.warningMsg.warningData.size > 0) {
@@ -471,19 +509,18 @@ class MogoPrivateObuNewManager private constructor() {
                     }
 
                     when (data.status) {
-                        // 添加
-                        MogoObuConstants.STATUS.ADD,
-                        MogoObuConstants.STATUS.UPDATE// 更新
-                        -> {
+                        MogoObuConstants.STATUS.ADD -> { // 添加
 //                        if (level == 2 || level == 3) { //不考虑level
                             //显示警告红边
                             CallerHmiManager.showWarning(direction)
                             CallerMsgBoxManager.saveMsgBox(
                                 MsgBoxBean(
                                     MsgBoxType.OBU,
-                                    V2XMsg(v2xType,
+                                    V2XMsg(
+                                        v2xType,
                                         alertContent,
-                                        ttsContent)
+                                        ttsContent
+                                    )
                                 )
                             )
                             CallerHmiManager.warningV2X(
@@ -494,17 +531,29 @@ class MogoPrivateObuNewManager private constructor() {
                                 object : IMoGoWarningStatusListener {
                                     override fun onDismiss() {
                                         // 关闭警告红边
-                                        CallerHmiManager.showWarning(WarningDirectionEnum.ALERT_WARNING_NON)
+                                        CallerHmiManager.showWarning(
+                                            WarningDirectionEnum.ALERT_WARNING_NON
+                                        )
                                     }
                                 },
                                 true,
-                                3000L
+                                5000L
                             )
 //                        }
+
                             // 更新数据
-                            TrafficDataConvertUtilsNew.cvxPtcThreatIndInfo2TrafficData(data)?.let {
-                                CallerMapUIServiceManager.getMarkerService()?.updateITrafficInfo(it)
-                            }
+                            TrafficDataConvertUtilsNew.cvxPtcThreatIndInfo2TrafficData(
+                                data
+                            )
+                                ?.let {
+                                    CallerMapUIServiceManager.getMarkerService()
+                                        ?.updateITrafficInfo(it)
+                                }
+
+                        }
+
+                        MogoObuConstants.STATUS.UPDATE -> {// 更新
+
                         }
 
                         // 删除
@@ -512,14 +561,13 @@ class MogoPrivateObuNewManager private constructor() {
                             // 关闭警告红边
                             CallerHmiManager.showWarning(WarningDirectionEnum.ALERT_WARNING_NON)
                             // 更新数据
-                            TrafficDataConvertUtilsNew.cvxPtcThreatIndInfo2TrafficData(data)?.let {
-                                // 事件结束，还原交通参与者颜色
-                                it.threatLevel = 0x01
-                                CallerMapUIServiceManager.getMarkerService()
-                                    ?.updateITrafficThreatLevelInfo(it)
-                            }
-
-//                        CallerHmiManager.disableWarningV2X(ObuConstants.USE_CASE_ID.VRUCW.toString())
+                            TrafficDataConvertUtilsNew.cvxPtcThreatIndInfo2TrafficData(data)
+                                ?.let {
+                                    // 事件结束，还原交通参与者颜色
+                                    it.threatLevel = 0x01
+                                    CallerMapUIServiceManager.getMarkerService()
+                                        ?.updateITrafficThreatLevelInfo(it)
+                                }
                         }
                     }
                 }
@@ -533,373 +581,418 @@ class MogoPrivateObuNewManager private constructor() {
             super.onMogoObuMapMath(data)
 
         }
+
     }
 
-    /**
-     * 获取消息的方位 车辆相关
-     */
-    private fun getMessageDirection(targetClassification: Int): WarningDirectionEnum {
-        CallerLogger.d("$M_OBU${MogoObuConst.TAG_MOGO_OBU}", "预警红边：预警方向->$targetClassification")
-        return when (targetClassification) {
-            MogoObuConstants.VEH_TARGET_POSITION.AHEAD_IN_LANE,
-            MogoObuConstants.VEH_TARGET_POSITION.ONCOMING_IN_LANE -> WarningDirectionEnum.ALERT_WARNING_TOP //正前方
+}
 
-            MogoObuConstants.VEH_TARGET_POSITION.BEHEAD_IN_LANE -> WarningDirectionEnum.ALERT_WARNING_BOTTOM //正后方
+/**
+ * 获取消息的方位 车辆相关
+ */
+private fun getMessageDirection(targetClassification: Int): WarningDirectionEnum {
+    CallerLogger.d("$M_OBU${MogoObuConst.TAG_MOGO_OBU}", "预警红边：预警方向->$targetClassification")
+    return when (targetClassification) {
+        MogoObuConstants.VEH_TARGET_POSITION.AHEAD_IN_LANE,
+        MogoObuConstants.VEH_TARGET_POSITION.ONCOMING_IN_LANE -> WarningDirectionEnum.ALERT_WARNING_TOP //正前方
 
-            MogoObuConstants.VEH_TARGET_POSITION.INTERSECTION_RIGHT -> WarningDirectionEnum.ALERT_WARNING_RIGHT //正右方
+        MogoObuConstants.VEH_TARGET_POSITION.BEHEAD_IN_LANE -> WarningDirectionEnum.ALERT_WARNING_BOTTOM //正后方
 
-            MogoObuConstants.VEH_TARGET_POSITION.INTERSECTION_LEFT -> WarningDirectionEnum.ALERT_WARNING_LEFT //正左方
+        MogoObuConstants.VEH_TARGET_POSITION.INTERSECTION_RIGHT -> WarningDirectionEnum.ALERT_WARNING_RIGHT //正右方
 
-            MogoObuConstants.VEH_TARGET_POSITION.AHEAD_LEFT, MogoObuConstants.VEH_TARGET_POSITION.AHEAD_FAR_LEFT,
-            MogoObuConstants.VEH_TARGET_POSITION.ONCOMING_LEFT, MogoObuConstants.VEH_TARGET_POSITION.ONCOMING_FAR_LEFT
-            -> WarningDirectionEnum.ALERT_WARNING_TOP_LEFT //左前方
+        MogoObuConstants.VEH_TARGET_POSITION.INTERSECTION_LEFT -> WarningDirectionEnum.ALERT_WARNING_LEFT //正左方
 
-            MogoObuConstants.VEH_TARGET_POSITION.AHEAD_RIGHT, MogoObuConstants.VEH_TARGET_POSITION.AHEAD_FAR_RIGHT,
-            MogoObuConstants.VEH_TARGET_POSITION.ONCOMING_RIGHT, MogoObuConstants.VEH_TARGET_POSITION.ONCOMING_FAT_RIGHT
-            -> WarningDirectionEnum.ALERT_WARNING_TOP_RIGHT //右前方
+        MogoObuConstants.VEH_TARGET_POSITION.AHEAD_LEFT, MogoObuConstants.VEH_TARGET_POSITION.AHEAD_FAR_LEFT,
+        MogoObuConstants.VEH_TARGET_POSITION.ONCOMING_LEFT, MogoObuConstants.VEH_TARGET_POSITION.ONCOMING_FAR_LEFT
+        -> WarningDirectionEnum.ALERT_WARNING_TOP_LEFT //左前方
 
-            MogoObuConstants.VEH_TARGET_POSITION.BEHEAD_LEFT, MogoObuConstants.VEH_TARGET_POSITION.BEHEAD_FAR_LEFT,
-            -> WarningDirectionEnum.ALERT_WARNING_BOTTOM_LEFT //左后方
+        MogoObuConstants.VEH_TARGET_POSITION.AHEAD_RIGHT, MogoObuConstants.VEH_TARGET_POSITION.AHEAD_FAR_RIGHT,
+        MogoObuConstants.VEH_TARGET_POSITION.ONCOMING_RIGHT, MogoObuConstants.VEH_TARGET_POSITION.ONCOMING_FAT_RIGHT
+        -> WarningDirectionEnum.ALERT_WARNING_TOP_RIGHT //右前方
 
-            MogoObuConstants.VEH_TARGET_POSITION.BEHEAD_RIGHT, MogoObuConstants.VEH_TARGET_POSITION.BEHEAD_FAR_RIGHT,
-            -> WarningDirectionEnum.ALERT_WARNING_BOTTOM_RIGHT  //右后方
+        MogoObuConstants.VEH_TARGET_POSITION.BEHEAD_LEFT, MogoObuConstants.VEH_TARGET_POSITION.BEHEAD_FAR_LEFT,
+        -> WarningDirectionEnum.ALERT_WARNING_BOTTOM_LEFT //左后方
 
-            MogoObuConstants.VEH_TARGET_POSITION.UNCLASSIFIED -> WarningDirectionEnum.ALERT_WARNING_NON //未知
-            else -> WarningDirectionEnum.ALERT_WARNING_ALL
-        }
+        MogoObuConstants.VEH_TARGET_POSITION.BEHEAD_RIGHT, MogoObuConstants.VEH_TARGET_POSITION.BEHEAD_FAR_RIGHT,
+        -> WarningDirectionEnum.ALERT_WARNING_BOTTOM_RIGHT  //右后方
+
+        MogoObuConstants.VEH_TARGET_POSITION.UNCLASSIFIED -> WarningDirectionEnum.ALERT_WARNING_NON //未知
+        else -> WarningDirectionEnum.ALERT_WARNING_ALL
     }
+}
 
-    /**
-     * 构造对应展示数据和场景 根据obu的场景，add change delete确定是否展示
-     *
-     * @param appId    使用WarningTypeEnum获取icon、提示内容、tts内容
-     *
-     * @see com.mogo.module.common.enums.EventTypeEnum
-     */
-    private fun handleSdkObu(
-        appId: String,
-        direction: WarningDirectionEnum,
-        status: Int,
-        level: Int,
-        info: MogoObuRvWarningData
-    ) {
-        //  这里排除需要特殊定制的语音及文案外,其余的都可以使用 EventTypeEnumNew 提供的
-        CallerLogger.d(
-            "$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
-            "handleSdkObu appId = $appId --- handleDirection = $direction ---level = $level ---status = $status"
-        )
-        Log.d(
-            TAG,
-            "handleSdkObu  appId = $appId --- handleDirection = $direction ---level = $level ---status = $status"
-        )
-        var alertContent: String
-        var ttsContent: String
-        var changeVisualAngle = false
-        when (appId) {
-            // 变道预警,注意左后车辆/注意右后车辆
-            EventTypeEnumNew.TYPE_USECASE_ID_LCW.poiType -> {
-                alertContent = EventTypeEnumNew.getWarningContent(appId)
-                ttsContent = EventTypeEnumNew.getWarningTts(appId)
-                if (
-                    direction == WarningDirectionEnum.ALERT_WARNING_LEFT ||
-                    direction == WarningDirectionEnum.ALERT_WARNING_TOP_LEFT ||
-                    direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_LEFT
-                ) {
-                    ttsContent = String.format(ttsContent, "左")
-                    alertContent = String.format(alertContent, "左")
-                } else if (
-                    direction == WarningDirectionEnum.ALERT_WARNING_RIGHT ||
-                    direction == WarningDirectionEnum.ALERT_WARNING_TOP_RIGHT ||
-                    direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_RIGHT
-                ) {
-                    ttsContent = String.format(ttsContent, "右")
-                    alertContent = String.format(alertContent, "右")
-                }
-            }
-
-            //车辆失控预警
-            EventTypeEnumNew.TYPE_USECASE_ID_CLW.poiType -> {
-                alertContent = EventTypeEnumNew.getWarningContent(appId)
-                ttsContent = EventTypeEnumNew.getWarningTts(appId)
-                alertContent = String.format(alertContent, direction.desc)
-                ttsContent = String.format(ttsContent, direction.desc)
-            }
-
-            //左转辅助
-//            EventTypeEnum.TYPE_USECASE_ID_LTA.poiType -> {
-//                alertContent = EventTypeEnum.getWarningContent(appId)
-//                ttsContent = EventTypeEnum.getWarningTts(appId)
-//            }
-
-            //异常车辆提醒
-            EventTypeEnumNew.TYPE_USECASE_ID_AVW.poiType -> {
-                alertContent = EventTypeEnumNew.getWarningContent(appId)
-                ttsContent = EventTypeEnumNew.getWarningTts(appId)
-                alertContent = String.format(alertContent, direction.desc)
-                ttsContent = String.format(ttsContent, direction.desc)
-            }
-
-            //盲区预警
-            EventTypeEnumNew.TYPE_USECASE_ID_BSW.poiType -> {
-                ttsContent = EventTypeEnumNew.getWarningTts(appId)
-                alertContent = EventTypeEnumNew.getWarningContent(appId)
-                if (
-                    direction == WarningDirectionEnum.ALERT_WARNING_LEFT ||
-                    direction == WarningDirectionEnum.ALERT_WARNING_TOP_LEFT ||
-                    direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_LEFT
-                ) { //左后
-                    changeVisualAngle = true
-                    ttsContent = String.format(ttsContent, "左")
-                    alertContent = String.format(alertContent, "左")
-                } else if (
-                    direction == WarningDirectionEnum.ALERT_WARNING_RIGHT ||
-                    direction == WarningDirectionEnum.ALERT_WARNING_TOP_RIGHT ||
-                    direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_RIGHT
-                ) { //右后
-                    changeVisualAngle = true
-                    ttsContent = String.format(ttsContent, "右")
-                    alertContent = String.format(alertContent, "右")
-                }
-            }
-
-            // 这里处理固定的提示信息,包括了<紧急车辆提醒>
-            else -> {
-                ttsContent = EventTypeEnumNew.getWarningTts(appId)
-                alertContent = EventTypeEnumNew.getWarningContent(appId)
+/**
+ * 构造对应展示数据和场景 根据obu的场景，add change delete确定是否展示
+ *
+ * @param appId    使用WarningTypeEnum获取icon、提示内容、tts内容
+ *
+ * @see com.mogo.module.common.enums.EventTypeEnum
+ */
+private fun handleSdkObu(
+    appId: String,
+    direction: WarningDirectionEnum,
+    status: Int,
+    level: Int,
+    info: MogoObuRvWarningData
+) {
+    //  这里排除需要特殊定制的语音及文案外,其余的都可以使用 EventTypeEnumNew 提供的
+    CallerLogger.d(
+        "$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
+        "handleSdkObu appId = $appId --- handleDirection = $direction ---level = $level ---status = $status"
+    )
+    Log.d(
+        TAG_MOGO_OBU,
+        "handleSdkObu  appId = $appId --- handleDirection = $direction ---level = $level ---status = $status"
+    )
+    var alertContent: String
+    var ttsContent: String
+    var changeVisualAngle = false
+    when (appId) {
+        // 变道预警,注意左后车辆/注意右后车辆
+        EventTypeEnumNew.TYPE_USECASE_ID_LCW.poiType -> {
+            alertContent = EventTypeEnumNew.getWarningContent(appId)
+            ttsContent = EventTypeEnumNew.getWarningTts(appId)
+            if (
+                direction == WarningDirectionEnum.ALERT_WARNING_LEFT ||
+                direction == WarningDirectionEnum.ALERT_WARNING_TOP_LEFT ||
+                direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_LEFT
+            ) {
+                ttsContent = String.format(ttsContent, "左")
+                alertContent = String.format(alertContent, "左")
+            } else if (
+                direction == WarningDirectionEnum.ALERT_WARNING_RIGHT ||
+                direction == WarningDirectionEnum.ALERT_WARNING_TOP_RIGHT ||
+                direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_RIGHT
+            ) {
+                ttsContent = String.format(ttsContent, "右")
+                alertContent = String.format(alertContent, "右")
             }
         }
 
-        when (status) {
-            // 添加,更新 add的时候，可能级别是2，
-            MogoObuConstants.STATUS.ADD,
-            MogoObuConstants.STATUS.UPDATE -> {
-                CallerLogger.d(
-                    "$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
-                    "appId2 = $appId --- level = $level ---ttsContent = $ttsContent --- alertContent = $alertContent --- direction = $direction"
-                )
-                Log.d(
-                    TAG,
-                    "appId2 = $appId --- level = $level ---ttsContent = $ttsContent --- alertContent = $alertContent --- direction = $direction"
-                )
-                if (level == 2 || level == 3) {
-                    //不显示弹框，其它保留
-                    CallerMsgBoxManager.saveMsgBox(
-                        MsgBoxBean(
-                            MsgBoxType.OBU,
-                            V2XMsg(appId,
-                                alertContent,
-                                ttsContent)
-                        )
-                    )
-                    CallerHmiManager.warningV2X(
-                        appId,
-                        alertContent,
-                        ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒
-                        (appId + direction.direction),//使用当前事件类型+方向记录tag，当发生变化的时候关闭当前弹出新的
-                        object : IMoGoWarningStatusListener {
-                            override fun onShow() {
-                                super.onShow()
-                                if (changeVisualAngle) {
-                                    CallerVisualAngleManager.changeVisualAngle(TooClose)
-                                }
-                            }
+        //车辆失控预警
+        EventTypeEnumNew.TYPE_USECASE_ID_CLW.poiType -> {
+            alertContent = EventTypeEnumNew.getWarningContent(appId)
+            ttsContent = EventTypeEnumNew.getWarningTts(appId)
+            alertContent = String.format(alertContent, direction.desc)
+            ttsContent = String.format(ttsContent, direction.desc)
+        }
 
-                            override fun onDismiss() {
-                                // 关闭警告红边
-                                CallerHmiManager.showWarning(WarningDirectionEnum.ALERT_WARNING_NON)
-                                if (changeVisualAngle) {
-                                    CallerVisualAngleManager.changeVisualAngle(Default())
-                                }
-                            }
-                        },
-                        true,
-                        3000L
-                    )
-                    //显示警告红边
-                    CallerHmiManager.showWarning(direction)
-                }
-                //更新周边车辆进行预警颜色变换，车辆实时移动和变色 ，UUID不需要匹配了
-                TrafficDataConvertUtilsNew.cvxV2vThreatIndInfo2TrafficData(info)?.let {
-                    CallerMapUIServiceManager.getMarkerService()?.updateITrafficThreatLevelInfo(it)
-                }
-            }
-            // 删除
-            MogoObuConstants.STATUS.DELETE -> {
-                // 关闭警告红边
-                CallerHmiManager.showWarning(WarningDirectionEnum.ALERT_WARNING_NON)
-                // 移除顶部弹窗
-//                CallerHmiManager.disableWarningV2X((appId + direction.direction))
-                //更新周边车辆进行预警颜色变换，车辆实时移动和变色
-                TrafficDataConvertUtilsNew.cvxV2vThreatIndInfo2TrafficData(info)?.let {
-                    it.threatLevel = 0x01
-                    CallerMapUIServiceManager.getMarkerService()?.updateITrafficThreatLevelInfo(it)
-                }
+        //异常车辆提醒
+        EventTypeEnumNew.TYPE_USECASE_ID_AVW.poiType -> {
+            alertContent = EventTypeEnumNew.getWarningContent(appId)
+            ttsContent = EventTypeEnumNew.getWarningTts(appId)
+            alertContent = String.format(alertContent, direction.desc)
+            ttsContent = String.format(ttsContent, direction.desc)
+        }
+
+        //盲区预警
+        EventTypeEnumNew.TYPE_USECASE_ID_BSW.poiType -> {
+            ttsContent = EventTypeEnumNew.getWarningTts(appId)
+            alertContent = EventTypeEnumNew.getWarningContent(appId)
+            if (
+                direction == WarningDirectionEnum.ALERT_WARNING_LEFT ||
+                direction == WarningDirectionEnum.ALERT_WARNING_TOP_LEFT ||
+                direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_LEFT
+            ) { //左后
+                changeVisualAngle = true
+                ttsContent = String.format(ttsContent, "左")
+                alertContent = String.format(alertContent, "左")
+            } else if (
+                direction == WarningDirectionEnum.ALERT_WARNING_RIGHT ||
+                direction == WarningDirectionEnum.ALERT_WARNING_TOP_RIGHT ||
+                direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_RIGHT
+            ) { //右后
+                changeVisualAngle = true
+                ttsContent = String.format(ttsContent, "右")
+                alertContent = String.format(alertContent, "右")
             }
         }
+        // 这里处理固定的提示信息,包括了<紧急车辆提醒>
+        else -> {
+            ttsContent = EventTypeEnumNew.getWarningTts(appId)
+            alertContent = EventTypeEnumNew.getWarningContent(appId)
+        }
     }
 
-    /**
-     * 处理红绿灯
-     */
-    private fun handlerTrafficLight(appId: Int, status: Int, lights: List<SpatLight>) {
-        CallerLogger.d(
-            "$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
-            "handlerTrafficLight --- status = $status ---lights.size = ${lights.size} ---lights = $lights "
-        )
-        Log.d(
-            TAG,
-            "handlerTrafficLight --- status = $status ---lights.size = ${lights.size} ---lights = $lights "
-        )
-
-        when (status) {
-            // 添加
-            MogoObuConstants.STATUS.ADD,
-            MogoObuConstants.STATUS.UPDATE
-            -> {
-                changeTrafficLightStatus(appId, lights)
-            }
-            // 删除
-            MogoObuConstants.STATUS.DELETE -> {
-                // 移除顶部弹窗
-                CallerHmiManager.disableWarningTrafficLight()
-//                CallerHmiManager.disableWarningV2X(appId.toString())
-            }
-        }
-    }
-
-    private var isRedLight = false
-    private var isGreenLight = false
-
-    /**
-     * 修改红绿灯
-     */
-    @Synchronized
-    private fun changeTrafficLightStatus(
-        appId: Int,
-        lights: List<SpatLight>
-    ) {
-        var ttsContent = ""
-        var alertContent = ""
-        //这里需要根据真实数据确定 index 取值方式
-        val currentLight = lights[0]
-        CallerLogger.d(
-            "$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
-            "currentLight = $currentLight ---currentLight.phase = ${currentLight.phaseId} ---appId = $appId"
-        )
-        Log.d(
-            TAG,
-            "currentLight = $currentLight ---currentLight.phase = ${currentLight.phaseId} ---appId = $appId"
-        )
-        // 闯红灯预警
-        when (appId) {
-            0x0 -> {//不可用 V2I_RLVW_VIOLATION_TYPE_UNAVAILABLE
-            }
-            0x1 -> {//无违规 V2I_RLVW_VIOLATION_TYPE_NO_VIOLATION
-//                CallerHmiManager.disableWarningV2X(appId.toString())
-            }
-            0x2 -> {//闯红灯 V2I_RLVW_VIOLATION_TYPE_RUNNING_RED_LIGHT
-                ttsContent = EventTypeEnumNew.getWarningTts(appId.toString())
-                alertContent = EventTypeEnumNew.getWarningContent(appId.toString())
+    when (status) {
+        // 添加,更新 add的时候，可能级别是2，
+        MogoObuConstants.STATUS.ADD,
+        MogoObuConstants.STATUS.UPDATE -> {
+            CallerLogger.d(
+                "$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
+                "appId2 = $appId --- level = $level ---ttsContent = $ttsContent --- alertContent = $alertContent --- direction = $direction"
+            )
+            Log.d(
+                TAG_MOGO_OBU,
+                "appId2 = $appId --- level = $level ---ttsContent = $ttsContent --- alertContent = $alertContent --- direction = $direction"
+            )
+            if (level == 2 || level == 3) {
+                //不显示弹框，其它保留
                 CallerMsgBoxManager.saveMsgBox(
                     MsgBoxBean(
                         MsgBoxType.OBU,
-                        V2XMsg(appId.toString(),
+                        V2XMsg(
+                            appId,
                             alertContent,
-                            ttsContent)
+                            ttsContent
+                        )
                     )
                 )
                 CallerHmiManager.warningV2X(
-                    appId.toString(), alertContent, ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒
-                    appId.toString(), null, true, 3000L
+                    appId,
+                    alertContent,
+                    ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒
+                    (appId + direction.direction),//使用当前事件类型+方向记录tag，当发生变化的时候关闭当前弹出新的
+                    object : IMoGoWarningStatusListener {
+                        override fun onShow() {
+                            super.onShow()
+                            if (changeVisualAngle) {
+                                CallerVisualAngleManager.changeVisualAngle(TooClose)
+                            }
+                        }
+
+                        override fun onDismiss() {
+                            // 关闭警告红边
+                            CallerHmiManager.showWarning(WarningDirectionEnum.ALERT_WARNING_NON)
+                            if (changeVisualAngle) {
+                                CallerVisualAngleManager.changeVisualAngle(Default())
+                            }
+                        }
+                    },
+                    true,
+                    3000L
                 )
+                //显示警告红边
+                CallerHmiManager.showWarning(direction)
             }
-            0x3 -> {//闯黄灯 V2I_RLVW_VIOLATION_TYPE_RUNNING_YELLOW_LIGHT
+            //更新周边车辆进行预警颜色变换，车辆实时移动和变色 ，UUID不需要匹配了
+            TrafficDataConvertUtilsNew.cvxV2vThreatIndInfo2TrafficData(info)?.let {
+                CallerMapUIServiceManager.getMarkerService()
+                    ?.updateITrafficThreatLevelInfo(it)
             }
         }
-
-        when (currentLight.light) {
-            // 灯光不可用
-            0x0 -> {
-                CallerHmiManager.showWarningTrafficLight(0, 2)
-            }
-            // 红灯
-            0x1 -> {
-                if (!isRedLight) {
-//                    CallerHmiManager.disableWarningV2X(appId.toString())
-                    isRedLight = true
-                }
-                isGreenLight = false
-                CallerHmiManager.showWarningTrafficLight(1, 2)
-
-                val red = currentLight.countDown.toInt()
-                CallerHmiManager.changeCountdownRed(red)
-                CallerHmiManager.changeCountdownGreen(0)
-                CallerHmiManager.changeCountdownYellow(0)
-            }
-            // 绿灯
-            0x2 -> {
-                if (!isGreenLight) {
-//                    CallerHmiManager.disableWarningV2X(appId.toString())
-                    isGreenLight = true
-                }
-                isRedLight = false
-                CallerHmiManager.showWarningTrafficLight(3, 2)
-                val green = currentLight.countDown.toInt()
-                CallerHmiManager.changeCountdownGreen(green)
-                //防止数据出现问题的容错
-                CallerHmiManager.changeCountdownRed(0)
-                CallerHmiManager.changeCountdownYellow(0)
-                // 拼接建议速度
-                CallerLogger.d(
-                    "$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
-                    "speed_min = ${currentLight.suggestMinSpeed} --speed_max = ${currentLight.suggestMaxSpeed}"
-                )
-                val adviceSpeed =
-                    "${currentLight.suggestMinSpeed} - ${currentLight.suggestMaxSpeed}"
-                val adviceSpeedTts =
-                    "${currentLight.suggestMinSpeed}到${currentLight.suggestMaxSpeed}"
-                ttsContent =
-                    String.format(
-                        EventTypeEnumNew.getWarningTts(EventTypeEnumNew.TYPE_USECASE_ID_IVP_GREEN.poiType),
-                        adviceSpeedTts
-                    )
-                alertContent =
-                    String.format(
-                        EventTypeEnumNew.getWarningContent(EventTypeEnumNew.TYPE_USECASE_ID_IVP_GREEN.poiType),
-                        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,
-                        3000L
-                    )
-                }
-            }
-            // 黄灯
-            0x3 -> {
-//                CallerHmiManager.disableWarningV2X(appId.toString())
-                CallerHmiManager.showWarningTrafficLight(2, 2)
-                val yellow = currentLight.countDown.toInt()
-                CallerHmiManager.changeCountdownYellow(yellow)
-                CallerHmiManager.changeCountdownGreen(0)
-                CallerHmiManager.changeCountdownRed(0)
+        // 删除
+        MogoObuConstants.STATUS.DELETE -> {
+            // 关闭警告红边
+            CallerHmiManager.showWarning(WarningDirectionEnum.ALERT_WARNING_NON)
+            // 移除顶部弹窗
+//                CallerHmiManager.disableWarningV2X((appId + direction.direction))
+            //更新周边车辆进行预警颜色变换，车辆实时移动和变色
+            TrafficDataConvertUtilsNew.cvxV2vThreatIndInfo2TrafficData(info)?.let {
+                it.threatLevel = 0x01
+                CallerMapUIServiceManager.getMarkerService()
+                    ?.updateITrafficThreatLevelInfo(it)
             }
         }
     }
+}
 
-}
\ No newline at end of file
+/**
+ * 处理红绿灯
+ */
+private fun handlerTrafficLight(appId: Int, status: Int, lights: List<SpatLight>) {
+    CallerLogger.d(
+        "$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
+        "handlerTrafficLight --- status = $status ---lights.size = ${lights.size} ---lights = $lights ---appId = $appId"
+    )
+    Log.d(
+        TAG_MOGO_OBU,
+        "handlerTrafficLight --- status = $status ---lights.size = ${lights.size} ---lights = $lights ---appId = $appId "
+    )
+
+    when (status) {
+        // 添加
+        MogoObuConstants.STATUS.ADD,
+        MogoObuConstants.STATUS.UPDATE
+        -> {
+            changeTrafficLightStatus(appId, lights)
+        }
+        // 删除
+        MogoObuConstants.STATUS.DELETE -> {
+            // 移除顶部弹窗
+            CallerHmiManager.disableWarningTrafficLight()
+            CallerHmiManager.disableWarningV2X(appId.toString())
+        }
+    }
+}
+
+private var isRedLight = false
+private var isGreenLight = false
+
+/**
+ * 修改红绿灯
+ */
+@Synchronized
+private fun changeTrafficLightStatus(
+    appId: Int,
+    lights: List<SpatLight>
+) {
+    var ttsContent = ""
+    var alertContent = ""
+    //这里需要根据真实数据确定 index 取值方式
+    val currentLight = lights[0]
+    CallerLogger.d(
+        "$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
+        "currentLight = $currentLight ---currentLight.phase = ${currentLight.phaseId} ---appId = $appId"
+    )
+    Log.d(
+        TAG_MOGO_OBU,
+        "currentLight = $currentLight ---currentLight.phase = ${currentLight.phaseId} ---appId = $appId"
+    )
+    // 闯红灯预警
+    when (appId) {
+        0x0 -> {//不可用 V2I_RLVW_VIOLATION_TYPE_UNAVAILABLE 无效
+
+        }
+        0x1 -> {//闯红灯 V2I_RLVW_VIOLATION_TYPE_RUNNING_RED_LIGHT TODO 需要约束一个红灯周期只显示一次
+//                CallerHmiManager.disableWarningV2X(appId.toString())
+//                Log.e(TAG, "changeTrafficLightStatus 闯红灯 --------> ")
+//                ttsContent = EventTypeEnumNew.getWarningTts(appId.toString())
+//                alertContent = EventTypeEnumNew.getWarningContent(appId.toString())
+//                CallerHmiManager.warningV2X(
+//                    appId.toString(), alertContent, ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒
+//                    appId.toString(), null, true, 5000L, MsgBoxType.OBU
+//                )
+        }
+
+        0x2 -> {//绿波通行引导 V2I_RLVW_VIOLATION_TYPE_NO_VIOLATION TODO 需要约束一个绿灯周期只显示一次
+            ttsContent = EventTypeEnumNew.getWarningTts(appId.toString())
+            alertContent = EventTypeEnumNew.getWarningContent(appId.toString())
+            CallerMsgBoxManager.saveMsgBox(
+                MsgBoxBean(
+                    MsgBoxType.OBU,
+                    V2XMsg(
+                        appId.toString(),
+                        alertContent,
+                        ttsContent
+                    )
+                )
+            )
+            CallerHmiManager.warningV2X(
+                appId.toString(), alertContent, ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒
+                appId.toString(), null, true, 3000L
+            )
+
+            // 拼接建议速度
+//                Log.e(TAG, "changeTrafficLightStatus 绿波通行引导 --------> ")
+//                CallerLogger.d(
+//                    "$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
+//                    "speed_min = ${currentLight.suggestMinSpeed} --speed_max = ${currentLight.suggestMaxSpeed}"
+//                )
+//                val adviceSpeed =
+//                    "${currentLight.suggestMinSpeed*3.6} - ${currentLight.suggestMaxSpeed*3.6}"
+//                val adviceSpeedTts =
+//                    "${currentLight.suggestMinSpeed*3.6}到${currentLight.suggestMaxSpeed*3.6}"
+//                ttsContent =
+//                    String.format(
+//                        EventTypeEnumNew.getWarningTts(EventTypeEnumNew.TYPE_USECASE_ID_IVP_GREEN.poiType),
+//                        adviceSpeedTts
+//                    )
+//                alertContent =
+//                    String.format(
+//                        EventTypeEnumNew.getWarningContent(EventTypeEnumNew.TYPE_USECASE_ID_IVP_GREEN.poiType),
+//                        adviceSpeed
+//                    )
+//                val maxSpeed = currentLight.suggestMaxSpeed*3.6
+//                if (maxSpeed > 0) {
+//                    CallerHmiManager.warningV2X(
+//                        EventTypeEnumNew.TYPE_USECASE_ID_IVP_GREEN.poiType,
+//                        alertContent,
+//                        ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒
+//                        appId.toString(),
+//                        null,
+//                        true,
+//                        5000L,
+//                        MsgBoxType.OBU
+//                    )
+//                }
+        }
+    }
+
+    when (currentLight.light) {
+        // 灯光不可用
+        0 -> {
+            CallerHmiManager.showWarningTrafficLight(0, 2)
+        }
+        // 红灯
+        2, 3 -> {
+            if (!isRedLight) {
+                CallerHmiManager.disableWarningV2X(appId.toString())
+                isRedLight = true
+            }
+            isGreenLight = false
+            CallerHmiManager.showWarningTrafficLight(1, 2)
+
+            val red = currentLight.countDown.toInt()
+            CallerHmiManager.changeCountdownRed(red)
+//                CallerHmiManager.changeCountdownGreen(0)
+//                CallerHmiManager.changeCountdownYellow(0)
+        }
+        // 绿灯
+        4, 5, 6 -> {
+            if (!isGreenLight) {
+                CallerHmiManager.disableWarningV2X(appId.toString())
+                isGreenLight = true
+            }
+            isRedLight = false
+            CallerHmiManager.showWarningTrafficLight(3, 2)
+            val green = currentLight.countDown.toInt()
+            CallerHmiManager.changeCountdownGreen(green)
+            //防止数据出现问题的容错
+            CallerHmiManager.changeCountdownRed(0)
+            CallerHmiManager.changeCountdownYellow(0)
+            // 拼接建议速度
+            CallerLogger.d(
+                "$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
+                "speed_min = ${currentLight.suggestMinSpeed} --speed_max = ${currentLight.suggestMaxSpeed}"
+            )
+            val adviceSpeed =
+                "${currentLight.suggestMinSpeed} - ${currentLight.suggestMaxSpeed}"
+            val adviceSpeedTts =
+                "${currentLight.suggestMinSpeed}到${currentLight.suggestMaxSpeed}"
+            ttsContent =
+                String.format(
+                    EventTypeEnumNew.getWarningTts(EventTypeEnumNew.TYPE_USECASE_ID_IVP_GREEN.poiType),
+                    adviceSpeedTts
+                )
+            alertContent =
+                String.format(
+                    EventTypeEnumNew.getWarningContent(EventTypeEnumNew.TYPE_USECASE_ID_IVP_GREEN.poiType),
+                    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,
+                    3000L
+                )
+            }
+//                CallerHmiManager.changeCountdownRed(0)
+//                CallerHmiManager.changeCountdownYellow(0)
+        }
+        // 黄灯
+        7, 8 -> {
+            CallerHmiManager.disableWarningV2X(appId.toString())
+            CallerHmiManager.showWarningTrafficLight(2, 2)
+            val yellow = currentLight.countDown.toInt()
+            CallerHmiManager.changeCountdownYellow(yellow)
+//                CallerHmiManager.changeCountdownGreen(0)
+//                CallerHmiManager.changeCountdownRed(0)
+        }
+    }
+}
diff --git a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/utils/TrafficDataConvertUtilsNew.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/utils/TrafficDataConvertUtilsNew.kt
index 32d49b96dc..7a253a920d 100644
--- a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/utils/TrafficDataConvertUtilsNew.kt
+++ b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/utils/TrafficDataConvertUtilsNew.kt
@@ -94,14 +94,22 @@ object TrafficDataConvertUtilsNew {
         trafficData.heading = info.participant.heading
         trafficData.speed = info.participant.speed
 
+        /**
+         * 交通参与者类型
+         * 0：未知
+         * 1：机动车
+         * 2：非机动车
+         * 3：行人
+         * 4：OBU自身
+         */
         when (info.participant.ptcType) {
             // 未知
             0 -> {
                 trafficData.type = TrafficTypeEnum.TYPE_TRAFFIC_ID_WEI_ZHI
             }
-            //机动车 //TODO
+            //机动车
             1 -> {
-                trafficData.type = TrafficTypeEnum.TYPE_TRAFFIC_ID_TA_CHE
+                trafficData.type = TrafficTypeEnum.TYPE_TRAFFIC_ID_MOTO
             }
             // 非机动车
             2 -> {
@@ -113,16 +121,6 @@ object TrafficDataConvertUtilsNew {
             }
         }
 
-        /**
-         * 交通参与者类型
-         * 0：未知
-         * 1：机动车
-         * 2：非机动车
-         * 3：行人
-         * 4：OBU自身
-         */
-        val ptcType = 0
-
         // 判断车辆V2X预警级别，调整车辆颜色
         if (info.warningMsg != null && info.warningMsg.warningData != null) {
             trafficData.threatLevel = info.warningMsg.warningData[0].warningLevel
diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt
index 15cae7ecf7..690adf88a0 100644
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt
@@ -56,6 +56,14 @@ object FunctionBuildConfig {
     @JvmField
     var isBeautyMode = true
 
+    /**
+     * 是否开启感知物替换颜色功能
+     * 默认关闭
+     */
+    @Volatile
+    @JvmField
+    var isFusionColor = false
+
     /**
      * 当前APP的身份模式
      *
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 634429710f..901bb2aae1 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
@@ -146,13 +146,13 @@ enum class EventTypeEnumNew(
         content = "前车碰撞预警",
         tts = "小心前车"
     ),
-    TYPE_USECASE_ID_ICW(
-        1.toString(),
-        "交叉路口碰撞预警",
-        poiTypeSrcVr = R.drawable.icon_warning_v2x_collision_warning,
-        content = "交叉路口碰撞预警",
-        tts = "注意交叉路口车辆"
-    ),
+//    TYPE_USECASE_ID_ICW(
+//        1.toString(),
+//        "交叉路口碰撞预警",
+//        poiTypeSrcVr = R.drawable.icon_warning_v2x_collision_warning,
+//        content = "交叉路口碰撞预警",
+//        tts = "注意交叉路口车辆"
+//    ),
     TYPE_USECASE_ID_AVW(
         7.toString(),
         "异常车辆提醒",
@@ -218,21 +218,6 @@ enum class EventTypeEnumNew(
         tts = "前方路口左转急弯，减速慢行",
     ),
 
-    //TODO
-    TYPE_USECASE_ID_VRUCW_PERSON(
-        0X2B0201.toString(),
-        "弱势交通参与者碰撞预警",
-        poiTypeSrcVr = R.drawable.icon_warning_v2x_pedestrian_crossing,
-        content = "注意行人",
-        tts = "注意行人"
-    ),//行人/摩托车碰撞预警
-    TYPE_USECASE_ID_VRUCW_MOTORBIKE(
-        0X2B0202.toString(),
-        "弱势交通参与者碰撞预警",
-        poiTypeSrcVr = R.drawable.icon_warning_v2x_motorcycle_collision,
-        content = "注意摩托车",
-        tts = "注意摩托车"
-    ),//摩托车碰撞预警
     TYPE_USECASE_ID_LTA(
         2.toString(),
         "左转辅助",
@@ -241,13 +226,6 @@ enum class EventTypeEnumNew(
         tts = "注意路口对向来车"
     ),
 
-    TYPE_USECASE_ID_IVS(
-        3.toString(),
-        "车内标牌",
-        poiTypeSrcVr = R.drawable.icon_warning_v2x_road_construction,
-        content = "车内标牌",
-        tts = ""
-    ),
     TYPE_USECASE_ID_TJW( //TODO
         4.toString(),
         "前方拥堵提醒",
@@ -256,32 +234,16 @@ enum class EventTypeEnumNew(
         tts = "前方拥堵，减速慢行"
     ),
 
-    //TODO 不能使用之前obu的定义 ObuConstants.USE_CASE_ID.HLW.toString(),
-    TYPE_USECASE_OPTIMAL_LANE(
-        "111",
-        "最优车道",
-        poiTypeSrcVr = R.drawable.v2x_icon_live_logo,
-        content = "最优车道",
-        tts = "最优车道"
-    ),
-
-    TYPE_USECASE_ID_HLW(
-        1.toString(),
-            "道路危险情况预警",
-            poiTypeSrcVr = R.drawable.icon_warning_v2x_road_dangerous,
-            content = "道路危险情况预警",
-            tts = "前方路况危险，小心行驶"
-    ),//（如果能给出具体的类别，则播报具体危险类别）
-
     TYPE_USECASE_ID_IVP(
-        0x2.toString(),
+        0x1.toString(),
         "闯红灯预警",
         poiTypeSrcVr = R.drawable.icon_warning_v2x_traffic_lights_red,
         content = "路口红灯，禁止通行",
         tts = "路口红灯，禁止通行"
     ),
+
     TYPE_USECASE_ID_IVP_GREEN(
-        0x2B091.toString(),
+        0x2.toString(),
         "绿波通行",
         poiTypeSrcVr = R.drawable.icon_warning_v2x_traffic_lights_green,
         content = "建议车速 %s KM/H",
@@ -305,22 +267,6 @@ enum class EventTypeEnumNew(
         tts = "注意超速车辆"
     ),
 
-    TYPE_USECASE_ID_BREAKDOWN_WARNING(
-        101.toString(),
-        "注意故障车辆",
-        poiTypeSrcVr = R.drawable.icon_warning_v2x_collision_warning,
-        content = "注意故障车辆",
-        tts = "注意故障车辆"
-    ),
-
-    TYPE_USECASE_ID_ROAD_PARKING(
-        412.toString(),
-        "注意异常停车",
-        poiTypeSrcVr = R.drawable.icon_warning_v2x_no_parking,
-        content = "注意异常停车",
-        tts = "注意异常停车"
-    ),
-
     TYPE_USECASE_ID_ROAD_TRAMCAR(
         0x2C01.toString(),
         "前方有轨电车提醒",
@@ -336,41 +282,6 @@ enum class EventTypeEnumNew(
         content = "注意前方人行横道",
         tts = "前方人行横道，减速慢行"
     ),
-    TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL(
-        0x2C05.toString(),
-        "学校",
-        poiTypeSrcVr = R.drawable.icon_warning_v2x_school,
-        content = "注意前方学校",
-        tts = "前方学校，减速慢行"
-    ),
-    TYPE_USECASE_ID_ROAD_COLLISION_WARNING(
-        0x2C06.toString(),
-        "事故易发路段",
-        poiTypeSrcVr = R.drawable.icon_warning_v2x_collision_warning,
-        content = "注意当前路段事故多发",
-        tts = "当前路段事故多发，请小心驾驶"
-    ),
-    TYPE_USECASE_ID_ROAD_ROUNDABOUTPNG(
-        0x2C07.toString(),
-        "环岛行驶",
-        poiTypeSrcVr = R.drawable.icon_warning_v2x_roundaboutpng,
-        content = "注意前方驶入环岛",
-        tts = "即将驶入环岛，减速慢行"
-    ),
-    TYPE_USECASE_ID_ROAD_TEST_SECTION(
-        0x2C08.toString(),
-        "驾校考试路段",
-        poiTypeSrcVr = R.drawable.icon_warning_v2x_test_section,
-        content = "注意前方驾校考试路段",
-        tts = "驾校考试路段，请小心驾驶"
-    ),
-    TYPE_USECASE_ID_ROAD_HUMP_BRIDGE(
-        0x2C09.toString(),
-        "驼峰桥",
-        poiTypeSrcVr = R.drawable.icon_warning_v2x_hump_bridge,
-        content = "注意前方驼峰桥",
-        tts = "注意即将驶入驼峰桥，请小心驾驶"
-    ),
     TYPE_USECASE_ID_ROAD_NO_PARKING(
         0x2C10.toString(),
         "禁止停车",
@@ -740,32 +651,22 @@ enum class EventTypeEnumNew(
             return when (poiType) {
                 TYPE_USECASE_ID_EBW.poiType -> TYPE_USECASE_ID_EBW.poiTypeSrcVr
                 TYPE_USECASE_ID_FCW.poiType -> TYPE_USECASE_ID_FCW.poiTypeSrcVr
-                TYPE_USECASE_ID_ICW.poiType -> TYPE_USECASE_ID_ICW.poiTypeSrcVr
+//                TYPE_USECASE_ID_ICW.poiType -> TYPE_USECASE_ID_ICW.poiTypeSrcVr
                 TYPE_USECASE_ID_CLW.poiType -> TYPE_USECASE_ID_CLW.poiTypeSrcVr
                 TYPE_USECASE_ID_DNPW.poiType -> TYPE_USECASE_ID_DNPW.poiTypeSrcVr
                 TYPE_USECASE_ID_AVW.poiType -> TYPE_USECASE_ID_AVW.poiTypeSrcVr
                 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_VRUCW_PERSON.poiType -> TYPE_USECASE_ID_VRUCW_PERSON.poiTypeSrcVr
-                TYPE_USECASE_ID_VRUCW_MOTORBIKE.poiType -> TYPE_USECASE_ID_VRUCW_MOTORBIKE.poiTypeSrcVr
                 TYPE_USECASE_ID_SLW.poiType -> TYPE_USECASE_ID_SLW.poiTypeSrcVr
                 TYPE_USECASE_ID_LTA.poiType -> TYPE_USECASE_ID_LTA.poiTypeSrcVr
-//                TYPE_USECASE_ID_HLW.poiType -> TYPE_USECASE_ID_HLW.poiTypeSrcVr
-                TYPE_USECASE_ID_IVS.poiType -> TYPE_USECASE_ID_IVS.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_COC.poiType -> TYPE_USECASE_ID_COC.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_PEDESTRIAN_SCHOOL.poiType -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiTypeSrcVr
-                TYPE_USECASE_ID_ROAD_COLLISION_WARNING.poiType -> TYPE_USECASE_ID_ROAD_COLLISION_WARNING.poiTypeSrcVr
-                TYPE_USECASE_ID_ROAD_ROUNDABOUTPNG.poiType -> TYPE_USECASE_ID_ROAD_ROUNDABOUTPNG.poiTypeSrcVr
-                TYPE_USECASE_ID_ROAD_TEST_SECTION.poiType -> TYPE_USECASE_ID_ROAD_TEST_SECTION.poiTypeSrcVr
-                TYPE_USECASE_ID_ROAD_HUMP_BRIDGE.poiType -> TYPE_USECASE_ID_ROAD_HUMP_BRIDGE.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
@@ -782,32 +683,22 @@ enum class EventTypeEnumNew(
             return when (poiType) {
                 TYPE_USECASE_ID_EBW.poiType -> TYPE_USECASE_ID_EBW.content
                 TYPE_USECASE_ID_FCW.poiType -> TYPE_USECASE_ID_FCW.content
-                TYPE_USECASE_ID_ICW.poiType -> TYPE_USECASE_ID_ICW.content
+//                TYPE_USECASE_ID_ICW.poiType -> TYPE_USECASE_ID_ICW.content
                 TYPE_USECASE_ID_CLW.poiType -> TYPE_USECASE_ID_CLW.content
                 TYPE_USECASE_ID_DNPW.poiType -> TYPE_USECASE_ID_DNPW.content
                 TYPE_USECASE_ID_AVW.poiType -> TYPE_USECASE_ID_AVW.content
                 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_VRUCW_PERSON.poiType -> TYPE_USECASE_ID_VRUCW_PERSON.content
-                TYPE_USECASE_ID_VRUCW_MOTORBIKE.poiType -> TYPE_USECASE_ID_VRUCW_MOTORBIKE.content
                 TYPE_USECASE_ID_SLW.poiType -> TYPE_USECASE_ID_SLW.content
                 TYPE_USECASE_ID_LTA.poiType -> TYPE_USECASE_ID_LTA.content
-//                TYPE_USECASE_ID_HLW.poiType -> TYPE_USECASE_ID_HLW.content
-                TYPE_USECASE_ID_IVS.poiType -> TYPE_USECASE_ID_IVS.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_COC.poiType -> TYPE_USECASE_ID_COC.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_PEDESTRIAN_SCHOOL.poiType -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.content
-                TYPE_USECASE_ID_ROAD_COLLISION_WARNING.poiType -> TYPE_USECASE_ID_ROAD_COLLISION_WARNING.content
-                TYPE_USECASE_ID_ROAD_ROUNDABOUTPNG.poiType -> TYPE_USECASE_ID_ROAD_ROUNDABOUTPNG.content
-                TYPE_USECASE_ID_ROAD_TEST_SECTION.poiType -> TYPE_USECASE_ID_ROAD_TEST_SECTION.content
-                TYPE_USECASE_ID_ROAD_HUMP_BRIDGE.poiType -> TYPE_USECASE_ID_ROAD_HUMP_BRIDGE.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
@@ -825,32 +716,22 @@ enum class EventTypeEnumNew(
             return when (poiType) {
                 TYPE_USECASE_ID_EBW.poiType -> TYPE_USECASE_ID_EBW.tts
                 TYPE_USECASE_ID_FCW.poiType -> TYPE_USECASE_ID_FCW.tts
-                TYPE_USECASE_ID_ICW.poiType -> TYPE_USECASE_ID_ICW.tts
+//                TYPE_USECASE_ID_ICW.poiType -> TYPE_USECASE_ID_ICW.tts
                 TYPE_USECASE_ID_CLW.poiType -> TYPE_USECASE_ID_CLW.tts
                 TYPE_USECASE_ID_DNPW.poiType -> TYPE_USECASE_ID_DNPW.tts
                 TYPE_USECASE_ID_AVW.poiType -> TYPE_USECASE_ID_AVW.tts
                 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_VRUCW_PERSON.poiType -> TYPE_USECASE_ID_VRUCW_PERSON.tts
-                TYPE_USECASE_ID_VRUCW_MOTORBIKE.poiType -> TYPE_USECASE_ID_VRUCW_MOTORBIKE.tts
                 TYPE_USECASE_ID_SLW.poiType -> TYPE_USECASE_ID_SLW.tts
                 TYPE_USECASE_ID_LTA.poiType -> TYPE_USECASE_ID_LTA.tts
-//                TYPE_USECASE_ID_HLW.poiType -> TYPE_USECASE_ID_HLW.tts //TODO
-                TYPE_USECASE_ID_IVS.poiType -> TYPE_USECASE_ID_IVS.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_COC.poiType -> TYPE_USECASE_ID_COC.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_PEDESTRIAN_SCHOOL.poiType -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.tts
-                TYPE_USECASE_ID_ROAD_COLLISION_WARNING.poiType -> TYPE_USECASE_ID_ROAD_COLLISION_WARNING.tts
-                TYPE_USECASE_ID_ROAD_ROUNDABOUTPNG.poiType -> TYPE_USECASE_ID_ROAD_ROUNDABOUTPNG.tts
-                TYPE_USECASE_ID_ROAD_TEST_SECTION.poiType -> TYPE_USECASE_ID_ROAD_TEST_SECTION.tts
-                TYPE_USECASE_ID_ROAD_HUMP_BRIDGE.poiType -> TYPE_USECASE_ID_ROAD_HUMP_BRIDGE.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
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
new file mode 100644
index 0000000000..736a5eff21
--- /dev/null
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumWeaknessTraffic.kt
@@ -0,0 +1,80 @@
+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( //TODO 图标需要换
+        2.toString(),
+        "弱势交通参与者碰撞预警",
+        poiTypeSrcVr = R.drawable.icon_warning_v2x_motorcycle_collision,
+        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/TrafficTypeEnum.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/TrafficTypeEnum.kt
index de509ab305..7a22d0063a 100644
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/TrafficTypeEnum.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/TrafficTypeEnum.kt
@@ -16,6 +16,20 @@ enum class TrafficTypeEnum(
     var traffic3DNightIconId: Int
 ) {
 
+    TYPE_TRAFFIC_ID_501(
+        501,
+        "未知数据",
+        R.raw.traffic_xiankuang,
+        R.raw.traffic_xiankuang,
+        R.raw.traffic_xiankuang
+    ),
+    TYPE_TRAFFIC_ID_502(
+        502,
+        "未知数据",
+        R.raw.traffic_xiankuang,
+        R.raw.traffic_xiankuang,
+        R.raw.traffic_xiankuang
+    ),
     TYPE_TRAFFIC_ID_WEI_ZHI(
         100,
         "未知数据",
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
index 6ce897b245..25dbb1dd41 100644
--- 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
@@ -231,14 +231,6 @@ enum class V2iEventTypeEnum(
         tts = ""
     ),
 
-    TYPE_USECASE_ID_HLW(
-        0x2B04.toString(),
-        "道路危险情况预警",
-        poiTypeSrcVr = R.drawable.icon_warning_v2x_road_dangerous,
-        content = "道路危险情况预警",
-        tts = "前方路况危险，小心行驶"
-    ),//（如果能给出具体的类别，则播报具体危险类别）
-
     TYPE_USECASE_ID_IVP(
         0x2.toString(),
         "闯红灯预警",
diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/smp/IMogoSmallMapProvider.java b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/smp/IMogoSmallMapProvider.java
index b8dfe560a9..9ff30c8670 100644
--- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/smp/IMogoSmallMapProvider.java
+++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/smp/IMogoSmallMapProvider.java
@@ -29,4 +29,6 @@ public interface IMogoSmallMapProvider {
      * 清除路径线
      */
     void clearPolyline();
+
+    default void clearV2XMarkers() {}
 }
diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/msgbox/IMsgBoxProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/msgbox/IMsgBoxProvider.kt
index b9178c0a1e..6444103924 100644
--- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/msgbox/IMsgBoxProvider.kt
+++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/msgbox/IMsgBoxProvider.kt
@@ -21,9 +21,7 @@ interface IMsgBoxProvider: IMoGoFunctionServerProvider {
      */
     fun getCachedRecordBagData(): List<MsgBoxBean>
 
-    fun removeRecordInfo(key: String, value: Any)
-
-    fun deleteBoxBean(context: Context, msgBoxBean: MsgBoxBean)
+    fun removeRecordInfo(context: Context, msgBoxBean: MsgBoxBean, key: String)
 
     fun getDismissTime(): Long
 }
\ No newline at end of file
diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerSmpManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerSmpManager.kt
index 0e98bde60e..13e5153fa9 100644
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerSmpManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerSmpManager.kt
@@ -47,4 +47,9 @@ object CallerSmpManager : CallerBase() {
     fun hidePanel() {
         mogoSmallMapProvider.hidePanel()
     }
+
+    @JvmStatic
+    fun clearV2XMarkers() {
+        mogoSmallMapProvider.clearV2XMarkers()
+    }
 }
\ No newline at end of file
diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerVisualAngleManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerVisualAngleManager.kt
index 82107fcf74..d6709a65ff 100644
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerVisualAngleManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerVisualAngleManager.kt
@@ -10,11 +10,8 @@ import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.LifecycleOwner
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.map.MapRoadInfo.StopLine
-import com.mogo.eagle.core.data.map.MogoLatLng
 import com.mogo.eagle.core.function.call.map.CallerMapRoadListenerManager.OnRoadListener
-import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager.Scene.CrossRoad
-import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager.Scene.Default
-import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager.Scene.LowSpeed
+import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager.Scene.*
 import com.mogo.eagle.core.utilcode.kotlin.lifeCycleOwner
 import com.mogo.eagle.core.utilcode.kotlin.safeCancel
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
@@ -35,8 +32,6 @@ object CallerVisualAngleManager {
 
     private const val TAG = "VisualAngle"
 
-    private const val MaxDisplayThreshold = 30_000 //最大展示阈值
-
     @Volatile
     private var hasCrossRoad = false
 
@@ -61,6 +56,7 @@ object CallerVisualAngleManager {
     private interface IAttach {
         val angle: VisualAngleMode
         val priority: Int
+        val displayThreshold: Long  //最大展示时长 > 0; 表示最长展示多长时间， -1 表示，一直展示，直到触发默认视角, 0: 默认视角专用值，
     }
 
     private val listener = object : OnRoadListener {
@@ -70,7 +66,7 @@ object CallerVisualAngleManager {
             if (oldRoadId != roadId) {
                 if (hasCrossRoad) {
                     hasCrossRoad = false
-                    changeVisualAngle(Default())
+                    changeVisualAngle(CrossRoad(false))
                 }
             }
             this.roadId = roadId
@@ -79,7 +75,7 @@ object CallerVisualAngleManager {
         override fun onStopLineInfo(info: StopLine) {
             if (!hasCrossRoad && info.distanceOfCarToStopLine <= 30.0) {
                 hasCrossRoad = true
-                changeVisualAngle(CrossRoad)
+                changeVisualAngle(CrossRoad(true))
             }
         }
     }
@@ -116,7 +112,10 @@ object CallerVisualAngleManager {
 
             override val angle: VisualAngleMode = VisualAngleMode.MODE_MEDIUM_SIGHT
 
-            override val priority: Int = 0
+            override val priority: Int = 1
+
+            override val displayThreshold: Long
+                get() = 0
 
             override fun toString(): String {
                 return "Default(delay=$delay, unit=$unit, angle=$angle, priority=$priority)"
@@ -126,11 +125,14 @@ object CallerVisualAngleManager {
         /**
          * 变道-接收到转向灯信息号
          */
-        object Turning: Scene() {
+        class Turning(var open: Boolean = false): Scene() {
 
             override val angle: VisualAngleMode = VisualAngleMode.MAP_STYLE_VR_ANGLE_TOP
 
-            override val priority: Int = 0
+            override val priority: Int = 3
+
+            override val displayThreshold: Long
+                get() = -1
         }
 
         /**
@@ -140,7 +142,10 @@ object CallerVisualAngleManager {
 
             override val angle: VisualAngleMode = VisualAngleMode.MAP_STYLE_VR_ANGLE_300
 
-            override val priority: Int = 0
+            override val priority: Int = 2
+
+            override val displayThreshold: Long
+                get() = SECONDS.toMillis(8)
         }
 
         /**
@@ -150,29 +155,21 @@ object CallerVisualAngleManager {
 
             override val angle: VisualAngleMode = VisualAngleMode.MODE_LONG_SIGHT
 
-            override val priority: Int = 0
+            override val priority: Int = 5
+
+            override val displayThreshold: Long
+                get() = SECONDS.toMillis(8)
         }
 
-        /**
-         * 车量低速行驶
-         */
-        class LowSpeed(val lat: Double, val lon: Double): Scene() {
-
-            override val angle: VisualAngleMode = VisualAngleMode.MODE_CLOSE_SIGHT
-
-            override val priority: Int = 0
-
-            override fun toString(): String {
-                return "LowSpeed(lat=$lat, lon=$lon, angle=$angle, priority=$priority)"
-            }
-        }
 
         /**
          * 十字路口
          */
-        object CrossRoad: Scene() {
+        class CrossRoad(var open: Boolean = false): Scene() {
             override val angle: VisualAngleMode = VisualAngleMode.MAP_STYLE_VR_ANGLE_CROSS
-            override val priority: Int = 0
+            override val priority: Int = 4
+            override val displayThreshold: Long
+                get() = -1
         }
     }
 
@@ -183,13 +180,8 @@ object CallerVisualAngleManager {
      * @param isDisplay: 是否正在展示
      * @param triggerTime: 触发时间
      */
-    private data class Record(val target: Scene, var isDisplay: Boolean = false, val triggerTime: Long): Comparable<Record> {
+    private data class Record(val target: Scene, var isDisplay: Boolean = false, var triggerTime: Long): Comparable<Record> {
         override fun compareTo(other: Record): Int {
-            //大根堆
-            if (triggerTime != other.triggerTime) {
-                //时间越晚，越靠近堆顶
-                return if (triggerTime > other.triggerTime) -1 else 1
-            }
             //如果时间一样，优先级越高，越靠近堆顶
             return other.target.priority - target.priority
         }
@@ -212,21 +204,50 @@ object CallerVisualAngleManager {
             if (displayed == null) {
                 CallerLogger.d("${M_DEVA}${TAG}", "触发场景:${scene} --- 2 ---")
                 val top = getTop() //堆顶
-                if (top != null && top.target.priority > scene.priority) {
-                    CallerLogger.d("${M_DEVA}${TAG}", "触发场景:${scene} --- 3 ---")
-                    doChangeAngle(top)
-                    heap += Record(scene, triggerTime = triggerTime)
+                if (top != null) {
+                    if (top.target.priority >= scene.priority) {
+                        CallerLogger.d("${M_DEVA}${TAG}", "触发场景:${scene} --- 3 ---")
+                        top.triggerTime = triggerTime
+                        doChangeAngle(top)
+                        synchronized(heap){
+                            heap += Record(scene, triggerTime = -1)
+                        }
+                    } else {
+                        CallerLogger.d("${M_DEVA}${TAG}", "触发场景:${scene} --- 4 ---")
+                        doChangeAngle(Record(scene, triggerTime = triggerTime))
+                    }
                 } else {
                     CallerLogger.d("${M_DEVA}${TAG}", "触发场景:${scene} --- 4 ---")
                     doChangeAngle(Record(scene, triggerTime = triggerTime))
                 }
             } else {
-
                 if (scene.javaClass == displayed.target.javaClass) {
                     CallerLogger.d("${M_DEVA}${TAG}", "触发场景:${scene} --- 5 ---")
                     defaultDelayJob?.safeCancel()
                     return@launch
                 }
+                val prev = displayed.target
+                val prevTriggerTime = displayed.triggerTime
+                if (scene is Turning) {
+                    val isOpen = scene.open
+                    if (!isOpen) {
+                        changeVisualAngle(Default())
+                        return@launch
+                    }
+                }
+                if (scene is CrossRoad) {
+                    val isOpen = scene.open
+                    if (!isOpen) {
+                        changeVisualAngle(Default())
+                        return@launch
+                    }
+                }
+                if (prev.priority >= scene.priority && (prev is RoadEvent || prev is TooClose)) {
+                    val displayDuration = triggerTime - prevTriggerTime
+                    if (displayDuration < prev.displayThreshold) {
+                        return@launch
+                    }
+                }
                 if (scene is Default) {
                     CallerLogger.d("${M_DEVA}${TAG}", "触发场景:${scene} --- 6 ---")
                     defaultDelayJob?.safeCancel()
@@ -248,12 +269,8 @@ object CallerVisualAngleManager {
                 } else {
                     CallerLogger.d("${M_DEVA}${TAG}", "触发场景:${scene} --- 10 ---")
                     defaultDelayJob?.safeCancel()
-                    val delta = triggerTime - displayed.triggerTime
-                    if (delta >= MaxDisplayThreshold) {
-                        CallerLogger.d("${M_DEVA}${TAG}", "触发场景:${scene} --- 11 ---")
+                    if (displayed.target.priority < scene.priority) {
                         doChangeAngle(Record(scene, triggerTime = triggerTime))
-                    } else {
-                        CallerLogger.d("${M_DEVA}${TAG}", "触发场景:${scene} --- 12 ---")
                     }
                 }
             }
@@ -262,6 +279,7 @@ object CallerVisualAngleManager {
 
     @OptIn(InternalCoroutinesApi::class)
     private fun doChangeAngle(record: Record) {
+        val angle = record.target.angle
         CallerMapUIServiceManager.getMapUIController()?.also {
             CallerLogger.d("${M_DEVA}${TAG}", "触发场景:${record.target} --- 13 ---")
             if (record.target !is Default) {
@@ -270,14 +288,8 @@ object CallerVisualAngleManager {
                     heap += record
                 }
             }
-            val target = record.target
-            if (target is LowSpeed) {
-                CallerLogger.d("${M_DEVA}${TAG}", "触发场景:${record.target} --- 14 ---")
-                it.changeMapVisualAngle(record.target.angle, MogoLatLng(target.lat, target.lon))
-            } else {
-                CallerLogger.d("${M_DEVA}${TAG}", "触发场景:${record.target} --- 15 ---")
-                it.changeMapVisualAngle(record.target.angle, null)
-            }
+            CallerLogger.d("${M_DEVA}${TAG}", "触发场景:${record.target} --- 15 ---> angle: $angle")
+            it.changeMapVisualAngle(angle, null)
         }
     }
 
diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/msgbox/CallerMsgBoxManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/msgbox/CallerMsgBoxManager.kt
index da9256e613..54232c8810 100644
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/msgbox/CallerMsgBoxManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/msgbox/CallerMsgBoxManager.kt
@@ -45,18 +45,11 @@ object CallerMsgBoxManager {
     }
 
     /**
-     * 用户已处理的Bag包需要删除
-     * key: Bag包的唯一标识key，value:任意非空的值
+     * 用户已处理的Bag包需要删除(上传或取消都包含)
+     * key: Bag包的唯一标识key, msgBoxBean: UI展示的那个对象而不是重新new的
      */
-    fun removeRecordInfo(key: String, value: Any) {
-        providerApi?.removeRecordInfo(key, value)
-    }
-
-    /**
-     * 删除消息盒子中存入数据库的数据，比如已经处理的录制bag信息
-     */
-    fun deleteBoxBean(context: Context, msgBoxBean: MsgBoxBean) {
-        providerApi?.deleteBoxBean(context, msgBoxBean)
+    fun removeRecordInfo(context: Context, msgBoxBean: MsgBoxBean, key: String) {
+        providerApi?.removeRecordInfo(context, msgBoxBean, key)
     }
 
     fun getDismissTime(): Long {
diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/scene/SceneConstant.kt b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/scene/SceneConstant.kt
index 491af13faf..74cf076347 100644
--- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/scene/SceneConstant.kt
+++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/scene/SceneConstant.kt
@@ -8,6 +8,9 @@ class SceneConstant {
         const val M_NETWORK = "M_NETWORK-"
         const val M_UTIL = "M_UTIL-"
 
+        //Main
+        const val M_MAIN = "M_MAIN-"
+
         //core业务module
         const val M_ADAS_IMPL = "M_ADAS_IMPL-"
         const val M_BINDING = "M_BINDING-"
diff --git a/gradle.properties b/gradle.properties
index 85588e184c..24621094e6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -63,7 +63,7 @@ BIZCONFIG_VERSION=1.3.2
 SERVICE_BIZ_VERSION=1.2.4
 ################  外部依赖引用 ################
 # loglib
-LOGLIB_VERSION=1.4.5
+LOGLIB_VERSION=1.5.7
 ######## MogoAiCloudSDK Version ########
 # 网络请求LOGLIB_VERSION
 MOGO_NETWORK_VERSION=1.4.3.26
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/utils/ObjectUtils.java b/libraries/mogo-map/src/main/java/com/mogo/map/utils/ObjectUtils.java
index 8b8c65d4a8..a681ad9254 100644
--- a/libraries/mogo-map/src/main/java/com/mogo/map/utils/ObjectUtils.java
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/utils/ObjectUtils.java
@@ -130,6 +130,7 @@ public class ObjectUtils {
             markerOptions.setRotateAngle((float) trafficData.getHeading());
             markerOptions.setLat(trafficData.getLatitude());
             markerOptions.setLon(trafficData.getLongitude());
+            markerOptions.setTime(Double.valueOf(trafficData.getSatelliteTime() * 1000).longValue());
             if(trafficData.getColor()!=null && !trafficData.getColor().isEmpty()){
                 markerOptions.setColor(trafficData.getColor());
             }else{
diff --git a/tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java b/tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java
index 68dac7476f..97e4475d5c 100644
--- a/tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java
+++ b/tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java
@@ -29,7 +29,6 @@ import com.mogo.eagle.core.utilcode.util.ThreadUtils;
 import com.mogo.eagle.core.utilcode.util.ToastUtils;
 import com.mogo.tts.base.IMogoTTS;
 import com.mogo.tts.base.IMogoTTSCallback;
-import com.mogo.tts.base.MogoTTSConstants;
 import com.mogo.tts.base.PreemptType;
 import com.zhidao.auto.platform.voice.VoiceClient;
 import com.zhidao.voicesdk.MogoVoiceManager;
@@ -118,6 +117,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
     private String[] mBackResBinArray = new String[]{TTS_BACK_RES_ZHILING, TTS_BACK_RES_GUODGM};
     // 单独的语音播放
     private boolean mHasAuth;
+    private int retryCount;
 
     private void initFlushStatus() {
         if (!mHasFlush) {
@@ -145,44 +145,51 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
 //                DUILiteSDK.openLog();//开启日志，需要在sdk init 之前调用
 //            }
 
-            DUILiteSDK.init(mContext, new DUILiteConfig.Builder()
-                    .setApiKey("113cc31f6385113cc31f6385618c86f5")
-                    .setProductId("278586132")
-                    .setProductKey("1fe5930844b488a8d32d9ef7717be7dc")
-                    .setProductSecret("f601ecc407986b548ac8ab2a9144162e")
-                    .setAuthConfig(onlineBuilder.create())//授权配置
-                    //                .setRecorderConfig(recorderConfig)//设置录音配置
-                    //                .setUploadConfig(uploadConfig)//设置日志上传配置
-                    //                .setTtsCacheDir("/sdcard/speech/cache") //设置tts cache文件存放目录
-                    .setEchoConfig(echoConfig)
-                    .create(), new DUILiteSDK.InitListener() {
-                @Override
-                public void success() {
-                    CallerLogger.INSTANCE.d(TAG, "授权成功");
-                    ThreadUtils.runOnUiThread(() -> {
-                        mHasAuth = true;
-                        initTtsEngine();
-                    });
-                }
-
-                @Override
-                public void error(String errorCode, final String errorInfo) {
-                    CallerLogger.INSTANCE.e(TAG, "error code : " + errorCode + " , error info :" + errorInfo);
-                    //                throw new IllegalStateException("授权失败,请检查授权配置");
-                }
-            });
-
-            boolean isAuthorized = DUILiteSDK.isAuthorized(mContext);//查询授权状态，DUILiteSDK.init之后随时可以调
-            CallerLogger.INSTANCE.d(TAG, "DUILite SDK is isAuthorized ？ " + isAuthorized);
-
-            String core_version = DUILiteSDK.getCoreVersion();//获取内核版本号
-            CallerLogger.INSTANCE.d(TAG, "core version is: " + core_version);
+            initDUILiteSDK(onlineBuilder, echoConfig);
         } catch (Exception e) {
             e.printStackTrace();
             ToastUtils.showShort("PadTTS 模块初始化异常");
         }
     }
 
+    private void initDUILiteSDK(AuthConfig.Builder onlineBuilder, EchoConfig echoConfig) {
+        DUILiteSDK.init(mContext, new DUILiteConfig.Builder()
+                .setApiKey("113cc31f6385113cc31f6385618c86f5")
+                .setProductId("278586132")
+                .setProductKey("1fe5930844b488a8d32d9ef7717be7dc")
+                .setProductSecret("f601ecc407986b548ac8ab2a9144162e")
+                .setAuthConfig(onlineBuilder.create())//授权配置
+                //                .setRecorderConfig(recorderConfig)//设置录音配置
+                //                .setUploadConfig(uploadConfig)//设置日志上传配置
+                //                .setTtsCacheDir("/sdcard/speech/cache") //设置tts cache文件存放目录
+                .setEchoConfig(echoConfig)
+                .create(), new DUILiteSDK.InitListener() {
+            @Override
+            public void success() {
+                CallerLogger.INSTANCE.d(TAG, "授权成功");
+                ThreadUtils.runOnUiThread(() -> {
+                    mHasAuth = true;
+                    initTtsEngine();
+                });
+            }
+
+            @Override
+            public void error(String errorCode, final String errorInfo) {
+                CallerLogger.INSTANCE.e(TAG, "error code : " + errorCode + " , error info :" + errorInfo);
+                if (retryCount++ < 3) {
+                    initDUILiteSDK(onlineBuilder, echoConfig);
+                }
+                //                throw new IllegalStateException("授权失败,请检查授权配置");
+            }
+        });
+
+//        boolean isAuthorized = DUILiteSDK.isAuthorized(mContext);//查询授权状态，DUILiteSDK.init之后随时可以调
+//        CallerLogger.INSTANCE.d(TAG, "DUILite SDK is isAuthorized ？ " + isAuthorized);
+//
+//        String core_version = DUILiteSDK.getCoreVersion();//获取内核版本号
+//        CallerLogger.INSTANCE.d(TAG, "core version is: " + core_version);
+    }
+
     private void initTtsEngine() {
         CallerLogger.INSTANCE.d(TAG, "initTtsEngine");
         if (mEngine != null) {
@@ -427,7 +434,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
 
     @MainThread
     public void speakTTSVoiceWithLevel(String text, int ttsLevel, IMogoTTSCallback callBack) {
-        if (mHasFlush && mEngine != null) {
+        if (mHasAuth && mEngine != null) {
             mSpeakVoiceMap.put(text, callBack);
         }
         speakTTSVoiceWithLevel(text, ttsLevel);