diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java
index 8ba9fb1404..bcb1422d46 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java
@@ -7,12 +7,10 @@ import android.graphics.BitmapFactory;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.TextView;
-
 import androidx.annotation.NonNull;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.Group;
 import androidx.annotation.Nullable;
-
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
 import com.mogo.commons.AbsMogoApplication;
@@ -25,8 +23,10 @@ import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant;
 import com.mogo.eagle.core.utilcode.util.ToastUtils;
-import com.mogo.map.marker.IMogoMarker;
-import com.mogo.map.marker.MogoMarkerOptions;
+import com.mogo.map.overlay.IMoGoOverlayManager;
+import com.mogo.map.overlay.core.Level;
+import com.mogo.map.overlay.point.Point;
+import com.mogo.map.uicontroller.IMogoMapUIController;
 import com.mogo.och.bus.R;
 import com.mogo.och.bus.bean.BusStationBean;
 import com.mogo.och.bus.constant.BusConst;
@@ -43,12 +43,9 @@ import com.mogo.och.common.module.utils.QRUtilsKt;
 import com.mogo.och.common.module.wigets.BindQRCodeDialog;
 import com.mogo.och.common.module.wigets.MarqueeTextView;
 import com.mogo.och.common.module.wigets.OCHCommitDialog;
-
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
-
 import java.util.List;
-import java.util.Objects;
 
 import me.jessyan.autosize.utils.AutoSizeUtils;
 
@@ -485,20 +482,29 @@ public class BusFragment extends BaseBusTabFragment<BusFragment, BusPresenter>
                 CallerLogger.INSTANCE.d(M_BUS + "setMapMaker= "+Thread.currentThread().getName(),
                         uuid + "=latitude=" + lat + ",longitude=" + longi);
 
-                MogoMarkerOptions options = new MogoMarkerOptions()
-                        .owner(BusConst.TYPE_MARKER_BUS_ORDER)
+                Point.Options.Builder builder = new Point.Options.Builder(BusConst.TYPE_MARKER_BUS_ORDER, Level.MAP_MARKER)
+                        .setId(uuid)
                         .anchor(0.5f, 0.5f)
                         .set3DMode(true)
-                        .gps(true)
+                        .isUseGps(true)
                         .controlAngle(true)
                         .icon3DRes(resourceId)
                         .latitude(lat)
                         .longitude(longi);
-                IMogoMarker marker = Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMarkerManager(AbsMogoApplication.getApp())).addMarker(uuid, options);
-                CenterLine centerLine = CallerMapUIServiceManager.INSTANCE.getMapUIController().getCenterLineInfo(
-                        longi,lat,-1);
-                if (null != centerLine && marker != null) { // 有可能鹰眼map为空没有角度。判空使用后可能造成maker角度跟道路角度不一致 地图未初始化会返回空
-                    marker.setRotateAngle(centerLine.getAngle().floatValue());
+                IMogoMapUIController mapUIController = CallerMapUIServiceManager.INSTANCE.getMapUIController();
+                if (mapUIController != null) {
+                    CenterLine centerLine = mapUIController.getCenterLineInfo(
+                            longi,lat,-1);
+                    if (null != centerLine) { // 有可能鹰眼map为空没有角度。判空使用后可能造成maker角度跟道路角度不一致 地图未初始化会返回空
+                        Double angle = centerLine.getAngle();
+                        if (angle != null) {
+                            builder.rotate(angle.floatValue());
+                        }
+                    }
+                }
+                IMoGoOverlayManager overlayManager = CallerMapUIServiceManager.INSTANCE.getOverlayManager();
+                if (overlayManager != null) {
+                    overlayManager.showOrUpdatePoint(builder.build());
                 }
             };
 
@@ -508,7 +514,10 @@ public class BusFragment extends BaseBusTabFragment<BusFragment, BusPresenter>
             Runnable removeMapMarkerRunnable = () -> {
                 CallerLogger.INSTANCE.d(M_BUS + "RemoveMapMaker="+Thread.currentThread().getName(),
                         uuid+"=latitude="+lat+",longitude="+longi);
-                Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMarkerManager(AbsMogoApplication.getApp())).removeMarkers(uuid);
+                IMoGoOverlayManager overlayManager = CallerMapUIServiceManager.INSTANCE.getOverlayManager();
+                if (overlayManager != null) {
+                    overlayManager.removePoint(uuid);
+                }
             };
             OCHThreadPoolManager.getsInstance().execute(removeMapMarkerRunnable);
         }
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java
index 274f62d862..48ab20daee 100644
--- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java
+++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java
@@ -27,7 +27,7 @@ import com.mogo.eagle.core.utilcode.util.ThreadUtils;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
 import com.mogo.map.listener.IMogoMapListener;
 import com.mogo.map.listener.MogoMapListenerHandler;
-import com.mogo.map.marker.IMogoMarkerManager;
+import com.mogo.map.overlay.IMoGoOverlayManager;
 import com.mogo.map.uicontroller.IMogoMapUIController;
 import com.mogo.map.uicontroller.VisualAngleMode;
 import com.mogo.och.common.module.map.AmapNaviToDestinationModel;
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.java
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java
index f03cec0009..a111111ffa 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java
@@ -17,7 +17,6 @@ import androidx.annotation.RequiresApi;
 import androidx.constraintlayout.widget.ConstraintLayout;
 
 import com.amap.api.navi.model.NaviLatLng;
-import com.mogo.commons.AbsMogoApplication;
 import com.mogo.eagle.core.data.map.CenterLine;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
@@ -26,8 +25,10 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.util.DateTimeUtils;
 import com.mogo.eagle.core.utilcode.util.ToastUtils;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
-import com.mogo.map.marker.IMogoMarker;
-import com.mogo.map.marker.MogoMarkerOptions;
+import com.mogo.map.overlay.IMoGoOverlayManager;
+import com.mogo.map.overlay.core.Level;
+import com.mogo.map.overlay.point.Point;
+import com.mogo.map.uicontroller.IMogoMapUIController;
 import com.mogo.och.common.module.map.AmapNaviToDestinationModel;
 import com.mogo.och.common.module.map.ICommonNaviChangedCallback;
 import com.mogo.och.common.module.utils.DateTimeUtil;
@@ -44,7 +45,6 @@ import com.mogo.och.taxi.model.TaxiModel;
 
 import java.util.Calendar;
 import java.util.List;
-import java.util.Objects;
 
 /**
  * @author congtaowang
@@ -752,20 +752,29 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment
                 CallerLogger.INSTANCE.d(M_TAXI + "setMapMaker= " + Thread.currentThread().getName(),
                         uuid + "=latitude=" + station.get(1) + ",longitude=" + station.get(0));
 
-                MogoMarkerOptions options = new MogoMarkerOptions()
-                        .owner(TaxiConst.TYPE_MARKER_TAXI_ORDER)
+                Point.Options.Builder builder = new Point.Options.Builder(TaxiConst.TYPE_MARKER_TAXI_ORDER, Level.MAP_MARKER)
+                        .setId(uuid)
                         .anchor(0.5f, 0.5f)
                         .set3DMode(true)
-                        .gps(true)
+                        .isUseGps(true)
                         .controlAngle(true)
                         .icon3DRes(resourceId)
                         .latitude(station.get(1))
                         .longitude(station.get(0));
-                IMogoMarker marker = Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMarkerManager(AbsMogoApplication.getApp())).addMarker(uuid, options);
-                CenterLine centerLine = CallerMapUIServiceManager.INSTANCE.getMapUIController().getCenterLineInfo(station.get(0)
-                        , station.get(1), -1);
-                if (null != centerLine && marker != null) {// 有可能鹰眼map为空没有角度。判空使用后可能造成maker角度跟道路角度不一致
-                    marker.setRotateAngle(centerLine.getAngle().floatValue());
+                IMogoMapUIController mapUIController = CallerMapUIServiceManager.INSTANCE.getMapUIController();
+                if (mapUIController != null) {
+                    CenterLine centerLine = mapUIController.getCenterLineInfo(station.get(0)
+                            , station.get(1), -1);
+                    if (null != centerLine) {// 有可能鹰眼map为空没有角度。判空使用后可能造成maker角度跟道路角度不一致
+                        Double angle = centerLine.getAngle();
+                        if (angle != null) {
+                            builder.rotate(angle.floatValue());
+                        }
+                    }
+                }
+                IMoGoOverlayManager overlayManager = CallerMapUIServiceManager.INSTANCE.getOverlayManager();
+                if (overlayManager != null) {
+                    overlayManager.showOrUpdatePoint(builder.build());
                 }
             };
             OCHThreadPoolManager.getsInstance().execute(setMapMarkerRunnable);
@@ -774,7 +783,11 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment
             Runnable removeMapMarkerRunnable = () -> {
                 CallerLogger.INSTANCE.d(M_TAXI + "RemoveMapMaker=" + Thread.currentThread().getName(),
                         uuid + "=latitude=" + station.get(1) + ",longitude=" + station.get(0));
-                Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMarkerManager(AbsMogoApplication.getApp())).removeMarkers(uuid);
+//                Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMarkerManager(AbsMogoApplication.getApp())).removeMarkers(uuid);
+                IMoGoOverlayManager overlayManager = CallerMapUIServiceManager.INSTANCE.getOverlayManager();
+                if (overlayManager != null) {
+                    overlayManager.removePoint(uuid);
+                }
             };
             OCHThreadPoolManager.getsInstance().execute(removeMapMarkerRunnable);
         }
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml
index 26b5abef3a..ca833243e2 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml
@@ -326,23 +326,23 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toRightOf="@id/module_och_taxi_badcase_ll"/>
 
-    <LinearLayout
-        android:id="@+id/module_och_taxi_ai_collect_ll"
-        android:layout_width="@dimen/module_mogo_och_operation_status_bg_width"
-        android:layout_height="@dimen/module_mogo_och_operation_status_bg_height"
-        android:layout_marginLeft="40dp"
-        android:layout_marginBottom="@dimen/module_mogo_och_margin_bottom"
-        android:elevation="@dimen/dp_10"
-        android:gravity="center"
-        android:background="@drawable/taxi_operation_status_bg_selector"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toRightOf="@id/module_och_taxi_badcase_ll">
-        <ImageView
-            android:layout_width="@dimen/dp_70"
-            android:layout_height="@dimen/dp_70"
-            android:layout_gravity="center"
-            android:background="@drawable/ai_collect_selector_och"/>
-    </LinearLayout>
+<!--    <LinearLayout-->
+<!--        android:id="@+id/module_och_taxi_ai_collect_ll"-->
+<!--        android:layout_width="@dimen/module_mogo_och_operation_status_bg_width"-->
+<!--        android:layout_height="@dimen/module_mogo_och_operation_status_bg_height"-->
+<!--        android:layout_marginLeft="40dp"-->
+<!--        android:layout_marginBottom="@dimen/module_mogo_och_margin_bottom"-->
+<!--        android:elevation="@dimen/dp_10"-->
+<!--        android:gravity="center"-->
+<!--        android:background="@drawable/taxi_operation_status_bg_selector"-->
+<!--        app:layout_constraintBottom_toBottomOf="parent"-->
+<!--        app:layout_constraintLeft_toRightOf="@id/module_och_taxi_badcase_ll">-->
+<!--        <ImageView-->
+<!--            android:layout_width="@dimen/dp_70"-->
+<!--            android:layout_height="@dimen/dp_70"-->
+<!--            android:layout_gravity="center"-->
+<!--            android:background="@drawable/ai_collect_selector_och"/>-->
+<!--    </LinearLayout>-->
 
     <Button
         android:id="@+id/btnAutopilotDisable"
diff --git a/app/src/androidTest/java/com/mogo/functions/test/ApkInstallerTest.kt b/app/src/androidTest/java/com/mogo/functions/test/ApkInstallerTest.kt
index d18278d650..36a17ae3d6 100644
--- a/app/src/androidTest/java/com/mogo/functions/test/ApkInstallerTest.kt
+++ b/app/src/androidTest/java/com/mogo/functions/test/ApkInstallerTest.kt
@@ -1,88 +1,88 @@
-package com.mogo.functions.test
-
-import android.util.*
-import androidx.test.core.app.*
-import androidx.test.ext.junit.runners.*
-import androidx.test.filters.*
-import androidx.test.platform.app.InstrumentationRegistry
-import com.mogo.eagle.core.function.hmi.ui.*
-import com.mogo.eagle.core.function.main.*
-import com.mogo.eagle.core.utilcode.util.*
-import kotlinx.coroutines.*
-import org.junit.*
-import org.junit.runner.*
-import java.util.concurrent.*
-import java.util.concurrent.TimeUnit.MILLISECONDS
-import kotlin.Result
-
-@RunWith(AndroidJUnit4::class)
-@LargeTest
-class ApkInstallerTest {
-
-
-    lateinit var launch: ActivityScenario<MainLauncherActivity>
-
-    @Before
-    fun before() {
-        launch = ActivityScenario.launch(MainLauncherActivity::class.java)
-    }
-
-    @Test
-    fun testInstall(): Unit = runBlocking {
-        Log.d("RWJ", "wait fragment show ...")
-        val f = ensureMoGoHmiFragmentShow()
-        Log.d("RWJ", "fragment showed, delay 10s ...")
-        delay(10000)
-
-        Log.d("RWJ", "10s end, start install ...")
-        val context = InstrumentationRegistry.getInstrumentation().context
-        ApkInstaller.installApp(f.requireContext(), context.assets.open("190000013.apk")) { code, msg ->
-            Log.d("RWJ", "code: $code, msg: $msg")
-        }
-        Log.d("RWJ", "开始延时10分钟....")
-        delay(TimeUnit.MINUTES.toMillis(10))
-        Log.d("RWJ", "延时10分钟结束....")
-    }
-
-
-    @Test
-    fun testInstall2(): Unit = runBlocking {
-        Log.d("RWJ", "wait fragment show ...")
-        val f = ensureMoGoHmiFragmentShow()
-        Log.d("RWJ", "fragment showed, delay 10s ...")
-        delay(10000)
-
-        Log.d("RWJ", "10s end, start install ...")
-        val context = InstrumentationRegistry.getInstrumentation().context
-        ApkInstaller.installApp(f.requireContext(), context.assets.open("HelloActivity.zip")) { code, msg ->
-            Log.d("RWJ", "code: $code, msg: $msg")
-        }
-        Log.d("RWJ", "开始延时10分钟....")
-        delay(TimeUnit.MINUTES.toMillis(10))
-        Log.d("RWJ", "延时10分钟结束....")
-    }
-
-    private suspend fun ensureMoGoHmiFragmentShow(): MoGoHmiFragment = suspendCancellableCoroutine {
-        launch.onActivity { itx ->
-            val executor = Executors.newSingleThreadScheduledExecutor()
-            executor.scheduleAtFixedRate({
-                var find =
-                    itx.supportFragmentManager.fragments.find { it is MoGoHmiFragment } as? MoGoHmiFragment
-                while (find == null) {
-                    find =
-                        itx.supportFragmentManager.fragments.find { it is MoGoHmiFragment } as? MoGoHmiFragment
-                }
-                while (!find.isResumed) {
-                    Thread.sleep(500)
-                }
-                it.resumeWith(Result.success(find))
-                try {
-                    Thread.sleep(500)
-                    executor.shutdownNow()
-                } catch (e: Throwable) {
-                    e.printStackTrace()
-                }
-            }, 50, 500, MILLISECONDS)
-        }
-    }
-}
\ No newline at end of file
+//package com.mogo.functions.test
+//
+//import android.util.*
+//import androidx.test.core.app.*
+//import androidx.test.ext.junit.runners.*
+//import androidx.test.filters.*
+//import androidx.test.platform.app.InstrumentationRegistry
+//import com.mogo.eagle.core.function.hmi.ui.*
+//import com.mogo.eagle.core.function.main.*
+//import com.mogo.eagle.core.utilcode.util.*
+//import kotlinx.coroutines.*
+//import org.junit.*
+//import org.junit.runner.*
+//import java.util.concurrent.*
+//import java.util.concurrent.TimeUnit.MILLISECONDS
+//import kotlin.Result
+//
+//@RunWith(AndroidJUnit4::class)
+//@LargeTest
+//class ApkInstallerTest {
+//
+//
+//    lateinit var launch: ActivityScenario<MainLauncherActivity>
+//
+//    @Before
+//    fun before() {
+//        launch = ActivityScenario.launch(MainLauncherActivity::class.java)
+//    }
+//
+//    @Test
+//    fun testInstall(): Unit = runBlocking {
+//        Log.d("RWJ", "wait fragment show ...")
+//        val f = ensureMoGoHmiFragmentShow()
+//        Log.d("RWJ", "fragment showed, delay 10s ...")
+//        delay(10000)
+//
+//        Log.d("RWJ", "10s end, start install ...")
+//        val context = InstrumentationRegistry.getInstrumentation().context
+//        ApkInstaller.installApp(f.requireContext(), context.assets.open("190000013.apk")) { code, msg ->
+//            Log.d("RWJ", "code: $code, msg: $msg")
+//        }
+//        Log.d("RWJ", "开始延时10分钟....")
+//        delay(TimeUnit.MINUTES.toMillis(10))
+//        Log.d("RWJ", "延时10分钟结束....")
+//    }
+//
+//
+//    @Test
+//    fun testInstall2(): Unit = runBlocking {
+//        Log.d("RWJ", "wait fragment show ...")
+//        val f = ensureMoGoHmiFragmentShow()
+//        Log.d("RWJ", "fragment showed, delay 10s ...")
+//        delay(10000)
+//
+//        Log.d("RWJ", "10s end, start install ...")
+//        val context = InstrumentationRegistry.getInstrumentation().context
+//        ApkInstaller.installApp(f.requireContext(), context.assets.open("HelloActivity.zip")) { code, msg ->
+//            Log.d("RWJ", "code: $code, msg: $msg")
+//        }
+//        Log.d("RWJ", "开始延时10分钟....")
+//        delay(TimeUnit.MINUTES.toMillis(10))
+//        Log.d("RWJ", "延时10分钟结束....")
+//    }
+//
+//    private suspend fun ensureMoGoHmiFragmentShow(): MoGoHmiFragment = suspendCancellableCoroutine {
+//        launch.onActivity { itx ->
+//            val executor = Executors.newSingleThreadScheduledExecutor()
+//            executor.scheduleAtFixedRate({
+//                var find =
+//                    itx.supportFragmentManager.fragments.find { it is MoGoHmiFragment } as? MoGoHmiFragment
+//                while (find == null) {
+//                    find =
+//                        itx.supportFragmentManager.fragments.find { it is MoGoHmiFragment } as? MoGoHmiFragment
+//                }
+//                while (!find.isResumed) {
+//                    Thread.sleep(500)
+//                }
+//                it.resumeWith(Result.success(find))
+//                try {
+//                    Thread.sleep(500)
+//                    executor.shutdownNow()
+//                } catch (e: Throwable) {
+//                    e.printStackTrace()
+//                }
+//            }, 50, 500, MILLISECONDS)
+//        }
+//    }
+//}
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/mogo/functions/test/AutoPilotBadCaseTest.kt b/app/src/androidTest/java/com/mogo/functions/test/AutoPilotBadCaseTest.kt
index afbe7425c2..f140f33ea0 100644
--- a/app/src/androidTest/java/com/mogo/functions/test/AutoPilotBadCaseTest.kt
+++ b/app/src/androidTest/java/com/mogo/functions/test/AutoPilotBadCaseTest.kt
@@ -1,148 +1,148 @@
-package com.mogo.functions.test
-
-import androidx.test.core.app.ActivityScenario
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.filters.LargeTest
-import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
-import com.mogo.eagle.core.function.hmi.ui.MoGoHmiProvider
-import com.mogo.eagle.core.function.main.MainLauncherActivity
-import kotlinx.coroutines.*
-import kotlinx.coroutines.flow.*
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import record_cache.RecordPanelOuterClass
-import java.text.SimpleDateFormat
-import java.util.*
-import java.util.concurrent.Executors
-import java.util.concurrent.TimeUnit
-import kotlin.random.Random
-
-@RunWith(AndroidJUnit4::class)
-@LargeTest
-class AutoPilotBadCaseTest {
-
-    private lateinit var launch: ActivityScenario<MainLauncherActivity>
-
-    @Before
-    fun launch() {
-        launch = ActivityScenario.launch(MainLauncherActivity::class.java)
-    }
-
-    @ExperimentalCoroutinesApi
-    @Test
-    fun showBadCaseEntrance1(): Unit = runBlocking(Dispatchers.Main) {
-        ensureMoGoHmiFragmentShow()
-        delay(TimeUnit.MILLISECONDS.toSeconds(30))
-        var index = 0
-        (1 until 50)
-            .map { it }
-            .asFlow()
-            .onEach {
-                delay(TimeUnit.SECONDS.toMillis(5))
-                val builder = RecordPanelOuterClass.RecordPanel.newBuilder()
-                builder.also {
-                    it.diskFree = (100 + index).toLong()
-                    it.duration = 60.0.toFloat()
-                    it.filename = "/user/general/record_$index.log"
-                    it.id = 10 + index
-                    it.key = index.toLong()
-                    it.stat = 100
-                    it.type = 1
-                    it.timestamp = SimpleDateFormat("yyyyMMddHHmmss").format(Date())
-                    index++
-                }
-              //  CallerDevaToolsManager.onReceiveBadCaseRecord(builder.build())
-            }
-            .flowOn(Dispatchers.Default)
-            .collect()
-        delay(TimeUnit.HOURS.toMillis(2))
-    }
-
-
-    @ExperimentalCoroutinesApi
-    @Test
-    fun showBadCaseEntrance2(): Unit = runBlocking(Dispatchers.Main) {
-        ensureMoGoHmiFragmentShow()
-        var index = 0
-        (1 until 50)
-            .map { it }
-            .asFlow()
-            .onEach {
-                if (index in 1..4) {
-                    delay(TimeUnit.SECONDS.toMillis(15))
-                } else {
-                    delay(Random(20).nextLong())
-                }
-                val builder = RecordPanelOuterClass.RecordPanel.newBuilder()
-                builder.also {
-                    it.diskFree = (100 + index).toLong()
-                    it.duration = 60.0.toFloat()
-                    it.filename = "/user/general/record_$index.log"
-                    it.id = 10 + index
-                    it.key = index.toLong()
-                    it.stat = 100
-                    it.type = 1
-                    it.timestamp = SimpleDateFormat("yyyyMMddHHmmss").format(Date())
-                    index++
-                }
-              //  CallerDevaToolsManager.onReceiveBadCaseRecord(builder.build())
-            }
-            .flowOn(Dispatchers.Default)
-            .collect()
-        delay(TimeUnit.HOURS.toMillis(2))
-    }
-
-    @ExperimentalCoroutinesApi
-    @Test
-    fun showBadCaseEntrance3(): Unit = runBlocking(Dispatchers.Main) {
-        var index = 0
-        (1 until 50)
-            .map { it }
-            .asFlow()
-            .onEach {
-                delay(TimeUnit.SECONDS.toMillis(20))
-                val builder = RecordPanelOuterClass.RecordPanel.newBuilder()
-                builder.also {
-                    it.diskFree = (100 + index).toLong()
-                    it.duration = 60.0.toFloat()
-                    it.filename = "/user/general/record_$index.log"
-                    it.id = 10 + index
-                    it.key = index.toLong()
-                    it.stat = 100
-                    it.type = 1
-                    it.timestamp = SimpleDateFormat("yyyyMMddHHmmss").format(Date())
-                    index++
-                }
-             //   CallerDevaToolsManager.onReceiveBadCaseRecord(builder.build())
-            }
-            .flowOn(Dispatchers.Default)
-            .collect()
-        delay(TimeUnit.HOURS.toMillis(2))
-    }
-
-    private suspend fun ensureMoGoHmiFragmentShow(): MoGoHmiProvider = suspendCancellableCoroutine {
-        launch.onActivity { itx ->
-            val executor = Executors.newSingleThreadScheduledExecutor()
-            executor.scheduleAtFixedRate({
-                var find =
-                    itx.supportFragmentManager.fragments.find { it is MoGoHmiProvider } as? MoGoHmiProvider
-                while (find == null) {
-                    find =
-                        itx.supportFragmentManager.fragments.find { it is MoGoHmiProvider } as? MoGoHmiProvider
-
-                }
-                while (!find.isResumed) {
-                    Thread.sleep(500)
-                }
-                it.resumeWith(Result.success(find))
-                try {
-                    Thread.sleep(500)
-                    executor.shutdownNow()
-                } catch (e: Throwable) {
-                    e.printStackTrace()
-                }
-            }, 50, 500, TimeUnit.MILLISECONDS)
-        }
-    }
-}
\ No newline at end of file
+//package com.mogo.functions.test
+//
+//import androidx.test.core.app.ActivityScenario
+//import androidx.test.ext.junit.runners.AndroidJUnit4
+//import androidx.test.filters.LargeTest
+//import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
+//import com.mogo.eagle.core.function.hmi.ui.MoGoHmiProvider
+//import com.mogo.eagle.core.function.main.MainLauncherActivity
+//import kotlinx.coroutines.*
+//import kotlinx.coroutines.flow.*
+//import org.junit.Before
+//import org.junit.Test
+//import org.junit.runner.RunWith
+//import record_cache.RecordPanelOuterClass
+//import java.text.SimpleDateFormat
+//import java.util.*
+//import java.util.concurrent.Executors
+//import java.util.concurrent.TimeUnit
+//import kotlin.random.Random
+//
+//@RunWith(AndroidJUnit4::class)
+//@LargeTest
+//class AutoPilotBadCaseTest {
+//
+//    private lateinit var launch: ActivityScenario<MainLauncherActivity>
+//
+//    @Before
+//    fun launch() {
+//        launch = ActivityScenario.launch(MainLauncherActivity::class.java)
+//    }
+//
+//    @ExperimentalCoroutinesApi
+//    @Test
+//    fun showBadCaseEntrance1(): Unit = runBlocking(Dispatchers.Main) {
+//        ensureMoGoHmiFragmentShow()
+//        delay(TimeUnit.MILLISECONDS.toSeconds(30))
+//        var index = 0
+//        (1 until 50)
+//            .map { it }
+//            .asFlow()
+//            .onEach {
+//                delay(TimeUnit.SECONDS.toMillis(5))
+//                val builder = RecordPanelOuterClass.RecordPanel.newBuilder()
+//                builder.also {
+//                    it.diskFree = (100 + index).toLong()
+//                    it.duration = 60.0.toFloat()
+//                    it.filename = "/user/general/record_$index.log"
+//                    it.id = 10 + index
+//                    it.key = index.toLong()
+//                    it.stat = 100
+//                    it.type = 1
+//                    it.timestamp = SimpleDateFormat("yyyyMMddHHmmss").format(Date())
+//                    index++
+//                }
+//              //  CallerDevaToolsManager.onReceiveBadCaseRecord(builder.build())
+//            }
+//            .flowOn(Dispatchers.Default)
+//            .collect()
+//        delay(TimeUnit.HOURS.toMillis(2))
+//    }
+//
+//
+//    @ExperimentalCoroutinesApi
+//    @Test
+//    fun showBadCaseEntrance2(): Unit = runBlocking(Dispatchers.Main) {
+//        ensureMoGoHmiFragmentShow()
+//        var index = 0
+//        (1 until 50)
+//            .map { it }
+//            .asFlow()
+//            .onEach {
+//                if (index in 1..4) {
+//                    delay(TimeUnit.SECONDS.toMillis(15))
+//                } else {
+//                    delay(Random(20).nextLong())
+//                }
+//                val builder = RecordPanelOuterClass.RecordPanel.newBuilder()
+//                builder.also {
+//                    it.diskFree = (100 + index).toLong()
+//                    it.duration = 60.0.toFloat()
+//                    it.filename = "/user/general/record_$index.log"
+//                    it.id = 10 + index
+//                    it.key = index.toLong()
+//                    it.stat = 100
+//                    it.type = 1
+//                    it.timestamp = SimpleDateFormat("yyyyMMddHHmmss").format(Date())
+//                    index++
+//                }
+//              //  CallerDevaToolsManager.onReceiveBadCaseRecord(builder.build())
+//            }
+//            .flowOn(Dispatchers.Default)
+//            .collect()
+//        delay(TimeUnit.HOURS.toMillis(2))
+//    }
+//
+//    @ExperimentalCoroutinesApi
+//    @Test
+//    fun showBadCaseEntrance3(): Unit = runBlocking(Dispatchers.Main) {
+//        var index = 0
+//        (1 until 50)
+//            .map { it }
+//            .asFlow()
+//            .onEach {
+//                delay(TimeUnit.SECONDS.toMillis(20))
+//                val builder = RecordPanelOuterClass.RecordPanel.newBuilder()
+//                builder.also {
+//                    it.diskFree = (100 + index).toLong()
+//                    it.duration = 60.0.toFloat()
+//                    it.filename = "/user/general/record_$index.log"
+//                    it.id = 10 + index
+//                    it.key = index.toLong()
+//                    it.stat = 100
+//                    it.type = 1
+//                    it.timestamp = SimpleDateFormat("yyyyMMddHHmmss").format(Date())
+//                    index++
+//                }
+//             //   CallerDevaToolsManager.onReceiveBadCaseRecord(builder.build())
+//            }
+//            .flowOn(Dispatchers.Default)
+//            .collect()
+//        delay(TimeUnit.HOURS.toMillis(2))
+//    }
+//
+//    private suspend fun ensureMoGoHmiFragmentShow(): MoGoHmiProvider = suspendCancellableCoroutine {
+//        launch.onActivity { itx ->
+//            val executor = Executors.newSingleThreadScheduledExecutor()
+//            executor.scheduleAtFixedRate({
+//                var find =
+//                    itx.supportFragmentManager.fragments.find { it is MoGoHmiProvider } as? MoGoHmiProvider
+//                while (find == null) {
+//                    find =
+//                        itx.supportFragmentManager.fragments.find { it is MoGoHmiProvider } as? MoGoHmiProvider
+//
+//                }
+//                while (!find.isResumed) {
+//                    Thread.sleep(500)
+//                }
+//                it.resumeWith(Result.success(find))
+//                try {
+//                    Thread.sleep(500)
+//                    executor.shutdownNow()
+//                } catch (e: Throwable) {
+//                    e.printStackTrace()
+//                }
+//            }, 50, 500, TimeUnit.MILLISECONDS)
+//        }
+//    }
+//}
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/mogo/functions/test/KotlinCoroutineSchedulersTest.kt b/app/src/androidTest/java/com/mogo/functions/test/KotlinCoroutineSchedulersTest.kt
index 4b0ae4bb87..bc36f1c017 100644
--- a/app/src/androidTest/java/com/mogo/functions/test/KotlinCoroutineSchedulersTest.kt
+++ b/app/src/androidTest/java/com/mogo/functions/test/KotlinCoroutineSchedulersTest.kt
@@ -1,57 +1,57 @@
-package com.mogo.functions.test
-
-import androidx.lifecycle.coroutineScope
-import androidx.test.core.app.ActivityScenario
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.filters.LargeTest
-import com.mogo.eagle.core.function.main.MainLauncherActivity
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.withContext
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import java.util.concurrent.TimeUnit
-
-@RunWith(AndroidJUnit4::class)
-@LargeTest
-class KotlinCoroutineSchedulersTest {
-
-    lateinit var launch: ActivityScenario<MainLauncherActivity>
-
-    @Before
-    fun before() {
-        launch = ActivityScenario.launch(MainLauncherActivity::class.java)
-    }
-
-    @Test
-    fun testKotlinCoroutineSchedulersIo() = runBlocking {
-        launch.onActivity {
-            it.lifecycle.coroutineScope.launchWhenCreated {
-                repeat(10) {
-                    withContext(Dispatchers.IO) {
-                        assert(Thread.currentThread().name.startsWith("io-pool-"))
-                    }
-                    delay(TimeUnit.SECONDS.toMillis(1))
-                }
-            }
-        }
-        delay(TimeUnit.SECONDS.toMillis(20))
-    }
-
-    @Test
-    fun testKotlinCoroutineSchedulersCpu() = runBlocking {
-        launch.onActivity {
-            it.lifecycle.coroutineScope.launchWhenCreated {
-                repeat(10) {
-                    withContext(Dispatchers.Default) {
-                        assert(Thread.currentThread().name.startsWith("cpu-pool-"))
-                    }
-                    delay(TimeUnit.SECONDS.toMillis(1))
-                }
-            }
-        }
-        delay(TimeUnit.SECONDS.toMillis(20))
-    }
-}
\ No newline at end of file
+//package com.mogo.functions.test
+//
+//import androidx.lifecycle.coroutineScope
+//import androidx.test.core.app.ActivityScenario
+//import androidx.test.ext.junit.runners.AndroidJUnit4
+//import androidx.test.filters.LargeTest
+//import com.mogo.eagle.core.function.main.MainLauncherActivity
+//import kotlinx.coroutines.Dispatchers
+//import kotlinx.coroutines.delay
+//import kotlinx.coroutines.runBlocking
+//import kotlinx.coroutines.withContext
+//import org.junit.Before
+//import org.junit.Test
+//import org.junit.runner.RunWith
+//import java.util.concurrent.TimeUnit
+//
+//@RunWith(AndroidJUnit4::class)
+//@LargeTest
+//class KotlinCoroutineSchedulersTest {
+//
+//    lateinit var launch: ActivityScenario<MainLauncherActivity>
+//
+//    @Before
+//    fun before() {
+//        launch = ActivityScenario.launch(MainLauncherActivity::class.java)
+//    }
+//
+//    @Test
+//    fun testKotlinCoroutineSchedulersIo() = runBlocking {
+//        launch.onActivity {
+//            it.lifecycle.coroutineScope.launchWhenCreated {
+//                repeat(10) {
+//                    withContext(Dispatchers.IO) {
+//                        assert(Thread.currentThread().name.startsWith("io-pool-"))
+//                    }
+//                    delay(TimeUnit.SECONDS.toMillis(1))
+//                }
+//            }
+//        }
+//        delay(TimeUnit.SECONDS.toMillis(20))
+//    }
+//
+//    @Test
+//    fun testKotlinCoroutineSchedulersCpu() = runBlocking {
+//        launch.onActivity {
+//            it.lifecycle.coroutineScope.launchWhenCreated {
+//                repeat(10) {
+//                    withContext(Dispatchers.Default) {
+//                        assert(Thread.currentThread().name.startsWith("cpu-pool-"))
+//                    }
+//                    delay(TimeUnit.SECONDS.toMillis(1))
+//                }
+//            }
+//        }
+//        delay(TimeUnit.SECONDS.toMillis(20))
+//    }
+//}
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/mogo/functions/test/MapDataCollectTest.kt b/app/src/androidTest/java/com/mogo/functions/test/MapDataCollectTest.kt
index 2785e65a1b..0fb5e74de3 100644
--- a/app/src/androidTest/java/com/mogo/functions/test/MapDataCollectTest.kt
+++ b/app/src/androidTest/java/com/mogo/functions/test/MapDataCollectTest.kt
@@ -1,62 +1,62 @@
-package com.mogo.functions.test
-
-import androidx.annotation.VisibleForTesting
-import androidx.test.core.app.ActivityScenario
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.filters.LargeTest
-import com.mogo.eagle.core.function.call.map.CallerMapDataCollectorManager
-import com.mogo.eagle.core.function.hmi.ui.MoGoHmiProvider
-import com.mogo.eagle.core.function.main.MainLauncherActivity
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.suspendCancellableCoroutine
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import java.util.concurrent.Executors
-import java.util.concurrent.TimeUnit
-import java.util.concurrent.TimeUnit.MILLISECONDS
-
-@RunWith(AndroidJUnit4::class)
-@LargeTest
-class MapDataCollectTest {
-
-    lateinit var launch: ActivityScenario<MainLauncherActivity>
-
-    @Before
-    fun before() {
-        launch = ActivityScenario.launch(MainLauncherActivity::class.java)
-    }
-
-    @Test
-    fun testTaskSent() = runBlocking {
-        ensureMoGoHmiFragmentShow()
-        delay(TimeUnit.SECONDS.toMillis(3))
-        CallerMapDataCollectorManager.setIsInit()
-        delay(TimeUnit.HOURS.toMillis(1))
-    }
-    private suspend fun ensureMoGoHmiFragmentShow(): MoGoHmiProvider = suspendCancellableCoroutine {
-        launch.onActivity { itx ->
-            val executor = Executors.newSingleThreadScheduledExecutor()
-            executor.scheduleAtFixedRate({
-                var find =
-                    itx.supportFragmentManager.fragments.find { it is MoGoHmiProvider } as? MoGoHmiProvider
-                while (find == null) {
-                    find =
-                        itx.supportFragmentManager.fragments.find { it is MoGoHmiProvider } as? MoGoHmiProvider
-
-                }
-                while (!find.isResumed) {
-                    Thread.sleep(500)
-                }
-                it.resumeWith(Result.success(find))
-                try {
-                    Thread.sleep(500)
-                    executor.shutdownNow()
-                } catch (e: Throwable) {
-                    e.printStackTrace()
-                }
-            }, 50, 500, MILLISECONDS)
-        }
-    }
-}
\ No newline at end of file
+//package com.mogo.functions.test
+//
+//import androidx.annotation.VisibleForTesting
+//import androidx.test.core.app.ActivityScenario
+//import androidx.test.ext.junit.runners.AndroidJUnit4
+//import androidx.test.filters.LargeTest
+//import com.mogo.eagle.core.function.call.map.CallerMapDataCollectorManager
+//import com.mogo.eagle.core.function.hmi.ui.MoGoHmiProvider
+//import com.mogo.eagle.core.function.main.MainLauncherActivity
+//import kotlinx.coroutines.delay
+//import kotlinx.coroutines.runBlocking
+//import kotlinx.coroutines.suspendCancellableCoroutine
+//import org.junit.Before
+//import org.junit.Test
+//import org.junit.runner.RunWith
+//import java.util.concurrent.Executors
+//import java.util.concurrent.TimeUnit
+//import java.util.concurrent.TimeUnit.MILLISECONDS
+//
+//@RunWith(AndroidJUnit4::class)
+//@LargeTest
+//class MapDataCollectTest {
+//
+//    lateinit var launch: ActivityScenario<MainLauncherActivity>
+//
+//    @Before
+//    fun before() {
+//        launch = ActivityScenario.launch(MainLauncherActivity::class.java)
+//    }
+//
+//    @Test
+//    fun testTaskSent() = runBlocking {
+//        ensureMoGoHmiFragmentShow()
+//        delay(TimeUnit.SECONDS.toMillis(3))
+//        CallerMapDataCollectorManager.setIsInit()
+//        delay(TimeUnit.HOURS.toMillis(1))
+//    }
+//    private suspend fun ensureMoGoHmiFragmentShow(): MoGoHmiProvider = suspendCancellableCoroutine {
+//        launch.onActivity { itx ->
+//            val executor = Executors.newSingleThreadScheduledExecutor()
+//            executor.scheduleAtFixedRate({
+//                var find =
+//                    itx.supportFragmentManager.fragments.find { it is MoGoHmiProvider } as? MoGoHmiProvider
+//                while (find == null) {
+//                    find =
+//                        itx.supportFragmentManager.fragments.find { it is MoGoHmiProvider } as? MoGoHmiProvider
+//
+//                }
+//                while (!find.isResumed) {
+//                    Thread.sleep(500)
+//                }
+//                it.resumeWith(Result.success(find))
+//                try {
+//                    Thread.sleep(500)
+//                    executor.shutdownNow()
+//                } catch (e: Throwable) {
+//                    e.printStackTrace()
+//                }
+//            }, 50, 500, MILLISECONDS)
+//        }
+//    }
+//}
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/mogo/functions/test/PatchUtilsTest.kt b/app/src/androidTest/java/com/mogo/functions/test/PatchUtilsTest.kt
index c575038ce1..35e181a6eb 100644
--- a/app/src/androidTest/java/com/mogo/functions/test/PatchUtilsTest.kt
+++ b/app/src/androidTest/java/com/mogo/functions/test/PatchUtilsTest.kt
@@ -1,89 +1,89 @@
-package com.mogo.functions.test
-
-import androidx.test.core.app.*
-import androidx.test.ext.junit.runners.*
-import androidx.test.filters.*
-import com.mogo.eagle.core.function.hmi.ui.*
-import com.mogo.eagle.core.function.main.*
-import com.mogo.launcher.patch.*
-import com.mogo.launcher.patch.utils.*
-import kotlinx.coroutines.*
-import org.junit.*
-import org.junit.runner.*
-import java.io.*
-import java.util.concurrent.*
-import java.util.concurrent.TimeUnit.MILLISECONDS
-import kotlin.Result
-
-@RunWith(AndroidJUnit4::class)
-@LargeTest
-class PatchUtilsTest {
-
-
-    lateinit var launch: ActivityScenario<MainLauncherActivity>
-
-    @Before
-    fun before() {
-        launch = ActivityScenario.launch(MainLauncherActivity::class.java)
-    }
-
-
-    @Test
-    fun testGeneratePatchAndMergeThenInstall() = runBlocking {
-        val f = ensureMoGoHmiFragmentShow()
-        withContext(Dispatchers.Default) {
-
-
-            val context = f.context ?: return@withContext
-            val oldApkPath = context.let {
-                it.packageManager.getPackageInfo(it.packageName, 0)?.applicationInfo?.sourceDir
-            } ?: return@withContext
-
-            val oldApk = File(oldApkPath)
-            if (!oldApk.exists()) {
-                throw AssertionError("old apk file is not exist.")
-            }
-            val oldApkTemp = File(context.getExternalFilesDir(null), "patches/old.apk")
-            if (oldApkTemp.exists()) {
-                oldApkTemp.delete()
-            }
-            oldApkTemp.parentFile?.takeIf { !it.exists() }?.also { it.mkdirs() }
-
-            oldApk.copyTo(oldApkTemp)
-            val patch = File(context.getExternalFilesDir(null), "patches/patch.zip")
-            if (!patch.exists()) {
-                throw AssertionError("patch file is not exist.")
-            }
-            val newApk = File(context.getExternalFilesDir(null), "patches/new.apk")
-//            PatchUtils.applyPatch(context, File(oldApkPath), patch, newApk)
-//            PatchUtils.install(context, newApk)
-        }
-        delay(TimeUnit.MINUTES.toMillis(1))
-    }
-
-
-    private suspend fun ensureMoGoHmiFragmentShow(): MoGoHmiFragment = suspendCancellableCoroutine {
-        launch.onActivity { itx ->
-            val executor = Executors.newSingleThreadScheduledExecutor()
-            executor.scheduleAtFixedRate({
-                var find =
-                    itx.supportFragmentManager.fragments.find { it is MoGoHmiFragment } as? MoGoHmiFragment
-                while (find == null) {
-                    find =
-                        itx.supportFragmentManager.fragments.find { it is MoGoHmiFragment } as? MoGoHmiFragment
-                }
-                while (!find.isResumed) {
-                    Thread.sleep(500)
-                }
-                it.resumeWith(Result.success(find))
-                try {
-                    Thread.sleep(500)
-                    executor.shutdownNow()
-                } catch (e: Throwable) {
-                    e.printStackTrace()
-                }
-            }, 50, 500, MILLISECONDS)
-        }
-    }
-
-}
\ No newline at end of file
+//package com.mogo.functions.test
+//
+//import androidx.test.core.app.*
+//import androidx.test.ext.junit.runners.*
+//import androidx.test.filters.*
+//import com.mogo.eagle.core.function.hmi.ui.*
+//import com.mogo.eagle.core.function.main.*
+//import com.mogo.launcher.patch.*
+//import com.mogo.launcher.patch.utils.*
+//import kotlinx.coroutines.*
+//import org.junit.*
+//import org.junit.runner.*
+//import java.io.*
+//import java.util.concurrent.*
+//import java.util.concurrent.TimeUnit.MILLISECONDS
+//import kotlin.Result
+//
+//@RunWith(AndroidJUnit4::class)
+//@LargeTest
+//class PatchUtilsTest {
+//
+//
+//    lateinit var launch: ActivityScenario<MainLauncherActivity>
+//
+//    @Before
+//    fun before() {
+//        launch = ActivityScenario.launch(MainLauncherActivity::class.java)
+//    }
+//
+//
+//    @Test
+//    fun testGeneratePatchAndMergeThenInstall() = runBlocking {
+//        val f = ensureMoGoHmiFragmentShow()
+//        withContext(Dispatchers.Default) {
+//
+//
+//            val context = f.context ?: return@withContext
+//            val oldApkPath = context.let {
+//                it.packageManager.getPackageInfo(it.packageName, 0)?.applicationInfo?.sourceDir
+//            } ?: return@withContext
+//
+//            val oldApk = File(oldApkPath)
+//            if (!oldApk.exists()) {
+//                throw AssertionError("old apk file is not exist.")
+//            }
+//            val oldApkTemp = File(context.getExternalFilesDir(null), "patches/old.apk")
+//            if (oldApkTemp.exists()) {
+//                oldApkTemp.delete()
+//            }
+//            oldApkTemp.parentFile?.takeIf { !it.exists() }?.also { it.mkdirs() }
+//
+//            oldApk.copyTo(oldApkTemp)
+//            val patch = File(context.getExternalFilesDir(null), "patches/patch.zip")
+//            if (!patch.exists()) {
+//                throw AssertionError("patch file is not exist.")
+//            }
+//            val newApk = File(context.getExternalFilesDir(null), "patches/new.apk")
+////            PatchUtils.applyPatch(context, File(oldApkPath), patch, newApk)
+////            PatchUtils.install(context, newApk)
+//        }
+//        delay(TimeUnit.MINUTES.toMillis(1))
+//    }
+//
+//
+//    private suspend fun ensureMoGoHmiFragmentShow(): MoGoHmiFragment = suspendCancellableCoroutine {
+//        launch.onActivity { itx ->
+//            val executor = Executors.newSingleThreadScheduledExecutor()
+//            executor.scheduleAtFixedRate({
+//                var find =
+//                    itx.supportFragmentManager.fragments.find { it is MoGoHmiFragment } as? MoGoHmiFragment
+//                while (find == null) {
+//                    find =
+//                        itx.supportFragmentManager.fragments.find { it is MoGoHmiFragment } as? MoGoHmiFragment
+//                }
+//                while (!find.isResumed) {
+//                    Thread.sleep(500)
+//                }
+//                it.resumeWith(Result.success(find))
+//                try {
+//                    Thread.sleep(500)
+//                    executor.shutdownNow()
+//                } catch (e: Throwable) {
+//                    e.printStackTrace()
+//                }
+//            }, 50, 500, MILLISECONDS)
+//        }
+//    }
+//
+//}
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/mogo/functions/test/ReminderTest.kt b/app/src/androidTest/java/com/mogo/functions/test/ReminderTest.kt
index 18a42b281b..0d9476c90f 100644
--- a/app/src/androidTest/java/com/mogo/functions/test/ReminderTest.kt
+++ b/app/src/androidTest/java/com/mogo/functions/test/ReminderTest.kt
@@ -1,426 +1,426 @@
-package com.mogo.functions.test
-
-import android.animation.Animator
-import android.app.Activity
-import android.content.Context
-import android.content.Intent
-import android.graphics.Color
-import android.view.Gravity
-import android.view.View
-import android.view.ViewGroup
-import android.view.WindowManager
-import android.view.animation.OvershootInterpolator
-import android.widget.PopupWindow
-import androidx.core.view.ViewCompat
-import androidx.lifecycle.lifecycleScope
-import androidx.test.core.app.ActivityScenario
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.filters.LargeTest
-import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener
-import com.mogo.eagle.core.function.hmi.notification.WarningFloat
-import com.mogo.eagle.core.function.hmi.notification.anim.DefaultAnimator
-import com.mogo.eagle.core.data.enums.SidePattern
-import com.mogo.eagle.core.function.hmi.ui.*
-import com.mogo.eagle.core.function.main.MainLauncherActivity
-import com.mogo.eagle.core.utilcode.kotlin.shape
-import com.mogo.eagle.core.utilcode.reminder.Reminder
-import com.mogo.eagle.core.utilcode.reminder.api.impl.ActivityReminder
-import com.mogo.eagle.core.utilcode.reminder.api.impl.PopupWindowReminder
-import com.mogo.eagle.core.utilcode.reminder.api.impl.ViewReminder
-import com.mogo.eagle.core.utilcode.util.AppStateManager
-import kotlinx.coroutines.*
-import kotlinx.coroutines.flow.*
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import java.lang.Integer.min
-import java.util.concurrent.*
-import java.util.concurrent.TimeUnit.MILLISECONDS
-
-
-@RunWith(AndroidJUnit4::class)
-@LargeTest
-class ReminderTest {
-
-    lateinit var launch: ActivityScenario<MainLauncherActivity>
-
-    @Before
-    fun before() {
-        launch = ActivityScenario.launch(MainLauncherActivity::class.java)
-    }
-
-    @Test
-    fun testViewReminderNotOverride() = runBlocking(Dispatchers.Main) {
-        launch.onActivity {
-            it.lifecycleScope.launchWhenResumed {
-                for (i in 1..10) {
-                    val reminder = WindowManagerViewUnOverrideReminder(View(it).also { itx -> itx.background = shape(solid = color(i)) }, 300, 300)
-                    Reminder.enqueue(it, reminder)
-                    delay(TimeUnit.SECONDS.toMillis(3))
-                    reminder.hide()
-                }
-            }
-        }
-        delay(TimeUnit.SECONDS.toMillis(100))
-        return@runBlocking
-    }
-
-    @Test
-    fun testShowWarningV2x() = runBlocking {
-        val f = ensureMoGoHmiFragmentShow()
-
-        delay(5000)
-        (1 until 20).map {
-            it
-        }.asFlow()
-            .onEach {
-                f.showWarningV2X("10006", "test", "测试$it", "$it", null, true, 5000)
-            }
-            .flowOn(Dispatchers.Default)
-            .collect()
-        delay(3000000)
-    }
-
-    private suspend fun ensureMoGoHmiFragmentShow(): MoGoHmiProvider = suspendCancellableCoroutine {
-        launch.onActivity { itx ->
-            val executor = Executors.newSingleThreadScheduledExecutor()
-            executor.scheduleAtFixedRate({
-                var find =
-                    itx.supportFragmentManager.fragments.find { it is MoGoHmiProvider } as? MoGoHmiProvider
-                while (find == null) {
-                    find =
-                        itx.supportFragmentManager.fragments.find { it is MoGoHmiProvider } as? MoGoHmiProvider
-                }
-                while (!find.isResumed) {
-                    Thread.sleep(500)
-                }
-                it.resumeWith(Result.success(find))
-                try {
-                    Thread.sleep(500)
-                    executor.shutdownNow()
-                } catch (e: Throwable) {
-                    e.printStackTrace()
-                }
-            }, 50, 500, MILLISECONDS)
-        }
-    }
-
-    @Test
-    fun testViewReminderOverride() = runBlocking(Dispatchers.Main) {
-        launch.onActivity {
-            it.lifecycleScope.launchWhenCreated {
-                for (i in 1..10) {
-                    val reminder = WindowManagerViewOverrideReminder(View(it).also { itx -> itx.background = shape(solid = color(i)) }, 300, 300)
-                    Reminder.enqueue(it, reminder)
-                    delay(TimeUnit.SECONDS.toMillis(3))
-                }
-            }
-        }
-        delay(TimeUnit.SECONDS.toMillis(100))
-        return@runBlocking
-    }
-
-    @Test
-    fun testViewReminderWhenActivityDestroyed() = runBlocking(Dispatchers.Main) {
-        launch.onActivity {
-            it.lifecycleScope.launchWhenCreated {
-                for (i in 1..10) {
-                    val reminder = WindowManagerViewOverrideReminder(View(it).also { itx -> itx.background = shape(solid = color(i)) }, 300, 300)
-                    Reminder.enqueue(it, reminder)
-                    delay(TimeUnit.SECONDS.toMillis(3))
-
-                    if (i == 8) {
-                        it.finish()
-                    }
-                }
-            }
-        }
-        delay(TimeUnit.SECONDS.toMillis(100))
-    }
-
-    @Test
-    fun testWarningFloat() = runBlocking(Dispatchers.Main) {
-        launch.onActivity {
-            it.lifecycleScope.launchWhenCreated {
-                for (i in 1..10) {
-                    val v = View(it).also {
-                        it.background = shape(solid = color(i))
-                        it.layoutParams = WindowManager.LayoutParams().also { itx ->
-                            itx.width = 300
-                            itx.height = 400
-                        }
-                    }
-                    val builder = WarningFloat.with(it).setTag("test${i}").setLayout(v).setSidePattern(SidePattern.RESULT_TOP).setCountDownTime(TimeUnit.SECONDS.toMillis(10)).setGravity(Gravity.CENTER_HORIZONTAL, offsetY = 110).setImmersionStatusBar(true).addWarningStatusListener(object :
-                            IMoGoWarningStatusListener {
-                            override fun onShow() {
-
-                            }
-                        }).setAnimator(object : DefaultAnimator() {
-                            override fun enterAnim(view: View, params: WindowManager.LayoutParams, windowManager: WindowManager, sidePattern: SidePattern): Animator? = super.enterAnim(view, params, windowManager, sidePattern)?.apply {
-                                interpolator = OvershootInterpolator()
-                            }
-
-                            override fun exitAnim(view: View, params: WindowManager.LayoutParams, windowManager: WindowManager, sidePattern: SidePattern): Animator? = super.exitAnim(view, params, windowManager, sidePattern)?.setDuration(200)
-                        })
-                    Reminder.enqueue(it, WarningFloatReminder(builder))
-                    delay(TimeUnit.SECONDS.toMillis(3))
-                }
-
-            }
-        }
-        delay(TimeUnit.SECONDS.toMillis(100))
-    }
-
-
-    @Test
-    fun testActivityReminder() = runBlocking(Dispatchers.Main) {
-        launch.onActivity {
-            it.lifecycleScope.launchWhenResumed {
-                for (i in 1..10) {
-                    val reminder = ActivityNameReminder(it, "com.mogo.launcher.TestActivity")
-                    Reminder.enqueue(it, reminder)
-                    delay(TimeUnit.SECONDS.toMillis(6))
-                    reminder.hide()
-                }
-            }
-        }
-        delay(TimeUnit.SECONDS.toMillis(100))
-    }
-
-    @Test
-    fun testActivityReminderOverride() = runBlocking(Dispatchers.Main) {
-        launch.onActivity {
-            it.lifecycleScope.launchWhenResumed {
-                for (i in 1..10) {
-                    val reminder = ActivityNameOverrideReminder(it, "com.mogo.launcher.TestActivity")
-                    Reminder.enqueue(it, reminder)
-                    delay(TimeUnit.SECONDS.toMillis(6))
-                }
-            }
-        }
-        delay(TimeUnit.SECONDS.toMillis(100))
-    }
-
-
-    @Test
-    fun testPopupWindowReminder() = runBlocking {
-        launch.onActivity {
-            it.lifecycleScope.launchWhenResumed {
-                for (i in 1..10) {
-
-                    val reminder = TestPopupWindowReminder(it.findViewById(android.R.id.content),  PopupWindow(WindowManager.LayoutParams.WRAP_CONTENT, WindowManager.LayoutParams.WRAP_CONTENT).also { itx ->
-                        itx.contentView = View(it).also {
-                            xx -> xx.background = shape(solid = color(i))
-                            xx.layoutParams = ViewGroup.LayoutParams(300, 400)
-                        }
-                    })
-                    Reminder.enqueue(it, reminder)
-                    delay(TimeUnit.SECONDS.toMillis(3))
-                    reminder.hide()
-                }
-            }
-        }
-        delay(TimeUnit.SECONDS.toMillis(100))
-    }
-
-    @Test
-    fun testPopupWindowReminderOverride() = runBlocking {
-        launch.onActivity {
-            it.lifecycleScope.launchWhenResumed {
-                for (i in 1..10) {
-
-                    val reminder = TestPopupWindowReminderOverride(it.findViewById(android.R.id.content),  PopupWindow(WindowManager.LayoutParams.WRAP_CONTENT, WindowManager.LayoutParams.WRAP_CONTENT).also { itx ->
-                        itx.contentView = View(it).also {
-                                xx -> xx.background = shape(solid = color(i))
-                            xx.layoutParams = ViewGroup.LayoutParams(300, 400)
-                        }
-                    })
-                    Reminder.enqueue(it, reminder)
-                    delay(TimeUnit.SECONDS.toMillis(3))
-                }
-            }
-        }
-        delay(TimeUnit.SECONDS.toMillis(100))
-    }
-
-    @Test
-    fun testWarningFloatForProject() = runBlocking {
+//package com.mogo.functions.test
+//
+//import android.animation.Animator
+//import android.app.Activity
+//import android.content.Context
+//import android.content.Intent
+//import android.graphics.Color
+//import android.view.Gravity
+//import android.view.View
+//import android.view.ViewGroup
+//import android.view.WindowManager
+//import android.view.animation.OvershootInterpolator
+//import android.widget.PopupWindow
+//import androidx.core.view.ViewCompat
+//import androidx.lifecycle.lifecycleScope
+//import androidx.test.core.app.ActivityScenario
+//import androidx.test.ext.junit.runners.AndroidJUnit4
+//import androidx.test.filters.LargeTest
+//import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener
+//import com.mogo.eagle.core.function.hmi.notification.WarningFloat
+//import com.mogo.eagle.core.function.hmi.notification.anim.DefaultAnimator
+//import com.mogo.eagle.core.data.enums.SidePattern
+//import com.mogo.eagle.core.function.hmi.ui.*
+//import com.mogo.eagle.core.function.main.MainLauncherActivity
+//import com.mogo.eagle.core.utilcode.kotlin.shape
+//import com.mogo.eagle.core.utilcode.reminder.Reminder
+//import com.mogo.eagle.core.utilcode.reminder.api.impl.ActivityReminder
+//import com.mogo.eagle.core.utilcode.reminder.api.impl.PopupWindowReminder
+//import com.mogo.eagle.core.utilcode.reminder.api.impl.ViewReminder
+//import com.mogo.eagle.core.utilcode.util.AppStateManager
+//import kotlinx.coroutines.*
+//import kotlinx.coroutines.flow.*
+//import org.junit.Before
+//import org.junit.Test
+//import org.junit.runner.RunWith
+//import java.lang.Integer.min
+//import java.util.concurrent.*
+//import java.util.concurrent.TimeUnit.MILLISECONDS
+//
+//
+//@RunWith(AndroidJUnit4::class)
+//@LargeTest
+//class ReminderTest {
+//
+//    lateinit var launch: ActivityScenario<MainLauncherActivity>
+//
+//    @Before
+//    fun before() {
+//        launch = ActivityScenario.launch(MainLauncherActivity::class.java)
+//    }
+//
+//    @Test
+//    fun testViewReminderNotOverride() = runBlocking(Dispatchers.Main) {
 //        launch.onActivity {
 //            it.lifecycleScope.launchWhenResumed {
 //                for (i in 1..10) {
-//                    val notificationView = V2XNotificationView(it)
-//                    notificationView.setWarningIcon(EventTypeEnum.getWarningIcon("10003"))
-//                    notificationView.setWarningContent("XXXXXX${i}")
-//                    WarningFloat.with(it)
-//                        .setTag("tag")
-//                        .setLayout(notificationView)
-//                        .setSidePattern(SidePattern.RESULT_TOP)
-//                        .setCountDownTime(5000)
-//                        .setGravity(Gravity.CENTER_HORIZONTAL, offsetY = 110)
-//                        .setImmersionStatusBar(true)
-//                        .addWarningStatusListener(object : IMoGoWarningStatusListener {
-//                            override fun onShow() {
-//                            }
-//                        })
-//                        .setAnimator(object : DefaultAnimator() {
-//                            override fun enterAnim(
-//                                view: View,
-//                                params: WindowManager.LayoutParams,
-//                                windowManager: WindowManager,
-//                                sidePattern: SidePattern
-//                            ): Animator? =
-//                                super.enterAnim(view, params, windowManager, sidePattern)?.apply {
-//                                    interpolator = OvershootInterpolator()
-//                                }
-//
-//                            override fun exitAnim(
-//                                view: View,
-//                                params: WindowManager.LayoutParams,
-//                                windowManager: WindowManager,
-//                                sidePattern: SidePattern
-//                            ): Animator? =
-//                                super.exitAnim(view, params, windowManager, sidePattern)?.setDuration(200)
-//                        })
-//                        .show()
-//                    delay(2000)
+//                    val reminder = WindowManagerViewUnOverrideReminder(View(it).also { itx -> itx.background = shape(solid = color(i)) }, 300, 300)
+//                    Reminder.enqueue(it, reminder)
+//                    delay(TimeUnit.SECONDS.toMillis(3))
+//                    reminder.hide()
 //                }
 //            }
 //        }
 //        delay(TimeUnit.SECONDS.toMillis(100))
-    }
-
-
-    class WarningFloatReminder(private val builder: WarningFloat.Builder) : ViewReminder(builder.config.layoutView!!) {
-
-        override fun show() {
-            builder.show()
-        }
-
-        override fun hide() {
-            WarningFloat.dismiss(builder.config.floatTag, false)
-        }
-
-        override fun isOverride(): Boolean {
-            return true
-        }
-    }
-
-
-    class WindowManagerViewUnOverrideReminder(private val content: View, private val width: Int, private val height: Int) : ViewReminder(content) {
-
-        private val wm by lazy {
-            content.context.getSystemService(Activity.WINDOW_SERVICE) as WindowManager
-        }
-
-        private var isAdd = false
-
-        override fun show() {
-            if (!isAdd) {
-                val params = WindowManager.LayoutParams().also {
-                    it.width = width
-                    it.height = height
-                }
-                params.gravity = Gravity.CENTER
-                wm.addView(content, params)
-                isAdd = true
-            }
-        }
-
-        override fun hide() {
-            if (isAdd && ViewCompat.isAttachedToWindow(content)) {
-                wm.removeView(content)
-                isAdd = false
-            }
-        }
-    }
-
-
-    class WindowManagerViewOverrideReminder(private val content: View, private val width: Int, private val height: Int) : ViewReminder(content) {
-
-        private val wm by lazy {
-            content.context.getSystemService(Activity.WINDOW_SERVICE) as WindowManager
-        }
-
-        private var isAdd = false
-
-        override fun show() {
-            if (!isAdd) {
-                val params = WindowManager.LayoutParams().also {
-                    it.width = width
-                    it.height = height
-                }
-                params.gravity = Gravity.CENTER
-                wm.addView(content, params)
-                isAdd = true
-            }
-        }
-
-        override fun hide() {
-            if (isAdd && ViewCompat.isAttachedToWindow(content)) {
-                wm.removeView(content)
-                isAdd = false
-            }
-        }
-
-        override fun isOverride(): Boolean {
-            return true
-        }
-    }
-
-
-    class ActivityNameReminder(private val context: Context, private val className: String): ActivityReminder(className) {
-
-        override fun show() {
-            Intent(context, Class.forName(className)).also {
-                context.startActivity(it)
-            }
-        }
-
-        override fun hide() {
-            AppStateManager.currentActivity()?.takeIf { it.javaClass.name == className }?.finish()
-        }
-    }
-
-    class ActivityNameOverrideReminder(private val context: Context, private val className: String): ActivityReminder(className) {
-
-        override fun show() {
-            Intent(context, Class.forName(className)).also {
-                context.startActivity(it)
-            }
-        }
-
-        override fun hide() {
-            AppStateManager.currentActivity()?.takeIf { it.javaClass.name == className }?.finish()
-        }
-
-        override fun isOverride(): Boolean {
-            return true
-        }
-    }
-
-    class TestPopupWindowReminder(private val anchor: View,  override val popupWindow: PopupWindow): PopupWindowReminder(popupWindow) {
-
-        override fun show() {
-            popupWindow.showAtLocation(anchor, Gravity.CENTER, 0, 0)
-        }
-    }
-
-    class TestPopupWindowReminderOverride(private val anchor: View, override val popupWindow: PopupWindow): PopupWindowReminder(popupWindow) {
-
-        override fun show() {
-            popupWindow.showAtLocation(anchor, Gravity.CENTER, 0, 0)
-        }
-
-        override fun isOverride(): Boolean {
-            return true
-        }
-    }
-
-    private fun color(index: Int): Int {
-        if (index > 10) {
-            return Color.BLACK
-        }
-        val alpha = min(255, 255 - index * 20)
-        return Color.argb(alpha, Color.red(Color.RED), Color.green(Color.RED), Color.blue(Color.RED))
-    }
-}
\ No newline at end of file
+//        return@runBlocking
+//    }
+//
+//    @Test
+//    fun testShowWarningV2x() = runBlocking {
+//        val f = ensureMoGoHmiFragmentShow()
+//
+//        delay(5000)
+//        (1 until 20).map {
+//            it
+//        }.asFlow()
+//            .onEach {
+//                f.showWarningV2X("10006", "test", "测试$it", "$it", null, true, 5000)
+//            }
+//            .flowOn(Dispatchers.Default)
+//            .collect()
+//        delay(3000000)
+//    }
+//
+//    private suspend fun ensureMoGoHmiFragmentShow(): MoGoHmiProvider = suspendCancellableCoroutine {
+//        launch.onActivity { itx ->
+//            val executor = Executors.newSingleThreadScheduledExecutor()
+//            executor.scheduleAtFixedRate({
+//                var find =
+//                    itx.supportFragmentManager.fragments.find { it is MoGoHmiProvider } as? MoGoHmiProvider
+//                while (find == null) {
+//                    find =
+//                        itx.supportFragmentManager.fragments.find { it is MoGoHmiProvider } as? MoGoHmiProvider
+//                }
+//                while (!find.isResumed) {
+//                    Thread.sleep(500)
+//                }
+//                it.resumeWith(Result.success(find))
+//                try {
+//                    Thread.sleep(500)
+//                    executor.shutdownNow()
+//                } catch (e: Throwable) {
+//                    e.printStackTrace()
+//                }
+//            }, 50, 500, MILLISECONDS)
+//        }
+//    }
+//
+//    @Test
+//    fun testViewReminderOverride() = runBlocking(Dispatchers.Main) {
+//        launch.onActivity {
+//            it.lifecycleScope.launchWhenCreated {
+//                for (i in 1..10) {
+//                    val reminder = WindowManagerViewOverrideReminder(View(it).also { itx -> itx.background = shape(solid = color(i)) }, 300, 300)
+//                    Reminder.enqueue(it, reminder)
+//                    delay(TimeUnit.SECONDS.toMillis(3))
+//                }
+//            }
+//        }
+//        delay(TimeUnit.SECONDS.toMillis(100))
+//        return@runBlocking
+//    }
+//
+//    @Test
+//    fun testViewReminderWhenActivityDestroyed() = runBlocking(Dispatchers.Main) {
+//        launch.onActivity {
+//            it.lifecycleScope.launchWhenCreated {
+//                for (i in 1..10) {
+//                    val reminder = WindowManagerViewOverrideReminder(View(it).also { itx -> itx.background = shape(solid = color(i)) }, 300, 300)
+//                    Reminder.enqueue(it, reminder)
+//                    delay(TimeUnit.SECONDS.toMillis(3))
+//
+//                    if (i == 8) {
+//                        it.finish()
+//                    }
+//                }
+//            }
+//        }
+//        delay(TimeUnit.SECONDS.toMillis(100))
+//    }
+//
+//    @Test
+//    fun testWarningFloat() = runBlocking(Dispatchers.Main) {
+//        launch.onActivity {
+//            it.lifecycleScope.launchWhenCreated {
+//                for (i in 1..10) {
+//                    val v = View(it).also {
+//                        it.background = shape(solid = color(i))
+//                        it.layoutParams = WindowManager.LayoutParams().also { itx ->
+//                            itx.width = 300
+//                            itx.height = 400
+//                        }
+//                    }
+//                    val builder = WarningFloat.with(it).setTag("test${i}").setLayout(v).setSidePattern(SidePattern.RESULT_TOP).setCountDownTime(TimeUnit.SECONDS.toMillis(10)).setGravity(Gravity.CENTER_HORIZONTAL, offsetY = 110).setImmersionStatusBar(true).addWarningStatusListener(object :
+//                            IMoGoWarningStatusListener {
+//                            override fun onShow() {
+//
+//                            }
+//                        }).setAnimator(object : DefaultAnimator() {
+//                            override fun enterAnim(view: View, params: WindowManager.LayoutParams, windowManager: WindowManager, sidePattern: SidePattern): Animator? = super.enterAnim(view, params, windowManager, sidePattern)?.apply {
+//                                interpolator = OvershootInterpolator()
+//                            }
+//
+//                            override fun exitAnim(view: View, params: WindowManager.LayoutParams, windowManager: WindowManager, sidePattern: SidePattern): Animator? = super.exitAnim(view, params, windowManager, sidePattern)?.setDuration(200)
+//                        })
+//                    Reminder.enqueue(it, WarningFloatReminder(builder))
+//                    delay(TimeUnit.SECONDS.toMillis(3))
+//                }
+//
+//            }
+//        }
+//        delay(TimeUnit.SECONDS.toMillis(100))
+//    }
+//
+//
+//    @Test
+//    fun testActivityReminder() = runBlocking(Dispatchers.Main) {
+//        launch.onActivity {
+//            it.lifecycleScope.launchWhenResumed {
+//                for (i in 1..10) {
+//                    val reminder = ActivityNameReminder(it, "com.mogo.launcher.TestActivity")
+//                    Reminder.enqueue(it, reminder)
+//                    delay(TimeUnit.SECONDS.toMillis(6))
+//                    reminder.hide()
+//                }
+//            }
+//        }
+//        delay(TimeUnit.SECONDS.toMillis(100))
+//    }
+//
+//    @Test
+//    fun testActivityReminderOverride() = runBlocking(Dispatchers.Main) {
+//        launch.onActivity {
+//            it.lifecycleScope.launchWhenResumed {
+//                for (i in 1..10) {
+//                    val reminder = ActivityNameOverrideReminder(it, "com.mogo.launcher.TestActivity")
+//                    Reminder.enqueue(it, reminder)
+//                    delay(TimeUnit.SECONDS.toMillis(6))
+//                }
+//            }
+//        }
+//        delay(TimeUnit.SECONDS.toMillis(100))
+//    }
+//
+//
+//    @Test
+//    fun testPopupWindowReminder() = runBlocking {
+//        launch.onActivity {
+//            it.lifecycleScope.launchWhenResumed {
+//                for (i in 1..10) {
+//
+//                    val reminder = TestPopupWindowReminder(it.findViewById(android.R.id.content),  PopupWindow(WindowManager.LayoutParams.WRAP_CONTENT, WindowManager.LayoutParams.WRAP_CONTENT).also { itx ->
+//                        itx.contentView = View(it).also {
+//                            xx -> xx.background = shape(solid = color(i))
+//                            xx.layoutParams = ViewGroup.LayoutParams(300, 400)
+//                        }
+//                    })
+//                    Reminder.enqueue(it, reminder)
+//                    delay(TimeUnit.SECONDS.toMillis(3))
+//                    reminder.hide()
+//                }
+//            }
+//        }
+//        delay(TimeUnit.SECONDS.toMillis(100))
+//    }
+//
+//    @Test
+//    fun testPopupWindowReminderOverride() = runBlocking {
+//        launch.onActivity {
+//            it.lifecycleScope.launchWhenResumed {
+//                for (i in 1..10) {
+//
+//                    val reminder = TestPopupWindowReminderOverride(it.findViewById(android.R.id.content),  PopupWindow(WindowManager.LayoutParams.WRAP_CONTENT, WindowManager.LayoutParams.WRAP_CONTENT).also { itx ->
+//                        itx.contentView = View(it).also {
+//                                xx -> xx.background = shape(solid = color(i))
+//                            xx.layoutParams = ViewGroup.LayoutParams(300, 400)
+//                        }
+//                    })
+//                    Reminder.enqueue(it, reminder)
+//                    delay(TimeUnit.SECONDS.toMillis(3))
+//                }
+//            }
+//        }
+//        delay(TimeUnit.SECONDS.toMillis(100))
+//    }
+//
+//    @Test
+//    fun testWarningFloatForProject() = runBlocking {
+////        launch.onActivity {
+////            it.lifecycleScope.launchWhenResumed {
+////                for (i in 1..10) {
+////                    val notificationView = V2XNotificationView(it)
+////                    notificationView.setWarningIcon(EventTypeEnum.getWarningIcon("10003"))
+////                    notificationView.setWarningContent("XXXXXX${i}")
+////                    WarningFloat.with(it)
+////                        .setTag("tag")
+////                        .setLayout(notificationView)
+////                        .setSidePattern(SidePattern.RESULT_TOP)
+////                        .setCountDownTime(5000)
+////                        .setGravity(Gravity.CENTER_HORIZONTAL, offsetY = 110)
+////                        .setImmersionStatusBar(true)
+////                        .addWarningStatusListener(object : IMoGoWarningStatusListener {
+////                            override fun onShow() {
+////                            }
+////                        })
+////                        .setAnimator(object : DefaultAnimator() {
+////                            override fun enterAnim(
+////                                view: View,
+////                                params: WindowManager.LayoutParams,
+////                                windowManager: WindowManager,
+////                                sidePattern: SidePattern
+////                            ): Animator? =
+////                                super.enterAnim(view, params, windowManager, sidePattern)?.apply {
+////                                    interpolator = OvershootInterpolator()
+////                                }
+////
+////                            override fun exitAnim(
+////                                view: View,
+////                                params: WindowManager.LayoutParams,
+////                                windowManager: WindowManager,
+////                                sidePattern: SidePattern
+////                            ): Animator? =
+////                                super.exitAnim(view, params, windowManager, sidePattern)?.setDuration(200)
+////                        })
+////                        .show()
+////                    delay(2000)
+////                }
+////            }
+////        }
+////        delay(TimeUnit.SECONDS.toMillis(100))
+//    }
+//
+//
+//    class WarningFloatReminder(private val builder: WarningFloat.Builder) : ViewReminder(builder.config.layoutView!!) {
+//
+//        override fun show() {
+//            builder.show()
+//        }
+//
+//        override fun hide() {
+//            WarningFloat.dismiss(builder.config.floatTag, false)
+//        }
+//
+//        override fun isOverride(): Boolean {
+//            return true
+//        }
+//    }
+//
+//
+//    class WindowManagerViewUnOverrideReminder(private val content: View, private val width: Int, private val height: Int) : ViewReminder(content) {
+//
+//        private val wm by lazy {
+//            content.context.getSystemService(Activity.WINDOW_SERVICE) as WindowManager
+//        }
+//
+//        private var isAdd = false
+//
+//        override fun show() {
+//            if (!isAdd) {
+//                val params = WindowManager.LayoutParams().also {
+//                    it.width = width
+//                    it.height = height
+//                }
+//                params.gravity = Gravity.CENTER
+//                wm.addView(content, params)
+//                isAdd = true
+//            }
+//        }
+//
+//        override fun hide() {
+//            if (isAdd && ViewCompat.isAttachedToWindow(content)) {
+//                wm.removeView(content)
+//                isAdd = false
+//            }
+//        }
+//    }
+//
+//
+//    class WindowManagerViewOverrideReminder(private val content: View, private val width: Int, private val height: Int) : ViewReminder(content) {
+//
+//        private val wm by lazy {
+//            content.context.getSystemService(Activity.WINDOW_SERVICE) as WindowManager
+//        }
+//
+//        private var isAdd = false
+//
+//        override fun show() {
+//            if (!isAdd) {
+//                val params = WindowManager.LayoutParams().also {
+//                    it.width = width
+//                    it.height = height
+//                }
+//                params.gravity = Gravity.CENTER
+//                wm.addView(content, params)
+//                isAdd = true
+//            }
+//        }
+//
+//        override fun hide() {
+//            if (isAdd && ViewCompat.isAttachedToWindow(content)) {
+//                wm.removeView(content)
+//                isAdd = false
+//            }
+//        }
+//
+//        override fun isOverride(): Boolean {
+//            return true
+//        }
+//    }
+//
+//
+//    class ActivityNameReminder(private val context: Context, private val className: String): ActivityReminder(className) {
+//
+//        override fun show() {
+//            Intent(context, Class.forName(className)).also {
+//                context.startActivity(it)
+//            }
+//        }
+//
+//        override fun hide() {
+//            AppStateManager.currentActivity()?.takeIf { it.javaClass.name == className }?.finish()
+//        }
+//    }
+//
+//    class ActivityNameOverrideReminder(private val context: Context, private val className: String): ActivityReminder(className) {
+//
+//        override fun show() {
+//            Intent(context, Class.forName(className)).also {
+//                context.startActivity(it)
+//            }
+//        }
+//
+//        override fun hide() {
+//            AppStateManager.currentActivity()?.takeIf { it.javaClass.name == className }?.finish()
+//        }
+//
+//        override fun isOverride(): Boolean {
+//            return true
+//        }
+//    }
+//
+//    class TestPopupWindowReminder(private val anchor: View,  override val popupWindow: PopupWindow): PopupWindowReminder(popupWindow) {
+//
+//        override fun show() {
+//            popupWindow.showAtLocation(anchor, Gravity.CENTER, 0, 0)
+//        }
+//    }
+//
+//    class TestPopupWindowReminderOverride(private val anchor: View, override val popupWindow: PopupWindow): PopupWindowReminder(popupWindow) {
+//
+//        override fun show() {
+//            popupWindow.showAtLocation(anchor, Gravity.CENTER, 0, 0)
+//        }
+//
+//        override fun isOverride(): Boolean {
+//            return true
+//        }
+//    }
+//
+//    private fun color(index: Int): Int {
+//        if (index > 10) {
+//            return Color.BLACK
+//        }
+//        val alpha = min(255, 255 - index * 20)
+//        return Color.argb(alpha, Color.red(Color.RED), Color.green(Color.RED), Color.blue(Color.RED))
+//    }
+//}
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/mogo/functions/test/RoadAITest.kt b/app/src/androidTest/java/com/mogo/functions/test/RoadAITest.kt
index a2da134840..2597b01f28 100644
--- a/app/src/androidTest/java/com/mogo/functions/test/RoadAITest.kt
+++ b/app/src/androidTest/java/com/mogo/functions/test/RoadAITest.kt
@@ -7,7 +7,6 @@ import androidx.test.filters.*
 import com.mogo.eagle.core.data.v2x.V2XEvent
 import com.mogo.eagle.core.function.hmi.ui.*
 import com.mogo.eagle.core.function.main.*
-import com.mogo.eagle.core.function.v2x.events.*
 import com.mogo.eagle.core.data.v2x.V2XRoadXData
 import com.mogo.eagle.core.utilcode.util.GsonUtils
 import com.mogo.eagle.function.biz.v2x.v2n.V2XEventManager
@@ -33,7 +32,7 @@ class RoadAITest {
 
     @Test
     fun test() = runBlocking(Dispatchers.Default) {
-        ensureMoGoHmiFragmentShow()
+        //ensureMoGoHmiFragmentShow()
         val nanos = System.nanoTime()
         val child =
             RW_PB
@@ -136,34 +135,10 @@ class RoadAITest {
 
     }
 
-    private suspend fun ensureMoGoHmiFragmentShow(): MoGoHmiProvider = suspendCancellableCoroutine {
-        launch.onActivity { itx ->
-            val executor = Executors.newSingleThreadScheduledExecutor()
-            executor.scheduleAtFixedRate({
-                var find =
-                    itx.supportFragmentManager.fragments.find { it is MoGoHmiProvider } as? MoGoHmiProvider
-                while (find == null) {
-                    find =
-                        itx.supportFragmentManager.fragments.find { it is MoGoHmiProvider } as? MoGoHmiProvider
-                }
-                while (!find.isResumed) {
-                    Thread.sleep(500)
-                }
-                it.resumeWith(Result.success(find))
-                try {
-                    Thread.sleep(500)
-                    executor.shutdownNow()
-                } catch (e: Throwable) {
-                    e.printStackTrace()
-                }
-            }, 50, 500, MILLISECONDS)
-        }
-    }
-
 
     @Test
     fun testRoadAI() = runBlocking {
-        ensureMoGoHmiFragmentShow()
+       // ensureMoGoHmiFragmentShow()
         val shigu = "{\"poiType\":\"100321\",\"receiveTime\":1673506266967,\"detectTime\":1673506266924,\"id\":\"f7b1df85-895a-41c1-b05d-7356955c1c91\",\"index\":\"636136931493454271\",\"polygon\":[{\"lon\":112.57321291454436,\"lat\":26.823070465392494},{\"lon\":112.573215006931,\"lat\":26.8230675990919},{\"lon\":112.573219106955,\"lat\":26.823061914715},{\"lon\":112.573223182233,\"lat\":26.8230562153801},{\"lon\":112.573227231639,\"lat\":26.8230505007471},{\"lon\":112.573231254048,\"lat\":26.8230447704754},{\"lon\":112.573235248336,\"lat\":26.8230390242245},{\"lon\":112.573239213377,\"lat\":26.8230332616541},{\"lon\":112.573243148045,\"lat\":26.8230274824236},{\"lon\":112.573247051217,\"lat\":26.8230216861928},{\"lon\":112.573250921765,\"lat\":26.823015872621},{\"lon\":112.573254758566,\"lat\":26.823010041368},{\"lon\":112.573258560494,\"lat\":26.8230041920932},{\"lon\":112.573262326424,\"lat\":26.8229983244562},{\"lon\":112.573266055231,\"lat\":26.8229924381166},{\"lon\":112.573269779025,\"lat\":26.8229864802436},{\"lon\":112.573273466,\"lat\":26.8229805039295},{\"lon\":112.573277118207,\"lat\":26.8229745102999},{\"lon\":112.573280737695,\"lat\":26.8229685004807},{\"lon\":112.573284326516,\"lat\":26.8229624755973},{\"lon\":112.57328788672,\"lat\":26.8229564367755},{\"lon\":112.573291420358,\"lat\":26.822950385141},{\"lon\":112.573294929481,\"lat\":26.8229443218192},{\"lon\":112.573298416139,\"lat\":26.822938247936},{\"lon\":112.573301882384,\"lat\":26.822932164617},{\"lon\":112.573305330265,\"lat\":26.8229260729878},{\"lon\":112.573308761833,\"lat\":26.8229199741741},{\"lon\":112.57331217914,\"lat\":26.8229138693015},{\"lon\":112.573315584235,\"lat\":26.8229077594956},{\"lon\":112.573318940869,\"lat\":26.8229017005891},{\"lon\":112.57332227685,\"lat\":26.8228956326057},{\"lon\":112.573325593901,\"lat\":26.8228895563037},{\"lon\":112.573328893742,\"lat\":26.8228834724414},{\"lon\":112.573332178097,\"lat\":26.8228773817772},{\"lon\":112.573335448685,\"lat\":26.8228712850694},{\"lon\":112.573338707228,\"lat\":26.8228651830762},{\"lon\":112.573341955449,\"lat\":26.822859076556},{\"lon\":112.573345195068,\"lat\":26.8228529662671},{\"lon\":112.573348427807,\"lat\":26.8228468529679},{\"lon\":112.573351655387,\"lat\":26.8228407374165},{\"lon\":112.57335487953,\"lat\":26.8228346203714},{\"lon\":112.573358101958,\"lat\":26.8228285025908},{\"lon\":112.573361324391,\"lat\":26.8228223848331},{\"lon\":112.573364548551,\"lat\":26.8228162678566},{\"lon\":112.573367776161,\"lat\":26.8228101524196},{\"lon\":112.57337100894,\"lat\":26.8228040392803},{\"lon\":112.573374248612,\"lat\":26.8227979291972},{\"lon\":112.573377570805,\"lat\":26.8227916708447},{\"lon\":112.573380890942,\"lat\":26.8227854119249},{\"lon\":112.573384209049,\"lat\":26.8227791523835},{\"lon\":112.573387525157,\"lat\":26.8227728921664},{\"lon\":112.573390839291,\"lat\":26.8227666312191},{\"lon\":112.573394151482,\"lat\":26.8227603694874},{\"lon\":112.573397461756,\"lat\":26.8227541069172},{\"lon\":112.573400770143,\"lat\":26.822747843454},{\"lon\":112.573404076669,\"lat\":26.8227415790437},{\"lon\":112.573407381363,\"lat\":26.822735313632},{\"lon\":112.573410684254,\"lat\":26.8227290471645},{\"lon\":112.57341398537,\"lat\":26.8227227795872},{\"lon\":112.573417284738,\"lat\":26.8227165108456},{\"lon\":112.573420582386,\"lat\":26.8227102408855},{\"lon\":112.573423878344,\"lat\":26.8227039696526},{\"lon\":112.573427172639,\"lat\":26.8226976970928},{\"lon\":112.573430465298,\"lat\":26.8226914231516},{\"lon\":112.5736541921437,\"lat\":26.822260937315143},{\"lon\":112.57362367177457,\"lat\":26.822244991227713},{\"lon\":112.573399937477,\"lat\":26.822675492918},{\"lon\":112.573396691977,\"lat\":26.8226816946351},{\"lon\":112.573393403264,\"lat\":26.8226879586397},{\"lon\":112.573390112889,\"lat\":26.8226942213535},{\"lon\":112.573386820836,\"lat\":26.8227004828209},{\"lon\":112.573383527072,\"lat\":26.822706742987},{\"lon\":112.573380231507,\"lat\":26.8227130021005},{\"lon\":112.573376934206,\"lat\":26.8227192599775},{\"lon\":112.573373635113,\"lat\":26.8227255169308},{\"lon\":112.573370334197,\"lat\":26.8227317727439},{\"lon\":112.573367031403,\"lat\":26.8227380276418},{\"lon\":112.573363726739,\"lat\":26.822744281759},{\"lon\":112.573360420141,\"lat\":26.8227505349933},{\"lon\":112.573357111541,\"lat\":26.8227567875221},{\"lon\":112.573353801054,\"lat\":26.8227630392523},{\"lon\":112.573350488563,\"lat\":26.8227692902611},{\"lon\":112.573347174021,\"lat\":26.8227755406808},{\"lon\":112.573343849991,\"lat\":26.8227818018286},{\"lon\":112.57334059532,\"lat\":26.8227879346295},{\"lon\":112.573337344447,\"lat\":26.8227940752481},{\"lon\":112.57333410391,\"lat\":26.8228002103548},{\"lon\":112.573330872,\"lat\":26.8228063391622},{\"lon\":112.573327646909,\"lat\":26.8228124609577},{\"lon\":112.573324426983,\"lat\":26.8228185749099},{\"lon\":112.573321210588,\"lat\":26.8228246801823},{\"lon\":112.573317995803,\"lat\":26.8228307762173},{\"lon\":112.573314781099,\"lat\":26.8228368621259},{\"lon\":112.573311564666,\"lat\":26.8228429372788},{\"lon\":112.573308344862,\"lat\":26.822849000878},{\"lon\":112.573305119998,\"lat\":26.8228550522037},{\"lon\":112.573301888377,\"lat\":26.8228610905445},{\"lon\":112.573298648327,\"lat\":26.8228671151949},{\"lon\":112.573295398165,\"lat\":26.8228731254473},{\"lon\":112.573292136233,\"lat\":26.822879120603},{\"lon\":112.573288860863,\"lat\":26.8228850999821},{\"lon\":112.573285560822,\"lat\":26.8228910767817},{\"lon\":112.573282199005,\"lat\":26.822897124157},{\"lon\":112.573278821808,\"lat\":26.8229031714324},{\"lon\":112.573275437073,\"lat\":26.8229092033326},{\"lon\":112.573272042813,\"lat\":26.8229152188038},{\"lon\":112.573268637042,\"lat\":26.8229212167948},{\"lon\":112.573265217788,\"lat\":26.8229271962611},{\"lon\":112.573261783086,\"lat\":26.8229331561851},{\"lon\":112.573258330982,\"lat\":26.8229390955283},{\"lon\":112.573254859519,\"lat\":26.8229450132931},{\"lon\":112.573251366753,\"lat\":26.8229509084733},{\"lon\":112.573247850743,\"lat\":26.8229567800818},{\"lon\":112.57324430955,\"lat\":26.8229626271411},{\"lon\":112.573240741245,\"lat\":26.8229684486883},{\"lon\":112.573237142704,\"lat\":26.8229742453022},{\"lon\":112.573233541124,\"lat\":26.8229799700034},{\"lon\":112.573229900299,\"lat\":26.8229856807403},{\"lon\":112.573226220729,\"lat\":26.8229913784753},{\"lon\":112.573222503466,\"lat\":26.8229970634612},{\"lon\":112.573218749581,\"lat\":26.8230027359391},{\"lon\":112.573214960128,\"lat\":26.8230083961865},{\"lon\":112.573211136192,\"lat\":26.8230140444302},{\"lon\":112.573207278832,\"lat\":26.8230196809522},{\"lon\":112.573203389132,\"lat\":26.8230253060135},{\"lon\":112.573199468169,\"lat\":26.8230309198603},{\"lon\":112.573195517033,\"lat\":26.8230365227693},{\"lon\":112.573191536797,\"lat\":26.8230421150085},{\"lon\":112.573187548559,\"lat\":26.8230476745161},{\"lon\":112.57318546455338,\"lat\":26.823050549063097}],\"polygonRoads\":[{\"tileId\":556834853,\"roadId\":\"130372\",\"laneNo\":-1,\"bearing\":152,\"roadName\":\"雁鸣路\"},{\"tileId\":556834853,\"roadId\":\"130372\",\"laneNo\":-2,\"bearing\":152,\"roadName\":\"雁鸣路\"},{\"tileId\":556834853,\"roadId\":\"130372\",\"laneNo\":-3,\"bearing\":152,\"roadName\":\"雁鸣路\"}],\"center\":{\"lon\":112.57320982521519,\"lat\":26.82306821019599},\"centerRoad\":{\"tileId\":556834853,\"roadId\":\"130372\",\"laneNo\":-2,\"bearing\":152,\"roadName\":\"雁鸣路\"},\"obstacles\":[{\"id\":0,\"type\":1,\"score\":95,\"polygon\":[{\"lon\":112.57321361221982,\"lat\":26.823054701276522},{\"lon\":112.57321254435868,\"lat\":26.823070134384093},{\"lon\":112.57320704440468,\"lat\":26.823066238995114},{\"lon\":112.57320772757787,\"lat\":26.823050237509577}],\"boundBox\":[{\"x\":2979.852783203125,\"y\":929.4248657226562},{\"x\":3031.54296875,\"y\":929.4248657226562},{\"x\":3031.54296875,\"y\":977.5980834960938},{\"x\":2979.852783203125,\"y\":977.5980834960938}],\"center\":{\"lon\":112.57320982521519,\"lat\":26.82306821019599}}],\"imgUrl\":\"http://petchfile-1255510688.cos.ap-beijing.myqcloud.com/roadwork_image/2023-01-12/f7b1df85-895a-41c1-b05d-7356955c1c91_172_18_24_62.jpg?sign=q-sign-algorithm%3Dsha1%26q-ak%3DAKIDCWfcNwD5PXVWLxwejccR3Tiz5zhIkx0T%26q-sign-time%3D1673506267%3B1673513467%26q-key-time%3D1673506267%3B1673513467%26q-header-list%3D%26q-url-param-list%3D%26q-signature%3Db6b2911110c9941471cfc447d7704b9caa57a0e1\",\"ip\":\"172.18.24.62\",\"score\":95,\"radius\":0,\"type\":2,\"trianglePolygon\":[[{\"lon\":112.57321291454436,\"lat\":26.823070465392494},{\"lon\":112.573215006931,\"lat\":26.8230675990919},{\"lon\":112.573219106955,\"lat\":26.823061914715},{\"lon\":112.573223182233,\"lat\":26.8230562153801},{\"lon\":112.573227231639,\"lat\":26.8230505007471},{\"lon\":112.573231254048,\"lat\":26.8230447704754},{\"lon\":112.573235248336,\"lat\":26.8230390242245},{\"lon\":112.573239213377,\"lat\":26.8230332616541},{\"lon\":112.573243148045,\"lat\":26.8230274824236},{\"lon\":112.573247051217,\"lat\":26.8230216861928},{\"lon\":112.573250921765,\"lat\":26.823015872621},{\"lon\":112.573254758566,\"lat\":26.823010041368},{\"lon\":112.573258560494,\"lat\":26.8230041920932},{\"lon\":112.573262326424,\"lat\":26.8229983244562},{\"lon\":112.573266055231,\"lat\":26.8229924381166},{\"lon\":112.573269779025,\"lat\":26.8229864802436},{\"lon\":112.573273466,\"lat\":26.8229805039295},{\"lon\":112.573277118207,\"lat\":26.8229745102999},{\"lon\":112.573280737695,\"lat\":26.8229685004807},{\"lon\":112.573284326516,\"lat\":26.8229624755973},{\"lon\":112.57328788672,\"lat\":26.8229564367755},{\"lon\":112.573291420358,\"lat\":26.822950385141},{\"lon\":112.573294929481,\"lat\":26.8229443218192},{\"lon\":112.573298416139,\"lat\":26.822938247936},{\"lon\":112.573301882384,\"lat\":26.822932164617},{\"lon\":112.573305330265,\"lat\":26.8229260729878},{\"lon\":112.573308761833,\"lat\":26.8229199741741},{\"lon\":112.57331217914,\"lat\":26.8229138693015},{\"lon\":112.573315584235,\"lat\":26.8229077594956},{\"lon\":112.573318940869,\"lat\":26.8229017005891},{\"lon\":112.57332227685,\"lat\":26.8228956326057},{\"lon\":112.573325593901,\"lat\":26.8228895563037},{\"lon\":112.573328893742,\"lat\":26.8228834724414},{\"lon\":112.573332178097,\"lat\":26.8228773817772},{\"lon\":112.573335448685,\"lat\":26.8228712850694},{\"lon\":112.573338707228,\"lat\":26.8228651830762},{\"lon\":112.573341955449,\"lat\":26.822859076556},{\"lon\":112.573345195068,\"lat\":26.8228529662671},{\"lon\":112.573348427807,\"lat\":26.8228468529679},{\"lon\":112.573351655387,\"lat\":26.8228407374165},{\"lon\":112.57335487953,\"lat\":26.8228346203714},{\"lon\":112.573358101958,\"lat\":26.8228285025908},{\"lon\":112.573361324391,\"lat\":26.8228223848331},{\"lon\":112.573364548551,\"lat\":26.8228162678566},{\"lon\":112.573367776161,\"lat\":26.8228101524196},{\"lon\":112.57337100894,\"lat\":26.8228040392803},{\"lon\":112.573374248612,\"lat\":26.8227979291972},{\"lon\":112.573377570805,\"lat\":26.8227916708447},{\"lon\":112.573380890942,\"lat\":26.8227854119249},{\"lon\":112.573384209049,\"lat\":26.8227791523835},{\"lon\":112.573387525157,\"lat\":26.8227728921664},{\"lon\":112.573390839291,\"lat\":26.8227666312191},{\"lon\":112.573394151482,\"lat\":26.8227603694874},{\"lon\":112.573397461756,\"lat\":26.8227541069172},{\"lon\":112.573400770143,\"lat\":26.822747843454},{\"lon\":112.573404076669,\"lat\":26.8227415790437},{\"lon\":112.573407381363,\"lat\":26.822735313632},{\"lon\":112.573410684254,\"lat\":26.8227290471645},{\"lon\":112.57341398537,\"lat\":26.8227227795872},{\"lon\":112.573417284738,\"lat\":26.8227165108456},{\"lon\":112.573420582386,\"lat\":26.8227102408855},{\"lon\":112.573423878344,\"lat\":26.8227039696526},{\"lon\":112.573427172639,\"lat\":26.8226976970928},{\"lon\":112.573430465298,\"lat\":26.8226914231516},{\"lon\":112.5736541921437,\"lat\":26.822260937315143},{\"lon\":112.57362367177457,\"lat\":26.822244991227713},{\"lon\":112.573399937477,\"lat\":26.822675492918},{\"lon\":112.573396691977,\"lat\":26.8226816946351},{\"lon\":112.573393403264,\"lat\":26.8226879586397},{\"lon\":112.573390112889,\"lat\":26.8226942213535},{\"lon\":112.573386820836,\"lat\":26.8227004828209},{\"lon\":112.573383527072,\"lat\":26.822706742987},{\"lon\":112.573380231507,\"lat\":26.8227130021005},{\"lon\":112.573376934206,\"lat\":26.8227192599775},{\"lon\":112.573373635113,\"lat\":26.8227255169308},{\"lon\":112.573370334197,\"lat\":26.8227317727439},{\"lon\":112.573367031403,\"lat\":26.8227380276418},{\"lon\":112.573363726739,\"lat\":26.822744281759},{\"lon\":112.573360420141,\"lat\":26.8227505349933},{\"lon\":112.573357111541,\"lat\":26.8227567875221},{\"lon\":112.573353801054,\"lat\":26.8227630392523},{\"lon\":112.573350488563,\"lat\":26.8227692902611},{\"lon\":112.573347174021,\"lat\":26.8227755406808},{\"lon\":112.573343849991,\"lat\":26.8227818018286},{\"lon\":112.57334059532,\"lat\":26.8227879346295},{\"lon\":112.573337344447,\"lat\":26.8227940752481},{\"lon\":112.57333410391,\"lat\":26.8228002103548},{\"lon\":112.573330872,\"lat\":26.8228063391622},{\"lon\":112.573327646909,\"lat\":26.8228124609577},{\"lon\":112.573324426983,\"lat\":26.8228185749099},{\"lon\":112.573321210588,\"lat\":26.8228246801823},{\"lon\":112.573317995803,\"lat\":26.8228307762173},{\"lon\":112.573314781099,\"lat\":26.8228368621259},{\"lon\":112.573311564666,\"lat\":26.8228429372788},{\"lon\":112.573308344862,\"lat\":26.822849000878},{\"lon\":112.573305119998,\"lat\":26.8228550522037},{\"lon\":112.573301888377,\"lat\":26.8228610905445},{\"lon\":112.573298648327,\"lat\":26.8228671151949},{\"lon\":112.573295398165,\"lat\":26.8228731254473},{\"lon\":112.573292136233,\"lat\":26.822879120603},{\"lon\":112.573288860863,\"lat\":26.8228850999821},{\"lon\":112.573285560822,\"lat\":26.8228910767817},{\"lon\":112.573282199005,\"lat\":26.822897124157},{\"lon\":112.573278821808,\"lat\":26.8229031714324},{\"lon\":112.573275437073,\"lat\":26.8229092033326},{\"lon\":112.573272042813,\"lat\":26.8229152188038},{\"lon\":112.573268637042,\"lat\":26.8229212167948},{\"lon\":112.573265217788,\"lat\":26.8229271962611},{\"lon\":112.573261783086,\"lat\":26.8229331561851},{\"lon\":112.573258330982,\"lat\":26.8229390955283},{\"lon\":112.573254859519,\"lat\":26.8229450132931},{\"lon\":112.573251366753,\"lat\":26.8229509084733},{\"lon\":112.573247850743,\"lat\":26.8229567800818},{\"lon\":112.57324430955,\"lat\":26.8229626271411},{\"lon\":112.573240741245,\"lat\":26.8229684486883},{\"lon\":112.573237142704,\"lat\":26.8229742453022},{\"lon\":112.573233541124,\"lat\":26.8229799700034},{\"lon\":112.573229900299,\"lat\":26.8229856807403},{\"lon\":112.573226220729,\"lat\":26.8229913784753},{\"lon\":112.573222503466,\"lat\":26.8229970634612},{\"lon\":112.573218749581,\"lat\":26.8230027359391},{\"lon\":112.573214960128,\"lat\":26.8230083961865},{\"lon\":112.573211136192,\"lat\":26.8230140444302},{\"lon\":112.573207278832,\"lat\":26.8230196809522},{\"lon\":112.573203389132,\"lat\":26.8230253060135},{\"lon\":112.573199468169,\"lat\":26.8230309198603},{\"lon\":112.573195517033,\"lat\":26.8230365227693},{\"lon\":112.573191536797,\"lat\":26.8230421150085},{\"lon\":112.573187548559,\"lat\":26.8230476745161},{\"lon\":112.57318546455338,\"lat\":26.823050549063097}]],\"obstaclePoint\":[{\"lon\":112.573443,\"lat\":26.822538},{\"lon\":112.573691,\"lat\":26.822676},{\"lon\":112.573021,\"lat\":26.823149},{\"lon\":112.572974,\"lat\":26.823199}],\"createTime\":1673506267760,\"createTimeStr\":\"2023-01-12 14:51:07\"}"
         val road1 = "{\"poiType\":\"100061\",\"receiveTime\":1673509755649,\"detectTime\":1673509755637,\"id\":\"86447e30-2dfc-4a27-8d01-41ffe9a9a7fe\",\"index\":\"636136931493457343\",\"polygon\":[{\"lon\":112.57337137520945,\"lat\":26.822950000610152},{\"lon\":112.5733703998375,\"lat\":26.82294943400411},{\"lon\":112.57336923793872,\"lat\":26.82294944578748},{\"lon\":112.57336827709125,\"lat\":26.82295003202963},{\"lon\":112.57336786590433,\"lat\":26.822950822795498},{\"lon\":112.57332583348149,\"lat\":26.823144415135413},{\"lon\":112.57332583904886,\"lat\":26.823145130116597},{\"lon\":112.57332615359141,\"lat\":26.82314578706645},{\"lon\":112.57332672775591,\"lat\":26.823146282906478},{\"lon\":112.57332747145331,\"lat\":26.823146539837108},{\"lon\":112.57332807078356,\"lat\":26.823146549872188},{\"lon\":112.57332882464814,\"lat\":26.82314631801647},{\"lon\":112.57332941903356,\"lat\":26.823145841742402},{\"lon\":112.57332970267485,\"lat\":26.82314536795171},{\"lon\":112.57339652767452,\"lat\":26.82297757920771},{\"lon\":112.57339644737766,\"lat\":26.82297673161999},{\"lon\":112.57339607387638,\"lat\":26.822976136665098},{\"lon\":112.57337137520945,\"lat\":26.822950000610152}],\"polygonRoads\":[{\"tileId\":556834853,\"roadId\":\"130314\",\"laneNo\":-1,\"bearing\":330,\"roadName\":\"雁鸣路\"},{\"tileId\":556834853,\"roadId\":\"130314\",\"laneNo\":-2,\"bearing\":330,\"roadName\":\"雁鸣路\"},{\"tileId\":556834853,\"roadId\":\"130314\",\"laneNo\":-3,\"bearing\":330,\"roadName\":\"雁鸣路\"},{\"tileId\":556834853,\"roadId\":\"130583\",\"laneNo\":-1,\"bearing\":278}],\"center\":{\"lon\":112.57336404707121,\"lat\":26.823024407262803},\"centerRoad\":{\"tileId\":556834853,\"roadId\":\"130314\",\"laneNo\":-2,\"bearing\":330,\"roadName\":\"雁鸣路\"},\"obstacles\":[{\"id\":0,\"type\":1,\"score\":88,\"polygon\":[{\"lon\":112.57334137965555,\"lat\":26.82313245733589},{\"lon\":112.573329020958,\"lat\":26.823145531571242},{\"lon\":112.57332663570918,\"lat\":26.823144025991855},{\"lon\":112.57333875695714,\"lat\":26.823130823353114}],\"boundBox\":[{\"x\":1439.8624267578125,\"y\":893.4229736328125},{\"x\":1474.45361328125,\"y\":893.4229736328125},{\"x\":1474.45361328125,\"y\":966.433837890625},{\"x\":1439.8624267578125,\"y\":966.433837890625}],\"center\":{\"lon\":112.57332779256919,\"lat\":26.823144756804734}},{\"id\":1,\"type\":1,\"score\":87,\"polygon\":[{\"lon\":112.57339986657128,\"lat\":26.822898951544797},{\"lon\":112.5733716620538,\"lat\":26.822952992001163},{\"lon\":112.57336786188131,\"lat\":26.822949186370185},{\"lon\":112.57339561566401,\"lat\":26.822894141465785}],\"boundBox\":[{\"x\":2085.054443359375,\"y\":503.0662841796875},{\"x\":2116.11865234375,\"y\":503.0662841796875},{\"x\":2116.11865234375,\"y\":559.9113159179688},{\"x\":2085.054443359375,\"y\":559.9113159179688}],\"center\":{\"lon\":112.5733698249888,\"lat\":26.822951164464232}},{\"id\":2,\"type\":1,\"score\":71,\"polygon\":[{\"lon\":112.57342641528835,\"lat\":26.82293191667262},{\"lon\":112.57339610867105,\"lat\":26.82297860774548},{\"lon\":112.5733928192764,\"lat\":26.822975877911627},{\"lon\":112.57342270277888,\"lat\":26.822928610829003}],\"boundBox\":[{\"x\":1873.2490234375,\"y\":507.2391357421875},{\"x\":1900.5283203125,\"y\":507.2391357421875},{\"x\":1900.5283203125,\"y\":562.299560546875},{\"x\":1873.2490234375,\"y\":562.299560546875}],\"center\":{\"lon\":112.57339452365564,\"lat\":26.822977300519444}}],\"imgUrl\":\"http://petchfile-1255510688.cos.ap-beijing.myqcloud.com/roadwork_image/2023-01-12/86447e30-2dfc-4a27-8d01-41ffe9a9a7fe_172_18_24_62.jpg?sign=q-sign-algorithm%3Dsha1%26q-ak%3DAKIDCWfcNwD5PXVWLxwejccR3Tiz5zhIkx0T%26q-sign-time%3D1673509757%3B1673516957%26q-key-time%3D1673509757%3B1673516957%26q-header-list%3D%26q-url-param-list%3D%26q-signature%3D557de14ddfb999d35ddef9e23b3532d9d299c62f\",\"ip\":\"172.18.24.62\",\"score\":82,\"radius\":0,\"type\":1,\"createTime\":1673509757496,\"createTimeStr\":\"2023-01-12 15:49:17\"}"
         val road2 = "{\"poiType\":\"100061\",\"receiveTime\":1673509756306,\"detectTime\":1673509756290,\"id\":\"be6a2000-a96c-42c8-a7ef-f83388d84858\",\"index\":\"636136931493532287\",\"polygon\":[{\"lon\":112.5733515539896,\"lat\":26.823143145432386},{\"lon\":112.57335140084462,\"lat\":26.823142454672727},{\"lon\":112.57335096472467,\"lat\":26.823141869074952},{\"lon\":112.57335031202503,\"lat\":26.82314147779103},{\"lon\":112.57334954211333,\"lat\":26.82314134039038},{\"lon\":112.57334877220161,\"lat\":26.82314147779103},{\"lon\":112.573348119502,\"lat\":26.823141869074952},{\"lon\":112.57334768338202,\"lat\":26.823142454672727},{\"lon\":112.57334753023707,\"lat\":26.823143145432386},{\"lon\":112.57334768338202,\"lat\":26.82314383619207},{\"lon\":112.57334811950196,\"lat\":26.82314442178987},{\"lon\":112.5733487722016,\"lat\":26.823144813073792},{\"lon\":112.57334954211333,\"lat\":26.823144950474443},{\"lon\":112.57335031202504,\"lat\":26.823144813073792},{\"lon\":112.57335096472468,\"lat\":26.82314442178987},{\"lon\":112.57335140084464,\"lat\":26.82314383619207},{\"lon\":112.5733515539896,\"lat\":26.823143145432386}],\"polygonRoads\":[{\"tileId\":556834853,\"roadId\":\"130314\",\"laneNo\":-4,\"bearing\":332,\"roadName\":\"雁鸣路\"}],\"center\":{\"lon\":112.57334952644263,\"lat\":26.823143141971546},\"centerRoad\":{\"tileId\":556834853,\"roadId\":\"130314\",\"laneNo\":-4,\"bearing\":332,\"roadName\":\"雁鸣路\"},\"obstacles\":[{\"id\":0,\"type\":1,\"score\":72,\"polygon\":[{\"lon\":112.57341760772391,\"lat\":26.823104379136176},{\"lon\":112.57335121413183,\"lat\":26.82314367391432},{\"lon\":112.57334751791018,\"lat\":26.823142500693834},{\"lon\":112.57341321183773,\"lat\":26.82310322131963}],\"boundBox\":[{\"x\":1551.2252197265625,\"y\":352.58837890625},{\"x\":1562.4649658203125,\"y\":352.58837890625},{\"x\":1562.4649658203125,\"y\":376.17327880859375},{\"x\":1551.2252197265625,\"y\":376.17327880859375}],\"center\":{\"lon\":112.57334952644263,\"lat\":26.823143141971546}}],\"imgUrl\":\"http://petchfile-1255510688.cos.ap-beijing.myqcloud.com/roadwork_image/2023-01-12/be6a2000-a96c-42c8-a7ef-f83388d84858_172_18_24_42.jpg?sign=q-sign-algorithm%3Dsha1%26q-ak%3DAKIDCWfcNwD5PXVWLxwejccR3Tiz5zhIkx0T%26q-sign-time%3D1673509758%3B1673516958%26q-key-time%3D1673509758%3B1673516958%26q-header-list%3D%26q-url-param-list%3D%26q-signature%3Db2682464078ae53eae6e87f924abe17fa7c04ac8\",\"ip\":\"172.18.24.42\",\"score\":72,\"radius\":0,\"type\":1,\"createTime\":1673509758511,\"createTimeStr\":\"2023-01-12 15:49:18\"}"
diff --git a/app/src/androidTest/java/com/mogo/functions/test/RxJavaBackPressureTest.kt b/app/src/androidTest/java/com/mogo/functions/test/RxJavaBackPressureTest.kt
index ef335d6bff..f46ac6f0a0 100644
--- a/app/src/androidTest/java/com/mogo/functions/test/RxJavaBackPressureTest.kt
+++ b/app/src/androidTest/java/com/mogo/functions/test/RxJavaBackPressureTest.kt
@@ -1,54 +1,54 @@
-package com.mogo.functions.test
-
-import android.os.Debug
-import androidx.test.core.app.ActivityScenario
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.filters.LargeTest
-import com.mogo.eagle.core.function.main.MainLauncherActivity
-import io.reactivex.Flowable
-import io.reactivex.plugins.RxJavaPlugins
-import io.reactivex.schedulers.Schedulers
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.runBlocking
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import java.text.SimpleDateFormat
-import java.util.*
-import java.util.concurrent.TimeUnit
-import java.util.concurrent.TimeUnit.MILLISECONDS
-
-@RunWith(AndroidJUnit4::class)
-@LargeTest
-class RxJavaBackPressureTest {
-
-    lateinit var launch: ActivityScenario<MainLauncherActivity>
-
-    @Before
-    fun before() {
-        launch = ActivityScenario.launch(MainLauncherActivity::class.java)
-        RxJavaPlugins.setErrorHandler {
-        }
-    }
-
-    @Test
-    fun testIntervalBackPressure() = runBlocking(Dispatchers.Default) {
-        val subscription = Flowable.interval(50, MILLISECONDS).doOnNext {
-        }.subscribeOn(Schedulers.computation()).observeOn(Schedulers.io()).subscribe {
-            Thread.sleep(2000)
-        }
-        repeat(10) {
-            delay(TimeUnit.SECONDS.toMillis(5))
-            try {
-                Debug.dumpHprofData(Date().toFileName())
-            } catch (t: Throwable) {
-                t.printStackTrace()
-            }
-        }
-        delay(TimeUnit.HOURS.toMillis(1))
-        subscription.dispose()
-    }
-
-    private fun Date.toFileName(): String = SimpleDateFormat("yyyyMMdd_HH_mm_ss", Locale.getDefault()).format(this) + ".hprof"
-}
\ No newline at end of file
+//package com.mogo.functions.test
+//
+//import android.os.Debug
+//import androidx.test.core.app.ActivityScenario
+//import androidx.test.ext.junit.runners.AndroidJUnit4
+//import androidx.test.filters.LargeTest
+//import com.mogo.eagle.core.function.main.MainLauncherActivity
+//import io.reactivex.Flowable
+//import io.reactivex.plugins.RxJavaPlugins
+//import io.reactivex.schedulers.Schedulers
+//import kotlinx.coroutines.Dispatchers
+//import kotlinx.coroutines.delay
+//import kotlinx.coroutines.runBlocking
+//import org.junit.Before
+//import org.junit.Test
+//import org.junit.runner.RunWith
+//import java.text.SimpleDateFormat
+//import java.util.*
+//import java.util.concurrent.TimeUnit
+//import java.util.concurrent.TimeUnit.MILLISECONDS
+//
+//@RunWith(AndroidJUnit4::class)
+//@LargeTest
+//class RxJavaBackPressureTest {
+//
+//    lateinit var launch: ActivityScenario<MainLauncherActivity>
+//
+//    @Before
+//    fun before() {
+//        launch = ActivityScenario.launch(MainLauncherActivity::class.java)
+//        RxJavaPlugins.setErrorHandler {
+//        }
+//    }
+//
+//    @Test
+//    fun testIntervalBackPressure() = runBlocking(Dispatchers.Default) {
+//        val subscription = Flowable.interval(50, MILLISECONDS).doOnNext {
+//        }.subscribeOn(Schedulers.computation()).observeOn(Schedulers.io()).subscribe {
+//            Thread.sleep(2000)
+//        }
+//        repeat(10) {
+//            delay(TimeUnit.SECONDS.toMillis(5))
+//            try {
+//                Debug.dumpHprofData(Date().toFileName())
+//            } catch (t: Throwable) {
+//                t.printStackTrace()
+//            }
+//        }
+//        delay(TimeUnit.HOURS.toMillis(1))
+//        subscription.dispose()
+//    }
+//
+//    private fun Date.toFileName(): String = SimpleDateFormat("yyyyMMdd_HH_mm_ss", Locale.getDefault()).format(this) + ".hprof"
+//}
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/mogo/functions/test/RxJavaSchedulersTest.kt b/app/src/androidTest/java/com/mogo/functions/test/RxJavaSchedulersTest.kt
index 58ac995932..a3531ea8e2 100644
--- a/app/src/androidTest/java/com/mogo/functions/test/RxJavaSchedulersTest.kt
+++ b/app/src/androidTest/java/com/mogo/functions/test/RxJavaSchedulersTest.kt
@@ -1,76 +1,76 @@
-package com.mogo.functions.test
-
-import androidx.test.core.app.ActivityScenario
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.filters.LargeTest
-import com.mogo.eagle.core.function.main.MainLauncherActivity
-import io.reactivex.Observable
-import io.reactivex.ObservableOnSubscribe
-import io.reactivex.schedulers.Schedulers
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.runBlocking
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import java.util.concurrent.TimeUnit.SECONDS
-
-@RunWith(AndroidJUnit4::class)
-@LargeTest
-class RxJavaSchedulersTest {
-
-    lateinit var launch: ActivityScenario<MainLauncherActivity>
-
-    @Before
-    fun before() {
-        launch = ActivityScenario.launch(MainLauncherActivity::class.java)
-    }
-
-    @Test
-    fun testRxJavaIoSchedulers() = runBlocking {
-        val list = mutableListOf<Int>()
-        for (i in 1..10) {
-            list += i
-        }
-        val result = Observable.fromIterable(list)
-            .doOnNext {
-                assert(Thread.currentThread().name.startsWith("io-pool-"))
-            }
-            .subscribeOn(Schedulers.io())
-            .reduce(0) { adder, toAdd ->
-                val sum = adder + toAdd
-                sum
-            }
-            .blockingGet()
-        assert(result == 55)
-
-        delay(SECONDS.toMillis(20))
-    }
-
-    @Test
-    fun testRxJavaCpuSchedulers() = runBlocking {
-        val result = Observable.create(ObservableOnSubscribe<Int> { emitter ->
-            for (i in 1..10) {
-                emitter.onNext(i)
-            }
-            assert(Thread.currentThread().name.startsWith("cpu-pool-"))
-            emitter.onComplete()
-        }).reduce(0) { adder, toAdd ->
-            adder + toAdd
-        }.subscribeOn(Schedulers.computation()).blockingGet()
-        assert(result == 55)
-        delay(SECONDS.toMillis(20))
-    }
-
-    @Test
-    fun testRxJavaIntervalSchedulers() = runBlocking {
-        var counter = 0
-        Observable.intervalRange(0, 10, 1, 1 ,SECONDS)
-            .doOnNext {
-                counter ++
-            }
-            .subscribe()
-        delay(SECONDS.toMillis(20))
-        assert(counter == 10)
-    }
-
-}
\ No newline at end of file
+//package com.mogo.functions.test
+//
+//import androidx.test.core.app.ActivityScenario
+//import androidx.test.ext.junit.runners.AndroidJUnit4
+//import androidx.test.filters.LargeTest
+//import com.mogo.eagle.core.function.main.MainLauncherActivity
+//import io.reactivex.Observable
+//import io.reactivex.ObservableOnSubscribe
+//import io.reactivex.schedulers.Schedulers
+//import kotlinx.coroutines.delay
+//import kotlinx.coroutines.runBlocking
+//import org.junit.Before
+//import org.junit.Test
+//import org.junit.runner.RunWith
+//import java.util.concurrent.TimeUnit.SECONDS
+//
+//@RunWith(AndroidJUnit4::class)
+//@LargeTest
+//class RxJavaSchedulersTest {
+//
+//    lateinit var launch: ActivityScenario<MainLauncherActivity>
+//
+//    @Before
+//    fun before() {
+//        launch = ActivityScenario.launch(MainLauncherActivity::class.java)
+//    }
+//
+//    @Test
+//    fun testRxJavaIoSchedulers() = runBlocking {
+//        val list = mutableListOf<Int>()
+//        for (i in 1..10) {
+//            list += i
+//        }
+//        val result = Observable.fromIterable(list)
+//            .doOnNext {
+//                assert(Thread.currentThread().name.startsWith("io-pool-"))
+//            }
+//            .subscribeOn(Schedulers.io())
+//            .reduce(0) { adder, toAdd ->
+//                val sum = adder + toAdd
+//                sum
+//            }
+//            .blockingGet()
+//        assert(result == 55)
+//
+//        delay(SECONDS.toMillis(20))
+//    }
+//
+//    @Test
+//    fun testRxJavaCpuSchedulers() = runBlocking {
+//        val result = Observable.create(ObservableOnSubscribe<Int> { emitter ->
+//            for (i in 1..10) {
+//                emitter.onNext(i)
+//            }
+//            assert(Thread.currentThread().name.startsWith("cpu-pool-"))
+//            emitter.onComplete()
+//        }).reduce(0) { adder, toAdd ->
+//            adder + toAdd
+//        }.subscribeOn(Schedulers.computation()).blockingGet()
+//        assert(result == 55)
+//        delay(SECONDS.toMillis(20))
+//    }
+//
+//    @Test
+//    fun testRxJavaIntervalSchedulers() = runBlocking {
+//        var counter = 0
+//        Observable.intervalRange(0, 10, 1, 1 ,SECONDS)
+//            .doOnNext {
+//                counter ++
+//            }
+//            .subscribe()
+//        delay(SECONDS.toMillis(20))
+//        assert(counter == 10)
+//    }
+//
+//}
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/mogo/functions/test/TipToastLeakTest.kt b/app/src/androidTest/java/com/mogo/functions/test/TipToastLeakTest.kt
index 833f3c87a1..fc6b89cc21 100644
--- a/app/src/androidTest/java/com/mogo/functions/test/TipToastLeakTest.kt
+++ b/app/src/androidTest/java/com/mogo/functions/test/TipToastLeakTest.kt
@@ -1,71 +1,71 @@
-package com.mogo.functions.test
-
-import androidx.test.core.app.ActivityScenario
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.filters.LargeTest
-import com.mogo.eagle.core.function.hmi.ui.MoGoHmiProvider
-import com.mogo.eagle.core.function.main.MainLauncherActivity
-import com.mogo.eagle.core.utilcode.mogo.toast.TipToast
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.suspendCancellableCoroutine
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import java.util.concurrent.Executors
-import java.util.concurrent.TimeUnit
-import java.util.concurrent.TimeUnit.MILLISECONDS
-
-@RunWith(AndroidJUnit4::class)
-@LargeTest
-class TipToastLeakTest {
-
-
-    lateinit var launch: ActivityScenario<MainLauncherActivity>
-
-    @Before
-    fun before() {
-        launch = ActivityScenario.launch(MainLauncherActivity::class.java)
-
-    }
-
-    @Test
-    fun test() = runBlocking(Dispatchers.Main) {
-        val f = ensureMoGoHmiFragmentShow()
-        var index = 0
-        while (index < 50) {
-            delay(TimeUnit.SECONDS.toMillis(4))
-            TipToast.shortTip("toast-> $index" )
-            index ++
-        }
-        delay(TimeUnit.SECONDS.toMillis(1))
-        f.activity?.finish()
-        delay(TimeUnit.SECONDS.toMillis(2))
-    }
-
-    private suspend fun ensureMoGoHmiFragmentShow(): MoGoHmiProvider = suspendCancellableCoroutine {
-        launch.onActivity { itx ->
-            val executor = Executors.newSingleThreadScheduledExecutor()
-            executor.scheduleAtFixedRate({
-                var find =
-                    itx.supportFragmentManager.fragments.find { it is MoGoHmiProvider } as? MoGoHmiProvider
-                while (find == null) {
-                    find =
-                        itx.supportFragmentManager.fragments.find { it is MoGoHmiProvider } as? MoGoHmiProvider
-
-                }
-                while (!find.isResumed) {
-                    Thread.sleep(500)
-                }
-                it.resumeWith(Result.success(find))
-                try {
-                    Thread.sleep(500)
-                    executor.shutdownNow()
-                } catch (e: Throwable) {
-                    e.printStackTrace()
-                }
-            }, 50, 500, MILLISECONDS)
-        }
-    }
-}
\ No newline at end of file
+//package com.mogo.functions.test
+//
+//import androidx.test.core.app.ActivityScenario
+//import androidx.test.ext.junit.runners.AndroidJUnit4
+//import androidx.test.filters.LargeTest
+//import com.mogo.eagle.core.function.hmi.ui.MoGoHmiProvider
+//import com.mogo.eagle.core.function.main.MainLauncherActivity
+//import com.mogo.eagle.core.utilcode.mogo.toast.TipToast
+//import kotlinx.coroutines.Dispatchers
+//import kotlinx.coroutines.delay
+//import kotlinx.coroutines.runBlocking
+//import kotlinx.coroutines.suspendCancellableCoroutine
+//import org.junit.Before
+//import org.junit.Test
+//import org.junit.runner.RunWith
+//import java.util.concurrent.Executors
+//import java.util.concurrent.TimeUnit
+//import java.util.concurrent.TimeUnit.MILLISECONDS
+//
+//@RunWith(AndroidJUnit4::class)
+//@LargeTest
+//class TipToastLeakTest {
+//
+//
+//    lateinit var launch: ActivityScenario<MainLauncherActivity>
+//
+//    @Before
+//    fun before() {
+//        launch = ActivityScenario.launch(MainLauncherActivity::class.java)
+//
+//    }
+//
+//    @Test
+//    fun test() = runBlocking(Dispatchers.Main) {
+//        val f = ensureMoGoHmiFragmentShow()
+//        var index = 0
+//        while (index < 50) {
+//            delay(TimeUnit.SECONDS.toMillis(4))
+//            TipToast.shortTip("toast-> $index" )
+//            index ++
+//        }
+//        delay(TimeUnit.SECONDS.toMillis(1))
+//        f.activity?.finish()
+//        delay(TimeUnit.SECONDS.toMillis(2))
+//    }
+//
+//    private suspend fun ensureMoGoHmiFragmentShow(): MoGoHmiProvider = suspendCancellableCoroutine {
+//        launch.onActivity { itx ->
+//            val executor = Executors.newSingleThreadScheduledExecutor()
+//            executor.scheduleAtFixedRate({
+//                var find =
+//                    itx.supportFragmentManager.fragments.find { it is MoGoHmiProvider } as? MoGoHmiProvider
+//                while (find == null) {
+//                    find =
+//                        itx.supportFragmentManager.fragments.find { it is MoGoHmiProvider } as? MoGoHmiProvider
+//
+//                }
+//                while (!find.isResumed) {
+//                    Thread.sleep(500)
+//                }
+//                it.resumeWith(Result.success(find))
+//                try {
+//                    Thread.sleep(500)
+//                    executor.shutdownNow()
+//                } catch (e: Throwable) {
+//                    e.printStackTrace()
+//                }
+//            }, 50, 500, MILLISECONDS)
+//        }
+//    }
+//}
\ No newline at end of file
diff --git a/config.gradle b/config.gradle
index 21d21eb8a1..c16883dd16 100644
--- a/config.gradle
+++ b/config.gradle
@@ -92,7 +92,7 @@ ext {
 
             // obu sdk
             obusdk                       : "com.zhidao.enterprise.smartv2x:smartv2x:1.0.0.3",
-            mogoobu                      : 'com.mogo.support.obu:mogo-obu:1.1.0_beta7',
+            mogoobu                      : 'com.mogo.support.obu:mogo-obu:1.1.0',
 
             // google
             googlezxing                  : "com.google.zxing:core:3.3.3",
diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt
index cd14fcae26..c9e60c8cf7 100644
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt
@@ -1,74 +1,53 @@
 package com.mogo.eagle.function.biz.v2x.v2n
 
-import android.content.Context
-import android.content.Intent
-import android.os.Build
-import android.os.Handler
-import android.os.Looper
-import android.util.Log
-import androidx.annotation.RequiresApi
-import androidx.localbroadcastmanager.content.LocalBroadcastManager
+import android.content.*
+import android.os.*
+import android.util.*
+import androidx.annotation.*
+import androidx.localbroadcastmanager.content.*
 import com.mogo.eagle.core.data.config.*
 import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_CLOUD_V2N
 import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_CLOUD
 import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_CLOUD_V2N
+import com.mogo.eagle.core.data.enums.*
 import com.mogo.eagle.core.data.enums.DataSourceType
-import com.mogo.eagle.core.data.enums.EventTypeEnumNew
-import com.mogo.eagle.core.data.enums.EventTypeHelper
-import com.mogo.eagle.core.data.enums.TrafficTypeEnum
+import com.mogo.eagle.core.data.enums.EventTypeEnumNew.Companion.isRoadEvent
 import com.mogo.eagle.core.data.enums.WarningDirectionEnum.ALERT_WARNING_TOP
-import com.mogo.eagle.core.data.map.MogoLocation
-import com.mogo.eagle.core.data.map.entity.V2XMessageEntity
-import com.mogo.eagle.core.data.map.entity.V2XRoadEventEntity
-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.data.traffic.TrafficData
-import com.mogo.eagle.core.data.v2x.V2XAdvanceWarning
-import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotIdentifyListener
-import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener
-import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener
+import com.mogo.eagle.core.data.map.*
+import com.mogo.eagle.core.data.map.entity.*
+import com.mogo.eagle.core.data.msgbox.*
+import com.mogo.eagle.core.data.traffic.*
+import com.mogo.eagle.core.data.v2x.*
+import com.mogo.eagle.core.function.api.autopilot.*
+import com.mogo.eagle.core.function.api.cloud.*
+import com.mogo.eagle.core.function.api.hmi.warning.*
 import com.mogo.eagle.core.function.api.map.angle.*
-import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotIdentifyListenerManager
-import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
-import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
-import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
-import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager
-import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager
-import com.mogo.eagle.function.biz.v2x.v2n.alarm.V2XAlarmServer
-import com.mogo.eagle.function.biz.v2x.v2n.bridge.BridgeApi
+import com.mogo.eagle.core.function.call.autopilot.*
+import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02
+import com.mogo.eagle.core.function.call.cloud.*
+import com.mogo.eagle.core.function.call.hmi.*
+import com.mogo.eagle.core.function.call.map.*
+import com.mogo.eagle.core.function.call.msgbox.*
+import com.mogo.eagle.core.utilcode.mogo.*
+import com.mogo.eagle.core.utilcode.mogo.logger.*
+import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_V2X
+import com.mogo.eagle.core.utilcode.util.*
+import com.mogo.eagle.function.biz.v2x.*
+import com.mogo.eagle.function.biz.v2x.v2n.V2XPoiLoader.Companion.v2xPoiLoader
+import com.mogo.eagle.function.biz.v2x.v2n.alarm.*
 import com.mogo.eagle.function.biz.v2x.v2n.consts.V2XConst.BROADCAST_SCENE_EXTRA_KEY
 import com.mogo.eagle.function.biz.v2x.v2n.consts.V2XConst.BROADCAST_SCENE_HANDLER_ACTION
-import com.mogo.eagle.function.biz.v2x.v2n.receiver.SceneBroadcastReceiver
-import com.mogo.eagle.function.biz.v2x.v2n.scenario.impl.V2XScenarioManager
-import com.mogo.eagle.function.biz.v2x.v2n.utils.toRoadMarker
-import com.mogo.eagle.core.data.v2x.V2XEvent
-import com.mogo.eagle.core.data.v2x.V2XMarkerCardResult
-import com.mogo.eagle.core.data.v2x.V2XWarningTarget
-import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
-import com.mogo.eagle.core.function.api.autopilot.IMoGoV2XListener
-import com.mogo.eagle.core.function.api.cloud.IMoGoCloudListener
-import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
-import com.mogo.eagle.core.function.call.autopilot.CallerV2XListenerManager
-import com.mogo.eagle.core.function.call.cloud.CallerCloudListenerManager
-import com.mogo.eagle.core.utilcode.mogo.*
-import com.mogo.eagle.function.biz.v2x.v2n.V2XPoiLoader.Companion.v2xPoiLoader
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
-import com.mogo.eagle.core.utilcode.mogo.logger.Logger
-import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_V2X
-import com.mogo.eagle.core.utilcode.util.Utils
-import com.mogo.eagle.function.biz.v2x.V2XBizTrace
-import com.mogo.eagle.function.biz.v2x.v2n.network.callback.IV2XCallback
-import com.zhjt.service.chain.ChainLog
-import com.zhjt.service.chain.TracingConstants
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.android.asCoroutineDispatcher
-import kotlinx.coroutines.cancel
-import kotlinx.coroutines.launch
-import java.util.concurrent.atomic.AtomicBoolean
+import com.mogo.eagle.function.biz.v2x.v2n.network.callback.*
+import com.mogo.eagle.function.biz.v2x.v2n.receiver.*
+import com.mogo.eagle.function.biz.v2x.v2n.scenario.impl.*
+import com.mogo.eagle.function.biz.v2x.v2n.utils.*
+import com.zhjt.service.chain.*
+import kotlinx.coroutines.*
+import kotlinx.coroutines.android.*
 import mogo.telematics.pad.MessagePad.PlanningObject
-import mogo.v2x.MogoV2X
+import mogo.v2x.*
+import java.util.concurrent.*
+import java.util.concurrent.atomic.*
 
 object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IV2XCallback,
     IMoGoAutopilotIdentifyListener, IMoGoCloudListener,
@@ -80,10 +59,11 @@ object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IV2XCallback,
         CoroutineScope(Handler(Looper.getMainLooper()).asCoroutineDispatcher(TAG))
     }
 
+    private val mV2XRoadEventEntityArrayList = CopyOnWriteArraySet<V2XRoadEventEntity>()
+
     private val hasInit by lazy { AtomicBoolean(false) }
 
     fun init(context: Context) {
-        BridgeApi.init(context)
         if (hasInit.compareAndSet(false, true)) {
             registerListener()
             v2xPoiLoader.startLoopPoi()
@@ -111,7 +91,6 @@ object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IV2XCallback,
     }
 
     override fun onChassisLocationGCJ02(mogoLocation: MogoLocation?) {
-        BridgeApi.location.set(mogoLocation)
         mogoLocation?.let {
             v2xPoiLoader.updateCheck(mogoLocation.longitude, mogoLocation.latitude)
             refreshCarState(mogoLocation)
@@ -120,9 +99,7 @@ object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IV2XCallback,
 
     private fun refreshCarState(location: MogoLocation) {
         // 巡航处理
-        val v2XRoadEventEntity = V2XAlarmServer.getDriveFrontAlarmEvent(
-            BridgeApi.v2xMarker()?.v2XRoadEventEntityList, location
-        )
+        val v2XRoadEventEntity = V2XAlarmServer.getDriveFrontAlarmEvent(getV2XRoadEventEntityList(), location)
         if (v2XRoadEventEntity != null) {
             val distance = v2XRoadEventEntity.distance
             val min = if (EventTypeEnumNew.isCloudSocketEvent(v2XRoadEventEntity.poiType)) 0 else 5
@@ -144,6 +121,29 @@ object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IV2XCallback,
         }
     }
 
+    private fun getV2XRoadEventEntityList(): CopyOnWriteArrayList<V2XRoadEventEntity> {
+        val roadEventEntities = CopyOnWriteArrayList<V2XRoadEventEntity>() // 当前车辆数据
+        val currentLocation = getChassisLocationGCJ02()
+        for (v2XRoadEventEntity in mV2XRoadEventEntityArrayList) { // 事件位置
+            val location = v2XRoadEventEntity.location
+            if (location != null) {
+                val calculateDistance = CoordinateUtils.calculateLineDistance(location.lat, location.lon, currentLocation.latitude, currentLocation.longitude)
+                v2XRoadEventEntity.distance = calculateDistance.toDouble()
+            }
+            roadEventEntities.add(v2XRoadEventEntity)
+        } // 按照与当前车辆距离排序
+        for (i in roadEventEntities.indices) {
+            for (j in i downTo 1) {
+                if (roadEventEntities[j].distance < roadEventEntities[j - 1].distance) {
+                    val v2XRoadEventEntity = roadEventEntities[j - 1]
+                    roadEventEntities[j - 1] = roadEventEntities[j]
+                    roadEventEntities[j] = v2XRoadEventEntity
+                }
+            }
+        }
+        return roadEventEntities
+    }
+
     /**
      * V2XEvent事件回调
      */
@@ -158,9 +158,6 @@ object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IV2XCallback,
     override fun onAck(event: V2XEvent) {
         Log.d("$M_V2X$TAG", "OK->: $event")
         when (event) {
-            is V2XEvent.ForwardsWarning -> {
-                handleAdvanceWarningEvent(event)
-            }
             is V2XEvent.Marker -> {
                 event.data.result?.let {
                     handleRoadMarkerEvent(it)
@@ -245,155 +242,35 @@ object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IV2XCallback,
     private fun handleRoadMarkerEvent(data: V2XMarkerCardResult) {
         try {
             scope.launch(Dispatchers.Default) {
-                BridgeApi.v2xMarker()?.analysisV2XRoadEvent(data)
+                analysisV2XRoadEvent(data)
             }
         } catch (e: Exception) {
             e.printStackTrace()
         }
     }
 
-    //todo 可优化，与obu解析类似
-    private fun handleAdvanceWarningEvent(event: V2XEvent.ForwardsWarning) {
-        scope.launch {
-            val message = event.data
-            val trafficData = buildTrafficData(message)
-            var changeVisualAngle = false
-            when (message.status) {
-                1 -> {
-                    var tempAppId = 0
-                    var tempTts = ""
-                    var tempContent = ""
-                    when (message.typeId) {
-                        1001 -> {
-                            // 弱势交通碰撞预警
-                            EventTypeHelper.getVRU { appId, tts, content ->
-                                tempAppId = appId
-                                tempTts = tts
-                                tempContent = content
-                            }
+    private fun analysisV2XRoadEvent(markerCardResult: V2XMarkerCardResult?) {
+        try { //当没有预警提示的时候重新绘制地图POI点
+            if (markerCardResult != null) { // 清除上次的道路事件， 这里注意，道路事件的触发和这里是异步操作会触发异常
+                mV2XRoadEventEntityArrayList.clear() // 获取探路以及新鲜事儿
+                val exploreWayList = markerCardResult.exploreWay
+                if (exploreWayList != null) {
+                    for (markerExploreWay in exploreWayList) {
+                        if (isRoadEvent(markerExploreWay.poiType)) {
+                            val markerLocation = markerExploreWay.location // 记录道路事件
+                            val v2XRoadEventEntity = V2XRoadEventEntity()
+                            v2XRoadEventEntity.location = markerLocation // 探路目前只有上报拥堵
+                            val poi = markerExploreWay.poiType
+                            v2XRoadEventEntity.poiType = poi
+                            v2XRoadEventEntity.noveltyInfo = markerExploreWay
+                            v2XRoadEventEntity.expireTime = 20000
+                            mV2XRoadEventEntityArrayList.add(v2XRoadEventEntity)
                         }
-                        1002 -> {
-                            // 弱势交通逆行预警
-                            EventTypeHelper.getVRURI { appId, tts, content ->
-                                tempAppId = appId
-                                tempTts = tts
-                                tempContent = content
-                            }
-                        }
-                        1003 -> {
-                            // 交叉路口碰撞预警
-                            changeVisualAngle = true
-                            tempAppId = EventTypeEnumNew.TYPE_USECASE_ID_ICW.poiType.toInt()
-                            tempTts = EventTypeEnumNew.TYPE_USECASE_ID_ICW.tts
-                            tempContent = EventTypeEnumNew.TYPE_USECASE_ID_ICW.content
-                        }
-                        1004 -> {
-                            // 交叉路口碰撞预警
-                            changeVisualAngle = true
-                            tempAppId = EventTypeEnumNew.TYPE_USECASE_ID_BSW.poiType.toInt()
-                            tempTts = String.format(
-                                EventTypeEnumNew.TYPE_USECASE_ID_BSW.tts,
-                                getWarningDirection()
-                            )
-                            tempContent = EventTypeEnumNew.TYPE_USECASE_ID_BSW.content
-                        }
-                        1006 -> {
-                            // 逆向超车预警
-                            tempAppId = EventTypeEnumNew.TYPE_USECASE_ID_DNPW.poiType.toInt()
-                            tempTts = EventTypeEnumNew.TYPE_USECASE_ID_DNPW.tts
-                            tempContent = EventTypeEnumNew.TYPE_USECASE_ID_DNPW.content
-                        }
-                        1005 -> {
-                            // 闯红灯预警
-                            tempAppId = EventTypeEnumNew.TYPE_USECASE_ID_IVP_RED.poiType.toInt()
-                            tempTts = EventTypeEnumNew.TYPE_USECASE_ID_IVP_RED.tts
-                            tempContent = EventTypeEnumNew.TYPE_USECASE_ID_IVP_RED.content
-                        }
-                        2001 -> {
-                            // 最优车道100061
-                            EventTypeHelper.getOptLine { appId, tts, content ->
-                                tempAppId = appId
-                                tempTts = tts
-                                tempContent = content
-                            }
-                        }
-                        3001 -> {
-                            // 前方道路拥堵预警
-                            EventTypeHelper.getTJW { appId, tts, content ->
-                                tempAppId = appId
-                                tempTts = tts
-                                tempContent = content
-                            }
-                        }
-                    }
-                    // 不显示弹框，其它保留
-                    if (tempContent.isEmpty() || tempTts.isEmpty()) {
-                        Log.d("MsgBox-V2XEventManager", "alertContent或ttsContent为空!")
-                    }
-                    CallerMsgBoxManager.saveMsgBox(
-                        MsgBoxBean(
-                            MsgBoxType.V2X,
-                            V2XMsg(
-                                tempAppId.toString(),
-                                tempContent,
-                                tempTts
-                            )
-                        )
-                    )
-                    CallerHmiManager.warningV2X(
-                        tempAppId.toString(),
-                        tempContent,
-                        tempTts,
-                        object : IMoGoWarningStatusListener {
-                            val change = changeVisualAngle
-                            override fun onShow() {
-                                if (change) {
-                                    CallerVisualAngleManager.changeAngle(TooClose)
-                                }
-                            }
-
-                            override fun onDismiss() {
-                                if (change) {
-                                    CallerVisualAngleManager.changeAngle(Default())
-                                }
-                            }
-                        }, isFromObu = false
-                    )
-                    CallerMapUIServiceManager.getMarkerService()?.updateITrafficInfo(trafficData)
-                }
-                2 -> {
-                    CallerMapUIServiceManager.getMarkerService()?.updateITrafficInfo(trafficData)
-                }
-                3 -> {
-                    trafficData.uuid?.let {
-                        CallerMapUIServiceManager.getMarkerService()?.removeCvxRvInfoIndInfo(it)
                     }
                 }
             }
-        }
-    }
-
-    private fun getWarningDirection(): String {
-        return "右" //TODO renwj 原来的逻辑,预警方向先写死, 后续做兼容
-    }
-
-    private fun buildTrafficData(message: V2XAdvanceWarning): TrafficData {
-        return TrafficData().apply {
-            type = when (message.objectType) {
-                1 -> TrafficTypeEnum.TYPE_TRAFFIC_ID_PEOPLE
-                2 -> TrafficTypeEnum.TYPE_TRAFFIC_ID_BICYCLE
-                3 -> TrafficTypeEnum.TYPE_TRAFFIC_ID_TA_CHE
-                4 -> TrafficTypeEnum.TYPE_TRAFFIC_ID_MOTO
-                6 -> TrafficTypeEnum.TYPE_TRAFFIC_ID_BUS
-                8 -> TrafficTypeEnum.TYPE_TRAFFIC_ID_TRUCK
-                9 -> TrafficTypeEnum.TYPE_TRAFFIC_ID_CAMERA
-                else -> TrafficTypeEnum.TYPE_TRAFFIC_ID_WEI_ZHI
-            }
-            uuid = message.objectId
-            lat = message.position?.lat ?: 0.0
-            lon = message.position?.lon ?: 0.0
-            heading = message.heading ?: 0.0
-            threatLevel = message.threatLevel ?: -1
+        } catch (e: java.lang.Exception) {
+            e.printStackTrace()
         }
     }
 
diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/bridge/BridgeApi.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/bridge/BridgeApi.kt
deleted file mode 100644
index 366a3c55ef..0000000000
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/bridge/BridgeApi.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.mogo.eagle.function.biz.v2x.v2n.bridge
-
-import android.content.Context
-import com.alibaba.android.arouter.launcher.ARouter
-import com.mogo.eagle.core.data.map.MogoLocation
-import com.mogo.eagle.function.biz.v2x.v2n.consts.MoGoV2XServicePaths
-import com.mogo.eagle.core.utilcode.util.Utils
-import com.mogo.eagle.function.biz.v2x.v2n.manager.IMoGoPersonWarnPolylineManager
-import com.mogo.eagle.function.biz.v2x.v2n.manager.IMoGoStopPolylineManager
-import com.mogo.eagle.function.biz.v2x.v2n.manager.IMoGoV2XMarkerManager
-import com.mogo.eagle.function.biz.v2x.v2n.manager.IMoGoWarnPolylineManager
-import java.lang.ref.WeakReference
-import java.util.concurrent.atomic.AtomicReference
-
-internal object BridgeApi {
-
-    private val context by lazy {
-        AtomicReference<WeakReference<Context>>(null)
-    }
-
-    val location by lazy {
-        AtomicReference<MogoLocation>()
-    }
-
-    private val v2xMarker by lazy {
-        ARouter.getInstance().build(MoGoV2XServicePaths.PATH_V2X_MARKER_MANAGER).navigation(context()) as? IMoGoV2XMarkerManager
-    }
-
-    private val v2xWarnPolyline by lazy {
-        ARouter.getInstance().build(MoGoV2XServicePaths.PATH_V2X_WARN_POLYLINE_MANAGER).navigation(
-            context()
-        ) as? IMoGoWarnPolylineManager
-    }
-
-    private val v2xPersonWarnPolyline by lazy {
-        ARouter.getInstance().build(MoGoV2XServicePaths.PATH_V2X_PERSON_WARN_POLYLINE_MANAGER).navigation(
-            context()
-        ) as? IMoGoPersonWarnPolylineManager
-    }
-
-    private val v2xStopPolyline by lazy {
-        ARouter.getInstance().build(MoGoV2XServicePaths.PATH_V2X_STOP_POLYLINE_MANAGER).navigation(
-            context()
-        ) as? IMoGoStopPolylineManager
-    }
-
-    fun init(context: Context) {
-        BridgeApi.context.set(WeakReference(context))
-    }
-
-    fun context(): Context = context.get()?.get() ?: Utils.getApp()
-
-    fun v2xMarker() = v2xMarker
-
-    fun v2xWarnPolyline() = v2xWarnPolyline
-
-    fun v2xPersonWarnPolyline() = v2xPersonWarnPolyline
-
-    fun v2xStopPolyline() = v2xStopPolyline
-}
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/consts/MoGoV2XServicePaths.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/consts/MoGoV2XServicePaths.java
deleted file mode 100644
index 4e4e959694..0000000000
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/consts/MoGoV2XServicePaths.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.mogo.eagle.function.biz.v2x.v2n.consts;
-
-import androidx.annotation.Keep;
-
-/**
- * author : donghongyu
- * e-mail : 1358506549@qq.com
- * date   : 2020/4/17 7:35 PM
- * desc   : 对外服务模块路径
- * version: 1.0
- * 使用方式：
- * Arouter.getInstance().path("").navigate()
- */
-@Keep
-public class MoGoV2XServicePaths {
-
-    /**
-     * V2X 道路事件POI点
-     */
-    @Keep
-    public static final String PATH_V2X_MARKER_MANAGER = "/v2xMarkerManager/api";
-
-
-    /**
-     * V2X 道路事件与车辆的连接线
-     */
-    @Keep
-    public static final String PATH_V2X_WARN_POLYLINE_MANAGER = "/v2xWarnPolylineManager/api";
-
-    /**
-     * V2X 二轮车和行人连接线
-     */
-    @Keep
-    public static final String PATH_V2X_PERSON_WARN_POLYLINE_MANAGER = "/v2xPersonWarnPolylineManager/api";
-
-    /**
-     * V2X 停止线连接线
-     */
-    @Keep
-    public static final String PATH_V2X_STOP_POLYLINE_MANAGER = "/v2xStopPolylineManager/api";
-}
diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/consts/V2XConst.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/consts/V2XConst.java
index 049d25ada1..257b34eabe 100644
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/consts/V2XConst.java
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/consts/V2XConst.java
@@ -16,10 +16,5 @@ public class V2XConst {
     public static final String BROADCAST_SCENE_HANDLER_ACTION = "com.v2x.scene_handler_broadcast";
     public static final String BROADCAST_SCENE_EXTRA_KEY = "V2XMessageEntity";
 
-
-    /**
-     * V2X预警日志tag
-     */
-    public static final String LOG_NAME_WARN = "PersonWarn";
-
+    public static final String V2X_MARKER_OWNER = "v2x_road_marker_owner";
 }
diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/IMoGoPersonWarnPolylineManager.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/IMoGoPersonWarnPolylineManager.java
deleted file mode 100644
index 81ff12f98f..0000000000
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/IMoGoPersonWarnPolylineManager.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.mogo.eagle.function.biz.v2x.v2n.manager;
-
-import android.content.Context;
-
-import com.alibaba.android.arouter.facade.template.IProvider;
-import com.mogo.eagle.core.data.v2x.DrawLineInfo;
-import com.mogo.map.overlay.IMogoPolyline;
-
-/**
- * 绘制可变宽度和渐变的线，
- */
-public interface IMoGoPersonWarnPolylineManager extends IProvider {
-    /**
-     * 绘制连接线，人物和二轮车
-     *
-     * @param context
-     * @param info
-     */
-    void drawPersonWarnPolyline(Context context, DrawLineInfo info);
-
-    /**
-     * 移除连接线
-     */
-    void clearLine();
-
-    IMogoPolyline getMogoPersonWarnPolyline();
-}
diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/IMoGoStopPolylineManager.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/IMoGoStopPolylineManager.java
deleted file mode 100644
index 2df7a2d0fd..0000000000
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/IMoGoStopPolylineManager.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.mogo.eagle.function.biz.v2x.v2n.manager;
-
-import android.content.Context;
-
-import com.alibaba.android.arouter.facade.template.IProvider;
-import com.mogo.eagle.core.data.v2x.DrawLineInfo;
-import com.mogo.map.overlay.IMogoPolyline;
-
-/**
- * 绘制可变宽度和渐变的线
- */
-public interface IMoGoStopPolylineManager extends IProvider {
-    /**
-     * 绘制连接线，目标车，与当前车辆间连线
-     *
-     * @param context
-     * @param info
-     */
-    void drawStopPolyline(Context context, DrawLineInfo info);
-
-    /**
-     * 移除连接线
-     */
-    void clearLine();
-
-    IMogoPolyline getMogoStopPolyline();
-}
diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/IMoGoV2XMarkerManager.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/IMoGoV2XMarkerManager.java
deleted file mode 100644
index 4118457e0c..0000000000
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/IMoGoV2XMarkerManager.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.mogo.eagle.function.biz.v2x.v2n.manager;
-
-import android.content.Context;
-
-import com.alibaba.android.arouter.facade.template.IProvider;
-import com.mogo.eagle.core.data.map.entity.V2XRoadEventEntity;
-import com.mogo.map.marker.IMogoMarker;
-import com.mogo.map.marker.IMogoMarkerClickListener;
-import com.mogo.eagle.core.data.v2x.V2XMarkerCardResult;
-
-import java.util.concurrent.CopyOnWriteArrayList;
-
-/**
- * author : donghongyu
- * e-mail : 1358506549@qq.com
- * date   : 2020/4/17 8:15 PM
- * desc   : V2X 涉及到的地图 POI 点的绘制
- * version: 1.0
- */
-public interface IMoGoV2XMarkerManager extends IProvider {
-
-    /**
-     * 获取所有的道路事件点，探路事件，返回结果是按照距离当前车辆从近到远排列好的
-     *
-     * @return 按从近到远排列好的道路事件
-     */
-    CopyOnWriteArrayList<V2XRoadEventEntity> getV2XRoadEventEntityList();
-
-    /**
-     * 从探路数据和新鲜事儿的路况信息中解析出道路事件信息
-     */
-    void analysisV2XRoadEvent(V2XMarkerCardResult markerCardResult);
-
-    /**
-     * 绘制正在预警的道路事件的POI点
-     *  @param context
-     * @param roadEventEntity
-     * @return
-     */
-    IMogoMarker drawableAlarmPOI(Context context, V2XRoadEventEntity roadEventEntity, IMogoMarkerClickListener clickListener);
-}
diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/IMoGoWarnPolylineManager.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/IMoGoWarnPolylineManager.java
deleted file mode 100644
index b888d21d03..0000000000
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/IMoGoWarnPolylineManager.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.mogo.eagle.function.biz.v2x.v2n.manager;
-
-import android.content.Context;
-
-import com.alibaba.android.arouter.facade.template.IProvider;
-import com.mogo.eagle.core.data.v2x.DrawLineInfo;
-import com.mogo.map.overlay.IMogoPolyline;
-
-/**
- * 绘制可变宽度和渐变的线
- */
-public interface IMoGoWarnPolylineManager extends IProvider {
-    /**
-     * 绘制连接线，目标车，与当前车辆间连线
-     *
-     * @param context
-     * @param info
-     */
-    void drawWarnPolyline(Context context, DrawLineInfo info);
-
-    /**
-     * 移除连接线
-     */
-    void clearLine();
-
-    IMogoPolyline getMogoWarnPolyline();
-}
diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/impl/MoGoPersonWarnPolylineManager.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/impl/MoGoPersonWarnPolylineManager.java
deleted file mode 100644
index e1da74057e..0000000000
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/impl/MoGoPersonWarnPolylineManager.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.mogo.eagle.function.biz.v2x.v2n.manager.impl;
-
-import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_V2X;
-
-import android.content.Context;
-
-import com.alibaba.android.arouter.facade.annotation.Route;
-import com.mogo.eagle.core.data.map.MogoLatLng;
-import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
-import com.mogo.eagle.function.biz.v2x.v2n.consts.MoGoV2XServicePaths;
-import com.mogo.eagle.function.biz.v2x.v2n.consts.V2XConst;
-import com.mogo.eagle.core.data.v2x.DrawLineInfo;
-import com.mogo.eagle.function.biz.v2x.v2n.manager.IMoGoPersonWarnPolylineManager;
-import com.mogo.map.overlay.IMogoOverlayManager;
-import com.mogo.map.overlay.IMogoPolyline;
-import com.mogo.map.overlay.MogoPolylineOptions;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 绘制行人和二轮车连线
- */
-@Route(path = MoGoV2XServicePaths.PATH_V2X_PERSON_WARN_POLYLINE_MANAGER)
-public class MoGoPersonWarnPolylineManager implements IMoGoPersonWarnPolylineManager {
-    private static IMogoPolyline mMogoPolyline;
-
-
-    @Override
-    public void drawPersonWarnPolyline(Context context, DrawLineInfo info) {
-        if (info == null) {
-            return;
-        }
-
-        try {
-            if (mMogoPolyline != null) {
-                mMogoPolyline.remove();
-            }
-
-            // 连接线参数
-            MogoPolylineOptions options = new MogoPolylineOptions().setGps(true);
-
-            // 渐变色
-            List<Integer> colors = new ArrayList<>();
-            colors.add(0x0DE32F46);
-            colors.add(0xD9E32F46);
-            colors.add(0x0DE32F46);
-
-            // 线条粗细，渐变，渐变色值
-            CallerLogger.INSTANCE.d(M_V2X + V2XConst.LOG_NAME_WARN, "MoGoPersonWarnPolylineManager  width = " + info.getWidth());
-            options.width(info.getWidth()).useGradient(true).colorValues(colors);
-            List<MogoLatLng> locations = info.getLocations();
-            for (int i = 0; i < locations.size(); i++) {
-                options.add(locations.get(i));
-            }
-            // 绘制线的对象
-            IMogoOverlayManager overlay = CallerMapUIServiceManager.INSTANCE.getOverlayManager();
-            if (overlay != null) {
-                mMogoPolyline = overlay.addPolyline(options);
-                mMogoPolyline.setTransparency(0.5f);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Override
-    public void clearLine() {
-        if (mMogoPolyline != null) {
-            mMogoPolyline.remove();
-            mMogoPolyline = null;
-        }
-    }
-
-    @Override
-    public void init(Context context) {
-
-    }
-
-    /**
-     * @return 绘制连接线的对象
-     */
-    @Override
-    public IMogoPolyline getMogoPersonWarnPolyline() {
-        return mMogoPolyline;
-    }
-}
diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/impl/MoGoStopPolylineManager.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/impl/MoGoStopPolylineManager.java
deleted file mode 100644
index 806688aabf..0000000000
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/impl/MoGoStopPolylineManager.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package com.mogo.eagle.function.biz.v2x.v2n.manager.impl;
-
-import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_V2X;
-
-import android.content.Context;
-
-import com.alibaba.android.arouter.facade.annotation.Route;
-import com.mogo.eagle.core.data.map.MogoLatLng;
-import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
-import com.mogo.eagle.function.biz.v2x.v2n.consts.MoGoV2XServicePaths;
-import com.mogo.eagle.function.biz.v2x.v2n.consts.V2XConst;
-import com.mogo.eagle.core.data.v2x.DrawLineInfo;
-import com.mogo.eagle.function.biz.v2x.v2n.manager.IMoGoStopPolylineManager;
-import com.mogo.map.overlay.IMogoOverlayManager;
-import com.mogo.map.overlay.IMogoPolyline;
-import com.mogo.map.overlay.MogoPolylineOptions;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 当前车辆与道路事件的连接线
- */
-@Route(path = MoGoV2XServicePaths.PATH_V2X_STOP_POLYLINE_MANAGER)
-public class MoGoStopPolylineManager implements IMoGoStopPolylineManager {
-    private static IMogoPolyline mMogoPolyline;
-
-    @Override
-    public void drawStopPolyline(Context context, DrawLineInfo info) {
-        if (info == null) {
-            return;
-        }
-
-        try {
-            if (mMogoPolyline != null) {
-                mMogoPolyline.remove();
-            }
-
-            // 连接线参数
-            MogoPolylineOptions options = new MogoPolylineOptions()
-                    .setGps(true);
-            List<Integer> colors = new ArrayList<>();
-            colors.add(0x0DE32F46);
-            colors.add(0xD9E32F46);
-            colors.add(0x0DE32F46);
-
-            CallerLogger.INSTANCE.d(M_V2X + V2XConst.LOG_NAME_WARN, "MoGoStopPolylineManager  roadWidth = " + info.getWidth());
-            // 线条粗细，渐变，渐变色值
-            // 当前车辆位置
-            options.width(info.getWidth() == 0.0 ? 60 : info.getWidth()).useGradient(true).colorValues(colors);
-            List<MogoLatLng> locations = info.getLocations();
-            for (int i = 0; i < locations.size(); i++) {
-                options.add(locations.get(i));
-            }
-            // 绘制线的对象
-            IMogoOverlayManager overlay = CallerMapUIServiceManager.INSTANCE.getOverlayManager();
-            if (overlay != null) {
-                mMogoPolyline = overlay.addPolyline(options);
-            }
-            if (mMogoPolyline != null) {
-                mMogoPolyline.setTransparency(0.5f);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Override
-    public void clearLine() {
-        if (mMogoPolyline != null) {
-            mMogoPolyline.remove();
-            mMogoPolyline = null;
-        }
-    }
-
-    @Override
-    public void init(Context context) {
-
-    }
-
-
-    @Override
-    public IMogoPolyline getMogoStopPolyline() {
-        return mMogoPolyline;
-    }
-}
diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/impl/MoGoV2XMarkerManager.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/impl/MoGoV2XMarkerManager.java
deleted file mode 100644
index 006662d122..0000000000
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/impl/MoGoV2XMarkerManager.java
+++ /dev/null
@@ -1,153 +0,0 @@
-package com.mogo.eagle.function.biz.v2x.v2n.manager.impl;
-
-import static com.mogo.commons.module.ServiceConst.CARD_TYPE_NOVELTY;
-import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_V2X;
-
-import android.content.Context;
-
-import com.alibaba.android.arouter.facade.annotation.Route;
-import com.mogo.eagle.core.data.enums.EventTypeEnumNew;
-import com.mogo.eagle.core.data.map.MogoLatLng;
-import com.mogo.eagle.core.data.map.MogoLocation;
-import com.mogo.eagle.core.data.map.entity.MarkerExploreWay;
-import com.mogo.eagle.core.data.map.entity.MarkerLocation;
-import com.mogo.eagle.core.data.map.entity.MarkerShowEntity;
-import com.mogo.eagle.core.data.map.entity.V2XRoadEventEntity;
-import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager;
-import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
-import com.mogo.eagle.function.biz.v2x.v2n.consts.MoGoV2XServicePaths;
-import com.mogo.eagle.function.biz.v2x.v2n.manager.IMoGoV2XMarkerManager;
-import com.mogo.eagle.function.biz.v2x.v2n.marker.V2XMarkerAdapter;
-import com.mogo.eagle.function.biz.v2x.v2n.utils.MapUtils;
-import com.mogo.eagle.core.data.v2x.V2XMarkerCardResult;
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
-import com.mogo.eagle.core.utilcode.util.CoordinateUtils;
-import com.mogo.map.marker.IMogoMarker;
-import com.mogo.map.marker.IMogoMarkerClickListener;
-import com.mogo.map.marker.MogoMarkerOptions;
-
-import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.CopyOnWriteArraySet;
-
-/**
- * author : donghongyu
- * e-mail : 1358506549@qq.com
- * date   : 2020/4/17 9:57 PM
- * desc   : V2X 涉及到的地图 POI 点的绘制
- * version: 1.0
- */
-@Route(path = MoGoV2XServicePaths.PATH_V2X_MARKER_MANAGER)
-public class MoGoV2XMarkerManager implements IMoGoV2XMarkerManager {
-    private static final String TAG = "MoGoV2XMarkerManager";
-
-    // 记录所有的：新鲜事儿的道路事件点、探路事件
-    private final CopyOnWriteArraySet<V2XRoadEventEntity> mV2XRoadEventEntityArrayList = new CopyOnWriteArraySet<>();
-
-    @Override
-    public void init(Context context) {}
-
-    @Override
-    public CopyOnWriteArrayList<V2XRoadEventEntity> getV2XRoadEventEntityList() {
-        CopyOnWriteArrayList<V2XRoadEventEntity> roadEventEntities = new CopyOnWriteArrayList<>();
-        // 当前车辆数据
-        MogoLocation currentLocation = CallerChassisLocationGCJ02ListenerManager.INSTANCE.getChassisLocationGCJ02();
-        if (currentLocation != null) {
-            // 重新计算距离
-            for (V2XRoadEventEntity v2XRoadEventEntity : mV2XRoadEventEntityArrayList) {
-                // 事件位置
-                MarkerLocation location = v2XRoadEventEntity.getLocation();
-                if (location != null) {
-                    float calculateDistance = CoordinateUtils.calculateLineDistance(location.getLat(), location.getLon(),
-                            currentLocation.getLatitude(), currentLocation.getLongitude());
-                    v2XRoadEventEntity.setDistance(calculateDistance);
-                }
-                roadEventEntities.add(v2XRoadEventEntity);
-            }
-            // 按照与当前车辆距离排序
-            for (int i = 0; i < roadEventEntities.size(); i++) {
-                for (int j = i; j > 0; j--) {
-                    if (roadEventEntities.get(j).getDistance() < roadEventEntities.get(j - 1).getDistance()) {
-                        V2XRoadEventEntity v2XRoadEventEntity = roadEventEntities.get(j - 1);
-                        roadEventEntities.set(j - 1, roadEventEntities.get(j));
-                        roadEventEntities.set(j, v2XRoadEventEntity);
-                    }
-                }
-            }
-        }
-        return roadEventEntities;
-    }
-
-    @Override
-    public void analysisV2XRoadEvent(V2XMarkerCardResult markerCardResult) {
-        try {
-            //当没有预警提示的时候重新绘制地图POI点
-            if (markerCardResult != null) {
-                // 清除上次的道路事件， 这里注意，道路事件的触发和这里是异步操作会触发异常
-                mV2XRoadEventEntityArrayList.clear();
-                // 获取探路以及新鲜事儿
-                List<MarkerExploreWay> exploreWayList = markerCardResult.getExploreWay();
-                if (exploreWayList != null) {
-                    for (MarkerExploreWay markerExploreWay : exploreWayList) {
-                        if (EventTypeEnumNew.isRoadEvent(markerExploreWay.getPoiType())) {
-                            MarkerLocation markerLocation = markerExploreWay.getLocation();
-                            // 记录道路事件
-                            V2XRoadEventEntity v2XRoadEventEntity = new V2XRoadEventEntity();
-                            v2XRoadEventEntity.setLocation(markerLocation);
-                            // 探路目前只有上报拥堵
-                            String poi = markerExploreWay.getPoiType();
-                            v2XRoadEventEntity.setPoiType(poi);
-                            v2XRoadEventEntity.setNoveltyInfo(markerExploreWay);
-                            v2XRoadEventEntity.setExpireTime(20000);
-                            mV2XRoadEventEntityArrayList.add(v2XRoadEventEntity);
-                        }
-                    }
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Override
-    public IMogoMarker drawableAlarmPOI(Context context, V2XRoadEventEntity roadEventEntity, IMogoMarkerClickListener clickListener) {
-        try {
-            // 清除原来的大而全的新鲜事儿
-            if (roadEventEntity.getLocation() != null) {
-                // 道路事件，或者水波纹扩散效果
-                MogoMarkerOptions optionsRipple = new MogoMarkerOptions()
-                        .data(roadEventEntity)
-                        .latitude(roadEventEntity.getLocation().getLat())
-                        .longitude(roadEventEntity.getLocation().getLon());
-                optionsRipple.anchor(0.5f, 0.5f);
-                MarkerShowEntity markerShowEntity = new MarkerShowEntity();
-                MarkerExploreWay markerExploreWay = roadEventEntity.getNoveltyInfo();
-                markerShowEntity.setBindObj(markerExploreWay);
-                markerShowEntity.setChecked(false);
-                markerShowEntity.setTextContent(markerExploreWay.getAddr());
-                markerShowEntity.setMarkerLocation(markerExploreWay.getLocation());
-                markerShowEntity.setMarkerType(CARD_TYPE_NOVELTY);
-                optionsRipple.icons(V2XMarkerAdapter.getV2XRoadEventViewGif(context, roadEventEntity));
-                optionsRipple.period(1);
-                IMogoMarker ret = Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMarkerService()).drawMarker(markerShowEntity);
-                // 当前Marker设置为最上面
-                if (ret != null) {
-                    ret.setToTop();
-                }
-                // 缩放地图
-                MapUtils.zoomMap(
-                        new MogoLatLng(roadEventEntity.getLocation().getLat(),
-                                roadEventEntity.getLocation().getLon()
-                        ), context);
-
-                return ret;
-            } else {
-                CallerLogger.INSTANCE.e(M_V2X + TAG, "Location 必须进行初始化！！！！！");
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-}
diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/impl/MoGoWarnPolylineManager.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/impl/MoGoWarnPolylineManager.java
deleted file mode 100644
index b0ae820d1f..0000000000
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/impl/MoGoWarnPolylineManager.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.mogo.eagle.function.biz.v2x.v2n.manager.impl;
-
-import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_V2X;
-
-import android.content.Context;
-
-import com.alibaba.android.arouter.facade.annotation.Route;
-import com.mogo.eagle.core.data.map.MogoLatLng;
-import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
-import com.mogo.eagle.function.biz.v2x.v2n.consts.MoGoV2XServicePaths;
-import com.mogo.eagle.core.data.v2x.DrawLineInfo;
-import com.mogo.eagle.function.biz.v2x.v2n.manager.IMoGoWarnPolylineManager;
-import com.mogo.map.overlay.IMogoOverlayManager;
-import com.mogo.map.overlay.IMogoPolyline;
-import com.mogo.map.overlay.MogoPolylineOptions;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 当前车辆与道路事件的连接线
- */
-@Route(path = MoGoV2XServicePaths.PATH_V2X_WARN_POLYLINE_MANAGER)
-public class MoGoWarnPolylineManager implements IMoGoWarnPolylineManager {
-    private static IMogoPolyline mMogoPolyline;
-    private static final String TAG = "V2XWarningMarker";
-
-    @Override
-    public void drawWarnPolyline(Context context, DrawLineInfo info) {
-        if (info == null) {
-            return;
-        }
-
-        try {
-            if (mMogoPolyline != null) {
-                mMogoPolyline.remove();
-            }
-
-            // 连接线参数
-            MogoPolylineOptions options = new MogoPolylineOptions()
-                    .setGps(true);
-            List<Integer> colors = new ArrayList<>();
-
-            if (info.isHasStopLines()) {
-                colors.add(0x0D3036FF);
-                colors.add(0xD93036FF);
-                colors.add(0x0D3036FF);
-            } else {
-                colors.add(0x0DE32F46);
-                colors.add(0xD9E32F46);
-                colors.add(0x0DE32F46);
-            }
-
-            CallerLogger.INSTANCE.d(M_V2X + TAG, "MoGoWarnPolylineManager  roadWidth = " + info.getWidth());
-            // 线条粗细，渐变，渐变色值
-            options.width(info.getWidth() == 0.0 ? 60 : info.getWidth()).useGradient(true).colorValues(colors);
-            List<MogoLatLng> locations = info.getLocations();
-            for (int i = 0; i < locations.size(); i++) {
-                options.add(locations.get(i));
-            }
-            // 绘制线的对象
-
-            IMogoOverlayManager overlay = CallerMapUIServiceManager.INSTANCE.getOverlayManager();
-            if (overlay != null) {
-                mMogoPolyline = overlay.addPolyline(options);
-            }
-            if (mMogoPolyline != null) {
-                mMogoPolyline.setTransparency(0.5f);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Override
-    public void clearLine() {
-        if (mMogoPolyline != null) {
-            mMogoPolyline.remove();
-            mMogoPolyline = null;
-        } else {
-            CallerLogger.INSTANCE.d(M_V2X + TAG, "mMogoPolyline==null");
-        }
-    }
-
-    @Override
-    public void init(Context context) {
-
-    }
-
-    /**
-     * @return 绘制连接线的对象
-     */
-    @Override
-    public IMogoPolyline getMogoWarnPolyline() {
-        return mMogoPolyline;
-    }
-
-}
diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/marker/V2XMarkerAdapter.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/marker/V2XMarkerAdapter.java
deleted file mode 100644
index a144505d5c..0000000000
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/marker/V2XMarkerAdapter.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package com.mogo.eagle.function.biz.v2x.v2n.marker;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import com.mogo.eagle.core.data.enums.EventTypeEnumNew;
-import com.mogo.eagle.core.data.map.entity.V2XRoadEventEntity;
-import com.mogo.eagle.core.function.biz.R;
-import com.mogo.eagle.function.biz.v2x.v2n.view.V2XMarkerRoadEventView;
-import java.util.ArrayList;
-
-/**
- * author : donghongyu
- * e-mail : 1358506549@qq.com
- * date   : 2020-01-1015:55
- * desc   : V2X 地图气泡
- * version: 1.0
- */
-public class V2XMarkerAdapter {
-
-    /**
-     * 返回道路事件
-     */
-    public static Bitmap getV2XRoadEventMarkerView(Context context, V2XRoadEventEntity alarmInfo, int imageRes) {
-        return new V2XMarkerRoadEventView(context, alarmInfo).setBackground(imageRes).getView();
-    }
-
-    /**
-     * 返回道路事件gif序列图集合
-     */
-    public static ArrayList<Bitmap> getV2XRoadEventViewGif(Context context, V2XRoadEventEntity alarmInfo) {
-        ArrayList<Bitmap> bitmapArrayList;
-        if (EventTypeEnumNew.ALERT_TRAFFIC_LIGHT_SUGGEST.getPoiType().equals(alarmInfo.getPoiType())
-                || EventTypeEnumNew.ALERT_TRAFFIC_LIGHT_WARNING.getPoiType().equals(alarmInfo.getPoiType())
-                || EventTypeEnumNew.FOURS_BLOCK_UP.getPoiType().equals(alarmInfo.getPoiType())
-                || EventTypeEnumNew.ALERT_CAR_TROUBLE_WARNING.getPoiType().equals(alarmInfo.getPoiType())) {
-            bitmapArrayList = getV2XRoadEventOrangeMarkerView(context, alarmInfo);
-        } else {
-            bitmapArrayList = getV2XRoadEventRedMarkerView(context, alarmInfo);
-        }
-        return bitmapArrayList;
-    }
-
-    /**
-     * 返回红色扩散效果的序列
-     */
-    public static ArrayList<Bitmap> getV2XRoadEventRedMarkerView(Context context, V2XRoadEventEntity alarmInfo) {
-        ArrayList<Bitmap> icons = new ArrayList<>();
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_red_00011));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_red_00012));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_red_00013));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_red_00014));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_red_00015));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_red_00016));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_red_00017));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_red_00018));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_red_00019));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_red_00020));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_red_00021));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_red_00022));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_red_00023));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_red_00024));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_red_00025));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_red_00026));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_red_00027));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_red_00028));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_red_00029));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_red_00030));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_red_00031));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_red_00032));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_red_00033));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_red_00034));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_red_00035));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_red_00036));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_red_00037));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_red_00038));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_red_00039));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_red_00040));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_red_00041));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_red_00042));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_red_00043));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_red_00044));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_red_00045));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_red_00046));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_red_00047));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_red_00048));
-        return icons;
-    }
-
-    /**
-     * 返回橘色色扩散效果的序列
-     */
-    public static ArrayList<Bitmap> getV2XRoadEventOrangeMarkerView(Context context, V2XRoadEventEntity alarmInfo) {
-        ArrayList<Bitmap> icons = new ArrayList<>();
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00011));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00012));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00013));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00014));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00015));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00016));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00017));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00018));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00019));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00020));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00021));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00022));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00023));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00024));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00025));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00026));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00027));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00028));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00029));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00030));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00031));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00032));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00033));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00034));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00035));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00036));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00037));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00038));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00039));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00040));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00041));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00042));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00043));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00044));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00045));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00046));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00047));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00048));
-        return icons;
-    }
-
-}
diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/remove/MarkerRemoveManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/remove/MarkerRemoveManager.kt
index 310481a8e9..cbb47b2dee 100644
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/remove/MarkerRemoveManager.kt
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/remove/MarkerRemoveManager.kt
@@ -6,10 +6,11 @@ import android.util.Log
 import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager
+import com.mogo.eagle.core.function.call.map.*
 import com.mogo.eagle.core.utilcode.util.CoordinateUtils
 import com.mogo.eagle.core.utilcode.util.DrivingDirectionUtils
-import com.mogo.map.marker.IMogoMarker
-import com.mogo.map.overlay.IMogoPolyline
+import com.mogo.map.overlay.line.*
+import com.mogo.map.overlay.point.*
 import kotlinx.coroutines.Runnable
 import java.util.*
 import java.util.concurrent.ConcurrentHashMap
@@ -17,9 +18,9 @@ import java.util.concurrent.atomic.AtomicBoolean
 import java.util.concurrent.atomic.AtomicReference
 
 
-data class MarkerWrapper(val id: String, val lon: Double, val lat: Double, val coordinateType: Int, var markers: ArrayList<IMogoMarker>? = null, var lines: ArrayList<IMogoPolyline>? = null, var onRemoved:((id: String) -> Unit)? = null) {
+data class MarkerWrapper(val id: String, val lon: Double, val lat: Double, val coordinateType: Int, var markers: ArrayList<Point>? = null, var lines: ArrayList<Polyline>? = null, var onRemoved:((id: String) -> Unit)? = null) {
 
-    fun addLine(line: IMogoPolyline) {
+    fun addLine(line: Polyline) {
         var ll = this.lines
         if (ll == null) {
             ll = ArrayList()
@@ -28,7 +29,7 @@ data class MarkerWrapper(val id: String, val lon: Double, val lat: Double, val c
         ll.add(line)
     }
 
-    fun addMarker(marker: IMogoMarker) {
+    fun addPoint(marker: Point) {
         var mm = this.markers
         if (mm == null) {
             mm = ArrayList()
@@ -72,7 +73,6 @@ object MarkerRemoveManager {
     private val checkTask = object : Runnable {
 
         override fun run() {
-
             try {
                 Log.d(TAG, "--- checkTask --- 1 ---")
                 if (lastCarLocation.get() == null) {
@@ -113,8 +113,7 @@ object MarkerRemoveManager {
                             marker.markers?.forEach {
                                 try {
                                     Log.e(TAG, "--- checkTask --- remove marker: $it, id: ${marker.id}")
-                                    it.setVisible(false)
-                                    it.destroy()
+                                    CallerMapUIServiceManager.getOverlayManager()?.removePoint(it.id)
                                 } catch (t: Throwable) {
                                     t.printStackTrace()
                                     removeMarkerError = true
@@ -124,9 +123,8 @@ object MarkerRemoveManager {
                             var removeLineError = false
                             marker.lines?.forEach {
                                 try {
-                                    it.isVisible = false
+                                    CallerMapUIServiceManager.getOverlayManager()?.removeLine(it)
                                     Log.e(TAG, "--- checkTask --- remove line : $it, id:${marker.id}")
-                                    it.destroy()
                                 } catch (t: Throwable) {
                                     t.printStackTrace()
                                     removeLineError = true
@@ -172,9 +170,9 @@ object MarkerRemoveManager {
                 t.printStackTrace()
             } finally {
                 val gcInfo = CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02()
-                lastCarLocation.set((gcInfo?.longitude ?: 0.0) to (gcInfo?.latitude ?: 0.0))
+                lastCarLocation.set(gcInfo.longitude to gcInfo.latitude)
                 val wgsInfo = CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84()
-                lastGpsLocation.set((wgsInfo?.longitude ?: 0.0) to (wgsInfo?.latitude ?: 0.0))
+                lastGpsLocation.set(wgsInfo.longitude to wgsInfo.latitude)
                 handler.postDelayed(this, 1000)
             }
         }
diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt
index daf151375b..6a7bbadd8c 100644
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt
@@ -3,6 +3,7 @@ package com.mogo.eagle.function.biz.v2x.v2n.scenario.scene.airoad
 import android.animation.ArgbEvaluator
 import android.graphics.Color
 import android.os.Handler
+import android.os.HandlerThread
 import android.os.Looper
 import android.util.Log
 import android.view.animation.DecelerateInterpolator
@@ -14,12 +15,13 @@ import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
 import com.mogo.eagle.core.utilcode.util.CoordinateUtils
 import com.mogo.eagle.core.utilcode.util.DrivingDirectionUtils
 import com.mogo.eagle.function.biz.v2x.V2XBizTrace
+import com.mogo.eagle.function.biz.v2x.v2n.consts.V2XConst
 import com.mogo.eagle.function.biz.v2x.v2n.remove.MarkerRemoveManager
 import com.mogo.eagle.function.biz.v2x.v2n.remove.MarkerWrapper
 import com.mogo.eagle.function.biz.v2x.v2n.scenario.scene.road.V2XAiRoadEventMarker
 import com.mogo.map.MogoMap
-import com.mogo.map.overlay.IMogoPolyline
-import com.mogo.map.overlay.MogoPolylineOptions
+import com.mogo.map.overlay.core.Level.ROAD_CENTER_LINE
+import com.mogo.map.overlay.line.*
 import java.util.*
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.atomic.AtomicReference
@@ -47,12 +49,16 @@ class AiRoadMarker {
 
     private val roadMarker by lazy { V2XAiRoadEventMarker() }
 
-    private val line = AtomicReference<IMogoPolyline>()
+    private val line = AtomicReference<Polyline>()
 
     private val handler by lazy {
         Handler(Looper.getMainLooper())
     }
 
+    private val v2nDrawHandler by lazy {
+        HandlerThread("v2n_draw_thread").let { it.start(); Handler(it.looper)}
+    }
+
     private val checkExpiredTask = Runnable {
         val poi = this.marker.get()
         val car = CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84()
@@ -64,128 +70,118 @@ class AiRoadMarker {
         }
     }
 
-    private val options by lazy {
-        MogoPolylineOptions().apply {
-            zIndex(40000f)
-            setGps(true)
-            width(50f)
-            useGradient(true)
-        }
+    private val builder by lazy {
+        Polyline.Options.Builder(V2XConst.V2X_MARKER_OWNER, ROAD_CENTER_LINE).setIsGradient(true).setWidth(50f).setUseGps(true)
     }
 
     fun marker(marker: Marker, drawMarker: Boolean, drawRoadLine: Boolean = false) {
-        val location = CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84()
-        this.marker.set(marker)
-        val wrapper = MarkerWrapper(marker.id, marker.poi_lon, marker.poi_lat, 1, null, null)
-        if (drawMarker) {
-            marker.entity?.apply { roadMarker.drawMarkers(this, wrapper) }
-        }
-        if (drawRoadLine) {
-            //施工中心点前方的自车行驶方向上300米距离
-            val l1 = MogoMap.getInstance().mogoMap.getCenterLineRangeInfo(
-                marker.poi_lon,
-                marker.poi_lat,
-                location.heading.toFloat(),
-                300f
-            )
-            //施工中心点后方的自车行驶方向上300米距离
-            Log.d(TAG, "--- marker --- 3 --- l1:$l1")
-            V2XBizTrace.onAck("$TAG --- marker --- 3 --- l1:", l1)
-            val l2 = MogoMap.getInstance().mogoMap.getCenterLineRangeInfo(
-                marker.poi_lon,
-                marker.poi_lat,
-                location.heading.toFloat(),
-                -300f
-            )
-            if (l1.points.isEmpty() || l2.points.isEmpty()) {
-                Log.d(TAG, " --- marker --- 3 --- return ----")
-                V2XBizTrace.onAck("$TAG --- marker --- 3 --- return ----", "")
-                return
+        v2nDrawHandler.post {
+            val location = CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84()
+            this.marker.set(marker)
+            val wrapper = MarkerWrapper(marker.id, marker.poi_lon, marker.poi_lat, 1, null, null)
+            if (drawMarker) {
+                marker.entity?.apply { roadMarker.drawMarkers(this, wrapper) }
             }
-            Log.d(TAG, " --- marker --- 4 --- l2: $l2")
-            V2XBizTrace.onAck("$TAG --- marker --- 4 --- l2:", l2)
-            val points = LinkedList<MogoLatLng>()
-            if (l2 != null && l2.points.isNotEmpty()) {
-                points.addAll(l2.points.reversed().map {
-                    MogoLatLng(it.second, it.first)
-                })
-            }
-            val centerX = marker.poi_lon
-            val centerY = marker.poi_lat
-            Log.d(TAG, "--- marker --- 5 --- marker: $marker")
-            V2XBizTrace.onAck("$TAG --- marker --- 5 --- marker:", marker)
-            val farthestPoint = marker.polygon?.let {
-                var find: Pair<Double, Double> = Pair(centerX, centerY)
-                var min = Long.MAX_VALUE
-                for (p in it) {
-                    val angle = DrivingDirectionUtils.getDegreeOfCar2Poi2(
-                        centerX,
-                        centerY,
-                        p.first,
-                        p.second,
-                        location.heading
-                    )
-                    if (angle < min) {
-                        min = angle
-                        find = p
+            if (drawRoadLine) {
+                Log.d(TAG, "--- marker --- 1 ---")
+                //施工中心点前方的自车行驶方向上300米距离
+                val l1 = MogoMap.getInstance().mogoMap.getCenterLineRangeInfo(
+                    marker.poi_lon,
+                    marker.poi_lat,
+                    location.heading.toFloat(),
+                    300f
+                )
+                //施工中心点后方的自车行驶方向上300米距离
+                Log.d(TAG, "--- marker --- 3 --- l1:$l1")
+                V2XBizTrace.onAck("$TAG --- marker --- 3 --- l1:", l1)
+                val l2 = MogoMap.getInstance().mogoMap.getCenterLineRangeInfo(
+                    marker.poi_lon,
+                    marker.poi_lat,
+                    location.heading.toFloat(),
+                    -300f
+                )
+                if (l1.points.isEmpty() || l2.points.isEmpty()) {
+                    Log.d(TAG, " --- marker --- 3 --- return ----")
+                    V2XBizTrace.onAck("$TAG --- marker --- 3 --- return ----", "")
+                    return@post
+                }
+                Log.d(TAG, " --- marker --- 4 --- l2: $l2")
+                V2XBizTrace.onAck("$TAG --- marker --- 4 --- l2:", l2)
+                val points = LinkedList<MogoLatLng>()
+                if (l2 != null && l2.points.isNotEmpty()) {
+                    points.addAll(l2.points.reversed().map {
+                        MogoLatLng(it.second, it.first)
+                    })
+                }
+                val centerX = marker.poi_lon
+                val centerY = marker.poi_lat
+                Log.d(TAG, "--- marker --- 5 --- marker: $marker")
+                V2XBizTrace.onAck("$TAG --- marker --- 5 --- marker:", marker)
+                val farthestPoint = marker.polygon?.let {
+                    var find: Pair<Double, Double> = Pair(centerX, centerY)
+                    var min = Long.MAX_VALUE
+                    for (p in it) {
+                        val angle = DrivingDirectionUtils.getDegreeOfCar2Poi2(
+                            centerX,
+                            centerY,
+                            p.first,
+                            p.second,
+                            location.heading
+                        )
+                        if (angle < min) {
+                            min = angle
+                            find = p
+                        }
+                    }
+                    MogoLatLng(find.second, find.first)
+                } ?: MogoLatLng(centerY, centerX)
+                marker.farthestPoint = Pair(farthestPoint.lon, farthestPoint.lat)
+                Log.d(TAG, "--- marker --- 6 --- marker:$marker")
+                V2XBizTrace.onAck("$TAG --- marker --- 6 --- marker:", marker)
+                if (l1 != null && l1.points.isNotEmpty()) {
+                    for (l in l1.points) {
+                        if (DrivingDirectionUtils.getDegreeOfCar2Poi2(
+                                farthestPoint.lon,
+                                farthestPoint.lat,
+                                l.first,
+                                l.second,
+                                (location.heading + 180)
+                            ) < 90L
+                        ) {
+                            points.add(l.let { MogoLatLng(it.second, it.first) })
+                        }
                     }
                 }
-                MogoLatLng(find.second, find.first)
-            } ?: MogoLatLng(centerY, centerX)
-            marker.farthestPoint = Pair(farthestPoint.lon, farthestPoint.lat)
-            Log.d(TAG, "--- marker --- 6 --- marker:$marker")
-            V2XBizTrace.onAck("$TAG --- marker --- 6 --- marker:", marker)
-            if (l1 != null && l1.points.isNotEmpty()) {
-                for (l in l1.points) {
-                    if (DrivingDirectionUtils.getDegreeOfCar2Poi2(
-                            farthestPoint.lon,
-                            farthestPoint.lat,
-                            l.first,
-                            l.second,
-                            (location.heading + 180)
-                        ) < 90L
-                    ) {
-                        points.add(l.let { MogoLatLng(it.second, it.first) })
-                    }
+                if (points.size <= 1) {
+                    return@post
+                }
+                val evaluator = ArgbEvaluator()
+                val interceptor = DecelerateInterpolator(1.5f)
+                val total = points.size
+                val colors = ArrayList<Int>()
+                (0..total).forEach { i ->
+                    colors += evaluator.evaluate(
+                        interceptor.getInterpolation(i * 1f / total),
+                        START_COLOR,
+                        END_COLOR
+                    ) as Int
+                }
+                builder.points(points)
+                builder.colors(colors)
+                builder.setVisible(true)
+                Log.d(TAG,  "--- marker --- 7 --- points:${points.size}")
+                V2XBizTrace.onAck("$TAG --- marker --- 7 --- points:", "${points.size}")
+                val line = overlayManager?.showOrUpdateLine(builder.build())
+                if (line != null) {
+                    this.line.set(line)
+                    wrapper.addLine(line)
                 }
             }
-            if (points.size <= 1) {
-                return
-            }
-            val evaluator = ArgbEvaluator()
-            val interceptor = DecelerateInterpolator(1.5f)
-            val total = points.size
-            val colors = ArrayList<Int>()
-            (0..total).forEach { i ->
-                colors += evaluator.evaluate(
-                    interceptor.getInterpolation(i * 1f / total),
-                    START_COLOR,
-                    END_COLOR
-                ) as Int
-            }
-            var line = line.get()
-            options.points(points)
-            options.colorValues(colors)
-            Log.d(TAG,  "--- marker --- 7 --- points:${points.size}")
-            V2XBizTrace.onAck("$TAG --- marker --- 7 --- points:", "${points.size}")
-            if (line == null || line.isDestroyed) {
-                val l = overlayManager?.addPolyline(options)
-                this.line.set(l)
-                line = l
-            } else {
-                line.setOption(options)
-            }
-            if (!line.isVisible) {
-                line.isVisible = true
-            }
-            if (line != null) {
-                wrapper.addLine(line)
+            wrapper.onRemoved = { id ->
+                aiMakers.remove(id)
             }
+            MarkerRemoveManager.addMarker(wrapper)
         }
-        wrapper.onRemoved = { id ->
-            aiMakers.remove(id)
-        }
-        MarkerRemoveManager.addMarker(wrapper)
     }
 
     private fun removeLine() {
@@ -196,19 +192,20 @@ class AiRoadMarker {
             Log.d(TAG,"--- removeRedLine --- 2")
             V2XBizTrace.onAck("$TAG --- removeRedLine --- 2", "")
             line.set(null)
-            old.isVisible = false
-            old.remove()
+            old.delegate?.remove()
         }
     }
 
     private fun unMarker(marker: Marker) {
-        Log.d(TAG,"$TAG --- unMarker ---")
-        V2XBizTrace.onAck("$TAG --- unMarker ---", "")
-        this.marker.set(null)
-        removeLine()
-        roadMarker.removeMarkers()
-        handler.removeCallbacks(checkExpiredTask)
-        aiMakers.remove(marker.id)
+        v2nDrawHandler.post {
+            Log.d(TAG,"$TAG --- unMarker ---")
+            V2XBizTrace.onAck("$TAG --- unMarker ---", "")
+            this.marker.set(null)
+            removeLine()
+            roadMarker.removeMarkers()
+            handler.removeCallbacks(checkExpiredTask)
+            aiMakers.remove(marker.id)
+        }
     }
 
     fun receive() {
diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XAiRoadEventMarker.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XAiRoadEventMarker.kt
index 92c0ee63a2..09335d777d 100644
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XAiRoadEventMarker.kt
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XAiRoadEventMarker.kt
@@ -5,50 +5,50 @@ import com.mogo.eagle.core.data.enums.EventTypeEnumNew
 import com.mogo.eagle.core.data.map.MogoLatLng
 import com.mogo.eagle.core.data.map.entity.V2XRoadEventEntity
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
-import com.mogo.eagle.function.biz.v2x.v2n.bridge.BridgeApi.context
-import com.mogo.eagle.function.biz.v2x.v2n.bridge.BridgeApi.v2xMarker
+import com.mogo.eagle.function.biz.v2x.v2n.consts.V2XConst
 import com.mogo.eagle.function.biz.v2x.v2n.remove.MarkerWrapper
-import com.mogo.map.marker.IMogoMarker
-import com.mogo.map.overlay.IMogoPolyline
-import com.mogo.map.overlay.MogoPolylineOptions
+import com.mogo.map.overlay.core.*
+import com.mogo.map.overlay.line.*
+import com.mogo.map.overlay.point.*
 import java.util.concurrent.atomic.AtomicReference
 
 class V2XAiRoadEventMarker {
 
-    private val current = AtomicReference<Pair<IMogoPolyline?, List<IMogoMarker>?>>()
-
-    private val overlayManager by lazy { CallerMapUIServiceManager.getOverlayManager() }
+    private val current = AtomicReference<Pair<Polyline?, List<Point>?>>()
 
     fun drawMarkers(entity: V2XRoadEventEntity, wrapper: MarkerWrapper) {
         val polygon = entity.noveltyInfo.polygon
-        v2xMarker()?.drawableAlarmPOI(context(), entity, null)?.also {
-            wrapper.addMarker(it)
-        }
+        CallerMapUIServiceManager.getOverlayManager()?.showOrUpdatePoint(
+            Point.Options
+                .Builder(V2XConst.V2X_MARKER_OWNER, Level.MAP_MARKER)
+                .longitude(entity.location.lon)
+                .latitude(entity.location.lat)
+                .icon3DRes(EventTypeEnumNew.getMarker3DRes(entity.poiType))
+                .set3DMode(true)
+                .build())?.also { wrapper.addPoint(it) }
         if (polygon != null && polygon.isNotEmpty() && entity.poiType != EventTypeEnumNew.TYPE_SOCKET_ROAD_JINGZHI.poiType) {
-            val options = MogoPolylineOptions()
+            val builder = Polyline.Options.Builder(V2XConst.V2X_MARKER_OWNER, Level.MAP_POLYGON)
             val colors = ArrayList<Int>()
             colors.add(Color.argb(204, 237, 172, 21))
             colors.add(Color.argb(0, 255, 255, 255))
-            options.colorValues(colors)
+            builder.colors(colors)
             val points = ArrayList<MogoLatLng>()
-
             for (p in polygon) {
                 points.add(MogoLatLng(p.second, p.first))
             }
             if (points.size > 2) {
                 points.add(points[0])
             }
-            options.points(points)
-            options.useGradient(true)
-            options.useFacade(true)
-            options.setGps(true)
-            options.width(5f)
-            options.zIndex(75000f)
-            options.maxIndex(800000f)
-            val line = overlayManager?.addPolyline(options)
+            builder.points(points)
+            builder.setIsGradient(true)
+            builder.useFacade(true)
+            builder.setUseGps(true)
+            builder.setWidth(5f)
+            builder.setMaxIndex(800000f)
+            builder.setVisible(true)
+            val line = CallerMapUIServiceManager.getOverlayManager()?.showOrUpdateLine(builder.build())
             line?.let {
                 current.set(Pair(line, wrapper.markers))
-                line.isVisible = true
                 wrapper.addLine(line)
             }
         }
@@ -61,15 +61,15 @@ class V2XAiRoadEventMarker {
         }
     }
 
-    private fun realRemove(pair: Pair<IMogoPolyline?, List<IMogoMarker>?>) {
+    private fun realRemove(pair: Pair<Polyline?, List<Point>?>) {
         val line = pair.first
-        if (line != null && line.isVisible) {
-            line.remove()
+        if (line != null) {
+            CallerMapUIServiceManager.getOverlayManager()?.removeLine(line.id)
         }
         val markers = pair.second
         if (markers != null && markers.isNotEmpty()) {
             for (m in markers) {
-                m.remove()
+                CallerMapUIServiceManager.getOverlayManager()?.removePoint(m.id)
             }
         }
     }
diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventMarker.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventMarker.java
index f1c733afc2..381b852113 100644
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventMarker.java
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventMarker.java
@@ -7,15 +7,17 @@ import com.mogo.eagle.core.data.enums.EventTypeEnumNew;
 import com.mogo.eagle.core.data.map.entity.MarkerExploreWay;
 import com.mogo.eagle.core.data.map.entity.MarkerLocation;
 import com.mogo.eagle.core.data.map.entity.V2XRoadEventEntity;
+import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.function.biz.v2x.V2XBizTrace;
-import com.mogo.eagle.function.biz.v2x.v2n.bridge.BridgeApi;
-import com.mogo.eagle.function.biz.v2x.v2n.manager.IMoGoV2XMarkerManager;
+import com.mogo.eagle.function.biz.v2x.v2n.consts.V2XConst;
 import com.mogo.eagle.function.biz.v2x.v2n.remove.MarkerWrapper;
 import com.mogo.eagle.function.biz.v2x.v2n.remove.MarkerRemoveManager;
 import com.mogo.eagle.function.biz.v2x.v2n.scenario.scene.airoad.AiRoadMarker;
 import com.mogo.eagle.function.biz.v2x.v2n.scenario.view.IV2XMarker;
-import com.mogo.map.marker.IMogoMarker;
+import com.mogo.map.overlay.IMoGoOverlayManager;
+import com.mogo.map.overlay.core.Level;
+import com.mogo.map.overlay.point.Point;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -30,8 +32,8 @@ public class V2XRoadEventMarker implements IV2XMarker<V2XRoadEventEntity> {
     public void drawPOI(V2XRoadEventEntity entity) {
         try {
             // 清除道路事件
-            IMoGoV2XMarkerManager marker = BridgeApi.INSTANCE.v2xMarker();
-            if (marker != null) {
+            IMoGoOverlayManager overlayManager = CallerMapUIServiceManager.INSTANCE.getOverlayManager();
+            if (overlayManager != null) {
                 if (entity != null) {
                     V2XBizTrace.Companion.onAck("V2XRoadEventMarker -> poiType : ", entity.getPoiType());
                     if (isAiRoadEvent(entity.getPoiType())) {
@@ -47,11 +49,16 @@ public class V2XRoadEventMarker implements IV2XMarker<V2XRoadEventEntity> {
                             AiRoadMarker.aiMakers.put(noveltyInfo.getInfoId(), aiMarker);
                         }
                     } else {
-                        IMogoMarker iMarker = marker.drawableAlarmPOI(BridgeApi.INSTANCE.context(), entity, null);
-                        if (iMarker != null) {
+                        Point point = overlayManager.showOrUpdatePoint(
+                                new Point.Options.Builder(V2XConst.V2X_MARKER_OWNER, Level.MAP_MARKER)
+                                        .longitude(entity.getLocation().getLon())
+                                        .latitude(entity.getLocation().getLat())
+                                        .set3DMode(true)
+                                        .icon3DRes(EventTypeEnumNew.getMarker3DRes(entity.getPoiType())).build());
+                        if (point != null) {
                             V2XBizTrace.Companion.onAck("V2XRoadEventMarker -> --- add Marker type: ", entity.getPoiType());
-                            ArrayList<IMogoMarker> markers = new ArrayList<>();
-                            markers.add(iMarker);
+                            ArrayList<Point> markers = new ArrayList<>();
+                            markers.add(point);
                             String id = entity.getLocation().getLon() + "_" + entity.getLocation().getLat();
                             MarkerRemoveManager.INSTANCE.addMarker(new MarkerWrapper(id, entity.getLocation().getLon(), entity.getLocation().getLat(), 0, markers, null, null));
                         } else  {
diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XFrontWarningScenario.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XFrontWarningScenario.java
index 56c2e609aa..4799a8fc3b 100644
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XFrontWarningScenario.java
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XFrontWarningScenario.java
@@ -7,9 +7,7 @@ import android.text.Spannable;
 import android.text.SpannableStringBuilder;
 import android.text.style.ForegroundColorSpan;
 import android.util.Log;
-
 import androidx.annotation.Nullable;
-
 import com.mogo.eagle.core.data.enums.EventTypeEnumNew;
 import com.mogo.eagle.core.data.enums.WarningDirectionEnum;
 import com.mogo.eagle.core.data.map.MogoLocation;
@@ -25,7 +23,6 @@ import com.mogo.eagle.function.biz.v2x.v2n.scenario.impl.AbsV2XScenario;
 import com.mogo.eagle.function.biz.v2x.v2n.scenario.view.IV2XMarker;
 import com.mogo.eagle.core.data.v2x.V2XWarningTarget;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
-
 import java.math.BigDecimal;
 import java.util.Locale;
 import java.util.concurrent.TimeUnit;
@@ -37,7 +34,7 @@ import java.util.concurrent.TimeUnit;
  */
 public class V2XFrontWarningScenario extends AbsV2XScenario implements IMoGoChassisLocationGCJ02Listener, IMoGoWarningStatusListener {
     private static final String TAG = "V2XWarningMarker";
-    private static final V2XWarningMarker sV2XWarningMarker = new V2XWarningMarker();
+//    private static final V2XWarningMarker sV2XWarningMarker = new V2XWarningMarker();
     private V2XWarningTarget mMarkerEntity;
 
     private WarningDirectionEnum mDirection;
@@ -132,7 +129,7 @@ public class V2XFrontWarningScenario extends AbsV2XScenario implements IMoGoChas
 
     @Override
     public void onChassisLocationGCJ02(@Nullable MogoLocation gnssInfo) {
-        sV2XWarningMarker.onCarLocationChanged2(gnssInfo);
+//        sV2XWarningMarker.onCarLocationChanged2(gnssInfo);
     }
 
     private WarningDirectionEnum getDirection(){
diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XWarningMarker.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XWarningMarker.java
index 1fcf53c350..571ac758f6 100644
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XWarningMarker.java
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XWarningMarker.java
@@ -1,446 +1,446 @@
-package com.mogo.eagle.function.biz.v2x.v2n.scenario.scene.warning;
-
-import static com.mogo.eagle.core.data.constants.DataTypes.TYPE_MARKER_CLOUD_STOP_LINE_DATA;
-import static com.mogo.eagle.core.data.constants.DataTypes.TYPE_MARKER_CLOUD_WARN_DATA;
-import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_V2X;
-
-import com.mogo.commons.AbsMogoApplication;
-import com.mogo.commons.module.status.MogoStatusManager;
-import com.mogo.commons.utils.Trigonometric;
-import com.mogo.eagle.core.data.map.MogoLatLng;
-import com.mogo.eagle.core.data.map.MogoLocation;
-import com.mogo.eagle.core.data.v2x.DrawLineInfo;
-import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager;
-import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
-import com.mogo.eagle.function.biz.v2x.v2n.bridge.BridgeApi;
-import com.mogo.eagle.function.biz.v2x.v2n.manager.IMoGoPersonWarnPolylineManager;
-import com.mogo.eagle.function.biz.v2x.v2n.manager.IMoGoStopPolylineManager;
-import com.mogo.eagle.function.biz.v2x.v2n.manager.IMoGoWarnPolylineManager;
-import com.mogo.eagle.function.biz.v2x.v2n.scenario.view.IV2XMarker;
-import com.mogo.eagle.core.data.v2x.V2XLocation;
-import com.mogo.eagle.core.data.v2x.V2XWarningTarget;
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
-import com.mogo.eagle.core.utilcode.mogo.thread.WorkThreadHandler;
-import com.mogo.eagle.core.utilcode.util.CoordinateUtils;
-import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
-import com.mogo.map.marker.IMogoMarkerManager;
-import com.mogo.map.overlay.IMogoPolyline;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * @author liujing
- * @description 前方预警marker打点  绘制安全线和预警线 衡阳交付-取消划线需求,只渲染识别物红色模型移动过程,代码保留
- * @since: 2021/3/30
- */
-public class V2XWarningMarker implements IV2XMarker {
-    private static final String TAG = "V2XWarningMarker";
-    private static final String WARNING_ARROWS = "WARNING_ARROWS";
-    private V2XWarningTarget mCloundWarningInfo;
-    private boolean isSelfLineClear = true;//绘制线是否已被清除
-    private final List fillPoints = new ArrayList();//停止线经纬度合集
-    private boolean isFirstLocation = false;
-    private MogoLatLng carLocation = new MogoLatLng(
-            CallerChassisLocationWGS84ListenerManager.INSTANCE.getChassisLocationWGS84().getLatitude(),
-            CallerChassisLocationWGS84ListenerManager.INSTANCE.getChassisLocationWGS84().getLongitude()
-    );
-
-    /*
-     * 自车前方的点,在停止线上--通过自车位置与距离停止线之间的距离计算
-     * */
-    private MogoLatLng middleLocationInStopLine = new MogoLatLng(0, 0);
-    private static long showTime = 6000;
-    private double bearing;
-    private boolean hasStopLines = false;
-
-    @Override
-    public void drawPOI(Object entity) {
-        try {
-            CallerLogger.INSTANCE.d(M_V2X + TAG, "===drawPOI");
-            mCloundWarningInfo = (V2XWarningTarget) entity;
-            drawLineWithEntity();
-
-        } catch (Exception e) {
-            CallerLogger.INSTANCE.d(M_V2X + TAG, e.toString());
-        }
-
-    }
-
-    public void drawLineWithEntity() {
-        showTime = mCloundWarningInfo.getShowTime() > 0 ? mCloundWarningInfo.getShowTime() * 1000 : 6000;
-        fillPointOnStopLine();
-        MogoLocation location = BridgeApi.INSTANCE.getLocation().get();
-        if (location == null) {
-            return;
-        }
-        bearing = location.getHeading();
-
-        if (mCloundWarningInfo != null && mCloundWarningInfo.getStopLines() != null) {
-            hasStopLines = mCloundWarningInfo.getStopLines().size() > 0;
-        }
-        isSelfLineClear = false;
-        isFirstLocation = false;
-        if (fillPoints != null && fillPoints.size() > 0) {
-            //存在停止线的情况 自车与停止线之间绘制蓝色安全线 停止线向前50m绘制红色预警线
-            middleLocationInStopLine = getMiddleLocationInStopLine();
-            //停止线前方画线
-            WorkThreadHandler.getInstance().postDelayed(() -> {
-                if (carLocation.lat != 0 && carLocation.lon != 0) {
-                    //在自车与停止线直线绘制蓝色预警线
-                    //衡阳交付-取消划线需求,只渲染识别物红色模型移动过程
-                    //drawSelfCarLine(carLocation.lon, carLocation.lat, bearing);
-                } else {
-                }
-                //二轮车和行人的渲染和移动
-                IMogoMarkerManager marker = CallerMapUIServiceManager.INSTANCE.getMarkerManager(AbsMogoApplication.getApp());
-                if (marker != null) {
-                    marker.removeMarkers(TYPE_MARKER_CLOUD_WARN_DATA);
-                }
-
-                /* 衡阳交付-取消划线需求,只渲染识别物红色模型移动过程
-                //获取停止线前方50m坐标点
-                MogoLatLng warningLocation = Trigonometric.getNewLocation(middleLocationInStopLine,
-                        50, angleForCarMoveDirection());
-                //停止线向前方50m绘制红色预警线
-                drawRedWarningLineFrontOfStopLine(mCloundWarningInfo, middleLocationInStopLine,
-                        warningLocation);
-
-                 */
-                Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMarkerService()).renderWarningMoveMarker(mCloundWarningInfo.getLon(), mCloundWarningInfo.getLat(), mCloundWarningInfo.getType(), mCloundWarningInfo.getCollisionLat(), mCloundWarningInfo.getCollisionLon(), mCloundWarningInfo.getAngle(), mCloundWarningInfo.getShowTime());
-
-                //添加停止线marker
-                //衡阳交付-取消划线需求,只渲染识别物红色模型移动过程
-                //handleStopLine();
-            }, 0);
-            CallerLogger.INSTANCE.d(M_V2X + TAG, "显示时间为++" + showTime + "识别物类型:" +
-                    String.valueOf(mCloundWarningInfo.getType()));
-
-        } else { //无停止线
-            CallerLogger.INSTANCE.d(M_V2X + TAG, "无停止线");
-            WorkThreadHandler.getInstance().postDelayed(() -> {
-                /*  衡阳交付-取消划线需求,只渲染识别物红色模型移动过程
-                CallerLogger.INSTANCE.d(M_V2X + TAG, "无停止线" + mCloundWarningInfo.toString());
-                //绘制识别物与交汇点连线，并且更新连线数据
-                drawOtherObjectLine(mCloundWarningInfo);
-                //二轮车和行人的渲染和移动
-                V2XServiceManager.getMarkerManager().removeMarkers(TYPE_MARKER_CLOUD_WARN_DATA);
-                if (carLocation.lat != 0 && carLocation.lon != 0) {
-                    drawSelfCarLine(carLocation.lon, carLocation.lat, bearing);
-                } else {
-                    CallerLogger.INSTANCE.d(M_V2X + TAG, "数据为空carLocation == null");
-                }
-                 */
-                Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMarkerService()).renderWarningMoveMarker(mCloundWarningInfo.getLon()
-                        , mCloundWarningInfo.getLat()
-                        , mCloundWarningInfo.getType()
-                        , mCloundWarningInfo.getCollisionLat()
-                        , mCloundWarningInfo.getCollisionLon()
-                        , mCloundWarningInfo.getAngle()
-                        , mCloundWarningInfo.getShowTime());
-            }, 0);
-
-        }
-        clearAllLine();
-    }
-
-    /*
-     *
-     * */
-    public double angleForCarMoveDirection() {
-        MogoLatLng startLatLng = new MogoLatLng(carLocation.lat, carLocation.lon);
-        MogoLatLng endLatLng = new MogoLatLng(middleLocationInStopLine.lat, middleLocationInStopLine.lon);
-        double angle = Trigonometric.getAngle(startLatLng.lon, startLatLng.lat, endLatLng.lon, endLatLng.lat);
-        CallerLogger.INSTANCE.d(M_V2X + TAG, "angle==" + String.valueOf(angle));
-        return angle;
-    }
-
-
-    /*绘制停止线前方50m的红色预警线
-     * startLatLng: 划线起点=停止线上的坐标点
-     * mogoLatLng: 停止线前方50m坐标点
-     * */
-    private void drawRedWarningLineFrontOfStopLine(V2XWarningTarget info, MogoLatLng
-            startLatLng, MogoLatLng mogoLatLng) {
-        if (info != null) {
-            double angle = Trigonometric.getAngle(startLatLng.lon, startLatLng.lat, mogoLatLng.lon, mogoLatLng.lat);
-            CallerLogger.INSTANCE.d(M_V2X + TAG, "angle==drawRedWarningLineFrontOfStopLine:" + String.valueOf(angle));
-            IMoGoStopPolylineManager stopPolyLineMnager = BridgeApi.INSTANCE.v2xStopPolyline();
-            if (stopPolyLineMnager != null) {
-                IMogoPolyline polyLine = stopPolyLineMnager.getMogoStopPolyline();
-                MogoLatLng endLatlng = new MogoLatLng(mogoLatLng.lat, mogoLatLng.lon);
-                MogoLatLng addMiddleLoc = Trigonometric.getNewLocation(startLatLng.lon, startLatLng.lat, 25, angle);
-                if (polyLine != null) {
-                    CallerLogger.INSTANCE.d(M_V2X + TAG, "drawStopLine polyLine != null");
-                    polyLine.setPoints(Arrays.asList(startLatLng, addMiddleLoc, endLatlng));
-                    polyLine.setTransparency(0.5f);
-                } else {
-                    DrawLineInfo lineInfo = new DrawLineInfo();
-                    List locations = new ArrayList();
-                    locations.add(startLatLng);
-                    locations.add(addMiddleLoc);
-                    locations.add(endLatlng);
-                    lineInfo.setLocations(locations);
-                    lineInfo.setHeading(info.getHeading());
-                    CallerLogger.INSTANCE.d(TAG, "drawStopLine width = " + info.getRoadwidth());
-                    lineInfo.setWidth(info.getRoadwidth() * 14 + 5);
-                    stopPolyLineMnager.drawStopPolyline(BridgeApi.INSTANCE.context(), lineInfo);
-                }
-                CallerLogger.INSTANCE.d(M_V2X + TAG, "停止线前方50m区域的三个坐标点是:" + startLatLng.lon + "," + startLatLng.lat +
-                        "中间点坐标:" + addMiddleLoc.lon + "," + addMiddleLoc.lat
-                        + "终点" + endLatlng.lon + "," + endLatlng.lat);
-            }
-        } else {
-            clearAllLine();
-        }
-    }
-
-    public void clearAllLine() {
-        UiThreadHandler.postDelayed(() -> {
-            CallerLogger.INSTANCE.d(M_V2X + TAG, "清除所有预警线的时间是:" + String.valueOf(showTime));
-            //清除识别物到碰撞点预警线
-            IMoGoPersonWarnPolylineManager personStopPolyLineManager = BridgeApi.INSTANCE.v2xPersonWarnPolyline();
-            if (personStopPolyLineManager != null) {
-                personStopPolyLineManager.clearLine();
-            }
-            //清除车前方第一条预警线
-            IMoGoWarnPolylineManager warnPolyLineManager = BridgeApi.INSTANCE.v2xWarnPolyline();
-            if (warnPolyLineManager != null) {
-                warnPolyLineManager.clearLine();
-            }
-            //清除停止线
-            IMoGoStopPolylineManager stopPolyLineManager = BridgeApi.INSTANCE.v2xStopPolyline();
-            if (stopPolyLineManager != null) {
-                stopPolyLineManager.clearLine();
-            }
-
-            IMogoMarkerManager marker = CallerMapUIServiceManager.INSTANCE.getMarkerManager(AbsMogoApplication.getApp());
-            if (marker != null) {
-                //清除小箭头
-                marker.removeMarkers(WARNING_ARROWS);
-                //清除停止线
-                marker.removeMarkers(TYPE_MARKER_CLOUD_STOP_LINE_DATA);
-            }
-
-            isSelfLineClear = true;
-        }, showTime);
-    }
-
-    /**
-     * 补点后的停止线经纬度合集
-     */
-    public void fillPointOnStopLine() {
-        try {
-            fillPoints.clear();
-            List stopLines = mCloundWarningInfo.getStopLines();
-            if (stopLines != null && stopLines.size() > 1) {
-                V2XLocation x = mCloundWarningInfo.getStopLines().get(0);
-                V2XLocation y = mCloundWarningInfo.getStopLines().get(1);
-                //两点间的距离
-                float distance = CoordinateUtils.calculateLineDistance(x.getLon(), x.getLat(), y.getLon(), y.getLat());
-                float average = distance / 3;
-                //两点间的角度
-                double angle = Trigonometric.getAngle(x.getLon(), x.getLat(), y.getLon(), y.getLat());
-                //根据距离和角度获取下个点的经纬度
-                fillPoints.add(x);
-                for (int i = 1; i < 3; i++) {
-                    MogoLatLng newLocation = Trigonometric.getNewLocation(x.getLon(), x.getLat(), average * i, angle);
-                    fillPoints.add(newLocation);
-                }
-                fillPoints.add(y);
-            } else {
-                CallerLogger.INSTANCE.d(M_V2X + TAG, "停止线数据不存在");
-            }
-        } catch (Exception e) {
-            CallerLogger.INSTANCE.e(M_V2X + TAG, "exception : " + e);
-            e.printStackTrace();
-        }
-    }
-
-    /*
-     * 停止线绘制
-     * */
-    private void handleStopLine() {
-        try {
-            if (mCloundWarningInfo != null) {
-                IMogoMarkerManager marker = CallerMapUIServiceManager.INSTANCE.getMarkerManager(AbsMogoApplication.getApp());
-                if (marker != null) {
-                    marker.removeMarkers(TYPE_MARKER_CLOUD_STOP_LINE_DATA);
-                }
-                for (int i = 0; i < fillPoints.size(); i++) {
-                    V2XWarningTarget entity = new V2XWarningTarget();
-                    MogoLatLng latLng = (MogoLatLng) fillPoints.get(i);
-                    entity.setLat(latLng.lat);
-                    entity.setLon(latLng.lon);
-                    entity.setHeading(mCloundWarningInfo.getHeading());
-                    Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMarkerService()).renderStopLineMarker(entity.getLon(), entity.getLat());
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private MogoLatLng getMogoLat(MogoLatLng latlng) {
-        MogoLatLng newLocation = Trigonometric.getNewLocation(latlng.lon, latlng.lat, mCloundWarningInfo.getStopLineDistance(),
-                mCloundWarningInfo.getAngle());
-        return newLocation;
-    }
-
-    /*
-     * 自车前方的点,落点在停止线上--通过自车位置与距离停止线之间的距离计算
-     * */
-    private MogoLatLng getMiddleLocationInStopLine() {
-        if (carLocation.lat == 0 || carLocation.lon == 0) {
-            CallerLogger.INSTANCE.d(M_V2X + TAG, "获取不到车的位置");
-        }
-        MogoLatLng newLocation = new MogoLatLng(0, 0);
-        if (mCloundWarningInfo != null && mCloundWarningInfo.getStopLines() != null && mCloundWarningInfo.getStopLines().size() > 1) {
-            V2XLocation x = mCloundWarningInfo.getStopLines().get(0);
-            V2XLocation y = mCloundWarningInfo.getStopLines().get(1);
-            float distance = CoordinateUtils.calculateLineDistance(x.getLon(), x.getLat(), y.getLat(), y.getLat());
-            double angle = Trigonometric.getAngle(x.getLat(), x.getLat(), y.getLon(), y.getLat());
-            newLocation = Trigonometric.getNewLocation(x.getLon(), x.getLat(), distance * 0.5, angle);
-        } else {
-            CallerLogger.INSTANCE.d(M_V2X + TAG, "停止线返回坐标点数量不正确" + mCloundWarningInfo.getStopLines().size());
-        }
-        return newLocation;
-    }
-
-    /**
-     * 存在停止线时自车与停止线之间为蓝色预警
-     * 不存在停止线,自车与预碰撞点之间为红色预警
-     * lon 自车经度
-     * lat 自车纬度
-     */
-    public void drawSelfCarLine(double lon, double lat, float bearing) {
-        CallerLogger.INSTANCE.d(M_V2X + TAG, "drawSelfCarLine");
-        if (!isSelfLineClear) {
-            if (mCloundWarningInfo != null) {
-                IMoGoWarnPolylineManager warnPolyLineManager = BridgeApi.INSTANCE.v2xWarnPolyline();
-                if (warnPolyLineManager == null) {
-                    return;
-                }
-                IMogoPolyline mogoPolyline = warnPolyLineManager.getMogoWarnPolyline();
-                MogoLatLng startLatlng = new MogoLatLng(0, 0);
-                MogoLatLng endLatlng = new MogoLatLng(0, 0);
-                MogoLatLng addMiddleLoc = new MogoLatLng(0, 0);
-
-                if (!isFirstLocation) {
-                    carLocation = getMogoLat(new MogoLatLng(lat, lon));
-                    isFirstLocation = true;
-                }
-                //绘制线的终点(在停止线上或者预碰撞点上)
-                endLatlng = new MogoLatLng(hasStopLines ?
-                        middleLocationInStopLine.lat : mCloundWarningInfo.getCollisionLat(), hasStopLines ?
-                        middleLocationInStopLine.lon : mCloundWarningInfo.getCollisionLon());
-
-                startLatlng = new MogoLatLng(lat, lon);
-                float distance = CoordinateUtils.calculateLineDistance(startLatlng.lon, startLatlng.lat, endLatlng.lon, endLatlng.lat);
-                //扩展点为了渐变色添加
-                addMiddleLoc = Trigonometric.getNewLocation(startLatlng.getLon(), startLatlng.getLat(), distance / 2,
-                        Trigonometric.getAngle(startLatlng.lon, startLatlng.lat, endLatlng.lon, endLatlng.lat));
-                CallerLogger.INSTANCE.d(M_V2X + TAG, "angle==扩展点为了渐变色添加:" +
-                        String.valueOf(Trigonometric.getAngle(startLatlng.lon, startLatlng.lat, endLatlng.lon, endLatlng.lat)));
-                if (mogoPolyline != null) {
-                    mogoPolyline.setPoints(Arrays.asList(startLatlng, addMiddleLoc, endLatlng));
-                    mogoPolyline.setTransparency(0.5f);
-                } else {
-                    DrawLineInfo info = new DrawLineInfo(); // 对象
-                    List locations = new ArrayList();
-                    locations.add(startLatlng);
-                    locations.add(addMiddleLoc);
-                    locations.add(endLatlng);
-                    info.setLocations(locations);
-                    info.setHeading(bearing);
-                    info.setWidth(mCloundWarningInfo.getRoadwidth() * 14 + 5);
-                    if (mCloundWarningInfo.getStopLines() != null) {
-                        info.setHasStopLines(mCloundWarningInfo.getStopLines().size() > 0);
-                    }
-                    warnPolyLineManager.drawWarnPolyline(BridgeApi.INSTANCE.context(), info);
-                    CallerLogger.INSTANCE.d(M_V2X + TAG, "自车前方第一条线" + "起点:" + startLatlng + "中间点:" + addMiddleLoc + "终点:" + endLatlng);
-                }
-                CallerLogger.INSTANCE.d(M_V2X + TAG, "自车为起点绘制  自车;" + startLatlng.lon + "," + startLatlng.lat +
-                        "中间扩展点" + addMiddleLoc.lon + "," + addMiddleLoc.lat + "终点:" + endLatlng.lon + "," + endLatlng.lat);
-            } else {
-                clearAllLine();
-            }
-        }
-    }
-
-    /**
-     * 侧方目标物与预碰撞点连线,并且更新数据 TODO 需要实时给行人当前位置
-     */
-    private void drawOtherObjectLine(V2XWarningTarget info) {
-        if (info != null) {
-            CallerLogger.INSTANCE.d(M_V2X + TAG, "info != null");
-            IMoGoPersonWarnPolylineManager personWarnPolylineManager = BridgeApi.INSTANCE.v2xPersonWarnPolyline();
-            if (personWarnPolylineManager == null) {
-                return;
-            }
-            IMogoPolyline polyLine = personWarnPolylineManager.getMogoPersonWarnPolyline();
-            MogoLatLng startLatlng = new MogoLatLng(info.getLat(), info.getLon());//识别物坐标
-            MogoLatLng endLatlng = new MogoLatLng(info.getCollisionLat(), info.getCollisionLon());//预碰撞点坐标
-            float distance = CoordinateUtils.calculateLineDistance(startLatlng.lon, startLatlng.lat, endLatlng.lon, endLatlng.lat);//识别物到碰撞点之间的距离
-            MogoLatLng addMiddleLoc = Trigonometric.getNewLocation(startLatlng.getLon(), startLatlng.getLat(), distance / 2,
-                    Trigonometric.getAngle(startLatlng.lon, startLatlng.lat, endLatlng.lon, endLatlng.lat));//补点
-            if (polyLine != null) {
-                CallerLogger.INSTANCE.d(M_V2X + TAG, "目标物与碰撞点连线 != null");
-                polyLine.setPoints(Arrays.asList(startLatlng, addMiddleLoc, endLatlng));
-                polyLine.setTransparency(0.5f);
-            } else {
-                //识别物到预碰撞点之间的箭头
-                addArrows(startLatlng, endLatlng);
-                DrawLineInfo lineInfo = new DrawLineInfo();
-                List locations = new ArrayList();
-                locations.add(startLatlng);
-                locations.add(addMiddleLoc);
-                locations.add(endLatlng);
-                lineInfo.setLocations(locations);
-                lineInfo.setHeading(info.getHeading());
-                lineInfo.setWidth(info.getRoadwidth() * 14 + 5);
-                personWarnPolylineManager.drawPersonWarnPolyline(BridgeApi.INSTANCE.context(), lineInfo);
-                CallerLogger.INSTANCE.d(M_V2X + TAG, "目标物与预碰撞点画线点为" + "起点:" + startLatlng + "中间点:" + addMiddleLoc + "终点:" + endLatlng);
-            }
-        } else {
-            CallerLogger.INSTANCE.e(M_V2X + TAG, "info == null");
-            clearAllLine();
-        }
-    }
-
-    //侧面目标物与碰撞点之间添加多个小箭头
-    private void addArrows(MogoLatLng startLatLng, MogoLatLng endLatLng) {
-        float distance = CoordinateUtils.calculateLineDistance(
-                startLatLng.lon, startLatLng.lat, endLatLng.lon, endLatLng.lat);
-        double rotate = Trigonometric.getAngle(startLatLng.lon, startLatLng.lat, endLatLng.lon, endLatLng.lat);
-        CallerLogger.INSTANCE.d(M_V2X + TAG, "添加小箭头--目标物与预碰撞点之间的距离是" + String.valueOf(distance));
-        if (distance > 5) {
-            int count = (int) (distance / 5);
-            for (int i = 0; i < count; i++) {
-                MogoLatLng newLo = Trigonometric.getNewLocation(
-                        startLatLng.getLon(), startLatLng.getLat(), 5 * (i + 1), Trigonometric.getAngle(startLatLng.lon, startLatLng.lat, endLatLng.lon, endLatLng.lat));
-                Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMarkerService()).drawerArrowsMarkerWithLocation(newLo, WARNING_ARROWS, 10, new Double(rotate).intValue());
-                CallerLogger.INSTANCE.d(M_V2X + TAG, "小箭头位置" + newLo);
-            }
-        }
-
-    }
-
-    //线随车动
-    public void onCarLocationChanged2(MogoLocation latLng) {
-        carLocation = new MogoLatLng(latLng.getLatitude(), latLng.getLongitude());
-        if (MogoStatusManager.getInstance().isVrMode() && !isSelfLineClear) {
-            if (mCloundWarningInfo != null) {
-                V2XLocation v2XLocation = new V2XLocation();
-                v2XLocation.setLat(latLng.getLatitude());
-                v2XLocation.setLon(latLng.getLongitude());
-                mCloundWarningInfo.setCarLocation(v2XLocation);
-            }
-            //衡阳交付-取消划线需求,只渲染识别物红色模型移动过程
-            //drawSelfCarLine(latLng.getLongitude(), latLng.getLatitude(), latLng.getBearing());
-        }
-        CallerLogger.INSTANCE.d(M_V2X + TAG, "车辆行驶轨迹" + latLng.getLongitude() + "," + latLng.getLatitude());
-    }
-}
+//package com.mogo.eagle.function.biz.v2x.v2n.scenario.scene.warning;
+//
+//import static com.mogo.eagle.core.data.constants.DataTypes.TYPE_MARKER_CLOUD_STOP_LINE_DATA;
+//import static com.mogo.eagle.core.data.constants.DataTypes.TYPE_MARKER_CLOUD_WARN_DATA;
+//import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_V2X;
+//
+//import com.mogo.commons.AbsMogoApplication;
+//import com.mogo.commons.module.status.MogoStatusManager;
+//import com.mogo.commons.utils.Trigonometric;
+//import com.mogo.eagle.core.data.map.MogoLatLng;
+//import com.mogo.eagle.core.data.map.MogoLocation;
+//import com.mogo.eagle.core.data.v2x.DrawLineInfo;
+//import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager;
+//import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
+//import com.mogo.eagle.function.biz.v2x.v2n.bridge.BridgeApi;
+//import com.mogo.eagle.function.biz.v2x.v2n.manager.IMoGoPersonWarnPolylineManager;
+//import com.mogo.eagle.function.biz.v2x.v2n.manager.IMoGoStopPolylineManager;
+//import com.mogo.eagle.function.biz.v2x.v2n.manager.IMoGoWarnPolylineManager;
+//import com.mogo.eagle.function.biz.v2x.v2n.scenario.view.IV2XMarker;
+//import com.mogo.eagle.core.data.v2x.V2XLocation;
+//import com.mogo.eagle.core.data.v2x.V2XWarningTarget;
+//import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
+//import com.mogo.eagle.core.utilcode.mogo.thread.WorkThreadHandler;
+//import com.mogo.eagle.core.utilcode.util.CoordinateUtils;
+//import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
+//import com.mogo.map.marker.IMogoMarkerManager;
+//import com.mogo.map.overlay.IMogoPolyline;
+//
+//import java.util.ArrayList;
+//import java.util.Arrays;
+//import java.util.List;
+//import java.util.Objects;
+//
+///**
+// * @author liujing
+// * @description 前方预警marker打点  绘制安全线和预警线 衡阳交付-取消划线需求,只渲染识别物红色模型移动过程,代码保留
+// * @since: 2021/3/30
+// */
+//public class V2XWarningMarker implements IV2XMarker {
+//    private static final String TAG = "V2XWarningMarker";
+//    private static final String WARNING_ARROWS = "WARNING_ARROWS";
+//    private V2XWarningTarget mCloundWarningInfo;
+//    private boolean isSelfLineClear = true;//绘制线是否已被清除
+//    private final List fillPoints = new ArrayList();//停止线经纬度合集
+//    private boolean isFirstLocation = false;
+//    private MogoLatLng carLocation = new MogoLatLng(
+//            CallerChassisLocationWGS84ListenerManager.INSTANCE.getChassisLocationWGS84().getLatitude(),
+//            CallerChassisLocationWGS84ListenerManager.INSTANCE.getChassisLocationWGS84().getLongitude()
+//    );
+//
+//    /*
+//     * 自车前方的点,在停止线上--通过自车位置与距离停止线之间的距离计算
+//     * */
+//    private MogoLatLng middleLocationInStopLine = new MogoLatLng(0, 0);
+//    private static long showTime = 6000;
+//    private double bearing;
+//    private boolean hasStopLines = false;
+//
+//    @Override
+//    public void drawPOI(Object entity) {
+//        try {
+//            CallerLogger.INSTANCE.d(M_V2X + TAG, "===drawPOI");
+//            mCloundWarningInfo = (V2XWarningTarget) entity;
+//            drawLineWithEntity();
+//
+//        } catch (Exception e) {
+//            CallerLogger.INSTANCE.d(M_V2X + TAG, e.toString());
+//        }
+//
+//    }
+//
+//    public void drawLineWithEntity() {
+//        showTime = mCloundWarningInfo.getShowTime() > 0 ? mCloundWarningInfo.getShowTime() * 1000 : 6000;
+//        fillPointOnStopLine();
+//        MogoLocation location = BridgeApi.INSTANCE.getLocation().get();
+//        if (location == null) {
+//            return;
+//        }
+//        bearing = location.getHeading();
+//
+//        if (mCloundWarningInfo != null && mCloundWarningInfo.getStopLines() != null) {
+//            hasStopLines = mCloundWarningInfo.getStopLines().size() > 0;
+//        }
+//        isSelfLineClear = false;
+//        isFirstLocation = false;
+//        if (fillPoints.size() > 0) {
+//            //存在停止线的情况 自车与停止线之间绘制蓝色安全线 停止线向前50m绘制红色预警线
+//            middleLocationInStopLine = getMiddleLocationInStopLine();
+//            //停止线前方画线
+//            WorkThreadHandler.getInstance().postDelayed(() -> {
+//                if (carLocation.lat != 0 && carLocation.lon != 0) {
+//                    //在自车与停止线直线绘制蓝色预警线
+//                    //衡阳交付-取消划线需求,只渲染识别物红色模型移动过程
+//                    //drawSelfCarLine(carLocation.lon, carLocation.lat, bearing);
+//                } else {
+//                }
+//                //二轮车和行人的渲染和移动
+//                IMogoMarkerManager marker = CallerMapUIServiceManager.INSTANCE.getMarkerManager(AbsMogoApplication.getApp());
+//                if (marker != null) {
+//                    marker.removeMarkers(TYPE_MARKER_CLOUD_WARN_DATA);
+//                }
+//
+//                /* 衡阳交付-取消划线需求,只渲染识别物红色模型移动过程
+//                //获取停止线前方50m坐标点
+//                MogoLatLng warningLocation = Trigonometric.getNewLocation(middleLocationInStopLine,
+//                        50, angleForCarMoveDirection());
+//                //停止线向前方50m绘制红色预警线
+//                drawRedWarningLineFrontOfStopLine(mCloundWarningInfo, middleLocationInStopLine,
+//                        warningLocation);
+//
+//                 */
+//                Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMarkerService()).renderWarningMoveMarker(mCloundWarningInfo.getLon(), mCloundWarningInfo.getLat(), mCloundWarningInfo.getType(), mCloundWarningInfo.getCollisionLat(), mCloundWarningInfo.getCollisionLon(), mCloundWarningInfo.getAngle(), mCloundWarningInfo.getShowTime());
+//
+//                //添加停止线marker
+//                //衡阳交付-取消划线需求,只渲染识别物红色模型移动过程
+//                //handleStopLine();
+//            }, 0);
+//            CallerLogger.INSTANCE.d(M_V2X + TAG, "显示时间为++" + showTime + "识别物类型:" +
+//                    String.valueOf(mCloundWarningInfo.getType()));
+//
+//        } else { //无停止线
+//            CallerLogger.INSTANCE.d(M_V2X + TAG, "无停止线");
+//            WorkThreadHandler.getInstance().postDelayed(() -> {
+//                /*  衡阳交付-取消划线需求,只渲染识别物红色模型移动过程
+//                CallerLogger.INSTANCE.d(M_V2X + TAG, "无停止线" + mCloundWarningInfo.toString());
+//                //绘制识别物与交汇点连线，并且更新连线数据
+//                drawOtherObjectLine(mCloundWarningInfo);
+//                //二轮车和行人的渲染和移动
+//                V2XServiceManager.getMarkerManager().removeMarkers(TYPE_MARKER_CLOUD_WARN_DATA);
+//                if (carLocation.lat != 0 && carLocation.lon != 0) {
+//                    drawSelfCarLine(carLocation.lon, carLocation.lat, bearing);
+//                } else {
+//                    CallerLogger.INSTANCE.d(M_V2X + TAG, "数据为空carLocation == null");
+//                }
+//                 */
+//                Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMarkerService()).renderWarningMoveMarker(mCloundWarningInfo.getLon()
+//                        , mCloundWarningInfo.getLat()
+//                        , mCloundWarningInfo.getType()
+//                        , mCloundWarningInfo.getCollisionLat()
+//                        , mCloundWarningInfo.getCollisionLon()
+//                        , mCloundWarningInfo.getAngle()
+//                        , mCloundWarningInfo.getShowTime());
+//            }, 0);
+//
+//        }
+//        clearAllLine();
+//    }
+//
+//    /*
+//     *
+//     * */
+//    public double angleForCarMoveDirection() {
+//        MogoLatLng startLatLng = new MogoLatLng(carLocation.lat, carLocation.lon);
+//        MogoLatLng endLatLng = new MogoLatLng(middleLocationInStopLine.lat, middleLocationInStopLine.lon);
+//        double angle = Trigonometric.getAngle(startLatLng.lon, startLatLng.lat, endLatLng.lon, endLatLng.lat);
+//        CallerLogger.INSTANCE.d(M_V2X + TAG, "angle==" + String.valueOf(angle));
+//        return angle;
+//    }
+//
+//
+//    /*绘制停止线前方50m的红色预警线
+//     * startLatLng: 划线起点=停止线上的坐标点
+//     * mogoLatLng: 停止线前方50m坐标点
+//     * */
+//    private void drawRedWarningLineFrontOfStopLine(V2XWarningTarget info, MogoLatLng
+//            startLatLng, MogoLatLng mogoLatLng) {
+//        if (info != null) {
+//            double angle = Trigonometric.getAngle(startLatLng.lon, startLatLng.lat, mogoLatLng.lon, mogoLatLng.lat);
+//            CallerLogger.INSTANCE.d(M_V2X + TAG, "angle==drawRedWarningLineFrontOfStopLine:" + String.valueOf(angle));
+//            IMoGoStopPolylineManager stopPolyLineMnager = BridgeApi.INSTANCE.v2xStopPolyline();
+//            if (stopPolyLineMnager != null) {
+//                IMogoPolyline polyLine = stopPolyLineMnager.getMogoStopPolyline();
+//                MogoLatLng endLatlng = new MogoLatLng(mogoLatLng.lat, mogoLatLng.lon);
+//                MogoLatLng addMiddleLoc = Trigonometric.getNewLocation(startLatLng.lon, startLatLng.lat, 25, angle);
+//                if (polyLine != null) {
+//                    CallerLogger.INSTANCE.d(M_V2X + TAG, "drawStopLine polyLine != null");
+//                    polyLine.setPoints(Arrays.asList(startLatLng, addMiddleLoc, endLatlng));
+//                    polyLine.setTransparency(0.5f);
+//                } else {
+//                    DrawLineInfo lineInfo = new DrawLineInfo();
+//                    List locations = new ArrayList();
+//                    locations.add(startLatLng);
+//                    locations.add(addMiddleLoc);
+//                    locations.add(endLatlng);
+//                    lineInfo.setLocations(locations);
+//                    lineInfo.setHeading(info.getHeading());
+//                    CallerLogger.INSTANCE.d(TAG, "drawStopLine width = " + info.getRoadwidth());
+//                    lineInfo.setWidth(info.getRoadwidth() * 14 + 5);
+//                    stopPolyLineMnager.drawStopPolyline(BridgeApi.INSTANCE.context(), lineInfo);
+//                }
+//                CallerLogger.INSTANCE.d(M_V2X + TAG, "停止线前方50m区域的三个坐标点是:" + startLatLng.lon + "," + startLatLng.lat +
+//                        "中间点坐标:" + addMiddleLoc.lon + "," + addMiddleLoc.lat
+//                        + "终点" + endLatlng.lon + "," + endLatlng.lat);
+//            }
+//        } else {
+//            clearAllLine();
+//        }
+//    }
+//
+//    public void clearAllLine() {
+//        UiThreadHandler.postDelayed(() -> {
+//            CallerLogger.INSTANCE.d(M_V2X + TAG, "清除所有预警线的时间是:" + String.valueOf(showTime));
+//            //清除识别物到碰撞点预警线
+//            IMoGoPersonWarnPolylineManager personStopPolyLineManager = BridgeApi.INSTANCE.v2xPersonWarnPolyline();
+//            if (personStopPolyLineManager != null) {
+//                personStopPolyLineManager.clearLine();
+//            }
+//            //清除车前方第一条预警线
+//            IMoGoWarnPolylineManager warnPolyLineManager = BridgeApi.INSTANCE.v2xWarnPolyline();
+//            if (warnPolyLineManager != null) {
+//                warnPolyLineManager.clearLine();
+//            }
+//            //清除停止线
+//            IMoGoStopPolylineManager stopPolyLineManager = BridgeApi.INSTANCE.v2xStopPolyline();
+//            if (stopPolyLineManager != null) {
+//                stopPolyLineManager.clearLine();
+//            }
+//
+//            IMogoMarkerManager marker = CallerMapUIServiceManager.INSTANCE.getMarkerManager(AbsMogoApplication.getApp());
+//            if (marker != null) {
+//                //清除小箭头
+//                marker.removeMarkers(WARNING_ARROWS);
+//                //清除停止线
+//                marker.removeMarkers(TYPE_MARKER_CLOUD_STOP_LINE_DATA);
+//            }
+//
+//            isSelfLineClear = true;
+//        }, showTime);
+//    }
+//
+//    /**
+//     * 补点后的停止线经纬度合集
+//     */
+//    public void fillPointOnStopLine() {
+//        try {
+//            fillPoints.clear();
+//            List stopLines = mCloundWarningInfo.getStopLines();
+//            if (stopLines != null && stopLines.size() > 1) {
+//                V2XLocation x = mCloundWarningInfo.getStopLines().get(0);
+//                V2XLocation y = mCloundWarningInfo.getStopLines().get(1);
+//                //两点间的距离
+//                float distance = CoordinateUtils.calculateLineDistance(x.getLon(), x.getLat(), y.getLon(), y.getLat());
+//                float average = distance / 3;
+//                //两点间的角度
+//                double angle = Trigonometric.getAngle(x.getLon(), x.getLat(), y.getLon(), y.getLat());
+//                //根据距离和角度获取下个点的经纬度
+//                fillPoints.add(x);
+//                for (int i = 1; i < 3; i++) {
+//                    MogoLatLng newLocation = Trigonometric.getNewLocation(x.getLon(), x.getLat(), average * i, angle);
+//                    fillPoints.add(newLocation);
+//                }
+//                fillPoints.add(y);
+//            } else {
+//                CallerLogger.INSTANCE.d(M_V2X + TAG, "停止线数据不存在");
+//            }
+//        } catch (Exception e) {
+//            CallerLogger.INSTANCE.e(M_V2X + TAG, "exception : " + e);
+//            e.printStackTrace();
+//        }
+//    }
+//
+//    /*
+//     * 停止线绘制
+//     * */
+//    private void handleStopLine() {
+//        try {
+//            if (mCloundWarningInfo != null) {
+//                IMogoMarkerManager marker = CallerMapUIServiceManager.INSTANCE.getMarkerManager(AbsMogoApplication.getApp());
+//                if (marker != null) {
+//                    marker.removeMarkers(TYPE_MARKER_CLOUD_STOP_LINE_DATA);
+//                }
+//                for (int i = 0; i < fillPoints.size(); i++) {
+//                    V2XWarningTarget entity = new V2XWarningTarget();
+//                    MogoLatLng latLng = (MogoLatLng) fillPoints.get(i);
+//                    entity.setLat(latLng.lat);
+//                    entity.setLon(latLng.lon);
+//                    entity.setHeading(mCloundWarningInfo.getHeading());
+//                    Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMarkerService()).renderStopLineMarker(entity.getLon(), entity.getLat());
+//                }
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//    }
+//
+//    private MogoLatLng getMogoLat(MogoLatLng latlng) {
+//        MogoLatLng newLocation = Trigonometric.getNewLocation(latlng.lon, latlng.lat, mCloundWarningInfo.getStopLineDistance(),
+//                mCloundWarningInfo.getAngle());
+//        return newLocation;
+//    }
+//
+//    /*
+//     * 自车前方的点,落点在停止线上--通过自车位置与距离停止线之间的距离计算
+//     * */
+//    private MogoLatLng getMiddleLocationInStopLine() {
+//        if (carLocation.lat == 0 || carLocation.lon == 0) {
+//            CallerLogger.INSTANCE.d(M_V2X + TAG, "获取不到车的位置");
+//        }
+//        MogoLatLng newLocation = new MogoLatLng(0, 0);
+//        if (mCloundWarningInfo != null && mCloundWarningInfo.getStopLines() != null && mCloundWarningInfo.getStopLines().size() > 1) {
+//            V2XLocation x = mCloundWarningInfo.getStopLines().get(0);
+//            V2XLocation y = mCloundWarningInfo.getStopLines().get(1);
+//            float distance = CoordinateUtils.calculateLineDistance(x.getLon(), x.getLat(), y.getLat(), y.getLat());
+//            double angle = Trigonometric.getAngle(x.getLat(), x.getLat(), y.getLon(), y.getLat());
+//            newLocation = Trigonometric.getNewLocation(x.getLon(), x.getLat(), distance * 0.5, angle);
+//        } else {
+//            CallerLogger.INSTANCE.d(M_V2X + TAG, "停止线返回坐标点数量不正确" + mCloundWarningInfo.getStopLines().size());
+//        }
+//        return newLocation;
+//    }
+//
+//    /**
+//     * 存在停止线时自车与停止线之间为蓝色预警
+//     * 不存在停止线,自车与预碰撞点之间为红色预警
+//     * lon 自车经度
+//     * lat 自车纬度
+//     */
+//    public void drawSelfCarLine(double lon, double lat, float bearing) {
+//        CallerLogger.INSTANCE.d(M_V2X + TAG, "drawSelfCarLine");
+//        if (!isSelfLineClear) {
+//            if (mCloundWarningInfo != null) {
+//                IMoGoWarnPolylineManager warnPolyLineManager = BridgeApi.INSTANCE.v2xWarnPolyline();
+//                if (warnPolyLineManager == null) {
+//                    return;
+//                }
+//                IMogoPolyline mogoPolyline = warnPolyLineManager.getMogoWarnPolyline();
+//                MogoLatLng startLatlng = new MogoLatLng(0, 0);
+//                MogoLatLng endLatlng = new MogoLatLng(0, 0);
+//                MogoLatLng addMiddleLoc = new MogoLatLng(0, 0);
+//
+//                if (!isFirstLocation) {
+//                    carLocation = getMogoLat(new MogoLatLng(lat, lon));
+//                    isFirstLocation = true;
+//                }
+//                //绘制线的终点(在停止线上或者预碰撞点上)
+//                endLatlng = new MogoLatLng(hasStopLines ?
+//                        middleLocationInStopLine.lat : mCloundWarningInfo.getCollisionLat(), hasStopLines ?
+//                        middleLocationInStopLine.lon : mCloundWarningInfo.getCollisionLon());
+//
+//                startLatlng = new MogoLatLng(lat, lon);
+//                float distance = CoordinateUtils.calculateLineDistance(startLatlng.lon, startLatlng.lat, endLatlng.lon, endLatlng.lat);
+//                //扩展点为了渐变色添加
+//                addMiddleLoc = Trigonometric.getNewLocation(startLatlng.getLon(), startLatlng.getLat(), distance / 2,
+//                        Trigonometric.getAngle(startLatlng.lon, startLatlng.lat, endLatlng.lon, endLatlng.lat));
+//                CallerLogger.INSTANCE.d(M_V2X + TAG, "angle==扩展点为了渐变色添加:" +
+//                        String.valueOf(Trigonometric.getAngle(startLatlng.lon, startLatlng.lat, endLatlng.lon, endLatlng.lat)));
+//                if (mogoPolyline != null) {
+//                    mogoPolyline.setPoints(Arrays.asList(startLatlng, addMiddleLoc, endLatlng));
+//                    mogoPolyline.setTransparency(0.5f);
+//                } else {
+//                    DrawLineInfo info = new DrawLineInfo(); // 对象
+//                    List locations = new ArrayList();
+//                    locations.add(startLatlng);
+//                    locations.add(addMiddleLoc);
+//                    locations.add(endLatlng);
+//                    info.setLocations(locations);
+//                    info.setHeading(bearing);
+//                    info.setWidth(mCloundWarningInfo.getRoadwidth() * 14 + 5);
+//                    if (mCloundWarningInfo.getStopLines() != null) {
+//                        info.setHasStopLines(mCloundWarningInfo.getStopLines().size() > 0);
+//                    }
+//                    warnPolyLineManager.drawWarnPolyline(BridgeApi.INSTANCE.context(), info);
+//                    CallerLogger.INSTANCE.d(M_V2X + TAG, "自车前方第一条线" + "起点:" + startLatlng + "中间点:" + addMiddleLoc + "终点:" + endLatlng);
+//                }
+//                CallerLogger.INSTANCE.d(M_V2X + TAG, "自车为起点绘制  自车;" + startLatlng.lon + "," + startLatlng.lat +
+//                        "中间扩展点" + addMiddleLoc.lon + "," + addMiddleLoc.lat + "终点:" + endLatlng.lon + "," + endLatlng.lat);
+//            } else {
+//                clearAllLine();
+//            }
+//        }
+//    }
+//
+//    /**
+//     * 侧方目标物与预碰撞点连线,并且更新数据 TODO 需要实时给行人当前位置
+//     */
+//    private void drawOtherObjectLine(V2XWarningTarget info) {
+//        if (info != null) {
+//            CallerLogger.INSTANCE.d(M_V2X + TAG, "info != null");
+//            IMoGoPersonWarnPolylineManager personWarnPolylineManager = BridgeApi.INSTANCE.v2xPersonWarnPolyline();
+//            if (personWarnPolylineManager == null) {
+//                return;
+//            }
+//            IMogoPolyline polyLine = personWarnPolylineManager.getMogoPersonWarnPolyline();
+//            MogoLatLng startLatlng = new MogoLatLng(info.getLat(), info.getLon());//识别物坐标
+//            MogoLatLng endLatlng = new MogoLatLng(info.getCollisionLat(), info.getCollisionLon());//预碰撞点坐标
+//            float distance = CoordinateUtils.calculateLineDistance(startLatlng.lon, startLatlng.lat, endLatlng.lon, endLatlng.lat);//识别物到碰撞点之间的距离
+//            MogoLatLng addMiddleLoc = Trigonometric.getNewLocation(startLatlng.getLon(), startLatlng.getLat(), distance / 2,
+//                    Trigonometric.getAngle(startLatlng.lon, startLatlng.lat, endLatlng.lon, endLatlng.lat));//补点
+//            if (polyLine != null) {
+//                CallerLogger.INSTANCE.d(M_V2X + TAG, "目标物与碰撞点连线 != null");
+//                polyLine.setPoints(Arrays.asList(startLatlng, addMiddleLoc, endLatlng));
+//                polyLine.setTransparency(0.5f);
+//            } else {
+//                //识别物到预碰撞点之间的箭头
+//                addArrows(startLatlng, endLatlng);
+//                DrawLineInfo lineInfo = new DrawLineInfo();
+//                List locations = new ArrayList();
+//                locations.add(startLatlng);
+//                locations.add(addMiddleLoc);
+//                locations.add(endLatlng);
+//                lineInfo.setLocations(locations);
+//                lineInfo.setHeading(info.getHeading());
+//                lineInfo.setWidth(info.getRoadwidth() * 14 + 5);
+//                personWarnPolylineManager.drawPersonWarnPolyline(BridgeApi.INSTANCE.context(), lineInfo);
+//                CallerLogger.INSTANCE.d(M_V2X + TAG, "目标物与预碰撞点画线点为" + "起点:" + startLatlng + "中间点:" + addMiddleLoc + "终点:" + endLatlng);
+//            }
+//        } else {
+//            CallerLogger.INSTANCE.e(M_V2X + TAG, "info == null");
+//            clearAllLine();
+//        }
+//    }
+//
+//    //侧面目标物与碰撞点之间添加多个小箭头
+//    private void addArrows(MogoLatLng startLatLng, MogoLatLng endLatLng) {
+//        float distance = CoordinateUtils.calculateLineDistance(
+//                startLatLng.lon, startLatLng.lat, endLatLng.lon, endLatLng.lat);
+//        double rotate = Trigonometric.getAngle(startLatLng.lon, startLatLng.lat, endLatLng.lon, endLatLng.lat);
+//        CallerLogger.INSTANCE.d(M_V2X + TAG, "添加小箭头--目标物与预碰撞点之间的距离是" + String.valueOf(distance));
+//        if (distance > 5) {
+//            int count = (int) (distance / 5);
+//            for (int i = 0; i < count; i++) {
+//                MogoLatLng newLo = Trigonometric.getNewLocation(
+//                        startLatLng.getLon(), startLatLng.getLat(), 5 * (i + 1), Trigonometric.getAngle(startLatLng.lon, startLatLng.lat, endLatLng.lon, endLatLng.lat));
+//                Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMarkerService()).drawerArrowsMarkerWithLocation(newLo, WARNING_ARROWS, 10, new Double(rotate).intValue());
+//                CallerLogger.INSTANCE.d(M_V2X + TAG, "小箭头位置" + newLo);
+//            }
+//        }
+//
+//    }
+//
+//    //线随车动
+//    public void onCarLocationChanged2(MogoLocation latLng) {
+//        carLocation = new MogoLatLng(latLng.getLatitude(), latLng.getLongitude());
+//        if (MogoStatusManager.getInstance().isVrMode() && !isSelfLineClear) {
+//            if (mCloundWarningInfo != null) {
+//                V2XLocation v2XLocation = new V2XLocation();
+//                v2XLocation.setLat(latLng.getLatitude());
+//                v2XLocation.setLon(latLng.getLongitude());
+//                mCloundWarningInfo.setCarLocation(v2XLocation);
+//            }
+//            //衡阳交付-取消划线需求,只渲染识别物红色模型移动过程
+//            //drawSelfCarLine(latLng.getLongitude(), latLng.getLatitude(), latLng.getBearing());
+//        }
+//        CallerLogger.INSTANCE.d(M_V2X + TAG, "车辆行驶轨迹" + latLng.getLongitude() + "," + latLng.getLatitude());
+//    }
+//}
diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/utils/MapUtils.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/utils/MapUtils.kt
deleted file mode 100644
index 3615906cb1..0000000000
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/utils/MapUtils.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.mogo.eagle.function.biz.v2x.v2n.utils
-
-import android.content.Context
-import android.graphics.Rect
-import com.mogo.eagle.core.data.map.MogoLatLng
-import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager
-import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
-import com.mogo.eagle.core.utilcode.util.WindowUtils
-
-class MapUtils {
-
-    companion object {
-
-        @JvmStatic
-        fun zoomMap(latLng: MogoLatLng?, context: Context) {
-            try {
-                if (latLng == null) {
-                    return
-                }
-                val mBoundRect = Rect()
-                mBoundRect.bottom = WindowUtils.dip2px(context, 100f)
-                mBoundRect.top = WindowUtils.dip2px(context, 370f)
-                mBoundRect.left = WindowUtils.dip2px(context, 575f)
-                mBoundRect.right = WindowUtils.dip2px(context, 100f)
-                // 当前车辆位置
-                val carLocation = MogoLatLng(
-                    CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84().latitude,
-                    CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84().longitude
-                )
-                // 调整自适应的地图镜头
-                CallerMapUIServiceManager.getMapUIController()
-                    ?.showBounds("MapUtils", carLocation, listOf(latLng), mBoundRect, true)
-            } catch (e: Exception) {
-                e.printStackTrace()
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt
index 978f721a68..0850c92c85 100644
--- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt
+++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt
@@ -16,11 +16,12 @@ import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
 import com.mogo.eagle.core.function.call.obu.*
 import com.mogo.eagle.core.function.call.v2x.CallerLimitingVelocityListenerManager
 import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager
+import com.mogo.eagle.core.function.datacenter.obu.drawer.*
 import com.mogo.eagle.core.function.datacenter.obu.utils.TrafficDataConvertUtilsNew
 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.support.obu.ObuScene
-import com.mogo.support.obu.constants.MogoObuConstants
+import com.zhidao.support.obu.constants.MogoObuShowConstants
 import kotlin.math.roundToInt
 
 /**
@@ -102,24 +103,24 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener
 
             when (appId) {
                 // 道路危险情况预警
-                MogoObuConstants.RSI_SCENE_TYPE.HLW.toString() -> {
+                MogoObuShowConstants.RSI_SCENE_TYPE.HLW.toString() -> {
                     when (rsiWarningData.warningMsgList[0].eventSerialNum) {
-                        MogoObuConstants.RTE.RTI_TYPE_BREAKDOWN -> {//车辆故障
+                        MogoObuShowConstants.RTE.RTI_TYPE_BREAKDOWN -> {//车辆故障
                             appId = EventTypeEnumNew.TYPE_USECASE_ID_BREAKDOWN_WARNING.poiType
                         }
-                        MogoObuConstants.RTE.RTI_TYPE_ROAD_WATER -> { //道路积水
+                        MogoObuShowConstants.RTE.RTI_TYPE_ROAD_WATER -> { //道路积水
                             appId = EventTypeEnumNew.FOURS_PONDING.poiType
                         }
-                        MogoObuConstants.RTE.RTI_TYPE_PARKING_VIOLATION -> { //异常停车
+                        MogoObuShowConstants.RTE.RTI_TYPE_PARKING_VIOLATION -> { //异常停车
                             appId = EventTypeEnumNew.TYPE_USECASE_ID_ROAD_PARKING.poiType
                         }
-//                            MogoObuConstants.RTE.RTI_TYPE_CONSTRUCTION_RTE -> { //施工占道，和标牌重复
+//                            MogoObuShowConstants.RTE.RTI_TYPE_CONSTRUCTION_RTE -> { //施工占道，和标牌重复
 //                                appId = EventTypeEnumNew.FOURS_ROAD_WORK.poiType
 //                            }
-                        MogoObuConstants.RTE.RTI_TYPE_SPEEDING -> { //超速行驶
+                        MogoObuShowConstants.RTE.RTI_TYPE_SPEEDING -> { //超速行驶
                             appId = EventTypeEnumNew.TYPE_USECASE_ID_SLW.poiType
                         }
-                        MogoObuConstants.RTE.RTI_TYPE_RETRIGRADE -> { //车辆逆行
+                        MogoObuShowConstants.RTE.RTI_TYPE_RETRIGRADE -> { //车辆逆行
                             appId =
                                 EventTypeEnumNew.TYPE_USECASE_ID_ROAD_VEHICLE_RETROGRADE.poiType
                         }
@@ -139,77 +140,77 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener
                 }
 
                 //车内标牌
-                MogoObuConstants.RSI_SCENE_TYPE.IVS.toString() -> {
+                MogoObuShowConstants.RSI_SCENE_TYPE.IVS.toString() -> {
                     when (rsiWarningData.warningMsgList[0].signSerialNum) {
-                        MogoObuConstants.RTS.RTI_TYPE_SHAPR_TURNS -> { //急转弯
+                        MogoObuShowConstants.RTS.RTI_TYPE_SHAPR_TURNS -> { //急转弯
                             appId = EventTypeEnumNew.TYPE_ID_SHAPR_TURNS.poiType
                         }
-                        MogoObuConstants.RTS.RTI_TYPE_BRIDGE -> { //桥梁
+                        MogoObuShowConstants.RTS.RTI_TYPE_BRIDGE -> { //桥梁
                             appId = EventTypeEnumNew.TYPE_ID_BRIDGE.poiType
                         }
-                        MogoObuConstants.RTS.RTI_TYPE_PEDESTRIAN -> { //行人
+                        MogoObuShowConstants.RTS.RTI_TYPE_PEDESTRIAN -> { //行人
                             appId = EventTypeEnumNew.TYPE_ID_PEDESTRIAN.poiType
                         }
-                        MogoObuConstants.RTS.RTI_TYPE_SLIPPERY_ROAD -> { //路滑
+                        MogoObuShowConstants.RTS.RTI_TYPE_SLIPPERY_ROAD -> { //路滑
                             appId = EventTypeEnumNew.TYPE_ID_SLIPPERY_ROAD.poiType
                         }
-                        MogoObuConstants.RTS.RTI_TYPE_TUNNEL -> { //隧道
+                        MogoObuShowConstants.RTS.RTI_TYPE_TUNNEL -> { //隧道
                             appId = EventTypeEnumNew.TYPE_ID_TUNNEL.poiType
                         }
-                        MogoObuConstants.RTS.RTI_TYPE_FERRY -> { //渡轮
+                        MogoObuShowConstants.RTS.RTI_TYPE_FERRY -> { //渡轮
                             appId = EventTypeEnumNew.TYPE_ID_FERRY.poiType
                         }
-                        MogoObuConstants.RTS.RTI_TYPE_UNEVEN_ROAD -> { //路面不平
+                        MogoObuShowConstants.RTS.RTI_TYPE_UNEVEN_ROAD -> { //路面不平
                             appId = EventTypeEnumNew.TYPE_ID_UNEVEN_ROAD.poiType
                         }
-                        MogoObuConstants.RTS.RTI_TYPE_NON_MOTOR_VEHICLE -> { //非机动车
+                        MogoObuShowConstants.RTS.RTI_TYPE_NON_MOTOR_VEHICLE -> { //非机动车
                             appId = EventTypeEnumNew.TYPE_ID_NON_MOTOR_VEHICLE.poiType
                         }
-                        MogoObuConstants.RTS.RTI_TYPE_OBSTACLE -> { //障碍
+                        MogoObuShowConstants.RTS.RTI_TYPE_OBSTACLE -> { //障碍
                             appId = EventTypeEnumNew.TYPE_ID_OBSTACLE.poiType
                         }
-                        MogoObuConstants.RTS.RTI_TYPE_CONSTRUCTION -> { //施工
+                        MogoObuShowConstants.RTS.RTI_TYPE_CONSTRUCTION -> { //施工
                             appId = EventTypeEnumNew.TYPE_FOURS_ROAD_WORK.poiType
                         }
-                        MogoObuConstants.RTS.RTI_TYPE_VEHICLE_QUEUE -> { //车队
+                        MogoObuShowConstants.RTS.RTI_TYPE_VEHICLE_QUEUE -> { //车队
                             appId = EventTypeEnumNew.TYPE_VEHICLE_QUEUE.poiType
                         }
-                        MogoObuConstants.RTS.RTI_TYPE_NO_PASSING -> { //不通
+                        MogoObuShowConstants.RTS.RTI_TYPE_NO_PASSING -> { //不通
                             appId = EventTypeEnumNew.TYPE_NO_PASSING.poiType
                         }
-                        MogoObuConstants.RTS.RTI_TYPE_NO_TURNING_AROUND -> { //禁止掉头
+                        MogoObuShowConstants.RTS.RTI_TYPE_NO_TURNING_AROUND -> { //禁止掉头
                             appId = EventTypeEnumNew.TYPE_NO_TURNING_AROUND.poiType
                         }
-                        MogoObuConstants.RTS.RTI_TYPE_NO_STOPPING -> { //禁止停车
+                        MogoObuShowConstants.RTS.RTI_TYPE_NO_STOPPING -> { //禁止停车
                             appId = EventTypeEnumNew.TYPE_USECASE_ID_ROAD_NO_PARKING.poiType
                         }
-                        MogoObuConstants.RTS.RTI_TYPE_NO_TOOTING -> { //禁止鸣笛
+                        MogoObuShowConstants.RTS.RTI_TYPE_NO_TOOTING -> { //禁止鸣笛
                             appId = EventTypeEnumNew.TYPE_USECASE_ID_ROAD_NO_TOOTING.poiType
                         }
-                        MogoObuConstants.RTS.RTI_TYPE_SPEED_LIMIT -> { //限速
+                        MogoObuShowConstants.RTS.RTI_TYPE_SPEED_LIMIT -> { //限速
                             appId = EventTypeEnumNew.TYPE_USECASE_ID_ROAD_SPEED_LIMIT.poiType
                         }
-                        MogoObuConstants.RTS.RTI_TYPE_BUS_WARNING -> { //公交提醒
+                        MogoObuShowConstants.RTS.RTI_TYPE_BUS_WARNING -> { //公交提醒
                             appId = EventTypeEnumNew.TYPE_USECASE_ID_BUS_WARNING.poiType
                         }
-                        MogoObuConstants.RTS.RTI_TYPE_NARROW_RIGHT -> { //右侧变窄/车道数减少
+                        MogoObuShowConstants.RTS.RTI_TYPE_NARROW_RIGHT -> { //右侧变窄/车道数减少
                             appId = EventTypeEnumNew.TYPE_USECASE_ID_NARROW_RIGHT.poiType
                         }
-                        MogoObuConstants.RTS.RTI_TYPE_GAS_STATION -> { //加油站
+                        MogoObuShowConstants.RTS.RTI_TYPE_GAS_STATION -> { //加油站
                             appId = EventTypeEnumNew.TYPE_USECASE_ID_GAS_STATION.poiType
                         }
-                        MogoObuConstants.RTS.RTI_TYPE_SCHOOL -> { //学校
+                        MogoObuShowConstants.RTS.RTI_TYPE_SCHOOL -> { //学校
                             appId =
                                 EventTypeEnumNew.TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType
                         }
-                        MogoObuConstants.RTS.RTI_TYPE_ACCIDENT -> { //事故
+                        MogoObuShowConstants.RTS.RTI_TYPE_ACCIDENT -> { //事故
                             appId = EventTypeEnumNew.TYPE_USECASE_ID_ACCIDENT.poiType
                         }
-                        MogoObuConstants.RTS.RTI_TYPE_ATTENTION_CONFLUENCE -> { //注意合流
+                        MogoObuShowConstants.RTS.RTI_TYPE_ATTENTION_CONFLUENCE -> { //注意合流
                             appId = EventTypeEnumNew.TYPE_ATTENTION_CONFLUENCE.poiType
                         }
 
-                        MogoObuConstants.RTS.RTI_TYPE_PEDESTRIAN_CROSSING -> { //人行横道
+                        MogoObuShowConstants.RTS.RTI_TYPE_PEDESTRIAN_CROSSING -> { //人行横道
                             appId = EventTypeEnumNew.TYPE_PEDESTRIAN_CROSSING.poiType
                         }
                     }
@@ -227,7 +228,7 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener
                 }
 
                 // 拥堵
-                MogoObuConstants.RSI_SCENE_TYPE.TJW.toString() -> {
+                MogoObuShowConstants.RSI_SCENE_TYPE.TJW.toString() -> {
                     appId = EventTypeEnumNew.TYPE_USECASE_ID_TJW.poiType
                     alertContent = EventTypeEnumNew.getWarningContent(appId)
                     ttsContent = EventTypeEnumNew.getWarningTts(appId)
@@ -244,7 +245,7 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener
                 }
 
                 //限速预警, ADD处理一次
-                MogoObuConstants.RSI_SCENE_TYPE.SLW.toString() -> {
+                MogoObuShowConstants.RSI_SCENE_TYPE.SLW.toString() -> {
                     appId = EventTypeEnumNew.TYPE_USECASE_ID_ROAD_SPEED_LIMIT.poiType
                     if (mLimitSpeed > 0) {
                         alertContent = String.format(
@@ -265,7 +266,7 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener
             )
             when (status) {
                 // 添加
-                MogoObuConstants.STATUS.ADD -> {
+                MogoObuShowConstants.STATUS.ADD -> {
                     if (alertContent.isEmpty() || ttsContent.isEmpty()) {
                         return
                     }
@@ -276,11 +277,11 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener
                     }
                 }
 
-                MogoObuConstants.STATUS.UPDATE -> { // 更新
+                MogoObuShowConstants.STATUS.UPDATE -> { // 更新
                 }
 
                 // 删除
-                MogoObuConstants.STATUS.DELETE -> {
+                MogoObuShowConstants.STATUS.DELETE -> {
                     // 关闭警告红边
                     CallerHmiManager.dismissWarning(WarningDirectionEnum.ALERT_WARNING_NON)
                 }
@@ -320,31 +321,28 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener
                 val direction = getMessageDirection(rsmWarningData.participant.targetPosition)
                 //模型的显示
                 when (rsmWarningData.status) {
-                    MogoObuConstants.STATUS.ADD -> { // 添加
+                    MogoObuShowConstants.STATUS.ADD -> { // 添加
                         // 更新数据，模型变色的时候是不是update,如果不是更新，可能导致模型不变色，（add的时候，是否有level高的） TODO
                         TrafficDataConvertUtilsNew.cvxPtcThreatIndInfo2TrafficData(rsmWarningData)
                             ?.let {
-                                CallerMapUIServiceManager.getMarkerService()
-                                    ?.updateITrafficThreatLevelInfo(it)
+                                TrafficMarkerDrawer.updateITrafficThreatLevelInfo(it)
                             }
                     }
 
-                    MogoObuConstants.STATUS.UPDATE -> { // 更新
+                    MogoObuShowConstants.STATUS.UPDATE -> { // 更新
                     }
 
-                    MogoObuConstants.STATUS.DELETE -> { // 删除
+                    MogoObuShowConstants.STATUS.DELETE -> { // 删除
                         // 更新数据 TODO 删除原来的，改变颜色，删除marker。不影响别的模型添加
                         TrafficDataConvertUtilsNew.cvxPtcThreatIndInfo2TrafficData(rsmWarningData)
                             ?.let {
                                 // 事件结束，还原交通参与者颜色
                                 it.threatLevel = 0x01
-                                CallerMapUIServiceManager.getMarkerService()
-                                    ?.updateITrafficThreatLevelInfo(it)
+                                TrafficMarkerDrawer.updateITrafficThreatLevelInfo(it)
                             }
 
                         //删除弱势交通元素
-                        CallerMapUIServiceManager.getMarkerService()
-                            ?.removeCvxRvInfoIndInfo(rsmWarningData.participant.ptcId.toString())
+                        TrafficMarkerDrawer.removeCvxRvInfoIndInfo(rsmWarningData.participant.ptcId.toString())
                     }
                 }
 
@@ -357,14 +355,13 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener
                         } --v2xType--- $v2xType ---alertContent = $alertContent ---ttsContent= $ttsContent"
                     )
                     when (rsmWarningData.warningMsg.warningDataList[0].status) {
-                        MogoObuConstants.STATUS.ADD -> { // 添加
+                        MogoObuShowConstants.STATUS.ADD -> { // 添加
                             //更新模型的颜色
                             TrafficDataConvertUtilsNew.cvxPtcThreatIndInfo2TrafficData(
                                 rsmWarningData
                             )
                                 ?.let {
-                                    CallerMapUIServiceManager.getMarkerService()
-                                        ?.updateITrafficThreatLevelInfo(it)
+                                    TrafficMarkerDrawer.updateITrafficThreatLevelInfo(it)
                                 }
 
                             if (alertContent.isEmpty() || ttsContent.isEmpty()) {
@@ -374,15 +371,14 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener
                             showWarning(v2xType, alertContent, ttsContent, direction)
                         }
 
-                        MogoObuConstants.STATUS.UPDATE -> {// 更新
+                        MogoObuShowConstants.STATUS.UPDATE -> {// 更新
                         }
 
-                        MogoObuConstants.STATUS.DELETE -> { // 删除
+                        MogoObuShowConstants.STATUS.DELETE -> { // 删除
                             // 关闭警告红边
                             CallerHmiManager.dismissWarning(WarningDirectionEnum.ALERT_WARNING_ALL)
                             //删除弱势交通元素
-                            CallerMapUIServiceManager.getMarkerService()
-                                ?.removeCvxRvInfoIndInfo(rsmWarningData.participant.ptcId.toString())
+                            TrafficMarkerDrawer.removeCvxRvInfoIndInfo(rsmWarningData.participant.ptcId.toString())
                         }
                     }
                 }
@@ -419,7 +415,7 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener
                 } --- data.speedMaxLimit = ${data.speedMaxLimit}"
             )
             when (data.status) {
-                MogoObuConstants.STATUS.ADD -> { // 添加
+                MogoObuShowConstants.STATUS.ADD -> { // 添加
                     mLimitSpeed = (data.speedMaxLimit * 3.6).roundToInt()
                     CallerLimitingVelocityListenerManager.invokeUnion(
                         (data.speedMaxLimit * 3.6).roundToInt(),
@@ -427,10 +423,10 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener
                     )
                 }
 
-                MogoObuConstants.STATUS.UPDATE -> { // 更新
+                MogoObuShowConstants.STATUS.UPDATE -> { // 更新
                 }
 
-                MogoObuConstants.STATUS.DELETE -> { // 删除
+                MogoObuShowConstants.STATUS.DELETE -> { // 删除
                     CallerLimitingVelocityListenerManager.invokeUnion(
                         -1,
                         DataSourceType.OBU
@@ -445,22 +441,22 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener
      */
     private fun getMessageDirection(targetClassification: Int): WarningDirectionEnum {
         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 //正后方
-            MogoObuConstants.VEH_TARGET_POSITION.INTERSECTION_RIGHT -> WarningDirectionEnum.ALERT_WARNING_RIGHT //正右方
-            MogoObuConstants.VEH_TARGET_POSITION.INTERSECTION_LEFT -> WarningDirectionEnum.ALERT_WARNING_LEFT //正左方
-            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
+            MogoObuShowConstants.VEH_TARGET_POSITION.AHEAD_IN_LANE,
+            MogoObuShowConstants.VEH_TARGET_POSITION.ONCOMING_IN_LANE -> WarningDirectionEnum.ALERT_WARNING_TOP //正前方
+            MogoObuShowConstants.VEH_TARGET_POSITION.BEHEAD_IN_LANE -> WarningDirectionEnum.ALERT_WARNING_BOTTOM //正后方
+            MogoObuShowConstants.VEH_TARGET_POSITION.INTERSECTION_RIGHT -> WarningDirectionEnum.ALERT_WARNING_RIGHT //正右方
+            MogoObuShowConstants.VEH_TARGET_POSITION.INTERSECTION_LEFT -> WarningDirectionEnum.ALERT_WARNING_LEFT //正左方
+            MogoObuShowConstants.VEH_TARGET_POSITION.AHEAD_LEFT, MogoObuShowConstants.VEH_TARGET_POSITION.AHEAD_FAR_LEFT,
+            MogoObuShowConstants.VEH_TARGET_POSITION.ONCOMING_LEFT, MogoObuShowConstants.VEH_TARGET_POSITION.ONCOMING_FAR_LEFT
             -> WarningDirectionEnum.ALERT_WARNING_TOP_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
+            MogoObuShowConstants.VEH_TARGET_POSITION.AHEAD_RIGHT, MogoObuShowConstants.VEH_TARGET_POSITION.AHEAD_FAR_RIGHT,
+            MogoObuShowConstants.VEH_TARGET_POSITION.ONCOMING_RIGHT, MogoObuShowConstants.VEH_TARGET_POSITION.ONCOMING_FAT_RIGHT
             -> WarningDirectionEnum.ALERT_WARNING_TOP_RIGHT //右前方
-            MogoObuConstants.VEH_TARGET_POSITION.BEHEAD_LEFT, MogoObuConstants.VEH_TARGET_POSITION.BEHEAD_FAR_LEFT,
+            MogoObuShowConstants.VEH_TARGET_POSITION.BEHEAD_LEFT, MogoObuShowConstants.VEH_TARGET_POSITION.BEHEAD_FAR_LEFT,
             -> WarningDirectionEnum.ALERT_WARNING_BOTTOM_LEFT //左后方
-            MogoObuConstants.VEH_TARGET_POSITION.BEHEAD_RIGHT, MogoObuConstants.VEH_TARGET_POSITION.BEHEAD_FAR_RIGHT,
+            MogoObuShowConstants.VEH_TARGET_POSITION.BEHEAD_RIGHT, MogoObuShowConstants.VEH_TARGET_POSITION.BEHEAD_FAR_RIGHT,
             -> WarningDirectionEnum.ALERT_WARNING_BOTTOM_RIGHT  //右后方
-            MogoObuConstants.VEH_TARGET_POSITION.UNCLASSIFIED -> WarningDirectionEnum.ALERT_WARNING_NON //未知
+            MogoObuShowConstants.VEH_TARGET_POSITION.UNCLASSIFIED -> WarningDirectionEnum.ALERT_WARNING_NON //未知
             else -> WarningDirectionEnum.ALERT_WARNING_ALL
         }
     }
@@ -479,17 +475,16 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener
         )
         when (status) {
             // 添加
-            MogoObuConstants.STATUS.ADD,
-            MogoObuConstants.STATUS.UPDATE
+            MogoObuShowConstants.STATUS.ADD,
+            MogoObuShowConstants.STATUS.UPDATE
             -> {
                 if (lights != null && lights.isNotEmpty()) {
                     changeTrafficLightStatus(appId, lights)
                 }
             }
             // 删除
-            MogoObuConstants.STATUS.DELETE -> {
+            MogoObuShowConstants.STATUS.DELETE -> {
                 // 移除顶部弹窗，当收不到信号的时候触发一次
-                CallerTrafficLightListenerManager.disableTrafficLight()
                 CallerTrafficLightListenerManager.invokeTrafficLightDisapper()
                 isShowGreenWave = false
                 isShowRunRedLight = false
diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt
index f5f63dc314..d9440bfefe 100644
--- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt
+++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt
@@ -1,7 +1,6 @@
 package com.mogo.eagle.core.function.datacenter.obu
 
 import android.content.Context
-import android.util.Log
 import com.mogo.eagle.core.data.app.AppConfigInfo
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.config.HmiBuildConfig
@@ -19,6 +18,7 @@ import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager
 import com.mogo.eagle.core.function.call.obu.*
 import com.mogo.eagle.core.function.call.v2x.CallerLimitingVelocityListenerManager
 import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager
+import com.mogo.eagle.core.function.datacenter.obu.drawer.*
 import com.mogo.eagle.core.function.datacenter.obu.utils.TrafficDataConvertUtilsNew
 import com.mogo.eagle.core.utilcode.breakpoint.Config
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
@@ -27,10 +27,7 @@ import com.mogo.eagle.core.utilcode.util.FileUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.support.obu.ObuBase
 import com.mogo.support.obu.ObuScene
-import com.mogo.support.obu.constants.MogoObuComType
-import com.mogo.support.obu.constants.MogoObuConstants
-import com.mogo.support.obu.constants.MogoObuLogLevel
-import com.mogo.support.obu.constants.MogoObuTopicId
+import com.mogo.support.obu.constants.*
 import com.mogo.support.obu.model.*
 import com.mogo.support.obu.model.result.BaseResult
 import com.mogo.support.obu.model.result.MogoObuCallConfigResult
@@ -43,6 +40,7 @@ import com.mogo.support.obu.upgrade.ObuSoftwareUpgradeStatus
 import com.mogo.support.obu.upgrade.OnUpgradeListener
 import com.zhidao.support.obu.ObuManager
 import com.zhidao.support.obu.OnObuListener
+import com.zhidao.support.obu.constants.MogoObuShowConstants
 import mogo.telematics.pad.MessagePad
 import kotlin.math.roundToInt
 
@@ -309,8 +307,7 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
                     data.vehBasicsMsg?.let {
                         TrafficDataConvertUtilsNew.cvxRvInfoIndInfo2TrafficData(it)
                             ?.let { data ->
-                                CallerMapUIServiceManager.getMarkerService()
-                                    ?.updateITrafficLocationInfo(data)
+                                TrafficMarkerDrawer.updateITrafficLocationInfo(data)
                             }
                     }.also {
                         CallerLogger.e(
@@ -380,26 +377,26 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
                     if (appId != "0") {
                         when (appId) {
                             // 道路危险情况预警
-                            MogoObuConstants.RSI_SCENE_TYPE.HLW.toString() -> {
+                            MogoObuShowConstants.RSI_SCENE_TYPE.HLW.toString() -> {
                                 when (data.warningMsgList[0].eventSerialNum) {
-                                    MogoObuConstants.RTE.RTI_TYPE_BREAKDOWN -> {//车辆故障
+                                    MogoObuShowConstants.RTE.RTI_TYPE_BREAKDOWN -> {//车辆故障
                                         appId =
                                             EventTypeEnumNew.TYPE_USECASE_ID_BREAKDOWN_WARNING.poiType
                                     }
-                                    MogoObuConstants.RTE.RTI_TYPE_ROAD_WATER -> { //道路积水
+                                    MogoObuShowConstants.RTE.RTI_TYPE_ROAD_WATER -> { //道路积水
                                         appId = EventTypeEnumNew.FOURS_PONDING.poiType
                                     }
-                                    MogoObuConstants.RTE.RTI_TYPE_PARKING_VIOLATION -> { //异常停车
+                                    MogoObuShowConstants.RTE.RTI_TYPE_PARKING_VIOLATION -> { //异常停车
                                         appId =
                                             EventTypeEnumNew.TYPE_USECASE_ID_ROAD_PARKING.poiType
                                     }
-//                            MogoObuConstants.RTE.RTI_TYPE_CONSTRUCTION_RTE -> { //施工占道，和标牌重复
+//                            MogoObuShowConstants.RTE.RTI_TYPE_CONSTRUCTION_RTE -> { //施工占道，和标牌重复
 //                                appId = EventTypeEnumNew.FOURS_ROAD_WORK.poiType
 //                            }
-                                    MogoObuConstants.RTE.RTI_TYPE_SPEEDING -> { //超速行驶
+                                    MogoObuShowConstants.RTE.RTI_TYPE_SPEEDING -> { //超速行驶
                                         appId = EventTypeEnumNew.TYPE_USECASE_ID_SLW.poiType
                                     }
-                                    MogoObuConstants.RTE.RTI_TYPE_RETRIGRADE -> { //车辆逆行
+                                    MogoObuShowConstants.RTE.RTI_TYPE_RETRIGRADE -> { //车辆逆行
                                         appId =
                                             EventTypeEnumNew.TYPE_USECASE_ID_ROAD_VEHICLE_RETROGRADE.poiType
                                     }
@@ -419,83 +416,83 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
                             }
 
                             //车内标牌
-                            MogoObuConstants.RSI_SCENE_TYPE.IVS.toString() -> {
+                            MogoObuShowConstants.RSI_SCENE_TYPE.IVS.toString() -> {
                                 when (data.warningMsgList[0].signSerialNum) {
-                                    MogoObuConstants.RTS.RTI_TYPE_SHAPR_TURNS -> { //急转弯
+                                    MogoObuShowConstants.RTS.RTI_TYPE_SHAPR_TURNS -> { //急转弯
                                         appId = EventTypeEnumNew.TYPE_ID_SHAPR_TURNS.poiType
                                     }
-                                    MogoObuConstants.RTS.RTI_TYPE_BRIDGE -> { //桥梁
+                                    MogoObuShowConstants.RTS.RTI_TYPE_BRIDGE -> { //桥梁
                                         appId = EventTypeEnumNew.TYPE_ID_BRIDGE.poiType
                                     }
-                                    MogoObuConstants.RTS.RTI_TYPE_PEDESTRIAN -> { //行人
+                                    MogoObuShowConstants.RTS.RTI_TYPE_PEDESTRIAN -> { //行人
                                         appId = EventTypeEnumNew.TYPE_ID_PEDESTRIAN.poiType
                                     }
-                                    MogoObuConstants.RTS.RTI_TYPE_SLIPPERY_ROAD -> { //路滑
+                                    MogoObuShowConstants.RTS.RTI_TYPE_SLIPPERY_ROAD -> { //路滑
                                         appId = EventTypeEnumNew.TYPE_ID_SLIPPERY_ROAD.poiType
                                     }
-                                    MogoObuConstants.RTS.RTI_TYPE_TUNNEL -> { //隧道
+                                    MogoObuShowConstants.RTS.RTI_TYPE_TUNNEL -> { //隧道
                                         appId = EventTypeEnumNew.TYPE_ID_TUNNEL.poiType
                                     }
-                                    MogoObuConstants.RTS.RTI_TYPE_FERRY -> { //渡轮
+                                    MogoObuShowConstants.RTS.RTI_TYPE_FERRY -> { //渡轮
                                         appId = EventTypeEnumNew.TYPE_ID_FERRY.poiType
                                     }
-                                    MogoObuConstants.RTS.RTI_TYPE_UNEVEN_ROAD -> { //路面不平
+                                    MogoObuShowConstants.RTS.RTI_TYPE_UNEVEN_ROAD -> { //路面不平
                                         appId = EventTypeEnumNew.TYPE_ID_UNEVEN_ROAD.poiType
                                     }
-                                    MogoObuConstants.RTS.RTI_TYPE_NON_MOTOR_VEHICLE -> { //非机动车
+                                    MogoObuShowConstants.RTS.RTI_TYPE_NON_MOTOR_VEHICLE -> { //非机动车
                                         appId = EventTypeEnumNew.TYPE_ID_NON_MOTOR_VEHICLE.poiType
                                     }
-                                    MogoObuConstants.RTS.RTI_TYPE_OBSTACLE -> { //障碍
+                                    MogoObuShowConstants.RTS.RTI_TYPE_OBSTACLE -> { //障碍
                                         appId = EventTypeEnumNew.TYPE_ID_OBSTACLE.poiType
                                     }
-                                    MogoObuConstants.RTS.RTI_TYPE_CONSTRUCTION -> { //施工
+                                    MogoObuShowConstants.RTS.RTI_TYPE_CONSTRUCTION -> { //施工
                                         appId = EventTypeEnumNew.TYPE_FOURS_ROAD_WORK.poiType
                                     }
-                                    MogoObuConstants.RTS.RTI_TYPE_VEHICLE_QUEUE -> { //车队
+                                    MogoObuShowConstants.RTS.RTI_TYPE_VEHICLE_QUEUE -> { //车队
                                         appId = EventTypeEnumNew.TYPE_VEHICLE_QUEUE.poiType
                                     }
-                                    MogoObuConstants.RTS.RTI_TYPE_NO_PASSING -> { //不通
+                                    MogoObuShowConstants.RTS.RTI_TYPE_NO_PASSING -> { //不通
                                         appId = EventTypeEnumNew.TYPE_NO_PASSING.poiType
                                     }
-                                    MogoObuConstants.RTS.RTI_TYPE_NO_TURNING_AROUND -> { //禁止掉头
+                                    MogoObuShowConstants.RTS.RTI_TYPE_NO_TURNING_AROUND -> { //禁止掉头
                                         appId = EventTypeEnumNew.TYPE_NO_TURNING_AROUND.poiType
                                     }
-                                    MogoObuConstants.RTS.RTI_TYPE_NO_STOPPING -> { //禁止停车
+                                    MogoObuShowConstants.RTS.RTI_TYPE_NO_STOPPING -> { //禁止停车
                                         appId =
                                             EventTypeEnumNew.TYPE_USECASE_ID_ROAD_NO_PARKING.poiType
                                     }
-                                    MogoObuConstants.RTS.RTI_TYPE_NO_TOOTING -> { //禁止鸣笛
+                                    MogoObuShowConstants.RTS.RTI_TYPE_NO_TOOTING -> { //禁止鸣笛
                                         appId =
                                             EventTypeEnumNew.TYPE_USECASE_ID_ROAD_NO_TOOTING.poiType
                                     }
 
-//                                MogoObuConstants.RTS.RTI_TYPE_SPEED_LIMIT -> { //限速
+//                                MogoObuShowConstants.RTS.RTI_TYPE_SPEED_LIMIT -> { //限速
 //                                    appId =
 //                                        EventTypeEnumNew.TYPE_USECASE_ID_ROAD_SPEED_LIMIT.poiType
 //                                }
-                                    MogoObuConstants.RTS.RTI_TYPE_BUS_WARNING -> { //公交提醒
+                                    MogoObuShowConstants.RTS.RTI_TYPE_BUS_WARNING -> { //公交提醒
                                         appId = EventTypeEnumNew.TYPE_USECASE_ID_BUS_WARNING.poiType
                                     }
-                                    MogoObuConstants.RTS.RTI_TYPE_NARROW_RIGHT -> { //右侧变窄/车道数减少
+                                    MogoObuShowConstants.RTS.RTI_TYPE_NARROW_RIGHT -> { //右侧变窄/车道数减少
                                         appId =
                                             EventTypeEnumNew.TYPE_USECASE_ID_NARROW_RIGHT.poiType
                                     }
-                                    MogoObuConstants.RTS.RTI_TYPE_GAS_STATION -> { //加油站
+                                    MogoObuShowConstants.RTS.RTI_TYPE_GAS_STATION -> { //加油站
                                         appId = EventTypeEnumNew.TYPE_USECASE_ID_GAS_STATION.poiType
                                     }
-                                    MogoObuConstants.RTS.RTI_TYPE_SCHOOL -> { //学校
+                                    MogoObuShowConstants.RTS.RTI_TYPE_SCHOOL -> { //学校
                                         appId =
                                             EventTypeEnumNew.TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType
                                     }
-                                    MogoObuConstants.RTS.RTI_TYPE_ACCIDENT -> { //事故
+                                    MogoObuShowConstants.RTS.RTI_TYPE_ACCIDENT -> { //事故
                                         appId = EventTypeEnumNew.TYPE_USECASE_ID_ACCIDENT.poiType
                                     }
 
-                                    MogoObuConstants.RTS.RTI_TYPE_ATTENTION_CONFLUENCE -> { //注意合流
+                                    MogoObuShowConstants.RTS.RTI_TYPE_ATTENTION_CONFLUENCE -> { //注意合流
                                         appId = EventTypeEnumNew.TYPE_ATTENTION_CONFLUENCE.poiType
                                     }
 
-                                    MogoObuConstants.RTS.RTI_TYPE_PEDESTRIAN_CROSSING -> { //人行横道
+                                    MogoObuShowConstants.RTS.RTI_TYPE_PEDESTRIAN_CROSSING -> { //人行横道
                                         appId = EventTypeEnumNew.TYPE_PEDESTRIAN_CROSSING.poiType
                                     }
                                 }
@@ -514,7 +511,7 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
                             }
 
                             // 拥堵
-                            MogoObuConstants.RSI_SCENE_TYPE.TJW.toString() -> {
+                            MogoObuShowConstants.RSI_SCENE_TYPE.TJW.toString() -> {
                                 appId = EventTypeEnumNew.TYPE_USECASE_ID_TJW.poiType
                                 alertContent = EventTypeEnumNew.getWarningContent(appId)
                                 ttsContent = EventTypeEnumNew.getWarningTts(appId)
@@ -531,7 +528,7 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
                             }
 
                             //限速预警, ADD处理一次
-                            MogoObuConstants.RSI_SCENE_TYPE.SLW.toString() -> {
+                            MogoObuShowConstants.RSI_SCENE_TYPE.SLW.toString() -> {
                                 appId = EventTypeEnumNew.TYPE_USECASE_ID_ROAD_SPEED_LIMIT.poiType
 //                                alertContent = EventTypeEnumNew.getWarningContent(appId)
 //                                ttsContent = EventTypeEnumNew.getWarningTts(appId)
@@ -556,7 +553,7 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
                         )
 
                         when (status) {
-                            MogoObuConstants.STATUS.ADD -> { // 添加
+                            MogoObuShowConstants.STATUS.ADD -> { // 添加
                                 //不显示弹框，语音提示,数据在消息盒子里面展示，此处不在处理弹框
                                 if (alertContent.isEmpty() || ttsContent.isEmpty()) {
                                     return
@@ -570,22 +567,21 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
                                 // 更新数据
                                 TrafficDataConvertUtilsNew.cvxRtiThreatIndInfo2TrafficData(data)
                                     ?.let {
-                                        CallerMapUIServiceManager.getMarkerService()
-                                            ?.updateITrafficThreatLevelInfo(it)
+                                        TrafficMarkerDrawer.updateITrafficThreatLevelInfo(it)
                                     }
                             }
 
-                            MogoObuConstants.STATUS.UPDATE -> { // 更新
+                            MogoObuShowConstants.STATUS.UPDATE -> { // 更新
                             }
 
-                            MogoObuConstants.STATUS.DELETE -> { // 删除
+                            MogoObuShowConstants.STATUS.DELETE -> { // 删除
                                 // 更新数据
                                 TrafficDataConvertUtilsNew.cvxRtiThreatIndInfo2TrafficData(data)
                                     ?.let {
                                         // 事件结束，还原车辆颜色
                                         it.threatLevel = 0x01
-                                        CallerMapUIServiceManager.getMarkerService()
-                                            ?.updateITrafficInfo(it)
+
+                                        TrafficMarkerDrawer.updateITrafficInfo(it)
                                     }
                             }
                         }
@@ -637,31 +633,29 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
                             "onMogoObuRsmWarning ---- data.status = ${data.status} ---data.participant.ptcId = ${data.participant.ptcId} ---data.participant.ptcType = ${data.participant.ptcType} ---data.warningMsg = ${data.warningMsg} -----data = ${data.toString()}"
                         )
                         when (data.status) {
-                            MogoObuConstants.STATUS.ADD -> { // 添加
+                            MogoObuShowConstants.STATUS.ADD -> { // 添加
                                 // 更新数据，模型变色的时候是不是update,如果不是更新，可能导致模型不变色，（add的时候，是否有level高的） TODO
                                 TrafficDataConvertUtilsNew.cvxPtcThreatIndInfo2TrafficData(data)
                                     ?.let {
-                                        CallerMapUIServiceManager.getMarkerService()
-                                            ?.updateITrafficThreatLevelInfo(it)
+
+                                        TrafficMarkerDrawer.updateITrafficThreatLevelInfo(it)
                                     }
                             }
 
-                            MogoObuConstants.STATUS.UPDATE -> { // 更新
+                            MogoObuShowConstants.STATUS.UPDATE -> { // 更新
                             }
 
-                            MogoObuConstants.STATUS.DELETE -> { // 删除
+                            MogoObuShowConstants.STATUS.DELETE -> { // 删除
                                 // 更新数据 TODO 删除原来的，改变颜色，删除marker。不影响别的模型添加
                                 TrafficDataConvertUtilsNew.cvxPtcThreatIndInfo2TrafficData(data)
                                     ?.let {
                                         // 事件结束，还原交通参与者颜色
                                         it.threatLevel = 0x01
-                                        CallerMapUIServiceManager.getMarkerService()
-                                            ?.updateITrafficThreatLevelInfo(it)
+                                        TrafficMarkerDrawer.updateITrafficThreatLevelInfo(it)
                                     }
 
                                 //删除弱势交通元素
-                                CallerMapUIServiceManager.getMarkerService()
-                                    ?.removeCvxRvInfoIndInfo(data.participant.ptcId.toString())
+                                TrafficMarkerDrawer.removeCvxRvInfoIndInfo(data.participant.ptcId.toString())
                             }
                         }
 
@@ -673,12 +667,11 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
                                 "onMogoObuRsmWarning ---status---> ${data.status} ---data.warningMsg.warningData[0].status = ${data.warningMsg.warningDataList[0].status} ---v2xType = $v2xType ---alertContent = $alertContent ---ttsContent = $ttsContent ---level = $level"
                             )
                             when (data.warningMsg.warningDataList[0].status) {
-                                MogoObuConstants.STATUS.ADD -> { // 添加
+                                MogoObuShowConstants.STATUS.ADD -> { // 添加
                                     //更新模型的颜色
                                     TrafficDataConvertUtilsNew.cvxPtcThreatIndInfo2TrafficData(data)
                                         ?.let {
-                                            CallerMapUIServiceManager.getMarkerService()
-                                                ?.updateITrafficThreatLevelInfo(it)
+                                            TrafficMarkerDrawer.updateITrafficThreatLevelInfo(it)
                                         }
 
                                     if (alertContent.isEmpty() || ttsContent.isEmpty()) {
@@ -688,15 +681,14 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
                                     showWarning(v2xType, alertContent, ttsContent, direction)
                                 }
 
-                                MogoObuConstants.STATUS.UPDATE -> {// 更新
+                                MogoObuShowConstants.STATUS.UPDATE -> {// 更新
                                 }
 
-                                MogoObuConstants.STATUS.DELETE -> { // 删除
+                                MogoObuShowConstants.STATUS.DELETE -> { // 删除
                                     // 关闭警告红边
                                     CallerHmiManager.dismissWarning(WarningDirectionEnum.ALERT_WARNING_ALL)
                                     //删除弱势交通元素
-                                    CallerMapUIServiceManager.getMarkerService()
-                                        ?.removeCvxRvInfoIndInfo(data.participant.ptcId.toString())
+                                    TrafficMarkerDrawer.removeCvxRvInfoIndInfo(data.participant.ptcId.toString())
                                 }
                             }
                         }
@@ -716,7 +708,7 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
                         "onMogoObuMapMath = ${data.status} --speedMaxLimit = ${(data.speedMaxLimit * 3.6).roundToInt()}"
                     )
                     when (data.status) {
-                        MogoObuConstants.STATUS.ADD -> { // 添加
+                        MogoObuShowConstants.STATUS.ADD -> { // 添加
                             UiThreadHandler.post {
                                 if (data.speedMaxLimit > 0) {
                                     mLimitSpeed = (data.speedMaxLimit * 3.6).roundToInt()
@@ -727,10 +719,10 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
                             }
                         }
 
-                        MogoObuConstants.STATUS.UPDATE -> { // 更新
+                        MogoObuShowConstants.STATUS.UPDATE -> { // 更新
                         }
 
-                        MogoObuConstants.STATUS.DELETE -> { // 删除
+                        MogoObuShowConstants.STATUS.DELETE -> { // 删除
                             UiThreadHandler.post {
                                 CallerLimitingVelocityListenerManager.invokeUnion(
                                     -1,
@@ -749,22 +741,22 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
      */
     private fun getMessageDirection(targetClassification: Int): WarningDirectionEnum {
         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 //正后方
-            MogoObuConstants.VEH_TARGET_POSITION.INTERSECTION_RIGHT -> WarningDirectionEnum.ALERT_WARNING_RIGHT //正右方
-            MogoObuConstants.VEH_TARGET_POSITION.INTERSECTION_LEFT -> WarningDirectionEnum.ALERT_WARNING_LEFT //正左方
-            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
+            MogoObuShowConstants.VEH_TARGET_POSITION.AHEAD_IN_LANE,
+            MogoObuShowConstants.VEH_TARGET_POSITION.ONCOMING_IN_LANE -> WarningDirectionEnum.ALERT_WARNING_TOP //正前方
+            MogoObuShowConstants.VEH_TARGET_POSITION.BEHEAD_IN_LANE -> WarningDirectionEnum.ALERT_WARNING_BOTTOM //正后方
+            MogoObuShowConstants.VEH_TARGET_POSITION.INTERSECTION_RIGHT -> WarningDirectionEnum.ALERT_WARNING_RIGHT //正右方
+            MogoObuShowConstants.VEH_TARGET_POSITION.INTERSECTION_LEFT -> WarningDirectionEnum.ALERT_WARNING_LEFT //正左方
+            MogoObuShowConstants.VEH_TARGET_POSITION.AHEAD_LEFT, MogoObuShowConstants.VEH_TARGET_POSITION.AHEAD_FAR_LEFT,
+            MogoObuShowConstants.VEH_TARGET_POSITION.ONCOMING_LEFT, MogoObuShowConstants.VEH_TARGET_POSITION.ONCOMING_FAR_LEFT
             -> WarningDirectionEnum.ALERT_WARNING_TOP_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
+            MogoObuShowConstants.VEH_TARGET_POSITION.AHEAD_RIGHT, MogoObuShowConstants.VEH_TARGET_POSITION.AHEAD_FAR_RIGHT,
+            MogoObuShowConstants.VEH_TARGET_POSITION.ONCOMING_RIGHT, MogoObuShowConstants.VEH_TARGET_POSITION.ONCOMING_FAT_RIGHT
             -> WarningDirectionEnum.ALERT_WARNING_TOP_RIGHT //右前方
-            MogoObuConstants.VEH_TARGET_POSITION.BEHEAD_LEFT, MogoObuConstants.VEH_TARGET_POSITION.BEHEAD_FAR_LEFT,
+            MogoObuShowConstants.VEH_TARGET_POSITION.BEHEAD_LEFT, MogoObuShowConstants.VEH_TARGET_POSITION.BEHEAD_FAR_LEFT,
             -> WarningDirectionEnum.ALERT_WARNING_BOTTOM_LEFT //左后方
-            MogoObuConstants.VEH_TARGET_POSITION.BEHEAD_RIGHT, MogoObuConstants.VEH_TARGET_POSITION.BEHEAD_FAR_RIGHT,
+            MogoObuShowConstants.VEH_TARGET_POSITION.BEHEAD_RIGHT, MogoObuShowConstants.VEH_TARGET_POSITION.BEHEAD_FAR_RIGHT,
             -> WarningDirectionEnum.ALERT_WARNING_BOTTOM_RIGHT  //右后方
-            MogoObuConstants.VEH_TARGET_POSITION.UNCLASSIFIED -> WarningDirectionEnum.ALERT_WARNING_NON //未知
+            MogoObuShowConstants.VEH_TARGET_POSITION.UNCLASSIFIED -> WarningDirectionEnum.ALERT_WARNING_NON //未知
             else -> WarningDirectionEnum.ALERT_WARNING_ALL
         }
     }
@@ -789,7 +781,7 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
         var changeVisualAngle = false
         when (appId) {
             //前向碰撞预警
-            MogoObuConstants.V2X_WARNING_TYPE.FCW.toString() -> {
+            MogoObuShowConstants.V2X_WARNING_TYPE.FCW.toString() -> {
                 if (FunctionBuildConfig.isObuWarningFusionUnion && level == 3) {
                     alertContent = "前车距离过近"
                     ttsContent = "前车距离过近"
@@ -803,7 +795,7 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
             }
 
             //交叉路口碰撞预警
-            MogoObuConstants.V2X_WARNING_TYPE.ICW.toString() -> {
+            MogoObuShowConstants.V2X_WARNING_TYPE.ICW.toString() -> {
                 alertContent =
                     EventTypeEnumNew.getWarningContent(EventTypeEnumNew.TYPE_USECASE_ID_ICW.poiType)
                 ttsContent =
@@ -812,7 +804,7 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
             }
 
             //左转辅助预警
-            MogoObuConstants.V2X_WARNING_TYPE.LTA.toString() -> {
+            MogoObuShowConstants.V2X_WARNING_TYPE.LTA.toString() -> {
                 alertContent =
                     EventTypeEnumNew.getWarningContent(EventTypeEnumNew.TYPE_USECASE_ID_LTA.poiType)
                 ttsContent =
@@ -821,7 +813,7 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
             }
 
             //盲区预警
-            MogoObuConstants.V2X_WARNING_TYPE.BSW.toString() -> {
+            MogoObuShowConstants.V2X_WARNING_TYPE.BSW.toString() -> {
                 ttsContent =
                     EventTypeEnumNew.getWarningTts(EventTypeEnumNew.TYPE_USECASE_ID_BSW.poiType)
                 alertContent =
@@ -847,7 +839,7 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
             }
 
             // 变道预警,注意左后车辆/注意右后车辆
-            MogoObuConstants.V2X_WARNING_TYPE.LCW.toString() -> {
+            MogoObuShowConstants.V2X_WARNING_TYPE.LCW.toString() -> {
                 alertContent =
                     EventTypeEnumNew.getWarningContent(EventTypeEnumNew.TYPE_USECASE_ID_LCW.poiType)
                 ttsContent =
@@ -871,7 +863,7 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
             }
 
             //逆向超车预警
-            MogoObuConstants.V2X_WARNING_TYPE.DNPW.toString() -> {
+            MogoObuShowConstants.V2X_WARNING_TYPE.DNPW.toString() -> {
                 alertContent =
                     EventTypeEnumNew.getWarningContent(EventTypeEnumNew.TYPE_USECASE_ID_DNPW.poiType)
                 ttsContent =
@@ -880,7 +872,7 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
             }
 
             //紧急制动预警
-            MogoObuConstants.V2X_WARNING_TYPE.EBW.toString() -> {
+            MogoObuShowConstants.V2X_WARNING_TYPE.EBW.toString() -> {
                 alertContent =
                     EventTypeEnumNew.getWarningContent(EventTypeEnumNew.TYPE_USECASE_ID_EBW.poiType)
                 ttsContent =
@@ -889,7 +881,7 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
             }
 
             //异常车辆提醒
-            MogoObuConstants.V2X_WARNING_TYPE.AVW.toString() -> {
+            MogoObuShowConstants.V2X_WARNING_TYPE.AVW.toString() -> {
                 alertContent =
                     EventTypeEnumNew.getWarningContent(EventTypeEnumNew.TYPE_USECASE_ID_AVW.poiType)
                 ttsContent =
@@ -899,7 +891,7 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
             }
 
             //车辆失控预警
-            MogoObuConstants.V2X_WARNING_TYPE.CLW.toString() -> {
+            MogoObuShowConstants.V2X_WARNING_TYPE.CLW.toString() -> {
                 alertContent =
                     EventTypeEnumNew.getWarningContent(EventTypeEnumNew.TYPE_USECASE_ID_CLW.poiType)
                 ttsContent =
@@ -909,7 +901,7 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
                 ttsContent = String.format(ttsContent, direction.desc)
             }
             //车辆失控预警
-            MogoObuConstants.V2X_WARNING_TYPE.EVW.toString() -> {
+            MogoObuShowConstants.V2X_WARNING_TYPE.EVW.toString() -> {
                 alertContent =
                     EventTypeEnumNew.getWarningContent(EventTypeEnumNew.TYPE_USECASE_ID_EVW.poiType)
                 ttsContent =
@@ -920,8 +912,8 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
 
         when (status) {
             // 添加,更新 add的时候，可能级别是2，
-            MogoObuConstants.STATUS.ADD,
-            MogoObuConstants.STATUS.UPDATE -> {
+            MogoObuShowConstants.STATUS.ADD,
+            MogoObuShowConstants.STATUS.UPDATE -> {
                 CallerLogger.d(
                     "$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}",
                     "new handleSdkObu appId2 = $appId --- level = $level ---ttsContent = $ttsContent --- alertContent = $alertContent --- direction = $direction"
@@ -953,20 +945,18 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
 
                 //更新周边车辆进行预警颜色变换，车辆实时移动和变色 ，UUID不需要匹配了
                 TrafficDataConvertUtilsNew.cvxV2vThreatIndInfo2TrafficData(info)?.let {
-                    CallerMapUIServiceManager.getMarkerService()
-                        ?.updateITrafficThreatLevelInfo(it)
+                    TrafficMarkerDrawer.updateITrafficThreatLevelInfo(it)
                     CallerObuWarningListenerManager.invokeTrackerWarningInfo(it)
                 }
             }
             // 删除
-            MogoObuConstants.STATUS.DELETE -> {
+            MogoObuShowConstants.STATUS.DELETE -> {
                 // 关闭警告红边
                 CallerHmiManager.dismissWarning(WarningDirectionEnum.ALERT_WARNING_ALL)
                 //更新周边车辆进行预警颜色变换，车辆实时移动和变色
                 TrafficDataConvertUtilsNew.cvxV2vThreatIndInfo2TrafficData(info)?.let {
                     it.threatLevel = 0x01
-                    CallerMapUIServiceManager.getMarkerService()
-                        ?.updateITrafficThreatLevelInfo(it)
+                    TrafficMarkerDrawer.updateITrafficThreatLevelInfo(it)
                     CallerObuWarningListenerManager.removeTrackerWarningInfo(it)
                 }
             }
@@ -987,16 +977,15 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
         )
         when (status) {
             // 添加
-            MogoObuConstants.STATUS.ADD,
-            MogoObuConstants.STATUS.UPDATE -> {
+            MogoObuShowConstants.STATUS.ADD,
+            MogoObuShowConstants.STATUS.UPDATE -> {
                 if (lights != null && lights.isNotEmpty()) {
                     changeTrafficLightStatus(appId, lights)
                 }
             }
             // 删除
-            MogoObuConstants.STATUS.DELETE -> {
+            MogoObuShowConstants.STATUS.DELETE -> {
                 // 移除顶部弹窗
-                CallerTrafficLightListenerManager.disableTrafficLight()
                 CallerTrafficLightListenerManager.invokeTrafficLightDisapper()
                 isShowGreenWave = false
                 isShowRunRedLight = false
diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/const/ObuConst.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/const/ObuConst.kt
new file mode 100644
index 0000000000..4024ad14f3
--- /dev/null
+++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/const/ObuConst.kt
@@ -0,0 +1,10 @@
+package com.mogo.eagle.core.function.datacenter.obu.const
+
+class ObuConst {
+
+    companion object {
+
+        @JvmStatic
+        val OBU_MARKER_OWNER = "obu_new_marker_owner"
+    }
+}
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/drawer/TrafficMarkerDrawer.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/drawer/TrafficMarkerDrawer.kt
similarity index 75%
rename from core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/drawer/TrafficMarkerDrawer.kt
rename to core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/drawer/TrafficMarkerDrawer.kt
index 785e7f24df..9c5780c48d 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/drawer/TrafficMarkerDrawer.kt
+++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/drawer/TrafficMarkerDrawer.kt
@@ -1,22 +1,22 @@
-package com.mogo.eagle.core.function.impl.marker.drawer
+package com.mogo.eagle.core.function.datacenter.obu.drawer
 
 import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Handler
 import android.os.Message
 import android.text.TextUtils
-import android.util.Log
 import com.mogo.commons.AbsMogoApplication
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.constants.DataTypes
 import com.mogo.eagle.core.data.enums.TrafficTypeEnum
 import com.mogo.eagle.core.data.traffic.TrafficData
 import com.mogo.eagle.core.data.traffic.threatLevelColor
+import com.mogo.eagle.core.function.call.map.*
+import com.mogo.eagle.core.function.datacenter.obu.const.*
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.thread.WorkThreadHandler
-import com.mogo.map.MogoMarkerManager
-import com.mogo.map.marker.IMogoMarker
-import com.mogo.map.marker.MogoMarkerOptions
+import com.mogo.map.overlay.core.Level.MAP_MARKER
+import com.mogo.map.overlay.point.*
 import java.util.concurrent.ConcurrentHashMap
 
 /**
@@ -41,7 +41,7 @@ object TrafficMarkerDrawer {
     private val mMarkerCachesResMd5Values = ConcurrentHashMap<String, String>()
 
     // 上一帧数据的缓存，用来做移动动画
-    private val mMarkersCaches = ConcurrentHashMap<String, IMogoMarker>()
+    private val mMarkersCaches = ConcurrentHashMap<String, Point?>()
 
     // 维护一个线程定时轮询数据进行地图绘制
     private val mDrawerHandler: Handler =
@@ -104,7 +104,7 @@ object TrafficMarkerDrawer {
          if (FunctionBuildConfig.debugTrackerProvider != 1) {
             return
         }
-        if (trafficData != null && !TextUtils.isEmpty(trafficData.uuid)) {
+        if (!TextUtils.isEmpty(trafficData.uuid)) {
             val tempTraffic = mTrafficMap[trafficData.uuid]
             if (tempTraffic != null) {
                 tempTraffic.lat = trafficData.lat
@@ -128,8 +128,8 @@ object TrafficMarkerDrawer {
     fun removeCvxRvInfoIndInfo(key: String) {
         if (mTrafficMap.containsKey(key)) {
             mTrafficMap.remove(key)
-            mMarkersCaches.get(key)?.let {
-                it.remove()
+            mMarkersCaches[key]?.let {
+                it.delegate?.remove()
             }
 
         }
@@ -141,8 +141,8 @@ object TrafficMarkerDrawer {
     private fun drawerTrafficInfo() {
         // 数据为空的时候清除所有数据
         if (mTrafficMap.isEmpty()) {
-            mMarkersCaches.forEach {
-                it.value.remove()
+            mMarkersCaches.forEach { it ->
+                it.value?.also { CallerMapUIServiceManager.getOverlayManager()?.removePoint(it) }
             }
             mMarkersCaches.clear()
         } else {
@@ -172,40 +172,33 @@ object TrafficMarkerDrawer {
             TAG,
             "drawObuRecognizedDataMarker trafficData.type = " + trafficData.type + "---trafficData.threatLevel = " + trafficData.threatLevel
         )
-        if (trafficData.type != null) {
-            val resId: Int = trafficData.type.traffic3DIconId
-
-            val resIdVal = resId.toString() + ""
-
-            val options = MogoMarkerOptions()
-                .owner(DataTypes.TYPE_MARKER_ADAS)
-                .anchor(0.5f, 0.5f)
-                .set3DMode(true)
-                .gps(true)
-                .controlAngle(true)
-                .resName(mMarkerCachesResMd5Values[resIdVal])
-                .icon3DRes(resId)
-                .rotate(trafficData.heading.toFloat())
-                .position(
-                    com.mogo.eagle.core.data.map.MogoLatLng(
-                        trafficData.lat,
-                        trafficData.lon
-                    )
-                )
-
-            if (trafficData.type != TrafficTypeEnum.TYPE_TRAFFIC_ID_SPECIAL_VEHICLE) {
-                // 修改颜色
-                mMarkersCaches[trafficData.uuid]?.setAnchorColor(trafficData.threatLevelColor())
+        val resId: Int = trafficData.type.traffic3DIconId
+        val resIdVal = resId.toString() + ""
+        val builder = Point.Options.Builder(DataTypes.TYPE_MARKER_ADAS, MAP_MARKER)
+            .anchor(0.5f, 0.5f)
+            .set3DMode(true)
+            .isUseGps(true)
+            .controlAngle(true)
+            .resName(mMarkerCachesResMd5Values[resIdVal])
+            .icon3DRes(resId)
+            .rotate(trafficData.heading.toFloat())
+            .longitude(trafficData.lon)
+            .latitude(trafficData.lat)
+        if (trafficData.type != TrafficTypeEnum.TYPE_TRAFFIC_ID_SPECIAL_VEHICLE) {
+            // 修改颜色
+            mMarkersCaches[trafficData.uuid]?.also {
+                CallerMapUIServiceManager.getOverlayManager()?.showOrUpdatePoint(it.option.builder().anchorColor(trafficData.threatLevelColor()).build())
             }
-            val marker = MogoMarkerManager.getInstance(mContext)
-                .addMarker(DataTypes.TYPE_MARKER_OBU_DATA, options)
+        }
 
-            // 缓存3D资源
-            mMarkerCachesResMd5Values[resIdVal] = marker.markerResName
-            // 缓存数据
-            if (trafficData.uuid != null) {
-                mMarkersCaches[trafficData.uuid!!] = marker
-            }
+        val options = builder.build()
+        val point = CallerMapUIServiceManager.getOverlayManager()?.showOrUpdatePoint(options) //        val marker = MogoMarkerManager.getInstance(mContext)
+//            .addMarker(DataTypes.TYPE_MARKER_OBU_DATA, options)
+
+        // 缓存3D资源
+        mMarkerCachesResMd5Values[resIdVal] = options.resName ?: "" // 缓存数据
+        if (trafficData.uuid != null) {
+            mMarkersCaches[trafficData.uuid!!] = point
         }
     }
 
@@ -213,7 +206,7 @@ object TrafficMarkerDrawer {
      * 带动画的修改Marker
      */
     private fun changeDynamicMarker(
-        marker: IMogoMarker,
+        marker: Point,
         trafficData: TrafficData
     ) {
         CallerLogger.d(
@@ -221,11 +214,12 @@ object TrafficMarkerDrawer {
             "changeDynamicMarker trafficData.type = " + trafficData.type + "---trafficData.threatLevel = " + trafficData.threatLevel
         )
         if (trafficData.type != TrafficTypeEnum.TYPE_TRAFFIC_ID_SPECIAL_VEHICLE) {
-            mMarkersCaches[trafficData.uuid]?.setAnchorColor(trafficData.threatLevelColor())
+            mMarkersCaches[trafficData.uuid]?.also {
+                CallerMapUIServiceManager.getOverlayManager()?.showOrUpdatePoint(it.option.builder().anchorColor(trafficData.threatLevelColor()).build())
+            }
         }
-
         try {
-            marker.addDynamicAnchorPosition(
+            marker.delegate?.addDynamicAnchorPosition(
                 com.mogo.eagle.core.data.map.MogoLatLng(
                     trafficData.lat,
                     trafficData.lon
diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt
index 8c57a70f32..58a7bd1214 100644
--- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt
+++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt
@@ -121,6 +121,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
      * @param enter true:进入路口；false:离开路口
      */
     override fun onEnterCrossRoad(enter: Boolean) {
+        CallerLogger.d("${SceneConstant.M_OBU}${TAG}", "onEnterCrossRoad enter = $enter ")
         if (!enter) {
             Handler().postDelayed({
                 hasAiLightStatus = false
@@ -139,6 +140,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
      */
     override fun onTrafficRequestError() {
         hasAiLightStatus = false
+        CallerLogger.d("${SceneConstant.M_OBU}${TAG}", "onTrafficRequestError hasObuLightStatus = $hasObuLightStatus ------> ")
         CallerTrafficLightListenerManager.resetTrafficLightStatus(!hasObuLightStatus)
         if(!hasObuLightStatus){
             hide()
@@ -149,6 +151,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
      * obu数据消失
      */
     override fun onObuTrafficLightDisapper() {
+        CallerLogger.d("${SceneConstant.M_OBU}${TAG}", "onObuTrafficLightDisapper ------> ")
         hasObuLightStatus = false
         hide()
     }
@@ -169,7 +172,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
         lightSource: DataSourceType
     ) {
         super.onTrafficLightPlusSource(light, remain, lightSource)
-        CallerLogger.d("${SceneConstant.M_OBU}${TAG}", "onTrafficLightPlusSource light = $light ---remain = $remain ---lightSource = $lightSource")
+        CallerLogger.d("${SceneConstant.M_OBU}${TAG}", "onTrafficLightPlusSource ----- light = $light ---remain = $remain ---lightSource = $lightSource")
         if (lightSource == DataSourceType.OBU) {
             hasObuLightStatus = true
         }
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/net/IAiCloudIdentifyApiService.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/net/IAiCloudIdentifyApiService.kt
index 2a88126598..2e8ec4357f 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/net/IAiCloudIdentifyApiService.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/net/IAiCloudIdentifyApiService.kt
@@ -9,6 +9,5 @@ interface IAiCloudIdentifyApiService {
 
     @Headers("Content-type:application/json;charset=UTF-8")
     @POST("eagle-eye-dns/yycp-c-v2x-service/dataFusion/remoteDrivingSet")
-//    @POST("yycp-data-center-service1/remoteDrivingSet")
     suspend fun identifyRange(@Body map: MutableMap<String, Any>): BaseResponse<Any>
 }
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyAiCloudDataDrawer.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyAiCloudDataDrawer.kt
index a0a741db4a..b01bf69b6e 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyAiCloudDataDrawer.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyAiCloudDataDrawer.kt
@@ -5,7 +5,7 @@ import androidx.collection.ArraySet
 import com.mogo.commons.AbsMogoApplication
 import com.mogo.commons.module.status.MogoStatusManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.w
-import com.mogo.map.MogoMarkerManager
+import com.mogo.map.identify.MogoIdentifyManager
 import mogo.yycp.api.proto.SocketDownData
 import java.util.concurrent.ConcurrentHashMap
 
@@ -58,14 +58,14 @@ class IdentifyAiCloudDataDrawer : Identify {
             val key = it.next() as String
             it.remove()
             mMarkersCaches.remove(key)
-            MogoMarkerManager.getInstance(AbsMogoApplication.getApp())
+            MogoIdentifyManager.getInstance(AbsMogoApplication.getApp())
                 .removeMarker(key.hashCode().toString())
         }
 
         val filterList = filterTrafficData(resultList)
         if (filterList.size > 0) {
             // 绘制新数据
-            MogoMarkerManager.getInstance(AbsMogoApplication.getApp())
+            MogoIdentifyManager.getInstance(AbsMogoApplication.getApp())
                 .updateBatchAiMarkerPosition(filterList)
         }
     }
@@ -93,7 +93,7 @@ class IdentifyAiCloudDataDrawer : Identify {
         trafficDataUuidList.clear()
         mMarkersCaches.forEach { (uuid, _) ->
             mMarkersCaches.remove(uuid)
-            MogoMarkerManager.getInstance(AbsMogoApplication.getApp())
+            MogoIdentifyManager.getInstance(AbsMogoApplication.getApp())
                 .removeMarker(uuid.hashCode().toString())
         }
         mFilterTrafficData.clear()
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyBeautifyDataDrawer.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyBeautifyDataDrawer.kt
index aa8a35caf9..7a334879a9 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyBeautifyDataDrawer.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyBeautifyDataDrawer.kt
@@ -5,7 +5,7 @@ import com.mogo.commons.AbsMogoApplication
 import com.mogo.commons.module.status.MogoStatusManager
 import com.mogo.eagle.core.data.traffic.TrafficData
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.w
-import com.mogo.map.MogoMarkerManager
+import com.mogo.map.identify.MogoIdentifyManager
 import mogo.telematics.pad.MessagePad
 import mogo.telematics.pad.MessagePad.TrackedObject
 
@@ -49,7 +49,7 @@ class IdentifyBeautifyDataDrawer : Identify {
         val filterList = TrackManager.getInstance().filterTrafficData(resultList)
         if (filterList.size > 0) {
             // 绘制新数据
-            MogoMarkerManager.getInstance(AbsMogoApplication.getApp())
+            MogoIdentifyManager.getInstance(AbsMogoApplication.getApp())
                 .updateBatchMarkerPosition(filterList)
         }
     }
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyOriginDataDrawer.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyOriginDataDrawer.kt
index 97ddd37b9a..4a729e4665 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyOriginDataDrawer.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyOriginDataDrawer.kt
@@ -6,7 +6,7 @@ import com.mogo.commons.AbsMogoApplication
 import com.mogo.commons.module.status.MogoStatusManager
 import com.mogo.eagle.core.data.traffic.TrafficData
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.w
-import com.mogo.map.MogoMarkerManager
+import com.mogo.map.identify.MogoIdentifyManager
 import mogo.telematics.pad.MessagePad.PlanningObject
 import mogo.telematics.pad.MessagePad.TrackedObject
 import java.util.concurrent.ConcurrentHashMap
@@ -82,14 +82,14 @@ class IdentifyOriginDataDrawer : Identify {
             val key = it.next() as String
             it.remove()
             mMarkersCaches.remove(key)
-            MogoMarkerManager.getInstance(AbsMogoApplication.getApp())
+            MogoIdentifyManager.getInstance(AbsMogoApplication.getApp())
                 .removeMarker(key)
         }
 
         val filterList = filterTrafficData(resultList)
         if (filterList.size > 0) {
             // 绘制新数据
-            MogoMarkerManager.getInstance(AbsMogoApplication.getApp())
+            MogoIdentifyManager.getInstance(AbsMogoApplication.getApp())
                 .updateBatchMarkerPosition(filterList)
         }
     }
@@ -127,7 +127,7 @@ class IdentifyOriginDataDrawer : Identify {
     @SuppressLint("NewApi")
     override fun clearOldMarker() {
         for (uuid in trafficDataUuidList) {
-            MogoMarkerManager.getInstance(AbsMogoApplication.getApp())
+            MogoIdentifyManager.getInstance(AbsMogoApplication.getApp())
                 .removeMarker(uuid)
         }
         trafficDataUuidList.clear()
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackManager.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackManager.java
index 242f8e1d23..df0035cbdc 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackManager.java
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackManager.java
@@ -9,7 +9,7 @@ import com.mogo.commons.AbsMogoApplication;
 import com.mogo.eagle.core.data.traffic.TrafficData;
 import com.mogo.eagle.core.utilcode.geometry.S2CellId;
 import com.mogo.eagle.core.utilcode.geometry.S2LatLng;
-import com.mogo.map.MogoMarkerManager;
+import com.mogo.map.identify.MogoIdentifyManager;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -150,7 +150,7 @@ public class TrackManager {
         cellIdCaches.remove(key);
         mMarkersCaches.remove(key);
         WarningHelper.INSTANCE.remove(key);
-        MogoMarkerManager.getInstance(AbsMogoApplication.getApp())
+        MogoIdentifyManager.getInstance(AbsMogoApplication.getApp())
                 .removeMarker(key);
     }
 
@@ -160,7 +160,7 @@ public class TrackManager {
         WarningHelper.INSTANCE.clear();
         mMarkersCaches.forEach((uuid, trackObj) -> {
             trackObj.clear();
-            MogoMarkerManager.getInstance(AbsMogoApplication.getApp())
+            MogoIdentifyManager.getInstance(AbsMogoApplication.getApp())
                     .removeMarker(uuid);
         });
         mMarkersCaches.clear();
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/RouteOverlayDrawer.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/RouteOverlayDrawer.java
index a218d36f2e..d68e7a025f 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/RouteOverlayDrawer.java
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/RouteOverlayDrawer.java
@@ -5,20 +5,16 @@ import android.graphics.Color;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.util.Log;
-
 import androidx.core.util.Pools;
-
 import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager;
+import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
 import com.mogo.eagle.core.utilcode.util.DrivingDirectionUtils;
-import com.mogo.map.MogoOverlayManager;
-import com.mogo.map.overlay.IMogoOverlayManager;
-import com.mogo.map.overlay.IMogoPolyline;
-import com.mogo.map.overlay.MogoPolylineOptions;
-
+import com.mogo.map.overlay.IMoGoOverlayManager;
+import com.mogo.map.overlay.core.Level;
+import com.mogo.map.overlay.line.Polyline;
 import java.util.LinkedList;
 import java.util.List;
-
 import mogo.telematics.pad.MessagePad;
 
 public class RouteOverlayDrawer {
@@ -27,28 +23,32 @@ public class RouteOverlayDrawer {
 
     // 连接线参数
     private Handler mRenderHandler;
-    IMogoOverlayManager mogoOverlayManager;
+    private final IMoGoOverlayManager mogoOverlayManager;
     private static volatile RouteOverlayDrawer sInstance;
-    private final MogoPolylineOptions mPolylineOptions;
-    private volatile IMogoPolyline mMoGoPolyline;
+    private Polyline.Options mPolylineOptions;
     private static final int COLOR_LIGHT = Color.parseColor("#BAEBF5");
 
+
     private RouteOverlayDrawer() {
-        mPolylineOptions = new MogoPolylineOptions();
-        mPolylineOptions.zIndex(75000f);
-        mPolylineOptions.setGps(true);
-        mPolylineOptions.width(20).useGradient(true);
         // 渐变色
-        mogoOverlayManager = MogoOverlayManager.getInstance();
-        // 线条粗细，渐变，渐变色值
-        HandlerThread renderTask = new HandlerThread("routing_render") {
-            @Override
-            protected void onLooperPrepared() {
-                super.onLooperPrepared();
-                mRenderHandler = new Handler(getLooper());
-            }
-        };
-        renderTask.start();
+        mogoOverlayManager = CallerMapUIServiceManager.INSTANCE.getOverlayManager();
+        if (mogoOverlayManager != null) {
+            mPolylineOptions = new Polyline.Options.Builder("router_overlay", Level.GUIDE_ROUTE_LINE)
+                    .setUseGps(true)
+                    .setWidth(20)
+                    .setIsGradient(true)
+                    .build();
+
+            // 线条粗细，渐变，渐变色值
+            HandlerThread renderTask = new HandlerThread("routing_render") {
+                @Override
+                protected void onLooperPrepared() {
+                    super.onLooperPrepared();
+                    mRenderHandler = new Handler(getLooper());
+                }
+            };
+            renderTask.start();
+        }
     }
 
     public static RouteOverlayDrawer getInstance() {
@@ -63,12 +63,11 @@ public class RouteOverlayDrawer {
     }
 
     public void clearMogoRouteOverlay() {
-        if (mRenderTask != null) {
-            mRenderHandler.removeCallbacks(mRenderTask);
-        }
-        if (mMoGoPolyline != null) {
-            mMoGoPolyline.remove();
-            mMoGoPolyline = null;
+        if (mogoOverlayManager != null) {
+            if (mRenderTask != null) {
+                mRenderHandler.removeCallbacks(mRenderTask);
+            }
+            mogoOverlayManager.removeAllLinesInLevel(Level.GUIDE_ROUTE_LINE);
         }
     }
 
@@ -93,9 +92,14 @@ public class RouteOverlayDrawer {
         @SuppressLint("LongLogTag")
         @Override
         public void run() {
+            IMoGoOverlayManager overlayManager = mogoOverlayManager;
+            if (overlayManager == null) {
+                return;
+            }
             LinkedList<MogoLatLng> pps = this.points;
             boolean isExcept = false;
             int total;
+
             try {
                 pps.clear();
                 List<MessagePad.TrajectoryPoint> routes = this.routeList;
@@ -170,32 +174,30 @@ public class RouteOverlayDrawer {
                     Strategy strategy = RouteStrategy.INSTANCE.getStrategy();
                     List<Integer> colors = strategy.getColors();
                     boolean isLightOn = strategy instanceof ColorfulStrategy && ((ColorfulStrategy) strategy).isLightOn();
-                    if (mMoGoPolyline == null || mMoGoPolyline.isDestroyed()) {
-                        mPolylineOptions.points(points);
-                        mPolylineOptions.colorValues(colors);
-                        if (isLightOn) {
-                            mPolylineOptions.openBright(true);
-                            mPolylineOptions.brightColor(COLOR_LIGHT);
-                            mPolylineOptions.brightSpeed(0.5f);
-                        } else  {
-                            mPolylineOptions.openBright(false);
-                        }
-                        mMoGoPolyline = mogoOverlayManager.addPolyline(mPolylineOptions);
+                    Polyline.Options.Builder builder;
+                    if (mPolylineOptions == null) {
+                        builder = new Polyline.Options.Builder("router_overlay", Level.GUIDE_ROUTE_LINE)
+                                .setUseGps(true)
+                                .setWidth(20)
+                                .setIsGradient(true);
                     } else {
-                        mPolylineOptions.points(points);
-                        mPolylineOptions.colorValues(colors);
-                        if (isLightOn) {
-                            mPolylineOptions.openBright(true);
-                            mPolylineOptions.brightColor(COLOR_LIGHT);
-                            mPolylineOptions.brightSpeed(0.5f);
-                        } else  {
-                            mPolylineOptions.openBright(false);
-                        }
-                        mMoGoPolyline.setOption(mPolylineOptions);
+                        builder = mPolylineOptions.builder();
                     }
-                    if (mMoGoPolyline != null && !mMoGoPolyline.isDestroyed() && !mMoGoPolyline.isVisible()) {
-                        mMoGoPolyline.setVisible(true);
+                    builder.points(points);
+                    builder.colors(colors);
+                    if (isLightOn) {
+                        builder.setLightOn(true);
+                        builder.setLightColor(COLOR_LIGHT);
+                        builder.setLightSpeed(0.5f);
+                    } else  {
+                        builder.setLightOn(false);
                     }
+                    builder.setVisible(true);
+                    Polyline.Options options = builder.build();
+                    if (mPolylineOptions == null) {
+                        mPolylineOptions = options;
+                    }
+                    overlayManager.showOrUpdateLine(options);
                 } else {
                     isExcept = true;
                 }
@@ -225,19 +227,25 @@ public class RouteOverlayDrawer {
     private volatile RenderTask mRenderTask;
 
     public void drawTrajectoryList(List<MessagePad.TrajectoryPoint> routeList, double bearing) {
-        if (mRenderTask == null) {
-            mRenderTask = new RenderTask();
-        }
-        mRenderTask.setData(routeList, bearing);
-        if (mRenderHandler != null) {
-            mRenderHandler.removeCallbacks(mRenderTask);
-            mRenderHandler.post(mRenderTask);
+        if (mogoOverlayManager != null) {
+            if (mRenderTask == null) {
+                mRenderTask = new RenderTask();
+            }
+            mRenderTask.setData(routeList, bearing);
+            if (mRenderHandler != null) {
+                mRenderHandler.removeCallbacks(mRenderTask);
+                mRenderHandler.post(mRenderTask);
+            }
         }
     }
 
     public void setVisible(boolean isVisible) {
-        if (mMoGoPolyline != null && !mMoGoPolyline.isDestroyed()) {
-            mMoGoPolyline.setVisible(isVisible);
+        if (mogoOverlayManager != null) {
+            if (isVisible) {
+                mogoOverlayManager.showAllLinesInLevel(Level.GUIDE_ROUTE_LINE);
+            } else {
+                mogoOverlayManager.hideAllLinesInLevel(Level.GUIDE_ROUTE_LINE);
+            }
         }
     }
 }
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/MogoMapService.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/MogoMapService.java
index 651b2a8a74..ef87eb3498 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/MogoMapService.java
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/MogoMapService.java
@@ -5,15 +5,11 @@ import android.content.Context;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.mogo.eagle.core.data.constants.MogoServicePaths;
 import com.mogo.eagle.core.function.api.map.IMogoMapService;
-import com.mogo.eagle.core.function.api.map.marker.IMogoMarkerService;
-import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager;
+import com.mogo.map.MoGoOverlayManager;
 import com.mogo.map.MogoMapUIController;
-import com.mogo.map.MogoMarkerManager;
-import com.mogo.map.MogoOverlayManager;
 import com.mogo.map.location.GDLocationClient;
 import com.mogo.map.location.IMogoGDLocationClient;
-import com.mogo.map.marker.IMogoMarkerManager;
-import com.mogo.map.overlay.IMogoOverlayManager;
+import com.mogo.map.overlay.IMoGoOverlayManager;
 import com.mogo.map.uicontroller.IMogoMapUIController;
 
 /**
@@ -25,15 +21,6 @@ import com.mogo.map.uicontroller.IMogoMapUIController;
 @Route(path = MogoServicePaths.PATH_SERVICES_MAP)
 public class MogoMapService implements IMogoMapService {
 
-    @Override
-    public IMogoMarkerManager getMarkerManager(Context context) {
-        return MogoMarkerManager.getInstance(context);
-    }
-
-    @Override
-    public IMogoMarkerService getMarkerService() {
-        return MogoMarkerServiceImpl.getInstance();
-    }
 
     @Override
     public IMogoMapUIController getMapUIController() {
@@ -41,8 +28,8 @@ public class MogoMapService implements IMogoMapService {
     }
 
     @Override
-    public IMogoOverlayManager getOverlayManager() {
-        return MogoOverlayManager.getInstance();
+    public IMoGoOverlayManager getOverlayManager() {
+        return MoGoOverlayManager.INSTANCE.overlay();
     }
 
     @Override
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/MogoMarkerServiceImpl.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/MogoMarkerServiceImpl.java
deleted file mode 100644
index c48d20d06d..0000000000
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/MogoMarkerServiceImpl.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.mogo.eagle.core.function.impl;
-
-import androidx.annotation.Nullable;
-
-import com.mogo.eagle.core.data.map.MogoLatLng;
-import com.mogo.eagle.core.data.map.entity.MarkerShowEntity;
-import com.mogo.eagle.core.data.traffic.TrafficData;
-import com.mogo.eagle.core.function.api.map.marker.IMogoMarkerService;
-import com.mogo.eagle.core.function.impl.marker.drawer.MarkerDrawer;
-import com.mogo.eagle.core.function.impl.marker.drawer.TrafficMarkerDrawer;
-import com.mogo.eagle.core.function.impl.marker.drawer.V2XWarnDataDrawer;
-import com.mogo.map.marker.IMogoMarker;
-
-public class MogoMarkerServiceImpl implements IMogoMarkerService {
-
-    private static volatile MogoMarkerServiceImpl sInstance;
-    private static final byte[] obj = new byte[0];
-
-    private MogoMarkerServiceImpl() {
-
-    }
-
-    public static MogoMarkerServiceImpl getInstance() {
-        if (sInstance == null) {
-            synchronized (obj) {
-                if (sInstance == null) {
-                    sInstance = new MogoMarkerServiceImpl();
-                }
-            }
-        }
-        return sInstance;
-    }
-
-    @Nullable
-    @Override
-    public IMogoMarker drawMarker(Object object) {
-        if (object instanceof MarkerShowEntity) {
-            return MarkerDrawer.getInstance().drawMapMarkerImpl(((MarkerShowEntity) object), MarkerDrawer.MARKER_Z_INDEX_HIGH, null);
-        }
-        return null;
-    }
-
-    @Override
-    public void renderWarningMoveMarker(double lon, double lat, int type, double collisionlat, double collisionLon, double angle, long showTime) {
-        V2XWarnDataDrawer.getInstance().renderWarnData(lon, lat, type, collisionlat, collisionLon, angle, showTime);
-    }
-
-    @Override
-    public void renderStopLineMarker(double lon, double lat) {
-        V2XWarnDataDrawer.getInstance().renderStopLineData(lon, lat);
-    }
-
-    @Override
-    public void drawerArrowsMarkerWithLocation(MogoLatLng location, String markerType, int type, int rotate) {
-        V2XWarnDataDrawer.getInstance().drawerArrowsMarkerWithLocation(location, markerType, type, rotate);
-    }
-
-    @Override
-    public void updateITrafficInfo(TrafficData trafficData) {
-        TrafficMarkerDrawer.INSTANCE.updateITrafficInfo(trafficData);
-    }
-
-    @Override
-    public void updateITrafficLocationInfo(TrafficData trafficData) {
-        TrafficMarkerDrawer.INSTANCE.updateITrafficLocationInfo(trafficData);
-    }
-
-    @Override
-    public void updateITrafficThreatLevelInfo(TrafficData trafficData) {
-        TrafficMarkerDrawer.INSTANCE.updateITrafficThreatLevelInfo(trafficData);
-    }
-
-    @Override
-    public void removeCvxRvInfoIndInfo(String uuid) {
-        TrafficMarkerDrawer.INSTANCE.removeCvxRvInfoIndInfo(uuid);
-    }
-
-}
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/AdasRecognizedType.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/AdasRecognizedType.java
deleted file mode 100644
index 17da52fab1..0000000000
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/AdasRecognizedType.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.mogo.eagle.core.function.impl.marker;
-
-public enum AdasRecognizedType {
-    //背景
-    classIdBackground("background", 0),
-    //人
-    classIdPerson("person", 1),
-    //自行车
-    classIdBicycle("bicycle", 2),
-    //小轿车
-    classIdCar("car", 3),
-    //摩托车
-    classIdMoto("moto", 4),
-    //红绿灯
-    classIdTrafficSign("traffic_sign", 5),
-    //bus
-    classIdTrafficBus("traffic_bus", 6),
-    //truck
-    classIdTrafficTruck("traffic_truck", 8),
-    //stopLine
-    classIdStopLine("warning_stop_line", 9),
-    //预警箭头
-    classIdWarningArrows("warning_arrows", 10),
-
-    //未知物体
-    classIdUnKnow("unKnow", 100);
-
-    AdasRecognizedType(int code) {
-        this.code = code;
-    }
-
-    private String res = "";
-    private int code = -1;
-
-    AdasRecognizedType(String res, int code) {
-        this.res = res;
-        this.code = code;
-    }
-
-    public static AdasRecognizedType[] VAL = {
-            classIdBackground,//0
-            classIdPerson,
-            classIdBicycle,
-            classIdCar,
-            classIdMoto,
-            classIdTrafficSign,
-            classIdTrafficBus,
-            null,
-            classIdTrafficTruck,
-            classIdStopLine,
-            classIdWarningArrows,
-            classIdUnKnow,
-    };
-
-    public String getRes() {
-        return res;
-    }
-
-    public static AdasRecognizedType valueFrom(int code) {
-        if (code == 100) {
-            return classIdUnKnow;
-        }
-        if (code >= 0 && code < VAL.length) {
-            return VAL[code];
-        }
-        return null;
-    }
-}
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/drawer/BaseDrawer.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/drawer/BaseDrawer.java
deleted file mode 100644
index b91a16170e..0000000000
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/drawer/BaseDrawer.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.mogo.eagle.core.function.impl.marker.drawer;
-
-
-import android.content.Context;
-
-import com.mogo.commons.AbsMogoApplication;
-import com.mogo.eagle.core.function.impl.marker.AdasRecognizedType;
-import com.mogo.eagle.core.function.map.R;
-
-/**
- * @author congtaowang
- * @since 2020/10/30
- * <p>
- * 描述
- */
-public class BaseDrawer {
-
-    protected final Context mContext;
-
-    public BaseDrawer() {
-        mContext = AbsMogoApplication.getApp();
-    }
-
-    /**
-     * 获取3D锚点模型资源
-     *
-     * @param type {@link AdasRecognizedType}
-     * @return modelRes
-     */
-    public int getModelRes(int type) {
-        AdasRecognizedType recognizedType = AdasRecognizedType.valueFrom(type);
-        if (recognizedType == AdasRecognizedType.classIdCar) {
-            return R.raw.traffic_tachexiaoche;
-        } else if (recognizedType == AdasRecognizedType.classIdTrafficBus) {
-            return R.raw.traffic_daba;
-        } else if (recognizedType == AdasRecognizedType.classIdMoto) {
-            return R.raw.traffic_motuoche;
-        } else if (recognizedType == AdasRecognizedType.classIdStopLine) {
-            return R.raw.stopline;
-        } else if (recognizedType == AdasRecognizedType.classIdWarningArrows) {
-            return R.raw.jiantou;
-        } else if (recognizedType == AdasRecognizedType.classIdUnKnow) {
-            return R.raw.special_vehicle;
-        } else if (recognizedType == AdasRecognizedType.classIdBicycle) {
-            return R.raw.traffic_zixingche;
-        } else if (recognizedType == AdasRecognizedType.classIdTrafficTruck) {
-            return R.raw.traffic_daba;
-        } else if (recognizedType == AdasRecognizedType.classIdPerson) {
-            return R.raw.traffic_people;
-        }
-        return R.raw.special_vehicle;
-    }
-
-}
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/drawer/MarkerDrawer.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/drawer/MarkerDrawer.java
deleted file mode 100644
index 30e4103320..0000000000
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/drawer/MarkerDrawer.java
+++ /dev/null
@@ -1,176 +0,0 @@
-package com.mogo.eagle.core.function.impl.marker.drawer;
-
-import android.text.TextUtils;
-
-import com.mogo.commons.AbsMogoApplication;
-import com.mogo.commons.module.status.MogoStatusManager;
-import com.mogo.eagle.core.data.enums.EventTypeEnumNew;
-import com.mogo.eagle.core.data.map.MogoLatLng;
-import com.mogo.eagle.core.data.map.entity.MarkerExploreWay;
-import com.mogo.eagle.core.data.map.entity.MarkerNoveltyInfo;
-import com.mogo.eagle.core.data.map.entity.MarkerOnlineCar;
-import com.mogo.eagle.core.data.map.entity.MarkerShareMusic;
-import com.mogo.eagle.core.data.map.entity.MarkerShowEntity;
-import com.mogo.eagle.core.function.impl.marker.view.EmptyMarkerView;
-import com.mogo.eagle.core.function.impl.marker.view.IMarkerView;
-import com.mogo.eagle.core.function.impl.marker.view.MapMarkerAdapter;
-import com.mogo.eagle.core.function.impl.marker.view.OnlineCarMarkerView;
-import com.mogo.eagle.core.utilcode.util.CoordinateUtils;
-import com.mogo.map.MogoMarkerManager;
-import com.mogo.map.marker.IMogoMarker;
-import com.mogo.map.marker.IMogoMarkerClickListener;
-import com.mogo.map.marker.MogoMarkerOptions;
-
-/**
- * @author congtaowang
- * @since 2020/10/28
- * <p>
- * 描述
- */
-public class MarkerDrawer {
-
-    public static final int MARKER_Z_INDEX_HIGH = 100;
-    public static final int MARKER_Z_INDEX_LOW = 2;
-
-    private static volatile MarkerDrawer sInstance;
-
-    private MarkerDrawer() {
-    }
-
-    public static MarkerDrawer getInstance() {
-        if (sInstance == null) {
-            synchronized (MarkerDrawer.class) {
-                if (sInstance == null) {
-                    sInstance = new MarkerDrawer();
-                }
-            }
-        }
-        return sInstance;
-    }
-
-    public synchronized void release() {
-        sInstance = null;
-    }
-
-    private Object readResolve() {
-        // 阻止反序列化，必须实现 Serializable 接口
-        return sInstance;
-    }
-
-    public IMogoMarker drawMapMarkerImpl(MarkerShowEntity markerShowEntity, int zIndex, IMogoMarkerClickListener listener) {
-        return drawMapMarkerImpl(markerShowEntity, false, zIndex, 0, listener);
-    }
-
-    /**
-     * add marker, { 如果是需要在3D模式下显示，则需要设置 {@link MogoMarkerOptions icon3DRes 资源id}}
-     *
-     * @param markerShowEntity marker展示数据结构体
-     * @param matchRoadSide    设置是否道路吸附，暂时没用到这个字段
-     * @param zIndex           zOrder
-     * @param icon3DRes        3D Res资源
-     * @param listener         marker回调
-     * @return {@link IMogoMarker}
-     */
-    public IMogoMarker drawMapMarkerImpl(MarkerShowEntity markerShowEntity, boolean matchRoadSide, int zIndex, int icon3DRes, IMogoMarkerClickListener listener) {
-        if (markerShowEntity == null || markerShowEntity.getMarkerLocation() == null) {
-            return null;
-        }
-        MogoMarkerOptions options = new MogoMarkerOptions().icon3DRes(icon3DRes).set3DMode(MogoStatusManager.getInstance().isVrMode()).matchOnRoadSide(matchRoadSide).owner(markerShowEntity.getMarkerType()).zIndex(zIndex).data(markerShowEntity).latitude(markerShowEntity.getMarkerLocation().getLat()).longitude(markerShowEntity.getMarkerLocation().getLon());
-
-        if (MogoStatusManager.getInstance().isVrMode()) {
-            Object bindObj = markerShowEntity.getBindObj();
-            if (bindObj instanceof MarkerExploreWay && ((MarkerExploreWay) bindObj).getPoiType() != null) {
-                String poiType = ((MarkerExploreWay) bindObj).getPoiType();
-                options.icon3DRes(EventTypeEnumNew.getMarker3DRes(poiType));
-            }
-
-        }
-        IMarkerView markerView = MapMarkerAdapter.getMarkerView(AbsMogoApplication.getApp(), markerShowEntity, options);
-        if (markerView instanceof OnlineCarMarkerView) {
-            try {
-                options.icon(markerView.getBitmap(((MarkerOnlineCar) markerShowEntity.getBindObj()).getCarInfo().getVehicleType()));
-            } catch (Exception e) {
-                options.icon(markerView.getBitmap(0));
-            }
-            options.anchor(0.5f, 0.5f);
-        } else {
-            options.icon(markerView.getView());
-        }
-
-        if (options.getIcon3DRes() != 0) {
-            options.icon(new EmptyMarkerView(AbsMogoApplication.getApp()));
-            options.icon(markerView.getBitmap(0));
-        }
-
-        IMogoMarker marker = MogoMarkerManager.getInstance(AbsMogoApplication.getApp()).addMarker(markerShowEntity.getMarkerType(), options);
-        if (marker != null) {
-            marker.setOwner(markerShowEntity.getMarkerType());
-            markerView.setMarker(marker);
-            marker.setOnMarkerClickListener(listener);
-        }
-        return marker;
-    }
-
-    public String getPrimaryKeyFromEntity(Object entity) {
-        if (entity instanceof MarkerExploreWay) {
-            String id = ((MarkerExploreWay) entity).getInfoId();
-            if (!TextUtils.isEmpty(id)) {
-                return id;
-            }
-        }
-        return getCarSnFromEntity(entity);
-    }
-
-    private String getPrimaryKeyFromMarker(IMogoMarker marker) {
-        if (marker == null || marker.getObject() == null || marker.isDestroyed()) {
-            return null;
-        }
-        if (!(marker.getObject() instanceof MarkerShowEntity)) {
-            return null;
-        }
-        return getPrimaryKeyFromEntity(((MarkerShowEntity) marker.getObject()).getBindObj());
-    }
-
-    private String getCarSnFromEntity(Object entity) {
-        try {
-            if (entity instanceof MarkerOnlineCar) {
-                return ((MarkerOnlineCar) entity).getUserInfo().getSn();
-            } else if (entity instanceof MarkerShareMusic) {
-                return ((MarkerShareMusic) entity).getUserInfo().getSn();
-            } else if (entity instanceof MarkerNoveltyInfo) {
-                return ((MarkerNoveltyInfo) entity).getSn();
-            } else if (entity instanceof MarkerExploreWay) {
-                return ((MarkerExploreWay) entity).getUserInfo().getSn();
-            }
-        } catch (Exception e) {
-
-        }
-        return "";
-    }
-
-    /**
-     * 距离半径计算方式
-     *
-     * @param point1 点一坐标
-     * @param point2 点二坐标
-     * @return 两坐标的距离 单位：米（M）
-     */
-    public static float calculateLineDistance(MogoLatLng point1, MogoLatLng point2) {
-        if (point1 != null && point2 != null) {
-            return calculateLineDistance(point1.lon, point1.lat, point2.lon, point2.lat);
-        } else {
-            return 0.0F;
-        }
-    }
-
-    /**
-     * @param lon1
-     * @param lat1
-     * @param lon2
-     * @param lat2
-     * @return 两坐标的距离 单位：米（M）
-     */
-    public static float calculateLineDistance(double lon1, double lat1, double lon2, double lat2) {
-        return CoordinateUtils.calculateLineDistance(lon1, lat1, lon2, lat2);
-    }
-}
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/drawer/V2XWarnDataDrawer.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/drawer/V2XWarnDataDrawer.java
deleted file mode 100644
index f426089edf..0000000000
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/drawer/V2XWarnDataDrawer.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package com.mogo.eagle.core.function.impl.marker.drawer;
-
-import static com.mogo.eagle.core.data.constants.DataTypes.TYPE_MARKER_CLOUD_STOP_LINE_DATA;
-import static com.mogo.eagle.core.data.constants.DataTypes.TYPE_MARKER_CLOUD_WARN_DATA;
-
-import com.mogo.eagle.core.data.map.MogoLatLng;
-import com.mogo.eagle.core.data.map.entity.MarkerLocation;
-import com.mogo.eagle.core.data.map.entity.MarkerShowEntity;
-import com.mogo.eagle.core.function.impl.marker.view.IMarkerView;
-import com.mogo.eagle.core.function.impl.marker.view.MapMarkerAdapter;
-import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
-import com.mogo.map.MogoMarkerManager;
-import com.mogo.map.marker.IMogoMarker;
-import com.mogo.map.marker.MogoMarkerOptions;
-
-
-/**
- * 云端 预警数据绘制
- */
-public class V2XWarnDataDrawer extends BaseDrawer {
-
-    private static volatile V2XWarnDataDrawer sInstance;
-    private static final byte[] obj = new byte[0];
-
-    private V2XWarnDataDrawer() {
-        super();
-    }
-
-    public static V2XWarnDataDrawer getInstance() {
-        if (sInstance == null) {
-            synchronized (obj) {
-                if (sInstance == null) {
-                    sInstance = new V2XWarnDataDrawer();
-                }
-            }
-        }
-        return sInstance;
-    }
-
-    public synchronized void release() {
-        sInstance = null;
-    }
-
-    /**
-     * 识别物移动
-     */
-    public void renderWarnData(double lon, double lat, int type, double collisionlat, double collisionLon, double angle, long showTime) {
-        MarkerLocation location = new MarkerLocation();
-        location.setLat(lat);
-        location.setLon(lon);
-        location.setAngle(angle);
-        MarkerShowEntity markerShowEntity = new MarkerShowEntity();
-        markerShowEntity.setMarkerLocation(location);
-        markerShowEntity.setMarkerType(TYPE_MARKER_CLOUD_WARN_DATA);
-        IMogoMarker marker = drawMarker(markerShowEntity, modeResType(type));
-//        marker.addDynamicAnchorPosition(new MogoLatLng(collisionlat, collisionLon), (float) heading, showTime * 1000);
-        UiThreadHandler.postDelayed(marker::remove, showTime * 1000);
-    }
-
-    /**
-     * 根据识别物类型 (行人1/自行车2/摩托车4/骑行车辆11)获取3D模型(对应查看getModelRes)
-     *
-     * @param dataType 数据类型
-     * @return 做完映射后的数据类型
-     */
-    private int modeResType(int dataType) {
-        switch (dataType) {
-            case 1:
-            case 11:
-                return 1;
-            case 2:
-                return 2;
-            case 4:
-                return 4;
-        }
-        return 1;
-    }
-
-    /**
-     * 绘制3D元素
-     *
-     * @param markerShowEntity 要展示的3d数据类型
-     * @param modeResType
-     * @return
-     */
-    public IMogoMarker drawMarker(MarkerShowEntity markerShowEntity, int modeResType) {
-        MogoMarkerOptions options = new MogoMarkerOptions()
-                .data(markerShowEntity)
-                .latitude(markerShowEntity.getMarkerLocation().getLat())
-                .longitude(markerShowEntity.getMarkerLocation().getLon())
-                .controlAngle(true)
-                .rotate((float) markerShowEntity.getMarkerLocation().getAngle())
-                .setGps(true);
-        IMarkerView iMarkerView = MapMarkerAdapter.getMarkerView(mContext, markerShowEntity, options);
-        options.icon3DRes(getModelRes(modeResType));
-        options.anchorColor("#FB3C3CFF");
-        IMogoMarker marker = MogoMarkerManager.getInstance(mContext).addMarker(markerShowEntity.getMarkerType(), options);
-        iMarkerView.setMarker(marker);
-        marker.setToTop();
-
-        return marker;
-    }
-
-    /**
-     * 绘制箭头
-     * @param location
-     * @param markerType
-     * @param type
-     * @param rotate
-     */
-    public void drawerArrowsMarkerWithLocation(MogoLatLng location, String markerType, int type, int rotate) {
-        MogoMarkerOptions options = new MogoMarkerOptions()
-                .latitude(location.getLat())
-                .longitude(location.getLon())
-                .set3DMode(true)
-                .setGps(true)
-                .controlAngle(true)
-                .icon3DRes(getModelRes(type))
-                .anchorColor("#FB3C3CFF")
-                .flat(true);
-        IMogoMarker marker = MogoMarkerManager.getInstance(mContext).addMarker(markerType, options);
-        marker.setRotateAngle(rotate);
-    }
-
-    /**
-     * 绘制停止线 marker
-     */
-    public void renderStopLineData(double lon, double lat) {
-        MarkerLocation location = new MarkerLocation();
-        location.setLat(lat);
-        location.setLon(lon);
-
-        MarkerShowEntity markerShowEntity = new MarkerShowEntity();
-        markerShowEntity.setMarkerLocation(location);
-        markerShowEntity.setMarkerType(TYPE_MARKER_CLOUD_STOP_LINE_DATA);
-        IMogoMarker marker = drawStopLineMarker(markerShowEntity);
-    }
-
-    /**
-     * 停止线绘制
-     */
-    public IMogoMarker drawStopLineMarker(MarkerShowEntity markerShowEntity) {
-        MogoMarkerOptions options = new MogoMarkerOptions()
-                .data(markerShowEntity)
-                .latitude(markerShowEntity.getMarkerLocation().getLat())
-                .longitude(markerShowEntity.getMarkerLocation().getLon())
-                .setGps(false);
-        IMarkerView iMarkerView = MapMarkerAdapter.getMarkerView(mContext, markerShowEntity, options);
-        options.icon3DRes(getModelRes(9));
-        options.anchorColor("#FB3C3CFF");
-        IMogoMarker marker = MogoMarkerManager.getInstance(mContext).addMarker(markerShowEntity.getMarkerType(), options);
-        iMarkerView.setMarker(marker);
-        marker.setToTop();
-        return marker;
-    }
-
-}
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/EmptyMarkerView.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/EmptyMarkerView.java
deleted file mode 100644
index 5dbe40c392..0000000000
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/EmptyMarkerView.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.mogo.eagle.core.function.impl.marker.view;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.View;
-
-import androidx.annotation.Nullable;
-
-import com.mogo.map.marker.IMogoMarker;
-
-public
-/**
- * @author congtaowang
- * @since 2020/12/16
- *
- * 描述
- */
-class EmptyMarkerView extends View implements IMarkerView {
-
-    public EmptyMarkerView( Context context ) {
-        this( context, null );
-    }
-
-    public EmptyMarkerView( Context context, @Nullable AttributeSet attrs ) {
-        this( context, attrs, 0 );
-    }
-
-    public EmptyMarkerView( Context context, @Nullable AttributeSet attrs, int defStyleAttr ) {
-        super( context, attrs, defStyleAttr );
-    }
-
-    @Override
-    public View getView() {
-        return this;
-    }
-
-    @Override
-    public void setMarker( IMogoMarker marker ) {
-
-    }
-
-    @Override
-    protected void onMeasure( int widthMeasureSpec, int heightMeasureSpec ) {
-        setMeasuredDimension( 1, 1 );
-    }
-}
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/IMarkerView.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/IMarkerView.java
deleted file mode 100644
index dd5eba9d65..0000000000
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/IMarkerView.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.mogo.eagle.core.function.impl.marker.view;
-
-import android.graphics.Bitmap;
-import android.view.View;
-
-import com.mogo.map.marker.IMogoMarker;
-
-/**
- * @author congtaowang
- * @since 2020-02-15
- * <p>
- * 描述
- */
-public interface IMarkerView {
-
-    View getView();
-
-    default Bitmap getBitmap( int type ){
-        return null;
-    }
-
-    void setMarker( IMogoMarker marker );
-}
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/MapCameraInfoView.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/MapCameraInfoView.java
deleted file mode 100644
index 1a74ba53a8..0000000000
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/MapCameraInfoView.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.mogo.eagle.core.function.impl.marker.view;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.LayoutInflater;
-import android.widget.ImageView;
-
-
-import androidx.annotation.Nullable;
-
-import com.mogo.eagle.core.data.map.entity.MarkerShowEntity;
-import com.mogo.eagle.core.function.map.R;
-import com.mogo.map.marker.MogoMarkerOptions;
-
-/**
- * author : 李小鹏
- * desc   : 地图2dMarker 在3d下的展示
- * version: 1.0
- */
-public class MapCameraInfoView extends MapMarkerBaseView {
-    private String TAG = "MapCameraInfoView";
-
-    private ImageView mCameraImage;
-
-
-    public MapCameraInfoView(Context context ) {
-        super( context );
-    }
-
-    public MapCameraInfoView(Context context, @Nullable AttributeSet attrs ) {
-        super( context, attrs );
-    }
-
-    public MapCameraInfoView(Context context, @Nullable AttributeSet attrs, int defStyleAttr ) {
-        super( context, attrs, defStyleAttr );
-    }
-
-    public MapCameraInfoView(Context context, MogoMarkerOptions options ) {
-        super( context );
-        mOptions = options;
-    }
-
-    @Override
-    protected void initView( Context context ) {
-        LayoutInflater.from( context ).inflate( R.layout.modudle_camera_layout_info, this );
-        mCameraImage = findViewById( R.id.iv_camera_traffic);
-    }
-
-    @Override
-    public void updateView( MarkerShowEntity markerShowEntity ) {
-
-    }
-
-}
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/MapMarkerAdapter.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/MapMarkerAdapter.java
deleted file mode 100644
index 9102b50ca8..0000000000
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/MapMarkerAdapter.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.mogo.eagle.core.function.impl.marker.view;
-
-import static com.mogo.commons.module.ServiceConst.CARD_TYPE_USER_DATA;
-
-import android.content.Context;
-import android.text.TextUtils;
-
-import com.mogo.commons.module.status.MogoStatusManager;
-import com.mogo.eagle.core.data.map.entity.MarkerShowEntity;
-import com.mogo.map.marker.MogoMarkerOptions;
-
-/**
- * author : donghongyu
- * e-mail : 1358506549@qq.com
- * date   : 2020-01-1015:55
- * desc   : 地图Marker的适配器
- * version: 1.0
- */
-public class MapMarkerAdapter {
-
-    /**
-     * 获取 MarkerShowEntity 填充好的 MarkerView
-     *
-     * @param context          上下文
-     * @param markerShowEntity 要填充的数据
-     * @return MarkerView
-     */
-    public static IMarkerView getMarkerView(Context context, MarkerShowEntity markerShowEntity, MogoMarkerOptions options) {
-
-        if (TextUtils.equals(markerShowEntity.getMarkerType(), CARD_TYPE_USER_DATA)) {
-            return OnlineCarMarkerView.getInstance();
-        } else {
-            if (MogoStatusManager.getInstance().isVrMode()) {
-                return new EmptyMarkerView(context);
-            } else {
-                return new MapMarkerView(context, markerShowEntity, options);
-            }
-        }
-
-    }
-
-}
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/MapMarkerBaseView.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/MapMarkerBaseView.java
deleted file mode 100644
index 527d352ed4..0000000000
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/MapMarkerBaseView.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package com.mogo.eagle.core.function.impl.marker.view;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.os.Looper;
-import android.text.TextUtils;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-
-import androidx.annotation.Nullable;
-
-import com.mogo.eagle.core.data.map.entity.MarkerShowEntity;
-import com.mogo.eagle.core.function.map.R;
-import com.mogo.eagle.core.utilcode.mogo.glide.GlideImageLoader;
-import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
-import com.mogo.eagle.core.utilcode.util.ViewUtils;
-import com.mogo.eagle.core.utilcode.util.WindowUtils;
-import com.mogo.eagle.core.utilcode.mogo.imageloader.IMogoImageLoaderListener;
-import com.mogo.eagle.core.utilcode.mogo.imageloader.MogoImageView;
-import com.mogo.map.marker.IMogoMarker;
-import com.mogo.map.marker.MogoMarkerOptions;
-
-/**
- * author : donghongyu
- * e-mail : 1358506549@qq.com
- * date   : 2020-01-1310:55
- * desc   : 地图上抽离的Marker的共性
- * version: 1.0
- */
-public abstract class MapMarkerBaseView extends LinearLayout implements IMarkerView {
-    private String TAG = "MapMarkerBaseView";
-
-    protected Context mContext;
-    protected MogoMarkerOptions mOptions;
-    protected MogoImageView ivUserHead;
-    protected MogoImageView ivIcon;
-    protected ImageView ivCar;
-    protected IMogoMarker mMarker;
-
-    public MapMarkerBaseView(Context context) {
-        super(context);
-        mContext = context;
-        initView(context);
-    }
-
-    public MapMarkerBaseView(Context context, @Nullable AttributeSet attrs) {
-        super(context, attrs);
-        mContext = context;
-        initView(context);
-    }
-
-    public MapMarkerBaseView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        mContext = context;
-        initView(context);
-    }
-
-    @Override
-    public void setMarker(IMogoMarker marker) {
-        this.mMarker = marker;
-    }
-
-    protected abstract void initView(Context context);
-
-    public abstract void updateView(MarkerShowEntity markerShowEntity);
-
-    protected void loadImageWithMarker(final MarkerShowEntity markerShowEntity) {
-
-        if (Looper.myLooper() != Looper.getMainLooper()) {
-            UiThreadHandler.post(() -> {
-                runOnUiThread(markerShowEntity);
-            });
-        } else {
-            runOnUiThread(markerShowEntity);
-        }
-    }
-
-    protected void loadPoiTypeIcon(String url, int res) {
-        ivIcon.setImageResource(res);
-        if (Looper.myLooper() != Looper.getMainLooper()) {
-            UiThreadHandler.post(() -> loadPoiTypeIconInUiThread(url, res));
-        } else {
-            loadPoiTypeIconInUiThread(url, res);
-        }
-    }
-
-    private void loadPoiTypeIconInUiThread(String url, int res) {
-        if (mMarker != null) {
-            mMarker.setIcon(ViewUtils.fromView(MapMarkerBaseView.this));
-        }
-        if (!url.isEmpty()) {
-            ivIcon.setPlaceHolder(res);
-            ivIcon.setFailureHolder(res);
-            GlideImageLoader.getInstance().displayImage(url,
-                    ivIcon, WindowUtils.dip2px(mContext, 50), WindowUtils.dip2px(mContext, 50),
-                    new IMogoImageLoaderListener() {
-                        @Override
-                        public void onStart() {
-
-                        }
-
-                        @Override
-                        public void onCompleted(Bitmap bitmap) {
-                            // 使用view渲染地图marker，刷新纹理的时候，需要重新用view生成纹理，然后在设置
-                            if (mMarker != null) {
-                                mMarker.setIcon(ViewUtils.fromView(MapMarkerBaseView.this));
-                            }
-                        }
-
-                        @Override
-                        public void onFailure(Exception e) {
-                        }
-                    });
-        }
-    }
-
-    private void runOnUiThread(final MarkerShowEntity markerShowEntity) {
-        if (!TextUtils.isEmpty(markerShowEntity.getIconUrl())) {
-            GlideImageLoader.getInstance().displayImage(markerShowEntity.getIconUrl(),
-                    ivUserHead,
-                    WindowUtils.dip2px(mContext, 50), WindowUtils.dip2px(mContext, 50),
-                    new IMogoImageLoaderListener() {
-                        @Override
-                        public void onStart() {
-
-                        }
-
-                        @Override
-                        public void onCompleted(Bitmap bitmap) {
-                            // 使用view渲染地图marker，刷新纹理的时候，需要重新用view生成纹理，然后在设置
-                            if (mMarker != null) {
-                                mMarker.setIcon(ViewUtils.fromView(MapMarkerBaseView.this));
-                            }
-                        }
-
-                        @Override
-                        public void onFailure(Exception e) {
-                        }
-                    });
-
-        } else {
-            ivUserHead.setBackgroundResource(R.drawable.icon_default_user_head);
-        }
-    }
-
-    @Override
-    public View getView() {
-        return this;
-    }
-}
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/MapMarkerView.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/MapMarkerView.java
deleted file mode 100644
index 47bd5de1cf..0000000000
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/MapMarkerView.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package com.mogo.eagle.core.function.impl.marker.view;
-
-import static com.mogo.commons.module.ServiceConst.CARD_TYPE_ROAD_CONDITION;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.LayoutInflater;
-import android.widget.FrameLayout;
-
-import androidx.annotation.Nullable;
-
-import com.mogo.commons.module.status.MogoStatusManager;
-import com.mogo.eagle.core.data.map.PoiWrapper;
-import com.mogo.eagle.core.data.map.entity.MarkerExploreWay;
-import com.mogo.eagle.core.data.map.entity.MarkerShowEntity;
-import com.mogo.eagle.core.function.map.R;
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
-import com.mogo.map.marker.MogoMarkerOptions;
-import com.mogo.eagle.core.data.config.CloudPoiManager;
-
-/**
- * author : donghongyu
- * e-mail : 1358506549@qq.com
- * date   : 2020-01-0619:55
- * desc   : 地图Marker图标
- * version: 1.0
- */
-public class MapMarkerView extends MapMarkerBaseView {
-    private String TAG = "MapMarkerView";
-
-    private FrameLayout clMarkerTopView;
-    private MarkerShowEntity mMarkerShowEntity;
-
-    public MapMarkerView( Context context ) {
-        super( context );
-    }
-
-    public MapMarkerView( Context context, @Nullable AttributeSet attrs ) {
-        super( context, attrs );
-    }
-
-    public MapMarkerView( Context context, @Nullable AttributeSet attrs, int defStyleAttr ) {
-        super( context, attrs, defStyleAttr );
-    }
-
-    public MapMarkerView( Context context, MarkerShowEntity markerShowEntity, MogoMarkerOptions options ) {
-        super( context );
-        mOptions = options;
-        mMarkerShowEntity = markerShowEntity;
-        try {
-            updateView( markerShowEntity );
-        } catch ( Exception e ) {
-            e.printStackTrace();
-        }
-    }
-
-    @Override
-    protected void initView( Context context ) {
-        if ( MogoStatusManager.getInstance().isVrMode() ) {
-            LayoutInflater.from( context ).inflate( R.layout.modudle_services_marker_vr_layout, this );
-        } else {
-            LayoutInflater.from( context ).inflate( R.layout.modudle_services_marker_layout, this );
-        }
-        clMarkerTopView = findViewById( R.id.clMarkerTopView );
-        ivIcon = findViewById( R.id.ivIcon );
-        ivCar = findViewById( R.id.ivCar );
-    }
-
-    @Override
-    public void updateView( MarkerShowEntity markerShowEntity ) {
-        Object bindObj = markerShowEntity.getBindObj();
-        switch ( markerShowEntity.getMarkerType() ) {
-            case CARD_TYPE_ROAD_CONDITION:
-                if ( mMarkerShowEntity != null && mMarkerShowEntity.isChecked() ) {
-                    clMarkerTopView.setBackgroundResource( R.drawable.module_services_marker_vr_bkg_checked );
-                }
-                if ( bindObj instanceof MarkerExploreWay && ( ( MarkerExploreWay ) bindObj ).getPoiType() != null ) {
-                    // 根据poiType获取对应的图片
-                    String poiType = ( ( MarkerExploreWay ) bindObj ).getPoiType();
-                    PoiWrapper poiWrapper =
-                            CloudPoiManager.getInstance().getWrapperByPoiType( poiType );
-                    if ( poiWrapper != null ) {
-                        // 加载图片
-                        loadPoiTypeIcon( poiWrapper.getIconUrl(), poiWrapper.getIconRes() );
-                    } else {
-                        CallerLogger.INSTANCE.e( TAG, "未能根据poiType获取对应poi信息，无法渲染marker====" + poiType );
-                    }
-                }
-                break;
-            default:
-                break;
-        }
-    }
-
-
-}
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/OnlineCarMarkerView.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/OnlineCarMarkerView.java
deleted file mode 100644
index e2faf4387b..0000000000
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/OnlineCarMarkerView.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.mogo.eagle.core.function.impl.marker.view;
-
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.view.View;
-
-import com.mogo.commons.AbsMogoApplication;
-import com.mogo.eagle.core.function.map.R;
-import com.mogo.map.marker.IMogoMarker;
-
-import java.lang.ref.SoftReference;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author congtaowang
- * @since 2020-04-30
- * <p>
- * 描述
- */
-public class OnlineCarMarkerView implements IMarkerView {
-
-    private static Map< Integer, SoftReference< Bitmap > > sRef = new HashMap<>();
-
-    private OnlineCarMarkerView() {
-        // private constructor
-    }
-
-    private static final class InstanceHolder {
-        private static final OnlineCarMarkerView INSTANCE = new OnlineCarMarkerView();
-    }
-
-    public static OnlineCarMarkerView getInstance() {
-        return InstanceHolder.INSTANCE;
-    }
-
-    @Override
-    public View getView() {
-        return null;
-    }
-
-    @Override
-    public Bitmap getBitmap( int vehicleType ) {
-        if ( sRef.get( vehicleType ) == null || sRef.get( vehicleType ).get() == null
-                || sRef.get( vehicleType ).get().isRecycled() ) {
-            switch ( vehicleType ) {
-                case 5:
-                    sRef.put( vehicleType, new SoftReference<>( BitmapFactory.decodeResource( AbsMogoApplication.getApp().getResources(), R.drawable.icon_map_marker_car_type_taxi ) ) );
-                    break;
-                case 6:
-                    sRef.put( vehicleType, new SoftReference<>( BitmapFactory.decodeResource( AbsMogoApplication.getApp().getResources(), R.drawable.icon_map_marker_car_type_bus ) ) );
-                    break;
-                case 1:
-                    sRef.put( vehicleType, new SoftReference<>( BitmapFactory.decodeResource( AbsMogoApplication.getApp().getResources(), R.drawable.icon_map_marker_car_type_110 ) ) );
-                    break;
-                case 2:
-                    sRef.put( vehicleType, new SoftReference<>( BitmapFactory.decodeResource( AbsMogoApplication.getApp().getResources(), R.drawable.icon_map_marker_car_type_120 ) ) );
-                    break;
-                case 7:
-                    sRef.put( vehicleType, new SoftReference<>( BitmapFactory.decodeResource( AbsMogoApplication.getApp().getResources(), R.drawable.icon_map_marker_car_type_119 ) ) );
-                    break;
-                default:
-                    sRef.put( vehicleType, new SoftReference<>( BitmapFactory.decodeResource( AbsMogoApplication.getApp().getResources(), R.drawable.icon_map_marker_car_gray ) ) );
-            }
-        }
-        return sRef.get( vehicleType ).get();
-    }
-
-    @Override
-    public void setMarker( IMogoMarker marker ) {
-
-    }
-}
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt
index 17bc54b9ed..db29213092 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt
@@ -261,7 +261,7 @@ class OverMapView @JvmOverloads constructor(
      */
     fun drawSiteNameViews(siteMarkers: List<SiteMarkerBean>?) {
         if (siteMarkers.isNullOrEmpty()) return
-        clearSiteMarkers()
+        clearSiteNameViews()
         val markerOptionsList = ArrayList<MarkerOptions>()
         for (siteMarkerBean in siteMarkers) {
             val markerOption = MarkerOptions()
@@ -833,7 +833,7 @@ class OverMapView @JvmOverloads constructor(
         }
 
         if (!isOnlyCarLocation) {
-            val cameraPosition = CameraPosition.Builder().tilt(mTilt).build()
+            val cameraPosition = CameraPosition.Builder().target(LatLng(mLocation!!.latitude, mLocation!!.longitude)).tilt(mTilt).build()
             //第二个参数为四周留空宽度
             mAMap!!.moveCamera(
                 CameraUpdateFactory.newLatLngBoundsRect(
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/proto/road.proto b/core/function-impl/mogo-core-function-v2x/src/main/proto/road.proto
deleted file mode 100644
index 71c087aa5b..0000000000
--- a/core/function-impl/mogo-core-function-v2x/src/main/proto/road.proto
+++ /dev/null
@@ -1,59 +0,0 @@
-syntax = "proto2";
-
-package roadwork;
-
-message RW_PB {
-	required Roadwork_PB roadwork =1;
-	optional Header header = 2;
-}
-
-message Roadwork_PB{
-	optional string id = 1; // 对应id
-	required int32 score = 2; // 置信度
-	required int64 detect_time = 3; // 发送时间
-	required int32 poi_type = 4; // poi 类型
-	optional int32 type = 5;  // 事件类型
-	required Center_PB center = 6; // 中心点坐标
-	repeated GPSPoint_PB polygon = 7; // 多边形范围
-	repeated Road_PB road = 8; // 车道集合信息
-}
-
-message GPSPoint_PB {
-	required double lat = 1; // 纬度
-	required double lon = 2; // 经度
-	optional double hgt = 3; // 高程
-}
-
-message Road_PB{
-	required string road_id = 1; // 路段id
-	required string lane_no = 2; // 车道号
-	required string tile_id = 3; // 瓦片id
-	required int32 bearing = 4;  // 方向角，正北是0度 顺时针
-}
-
-message Center_PB{
-	required Road_PB road = 1;  // 道路信息
-	required GPSPoint_PB point = 2; // 坐标
-}
-
-// header
-
-message Time {
-	optional uint32 sec = 1; // 秒
-	optional uint32 nsec = 2; // 纳秒
-}
-
-message Header {
-	// Sequence number for each message. Each module maintains its own counter for
-	// sequence_num, always starting from 1 on boot.
-	optional uint32 seq = 1;
-
-	// Message publishing time in seconds.
-	optional Time stamp = 2;
-
-	// frame id
-	optional string frame_id = 3;
-
-	// Module name.
-	optional string module_name = 4;
-}
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 44708185ff..b98c2b9c2f 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
@@ -275,49 +275,49 @@ enum class EventTypeEnumNew(
         "车辆故障",
         poiTypeSrcVr = R.drawable.icon_warning_v2x_car_breakdown,
         content = "前方%s米有故障车辆，影响路段%s米",
-        tts = "前方%s米有故障车辆，影响路段%s米"
+        tts = "蘑菇路侧提醒您，前方%s米有故障车辆，影响路段%s米"
     ),
     TYPE_FOURS_PONDING( //积水
         407.toString(),
         "道路积水",
         poiTypeSrcVr = R.drawable.v2x_icon_jishui_vr,
         content = "前方%s米道路积水，影响路段%s米",
-        tts ="前方%s米道路积水，影响路段%s米"
+        tts ="蘑菇路侧提醒您，前方%s米道路积水，影响路段%s米"
     ),
     TYPE_USECASE_ID_ROAD_PARKING( //异常停车
         412.toString(),
         "异常停车",
         poiTypeSrcVr = R.drawable.icon_warning_v2x_no_parking,
         content = "前方%s米异常停车，影响路段%s米",
-        tts = "前方%s米异常停车，影响路段%s米"
+        tts = "蘑菇路侧提醒您，前方%s米异常停车，影响路段%s米"
     ),
     TYPE_USECASE_ID_TJW( //%d
         707.toString(),
         "拥堵",
         poiTypeSrcVr = R.drawable.icon_warning_v2x_congestion,
         content = "前方%s米拥堵，影响路段%s米",
-        tts = "前方%s米拥堵，影响路段%s米"
+        tts = "蘑菇路侧提醒您，前方%s米拥堵，影响路段%s米"
     ),
     TYPE_USECASE_ID_SLW( //超速行驶
         901.toString(),
         "超速行驶",
         poiTypeSrcVr = R.drawable.icon_warning_v2x_over_speed,
         content = "前方%s米超速行驶，影响路段%s米",
-        tts = "前方%s米超速行驶，影响路段%s米"
+        tts = "蘑菇路侧提醒您，前方%s米超速行驶，影响路段%s米"
     ),
     TYPE_USECASE_ID_ROAD_VEHICLE_RETROGRADE( //车辆逆行
         904.toString(),
         "逆行车辆",
         poiTypeSrcVr = R.drawable.icon_default,
         content = "前方%s米逆行车辆，影响路段%s米",
-        tts = "前方%s米逆行车辆，影响路段%s米"
+        tts = "蘑菇路侧提醒您，前方%s米逆行车辆，影响路段%s米"
     ),
     TYPE_USECASE_ID_ROAD_SPEED_LIMIT( //-->
         6666.toString(),
         "超速",
         poiTypeSrcVr = R.drawable.icon_warning_v2x_over_speed,
         content = "当前路段限速 %s KM/H，已超速",
-        tts = "当前路段限速 %s KM/H，已超速"
+        tts = "蘑菇路侧提醒您，当前路段限速 %s KM/H，已超速"
     ),
     //------------道路危险情况预警 obu end ----------->
 
@@ -327,154 +327,154 @@ enum class EventTypeEnumNew(
         "急转弯",
         poiTypeSrcVr = R.drawable.icon_warning_v2x_turn_left_sharp,
         content = "前方%s米急转弯",
-        tts = "前方%s米急转弯"
+        tts = "蘑菇路侧提醒您，前方%s米急转弯"
     ),
     TYPE_ID_BRIDGE(
         8.toString(),
         "桥梁",
         poiTypeSrcVr = R.drawable.icon_warning_v2x_hump_bridge,
         content = "前方%s米桥梁",
-        tts = "前方%s米桥梁"
+        tts = "蘑菇路侧提醒您，前方%s米桥梁"
     ),
     TYPE_ID_PEDESTRIAN(
         10.toString(),
         "行人",
         poiTypeSrcVr = R.drawable.icon_warning_v2x_pedestrian_crossing,
         content = "前方%s米行人",
-        tts = "前方%s米行人"
+        tts = "蘑菇路侧提醒您，前方%s米行人"
     ),
     TYPE_ID_SLIPPERY_ROAD(
         17.toString(),
         "路滑",
         poiTypeSrcVr = R.drawable.v2x_icon_jiebing_vr,
         content = "前方%s米路滑",
-        tts = "前方%s米路滑"
+        tts = "蘑菇路侧提醒您，前方%s米路滑"
     ),
     TYPE_ID_TUNNEL(
         21.toString(),
         "隧道",
         poiTypeSrcVr = R.drawable.icon_default,
         content = "前方%s米隧道",
-        tts = "前方%s米隧道"
+        tts = "蘑菇路侧提醒您，前方%s米隧道"
     ),
     TYPE_ID_FERRY(
         22.toString(),
         "渡轮",
         poiTypeSrcVr = R.drawable.icon_default,
         content = "前方%s米渡轮",
-        tts = "前方%s米渡轮"
+        tts = "蘑菇路侧提醒您，前方%s米渡轮"
     ),
     TYPE_ID_UNEVEN_ROAD(
         24.toString(),
         "路面不平",
         poiTypeSrcVr = R.drawable.icon_warning_road_hollow,
         content = "前方%s米路面不平",
-        tts = "前方%s米路面不平"
+        tts = "蘑菇路侧提醒您，前方%s米路面不平"
     ),
     TYPE_ID_NON_MOTOR_VEHICLE(
         32.toString(),
         "非机动车",
         poiTypeSrcVr = R.drawable.icon_warning_v2x_motobike,
         content = "前方%s米有非机动车",
-        tts = "前方%s米有非机动车"
+        tts = "蘑菇路侧提醒您，前方%s米有非机动车"
     ),
     TYPE_ID_OBSTACLE(
         36.toString(),
         "障碍",
         poiTypeSrcVr = R.drawable.icon_default,
         content = "前方%s米障碍",
-        tts = "前方%s米障碍"
+        tts = "蘑菇路侧提醒您，前方%s米障碍"
     ),
     TYPE_FOURS_ROAD_WORK(
         38.toString(),
         "施工",
         poiTypeSrcVr = R.drawable.icon_warning_v2x_road_construction,
         content = "前方%s米施工",
-        tts = "前方%s米施工"
+        tts = "蘑菇路侧提醒您，前方%s米施工"
     ),
     TYPE_VEHICLE_QUEUE(
         47.toString(),
         "车队",
         poiTypeSrcVr = R.drawable.icon_default,
         content = "前方%s米车队",
-        tts = "前方%s米车队"
+        tts = "蘑菇路侧提醒您，前方%s米车队"
     ),
     TYPE_NO_PASSING(
         51.toString(),
         "道路不通",
         poiTypeSrcVr = R.drawable.v2x_icon_fenglu_vr,
         content = "前方%s米不通",
-        tts = "前方%s米不通"
+        tts = "蘑菇路侧提醒您，前方%s米不通"
     ),
     TYPE_NO_TURNING_AROUND(
         75.toString(),
         "禁止掉头",
         poiTypeSrcVr = R.drawable.icon_default,
         content = "前方%s米禁止掉头",
-        tts = "前方%s米禁止掉头"
+        tts = "蘑菇路侧提醒您，前方%s米禁止掉头"
     ),
     TYPE_USECASE_ID_ROAD_NO_PARKING(
         78.toString(),
         "禁止停车",
         poiTypeSrcVr = R.drawable.icon_warning_v2x_no_parking,
         content = "前方%s米有禁停路段",
-        tts = "前方%s米有禁停路段"
+        tts = "蘑菇路侧提醒您，前方%s米有禁停路段"
     ),
     TYPE_USECASE_ID_ROAD_NO_TOOTING(
         80.toString(),
         "禁止鸣笛",
         poiTypeSrcVr = R.drawable.icon_warning_v2x_no_tooting,
         content = "前方%s米禁止鸣笛",
-        tts = "前方%s米禁止鸣笛"
+        tts = "蘑菇路侧提醒您，前方%s米禁止鸣笛"
     ),
     TYPE_USECASE_ID_BUS_WARNING(
         123.toString(),
         "公交提醒",
         poiTypeSrcVr = R.drawable.icon_warning_v2x_tramcar,
         content = "前方%s米公交提醒",
-        tts = "前方%s米公交提醒"
+        tts = "蘑菇路侧提醒您，前方%s米公交提醒"
     ),
     TYPE_USECASE_ID_NARROW_RIGHT(
         163.toString(),
         "右侧变窄/车道数减少",
         poiTypeSrcVr = R.drawable.icon_default,
         content = "前方%s米右侧变窄/车道数减少",
-        tts = "前方%s米右侧变窄/车道数减少"
+        tts = "蘑菇路侧提醒您，前方%s米右侧变窄/车道数减少"
     ),
     TYPE_USECASE_ID_GAS_STATION(
         201.toString(),
         "加油站",
         poiTypeSrcVr = R.drawable.icon_warning_gas_station,
         content = "前方%s米加油站",
-        tts = "前方%s米加油站"
+        tts = "蘑菇路侧提醒您，前方%s米加油站"
     ),
     TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL(
         242.toString(),
         "学校",
         poiTypeSrcVr = R.drawable.icon_warning_v2x_school,
         content = "前方%s米学校",
-        tts = "前方%s米学校"
+        tts = "蘑菇路侧提醒您，前方%s米学校"
     ),
     TYPE_USECASE_ID_ACCIDENT(
         244.toString(),
         "交通事故",
         poiTypeSrcVr = R.drawable.v2x_icon_jiaotongshigu_vr,
         content = "前方%s米交通事故",
-        tts = "前方%s米交通事故"
+        tts = "蘑菇路侧提醒您，前方%s米交通事故"
     ),
     TYPE_ATTENTION_CONFLUENCE(
         44.toString(),
         "注意合流",
         poiTypeSrcVr = R.drawable.icon_warning_v2x_attention_confluence,
         content = "前方%s米注意合流",
-        tts = "前方%s米注意合流"
+        tts = "蘑菇路侧提醒您，前方%s米注意合流"
     ),
     TYPE_PEDESTRIAN_CROSSING(
         114.toString(),
         "人行横道",
         poiTypeSrcVr = R.drawable.icon_warning_v2x_person,
         content = "前方%s米人行横道",
-        tts = "前方%s米人行横道"
+        tts = "蘑菇路侧提醒您，前方%s米人行横道"
     ),
     //------------车内标牌 obu end -------------->
 
diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/IMogoMapService.java b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/IMogoMapService.java
index 8c14762e36..9712793375 100644
--- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/IMogoMapService.java
+++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/IMogoMapService.java
@@ -3,10 +3,8 @@ package com.mogo.eagle.core.function.api.map;
 import android.content.Context;
 
 import com.alibaba.android.arouter.facade.template.IProvider;
-import com.mogo.eagle.core.function.api.map.marker.IMogoMarkerService;
 import com.mogo.map.location.IMogoGDLocationClient;
-import com.mogo.map.marker.IMogoMarkerManager;
-import com.mogo.map.overlay.IMogoOverlayManager;
+import com.mogo.map.overlay.IMoGoOverlayManager;
 import com.mogo.map.uicontroller.IMogoMapUIController;
 
 /**
@@ -16,19 +14,8 @@ import com.mogo.map.uicontroller.IMogoMapUIController;
  * 地图对外接口
  */
 public interface IMogoMapService extends IProvider {
-    /**
-     * marker 操作
-     *
-     * @return
-     */
-    IMogoMarkerManager getMarkerManager(Context context);
 
-    /**
-     * 带有业务标注的服务marker
-     *
-     * @return
-     */
-    IMogoMarkerService getMarkerService();
+
 
     /**
      * 地图UI控制
@@ -37,12 +24,12 @@ public interface IMogoMapService extends IProvider {
      */
     IMogoMapUIController getMapUIController();
 
+
     /**
      * 覆盖物操作
-     *
      * @return
      */
-    IMogoOverlayManager getOverlayManager();
+    IMoGoOverlayManager getOverlayManager();
 
     /**
      * 获取高德定位服务
diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/marker/IMogoMarkerService.java b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/marker/IMogoMarkerService.java
deleted file mode 100644
index f87033daf6..0000000000
--- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/marker/IMogoMarkerService.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.mogo.eagle.core.function.api.map.marker;
-
-import androidx.annotation.Nullable;
-
-import com.mogo.eagle.core.data.map.MogoLatLng;
-import com.mogo.eagle.core.data.traffic.TrafficData;
-import com.mogo.map.marker.IMogoMarker;
-
-
-public interface IMogoMarkerService {
-
-    /**
-     * @param object
-     * @return
-     */
-    @Nullable
-    IMogoMarker drawMarker(Object object);
-
-    /**
-     * 识别物体移动
-     * @param lon
-     * @param lat
-     * @param type
-     * @param collisionlat
-     * @param collisionLon
-     * @param angle
-     * @param showTime
-     */
-    void renderWarningMoveMarker(double lon, double lat, int type, double collisionlat, double collisionLon, double angle, long showTime);
-
-    /**
-     * 绘制停止线marker
-     * @param lon
-     * @param lat
-     */
-    void renderStopLineMarker(double lon, double lat);
-
-    /**
-     * 绘制箭头
-     * @param location
-     * @param markerType
-     * @param type
-     * @param rotate
-     */
-    void drawerArrowsMarkerWithLocation(MogoLatLng location, String markerType, int type, int rotate);
-
-    /**
-     * 更新OBU/V2X传来的 单个物体感知数据
-     * @param trafficData
-     */
-    void updateITrafficInfo(TrafficData trafficData);
-
-    /**
-     * 更新数据
-     */
-    void updateITrafficLocationInfo(TrafficData trafficData);
-
-    /**
-     * 更新识别数据颜色
-     */
-    void updateITrafficThreatLevelInfo(TrafficData trafficData);
-
-    /**
-     * 移除OBU/V2X传来的 单个物体感知数据
-     * @param uuid
-     */
-    void removeCvxRvInfoIndInfo(String uuid);
-
-
-
-
-
-}
diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapUIServiceManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapUIServiceManager.kt
index a7bedbeda3..3783e4d203 100644
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapUIServiceManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapUIServiceManager.kt
@@ -4,12 +4,10 @@ import android.content.Context
 import com.mogo.eagle.core.data.constants.MogoServicePaths
 import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.function.api.map.IMogoMapService
-import com.mogo.eagle.core.function.api.map.marker.IMogoMarkerService
 import com.mogo.eagle.core.function.call.base.CallerBase
 import com.mogo.map.hdcache.IHdCacheListener
 import com.mogo.map.location.IMogoGDLocationClient
-import com.mogo.map.marker.IMogoMarkerManager
-import com.mogo.map.overlay.IMogoOverlayManager
+import com.mogo.map.overlay.*
 import com.mogo.map.uicontroller.IMogoMapUIController
 
 object CallerMapUIServiceManager {
@@ -24,14 +22,6 @@ object CallerMapUIServiceManager {
         return serviceProvider?.mapUIController
     }
 
-    fun getMarkerManager(context: Context): IMogoMarkerManager? {
-        return serviceProvider?.getMarkerManager(context)
-    }
-
-    fun getMarkerService(): IMogoMarkerService? {
-        return serviceProvider?.markerService
-    }
-
     fun cacheHDDataByCity(listener: IHdCacheListener) {
         serviceProvider?.mapUIController?.cacheHDDataByCity(listener)
     }
@@ -44,7 +34,7 @@ object CallerMapUIServiceManager {
         return serviceProvider?.mapUIController?.isCityDataCached ?: false
     }
 
-    fun getOverlayManager(): IMogoOverlayManager?{
+    fun getOverlayManager(): IMoGoOverlayManager? {
         return serviceProvider?.overlayManager
     }
 
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoMap.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoMap.java
index 5fad00ad88..4e389d5af2 100644
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoMap.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoMap.java
@@ -1,17 +1,13 @@
 package com.mogo.map;
 
-import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.center.CenterLine;
-import com.mogo.map.marker.IMogoMarker;
-import com.mogo.map.marker.MogoMarkerOptions;
-import com.mogo.map.overlay.IMogoPolyline;
-import com.mogo.map.overlay.MogoPolylineOptions;
+import com.mogo.map.overlay.line.Polyline;
+import com.mogo.map.overlay.point.Point;
+import com.mogo.map.overlay.proxy.line.IMapPolylineOverlay;
+import com.mogo.map.overlay.proxy.point.IMapPointOverlay;
 import com.mogo.map.road.RoadNameInfo;
 import com.mogo.map.uicontroller.IMogoMapUIController;
-
-import java.util.ArrayList;
 import java.util.HashMap;
-
 import mogo.telematics.pad.MessagePad;
 import mogo.yycp.api.proto.SocketDownData;
 
@@ -37,19 +33,9 @@ public interface IMogoMap {
      */
     IMogoMapUIController getUIController();
 
-    /**
-     * 在地图上添一个图片标记（marker）对象。
-     *
-     * @param tag     标识服务
-     * @param options
-     * @return
-     */
-    IMogoMarker addMarker(String tag, MogoMarkerOptions options);
+    IMapPointOverlay addPoint(Point.Options options);
 
-    /**
-     * 清除所有marker
-     */
-    void clearAllMarkers();
+    IMapPolylineOverlay addLine(Polyline.Options options);
 
     /**
      * 批量更新锚点位置
@@ -80,16 +66,6 @@ public interface IMogoMap {
      */
     void removeMarker(String uuidString);
 
-    /**
-     * 在地图上添一组图片标记（marker）对象，并设置是否改变地图状态以至于所有的marker对象都在当前地图可视区域范围内显示。
-     *
-     * @param tag          标识服务
-     * @param options
-     * @param moveToCenter
-     * @return
-     */
-    ArrayList<IMogoMarker> addMarkers(String tag, ArrayList<MogoMarkerOptions> options, boolean moveToCenter);
-
     /**
      * 从地图上删除所有的overlay（marker，circle，polyline 等对象）。
      */
@@ -136,14 +112,6 @@ public interface IMogoMap {
      */
     float getRoadWidth(double lon, double lat, float angle, boolean isGpsLocation, boolean isRTK);
 
-    /**
-     * 添加线段
-     *
-     * @param options
-     * @return
-     */
-    IMogoPolyline addPolyline(MogoPolylineOptions options);
-
     /**
      * 获取行驶方向一定长度的中心线
      *
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/identity/IMogoIdentifyManager.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/identity/IMogoIdentifyManager.java
new file mode 100644
index 0000000000..3edb89854d
--- /dev/null
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/identity/IMogoIdentifyManager.java
@@ -0,0 +1,44 @@
+package com.mogo.map.identity;
+
+import java.util.HashMap;
+import mogo.telematics.pad.MessagePad;
+import mogo.yycp.api.proto.SocketDownData;
+
+/**
+ * @author congtaowang
+ * @since 2019-12-25
+ * <p>
+ * 地图 marker 管理
+ */
+public interface IMogoIdentifyManager {
+
+
+    /**
+     * 要移除的感知数据uuid
+     *
+     * @param uuidString
+     */
+    void removeMarker(String uuidString);
+
+    /**
+     * 批量更新锚点位置
+     *
+     * @param optionsArrayList 锚点集合
+     */
+    void updateBatchMarkerPosition(HashMap<String, MessagePad.TrackedObject> optionsArrayList);
+
+    /**
+     * 批量更新锚点位置
+     *
+     * @param optionsArrayList 锚点集合
+     */
+    void updateBatchAiMarkerPosition(HashMap<String, SocketDownData.CloudRoadDataProto> optionsArrayList);
+
+    /**
+     * 添加感知使用到的3d模型
+     *
+     * @param type
+     * @param modelRes
+     */
+    String addPreVehicleModel(int type, int modelRes);
+}
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoInfoWindowAdapter.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoInfoWindowAdapter.java
deleted file mode 100644
index 0d0786991f..0000000000
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoInfoWindowAdapter.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.mogo.map.marker;
-
-import android.view.View;
-
-/**
- * @author congtaowang
- * @since 2019-12-24
- * <p>
- * 自定义 infowindow 适配器
- */
-public interface IMogoInfoWindowAdapter {
-
-    /**
-     * 获取infowindow的布局
-     *
-     * @param marker
-     * @return
-     */
-    View getInfoWindow( IMogoMarker marker );
-}
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarker.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarker.java
deleted file mode 100644
index 099b77c4f0..0000000000
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarker.java
+++ /dev/null
@@ -1,218 +0,0 @@
-package com.mogo.map.marker;
-
-import android.graphics.Bitmap;
-import android.view.animation.Interpolator;
-
-import com.mogo.eagle.core.data.map.MogoLatLng;
-import com.mogo.map.marker.anim.OnMarkerAnimationListener;
-
-import java.util.ArrayList;
-
-/**
- * @author congtaowang
- * @since 2019-12-18
- * <p>
- * 地图 marker 抽象
- */
-public interface IMogoMarker {
-
-    /**
-     * 删除当前marker并销毁Marker的图片等资源
-     */
-    void destroy();
-
-    /**
-     * 删除当前marker。
-     */
-    void remove();
-
-    /**
-     * 设置Marker覆盖物的透明度
-     *
-     * @param alpha
-     */
-    void setAlpha( float alpha );
-
-    /**
-     * 设置 Marker覆盖物的图标
-     *
-     * @param bitmap
-     */
-    void setIcon( Bitmap bitmap );
-
-    /**
-     * 设置 Marker 的图标集合，相同图案的 icon 的 marker 最好使用同一个 BitmapDescriptor 对象以节省内存空间。
-     *
-     * @param icons
-     */
-    void setIcons( ArrayList< Bitmap > icons );
-
-    /**
-     * 设置Marker覆盖物的属性选项类 通过markerOption 给marker设置属性
-     *
-     * @param opt
-     */
-    void setMarkerOptions( MogoMarkerOptions opt );
-
-    /**
-     * 可以存储业务相关的数据
-     *
-     * @param object
-     */
-    void setObject( Object object );
-
-    /**
-     * @return 用户设置的 object 对象
-     */
-    Object getObject();
-
-    /**
-     * 设置位置
-     *
-     * @param lat
-     * @param lng
-     */
-    void setPosition( double lat, double lng );
-
-    /**
-     * 获取坐标点
-     *
-     * @return
-     */
-    MogoLatLng getPosition();
-
-    /**
-     * 设置Marker覆盖物图片旋转的角度，从正北开始，逆时针计算。
-     *
-     * @param rotate
-     */
-    void setRotateAngle( float rotate );
-
-    /**
-     * 设置Marker 覆盖物的标题。
-     *
-     * @param title
-     */
-    void setTitle( String title );
-
-    /**
-     * 设置当前marker在最上面。
-     */
-    void setToTop();
-
-    /**
-     * 设置 Marker 覆盖物的可见属性。
-     *
-     * @param visible
-     */
-    void setVisible( boolean visible );
-
-
-    /**
-     * 设置点击事件
-     *
-     * @param listener
-     */
-    void setOnMarkerClickListener( IMogoMarkerClickListener listener );
-
-    /**
-     * 获取点击事件
-     *
-     * @return
-     */
-    IMogoMarkerClickListener getOnMarkerClickListener();
-
-    /**
-     * 自定义 infowindow 样式接口
-     *
-     * @return
-     */
-    IMogoInfoWindowAdapter getInfoWindowAdapter();
-
-    /**
-     * 是否被销毁
-     *
-     * @return
-     */
-    boolean isDestroyed();
-
-    /**
-     * 设置marker的归属模块
-     *
-     * @param mOwner
-     */
-    void setOwner( String mOwner );
-
-    /**
-     * 获取marker的归属模块
-     *
-     * @return
-     */
-    String getOwner();
-
-    /**
-     * Marker 配置
-     *
-     * @return
-     */
-    MogoMarkerOptions getMogoMarkerOptions();
-
-
-
-    /**
-     * 缩放动画
-     *
-     * @param fromX
-     * @param toX
-     * @param fromY
-     * @param toY
-     * @param duration
-     * @param interpolator
-     * @param listener
-     */
-    void startScaleAnimation( float fromX,
-                              float toX,
-                              float fromY,
-                              float toY,
-                              int duration,
-                              Interpolator interpolator,
-                              OnMarkerAnimationListener listener );
-
-    /**
-     * 是否是否可点击
-     *
-     * @param clickable
-     */
-    void setClickable( boolean clickable );
-
-
-    /**
-     * 设置是否是gps
-     *
-     * @param isGps
-     */
-    void setGps( boolean isGps );
-
-    /**
-     * 设置3D车模颜色
-     *
-     * @param anchorColor
-     */
-    default void setAnchorColor( String anchorColor ) {
-
-    }
-
-    default void addDynamicAnchorPosition( MogoLatLng latLng, float angle, long duration ) {
-
-    }
-
-    /**
-     * 获取 marker 内部使用资源内容 md5
-     *
-     * @return
-     */
-    default String getMarkerResName() {
-        return "";
-    }
-
-}
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarkerClickListener.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarkerClickListener.java
deleted file mode 100644
index 0298c65686..0000000000
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarkerClickListener.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.mogo.map.marker;
-
-/**
- * @author congtaowang
- * @since 2019-12-23
- * <p>
- * marker 点击事件
- */
-public interface IMogoMarkerClickListener {
-
-    /**
-     * 事件是否继续往下传递
-     *
-     * @param marker
-     * @return true - 事件已经处理完毕不继续往下传，否则继续往下传
-     */
-    default boolean onMarkerClicked(IMogoMarker marker){
-        return false;
-    };
-
-    /**
-     * 地图上静态Marker点击事件传递
-     * @param marker
-     * @return true - 事件已经处理完毕不继续往下传，否则继续往下传
-     */
-    default boolean onStaticMarkerClicked(IMogoMarker marker){
-        return false;
-    };
-}
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarkerClickListenerRegister.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarkerClickListenerRegister.java
deleted file mode 100644
index 615904888c..0000000000
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarkerClickListenerRegister.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.mogo.map.marker;
-
-/**
- * @author congtaowang
- * @since 2019-12-23
- * <p>
- * 地图操作回调
- */
-public interface IMogoMarkerClickListenerRegister {
-
-    /**
-     * 注册marker回调，各业务模块不用关注
-     *
-     * @param listener
-     */
-    void registerMarkerClickListener(String tag, IMogoMarkerClickListener listener );
-
-
-    /**
-     * 注销marker回调，各业务模块不需要关注
-     */
-    void unregisterMarkerClickListener(String tag);
-}
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarkerIconViewCreator.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarkerIconViewCreator.java
deleted file mode 100644
index 50089cb15b..0000000000
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarkerIconViewCreator.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.mogo.map.marker;
-
-import android.view.View;
-
-/**
- * @author congtaowang
- * @since 2019-12-29
- * <p>
- * 动态变换 marker 样式接口
- */
-public interface IMogoMarkerIconViewCreator {
-
-    /**
-     * 返回自定义marker样式
-     *
-     * @param marker marker 的数据
-     * @return
-     */
-    View createView( IMogoMarker marker );
-}
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarkerManager.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarkerManager.java
deleted file mode 100644
index f4c23bb89b..0000000000
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarkerManager.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package com.mogo.map.marker;
-
-import android.content.Context;
-
-import com.mogo.eagle.core.data.map.MogoLatLng;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import mogo.telematics.pad.MessagePad;
-import mogo.yycp.api.proto.SocketDownData;
-
-/**
- * @author congtaowang
- * @since 2019-12-25
- * <p>
- * 地图 marker 管理
- */
-public interface IMogoMarkerManager {
-
-    /**
-     * 添加marker
-     *
-     * @param tag     标识调用者
-     * @param options
-     * @return
-     */
-    IMogoMarker addMarker(String tag, MogoMarkerOptions options);
-
-    /**
-     * 添加多个marker
-     *
-     * @param tag     标识调用者
-     * @param options
-     * @return
-     */
-    List<IMogoMarker> addMarkers(String tag, ArrayList<MogoMarkerOptions> options, boolean moveToCenter);
-
-    /**
-     * 清除所有marker
-     */
-    void clearAllMarker();
-
-    /**
-     * 批量更新锚点位置
-     *
-     * @param optionsArrayList 锚点集合
-     */
-    void updateBatchMarkerPosition(HashMap<String, MessagePad.TrackedObject> optionsArrayList);
-
-    /**
-     * 批量更新锚点位置
-     *
-     * @param optionsArrayList 锚点集合
-     */
-    void updateBatchAiMarkerPosition(HashMap<String, SocketDownData.CloudRoadDataProto> optionsArrayList);
-
-    /**
-     * 添加感知使用到的3d模型
-     *
-     * @param type
-     * @param modelRes
-     */
-    String addPreVehicleModel(int type, int modelRes);
-
-    /**
-     * 要移除的感知数据uuid
-     *
-     * @param uuidString
-     */
-    void removeMarker(String uuidString);
-
-    /**
-     * 移除某一个类型、某个模块的 markers
-     *
-     * @param tag
-     */
-    void removeMarkers(String tag);
-
-    /**
-     * 移除地图上添加的所有markers
-     */
-    void removeMarkers();
-
-    /**
-     * 显示地图上添加的所有markers
-     */
-    void visibleAllMarkers();
-
-    /**
-     * 隐藏地图上添加的所有markers
-     */
-    void inVisibleAllMarkers();
-
-    /**
-     * 隐藏除了某些类别的所有marker {@link MogoMarkerOptions Owner}
-     *
-     * @param owner
-     */
-    void inVisibleWithoutMarkers(String... owner); //todo 后续需要把Owner类别统一起来，基类下沉，此接口为临时方案，应该设计为隐藏某一类元素
-
-    /**
-     * 获取某种类型的全部marker。
-     *
-     * @param tag 业务类型
-     * @return
-     */
-    List<IMogoMarker> getMarkers(String tag);
-
-    /**
-     * 获取所有类型的marker。
-     *
-     * @return
-     */
-    Map<String, List<IMogoMarker>> getAllMarkers();
-
-    /**
-     * 仅保留指定类型的tag
-     *
-     * @param tag 需要保留的类型
-     */
-    void removeMarkersExcept(String tag);
-
-    /**
-     * 添加搜索路线
-     *
-     * @param context    上下文
-     * @param startPoint 起点
-     * @param endPoint   终点
-     * @param wayPoints  途经点
-     */
-    void addRouteWay(Context context, MogoLatLng startPoint, MogoLatLng endPoint, List<MogoLatLng> wayPoints);
-
-    /**
-     * 移除添加的导航预测路线
-     */
-    void removeRouteWayOverlay();
-}
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/MarkerType.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/MarkerType.java
deleted file mode 100644
index 9f57a444f2..0000000000
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/MarkerType.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.mogo.map.marker;
-
-public class MarkerType {
-
-    public static final String MAP_STATIC = "mapStatic";
-    public static final String MAP_STATIC_TRAFFIC = "trafficcamera";
-}
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/MogoMarkerOptions.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/MogoMarkerOptions.java
deleted file mode 100644
index ae1b76bc6f..0000000000
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/MogoMarkerOptions.java
+++ /dev/null
@@ -1,460 +0,0 @@
-package com.mogo.map.marker;
-
-import android.graphics.Bitmap;
-import android.location.Location;
-import android.view.View;
-
-import androidx.annotation.RawRes;
-
-import com.mogo.eagle.core.data.map.MogoLatLng;
-import com.mogo.eagle.core.data.map.MogoLocation;
-
-import java.util.ArrayList;
-import java.util.Observable;
-
-/**
- * @author congtaowang
- * @since 2019-12-18
- * <p>
- * 地图marker
- */
-public class MogoMarkerOptions extends Observable {
-
-    // marker 唯一标记
-    private String uuid;
-    private int markerType;
-    private double latitude;
-    private double longitude;
-    // 设置 Marker覆盖物 的标题
-    private String title;
-    // 设置 Marker覆盖物的 文字描述
-    private String snippet;
-    // 设置Marker覆盖物的图标。
-    private Bitmap icon;
-    // 设置Marker覆盖物的动画帧图标列表，多张图片模拟gif的效果。
-    private ArrayList< Bitmap > icons;
-    // 设置多少帧刷新一次图片资源，Marker动画的间隔时间，值越小动画越快。
-    private int period = 20;
-    // 设置Marker覆盖物的图片旋转角度，从正北开始，逆时针计算。
-    private float rotate;
-    // 设置Marker覆盖物是否平贴地图。
-    private boolean flat = false;
-    // 设置Marker覆盖物是否可见。
-    private boolean visible = true;
-    // 设置Marker覆盖物的InfoWindow是否允许显示
-    private boolean inifoWindowEnable = true;
-    // 设置Marker覆盖物的透明度
-    private float alpha = 1.0f;
-
-    // 设置Marker覆盖物的缩放
-    private float scale = 1.0f;
-
-    // Marker覆盖物的坐标是否是Gps
-    private boolean isGps = false;
-
-    // Marker覆盖物锚点在水平范围的比例。
-    private float u = 0.5f;
-    // Marker覆盖物锚点垂直范围的比例。
-    private float v = 1f;
-
-    // 设置Marker覆盖物是否可拖拽。
-    private boolean draggable = false;
-
-    // Marker覆盖物的InfoWindow相对X 轴的Marker的偏移
-    private int offsetX = 0;
-    // Marker覆盖物的InfoWindow相对Y 轴的Marker的偏移
-    private int offsetY = 0;
-
-    // 设置Marker覆盖物 zIndex。
-    private int zIndex = 0;
-    // 自定义样式
-    private View mIconView;
-    // marker 归属模块
-    private String mOwner;
-
-    private Object mObject;
-
-    /**
-     * 是否加入marker管理
-     */
-    private boolean mAutoManager = true;
-
-    private @RawRes
-    int mIcon3DRes = 0;
-    private String mAnchorColor;
-
-    private boolean mIs3DMode = false;
-
-    private boolean mIsControlAngle = false;
-
-    /**
-     * 资源名称，便于缓存重复使用，和mIcon3DRes、mIconView、icon等冲突，需要县设置
-     */
-    private String mResName;
-
-    /**
-     * 吸附在车道上
-     */
-    private boolean mMatchOnRoadSide = true;
-
-    public String getUuid() {
-        return uuid;
-    }
-
-    public void setUuid(String uuid) {
-        this.uuid = uuid;
-    }
-
-    public int getMarkerType() {
-        return markerType;
-    }
-
-    public void setMarkerType(int markerType) {
-        this.markerType = markerType;
-    }
-
-    public MogoMarkerOptions matchOnRoadSide(boolean matchOnRoadSide ) {
-        this.mMatchOnRoadSide = matchOnRoadSide;
-        return this;
-    }
-
-    public boolean isMatchOnRoadSide() {
-        return mMatchOnRoadSide;
-    }
-
-    public MogoMarkerOptions resName( String resName ) {
-        this.mResName = resName;
-        return this;
-    }
-
-    public String getResName() {
-        return mResName;
-    }
-
-    public MogoMarkerOptions controlAngle( boolean controlAngle ) {
-        this.mIsControlAngle = controlAngle;
-        return this;
-    }
-
-    public boolean isControlAngle() {
-        return mIsControlAngle;
-    }
-
-    public MogoMarkerOptions set3DMode( boolean is3DMode ) {
-        mIs3DMode = is3DMode;
-        return this;
-    }
-
-    public boolean is3DMode() {
-        return mIs3DMode;
-    }
-
-    public MogoMarkerOptions position( MogoLatLng latLng ) {
-        if ( latLng != null ) {
-            latitude( latLng.lat );
-            longitude( latLng.lon );
-        }
-        return this;
-    }
-
-    public MogoMarkerOptions position( MogoLocation location ) {
-        if ( location != null ) {
-            latitude( location.getLatitude() );
-            longitude( location.getLongitude() );
-        }
-        return this;
-    }
-
-    public MogoMarkerOptions position( Location location ) {
-        if ( location != null ) {
-            latitude( location.getLatitude() );
-            longitude( location.getLongitude() );
-        }
-        return this;
-    }
-
-    public MogoMarkerOptions latitude( double latitude ) {
-        this.latitude = latitude;
-        return this;
-    }
-
-    public MogoMarkerOptions longitude( double longitude ) {
-        this.longitude = longitude;
-        return this;
-    }
-
-    public MogoMarkerOptions title( String title ) {
-        this.title = title;
-        return this;
-    }
-
-    public MogoMarkerOptions snippet( String snippet ) {
-        this.snippet = snippet;
-        return this;
-    }
-
-    /**
-     * 优先使用icon作为marker资源
-     *
-     * @param icon
-     * @return
-     */
-    public MogoMarkerOptions icon( Bitmap icon ) {
-        this.icon = icon;
-        return this;
-    }
-
-    public MogoMarkerOptions icons( ArrayList< Bitmap > icons ) {
-        this.icons = icons;
-        return this;
-    }
-
-    public MogoMarkerOptions period( int period ) {
-        this.period = period;
-        if ( this.period < 1 ) {
-            this.period = 1;
-        }
-        return this;
-    }
-
-    public MogoMarkerOptions rotate( float rotate ) {
-        this.rotate = rotate;
-        return this;
-    }
-
-    public MogoMarkerOptions flat( boolean flat ) {
-        this.flat = flat;
-        return this;
-    }
-
-    public MogoMarkerOptions visible( boolean visible ) {
-        this.visible = visible;
-        return this;
-    }
-
-    public MogoMarkerOptions inifoWindowEnable( boolean inifoWindowEnable ) {
-        this.inifoWindowEnable = inifoWindowEnable;
-        return this;
-    }
-
-    public MogoMarkerOptions alpha( float alpha ) {
-        this.alpha = alpha;
-        return this;
-    }
-
-    public MogoMarkerOptions scale( float scale ) {
-        this.scale = scale;
-        return this;
-    }
-
-
-    public MogoMarkerOptions gps( boolean gps ) {
-        isGps = gps;
-        return this;
-    }
-
-    public MogoMarkerOptions anchor( float u, float v ) {
-        this.u = u;
-        this.v = v;
-        return this;
-    }
-
-    public MogoMarkerOptions draggable( boolean draggable ) {
-        this.draggable = draggable;
-        return this;
-    }
-
-    public MogoMarkerOptions setInfoWindowOffset( int offsetX, int offsetY ) {
-        this.offsetX = offsetX;
-        this.offsetY = offsetY;
-        return this;
-    }
-
-    public MogoMarkerOptions zIndex( int zIndex ) {
-        this.zIndex = zIndex;
-        return this;
-    }
-
-    public MogoMarkerOptions data(Object object ) {
-        this.mObject = object;
-        return this;
-    }
-
-    /**
-     * 自定义marker图层样式，优先使用 icon {@link #icon(Bitmap)}作为marker资源
-     *
-     * @param iconView
-     * @return
-     */
-    public MogoMarkerOptions icon( View iconView ) {
-        this.mIconView = iconView;
-        return this;
-    }
-
-    public MogoMarkerOptions owner( String owner ) {
-        this.mOwner = owner;
-        return this;
-    }
-
-    public MogoMarkerOptions icon3DRes( @RawRes int icon3DRes ) {
-        this.mIcon3DRes = icon3DRes;
-        return this;
-    }
-
-    public MogoMarkerOptions anchorColor( String anchorColor ) {
-        this.mAnchorColor = anchorColor;
-        return this;
-    }
-
-    public double getLatitude() {
-        return latitude;
-    }
-
-    public double getLongitude() {
-        return longitude;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public String getSnippet() {
-        return snippet;
-    }
-
-    public Bitmap getIcon() {
-        return icon;
-    }
-
-    public ArrayList< Bitmap > getIcons() {
-        return icons;
-    }
-
-    public int getPeriod() {
-        return period;
-    }
-
-    public float getRotate() {
-        return rotate;
-    }
-
-    public boolean isFlat() {
-        return flat;
-    }
-
-    public boolean isVisible() {
-        return visible;
-    }
-
-    public boolean isInifoWindowEnable() {
-        return inifoWindowEnable;
-    }
-
-    public float getAlpha() {
-        return alpha;
-    }
-
-    public float getScale() {
-        return scale;
-    }
-
-    public boolean isGps() {
-        return isGps;
-    }
-
-    public float getU() {
-        return u;
-    }
-
-    public float getV() {
-        return v;
-    }
-
-    public boolean isDraggable() {
-        return draggable;
-    }
-
-    public int getOffsetX() {
-        return offsetX;
-    }
-
-    public int getOffsetY() {
-        return offsetY;
-    }
-
-    public int getzIndex() {
-        return zIndex;
-    }
-
-    public View getIconView() {
-        return mIconView;
-    }
-
-    public String getOwner() {
-        return mOwner;
-    }
-
-    public Object getObject() {
-        return mObject;
-    }
-
-    public boolean isAutoManager() {
-        return mAutoManager;
-    }
-
-    public MogoMarkerOptions autoManager( boolean autoManager ) {
-        this.mAutoManager = autoManager;
-        return this;
-    }
-
-    public int getIcon3DRes() {
-        return mIcon3DRes;
-    }
-
-    public String getAnchorColor() {
-        return mAnchorColor;
-    }
-
-    public MogoMarkerOptions setGps(boolean gps) {
-        isGps = gps;
-        return this;
-    }
-
-    @Override
-    public String toString() {
-        return "MogoMarkerOptions{" +
-                "uuid='" + uuid + '\'' +
-                ", markerType=" + markerType +
-                ", latitude=" + latitude +
-                ", longitude=" + longitude +
-                ", title='" + title + '\'' +
-                ", snippet='" + snippet + '\'' +
-                ", icon=" + icon +
-                ", icons=" + icons +
-                ", period=" + period +
-                ", rotate=" + rotate +
-                ", flat=" + flat +
-                ", visible=" + visible +
-                ", inifoWindowEnable=" + inifoWindowEnable +
-                ", alpha=" + alpha +
-                ", scale=" + scale +
-                ", isGps=" + isGps +
-                ", u=" + u +
-                ", v=" + v +
-                ", draggable=" + draggable +
-                ", offsetX=" + offsetX +
-                ", offsetY=" + offsetY +
-                ", zIndex=" + zIndex +
-                ", mIconView=" + mIconView +
-                ", mOwner='" + mOwner + '\'' +
-                ", mObject=" + mObject +
-                ", mAutoManager=" + mAutoManager +
-                ", mIcon3DRes=" + mIcon3DRes +
-                ", mAnchorColor='" + mAnchorColor + '\'' +
-                ", mIs3DMode=" + mIs3DMode +
-                ", mIsControlAngle=" + mIsControlAngle +
-                ", mResName='" + mResName + '\'' +
-                ", mMatchOnRoadSide=" + mMatchOnRoadSide +
-                '}';
-    }
-}
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/MogoMarkersHandler.kt b/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/MogoMarkersHandler.kt
deleted file mode 100644
index d5d12d8fae..0000000000
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/MogoMarkersHandler.kt
+++ /dev/null
@@ -1,176 +0,0 @@
-package com.mogo.map.marker
-
-import android.annotation.SuppressLint
-import android.text.TextUtils
-import java.util.*
-import java.util.concurrent.ConcurrentHashMap
-import java.util.function.Consumer
-
-/**
- * @author congtaowang
- * @since 2019-12-24
- *
- *
- * 管理地图上的所有marker
- */
-class MogoMarkersHandler private constructor() : IMogoMarkerClickListener,
-    IMogoMarkerClickListenerRegister {
-
-    companion object {
-        val mogoMarkersHandler by lazy(LazyThreadSafetyMode.SYNCHRONIZED) {
-            MogoMarkersHandler()
-        }
-    }
-
-    private val mMap: ConcurrentHashMap<String, IMogoMarkerClickListener> = ConcurrentHashMap()
-    private val mServicesMarkers: MutableMap<String, MutableList<IMogoMarker>?> =
-        ConcurrentHashMap()
-
-    override fun registerMarkerClickListener(tag: String, listener: IMogoMarkerClickListener) {
-        if (mMap.containsKey(tag)) {
-            return
-        }
-        mMap[tag] = listener
-    }
-
-    override fun unregisterMarkerClickListener(tag: String) {
-        if (!mMap.containsKey(tag)) {
-            return
-        }
-        mMap.remove(tag)
-    }
-
-    @SuppressLint("NewApi")
-    @Synchronized
-    fun visibleAll() {
-        mServicesMarkers.values.stream()
-            .filter { mogoMarkerList: List<IMogoMarker>? -> mogoMarkerList != null && !mogoMarkerList.isEmpty() }
-            .forEach { mogoMarkerList: List<IMogoMarker>? ->
-                mogoMarkerList!!.forEach(
-                    Consumer { mogoMarker: IMogoMarker -> mogoMarker.setVisible(true) })
-            }
-    }
-
-    @SuppressLint("NewApi")
-    @Synchronized
-    fun inVisibleAll() {
-        mServicesMarkers.values.stream()
-            .filter { mogoMarkerList: List<IMogoMarker>? -> mogoMarkerList != null && !mogoMarkerList.isEmpty() }
-            .forEach { mogoMarkerList: List<IMogoMarker>? ->
-                mogoMarkerList!!.forEach(
-                    Consumer { mogoMarker: IMogoMarker -> mogoMarker.setVisible(false) })
-            }
-    }
-
-    @SuppressLint("NewApi")
-    @Synchronized
-    fun inVisibleMarkers(vararg owner: String?) {
-        mServicesMarkers.values.stream()
-            .filter { mogoMarkerList: List<IMogoMarker>? -> mogoMarkerList != null && !mogoMarkerList.isEmpty() }
-            .forEach { mogoMarkerList: List<IMogoMarker>? ->
-                mogoMarkerList!!.forEach(
-                    Consumer { mogoMarker: IMogoMarker ->
-                        if (TextUtils.isEmpty(mogoMarker.owner)) {
-                            mogoMarker.setVisible(false)
-                        }
-                        if (!Arrays.asList(*owner).contains(mogoMarker.owner)) {
-                            mogoMarker.setVisible(false)
-                        }
-                    })
-            }
-    }
-
-    @Synchronized
-    fun removeAll() {
-        val mogoMarkers: Collection<List<IMogoMarker>?> = mServicesMarkers.values
-        for (mogoMarkerList in mogoMarkers) {
-            if (mogoMarkerList != null && !mogoMarkerList.isEmpty()) {
-                for (mogoMarker in mogoMarkerList) {
-                    try {
-                        mogoMarker.destroy()
-                    } catch (e: Exception) {
-                        e.printStackTrace()
-                    }
-                }
-            }
-        }
-        mServicesMarkers.clear()
-    }
-
-    @Synchronized
-    fun remove(tag: String) {
-        val mogoMarkerList = mServicesMarkers.remove(tag)
-        if (mogoMarkerList != null && !mogoMarkerList.isEmpty()) {
-            for (mogoMarker in mogoMarkerList) {
-                try {
-                    mogoMarker.destroy()
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                }
-            }
-            mogoMarkerList.clear()
-        }
-    }
-
-    @Synchronized
-    fun getMarkers(tag: String): List<IMogoMarker>? {
-        return mServicesMarkers[tag]
-    }
-
-    @get:Synchronized
-    val allMarkers: Map<String, MutableList<IMogoMarker>?>
-        get() = mServicesMarkers
-
-    @Synchronized
-    fun add(tag: String, marker: IMogoMarker?) {
-        if (marker == null) {
-            return
-        }
-        if (mServicesMarkers[tag] == null) {
-            mServicesMarkers[tag] = ArrayList()
-        }
-        mServicesMarkers[tag]!!.add(marker)
-    }
-
-    @Synchronized
-    fun add(tag: String, markers: List<IMogoMarker>?) {
-        if (markers == null || markers.isEmpty()) {
-            return
-        }
-        if (mServicesMarkers[tag] == null) {
-            mServicesMarkers[tag] = ArrayList()
-        }
-        mServicesMarkers[tag]!!.addAll(markers)
-    }
-
-    override fun onMarkerClicked(marker: IMogoMarker): Boolean {
-        val iMogoMarker = mMap[marker.owner]
-        return iMogoMarker?.onMarkerClicked(marker) ?: false
-    }
-
-    override fun onStaticMarkerClicked(marker: IMogoMarker): Boolean {
-        val iMogoMarker = mMap[marker.owner]
-        return iMogoMarker?.onStaticMarkerClicked(marker) ?: false
-    }
-
-    /**
-     * @param tag 需要保留的类型
-     */
-    fun deleteAllExcept(tag: String) {
-        if (TextUtils.isEmpty(tag)) {
-            return
-        }
-        val mogoMarkerList = mServicesMarkers.remove(tag)
-        for (value in mServicesMarkers.values) {
-            if (value != null && value.isNotEmpty()) {
-                for (mogoMarker in value) {
-                    mogoMarker.destroy()
-                }
-                value.clear()
-            }
-        }
-        mServicesMarkers[tag] = mogoMarkerList
-    }
-
-
-}
\ No newline at end of file
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/anim/OnMarkerAnimationListener.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/anim/OnMarkerAnimationListener.java
deleted file mode 100644
index 436e1f0e68..0000000000
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/anim/OnMarkerAnimationListener.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.mogo.map.marker.anim;
-
-/**
- * @author congtaowang
- * @since 2020-04-22
- * <p>
- * marker 动画监听
- */
-public interface OnMarkerAnimationListener {
-
-    default void onAnimStart() {
-    }
-
-    default void onAnimEnd() {
-    }
-}
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/IMoGoOverlayManager.kt b/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/IMoGoOverlayManager.kt
new file mode 100644
index 0000000000..eece4e7d93
--- /dev/null
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/IMoGoOverlayManager.kt
@@ -0,0 +1,74 @@
+package com.mogo.map.overlay
+
+import com.mogo.map.overlay.core.*
+import com.mogo.map.overlay.line.*
+import com.mogo.map.overlay.point.*
+import com.mogo.map.overlay.point.Point.Options as PointOptions
+import com.mogo.map.overlay.line.Polyline.Options as LineOptions
+
+interface IMoGoOverlayManager {
+
+    fun showOrUpdatePoint(options: PointOptions): Point?
+
+    fun hidePoint(id: String)
+
+    fun hidePoint(p: Point)
+
+    fun hideAllPointsInOwner(owner: String)
+
+    fun hideAllPointsInLevel(level: Level)
+
+    fun hideAllPoints()
+
+    fun removePoint(id: String)
+
+    fun removePoint(p: Point)
+
+    fun removeAllPointsInOwner(owner: String)
+
+    fun removeAllPointsInLevel(level: Level)
+
+    fun removeAllPoints()
+
+    fun showAllPoints()
+
+    fun showAllPointsInOwner(owner: String)
+
+    fun showAllPointsInLevel(level: Level)
+
+    fun showPoint(id: String)
+
+    fun showOrUpdateLine(options: LineOptions): Polyline?
+
+    fun hideLine(id: String)
+
+    fun hideLine(p: Polyline)
+
+    fun hideAllLinesInOwner(owner: String)
+
+    fun hideAllLinesInLevel(level: Level)
+
+    fun hideAllLines()
+
+    fun removeLine(id: String)
+
+    fun removeLine(p: Polyline)
+
+    fun removeAllLinesInOwner(owner: String)
+
+    fun removeAllLinesInLevel(level: Level)
+
+    fun removeAllLines()
+
+    fun showAllLines()
+
+    fun showAllLinesInOwner(owner: String)
+
+    fun showAllLinesInLevel(level: Level)
+
+    fun showLine(id: String)
+
+    fun hideAllPointsExceptIds(vararg ids: String)
+
+    fun hideAllPointsExceptOwners(vararg owners: String)
+}
\ No newline at end of file
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/IMogoOverlayManager.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/IMogoOverlayManager.java
deleted file mode 100644
index f429797e1a..0000000000
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/IMogoOverlayManager.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.mogo.map.overlay;
-
-/**
- * @author congtaowang
- * @since 2020-03-10
- * <p>
- * 覆盖物
- */
-public interface IMogoOverlayManager {
-
-    /**
-     * 绘制线段
-     *
-     * @param options
-     * @return
-     */
-    IMogoPolyline addPolyline( MogoPolylineOptions options );
-}
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/IMogoPolyline.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/IMogoPolyline.java
deleted file mode 100644
index 15a0350051..0000000000
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/IMogoPolyline.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package com.mogo.map.overlay;
-
-import androidx.annotation.ColorInt;
-
-import com.mogo.map.IDestroyable;
-import com.mogo.eagle.core.data.map.MogoLatLng;
-
-import java.util.List;
-
-/**
- * @author congtaowang
- * @since 2020-03-10
- * <p>
- * 线段
- */
-public interface IMogoPolyline extends IDestroyable {
-
-
-    /**
-     * 是否已经销毁
-     *
-     * @return
-     */
-    boolean isDestroyed();
-
-    /**
-     * 移除
-     */
-    void remove();
-
-    /**
-     * 获取ID
-     *
-     * @return
-     */
-    String getId();
-
-    /**
-     * 设置绘制点数据
-     *
-     * @param lonLats
-     */
-    void setPoints( List< MogoLatLng > lonLats );
-
-    /**
-     * 获取点
-     *
-     * @return
-     */
-    List< MogoLatLng > getPoints();
-
-    /**
-     * 测地线
-     *
-     * @param draw
-     */
-    void setGeodesic( boolean draw );
-
-    /**
-     * 是否设置了测地线
-     *
-     * @return
-     */
-    boolean isGeodesic();
-
-    /**
-     * 虚线
-     *
-     * @param dottedLine
-     */
-    void setDottedLine( boolean dottedLine );
-
-    /**
-     * 是否是虚线
-     *
-     * @return
-     */
-    boolean isDottedLine();
-
-    /**
-     * 设置线宽
-     *
-     * @param width
-     */
-    void setWidth( float width );
-
-    /**
-     * 获取线宽
-     *
-     * @return
-     */
-    float getWidth();
-
-    /**
-     * 设置线条颜色
-     *
-     * @param color
-     */
-    void setColor( @ColorInt int color );
-
-    /**
-     * 获取线条颜色
-     *
-     * @return
-     */
-    @ColorInt
-    int getColor();
-
-    /**
-     * 设置Z轴
-     */
-    void setZIndex( float zIndex );
-
-    /**
-     * 获取Z轴
-     *
-     * @return
-     */
-    float getZIndex();
-
-    /**
-     * 设置显示/隐藏
-     */
-    void setVisible( boolean visible );
-
-    /**
-     * 是否可见
-     *
-     * @return
-     */
-    boolean isVisible();
-
-    /**
-     * 设置透明度
-     *
-     * @param transparency
-     */
-    void setTransparency( float transparency );
-
-    /**
-     * 设置配置项
-     */
-    void setOption( MogoPolylineOptions option );
-}
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/MogoPolylineOptions.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/MogoPolylineOptions.java
deleted file mode 100644
index 489f9598b1..0000000000
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/MogoPolylineOptions.java
+++ /dev/null
@@ -1,288 +0,0 @@
-package com.mogo.map.overlay;
-
-import android.graphics.Color;
-
-import androidx.annotation.ColorInt;
-
-import com.mogo.eagle.core.data.map.MogoLatLng;
-import com.mogo.eagle.core.data.map.MogoLocation;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * @author congtaowang
- * @since 2020-03-10
- * <p>
- * 线段属性
- */
-public class MogoPolylineOptions {
-
-    public boolean useFacade = false;
-    public float maxIndex = Float.MIN_VALUE;
-    private List<MogoLatLng> mPoints;
-    private float mWidth = 10.0F;
-    private int mColor = Color.BLACK;
-    private float mZIndex = 0.0F;
-    private boolean mIsVisible = true;
-    private boolean mIsGeodesic = false;
-    private boolean mIsDottedLine = false;
-    private boolean mIsGradient = false;
-    private float mTransparency = 1.0F;
-    private boolean mIsAboveMaskLayer = false;
-    private boolean mIsPointsUpdated = false;
-    private boolean mGps = false;
-    private List<Integer> mColorValues;
-
-    private float brightSpeed = Float.MIN_VALUE;
-
-    private int brightColor = -1;
-
-    private boolean isBrightOn = false;
-
-    public MogoPolylineOptions() {
-        this.mPoints = new ArrayList<>();
-    }
-
-    /**
-     * 设置顶点
-     *
-     * @param points
-     * @return
-     */
-    public MogoPolylineOptions points(List<MogoLatLng> points) {
-        this.mPoints.clear();
-        this.mPoints.addAll(points);
-        this.mIsPointsUpdated = true;
-        return this;
-    }
-
-    /**
-     * 添加顶点到集合最后
-     *
-     * @param points
-     * @return
-     */
-    public MogoPolylineOptions add(MogoLatLng... points) {
-        if (points != null) {
-            this.mPoints.addAll(Arrays.asList(points));
-            this.mIsPointsUpdated = true;
-        }
-        return this;
-    }
-
-    public MogoPolylineOptions add(double lon, double lat) {
-        this.mPoints.add(new MogoLatLng(lat, lon));
-        return this;
-    }
-
-    public MogoPolylineOptions add(MogoLocation location) {
-        if (location != null) {
-            this.mPoints.add(new MogoLatLng(location.getLatitude(), location.getLongitude()));
-        }
-        return this;
-    }
-
-    /**
-     * 设置线宽
-     */
-    public MogoPolylineOptions width(float width) {
-        this.mWidth = width;
-        return this;
-    }
-
-    /**
-     * 设置线的颜色
-     *
-     * @param color
-     * @return
-     */
-    public MogoPolylineOptions color(@ColorInt int color) {
-        this.mColor = color;
-        return this;
-    }
-
-    /**
-     * 设置Z轴的值
-     *
-     * @param zIndex
-     * @return
-     */
-    public MogoPolylineOptions zIndex(float zIndex) {
-        this.mZIndex = zIndex;
-        return this;
-    }
-
-    /**
-     * 设置是否可见
-     *
-     * @param isVisible
-     * @return
-     */
-    public MogoPolylineOptions visible(boolean isVisible) {
-        this.mIsVisible = isVisible;
-        return this;
-    }
-
-    /**
-     * 设置是否绘制测地线
-     *
-     * @param isGeodesic
-     * @return
-     */
-    public MogoPolylineOptions geodesic(boolean isGeodesic) {
-        this.mIsGeodesic = isGeodesic;
-        return this;
-    }
-
-    /**
-     * 是否是虚线
-     *
-     * @param isDottedLine
-     * @return
-     */
-    public MogoPolylineOptions dottedLine(boolean isDottedLine) {
-        this.mIsDottedLine = isDottedLine;
-        return this;
-    }
-
-    /**
-     * 是否使用渐变色
-     *
-     * @param isGradient
-     * @return
-     */
-    public MogoPolylineOptions useGradient(boolean isGradient) {
-        this.mIsGradient = isGradient;
-        return this;
-    }
-
-    public MogoPolylineOptions maxIndex(float maxIndex) {
-        this.maxIndex  = maxIndex;
-        return this;
-    }
-
-    /**
-     * 设置透明度
-     *
-     * @param transparency
-     * @return
-     */
-    public MogoPolylineOptions transparency(float transparency) {
-        this.mTransparency = transparency;
-        return this;
-    }
-
-    public MogoPolylineOptions brightSpeed(float speed) {
-        this.brightSpeed = speed;
-        return this;
-    }
-
-    public MogoPolylineOptions openBright(boolean on) {
-        this.isBrightOn = on;
-        return this;
-    }
-
-    public MogoPolylineOptions brightColor(int color) {
-        this.brightColor = color;
-        return this;
-    }
-
-    public MogoPolylineOptions useFacade(boolean useFacade) {
-        this.useFacade = useFacade;
-        return this;
-    }
-
-
-    /**
-     * @param isAboveMaskLayer
-     * @return
-     */
-    public MogoPolylineOptions aboveMaskLayer(boolean isAboveMaskLayer) {
-        this.mIsAboveMaskLayer = isAboveMaskLayer;
-        return this;
-    }
-
-    /**
-     * @param colors
-     * @return
-     */
-    public MogoPolylineOptions colorValues(List<Integer> colors) {
-        mColorValues = colors;
-        return this;
-    }
-    public boolean gps() {
-        return mGps;
-    }
-
-    public MogoPolylineOptions setGps(boolean gps) {
-        mGps = gps;
-        return this;
-    }
-
-    public List<MogoLatLng> getPoints() {
-        return mPoints;
-    }
-
-    public float getWidth() {
-        return mWidth;
-    }
-
-    public int getColor() {
-        return mColor;
-    }
-
-    public float getZIndex() {
-        return mZIndex;
-    }
-
-    public boolean isVisible() {
-        return mIsVisible;
-    }
-
-    public boolean isGeodesic() {
-        return mIsGeodesic;
-    }
-
-    public boolean isDottedLine() {
-        return mIsDottedLine;
-    }
-
-    public boolean isGradient() {
-        return mIsGradient;
-    }
-
-    public boolean useFacade() {
-        return useFacade;
-    }
-
-
-    public float getTransparency() {
-        return mTransparency;
-    }
-
-    public boolean isAboveMaskLayer() {
-        return mIsAboveMaskLayer;
-    }
-
-    public boolean isPointsUpdated() {
-        return mIsPointsUpdated;
-    }
-
-    public float getBrightSpeed() {
-        return brightSpeed;
-    }
-
-    public boolean isBrightOn() {
-        return isBrightOn;
-    }
-
-    public int getBrightColor() {
-        return brightColor;
-    }
-
-    public List<Integer> getColorValues() {
-        return mColorValues;
-    }
-}
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/core/Level.kt b/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/core/Level.kt
new file mode 100644
index 0000000000..449fa8de46
--- /dev/null
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/core/Level.kt
@@ -0,0 +1,28 @@
+package com.mogo.map.overlay.core
+
+enum class Level(val zIndex: Int) {
+
+
+    DEFAULT(10),
+
+    /**
+     * 地图上Marker覆盖物
+     */
+    MAP_MARKER(100),
+
+    /**
+     * 车道中心线
+     */
+    ROAD_CENTER_LINE(40000),
+
+    /**
+     * 前车引导线
+     */
+    GUIDE_ROUTE_LINE(75000),
+
+
+    /**
+     * 道路围栏区域绘制
+     */
+    MAP_POLYGON(76000)
+}
\ No newline at end of file
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/line/Polyline.kt b/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/line/Polyline.kt
new file mode 100644
index 0000000000..6314740138
--- /dev/null
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/line/Polyline.kt
@@ -0,0 +1,194 @@
+package com.mogo.map.overlay.line
+
+import android.graphics.*
+import android.text.TextUtils
+import com.mogo.eagle.core.data.map.MogoLatLng
+import com.mogo.map.overlay.core.*
+import com.mogo.map.overlay.proxy.line.*
+import java.util.UUID
+
+data class Polyline(val id: String, val owner: String, val level: Level, val options: Options) {
+
+    @Volatile
+    var delegate: IMapPolylineOverlay? = null
+
+    class Options private constructor(private val builder: Builder) {
+
+        val id: String = builder.id ?: throw AssertionError("id must not be null.")
+
+        val owner: String = builder.owner
+
+        val level: Level = builder.level
+
+        val useFacade: Boolean = builder.useFacade
+
+        val maxIndex: Float = builder.maxIndex
+
+        val points: List<MogoLatLng>? = builder.points
+
+        val width = builder.width
+
+        val color: Int = builder.color
+
+        val isVisible = builder.isVisible
+
+        val isGeodesic = builder.isGeodesic
+
+        val isDottedLine = builder.isDottedLine
+
+        val dottedLineType = builder.dottedLineType
+
+        val isGradient = builder.isGradient
+
+        val alpha = builder.alpha
+
+        val isUseGps = builder.isUseGps
+
+        val colors: List<Int>? = builder.colors
+
+        val isLightOn: Boolean = builder.isLightOn
+
+        val lightColor: Int = builder.lightColor
+
+        val lightSpeed: Float = builder.lightSpeed
+
+        fun builder(): Builder {
+            return builder
+        }
+
+        class Builder(val owner: String, val level: Level) {
+
+            internal var id: String? = null
+
+            internal var useFacade: Boolean = false
+
+            internal var maxIndex: Float = Float.MIN_VALUE
+
+            internal var points: List<MogoLatLng>? = null
+
+            internal var width = 10.0f
+
+            internal var color: Int = Color.BLACK
+
+            internal var isVisible = true
+
+            internal var isGeodesic = false
+
+            internal var isDottedLine = false
+
+            internal var dottedLineType = -1
+
+            internal var isGradient = false
+
+            internal var alpha = 1.0f
+
+            internal var isUseGps = false
+
+            internal var colors: List<Int>? = null
+
+            internal var isLightOn: Boolean = false
+
+            internal var lightColor: Int = Color.WHITE
+
+            internal var lightSpeed: Float = 0f
+
+            fun setId(id: String) = apply {
+                this.id = id
+            }
+
+            fun points(points: List<MogoLatLng>) = apply {
+                this.points = points
+            }
+
+            fun colors(colors: List<Int>) = apply {
+                this.colors = colors
+            }
+
+            fun color(color: Int) = apply {
+                this.color = color
+            }
+
+            fun setVisible(visible: Boolean) = apply {
+                this.isVisible = visible
+            }
+
+            fun setWidth(width: Float) = apply {
+                this.width = width
+            }
+
+            fun setMaxIndex(maxIndex: Float) = apply {
+                this.maxIndex = maxIndex
+            }
+
+            fun useFacade(facade: Boolean) = apply {
+                this.useFacade = facade
+            }
+
+            fun setGeodesic(isGeodesic: Boolean) = apply {
+                this.isGeodesic = isGeodesic
+            }
+
+            fun setIsDottedLine(isDottedLine: Boolean) = apply {
+                this.isDottedLine = isDottedLine
+            }
+
+            fun setDottedLineType(type: Int) = apply {
+                this.dottedLineType = type
+            }
+
+            fun setIsGradient(isGradient: Boolean) = apply {
+                this.isGradient = isGradient
+            }
+
+            fun setAlpha(alpha: Float) = apply {
+                this.alpha = alpha
+            }
+
+            fun setUseGps(isUseGps: Boolean) = apply {
+                this.isUseGps = isUseGps
+            }
+
+            fun setLightOn(isLightOn: Boolean) = apply {
+                this.isLightOn = isLightOn
+            }
+
+            fun setLightColor(color: Int) = apply {
+                this.lightColor = color
+            }
+
+            fun setLightSpeed(speed: Float) = apply {
+                this.lightSpeed = speed
+            }
+
+            fun build(): Options {
+                if (TextUtils.isEmpty(id)) {
+                    id = UUID.randomUUID().toString()
+                }
+                if (TextUtils.isEmpty(id)) {
+                    throw AssertionError("id must not be null.")
+                }
+                return Options(this)
+            }
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as Polyline
+
+        if (id != other.id) return false
+        if (owner != other.owner) return false
+        if (level != other.level) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = id.hashCode()
+        result = 31 * result + owner.hashCode()
+        result = 31 * result + level.hashCode()
+        return result
+    }
+}
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/point/Point.kt b/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/point/Point.kt
new file mode 100644
index 0000000000..aef3754434
--- /dev/null
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/point/Point.kt
@@ -0,0 +1,448 @@
+package com.mogo.map.overlay.point
+
+import android.graphics.*
+import android.text.TextUtils
+import android.view.*
+import androidx.annotation.*
+import com.mogo.map.overlay.core.*
+import com.mogo.map.overlay.proxy.point.*
+import java.util.*
+
+data class Point(val id: String, val owner: String, val level: Level, val option: Options) {
+
+    @Volatile
+    var delegate: IMapPointOverlay? = null
+
+    /**
+     *
+     * 地图上绘制点相关的参数
+     */
+    class Options private constructor(private val builder: Builder){
+
+        /**
+         * 唯一标识，可以通过此标识，操作对点的显示和隐藏
+         */
+        val id: String = builder.id ?: throw AssertionError("id must not be null")
+
+        /**
+         * 当前地图覆盖物所在level(zIndex值在此存储)
+         */
+        val level: Level = builder.level
+
+        /**
+         * 当前地图覆盖物所属的业务类型
+         */
+        val owner: String = builder.owner
+
+        /**
+         * 绘制点的纬度
+         */
+        val latitude: Double = builder.latitude ?: 0.0
+
+        /**
+         * 绘制点的经度
+         */
+        val longitude: Double = builder.longitude ?: 0.0
+
+        /**
+         * 3D模型
+         */
+        @RawRes
+        val icon3DRes: Int = builder.icon3DRes
+
+        /**
+         * 自定义样式
+         */
+        val iconView: View? = builder.iconView
+
+        /**
+         * 指定覆盖物的颜色
+         */
+        val anchorColor: String? = builder.anchorColor
+
+        /**
+         * 文字标题
+         */
+        val title: String? = builder.title
+
+        /**
+         * 文字描述
+         */
+        val snippet: String? = builder.snippet
+
+        /**
+         * 图标对应的Bitmap对象
+         */
+        val icon: Bitmap? = builder.icon
+
+        /**
+         * 设置Marker覆盖物的动画帧图标列表，多张图片模拟gif的效果
+         */
+        val icons: ArrayList<Bitmap>? = builder.icons
+
+        /**
+         * 设置多少帧刷新一次图片资源，Marker动画的间隔时间，值越小动画越快
+         */
+        val period = builder.period
+
+        /**
+         * 设置Marker覆盖物的图片旋转角度，从正北开始，逆时针计算
+         */
+        val rotate = builder.rotate
+
+        /**
+         * 设置Marker覆盖物是否平贴地图
+         */
+        val isFlat = builder.isFlat
+
+        /**
+         * 设置Marker覆盖物是否可见
+         */
+        val isVisible = builder.isVisible
+
+        /**
+         * 设置Marker覆盖物的InfoWindow是否允许显示
+         */
+        val isInfoWindowEnable = builder.isInfoWindowEnable
+
+        /**
+         * 设置Marker覆盖物的透明度
+         */
+        val alpha = builder.alpha
+
+        /**
+         * 设置Marker覆盖物的透明度
+         */
+        val scale = builder.scale
+
+        /**
+         * Marker覆盖物的坐标是否是Gps
+         */
+        val isGps = builder.isGps
+
+        /**
+         * Marker覆盖物锚点在水平范围的比例
+         */
+        val u = builder.u
+
+        /**
+         * Marker覆盖物锚点垂直范围的比例
+         */
+        val v = builder.v
+
+        /**
+         * 是否是3D模型
+         */
+        val is3DMode: Boolean = builder.is3DMode
+
+        /**
+         * 是否控制角度
+         */
+        val isControlAngle = builder.isControlAngle
+
+        /**
+         * 资源名称，便于缓存重复使用，和mIcon3DRes、mIconView、icon等冲突，需要县设置
+         */
+        val resName: String? = builder.resName
+
+        /**
+         * 是否切换到当前marker所在的视角
+         */
+        val moveToCenter: Boolean = builder.moveToCenter
+        
+        fun builder(): Builder {
+            return builder
+        }
+
+        class Builder(val owner: String,val level: Level){
+
+            /**
+             * 唯一标识，可以通过此标识，操作对点的显示和隐藏
+             */
+            internal var id: String? = null
+
+            /**
+             * 绘制点的纬度
+             */
+            internal var latitude: Double? = null
+
+            /**
+             * 绘制点的经度
+             */
+            internal var longitude: Double? = null
+
+            /**
+             * 3D模型
+             */
+            @RawRes
+            internal var icon3DRes = 0
+
+
+            /**
+             * 自定义样式
+             */
+            internal var iconView: View? = null
+
+            /**
+             * 指定覆盖物的颜色
+             */
+            internal var anchorColor: String? = null
+
+            /**
+             * 文字标题
+             */
+            internal var title: String? = null
+
+            /**
+             * 文字描述
+             */
+            internal var snippet: String? = null
+
+            /**
+             * 图标对应的Bitmap对象
+             */
+            internal var icon: Bitmap? = null
+
+            /**
+             * 设置Marker覆盖物的动画帧图标列表，多张图片模拟gif的效果
+             */
+            internal var icons: ArrayList<Bitmap>? = null
+
+            /**
+             * 设置多少帧刷新一次图片资源，Marker动画的间隔时间，值越小动画越快
+             */
+            internal var period = 0
+
+            /**
+             * 设置Marker覆盖物的图片旋转角度，从正北开始，逆时针计算
+             */
+            internal var rotate = 0f
+
+            /**
+             * 设置Marker覆盖物是否平贴地图
+             */
+            internal var isFlat = false
+
+            /**
+             * 设置Marker覆盖物是否可见
+             */
+            internal var isVisible = true
+
+            /**
+             * 设置Marker覆盖物的InfoWindow是否允许显示
+             */
+            internal var isInfoWindowEnable = true
+
+            /**
+             * 设置Marker覆盖物的透明度
+             */
+            internal var alpha = 1.0f
+
+            /**
+             * 设置Marker覆盖物的透明度
+             */
+            internal var scale = 1.0f
+
+            /**
+             * Marker覆盖物的坐标是否是Gps
+             */
+            internal var isGps = false
+
+            /**
+             * Marker覆盖物锚点在水平范围的比例
+             */
+            internal var u = 0.5f
+
+            /**
+             * Marker覆盖物锚点垂直范围的比例
+             */
+            internal var v = 0.5f
+
+
+            /**
+             * 是否是3D模型
+             */
+            internal var is3DMode: Boolean = false
+
+            /**
+             * 是否控制角度
+             */
+            internal var isControlAngle = false
+
+            /**
+             * 资源名称，便于缓存重复使用，和mIcon3DRes、mIconView、icon等冲突，需要县设置
+             */
+            internal var resName: String? = null
+
+
+            /**
+             * 是否切换到当前marker所在的视角
+             */
+            internal var moveToCenter: Boolean = true
+
+            fun setId(id: String) = apply {
+                this.id = id
+            }
+
+            fun resName(resName: String?) = apply {
+                this.resName = resName
+            }
+
+            fun controlAngle(controlAngle: Boolean) = apply {
+                isControlAngle = controlAngle
+            }
+
+            fun set3DMode(is3DMode: Boolean) = apply {
+                this.is3DMode = is3DMode
+            }
+
+            fun latitude(latitude: Double) = apply {
+                this.latitude = latitude
+            }
+
+            fun longitude(longitude: Double) = apply {
+                this.longitude = longitude
+            }
+
+            /**
+             * 优先使用icon作为marker资源
+             * @param icon
+             * @return
+             */
+            fun icon(icon: Bitmap?) = apply {
+                this.icon = icon
+            }
+
+            /**
+             * 帧动画对应的图片序列
+             */
+            fun icons(icons: ArrayList<Bitmap>?) = apply {
+                this.icons = icons
+            }
+
+            /**
+             * 帧动画执行完成一次需要的时长，时间越短，帧动画越快
+             */
+            fun period(period: Int) = apply {
+                this.period = period
+                if (this.period < 1) {
+                    this.period = 1
+                }
+            }
+
+            /**
+             * marker对应的资源的，旋转角度，正北方为0度，逆时针计算
+             */
+            fun rotate(rotate: Float) = apply {
+                this.rotate = rotate
+            }
+
+            /**
+             * 是否平铺在地图上
+             */
+            fun flat(flat: Boolean) = apply {
+                isFlat = flat
+            }
+
+            /**
+             * 是否可见
+             */
+            fun visible(visible: Boolean) = apply {
+                isVisible = visible
+            }
+
+            /**
+             * 设置地图覆盖物的透明度
+             */
+            fun alpha(alpha: Float) = apply {
+                this.alpha = alpha
+            }
+
+            /**
+             * 设置地图覆盖物的缩放比例
+             */
+            fun scale(scale: Float) = apply {
+                this.scale = scale
+            }
+
+            /**
+             * 设置是否使用GPS坐标
+             */
+            fun isUseGps(gps: Boolean) = apply {
+                this.isGps = gps
+            }
+
+            /**
+             * 设置地图覆盖物锚点在水平和垂直方向的比例
+             */
+            fun anchor(u: Float, v: Float) = apply {
+                this.u = u
+                this.v = v
+            }
+
+            /**
+             * 自定义marker图层样式，优先使用 icon [.icon]作为marker资源
+             *
+             * @param iconView
+             * @return
+             */
+            fun icon(iconView: View?) = apply {
+                this.iconView = iconView
+            }
+
+            /**
+             * 3D模型对应的资源
+             */
+            fun icon3DRes(@RawRes icon3DRes: Int) = apply {
+                this.icon3DRes = icon3DRes
+            }
+
+            /**
+             * 设置地图覆盖物的颜色
+             */
+            fun anchorColor(anchorColor: String?) = apply {
+                this.anchorColor = anchorColor
+            }
+
+            /**
+             * 是否切换到当前marker所在的视角
+             */
+            fun moveToCenter(flag: Boolean) = apply {
+                this.moveToCenter = flag
+            }
+
+            /**
+             * 构建Options对象
+             */
+            fun build(): Options {
+                if (TextUtils.isEmpty(id)) {
+                    id = UUID.randomUUID().toString()
+                }
+                if (TextUtils.isEmpty(id)) {
+                    throw AssertionError("id must not be null.")
+                }
+                return Options(this)
+            }
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as Point
+
+        if (id != other.id) return false
+        if (owner != other.owner) return false
+        if (level != other.level) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = id.hashCode()
+        result = 31 * result + owner.hashCode()
+        result = 31 * result + level.hashCode()
+        return result
+    }
+}
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/proxy/IMapOverlay.kt b/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/proxy/IMapOverlay.kt
new file mode 100644
index 0000000000..b8c1c7df0d
--- /dev/null
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/proxy/IMapOverlay.kt
@@ -0,0 +1,46 @@
+package com.mogo.map.overlay.proxy
+
+
+interface IMapOverlay {
+
+    /**
+     * 删除当前marker并销毁Marker的图片等资源
+     */
+    fun destroy()
+
+    /**
+     * 删除当前marker。
+     */
+    fun remove()
+
+    /**
+     * 设置 Marker 覆盖物的可见属性。
+     *
+     * @param visible
+     */
+    fun setVisible(visible: Boolean)
+
+    /**
+     * 是否已销毁
+     */
+    fun isDestroyed(): Boolean
+
+    /**
+     * 是否可见
+     */
+    fun isVisible(): Boolean
+
+
+    /**
+     * 设置当前marker在最上面。
+     */
+    fun setToTop()
+
+    /**
+     * 取消当前marker在最上面
+     */
+    fun setUnTop()
+
+
+    fun onRemove(action: (id: String) -> Unit)
+}
\ No newline at end of file
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/proxy/line/IMapPolylineOverlay.kt b/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/proxy/line/IMapPolylineOverlay.kt
new file mode 100644
index 0000000000..fab2441c5a
--- /dev/null
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/proxy/line/IMapPolylineOverlay.kt
@@ -0,0 +1,9 @@
+package com.mogo.map.overlay.proxy.line
+
+import com.mogo.map.overlay.line.*
+import com.mogo.map.overlay.proxy.*
+
+interface IMapPolylineOverlay: IMapOverlay {
+
+    fun setOptions(options: Polyline.Options)
+}
\ No newline at end of file
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/proxy/point/IMapPointOverlay.kt b/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/proxy/point/IMapPointOverlay.kt
new file mode 100644
index 0000000000..da9d814ba9
--- /dev/null
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/proxy/point/IMapPointOverlay.kt
@@ -0,0 +1,18 @@
+package com.mogo.map.overlay.proxy.point
+
+import com.mogo.eagle.core.data.map.MogoLatLng
+import com.mogo.map.overlay.point.Point.Options
+import com.mogo.map.overlay.proxy.*
+
+interface IMapPointOverlay: IMapOverlay {
+
+    /**
+     * 设置Marker覆盖物的属性选项类 通过markerOption 给marker设置属性
+     *
+     * @param opt
+     */
+    fun setOptions(opt: Options)
+
+
+    fun addDynamicAnchorPosition(point: MogoLatLng, angle: Float, duration: Long)
+}
\ No newline at end of file
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapMarkerClickHandler.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapMarkerClickHandler.java
deleted file mode 100644
index 6f54a88028..0000000000
--- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapMarkerClickHandler.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.mogo.map;
-
-import static com.mogo.map.marker.MarkerType.MAP_STATIC;
-
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
-import com.mogo.map.marker.AMapMarkerWrapper;
-import com.mogo.map.marker.IMogoMarker;
-import com.mogo.map.marker.IMogoMarkerClickListener;
-import com.mogo.map.marker.MarkerWrapperClickHelper;
-import com.mogo.map.marker.MogoMarkerOptions;
-import com.mogo.map.marker.MogoMarkersHandler;
-import com.zhidaoauto.map.sdk.open.marker.Marker;
-
-import java.util.Map;
-
-/**
- * @author congtaowang
- * @since 2019-12-24
- * <p>
- * marker 点击事件处理
- */
-public class AMapMarkerClickHandler {
-
-    private static volatile AMapMarkerClickHandler sInstance;
-
-    private AMapMarkerClickHandler() {
-    }
-
-    public static AMapMarkerClickHandler getInstance() {
-        if (sInstance == null) {
-            synchronized (AMapMarkerClickHandler.class) {
-                if (sInstance == null) {
-                    sInstance = new AMapMarkerClickHandler();
-                }
-            }
-        }
-        return sInstance;
-    }
-
-    public synchronized void release() {
-        sInstance = null;
-    }
-
-    private Object readResolve() {
-        // 阻止反序列化，必须实现 Serializable 接口
-        return sInstance;
-    }
-
-    public boolean handleMarkerClicked(Marker marker) {
-        if (marker == null) {
-            return false;
-        }
-        //地图道路上静态数，暂时只过滤traffic类型下发点击事件
-        if (MarkerWrapperClickHelper.getInstance().isStaticMarker(marker.getId())){
-            IMogoMarker iMogoMarker = new AMapMarkerWrapper(marker,new MogoMarkerOptions());
-            iMogoMarker.setOwner(MAP_STATIC);  //TODO 后续可能由于类型比较多，需要owner匹配机制,以及控制owner细粒度
-            CallerLogger.INSTANCE.d("AMapMarkerWrapper", "traffic marker 点击回调");
-            return MogoMarkersHandler.Companion.getMogoMarkersHandler().onStaticMarkerClicked(iMogoMarker);
-        }
-
-        Map<String, IMogoMarker> mogoMarkerMap = MarkerWrapperClickHelper.getInstance().getMogoMarkerMap();
-        if (mogoMarkerMap.containsKey(marker.getId())) {
-            IMogoMarker mogoMarker = mogoMarkerMap.get(marker.getId());
-            final IMogoMarkerClickListener listener = mogoMarker.getOnMarkerClickListener();
-            CallerLogger.INSTANCE.d("AMapMarkerWrapper", "marker 点击回调：%s -> %s", mogoMarker, marker);
-            if (listener != null) {
-                boolean result = listener.onMarkerClicked(mogoMarker);
-                if (result) {
-                    return true;
-                }
-            }
-            return MogoMarkersHandler.Companion.getMogoMarkersHandler().onMarkerClicked(mogoMarker);
-        }
-        return false;
-    }
-
-}
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java
index f4276d4c34..bd73571d31 100644
--- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java
@@ -46,6 +46,7 @@ import com.mogo.eagle.core.utilcode.mogo.toast.TipToast;
 import com.mogo.eagle.core.utilcode.util.ThreadUtils;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
 import com.mogo.map.hdcache.IHdCacheListener;
+import com.mogo.map.identify.MogoIdentifyManager;
 import com.mogo.map.listener.MogoMapListenerHandler;
 import com.mogo.map.location.GDLocationClient;
 import com.mogo.map.uicontroller.CarCursorOption;
@@ -112,8 +113,6 @@ public class AMapViewWrapper implements IMogoMapView,
     private static final String TAG = "AMapViewWrapper";
     private final MapAutoView mMapView;
     private final IMogoMap mIMap;
-    private AMapMarkerClickHandler mMarkerClickHandler;
-
     private final CarCursorOption DEFAULT_OPTION = new CarCursorOption.Builder()
             .carCursorRes(R.drawable.map_api_ic_current_location2)
             .naviCursorRes(R.drawable.ic_amap_navi_cursor)
@@ -187,7 +186,6 @@ public class AMapViewWrapper implements IMogoMapView,
 
     private void initListeners() {
         mMapView.setOnMarkClickListener(this);
-        mMarkerClickHandler = AMapMarkerClickHandler.getInstance();
         mMapView.setOnMapLoadedListener(this);
         mMapView.setOnMapTouchListener(this);
         mMapView.setOnMapClickListener(this);
@@ -768,7 +766,7 @@ public class AMapViewWrapper implements IMogoMapView,
 
     @Override
     public void onMarkClick(@NotNull Marker markerInfo) {
-        mMarkerClickHandler.handleMarkerClicked(markerInfo);
+//        mMarkerClickHandler.handleMarkerClicked(markerInfo);
     }
 
     @Override
@@ -958,12 +956,12 @@ public class AMapViewWrapper implements IMogoMapView,
         if (isDayMode()) {
             preVehicleStrWeiZhi =
                     // 添加模型到地图中
-                    MogoMarkerManager.getInstance(getContext())
+                    MogoIdentifyManager.getInstance(getContext())
                             .addPreVehicleModel(typeTrafficId.getType(), typeTrafficId.getTraffic3DIconId());
         } else {
             preVehicleStrWeiZhi =
                     // 添加模型到地图中
-                    MogoMarkerManager.getInstance(getContext())
+                    MogoIdentifyManager.getInstance(getContext())
                             .addPreVehicleModel(typeTrafficId.getType(), typeTrafficId.getTraffic3DNightIconId());
         }
 
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java
index 6924f0926f..997ba4625d 100644
--- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java
@@ -1,26 +1,18 @@
 package com.mogo.map;
 
 import android.annotation.SuppressLint;
-import android.content.Context;
 import android.graphics.Point;
 import android.util.Pair;
-
 import com.mogo.eagle.core.data.config.FunctionBuildConfig;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.map.center.CenterLine;
-import com.mogo.map.marker.AMapInfoWindowAdapter;
-import com.mogo.map.marker.AMapMarkerWrapper;
-import com.mogo.map.marker.IMogoMarker;
-import com.mogo.map.marker.MogoMarkerOptions;
-import com.mogo.map.marker.MogoMarkersHandler;
-import com.mogo.map.overlay.AMapPolylineWrapper;
-import com.mogo.map.overlay.IMogoPolyline;
-import com.mogo.map.overlay.MogoPolylineOptions;
+import com.mogo.map.overlay.proxy.line.IMapPolylineOverlay;
+import com.mogo.map.overlay.proxy.point.IMapPointOverlay;
+import com.mogo.map.overlay.wrapper.point.AMapPointWrapper;
 import com.mogo.map.road.RoadNameInfo;
 import com.mogo.map.uicontroller.AMapUIController;
 import com.mogo.map.uicontroller.IMogoMapUIController;
 import com.mogo.map.utils.ObjectUtils;
-import com.zhidaoauto.map.sdk.open.MapAutoApi;
 import com.zhidaoauto.map.sdk.open.data.MapDataApi;
 import com.zhidaoauto.map.sdk.open.data.SinglePointRoadInfo;
 import com.zhidaoauto.map.sdk.open.marker.BatchMarkerOptions;
@@ -28,7 +20,6 @@ import com.zhidaoauto.map.sdk.open.marker.Marker;
 import com.zhidaoauto.map.sdk.open.marker.MarkerHelper;
 import com.zhidaoauto.map.sdk.open.marker.MarkerOptions;
 import com.zhidaoauto.map.sdk.open.marker.MarkerSimpleData;
-import com.zhidaoauto.map.sdk.open.marker.MultiPointOverlayOptions;
 import com.zhidaoauto.map.sdk.open.poyline.Polyline;
 import com.zhidaoauto.map.sdk.open.poyline.PolylineOptions;
 import com.zhidaoauto.map.sdk.open.query.LonLatPoint;
@@ -55,9 +46,9 @@ public class AMapWrapper implements IMogoMap {
     private static final String TAG = "AMapWrapper";
 
     private static MapAutoViewHelper sAMap;
-    private IMogoMapUIController mMapUIController;
+    private final IMogoMapUIController mMapUIController;
     private MapAutoViewHelper mAMap;
-    private MapAutoView mMapView;
+    private final MapAutoView mMapView;
     private IMogoUiSettings mUiSettings;
 
     public AMapWrapper(MapAutoViewHelper map, MapAutoView mapView, IMogoMapUIController controller) {
@@ -67,7 +58,7 @@ public class AMapWrapper implements IMogoMap {
         this.mMapView = mapView;
         mMapUIController = controller;
         // 设置实现自定义 info window
-        MapAutoApi.INSTANCE.setInfoWindowAdapter(new AMapInfoWindowAdapter());
+//        MapAutoApi.INSTANCE.setInfoWindowAdapter(new AMapInfoWindowAdapter());
         AMapUIController.getInstance().initClient(mMapUIController);
     }
 
@@ -92,7 +83,7 @@ public class AMapWrapper implements IMogoMap {
     }
 
     @Override
-    public IMogoMarker addMarker(String tag, MogoMarkerOptions options) {
+    public IMapPointOverlay addPoint(com.mogo.map.overlay.point.Point.Options options) {
         if (!checkAMap()) {
             return null;
         }
@@ -101,18 +92,28 @@ public class AMapWrapper implements IMogoMap {
             CallerLogger.INSTANCE.e(TAG, "marker参数为空");
             return null;
         }
-        final IMogoMarker mogoMarker = new AMapMarkerWrapper(mAMap.addMarker(markerOptions), options);
-        if (options.isAutoManager()) {
-            MogoMarkersHandler.Companion.getMogoMarkersHandler().add(tag, mogoMarker);
+        Marker delegate = mAMap.addMarker(markerOptions);
+        if (delegate == null) {
+            return null;
         }
-        return mogoMarker;
+        return new AMapPointWrapper(options.getId(), delegate);
     }
 
     @Override
-    public void clearAllMarkers() {
-        if (sAMap != null) {
-            sAMap.clearAllMarkers();
+    public IMapPolylineOverlay addLine(com.mogo.map.overlay.line.Polyline.Options options) {
+        if (!checkAMap()) {
+            return null;
         }
+        PolylineOptions polylineOptions = ObjectUtils.fromMogo(options);
+        if (polylineOptions == null) {
+            CallerLogger.INSTANCE.e(TAG, "polyline参数为空");
+            return null;
+        }
+        Polyline delegate = polylineOptions.lineWidth > 0 ? mAMap.drawThickLine(polylineOptions) : mAMap.drawLine(polylineOptions);
+        if (delegate == null) {
+            return null;
+        }
+        return new com.mogo.map.overlay.wrapper.line.AMapPolylineWrapper(options.getId(), delegate);
     }
 
     BatchMarkerOptions batchMarkerOptions = new BatchMarkerOptions();
@@ -197,53 +198,6 @@ public class AMapWrapper implements IMogoMap {
         }
     }
 
-    @Override
-    public ArrayList<IMogoMarker> addMarkers(String tag, ArrayList<MogoMarkerOptions> options, boolean moveToCenter) {
-        if (!checkAMap()) {
-            return null;
-        }
-
-        if (options == null || options.isEmpty()) {
-            return null;
-        }
-
-        ArrayList<Marker> markers = new ArrayList<>();
-        ArrayList<MarkerOptions> markerOptions = new ArrayList<>();
-        ArrayList<IMogoMarker> mogoMarkers = new ArrayList<>();
-        for (MogoMarkerOptions option : options) {
-            if (option == null) {
-                continue;
-            }
-            MarkerOptions mo = ObjectUtils.fromMogo(option);
-            if (mo == null) {
-                continue;
-            }
-            markerOptions.add(mo);
-        }
-        if (markerOptions.isEmpty()) {
-            return null;
-        }
-        MultiPointOverlayOptions multiPointOverlayOptions = new MultiPointOverlayOptions();
-        multiPointOverlayOptions.setData(markerOptions);
-        multiPointOverlayOptions.setMarkerIcon(R.drawable.marker_blue);
-        List<MarkerOptions> data = mAMap.addMarkers(multiPointOverlayOptions).getOptions().getData();
-        for (int i = 0; i < data.size(); i++) {
-            markers.add(new Marker(data.get(i)));
-        }
-        if (markers == null || markers.isEmpty()) {
-            return null;
-        }
-        for (int i = 0; i < markers.size(); i++) {
-            Marker marker = markers.get(i);
-            if (marker == null) {
-                continue;
-            }
-            mogoMarkers.add(new AMapMarkerWrapper(marker, options.get(i)));
-        }
-        MogoMarkersHandler.Companion.getMogoMarkersHandler().add(tag, mogoMarkers);
-        return mogoMarkers;
-    }
-
     @Override
     public void clear() {
         if (checkAMap()) {
@@ -287,32 +241,13 @@ public class AMapWrapper implements IMogoMap {
         if (checkAMap()) {
             try {
                 return mAMap.getZoom();
-            } catch (Exception e) {
+            } catch (Exception ignored) {
 
             }
         }
         return 0;
     }
 
-    @Override
-    public IMogoPolyline addPolyline(MogoPolylineOptions options) {
-        if (checkAMap()) {
-            PolylineOptions polylineOptions = ObjectUtils.fromMogo(options);
-            CallerLogger.INSTANCE.d(TAG, "addPolyline %s", polylineOptions.toString());
-            if (polylineOptions == null) {
-                return null;
-            }
-            Polyline polyline = null;
-            if (polylineOptions.getLineWidth() > 0) {
-                polyline = mAMap.drawThickLine(polylineOptions);
-            } else {
-                polyline = mAMap.drawLine(polylineOptions);
-            }
-            return new AMapPolylineWrapper(polyline, options);
-        }
-        return null;
-    }
-
     private boolean checkAMap() {
         mAMap = mMapView.getMapAutoViewHelper();
         sAMap = mAMap;
@@ -365,8 +300,4 @@ public class AMapWrapper implements IMogoMap {
         }
         return ret;
     }
-
-    private Context getContext() {
-        return mMapView.getContext();
-    }
 }
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MoGoOverlayManager.kt b/libraries/mogo-map/src/main/java/com/mogo/map/MoGoOverlayManager.kt
new file mode 100644
index 0000000000..386c478cf9
--- /dev/null
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/MoGoOverlayManager.kt
@@ -0,0 +1,10 @@
+package com.mogo.map
+
+import com.mogo.map.overlay.*
+
+object MoGoOverlayManager {
+
+    private val impl by lazy { MoGoOverlayManagerImpl() }
+
+    fun overlay(): IMoGoOverlayManager = impl
+}
\ No newline at end of file
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMarkerManager.java b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMarkerManager.java
deleted file mode 100644
index db9333517e..0000000000
--- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMarkerManager.java
+++ /dev/null
@@ -1,172 +0,0 @@
-package com.mogo.map;
-
-import android.content.Context;
-
-import com.mogo.eagle.core.data.map.MogoLatLng;
-import com.mogo.eagle.core.function.call.v2x.CallMarkersClearManager;
-import com.mogo.map.marker.IMogoMarker;
-import com.mogo.map.marker.IMogoMarkerManager;
-import com.mogo.map.marker.MogoMarkerOptions;
-import com.mogo.map.marker.MogoMarkersHandler;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import mogo.telematics.pad.MessagePad;
-import mogo.yycp.api.proto.SocketDownData;
-
-/**
- * @author congtaowang
- * @since 2019-12-20
- * <p>
- * marker 管理实现
- */
-public class MogoMarkerManager implements IMogoMarkerManager {
-
-    private static final String TAG = "MogoMarkerManager";
-
-    private static volatile MogoMarkerManager sInstance;
-    private Context mApplicationContext;
-
-    private MogoMarkerManager(Context context) {
-        if (context != null) {
-            mApplicationContext = context.getApplicationContext();
-        }
-    }
-
-    public static MogoMarkerManager getInstance(Context context) {
-        if (sInstance == null) {
-            synchronized (MogoMarkerManager.class) {
-                if (sInstance == null) {
-                    sInstance = new MogoMarkerManager(context);
-                }
-            }
-        }
-        return sInstance;
-    }
-
-    public synchronized void release() {
-        sInstance = null;
-    }
-
-    @Override
-    public IMogoMarker addMarker(String tag, MogoMarkerOptions options) {
-        try {
-            return MogoMap.getInstance().getMogoMap().addMarker(tag, options);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    @Override
-    public List<IMogoMarker> addMarkers(String tag, ArrayList<MogoMarkerOptions> options, boolean moveToCenter) {
-        try {
-            return MogoMap.getInstance().getMogoMap().addMarkers(tag, options, moveToCenter);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    @Override
-    public void clearAllMarker() {
-        try{
-            MogoMap.getInstance().getMogoMap().clearAllMarkers();
-        }catch (Exception e){
-            e.printStackTrace();
-        }
-    }
-
-    @Override
-    public void updateBatchMarkerPosition(HashMap<String, MessagePad.TrackedObject> optionsArrayList) {
-        try {
-            MogoMap.getInstance().getMogoMap().updateBatchMarkerPosition(optionsArrayList);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Override
-    public void updateBatchAiMarkerPosition(HashMap<String, SocketDownData.CloudRoadDataProto> optionsArrayList) {
-        try {
-            MogoMap.getInstance().getMogoMap().updateBatchAiMarkerPosition(optionsArrayList);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Override
-    public String addPreVehicleModel(int type, int modelRes) {
-        try {
-            return MogoMap.getInstance().getMogoMap().addPreVehicleModel(type, modelRes);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    @Override
-    public void removeMarker(String uuidString) {
-        try {
-            MogoMap.getInstance().getMogoMap().removeMarker(uuidString);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-
-    @Override
-    public void removeMarkers(String tag) {
-        CallMarkersClearManager.INSTANCE.invokeClearAllMarkersOfTag(tag);
-        MogoMarkersHandler.Companion.getMogoMarkersHandler().remove(tag);
-    }
-
-    @Override
-    public void removeMarkers() {
-        CallMarkersClearManager.INSTANCE.invokeClearAllMarkers();
-        MogoMarkersHandler.Companion.getMogoMarkersHandler().removeAll();
-    }
-
-    @Override
-    public void visibleAllMarkers() {
-        MogoMarkersHandler.Companion.getMogoMarkersHandler().visibleAll();
-    }
-
-    @Override
-    public void inVisibleAllMarkers() {
-        CallMarkersClearManager.INSTANCE.invokeClearAllMarkers();
-        MogoMarkersHandler.Companion.getMogoMarkersHandler().inVisibleAll();
-    }
-
-    @Override
-    public void inVisibleWithoutMarkers(String... owner) {
-        MogoMarkersHandler.Companion.getMogoMarkersHandler().inVisibleMarkers(owner);
-    }
-
-    @Override
-    public List<IMogoMarker> getMarkers(String tag) {
-        return MogoMarkersHandler.Companion.getMogoMarkersHandler().getMarkers(tag);
-    }
-
-    @Override
-    public Map<String, List<IMogoMarker>> getAllMarkers() {
-        return MogoMarkersHandler.Companion.getMogoMarkersHandler().getAllMarkers();
-    }
-
-    @Override
-    public void removeMarkersExcept(String tag) {
-        MogoMarkersHandler.Companion.getMogoMarkersHandler().deleteAllExcept(tag);
-    }
-
-    @Override
-    public void addRouteWay(Context context, MogoLatLng startPoint, MogoLatLng endPoint, List<MogoLatLng> wayPoints) {
-    }
-
-    @Override
-    public void removeRouteWayOverlay() {
-    }
-
-}
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MogoOverlayManager.java b/libraries/mogo-map/src/main/java/com/mogo/map/MogoOverlayManager.java
deleted file mode 100644
index 1a816645b0..0000000000
--- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoOverlayManager.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.mogo.map;
-
-import com.mogo.map.overlay.IMogoOverlayManager;
-import com.mogo.map.overlay.IMogoPolyline;
-import com.mogo.map.overlay.MogoPolylineOptions;
-
-/**
- * @author congtaowang
- * @since 2020-03-10
- * <p>
- * 描述
- */
-public class MogoOverlayManager implements IMogoOverlayManager {
-
-    private MogoOverlayManager() {
-        // private constructor
-    }
-
-    private static final class InstanceHolder {
-        private static final MogoOverlayManager INSTANCE = new MogoOverlayManager();
-    }
-
-    public static MogoOverlayManager getInstance() {
-        return InstanceHolder.INSTANCE;
-    }
-
-    private Object readResolve() {
-        // 阻止反序列化，必须实现 Serializable 接口
-        return InstanceHolder.INSTANCE;
-    }
-
-    @Override
-    public IMogoPolyline addPolyline(MogoPolylineOptions options) {
-        try {
-            return MogoMap.getInstance().getMogoMap().addPolyline(options);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-}
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/identify/MogoIdentifyManager.java b/libraries/mogo-map/src/main/java/com/mogo/map/identify/MogoIdentifyManager.java
new file mode 100644
index 0000000000..02fd1c214b
--- /dev/null
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/identify/MogoIdentifyManager.java
@@ -0,0 +1,75 @@
+package com.mogo.map.identify;
+
+import android.content.Context;
+
+import com.mogo.map.MogoMap;
+import com.mogo.map.identity.IMogoIdentifyManager;
+import java.util.HashMap;
+import mogo.telematics.pad.MessagePad;
+import mogo.yycp.api.proto.SocketDownData;
+
+/**
+ * @author congtaowang
+ * @since 2019-12-20
+ * <p>
+ * marker 管理实现
+ */
+public class MogoIdentifyManager implements IMogoIdentifyManager {
+
+    private static final String TAG = "MogoIdentifyManager";
+
+    private static volatile MogoIdentifyManager sInstance;
+
+    private MogoIdentifyManager(Context context) {}
+
+    public static MogoIdentifyManager getInstance(Context context) {
+        if (sInstance == null) {
+            synchronized (MogoIdentifyManager.class) {
+                if (sInstance == null) {
+                    sInstance = new MogoIdentifyManager(context);
+                }
+            }
+        }
+        return sInstance;
+    }
+
+    @Override
+    public void removeMarker(String uuidString) {
+        try {
+            MogoMap.getInstance().getMogoMap().removeMarker(uuidString);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+    public synchronized void release() {
+        sInstance = null;
+    }
+
+    @Override
+    public void updateBatchMarkerPosition(HashMap<String, MessagePad.TrackedObject> optionsArrayList) {
+        try {
+            MogoMap.getInstance().getMogoMap().updateBatchMarkerPosition(optionsArrayList);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void updateBatchAiMarkerPosition(HashMap<String, SocketDownData.CloudRoadDataProto> optionsArrayList) {
+        try {
+            MogoMap.getInstance().getMogoMap().updateBatchAiMarkerPosition(optionsArrayList);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public String addPreVehicleModel(int type, int modelRes) {
+        try {
+            return MogoMap.getInstance().getMogoMap().addPreVehicleModel(type, modelRes);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+}
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/marker/AMapInfoWindowAdapter.java b/libraries/mogo-map/src/main/java/com/mogo/map/marker/AMapInfoWindowAdapter.java
deleted file mode 100644
index d327fa1218..0000000000
--- a/libraries/mogo-map/src/main/java/com/mogo/map/marker/AMapInfoWindowAdapter.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.mogo.map.marker;
-
-import android.view.View;
-
-import com.mogo.map.AMapMarkerClickHandler;
-import com.zhidaoauto.map.sdk.open.abs.marker.InfoWindowAdapter;
-import com.zhidaoauto.map.sdk.open.marker.Marker;
-import com.zhidaoauto.map.sdk.open.marker.OnInfoWindowClickListener;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * @author congtaowang
- * @since 2019-12-24
- * <p>
- * 自定义infowindow
- */
-public final class AMapInfoWindowAdapter implements InfoWindowAdapter, OnInfoWindowClickListener {
-
-    @Override
-    public View getInfoWindow(Marker marker ) {
-        if ( marker.getMObject() instanceof IMogoMarker ) {
-            IMogoMarker mogoMarker = ( ( IMogoMarker ) marker.getMObject() );
-            IMogoInfoWindowAdapter delegate = mogoMarker.getInfoWindowAdapter();
-            if ( delegate != null ) {
-                final View infoView = delegate.getInfoWindow( mogoMarker );
-                marker.setOnInfoWindowClickListener( this );
-                return infoView;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public void onInfoWindowClick( @NotNull Marker marker ) {
-        AMapMarkerClickHandler.getInstance().handleMarkerClicked( marker );
-    }
-
-    @Nullable
-    @Override
-    public View getInfoContents( @Nullable Marker marker ) {
-        return null;
-    }
-}
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/marker/AMapMarkerWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/marker/AMapMarkerWrapper.java
deleted file mode 100644
index f011befb30..0000000000
--- a/libraries/mogo-map/src/main/java/com/mogo/map/marker/AMapMarkerWrapper.java
+++ /dev/null
@@ -1,338 +0,0 @@
-package com.mogo.map.marker;
-
-import android.graphics.Bitmap;
-import android.text.TextUtils;
-import android.view.animation.Interpolator;
-
-import com.mogo.eagle.core.data.map.MogoLatLng;
-import com.mogo.map.marker.anim.OnMarkerAnimationListener;
-import com.mogo.map.utils.ObjectUtils;
-import com.zhidaoauto.map.sdk.open.abs.marker.MarkerAnimationListener;
-import com.zhidaoauto.map.sdk.open.marker.Animation;
-import com.zhidaoauto.map.sdk.open.marker.BitmapDescriptor;
-import com.zhidaoauto.map.sdk.open.marker.BitmapDescriptorFactory;
-import com.zhidaoauto.map.sdk.open.marker.Marker;
-import com.zhidaoauto.map.sdk.open.marker.MarkerOptions;
-import com.zhidaoauto.map.sdk.open.marker.MarkerScaleAnimation;
-import com.zhidaoauto.map.sdk.open.query.LonLatPoint;
-
-import org.jetbrains.annotations.NotNull;
-
-import java.util.ArrayList;
-import java.util.Observable;
-import java.util.Observer;
-
-/**
- * @author congtaowang
- * @since 2019-12-18
- * <p>
- * 自研marker
- */
-public class AMapMarkerWrapper implements IMogoMarker, Observer {
-
-    private final String TAG = AMapMarkerWrapper.class.getName();
-
-    private Marker mMarker;
-    private Object mObject;
-    private IMogoMarkerClickListener mMogoMarkerClickListener;
-    private IMogoInfoWindowAdapter mMogoInfoWindowAdapter;
-
-    private boolean mIsDestroy = false;
-
-    private MogoMarkerOptions mMogoMarkerOptions;
-    private String mOwner;
-
-    public AMapMarkerWrapper( Marker marker, MogoMarkerOptions mogoMarkerOptions ) {
-        this.mMarker = marker;
-        if ( marker != null ) {
-            // 设置自研 marker 的object对象为 IMogoMarker 实例。！！！！
-            marker.setMObject( this );
-            if ( !TextUtils.isEmpty( mogoMarkerOptions.getAnchorColor() ) ) {
-                marker.setAnchorColor( mogoMarkerOptions.getAnchorColor() );
-            }
-            MarkerWrapperClickHelper.getInstance().setMogoMarkerMap( marker.getId(), this );
-        }
-        setObject( mogoMarkerOptions.getObject() );
-        this.mMogoMarkerOptions = mogoMarkerOptions;
-        mMogoMarkerOptions.addObserver( this );
-    }
-
-    @Override
-    public void update( Observable o, Object arg ) {
-        if ( isDestroyed() ) {
-            return;
-        }
-        setMarkerOptions( mMogoMarkerOptions );
-    }
-
-    @Override
-    public void destroy() {
-        synchronized (this) {
-            if ( mMogoMarkerOptions != null ) {
-                mMogoMarkerOptions.deleteObservers();
-                mMogoMarkerOptions = null;
-            }
-            if ( mMarker != null ) {
-                mMarker.remove();
-                mMarker.setMObject( null );
-                mMarker.setOnInfoWindowClickListener( null );
-                mMarker = null;
-            }
-        }
-        mMogoInfoWindowAdapter = null;
-        mMogoMarkerClickListener = null;
-        mObject = null;
-        mIsDestroy = true;
-    }
-
-    @Override
-    public void remove() {
-        destroy();
-    }
-
-
-    @Override
-    public void setAlpha( float alpha ) {
-        if ( mMarker != null ) {
-            mMarker.setAlpha( alpha );
-        }
-    }
-
-    @Override
-    public void setIcon( Bitmap icon ) {
-        if ( icon == null || icon.isRecycled() ) {
-            return;
-        }
-        if ( mMarker != null ) {
-            mMarker.setIcon( icon );
-        }
-    }
-
-    @Override
-    public void setIcons( ArrayList< Bitmap > icons ) {
-        if ( icons == null || icons.isEmpty() ) {
-            return;
-        }
-        ArrayList< BitmapDescriptor > descriptors = new ArrayList<>();
-        for ( Bitmap icon : icons ) {
-            if ( icon == null || icon.isRecycled() ) {
-                continue;
-            }
-            descriptors.add( BitmapDescriptorFactory.INSTANCE.fromBitmap( icon ) );
-        }
-        if ( descriptors.isEmpty() ) {
-            return;
-        }
-        if ( mMarker != null ) {
-            mMarker.setIcons( descriptors );
-        }
-    }
-
-    @Override
-    public void setMarkerOptions( MogoMarkerOptions opt ) {
-
-        final MarkerOptions options = ObjectUtils.fromMogo( opt );
-        if ( options == null ) {
-            return;
-        }
-        if ( mMarker != null ) {
-            mMarker.setMarkerOptions( options );
-            setObject( opt.getObject() );
-        }
-    }
-
-    @Override
-    public void setObject( Object object ) {
-        mObject = object;
-    }
-
-    @Override
-    public Object getObject() {
-        return mObject;
-    }
-
-
-    @Override
-    public void setPosition( double lat, double lng ) {
-        if ( mMarker != null ) {
-            mMarker.setPosition( new LonLatPoint( lng, lat ) );
-        }
-    }
-
-    @Override
-    public MogoLatLng getPosition() {
-        if ( mMarker != null ) {
-            final LonLatPoint latLng = mMarker.getPosition();
-            return ObjectUtils.fromAMap( latLng );
-        }
-        return null;
-    }
-
-    @Override
-    public void setRotateAngle( float rotate ) {
-        if ( mMarker != null ) {
-            mMarker.setRotateAngle( rotate );
-        }
-    }
-
-    @Override
-    public void setTitle( String title ) {
-        if ( mMarker != null ) {
-            mMarker.setTitle( title );
-        }
-    }
-
-    @Override
-    public void setToTop() {
-        if ( mMarker != null ) {
-            mMarker.setToTop();
-        }
-    }
-
-    @Override
-    public void setVisible( boolean visible ) {
-        if ( mMarker != null ) {
-            mMarker.setVisible( visible );
-        }
-    }
-
-
-    @Override
-    public void setOnMarkerClickListener( IMogoMarkerClickListener listener ) {
-        mMogoMarkerClickListener = listener;
-    }
-
-    @Override
-    public IMogoMarkerClickListener getOnMarkerClickListener() {
-        return mMogoMarkerClickListener;
-    }
-
-    @Override
-    public IMogoInfoWindowAdapter getInfoWindowAdapter() {
-        return mMogoInfoWindowAdapter;
-    }
-
-    @Override
-    public boolean isDestroyed() {
-        return mIsDestroy;
-    }
-
-    @Override
-    public void setOwner( String mOwner ) {
-        this.mOwner = mOwner;
-    }
-
-    @Override
-    public String getOwner() {
-        if ( mOwner != null ) {
-            return mOwner;
-        }
-        if ( mMogoMarkerOptions != null ) {
-            return mMogoMarkerOptions.getOwner();
-        }
-        return null;
-    }
-
-    public Marker getMarker() {
-        return mMarker;
-    }
-
-    @Override
-    public MogoMarkerOptions getMogoMarkerOptions() {
-        return mMogoMarkerOptions;
-    }
-
-
-    @Override
-    public void startScaleAnimation(float fromX, float toX, float fromY, float toY, int duration, Interpolator interpolator, final OnMarkerAnimationListener listener ) {
-        if ( isDestroyed() ) {
-            return;
-        }
-
-        MarkerScaleAnimation animationScale = new MarkerScaleAnimation( fromX, toX );
-        animationScale.setDuration( duration );
-//        animationScale.setFillMode(Animation.FILL_MODE_FORWARDS);
-//        animationScale.setInterpolator(interpolator);
-        animationScale.setAnimationListener( new MarkerAnimationListener() {
-            @Override
-            public void onAnimationEnd( @NotNull Animation animation ) {
-                if ( isDestroyed() ) {
-                    return;
-                }
-                if ( listener != null ) {
-                    listener.onAnimEnd();
-                }
-            }
-
-            @Override
-            public void onAnimationRepeat( @NotNull Animation animation ) {
-
-            }
-
-            @Override
-            public void onAnimationStart( @NotNull Animation animation ) {
-                if ( isDestroyed() ) {
-                    return;
-                }
-                if ( listener != null ) {
-                    listener.onAnimStart();
-                }
-            }
-        } );
-
-        mMarker.setMarkerScaleAnimation( animationScale );
-        mMarker.startAnimation();
-    }
-
-    @Override
-    public void setClickable( boolean clickable ) {
-        if ( mMarker != null ) {
-            mMarker.setClickable( clickable );
-        }
-    }
-
-
-    @Override
-    public void setGps( boolean isGps ) {
-        if ( mMarker != null ) {
-            mMarker.setGps( isGps );
-        }
-    }
-
-
-    private String mLastAnchorColor = "";
-
-    @Override
-    public void setAnchorColor( String anchorColor ) {
-        if ( TextUtils.equals( mLastAnchorColor, anchorColor ) ) {
-            return;
-        }
-        if (mMogoMarkerOptions != null) {
-            mMogoMarkerOptions.anchorColor( anchorColor );
-        }
-
-        if (mMarker != null) {
-            mMarker.setAnchorColor( anchorColor );
-        }
-        mLastAnchorColor = anchorColor;
-    }
-
-
-    @Override
-    public void addDynamicAnchorPosition( MogoLatLng latLng, float angle, long duration ) {
-        mMarker.addDynamicAnchorPostion( new LonLatPoint( latLng.lon, latLng.lat, angle ), System.currentTimeMillis(), ( int ) duration);
-    }
-
-    @Override
-    public String getMarkerResName() {
-        if ( mMarker != null ) {
-            try {
-                return mMarker.getMarkeOptions().getMarkerIconName();
-            } catch ( Exception e ) {
-                e.printStackTrace();
-            }
-        }
-        return "";
-    }
-
-}
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/marker/MarkerWrapperClickHelper.java b/libraries/mogo-map/src/main/java/com/mogo/map/marker/MarkerWrapperClickHelper.java
deleted file mode 100644
index a4e47349f3..0000000000
--- a/libraries/mogo-map/src/main/java/com/mogo/map/marker/MarkerWrapperClickHelper.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.mogo.map.marker;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class MarkerWrapperClickHelper {
-
-    private volatile static MarkerWrapperClickHelper markerWrapperClickHelper;
-
-    private final Map<String, IMogoMarker> mogoMarkerMap = new HashMap<>();
-
-    private MarkerWrapperClickHelper(){
-
-    }
-
-    public void setMogoMarkerMap(String id,IMogoMarker iMogoMarker){
-        if(isStaticMarker(id)){
-            return;
-        }
-        this.mogoMarkerMap.put(id,iMogoMarker);
-    }
-
-    public Map<String, IMogoMarker> getMogoMarkerMap() {
-        return mogoMarkerMap;
-    }
-
-    public static MarkerWrapperClickHelper getInstance(){
-        if (markerWrapperClickHelper == null) {
-            synchronized (MarkerWrapperClickHelper.class) {
-                if (markerWrapperClickHelper == null) {
-                    markerWrapperClickHelper = new MarkerWrapperClickHelper();
-                }
-            }
-        }
-        return markerWrapperClickHelper;
-    }
-
-    public boolean isStaticMarker(String id){
-        return id.contains("traffic");
-    }
-}
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/overlay/AMapPolylineWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/overlay/AMapPolylineWrapper.java
deleted file mode 100644
index df69003403..0000000000
--- a/libraries/mogo-map/src/main/java/com/mogo/map/overlay/AMapPolylineWrapper.java
+++ /dev/null
@@ -1,195 +0,0 @@
-package com.mogo.map.overlay;
-
-
-import com.mogo.eagle.core.data.map.MogoLatLng;
-import com.mogo.map.utils.ObjectUtils;
-import com.zhidaoauto.map.sdk.open.poyline.Polyline;
-import com.zhidaoauto.map.sdk.open.poyline.PolylineOptions;
-import com.zhidaoauto.map.sdk.open.query.LonLatPoint;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author congtaowang
- * @since 2020-03-10
- * <p>
- * 描述
- */
-public class AMapPolylineWrapper implements IMogoPolyline {
-
-    private Polyline mPolyline;
-    private MogoPolylineOptions mOptions;
-    private boolean mIsDestroyed = false;
-
-    public AMapPolylineWrapper( Polyline mPolyline,
-                                MogoPolylineOptions mOptions ) {
-        this.mPolyline = mPolyline;
-        this.mOptions = mOptions;
-    }
-
-    @Override
-    public void destroy() {
-        remove();
-    }
-
-    @Override
-    public void remove() {
-        if ( mPolyline != null ) {
-            mPolyline.remove();
-        }
-        mIsDestroyed = true;
-    }
-
-    @Override
-    public String getId() {
-        if ( mPolyline != null ) {
-            return mPolyline.getId();
-        }
-        return null;
-    }
-
-    @Override
-    public void setPoints( List< MogoLatLng > lonLats ) {
-        if ( lonLats == null || lonLats.isEmpty() ) {
-            mPolyline.setPoints( new ArrayList<LonLatPoint>() );
-            return;
-        }
-        ArrayList< LonLatPoint > points = new ArrayList<>();
-        for ( MogoLatLng lonLat : lonLats ) {
-            LonLatPoint latLng = ObjectUtils.fromMogo( lonLat );
-            if ( latLng == null ) {
-                continue;
-            }
-            points.add( latLng );
-        }
-        mPolyline.setPoints( points );
-    }
-
-    @Override
-    public List< MogoLatLng > getPoints() {
-        if ( mPolyline == null ) {
-            return null;
-        }
-        ArrayList< MogoLatLng > lonLats = new ArrayList<>();
-        List<LonLatPoint> points = mPolyline.getPoints();
-        if ( points != null ) {
-            for ( LonLatPoint latLng : points ) {
-                MogoLatLng lonLat = ObjectUtils.fromAMap( latLng );
-                if ( lonLat == null ) {
-                    continue;
-                }
-                lonLats.add( lonLat );
-            }
-        }
-        return lonLats;
-    }
-
-    @Override
-    public void setGeodesic( boolean draw ) {
-        if ( mPolyline != null ) {
-            mPolyline.setGeodesic( draw );
-        }
-    }
-
-    @Override
-    public boolean isGeodesic() {
-        return mPolyline == null ? false : mPolyline.isGeodesic();
-    }
-
-    @Override
-    public void setDottedLine( boolean dottedLine ) {
-        if ( mPolyline != null ) {
-            mPolyline.setDottedLine( dottedLine );
-        }
-    }
-
-    @Override
-    public boolean isDottedLine() {
-        return mPolyline == null ? false : mPolyline.isDottedLine();
-    }
-
-    @Override
-    public void setWidth( float width ) {
-        if ( mPolyline != null ) {
-            mPolyline.setWidth( width );
-        }
-    }
-
-    @Override
-    public float getWidth() {
-        if ( mPolyline != null ) {
-            return mPolyline.getWidth();
-        }
-        return 0;
-    }
-
-    @Override
-    public void setColor( int color ) {
-        if ( mPolyline != null ) {
-            mPolyline.setColor( color );
-        }
-    }
-
-    @Override
-    public int getColor() {
-        if ( mPolyline != null ) {
-            return mPolyline.getColor();
-        }
-        return 0;
-    }
-
-    @Override
-    public void setZIndex( float zIndex ) {
-        if ( mPolyline != null ) {
-            mPolyline.setZIndex( zIndex );
-        }
-    }
-
-    @Override
-    public float getZIndex() {
-        if ( mPolyline != null ) {
-            return mPolyline.getZIndex();
-        }
-        return 0;
-    }
-
-    @Override
-    public void setVisible( boolean visible ) {
-        if ( mPolyline != null ) {
-            mPolyline.setVisible( visible );
-        }
-    }
-
-    @Override
-    public boolean isVisible() {
-        if ( mPolyline != null ) {
-            return mPolyline.isVisible();
-        }
-        return false;
-    }
-
-    @Override
-    public void setTransparency( float transparency ) {
-        if ( mPolyline != null ) {
-            mPolyline.setTransparency( transparency );
-        }
-    }
-
-    @Override
-    public void setOption( MogoPolylineOptions option ) {
-        PolylineOptions target = ObjectUtils.fromMogo( option );
-        if ( target == null ) {
-            return;
-        }
-        mOptions = option;
-        if ( mPolyline != null ) {
-            mPolyline.setOption( target );
-        }
-    }
-
-    @Override
-    public boolean isDestroyed() {
-        return false;
-    }
-}
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/overlay/MoGoOverlayManagerImpl.kt b/libraries/mogo-map/src/main/java/com/mogo/map/overlay/MoGoOverlayManagerImpl.kt
new file mode 100644
index 0000000000..7b88d0907d
--- /dev/null
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/overlay/MoGoOverlayManagerImpl.kt
@@ -0,0 +1,448 @@
+package com.mogo.map.overlay
+
+import android.graphics.*
+import com.mogo.eagle.core.data.map.*
+import com.mogo.eagle.core.function.call.autopilot.*
+import com.mogo.eagle.core.function.call.map.*
+import com.mogo.eagle.core.utilcode.util.*
+import com.mogo.map.overlay.point.Point.Options
+import com.mogo.map.*
+import com.mogo.map.overlay.core.*
+import com.mogo.map.overlay.line.*
+import com.mogo.map.overlay.point.Point
+import com.mogo.map.overlay.proxy.line.*
+import com.mogo.map.overlay.proxy.point.*
+import java.util.concurrent.ConcurrentHashMap
+
+internal class MoGoOverlayManagerImpl: IMoGoOverlayManager {
+
+    private val points by lazy { ConcurrentHashMap<Point, IMapPointOverlay>() }
+
+    private val lines by lazy { ConcurrentHashMap<Polyline, IMapPolylineOverlay>() }
+
+    override fun showOrUpdatePoint(options: Options): Point? {
+        synchronized(points) {
+            val key = Point(options.id, options.owner, options.level, options)
+            var point = points[key]
+            try {
+                if (point != null) {
+                    point.setOptions(options)
+                    return key
+                } else {
+                    val p = MogoMap.getInstance().mogoMap.addPoint(options)
+                    if (p != null) {
+                        p.onRemove { removed ->
+                            val keys = points.filterKeys { it.id == removed }
+                            if (keys.isNotEmpty()) {
+                                keys.forEach {
+                                    points.remove(it.key)
+                                }
+                            }
+                        }
+                        points[key] = p
+                        point = p
+                        return key
+                    }
+                }
+            } finally {
+                point?.also {
+                    key.delegate = point
+                    it.setToTop()
+                   if (options.moveToCenter) {
+                       moveToCenter(
+                           options.id,
+                           options.longitude,
+                           options.latitude,
+                           if (options.isGps) CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84().longitude else CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02().longitude,
+                           if (options.isGps) CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84().latitude else CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02().latitude
+                       )
+                   }
+                }
+            }
+            return null
+        }
+    }
+
+    override fun hidePoint(id: String) {
+        points.filter { it.key.id == id && it.value.isVisible() }.onEach {
+            it.value.setVisible(false)
+        }
+    }
+
+    override fun hidePoint(p: Point) {
+        points.filter { it.key == p && it.value.isVisible() }.onEach {
+            it.value.setVisible(false)
+        }
+    }
+
+    override fun hideAllPointsInOwner(owner: String) {
+        points.filter { it.key.owner == owner && it.value.isVisible() }.onEach {
+            it.value.setVisible(false)
+        }
+    }
+
+    override fun hideAllPointsInLevel(level: Level) {
+        points.filter { it.key.level == level && it.value.isVisible() }.onEach {
+            it.value.setVisible(false)
+        }
+    }
+
+    override fun hideAllPoints() {
+        points.filter { it.value.isVisible() }.onEach {
+            it.value.setVisible(false)
+        }
+    }
+
+    override fun removePoint(id: String) {
+        synchronized(points) {
+            val keys = ArrayList<Point>()
+            points.filter { it.key.id == id }.onEach {
+                try {
+                    it.value.remove()
+                } catch (t: Throwable) {
+                    t.printStackTrace()
+                }
+                try {
+                    it.value.destroy()
+                } catch (t: Throwable) {
+                    t.printStackTrace()
+                }
+                keys += it.key
+            }
+            keys.forEach {
+                points.remove(it)
+            }
+        }
+    }
+
+    override fun removePoint(p: Point) {
+        synchronized(points) {
+            val keys = ArrayList<Point>()
+            points.filter { it.key == p }.onEach {
+                try {
+                    it.value.remove()
+                } catch (t: Throwable) {
+                    t.printStackTrace()
+                }
+                try {
+                    it.value.destroy()
+                } catch (t: Throwable) {
+                    t.printStackTrace()
+                }
+                keys += it.key
+            }
+            keys.forEach {
+                points.remove(it)
+            }
+        }
+    }
+
+    override fun removeAllPointsInOwner(owner: String) {
+        synchronized(points) {
+            val keys = ArrayList<Point>()
+            points.filter { it.key.owner == owner }.onEach {
+                try {
+                    it.value.remove()
+                } catch (t: Throwable) {
+                    t.printStackTrace()
+                }
+                try {
+                    it.value.destroy()
+                } catch (t: Throwable) {
+                    t.printStackTrace()
+                }
+                keys += it.key
+            }
+            keys.forEach {
+                points.remove(it)
+            }
+        }
+    }
+
+    override fun removeAllPointsInLevel(level: Level) {
+        synchronized(points) {
+            val keys = ArrayList<Point>()
+            points.filter { it.key.level == level && it.value.isVisible() }.onEach {
+                try {
+                    it.value.remove()
+                } catch (t: Throwable) {
+                    t.printStackTrace()
+                }
+                try {
+                    it.value.destroy()
+                } catch (t: Throwable) {
+                    t.printStackTrace()
+                }
+                keys += it.key
+            }
+            keys.forEach {
+                points.remove(it)
+            }
+        }
+    }
+
+    override fun removeAllPoints() {
+        synchronized(points){
+            points.onEach {
+                try {
+                    it.value.remove()
+                } catch (t: Throwable) {
+                    t.printStackTrace()
+                }
+                try {
+                    it.value.destroy()
+                } catch (t: Throwable) {
+                    t.printStackTrace()
+                }
+            }
+            points.clear()
+        }
+    }
+
+    override fun showAllPoints() {
+        points.filter { !it.value.isVisible() }.onEach {
+            it.value.setVisible(true)
+        }
+    }
+
+    override fun showAllPointsInOwner(owner: String) {
+        points.filter { it.key.owner == owner && !it.value.isVisible() }.onEach {
+            it.value.setVisible(true)
+        }
+    }
+
+    override fun showAllPointsInLevel(level: Level) {
+        points.filter { it.key.level == level && !it.value.isVisible() }.onEach {
+            it.value.setVisible(true)
+        }
+    }
+
+    override fun showPoint(id: String) {
+        points.filter { it.key.id == id && !it.value.isVisible() }.onEach {
+            it.value.setVisible(true)
+        }
+    }
+
+    override fun showOrUpdateLine(options: Polyline.Options): Polyline? {
+        synchronized(lines) {
+            val key = Polyline(options.id, options.owner, options.level, options)
+            var line = lines[key]
+            try {
+                if (line != null) {
+                    line.setOptions(options)
+                    return key
+                } else {
+                    val newLine = MogoMap.getInstance().mogoMap.addLine(options)
+                    if (newLine != null) {
+                        newLine.onRemove { removed ->
+                            val keys = lines.filterKeys { it.id == removed }
+                            if (keys.isNotEmpty()) {
+                                keys.forEach {
+                                    lines.remove(it.key)
+                                }
+                            }
+                        }
+                        lines[key] = newLine
+                        line = newLine
+                        return key
+                    }
+                }
+            } finally {
+                line?.also {
+                    it.setToTop()
+                    key.delegate = it
+                }
+            }
+            return null
+        }
+    }
+
+    private fun moveToCenter(id: String, eventLon: Double, eventLat: Double, carLon: Double, carLat: Double) {
+        try {
+            CallerMapUIServiceManager.getMapUIController()?.showBounds(
+                id,
+                MogoLatLng(carLat, carLon),
+                listOf(MogoLatLng(eventLat, eventLon)),
+                Rect(
+                    WindowUtils.dip2px(Utils.getApp(), 100f),
+                    WindowUtils.dip2px(Utils.getApp(), 370f),
+                    WindowUtils.dip2px(Utils.getApp(), 575f),
+                    WindowUtils.dip2px(Utils.getApp(), 100f)
+                ), true)
+        } catch (t: Throwable) {
+            t.printStackTrace()
+        }
+    }
+
+    override fun hideLine(id: String) {
+        lines.filter { it.key.id == id && it.value.isVisible() }.onEach {
+            it.value.setVisible(false)
+        }
+    }
+
+    override fun hideLine(p: Polyline) {
+        lines.filter { it.key == p && it.value.isVisible() }.onEach {
+            it.value.setVisible(false)
+        }
+    }
+
+    override fun hideAllLinesInOwner(owner: String) {
+        lines.filter { it.key.owner == owner && it.value.isVisible() }.onEach {
+            it.value.setVisible(false)
+        }
+    }
+
+    override fun hideAllLinesInLevel(level: Level) {
+        lines.filter { it.key.level == level && it.value.isVisible() }.onEach {
+            it.value.setVisible(false)
+        }
+    }
+
+    override fun hideAllLines() {
+        lines.filter { it.value.isVisible() }.onEach {
+            it.value.setVisible(false)
+        }
+    }
+
+    override fun removeLine(id: String) {
+        synchronized(lines) {
+            val keys = ArrayList<Polyline>()
+            lines.filter { it.key.id == id }.onEach {
+                try {
+                    it.value.remove()
+                } catch (t: Throwable) {
+                    t.printStackTrace()
+                }
+                try {
+                    it.value.destroy()
+                } catch (t: Throwable) {
+                    t.printStackTrace()
+                }
+                keys += it.key
+            }
+            keys.forEach {
+                lines.remove(it)
+            }
+        }
+    }
+
+    override fun removeLine(p: Polyline) {
+        synchronized(lines) {
+            val keys = ArrayList<Polyline>()
+            lines.filter { it.key == p }.onEach {
+                try {
+                    it.value.remove()
+                } catch (t: Throwable) {
+                    t.printStackTrace()
+                }
+                try {
+                    it.value.destroy()
+                } catch (t: Throwable) {
+                    t.printStackTrace()
+                }
+                keys += it.key
+            }
+            keys.forEach {
+                lines.remove(it)
+            }
+        }
+    }
+
+    override fun removeAllLinesInOwner(owner: String) {
+        synchronized(lines) {
+            val keys = ArrayList<Polyline>()
+            lines.filter { it.key.owner == owner }.onEach {
+                try {
+                    it.value.remove()
+                } catch (t: Throwable) {
+                    t.printStackTrace()
+                }
+                try {
+                    it.value.destroy()
+                } catch (t: Throwable) {
+                    t.printStackTrace()
+                }
+                keys += it.key
+            }
+            keys.forEach {
+                lines.remove(it)
+            }
+        }
+    }
+
+    override fun removeAllLinesInLevel(level: Level) {
+        synchronized(lines) {
+            val keys = ArrayList<Polyline>()
+            lines.filter { it.key.level == level }.onEach {
+                try {
+                    it.value.remove()
+                } catch (t: Throwable) {
+                    t.printStackTrace()
+                }
+                try {
+                    it.value.destroy()
+                } catch (t: Throwable) {
+                    t.printStackTrace()
+                }
+                keys += it.key
+            }
+            keys.forEach {
+                lines.remove(it)
+            }
+        }
+    }
+
+    override fun removeAllLines() {
+        synchronized(lines) {
+            lines.onEach {
+                try {
+                    it.value.remove()
+                } catch (t: Throwable) {
+                    t.printStackTrace()
+                }
+                try {
+                    it.value.destroy()
+                } catch (t: Throwable) {
+                    t.printStackTrace()
+                }
+            }
+            lines.clear()
+        }
+    }
+
+    override fun showAllLines() {
+        lines.filter { !it.value.isVisible() }.onEach {
+            it.value.setVisible(true)
+        }
+    }
+
+    override fun showAllLinesInOwner(owner: String) {
+        lines.filter { !it.value.isVisible() && it.key.owner == owner }.onEach {
+            it.value.setVisible(true)
+        }
+    }
+
+    override fun showAllLinesInLevel(level: Level) {
+        lines.filter { !it.value.isVisible() && it.key.level == level }.onEach {
+            it.value.setVisible(true)
+        }
+    }
+
+    override fun showLine(id: String) {
+        lines.filter { it.key.id == id && !it.value.isVisible() }.onEach {
+            it.value.setVisible(true)
+        }
+    }
+
+    override fun hideAllPointsExceptIds(vararg ids: String) {
+        points.filter { !ids.contains(it.key.id) && it.value.isVisible() }.onEach {
+            it.value.setVisible(false)
+        }
+    }
+
+    override fun hideAllPointsExceptOwners(vararg owners: String) {
+        points.filter { !owners.contains(it.key.owner) && it.value.isVisible() }.onEach {
+            it.value.setVisible(false)
+        }
+    }
+}
\ No newline at end of file
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/overlay/wrapper/line/AMapPolylineWrapper.kt b/libraries/mogo-map/src/main/java/com/mogo/map/overlay/wrapper/line/AMapPolylineWrapper.kt
new file mode 100644
index 0000000000..39f9ffdefe
--- /dev/null
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/overlay/wrapper/line/AMapPolylineWrapper.kt
@@ -0,0 +1,76 @@
+package com.mogo.map.overlay.wrapper.line
+
+import com.mogo.map.overlay.line.Polyline.Options
+import com.mogo.map.overlay.proxy.line.*
+import com.mogo.map.utils.ObjectUtils
+import com.zhidaoauto.map.sdk.open.poyline.*
+import java.util.concurrent.atomic.*
+
+class AMapPolylineWrapper(private val id: String, private val delegate: Polyline): IMapPolylineOverlay {
+
+    private val isDestroyed by lazy { AtomicBoolean(false) }
+
+    private val isRemoved by lazy { AtomicBoolean(false) }
+
+    @Volatile
+    private var onRemoveAction: ((id: String) -> Unit)? = null
+
+    override fun destroy() {
+        if (isDestroyed.compareAndSet(false, true)) {
+            try {
+                delegate.destroy()
+            } finally {
+                onRemoveAction?.invoke(id)
+            }
+        }
+    }
+
+    override fun remove() {
+        if (isRemoved.compareAndSet(false, true)) {
+            try {
+                delegate.remove()
+            } finally {
+                onRemoveAction?.invoke(id)
+            }
+        }
+    }
+
+    override fun setVisible(visible: Boolean) {
+        if (isDestroyed.get() || isRemoved.get()) {
+            return
+        }
+        delegate.setVisible(visible)
+    }
+
+    override fun isDestroyed(): Boolean {
+        return isDestroyed.get()
+    }
+
+    override fun isVisible(): Boolean {
+        return delegate.isVisible() ?: false
+    }
+
+    override fun setToTop() {
+        //没有对应的API
+    }
+
+    override fun setUnTop() {
+        //没有对应的API
+    }
+
+    override fun setOptions(options: Options) {
+        if (isDestroyed.get() || isRemoved.get()) {
+            return
+        }
+        delegate.also {
+            val option = ObjectUtils.fromMogo(options)
+            if (option != null) {
+                it.setOption(option)
+            }
+        }
+    }
+
+    override fun onRemove(action: (id: String) -> Unit) {
+        onRemoveAction = action
+    }
+}
\ No newline at end of file
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/overlay/wrapper/point/AMapPointWrapper.kt b/libraries/mogo-map/src/main/java/com/mogo/map/overlay/wrapper/point/AMapPointWrapper.kt
new file mode 100644
index 0000000000..2c1cb3afc4
--- /dev/null
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/overlay/wrapper/point/AMapPointWrapper.kt
@@ -0,0 +1,84 @@
+package com.mogo.map.overlay.wrapper.point
+
+import com.mogo.eagle.core.data.map.*
+import com.mogo.map.overlay.point.Point.Options
+import com.mogo.map.overlay.proxy.point.*
+import com.mogo.map.utils.ObjectUtils
+import com.zhidaoauto.map.sdk.open.marker.*
+import com.zhidaoauto.map.sdk.open.query.LonLatPoint
+import java.util.concurrent.atomic.AtomicBoolean
+
+class AMapPointWrapper(private val id: String, private val delegate: Marker): IMapPointOverlay {
+
+    private val isDestroyed by lazy { AtomicBoolean(false) }
+
+    private val isRemoved by lazy { AtomicBoolean(false) }
+
+
+    @Volatile
+    private var onRemoveAction: ((id: String) -> Unit)? = null
+
+    override fun destroy() {
+        if (isDestroyed.compareAndSet(false, true)) {
+            try {
+                delegate.destroy()
+            } finally {
+                onRemoveAction?.invoke(id)
+            }
+        }
+    }
+
+    override fun remove() {
+        if (isRemoved.compareAndSet(false, true)) {
+            try {
+                delegate.remove()
+            } finally {
+                onRemoveAction?.invoke(id)
+            }
+        }
+    }
+
+    override fun setVisible(visible: Boolean) {
+        if (isDestroyed.get() || isRemoved.get()) {
+            return
+        }
+        delegate.setVisible(visible)
+    }
+
+    override fun isDestroyed(): Boolean {
+        return isDestroyed.get()
+    }
+
+    override fun isVisible(): Boolean {
+        return delegate.isVisible()
+    }
+
+    override fun setToTop() {
+        if (isDestroyed.get() || isRemoved.get()) {
+            return
+        }
+        delegate.setToTop()
+    }
+
+    override fun setUnTop() {
+        if (isDestroyed.get() || isRemoved.get()) {
+            return
+        }
+        delegate.setUnTop()
+    }
+
+    override fun setOptions(opt: Options) {
+        if (isDestroyed.get() || isRemoved.get()) {
+            return
+        }
+        delegate.setMarkerOptions(ObjectUtils.fromMogo(opt))
+    }
+
+    override fun addDynamicAnchorPosition(point: MogoLatLng, angle: Float, duration: Long) {
+        delegate.addDynamicAnchorPostion(LonLatPoint(point.lon, point.lat, angle.toDouble()), System.currentTimeMillis(), duration.toInt())
+    }
+
+    override fun onRemove(action: (id: String) -> Unit) {
+        onRemoveAction = action
+    }
+}
\ No newline at end of file
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 95f035487e..54477279cc 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
@@ -7,9 +7,8 @@ import android.view.View;
 
 import com.mogo.eagle.core.data.map.CenterLine;
 import com.mogo.eagle.core.data.map.MogoLatLng;
-import com.mogo.eagle.core.data.map.MogoLocation;
-import com.mogo.map.marker.MogoMarkerOptions;
-import com.mogo.map.overlay.MogoPolylineOptions;
+import com.mogo.map.overlay.line.Polyline;
+import com.mogo.map.overlay.point.Point;
 import com.mogo.map.uicontroller.MapCameraPosition;
 import com.zhidaoauto.map.sdk.open.camera.CameraPosition;
 import com.zhidaoauto.map.sdk.open.marker.BitmapDescriptor;
@@ -33,7 +32,7 @@ import mogo.yycp.api.proto.SocketDownData;
  */
 public class ObjectUtils {
 
-    public static MarkerOptions fromMogo(MogoMarkerOptions opt) {
+    public static MarkerOptions fromMogo(Point.Options opt) {
 
         if (opt == null) {
             return null;
@@ -59,25 +58,26 @@ public class ObjectUtils {
                 .rotateAngle(opt.getRotate())
                 .setFlat(opt.isFlat())
                 .visible(opt.isVisible())
-                .infoWindowEnable(opt.isInifoWindowEnable())
+                .infoWindowEnable(opt.isInfoWindowEnable())
                 .scale(opt.getScale())
                 .alpha(opt.getAlpha())
-                .setInfoWindowOffset(opt.getOffsetX(), opt.getOffsetY())
-                .zIndex(opt.getzIndex());
+                .zIndex(opt.getLevel().getZIndex());
 
         try {
-            if (!TextUtils.isEmpty(opt.getAnchorColor())) {
-                Color.parseColor(opt.getAnchorColor());
-                markerOptions.anchorColor(opt.getAnchorColor());
+            String anchorColor = opt.getAnchorColor();
+            if (anchorColor != null && !TextUtils.isEmpty(anchorColor)) {
+                Color.parseColor(anchorColor);
+                markerOptions.anchorColor(anchorColor);
             }
         } catch (Exception e) {
             //e.printStackTrace();
         }
         markerOptions.vrEnable(opt.is3DMode());
-        if (!TextUtils.isEmpty(opt.getResName())) {
-            markerOptions.setMarkerIconName(opt.getResName());
+        String resName = opt.getResName();
+        if (resName != null && !TextUtils.isEmpty(resName)) {
+            markerOptions.setMarkerIconName(resName);
         } else {
-            BitmapDescriptor descriptor = getBitmapDescriptorFromMogo(opt);
+            BitmapDescriptor descriptor = getBitmapDescriptorFromMogo(opt.getIcon(), opt.getIconView());
             if (descriptor != null) {
                 markerOptions.markerIcon(descriptor);
             }
@@ -85,11 +85,13 @@ public class ObjectUtils {
                 markerOptions.marker3DIcon(opt.getIcon3DRes());
             }
         }
-        if (!TextUtils.isEmpty(opt.getTitle())) {
-            markerOptions.title(opt.getTitle());
+        String title = opt.getTitle();
+        if (title != null && !TextUtils.isEmpty(title)) {
+            markerOptions.title(title);
         }
-        if (!TextUtils.isEmpty(opt.getSnippet())) {
-            markerOptions.snippet(opt.getSnippet());
+        String snippet = opt.getSnippet();
+        if (snippet != null && !TextUtils.isEmpty(snippet)) {
+            markerOptions.snippet(snippet);
         }
         return markerOptions;
     }
@@ -107,7 +109,8 @@ public class ObjectUtils {
             markerOptions.setLat(trafficData.getLatitude());
             markerOptions.setLon(trafficData.getLongitude());
             markerOptions.setTime(Double.valueOf(trafficData.getSatelliteTime() * 1000).longValue());
-            if(trafficData.getColor()!=null && !trafficData.getColor().isEmpty()){
+            trafficData.getColor();
+            if(!trafficData.getColor().isEmpty()){
                 markerOptions.setColor(trafficData.getColor());
             }else{
                 markerOptions.setColor("#00000000");
@@ -138,68 +141,16 @@ public class ObjectUtils {
         return markerOptions;
     }
 
-    private static BitmapDescriptor getBitmapDescriptorFromMogo(MogoMarkerOptions options) {
-        if (options == null) {
-            return null;
-        }
-        Bitmap icon = options.getIcon();
+    private static BitmapDescriptor getBitmapDescriptorFromMogo(Bitmap icon, View view) {
         if (icon != null) {
             return BitmapDescriptorFactory.INSTANCE.fromBitmap(icon);
         }
-        View view = options.getIconView();
         if (view != null) {
             return BitmapDescriptorFactory.INSTANCE.fromView(view);
         }
         return null;
     }
 
-
-    public static MogoLocation fromLocation(com.zhidaoauto.map.sdk.open.location.MogoLocation aLocation) {
-        if (aLocation == null) {
-            return null;
-        }
-        MogoLocation location = new MogoLocation();
-
-        //agps 高德
-        //agps_rtk 高德-高精
-        if (aLocation.getProvider().isEmpty()) {
-            location.setLocType(0);
-        }
-        if ("AGPS".equals(aLocation.getProvider())) {
-            location.setLocType(1); // 定位类型为高德坐标(网路或者硬件定位)
-        } else if ("AGPS_RTK".equals(aLocation.getProvider())) {
-            location.setLocType(1000); // 定位类型为WGS84进行转译的坐标
-        } else {
-            location.setLocType(0);
-        }
-        location.setSatellite(4);
-        location.setGnssSpeed(aLocation.getSpeed());
-        location.setLatitude(aLocation.getLat());
-        location.setLongitude(aLocation.getLon());
-        location.setAltitude(aLocation.getAltitude());
-        location.setHeading((float) aLocation.getHeading());
-        location.setCityCode(aLocation.getCityCode());
-        location.setCityName(aLocation.getCity());
-        location.setProvider(aLocation.getProvider());
-        location.setAddress(aLocation.getAddress());
-        location.setDistrict(aLocation.getDistrict());
-        location.setProvince(aLocation.getProvince());
-        location.setAdCode(aLocation.getAdCode());
-        //        location.setAccuracy( aLocation.getAccuracy() );
-        //        location.setTime( aLocation.getTime() );
-//        location.setLocationDetail( aLocation.getLocationDetail() );
-//        location.setPoiName( aLocation.getPoiName() );
-//        location.setAoiName( aLocation.getAoiName() );
-//        location.setErrCode( aLocation.getErrorCode() );
-//        location.setErrInfo( aLocation.getErrorInfo() );
-//        location.setStreetNum( aLocation.getStreetNum() );
-//        location.setDescription( aLocation.getDescription() );
-//        location.setBuildingId( aLocation.getBuildingId() );
-//        location.setFloor( aLocation.getFloor() );
-//        location.setGpsAccuracyStatus( aLocation.getGpsAccuracyStatus() );
-        return location;
-    }
-
     public static LonLatPoint fromMogo(MogoLatLng latLng) {
         if (latLng == null) {
             return null;
@@ -214,12 +165,12 @@ public class ObjectUtils {
         return new MogoLatLng(point.getLatitude(), point.getLongitude());
     }
 
-    public static PolylineOptions fromMogo(MogoPolylineOptions options) {
+    public static PolylineOptions fromMogo(Polyline.Options options) {
         if (options == null) {
             return null;
         }
         PolylineOptions target = new PolylineOptions();
-        target.setGps(options.gps());
+        target.setGps(options.isUseGps());
         if (options.getPoints() != null) {
             List<LonLatPoint> points = new ArrayList<>();
             for (MogoLatLng point : options.getPoints()) {
@@ -228,20 +179,24 @@ public class ObjectUtils {
             target.lonLatPoints(points);
         }
         target.setLineWidth(options.getWidth());
-        target.zIndex(options.getZIndex());
+        target.dottedLine(options.isDottedLine());
+        target.geodesic(options.isGeodesic());
+        target.dottedLineType(options.getDottedLineType());
+        target.zIndex(options.getLevel().getZIndex());
         target.setColor(options.getColor());
         target.useGradient(options.isGradient());
-        target.useFacade(options.useFacade);
-        if (options.maxIndex >= 0f) {
-            target.maxIndex = options.maxIndex;
+        target.useFacade(options.getUseFacade());
+        target.setVisible(options.isVisible());
+        if (options.getMaxIndex() >= 0f) {
+            target.maxIndex = options.getMaxIndex();
         }
-        if (options.getColorValues() != null) {
-            target.colorValues(options.getColorValues());
+        if (options.getColors() != null) {
+            target.colorValues(options.getColors());
         }
-        if (options.isBrightOn()) {
+        if (options.isLightOn()) {
             target.isBright = true;
-            target.brightColor = options.getBrightColor();
-            target.brightSpeed = options.getBrightSpeed();
+            target.brightColor = options.getLightColor();
+            target.brightSpeed = options.getLightSpeed();
         }
         return target;
     }
diff --git a/libraries/mogo-obu/src/main/java/com/zhidao/support/obu/constants/MogoObuShowConstants.java b/libraries/mogo-obu/src/main/java/com/zhidao/support/obu/constants/MogoObuShowConstants.java
new file mode 100644
index 0000000000..fe3f2d7100
--- /dev/null
+++ b/libraries/mogo-obu/src/main/java/com/zhidao/support/obu/constants/MogoObuShowConstants.java
@@ -0,0 +1,423 @@
+package com.zhidao.support.obu.constants;
+
+/**
+ * obu 数据类型定义
+ * 后面添加新数据类型，只需要鹰眼业务层修改就可以。obu硬件和obu的sdk都是透传
+ */
+public class MogoObuShowConstants {
+
+    public interface STATUS {
+        /**
+         * 更新
+         */
+        int UPDATE = 0;
+        /**
+         * 添加
+         */
+        int ADD = 1;
+        /**
+         * 删除
+         */
+        int DELETE = 2;
+    }
+
+
+    /**
+     *  红绿灯预警类型
+     */
+    public interface SPAT_WARNING_TYPE {
+        /**
+         * 无效
+         */
+        int INVALID = 0;
+        /**
+         * 闯红灯预警（Signal Violation Warning）
+         */
+        int SVW = 1;
+        /**
+         * 绿波通行引导（Green Light Optimal Speed Advisory）
+         */
+        int GLOSA = 2;
+    }
+
+    /**
+     * 交通参与者类型
+     */
+    public interface PTC_TYPE {
+        /**
+         * 未知
+         */
+        int UNKNOWN = 0;
+        /**
+         * 机动车
+         */
+        int MOTOR_VEHICLE = 1;
+        /**
+         * 非机动车
+         */
+        int NON_MOTOR_VEHICLE = 2;
+        /**
+         * 行人
+         */
+        int PEDESTRIAN = 3;
+        /**
+         * OBU自身
+         */
+        int OBU_ONESELF = 4;
+    }
+
+    /**
+     * 预警类型
+     */
+    public interface V2X_WARNING_TYPE {
+        /**
+         * 前向碰撞预警（Forward Collision Warning）
+         */
+        int FCW = 0;
+        /**
+         * 交叉路口碰撞预警（Intersection Collision Warning）
+         */
+        int ICW = 1;
+        /**
+         * 左转辅助预警（Left Turn Assist）
+         */
+        int LTA = 2;
+        /**
+         * 盲区预警（Blind Spot Warning）
+         */
+        int BSW = 3;
+        /**
+         * 变道预警（Lane Change Warning）
+         */
+        int LCW = 4;
+        /**
+         * 逆向超车预警（Do Not Pass Warning）
+         */
+        int DNPW = 5;
+        /**
+         * 紧急制动预警（Emergency Brake Warning）
+         */
+        int EBW = 6;
+        /**
+         * 异常车辆提醒（Abnormal Vehicle Warning）
+         */
+        int AVW = 7;
+        /**
+         * 失控车辆预警（Control Loss Warning）
+         */
+        int CLW = 8;
+        /**
+         * 紧急车辆预警（Emergency Vehicle Warning）
+         */
+        int EVW = 9;
+        /**
+         * 弱势交通参与者碰撞预警（Vulnerable Road User Collision Warning）
+         */
+        int VRUCW = 10;
+    }
+
+    /**
+     * V2V预警等级
+     */
+    public interface V2X_WARNING_LEVEL {
+        /**
+         * 无效
+         */
+        int INVALID = 0;
+        /**
+         * 检测到
+         */
+        int DETECTED = 1;
+        /**
+         * 通知
+         */
+        int INFORM = 2;
+        /**
+         * 警告
+         */
+        int WARNING = 3;
+    }
+
+    /**
+     * RSI预警类型
+     */
+    public interface RSI_SCENE_TYPE {
+        /**
+         * 无效
+         */
+        int INVALID = 0;
+        /**
+         * 限速信息（Speed Limit Warning）
+         */
+        int SLW = 1;
+        /**
+         * 道路危险（Hazardous Location Warning）
+         */
+        int HLW = 2;
+        /**
+         * 车内标牌（In-Vehicle Signage）
+         */
+        int IVS = 3;
+        /**
+         * 前方拥堵（Traffic Jam Warning）
+         */
+        int TJW = 4;
+    }
+
+    /**
+     * 车辆和交通参与者的目标方位信息
+     */
+    public interface VEH_TARGET_POSITION {
+        /**
+         * 同向正前方
+         */
+        int AHEAD_IN_LANE = 0x11;
+        /**
+         * 同向邻道左前方
+         */
+        int AHEAD_LEFT = 0x12;
+        /**
+         * 同向邻道右前方
+         */
+        int AHEAD_RIGHT = 0x13;
+        /**
+         * 同向远道左前方
+         */
+        int AHEAD_FAR_LEFT = 0x14;
+        /**
+         * 同向远道右前方
+         */
+        int AHEAD_FAR_RIGHT = 0x15;
+        /**
+         * 同向正后方
+         */
+        int BEHEAD_IN_LANE = 0x21;
+        /**
+         * 同向邻道左后方
+         */
+        int BEHEAD_LEFT = 0x22;
+        /**
+         * 同向邻道右后方
+         */
+        int BEHEAD_RIGHT = 0x23;
+        /**
+         * 同向远道左后方
+         */
+        int BEHEAD_FAR_LEFT = 0x24;
+        /**
+         * 同向远道右后方
+         */
+        int BEHEAD_FAR_RIGHT = 0x25;
+        /**
+         * 对向正前方
+         */
+        int ONCOMING_IN_LANE = 0x31;
+        /**
+         * 对向邻道左前方
+         */
+        int ONCOMING_LEFT = 0x32;
+        /**
+         * 对向邻道右前方
+         */
+        int ONCOMING_RIGHT = 0x33;
+        /**
+         * 对向远道左前方
+         */
+        int ONCOMING_FAR_LEFT = 0x34;
+        /**
+         * 对向远道右前方
+         */
+        int ONCOMING_FAT_RIGHT = 0x35;
+        /**
+         * 路口左侧来车
+         */
+        int INTERSECTION_LEFT = 0x46;
+        /**
+         * 路口右侧来车
+         */
+        int INTERSECTION_RIGHT = 0x47;
+        /**
+         * 其他情况
+         */
+        int UNCLASSIFIED = 0x00;
+    }
+
+    /**
+     * 交通时间或标志的目标方位信息
+     */
+    public interface RTI_TARGET_POSITION {
+        /**
+         * 未知
+         */
+        int UNKNOWN = 0x00;
+        /**
+         * 在事件中
+         */
+        int LANE_INSID = 0x01;
+        /**
+         * 在事件左侧
+         */
+        int LANE_LEFT = 0x02;
+        /**
+         * 在事件右侧
+         */
+        int LANE_RIGHT = 0x03;
+        /**
+         * 在事件前方
+         */
+        int LANE_AHEAD = 0x04;
+        /**
+         * 在事件后方
+         */
+        int LANE_REAR = 0x05;
+        /**
+         * 距事件较远
+         */
+        int FARAWAY = 0x06;
+        /**
+         * 不在同一平面
+         */
+        int NOT_SOME_PLANE = 0x07;
+    }
+
+    /**
+     * 交通事件
+     */
+    public interface RTE {
+        /**
+         * 车辆故障
+         */
+        int RTI_TYPE_BREAKDOWN = 101;
+        /**
+         * 道路积水
+         */
+        int RTI_TYPE_ROAD_WATER = 407;
+        /**
+         * 异常停车
+         */
+        int RTI_TYPE_PARKING_VIOLATION = 412;
+        /**
+         * 施工占道
+         */
+        int RTI_TYPE_CONSTRUCTION_RTE = 501;
+        /**
+         * 拥堵
+         */
+        int RTI_TYPE_TJW = 707;
+        /**
+         * 超速行驶
+         */
+        int RTI_TYPE_SPEEDING = 901;
+        /**
+         * 车辆逆行
+         */
+        int RTI_TYPE_RETRIGRADE = 904;
+    }
+
+    /**
+     * 交通标牌
+     */
+    public interface RTS {
+        /**
+         * 十字路口
+         */
+        int RTI_TYPE_INTERSECTION = 1;
+        /**
+         * 急转弯
+         */
+        int RTI_TYPE_SHAPR_TURNS = 2;
+        /**
+         * 桥梁
+         */
+        int RTI_TYPE_BRIDGE = 8;
+        /**
+         * 行人
+         */
+        int RTI_TYPE_PEDESTRIAN = 10;
+        /**
+         * 路滑
+         */
+        int RTI_TYPE_SLIPPERY_ROAD = 17;
+        /**
+         * 隧道
+         */
+        int RTI_TYPE_TUNNEL = 21;
+        /**
+         * 渡轮
+         */
+        int RTI_TYPE_FERRY = 22;
+        /**
+         * 路面不平
+         */
+        int RTI_TYPE_UNEVEN_ROAD = 24;
+        /**
+         * 非机动车
+         */
+        int RTI_TYPE_NON_MOTOR_VEHICLE = 32;
+        /**
+         * 障碍
+         */
+        int RTI_TYPE_OBSTACLE = 36;
+        /**
+         * 施工
+         */
+        int RTI_TYPE_CONSTRUCTION = 38;
+        /**
+         * 注意合流
+         */
+        int RTI_TYPE_ATTENTION_CONFLUENCE = 44;
+        /**
+         * 车队
+         */
+        int RTI_TYPE_VEHICLE_QUEUE = 47;
+        /**
+         * 不通
+         */
+        int RTI_TYPE_NO_PASSING = 51;
+        /**
+         * 禁止掉头
+         */
+        int RTI_TYPE_NO_TURNING_AROUND = 75;
+        /**
+         * 禁止停车
+         */
+        int RTI_TYPE_NO_STOPPING = 78;
+        /**
+         * 禁止鸣笛
+         */
+        int RTI_TYPE_NO_TOOTING = 80;
+        /**
+         * 限速
+         */
+        int RTI_TYPE_SPEED_LIMIT = 85;
+        /**
+         * 直行或右转
+         */
+        int RTI_TYPE_GO_STRAIGHT_TURN_RIGHT = 100;
+        /**
+         * 人行横道
+         */
+        int RTI_TYPE_PEDESTRIAN_CROSSING = 114;
+        /**
+         * 公交提醒
+         */
+        int RTI_TYPE_BUS_WARNING = 123;
+        /**
+         * 右侧变窄/车道数减少
+         */
+        int RTI_TYPE_NARROW_RIGHT = 163;
+        /**
+         * 加油站
+         */
+        int RTI_TYPE_GAS_STATION = 201;
+        /**
+         * 学校
+         */
+        int RTI_TYPE_SCHOOL = 242;
+        /**
+         * 事故
+         */
+        int RTI_TYPE_ACCIDENT = 244;
+    }
+
+}
diff --git a/settings.gradle b/settings.gradle
index 92baf7c388..d6e38b1c58 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,6 @@
 rootProject.name = 'MoGoEagleEye'
 include ':app'
-include ':app_ipc_monitoring'
+//include ':app_ipc_monitoring'
 //include ':app_mogo_magic_ring'