diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/constant/OchBusConst.kt b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/constant/OchBusConst.kt
index a85ea7ae3f..ceb9969047 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/constant/OchBusConst.kt
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/constant/OchBusConst.kt
@@ -38,6 +38,8 @@ class OchBusConst {
 
         // 上报心跳轮询ms
         const val LOOP_PERIOD_60S = 60 * 1000L
+        // 开始服务启动自动驾驶等待时间（埋点上传）
+        const val LOOP_PERIOD_15S = 15 * 1000L
         const val LOOP_PERIOD_1S = 1 * 1000L
         const val LOOP_DELAY = 100L
 
@@ -45,5 +47,14 @@ class OchBusConst {
         const val BUS_START_MAP_MAKER = "bus_start_map_maker";
         //终点UUID
         const val BUS_END_MAP_MAKER = "bus_end_map_maker";
+
+        // 埋点key：开始服务开启自动驾驶（成功/失败）
+        const val EVENT_KEY_START_SERVICE = "event_key_och_bus_start_service"
+        const val EVENT_PARAM_SN = "sn"
+        const val EVENT_PARAM_TIME = "time"
+        const val EVENT_PARAM_START_NAME = "start_name"
+        const val EVENT_PARAM_END_NAME = "end_name"
+        const val EVENT_PARAM_LINE_ID = "line_id"
+        const val EVENT_PARAM_START_RESULT = "start_autopilot" // true/false
     }
 }
\ No newline at end of file
diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseOchBusTabFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseOchBusTabFragment.java
index 176359e5a2..849925cefb 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseOchBusTabFragment.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseOchBusTabFragment.java
@@ -374,11 +374,6 @@ public abstract class BaseOchBusTabFragment<V extends IView, P extends Presenter
     public void showAutopilotBiz() {
         getActivity().runOnUiThread(() -> {
             ctvAutopilotStatus.setVisibility(View.VISIBLE);
-            if (isOperationStatus) {
-                slidePanelView.setVisibility(View.VISIBLE);
-            } else {
-                slidePanelView.setVisibility(View.GONE);
-            }
         });
     }
 
diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java
index 79ff5ce9ac..8c94a1f856 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java
@@ -15,10 +15,13 @@ import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.voice.AIAssist;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
+import com.mogo.eagle.core.function.call.map.CallerHDMapManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.mogo.toast.TipToast;
 import com.mogo.map.MogoMarkerManager;
+import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.marker.MogoMarkerOptions;
+import com.mogo.module.common.constants.DataTypes;
 import com.mogo.och.bus.R;
 import com.mogo.och.bus.bean.OchBusStation;
 import com.mogo.och.bus.constant.OchBusConst;
@@ -172,34 +175,34 @@ public class OchBusFragment extends BaseOchBusTabFragment<OchBusFragment, OchBus
             startStationFlagVisibility = View.VISIBLE;
             isArriveAtStartStation = true;
             mStartStationFlag.setText(getResources().getString(R.string.bus_arrive_to_end_start));
-//            CallerLogger.INSTANCE.d("MapMaker= ","起点=");
+
             setOrRemoveMapMaker(true, OchBusConst.BUS_START_MAP_MAKER, startStation.getLat()
-                    , startStation.getLon(), R.drawable.icon_station_start_end);
+                    , startStation.getLon());
             setOrRemoveMapMaker(true, OchBusConst.BUS_END_MAP_MAKER, endStation.getLat()
-                    , endStation.getLon(), R.drawable.icon_station_start_end);
+                    , endStation.getLon());
         } else if (currentStation > 0 && currentStation < stationList.size() - 1) {// 是否到达站点
-//            CallerLogger.INSTANCE.d("MapMaker= ","中间=");
             isArriveAtStation = true;
-//            mStartStationFlag.setText(getResources().getString(R.string.bus_arrive_to_end_start1));
+
             setOrRemoveMapMaker(false, OchBusConst.BUS_START_MAP_MAKER, startStation.getLat()
-                    , startStation.getLon(), R.drawable.icon_station_start_end);
+                    , startStation.getLon());
             setOrRemoveMapMaker(true, OchBusConst.BUS_END_MAP_MAKER, endStation.getLat()
-                    , endStation.getLon(), R.drawable.icon_station_start_end);
+                    , endStation.getLon());
         } else if (currentStation == stationList.size() - 1) {// 是否到达终点
-//            CallerLogger.INSTANCE.d("MapMaker= ","终点=");
             isArriveEndStation = true;
             nextStationName = "--";
             mStartStationFlag.setText(getResources().getString(R.string.bus_arrive_to_end_end));
             startStationFlagVisibility = View.VISIBLE;
             endStationFlagVisibility = View.INVISIBLE;
+
             setOrRemoveMapMaker(false, OchBusConst.BUS_START_MAP_MAKER, startStation.getLat()
-                    , startStation.getLon(), R.drawable.icon_station_start_end);
+                    , startStation.getLon());
+
             if (isArrived) {
                 setOrRemoveMapMaker(false, OchBusConst.BUS_END_MAP_MAKER, endStation.getLat()
-                        , endStation.getLon(), R.drawable.icon_station_start_end);
+                        , endStation.getLon());
             } else {
                 setOrRemoveMapMaker(true, OchBusConst.BUS_END_MAP_MAKER, endStation.getLat()
-                        , endStation.getLon(), R.drawable.icon_station_start_end);
+                        , endStation.getLon());
             }
         }
 
@@ -292,11 +295,11 @@ public class OchBusFragment extends BaseOchBusTabFragment<OchBusFragment, OchBus
             //移除起点终点
             if (null != startStation) {
                 setOrRemoveMapMaker(false, OchBusConst.BUS_START_MAP_MAKER, startStation.getLat()
-                        , startStation.getLon(), R.drawable.icon_station_start_end);
+                        , startStation.getLon());
             }
             if (null != endStation) {
                 setOrRemoveMapMaker(false, OchBusConst.BUS_END_MAP_MAKER, endStation.getLat()
-                        , endStation.getLon(), R.drawable.icon_station_start_end);
+                        , endStation.getLon());
             }
         }
     }
@@ -317,20 +320,25 @@ public class OchBusFragment extends BaseOchBusTabFragment<OchBusFragment, OchBus
      *
      * @param isAdd
      * @param uuid
-     * @param iconId
      */
-    private void setOrRemoveMapMaker(boolean isAdd, String uuid, double lat, double longi, int iconId) {
+    private void setOrRemoveMapMaker(boolean isAdd, String uuid, double lat, double longi) {
         if (isAdd) {
             CallerLogger.INSTANCE.d("setMapMaker= ", uuid + "=latitude=" + lat + ",longitude=" + longi);
-            MogoMarkerOptions options = new MogoMarkerOptions();
-            options.anchorColor("#000000");//不设置报错，暂时随便设置个
-            options.setGps(true);//使用wgs 必须设置true
-            options.scale(0.15f);
-            Bitmap bitmap = BitmapFactory.decodeResource(AbsMogoApplication.getApp().getResources(), iconId, null);
-            options.icon(bitmap);
-            options.latitude(lat);
-            options.longitude(longi);
-            MogoMarkerManager.getInstance(AbsMogoApplication.getApp()).addMarker(uuid, options);
+
+            MogoMarkerOptions options = new MogoMarkerOptions()
+                    .owner(DataTypes.TYPE_MARKER_ADAS)
+                    .anchor(0.5f, 0.5f)
+                    .set3DMode(true)
+                    .gps(true)
+                    .controlAngle(true)
+                    .icon3DRes(R.raw.start_and_end)
+                    .latitude(lat)
+                    .longitude(longi);
+            IMogoMarker marker = MogoMarkerManager.getInstance(AbsMogoApplication.getApp()) .addMarker(uuid, options);
+            marker.setRotateAngle(CallerHDMapManager.INSTANCE.getCenterLineInfo(
+                    longi,lat,-1)
+                    .getAngle()
+                    .floatValue());
         }else {
             CallerLogger.INSTANCE.d("RemoveMapMaker=",uuid+"=latitude="+lat+",longitude="+longi);
             MogoMarkerManager.getInstance(AbsMogoApplication.getApp()).removeMarkers(uuid);
diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusOrderModel.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusOrderModel.java
index 556b70ce1a..ea97ad4f27 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusOrderModel.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusOrderModel.java
@@ -39,6 +39,7 @@ import com.mogo.och.bus.callback.SlidePannelHideCallback;
 import com.mogo.och.bus.constant.OchBusConst;
 import com.mogo.och.bus.net.OCHBusServiceManager;
 import com.mogo.och.bus.net.OCHServiceCallback;
+import com.mogo.och.bus.util.OchBusAnalyticsUtil;
 import com.mogo.och.bus.util.PinYinUtil;
 import com.mogo.service.IMogoServiceApis;
 import com.mogo.service.statusmanager.IMogoStatusChangedListener;
@@ -445,6 +446,9 @@ public class OchBusOrderModel {
         CallerLogger.INSTANCE.d( M_BUS + TAG, "开启自动驾驶====" + currentAutopilot.toString()
                 +" startLatLon="+currentStation.getName()+"，endLatLon="+nextStation.getName());
         CallerAutoPilotManager.INSTANCE.startAutoPilot(currentAutopilot);
+
+        triggerStartServiceEvent(false);
+
         if (mControllerStatusCallback != null) {
             mControllerStatusCallback.startOpenAutopilot();
         }
@@ -841,4 +845,14 @@ public class OchBusOrderModel {
             OchBusModelLoopManager.getInstance().stopHeartbeatLoop();
         }
     }
+
+    public void triggerStartServiceEvent(boolean send) {
+        if (stationList == null || currentStationIndex >= stationList.size()) {
+            return;
+        }
+        OchBusStation currentStation = stationList.get( currentStationIndex -1);
+        OchBusStation nextStation = stationList.get( currentStationIndex);
+        OchBusAnalyticsUtil.triggerStartServiceEvent(send,
+                currentStation.getName(), nextStation.getName(), currentLineId);
+    }
 }
diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java
index 00664fb7d5..3a01e43818 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java
@@ -194,6 +194,7 @@ public class OchBusPresenter extends Presenter<OchBusFragment>
                     currentAutopilotStatus = IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING;
                     // 改变UI自动驾驶状态
                     mView.onAutopilotStatusChanged(currentAutopilotStatus, isAnimateRunning);
+                    OchBusOrderModel.getInstance().triggerStartServiceEvent(true);
                 }
                 isAnimateRunning = false;
                 break;
diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/OchBusAnalyticsUtil.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/OchBusAnalyticsUtil.java
new file mode 100644
index 0000000000..a2b88c8f2c
--- /dev/null
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/OchBusAnalyticsUtil.java
@@ -0,0 +1,55 @@
+package com.mogo.och.bus.util;
+
+import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
+import com.mogo.eagle.core.function.call.analytics.AnalyticsManager;
+import com.mogo.eagle.core.utilcode.util.DateTimeUtils;
+import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
+import com.mogo.och.bus.constant.OchBusConst;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * OCH Bus埋点工具
+ *
+ * Created on 2022/3/24
+ */
+public class OchBusAnalyticsUtil {
+
+    /**
+     * 触发'滑动出发'埋点流程：
+     * 滑动出发（开启自动驾驶）后，15s内成功则发送成功埋点，否则发送失败埋点
+     * @param send 是否直接发送埋点（15s内开启成功则直接发送成功埋点）
+     */
+    public static void triggerStartServiceEvent(
+            boolean send, String startName, String endName, int lineId) {
+
+        String sn = MoGoAiCloudClientConfig.getInstance().getSn();
+        String dateTime = DateTimeUtils.getTimeText(
+                System.currentTimeMillis(), DateTimeUtils.yyyy_MM_dd_HH_mm_ss);
+
+        Map<String, Object> params = new HashMap<>();
+        params.put(OchBusConst.EVENT_PARAM_SN, sn);
+        params.put(OchBusConst.EVENT_PARAM_TIME, dateTime);
+        params.put(OchBusConst.EVENT_PARAM_START_NAME, startName);
+        params.put(OchBusConst.EVENT_PARAM_END_NAME, endName);
+        params.put(OchBusConst.EVENT_PARAM_LINE_ID, lineId);
+
+        Runnable runnable = () -> {
+            // 15s内未开启，上报失败埋点
+            params.put(OchBusConst.EVENT_PARAM_START_RESULT, false);
+            AnalyticsManager.INSTANCE.track(OchBusConst.EVENT_KEY_START_SERVICE, params);
+        };
+
+        if (send) {
+            // 开启成功，上报埋点
+            if (runnable != null && UiThreadHandler.getsUiHandler().hasCallbacks(runnable)) {
+                UiThreadHandler.removeCallbacks(runnable);
+            }
+            params.put(OchBusConst.EVENT_PARAM_START_RESULT, true);
+            AnalyticsManager.INSTANCE.track(OchBusConst.EVENT_KEY_START_SERVICE, params);
+        } else {
+            UiThreadHandler.postDelayed(runnable, OchBusConst.LOOP_PERIOD_15S);
+        }
+    }
+}
diff --git a/OCH/mogo-och-bus/src/main/res/raw/start_and_end.nt3d b/OCH/mogo-och-bus/src/main/res/raw/start_and_end.nt3d
new file mode 100644
index 0000000000..8424316486
Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/raw/start_and_end.nt3d differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java
index b895718994..e3453380e0 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java
@@ -275,6 +275,7 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback
                             if (mCurrentOCHOrder != null) {
                                 queryCurOrderStatus();
                             }
+                            recoverNaviInfo();
                         }
                     }
 
@@ -600,6 +601,14 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback
         naviOrderStartToEnd();
     }
 
+    /**
+     * 订单结束或者取消的时候， 刷新导航标识位以及缓存的数据
+     */
+    public void recoverNaviInfo(){
+        SharedPrefsMgr.getInstance(mContext).remove(TaxiPassengerConst.SP_KEY_ORDER_SUM_DIS);
+        TaxiPassengerNaviToDestinationModel.getInstance(mContext).setFirstcalculateDriveRoute(0);
+    }
+
     private void runOnUIThread(Runnable executor) {
         if (executor == null) {
             return;
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java
index 7dd3280fe8..d060812f85 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java
@@ -140,7 +140,7 @@ public class BaseTaxiPassengerPresenter extends Presenter<TaxiPassengerBaseFragm
         CallerLogger.INSTANCE.d(M_TAXI_P+TAG,"updateOrderView = "+order.orderStatus);
         if (TaxiPassengerOrderStatusEnum.Cancel.getCode() == order.orderStatus){
             mView.showOrHideServingOrderFragment(false);
-            recoverNaviInfo();
+            TaxiPassengerModel.getInstance().recoverNaviInfo();
             return;
         }
         if (TaxiPassengerOrderStatusEnum.ArriveAtStartStation.getCode() == order.orderStatus
@@ -149,7 +149,7 @@ public class BaseTaxiPassengerPresenter extends Presenter<TaxiPassengerBaseFragm
             return;
         }
         if (TaxiPassengerOrderStatusEnum.ArriveAtEndStation.getCode() == order.orderStatus){
-            recoverNaviInfo();
+            TaxiPassengerModel.getInstance().recoverNaviInfo();
             runOnUIThread(() ->{
                 AIAssist.getInstance(getContext()).speakTTSVoice(getContext().getString(R.string.taxi_p_arrive_end_tts));
             });
@@ -165,11 +165,4 @@ public class BaseTaxiPassengerPresenter extends Presenter<TaxiPassengerBaseFragm
         }
     }
 
-    /**
-     * 订单结束或者取消的时候， 刷新导航标识位以及缓存的数据
-     */
-    public void recoverNaviInfo(){
-        SharedPrefsMgr.getInstance(getContext()).remove(TaxiPassengerConst.SP_KEY_ORDER_SUM_DIS);
-        TaxiPassengerNaviToDestinationModel.getInstance(getContext()).setFirstcalculateDriveRoute(0);
-    }
 }
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerServingOrderFragment.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerServingOrderFragment.java
index 3c7886ac16..88efec1c08 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerServingOrderFragment.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerServingOrderFragment.java
@@ -366,6 +366,18 @@ public class TaxiPassengerServingOrderFragment extends
         TaxiPassengerModel.getInstance().naviOrderStartToEnd();
     }
 
+    @Override
+    public void onHiddenChanged(boolean hidden) {
+        super.onHiddenChanged(hidden);
+
+        if (hidden){//fragment 隐藏， 导航取消
+            clearPolyline();
+            TaxiPassengerNaviToDestinationModel.getInstance(getContext()).destroyAmaNavi();
+        }else {  //fragment 显示， 导航开始
+            TaxiPassengerModel.getInstance().naviOrderStartToEnd();
+        }
+    }
+
     @Override
     public void onPause() {
         super.onPause();
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/OCHTaxiConst.kt b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/OCHTaxiConst.kt
index 3b894d7e2b..edb45a2521 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/OCHTaxiConst.kt
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/OCHTaxiConst.kt
@@ -30,7 +30,8 @@ class OCHTaxiConst {
 
         // 上报心跳轮询ms
         const val LOOP_PERIOD_60S = 60 * 1000L
-
+        // 开始服务启动自动驾驶等待时间（埋点上传）
+        const val LOOP_PERIOD_15S = 15 * 1000L
         // 轮询查询进行中/待服务订单的间隔时间 2秒
         const val LOOP_PERIOD_2S = 2 * 1000L
         // 轮询查询新到预约单 1秒
@@ -48,5 +49,15 @@ class OCHTaxiConst {
         //演示：V  测试：内测
         const val DEMO_USER = "V"
         const val TEST_USER = "内测"
+
+        // 埋点key：开始服务开启自动驾驶（成功/失败）
+        const val EVENT_KEY_START_SERVICE = "event_key_och_taxi_start_service"
+        const val EVENT_PARAM_SN = "sn"
+        const val EVENT_PARAM_TIME = "time"
+        const val EVENT_PARAM_START_NAME = "start_name"
+        const val EVENT_PARAM_END_NAME = "end_name"
+        const val EVENT_PARAM_ORDER_NUMBER = "order_num"
+        const val EVENT_PARAM_START_RESULT = "start_autopilot" // true/false
+
     }
 }
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/MogoOCHTaxiModelNew.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/MogoOCHTaxiModelNew.java
index 2a36c5677c..ddd574d459 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/MogoOCHTaxiModelNew.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/MogoOCHTaxiModelNew.java
@@ -51,6 +51,7 @@ import com.mogo.och.taxi.constant.OrderStatusEnum;
 import com.mogo.och.taxi.constant.OrderTypeEnum;
 import com.mogo.och.taxi.network.OCHTaxiServiceCallback;
 import com.mogo.och.taxi.network.OCHTaxiServiceManagerNew;
+import com.mogo.och.taxi.utils.OchTaxiAnalyticsUtil;
 import com.mogo.och.taxi.utils.OrderUtil;
 import com.mogo.och.taxi.utils.PinYinUtil;
 import com.mogo.service.IMogoServiceApis;
@@ -809,6 +810,10 @@ public class MogoOCHTaxiModelNew {
         CallerAutoPilotManager.INSTANCE.startAutoPilot(parameters);
         CallerLogger.INSTANCE.d(M_TAXI + TAG, "start autopilot with parameter: %s", GsonUtil.jsonFromObject(parameters)
                 + " ,startSiteName=" + mCurrentOCHOrder.startSiteAddr + " ,endSiteName=" + mCurrentOCHOrder.endSiteAddr);
+
+        OchTaxiAnalyticsUtil.triggerStartServiceEvent(false,
+                mCurrentOCHOrder.startSiteAddr, mCurrentOCHOrder.endSiteAddr, mCurrentOCHOrder.orderNo);
+
         if (DebugConfig.isDebug()) {
             // TipToast.shortTip("Start autopilot!");
         }
@@ -1005,6 +1010,10 @@ public class MogoOCHTaxiModelNew {
                     // 当高频返回autopilot 2时，不重复调用订单状态变更
                     mPrevAPStatus = state; // 每个状态单独赋值，解决无订单时已经是2的状态导致的新订单来时无法进入此逻辑更新状态
                     updateOCHOrderStatus(OrderStatusEnum.OnTheWayToEndStation);
+
+                    OchTaxiAnalyticsUtil.triggerStartServiceEvent(true,
+                            mCurrentOCHOrder.startSiteAddr, mCurrentOCHOrder.endSiteAddr, mCurrentOCHOrder.orderNo);
+
                     if (FunctionBuildConfig.isDemoMode) {
                         // 当美化模式（演示模式）开启时: 订单对应自动驾驶开启后，置true
                         FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = true;
@@ -1039,6 +1048,8 @@ public class MogoOCHTaxiModelNew {
 
         @Override
         public void onAutopilotArriveAtStation(MessagePad.ArrivalNotification data) {
+            CallerLogger.INSTANCE.i(M_TAXI + TAG, "onAutopilotArriveAtStation = " + data.toString());
+
             if (data == null || !checkCurrentOCHOrder()
                     || (getCurOrderStatus() == OrderStatusEnum.ArriveAtEndStation)) {
                 return;
@@ -1070,7 +1081,7 @@ public class MogoOCHTaxiModelNew {
      * @param models
      */
     public void updateOrderRoute(List<MessagePad.Location> models) {
-
+        if (null == mCurrentOCHOrder) return;
         List<OrderRouteUpdateReqBean.Result> points =  CoordinateConverterFrom84ForList(mContext,models);
 
         OCHTaxiServiceManagerNew.getInstance().updateOrderRoute(mContext, mCurrentOCHOrder.orderNo
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiBeingServerdOrdersFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiBeingServerdOrdersFragment.java
index d82fafdfb8..47692ff70b 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiBeingServerdOrdersFragment.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiBeingServerdOrdersFragment.java
@@ -22,12 +22,15 @@ import com.amap.api.navi.model.NaviLatLng;
 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.voice.AIAssist;
+import com.mogo.eagle.core.function.call.map.CallerHDMapManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.mogo.toast.TipToast;
 import com.mogo.eagle.core.utilcode.util.DateTimeUtils;
 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;
+import com.mogo.module.common.constants.DataTypes;
 import com.mogo.och.taxi.callback.IOCHTaxiNaviChangedCallback;
 import com.mogo.och.taxi.constant.OCHTaxiConst;
 import com.mogo.och.taxi.constant.OrderStatusEnum;
@@ -368,35 +371,36 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem
                         showNotice(mActivity.getString(R.string.module_och_taxi_new_order));
                         startNaviToStartStation(false, mOrderStartStationLat, mOrderStartStationLng);
                         showOrHideNavi(true);
-                        setOrRemoveMapMaker(true, OCHTaxiConst.TAXI_START_MAP_MAKER,order.startSitePoint,R.drawable.icon_station_start_end);
-                        setOrRemoveMapMaker(true,OCHTaxiConst.TAXI_END_MAP_MAKER,order.endSitePoint,R.drawable.icon_station_start_end);
+                        setOrRemoveMapMaker(true, OCHTaxiConst.TAXI_START_MAP_MAKER,order.startSitePoint);
+                        setOrRemoveMapMaker(true,OCHTaxiConst.TAXI_END_MAP_MAKER,order.endSitePoint);
                         break;
                     case Cancel:
                         mOrderCancel.setVisibility(View.VISIBLE);
                         showNotice(mActivity.getString(R.string.module_och_taxi_order_cancel));
                         showOrHideNavi(false);
-                        setOrRemoveMapMaker(false, OCHTaxiConst.TAXI_START_MAP_MAKER,order.startSitePoint,R.drawable.icon_station_start_end);
-                        setOrRemoveMapMaker(false,OCHTaxiConst.TAXI_END_MAP_MAKER,order.endSitePoint,R.drawable.icon_station_start_end);
+                        setOrRemoveMapMaker(false, OCHTaxiConst.TAXI_START_MAP_MAKER,order.startSitePoint);
+                        setOrRemoveMapMaker(false,OCHTaxiConst.TAXI_END_MAP_MAKER,order.endSitePoint);
                         break;
                     case ArriveAtStartStation:
                         mOrderCancel.setVisibility(View.VISIBLE);
                         showNotice(mActivity.getString(R.string.module_och_taxi_order_status_ph_text));
                         showOrHideNavi(false);
-                        setOrRemoveMapMaker(true, OCHTaxiConst.TAXI_START_MAP_MAKER,order.startSitePoint,R.drawable.icon_station_start_end);
-                        setOrRemoveMapMaker(true,OCHTaxiConst.TAXI_END_MAP_MAKER,order.endSitePoint,R.drawable.icon_station_start_end);
+                        setOrRemoveMapMaker(true, OCHTaxiConst.TAXI_START_MAP_MAKER,order.startSitePoint);
+                        setOrRemoveMapMaker(true,OCHTaxiConst.TAXI_END_MAP_MAKER,order.endSitePoint);
                         break;
                     case OnTheWayToEndStation:
 //                        showNotice("欢迎使用蘑菇智行");
                         mOrderCancel.setVisibility(View.VISIBLE);
                         showOrHideNavi(false);
-                        setOrRemoveMapMaker(false, OCHTaxiConst.TAXI_START_MAP_MAKER,order.startSitePoint,R.drawable.icon_station_start_end);
-                        setOrRemoveMapMaker(true,OCHTaxiConst.TAXI_END_MAP_MAKER,order.endSitePoint,R.drawable.icon_station_start_end);
+                        setOrRemoveMapMaker(false, OCHTaxiConst.TAXI_START_MAP_MAKER,order.startSitePoint);
+                        setOrRemoveMapMaker(true,OCHTaxiConst.TAXI_END_MAP_MAKER,order.endSitePoint);
                         break;
                     case ArriveAtEndStation:
                         mOrderCancel.setVisibility(View.GONE);
                         showNotice(mActivity.getString(R.string.module_och_taxi_order_complete_1));
                         showOrHideNavi(false);
-                        setOrRemoveMapMaker(false,OCHTaxiConst.TAXI_END_MAP_MAKER,order.endSitePoint,R.drawable.icon_station_start_end);
+                        setOrRemoveMapMaker(false, OCHTaxiConst.TAXI_START_MAP_MAKER,order.startSitePoint);
+                        setOrRemoveMapMaker(false,OCHTaxiConst.TAXI_END_MAP_MAKER,order.endSitePoint);
                         break;
                     case JourneyCompleted:
                         mOrderCancel.setVisibility(View.GONE);
@@ -522,20 +526,27 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem
      * @param isAdd
      * @param uuid
      * @param station
-     * @param iconId
      */
-    private void setOrRemoveMapMaker(boolean isAdd, String uuid, List<Double> station, int iconId){
+    private void setOrRemoveMapMaker(boolean isAdd, String uuid, List<Double> station){
         if (isAdd){
-            CallerLogger.INSTANCE.d(M_TAXI + "setMapMaker= ",uuid+"=latitude="+station.get(1)+",longitude="+station.get(0));
-            MogoMarkerOptions options = new MogoMarkerOptions();
-            options.anchorColor("#000000");//不设置报错，暂时随便设置个
-            options.setGps(true);//使用wgs 必须设置true
-            options.scale(0.15f);
-            Bitmap bitmap = BitmapFactory.decodeResource(mActivity.getResources(), iconId, null);
-            options.icon(bitmap);
-            options.latitude(station.get(1));
-            options.longitude(station.get(0));
-            MogoMarkerManager.getInstance(AbsMogoApplication.getApp()) .addMarker(uuid, options);
+            CallerLogger.INSTANCE.d(M_TAXI + "setMapMaker= ",uuid+"=latitude="
+                    +station.get(1)+",longitude="+station.get(0));
+
+            MogoMarkerOptions options = new MogoMarkerOptions()
+                    .owner(DataTypes.TYPE_MARKER_ADAS)
+                    .anchor(0.5f, 0.5f)
+                    .set3DMode(true)
+                    .gps(true)
+                    .controlAngle(true)
+                    .icon3DRes(R.raw.start_and_end)
+                    .latitude(station.get(1))
+                    .longitude(station.get(0));
+            IMogoMarker marker = MogoMarkerManager.getInstance(AbsMogoApplication.getApp()).addMarker(uuid, options);
+            marker.setRotateAngle(CallerHDMapManager.INSTANCE.getCenterLineInfo(
+                    station.get(0),station.get(1),-1)
+                    .getAngle()
+                    .floatValue());
+
         }else {
             CallerLogger.INSTANCE.d(M_TAXI + "RemoveMapMaker=",uuid+"=latitude="+station.get(1)+",longitude="+station.get(0));
             MogoMarkerManager.getInstance(AbsMogoApplication.getApp()) .removeMarkers(uuid);
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/OchTaxiAnalyticsUtil.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/OchTaxiAnalyticsUtil.java
new file mode 100644
index 0000000000..a0f8b5b517
--- /dev/null
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/OchTaxiAnalyticsUtil.java
@@ -0,0 +1,55 @@
+package com.mogo.och.taxi.utils;
+
+import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
+import com.mogo.eagle.core.function.call.analytics.AnalyticsManager;
+import com.mogo.eagle.core.utilcode.util.DateTimeUtils;
+import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
+import com.mogo.och.taxi.constant.OCHTaxiConst;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * OCH Taxi埋点工具
+ *
+ * Created on 2022/3/24
+ */
+public class OchTaxiAnalyticsUtil {
+
+    /**
+     * 触发'开始服务'埋点流程：
+     * 点击开始服务（开启自动驾驶）后，15s内成功则发送成功埋点，否则发送失败埋点
+     * @param send 是否直接发送埋点（15s内开启成功则直接发送成功埋点）
+     */
+    public static void triggerStartServiceEvent(
+            boolean send, String startName, String endName, String orderNo) {
+
+        String sn = MoGoAiCloudClientConfig.getInstance().getSn();
+        String dateTime = DateTimeUtils.getTimeText(
+                System.currentTimeMillis(), DateTimeUtils.yyyy_MM_dd_HH_mm_ss);
+
+        Map<String, Object> params = new HashMap<>();
+        params.put(OCHTaxiConst.EVENT_PARAM_SN, sn);
+        params.put(OCHTaxiConst.EVENT_PARAM_TIME, dateTime);
+        params.put(OCHTaxiConst.EVENT_PARAM_START_NAME, startName);
+        params.put(OCHTaxiConst.EVENT_PARAM_END_NAME, endName);
+        params.put(OCHTaxiConst.EVENT_PARAM_ORDER_NUMBER, orderNo);
+
+        Runnable runnable = () -> {
+            // 15s内未开启，上报失败埋点
+            params.put(OCHTaxiConst.EVENT_PARAM_START_RESULT, false);
+            AnalyticsManager.INSTANCE.track(OCHTaxiConst.EVENT_KEY_START_SERVICE, params);
+        };
+
+        if (send) {
+            // 开启成功，上报埋点
+            if (runnable != null && UiThreadHandler.getsUiHandler().hasCallbacks(runnable)) {
+                UiThreadHandler.removeCallbacks(runnable);
+            }
+            params.put(OCHTaxiConst.EVENT_PARAM_START_RESULT, true);
+            AnalyticsManager.INSTANCE.track(OCHTaxiConst.EVENT_KEY_START_SERVICE, params);
+        } else {
+            UiThreadHandler.postDelayed(runnable, OCHTaxiConst.LOOP_PERIOD_15S);
+        }
+    }
+}
diff --git a/OCH/mogo-och-taxi/src/main/res/raw/start_and_end.nt3d b/OCH/mogo-och-taxi/src/main/res/raw/start_and_end.nt3d
new file mode 100644
index 0000000000..8424316486
Binary files /dev/null and b/OCH/mogo-och-taxi/src/main/res/raw/start_and_end.nt3d differ
diff --git a/README_shell.md b/README_shell.md
index 7c590f74af..b060af0060 100644
--- a/README_shell.md
+++ b/README_shell.md
@@ -19,7 +19,7 @@ adb pull /sdcard/Android/data/com.mogo.launcher.f/log/20211022
 
 // (新的HMI)使用命令行触发 V2X 预警场景
 // 顶部弹窗场景，控制展示
-adb shell am broadcast -a com.hmi.v2x.notification --ez v2xIsShow true --es tag "200011" --ei v2xType 20011 --es alertContent "测试外部传入数据" --es  ttsContent "测试TTS"
+adb shell am broadcast -a com.hmi.v2x.notification --ez v2xIsShow true --es tag "200012" --ei v2xType 20012 --es alertContent "测试外部传入数据2" --es  ttsContent "测试TTS2"
 // 关闭顶部弹窗
 adb shell am broadcast -a com.hmi.v2x.notification --ez v2xIsShow false  --es tag "200011"
 
diff --git a/TestHmiWarning.sh b/TestHmiWarning.sh
new file mode 100755
index 0000000000..1ab54760cc
--- /dev/null
+++ b/TestHmiWarning.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+for index in `seq 300`;
+do
+  b=$(( $index % 2 ))
+  if [ $b = 0 ]
+  then
+    echo "200011"
+    adb shell am broadcast -a com.hmi.v2x.notification --ez v2xIsShow true --es tag "200011" --ei v2xType 20011 --es alertContent "测试外部传入数据1" --es  ttsContent "测试TTS1"
+  else
+    echo "200012"
+    adb shell am broadcast -a com.hmi.v2x.notification --ez v2xIsShow true --es tag "200012" --ei v2xType 20012 --es alertContent "测试外部传入数据2" --es  ttsContent "测试TTS2"
+  fi
+  sleep 0.5
+done
+
+echo -e "\033[32m 恭喜你完成了所有 测试脚本 \033[0m"
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 050d2d0e2c..66a4af0052 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,12 +15,13 @@ if (!isAndroidTestBuild()) {
         logLevel "DEBUG"
     }
 }
-//if (!isAndroidTestBuild()) {
-//    apply plugin: 'chain.log.hook'
-//    hooklog{
-//        enableLoggerToServer true
-//    }
-//}
+if (!isAndroidTestBuild()) {
+    apply plugin: 'chain.log.hook'
+    hooklog{
+        enableTraceToServer false
+        enableLoggerToLocal true
+    }
+}
 
 //if (!isAndroidTestBuild()) {
 //    apply plugin: 'apm-plugin'
@@ -232,8 +233,6 @@ dependencies {
     implementation rootProject.ext.dependencies.arouter
     implementation rootProject.ext.dependencies.boostmultidex
 
-    compileOnly rootProject.ext.dependencies.adasapi
-    compileOnly rootProject.ext.dependencies.adasconfigapi
     debugImplementation rootProject.ext.dependencies.debugleakcanary
     releaseImplementation rootProject.ext.dependencies.releaseleakcanary
 
diff --git a/app_ipc_monitoring/build.gradle b/app_ipc_monitoring/build.gradle
index 9bb528f9a9..e688cb6413 100644
--- a/app_ipc_monitoring/build.gradle
+++ b/app_ipc_monitoring/build.gradle
@@ -58,5 +58,5 @@ dependencies {
 //    api "com.zhidao.support.adas:high:1.2.1.2_bate21"
     implementation 'org.greenrobot:eventbus:3.2.0'
     implementation 'com.android.support:multidex:1.0.3'
-    implementation 'com.mogo.cloud:telematic:1.3.31'
+    implementation 'com.mogo.cloud:telematic:1.3.50'
 }
diff --git a/build.gradle b/build.gradle
index 091b93c9bf..46b8a4826e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,7 +21,7 @@ buildscript {
         maven {
             url "https://artifact.bytedance.com/repository/byteX/"
         }
-        mavenCentral()
+//        mavenCentral()
         google()
     }
     dependencies {
@@ -57,7 +57,7 @@ allprojects {
         maven { url 'https://maven.aliyun.com/repository/google' }
         maven { url 'https://maven.aliyun.com/repository/gradle-plugin' }
         maven { url 'https://maven.aliyun.com/repository/jcenter' }
-        mavenCentral()
+//        mavenCentral()
         maven { url 'http://nexus.zhidaoauto.com/repository/maven-releases/' }
         maven { url 'http://nexus.zhidaoauto.com/repository/maven-public/' }
         maven {
diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt
index a51271e89e..b31bd57da7 100644
--- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt
+++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt
@@ -27,6 +27,7 @@ import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.telematic.MogoProtocolMsg
 import com.mogo.telematic.MogoProtocolMsg.NORMAL_DATA
+import com.mogo.telematic.MogoProtocolMsg.SYNC_MODE_STATUS
 import com.mogo.telematic.NSDNettyManager
 import com.mogo.telematic.client.listener.NettyClientListener
 import com.mogo.telematic.client.status.ConnectState
@@ -56,7 +57,7 @@ class MoGoAutopilotProvider :
         get() = TAG
 
     override fun init(context: Context) {
-        MoGoHandAdasMsgManager.getInstance()
+        MoGoHandAdasMsgManager.getInstance(context)
         CallerLogger.i("$M_ADAS_IMPL$TAG", "初始化工控机连接……")
         mContext = context
         // 初始化ADAS 域控制器
@@ -90,13 +91,9 @@ class MoGoAutopilotProvider :
                 override fun onChannelConnect(channel: Channel?) {
                     val socketAddress = channel?.remoteAddress().toString()
                     CallerLogger.d("$M_ADAS_IMPL$TAG", "Client ip is:${socketAddress}")
-                    synchronized(this@MoGoAutopilotProvider) {
-                        NSDNettyManager.getInstance().selectChannel(channel)
-                        var byteArray = if(FunctionBuildConfig.isDemoMode) byteArrayOf(1) else byteArrayOf(0)
-                        NSDNettyManager.getInstance().sendMogoProtocolMsgToClient(MogoProtocolMsg(3, byteArray.size, byteArray)
-                        ) {
-                            CallerLogger.d("$M_ADAS_IMPL$TAG", "同步美化模式状态是否成功：${it.isSuccess}")
-                        }
+                    val byteArray = if(FunctionBuildConfig.isDemoMode) byteArrayOf(1) else byteArrayOf(0)
+                    NSDNettyManager.getInstance().sendMsgToSpecifiedClient(MogoProtocolMsg(SYNC_MODE_STATUS, byteArray.size, byteArray), channel) {
+                        CallerLogger.d("$M_ADAS_IMPL$TAG", "同步美化模式状态是否成功：${it.isSuccess}")
                     }
                 }
 
@@ -210,6 +207,13 @@ class MoGoAutopilotProvider :
         }, 1000, TimeUnit.MILLISECONDS)
     }
 
+    /**
+     * 断开与工控机的连接
+     */
+    override fun disconnectIpc() {
+        AdasManager.getInstance().disconnect()
+    }
+
     override fun onMapCollectStart(cmdId: Int, cmdTime: Long) {
         val result = recordPackage(2, cmdId)
         CallerLogger.d("$M_ADAS_IMPL$TAG", "开始记录包: [$cmdId, $result]")
@@ -328,7 +332,7 @@ class MoGoAutopilotProvider :
             var byteArray = if (isEnable) byteArrayOf(1) else byteArrayOf(0)
             if (NSDNettyManager.getInstance().isServerStart) {
                 NSDNettyManager.getInstance()
-                    .sendMsgToAllClients(MogoProtocolMsg(3, byteArray.size, byteArray))
+                    .sendMsgToAllClients(MogoProtocolMsg(SYNC_MODE_STATUS, byteArray.size, byteArray))
             } else {
                 CallerLogger.d("$M_ADAS_IMPL$TAG", "同步美化模式状态时司机端Server未启动！")
             }
@@ -368,4 +372,13 @@ class MoGoAutopilotProvider :
     override fun isConnected(): Boolean {
         return AdasManager.getInstance().ipcConnectionStatus == IPC_CONNECTION_STATUS.CONNECTED
     }
+
+    /**
+     * 获取协议版本
+     */
+    override fun getProtocolVersion(): Int {
+        return AdasManager.getInstance().protocolVersion
+    }
+
+
 }
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt
index 3038e2baa5..92fcd2e26d 100644
--- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt
+++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt
@@ -10,11 +10,15 @@ import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_C
 import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_ROUTE
 import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_STATUS
 import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_TRAJECTORY
+import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_VEHICLE
 import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_WARN
 import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_ADAS_MESSAGE_CAR_STATE
 import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_ADAS_MESSAGE_RECT_DATA
 import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_ADAS
-import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_WEB_SOCKET_DATA
+import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT
+import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_WEB_SOCKET_DATA_TRACKED
+import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_WEB_SOCKET_TRAJECTORY
+import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_WEB_SOCKET_VEHICLE
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_ADAS_IMPL
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager.invokeArriveAtStation
@@ -35,7 +39,6 @@ import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.module.common.MogoApisHandler
 import com.mogo.module.common.datacenter.SnapshotLocationDataCenter
-import com.mogo.module.service.MarkerServiceHandler
 import com.zhidao.support.adas.high.AdasManager
 import com.zhidao.support.adas.high.OnAdasListener
 import com.zhidao.support.adas.high.bean.IPCUpgradeStateInfo
@@ -64,6 +67,7 @@ class MoGoAdasListenerImpl : OnAdasListener {
 
     //车前引导线
     @ChainLog(
+        linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_TRAJECTORY,
         linkCode = CHAIN_LINK_ADAS,
         endpoint = PAD,
         nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_TRAJECTORY,
@@ -94,8 +98,8 @@ class MoGoAdasListenerImpl : OnAdasListener {
 
     //感知物体
     @ChainLog(
+        linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_DATA_TRACKED,
         linkCode = CHAIN_LINK_ADAS,
-        linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_DATA,
         endpoint = PAD,
         nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_RECT_DATA,
         paramIndexes = [0, 1],
@@ -112,8 +116,8 @@ class MoGoAdasListenerImpl : OnAdasListener {
 
     //自车定位信息
     @ChainLog(
+        linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT,
         linkCode = CHAIN_LINK_ADAS,
-        linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_DATA,
         endpoint = PAD,
         nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_CAR_STATE,
         paramIndexes = [0, 1],
@@ -127,16 +131,27 @@ class MoGoAdasListenerImpl : OnAdasListener {
             MogoApisHandler.getInstance().apis.adasControllerApi.lastLon = gnssInfo.longitude
             MogoApisHandler.getInstance().apis.adasControllerApi.satelliteTime =
                 java.lang.Double.valueOf(gnssInfo.satelliteTime).toLong()
+
             if (1 == FunctionBuildConfig.gpsProvider) {
                 CallerMapUIServiceManager.getMapUIController()?.syncLocation2Map(
                     gnssInfo
                 )
                 SnapshotLocationDataCenter.getInstance().syncAdasLocationInfo(gnssInfo)
             }
+            //根据加速度判断 是否刹车
+            CallerAutopilotVehicleStateListenerManager.invokeAutopilotBrakeLightByAcceleration(gnssInfo.acceleration)
         }
     }
 
     //自车状态(底盘)，车灯等。
+    @ChainLog(
+        linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_VEHICLE,
+        linkCode = CHAIN_LINK_ADAS,
+        endpoint = PAD,
+        nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_VEHICLE,
+        paramIndexes = [0, 1],
+        clientPkFileName = "sn"
+    )
     override fun onVehicleState(
         header: MessagePad.Header,
         vehicleState: VehicleStateOuterClass.VehicleState?
@@ -151,8 +166,8 @@ class MoGoAdasListenerImpl : OnAdasListener {
 
     //自动驾驶状态
     @ChainLog(
+        linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT,
         linkCode = CHAIN_LINK_ADAS,
-        linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_DATA,
         endpoint = PAD,
         nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_STATUS,
         paramIndexes = [0, 1],
@@ -189,8 +204,8 @@ class MoGoAdasListenerImpl : OnAdasListener {
 
     //监控
     @ChainLog(
+        linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT,
         linkCode = CHAIN_LINK_ADAS,
-        linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_DATA,
         endpoint = PAD,
         nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_GUARDIAN,
         paramIndexes = [0, 1],
@@ -222,28 +237,10 @@ class MoGoAdasListenerImpl : OnAdasListener {
         }
     }
 
-    //数据采集，badCase
-    @ChainLog(
-        linkCode = CHAIN_LINK_ADAS,
-        linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_DATA,
-        endpoint = PAD,
-        nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_RECORD,
-        paramIndexes = [0, 1],
-        clientPkFileName = "sn"
-    )
-    override fun onRecordResult(
-        header: MessagePad.Header,
-        recordPanel: RecordPanelOuterClass.RecordPanel?
-    ) {
-        if (recordPanel != null) {
-            invokeAutopilotRecordResult(recordPanel)
-        }
-    }
-
     //全局路径规划
     @ChainLog(
+        linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT,
         linkCode = CHAIN_LINK_ADAS,
-        linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_DATA,
         endpoint = PAD,
         nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_ROUTE,
         paramIndexes = [0, 1],
@@ -258,23 +255,41 @@ class MoGoAdasListenerImpl : OnAdasListener {
         }
     }
 
-    //预警信息
+    //数据采集，badCase
     @ChainLog(
+        linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT,
         linkCode = CHAIN_LINK_ADAS,
-        linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_DATA,
         endpoint = PAD,
-        nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_WARN,
+        nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_RECORD,
         paramIndexes = [0, 1],
         clientPkFileName = "sn"
     )
+    override fun onRecordResult(
+        header: MessagePad.Header,
+        recordPanel: RecordPanelOuterClass.RecordPanel?
+    ) {
+        if (recordPanel != null) {
+            invokeAutopilotRecordResult(recordPanel)
+        }
+    }
+
+    //预警信息
+//    @ChainLog(
+//        linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT,
+//        linkCode = CHAIN_LINK_ADAS,
+//        endpoint = PAD,
+//        nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_WARN,
+//        paramIndexes = [0, 1],
+//        clientPkFileName = "sn"
+//    )
     override fun onWarn(header: MessagePad.Header, warn: MessagePad.Warn?) {
         invokeAutopilotWarnMessage(warn)
     }
 
     //到站回调
     @ChainLog(
+        linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT,
         linkCode = CHAIN_LINK_ADAS,
-        linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_DATA,
         endpoint = PAD,
         nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_ARRIVE,
         paramIndexes = [0, 1],
diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java
index 5ab824a239..b27b57f21b 100644
--- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java
+++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java
@@ -1,18 +1,23 @@
 package com.mogo.eagle.core.function.autopilot.adapter;
 
+import android.content.Context;
 import android.text.TextUtils;
+import android.util.Log;
 
 import com.mogo.eagle.core.data.config.FunctionBuildConfig;
+import com.mogo.eagle.core.data.constants.MoGoConfig;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarConfigListener;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotIdentifyListener;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotVehicleStateListener;
+import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotCarConfigListenerManager;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotIdentifyListenerManager;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotVehicleStateListenerManager;
 import com.mogo.eagle.core.function.call.bindingcar.CallerBindingcarManager;
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
+import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
 import com.mogo.eagle.core.utilcode.util.ThreadUtils;
 import com.mogo.module.common.drawer.IdentifyDataDrawer;
-import com.zhidao.support.obu.ami.AmiClientManager;
 
 import org.jetbrains.annotations.NotNull;
 
@@ -22,46 +27,86 @@ import chassis.Chassis;
 import mogo.telematics.pad.MessagePad;
 import record_cache.RecordPanelOuterClass;
 
+import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_DEVA;
+
 public class MoGoHandAdasMsgManager implements
         IMoGoAutopilotIdentifyListener,
         IMoGoAutopilotVehicleStateListener,
-        IMoGoAutopilotCarConfigListener {
+        IMoGoAutopilotCarConfigListener{
 
     private final String TAG = "AdasEventManager";
 
     private static volatile MoGoHandAdasMsgManager moGoHandAdasMsgManager;
+    private Context mContext;
 
-    private MoGoHandAdasMsgManager() {
+    private MoGoHandAdasMsgManager(Context context) {
         CallerAutopilotIdentifyListenerManager.INSTANCE.addListener(TAG, this);
         CallerAutopilotVehicleStateListenerManager.INSTANCE.addListener(TAG, this);
+        CallerAutopilotCarConfigListenerManager.INSTANCE.addListener(TAG, this);
+        mContext = context;
     }
 
-    public static MoGoHandAdasMsgManager getInstance() {
+    public static MoGoHandAdasMsgManager getInstance(Context context) {
         if (moGoHandAdasMsgManager == null) {
             synchronized (MoGoHandAdasMsgManager.class) {
                 if (moGoHandAdasMsgManager == null) {
-                    moGoHandAdasMsgManager = new MoGoHandAdasMsgManager();
+                    moGoHandAdasMsgManager = new MoGoHandAdasMsgManager(context);
                 }
             }
         }
         return moGoHandAdasMsgManager;
     }
 
+    private int turnLightTimes = 0;
+    private boolean isOnTurnLight = false;
+    private int turnLight = 0;
+    private volatile boolean isShowTurnLight = false;
+    private int brakeLight = -1;
+
+
+    private int setTurnLightState(int turn_light) {
+        if (turn_light == 0) {
+            if (isOnTurnLight) {
+                if (turnLightTimes >= 10) {
+                    isOnTurnLight = false;
+                    turnLight = 0;
+                }
+                turnLightTimes++;
+            }
+        } else if (turn_light == 1) {
+            turnLightTimes = 0;
+            isOnTurnLight = true;
+            turnLight = 1;
+        } else if (turn_light == 2) {
+            turnLightTimes = 0;
+            isOnTurnLight = true;
+            turnLight = 2;
+        }
+        return turnLight;
+    }
+
     @Override
     public void onAutopilotLightSwitchData(Chassis.LightSwitch lightSwitch) {
         //can数据转发  转向灯状态 0是正常 1是左转 2是右转
-//        if (lightSwitch != null) {
-//            int turnLightNum = lightSwitch.getNumber();
-//            AmiClientManager.getInstance().setTurnLightState(turnLightNum);
-//            //设置转向灯
-//            CallerHmiManager.INSTANCE.showTurnLight(turnLightNum);
-//        }
+        if (lightSwitch != null) {
+            int state = setTurnLightState(lightSwitch.getNumber());
+            if (state == 1 || state == 2) {
+                isShowTurnLight = true;
+                CallerHmiManager.INSTANCE.showBrakeLight(0);
+            } else {
+                isShowTurnLight = false;
+            }
+//            CallerLogger.INSTANCE.d(M_DEVA + TAG, "onAutopilotLightSwitchData -- newState:" + state + ",oldState:" + lightSwitch.getNumber());
+            CallerHmiManager.INSTANCE.showTurnLight(state);
+        }
     }
 
     @Override
     public void onAutopilotBrakeLightData(boolean brakeLight) {
-        //设置刹车信息 TODO 需要添加转向和删除的优先级
-//        CallerHmiManager.INSTANCE.showBrakeLight(brakeLight ? 1 : 0);
+//        CallerLogger.INSTANCE.d(M_DEVA + TAG, "onAutopilotBrakeLightData -- brakeLight = $brakeLight ---$isShowTurnLight");
+//        if (!isShowTurnLight) {
+//            CallerHmiManager.INSTANCE.showBrakeLight(brakeLight ? 1 : 0);
+//        }
     }
 
     @Override
@@ -91,10 +136,28 @@ public class MoGoHandAdasMsgManager implements
 
     @Override
     public void onAutopilotCarConfig(@NotNull MessagePad.CarConfigResp carConfigResp) {
-//        if (carConfigResp != null && !TextUtils.isEmpty(carConfigResp.getMacAddress())) {
-//            CallerBindingcarManager.getBindingcarProvider().getBindingcarInfo(carConfigResp.getMacAddress());
-//        }
-
+        if (carConfigResp != null && !TextUtils.isEmpty(carConfigResp.getMacAddress())) {
+            CallerLogger.INSTANCE.d(M_DEVA + TAG, " carConfigResp.getMacAddress() = " + carConfigResp.getMacAddress() + "--mac = " + carConfigResp.getMacAddress().replaceAll(".{2}(?=.)", "$0:"));
+            CallerBindingcarManager.getBindingcarProvider().getBindingcarInfo(carConfigResp.getMacAddress());
+        }
     }
 
+    /**
+     * 根据加速度判断是否刹车
+     * @param acceleration
+     */
+    @Override
+    public void onAutopilotBrakeLightByAcceleration(double acceleration) {
+        //设置刹车信息
+        if (acceleration < SharedPrefsMgr.getInstance(mContext).getFloat(MoGoConfig.BRAKE_ACCELERATION_THRESHOLD,-2.5F)) {
+            brakeLight = 1;
+        } else {
+            brakeLight = 0;
+        }
+//        CallerLogger.INSTANCE.d(M_DEVA + TAG, "onAutopilotBrakeLightByAcceleration -- acceleration = " + acceleration);
+        if (!isShowTurnLight) {
+            CallerHmiManager.INSTANCE.showBrakeLight(brakeLight);
+        }
+
+    }
 }
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java
index 0bfee198e3..b529bd9228 100644
--- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java
+++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java
@@ -1,26 +1,30 @@
 package com.mogo.eagle.core.function.bindingcar;
 
 import android.content.Context;
+import android.text.TextUtils;
 import android.util.Log;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
+import com.mogo.commons.constants.SharedPrefsConstants;
 import com.mogo.eagle.core.data.constants.MogoServicePaths;
 import com.mogo.eagle.core.function.api.bindingcar.BindingcarCallBack;
 import com.mogo.eagle.core.function.api.bindingcar.IMoGoBindingcarProvider;
 import com.mogo.eagle.core.function.bindingcar.network.BindingcarNetWorkManager;
+import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
 
 import org.jetbrains.annotations.NotNull;
 
 
 /**
- * @author Jing
- * @description 云公告公告
- * @since: 10/27/21
+ * @author lixiaopeng
+ * @description 绑定sn
+ * @since: 3/26/22
  */
 @Route(path = MogoServicePaths.PATH_BINDING_CAR)
 public class BindingcarProvider implements IMoGoBindingcarProvider {
 
     private Context mContext;
+    private volatile String mAddress;
 
     @NotNull
     @Override
@@ -30,6 +34,7 @@ public class BindingcarProvider implements IMoGoBindingcarProvider {
 
     @Override
     public void onDestroy() {
+
     }
 
     @Override
@@ -38,21 +43,20 @@ public class BindingcarProvider implements IMoGoBindingcarProvider {
     }
 
     /**
-     * TODO 获取,每次连接请求一次
+     * 获取macaddress,每次连接请求一次
+     *
      * @param macAddress
      */
     @Override
     public void getBindingcarInfo(String macAddress) {
-//        Log.d("liyz", "macAddress = " + macAddress);
-//        BindingcarNetWorkManager.getInstance().getBindingcarInfo(macAddress);
+        mAddress = macAddress;
+        BindingcarNetWorkManager.getInstance().getBindingcarInfo(mContext, macAddress);
     }
 
     @Override
     public void modifyCarInfo(BindingcarCallBack callBack) {
-        BindingcarNetWorkManager.getInstance().modifyBindingcar("",callBack);
+        BindingcarNetWorkManager.getInstance().modifyBindingcar(mAddress, callBack);
     }
 
 
-
-
 }
diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarApiService.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarApiService.java
index d9e4a80a59..b6549f9b57 100644
--- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarApiService.java
+++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarApiService.java
@@ -2,11 +2,11 @@ package com.mogo.eagle.core.function.bindingcar.network;
 
 import com.mogo.eagle.core.data.bindingcar.BindingcarInfo;
 import com.mogo.eagle.core.data.bindingcar.ModifyBindingcarInfo;
-import com.mogo.eagle.core.data.notice.NoticeTrafficStyleInfo;
 
 import io.reactivex.Observable;
 import okhttp3.RequestBody;
 import retrofit2.http.Body;
+import retrofit2.http.Header;
 import retrofit2.http.Headers;
 import retrofit2.http.POST;
 
@@ -22,8 +22,8 @@ public interface BindingcarApiService {
      * @return {@link BindingcarInfo}
      */
     @Headers("Content-Type:application/json;charset=UTF-8")
-    @POST("/pad/selectPadByMac")
-    Observable<BindingcarInfo> getBindingcarInfo(@Body RequestBody requestBody);
+    @POST("pad/selectPadByMac")
+    Observable<BindingcarInfo> getBindingcarInfo(@Header("access_token") String access_token, @Body RequestBody requestBody);
 
     /**
      * 绑定和修改绑定车机
@@ -31,7 +31,7 @@ public interface BindingcarApiService {
      * @return {@link ModifyBindingcarInfo}
      */
     @Headers("Content-Type:application/json;charset=UTF-8")
-    @POST("/pad/updatePadByMac")
-    Observable<ModifyBindingcarInfo> modifyBindingcarInfo(@Body RequestBody requestBody);
+    @POST("pad/updatePadByMac")
+    Observable<ModifyBindingcarInfo> modifyBindingcarInfo(@Header("access_token") String access_token, @Body RequestBody requestBody);
 
 }
diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java
index 7e2ee35355..4a25019f50 100644
--- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java
+++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java
@@ -1,14 +1,18 @@
 package com.mogo.eagle.core.function.bindingcar.network;
 
-import android.util.Log;
+import android.content.Context;
 
-import com.mogo.cloud.network.RetrofitFactory;
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
+import com.mogo.commons.constants.SharedPrefsConstants;
 import com.mogo.eagle.core.data.bindingcar.BindingcarInfo;
 import com.mogo.eagle.core.data.bindingcar.ModifyBindingcarInfo;
 import com.mogo.eagle.core.function.api.bindingcar.BindingcarCallBack;
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
+import com.mogo.eagle.core.network.MoGoRetrofitFactory;
 import com.mogo.eagle.core.network.utils.GsonUtil;
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
+import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
+import com.mogo.module.common.constants.HostConst;
 
 import io.reactivex.Observer;
 import io.reactivex.android.schedulers.AndroidSchedulers;
@@ -19,19 +23,18 @@ import okhttp3.MediaType;
 import okhttp3.RequestBody;
 
 /**
- * @author Jing
- * @description 云公告网络请求类
- * @since: 10/28/21
+ * @author lixiaopeng
+ * @description 绑定车机网络请求
+ * @since: 3/25/22
  */
 public class BindingcarNetWorkManager {
     private static volatile BindingcarNetWorkManager requestNoticeManager;
     private final BindingcarApiService mBindingcarApiService;
+    private String token = "c4a2f30cebf64972bcd11577e1c07f86"; //中台做了接口适配，需要这个token
+    private static final String TAG = "BindingcarNetWorkManager";
 
-    private BindingcarNetWorkManager() { //TODO
-//        mBindingcarApiService = RetrofitFactory.INSTANCE.getInstance(NetConstants.DEVA_HOST)
-//                .create(BindingcarApiService.class);
-
-        mBindingcarApiService = RetrofitFactory.INSTANCE.getInstance("http://cmdb.ee-private-dev.myghost.zhidaoauto.com/")
+    private BindingcarNetWorkManager() {
+        mBindingcarApiService = MoGoRetrofitFactory.getInstance(HostConst.BINDING_SN_HOST)
                 .create(BindingcarApiService.class);
     }
 
@@ -46,85 +49,84 @@ public class BindingcarNetWorkManager {
         return requestNoticeManager;
     }
 
+
     /**
      * 获取绑定的车辆信息
      *
-     * @param macAddress mac地址 TODO
-     *
+     * @param macAddress mac地址
      */
-    public void getBindingcarInfo(String macAddress) {
+    public void getBindingcarInfo(Context context, String macAddress) {
         String sn = MoGoAiCloudClientConfig.getInstance().getSn();
-        BindingcarRequest request = new BindingcarRequest(sn, "48:b0:2d:3a:9c:19");
+        BindingcarRequest request = new BindingcarRequest(macAddress, sn);
         RequestBody requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request));
-        mBindingcarApiService.getBindingcarInfo(requestBody)
+        mBindingcarApiService.getBindingcarInfo(token, requestBody)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Observer<BindingcarInfo>() {
                     @Override
                     public void onSubscribe(@NonNull Disposable d) {
-                        Log.d("liyz", "getBindingcarInfo onSubscribe -----> ");
                     }
 
                     @Override
                     public void onNext(@NonNull BindingcarInfo info) {
                         if (info != null && info.getData() != null) {
-                            Log.d("liyz", "getBindingcarInfo onNext info.getData() =" + info.getData().toString());
+                            CallerLogger.INSTANCE.d(TAG, "getBindingcarInfo onNext info.getData() =" + info.getData().toString());
                             if (info.getData().getCompare() == 0) {
                                 CallerHmiManager.INSTANCE.showBindingcarDialog();
                             } else if (info.getData().getCompare() == 3) {
                                 CallerHmiManager.INSTANCE.showModifyBindingcarDialog();
                             }
+
+                            SharedPrefsMgr.getInstance(context).putString(SharedPrefsConstants.CAR_MODE_TYPE, info.data.getSeries());
                         }
                     }
 
                     @Override
                     public void onError(@NonNull Throwable e) {
-                        Log.d("liyz", "getBindingcarInfo onError e = " + e.toString() + "---e.getMessage = " + e.getMessage());
+                        CallerLogger.INSTANCE.e(TAG, "getBindingcarInfo onError e = " + e.toString() + "---e.getMessage = " + e.getMessage());
                     }
 
                     @Override
                     public void onComplete() {
-                        Log.d("liyz", "getBindingcarInfo onComplete");
                     }
                 });
 
     }
 
     /**
-     * 绑定和修改绑定车辆 TODO
+     * 绑定和修改绑定车辆
+     * mac: 48:b0:2d:3a:9c:19
      */
     public void modifyBindingcar(String macAddress, BindingcarCallBack callBack) {
         String sn = MoGoAiCloudClientConfig.getInstance().getSn();
-        BindingcarRequest request = new BindingcarRequest(sn, "48:b0:2d:3a:9c:19");
+        BindingcarRequest request = new BindingcarRequest(macAddress, sn);
         RequestBody requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request));
-        mBindingcarApiService.modifyBindingcarInfo(requestBody)
+        mBindingcarApiService.modifyBindingcarInfo(token, requestBody)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Observer<ModifyBindingcarInfo>() {
                     @Override
                     public void onSubscribe(@NonNull Disposable d) {
-                        Log.d("liyz", "modifyBindingcar onSubscribe -----> ");
                     }
 
                     @Override
                     public void onNext(@NonNull ModifyBindingcarInfo info) {
-                        if (info.getData() != null) {
+                        if (info != null) {
                             callBack.callBackResult(info);
+                            CallerLogger.INSTANCE.d(TAG, "modifyBindingcar onNext code = " + info.code + "---msg = " + info.msg + "--info.toString() = " + info.toString());
                         }
-                        Log.d("liyz", "modifyBindingcar onNext info " + info.toString());
                     }
 
                     @Override
                     public void onError(@NonNull Throwable e) {
-                        Log.d("liyz", "modifyBindingcar onError e = " + e.toString() + "---e.getMessage = " + e.getMessage());
+                        CallerLogger.INSTANCE.e(TAG, "modifyBindingcar onError e = " + e.toString() + "---e.getMessage = " + e.getMessage());
                     }
 
                     @Override
                     public void onComplete() {
-                        Log.d("liyz", "modifyBindingcar onComplete ");
                     }
                 });
+
     }
 
-
 }
diff --git a/core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/ui/CallChatWindowManager.kt b/core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/ui/CallChatWindowManager.kt
index f9db3ded23..e1529b3690 100644
--- a/core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/ui/CallChatWindowManager.kt
+++ b/core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/ui/CallChatWindowManager.kt
@@ -2,6 +2,7 @@ package com.mogo.eagle.core.function.chat.facade.ui
 
 import android.content.Context
 import android.media.AudioManager
+import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
 import android.widget.FrameLayout
@@ -28,10 +29,7 @@ import com.mogo.eagle.core.function.chat.facade.OnInComingCallback
 import com.mogo.eagle.core.function.chat.facade.bridge.BridgeApi
 import com.mogo.eagle.core.function.chat.facade.utils.log
 import com.mogo.eagle.core.function.chat.facade.voice.VoiceControlFacade.REQUEST_CLOUD_VOICE_CALL
-import com.mogo.eagle.core.utilcode.kotlin.lifeCycleScope
-import com.mogo.eagle.core.utilcode.kotlin.observe
-import com.mogo.eagle.core.utilcode.kotlin.onClick
-import com.mogo.eagle.core.utilcode.kotlin.safeCancel
+import com.mogo.eagle.core.utilcode.kotlin.*
 import com.mogo.eagle.core.utilcode.mogo.glide.GlideRoundedCornersTransform
 import com.mogo.eagle.core.utilcode.mogo.glide.GlideRoundedCornersTransform.CornerType.LEFT
 import kotlinx.coroutines.*
@@ -247,10 +245,9 @@ internal class CallChatWindowManager {
             context.resources.getDimension(R.dimen.module_call_chat_state_incoming_hawk_eye_width).toInt(),
             context.resources.getDimension(R.dimen.module_call_chat_state_incoming_hawk_eye_height).toInt())
             .also {
-                val x = context.resources.getDimension(R.dimen.module_call_chat_state_location_hawk_eye_x)
-                val y = context.resources.getDimension(R.dimen.module_call_chat_state_location_hawk_eye_y)
-                it.leftMargin = x.toInt()
-                it.topMargin = y.toInt()
+                it.gravity = Gravity.BOTTOM or Gravity.START
+                it.marginStart = 40.PX
+                it.bottomMargin = 168.PX
             }
     }
 
@@ -370,8 +367,9 @@ internal class CallChatWindowManager {
                 context.resources.getDimension(R.dimen.module_call_chat_state_hawk_eye_height).toInt()
              )
             .also {
-                it.leftMargin = context.resources.getDimension(R.dimen.module_call_chat_state_location_hawk_eye_x).toInt()
-                it.topMargin = context.resources.getDimension(R.dimen.module_call_chat_state_location_hawk_eye_y).toInt()
+                it.gravity = Gravity.BOTTOM or Gravity.START
+                it.marginStart = 40.PX
+                it.bottomMargin = 168.PX
             }
     }
 
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_launcher_calling_bg.9.png b/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_launcher_calling_bg.9.png
deleted file mode 100644
index 96ddb81326..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_launcher_calling_bg.9.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_fragment.png b/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_fragment.png
deleted file mode 100644
index 950d184e38..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_fragment.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_fragment_close_normal.png b/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_fragment_close_normal.png
deleted file mode 100644
index 12ae03bfed..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_fragment_close_normal.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_fragment_close_pressed.png b/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_fragment_close_pressed.png
deleted file mode 100644
index f81ff730e4..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_fragment_close_pressed.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_fragment_x.png b/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_fragment_x.png
deleted file mode 100644
index f7530c5024..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_fragment_x.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_invitation_hawk_eye_head_default.png b/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_invitation_hawk_eye_head_default.png
deleted file mode 100644
index eacbf33bf8..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_invitation_hawk_eye_head_default.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_invitation_hawk_eye_join_normal.png b/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_invitation_hawk_eye_join_normal.png
deleted file mode 100644
index 6f301e97ab..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_invitation_hawk_eye_join_normal.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_invitation_hawk_eye_join_pressed.png b/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_invitation_hawk_eye_join_pressed.png
deleted file mode 100644
index 6f5411a704..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_invitation_hawk_eye_join_pressed.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_invitation_hawk_eye_refuse_normal.png b/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_invitation_hawk_eye_refuse_normal.png
deleted file mode 100644
index ee7fbb5dfe..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_invitation_hawk_eye_refuse_normal.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_invitation_hawk_eye_refuse_pressed.png b/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_invitation_hawk_eye_refuse_pressed.png
deleted file mode 100644
index 0b1873ee8f..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_invitation_hawk_eye_refuse_pressed.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_invitation_head_default.png b/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_invitation_head_default.png
deleted file mode 100644
index 4a891e57e5..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_invitation_head_default.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_invitation_join_normal.png b/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_invitation_join_normal.png
deleted file mode 100644
index acf19225e1..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_invitation_join_normal.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_invitation_join_pressed.png b/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_invitation_join_pressed.png
deleted file mode 100644
index d13ff23373..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_invitation_join_pressed.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_invitation_refuse_normal.png b/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_invitation_refuse_normal.png
deleted file mode 100644
index f7530c5024..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_invitation_refuse_normal.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_invitation_refuse_pressed.png b/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_invitation_refuse_pressed.png
deleted file mode 100644
index 950d184e38..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_invitation_refuse_pressed.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_quit_normal.png b/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_quit_normal.png
deleted file mode 100644
index 0bd4b588e1..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_quit_normal.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_quit_pressed.png b/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_quit_pressed.png
deleted file mode 100644
index 8954c0a15e..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-hdpi/module_carchatting_team_quit_pressed.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-mdpi/module_carchatting_launcher_calling_bg.9.png b/core/function-impl/mogo-core-function-chat/src/main/res/drawable-mdpi/module_carchatting_launcher_calling_bg.9.png
deleted file mode 100644
index fa35eccafd..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-mdpi/module_carchatting_launcher_calling_bg.9.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-mdpi/module_carchatting_team_fragment.png b/core/function-impl/mogo-core-function-chat/src/main/res/drawable-mdpi/module_carchatting_team_fragment.png
deleted file mode 100644
index b04650a030..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-mdpi/module_carchatting_team_fragment.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-mdpi/module_carchatting_team_fragment_close_normal.png b/core/function-impl/mogo-core-function-chat/src/main/res/drawable-mdpi/module_carchatting_team_fragment_close_normal.png
deleted file mode 100644
index 12ae03bfed..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-mdpi/module_carchatting_team_fragment_close_normal.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-mdpi/module_carchatting_team_fragment_close_pressed.png b/core/function-impl/mogo-core-function-chat/src/main/res/drawable-mdpi/module_carchatting_team_fragment_close_pressed.png
deleted file mode 100644
index f81ff730e4..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-mdpi/module_carchatting_team_fragment_close_pressed.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-mdpi/module_carchatting_team_fragment_x.png b/core/function-impl/mogo-core-function-chat/src/main/res/drawable-mdpi/module_carchatting_team_fragment_x.png
deleted file mode 100644
index f274a5fa76..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-mdpi/module_carchatting_team_fragment_x.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-mdpi/module_carchatting_team_invitation_head_default.png b/core/function-impl/mogo-core-function-chat/src/main/res/drawable-mdpi/module_carchatting_team_invitation_head_default.png
deleted file mode 100644
index 53051d4e9e..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-mdpi/module_carchatting_team_invitation_head_default.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-mdpi/module_carchatting_team_invitation_join_normal.png b/core/function-impl/mogo-core-function-chat/src/main/res/drawable-mdpi/module_carchatting_team_invitation_join_normal.png
deleted file mode 100644
index cf3e4aa222..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-mdpi/module_carchatting_team_invitation_join_normal.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-mdpi/module_carchatting_team_invitation_join_pressed.png b/core/function-impl/mogo-core-function-chat/src/main/res/drawable-mdpi/module_carchatting_team_invitation_join_pressed.png
deleted file mode 100644
index b5a28f5583..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-mdpi/module_carchatting_team_invitation_join_pressed.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-mdpi/module_carchatting_team_invitation_refuse_normal.png b/core/function-impl/mogo-core-function-chat/src/main/res/drawable-mdpi/module_carchatting_team_invitation_refuse_normal.png
deleted file mode 100644
index f274a5fa76..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-mdpi/module_carchatting_team_invitation_refuse_normal.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-mdpi/module_carchatting_team_invitation_refuse_pressed.png b/core/function-impl/mogo-core-function-chat/src/main/res/drawable-mdpi/module_carchatting_team_invitation_refuse_pressed.png
deleted file mode 100644
index b04650a030..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-mdpi/module_carchatting_team_invitation_refuse_pressed.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-mdpi/module_carchatting_team_quit_normal.png b/core/function-impl/mogo-core-function-chat/src/main/res/drawable-mdpi/module_carchatting_team_quit_normal.png
deleted file mode 100644
index f22c026f58..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-mdpi/module_carchatting_team_quit_normal.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-mdpi/module_carchatting_team_quit_pressed.png b/core/function-impl/mogo-core-function-chat/src/main/res/drawable-mdpi/module_carchatting_team_quit_pressed.png
deleted file mode 100644
index a1f1234504..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-mdpi/module_carchatting_team_quit_pressed.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-xhdpi/module_carchatting_launcher_calling_bg.9.png b/core/function-impl/mogo-core-function-chat/src/main/res/drawable-xhdpi/module_carchatting_launcher_calling_bg.9.png
deleted file mode 100644
index 96ddb81326..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-xhdpi/module_carchatting_launcher_calling_bg.9.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-xhdpi/module_carchatting_launcher_hawk_eye_calling_bg.png b/core/function-impl/mogo-core-function-chat/src/main/res/drawable-xhdpi/module_carchatting_launcher_hawk_eye_calling_bg.png
deleted file mode 100644
index 2357cb985b..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-xhdpi/module_carchatting_launcher_hawk_eye_calling_bg.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-xhdpi/module_carchatting_team_invitation_hawk_eye_bg.png b/core/function-impl/mogo-core-function-chat/src/main/res/drawable-xhdpi/module_carchatting_team_invitation_hawk_eye_bg.png
deleted file mode 100644
index c2c244c134..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-xhdpi/module_carchatting_team_invitation_hawk_eye_bg.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-xhdpi/module_carchatting_team_invitation_hawk_eye_head_default.png b/core/function-impl/mogo-core-function-chat/src/main/res/drawable-xhdpi/module_carchatting_team_invitation_hawk_eye_head_default.png
deleted file mode 100644
index eacbf33bf8..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-xhdpi/module_carchatting_team_invitation_hawk_eye_head_default.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-xhdpi/module_carchatting_team_invitation_hawk_eye_join_normal.png b/core/function-impl/mogo-core-function-chat/src/main/res/drawable-xhdpi/module_carchatting_team_invitation_hawk_eye_join_normal.png
deleted file mode 100644
index 6f301e97ab..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-xhdpi/module_carchatting_team_invitation_hawk_eye_join_normal.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-xhdpi/module_carchatting_team_invitation_hawk_eye_join_pressed.png b/core/function-impl/mogo-core-function-chat/src/main/res/drawable-xhdpi/module_carchatting_team_invitation_hawk_eye_join_pressed.png
deleted file mode 100644
index 6f5411a704..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-xhdpi/module_carchatting_team_invitation_hawk_eye_join_pressed.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-xhdpi/module_carchatting_team_invitation_hawk_eye_refuse_normal.png b/core/function-impl/mogo-core-function-chat/src/main/res/drawable-xhdpi/module_carchatting_team_invitation_hawk_eye_refuse_normal.png
deleted file mode 100644
index ee7fbb5dfe..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-xhdpi/module_carchatting_team_invitation_hawk_eye_refuse_normal.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-xhdpi/module_carchatting_team_invitation_hawk_eye_refuse_pressed.png b/core/function-impl/mogo-core-function-chat/src/main/res/drawable-xhdpi/module_carchatting_team_invitation_hawk_eye_refuse_pressed.png
deleted file mode 100644
index 0b1873ee8f..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/drawable-xhdpi/module_carchatting_team_invitation_hawk_eye_refuse_pressed.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_callchatting_shape_gradient_blue.xml b/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_callchatting_shape_gradient_blue.xml
deleted file mode 100644
index be1941fa09..0000000000
--- a/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_callchatting_shape_gradient_blue.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/module_callchatting_shape_gradient_blue_normal" android:state_pressed="false" />
-    <item android:drawable="@drawable/module_callchatting_shape_gradient_blue_pressed" android:state_pressed="true" />
-</selector>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_callchatting_shape_gradient_blue_normal.xml b/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_callchatting_shape_gradient_blue_normal.xml
deleted file mode 100644
index e8d86c9442..0000000000
--- a/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_callchatting_shape_gradient_blue_normal.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="@dimen/dp_16" />
-    <gradient
-        android:angle="0"
-        android:endColor="#1F7EFF"
-        android:startColor="#1E57A4" />
-
-</shape>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_callchatting_shape_gradient_blue_pressed.xml b/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_callchatting_shape_gradient_blue_pressed.xml
deleted file mode 100644
index c55995839e..0000000000
--- a/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_callchatting_shape_gradient_blue_pressed.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="@dimen/dp_16" />
-    <gradient
-        android:angle="0"
-        android:endColor="#1363A4"
-        android:startColor="#164079" />
-
-</shape>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_callchatting_user_pop_call_bg.xml b/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_callchatting_user_pop_call_bg.xml
deleted file mode 100644
index 83ee0bdebb..0000000000
--- a/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_callchatting_user_pop_call_bg.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/module_callchatting_user_pop_call_bg_normal" android:state_pressed="false" />
-    <item android:drawable="@drawable/module_callchatting_user_pop_call_bg_pressed" android:state_pressed="true" />
-</selector>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_callchatting_user_pop_call_bg_normal.xml b/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_callchatting_user_pop_call_bg_normal.xml
deleted file mode 100644
index b9765da6bb..0000000000
--- a/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_callchatting_user_pop_call_bg_normal.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="@dimen/dp_16" />
-    <gradient
-        android:angle="0"
-        android:endColor="#585E8B"
-        android:startColor="#4A4C70" />
-
-</shape>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_callchatting_user_pop_call_bg_pressed.xml b/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_callchatting_user_pop_call_bg_pressed.xml
deleted file mode 100644
index 21bf8c6e8e..0000000000
--- a/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_callchatting_user_pop_call_bg_pressed.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="@dimen/dp_16" />
-    <gradient
-        android:angle="0"
-        android:endColor="#383C5E"
-        android:startColor="#373856" />
-
-</shape>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_carchatting_team_fragment_bg.xml b/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_carchatting_team_fragment_bg.xml
deleted file mode 100644
index 1965671b5d..0000000000
--- a/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_carchatting_team_fragment_bg.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="@dimen/dp_30" />
-    <solid android:color="#F710121E" />
-</shape>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_carchatting_team_fragment_close.xml b/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_carchatting_team_fragment_close.xml
deleted file mode 100644
index b369d3a308..0000000000
--- a/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_carchatting_team_fragment_close.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/module_carchatting_team_fragment_close_normal" android:state_pressed="false" />
-    <item android:drawable="@drawable/module_carchatting_team_fragment_close_pressed" android:state_pressed="true" />
-</selector>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_carchatting_team_invitation_bg.xml b/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_carchatting_team_invitation_bg.xml
deleted file mode 100644
index 28a3d7870b..0000000000
--- a/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_carchatting_team_invitation_bg.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="@dimen/dp_30" />
-    <gradient
-        android:angle="180"
-        android:endColor="#3F4057"
-        android:startColor="#5E6079" />
-</shape>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_carchatting_team_invitation_hawk_eye_header_bg.xml b/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_carchatting_team_invitation_hawk_eye_header_bg.xml
deleted file mode 100644
index ef8a4f7ea6..0000000000
--- a/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_carchatting_team_invitation_hawk_eye_header_bg.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:topLeftRadius="@dimen/module_call_chat_team_invitation_hawk_eye_bg_corner"
-        android:bottomLeftRadius="@dimen/module_call_chat_team_invitation_hawk_eye_bg_corner"/>
-    <gradient
-        android:angle="135"
-        android:endColor="#22E2FE"
-        android:startColor="#005CFF" />
-</shape>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_carchatting_team_invitation_hawk_eye_join.xml b/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_carchatting_team_invitation_hawk_eye_join.xml
deleted file mode 100644
index a38fdde074..0000000000
--- a/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_carchatting_team_invitation_hawk_eye_join.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/module_carchatting_team_invitation_hawk_eye_join_normal" android:state_pressed="false" />
-    <item android:drawable="@drawable/module_carchatting_team_invitation_hawk_eye_join_pressed" android:state_pressed="true" />
-</selector>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_carchatting_team_invitation_hawk_eye_refuse.xml b/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_carchatting_team_invitation_hawk_eye_refuse.xml
deleted file mode 100644
index f934359daf..0000000000
--- a/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_carchatting_team_invitation_hawk_eye_refuse.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/module_carchatting_team_invitation_hawk_eye_refuse_normal" android:state_pressed="false" />
-    <item android:drawable="@drawable/module_carchatting_team_invitation_hawk_eye_refuse_pressed" android:state_pressed="true" />
-</selector>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_carchatting_team_invitation_join.xml b/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_carchatting_team_invitation_join.xml
deleted file mode 100644
index 12f805d13f..0000000000
--- a/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_carchatting_team_invitation_join.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/module_carchatting_team_invitation_join_normal" android:state_pressed="false" />
-    <item android:drawable="@drawable/module_carchatting_team_invitation_join_pressed" android:state_pressed="true" />
-</selector>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_carchatting_team_invitation_refuse.xml b/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_carchatting_team_invitation_refuse.xml
deleted file mode 100644
index 2981370f58..0000000000
--- a/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_carchatting_team_invitation_refuse.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/module_carchatting_team_invitation_refuse_normal" android:state_pressed="false" />
-    <item android:drawable="@drawable/module_carchatting_team_invitation_refuse_pressed" android:state_pressed="true" />
-</selector>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_carchatting_team_invitation_title_bg.xml b/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_carchatting_team_invitation_title_bg.xml
deleted file mode 100644
index 0bd680b478..0000000000
--- a/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_carchatting_team_invitation_title_bg.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="@dimen/dp_11" />
-    <gradient
-        android:angle="180"
-        android:endColor="#1DAAA5"
-        android:startColor="#37DED9" />
-</shape>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_carchatting_team_quit.xml b/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_carchatting_team_quit.xml
deleted file mode 100644
index 286dfde9e6..0000000000
--- a/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_carchatting_team_quit.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/module_carchatting_team_quit_normal" android:state_pressed="false" />
-    <item android:drawable="@drawable/module_carchatting_team_quit_pressed" android:state_pressed="true" />
-</selector>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_carchatting_team_teammate_bg.xml b/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_carchatting_team_teammate_bg.xml
deleted file mode 100644
index c1e6217fbe..0000000000
--- a/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_carchatting_team_teammate_bg.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="@dimen/dp_23" />
-    <solid android:color="#FF1F2131" />
-</shape>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_carchatting_team_teammate_follower_bg.xml b/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_carchatting_team_teammate_follower_bg.xml
deleted file mode 100644
index e1f1abd61e..0000000000
--- a/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_carchatting_team_teammate_follower_bg.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="@dimen/dp_11" />
-    <gradient
-        android:angle="180"
-        android:endColor="#4E5069"
-        android:startColor="#4E5069" />
-</shape>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_carchatting_team_teammate_leader_bg.xml b/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_carchatting_team_teammate_leader_bg.xml
deleted file mode 100644
index 72421b5d37..0000000000
--- a/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_carchatting_team_teammate_leader_bg.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="@dimen/dp_11" />
-    <gradient
-        android:angle="180"
-        android:endColor="#256BFF"
-        android:startColor="#5CC1FF" />
-</shape>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_carchatting_vr_team_num_bg.xml b/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_carchatting_vr_team_num_bg.xml
deleted file mode 100644
index ca94787528..0000000000
--- a/core/function-impl/mogo-core-function-chat/src/main/res/drawable/module_carchatting_vr_team_num_bg.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <gradient
-
-        android:endColor="#595FA2"
-        android:startColor="#43508E"></gradient>
-    <size
-        android:width="@dimen/dp_80"
-        android:height="@dimen/dp_80" />
-</shape>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/layout/module_car_chatting_fragment_team_view.xml b/core/function-impl/mogo-core-function-chat/src/main/res/layout/module_car_chatting_fragment_team_view.xml
deleted file mode 100644
index 6dff11c8fb..0000000000
--- a/core/function-impl/mogo-core-function-chat/src/main/res/layout/module_car_chatting_fragment_team_view.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_margin="@dimen/module_call_chat_team_fragment_margin"
-    android:elevation="@dimen/dp_10"
-    android:background="@drawable/module_carchatting_team_fragment_bg"
-    android:clickable="true"
-    android:padding="@dimen/module_call_chat_team_fragment_padding">
-
-    <TextView
-        android:id="@+id/tv_num"
-        android:layout_width="wrap_content"
-        android:layout_height="@dimen/module_call_chat_team_fragment_close_view_height"
-        android:gravity="center_vertical"
-        android:text="车队人数"
-        android:textColor="@color/module_carchatting_white_color"
-        android:textSize="@dimen/module_call_chat_team_fragment_num_text_size"
-        app:layout_constraintBaseline_toBaselineOf="@+id/iv_close"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <ImageView
-        android:id="@+id/iv_close"
-        android:layout_width="@dimen/module_call_chat_team_fragment_close_view_width"
-        android:layout_height="@dimen/module_call_chat_team_fragment_close_view_height"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/module_carchatting_team_fragment_close"
-        tools:ignore="ContentDescription" />
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/rv_teammates"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_marginTop="@dimen/module_call_chat_team_fragment_teammates__margin_top"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/iv_close" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/layout/module_car_chatting_launcher_calling_hawk_eye_view.xml b/core/function-impl/mogo-core-function-chat/src/main/res/layout/module_car_chatting_launcher_calling_hawk_eye_view.xml
index 71ade7e3ea..13272210f3 100644
--- a/core/function-impl/mogo-core-function-chat/src/main/res/layout/module_car_chatting_launcher_calling_hawk_eye_view.xml
+++ b/core/function-impl/mogo-core-function-chat/src/main/res/layout/module_car_chatting_launcher_calling_hawk_eye_view.xml
@@ -2,261 +2,55 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/module_carchatting_rl_call_view"
+    android:clickable="true"
+    android:focusable="true"
     android:layout_width="@dimen/module_call_chat_state_hawk_eye_width"
     android:layout_height="@dimen/module_call_chat_state_hawk_eye_height"
-    android:background="@drawable/module_carchatting_vr_calling_bg"
-    android:orientation="vertical">
+    android:background="@drawable/module_carchatting_vr_calling_bg">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/module_carchatting_rl_match_init_view"
-        android:layout_width="@dimen/module_call_chat_view_match_width"
-        android:layout_height="@dimen/module_call_chat_state_hawk_eye_height"
-        android:background="@drawable/module_callchatting_shape_gradient_blue"
-        android:visibility="gone"
-        app:layout_constraintLeft_toLeftOf="parent"
+    <ImageView
+        android:id="@+id/module_carchatting_call_head"
+        android:layout_width="@dimen/module_call_chat_calling_iv_hawk_eye_width_height"
+        android:layout_height="@dimen/module_call_chat_calling_iv_hawk_eye_width_height"
+        android:scaleType="centerInside"
+        android:src="@mipmap/module_carchatting_hawk_eye_default_head_img"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="ContentDescription" />
 
-        <ImageView
-            android:layout_width="@dimen/module_call_chat_match_iv_width"
-            android:layout_height="@dimen/module_call_chat_match_iv_height"
-            android:layout_marginStart="@dimen/dp_16"
-            android:src="@mipmap/module_callchatting_match"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:ignore="ContentDescription" />
+    <ImageView
+        android:id="@+id/module_carchatting_call_hangUp"
+        android:layout_width="@dimen/module_call_chat_hawk_eye_circle_btn_size"
+        android:layout_height="@dimen/module_call_chat_hawk_eye_circle_btn_size"
+        android:layout_marginEnd="@dimen/module_call_chat_calling_iv_hawk_eye_margin_left_right"
+        android:scaleType="centerInside"
+        android:src="@mipmap/module_carchatting_launcher_calling_hangup"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="ContentDescription" />
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/module_call_chat_view_margin_end"
-            android:text="@string/module_car_chat_match_tip"
-            android:textColor="@android:color/white"
-            android:textSize="@dimen/module_call_chat_match_text_size"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/module_carchatting_rl_matching_view"
-        android:layout_width="@dimen/module_call_chat_state_hawk_eye_width"
-        android:layout_height="@dimen/module_call_chat_state_hawk_eye_height"
-        android:visibility="gone"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_30"
-            android:text="@string/module_car_chat_matching"
-            android:textColor="@android:color/white"
-            android:textSize="@dimen/module_call_chat_matching_textsize"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/module_carchatting_tv_cancel_match"
-            android:layout_width="@dimen/module_call_chat_state_hawk_eye_height"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            android:text="@string/module_car_chat_matching_cancel"
-            android:textColor="@color/module_carchatting_red_color"
-            android:textSize="@dimen/module_call_chat_matching_text_size"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <View
-            android:layout_width="1px"
-            android:layout_height="match_parent"
-            android:layout_marginTop="@dimen/module_call_chat_match_view_line_margin_top_bottom"
-            android:layout_marginBottom="@dimen/module_call_chat_match_view_line_margin_top_bottom"
-            android:background="@color/module_carchatting_match_line"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/module_carchatting_tv_cancel_match"
-            app:layout_constraintTop_toTopOf="parent" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/module_carchatting_rl_call_view"
-        android:layout_width="@dimen/module_call_chat_state_hawk_eye_width"
-        android:layout_height="@dimen/module_call_chat_state_hawk_eye_height"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <ImageView
-            android:id="@+id/module_carchatting_call_head"
-            android:layout_width="@dimen/module_call_chat_calling_iv_hawk_eye_width_height"
-            android:layout_height="@dimen/module_call_chat_calling_iv_hawk_eye_width_height"
-            android:clickable="true"
-            android:scaleType="centerInside"
-            android:src="@mipmap/module_carchatting_hawk_eye_default_head_img"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:ignore="ContentDescription" />
-
-        <ImageView
-            android:id="@+id/module_carchatting_call_hangUp"
-            android:layout_width="@dimen/module_call_chat_hawk_eye_circle_btn_size"
-            android:layout_height="@dimen/module_call_chat_hawk_eye_circle_btn_size"
-            android:layout_marginEnd="@dimen/module_call_chat_calling_iv_hawk_eye_margin_left_right"
-            android:scaleType="centerInside"
-            android:src="@mipmap/module_carchatting_launcher_calling_hangup"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:ignore="ContentDescription" />
-
-        <TextView
-            android:id="@+id/module_carchatting_call_time"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/module_call_chat_calling_text_hawk_eye_margin_top_bottom"
-            android:text="@string/module_car_chat_matching_wait"
-            android:textColor="@color/module_carchatting_hawk_eye_status_color"
-            android:textSize="@dimen/module_call_chat_calling_text_hawk_eye_time_size"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="@+id/module_carchatting_call_nickname" />
-
-        <TextView
-            android:id="@+id/module_carchatting_call_nickname"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_22"
-            android:layout_marginTop="@dimen/module_call_chat_calling_text_hawk_eye_margin_top_bottom"
-            android:textColor="@android:color/white"
-            android:textSize="@dimen/module_call_chat_calling_text_hawk_eye_name_size"
-            app:layout_constraintStart_toEndOf="@+id/module_carchatting_call_head"
-            app:layout_constraintTop_toTopOf="parent" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/module_carchatting_team_rl_view"
-        android:layout_width="@dimen/module_call_chat_state_hawk_eye_width"
-        android:layout_height="@dimen/module_call_chat_state_hawk_eye_height"
-        android:visibility="gone"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <ImageView
-            android:id="@+id/module_carchatting_iv_team_quit"
-            android:layout_width="@dimen/module_call_chat_hawk_eye_circle_btn_size"
-            android:layout_height="@dimen/module_call_chat_hawk_eye_circle_btn_size"
-            android:layout_marginRight="@dimen/module_call_chat_calling_iv_hawk_eye_margin_left_right"
-            android:src="@drawable/module_carchatting_team_quit"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:ignore="ContentDescription" />
-
-        <LinearLayout
-            android:id="@+id/module_carchatting_team_ll_head"
-            android:layout_width="@dimen/module_call_chat_team_ll_head_width"
-            android:layout_height="@dimen/module_call_chat_state_hawk_eye_height"
-            android:gravity="center"
-            android:visibility="invisible"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <TextView
-                android:id="@+id/module_carchatting_team_num"
-                android:layout_width="@dimen/module_call_chat_team_num_width"
-                android:layout_height="@dimen/module_call_chat_team_num_width"
-                android:background="@drawable/module_carchatting_vr_team_num_bg"
-                android:gravity="center"
-                android:textColor="@android:color/white"
-                android:textSize="@dimen/module_call_chat_team_num_text_size"
-                android:visibility="gone" />
-
-            <de.hdodenhof.circleimageview.CircleImageView
-                android:id="@+id/module_carchatting_civ_head0"
-                android:layout_width="@dimen/module_call_chat_team_head_view_width"
-                android:layout_height="@dimen/module_call_chat_team_head_view_height"
-                android:src="@mipmap/module_carchatting_default_head_img"
-                android:translationZ="@dimen/dp_1_5"
-                android:visibility="gone"
-                app:civ_border_color="#FFFFFF"
-                app:civ_border_width="2dp" />
-
-            <de.hdodenhof.circleimageview.CircleImageView
-                android:id="@+id/module_carchatting_civ_head1"
-                android:layout_width="@dimen/module_call_chat_team_head_view_width"
-                android:layout_height="@dimen/module_call_chat_team_head_view_height"
-                android:layout_marginLeft="@dimen/module_call_chat_team_head_view_left_margin"
-                android:src="@mipmap/module_carchatting_default_head_img"
-                android:translationZ="@dimen/dp_1"
-                android:visibility="gone"
-                app:civ_border_color="#FFFFFF"
-                app:civ_border_width="2dp" />
-
-            <de.hdodenhof.circleimageview.CircleImageView
-                android:id="@+id/module_carchatting_civ_head2"
-                android:layout_width="@dimen/module_call_chat_team_head_view_width"
-                android:layout_height="@dimen/module_call_chat_team_head_view_height"
-                android:layout_marginLeft="@dimen/module_call_chat_team_head_view_left_margin"
-                android:src="@mipmap/module_carchatting_default_head_img"
-                android:translationZ="@dimen/dp_0_5"
-                android:visibility="gone"
-                app:civ_border_color="#FFFFFF"
-                app:civ_border_width="2dp" />
-
-            <de.hdodenhof.circleimageview.CircleImageView
-                android:id="@+id/module_carchatting_civ_head3"
-                android:layout_width="@dimen/module_call_chat_team_head_view_width"
-                android:layout_height="@dimen/module_call_chat_team_head_view_height"
-                android:layout_marginLeft="@dimen/module_call_chat_team_head_view_left_margin4"
-                android:layout_marginTop="@dimen/module_call_chat_team_head_view_top_margin"
-                android:src="@mipmap/module_carchatting_default_head_img"
-                android:translationZ="@dimen/dp_0_1"
-                android:visibility="gone"
-                app:civ_border_color="#FFFFFF"
-                app:civ_border_width="2dp" />
-
-            <de.hdodenhof.circleimageview.CircleImageView
-                android:id="@+id/module_carchatting_civ_head4"
-                android:layout_width="@dimen/module_call_chat_team_head_view_width"
-                android:layout_height="@dimen/module_call_chat_team_head_view_height"
-                android:layout_marginLeft="@dimen/module_call_chat_team_head_view_left_margin"
-                android:layout_marginTop="@dimen/module_call_chat_team_head_view_top_margin"
-                android:src="@mipmap/module_carchatting_default_head_img"
-                android:translationZ="@dimen/dp_0"
-                android:visibility="gone"
-                app:civ_border_color="#FFFFFF"
-                app:civ_border_width="2dp" />
-        </LinearLayout>
-
-        <TextView
-            android:id="@+id/module_carchatting_team_tv_info"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/module_call_chat_team_info_margin_bottom"
-            android:text="@string/module_car_chat_team_info"
-            android:textColor="#7FFFFFFF"
-            android:textSize="@dimen/module_call_chat_team_info_text_size"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/module_carchatting_team_ll_head" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/module_call_chat_team_chatting_margin_top"
-            android:text="@string/module_car_chat_team_calling"
-            android:textColor="@android:color/white"
-            android:textSize="@dimen/module_call_chat_team_chatting_text_size"
-            android:textStyle="bold"
-            app:layout_constraintStart_toEndOf="@+id/module_carchatting_team_ll_head"
-            app:layout_constraintTop_toTopOf="parent" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
+    <TextView
+        android:id="@+id/module_carchatting_call_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/module_call_chat_calling_text_hawk_eye_margin_top_bottom"
+        android:text="@string/module_car_chat_matching_wait"
+        android:textColor="@color/module_carchatting_hawk_eye_status_color"
+        android:textSize="@dimen/module_call_chat_calling_text_hawk_eye_time_size"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="@+id/module_carchatting_call_nickname" />
 
+    <TextView
+        android:id="@+id/module_carchatting_call_nickname"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/dp_22"
+        android:layout_marginTop="@dimen/module_call_chat_calling_text_hawk_eye_margin_top_bottom"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/module_call_chat_calling_text_hawk_eye_name_size"
+        app:layout_constraintStart_toEndOf="@+id/module_carchatting_call_head"
+        app:layout_constraintTop_toTopOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/layout/module_car_chatting_launcher_calling_view.xml b/core/function-impl/mogo-core-function-chat/src/main/res/layout/module_car_chatting_launcher_calling_view.xml
deleted file mode 100644
index f2029d834a..0000000000
--- a/core/function-impl/mogo-core-function-chat/src/main/res/layout/module_car_chatting_launcher_calling_view.xml
+++ /dev/null
@@ -1,257 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="@dimen/module_call_chat_state_width"
-    android:layout_height="@dimen/module_call_chat_state_height"
-    android:orientation="vertical">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/module_carchatting_rl_match_init_view"
-        android:layout_width="@dimen/module_call_chat_view_match_width"
-        android:layout_height="@dimen/module_call_chat_state_height"
-        android:background="@drawable/module_callchatting_shape_gradient_blue"
-        android:visibility="gone"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <ImageView
-            android:layout_width="@dimen/module_call_chat_match_iv_width"
-            android:layout_height="@dimen/module_call_chat_match_iv_height"
-            android:layout_marginStart="@dimen/module_call_chat_match_iv_left_margin"
-            android:src="@mipmap/module_callchatting_match"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:ignore="ContentDescription" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/module_call_chat_view_margin_end"
-            android:text="@string/module_car_chat_match_tip"
-            android:textColor="@color/module_carchatting_white_color"
-            android:textSize="@dimen/module_call_chat_match_text_size"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/module_carchatting_rl_matching_view"
-        android:layout_width="@dimen/module_call_chat_state_width"
-        android:layout_height="@dimen/module_call_chat_state_height"
-        android:background="@drawable/module_carchatting_launcher_calling_bg"
-        android:visibility="gone"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/module_call_chat_match_view_left_margin"
-            android:text="@string/module_car_chat_matching"
-            android:textColor="@color/module_carchatting_white_color"
-            android:textSize="@dimen/module_call_chat_matching_text_size"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/module_carchatting_tv_cancel_match"
-            android:layout_width="90px"
-            android:layout_height="match_parent"
-            android:layout_marginEnd="@dimen/module_call_chat_match_view_right_margin"
-            android:gravity="center"
-            android:text="@string/module_car_chat_matching_cancel"
-            android:textColor="@color/module_carchatting_red_color"
-            android:textSize="@dimen/module_call_chat_matching_text_size"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <View
-            android:layout_width="1px"
-            android:layout_height="match_parent"
-            android:layout_marginTop="@dimen/module_call_chat_match_view_line_margin_top_bottom"
-            android:layout_marginEnd="@dimen/module_call_chat_match_view_right_margin"
-            android:layout_marginBottom="@dimen/module_call_chat_match_view_line_margin_top_bottom"
-            android:background="@color/module_carchatting_match_line"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/module_carchatting_tv_cancel_match"
-            app:layout_constraintTop_toTopOf="parent" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/module_carchatting_rl_call_view"
-        android:layout_width="@dimen/module_call_chat_state_width"
-        android:layout_height="@dimen/module_call_chat_state_height"
-        android:background="@drawable/module_carchatting_launcher_calling_bg"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <ImageView
-            android:id="@+id/module_carchatting_call_head"
-            android:layout_width="@dimen/module_call_chat_calling_iv_width_height"
-            android:layout_height="@dimen/module_call_chat_calling_iv_width_height"
-            android:layout_marginStart="@dimen/module_call_chat_calling_iv_margin_left_right"
-            android:clickable="true"
-            android:src="@mipmap/module_carchatting_default_head_img"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:ignore="ContentDescription" />
-
-        <ImageView
-            android:id="@+id/module_carchatting_call_hangUp"
-            android:layout_width="@dimen/module_call_chat_calling_iv_width_height"
-            android:layout_height="@dimen/module_call_chat_calling_iv_width_height"
-            android:layout_marginEnd="@dimen/module_call_chat_calling_iv_margin_left_right"
-            android:src="@mipmap/module_carchatting_launcher_calling_hangup"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:ignore="ContentDescription" />
-
-        <TextView
-            android:id="@+id/module_carchatting_call_time"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/module_call_chat_calling_text_margin_top_bottom"
-            android:text="@string/module_car_chat_matching_wait"
-            android:textColor="@color/module_carchatting_status_color"
-            android:textSize="@dimen/module_call_chat_calling_text_time_size"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="@+id/module_carchatting_call_nickname" />
-
-        <TextView
-            android:id="@+id/module_carchatting_call_nickname"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_22"
-            android:layout_marginTop="@dimen/module_call_chat_calling_text_margin_top_bottom"
-            android:textColor="@color/module_carchatting_white_color"
-            android:textSize="@dimen/module_call_chat_calling_text_name_size"
-            app:layout_constraintStart_toEndOf="@+id/module_carchatting_call_head"
-            app:layout_constraintTop_toTopOf="parent" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/module_carchatting_team_rl_view"
-        android:layout_width="@dimen/module_call_chat_state_width"
-        android:layout_height="@dimen/module_call_chat_state_height"
-        android:background="@drawable/module_carchatting_launcher_calling_bg"
-        android:visibility="gone"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <LinearLayout
-            android:id="@+id/module_carchatting_team_ll_head"
-            android:layout_width="@dimen/dp_160"
-            android:layout_height="@dimen/module_call_chat_state_height"
-            android:gravity="center"
-            android:visibility="invisible"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <de.hdodenhof.circleimageview.CircleImageView
-                android:id="@+id/module_carchatting_civ_head0"
-                android:layout_width="@dimen/module_call_chat_team_head_view_width"
-                android:layout_height="@dimen/module_call_chat_team_head_view_height"
-                android:src="@mipmap/module_carchatting_default_head_img"
-                android:translationZ="@dimen/dp_1_5"
-                app:civ_border_color="#FFFFFF"
-                app:civ_border_width="2dp" />
-
-            <de.hdodenhof.circleimageview.CircleImageView
-                android:id="@+id/module_carchatting_civ_head1"
-                android:layout_width="@dimen/module_call_chat_team_head_view_width"
-                android:layout_height="@dimen/module_call_chat_team_head_view_height"
-                android:layout_marginLeft="@dimen/module_call_chat_team_head_view_left_margin"
-                android:src="@mipmap/module_carchatting_default_head_img"
-                android:translationZ="@dimen/dp_1"
-                app:civ_border_color="#FFFFFF"
-                app:civ_border_width="2dp" />
-
-            <de.hdodenhof.circleimageview.CircleImageView
-                android:id="@+id/module_carchatting_civ_head2"
-                android:layout_width="@dimen/module_call_chat_team_head_view_width"
-                android:layout_height="@dimen/module_call_chat_team_head_view_height"
-                android:layout_marginLeft="@dimen/module_call_chat_team_head_view_left_margin"
-                android:src="@mipmap/module_carchatting_default_head_img"
-                android:translationZ="@dimen/dp_0_5"
-                android:visibility="gone"
-                app:civ_border_color="#FFFFFF"
-                app:civ_border_width="2dp" />
-
-            <de.hdodenhof.circleimageview.CircleImageView
-                android:id="@+id/module_carchatting_civ_head3"
-                android:layout_width="@dimen/module_call_chat_team_head_view_width"
-                android:layout_height="@dimen/module_call_chat_team_head_view_height"
-                android:layout_marginLeft="@dimen/module_call_chat_team_head_view_left_margin4"
-                android:layout_marginTop="@dimen/module_call_chat_team_head_view_top_margin"
-                android:src="@mipmap/module_carchatting_default_head_img"
-                android:translationZ="@dimen/dp_0_1"
-                android:visibility="gone"
-                app:civ_border_color="#FFFFFF"
-                app:civ_border_width="2dp" />
-
-            <de.hdodenhof.circleimageview.CircleImageView
-                android:id="@+id/module_carchatting_civ_head4"
-                android:layout_width="@dimen/module_call_chat_team_head_view_width"
-                android:layout_height="@dimen/module_call_chat_team_head_view_height"
-                android:layout_marginLeft="@dimen/module_call_chat_team_head_view_left_margin"
-                android:layout_marginTop="@dimen/module_call_chat_team_head_view_top_margin"
-                android:src="@mipmap/module_carchatting_default_head_img"
-                android:translationZ="@dimen/dp_0"
-                android:visibility="gone"
-                app:civ_border_color="#FFFFFF"
-                app:civ_border_width="2dp" />
-        </LinearLayout>
-
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/module_call_chat_team_calling_left_margin"
-            android:layout_marginTop="@dimen/module_call_chat_team_calling_top_margin"
-            android:text="@string/module_car_chat_team_calling"
-            android:textColor="@color/module_carchatting_nick_color"
-            android:textSize="@dimen/module_call_chat_team_calling_size"
-            android:textStyle="bold"
-            app:layout_constraintBottom_toTopOf="@id/module_carchatting_team_tv_info"
-            app:layout_constraintStart_toEndOf="@+id/module_carchatting_team_ll_head" />
-
-        <TextView
-            android:id="@+id/module_carchatting_team_tv_info"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/module_call_chat_team_info_left_margin"
-            android:layout_marginBottom="@dimen/module_call_chat_team_info_bottom_margin"
-            android:text="@string/module_car_chat_team_info"
-            android:textColor="@color/module_carchatting_status_color"
-            android:textSize="@dimen/module_call_chat_team_info_size"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/module_carchatting_team_ll_head" />
-
-
-        <ImageView
-            android:id="@+id/module_carchatting_iv_team_quit"
-            android:layout_width="@dimen/module_call_chat_team_quit_view_width"
-            android:layout_height="@dimen/module_call_chat_team_quit_view_height"
-            android:layout_marginRight="@dimen/module_call_chat_team_quit_right_margin"
-            android:src="@drawable/module_carchatting_team_quit"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:ignore="ContentDescription" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/layout/module_car_chatting_launcher_incoming_hawk_eye_view.xml b/core/function-impl/mogo-core-function-chat/src/main/res/layout/module_car_chatting_launcher_incoming_hawk_eye_view.xml
index 799bc5faec..cdf0244555 100644
--- a/core/function-impl/mogo-core-function-chat/src/main/res/layout/module_car_chatting_launcher_incoming_hawk_eye_view.xml
+++ b/core/function-impl/mogo-core-function-chat/src/main/res/layout/module_car_chatting_launcher_incoming_hawk_eye_view.xml
@@ -2,79 +2,69 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/module_carchatting_rl_incoming_view"
     android:layout_width="@dimen/module_call_chat_state_incoming_hawk_eye_width"
     android:layout_height="@dimen/module_call_chat_state_incoming_hawk_eye_height"
     android:background="@drawable/module_carchatting_vr_calling_bg"
     android:orientation="vertical">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/module_carchatting_rl_incoming_view"
-        android:layout_width="@dimen/module_call_chat_state_incoming_hawk_eye_width"
-        android:layout_height="@dimen/module_call_chat_state_incoming_hawk_eye_height"
-        android:visibility="visible"
-        app:layout_constraintLeft_toLeftOf="parent"
+    <ImageView
+        android:id="@+id/module_carchatting_call_head"
+        android:layout_width="@dimen/module_call_chat_incoming_aisdk_tag_width"
+        android:layout_height="match_parent"
+        android:scaleType="centerInside"
+        android:src="@drawable/module_carchatting_aicloud_incoming"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="ContentDescription" />
 
-        <ImageView
-            android:id="@+id/module_carchatting_call_head"
-            android:layout_width="@dimen/module_call_chat_incoming_aisdk_tag_width"
-            android:layout_height="match_parent"
-            android:scaleType="centerInside"
-            android:src="@drawable/module_carchatting_aicloud_incoming"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:ignore="ContentDescription" />
+    <ImageView
+        android:id="@+id/module_carchatting_incoming_answer"
+        android:layout_width="@dimen/module_call_chat_hawk_eye_incoming_circle_btn_size"
+        android:layout_height="@dimen/module_call_chat_hawk_eye_incoming_circle_btn_size"
+        android:layout_marginEnd="@dimen/module_call_chat_calling_iv_hawk_eye_margin_left_right"
+        android:layout_marginRight="@dimen/module_call_chat_state_incoming_hawk_eye_call_margin_right"
+        android:clickable="true"
+        android:scaleType="centerInside"
+        android:src="@mipmap/module_callchatting_launcher_incoming_answer"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/module_carchatting_incoming_hangUp"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="ContentDescription" />
 
-        <ImageView
-            android:id="@+id/module_carchatting_incoming_answer"
-            android:layout_width="@dimen/module_call_chat_hawk_eye_incoming_circle_btn_size"
-            android:layout_height="@dimen/module_call_chat_hawk_eye_incoming_circle_btn_size"
-            android:layout_marginEnd="@dimen/module_call_chat_calling_iv_hawk_eye_margin_left_right"
-            android:layout_marginRight="@dimen/module_call_chat_state_incoming_hawk_eye_call_margin_right"
-            android:clickable="true"
-            android:scaleType="centerInside"
-            android:src="@mipmap/module_callchatting_launcher_incoming_answer"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/module_carchatting_incoming_hangUp"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:ignore="ContentDescription" />
+    <ImageView
+        android:id="@+id/module_carchatting_incoming_hangUp"
+        android:layout_width="@dimen/module_call_chat_hawk_eye_incoming_circle_btn_size"
+        android:layout_height="@dimen/module_call_chat_hawk_eye_incoming_circle_btn_size"
+        android:layout_marginEnd="@dimen/module_call_chat_calling_iv_hawk_eye_margin_left_right"
+        android:clickable="true"
+        android:scaleType="centerInside"
+        android:src="@mipmap/module_callchatting_launcher_incoming_hangup"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="ContentDescription" />
 
-        <ImageView
-            android:id="@+id/module_carchatting_incoming_hangUp"
-            android:layout_width="@dimen/module_call_chat_hawk_eye_incoming_circle_btn_size"
-            android:layout_height="@dimen/module_call_chat_hawk_eye_incoming_circle_btn_size"
-            android:layout_marginEnd="@dimen/module_call_chat_calling_iv_hawk_eye_margin_left_right"
-            android:clickable="true"
-            android:scaleType="centerInside"
-            android:src="@mipmap/module_callchatting_launcher_incoming_hangup"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:ignore="ContentDescription" />
-
-        <TextView
-            android:id="@+id/module_carchatting_call_time"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/module_call_chat_state_incoming_hawk_eye_margin_left"
-            android:layout_marginBottom="@dimen/module_call_chat_calling_text_hawk_eye_margin_top_bottom"
-            android:text="请求语音通话..."
-            android:textColor="@color/module_carchatting_hawk_eye_status_color"
-            android:textSize="@dimen/module_call_chat_calling_text_hawk_eye_time_size"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toRightOf="@+id/module_carchatting_call_head" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/module_call_chat_calling_text_hawk_eye_margin_top_bottom"
-            android:text="云平台"
-            android:textColor="@android:color/white"
-            android:textSize="@dimen/module_call_chat_calling_text_hawk_eye_name_size"
-            app:layout_constraintStart_toStartOf="@+id/module_carchatting_call_time"
-            app:layout_constraintTop_toTopOf="parent" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
+    <TextView
+        android:id="@+id/module_carchatting_call_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/module_call_chat_state_incoming_hawk_eye_margin_left"
+        android:layout_marginBottom="@dimen/module_call_chat_calling_text_hawk_eye_margin_top_bottom"
+        android:text="请求语音通话..."
+        android:textColor="@color/module_carchatting_hawk_eye_status_color"
+        android:textSize="@dimen/module_call_chat_calling_text_hawk_eye_time_size"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toRightOf="@+id/module_carchatting_call_head" />
 
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/module_call_chat_calling_text_hawk_eye_margin_top_bottom"
+        android:text="云平台"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/module_call_chat_calling_text_hawk_eye_name_size"
+        app:layout_constraintStart_toStartOf="@+id/module_carchatting_call_time"
+        app:layout_constraintTop_toTopOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/layout/module_car_chatting_launcher_team_invitation_hawk_eye_view.xml b/core/function-impl/mogo-core-function-chat/src/main/res/layout/module_car_chatting_launcher_team_invitation_hawk_eye_view.xml
deleted file mode 100644
index 3e68b3ab98..0000000000
--- a/core/function-impl/mogo-core-function-chat/src/main/res/layout/module_car_chatting_launcher_team_invitation_hawk_eye_view.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="@dimen/module_call_chat_team_invitation_hawk_eye_width"
-    android:layout_height="@dimen/module_call_chat_team_invitation_hawk_eye_height"
-    android:background="@drawable/module_carchatting_team_invitation_hawk_eye_bg"
-    android:elevation="@dimen/dp_8">
-
-    <ImageView
-        android:layout_width="@dimen/dp_121"
-        android:layout_height="match_parent"
-        android:layout_marginStart="@dimen/dp_31"
-        android:layout_marginTop="@dimen/dp_22"
-        android:layout_marginBottom="@dimen/dp_42"
-        android:background="@drawable/module_carchatting_team_invitation_hawk_eye_header_bg"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:ignore="ContentDescription" />
-
-    <ImageView
-        android:id="@+id/module_carchatting_civ_head"
-        android:layout_width="@dimen/dp_121"
-        android:layout_height="match_parent"
-        android:layout_marginStart="@dimen/dp_31"
-        android:layout_marginTop="@dimen/dp_22"
-        android:layout_marginBottom="@dimen/dp_42"
-        android:src="@drawable/module_carchatting_team_invitation_hawk_eye_head_default"
-        android:scaleType="centerInside"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:ignore="ContentDescription" />
-
-    <ImageView
-        android:id="@+id/module_carchatting_iv_join"
-        android:layout_width="@dimen/module_call_chat_hawk_eye_circle_btn_size"
-        android:layout_height="@dimen/module_call_chat_hawk_eye_circle_btn_size"
-        android:layout_marginEnd="@dimen/module_call_chat_team_invitation_join_hawk_eye_margin_right"
-        android:layout_marginBottom="@dimen/dp_21"
-        android:src="@drawable/module_carchatting_team_invitation_hawk_eye_join"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/module_carchatting_iv_refuse"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:ignore="ContentDescription" />
-
-    <ImageView
-        android:id="@+id/module_carchatting_iv_refuse"
-        android:layout_width="@dimen/module_call_chat_hawk_eye_circle_btn_size"
-        android:layout_height="@dimen/module_call_chat_hawk_eye_circle_btn_size"
-        android:layout_marginBottom="@dimen/dp_21"
-        android:layout_marginEnd="@dimen/module_call_chat_team_invitation_hawk_eye_padding"
-        android:src="@drawable/module_carchatting_team_invitation_hawk_eye_refuse"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:ignore="ContentDescription" />
-
-    <TextView
-        android:id="@+id/module_carchatting_tv_content"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/module_call_chat_team_invitation_content_margin_left"
-        android:text="车友邀请你加入车队!"
-        android:textColor="@color/module_carchatting_white_color"
-        android:textSize="@dimen/module_call_chat_team_invitation_content_text_size"
-        app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_marginBottom="@dimen/dp_21"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/module_carchatting_civ_head" />
-
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/layout/module_car_chatting_launcher_team_invitation_view.xml b/core/function-impl/mogo-core-function-chat/src/main/res/layout/module_car_chatting_launcher_team_invitation_view.xml
deleted file mode 100644
index 48c915f342..0000000000
--- a/core/function-impl/mogo-core-function-chat/src/main/res/layout/module_car_chatting_launcher_team_invitation_view.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/module_call_chat_team_invitation_height"
-        android:layout_margin="@dimen/module_common_shadow_width_pos"
-        android:background="@drawable/module_carchatting_team_invitation_bg"
-        android:elevation="@dimen/dp_8">
-
-        <ImageView
-            android:id="@+id/module_carchatting_civ_head"
-            android:layout_width="@dimen/module_call_chat_team_invitation_height"
-            android:layout_height="@dimen/module_call_chat_team_invitation_height"
-            android:src="@drawable/module_carchatting_team_invitation_head_default"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:ignore="ContentDescription" />
-
-        <TextView
-            android:id="@+id/module_carchatting_tv_title"
-            android:layout_width="@dimen/module_call_chat_team_invitation_title_width"
-            android:layout_height="@dimen/module_call_chat_team_invitation_title_height"
-            android:layout_marginLeft="@dimen/module_call_chat_team_invitation_title_margin_left"
-            android:layout_marginTop="@dimen/module_call_chat_team_invitation_title_margin_top"
-            android:background="@drawable/module_carchatting_team_invitation_title_bg"
-            android:gravity="center"
-            android:text="车队邀请"
-            android:textColor="@color/module_carchatting_white_color"
-            android:textSize="@dimen/module_call_chat_team_invitation_title_text_size"
-            app:layout_constraintStart_toEndOf="@+id/module_carchatting_civ_head"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/module_carchatting_tv_content"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/module_call_chat_team_invitation_content_margin_left"
-            android:layout_marginBottom="@dimen/module_call_chat_team_invitation_content_margin_bottom"
-            android:text="车友邀请你加入车队!"
-            android:textColor="@color/module_carchatting_white_color"
-            android:textSize="@dimen/module_call_chat_team_invitation_content_text_size"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/module_carchatting_civ_head" />
-
-        <ImageView
-            android:id="@+id/module_carchatting_iv_join"
-            android:layout_width="@dimen/module_call_chat_team_invitation_join_width"
-            android:layout_height="@dimen/module_call_chat_team_invitation_join_height"
-            android:layout_marginRight="@dimen/module_call_chat_team_invitation_join_margin_right"
-            android:src="@drawable/module_carchatting_team_invitation_join"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/module_carchatting_iv_refuse"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:ignore="ContentDescription" />
-
-        <ImageView
-            android:id="@+id/module_carchatting_iv_refuse"
-            android:layout_width="@dimen/module_call_chat_team_invitation_join_width"
-            android:layout_height="@dimen/module_call_chat_team_invitation_join_height"
-            android:layout_marginRight="@dimen/module_call_chat_team_invitation_padding"
-            android:src="@drawable/module_carchatting_team_invitation_refuse"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:ignore="ContentDescription" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-</LinearLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/layout/module_car_chatting_launcher_teammate_item.xml b/core/function-impl/mogo-core-function-chat/src/main/res/layout/module_car_chatting_launcher_teammate_item.xml
deleted file mode 100644
index f58bf9d3d5..0000000000
--- a/core/function-impl/mogo-core-function-chat/src/main/res/layout/module_car_chatting_launcher_teammate_item.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/module_call_chat_team_teammate_height"
-    android:layout_marginTop="@dimen/module_call_chat_team_teammate_margin"
-    android:layout_marginBottom="@dimen/module_call_chat_team_teammate_margin"
-    android:background="@drawable/module_carchatting_team_teammate_bg"
-    android:padding="@dimen/module_call_chat_team_teammate_padding">
-
-
-    <de.hdodenhof.circleimageview.CircleImageView
-        android:id="@+id/module_carchatting_civ_head"
-        android:layout_width="@dimen/module_call_chat_team_teammate_head_width"
-        android:layout_height="@dimen/module_call_chat_team_teammate_head_height"
-        android:src="@mipmap/module_carchatting_default_head_img"
-        app:civ_border_color="#4cffffff"
-        app:civ_border_width="@dimen/module_call_chat_state_head_border"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/module_carchatting_tv_nickname"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/module_call_chat_team_teammate_nickname_margin_left"
-        android:text="昵称"
-        android:textColor="@color/module_carchatting_white_color"
-        android:textSize="@dimen/module_call_chat_team_teammate_nickname_text_size"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/module_carchatting_civ_head"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/module_carchatting_tv_identity"
-        android:layout_width="@dimen/module_call_chat_team_teammate_identity_width"
-        android:layout_height="@dimen/module_call_chat_team_teammate_identity_height"
-        android:background="@drawable/module_carchatting_team_teammate_follower_bg"
-        android:gravity="center"
-        android:text="身份"
-        android:textColor="@color/module_carchatting_white_color"
-        android:textSize="@dimen/module_call_chat_team_teammate_identity_text_size"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/layout/module_car_chatting_launcher_user_view.xml b/core/function-impl/mogo-core-function-chat/src/main/res/layout/module_car_chatting_launcher_user_view.xml
deleted file mode 100644
index 1de23819e8..0000000000
--- a/core/function-impl/mogo-core-function-chat/src/main/res/layout/module_car_chatting_launcher_user_view.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="@dimen/module_call_chat_user_state_x"
-    android:layout_height="@dimen/module_call_chat_user_state_y"
-    android:orientation="vertical">
-
-    <ImageView
-        android:id="@+id/moduleCallChatBg"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scaleType="fitXY" />
-
-    <ImageView
-        android:id="@+id/moduleCallChatCoverBg"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scaleType="fitXY"
-        android:src="@mipmap/module_carchatting_user_cover_bg" />
-
-    <ImageView
-        android:id="@+id/moduleCallChatUserClose"
-        android:layout_width="@dimen/module_call_chat_state_close_icon_width"
-        android:layout_height="@dimen/module_call_chat_state_close_icon_width"
-        android:layout_marginLeft="@dimen/module_call_chat_state_close_margin"
-        android:layout_marginTop="@dimen/module_call_chat_state_close_margin"
-        android:src="@drawable/module_carchatting_team_fragment_close"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <de.hdodenhof.circleimageview.CircleImageView
-        android:id="@+id/moduleCallChatUserHead"
-        android:layout_width="@dimen/module_call_chat_state_user_head_width"
-        android:layout_height="@dimen/module_call_chat_state_user_head_width"
-        android:layout_marginTop="@dimen/module_call_chat_state_head_margin_top"
-        android:src="@mipmap/module_carchatting_default_head_img"
-        app:civ_border_color="#E8EEF9"
-        app:civ_border_width="@dimen/module_call_chat_state_head_border"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/moduleCallChatUserNickName"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/module_call_chat_state_nick_name_margin_top"
-        android:text="杨超越"
-        android:textColor="@color/module_carchatting_nick_color"
-        android:textSize="@dimen/module_call_chat_state_nick_name_size"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/moduleCallChatUserHead" />
-
-    <com.mogo.module.common.view.CustomRatingBar
-        android:id="@+id/moduleCallChatRatingBar"
-        style="@style/customHeartHeartRatingBarStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/module_call_chat_state_rating_margin_top"
-        android:isIndicator="true"
-        android:visibility="gone"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/moduleCallChatUserNickName"
-        tools:visibility="visible" />
-
-    <com.mogo.module.carchatting.view.DrawableTextView
-        android:id="@+id/moduleCallChatUserJoinTeam"
-        android:layout_width="@dimen/module_call_chat_user_caller_x"
-        android:layout_height="@dimen/module_call_chat_state_caller_height"
-        android:layout_marginLeft="@dimen/module_call_chat_state_caller_margin_left_right"
-        android:layout_marginBottom="@dimen/module_call_chat_state_caller_margin_bottom"
-        android:background="@drawable/module_callchatting_shape_gradient_blue"
-        android:drawableLeft="@mipmap/module_callchatting_user_join_team"
-        android:drawablePadding="@dimen/module_call_chat_state_caller_drawable_padding"
-        android:gravity="center_vertical"
-        android:text="@string/module_car_chat_user_join_team"
-        android:textColor="#FFFFFF"
-        android:textSize="@dimen/module_call_chat_state_caller_text_size"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        tools:visibility="visible" />
-
-    <TextView
-        android:id="@+id/moduleCallChatUserCaller"
-        android:layout_width="@dimen/module_call_chat_user_caller_x"
-        android:layout_height="@dimen/module_call_chat_state_caller_height"
-        android:layout_marginRight="@dimen/module_call_chat_state_caller_margin_left_right"
-        android:layout_marginBottom="@dimen/module_call_chat_state_caller_margin_bottom"
-        android:background="@drawable/module_callchatting_user_pop_call_bg"
-        android:drawableLeft="@mipmap/module_callchatting_user_caller"
-        android:drawablePadding="@dimen/module_call_chat_state_caller_drawable_padding"
-        android:gravity="center_vertical"
-        android:paddingLeft="@dimen/module_call_chat_state_caller_padding_left"
-        android:text="@string/module_car_chat_user_caller"
-        android:textColor="@color/module_carchatting_nick_color"
-        android:textSize="@dimen/module_call_chat_state_caller_text_size"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        tools:visibility="visible" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-hdpi/module_callchatting_match.png b/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-hdpi/module_callchatting_match.png
deleted file mode 100644
index 08bcfd78a0..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-hdpi/module_callchatting_match.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-hdpi/module_callchatting_user_caller.png b/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-hdpi/module_callchatting_user_caller.png
deleted file mode 100644
index cd5fb91de2..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-hdpi/module_callchatting_user_caller.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-hdpi/module_callchatting_user_close.png b/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-hdpi/module_callchatting_user_close.png
deleted file mode 100644
index aa5d44c24d..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-hdpi/module_callchatting_user_close.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-hdpi/module_callchatting_user_join_team.png b/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-hdpi/module_callchatting_user_join_team.png
deleted file mode 100644
index fc4b862902..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-hdpi/module_callchatting_user_join_team.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-hdpi/module_carchatting_caller.png b/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-hdpi/module_carchatting_caller.png
deleted file mode 100644
index 0f16300e2e..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-hdpi/module_carchatting_caller.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-hdpi/module_carchatting_default_head_img.png b/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-hdpi/module_carchatting_default_head_img.png
deleted file mode 100644
index 97e9ddda74..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-hdpi/module_carchatting_default_head_img.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-hdpi/module_carchatting_user_cover_bg.png b/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-hdpi/module_carchatting_user_cover_bg.png
deleted file mode 100644
index 89153623c3..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-hdpi/module_carchatting_user_cover_bg.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-ldpi/module_callchatting_match.png b/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-ldpi/module_callchatting_match.png
deleted file mode 100644
index 08bcfd78a0..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-ldpi/module_callchatting_match.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-ldpi/module_callchatting_user_caller.png b/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-ldpi/module_callchatting_user_caller.png
deleted file mode 100644
index a15e56ada7..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-ldpi/module_callchatting_user_caller.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-ldpi/module_callchatting_user_close.png b/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-ldpi/module_callchatting_user_close.png
deleted file mode 100644
index a74b6c7341..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-ldpi/module_callchatting_user_close.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-ldpi/module_callchatting_user_join_team.png b/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-ldpi/module_callchatting_user_join_team.png
deleted file mode 100644
index b49d9f707f..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-ldpi/module_callchatting_user_join_team.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-ldpi/module_carchatting_caller.png b/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-ldpi/module_carchatting_caller.png
deleted file mode 100644
index c3cb5f4aaa..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-ldpi/module_carchatting_caller.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-ldpi/module_carchatting_default_head_img.png b/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-ldpi/module_carchatting_default_head_img.png
deleted file mode 100644
index 88cd08b75a..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-ldpi/module_carchatting_default_head_img.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-ldpi/module_carchatting_user_cover_bg.png b/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-ldpi/module_carchatting_user_cover_bg.png
deleted file mode 100644
index ab7640f350..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-ldpi/module_carchatting_user_cover_bg.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-mdpi-1920x720/module_callchatting_match.png b/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-mdpi-1920x720/module_callchatting_match.png
deleted file mode 100644
index 08bcfd78a0..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-mdpi-1920x720/module_callchatting_match.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-xhdpi/module_callchatting_user_caller.png b/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-xhdpi/module_callchatting_user_caller.png
deleted file mode 100644
index cd5fb91de2..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-xhdpi/module_callchatting_user_caller.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-xhdpi/module_callchatting_user_close.png b/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-xhdpi/module_callchatting_user_close.png
deleted file mode 100644
index aa5d44c24d..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-xhdpi/module_callchatting_user_close.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-xhdpi/module_callchatting_user_join_team.png b/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-xhdpi/module_callchatting_user_join_team.png
deleted file mode 100644
index fc4b862902..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-xhdpi/module_callchatting_user_join_team.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-xhdpi/module_carchatting_caller.png b/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-xhdpi/module_carchatting_caller.png
deleted file mode 100644
index 0f16300e2e..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-xhdpi/module_carchatting_caller.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-xhdpi/module_carchatting_default_head_img.png b/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-xhdpi/module_carchatting_default_head_img.png
deleted file mode 100644
index 97e9ddda74..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-xhdpi/module_carchatting_default_head_img.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-xhdpi/module_carchatting_user_cover_bg.png b/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-xhdpi/module_carchatting_user_cover_bg.png
deleted file mode 100644
index 89153623c3..0000000000
Binary files a/core/function-impl/mogo-core-function-chat/src/main/res/mipmap-xhdpi/module_carchatting_user_cover_bg.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/values-hdpi/dimens.xml b/core/function-impl/mogo-core-function-chat/src/main/res/values-hdpi/dimens.xml
index 295f403713..40915903bf 100644
--- a/core/function-impl/mogo-core-function-chat/src/main/res/values-hdpi/dimens.xml
+++ b/core/function-impl/mogo-core-function-chat/src/main/res/values-hdpi/dimens.xml
@@ -1,116 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-    <dimen name="module_call_chat_state_location_y">872px</dimen>
-    <dimen name="module_call_chat_state_location_x">1067px</dimen>
-    <dimen name="module_call_chat_state_location_hawk_eye_y">776px</dimen>
-    <dimen name="module_call_chat_state_location_hawk_eye_x">22px</dimen>
-    <dimen name="module_call_chat_state_width">600px</dimen>
-    <dimen name="module_call_chat_state_height">140px</dimen>
     <dimen name="module_call_chat_state_hawk_eye_width">300px</dimen>
     <dimen name="module_call_chat_state_hawk_eye_height">100px</dimen>
-
-    <dimen name="module_call_chat_user_state_location_x">1370px</dimen>
-    <dimen name="module_call_chat_user_state_location_y">30px</dimen>
-    <dimen name="module_call_chat_user_state_x">740px</dimen>
-    <dimen name="module_call_chat_user_state_y">854px</dimen>
-
-    <dimen name="module_call_chat_user_caller_x">290px</dimen>
-
-    <dimen name="module_call_chat_view_match_width">355px</dimen>
-    <dimen name="module_call_chat_view_margin_end">37px</dimen>
-    <dimen name="module_call_chat_match_view_left_margin">32px</dimen>
-    <dimen name="module_call_chat_match_view_right_margin">39px</dimen>
-    <dimen name="module_call_chat_match_view_line_margin_top_bottom">25px</dimen>
-    <dimen name="module_call_chat_match_iv_width">80px</dimen>
-    <dimen name="module_call_chat_match_iv_height">72px</dimen>
-    <dimen name="module_call_chat_match_iv_left_margin">38px</dimen>
-    <dimen name="module_call_chat_match_text_size">30px</dimen>
-    <dimen name="module_call_chat_matching_text_size">30px</dimen>
-    <dimen name="module_call_chat_calling_text_name_size">37px</dimen>
     <dimen name="module_call_chat_calling_text_hawk_eye_name_size">27px</dimen>
-    <dimen name="module_call_chat_calling_text_time_size">26px</dimen>
     <dimen name="module_call_chat_calling_text_hawk_eye_time_size">18px</dimen>
-    <dimen name="module_call_chat_calling_text_margin_top_bottom">18px</dimen>
     <dimen name="module_call_chat_calling_text_hawk_eye_margin_top_bottom">10px</dimen>
-    <dimen name="module_call_chat_calling_iv_margin_left_right">23px</dimen>
-    <dimen name="module_call_chat_calling_iv_hawk_eye_margin_left_right">6px</dimen>
-    <dimen name="module_call_chat_calling_iv_width_height">82px</dimen>
     <dimen name="module_call_chat_calling_iv_hawk_eye_width_height">100px</dimen>
-
-    <dimen name="module_call_chat_state_close_icon_width">82.5px</dimen>
-    <dimen name="module_call_chat_state_user_head_width">150px</dimen>
-    <dimen name="module_call_chat_state_close_margin">30px</dimen>
-    <dimen name="module_call_chat_state_head_margin_top">159px</dimen>
-    <dimen name="module_call_chat_state_head_border">8px</dimen>
-    <dimen name="module_call_chat_state_nick_name_margin_top">16px</dimen>
-    <dimen name="module_call_chat_state_nick_name_size">40px</dimen>
-    <dimen name="module_call_chat_state_rating_margin_top">15px</dimen>
-    <dimen name="module_call_chat_state_caller_height">90px</dimen>
-    <dimen name="module_call_chat_state_caller_margin_bottom">50px</dimen>
-    <dimen name="module_call_chat_state_caller_margin_left_right">70px</dimen>
-    <dimen name="module_call_chat_state_caller_drawable_padding">10px</dimen>
-    <dimen name="module_call_chat_state_caller_padding_left">56px</dimen>
-    <dimen name="module_call_chat_state_caller_text_size">30px</dimen>
-
-
-    <dimen name="module_call_chat_team_head_view_width">48px</dimen>
-    <dimen name="module_call_chat_team_head_view_height">48px</dimen>
-    <dimen name="module_call_chat_team_head_view_left_margin">-12px</dimen>
-    <dimen name="module_call_chat_team_head_view_left_margin4">-122px</dimen>
-    <dimen name="module_call_chat_team_head_view_top_margin">36px</dimen>
-    <dimen name="module_call_chat_team_calling_top_margin">22px</dimen>
-    <dimen name="module_call_chat_team_calling_left_margin">22px</dimen>
-    <dimen name="module_call_chat_team_calling_size">32px</dimen>
-    <dimen name="module_call_chat_team_info_size">26px</dimen>
-    <dimen name="module_call_chat_team_info_bottom_margin">22px</dimen>
-    <dimen name="module_call_chat_team_info_left_margin">22px</dimen>
-    <dimen name="module_call_chat_team_quit_view_width">79.8px</dimen>
-    <dimen name="module_call_chat_team_quit_view_height">79.8px</dimen>
-    <dimen name="module_call_chat_team_quit_right_margin">28.4px</dimen>
-    <dimen name="module_call_chat_team_view_line_margin_top_bottom">25px</dimen>
-
-
-    <dimen name="module_call_chat_team_fragment_margin">27.5px</dimen>
-    <dimen name="module_call_chat_team_fragment_padding">50px</dimen>
-    <dimen name="module_call_chat_team_fragment_num_text_size">36px</dimen>
-    <dimen name="module_call_chat_team_fragment_close_view_width">80.8px</dimen>
-    <dimen name="module_call_chat_team_fragment_close_view_height">80.8px</dimen>
-    <dimen name="module_call_chat_team_fragment_teammates__margin_top">24px</dimen>
-
-    <dimen name="module_call_chat_team_teammate_margin">14px</dimen>
-    <dimen name="module_call_chat_team_teammate_padding">32px</dimen>
-    <dimen name="module_call_chat_team_teammate_height">164px</dimen>
-    <dimen name="module_call_chat_team_teammate_head_width">98px</dimen>
-    <dimen name="module_call_chat_team_teammate_head_height">98px</dimen>
-    <dimen name="module_call_chat_team_teammate_nickname_margin_left">30px</dimen>
-    <dimen name="module_call_chat_team_teammate_nickname_text_size">34px</dimen>
-    <dimen name="module_call_chat_team_teammate_identity_width">98px</dimen>
-    <dimen name="module_call_chat_team_teammate_identity_height">46px</dimen>
-    <dimen name="module_call_chat_team_teammate_identity_text_size">26px</dimen>
-
-
-    <dimen name="module_call_chat_team_invitation_layout_height">230px</dimen>
-    <dimen name="module_call_chat_team_invitation_padding">30px</dimen>
-    <dimen name="module_call_chat_team_invitation_hawk_eye_padding">61px</dimen>
-    <dimen name="module_call_chat_team_invitation_margin">18px</dimen>
-    <dimen name="module_call_chat_team_invitation_height">210px</dimen>
-    <dimen name="module_call_chat_team_invitation_hawk_eye_bg_corner">20px</dimen>
-    <dimen name="module_call_chat_team_invitation_hawk_eye_width">822px</dimen>
-    <dimen name="module_call_chat_team_invitation_hawk_eye_height">182px</dimen>
-    <dimen name="module_call_chat_team_invitation_head_width">148px</dimen>
-    <dimen name="module_call_chat_team_invitation_head_height">148px</dimen>
-    <dimen name="module_call_chat_team_invitation_title_width">120px</dimen>
-    <dimen name="module_call_chat_team_invitation_title_height">46px</dimen>
-    <dimen name="module_call_chat_team_invitation_title_margin_left">30px</dimen>
-    <dimen name="module_call_chat_team_invitation_title_margin_top">60px</dimen>
-    <dimen name="module_call_chat_team_invitation_title_text_size">25px</dimen>
-    <dimen name="module_call_chat_team_invitation_content_margin_left">30px</dimen>
-    <dimen name="module_call_chat_team_invitation_content_margin_bottom">60px</dimen>
-    <dimen name="module_call_chat_team_invitation_content_text_size">32px</dimen>
-    <dimen name="module_call_chat_team_invitation_join_width">98px</dimen>
     <dimen name="module_call_chat_hawk_eye_circle_btn_size">63px</dimen>
-    <dimen name="module_call_chat_team_invitation_join_height">98px</dimen>
-    <dimen name="module_call_chat_team_invitation_join_margin_right">36px</dimen>
-    <dimen name="module_call_chat_team_invitation_join_hawk_eye_margin_right">42px</dimen>
-
 </resources>
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/values-ldpi/dimens.xml b/core/function-impl/mogo-core-function-chat/src/main/res/values-ldpi/dimens.xml
deleted file mode 100644
index 8c085f2cba..0000000000
--- a/core/function-impl/mogo-core-function-chat/src/main/res/values-ldpi/dimens.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-
-
-    <dimen name="module_call_chat_state_location_y">478px</dimen>
-    <dimen name="module_call_chat_state_location_x">560px</dimen>
-    <dimen name="module_call_chat_state_width">338px</dimen>
-    <dimen name="module_call_chat_state_height">82px</dimen>
-    <dimen name="module_call_chat_user_state_location_x">1543px</dimen>
-    <dimen name="module_call_chat_user_state_location_y">0px</dimen>
-    <dimen name="module_call_chat_user_state_x">411px</dimen>
-    <dimen name="module_call_chat_user_state_y">474px</dimen>
-    <dimen name="module_call_chat_user_caller_x">161px</dimen>
-
-    <dimen name="module_call_chat_view_width">338px</dimen>
-    <dimen name="module_call_chat_view_match_width">260px</dimen>
-    <dimen name="module_call_chat_view_height">82px</dimen>
-    <dimen name="module_call_chat_view_margin_end">27px</dimen>
-    <dimen name="module_call_chat_match_view_left_margin">23px</dimen>
-    <dimen name="module_call_chat_match_view_right_margin">27px</dimen>
-    <dimen name="module_call_chat_match_view_line_margin_top_bottom">25px</dimen>
-    <dimen name="module_call_chat_match_iv_width">60px</dimen>
-    <dimen name="module_call_chat_match_iv_height">54px</dimen>
-    <dimen name="module_call_chat_match_iv_left_margin">28px</dimen>
-    <dimen name="module_call_chat_match_text_size">22px</dimen>
-    <dimen name="module_call_chat_matching_text_size">22px</dimen>
-    <dimen name="module_call_chat_calling_text_name_size">18px</dimen>
-    <dimen name="module_call_chat_calling_text_time_size">14px</dimen>
-    <dimen name="module_call_chat_calling_text_margin_top_bottom">6px</dimen>
-    <dimen name="module_call_chat_calling_iv_margin_left_right">18px</dimen>
-    <dimen name="module_call_chat_calling_iv_width_height">44px</dimen>
-
-    <dimen name="module_call_chat_state_close_icon_width">45.8px</dimen>
-    <dimen name="module_call_chat_state_user_head_width">83.3px</dimen>
-    <dimen name="module_call_chat_state_close_margin">16.6px</dimen>
-    <dimen name="module_call_chat_state_head_margin_top">88.3px</dimen>
-    <dimen name="module_call_chat_state_head_border">5px</dimen>
-    <dimen name="module_call_chat_state_nick_name_margin_top">10px</dimen>
-    <dimen name="module_call_chat_state_nick_name_size">22px</dimen>
-    <dimen name="module_call_chat_state_rating_margin_top">10px</dimen>
-    <dimen name="module_call_chat_state_caller_height">56px</dimen>
-    <dimen name="module_call_chat_state_caller_margin_bottom">30px</dimen>
-    <dimen name="module_call_chat_state_caller_margin_left_right">39px</dimen>
-    <dimen name="module_call_chat_state_caller_padding_left">30px</dimen>
-    <dimen name="module_call_chat_state_caller_drawable_padding">13px</dimen>
-    <dimen name="module_call_chat_state_caller_text_size">17px</dimen>
-
-
-    <dimen name="module_call_chat_team_head_view_width">26.4px</dimen>
-    <dimen name="module_call_chat_team_head_view_height">26.4px</dimen>
-    <dimen name="module_call_chat_team_head_view_left_margin">-6.6px</dimen>
-    <dimen name="module_call_chat_team_head_view_left_margin4">-66px</dimen>
-    <dimen name="module_call_chat_team_head_view_top_margin">19.8px</dimen>
-    <dimen name="module_call_chat_team_calling_top_margin">13px</dimen>
-    <dimen name="module_call_chat_team_calling_left_margin">14.6px</dimen>
-    <dimen name="module_call_chat_team_calling_size">18px</dimen>
-    <dimen name="module_call_chat_team_info_size">14px</dimen>
-    <dimen name="module_call_chat_team_info_bottom_margin">11px</dimen>
-    <dimen name="module_call_chat_team_info_left_margin">14.6px</dimen>
-    <dimen name="module_call_chat_team_quit_view_width">43.4px</dimen>
-    <dimen name="module_call_chat_team_quit_view_height">43.4px</dimen>
-    <dimen name="module_call_chat_team_quit_right_margin">16.5px</dimen>
-    <dimen name="module_call_chat_team_view_line_margin_top_bottom">25px</dimen>
-
-
-    <dimen name="module_call_chat_team_fragment_margin">10px</dimen>
-    <dimen name="module_call_chat_team_fragment_padding">28px</dimen>
-    <dimen name="module_call_chat_team_fragment_num_text_size">20px</dimen>
-    <dimen name="module_call_chat_team_fragment_close_view_width">44px</dimen>
-    <dimen name="module_call_chat_team_fragment_close_view_height">44px</dimen>
-    <dimen name="module_call_chat_team_fragment_teammates__margin_top">14px</dimen>
-
-    <dimen name="module_call_chat_team_teammate_margin">8px</dimen>
-    <dimen name="module_call_chat_team_teammate_padding">14px</dimen>
-    <dimen name="module_call_chat_team_teammate_height">86px</dimen>
-    <dimen name="module_call_chat_team_teammate_head_width">56px</dimen>
-    <dimen name="module_call_chat_team_teammate_head_height">56px</dimen>
-    <dimen name="module_call_chat_team_teammate_nickname_margin_left">12.4px</dimen>
-    <dimen name="module_call_chat_team_teammate_nickname_text_size">18px</dimen>
-    <dimen name="module_call_chat_team_teammate_identity_width">54px</dimen>
-    <dimen name="module_call_chat_team_teammate_identity_height">26px</dimen>
-    <dimen name="module_call_chat_team_teammate_identity_text_size">15px</dimen>
-
-
-    <dimen name="module_call_chat_team_invitation_layout_height">138px</dimen>
-    <dimen name="module_call_chat_team_invitation_padding">21px</dimen>
-    <dimen name="module_call_chat_team_invitation_margin">18px</dimen>
-    <dimen name="module_call_chat_team_invitation_height">122px</dimen>
-    <dimen name="module_call_chat_team_invitation_head_width">82px</dimen>
-    <dimen name="module_call_chat_team_invitation_head_height">82px</dimen>
-    <dimen name="module_call_chat_team_invitation_title_width">66px</dimen>
-    <dimen name="module_call_chat_team_invitation_title_height">26px</dimen>
-    <dimen name="module_call_chat_team_invitation_title_margin_left">12px</dimen>
-    <dimen name="module_call_chat_team_invitation_title_margin_top">30px</dimen>
-    <dimen name="module_call_chat_team_invitation_title_text_size">14px</dimen>
-    <dimen name="module_call_chat_team_invitation_content_margin_left">12px</dimen>
-    <dimen name="module_call_chat_team_invitation_content_margin_bottom">30px</dimen>
-    <dimen name="module_call_chat_team_invitation_content_text_size">18px</dimen>
-    <dimen name="module_call_chat_team_invitation_join_width">54px</dimen>
-    <dimen name="module_call_chat_team_invitation_join_height">54px</dimen>
-    <dimen name="module_call_chat_team_invitation_join_margin_right">20px</dimen>
-</resources>
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/values-mdpi-1920x720/dimens.xml b/core/function-impl/mogo-core-function-chat/src/main/res/values-mdpi-1920x720/dimens.xml
deleted file mode 100644
index 54f7a54824..0000000000
--- a/core/function-impl/mogo-core-function-chat/src/main/res/values-mdpi-1920x720/dimens.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-
-
-    <dimen name="module_call_chat_state_location_y">467px</dimen>
-    <dimen name="module_call_chat_state_location_x">573px</dimen>
-    <dimen name="module_call_chat_state_width">338px</dimen>
-    <dimen name="module_call_chat_state_height">82px</dimen>
-    <dimen name="module_call_chat_user_state_location_x">1543px</dimen>
-    <dimen name="module_call_chat_user_state_location_y">0px</dimen>
-    <dimen name="module_call_chat_user_state_x">347px</dimen>
-    <dimen name="module_call_chat_user_state_y">374px</dimen>
-    <dimen name="module_call_chat_user_caller_x">310px</dimen>
-
-    <dimen name="module_call_chat_view_width">422px</dimen>
-    <dimen name="module_call_chat_view_match_width">260px</dimen>
-    <dimen name="module_call_chat_view_height">87px</dimen>
-    <dimen name="module_call_chat_view_margin_end">27px</dimen>
-    <dimen name="module_call_chat_match_view_left_margin">23px</dimen>
-    <dimen name="module_call_chat_match_view_right_margin">27px</dimen>
-    <dimen name="module_call_chat_match_view_line_margin_top_bottom">25px</dimen>
-    <dimen name="module_call_chat_match_iv_width">60px</dimen>
-    <dimen name="module_call_chat_match_iv_height">54px</dimen>
-    <dimen name="module_call_chat_match_iv_left_margin">28px</dimen>
-    <dimen name="module_call_chat_match_text_size">22px</dimen>
-    <dimen name="module_call_chat_matching_text_size">22px</dimen>
-    <dimen name="module_call_chat_calling_text_name_size">24px</dimen>
-    <dimen name="module_call_chat_calling_text_time_size">17px</dimen>
-    <dimen name="module_call_chat_calling_text_margin_top_bottom">15px</dimen>
-    <dimen name="module_call_chat_calling_iv_margin_left_right">23px</dimen>
-    <dimen name="module_call_chat_calling_iv_width_height">58px</dimen>
-
-    <dimen name="module_call_chat_state_close_icon_width">55px</dimen>
-    <dimen name="module_call_chat_state_user_head_width">97px</dimen>
-    <dimen name="module_call_chat_state_close_margin">13px</dimen>
-    <dimen name="module_call_chat_state_head_margin_top">75px</dimen>
-    <dimen name="module_call_chat_state_head_border">9px</dimen>
-    <dimen name="module_call_chat_state_nick_name_margin_top">9px</dimen>
-    <dimen name="module_call_chat_state_nick_name_size">23px</dimen>
-    <dimen name="module_call_chat_state_rating_margin_top">10px</dimen>
-    <dimen name="module_call_chat_state_caller_height">60px</dimen>
-    <dimen name="module_call_chat_state_caller_margin_bottom">20px</dimen>
-    <dimen name="module_call_chat_state_caller_margin_left_right">45px</dimen>
-    <dimen name="module_call_chat_state_caller_drawable_padding">13px</dimen>
-    <dimen name="module_call_chat_state_caller_text_size">17px</dimen>
-
-
-    <dimen name="module_call_chat_team_head_view_width">48px</dimen>
-    <dimen name="module_call_chat_team_head_view_height">48px</dimen>
-    <dimen name="module_call_chat_team_head_view_left_margin">-12px</dimen>
-    <dimen name="module_call_chat_team_head_view_left_margin4">-120px</dimen>
-    <dimen name="module_call_chat_team_head_view_top_margin">19.8px</dimen>
-    <dimen name="module_call_chat_team_calling_top_margin">13px</dimen>
-    <dimen name="module_call_chat_team_calling_left_margin">16px</dimen>
-    <dimen name="module_call_chat_team_calling_size">18px</dimen>
-    <dimen name="module_call_chat_team_info_size">14px</dimen>
-    <dimen name="module_call_chat_team_info_bottom_margin">13px</dimen>
-    <dimen name="module_call_chat_team_info_left_margin">16px</dimen>
-    <dimen name="module_call_chat_team_quit_view_width">43.4px</dimen>
-    <dimen name="module_call_chat_team_quit_view_height">43.4px</dimen>
-    <dimen name="module_call_chat_team_quit_right_margin">16px</dimen>
-
-
-    <dimen name="module_call_chat_team_fragment_margin">10px</dimen>
-    <dimen name="module_call_chat_team_fragment_padding">28px</dimen>
-    <dimen name="module_call_chat_team_fragment_num_text_size">20px</dimen>
-    <dimen name="module_call_chat_team_fragment_close_view_width">44px</dimen>
-    <dimen name="module_call_chat_team_fragment_close_view_height">44px</dimen>
-    <dimen name="module_call_chat_team_fragment_teammates__margin_top">14px</dimen>
-
-    <dimen name="module_call_chat_team_teammate_margin">8px</dimen>
-    <dimen name="module_call_chat_team_teammate_padding">14px</dimen>
-    <dimen name="module_call_chat_team_teammate_height">86px</dimen>
-    <dimen name="module_call_chat_team_teammate_head_width">56px</dimen>
-    <dimen name="module_call_chat_team_teammate_head_height">56px</dimen>
-    <dimen name="module_call_chat_team_teammate_nickname_margin_left">12.4px</dimen>
-    <dimen name="module_call_chat_team_teammate_nickname_text_size">18px</dimen>
-    <dimen name="module_call_chat_team_teammate_identity_width">54px</dimen>
-    <dimen name="module_call_chat_team_teammate_identity_height">26px</dimen>
-    <dimen name="module_call_chat_team_teammate_identity_text_size">15px</dimen>
-
-
-    <dimen name="module_call_chat_team_invitation_padding">21px</dimen>
-    <dimen name="module_call_chat_team_invitation_margin">18px</dimen>
-    <dimen name="module_call_chat_team_invitation_height">122px</dimen>
-    <dimen name="module_call_chat_team_invitation_head_width">82px</dimen>
-    <dimen name="module_call_chat_team_invitation_head_height">82px</dimen>
-    <dimen name="module_call_chat_team_invitation_title_width">66px</dimen>
-    <dimen name="module_call_chat_team_invitation_title_height">26px</dimen>
-    <dimen name="module_call_chat_team_invitation_title_margin_left">12px</dimen>
-    <dimen name="module_call_chat_team_invitation_title_margin_top">9px</dimen>
-    <dimen name="module_call_chat_team_invitation_title_text_size">14px</dimen>
-    <dimen name="module_call_chat_team_invitation_content_margin_left">12px</dimen>
-    <dimen name="module_call_chat_team_invitation_content_margin_bottom">9px</dimen>
-    <dimen name="module_call_chat_team_invitation_content_text_size">18px</dimen>
-    <dimen name="module_call_chat_team_invitation_join_width">54px</dimen>
-    <dimen name="module_call_chat_team_invitation_join_height">54px</dimen>
-    <dimen name="module_call_chat_team_invitation_join_margin_right">20px</dimen>
-</resources>
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/values-mdpi/dimens.xml b/core/function-impl/mogo-core-function-chat/src/main/res/values-mdpi/dimens.xml
deleted file mode 100644
index b757d39120..0000000000
--- a/core/function-impl/mogo-core-function-chat/src/main/res/values-mdpi/dimens.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-
-
-    <dimen name="module_call_chat_state_location_y">467px</dimen>
-    <dimen name="module_call_chat_state_location_x">573px</dimen>
-    <dimen name="module_call_chat_state_width">338px</dimen>
-    <dimen name="module_call_chat_state_height">82px</dimen>
-    <dimen name="module_call_chat_user_state_location_x">1543px</dimen>
-    <dimen name="module_call_chat_user_state_location_y">0px</dimen>
-    <dimen name="module_call_chat_user_state_x">411px</dimen>
-    <dimen name="module_call_chat_user_state_y">474px</dimen>
-    <dimen name="module_call_chat_user_caller_x">161px</dimen>
-
-    <dimen name="module_call_chat_view_width">338px</dimen>
-    <dimen name="module_call_chat_view_match_width">260px</dimen>
-    <dimen name="module_call_chat_view_height">82px</dimen>
-    <dimen name="module_call_chat_view_margin_end">27px</dimen>
-    <dimen name="module_call_chat_match_view_left_margin">23px</dimen>
-    <dimen name="module_call_chat_match_view_right_margin">27px</dimen>
-    <dimen name="module_call_chat_match_view_line_margin_top_bottom">25px</dimen>
-    <dimen name="module_call_chat_match_iv_width">60px</dimen>
-    <dimen name="module_call_chat_match_iv_height">54px</dimen>
-    <dimen name="module_call_chat_match_iv_left_margin">28px</dimen>
-    <dimen name="module_call_chat_match_text_size">22px</dimen>
-    <dimen name="module_call_chat_matching_text_size">22px</dimen>
-    <dimen name="module_call_chat_calling_text_name_size">18px</dimen>
-    <dimen name="module_call_chat_calling_text_time_size">14px</dimen>
-    <dimen name="module_call_chat_calling_text_margin_top_bottom">6px</dimen>
-    <dimen name="module_call_chat_calling_iv_margin_left_right">18px</dimen>
-    <dimen name="module_call_chat_calling_iv_width_height">44px</dimen>
-
-    <dimen name="module_call_chat_state_close_icon_width">45.8px</dimen>
-    <dimen name="module_call_chat_state_user_head_width">83.3px</dimen>
-    <dimen name="module_call_chat_state_close_margin">16.6px</dimen>
-    <dimen name="module_call_chat_state_head_margin_top">88.3px</dimen>
-    <dimen name="module_call_chat_state_head_border">5px</dimen>
-    <dimen name="module_call_chat_state_nick_name_margin_top">10px</dimen>
-    <dimen name="module_call_chat_state_nick_name_size">22px</dimen>
-    <dimen name="module_call_chat_state_rating_margin_top">10px</dimen>
-    <dimen name="module_call_chat_state_caller_height">56px</dimen>
-    <dimen name="module_call_chat_state_caller_margin_bottom">30px</dimen>
-    <dimen name="module_call_chat_state_caller_margin_left_right">39px</dimen>
-    <dimen name="module_call_chat_state_caller_padding_left">30px</dimen>
-    <dimen name="module_call_chat_state_caller_drawable_padding">13px</dimen>
-    <dimen name="module_call_chat_state_caller_text_size">17px</dimen>
-
-
-    <dimen name="module_call_chat_team_head_view_width">26.4px</dimen>
-    <dimen name="module_call_chat_team_head_view_height">26.4px</dimen>
-    <dimen name="module_call_chat_team_head_view_left_margin">-6.6px</dimen>
-    <dimen name="module_call_chat_team_head_view_left_margin4">-66px</dimen>
-    <dimen name="module_call_chat_team_head_view_top_margin">19.8px</dimen>
-    <dimen name="module_call_chat_team_calling_top_margin">13px</dimen>
-    <dimen name="module_call_chat_team_calling_left_margin">14.6px</dimen>
-    <dimen name="module_call_chat_team_calling_size">18px</dimen>
-    <dimen name="module_call_chat_team_info_size">14px</dimen>
-    <dimen name="module_call_chat_team_info_bottom_margin">11px</dimen>
-    <dimen name="module_call_chat_team_info_left_margin">14.6px</dimen>
-    <dimen name="module_call_chat_team_quit_view_width">43.4px</dimen>
-    <dimen name="module_call_chat_team_quit_view_height">43.4px</dimen>
-    <dimen name="module_call_chat_team_quit_right_margin">16.5px</dimen>
-    <dimen name="module_call_chat_team_view_line_margin_top_bottom">25px</dimen>
-
-
-    <dimen name="module_call_chat_team_fragment_margin">10px</dimen>
-    <dimen name="module_call_chat_team_fragment_padding">28px</dimen>
-    <dimen name="module_call_chat_team_fragment_num_text_size">20px</dimen>
-    <dimen name="module_call_chat_team_fragment_close_view_width">44px</dimen>
-    <dimen name="module_call_chat_team_fragment_close_view_height">44px</dimen>
-    <dimen name="module_call_chat_team_fragment_teammates__margin_top">14px</dimen>
-
-    <dimen name="module_call_chat_team_teammate_margin">8px</dimen>
-    <dimen name="module_call_chat_team_teammate_padding">14px</dimen>
-    <dimen name="module_call_chat_team_teammate_height">86px</dimen>
-    <dimen name="module_call_chat_team_teammate_head_width">56px</dimen>
-    <dimen name="module_call_chat_team_teammate_head_height">56px</dimen>
-    <dimen name="module_call_chat_team_teammate_nickname_margin_left">12.4px</dimen>
-    <dimen name="module_call_chat_team_teammate_nickname_text_size">18px</dimen>
-    <dimen name="module_call_chat_team_teammate_identity_width">54px</dimen>
-    <dimen name="module_call_chat_team_teammate_identity_height">26px</dimen>
-    <dimen name="module_call_chat_team_teammate_identity_text_size">15px</dimen>
-
-
-    <dimen name="module_call_chat_team_invitation_layout_height">138px</dimen>
-    <dimen name="module_call_chat_team_invitation_padding">21px</dimen>
-    <dimen name="module_call_chat_team_invitation_margin">18px</dimen>
-    <dimen name="module_call_chat_team_invitation_height">122px</dimen>
-    <dimen name="module_call_chat_team_invitation_head_width">82px</dimen>
-    <dimen name="module_call_chat_team_invitation_head_height">82px</dimen>
-    <dimen name="module_call_chat_team_invitation_title_width">66px</dimen>
-    <dimen name="module_call_chat_team_invitation_title_height">26px</dimen>
-    <dimen name="module_call_chat_team_invitation_title_margin_left">12px</dimen>
-    <dimen name="module_call_chat_team_invitation_title_margin_top">30px</dimen>
-    <dimen name="module_call_chat_team_invitation_title_text_size">14px</dimen>
-    <dimen name="module_call_chat_team_invitation_content_margin_left">12px</dimen>
-    <dimen name="module_call_chat_team_invitation_content_margin_bottom">30px</dimen>
-    <dimen name="module_call_chat_team_invitation_content_text_size">18px</dimen>
-    <dimen name="module_call_chat_team_invitation_join_width">54px</dimen>
-    <dimen name="module_call_chat_team_invitation_join_height">54px</dimen>
-    <dimen name="module_call_chat_team_invitation_join_margin_right">20px</dimen>
-</resources>
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/values-xhdpi-2560x1440/dimens.xml b/core/function-impl/mogo-core-function-chat/src/main/res/values-xhdpi-2560x1440/dimens.xml
index e264311f06..8f264f035d 100644
--- a/core/function-impl/mogo-core-function-chat/src/main/res/values-xhdpi-2560x1440/dimens.xml
+++ b/core/function-impl/mogo-core-function-chat/src/main/res/values-xhdpi-2560x1440/dimens.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="module_call_chat_state_location_hawk_eye_x">40px</dimen>
-    <dimen name="module_call_chat_state_location_hawk_eye_y">1160px</dimen>
     <dimen name="module_call_chat_state_hawk_eye_width">460px</dimen>
     <dimen name="module_call_chat_state_hawk_eye_height">144px</dimen>
     <dimen name="module_call_chat_state_incoming_hawk_eye_width">560px</dimen>
@@ -9,8 +7,6 @@
     <dimen name="module_call_chat_state_incoming_hawk_eye_margin_left">20px</dimen>
     <dimen name="module_call_chat_state_incoming_hawk_eye_call_margin_right">30px</dimen>
     <dimen name="module_call_chat_calling_bg_radius">30px</dimen>
-    <dimen name="module_call_chat_matching_textsize">28px</dimen>
-    <dimen name="module_call_chat_matching_text_size">24px</dimen>
     <dimen name="module_call_chat_calling_iv_hawk_eye_width_height">144px</dimen>
     <dimen name="module_call_chat_hawk_eye_circle_btn_size">88px</dimen>
     <dimen name="module_call_chat_hawk_eye_incoming_circle_btn_size">86px</dimen>
@@ -18,12 +14,5 @@
     <dimen name="module_call_chat_calling_text_hawk_eye_margin_top_bottom">26px</dimen>
     <dimen name="module_call_chat_calling_text_hawk_eye_time_size">24px</dimen>
     <dimen name="module_call_chat_calling_text_hawk_eye_name_size">40px</dimen>
-    <dimen name="module_call_chat_team_ll_head_width">144px</dimen>
-    <dimen name="module_call_chat_team_num_width">106px</dimen>
-    <dimen name="module_call_chat_team_num_text_size">40px</dimen>
-    <dimen name="module_call_chat_team_info_margin_bottom">27px</dimen>
-    <dimen name="module_call_chat_team_info_text_size">24px</dimen>
-    <dimen name="module_call_chat_team_chatting_margin_top">27px</dimen>
-    <dimen name="module_call_chat_team_chatting_text_size">34px</dimen>
     <dimen name="module_call_chat_incoming_aisdk_tag_width">139px</dimen>
 </resources>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/values-xhdpi/dimens.xml b/core/function-impl/mogo-core-function-chat/src/main/res/values-xhdpi/dimens.xml
index 56261617d8..ee096204b6 100644
--- a/core/function-impl/mogo-core-function-chat/src/main/res/values-xhdpi/dimens.xml
+++ b/core/function-impl/mogo-core-function-chat/src/main/res/values-xhdpi/dimens.xml
@@ -1,1105 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
     <dimen name="module_call_chat_calling_bg_radius">20px</dimen>
-    <dimen name="module_call_chat_matching_textsize">18px</dimen>
-    <dimen name="module_call_chat_team_ll_head_width">100px</dimen>
-    <dimen name="module_call_chat_team_num_width">80px</dimen>
-    <dimen name="module_call_chat_team_num_text_size">30px</dimen>
-    <dimen name="module_call_chat_team_info_margin_bottom">20px</dimen>
-    <dimen name="module_call_chat_team_info_text_size">20px</dimen>
-    <dimen name="module_call_chat_team_chatting_margin_top">20px</dimen>
-    <dimen name="module_call_chat_team_chatting_text_size">22px</dimen>
-    <!-- dp and sp values, must be define in this file! -->
-    <!-- view size,you can add if there is no one -->
-    <dimen name="dp_m_60">-60px</dimen>
-    <dimen name="dp_m_30">-30px</dimen>
-    <dimen name="dp_m_20">-20px</dimen>
-    <dimen name="dp_m_12">-12px</dimen>
-    <dimen name="dp_m_10">-10px</dimen>
-    <dimen name="dp_m_8">-8px</dimen>
-    <dimen name="dp_m_5">-5px</dimen>
-    <dimen name="dp_m_2">-2px</dimen>
-    <dimen name="dp_m_1">-1px</dimen>
-    <dimen name="dp_0">0px</dimen>
-    <dimen name="dp_0_1">0.1px</dimen>
-    <dimen name="dp_0_5">0.5px</dimen>
-    <dimen name="dp_1">1px</dimen>
-    <dimen name="dp_1_5">1.5px</dimen>
-    <dimen name="dp_2">2px</dimen>
-    <dimen name="dp_2_5">2.5px</dimen>
-    <dimen name="dp_3">3px</dimen>
-    <dimen name="dp_3_5">3.5px</dimen>
-    <dimen name="dp_4">4px</dimen>
-    <dimen name="dp_4_5">4.5px</dimen>
-    <dimen name="dp_5">5px</dimen>
-    <dimen name="dp_6">6px</dimen>
-    <dimen name="dp_7">7px</dimen>
-    <dimen name="dp_7_5">7.5px</dimen>
-    <dimen name="dp_8">8px</dimen>
-    <dimen name="dp_9">9px</dimen>
-    <dimen name="dp_10">10px</dimen>
-    <dimen name="dp_11">11px</dimen>
-    <dimen name="dp_12">12px</dimen>
-    <dimen name="dp_13">13px</dimen>
-    <dimen name="dp_14">14px</dimen>
-    <dimen name="dp_15">15px</dimen>
-    <dimen name="dp_16">16px</dimen>
-    <dimen name="dp_17">17px</dimen>
-    <dimen name="dp_18">18px</dimen>
-    <dimen name="dp_19">19px</dimen>
-    <dimen name="dp_20">20px</dimen>
-    <dimen name="dp_21">21px</dimen>
+
     <dimen name="dp_22">22px</dimen>
-    <dimen name="dp_23">23px</dimen>
-    <dimen name="dp_24">24px</dimen>
-    <dimen name="dp_25">25px</dimen>
-    <dimen name="dp_26">26px</dimen>
-    <dimen name="dp_27">27px</dimen>
-    <dimen name="dp_28">28px</dimen>
-    <dimen name="dp_29">29px</dimen>
-    <dimen name="dp_30">30px</dimen>
-    <dimen name="dp_31">31px</dimen>
-    <dimen name="dp_32">32px</dimen>
-    <dimen name="dp_33">33px</dimen>
-    <dimen name="dp_34">34px</dimen>
-    <dimen name="dp_35">35px</dimen>
-    <dimen name="dp_36">36px</dimen>
-    <dimen name="dp_37">37px</dimen>
-    <dimen name="dp_38">38px</dimen>
-    <dimen name="dp_39">39px</dimen>
-    <dimen name="dp_40">40px</dimen>
-    <dimen name="dp_41">41px</dimen>
-    <dimen name="dp_42">42px</dimen>
-    <dimen name="dp_43">43px</dimen>
-    <dimen name="dp_44">44px</dimen>
-    <dimen name="dp_45">45px</dimen>
-    <dimen name="dp_46">46px</dimen>
-    <dimen name="dp_47">47px</dimen>
-    <dimen name="dp_48">48px</dimen>
-    <dimen name="dp_49">49px</dimen>
-    <dimen name="dp_50">50px</dimen>
-    <dimen name="dp_51">51px</dimen>
-    <dimen name="dp_52">52px</dimen>
-    <dimen name="dp_53">53px</dimen>
-    <dimen name="dp_54">54px</dimen>
-    <dimen name="dp_55">55px</dimen>
-    <dimen name="dp_56">56px</dimen>
-    <dimen name="dp_57">57px</dimen>
-    <dimen name="dp_58">58px</dimen>
-    <dimen name="dp_59">59px</dimen>
-    <dimen name="dp_60">60px</dimen>
-    <dimen name="dp_61">61px</dimen>
-    <dimen name="dp_62">62px</dimen>
-    <dimen name="dp_63">63px</dimen>
-    <dimen name="dp_64">64px</dimen>
-    <dimen name="dp_65">65px</dimen>
-    <dimen name="dp_66">66px</dimen>
-    <dimen name="dp_67">67px</dimen>
-    <dimen name="dp_68">68px</dimen>
-    <dimen name="dp_69">69px</dimen>
-    <dimen name="dp_70">70px</dimen>
-    <dimen name="dp_71">71px</dimen>
-    <dimen name="dp_72">72px</dimen>
-    <dimen name="dp_73">73px</dimen>
-    <dimen name="dp_74">74px</dimen>
-    <dimen name="dp_75">75px</dimen>
-    <dimen name="dp_76">76px</dimen>
-    <dimen name="dp_77">77px</dimen>
-    <dimen name="dp_78">78px</dimen>
-    <dimen name="dp_79">79px</dimen>
-    <dimen name="dp_80">80px</dimen>
-    <dimen name="dp_81">81px</dimen>
-    <dimen name="dp_82">82px</dimen>
-    <dimen name="dp_83">83px</dimen>
-    <dimen name="dp_84">84px</dimen>
-    <dimen name="dp_85">85px</dimen>
-    <dimen name="dp_86">86px</dimen>
-    <dimen name="dp_87">87px</dimen>
-    <dimen name="dp_88">88px</dimen>
-    <dimen name="dp_89">89px</dimen>
-    <dimen name="dp_90">90px</dimen>
-    <dimen name="dp_91">91px</dimen>
-    <dimen name="dp_92">92px</dimen>
-    <dimen name="dp_93">93px</dimen>
-    <dimen name="dp_94">94px</dimen>
-    <dimen name="dp_95">95px</dimen>
-    <dimen name="dp_96">96px</dimen>
-    <dimen name="dp_97">97px</dimen>
-    <dimen name="dp_98">98px</dimen>
-    <dimen name="dp_99">99px</dimen>
-    <dimen name="dp_100">100px</dimen>
-    <dimen name="dp_101">101px</dimen>
-    <dimen name="dp_102">102px</dimen>
-    <dimen name="dp_103">103px</dimen>
-    <dimen name="dp_104">104px</dimen>
-    <dimen name="dp_104_5">104.5px</dimen>
-    <dimen name="dp_105">105px</dimen>
-    <dimen name="dp_106">106px</dimen>
-    <dimen name="dp_107">107px</dimen>
-    <dimen name="dp_108">108px</dimen>
-    <dimen name="dp_109">109px</dimen>
-    <dimen name="dp_110">110px</dimen>
-    <dimen name="dp_111">111px</dimen>
-    <dimen name="dp_112">112px</dimen>
-    <dimen name="dp_113">113px</dimen>
-    <dimen name="dp_114">114px</dimen>
-    <dimen name="dp_115">115px</dimen>
-    <dimen name="dp_116">116px</dimen>
-    <dimen name="dp_117">117px</dimen>
-    <dimen name="dp_118">118px</dimen>
-    <dimen name="dp_119">119px</dimen>
-    <dimen name="dp_120">120px</dimen>
-    <dimen name="dp_121">121px</dimen>
-    <dimen name="dp_122">122px</dimen>
-    <dimen name="dp_123">123px</dimen>
-    <dimen name="dp_124">124px</dimen>
-    <dimen name="dp_125">125px</dimen>
-    <dimen name="dp_126">126px</dimen>
-    <dimen name="dp_127">127px</dimen>
-    <dimen name="dp_128">128px</dimen>
-    <dimen name="dp_129">129px</dimen>
-    <dimen name="dp_130">130px</dimen>
-    <dimen name="dp_131">131px</dimen>
-    <dimen name="dp_132">132px</dimen>
-    <dimen name="dp_133">133px</dimen>
-    <dimen name="dp_134">134px</dimen>
-    <dimen name="dp_134_5">134.5px</dimen>
-    <dimen name="dp_135">135px</dimen>
-    <dimen name="dp_136">136px</dimen>
-    <dimen name="dp_137">137px</dimen>
-    <dimen name="dp_138">138px</dimen>
-    <dimen name="dp_139">139px</dimen>
-    <dimen name="dp_140">140px</dimen>
-    <dimen name="dp_141">141px</dimen>
-    <dimen name="dp_142">142px</dimen>
-    <dimen name="dp_143">143px</dimen>
-    <dimen name="dp_144">144px</dimen>
-    <dimen name="dp_145">145px</dimen>
-    <dimen name="dp_146">146px</dimen>
-    <dimen name="dp_147">147px</dimen>
-    <dimen name="dp_148">148px</dimen>
-    <dimen name="dp_149">149px</dimen>
-    <dimen name="dp_150">150px</dimen>
-    <dimen name="dp_151">151px</dimen>
-    <dimen name="dp_152">152px</dimen>
-    <dimen name="dp_153">153px</dimen>
-    <dimen name="dp_154">154px</dimen>
-    <dimen name="dp_155">155px</dimen>
-    <dimen name="dp_156">156px</dimen>
-    <dimen name="dp_157">157px</dimen>
-    <dimen name="dp_158">158px</dimen>
-    <dimen name="dp_159">159px</dimen>
-    <dimen name="dp_160">160px</dimen>
-    <dimen name="dp_161">161px</dimen>
-    <dimen name="dp_162">162px</dimen>
-    <dimen name="dp_163">163px</dimen>
-    <dimen name="dp_164">164px</dimen>
-    <dimen name="dp_165">165px</dimen>
-    <dimen name="dp_166">166px</dimen>
-    <dimen name="dp_167">167px</dimen>
-    <dimen name="dp_168">168px</dimen>
-    <dimen name="dp_169">169px</dimen>
-    <dimen name="dp_170">170px</dimen>
-    <dimen name="dp_171">171px</dimen>
-    <dimen name="dp_172">172px</dimen>
-    <dimen name="dp_173">173px</dimen>
-    <dimen name="dp_174">174px</dimen>
-    <dimen name="dp_175">175px</dimen>
-    <dimen name="dp_176">176px</dimen>
-    <dimen name="dp_177">177px</dimen>
-    <dimen name="dp_178">178px</dimen>
-    <dimen name="dp_179">179px</dimen>
-    <dimen name="dp_180">180px</dimen>
-    <dimen name="dp_181">181px</dimen>
-    <dimen name="dp_182">182px</dimen>
-    <dimen name="dp_183">183px</dimen>
-    <dimen name="dp_184">184px</dimen>
-    <dimen name="dp_185">185px</dimen>
-    <dimen name="dp_186">186px</dimen>
-    <dimen name="dp_187">187px</dimen>
-    <dimen name="dp_188">188px</dimen>
-    <dimen name="dp_189">189px</dimen>
-    <dimen name="dp_190">190px</dimen>
-    <dimen name="dp_191">191px</dimen>
-    <dimen name="dp_191_25">191.25px</dimen>
-    <dimen name="dp_192">192px</dimen>
-    <dimen name="dp_193">193px</dimen>
-    <dimen name="dp_194">194px</dimen>
-    <dimen name="dp_195">195px</dimen>
-    <dimen name="dp_196">196px</dimen>
-    <dimen name="dp_197">197px</dimen>
-    <dimen name="dp_198">198px</dimen>
-    <dimen name="dp_199">199px</dimen>
-    <dimen name="dp_200">200px</dimen>
-    <dimen name="dp_201">201px</dimen>
-    <dimen name="dp_202">202px</dimen>
-    <dimen name="dp_203">203px</dimen>
-    <dimen name="dp_204">204px</dimen>
-    <dimen name="dp_205">205px</dimen>
-    <dimen name="dp_206">206px</dimen>
-    <dimen name="dp_207">207px</dimen>
-    <dimen name="dp_208">208px</dimen>
-    <dimen name="dp_209">209px</dimen>
-    <dimen name="dp_210">210px</dimen>
-    <dimen name="dp_211">211px</dimen>
-    <dimen name="dp_212">212px</dimen>
-    <dimen name="dp_213">213px</dimen>
-    <dimen name="dp_214">214px</dimen>
-    <dimen name="dp_215">215px</dimen>
-    <dimen name="dp_216">216px</dimen>
-    <dimen name="dp_217">217px</dimen>
-    <dimen name="dp_218">218px</dimen>
-    <dimen name="dp_219">219px</dimen>
-    <dimen name="dp_220">220px</dimen>
-    <dimen name="dp_221">221px</dimen>
-    <dimen name="dp_222">222px</dimen>
-    <dimen name="dp_223">223px</dimen>
-    <dimen name="dp_224">224px</dimen>
-    <dimen name="dp_225">225px</dimen>
-    <dimen name="dp_226">226px</dimen>
-    <dimen name="dp_227">227px</dimen>
-    <dimen name="dp_228">228px</dimen>
-    <dimen name="dp_229">229px</dimen>
-    <dimen name="dp_230">230px</dimen>
-    <dimen name="dp_231">231px</dimen>
-    <dimen name="dp_232">232px</dimen>
-    <dimen name="dp_233">233px</dimen>
-    <dimen name="dp_234">234px</dimen>
-    <dimen name="dp_235">235px</dimen>
-    <dimen name="dp_236">236px</dimen>
-    <dimen name="dp_237">237px</dimen>
-    <dimen name="dp_238">238px</dimen>
-    <dimen name="dp_239">239px</dimen>
-    <dimen name="dp_240">240px</dimen>
-    <dimen name="dp_241">241px</dimen>
-    <dimen name="dp_242">242px</dimen>
-    <dimen name="dp_243">243px</dimen>
-    <dimen name="dp_244">244px</dimen>
-    <dimen name="dp_245">245px</dimen>
-    <dimen name="dp_246">246px</dimen>
-    <dimen name="dp_247">247px</dimen>
-    <dimen name="dp_248">248px</dimen>
-    <dimen name="dp_249">249px</dimen>
-    <dimen name="dp_250">250px</dimen>
-    <dimen name="dp_251">251px</dimen>
-    <dimen name="dp_252">252px</dimen>
-    <dimen name="dp_253">253px</dimen>
-    <dimen name="dp_254">254px</dimen>
-    <dimen name="dp_255">255px</dimen>
-    <dimen name="dp_256">256px</dimen>
-    <dimen name="dp_257">257px</dimen>
-    <dimen name="dp_258">258px</dimen>
-    <dimen name="dp_259">259px</dimen>
-    <dimen name="dp_260">260px</dimen>
-    <dimen name="dp_261">261px</dimen>
-    <dimen name="dp_262">262px</dimen>
-    <dimen name="dp_263">263px</dimen>
-    <dimen name="dp_264">264px</dimen>
-    <dimen name="dp_265">265px</dimen>
-    <dimen name="dp_266">266px</dimen>
-    <dimen name="dp_267">267px</dimen>
-    <dimen name="dp_268">268px</dimen>
-    <dimen name="dp_269">269px</dimen>
-    <dimen name="dp_270">270px</dimen>
-    <dimen name="dp_271">271px</dimen>
-    <dimen name="dp_272">272px</dimen>
-    <dimen name="dp_273">273px</dimen>
-    <dimen name="dp_274">274px</dimen>
-    <dimen name="dp_275">275px</dimen>
-    <dimen name="dp_276">276px</dimen>
-    <dimen name="dp_277">277px</dimen>
-    <dimen name="dp_278">278px</dimen>
-    <dimen name="dp_279">279px</dimen>
-    <dimen name="dp_280">280px</dimen>
-    <dimen name="dp_281">281px</dimen>
-    <dimen name="dp_282">282px</dimen>
-    <dimen name="dp_283">283px</dimen>
-    <dimen name="dp_284">284px</dimen>
-    <dimen name="dp_285">285px</dimen>
-    <dimen name="dp_286">286px</dimen>
-    <dimen name="dp_287">287px</dimen>
-    <dimen name="dp_288">288px</dimen>
-    <dimen name="dp_289">289px</dimen>
-    <dimen name="dp_290">290px</dimen>
-    <dimen name="dp_291">291px</dimen>
-    <dimen name="dp_292">292px</dimen>
-    <dimen name="dp_293">293px</dimen>
-    <dimen name="dp_294">294px</dimen>
-    <dimen name="dp_295">295px</dimen>
-    <dimen name="dp_296">296px</dimen>
-    <dimen name="dp_297">297px</dimen>
-    <dimen name="dp_298">298px</dimen>
-    <dimen name="dp_299">299px</dimen>
-    <dimen name="dp_300">300px</dimen>
-    <dimen name="dp_301">301px</dimen>
-    <dimen name="dp_302">302px</dimen>
-    <dimen name="dp_303">303px</dimen>
-    <dimen name="dp_304">304px</dimen>
-    <dimen name="dp_305">305px</dimen>
-    <dimen name="dp_306">306px</dimen>
-    <dimen name="dp_307">307px</dimen>
-    <dimen name="dp_308">308px</dimen>
-    <dimen name="dp_309">309px</dimen>
-    <dimen name="dp_310">310px</dimen>
-    <dimen name="dp_311">311px</dimen>
-    <dimen name="dp_312">312px</dimen>
-    <dimen name="dp_313">313px</dimen>
-    <dimen name="dp_314">314px</dimen>
-    <dimen name="dp_315">315px</dimen>
-    <dimen name="dp_316">316px</dimen>
-    <dimen name="dp_317">317px</dimen>
-    <dimen name="dp_318">318px</dimen>
-    <dimen name="dp_319">319px</dimen>
-    <dimen name="dp_320">320px</dimen>
-    <dimen name="dp_321">321px</dimen>
-    <dimen name="dp_322">322px</dimen>
-    <dimen name="dp_323">323px</dimen>
-    <dimen name="dp_324">324px</dimen>
-    <dimen name="dp_325">325px</dimen>
-    <dimen name="dp_326">326px</dimen>
-    <dimen name="dp_327">327px</dimen>
-    <dimen name="dp_328">328px</dimen>
-    <dimen name="dp_329">329px</dimen>
-    <dimen name="dp_330">330px</dimen>
-    <dimen name="dp_331">331px</dimen>
-    <dimen name="dp_332">332px</dimen>
-    <dimen name="dp_333">333px</dimen>
-    <dimen name="dp_334">334px</dimen>
-    <dimen name="dp_335">335px</dimen>
-    <dimen name="dp_336">336px</dimen>
-    <dimen name="dp_337">337px</dimen>
-    <dimen name="dp_338">338px</dimen>
-    <dimen name="dp_339">339px</dimen>
-    <dimen name="dp_340">340px</dimen>
-    <dimen name="dp_341">341px</dimen>
-    <dimen name="dp_342">342px</dimen>
-    <dimen name="dp_343">343px</dimen>
-    <dimen name="dp_344">344px</dimen>
-    <dimen name="dp_345">345px</dimen>
-    <dimen name="dp_346">346px</dimen>
-    <dimen name="dp_347">347px</dimen>
-    <dimen name="dp_348">348px</dimen>
-    <dimen name="dp_349">349px</dimen>
-    <dimen name="dp_350">350px</dimen>
-    <dimen name="dp_351">351px</dimen>
-    <dimen name="dp_352">352px</dimen>
-    <dimen name="dp_353">353px</dimen>
-    <dimen name="dp_354">354px</dimen>
-    <dimen name="dp_355">355px</dimen>
-    <dimen name="dp_356">356px</dimen>
-    <dimen name="dp_357">357px</dimen>
-    <dimen name="dp_358">358px</dimen>
-    <dimen name="dp_359">359px</dimen>
-    <dimen name="dp_366">366px</dimen>
-    <dimen name="dp_367">367px</dimen>
-    <dimen name="dp_368">368px</dimen>
-    <dimen name="dp_369">369px</dimen>
-    <dimen name="dp_370">370px</dimen>
-    <dimen name="dp_371">371px</dimen>
-    <dimen name="dp_372">372px</dimen>
-    <dimen name="dp_373">373px</dimen>
-    <dimen name="dp_374">374px</dimen>
-    <dimen name="dp_375">375px</dimen>
-    <dimen name="dp_376">376px</dimen>
-    <dimen name="dp_377">377px</dimen>
-    <dimen name="dp_378">378px</dimen>
-    <dimen name="dp_379">379px</dimen>
-    <dimen name="dp_380">380px</dimen>
-    <dimen name="dp_381">381px</dimen>
-    <dimen name="dp_382">382px</dimen>
-    <dimen name="dp_383">383px</dimen>
-    <dimen name="dp_384">384px</dimen>
-    <dimen name="dp_385">385px</dimen>
-    <dimen name="dp_386">386px</dimen>
-    <dimen name="dp_387">387px</dimen>
-    <dimen name="dp_388">388px</dimen>
-    <dimen name="dp_389">389px</dimen>
-    <dimen name="dp_390">390px</dimen>
-    <dimen name="dp_391">391px</dimen>
-    <dimen name="dp_392">392px</dimen>
-    <dimen name="dp_393">393px</dimen>
-    <dimen name="dp_394">394px</dimen>
-    <dimen name="dp_395">395px</dimen>
-    <dimen name="dp_396">396px</dimen>
-    <dimen name="dp_397">397px</dimen>
-    <dimen name="dp_398">398px</dimen>
-    <dimen name="dp_399">399px</dimen>
-    <dimen name="dp_400">400px</dimen>
-    <dimen name="dp_401">401px</dimen>
-    <dimen name="dp_402">402px</dimen>
-    <dimen name="dp_403">403px</dimen>
-    <dimen name="dp_404">404px</dimen>
-    <dimen name="dp_405">405px</dimen>
-    <dimen name="dp_406">406px</dimen>
-    <dimen name="dp_407">407px</dimen>
-    <dimen name="dp_408">408px</dimen>
-    <dimen name="dp_409">409px</dimen>
-    <dimen name="dp_410">410px</dimen>
-    <dimen name="dp_411">411px</dimen>
-    <dimen name="dp_412">412px</dimen>
-    <dimen name="dp_413">413px</dimen>
-    <dimen name="dp_414">414px</dimen>
-    <dimen name="dp_415">415px</dimen>
-    <dimen name="dp_416">416px</dimen>
-    <dimen name="dp_417">417px</dimen>
-    <dimen name="dp_418">418px</dimen>
-    <dimen name="dp_419">419px</dimen>
-    <dimen name="dp_420">420px</dimen>
-    <dimen name="dp_421">421px</dimen>
-    <dimen name="dp_422">422px</dimen>
-    <dimen name="dp_423">423px</dimen>
-    <dimen name="dp_424">424px</dimen>
-    <dimen name="dp_425">425px</dimen>
-    <dimen name="dp_426">426px</dimen>
-    <dimen name="dp_427">427px</dimen>
-    <dimen name="dp_428">428px</dimen>
-    <dimen name="dp_429">429px</dimen>
-    <dimen name="dp_430">430px</dimen>
-    <dimen name="dp_431">431px</dimen>
-    <dimen name="dp_432">432px</dimen>
-    <dimen name="dp_433">433px</dimen>
-    <dimen name="dp_434">434px</dimen>
-    <dimen name="dp_435">435px</dimen>
-    <dimen name="dp_436">436px</dimen>
-    <dimen name="dp_437">437px</dimen>
-    <dimen name="dp_438">438px</dimen>
-    <dimen name="dp_439">439px</dimen>
-    <dimen name="dp_440">440px</dimen>
-    <dimen name="dp_441">441px</dimen>
-    <dimen name="dp_442">442px</dimen>
-    <dimen name="dp_443">443px</dimen>
-    <dimen name="dp_444">444px</dimen>
-    <dimen name="dp_445">445px</dimen>
-    <dimen name="dp_446">446px</dimen>
-    <dimen name="dp_447">447px</dimen>
-    <dimen name="dp_448">448px</dimen>
-    <dimen name="dp_449">449px</dimen>
-    <dimen name="dp_450">450px</dimen>
-    <dimen name="dp_451">451px</dimen>
-    <dimen name="dp_452">452px</dimen>
-    <dimen name="dp_453">453px</dimen>
-    <dimen name="dp_454">454px</dimen>
-    <dimen name="dp_455">455px</dimen>
-    <dimen name="dp_456">456px</dimen>
-    <dimen name="dp_457">457px</dimen>
-    <dimen name="dp_458">458px</dimen>
-    <dimen name="dp_459">459px</dimen>
-    <dimen name="dp_460">460px</dimen>
-    <dimen name="dp_461">461px</dimen>
-    <dimen name="dp_462">462px</dimen>
-    <dimen name="dp_463">463px</dimen>
-    <dimen name="dp_464">464px</dimen>
-    <dimen name="dp_465">465px</dimen>
-    <dimen name="dp_466">466px</dimen>
-    <dimen name="dp_467">467px</dimen>
-    <dimen name="dp_468">468px</dimen>
-    <dimen name="dp_469">469px</dimen>
-    <dimen name="dp_470">470px</dimen>
-    <dimen name="dp_471">471px</dimen>
-    <dimen name="dp_472">472px</dimen>
-    <dimen name="dp_473">473px</dimen>
-    <dimen name="dp_474">474px</dimen>
-    <dimen name="dp_475">475px</dimen>
-    <dimen name="dp_476">476px</dimen>
-    <dimen name="dp_477">477px</dimen>
-    <dimen name="dp_478">478px</dimen>
-    <dimen name="dp_479">479px</dimen>
-    <dimen name="dp_480">480px</dimen>
-    <dimen name="dp_481">481px</dimen>
-    <dimen name="dp_482">482px</dimen>
-    <dimen name="dp_483">483px</dimen>
-    <dimen name="dp_484">484px</dimen>
-    <dimen name="dp_485">485px</dimen>
-    <dimen name="dp_486">486px</dimen>
-    <dimen name="dp_487">487px</dimen>
-    <dimen name="dp_488">488px</dimen>
-    <dimen name="dp_489">489px</dimen>
-    <dimen name="dp_490">490px</dimen>
-    <dimen name="dp_491">491px</dimen>
-    <dimen name="dp_492">492px</dimen>
-    <dimen name="dp_493">493px</dimen>
-    <dimen name="dp_494">494px</dimen>
-    <dimen name="dp_495">495px</dimen>
-    <dimen name="dp_496">496px</dimen>
-    <dimen name="dp_497">497px</dimen>
-    <dimen name="dp_498">498px</dimen>
-    <dimen name="dp_499">499px</dimen>
-    <dimen name="dp_500">500px</dimen>
-    <dimen name="dp_501">501px</dimen>
-    <dimen name="dp_502">502px</dimen>
-    <dimen name="dp_503">503px</dimen>
-    <dimen name="dp_504">504px</dimen>
-    <dimen name="dp_505">505px</dimen>
-    <dimen name="dp_506">506px</dimen>
-    <dimen name="dp_507">507px</dimen>
-    <dimen name="dp_508">508px</dimen>
-    <dimen name="dp_509">509px</dimen>
-    <dimen name="dp_510">510px</dimen>
-    <dimen name="dp_511">511px</dimen>
-    <dimen name="dp_512">512px</dimen>
-    <dimen name="dp_513">513px</dimen>
-    <dimen name="dp_514">514px</dimen>
-    <dimen name="dp_515">515px</dimen>
-    <dimen name="dp_516">516px</dimen>
-    <dimen name="dp_517">517px</dimen>
-    <dimen name="dp_518">518px</dimen>
-    <dimen name="dp_519">519px</dimen>
-    <dimen name="dp_520">520px</dimen>
-    <dimen name="dp_521">521px</dimen>
-    <dimen name="dp_522">522px</dimen>
-    <dimen name="dp_523">523px</dimen>
-    <dimen name="dp_524">524px</dimen>
-    <dimen name="dp_525">525px</dimen>
-    <dimen name="dp_526">526px</dimen>
-    <dimen name="dp_527">527px</dimen>
-    <dimen name="dp_528">528px</dimen>
-    <dimen name="dp_529">529px</dimen>
-    <dimen name="dp_530">530px</dimen>
-    <dimen name="dp_531">531px</dimen>
-    <dimen name="dp_532">532px</dimen>
-    <dimen name="dp_533">533px</dimen>
-    <dimen name="dp_534">534px</dimen>
-    <dimen name="dp_535">535px</dimen>
-    <dimen name="dp_536">536px</dimen>
-    <dimen name="dp_537">537px</dimen>
-    <dimen name="dp_538">538px</dimen>
-    <dimen name="dp_539">539px</dimen>
-    <dimen name="dp_540">540px</dimen>
-    <dimen name="dp_541">541px</dimen>
-    <dimen name="dp_542">542px</dimen>
-    <dimen name="dp_543">543px</dimen>
-    <dimen name="dp_544">544px</dimen>
-    <dimen name="dp_545">545px</dimen>
-    <dimen name="dp_546">546px</dimen>
-    <dimen name="dp_547">547px</dimen>
-    <dimen name="dp_548">548px</dimen>
-    <dimen name="dp_549">549px</dimen>
-    <dimen name="dp_550">550px</dimen>
-    <dimen name="dp_551">551px</dimen>
-    <dimen name="dp_552">552px</dimen>
-    <dimen name="dp_553">553px</dimen>
-    <dimen name="dp_554">554px</dimen>
-    <dimen name="dp_555">555px</dimen>
-    <dimen name="dp_556">556px</dimen>
-    <dimen name="dp_557">557px</dimen>
-    <dimen name="dp_558">558px</dimen>
-    <dimen name="dp_559">559px</dimen>
-    <dimen name="dp_560">560px</dimen>
-    <dimen name="dp_561">561px</dimen>
-    <dimen name="dp_562">562px</dimen>
-    <dimen name="dp_563">563px</dimen>
-    <dimen name="dp_564">564px</dimen>
-    <dimen name="dp_565">565px</dimen>
-    <dimen name="dp_566">566px</dimen>
-    <dimen name="dp_567">567px</dimen>
-    <dimen name="dp_568">568px</dimen>
-    <dimen name="dp_569">569px</dimen>
-    <dimen name="dp_570">570px</dimen>
-    <dimen name="dp_571">571px</dimen>
-    <dimen name="dp_572">572px</dimen>
-    <dimen name="dp_573">573px</dimen>
-    <dimen name="dp_574">574px</dimen>
-    <dimen name="dp_575">575px</dimen>
-    <dimen name="dp_576">576px</dimen>
-    <dimen name="dp_577">577px</dimen>
-    <dimen name="dp_578">578px</dimen>
-    <dimen name="dp_579">579px</dimen>
-    <dimen name="dp_580">580px</dimen>
-    <dimen name="dp_581">581px</dimen>
-    <dimen name="dp_582">582px</dimen>
-    <dimen name="dp_583">583px</dimen>
-    <dimen name="dp_584">584px</dimen>
-    <dimen name="dp_585">585px</dimen>
-    <dimen name="dp_586">586px</dimen>
-    <dimen name="dp_587">587px</dimen>
-    <dimen name="dp_588">588px</dimen>
-    <dimen name="dp_589">589px</dimen>
-    <dimen name="dp_590">590px</dimen>
-    <dimen name="dp_591">591px</dimen>
-    <dimen name="dp_592">592px</dimen>
-    <dimen name="dp_593">593px</dimen>
-    <dimen name="dp_594">594px</dimen>
-    <dimen name="dp_595">595px</dimen>
-    <dimen name="dp_596">596px</dimen>
-    <dimen name="dp_597">597px</dimen>
-    <dimen name="dp_598">598px</dimen>
-    <dimen name="dp_599">599px</dimen>
-    <dimen name="dp_600">600px</dimen>
-    <dimen name="dp_601">601px</dimen>
-    <dimen name="dp_602">602px</dimen>
-    <dimen name="dp_603">603px</dimen>
-    <dimen name="dp_604">604px</dimen>
-    <dimen name="dp_605">605px</dimen>
-    <dimen name="dp_606">606px</dimen>
-    <dimen name="dp_607">607px</dimen>
-    <dimen name="dp_608">608px</dimen>
-    <dimen name="dp_609">609px</dimen>
-    <dimen name="dp_610">610px</dimen>
-    <dimen name="dp_611">611px</dimen>
-    <dimen name="dp_612">612px</dimen>
-    <dimen name="dp_613">613px</dimen>
-    <dimen name="dp_614">614px</dimen>
-    <dimen name="dp_615">615px</dimen>
-    <dimen name="dp_616">616px</dimen>
-    <dimen name="dp_617">617px</dimen>
-    <dimen name="dp_618">618px</dimen>
-    <dimen name="dp_619">619px</dimen>
-    <dimen name="dp_620">620px</dimen>
-    <dimen name="dp_621">621px</dimen>
-    <dimen name="dp_622">622px</dimen>
-    <dimen name="dp_623">623px</dimen>
-    <dimen name="dp_624">624px</dimen>
-    <dimen name="dp_625">625px</dimen>
-    <dimen name="dp_626">626px</dimen>
-    <dimen name="dp_627">627px</dimen>
-    <dimen name="dp_628">628px</dimen>
-    <dimen name="dp_629">629px</dimen>
-    <dimen name="dp_630">630px</dimen>
-    <dimen name="dp_631">631px</dimen>
-    <dimen name="dp_632">632px</dimen>
-    <dimen name="dp_633">633px</dimen>
-    <dimen name="dp_634">634px</dimen>
-    <dimen name="dp_635">635px</dimen>
-    <dimen name="dp_636">636px</dimen>
-    <dimen name="dp_637">637px</dimen>
-    <dimen name="dp_638">638px</dimen>
-    <dimen name="dp_639">639px</dimen>
-    <dimen name="dp_640">640px</dimen>
-    <dimen name="dp_641">641px</dimen>
-    <dimen name="dp_642">642px</dimen>
-    <dimen name="dp_643">643px</dimen>
-    <dimen name="dp_644">644px</dimen>
-    <dimen name="dp_645">645px</dimen>
-    <dimen name="dp_646">646px</dimen>
-    <dimen name="dp_647">647px</dimen>
-    <dimen name="dp_648">648px</dimen>
-    <dimen name="dp_649">649px</dimen>
-    <dimen name="dp_650">650px</dimen>
-    <dimen name="dp_651">651px</dimen>
-    <dimen name="dp_652">652px</dimen>
-    <dimen name="dp_653">653px</dimen>
-    <dimen name="dp_654">654px</dimen>
-    <dimen name="dp_655">655px</dimen>
-    <dimen name="dp_656">656px</dimen>
-    <dimen name="dp_657">657px</dimen>
-    <dimen name="dp_658">658px</dimen>
-    <dimen name="dp_659">659px</dimen>
-    <dimen name="dp_660">660px</dimen>
-    <dimen name="dp_661">661px</dimen>
-    <dimen name="dp_662">662px</dimen>
-    <dimen name="dp_663">663px</dimen>
-    <dimen name="dp_664">664px</dimen>
-    <dimen name="dp_665">665px</dimen>
-    <dimen name="dp_666">666px</dimen>
-    <dimen name="dp_667">667px</dimen>
-    <dimen name="dp_668">668px</dimen>
-    <dimen name="dp_669">669px</dimen>
-    <dimen name="dp_670">670px</dimen>
-    <dimen name="dp_671">671px</dimen>
-    <dimen name="dp_672">672px</dimen>
-    <dimen name="dp_673">673px</dimen>
-    <dimen name="dp_674">674px</dimen>
-    <dimen name="dp_675">675px</dimen>
-    <dimen name="dp_676">676px</dimen>
-    <dimen name="dp_677">677px</dimen>
-    <dimen name="dp_678">678px</dimen>
-    <dimen name="dp_679">679px</dimen>
-    <dimen name="dp_680">680px</dimen>
-    <dimen name="dp_681">681px</dimen>
-    <dimen name="dp_682">682px</dimen>
-    <dimen name="dp_683">683px</dimen>
-    <dimen name="dp_684">684px</dimen>
-    <dimen name="dp_685">685px</dimen>
-    <dimen name="dp_686">686px</dimen>
-    <dimen name="dp_687">687px</dimen>
-    <dimen name="dp_688">688px</dimen>
-    <dimen name="dp_689">689px</dimen>
-    <dimen name="dp_690">690px</dimen>
-    <dimen name="dp_691">691px</dimen>
-    <dimen name="dp_692">692px</dimen>
-    <dimen name="dp_693">693px</dimen>
-    <dimen name="dp_694">694px</dimen>
-    <dimen name="dp_695">695px</dimen>
-    <dimen name="dp_696">696px</dimen>
-    <dimen name="dp_697">697px</dimen>
-    <dimen name="dp_698">698px</dimen>
-    <dimen name="dp_699">699px</dimen>
-    <dimen name="dp_700">700px</dimen>
-    <dimen name="dp_701">701px</dimen>
-    <dimen name="dp_702">702px</dimen>
-    <dimen name="dp_703">703px</dimen>
-    <dimen name="dp_704">704px</dimen>
-    <dimen name="dp_705">705px</dimen>
-    <dimen name="dp_706">706px</dimen>
-    <dimen name="dp_707">707px</dimen>
-    <dimen name="dp_708">708px</dimen>
-    <dimen name="dp_709">709px</dimen>
-    <dimen name="dp_710">710px</dimen>
-    <dimen name="dp_711">711px</dimen>
-    <dimen name="dp_712">712px</dimen>
-    <dimen name="dp_713">713px</dimen>
-    <dimen name="dp_714">714px</dimen>
-    <dimen name="dp_715">715px</dimen>
-    <dimen name="dp_716">716px</dimen>
-    <dimen name="dp_717">717px</dimen>
-    <dimen name="dp_718">718px</dimen>
-    <dimen name="dp_719">719px</dimen>
-    <dimen name="dp_720">720px</dimen>
-    <dimen name="dp_721">721px</dimen>
-    <dimen name="dp_722">722px</dimen>
-    <dimen name="dp_723">723px</dimen>
-    <dimen name="dp_724">724px</dimen>
-    <dimen name="dp_725">725px</dimen>
-    <dimen name="dp_726">726px</dimen>
-    <dimen name="dp_727">727px</dimen>
-    <dimen name="dp_728">728px</dimen>
-    <dimen name="dp_729">729px</dimen>
-    <dimen name="dp_730">730px</dimen>
-    <dimen name="dp_731">731px</dimen>
-    <dimen name="dp_732">732px</dimen>
-    <dimen name="dp_733">733px</dimen>
-    <dimen name="dp_734">734px</dimen>
-    <dimen name="dp_735">735px</dimen>
-    <dimen name="dp_736">736px</dimen>
-    <dimen name="dp_737">737px</dimen>
-    <dimen name="dp_738">738px</dimen>
-    <dimen name="dp_739">739px</dimen>
-    <dimen name="dp_740">740px</dimen>
-    <dimen name="dp_741">741px</dimen>
-    <dimen name="dp_742">742px</dimen>
-    <dimen name="dp_743">743px</dimen>
-    <dimen name="dp_744">744px</dimen>
-    <dimen name="dp_745">745px</dimen>
-    <dimen name="dp_746">746px</dimen>
-    <dimen name="dp_747">747px</dimen>
-    <dimen name="dp_748">748px</dimen>
-    <dimen name="dp_749">749px</dimen>
-    <dimen name="dp_750">750px</dimen>
-    <dimen name="dp_751">751px</dimen>
-    <dimen name="dp_752">752px</dimen>
-    <dimen name="dp_753">753px</dimen>
-    <dimen name="dp_754">754px</dimen>
-    <dimen name="dp_755">755px</dimen>
-    <dimen name="dp_756">756px</dimen>
-    <dimen name="dp_757">757px</dimen>
-    <dimen name="dp_758">758px</dimen>
-    <dimen name="dp_759">759px</dimen>
-    <dimen name="dp_760">760px</dimen>
-    <dimen name="dp_761">761px</dimen>
-    <dimen name="dp_762">762px</dimen>
-    <dimen name="dp_763">763px</dimen>
-    <dimen name="dp_764">764px</dimen>
-    <dimen name="dp_765">765px</dimen>
-    <dimen name="dp_766">766px</dimen>
-    <dimen name="dp_767">767px</dimen>
-    <dimen name="dp_768">768px</dimen>
-    <dimen name="dp_769">769px</dimen>
-    <dimen name="dp_770">770px</dimen>
-    <dimen name="dp_771">771px</dimen>
-    <dimen name="dp_772">772px</dimen>
-    <dimen name="dp_773">773px</dimen>
-    <dimen name="dp_774">774px</dimen>
-    <dimen name="dp_775">775px</dimen>
-    <dimen name="dp_776">776px</dimen>
-    <dimen name="dp_777">777px</dimen>
-    <dimen name="dp_778">778px</dimen>
-    <dimen name="dp_779">779px</dimen>
-    <dimen name="dp_780">780px</dimen>
-    <dimen name="dp_781">781px</dimen>
-    <dimen name="dp_782">782px</dimen>
-    <dimen name="dp_783">783px</dimen>
-    <dimen name="dp_784">784px</dimen>
-    <dimen name="dp_785">785px</dimen>
-    <dimen name="dp_786">786px</dimen>
-    <dimen name="dp_787">787px</dimen>
-    <dimen name="dp_788">788px</dimen>
-    <dimen name="dp_789">789px</dimen>
-    <dimen name="dp_790">790px</dimen>
-    <dimen name="dp_791">791px</dimen>
-    <dimen name="dp_792">792px</dimen>
-    <dimen name="dp_793">793px</dimen>
-    <dimen name="dp_794">794px</dimen>
-    <dimen name="dp_795">795px</dimen>
-    <dimen name="dp_796">796px</dimen>
-    <dimen name="dp_797">797px</dimen>
-    <dimen name="dp_798">798px</dimen>
-    <dimen name="dp_799">799px</dimen>
-    <dimen name="dp_800">800px</dimen>
-    <dimen name="dp_801">801px</dimen>
-    <dimen name="dp_802">802px</dimen>
-    <dimen name="dp_803">803px</dimen>
-    <dimen name="dp_804">804px</dimen>
-    <dimen name="dp_805">805px</dimen>
-    <dimen name="dp_806">806px</dimen>
-    <dimen name="dp_807">807px</dimen>
-    <dimen name="dp_808">808px</dimen>
-    <dimen name="dp_809">809px</dimen>
-    <dimen name="dp_810">810px</dimen>
-    <dimen name="dp_811">811px</dimen>
-    <dimen name="dp_812">812px</dimen>
-    <dimen name="dp_813">813px</dimen>
-    <dimen name="dp_814">814px</dimen>
-    <dimen name="dp_815">815px</dimen>
-    <dimen name="dp_816">816px</dimen>
-    <dimen name="dp_817">817px</dimen>
-    <dimen name="dp_818">818px</dimen>
-    <dimen name="dp_819">819px</dimen>
-    <dimen name="dp_820">820px</dimen>
-    <dimen name="dp_821">821px</dimen>
-    <dimen name="dp_822">822px</dimen>
-    <dimen name="dp_823">823px</dimen>
-    <dimen name="dp_824">824px</dimen>
-    <dimen name="dp_825">825px</dimen>
-    <dimen name="dp_826">826px</dimen>
-    <dimen name="dp_827">827px</dimen>
-    <dimen name="dp_828">828px</dimen>
-    <dimen name="dp_829">829px</dimen>
-    <dimen name="dp_830">830px</dimen>
-    <dimen name="dp_831">831px</dimen>
-    <dimen name="dp_832">832px</dimen>
-    <dimen name="dp_833">833px</dimen>
-    <dimen name="dp_834">834px</dimen>
-    <dimen name="dp_835">835px</dimen>
-    <dimen name="dp_836">836px</dimen>
-    <dimen name="dp_837">837px</dimen>
-    <dimen name="dp_838">838px</dimen>
-    <dimen name="dp_839">839px</dimen>
-    <dimen name="dp_840">840px</dimen>
-    <dimen name="dp_841">841px</dimen>
-    <dimen name="dp_842">842px</dimen>
-    <dimen name="dp_843">843px</dimen>
-    <dimen name="dp_844">844px</dimen>
-    <dimen name="dp_845">845px</dimen>
-    <dimen name="dp_846">846px</dimen>
-    <dimen name="dp_847">847px</dimen>
-    <dimen name="dp_848">848px</dimen>
-    <dimen name="dp_849">849px</dimen>
-    <dimen name="dp_850">850px</dimen>
-    <dimen name="dp_851">851px</dimen>
-    <dimen name="dp_852">852px</dimen>
-    <dimen name="dp_853">853px</dimen>
-    <dimen name="dp_854">854px</dimen>
-    <dimen name="dp_855">855px</dimen>
-    <dimen name="dp_856">856px</dimen>
-    <dimen name="dp_857">857px</dimen>
-    <dimen name="dp_858">858px</dimen>
-    <dimen name="dp_859">859px</dimen>
-    <dimen name="dp_860">860px</dimen>
-    <dimen name="dp_861">861px</dimen>
-    <dimen name="dp_862">862px</dimen>
-    <dimen name="dp_863">863px</dimen>
-    <dimen name="dp_864">864px</dimen>
-    <dimen name="dp_865">865px</dimen>
-    <dimen name="dp_866">866px</dimen>
-    <dimen name="dp_867">867px</dimen>
-    <dimen name="dp_868">868px</dimen>
-    <dimen name="dp_869">869px</dimen>
-    <dimen name="dp_870">870px</dimen>
-    <dimen name="dp_871">871px</dimen>
-    <dimen name="dp_872">872px</dimen>
-    <dimen name="dp_873">873px</dimen>
-    <dimen name="dp_874">874px</dimen>
-    <dimen name="dp_875">875px</dimen>
-    <dimen name="dp_876">876px</dimen>
-    <dimen name="dp_877">877px</dimen>
-    <dimen name="dp_878">878px</dimen>
-    <dimen name="dp_879">879px</dimen>
-    <dimen name="dp_880">880px</dimen>
-    <dimen name="dp_881">881px</dimen>
-    <dimen name="dp_882">882px</dimen>
-    <dimen name="dp_883">883px</dimen>
-    <dimen name="dp_884">884px</dimen>
-    <dimen name="dp_885">885px</dimen>
-    <dimen name="dp_886">886px</dimen>
-    <dimen name="dp_887">887px</dimen>
-    <dimen name="dp_888">888px</dimen>
-    <dimen name="dp_889">889px</dimen>
-    <dimen name="dp_890">890px</dimen>
-    <dimen name="dp_891">891px</dimen>
-    <dimen name="dp_892">892px</dimen>
-    <dimen name="dp_893">893px</dimen>
-    <dimen name="dp_894">894px</dimen>
-    <dimen name="dp_895">895px</dimen>
-    <dimen name="dp_896">896px</dimen>
-    <dimen name="dp_897">897px</dimen>
-    <dimen name="dp_898">898px</dimen>
-    <dimen name="dp_899">899px</dimen>
-    <dimen name="dp_900">900px</dimen>
-    <dimen name="dp_901">901px</dimen>
-    <dimen name="dp_902">902px</dimen>
-    <dimen name="dp_903">903px</dimen>
-    <dimen name="dp_904">904px</dimen>
-    <dimen name="dp_905">905px</dimen>
-    <dimen name="dp_906">906px</dimen>
-    <dimen name="dp_907">907px</dimen>
-    <dimen name="dp_908">908px</dimen>
-    <dimen name="dp_909">909px</dimen>
-    <dimen name="dp_910">910px</dimen>
-    <dimen name="dp_911">911px</dimen>
-    <dimen name="dp_912">912px</dimen>
-    <dimen name="dp_913">913px</dimen>
-    <dimen name="dp_914">914px</dimen>
-    <dimen name="dp_915">915px</dimen>
-    <dimen name="dp_916">916px</dimen>
-    <dimen name="dp_917">917px</dimen>
-    <dimen name="dp_918">918px</dimen>
-    <dimen name="dp_919">919px</dimen>
-    <dimen name="dp_920">920px</dimen>
-    <dimen name="dp_921">921px</dimen>
-    <dimen name="dp_922">922px</dimen>
-    <dimen name="dp_923">923px</dimen>
-    <dimen name="dp_924">924px</dimen>
-    <dimen name="dp_925">925px</dimen>
-    <dimen name="dp_926">926px</dimen>
-    <dimen name="dp_927">927px</dimen>
-    <dimen name="dp_928">928px</dimen>
-    <dimen name="dp_929">929px</dimen>
-    <dimen name="dp_930">930px</dimen>
-    <dimen name="dp_931">931px</dimen>
-    <dimen name="dp_932">932px</dimen>
-    <dimen name="dp_933">933px</dimen>
-    <dimen name="dp_934">934px</dimen>
-    <dimen name="dp_935">935px</dimen>
-    <dimen name="dp_936">936px</dimen>
-    <dimen name="dp_937">937px</dimen>
-    <dimen name="dp_938">938px</dimen>
-    <dimen name="dp_939">939px</dimen>
-    <dimen name="dp_940">940px</dimen>
-    <dimen name="dp_941">941px</dimen>
-    <dimen name="dp_942">942px</dimen>
-    <dimen name="dp_943">943px</dimen>
-    <dimen name="dp_944">944px</dimen>
-    <dimen name="dp_945">945px</dimen>
-    <dimen name="dp_946">946px</dimen>
-    <dimen name="dp_947">947px</dimen>
-    <dimen name="dp_948">948px</dimen>
-    <dimen name="dp_949">949px</dimen>
-    <dimen name="dp_950">950px</dimen>
-    <dimen name="dp_951">951px</dimen>
-    <dimen name="dp_952">952px</dimen>
-    <dimen name="dp_953">953px</dimen>
-    <dimen name="dp_954">954px</dimen>
-    <dimen name="dp_955">955px</dimen>
-    <dimen name="dp_956">956px</dimen>
-    <dimen name="dp_957">957px</dimen>
-    <dimen name="dp_958">958px</dimen>
-    <dimen name="dp_959">959px</dimen>
-    <dimen name="dp_960">960px</dimen>
-    <dimen name="dp_961">961px</dimen>
-    <dimen name="dp_962">962px</dimen>
-    <dimen name="dp_963">963px</dimen>
-    <dimen name="dp_964">964px</dimen>
-    <dimen name="dp_965">965px</dimen>
-    <dimen name="dp_966">966px</dimen>
-    <dimen name="dp_967">967px</dimen>
-    <dimen name="dp_968">968px</dimen>
-    <dimen name="dp_969">969px</dimen>
-    <dimen name="dp_970">970px</dimen>
-    <dimen name="dp_971">971px</dimen>
-    <dimen name="dp_972">972px</dimen>
-    <dimen name="dp_973">973px</dimen>
-    <dimen name="dp_974">974px</dimen>
-    <dimen name="dp_975">975px</dimen>
-    <dimen name="dp_976">976px</dimen>
-    <dimen name="dp_977">977px</dimen>
-    <dimen name="dp_978">978px</dimen>
-    <dimen name="dp_979">979px</dimen>
-    <dimen name="dp_980">980px</dimen>
-    <dimen name="dp_981">981px</dimen>
-    <dimen name="dp_982">982px</dimen>
-    <dimen name="dp_983">983px</dimen>
-    <dimen name="dp_984">984px</dimen>
-    <dimen name="dp_985">985px</dimen>
-    <dimen name="dp_986">986px</dimen>
-    <dimen name="dp_987">987px</dimen>
-    <dimen name="dp_988">988px</dimen>
-    <dimen name="dp_989">989px</dimen>
-    <dimen name="dp_990">990px</dimen>
-    <dimen name="dp_991">991px</dimen>
-    <dimen name="dp_992">992px</dimen>
-    <dimen name="dp_993">993px</dimen>
-    <dimen name="dp_994">994px</dimen>
-    <dimen name="dp_995">995px</dimen>
-    <dimen name="dp_996">996px</dimen>
-    <dimen name="dp_997">997px</dimen>
-    <dimen name="dp_998">998px</dimen>
-    <dimen name="dp_999">999px</dimen>
-    <dimen name="dp_1300">1300px</dimen>
-    <dimen name="module_call_chat_state_location_y">872px</dimen>
-    <dimen name="module_call_chat_state_location_x">1067px</dimen>
-    <dimen name="module_call_chat_state_location_hawk_eye_y">776px</dimen>
-    <dimen name="module_call_chat_state_location_hawk_eye_x">30px</dimen>
-    <dimen name="module_call_chat_state_width">600px</dimen>
-    <dimen name="module_call_chat_state_height">140px</dimen>
     <dimen name="module_call_chat_state_hawk_eye_width">300px</dimen>
     <dimen name="module_call_chat_state_hawk_eye_height">100px</dimen>
 
-    <dimen name="module_call_chat_user_state_location_x">1380px</dimen>
-    <dimen name="module_call_chat_user_state_location_y">20px</dimen>
-    <dimen name="module_call_chat_user_state_x">740px</dimen>
-    <dimen name="module_call_chat_user_state_y">854px</dimen>
-
-    <dimen name="module_call_chat_user_caller_x">290px</dimen>
-
-    <dimen name="module_call_chat_team_invitation_padding">30px</dimen>
-    <dimen name="module_call_chat_team_invitation_hawk_eye_padding">61px</dimen>
-    <dimen name="module_call_chat_calling_text_time_size">26px</dimen>
     <dimen name="module_call_chat_calling_text_hawk_eye_time_size">18px</dimen>
-    <dimen name="module_call_chat_calling_text_name_size">37px</dimen>
     <dimen name="module_call_chat_calling_text_hawk_eye_name_size">27px</dimen>
-    <dimen name="module_call_chat_calling_text_margin_top_bottom">18px</dimen>
     <dimen name="module_call_chat_calling_text_hawk_eye_margin_top_bottom">16px</dimen>
-    <dimen name="module_call_chat_calling_iv_margin_left_right">23px</dimen>
     <dimen name="module_call_chat_calling_iv_hawk_eye_margin_left_right">9px</dimen>
-    <dimen name="module_call_chat_calling_iv_width_height">82px</dimen>
     <dimen name="module_call_chat_calling_iv_hawk_eye_width_height">100px</dimen>
-    <dimen name="module_call_chat_team_invitation_join_hawk_eye_margin_right">42px</dimen>
-    <dimen name="module_call_chat_hawk_eye_circle_btn_size">66px</dimen>
-    <dimen name="module_call_chat_team_invitation_hawk_eye_width">822px</dimen>
-    <dimen name="module_call_chat_team_invitation_hawk_eye_height">182px</dimen>
-    <dimen name="module_call_chat_state_close_icon_width">82.5px</dimen>
-    <dimen name="module_call_chat_state_user_head_width">150px</dimen>
-    <dimen name="module_call_chat_state_close_margin">30px</dimen>
-    <dimen name="module_call_chat_state_head_margin_top">159px</dimen>
-    <dimen name="module_call_chat_state_head_border">8px</dimen>
-    <dimen name="module_call_chat_state_nick_name_margin_top">16px</dimen>
-    <dimen name="module_call_chat_state_nick_name_size">40px</dimen>
-    <dimen name="module_call_chat_state_rating_margin_top">15px</dimen>
-    <dimen name="module_call_chat_state_caller_height">90px</dimen>
-    <dimen name="module_call_chat_state_caller_margin_bottom">50px</dimen>
-    <dimen name="module_call_chat_state_caller_margin_left_right">70px</dimen>
-    <dimen name="module_call_chat_state_caller_drawable_padding">10px</dimen>
-    <dimen name="module_call_chat_state_caller_padding_left">56px</dimen>
-    <dimen name="module_call_chat_state_caller_text_size">30px</dimen>
-    <!-- font size,you can add if there is no one -->
-    <dimen name="sp_6">6px</dimen>
-    <dimen name="sp_7">7px</dimen>
-    <dimen name="sp_8">8px</dimen>
-    <dimen name="sp_9">9px</dimen>
-    <dimen name="sp_10">10px</dimen>
-    <dimen name="sp_11">11px</dimen>
-    <dimen name="sp_12">12px</dimen>
-    <dimen name="sp_13">13px</dimen>
-    <dimen name="sp_14">14px</dimen>
-    <dimen name="sp_15">15px</dimen>
-    <dimen name="sp_16">16px</dimen>
-    <dimen name="sp_17">17px</dimen>
-    <dimen name="sp_18">18px</dimen>
-    <dimen name="sp_19">19px</dimen>
-    <dimen name="sp_20">20px</dimen>
-    <dimen name="sp_21">21px</dimen>
-    <dimen name="sp_22">22px</dimen>
-    <dimen name="sp_23">23px</dimen>
-    <dimen name="sp_24">24px</dimen>
-    <dimen name="sp_25">25px</dimen>
-    <dimen name="sp_28">28px</dimen>
-    <dimen name="sp_30">30px</dimen>
-    <dimen name="sp_32">32px</dimen>
-    <dimen name="sp_34">34px</dimen>
-    <dimen name="sp_36">36px</dimen>
-    <dimen name="sp_38">38px</dimen>
-    <dimen name="sp_40">40px</dimen>
-    <dimen name="sp_42">42px</dimen>
-    <dimen name="sp_48">48px</dimen>
 
 </resources>
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/values/colors.xml b/core/function-impl/mogo-core-function-chat/src/main/res/values/colors.xml
index d5046a7da3..478fdfea05 100644
--- a/core/function-impl/mogo-core-function-chat/src/main/res/values/colors.xml
+++ b/core/function-impl/mogo-core-function-chat/src/main/res/values/colors.xml
@@ -1,14 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="module_carchatting_nick_color">#FFFFFF</color>
-    <color name="module_carchatting_white_color">#FFFFFF</color>
-    <color name="module_carchatting_red_color">#EE433E</color>
-    <color name="module_carchatting_status_color">#7FFFFFFF</color>
     <color name="module_carchatting_hawk_eye_status_color">#B5B5B5</color>
-    <color name="module_carchatting_match_line">#66D8D8D8</color>
-    <color name="module_carchatting_team_line">#66D8D8D8</color>
-
-    <color name="module_carchatting_user_call">#FFFFFF</color>
-
-    <color name="module_carchatting_team_leader">#FFFFFF</color>
 </resources>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/values/dimens.xml b/core/function-impl/mogo-core-function-chat/src/main/res/values/dimens.xml
deleted file mode 100644
index 98243747e2..0000000000
--- a/core/function-impl/mogo-core-function-chat/src/main/res/values/dimens.xml
+++ /dev/null
@@ -1,1155 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-
-
-    <dimen name="module_call_chat_state_incoming_hawk_eye_width">560px</dimen>
-    <dimen name="module_call_chat_state_incoming_hawk_eye_height">142px</dimen>
-    <dimen name="module_call_chat_incoming_aisdk_tag_width">139px</dimen>
-    <dimen name="module_call_chat_state_incoming_hawk_eye_margin_left">20px</dimen>
-    <dimen name="module_call_chat_state_incoming_hawk_eye_call_margin_right">30px</dimen>
-    <dimen name="module_call_chat_hawk_eye_incoming_circle_btn_size">86px</dimen>
-
-    <dimen name="module_call_chat_state_location_y">467px</dimen>
-    <dimen name="module_call_chat_state_location_x">573px</dimen>
-    <dimen name="module_call_chat_state_width">338px</dimen>
-    <dimen name="module_call_chat_state_height">82px</dimen>
-
-    <dimen name="module_call_chat_user_state_location_x">746px</dimen>
-    <dimen name="module_call_chat_user_state_location_y">2px</dimen>
-    <dimen name="module_call_chat_user_state_x">411px</dimen>
-    <dimen name="module_call_chat_user_state_y">474px</dimen>
-
-    <dimen name="module_call_chat_user_caller_x">240px</dimen>
-
-    <dimen name="module_call_chat_view_width">338px</dimen>
-    <dimen name="module_call_chat_view_match_width">260px</dimen>
-    <dimen name="module_call_chat_view_height">82px</dimen>
-    <dimen name="module_call_chat_view_margin_end">27px</dimen>
-    <dimen name="module_call_chat_match_view_left_margin">23px</dimen>
-    <dimen name="module_call_chat_match_view_right_margin">27px</dimen>
-    <dimen name="module_call_chat_match_view_line_margin_top_bottom">25px</dimen>
-    <dimen name="module_call_chat_match_iv_width">60px</dimen>
-    <dimen name="module_call_chat_match_iv_height">54px</dimen>
-    <dimen name="module_call_chat_match_iv_left_margin">28px</dimen>
-    <dimen name="module_call_chat_match_text_size">22px</dimen>
-    <dimen name="module_call_chat_matching_text_size">22px</dimen>
-    <dimen name="module_call_chat_calling_text_name_size">24px</dimen>
-    <dimen name="module_call_chat_calling_text_time_size">17px</dimen>
-    <dimen name="module_call_chat_calling_text_margin_top_bottom">8px</dimen>
-    <dimen name="module_call_chat_calling_iv_margin_left_right">23px</dimen>
-    <dimen name="module_call_chat_calling_iv_width_height">58px</dimen>
-
-    <dimen name="module_call_chat_state_close_icon_width">45px</dimen>
-    <dimen name="module_call_chat_state_user_head_width">74px</dimen>
-    <dimen name="module_call_chat_state_close_margin">11px</dimen>
-    <dimen name="module_call_chat_state_head_margin_top">63px</dimen>
-    <dimen name="module_call_chat_state_head_border">5px</dimen>
-    <dimen name="module_call_chat_state_nick_name_margin_top">9px</dimen>
-    <dimen name="module_call_chat_state_nick_name_size">20px</dimen>
-    <dimen name="module_call_chat_state_rating_margin_top">8px</dimen>
-    <dimen name="module_call_chat_state_caller_height">50px</dimen>
-    <dimen name="module_call_chat_state_caller_margin_bottom">17px</dimen>
-    <dimen name="module_call_chat_state_caller_margin_left_right">40px</dimen>
-    <dimen name="module_call_chat_state_caller_padding_left">30px</dimen>
-    <dimen name="module_call_chat_state_caller_drawable_padding">5px</dimen>
-    <dimen name="module_call_chat_state_caller_text_size">17px</dimen>
-
-
-    <dimen name="module_call_chat_team_head_view_width">48px</dimen>
-    <dimen name="module_call_chat_team_head_view_height">48px</dimen>
-    <dimen name="module_call_chat_team_head_view_left_margin">-12px</dimen>
-    <dimen name="module_call_chat_team_head_view_left_margin4">-120px</dimen>
-    <dimen name="module_call_chat_team_head_view_top_margin">19.8px</dimen>
-    <dimen name="module_call_chat_team_calling_top_margin">22px</dimen>
-    <dimen name="module_call_chat_team_calling_left_margin">22px</dimen>
-    <dimen name="module_call_chat_team_calling_size">24px</dimen>
-    <dimen name="module_call_chat_team_info_size">17px</dimen>
-    <dimen name="module_call_chat_team_info_bottom_margin">22px</dimen>
-    <dimen name="module_call_chat_team_info_left_margin">22px</dimen>
-    <dimen name="module_call_chat_team_quit_view_width">79.8px</dimen>
-    <dimen name="module_call_chat_team_quit_view_height">79.8px</dimen>
-    <dimen name="module_call_chat_team_quit_right_margin">28.4px</dimen>
-    <dimen name="module_call_chat_team_view_line_margin_top_bottom">25px</dimen>
-
-
-    <dimen name="module_call_chat_team_fragment_margin">27.5px</dimen>
-    <dimen name="module_call_chat_team_fragment_padding">50px</dimen>
-    <dimen name="module_call_chat_team_fragment_num_text_size">36px</dimen>
-    <dimen name="module_call_chat_team_fragment_close_view_width">80.8px</dimen>
-    <dimen name="module_call_chat_team_fragment_close_view_height">80.8px</dimen>
-    <dimen name="module_call_chat_team_fragment_teammates__margin_top">24px</dimen>
-
-    <dimen name="module_call_chat_team_teammate_margin">14px</dimen>
-    <dimen name="module_call_chat_team_teammate_padding">32px</dimen>
-    <dimen name="module_call_chat_team_teammate_height">164px</dimen>
-    <dimen name="module_call_chat_team_teammate_head_width">98px</dimen>
-    <dimen name="module_call_chat_team_teammate_head_height">198px</dimen>
-    <dimen name="module_call_chat_team_teammate_nickname_margin_left">30px</dimen>
-    <dimen name="module_call_chat_team_teammate_nickname_text_size">34px</dimen>
-    <dimen name="module_call_chat_team_teammate_identity_width">98px</dimen>
-    <dimen name="module_call_chat_team_teammate_identity_height">46px</dimen>
-    <dimen name="module_call_chat_team_teammate_identity_text_size">26px</dimen>
-
-
-    <dimen name="module_call_chat_team_invitation_padding">30px</dimen>
-    <dimen name="module_call_chat_team_invitation_margin">18px</dimen>
-    <dimen name="module_call_chat_team_invitation_height">210px</dimen>
-    <dimen name="module_call_chat_team_invitation_head_width">148px</dimen>
-    <dimen name="module_call_chat_team_invitation_head_height">148px</dimen>
-    <dimen name="module_call_chat_team_invitation_title_width">120px</dimen>
-    <dimen name="module_call_chat_team_invitation_title_height">46px</dimen>
-    <dimen name="module_call_chat_team_invitation_title_margin_left">30px</dimen>
-    <dimen name="module_call_chat_team_invitation_title_margin_top">30px</dimen>
-    <dimen name="module_call_chat_team_invitation_title_text_size">25px</dimen>
-    <dimen name="module_call_chat_team_invitation_content_margin_left">30px</dimen>
-    <dimen name="module_call_chat_team_invitation_content_margin_bottom">30px</dimen>
-    <dimen name="module_call_chat_team_invitation_content_text_size">32px</dimen>
-    <dimen name="module_call_chat_team_invitation_join_width">98px</dimen>
-    <dimen name="module_call_chat_team_invitation_join_height">98px</dimen>
-    <dimen name="module_call_chat_team_invitation_join_margin_right">36px</dimen>
-
-    <dimen name="dp_m_60">-32.8125px</dimen>
-    <dimen name="dp_m_30">-16.4062px</dimen>
-    <dimen name="dp_m_20">-10.9375px</dimen>
-    <dimen name="dp_m_12">-6.5625px</dimen>
-    <dimen name="dp_m_10">-5.4688px</dimen>
-    <dimen name="dp_m_8">-4.3750px</dimen>
-    <dimen name="dp_m_5">-2.7344px</dimen>
-    <dimen name="dp_m_2">-1.0938px</dimen>
-    <dimen name="dp_m_1">-0.5469px</dimen>
-    <dimen name="dp_0">0.0000px</dimen>
-    <dimen name="dp_0_1">0.0547px</dimen>
-    <dimen name="dp_0_5">0.2734px</dimen>
-    <dimen name="dp_1">0.5469px</dimen>
-    <dimen name="dp_1_5">0.8203px</dimen>
-    <dimen name="dp_2">1.0938px</dimen>
-    <dimen name="dp_2_5">1.3672px</dimen>
-    <dimen name="dp_3">1.6406px</dimen>
-    <dimen name="dp_3_5">1.9141px</dimen>
-    <dimen name="dp_4">2.1875px</dimen>
-    <dimen name="dp_4_5">2.4609px</dimen>
-    <dimen name="dp_5">2.7344px</dimen>
-    <dimen name="dp_6">3.2812px</dimen>
-    <dimen name="dp_7">3.8281px</dimen>
-    <dimen name="dp_7_5">4.1016px</dimen>
-    <dimen name="dp_8">4.3750px</dimen>
-    <dimen name="dp_9">4.9219px</dimen>
-    <dimen name="dp_10">5.4688px</dimen>
-    <dimen name="dp_11">6.0156px</dimen>
-    <dimen name="dp_12">6.5625px</dimen>
-    <dimen name="dp_13">7.1094px</dimen>
-    <dimen name="dp_14">7.6562px</dimen>
-    <dimen name="dp_15">8.2031px</dimen>
-    <dimen name="dp_16">8.7500px</dimen>
-    <dimen name="dp_17">9.2969px</dimen>
-    <dimen name="dp_18">9.8438px</dimen>
-    <dimen name="dp_19">10.3906px</dimen>
-    <dimen name="dp_20">10.9375px</dimen>
-    <dimen name="dp_21">11.4844px</dimen>
-    <dimen name="dp_22">12.0312px</dimen>
-    <dimen name="dp_23">12.5781px</dimen>
-    <dimen name="dp_24">13.1250px</dimen>
-    <dimen name="dp_25">13.6719px</dimen>
-    <dimen name="dp_26">14.2188px</dimen>
-    <dimen name="dp_27">14.7656px</dimen>
-    <dimen name="dp_28">15.3125px</dimen>
-    <dimen name="dp_29">15.8594px</dimen>
-    <dimen name="dp_30">16.4062px</dimen>
-    <dimen name="dp_31">16.9531px</dimen>
-    <dimen name="dp_32">17.5000px</dimen>
-    <dimen name="dp_33">18.0469px</dimen>
-    <dimen name="dp_34">18.5938px</dimen>
-    <dimen name="dp_35">19.1406px</dimen>
-    <dimen name="dp_36">19.6875px</dimen>
-    <dimen name="dp_37">20.2344px</dimen>
-    <dimen name="dp_38">20.7812px</dimen>
-    <dimen name="dp_39">21.3281px</dimen>
-    <dimen name="dp_40">21.8750px</dimen>
-    <dimen name="dp_41">22.4219px</dimen>
-    <dimen name="dp_42">22.9688px</dimen>
-    <dimen name="dp_43">23.5156px</dimen>
-    <dimen name="dp_44">24.0625px</dimen>
-    <dimen name="dp_45">24.6094px</dimen>
-    <dimen name="dp_46">25.1562px</dimen>
-    <dimen name="dp_47">25.7031px</dimen>
-    <dimen name="dp_48">26.2500px</dimen>
-    <dimen name="dp_49">26.7969px</dimen>
-    <dimen name="dp_50">27.3438px</dimen>
-    <dimen name="dp_51">27.8906px</dimen>
-    <dimen name="dp_52">28.4375px</dimen>
-    <dimen name="dp_53">28.9844px</dimen>
-    <dimen name="dp_54">29.5312px</dimen>
-    <dimen name="dp_55">30.0781px</dimen>
-    <dimen name="dp_56">30.6250px</dimen>
-    <dimen name="dp_57">31.1719px</dimen>
-    <dimen name="dp_58">31.7188px</dimen>
-    <dimen name="dp_59">32.2656px</dimen>
-    <dimen name="dp_60">32.8125px</dimen>
-    <dimen name="dp_61">33.3594px</dimen>
-    <dimen name="dp_62">33.9062px</dimen>
-    <dimen name="dp_63">34.4531px</dimen>
-    <dimen name="dp_64">35.0000px</dimen>
-    <dimen name="dp_65">35.5469px</dimen>
-    <dimen name="dp_66">36.0938px</dimen>
-    <dimen name="dp_67">36.6406px</dimen>
-    <dimen name="dp_68">37.1875px</dimen>
-    <dimen name="dp_69">37.7344px</dimen>
-    <dimen name="dp_70">38.2812px</dimen>
-    <dimen name="dp_71">38.8281px</dimen>
-    <dimen name="dp_72">39.3750px</dimen>
-    <dimen name="dp_73">39.9219px</dimen>
-    <dimen name="dp_74">40.4688px</dimen>
-    <dimen name="dp_75">41.0156px</dimen>
-    <dimen name="dp_76">41.5625px</dimen>
-    <dimen name="dp_77">42.1094px</dimen>
-    <dimen name="dp_78">42.6562px</dimen>
-    <dimen name="dp_79">43.2031px</dimen>
-    <dimen name="dp_80">43.7500px</dimen>
-    <dimen name="dp_81">44.2969px</dimen>
-    <dimen name="dp_82">44.8438px</dimen>
-    <dimen name="dp_83">45.3906px</dimen>
-    <dimen name="dp_84">45.9375px</dimen>
-    <dimen name="dp_85">46.4844px</dimen>
-    <dimen name="dp_86">47.0312px</dimen>
-    <dimen name="dp_87">47.5781px</dimen>
-    <dimen name="dp_88">48.1250px</dimen>
-    <dimen name="dp_89">48.6719px</dimen>
-    <dimen name="dp_90">49.2188px</dimen>
-    <dimen name="dp_91">49.7656px</dimen>
-    <dimen name="dp_92">50.3125px</dimen>
-    <dimen name="dp_93">50.8594px</dimen>
-    <dimen name="dp_94">51.4062px</dimen>
-    <dimen name="dp_95">51.9531px</dimen>
-    <dimen name="dp_96">52.5000px</dimen>
-    <dimen name="dp_97">53.0469px</dimen>
-    <dimen name="dp_98">53.5938px</dimen>
-    <dimen name="dp_99">54.1406px</dimen>
-    <dimen name="dp_100">54.6875px</dimen>
-    <dimen name="dp_101">55.2344px</dimen>
-    <dimen name="dp_102">55.7812px</dimen>
-    <dimen name="dp_103">56.3281px</dimen>
-    <dimen name="dp_104">56.8750px</dimen>
-    <dimen name="dp_104_5">57.1484px</dimen>
-    <dimen name="dp_105">57.4219px</dimen>
-    <dimen name="dp_106">57.9688px</dimen>
-    <dimen name="dp_107">58.5156px</dimen>
-    <dimen name="dp_108">59.0625px</dimen>
-    <dimen name="dp_109">59.6094px</dimen>
-    <dimen name="dp_110">60.1562px</dimen>
-    <dimen name="dp_111">60.7031px</dimen>
-    <dimen name="dp_112">61.2500px</dimen>
-    <dimen name="dp_113">61.7969px</dimen>
-    <dimen name="dp_114">62.3438px</dimen>
-    <dimen name="dp_115">62.8906px</dimen>
-    <dimen name="dp_116">63.4375px</dimen>
-    <dimen name="dp_117">63.9844px</dimen>
-    <dimen name="dp_118">64.5312px</dimen>
-    <dimen name="dp_119">65.0781px</dimen>
-    <dimen name="dp_120">65.6250px</dimen>
-    <dimen name="dp_121">66.1719px</dimen>
-    <dimen name="dp_122">66.7188px</dimen>
-    <dimen name="dp_123">67.2656px</dimen>
-    <dimen name="dp_124">67.8125px</dimen>
-    <dimen name="dp_125">68.3594px</dimen>
-    <dimen name="dp_126">68.9062px</dimen>
-    <dimen name="dp_127">69.4531px</dimen>
-    <dimen name="dp_128">70.0000px</dimen>
-    <dimen name="dp_129">70.5469px</dimen>
-    <dimen name="dp_130">71.0938px</dimen>
-    <dimen name="dp_131">71.6406px</dimen>
-    <dimen name="dp_132">72.1875px</dimen>
-    <dimen name="dp_133">72.7344px</dimen>
-    <dimen name="dp_134">73.2812px</dimen>
-    <dimen name="dp_134_5">73.5547px</dimen>
-    <dimen name="dp_135">73.8281px</dimen>
-    <dimen name="dp_136">74.3750px</dimen>
-    <dimen name="dp_137">74.9219px</dimen>
-    <dimen name="dp_138">75.4688px</dimen>
-    <dimen name="dp_139">76.0156px</dimen>
-    <dimen name="dp_140">76.5625px</dimen>
-    <dimen name="dp_141">77.1094px</dimen>
-    <dimen name="dp_142">77.6562px</dimen>
-    <dimen name="dp_143">78.2031px</dimen>
-    <dimen name="dp_144">78.7500px</dimen>
-    <dimen name="dp_145">79.2969px</dimen>
-    <dimen name="dp_146">79.8438px</dimen>
-    <dimen name="dp_147">80.3906px</dimen>
-    <dimen name="dp_148">80.9375px</dimen>
-    <dimen name="dp_149">81.4844px</dimen>
-    <dimen name="dp_150">82.0312px</dimen>
-    <dimen name="dp_151">82.5781px</dimen>
-    <dimen name="dp_152">83.1250px</dimen>
-    <dimen name="dp_153">83.6719px</dimen>
-    <dimen name="dp_154">84.2188px</dimen>
-    <dimen name="dp_155">84.7656px</dimen>
-    <dimen name="dp_156">85.3125px</dimen>
-    <dimen name="dp_157">85.8594px</dimen>
-    <dimen name="dp_158">86.4062px</dimen>
-    <dimen name="dp_159">86.9531px</dimen>
-    <dimen name="dp_160">87.5000px</dimen>
-    <dimen name="dp_161">88.0469px</dimen>
-    <dimen name="dp_162">88.5938px</dimen>
-    <dimen name="dp_163">89.1406px</dimen>
-    <dimen name="dp_164">89.6875px</dimen>
-    <dimen name="dp_165">90.2344px</dimen>
-    <dimen name="dp_166">90.7812px</dimen>
-    <dimen name="dp_167">91.3281px</dimen>
-    <dimen name="dp_168">91.8750px</dimen>
-    <dimen name="dp_169">92.4219px</dimen>
-    <dimen name="dp_170">92.9688px</dimen>
-    <dimen name="dp_171">93.5156px</dimen>
-    <dimen name="dp_172">94.0625px</dimen>
-    <dimen name="dp_173">94.6094px</dimen>
-    <dimen name="dp_174">95.1562px</dimen>
-    <dimen name="dp_175">95.7031px</dimen>
-    <dimen name="dp_176">96.2500px</dimen>
-    <dimen name="dp_177">96.7969px</dimen>
-    <dimen name="dp_178">97.3438px</dimen>
-    <dimen name="dp_179">97.8906px</dimen>
-    <dimen name="dp_180">98.4375px</dimen>
-    <dimen name="dp_181">98.9844px</dimen>
-    <dimen name="dp_182">99.5312px</dimen>
-    <dimen name="dp_183">100.0781px</dimen>
-    <dimen name="dp_184">100.6250px</dimen>
-    <dimen name="dp_185">101.1719px</dimen>
-    <dimen name="dp_186">101.7188px</dimen>
-    <dimen name="dp_187">102.2656px</dimen>
-    <dimen name="dp_188">102.8125px</dimen>
-    <dimen name="dp_189">103.3594px</dimen>
-    <dimen name="dp_190">103.9062px</dimen>
-    <dimen name="dp_191">104.4531px</dimen>
-    <dimen name="dp_191_25">104.5898px</dimen>
-    <dimen name="dp_192">105.0000px</dimen>
-    <dimen name="dp_193">105.5469px</dimen>
-    <dimen name="dp_194">106.0938px</dimen>
-    <dimen name="dp_195">106.6406px</dimen>
-    <dimen name="dp_196">107.1875px</dimen>
-    <dimen name="dp_197">107.7344px</dimen>
-    <dimen name="dp_198">108.2812px</dimen>
-    <dimen name="dp_199">108.8281px</dimen>
-    <dimen name="dp_200">109.3750px</dimen>
-    <dimen name="dp_201">109.9219px</dimen>
-    <dimen name="dp_202">110.4688px</dimen>
-    <dimen name="dp_203">111.0156px</dimen>
-    <dimen name="dp_204">111.5625px</dimen>
-    <dimen name="dp_205">112.1094px</dimen>
-    <dimen name="dp_206">112.6562px</dimen>
-    <dimen name="dp_207">113.2031px</dimen>
-    <dimen name="dp_208">113.7500px</dimen>
-    <dimen name="dp_209">114.2969px</dimen>
-    <dimen name="dp_210">114.8438px</dimen>
-    <dimen name="dp_211">115.3906px</dimen>
-    <dimen name="dp_212">115.9375px</dimen>
-    <dimen name="dp_213">116.4844px</dimen>
-    <dimen name="dp_214">117.0312px</dimen>
-    <dimen name="dp_215">117.5781px</dimen>
-    <dimen name="dp_216">118.1250px</dimen>
-    <dimen name="dp_217">118.6719px</dimen>
-    <dimen name="dp_218">119.2188px</dimen>
-    <dimen name="dp_219">119.7656px</dimen>
-    <dimen name="dp_220">120.3125px</dimen>
-    <dimen name="dp_221">120.8594px</dimen>
-    <dimen name="dp_222">121.4062px</dimen>
-    <dimen name="dp_223">121.9531px</dimen>
-    <dimen name="dp_224">122.5000px</dimen>
-    <dimen name="dp_225">123.0469px</dimen>
-    <dimen name="dp_226">123.5938px</dimen>
-    <dimen name="dp_227">124.1406px</dimen>
-    <dimen name="dp_228">124.6875px</dimen>
-    <dimen name="dp_229">125.2344px</dimen>
-    <dimen name="dp_230">125.7812px</dimen>
-    <dimen name="dp_231">126.3281px</dimen>
-    <dimen name="dp_232">126.8750px</dimen>
-    <dimen name="dp_233">127.4219px</dimen>
-    <dimen name="dp_234">127.9688px</dimen>
-    <dimen name="dp_235">128.5156px</dimen>
-    <dimen name="dp_236">129.0625px</dimen>
-    <dimen name="dp_237">129.6094px</dimen>
-    <dimen name="dp_238">130.1562px</dimen>
-    <dimen name="dp_239">130.7031px</dimen>
-    <dimen name="dp_240">131.2500px</dimen>
-    <dimen name="dp_241">131.7969px</dimen>
-    <dimen name="dp_242">132.3438px</dimen>
-    <dimen name="dp_243">132.8906px</dimen>
-    <dimen name="dp_244">133.4375px</dimen>
-    <dimen name="dp_245">133.9844px</dimen>
-    <dimen name="dp_246">134.5312px</dimen>
-    <dimen name="dp_247">135.0781px</dimen>
-    <dimen name="dp_248">135.6250px</dimen>
-    <dimen name="dp_249">136.1719px</dimen>
-    <dimen name="dp_250">136.7188px</dimen>
-    <dimen name="dp_251">137.2656px</dimen>
-    <dimen name="dp_252">137.8125px</dimen>
-    <dimen name="dp_253">138.3594px</dimen>
-    <dimen name="dp_254">138.9062px</dimen>
-    <dimen name="dp_255">139.4531px</dimen>
-    <dimen name="dp_256">140.0000px</dimen>
-    <dimen name="dp_257">140.5469px</dimen>
-    <dimen name="dp_258">141.0938px</dimen>
-    <dimen name="dp_259">141.6406px</dimen>
-    <dimen name="dp_260">142.1875px</dimen>
-    <dimen name="dp_261">142.7344px</dimen>
-    <dimen name="dp_262">143.2812px</dimen>
-    <dimen name="dp_263">143.8281px</dimen>
-    <dimen name="dp_264">144.3750px</dimen>
-    <dimen name="dp_265">144.9219px</dimen>
-    <dimen name="dp_266">145.4688px</dimen>
-    <dimen name="dp_267">146.0156px</dimen>
-    <dimen name="dp_268">146.5625px</dimen>
-    <dimen name="dp_269">147.1094px</dimen>
-    <dimen name="dp_270">147.6562px</dimen>
-    <dimen name="dp_271">148.2031px</dimen>
-    <dimen name="dp_272">148.7500px</dimen>
-    <dimen name="dp_273">149.2969px</dimen>
-    <dimen name="dp_274">149.8438px</dimen>
-    <dimen name="dp_275">150.3906px</dimen>
-    <dimen name="dp_276">150.9375px</dimen>
-    <dimen name="dp_277">151.4844px</dimen>
-    <dimen name="dp_278">152.0312px</dimen>
-    <dimen name="dp_279">152.5781px</dimen>
-    <dimen name="dp_280">153.1250px</dimen>
-    <dimen name="dp_281">153.6719px</dimen>
-    <dimen name="dp_282">154.2188px</dimen>
-    <dimen name="dp_283">154.7656px</dimen>
-    <dimen name="dp_284">155.3125px</dimen>
-    <dimen name="dp_285">155.8594px</dimen>
-    <dimen name="dp_286">156.4062px</dimen>
-    <dimen name="dp_287">156.9531px</dimen>
-    <dimen name="dp_288">157.5000px</dimen>
-    <dimen name="dp_289">158.0469px</dimen>
-    <dimen name="dp_290">158.5938px</dimen>
-    <dimen name="dp_291">159.1406px</dimen>
-    <dimen name="dp_292">159.6875px</dimen>
-    <dimen name="dp_293">160.2344px</dimen>
-    <dimen name="dp_294">160.7812px</dimen>
-    <dimen name="dp_295">161.3281px</dimen>
-    <dimen name="dp_296">161.8750px</dimen>
-    <dimen name="dp_297">162.4219px</dimen>
-    <dimen name="dp_298">162.9688px</dimen>
-    <dimen name="dp_299">163.5156px</dimen>
-    <dimen name="dp_300">164.0625px</dimen>
-    <dimen name="dp_301">164.6094px</dimen>
-    <dimen name="dp_302">165.1562px</dimen>
-    <dimen name="dp_303">165.7031px</dimen>
-    <dimen name="dp_304">166.2500px</dimen>
-    <dimen name="dp_305">166.7969px</dimen>
-    <dimen name="dp_306">167.3438px</dimen>
-    <dimen name="dp_307">167.8906px</dimen>
-    <dimen name="dp_308">168.4375px</dimen>
-    <dimen name="dp_309">168.9844px</dimen>
-    <dimen name="dp_310">169.5312px</dimen>
-    <dimen name="dp_311">170.0781px</dimen>
-    <dimen name="dp_312">170.6250px</dimen>
-    <dimen name="dp_313">171.1719px</dimen>
-    <dimen name="dp_314">171.7188px</dimen>
-    <dimen name="dp_315">172.2656px</dimen>
-    <dimen name="dp_316">172.8125px</dimen>
-    <dimen name="dp_317">173.3594px</dimen>
-    <dimen name="dp_318">173.9062px</dimen>
-    <dimen name="dp_319">174.4531px</dimen>
-    <dimen name="dp_320">175.0000px</dimen>
-    <dimen name="dp_321">175.5469px</dimen>
-    <dimen name="dp_322">176.0938px</dimen>
-    <dimen name="dp_323">176.6406px</dimen>
-    <dimen name="dp_324">177.1875px</dimen>
-    <dimen name="dp_325">177.7344px</dimen>
-    <dimen name="dp_326">178.2812px</dimen>
-    <dimen name="dp_327">178.8281px</dimen>
-    <dimen name="dp_328">179.3750px</dimen>
-    <dimen name="dp_329">179.9219px</dimen>
-    <dimen name="dp_330">180.4688px</dimen>
-    <dimen name="dp_331">181.0156px</dimen>
-    <dimen name="dp_332">181.5625px</dimen>
-    <dimen name="dp_333">182.1094px</dimen>
-    <dimen name="dp_334">182.6562px</dimen>
-    <dimen name="dp_335">183.2031px</dimen>
-    <dimen name="dp_336">183.7500px</dimen>
-    <dimen name="dp_337">184.2969px</dimen>
-    <dimen name="dp_338">184.8438px</dimen>
-    <dimen name="dp_339">185.3906px</dimen>
-    <dimen name="dp_340">185.9375px</dimen>
-    <dimen name="dp_341">186.4844px</dimen>
-    <dimen name="dp_342">187.0312px</dimen>
-    <dimen name="dp_343">187.5781px</dimen>
-    <dimen name="dp_344">188.1250px</dimen>
-    <dimen name="dp_345">188.6719px</dimen>
-    <dimen name="dp_346">189.2188px</dimen>
-    <dimen name="dp_347">189.7656px</dimen>
-    <dimen name="dp_348">190.3125px</dimen>
-    <dimen name="dp_349">190.8594px</dimen>
-    <dimen name="dp_350">191.4062px</dimen>
-    <dimen name="dp_351">191.9531px</dimen>
-    <dimen name="dp_352">192.5000px</dimen>
-    <dimen name="dp_353">193.0469px</dimen>
-    <dimen name="dp_354">193.5938px</dimen>
-    <dimen name="dp_355">194.1406px</dimen>
-    <dimen name="dp_356">194.6875px</dimen>
-    <dimen name="dp_357">195.2344px</dimen>
-    <dimen name="dp_358">195.7812px</dimen>
-    <dimen name="dp_359">196.3281px</dimen>
-    <dimen name="dp_366">200.1562px</dimen>
-    <dimen name="dp_367">200.7031px</dimen>
-    <dimen name="dp_368">201.2500px</dimen>
-    <dimen name="dp_369">201.7969px</dimen>
-    <dimen name="dp_370">202.3438px</dimen>
-    <dimen name="dp_371">202.8906px</dimen>
-    <dimen name="dp_372">203.4375px</dimen>
-    <dimen name="dp_373">203.9844px</dimen>
-    <dimen name="dp_374">204.5312px</dimen>
-    <dimen name="dp_375">205.0781px</dimen>
-    <dimen name="dp_376">205.6250px</dimen>
-    <dimen name="dp_377">206.1719px</dimen>
-    <dimen name="dp_378">206.7188px</dimen>
-    <dimen name="dp_379">207.2656px</dimen>
-    <dimen name="dp_380">207.8125px</dimen>
-    <dimen name="dp_381">208.3594px</dimen>
-    <dimen name="dp_382">208.9062px</dimen>
-    <dimen name="dp_383">209.4531px</dimen>
-    <dimen name="dp_384">210.0000px</dimen>
-    <dimen name="dp_385">210.5469px</dimen>
-    <dimen name="dp_386">211.0938px</dimen>
-    <dimen name="dp_387">211.6406px</dimen>
-    <dimen name="dp_388">212.1875px</dimen>
-    <dimen name="dp_389">212.7344px</dimen>
-    <dimen name="dp_390">213.2812px</dimen>
-    <dimen name="dp_391">213.8281px</dimen>
-    <dimen name="dp_392">214.3750px</dimen>
-    <dimen name="dp_393">214.9219px</dimen>
-    <dimen name="dp_394">215.4688px</dimen>
-    <dimen name="dp_395">216.0156px</dimen>
-    <dimen name="dp_396">216.5625px</dimen>
-    <dimen name="dp_397">217.1094px</dimen>
-    <dimen name="dp_398">217.6562px</dimen>
-    <dimen name="dp_399">218.2031px</dimen>
-    <dimen name="dp_400">218.7500px</dimen>
-    <dimen name="dp_401">219.2969px</dimen>
-    <dimen name="dp_402">219.8438px</dimen>
-    <dimen name="dp_403">220.3906px</dimen>
-    <dimen name="dp_404">220.9375px</dimen>
-    <dimen name="dp_405">221.4844px</dimen>
-    <dimen name="dp_406">222.0312px</dimen>
-    <dimen name="dp_407">222.5781px</dimen>
-    <dimen name="dp_408">223.1250px</dimen>
-    <dimen name="dp_409">223.6719px</dimen>
-    <dimen name="dp_410">224.2188px</dimen>
-    <dimen name="dp_411">224.7656px</dimen>
-    <dimen name="dp_412">225.3125px</dimen>
-    <dimen name="dp_413">225.8594px</dimen>
-    <dimen name="dp_414">226.4062px</dimen>
-    <dimen name="dp_415">226.9531px</dimen>
-    <dimen name="dp_416">227.5000px</dimen>
-    <dimen name="dp_417">228.0469px</dimen>
-    <dimen name="dp_418">228.5938px</dimen>
-    <dimen name="dp_419">229.1406px</dimen>
-    <dimen name="dp_420">229.6875px</dimen>
-    <dimen name="dp_421">230.2344px</dimen>
-    <dimen name="dp_422">230.7812px</dimen>
-    <dimen name="dp_423">231.3281px</dimen>
-    <dimen name="dp_424">231.8750px</dimen>
-    <dimen name="dp_425">232.4219px</dimen>
-    <dimen name="dp_426">232.9688px</dimen>
-    <dimen name="dp_427">233.5156px</dimen>
-    <dimen name="dp_428">234.0625px</dimen>
-    <dimen name="dp_429">234.6094px</dimen>
-    <dimen name="dp_430">235.1562px</dimen>
-    <dimen name="dp_431">235.7031px</dimen>
-    <dimen name="dp_432">236.2500px</dimen>
-    <dimen name="dp_433">236.7969px</dimen>
-    <dimen name="dp_434">237.3438px</dimen>
-    <dimen name="dp_435">237.8906px</dimen>
-    <dimen name="dp_436">238.4375px</dimen>
-    <dimen name="dp_437">238.9844px</dimen>
-    <dimen name="dp_438">239.5312px</dimen>
-    <dimen name="dp_439">240.0781px</dimen>
-    <dimen name="dp_440">240.6250px</dimen>
-    <dimen name="dp_441">241.1719px</dimen>
-    <dimen name="dp_442">241.7188px</dimen>
-    <dimen name="dp_443">242.2656px</dimen>
-    <dimen name="dp_444">242.8125px</dimen>
-    <dimen name="dp_445">243.3594px</dimen>
-    <dimen name="dp_446">243.9062px</dimen>
-    <dimen name="dp_447">244.4531px</dimen>
-    <dimen name="dp_448">245.0000px</dimen>
-    <dimen name="dp_449">245.5469px</dimen>
-    <dimen name="dp_450">246.0938px</dimen>
-    <dimen name="dp_451">246.6406px</dimen>
-    <dimen name="dp_452">247.1875px</dimen>
-    <dimen name="dp_453">247.7344px</dimen>
-    <dimen name="dp_454">248.2812px</dimen>
-    <dimen name="dp_455">248.8281px</dimen>
-    <dimen name="dp_456">249.3750px</dimen>
-    <dimen name="dp_457">249.9219px</dimen>
-    <dimen name="dp_458">250.4688px</dimen>
-    <dimen name="dp_459">251.0156px</dimen>
-    <dimen name="dp_460">251.5625px</dimen>
-    <dimen name="dp_461">252.1094px</dimen>
-    <dimen name="dp_462">252.6562px</dimen>
-    <dimen name="dp_463">253.2031px</dimen>
-    <dimen name="dp_464">253.7500px</dimen>
-    <dimen name="dp_465">254.2969px</dimen>
-    <dimen name="dp_466">254.8438px</dimen>
-    <dimen name="dp_467">255.3906px</dimen>
-    <dimen name="dp_468">255.9375px</dimen>
-    <dimen name="dp_469">256.4844px</dimen>
-    <dimen name="dp_470">257.0312px</dimen>
-    <dimen name="dp_471">257.5781px</dimen>
-    <dimen name="dp_472">258.1250px</dimen>
-    <dimen name="dp_473">258.6719px</dimen>
-    <dimen name="dp_474">259.2188px</dimen>
-    <dimen name="dp_475">259.7656px</dimen>
-    <dimen name="dp_476">260.3125px</dimen>
-    <dimen name="dp_477">260.8594px</dimen>
-    <dimen name="dp_478">261.4062px</dimen>
-    <dimen name="dp_479">261.9531px</dimen>
-    <dimen name="dp_480">262.5000px</dimen>
-    <dimen name="dp_481">263.0469px</dimen>
-    <dimen name="dp_482">263.5938px</dimen>
-    <dimen name="dp_483">264.1406px</dimen>
-    <dimen name="dp_484">264.6875px</dimen>
-    <dimen name="dp_485">265.2344px</dimen>
-    <dimen name="dp_486">265.7812px</dimen>
-    <dimen name="dp_487">266.3281px</dimen>
-    <dimen name="dp_488">266.8750px</dimen>
-    <dimen name="dp_489">267.4219px</dimen>
-    <dimen name="dp_490">267.9688px</dimen>
-    <dimen name="dp_491">268.5156px</dimen>
-    <dimen name="dp_492">269.0625px</dimen>
-    <dimen name="dp_493">269.6094px</dimen>
-    <dimen name="dp_494">270.1562px</dimen>
-    <dimen name="dp_495">270.7031px</dimen>
-    <dimen name="dp_496">271.2500px</dimen>
-    <dimen name="dp_497">271.7969px</dimen>
-    <dimen name="dp_498">272.3438px</dimen>
-    <dimen name="dp_499">272.8906px</dimen>
-    <dimen name="dp_500">273.4375px</dimen>
-    <dimen name="dp_501">273.9844px</dimen>
-    <dimen name="dp_502">274.5312px</dimen>
-    <dimen name="dp_503">275.0781px</dimen>
-    <dimen name="dp_504">275.6250px</dimen>
-    <dimen name="dp_505">276.1719px</dimen>
-    <dimen name="dp_506">276.7188px</dimen>
-    <dimen name="dp_507">277.2656px</dimen>
-    <dimen name="dp_508">277.8125px</dimen>
-    <dimen name="dp_509">278.3594px</dimen>
-    <dimen name="dp_510">278.9062px</dimen>
-    <dimen name="dp_511">279.4531px</dimen>
-    <dimen name="dp_512">280.0000px</dimen>
-    <dimen name="dp_513">280.5469px</dimen>
-    <dimen name="dp_514">281.0938px</dimen>
-    <dimen name="dp_515">281.6406px</dimen>
-    <dimen name="dp_516">282.1875px</dimen>
-    <dimen name="dp_517">282.7344px</dimen>
-    <dimen name="dp_518">283.2812px</dimen>
-    <dimen name="dp_519">283.8281px</dimen>
-    <dimen name="dp_520">284.3750px</dimen>
-    <dimen name="dp_521">284.9219px</dimen>
-    <dimen name="dp_522">285.4688px</dimen>
-    <dimen name="dp_523">286.0156px</dimen>
-    <dimen name="dp_524">286.5625px</dimen>
-    <dimen name="dp_525">287.1094px</dimen>
-    <dimen name="dp_526">287.6562px</dimen>
-    <dimen name="dp_527">288.2031px</dimen>
-    <dimen name="dp_528">288.7500px</dimen>
-    <dimen name="dp_529">289.2969px</dimen>
-    <dimen name="dp_530">289.8438px</dimen>
-    <dimen name="dp_531">290.3906px</dimen>
-    <dimen name="dp_532">290.9375px</dimen>
-    <dimen name="dp_533">291.4844px</dimen>
-    <dimen name="dp_534">292.0312px</dimen>
-    <dimen name="dp_535">292.5781px</dimen>
-    <dimen name="dp_536">293.1250px</dimen>
-    <dimen name="dp_537">293.6719px</dimen>
-    <dimen name="dp_538">294.2188px</dimen>
-    <dimen name="dp_539">294.7656px</dimen>
-    <dimen name="dp_540">295.3125px</dimen>
-    <dimen name="dp_541">295.8594px</dimen>
-    <dimen name="dp_542">296.4062px</dimen>
-    <dimen name="dp_543">296.9531px</dimen>
-    <dimen name="dp_544">297.5000px</dimen>
-    <dimen name="dp_545">298.0469px</dimen>
-    <dimen name="dp_546">298.5938px</dimen>
-    <dimen name="dp_547">299.1406px</dimen>
-    <dimen name="dp_548">299.6875px</dimen>
-    <dimen name="dp_549">300.2344px</dimen>
-    <dimen name="dp_550">300.7812px</dimen>
-    <dimen name="dp_551">301.3281px</dimen>
-    <dimen name="dp_552">301.8750px</dimen>
-    <dimen name="dp_553">302.4219px</dimen>
-    <dimen name="dp_554">302.9688px</dimen>
-    <dimen name="dp_555">303.5156px</dimen>
-    <dimen name="dp_556">304.0625px</dimen>
-    <dimen name="dp_557">304.6094px</dimen>
-    <dimen name="dp_558">305.1562px</dimen>
-    <dimen name="dp_559">305.7031px</dimen>
-    <dimen name="dp_560">306.2500px</dimen>
-    <dimen name="dp_561">306.7969px</dimen>
-    <dimen name="dp_562">307.3438px</dimen>
-    <dimen name="dp_563">307.8906px</dimen>
-    <dimen name="dp_564">308.4375px</dimen>
-    <dimen name="dp_565">308.9844px</dimen>
-    <dimen name="dp_566">309.5312px</dimen>
-    <dimen name="dp_567">310.0781px</dimen>
-    <dimen name="dp_568">310.6250px</dimen>
-    <dimen name="dp_569">311.1719px</dimen>
-    <dimen name="dp_570">311.7188px</dimen>
-    <dimen name="dp_571">312.2656px</dimen>
-    <dimen name="dp_572">312.8125px</dimen>
-    <dimen name="dp_573">313.3594px</dimen>
-    <dimen name="dp_574">313.9062px</dimen>
-    <dimen name="dp_575">314.4531px</dimen>
-    <dimen name="dp_576">315.0000px</dimen>
-    <dimen name="dp_577">315.5469px</dimen>
-    <dimen name="dp_578">316.0938px</dimen>
-    <dimen name="dp_579">316.6406px</dimen>
-    <dimen name="dp_580">317.1875px</dimen>
-    <dimen name="dp_581">317.7344px</dimen>
-    <dimen name="dp_582">318.2812px</dimen>
-    <dimen name="dp_583">318.8281px</dimen>
-    <dimen name="dp_584">319.3750px</dimen>
-    <dimen name="dp_585">319.9219px</dimen>
-    <dimen name="dp_586">320.4688px</dimen>
-    <dimen name="dp_587">321.0156px</dimen>
-    <dimen name="dp_588">321.5625px</dimen>
-    <dimen name="dp_589">322.1094px</dimen>
-    <dimen name="dp_590">322.6562px</dimen>
-    <dimen name="dp_591">323.2031px</dimen>
-    <dimen name="dp_592">323.7500px</dimen>
-    <dimen name="dp_593">324.2969px</dimen>
-    <dimen name="dp_594">324.8438px</dimen>
-    <dimen name="dp_595">325.3906px</dimen>
-    <dimen name="dp_596">325.9375px</dimen>
-    <dimen name="dp_597">326.4844px</dimen>
-    <dimen name="dp_598">327.0312px</dimen>
-    <dimen name="dp_599">327.5781px</dimen>
-    <dimen name="dp_600">328.1250px</dimen>
-    <dimen name="dp_601">328.6719px</dimen>
-    <dimen name="dp_602">329.2188px</dimen>
-    <dimen name="dp_603">329.7656px</dimen>
-    <dimen name="dp_604">330.3125px</dimen>
-    <dimen name="dp_605">330.8594px</dimen>
-    <dimen name="dp_606">331.4062px</dimen>
-    <dimen name="dp_607">331.9531px</dimen>
-    <dimen name="dp_608">332.5000px</dimen>
-    <dimen name="dp_609">333.0469px</dimen>
-    <dimen name="dp_610">333.5938px</dimen>
-    <dimen name="dp_611">334.1406px</dimen>
-    <dimen name="dp_612">334.6875px</dimen>
-    <dimen name="dp_613">335.2344px</dimen>
-    <dimen name="dp_614">335.7812px</dimen>
-    <dimen name="dp_615">336.3281px</dimen>
-    <dimen name="dp_616">336.8750px</dimen>
-    <dimen name="dp_617">337.4219px</dimen>
-    <dimen name="dp_618">337.9688px</dimen>
-    <dimen name="dp_619">338.5156px</dimen>
-    <dimen name="dp_620">339.0625px</dimen>
-    <dimen name="dp_621">339.6094px</dimen>
-    <dimen name="dp_622">340.1562px</dimen>
-    <dimen name="dp_623">340.7031px</dimen>
-    <dimen name="dp_624">341.2500px</dimen>
-    <dimen name="dp_625">341.7969px</dimen>
-    <dimen name="dp_626">342.3438px</dimen>
-    <dimen name="dp_627">342.8906px</dimen>
-    <dimen name="dp_628">343.4375px</dimen>
-    <dimen name="dp_629">343.9844px</dimen>
-    <dimen name="dp_630">344.5312px</dimen>
-    <dimen name="dp_631">345.0781px</dimen>
-    <dimen name="dp_632">345.6250px</dimen>
-    <dimen name="dp_633">346.1719px</dimen>
-    <dimen name="dp_634">346.7188px</dimen>
-    <dimen name="dp_635">347.2656px</dimen>
-    <dimen name="dp_636">347.8125px</dimen>
-    <dimen name="dp_637">348.3594px</dimen>
-    <dimen name="dp_638">348.9062px</dimen>
-    <dimen name="dp_639">349.4531px</dimen>
-    <dimen name="dp_640">350.0000px</dimen>
-    <dimen name="dp_641">350.5469px</dimen>
-    <dimen name="dp_642">351.0938px</dimen>
-    <dimen name="dp_643">351.6406px</dimen>
-    <dimen name="dp_644">352.1875px</dimen>
-    <dimen name="dp_645">352.7344px</dimen>
-    <dimen name="dp_646">353.2812px</dimen>
-    <dimen name="dp_647">353.8281px</dimen>
-    <dimen name="dp_648">354.3750px</dimen>
-    <dimen name="dp_649">354.9219px</dimen>
-    <dimen name="dp_650">355.4688px</dimen>
-    <dimen name="dp_651">356.0156px</dimen>
-    <dimen name="dp_652">356.5625px</dimen>
-    <dimen name="dp_653">357.1094px</dimen>
-    <dimen name="dp_654">357.6562px</dimen>
-    <dimen name="dp_655">358.2031px</dimen>
-    <dimen name="dp_656">358.7500px</dimen>
-    <dimen name="dp_657">359.2969px</dimen>
-    <dimen name="dp_658">359.8438px</dimen>
-    <dimen name="dp_659">360.3906px</dimen>
-    <dimen name="dp_660">360.9375px</dimen>
-    <dimen name="dp_661">361.4844px</dimen>
-    <dimen name="dp_662">362.0312px</dimen>
-    <dimen name="dp_663">362.5781px</dimen>
-    <dimen name="dp_664">363.1250px</dimen>
-    <dimen name="dp_665">363.6719px</dimen>
-    <dimen name="dp_666">364.2188px</dimen>
-    <dimen name="dp_667">364.7656px</dimen>
-    <dimen name="dp_668">365.3125px</dimen>
-    <dimen name="dp_669">365.8594px</dimen>
-    <dimen name="dp_670">366.4062px</dimen>
-    <dimen name="dp_671">366.9531px</dimen>
-    <dimen name="dp_672">367.5000px</dimen>
-    <dimen name="dp_673">368.0469px</dimen>
-    <dimen name="dp_674">368.5938px</dimen>
-    <dimen name="dp_675">369.1406px</dimen>
-    <dimen name="dp_676">369.6875px</dimen>
-    <dimen name="dp_677">370.2344px</dimen>
-    <dimen name="dp_678">370.7812px</dimen>
-    <dimen name="dp_679">371.3281px</dimen>
-    <dimen name="dp_680">371.8750px</dimen>
-    <dimen name="dp_681">372.4219px</dimen>
-    <dimen name="dp_682">372.9688px</dimen>
-    <dimen name="dp_683">373.5156px</dimen>
-    <dimen name="dp_684">374.0625px</dimen>
-    <dimen name="dp_685">374.6094px</dimen>
-    <dimen name="dp_686">375.1562px</dimen>
-    <dimen name="dp_687">375.7031px</dimen>
-    <dimen name="dp_688">376.2500px</dimen>
-    <dimen name="dp_689">376.7969px</dimen>
-    <dimen name="dp_690">377.3438px</dimen>
-    <dimen name="dp_691">377.8906px</dimen>
-    <dimen name="dp_692">378.4375px</dimen>
-    <dimen name="dp_693">378.9844px</dimen>
-    <dimen name="dp_694">379.5312px</dimen>
-    <dimen name="dp_695">380.0781px</dimen>
-    <dimen name="dp_696">380.6250px</dimen>
-    <dimen name="dp_697">381.1719px</dimen>
-    <dimen name="dp_698">381.7188px</dimen>
-    <dimen name="dp_699">382.2656px</dimen>
-    <dimen name="dp_700">382.8125px</dimen>
-    <dimen name="dp_701">383.3594px</dimen>
-    <dimen name="dp_702">383.9062px</dimen>
-    <dimen name="dp_703">384.4531px</dimen>
-    <dimen name="dp_704">385.0000px</dimen>
-    <dimen name="dp_705">385.5469px</dimen>
-    <dimen name="dp_706">386.0938px</dimen>
-    <dimen name="dp_707">386.6406px</dimen>
-    <dimen name="dp_708">387.1875px</dimen>
-    <dimen name="dp_709">387.7344px</dimen>
-    <dimen name="dp_710">388.2812px</dimen>
-    <dimen name="dp_711">388.8281px</dimen>
-    <dimen name="dp_712">389.3750px</dimen>
-    <dimen name="dp_713">389.9219px</dimen>
-    <dimen name="dp_714">390.4688px</dimen>
-    <dimen name="dp_715">391.0156px</dimen>
-    <dimen name="dp_716">391.5625px</dimen>
-    <dimen name="dp_717">392.1094px</dimen>
-    <dimen name="dp_718">392.6562px</dimen>
-    <dimen name="dp_719">393.2031px</dimen>
-    <dimen name="dp_720">393.7500px</dimen>
-    <dimen name="dp_721">394.2969px</dimen>
-    <dimen name="dp_722">394.8438px</dimen>
-    <dimen name="dp_723">395.3906px</dimen>
-    <dimen name="dp_724">395.9375px</dimen>
-    <dimen name="dp_725">396.4844px</dimen>
-    <dimen name="dp_726">397.0312px</dimen>
-    <dimen name="dp_727">397.5781px</dimen>
-    <dimen name="dp_728">398.1250px</dimen>
-    <dimen name="dp_729">398.6719px</dimen>
-    <dimen name="dp_730">399.2188px</dimen>
-    <dimen name="dp_731">399.7656px</dimen>
-    <dimen name="dp_732">400.3125px</dimen>
-    <dimen name="dp_733">400.8594px</dimen>
-    <dimen name="dp_734">401.4062px</dimen>
-    <dimen name="dp_735">401.9531px</dimen>
-    <dimen name="dp_736">402.5000px</dimen>
-    <dimen name="dp_737">403.0469px</dimen>
-    <dimen name="dp_738">403.5938px</dimen>
-    <dimen name="dp_739">404.1406px</dimen>
-    <dimen name="dp_740">404.6875px</dimen>
-    <dimen name="dp_741">405.2344px</dimen>
-    <dimen name="dp_742">405.7812px</dimen>
-    <dimen name="dp_743">406.3281px</dimen>
-    <dimen name="dp_744">406.8750px</dimen>
-    <dimen name="dp_745">407.4219px</dimen>
-    <dimen name="dp_746">407.9688px</dimen>
-    <dimen name="dp_747">408.5156px</dimen>
-    <dimen name="dp_748">409.0625px</dimen>
-    <dimen name="dp_749">409.6094px</dimen>
-    <dimen name="dp_750">410.1562px</dimen>
-    <dimen name="dp_751">410.7031px</dimen>
-    <dimen name="dp_752">411.2500px</dimen>
-    <dimen name="dp_753">411.7969px</dimen>
-    <dimen name="dp_754">412.3438px</dimen>
-    <dimen name="dp_755">412.8906px</dimen>
-    <dimen name="dp_756">413.4375px</dimen>
-    <dimen name="dp_757">413.9844px</dimen>
-    <dimen name="dp_758">414.5312px</dimen>
-    <dimen name="dp_759">415.0781px</dimen>
-    <dimen name="dp_760">415.6250px</dimen>
-    <dimen name="dp_761">416.1719px</dimen>
-    <dimen name="dp_762">416.7188px</dimen>
-    <dimen name="dp_763">417.2656px</dimen>
-    <dimen name="dp_764">417.8125px</dimen>
-    <dimen name="dp_765">418.3594px</dimen>
-    <dimen name="dp_766">418.9062px</dimen>
-    <dimen name="dp_767">419.4531px</dimen>
-    <dimen name="dp_768">420.0000px</dimen>
-    <dimen name="dp_769">420.5469px</dimen>
-    <dimen name="dp_770">421.0938px</dimen>
-    <dimen name="dp_771">421.6406px</dimen>
-    <dimen name="dp_772">422.1875px</dimen>
-    <dimen name="dp_773">422.7344px</dimen>
-    <dimen name="dp_774">423.2812px</dimen>
-    <dimen name="dp_775">423.8281px</dimen>
-    <dimen name="dp_776">424.3750px</dimen>
-    <dimen name="dp_777">424.9219px</dimen>
-    <dimen name="dp_778">425.4688px</dimen>
-    <dimen name="dp_779">426.0156px</dimen>
-    <dimen name="dp_780">426.5625px</dimen>
-    <dimen name="dp_781">427.1094px</dimen>
-    <dimen name="dp_782">427.6562px</dimen>
-    <dimen name="dp_783">428.2031px</dimen>
-    <dimen name="dp_784">428.7500px</dimen>
-    <dimen name="dp_785">429.2969px</dimen>
-    <dimen name="dp_786">429.8438px</dimen>
-    <dimen name="dp_787">430.3906px</dimen>
-    <dimen name="dp_788">430.9375px</dimen>
-    <dimen name="dp_789">431.4844px</dimen>
-    <dimen name="dp_790">432.0312px</dimen>
-    <dimen name="dp_791">432.5781px</dimen>
-    <dimen name="dp_792">433.1250px</dimen>
-    <dimen name="dp_793">433.6719px</dimen>
-    <dimen name="dp_794">434.2188px</dimen>
-    <dimen name="dp_795">434.7656px</dimen>
-    <dimen name="dp_796">435.3125px</dimen>
-    <dimen name="dp_797">435.8594px</dimen>
-    <dimen name="dp_798">436.4062px</dimen>
-    <dimen name="dp_799">436.9531px</dimen>
-    <dimen name="dp_800">437.5000px</dimen>
-    <dimen name="dp_801">438.0469px</dimen>
-    <dimen name="dp_802">438.5938px</dimen>
-    <dimen name="dp_803">439.1406px</dimen>
-    <dimen name="dp_804">439.6875px</dimen>
-    <dimen name="dp_805">440.2344px</dimen>
-    <dimen name="dp_806">440.7812px</dimen>
-    <dimen name="dp_807">441.3281px</dimen>
-    <dimen name="dp_808">441.8750px</dimen>
-    <dimen name="dp_809">442.4219px</dimen>
-    <dimen name="dp_810">442.9688px</dimen>
-    <dimen name="dp_811">443.5156px</dimen>
-    <dimen name="dp_812">444.0625px</dimen>
-    <dimen name="dp_813">444.6094px</dimen>
-    <dimen name="dp_814">445.1562px</dimen>
-    <dimen name="dp_815">445.7031px</dimen>
-    <dimen name="dp_816">446.2500px</dimen>
-    <dimen name="dp_817">446.7969px</dimen>
-    <dimen name="dp_818">447.3438px</dimen>
-    <dimen name="dp_819">447.8906px</dimen>
-    <dimen name="dp_820">448.4375px</dimen>
-    <dimen name="dp_821">448.9844px</dimen>
-    <dimen name="dp_822">449.5312px</dimen>
-    <dimen name="dp_823">450.0781px</dimen>
-    <dimen name="dp_824">450.6250px</dimen>
-    <dimen name="dp_825">451.1719px</dimen>
-    <dimen name="dp_826">451.7188px</dimen>
-    <dimen name="dp_827">452.2656px</dimen>
-    <dimen name="dp_828">452.8125px</dimen>
-    <dimen name="dp_829">453.3594px</dimen>
-    <dimen name="dp_830">453.9062px</dimen>
-    <dimen name="dp_831">454.4531px</dimen>
-    <dimen name="dp_832">455.0000px</dimen>
-    <dimen name="dp_833">455.5469px</dimen>
-    <dimen name="dp_834">456.0938px</dimen>
-    <dimen name="dp_835">456.6406px</dimen>
-    <dimen name="dp_836">457.1875px</dimen>
-    <dimen name="dp_837">457.7344px</dimen>
-    <dimen name="dp_838">458.2812px</dimen>
-    <dimen name="dp_839">458.8281px</dimen>
-    <dimen name="dp_840">459.3750px</dimen>
-    <dimen name="dp_841">459.9219px</dimen>
-    <dimen name="dp_842">460.4688px</dimen>
-    <dimen name="dp_843">461.0156px</dimen>
-    <dimen name="dp_844">461.5625px</dimen>
-    <dimen name="dp_845">462.1094px</dimen>
-    <dimen name="dp_846">462.6562px</dimen>
-    <dimen name="dp_847">463.2031px</dimen>
-    <dimen name="dp_848">463.7500px</dimen>
-    <dimen name="dp_849">464.2969px</dimen>
-    <dimen name="dp_850">464.8438px</dimen>
-    <dimen name="dp_851">465.3906px</dimen>
-    <dimen name="dp_852">465.9375px</dimen>
-    <dimen name="dp_853">466.4844px</dimen>
-    <dimen name="dp_854">467.0312px</dimen>
-    <dimen name="dp_855">467.5781px</dimen>
-    <dimen name="dp_856">468.1250px</dimen>
-    <dimen name="dp_857">468.6719px</dimen>
-    <dimen name="dp_858">469.2188px</dimen>
-    <dimen name="dp_859">469.7656px</dimen>
-    <dimen name="dp_860">470.3125px</dimen>
-    <dimen name="dp_861">470.8594px</dimen>
-    <dimen name="dp_862">471.4062px</dimen>
-    <dimen name="dp_863">471.9531px</dimen>
-    <dimen name="dp_864">472.5000px</dimen>
-    <dimen name="dp_865">473.0469px</dimen>
-    <dimen name="dp_866">473.5938px</dimen>
-    <dimen name="dp_867">474.1406px</dimen>
-    <dimen name="dp_868">474.6875px</dimen>
-    <dimen name="dp_869">475.2344px</dimen>
-    <dimen name="dp_870">475.7812px</dimen>
-    <dimen name="dp_871">476.3281px</dimen>
-    <dimen name="dp_872">476.8750px</dimen>
-    <dimen name="dp_873">477.4219px</dimen>
-    <dimen name="dp_874">477.9688px</dimen>
-    <dimen name="dp_875">478.5156px</dimen>
-    <dimen name="dp_876">479.0625px</dimen>
-    <dimen name="dp_877">479.6094px</dimen>
-    <dimen name="dp_878">480.1562px</dimen>
-    <dimen name="dp_879">480.7031px</dimen>
-    <dimen name="dp_880">481.2500px</dimen>
-    <dimen name="dp_881">481.7969px</dimen>
-    <dimen name="dp_882">482.3438px</dimen>
-    <dimen name="dp_883">482.8906px</dimen>
-    <dimen name="dp_884">483.4375px</dimen>
-    <dimen name="dp_885">483.9844px</dimen>
-    <dimen name="dp_886">484.5312px</dimen>
-    <dimen name="dp_887">485.0781px</dimen>
-    <dimen name="dp_888">485.6250px</dimen>
-    <dimen name="dp_889">486.1719px</dimen>
-    <dimen name="dp_890">486.7188px</dimen>
-    <dimen name="dp_891">487.2656px</dimen>
-    <dimen name="dp_892">487.8125px</dimen>
-    <dimen name="dp_893">488.3594px</dimen>
-    <dimen name="dp_894">488.9062px</dimen>
-    <dimen name="dp_895">489.4531px</dimen>
-    <dimen name="dp_896">490.0000px</dimen>
-    <dimen name="dp_897">490.5469px</dimen>
-    <dimen name="dp_898">491.0938px</dimen>
-    <dimen name="dp_899">491.6406px</dimen>
-    <dimen name="dp_900">492.1875px</dimen>
-    <dimen name="dp_901">492.7344px</dimen>
-    <dimen name="dp_902">493.2812px</dimen>
-    <dimen name="dp_903">493.8281px</dimen>
-    <dimen name="dp_904">494.3750px</dimen>
-    <dimen name="dp_905">494.9219px</dimen>
-    <dimen name="dp_906">495.4688px</dimen>
-    <dimen name="dp_907">496.0156px</dimen>
-    <dimen name="dp_908">496.5625px</dimen>
-    <dimen name="dp_909">497.1094px</dimen>
-    <dimen name="dp_910">497.6562px</dimen>
-    <dimen name="dp_911">498.2031px</dimen>
-    <dimen name="dp_912">498.7500px</dimen>
-    <dimen name="dp_913">499.2969px</dimen>
-    <dimen name="dp_914">499.8438px</dimen>
-    <dimen name="dp_915">500.3906px</dimen>
-    <dimen name="dp_916">500.9375px</dimen>
-    <dimen name="dp_917">501.4844px</dimen>
-    <dimen name="dp_918">502.0312px</dimen>
-    <dimen name="dp_919">502.5781px</dimen>
-    <dimen name="dp_920">503.1250px</dimen>
-    <dimen name="dp_921">503.6719px</dimen>
-    <dimen name="dp_922">504.2188px</dimen>
-    <dimen name="dp_923">504.7656px</dimen>
-    <dimen name="dp_924">505.3125px</dimen>
-    <dimen name="dp_925">505.8594px</dimen>
-    <dimen name="dp_926">506.4062px</dimen>
-    <dimen name="dp_927">506.9531px</dimen>
-    <dimen name="dp_928">507.5000px</dimen>
-    <dimen name="dp_929">508.0469px</dimen>
-    <dimen name="dp_930">508.5938px</dimen>
-    <dimen name="dp_931">509.1406px</dimen>
-    <dimen name="dp_932">509.6875px</dimen>
-    <dimen name="dp_933">510.2344px</dimen>
-    <dimen name="dp_934">510.7812px</dimen>
-    <dimen name="dp_935">511.3281px</dimen>
-    <dimen name="dp_936">511.8750px</dimen>
-    <dimen name="dp_937">512.4219px</dimen>
-    <dimen name="dp_938">512.9688px</dimen>
-    <dimen name="dp_939">513.5156px</dimen>
-    <dimen name="dp_940">514.0625px</dimen>
-    <dimen name="dp_941">514.6094px</dimen>
-    <dimen name="dp_942">515.1562px</dimen>
-    <dimen name="dp_943">515.7031px</dimen>
-    <dimen name="dp_944">516.2500px</dimen>
-    <dimen name="dp_945">516.7969px</dimen>
-    <dimen name="dp_946">517.3438px</dimen>
-    <dimen name="dp_947">517.8906px</dimen>
-    <dimen name="dp_948">518.4375px</dimen>
-    <dimen name="dp_949">518.9844px</dimen>
-    <dimen name="dp_950">519.5312px</dimen>
-    <dimen name="dp_951">520.0781px</dimen>
-    <dimen name="dp_952">520.6250px</dimen>
-    <dimen name="dp_953">521.1719px</dimen>
-    <dimen name="dp_954">521.7188px</dimen>
-    <dimen name="dp_955">522.2656px</dimen>
-    <dimen name="dp_956">522.8125px</dimen>
-    <dimen name="dp_957">523.3594px</dimen>
-    <dimen name="dp_958">523.9062px</dimen>
-    <dimen name="dp_959">524.4531px</dimen>
-    <dimen name="dp_960">525.0000px</dimen>
-    <dimen name="dp_961">525.5469px</dimen>
-    <dimen name="dp_962">526.0938px</dimen>
-    <dimen name="dp_963">526.6406px</dimen>
-    <dimen name="dp_964">527.1875px</dimen>
-    <dimen name="dp_965">527.7344px</dimen>
-    <dimen name="dp_966">528.2812px</dimen>
-    <dimen name="dp_967">528.8281px</dimen>
-    <dimen name="dp_968">529.3750px</dimen>
-    <dimen name="dp_969">529.9219px</dimen>
-    <dimen name="dp_970">530.4688px</dimen>
-    <dimen name="dp_971">531.0156px</dimen>
-    <dimen name="dp_972">531.5625px</dimen>
-    <dimen name="dp_973">532.1094px</dimen>
-    <dimen name="dp_974">532.6562px</dimen>
-    <dimen name="dp_975">533.2031px</dimen>
-    <dimen name="dp_976">533.7500px</dimen>
-    <dimen name="dp_977">534.2969px</dimen>
-    <dimen name="dp_978">534.8438px</dimen>
-    <dimen name="dp_979">535.3906px</dimen>
-    <dimen name="dp_980">535.9375px</dimen>
-    <dimen name="dp_981">536.4844px</dimen>
-    <dimen name="dp_982">537.0312px</dimen>
-    <dimen name="dp_983">537.5781px</dimen>
-    <dimen name="dp_984">538.1250px</dimen>
-    <dimen name="dp_985">538.6719px</dimen>
-    <dimen name="dp_986">539.2188px</dimen>
-    <dimen name="dp_987">539.7656px</dimen>
-    <dimen name="dp_988">540.3125px</dimen>
-    <dimen name="dp_989">540.8594px</dimen>
-    <dimen name="dp_990">541.4062px</dimen>
-    <dimen name="dp_991">541.9531px</dimen>
-    <dimen name="dp_992">542.5000px</dimen>
-    <dimen name="dp_993">543.0469px</dimen>
-    <dimen name="dp_994">543.5938px</dimen>
-    <dimen name="dp_995">544.1406px</dimen>
-    <dimen name="dp_996">544.6875px</dimen>
-    <dimen name="dp_997">545.2344px</dimen>
-    <dimen name="dp_998">545.7812px</dimen>
-    <dimen name="dp_999">546.3281px</dimen>
-    <dimen name="dp_1300">710.9375px</dimen>
-
-    <dimen name="sp_6">3.2812px</dimen>
-    <dimen name="sp_7">3.8281px</dimen>
-    <dimen name="sp_8">4.3750px</dimen>
-    <dimen name="sp_9">4.9219px</dimen>
-    <dimen name="sp_10">5.4688px</dimen>
-    <dimen name="sp_11">6.0156px</dimen>
-    <dimen name="sp_12">6.5625px</dimen>
-    <dimen name="sp_13">7.1094px</dimen>
-    <dimen name="sp_14">7.6562px</dimen>
-    <dimen name="sp_15">8.2031px</dimen>
-    <dimen name="sp_16">8.7500px</dimen>
-    <dimen name="sp_17">9.2969px</dimen>
-    <dimen name="sp_18">9.8438px</dimen>
-    <dimen name="sp_19">10.3906px</dimen>
-    <dimen name="sp_20">10.9375px</dimen>
-    <dimen name="sp_21">11.4844px</dimen>
-    <dimen name="sp_22">12.0312px</dimen>
-    <dimen name="sp_23">12.5781px</dimen>
-    <dimen name="sp_24">13.1250px</dimen>
-    <dimen name="sp_25">13.6719px</dimen>
-    <dimen name="sp_28">15.3125px</dimen>
-    <dimen name="sp_30">16.4062px</dimen>
-    <dimen name="sp_32">17.5000px</dimen>
-    <dimen name="sp_34">18.5938px</dimen>
-    <dimen name="sp_36">19.6875px</dimen>
-    <dimen name="sp_38">20.7812px</dimen>
-    <dimen name="sp_40">21.8750px</dimen>
-    <dimen name="sp_42">22.9688px</dimen>
-    <dimen name="sp_48">26.2500px</dimen>
-</resources>
diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/values/strings.xml b/core/function-impl/mogo-core-function-chat/src/main/res/values/strings.xml
index d85fb26674..cb3403e38a 100644
--- a/core/function-impl/mogo-core-function-chat/src/main/res/values/strings.xml
+++ b/core/function-impl/mogo-core-function-chat/src/main/res/values/strings.xml
@@ -1,33 +1,3 @@
 <resources>
-    <string name="app_name">CarChatting</string>
-    <string name="module_car_chat_already_cancel">已取消</string>
-    <string name="module_car_chat_ok">好的</string>
-    <string name="module_distance_metre">%1$sm</string>
-    <string name="module_distance_kilometre">%1$skm</string>
-    <string name="module_car_chat_user_info_null">用户信息缺失，请稍后再试</string>
-    <string name="module_car_chat_self_error">拨打电话失败，不能打点话给自己</string>
-    <string name="module_car_chat_call_hangup">已挂断</string>
-    <string name="module_car_chat_call_refuse">对方无应答</string>
-    <string name="module_car_chat_can_not_call">正在通话中,请稍后再试</string>
-    <string name="module_car_chat_match_less">当前匹配人数较少，请稍后重试</string>
-    <string name="module_car_chat_user_caller">打电话</string>
-    <string name="module_car_chat_user_join_team">加入车队</string>
-    <string name="module_car_chat_match_tip">匹配车友聊天</string>
-    <string name="module_car_chat_matching">正在为您匹配车友...</string>
-    <string name="module_car_chat_matching_cancel">取消</string>
     <string name="module_car_chat_matching_wait">等待接听</string>
-    <string name="module_car_chat_team_calling">车队通话中...</string>
-    <string name="module_car_chat_team_info">点击查看信息</string>
-    <string name="module_car_chat_team_quit">退出车队</string>
-    <string name="module_car_chat_network_error">请检查网络状态</string>
-    <string name="module_car_chat_invitation_window">车友%1$s邀请你加入车队！</string>
-
-    <string name="module_car_chat_team_invited">已邀请</string>
-    <string name="module_car_chat_in_the_team">对方已有车队</string>
-    <string name="module_car_chat_team_invited_prompt">有车友邀请你加入车队，你可以对我说，加入或拒绝</string>
-    <string name="module_car_chat_error_call_test">SN 不能为 null</string>
-    <string name="module_car_chat_joined_team">已加入车队，你可以直接跟队友通话</string>
-    <string name="module_car_chat_vehicle_dismiss">车队已解散</string>
-    <string name="module_car_chat_in_call">当前正在通话中</string>
-    <string name="module_car_chat_hangup_fail">挂断失败</string>
 </resources>
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt
index 46270dfc08..d74fa5a33a 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt
@@ -40,8 +40,8 @@ class DevaToolsProvider : IDevaToolsProvider {
         MogoLogCatchManager.startCatchLog(duration, logPrefixName)
     }
 
-    override fun stopLogCatch() {
-        MogoLogCatchManager.stopCatchLog()
+    override fun stopLogCatch(logPrefixName: String?) {
+        MogoLogCatchManager.stopCatchLog(logPrefixName)
     }
 
     override fun getTraceInfo(): HashMap<Int, ChainLogParam> {
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt
index 8cd418c3d7..930224fd9d 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt
@@ -7,6 +7,7 @@ import android.view.ViewGroup
 import android.view.WindowManager
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.Lifecycle.Event
+import androidx.lifecycle.Lifecycle.Event.ON_CREATE
 import androidx.lifecycle.Lifecycle.Event.ON_DESTROY
 import androidx.lifecycle.LifecycleCoroutineScope
 import androidx.lifecycle.LifecycleEventObserver
@@ -18,6 +19,9 @@ import com.mogo.eagle.core.utilcode.kotlin.PX
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.kotlin.lifecycleOwner
 import com.mogo.eagle.core.utilcode.kotlin.onClick
+import com.mogo.eagle.core.utilcode.reminder.Reminder
+import com.mogo.eagle.core.utilcode.reminder.api.IReminder
+import com.mogo.eagle.core.utilcode.reminder.api.IReminder.IGlobalStateChangeListener
 import com.zhjt.mogo_core_function_devatools.badcase.repository.net.api.entity.BadCaseResponse.Reason
 import com.zhjt.mogo_core_function_devatools.badcase.biz.BadCasePresenter
 import com.zhjt.mogo_core_function_devatools.badcase.biz.BadCaseView
@@ -55,6 +59,9 @@ internal object BadCaseManager : LifecycleEventObserver {
     @Volatile
     private var dismissJob: Job? = null
 
+    @Volatile
+    private var feedbackFloatShow = false
+
     @OptIn(ExperimentalCoroutinesApi::class)
     private var channel: Channel<AutoPilotRecord> = Channel(Channel.RENDEZVOUS)
         get() = if (field.isClosedForReceive || field.isClosedForSend) {
@@ -172,6 +179,9 @@ internal object BadCaseManager : LifecycleEventObserver {
     }
 
     fun onReceiveBadCaseRecord(record: RecordPanelOuterClass.RecordPanel) {
+        if (feedbackFloatShow) {
+            return
+        }
         scope?.launch {
             val newRecord = record.toRecord()
             withContext(Dispatchers.IO) {
@@ -182,10 +192,10 @@ internal object BadCaseManager : LifecycleEventObserver {
     }
 
     private fun CoroutineScope.showBadCaseInternal(record: AutoPilotRecord) = launch {
-        viewHolder?.get()?.also {
+        viewHolder?.get()?.also { itx ->
             presenter.updateLastModified(record.toLongTime())
             showEntry()
-            it.onClick {
+            itx.onClick {
                 showBadCaseFloat(
                     onDismiss = {
                         hideFloat?.invoke()
@@ -252,14 +262,33 @@ internal object BadCaseManager : LifecycleEventObserver {
         val activity = viewHolder?.get()?.context as? FragmentActivity ?: throw IllegalStateException("please ensure context is FragmentActivity.")
         BadCaseView(activity).also { itx ->
             itx.register(record, onDismiss, onSelect)
-            activity.pop(itx, 960.PX, WindowManager.LayoutParams.MATCH_PARENT).also {
+            activity.pop(itx, 960.PX, WindowManager.LayoutParams.MATCH_PARENT, key = "BadCaseFloatWindow_").also {
                 hideFloat = it
             }
         }
     }
 
+
+    private val listener = object : IGlobalStateChangeListener {
+        override fun onShow(reminder: IReminder) {
+            if (reminder.key().startsWith("FeedBackFloatWindow_")) {
+                feedbackFloatShow = true
+            }
+        }
+
+        override fun onHide(reminder: IReminder) {
+            if (reminder.key().startsWith("FeedBackFloatWindow_")) {
+                feedbackFloatShow = false
+            }
+        }
+    }
+
     override fun onStateChanged(source: LifecycleOwner, event: Event) {
+        if (event == ON_CREATE) {
+            Reminder.registerGlobalStateChangeListener(listener)
+        }
         if (event == ON_DESTROY) {
+            Reminder.unRegisterGlobalStateChangeListener(listener)
             dismissJob?.takeIf { it.isActive }?.cancel()
             onHide = null
             onShow = null
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/ext/BadCaseExt.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/ext/BadCaseExt.kt
index 55d9da26a5..a62b8fecd6 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/ext/BadCaseExt.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/ext/BadCaseExt.kt
@@ -66,7 +66,7 @@ internal fun Context.toast(text: CharSequence, duration: Long = 2, unit: TimeUni
 }
 
 @SuppressLint("ClickableViewAccessibility")
-internal fun Context.pop(content: View, width: Int, height: Int, fitSystemWindow: Boolean = true, onOuterViewClicked:((focus: View) -> Unit)? = null): () -> Unit {
+internal fun Context.pop(content: View, width: Int, height: Int, key: String, fitSystemWindow: Boolean = true, onOuterViewClicked:((focus: View) -> Unit)? = null): () -> Unit {
     val activity = (this as? FragmentActivity) ?: throw IllegalStateException("please use Activity to trigger pop show.")
     var tempReminder: PopupWindowReminder? = null
     activity.lifecycleScope.launchWhenResumed {
@@ -104,7 +104,11 @@ internal fun Context.pop(content: View, width: Int, height: Int, fitSystemWindow
                         }
                     }
                 }
-                return@setTouchInterceptor true
+                try {
+                    return@setTouchInterceptor true
+                } finally {
+                    activity.window.decorView.dispatchTouchEvent(event)
+                }
             }
             it.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
         }
@@ -118,6 +122,11 @@ internal fun Context.pop(content: View, width: Int, height: Int, fitSystemWindow
         }
         pop.contentView = content
         val reminder = object : PopupWindowReminder(pop) {
+
+            override fun key(): String {
+                return key + super.key()
+            }
+
             override fun show() {
                 pop.showAtLocation(activity.window.decorView, Gravity.START, 0, if (fitSystemWindow) WindowUtils.getStatusBarHeight(activity) else 0)
             }
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/feedback/FeedbackManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/feedback/FeedbackManager.kt
index cc3715ec27..a1032bd60f 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/feedback/FeedbackManager.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/feedback/FeedbackManager.kt
@@ -2,7 +2,6 @@ package com.zhjt.mogo_core_function_devatools.feedback
 
 import android.content.Context
 import android.text.TextUtils
-import android.util.Log
 import android.view.View
 import android.view.WindowManager
 import android.widget.TextView
@@ -14,13 +13,11 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotIdentifyListen
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
 import com.mogo.eagle.core.utilcode.kotlin.*
 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.mogo.logger.scene.SceneConstant.Companion.M_DEVA
 import com.mogo.eagle.core.utilcode.mogo.toast.TipToast
 import com.mogo.eagle.core.utilcode.util.KeyboardUtils
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.zhjt.mogo_core_function_devatools.R
-import com.zhjt.mogo_core_function_devatools.badcase.BadCaseManager
 import com.zhjt.mogo_core_function_devatools.badcase.repository.db.entity.AutoPilotRecord
 import com.zhjt.mogo_core_function_devatools.badcase.repository.net.api.entity.BadCaseResponse.Reason
 import com.zhjt.mogo_core_function_devatools.badcase.toRecord
@@ -32,7 +29,10 @@ import com.zhjt.mogo_core_function_devatools.feedback.biz.impl.FeedbackPresenter
 import com.zhjt.mogo_core_function_devatools.feedback.callback.IFeedbackCallback
 import kotlinx.coroutines.*
 import record_cache.RecordPanelOuterClass
+import java.io.File
 import java.lang.IllegalStateException
+import java.text.SimpleDateFormat
+import java.util.*
 import kotlin.Result.Companion
 
 internal object FeedbackManager {
@@ -73,12 +73,13 @@ internal object FeedbackManager {
                         TipToast.shortTip("请选择一个Case")
                         return
                     }
+
                     record.scope.launch {
                         val taskId = presenter.getBadCaseTaskId()
                         val listener = object : IMoGoAutopilotIdentifyListener {
                             override fun onAutopilotRecordResult(recordPanel: RecordPanelOuterClass.RecordPanel) {
                                 super.onAutopilotRecordResult(recordPanel)
-                                launch {
+                                record.scope.launch {
                                     val newRecord = recordPanel.toRecord()
                                     CallerLogger.d("${M_DEVA}${TAG}", "-- 收到工控机录制任务回调 -- $recordPanel")
                                     if (newRecord.type == 1 && newRecord.id == taskId) {
@@ -153,6 +154,7 @@ internal object FeedbackManager {
         },
             width = 960.PX,
             height = WindowManager.LayoutParams.MATCH_PARENT,
+            key = "FeedBackFloatWindow_",
             onOuterViewClicked = {
                 KeyboardUtils.hideSoftInput(it)
             }
@@ -160,13 +162,16 @@ internal object FeedbackManager {
     }
 
     private fun startRecordLog(record: AutoPilotRecord) {
+        val prefix = record.fileName?.split(File.separator)?.last()?.substringBeforeLast(".")?.let { "BadCase-$it" } ?: "BadCase-${SimpleDateFormat("yyyy-MM-dd-HH-mm-ss", Locale.getDefault()).format(Date())}"
         CallerLogger.d("${M_DEVA}${TAG}", "录制Bag开始, 触发录制全量日志 ...")
-        CallerDevaToolsManager.startCatchLog(1,record.fileName)
+        CallerLogger.d("${M_DEVA}${TAG}", "全量日志前缀: $prefix")
+        CallerDevaToolsManager.startCatchLog(1, prefix)
     }
 
     private fun stopRecordLog(newRecord: AutoPilotRecord) {
+        val prefix = newRecord.fileName?.split(File.separator)?.last()?.substringBeforeLast(".")?.let { "BadCase-$it" } ?: "BadCase-${SimpleDateFormat("yyyy-MM-dd-HH-mm-ss", Locale.getDefault()).format(Date())}"
         CallerLogger.d("${M_DEVA}${TAG}", "录制Bag完成, 触发结束录制全量日志 ...")
-        CallerDevaToolsManager.startCatchLog()
+        CallerDevaToolsManager.stopCatchLog(prefix)
     }
 
     private suspend fun upload(ctx: Context, badCase: BadCase, checked: Reason, record: AutoPilotRecord): Boolean {
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt
index f0c5c94477..6a761ab21c 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt
@@ -36,8 +36,8 @@ object MogoLogCatchManager : IMogoOnMessageListener<RemoteLogPushContent>, Handl
     ILogListener {
 
     private const val TAG = "MogoLogCatchManager"
-    private const val MANUAL_CATCH_PKG_NAME = "manual-catch-log"
     private const val MSG_TRY_CLOSE_LOG = 1001
+    private const val MSG_TRY_START_LOG = 1002
 
     private var mContext: Context? = null
 
@@ -81,47 +81,68 @@ object MogoLogCatchManager : IMogoOnMessageListener<RemoteLogPushContent>, Handl
     override fun onMsgReceived(obj: RemoteLogPushContent?) {
         obj?.let {
             CallerLogger.d("$M_DEVA$TAG", "收到push消息: $obj")
-            when (obj.type) {
-                START_CATCH_LOG -> if (!catchingList.contains(obj.pkgName)) {
-                    startCatchLog(obj)
-                }
-                STOP_CATCH_LOG -> stopCatchLog(obj)
-                LOCAL_CONFIG_OPEN_LOG -> openLoggerLevel()
-                LOCAL_CONFIG_CLOSE_LOG -> closeLoggerLevel()
-                else -> {
+            ThreadUtils.runOnUiThread {
+                obj.pkgName = mContext?.packageName
+                when (obj.type) {
+                    START_CATCH_LOG -> if (!catchingList.contains(obj.pkgName)) {
+                        TipToast.longTip("云端下发抓取日志，时间:${obj.duration}分钟")
+                        startCatchLog(obj.duration)
+                    }
+                    STOP_CATCH_LOG -> {
+                        TipToast.longTip("云端下发停止抓取日志")
+                        stopCatchLog(obj)
+                    }
+                    LOCAL_CONFIG_OPEN_LOG -> {
+                        TipToast.longTip("云端下发打开日志开关")
+                        openLoggerLevel()
+                    }
+                    LOCAL_CONFIG_CLOSE_LOG -> {
+                        TipToast.longTip("云端下发关闭日志开关")
+                        closeLoggerLevel()
+                    }
+                    else -> {
+                    }
                 }
             }
         }
     }
 
     override fun handleMessage(msg: Message): Boolean {
-        if (msg.what == MSG_TRY_CLOSE_LOG) {
-            CallerDevaToolsListenerManager.invokeDevaToolsLogCatchClose()
-            closeLoggerLevel()
-            return true
+        when(msg.what){
+            MSG_TRY_CLOSE_LOG -> {
+                CallerDevaToolsListenerManager.invokeDevaToolsLogCatchClose()
+                closeLoggerLevel()
+                return true
+            }
+            MSG_TRY_START_LOG -> {
+                CallerDevaToolsListenerManager.invokeDevaToolsLogCatchStart()
+                return true
+            }
         }
         return false
     }
 
     fun startCatchLog(duration: Int = 10, logPrefixName: String? = null) {
-        if (catchingList.contains(MANUAL_CATCH_PKG_NAME)) {
+        if (catchingList.contains(manualContent.pkgName + logPrefixName)) {
             TipToast.shortTip("已经在抓取日志了,请稍后再试")
         } else {
             CallerLogger.d("$M_DEVA$TAG", "开始抓取日志==== duration : $duration")
             manualContent.type = START_CATCH_LOG
             manualContent.duration = duration
+            CallerLogger.d("$M_DEVA$TAG", "manualContent : $manualContent")
             startCatchLog(manualContent, logPrefixName)
         }
     }
 
-    fun stopCatchLog() {
+    fun stopCatchLog(logPrefixName: String? = null) {
         CallerLogger.d("$M_DEVA$TAG", "结束抓取日志====")
         manualContent.type = STOP_CATCH_LOG
-        stopCatchLog(manualContent)
+        stopCatchLog(manualContent, logPrefixName)
     }
 
     private fun startCatchLog(content: RemoteLogPushContent, logPrefixName: String? = null) {
-        catchingList.add(content.pkgName)
+        CallerLogger.d("$M_DEVA$TAG", "startCatchLog path : ${content.pkgName + logPrefixName}")
+        catchingList.add(content.pkgName + logPrefixName)
         var delay = (content.duration).toLong()
         handler.removeMessages(MSG_TRY_CLOSE_LOG)
         if (delay <= 0) {
@@ -131,7 +152,6 @@ object MogoLogCatchManager : IMogoOnMessageListener<RemoteLogPushContent>, Handl
         handler.sendEmptyMessageDelayed(MSG_TRY_CLOSE_LOG, delay * 1000L * 60)
 
         openLoggerLevel()
-
         logInfoManager = LogInfoManagerFactory.createPushLogInfoManager(
             mContext,
             MoGoAiCloudClientConfig.getInstance().sn,
@@ -140,19 +160,23 @@ object MogoLogCatchManager : IMogoOnMessageListener<RemoteLogPushContent>, Handl
             content,
             this
         )
-
         logInfoManager?.start()
         logInfoManager?.registerLogOutListener { lineLog ->
             CallerDevaToolsListenerManager.invokeDevaToolsLogCatchLines(lineLog)
         }
+        handler.sendEmptyMessage(MSG_TRY_START_LOG)
 
         SharedPrefsMgr.getInstance(mContext!!).putBoolean(MoGoConfig.CATCH_LOG, true)
         SharedPrefsMgr.getInstance(mContext!!)
             .putLong(MoGoConfig.CATCH_LOG_TIME, System.currentTimeMillis())
     }
 
-    private fun stopCatchLog(content: RemoteLogPushContent) {
-        catchingList.remove(content.pkgName)
+    private fun stopCatchLog(content: RemoteLogPushContent, logPrefixName: String? = null) {
+        CallerLogger.d("$M_DEVA$TAG", "stopCatchLog path : ${content.pkgName + logPrefixName}")
+        if (!catchingList.contains(content.pkgName + logPrefixName)) {
+            return
+        }
+        catchingList.remove(content.pkgName + logPrefixName)
         if (catchingList.isEmpty()) {
             handler.removeMessages(MSG_TRY_CLOSE_LOG)
         }
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/scene/SceneManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/scene/SceneManager.kt
index 55205d11a9..5baadf1dc3 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/scene/SceneManager.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/scene/SceneManager.kt
@@ -45,7 +45,7 @@ class SceneManager {
     private var sceneModuleTAG: SceneModuleTAG = SceneModuleTAG(mutableMapOf())
     private var sceneLogTAG: SceneLogTAG = SceneLogTAG(mutableMapOf())
 
-    fun init() {
+    init {
         //过滤所需条件
         sceneModuleTAG.map[ADAS] = SceneModule(true, M_ADAS_IMPL)
         sceneModuleTAG.map[DEVA] = SceneModule(true, M_DEVA)
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt
index 23694c81a2..75c67d6cfa 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt
@@ -4,8 +4,8 @@ import android.content.Context
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
 import com.mogo.eagle.core.data.deva.chain.ChainConstant
 import com.mogo.eagle.core.data.deva.chain.ChainLogParam
-import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
+import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA
 import com.mogo.eagle.core.utilcode.util.DeviceUtils
 import com.mogo.eagle.core.utilcode.util.Utils
 import com.zhidao.loglib.fw.FileWriteManager
@@ -33,14 +33,27 @@ class TraceManager {
 
         // Trace过程中进行日志抓取，对日志进行配置
         fwBuildMap[ChainConstant.CHAIN_LINK_LOG_CONNECT_STATUS] =
-            FwBuild(true, pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_INIT, 5_000)
-        fwBuildMap[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_DATA] =
-            FwBuild(false, pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_MSG, 500)
+            FwBuild(true, pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_INIT)
+        fwBuildMap[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT] =
+            FwBuild(true, pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_AUTO)
+        fwBuildMap[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_DATA_TRACKED] =
+            FwBuild(false, pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_DATA_TRACK)
+        fwBuildMap[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_TRAJECTORY] =
+            FwBuild(false, pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_TRAJECTORY)
+        fwBuildMap[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_VEHICLE] =
+            FwBuild(false, pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_VEHICLE)
 
         traceInfoCache[ChainConstant.CHAIN_LINK_LOG_CONNECT_STATUS] =
             ChainLogParam(true, "ADAS连接状态")
-        traceInfoCache[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_DATA] =
-            ChainLogParam(false, "ADAS长链数据")
+        traceInfoCache[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT] =
+            ChainLogParam(true, "ADAS自动驾驶链路(包含: 定位,自动驾驶状态,全局路径,到站提醒,节点状态,异常上报)")
+        traceInfoCache[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_DATA_TRACKED] =
+            ChainLogParam(false, "ADAS感知物体")
+        traceInfoCache[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_TRAJECTORY] =
+            ChainLogParam(false, "ADAS车前引导线")
+        traceInfoCache[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_VEHICLE] =
+            ChainLogParam(false, "ADAS车辆底盘数据")
+
         FileWriteManager.getInstance()
             .init(context, MoGoAiCloudClientConfig.getInstance().sn, pkgName, fwBuildMap)
     }
@@ -51,10 +64,12 @@ class TraceManager {
 
     fun refreshTraceInfo(map: HashMap<Int, ChainLogParam>) {
         map.forEach { (type, param) ->
-            val fwBuild = this.fwBuildMap[type]
-            fwBuild?.let {
-                CallerLogger.d("$M_DEVA$TAG", "param : ${param.des} , record : ${param.record}")
-                it.isRecord = param.record
+            if(type != ChainConstant.CHAIN_LINK_LOG_CONNECT_STATUS){
+                val fwBuild = this.fwBuildMap[type]
+                fwBuild?.let {
+                    CallerLogger.d("$M_DEVA$TAG", "param : ${param.des} , record : ${param.record}")
+                    it.isRecord = param.record
+                }
             }
         }
         FileWriteManager.getInstance().operateChainMap(fwBuildMap)
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/WarningFloatWindowHelper.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/WarningFloatWindowHelper.kt
index 040628e086..8df1a947ee 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/WarningFloatWindowHelper.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/WarningFloatWindowHelper.kt
@@ -7,17 +7,15 @@ import android.app.Service
 import android.content.Context
 import android.graphics.PixelFormat
 import android.graphics.Rect
-import android.view.Gravity
-import android.view.LayoutInflater
-import android.view.View
-import android.view.WindowManager
-import com.mogo.eagle.core.function.hmi.notification.anim.AnimatorManager
+import android.view.*
 import com.mogo.eagle.core.data.enums.ShowPattern
+import com.mogo.eagle.core.function.hmi.notification.anim.AnimatorManager
 import com.mogo.eagle.core.function.hmi.notification.widget.ParentFrameLayout
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI
 import com.mogo.eagle.core.utilcode.util.WindowUtils
 
+
 /**
  * @author donghongyu
  * @date 2021/8/5 5:29 下午
@@ -89,12 +87,18 @@ internal class WarningFloatWindowHelper(
         frameLayout = ParentFrameLayout(context, config)
         frameLayout?.tag = config.floatTag
         // 将浮窗布局文件添加到父容器frameLayout中，并返回该浮窗文件
-        val floatingView = config.layoutView?.also { frameLayout?.addView(it) }
-                ?: LayoutInflater.from(context).inflate(config.layoutId!!, frameLayout, true)
+        val floatingView = config.layoutView?.also {
+            try {
+                val parent = (it.parent as ViewGroup)
+                parent.removeAllViews()
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+            frameLayout?.addView(it)
+        } ?: LayoutInflater.from(context).inflate(config.layoutId!!, frameLayout, true)
         // 为了避免创建的时候闪一下，我们先隐藏视图，不能直接设置GONE，否则定位会出现问题
         floatingView.visibility = View.INVISIBLE
         // 将frameLayout添加到系统windowManager中
-
         windowManager.addView(frameLayout, params)
 
         // 在浮窗绘制完成的时候，设置初始坐标、执行入场动画
@@ -216,12 +220,12 @@ internal class WarningFloatWindowHelper(
      * 退出动画执行结束/没有退出动画，进行回调、移除等操作
      */
     fun remove(force: Boolean = false) = try {
+        frameLayout?.removeAllViews()
         frameLayout?.removeCallbacks(closeWarningTask)
         config.isAnim = false
         WarningFloatWindowManager.remove(config.floatTag)
         // removeView是异步删除，在Activity销毁的时候会导致窗口泄漏，所以使用removeViewImmediate直接删除view
         windowManager.run {
-            frameLayout?.removeAllViews()
             if (force) {
                 removeViewImmediate(frameLayout)
             } else {
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
index 5ffa84b7e7..9b66fdfcb8 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
@@ -195,14 +195,23 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
         }
     }
 
+    /**
+     * 设置 V2X 通知 代理View
+     */
     override fun setProxyNotificationView(view: IViewNotification) {
         mViewNotification = view
     }
 
+    /**
+     * 设置 红绿灯 代理View
+     */
     override fun setProxyTrafficLightView(view: IViewTrafficLight) {
         mViewTrafficLight = view
     }
 
+    /**
+     * 设置 限速 代理View
+     */
     override fun setProxyLimitingSpeedView(view: IViewLimitingVelocity) {
         mViewLimitingVelocity = view
     }
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/ModifyBindingCarDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/ModifyBindingCarDialog.kt
index 12912d60fe..84f070921c 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/ModifyBindingCarDialog.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/ModifyBindingCarDialog.kt
@@ -1,6 +1,7 @@
 package com.mogo.eagle.core.function.hmi.ui.bindingcar
 
 import android.content.Context
+import android.util.Log
 import android.widget.TextView
 import androidx.lifecycle.LifecycleObserver
 import com.mogo.eagle.core.function.call.bindingcar.CallerBindingcarManager
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/ToBindingCarDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/ToBindingCarDialog.kt
index db27456c94..6d38ac8373 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/ToBindingCarDialog.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/ToBindingCarDialog.kt
@@ -46,7 +46,7 @@ class ToBindingCarDialog(context: Context) : BaseFloatDialog(context), Lifecycle
     }
 
     /**
-     * 修改绑定车机 TODO
+     * 修改绑定车机
      */
     fun toBindingcar() {
         CallerBindingcarManager.getBindingcarProvider().modifyCarInfo {
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
index 0b58988782..419160c5aa 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
@@ -20,7 +20,6 @@ import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.constants.MoGoConfig
 import com.mogo.eagle.core.data.deva.chain.ChainConstant
 import com.mogo.eagle.core.data.deva.scene.SceneModule
-import com.mogo.eagle.core.data.deva.scene.SceneTAG
 import com.mogo.eagle.core.data.enums.TrafficTypeEnum
 import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.data.obu.ObuStatusInfo
@@ -97,18 +96,25 @@ class DebugSettingView @JvmOverloads constructor(
 
     //当前PAD支持的CPU架构
     private var cpuList = "CPU架构："
+
     //日志过滤标签集合
-    private val sceneMap = mutableMapOf< String, SceneModule>()
+    private val sceneMap = mutableMapOf<String, SceneModule>()
 
     private var dockerRebootDialog: DockerRebootDialog? = null  //docker重启对话框
-    private var adUpgradeDialog : AdUpgradeDialog? = null //工控机升级对话框
-    private var upgradeMode: Int=-1 //升级模式
-    private var downloadStatus: Int=-1 //下载状态
-    private var currentProgress: Int=-1 //当前已下载包体大小
-    private var previousProgress: Int=-1 //前一秒的下载进度，用于计算下载剩余时间
-    private var totalProgress: Int=-1 //包体总大小
-    private var downloadVersion: String?=null //工控机docker版本
-    private var upgradeStatus: Int=-1 //升级状态
+    private var adUpgradeDialog: AdUpgradeDialog? = null //工控机升级对话框
+    private var upgradeMode: Int = -1 //升级模式
+    private var downloadStatus: Int = -1 //下载状态
+    private var currentProgress: Int = -1 //当前已下载包体大小
+    private var previousProgress: Int = -1 //前一秒的下载进度，用于计算下载剩余时间
+    private var totalProgress: Int = -1 //包体总大小
+    private var downloadVersion: String? = null //工控机docker版本
+    private var upgradeStatus: Int = -1 //升级状态
+
+    //ADAS连接状态
+    private var adasConnectStatus: Boolean = false
+
+    //OBU连接状态
+    private var obuConnectStatus: Boolean = false
 
     private val mapUiController by lazy {
         CallerMapUIServiceManager.getMapUIController()
@@ -181,23 +187,23 @@ class DebugSettingView @JvmOverloads constructor(
     }
 
     private fun initView() {
-        val iconDown = ContextCompat.getDrawable(context,R.drawable.icon_down)
-        iconDown?.setBounds(0,0,iconDown.minimumWidth,iconDown.minimumHeight)
-        val iconRight = ContextCompat.getDrawable(context,R.drawable.icon_right)
-        iconRight?.setBounds(0,0,iconRight.minimumWidth,iconRight.minimumHeight)
+        val iconDown = ContextCompat.getDrawable(context, R.drawable.icon_down)
+        iconDown?.setBounds(0, 0, iconDown.minimumWidth, iconDown.minimumHeight)
+        val iconRight = ContextCompat.getDrawable(context, R.drawable.icon_right)
+        iconRight?.setBounds(0, 0, iconRight.minimumWidth, iconRight.minimumHeight)
 
         /**
          * 设备绑定关系
          */
         tbDeviceBind.setOnCheckedChangeListener { buttonView, isChecked ->
-            if(isChecked){
-                buttonView.setCompoundDrawables(null,null,iconDown,null)
+            if (isChecked) {
+                buttonView.setCompoundDrawables(null, null, iconDown, null)
                 //展示隐藏设备绑定关系视图
-                deviceBindLayout.visibility =View.VISIBLE
-            }else{
-                buttonView.setCompoundDrawables(null,null,iconRight,null)
+                deviceBindLayout.visibility = View.VISIBLE
+            } else {
+                buttonView.setCompoundDrawables(null, null, iconRight, null)
                 //默认隐藏设备绑定关系视图
-                deviceBindLayout.visibility =View.GONE
+                deviceBindLayout.visibility = View.GONE
             }
         }
 
@@ -205,12 +211,12 @@ class DebugSettingView @JvmOverloads constructor(
          * 版本信息
          */
         tbAppVersionInfo.setOnCheckedChangeListener { buttonView, isChecked ->
-            if(isChecked){
-                buttonView.setCompoundDrawables(null,null,iconDown,null)
+            if (isChecked) {
+                buttonView.setCompoundDrawables(null, null, iconDown, null)
                 //展示版本信息
                 appVersionInfoLayout.visibility = View.VISIBLE
-            }else{
-                buttonView.setCompoundDrawables(null,null,iconRight,null)
+            } else {
+                buttonView.setCompoundDrawables(null, null, iconRight, null)
                 //隐藏版本信息
                 appVersionInfoLayout.visibility = View.GONE
             }
@@ -219,48 +225,60 @@ class DebugSettingView @JvmOverloads constructor(
          * 状态中心
          */
         tbStatusCenter.setOnCheckedChangeListener { buttonView, isChecked ->
-            if(isChecked){
-                buttonView.setCompoundDrawables(null,null,iconDown,null)
+            if (isChecked) {
+                buttonView.setCompoundDrawables(null, null, iconDown, null)
                 //展示状态中心
                 statusCenterLayout.visibility = View.VISIBLE
-            }else{
-                buttonView.setCompoundDrawables(null,null,iconRight,null)
+            } else {
+                buttonView.setCompoundDrawables(null, null, iconRight, null)
                 //隐藏状态中心
                 statusCenterLayout.visibility = View.GONE
             }
         }
 
 
-        for(element in DeviceUtils.getABIs()){
+        for (element in DeviceUtils.getABIs()) {
             cpuList = "$cpuList$element   "
         }
-        tvCPUFrameworkInfo.text =cpuList
+        tvCPUFrameworkInfo.text = cpuList
 
         /**
          * 控制中心
          */
         tbControlCenter.setOnCheckedChangeListener { buttonView, isChecked ->
-            if(isChecked){
-                buttonView.setCompoundDrawables(null,null,iconDown,null)
+            if (isChecked) {
+                buttonView.setCompoundDrawables(null, null, iconDown, null)
                 //展示控制中心
                 controlCenterLayout.visibility = View.VISIBLE
-            }else{
-                buttonView.setCompoundDrawables(null,null,iconRight,null)
+            } else {
+                buttonView.setCompoundDrawables(null, null, iconRight, null)
                 //隐藏控制中心
                 controlCenterLayout.visibility = View.GONE
             }
         }
 
+        tbEagleEyeController.setOnCheckedChangeListener { buttonView, isChecked ->
+            if(isChecked){
+                buttonView.setCompoundDrawables(null, null, iconDown, null)
+                //展示参数配置
+                eagleEyeControllerLayout.visibility = View.VISIBLE
+            }else{
+                buttonView.setCompoundDrawables(null, null, iconRight, null)
+                //隐藏参数配置
+                eagleEyeControllerLayout.visibility = View.GONE
+            }
+        }
+
         /**
          * 域控制器
          */
         tbDomainController.setOnCheckedChangeListener { buttonView, isChecked ->
-            if(isChecked){
-                buttonView.setCompoundDrawables(null,null,iconDown,null)
+            if (isChecked) {
+                buttonView.setCompoundDrawables(null, null, iconDown, null)
                 //展示域控制器
                 domainControllerLayout.visibility = View.VISIBLE
-            }else{
-                buttonView.setCompoundDrawables(null,null,iconRight,null)
+            } else {
+                buttonView.setCompoundDrawables(null, null, iconRight, null)
                 //隐藏域控制器
                 domainControllerLayout.visibility = View.GONE
             }
@@ -270,13 +288,13 @@ class DebugSettingView @JvmOverloads constructor(
          * OBU控制中心
          */
         tbObuController.setOnCheckedChangeListener { buttonView, isChecked ->
-            if(isChecked){
-                buttonView.setCompoundDrawables(null,null,iconDown,null)
+            if (isChecked) {
+                buttonView.setCompoundDrawables(null, null, iconDown, null)
                 //展示OBU控制中心
                 obuControllerLayout.visibility = View.VISIBLE
 
-            }else{
-                buttonView.setCompoundDrawables(null,null,iconRight,null)
+            } else {
+                buttonView.setCompoundDrawables(null, null, iconRight, null)
                 //隐藏OBU控制中心
                 obuControllerLayout.visibility = View.GONE
             }
@@ -286,12 +304,12 @@ class DebugSettingView @JvmOverloads constructor(
          * HMI控制中心
          */
         tbHmiController.setOnCheckedChangeListener { buttonView, isChecked ->
-            if(isChecked){
-                buttonView.setCompoundDrawables(null,null,iconDown,null)
+            if (isChecked) {
+                buttonView.setCompoundDrawables(null, null, iconDown, null)
                 //展示HMI控制中心
                 hmiControllerLayout.visibility = View.VISIBLE
-            }else{
-                buttonView.setCompoundDrawables(null,null,iconRight,null)
+            } else {
+                buttonView.setCompoundDrawables(null, null, iconRight, null)
                 //隐藏HMI控制中心
                 hmiControllerLayout.visibility = View.GONE
             }
@@ -301,12 +319,12 @@ class DebugSettingView @JvmOverloads constructor(
          * 高精地图控制中心
          */
         tbHdMapController.setOnCheckedChangeListener { buttonView, isChecked ->
-            if(isChecked){
-                buttonView.setCompoundDrawables(null,null,iconDown,null)
+            if (isChecked) {
+                buttonView.setCompoundDrawables(null, null, iconDown, null)
                 //展示高精地图控制中心
                 hdMapControllerLayout.visibility = View.VISIBLE
-            }else{
-                buttonView.setCompoundDrawables(null,null,iconRight,null)
+            } else {
+                buttonView.setCompoundDrawables(null, null, iconRight, null)
                 //隐藏高精地图控制中心
                 hdMapControllerLayout.visibility = View.GONE
             }
@@ -316,12 +334,12 @@ class DebugSettingView @JvmOverloads constructor(
          * 日志中心
          */
         tbLogcatCenter.setOnCheckedChangeListener { buttonView, isChecked ->
-            if(isChecked){
-                buttonView.setCompoundDrawables(null,null,iconDown,null)
+            if (isChecked) {
+                buttonView.setCompoundDrawables(null, null, iconDown, null)
                 //展示日志中心
                 logcatCenterLayout.visibility = View.VISIBLE
-            }else{
-                buttonView.setCompoundDrawables(null,null,iconRight,null)
+            } else {
+                buttonView.setCompoundDrawables(null, null, iconRight, null)
                 //隐藏日志中心
                 logcatCenterLayout.visibility = View.GONE
             }
@@ -369,9 +387,6 @@ class DebugSettingView @JvmOverloads constructor(
         }
 
 
-
-
-
         /**
          * 修改自车按钮（出租车、小巴车）
          */
@@ -385,6 +400,8 @@ class DebugSettingView @JvmOverloads constructor(
             }
         }
 
+        //设置鹰眼本地参数配置监听
+        setEagleEyeConfigListener()
         //域控制器中心事件点击监听
         setDomainControllerCheckedChangeListener()
         //Hmi控制中心事件点击监听
@@ -392,9 +409,6 @@ class DebugSettingView @JvmOverloads constructor(
         //日志中心事件点击监听
         setLogCheckedChangeListener()
 
-
-
-
         //OBU配置信息
         tvObuInfo.text = CallerObuListenerManager.getObuStatusInfoJsonString()
 
@@ -474,7 +488,6 @@ class DebugSettingView @JvmOverloads constructor(
         }
 
 
-
         // 初始化 ADAS感知数据是否绘制 选择情况
         tbIsDrawIdentifyData.isChecked = FunctionBuildConfig.isDrawIdentifyData
         tbIsDrawIdentifyData.setOnCheckedChangeListener { buttonView, isChecked ->
@@ -501,10 +514,43 @@ class DebugSettingView @JvmOverloads constructor(
 
     }
 
+    /**
+     * 设置鹰眼本地参数配置监听
+     */
+    private fun setEagleEyeConfigListener(){
+        //初始化刹车加速度阈值信息
+        val brakeThreshold = SharedPrefsMgr.getInstance(context)
+            .getFloat(MoGoConfig.BRAKE_ACCELERATION_THRESHOLD,-2.5F)
+        etInputBrakeThreshold.setText(brakeThreshold.toString())
+        etInputBrakeThreshold.text?.let { etInputBrakeThreshold.setSelection(brakeThreshold.toString().length) }
+        //设置刹车加速度阈值信息
+        btnBrakeThreshold.setOnClickListener {
+            val thresholdStr = etInputBrakeThreshold.text.toString()
+            if(thresholdStr.isNullOrEmpty()){
+                ToastUtils.showShort("请输入正确的判定刹车加速度阈值")
+            }else{
+                try{
+                    val thresholdStrFloat = thresholdStr.toFloat()
+                    if(thresholdStrFloat<0){
+                        SharedPrefsMgr.getInstance(context).putFloat(MoGoConfig.BRAKE_ACCELERATION_THRESHOLD,thresholdStrFloat)
+                        ToastUtils.showShort("刹车阈值设置成功")
+                    }else{
+                        ToastUtils.showShort("刹车阈值加速度值应小于0")
+                    }
+                }catch (e: Exception){
+                    ToastUtils.showShort("判定刹车加速度阈值格式设置不正确")
+                }
+
+
+
+            }
+        }
+    }
+
     /**
      * 设置域控制器点击监听
      */
-    private fun setDomainControllerCheckedChangeListener(){
+    private fun setDomainControllerCheckedChangeListener() {
 
         // 初始化工控机 IP信息
         val autoPilotIpAddress =
@@ -523,21 +569,25 @@ class DebugSettingView @JvmOverloads constructor(
             }
         }
 
+        //断开与工控机的连接
+        btnDisconnectIpc.setOnClickListener {
+            CallerAutoPilotManager.disconnectIpc()
+        }
 
         updateSpeedSettingViews()
 
         /**
          * 设置最大速度
          */
-        btnSetAutopilotSpeed.onClick{
-            if(AppConfigInfo.isConnectAutopilot){
+        btnSetAutopilotSpeed.onClick {
+            if (AppConfigInfo.isConnectAutopilot) {
                 val speedStr = etInputSpeed.text?.toString()
                 try {
-                    if(speedStr.isNullOrEmpty()){
+                    if (speedStr.isNullOrEmpty()) {
                         ToastUtils.showShort("请输入最大车速")
                     }
                     val speed = speedStr?.toInt()
-                    if(speed!=null && speed>0 && speed<60){
+                    if (speed != null && speed > 0 && speed < 60) {
                         // 设置自动驾驶速度
                         val isSuccess = CallerAutoPilotManager.setAutoPilotSpeed(speed)
                         when {
@@ -548,13 +598,13 @@ class DebugSettingView @JvmOverloads constructor(
                                 ToastUtils.showShort("设置车速失败，请启动域控制器")
                             }
                         }
-                    }else{
+                    } else {
                         ToastUtils.showShort("最大车速应大于0且小于60")
                     }
-                }catch (e: Exception){
+                } catch (e: Exception) {
                     ToastUtils.showShort("车速设置失败，请正确设置车速")
                 }
-            }else{
+            } else {
                 ToastUtils.showShort("设置车速失败，请启动域控制器")
             }
         }
@@ -562,19 +612,19 @@ class DebugSettingView @JvmOverloads constructor(
         /**
          * 录制Bag包
          */
-        btnRecordPackage.onClick{
+        btnRecordPackage.onClick {
             val recordTimeStr = etInputRecordTime.text?.toString()
-            try{
-                if(recordTimeStr.isNullOrEmpty()){
+            try {
+                if (recordTimeStr.isNullOrEmpty()) {
                     CallerAutoPilotManager.recordPackage()
                 }
                 val recordTime = recordTimeStr?.toInt()
-                if(recordTime!=null && recordTime>0){
+                if (recordTime != null && recordTime > 0) {
                     CallerAutoPilotManager.recordPackage(recordTime)
-                }else{
+                } else {
                     CallerAutoPilotManager.recordPackage()
                 }
-            }catch (e: Exception){
+            } catch (e: Exception) {
                 CallerAutoPilotManager.recordPackage()
             }
         }
@@ -582,30 +632,43 @@ class DebugSettingView @JvmOverloads constructor(
         /**
          * 工控机升级
          */
-        btnSystemUpgrade.onClick{
-            if(AppConfigInfo.isConnectAutopilot){
-                Logger.i(TAG,"upgradeMode="+upgradeMode+" downloadStatus="+downloadStatus+" upgradeStatus="+upgradeStatus)
-                if(AdUpgradeStateHelper.isDownloading(downloadStatus)){
+        btnSystemUpgrade.onClick {
+            if (AppConfigInfo.isConnectAutopilot) {
+                Logger.i(
+                    TAG,
+                    "upgradeMode=" + upgradeMode + " downloadStatus=" + downloadStatus + " upgradeStatus=" + upgradeStatus
+                )
+                if (AdUpgradeStateHelper.isDownloading(downloadStatus)) {
                     //点击Toast提示：下载剩余时间
-                    ToastUtils.showShort("预计"+AdUpgradeStateHelper.getRemainingTime(totalProgress,previousProgress,currentProgress)+"下载完成")
-                }else if(AdUpgradeStateHelper.getUpgradeStatus()){
+                    ToastUtils.showShort(
+                        "预计" + AdUpgradeStateHelper.getRemainingTime(
+                            totalProgress,
+                            previousProgress,
+                            currentProgress
+                        ) + "下载完成"
+                    )
+                } else if (AdUpgradeStateHelper.getUpgradeStatus()) {
                     //工控机状态为“升级中”
                     ToastUtils.showShort("新版本升级中，预计5分钟升级完成")
-                }else if(AdUpgradeStateHelper.isUpgradeFailed(upgradeStatus)){
+                } else if (AdUpgradeStateHelper.isUpgradeFailed(upgradeStatus)) {
                     //如果升级失败，则Toast提示：升级失败，请联系运维人员
                     ToastUtils.showShort("升级失败，请联系运维人员")
-                }else if(AdUpgradeStateHelper.isHintUpgradeMode(upgradeMode) && AdUpgradeStateHelper.isDownloadFinish(downloadStatus,upgradeStatus)){
+                } else if (AdUpgradeStateHelper.isHintUpgradeMode(upgradeMode) && AdUpgradeStateHelper.isDownloadFinish(
+                        downloadStatus,
+                        upgradeStatus
+                    )
+                ) {
                     //如果升级模式为“提示升级”，并且下载状态为已经下载完成，点击弹出升级确认弹窗
-                    if(adUpgradeDialog == null){
+                    if (adUpgradeDialog == null) {
                         adUpgradeDialog = AdUpgradeDialog(context)
-                        adUpgradeDialog?.setClickListener(object : AdUpgradeDialog.ClickListener{
+                        adUpgradeDialog?.setClickListener(object : AdUpgradeDialog.ClickListener {
                             override fun confirm() {
-                                if(mAutoPilotStatusInfo?.state==2){
+                                if (mAutoPilotStatusInfo?.state == 2) {
                                     //当前处于自动驾驶状态，不可进行升级，Toast提示
                                     ToastUtils.showShort("升级前请先退出自动驾驶模式")
-                                }else{
+                                } else {
                                     //确认升级
-                                    Logger.i(TAG,"upgrade confirm")
+                                    Logger.i(TAG, "upgrade confirm")
                                     //设置当前状态为“升级中”
                                     AdUpgradeStateHelper.setUpgradeStatus(true)
                                     CallerAutoPilotManager.setIPCUpgradeAffirm()
@@ -614,7 +677,7 @@ class DebugSettingView @JvmOverloads constructor(
 
                             override fun cancel() {
                                 //取消升级
-                                Logger.i(TAG,"upgrade cancel")
+                                Logger.i(TAG, "upgrade cancel")
                                 //取消升级命令不下发
 //                            CallerAutoPilotManager.setIPCUpgradeCancel()
                             }
@@ -622,10 +685,10 @@ class DebugSettingView @JvmOverloads constructor(
                         })
                     }
                     adUpgradeDialog?.showUpgradeDialog()
-                }else{
+                } else {
                     ToastUtils.showShort("当前工控机处于最新版本状态，不可升级")
                 }
-            }else{
+            } else {
                 ToastUtils.showShort("域控制器未连接")
             }
 
@@ -635,34 +698,38 @@ class DebugSettingView @JvmOverloads constructor(
         /**
          * 重启系统
          */
-        btnSystemRestart.onClick{
-            if(AppConfigInfo.isConnectAutopilot){
-                if(dockerRebootDialog == null){
+        btnSystemRestart.onClick {
+            if (AppConfigInfo.isConnectAutopilot) {
+                if (dockerRebootDialog == null) {
                     dockerRebootDialog = DockerRebootDialog(context)
-                    dockerRebootDialog?.setClickListener(object : DockerRebootDialog.ClickListener{
+                    dockerRebootDialog?.setClickListener(object : DockerRebootDialog.ClickListener {
                         override fun confirm() {
-                            if(mAutoPilotStatusInfo?.state==2){
+                            if (mAutoPilotStatusInfo?.state == 2) {
                                 //当前处于自动驾驶状态，不可进行重启，Toast提示
                                 ToastUtils.showShort("请先退出自动驾驶状态")
-                            }else if(AdUpgradeStateHelper.showCannotReboot(downloadStatus, upgradeStatus)){
+                            } else if (AdUpgradeStateHelper.showCannotReboot(
+                                    downloadStatus,
+                                    upgradeStatus
+                                )
+                            ) {
                                 //当工控机处于下载或者升级状态，需要先进行升级
                                 ToastUtils.showShort("请先完成新自动驾驶系统的下载/升级")
-                            } else{
+                            } else {
                                 //确认重启
-                                Logger.i(TAG,"reboot confirm")
+                                Logger.i(TAG, "reboot confirm")
                                 CallerAutoPilotManager.setIPCReboot()
                             }
                         }
 
                         override fun cancel() {
                             //取消重启
-                            Logger.i(TAG,"reboot cancel")
+                            Logger.i(TAG, "reboot cancel")
                         }
 
                     })
                 }
                 dockerRebootDialog?.showUpgradeDialog()
-            }else{
+            } else {
                 ToastUtils.showShort("域控制器未连接")
             }
 
@@ -696,21 +763,23 @@ class DebugSettingView @JvmOverloads constructor(
      * @param downloadVersion 下载版本
      * @param upgradeStatus 升级状态
      */
-    fun setAdUpgradeInfo(upgradeMode: Int,downloadStatus: Int,currentProgress: Int,totalProgress: Int,
-                         downloadVersion: String,upgradeStatus: Int){
-        this.upgradeMode=upgradeMode
-        this.downloadStatus=downloadStatus
-        this.previousProgress=this.currentProgress
-        this.currentProgress=currentProgress
-        this.totalProgress=totalProgress
-        this.downloadVersion=downloadVersion
-        this.upgradeStatus=upgradeStatus
+    fun setAdUpgradeInfo(
+        upgradeMode: Int, downloadStatus: Int, currentProgress: Int, totalProgress: Int,
+        downloadVersion: String, upgradeStatus: Int
+    ) {
+        this.upgradeMode = upgradeMode
+        this.downloadStatus = downloadStatus
+        this.previousProgress = this.currentProgress
+        this.currentProgress = currentProgress
+        this.totalProgress = totalProgress
+        this.downloadVersion = downloadVersion
+        this.upgradeStatus = upgradeStatus
     }
 
     /**
      * 设置Hmi点击监听
      */
-    private fun setHmiCheckedChangeListener(){
+    private fun setHmiCheckedChangeListener() {
         /**
          * 显示、隐藏迈速表
          */
@@ -793,7 +862,40 @@ class DebugSettingView @JvmOverloads constructor(
     /**
      * 设置日志点击监听
      */
-    private fun setLogCheckedChangeListener(){
+    private fun setLogCheckedChangeListener() {
+        //初始化标签选中状态
+        val tagMap = CallerDevaToolsManager.getModuleTAG()
+        tagMap?.let {
+            it.iterator().forEach { map ->
+                val name = map.value.name
+                val log = map.value.log
+                when (name) {
+                    ////ADAS日志标签
+                    SceneConstant.M_ADAS_IMPL -> cbAdasLog.isChecked = log
+                    //OBU日志标签
+                    SceneConstant.M_OBU -> cbObuLog.isChecked = log
+                    //HMI日志标签
+                    SceneConstant.M_HMI -> cbHmiLog.isChecked = log
+                    //V2X日志标签
+                    SceneConstant.M_V2X -> cbV2xLog.isChecked = log
+                    //地图日志标签
+                    SceneConstant.M_MAP -> cbMapLog.isChecked = log
+                    //DEVA日志标签
+                    SceneConstant.M_DEVA -> cbDevaLog.isChecked = log
+                    //网络模块日志标签
+                    SceneConstant.M_NETWORK -> cbNetworkLog.isChecked = log
+                    //ROUTE日志标签
+                    SceneConstant.M_OLD_ROUTE -> cbOldRouteLog.isChecked = log
+                    //BUS日志标签
+                    SceneConstant.M_BUS -> cbBusLog.isChecked = log
+                    //TAXI日志标签
+                    SceneConstant.M_TAXI -> cbTaxiLog.isChecked = log
+                    //TAXI_P日志标签
+                    SceneConstant.M_TAXI_P -> cbTaxiPLog.isChecked = log
+                }
+            }
+        }
+
         /**
          * 打开、关闭鹰眼Log
          */
@@ -821,40 +923,72 @@ class DebugSettingView @JvmOverloads constructor(
         }
 
 
-
         //ADAS日志标签
         cbAdasLog.setOnCheckedChangeListener { _, isChecked ->
-            val adasModule = SceneModule(isChecked,SceneConstant.M_ADAS_IMPL)
+            val adasModule = SceneModule(isChecked, SceneConstant.M_ADAS_IMPL)
             sceneMap[SceneConstant.M_ADAS_IMPL] = adasModule
             CallerDevaToolsManager.updateModuleTAG(sceneMap)
         }
         //OBU日志标签
         cbObuLog.setOnCheckedChangeListener { _, isChecked ->
-            val obuModule = SceneModule(isChecked,SceneConstant.M_OBU)
+            val obuModule = SceneModule(isChecked, SceneConstant.M_OBU)
             sceneMap[SceneConstant.M_OBU] = obuModule
             CallerDevaToolsManager.updateModuleTAG(sceneMap)
         }
         //HMI日志标签
         cbHmiLog.setOnCheckedChangeListener { _, isChecked ->
-            val hmiModule = SceneModule(isChecked,SceneConstant.M_HMI)
+            val hmiModule = SceneModule(isChecked, SceneConstant.M_HMI)
             sceneMap[SceneConstant.M_HMI] = hmiModule
             CallerDevaToolsManager.updateModuleTAG(sceneMap)
         }
         //V2X日志标签
         cbV2xLog.setOnCheckedChangeListener { _, isChecked ->
-            val v2xModule = SceneModule(isChecked,SceneConstant.M_V2X)
+            val v2xModule = SceneModule(isChecked, SceneConstant.M_V2X)
             sceneMap[SceneConstant.M_V2X] = v2xModule
             CallerDevaToolsManager.updateModuleTAG(sceneMap)
         }
         //地图日志标签
         cbMapLog.setOnCheckedChangeListener { _, isChecked ->
-            val mapModule = SceneModule(isChecked,SceneConstant.M_MAP)
+            val mapModule = SceneModule(isChecked, SceneConstant.M_MAP)
             sceneMap[SceneConstant.M_MAP] = mapModule
             CallerDevaToolsManager.updateModuleTAG(sceneMap)
         }
-
-
-
+        //DEVA日志标签
+        cbDevaLog.setOnCheckedChangeListener { _, isChecked ->
+            val devaModule = SceneModule(isChecked, SceneConstant.M_DEVA)
+            sceneMap[SceneConstant.M_DEVA] = devaModule
+            CallerDevaToolsManager.updateModuleTAG(sceneMap)
+        }
+        //网络模块日志标签
+        cbNetworkLog.setOnCheckedChangeListener { _, isChecked ->
+            val networkModule = SceneModule(isChecked, SceneConstant.M_NETWORK)
+            sceneMap[SceneConstant.M_NETWORK] = networkModule
+            CallerDevaToolsManager.updateModuleTAG(sceneMap)
+        }
+        //ROUTE日志标签
+        cbOldRouteLog.setOnCheckedChangeListener { _, isChecked ->
+            val oldRouteModule = SceneModule(isChecked, SceneConstant.M_OLD_ROUTE)
+            sceneMap[SceneConstant.M_OLD_ROUTE] = oldRouteModule
+            CallerDevaToolsManager.updateModuleTAG(sceneMap)
+        }
+        //BUS日志标签
+        cbBusLog.setOnCheckedChangeListener { _, isChecked ->
+            val busModule = SceneModule(isChecked, SceneConstant.M_BUS)
+            sceneMap[SceneConstant.M_BUS] = busModule
+            CallerDevaToolsManager.updateModuleTAG(sceneMap)
+        }
+        //TAXI日志标签
+        cbTaxiLog.setOnCheckedChangeListener { _, isChecked ->
+            val taxiModule = SceneModule(isChecked, SceneConstant.M_TAXI)
+            sceneMap[SceneConstant.M_TAXI] = taxiModule
+            CallerDevaToolsManager.updateModuleTAG(sceneMap)
+        }
+        //TAXI_P日志标签
+        cbTaxiPLog.setOnCheckedChangeListener { _, isChecked ->
+            val taxiPModule = SceneModule(isChecked, SceneConstant.M_TAXI_P)
+            sceneMap[SceneConstant.M_TAXI_P] = taxiPModule
+            CallerDevaToolsManager.updateModuleTAG(sceneMap)
+        }
 
         //开始停止抓取全量日志
         tbLogCatch.isChecked =
@@ -862,7 +996,7 @@ class DebugSettingView @JvmOverloads constructor(
         tbLogCatch.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 var logTimeStr = etLogCatch.text?.toString()
-                if(logTimeStr.isNullOrEmpty()){
+                if (logTimeStr.isNullOrEmpty()) {
                     logTimeStr = "10"
                 }
                 val logCatchTime = logTimeStr.toInt()
@@ -878,6 +1012,11 @@ class DebugSettingView @JvmOverloads constructor(
         }
         CallerDevaToolsListenerManager.registerDevaToolsLogCatchListener(TAG,
             object : IMoGoDevaToolsListener {
+                override fun onLogCatchStart() {
+                    super.onLogCatchStart()
+                    tbLogCatch.isChecked = true
+                }
+
                 override fun onLogCatchClose() {
                     super.onLogCatchClose()
                     tbLogCatch.isChecked = false
@@ -896,7 +1035,7 @@ class DebugSettingView @JvmOverloads constructor(
                 }
 
                 override fun upgradeVersionUrls(urls: Map<String, String>?) {
-                    //todo 版本信息更新
+
                 }
             })
 
@@ -923,16 +1062,73 @@ class DebugSettingView @JvmOverloads constructor(
             }
         }
 
+        val traceInfoMap =  CallerDevaToolsManager.getTraceInfo()
+        val autopilot = traceInfoMap[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT]
+        autopilot?.let{
+            cbAdasAutoPilot.isChecked = it.record
+        }
+        val dataTrack = traceInfoMap[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_DATA_TRACKED]
+        dataTrack?.let {
+            cbAdasDataTrack.isChecked = it.record
+        }
+        val trajectory = traceInfoMap[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_TRAJECTORY]
+        trajectory?.let {
+            cbAdasTrajectory.isChecked = it.record
+        }
+        val vehicle = traceInfoMap[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_VEHICLE]
+        vehicle?.let {
+            cbAdasVehicle.isChecked = it.record
+        }
+
         /**
-         * ADAS长链数据
+         * ADAS自动驾驶链路
          */
-        cbAdasChainLog.setOnCheckedChangeListener { _, isChecked ->
-            val traceInfoMap = CallerDevaToolsManager.getTraceInfo()
-            val chainLogParam = traceInfoMap[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_DATA]
-            chainLogParam?.let {
+        cbAdasAutoPilot.setOnCheckedChangeListener { _, isChecked ->
+            val map = CallerDevaToolsManager.getTraceInfo()
+            val param = map[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT]
+            param?.let {
                 it.record = isChecked
-                traceInfoMap[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_DATA] = chainLogParam
-                CallerDevaToolsManager.refreshTraceInfo(traceInfoMap)
+                map[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT] = param
+                CallerDevaToolsManager.refreshTraceInfo(map)
+            }
+        }
+
+        /**
+         * ADAS感知物体
+         */
+        cbAdasDataTrack.setOnCheckedChangeListener { _, isChecked ->
+            val map = CallerDevaToolsManager.getTraceInfo()
+            val param = map[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_DATA_TRACKED]
+            param?.let {
+                it.record = isChecked
+                map[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_DATA_TRACKED] = param
+                CallerDevaToolsManager.refreshTraceInfo(map)
+            }
+        }
+
+        /**
+         * ADAS前车引导线
+         */
+        cbAdasTrajectory.setOnCheckedChangeListener { _, isChecked ->
+            val map = CallerDevaToolsManager.getTraceInfo()
+            val param = map[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_TRAJECTORY]
+            param?.let {
+                it.record = isChecked
+                map[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_TRAJECTORY] = param
+                CallerDevaToolsManager.refreshTraceInfo(map)
+            }
+        }
+
+        /**
+         * ADAS车辆地盘数据
+         */
+        cbAdasVehicle.setOnCheckedChangeListener { _, isChecked ->
+            val map = CallerDevaToolsManager.getTraceInfo()
+            val param = map[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_VEHICLE]
+            param?.let {
+                it.record = isChecked
+                map[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_VEHICLE] = param
+                CallerDevaToolsManager.refreshTraceInfo(map)
             }
         }
     }
@@ -965,7 +1161,8 @@ class DebugSettingView @JvmOverloads constructor(
             AppConfigInfo.uniqueDeviceId = DeviceIdUtils.getDeviceId(AbsMogoApplication.getApp())
         }
         if (AppConfigInfo.widevineIDMd5.isNullOrEmpty()) {
-            AppConfigInfo.widevineIDMd5 = DeviceIdUtils.getWidevineIDWithMd5(AbsMogoApplication.getApp())
+            AppConfigInfo.widevineIDMd5 =
+                DeviceIdUtils.getWidevineIDWithMd5(AbsMogoApplication.getApp())
         }
         AppConfigInfo.mogoSN = MoGoAiCloudClient.getInstance().aiCloudClientConfig.sn
         AppConfigInfo.mogoToken = MoGoAiCloudClient.getInstance().aiCloudClientConfig.token
@@ -1003,7 +1200,9 @@ class DebugSettingView @JvmOverloads constructor(
         tvObuAppInfo.text = "OBU程序版本：${CallerObuListenerManager.getObuStatusInfo().appInfo}"
         tvObuHliInfo.text = "OBU协议版本：${CallerObuListenerManager.getObuStatusInfo().hliInfo}"
         tvObuSdkVersion.text = "OBU-SDK版本：${AppConfigInfo.obuSdkVersion}"
-        tvAutopilotVersionInfo.text = "Autopilot版本：${AppConfigInfo.adasSdkVersion}"
+        tvAutopilotProtocolVersionInfo.text =
+            "Autopilot协议版本：${CallerAutoPilotManager.getProtocolVersion()}"
+        tvIpcProtocolVersionInfo.text = "工控机协议版本：${AppConfigInfo.protocolVersionNumber}"
         tvMoGoMapVersion.text = "HD-Map版本：${MogoMap.getInstance().mogoMap.mapVersion}"
         tvGitBranchInfo.text = "Git分支：${AppConfigInfo.workingBranchName}"
         tvGitHashInfo.text = "Git-Hash：${AppConfigInfo.workingBranchHash}"
@@ -1029,82 +1228,94 @@ class DebugSettingView @JvmOverloads constructor(
             }
         }"
 
-        tvInternetEnvironment.text =Html.fromHtml("当前网络环境：${
-            if(NetworkUtils.isConnected(context)){
-                if(NetworkUtils.isConnectedMobile(context)){
-                    //已连接移动数据
-                    "移动数据"
-                }else{
-                    //WiFi
-                    CommonUtils.getWifiName(context)
+        tvInternetEnvironment.text = Html.fromHtml(
+            "当前网络环境：${
+                if (NetworkUtils.isConnected(context)) {
+                    if (NetworkUtils.isConnectedMobile(context)) {
+                        //已连接移动数据
+                        "移动数据"
+                    } else {
+                        //WiFi
+                        CommonUtils.getWifiName(context)
+                    }
+
+                } else {
+                    //未连接任何网络
+                    "<font color='red'>异常"
                 }
-
-            }else{
-                //未连接任何网络
-                "<font color='red'>异常"
-            }
-        }")
+            }"
+        )
 
 
-        tvServerSocketStatus.text = Html.fromHtml("服务器Socket状态：${
-            if(DebugConfig.isDownloadSnapshot()){
-                "<font color='blue'>正常"
-            }else{
-                "<font color='red'>异常"
-            }
-        }")
-
-        tvAutopilotConnectStatus.text =Html.fromHtml("Autopilot系统连接状态：${
-            if(AppConfigInfo.isConnectAutopilot){
-                "<font color='blue'>正常"
-            }else{
-                "<font color='red'>异常"
-            }
-        }")
-
-        tvObuConnectStatus.text =Html.fromHtml("OBU连接状态：${
-            if(AppConfigInfo.isConnectObu){
-                "<font color='blue'>正常"
-            }else{
-                "<font color='red'>异常"
-            }
-        }")
-
-        tvDriverServerStartupStatus.text = Html.fromHtml("${
-            when {
-                AppConfigInfo.isDriver -> {
-                    "司机端Server启动"
+        tvServerSocketStatus.text = Html.fromHtml(
+            "服务器Socket状态：${
+                if (DebugConfig.isDownloadSnapshot()) {
+                    "<font color='blue'>正常"
+                } else {
+                    "<font color='red'>异常"
                 }
-                else -> {
-                    "乘客端${
-                        when {
-                            AppConfigInfo.serverIp.isNotEmpty() -> "(目标ip为:${AppConfigInfo.serverIp})"
-                            else -> ""
-                        }
-                    }连接"
-                }
-            }
-        }是否正常：${
-            if (AppConfigInfo.isConnectedNetty) {
-                "<font color='blue'>正常"
-            } else {
-                "<font color='red'>异常"
-            }
-        }")
+            }"
+        )
 
-        tvLocationEnabled.text =Html.fromHtml("定位服务开启状态：${
-            if(DeviceUtils.isLocationEnabled()){
-                "<font color='blue'>正常"
-            }else{
-                "<font color='red'>异常"
-            }
-        }")
+        tvAutopilotConnectStatus.text = Html.fromHtml(
+            "Autopilot系统连接状态：${
+                if (AppConfigInfo.isConnectAutopilot) {
+                    "<font color='blue'>正常"
+                } else {
+                    "<font color='red'>异常"
+                }
+            }"
+        )
+
+        tvObuConnectStatus.text = Html.fromHtml(
+            "OBU连接状态：${
+                if (AppConfigInfo.isConnectObu) {
+                    "<font color='blue'>正常"
+                } else {
+                    "<font color='red'>异常"
+                }
+            }"
+        )
+
+        tvDriverServerStartupStatus.text = Html.fromHtml(
+            "${
+                when {
+                    AppConfigInfo.isDriver -> {
+                        "司机端Server启动"
+                    }
+                    else -> {
+                        "乘客端${
+                            when {
+                                AppConfigInfo.serverIp.isNotEmpty() -> "(目标ip为:${AppConfigInfo.serverIp})"
+                                else -> ""
+                            }
+                        }连接"
+                    }
+                }
+            }是否正常：${
+                if (AppConfigInfo.isConnectedNetty) {
+                    "<font color='blue'>正常"
+                } else {
+                    "<font color='red'>异常"
+                }
+            }"
+        )
+
+        tvLocationEnabled.text = Html.fromHtml(
+            "定位服务开启状态：${
+                if (DeviceUtils.isLocationEnabled()) {
+                    "<font color='blue'>正常"
+                } else {
+                    "<font color='red'>异常"
+                }
+            }"
+        )
 
 
         tvAutopilotInfo.text = GsonUtils.toJson(mAutoPilotStatusInfo)
 
         tvCarInfo.text =
-            "GPS时间：${mGnssInfo?.satelliteTime}\n" +
+            "GPS时间：${(mGnssInfo?.satelliteTime?.times(1000))?.toLong()}\n" +
                     "自车经纬度：\n${mGnssInfo?.longitude}\n${mGnssInfo?.latitude}\n"
 
         tvIdentifyInfo.text =
@@ -1116,7 +1327,6 @@ class DebugSettingView @JvmOverloads constructor(
             "全局路径规划点个数：${mRouteInfoSize}"
 
 
-
         // 用完之后重制为0，防止节点回掉突然没数据，导致页面显示还是之前的数据情况
         mIdentifyDataSize = 0
         mUnknownIdentifyDataSize = 0
@@ -1132,6 +1342,15 @@ class DebugSettingView @JvmOverloads constructor(
 
         AppConfigInfo.obuSdkVersion = obuStatusInfo.obuSdkVersion
         AppConfigInfo.isConnectObu = obuStatusInfo.obuStatus
+
+        if (obuStatusInfo.obuStatus) {
+            obuConnectStatus = true
+        }
+        //OBU断开连接，提示异常
+        if (obuConnectStatus && !obuStatusInfo.obuStatus) {
+            obuConnectStatus = false
+            toastMsg("OBU连接状态异常")
+        }
     }
 
     /**
@@ -1139,14 +1358,21 @@ class DebugSettingView @JvmOverloads constructor(
      */
     override fun onAutopilotStatusResponse(autoPilotStatusInfo: AutopilotStatusInfo) {
         mAutoPilotStatusInfo = autoPilotStatusInfo
-
-        AppConfigInfo.adasSdkVersion = autoPilotStatusInfo.version
         AppConfigInfo.isConnectAutopilot = autoPilotStatusInfo.connectStatus
 
-        if(AppConfigInfo.isConnectAutopilot && (AppConfigInfo.plateNumber.isNullOrEmpty() || AppConfigInfo.iPCMacAddress.isNullOrEmpty())){
+        if (AppConfigInfo.isConnectAutopilot && (AppConfigInfo.plateNumber.isNullOrEmpty() || AppConfigInfo.iPCMacAddress.isNullOrEmpty())) {
             //查询工控机基础配置信息
             CallerAutoPilotManager.getCarConfig()
         }
+
+        if (autoPilotStatusInfo.connectStatus) {
+            adasConnectStatus = true
+        }
+        //ADAS断开连接，提示异常
+        if (adasConnectStatus && !autoPilotStatusInfo.connectStatus) {
+            adasConnectStatus = false
+            toastMsg("Autopilot系统连接状态异常")
+        }
     }
 
     override fun onAutopilotCarStateData(gnssInfo: MessagePad.GnssInfo?) {
@@ -1181,8 +1407,9 @@ class DebugSettingView @JvmOverloads constructor(
      */
     override fun onAutopilotCarConfig(carConfigResp: MessagePad.CarConfigResp) {
         carConfigResp?.let {
-            AppConfigInfo.plateNumber = it.plateNumber
-            AppConfigInfo.iPCMacAddress = it.macAddress
+            AppConfigInfo.plateNumber = it.plateNumber//车牌号
+            AppConfigInfo.iPCMacAddress = it.macAddress//工控机MAC地址
+            AppConfigInfo.protocolVersionNumber = it.protocolVersion.number//工控机协议版本
         }
 
     }
@@ -1191,27 +1418,30 @@ class DebugSettingView @JvmOverloads constructor(
      * 工控机异常回调
      */
     override fun onAutopilotGuardian(guardianInfo: MogoReportMsg.MogoReportMessage?) {
-        ThreadUtils.runOnUiThread{
+        ThreadUtils.runOnUiThread {
             guardianInfo?.let {
                 reportMsgLayout.visibility = View.VISIBLE
                 tvReportSrc.text = "src:${it.src}"
                 tvReportLevel.text = "level:${it.level}"
                 tvReportMsg.text = "msg:${it.msg}"
                 tvReportCode.text = "code:${it.code}"
-                var resultStr="result:"
-                for(result in it.resultList){
+                var resultStr = "result:"
+                for (result in it.resultList) {
                     resultStr = "$resultStr$result  "
                 }
                 tvReportResult.text = resultStr
 
-                var actionStr="action:"
-                for(action in it.actionsList){
+                var actionStr = "action:"
+                for (action in it.actionsList) {
                     actionStr = "$actionStr$action  "
                 }
                 tvReportActions.text = actionStr
 
+                tvReportSec.text = "sec:${it.timestamp.sec}"
+                tvReportNSec.text = "nsec:${it.timestamp.nsec}"
 
-                if("error".equals(it.level)){
+
+                if ("error" == it.level) {
                     //字体为红色,吐司提示
                     tvReportSrc.setTextColor(Color.RED)
                     tvReportLevel.setTextColor(Color.RED)
@@ -1219,14 +1449,18 @@ class DebugSettingView @JvmOverloads constructor(
                     tvReportCode.setTextColor(Color.RED)
                     tvReportResult.setTextColor(Color.RED)
                     tvReportActions.setTextColor(Color.RED)
-                    ToastUtils.showShort(it.msg)
-                }else{
+                    tvReportSec.setTextColor(Color.RED)
+                    tvReportNSec.setTextColor(Color.RED)
+                    toastMsg(it.msg)
+                } else {
                     tvReportSrc.setTextColor(Color.BLACK)
                     tvReportLevel.setTextColor(Color.BLACK)
                     tvReportMsg.setTextColor(Color.BLACK)
                     tvReportCode.setTextColor(Color.BLACK)
                     tvReportResult.setTextColor(Color.BLACK)
                     tvReportActions.setTextColor(Color.BLACK)
+                    tvReportSec.setTextColor(Color.BLACK)
+                    tvReportNSec.setTextColor(Color.BLACK)
                 }
             }
         }
@@ -1243,4 +1477,14 @@ class DebugSettingView @JvmOverloads constructor(
         tvObuDelay.text = "obu时延：" + delayTime.toString()
     }
 
+    /**
+     * 吐司提示
+     */
+    private fun toastMsg(msg: String) {
+        //当处于美化（演示）模式、msg为空时不弹吐司
+        if (!FunctionBuildConfig.isDemoMode && msg.isNotEmpty()) {
+            ToastUtils.showLong(msg)
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt
index 99f5b52ca4..74d7a2f745 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt
@@ -120,6 +120,7 @@ class AutoPilotAndCheckView @JvmOverloads constructor(
             }
         }
         updateSpeedSettingViews()
+        CallerAutoPilotManager.getCarConfig()
 //        // 比如需要设置默认速度
 //        val speed = "30"
 //        etInputSpeed.setText(speed)
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/turnlight/BrakeViewStatus.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/turnlight/BrakeViewStatus.kt
index a5c9f77a40..5324d03e61 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/turnlight/BrakeViewStatus.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/turnlight/BrakeViewStatus.kt
@@ -39,6 +39,7 @@ class BrakeViewStatus @JvmOverloads constructor(
     fun setBrakeLight(brakeLight: Int) {
         if (brakeLight == 1) { //刹车灯亮
             if (!isBrake) {
+                isBrake = true
                 GlobalScope.launch(Dispatchers.Main) {
                     var appearAnimation = AlphaAnimation(0f, 1f)
                     appearAnimation.duration = 300
@@ -48,7 +49,6 @@ class BrakeViewStatus @JvmOverloads constructor(
                     layout_brake.visibility = View.VISIBLE
                     image_brake.visibility = View.VISIBLE
                     tv_brake.visibility = View.VISIBLE
-                    isBrake = true
                 }
             }
         } else { //不踩刹车，就消失
@@ -56,7 +56,6 @@ class BrakeViewStatus @JvmOverloads constructor(
                 isBrake = false
                 GlobalScope.launch(Dispatchers.Main) {
                     scaleImageAndTv()
-
                     var disappearAnimation = AlphaAnimation(1f, 0f)
                     disappearAnimation.duration = 1200
                     layout_brake.startAnimation(disappearAnimation)
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/turnlight/TurnLightViewStatus.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/turnlight/TurnLightViewStatus.kt
index 222aad6344..394e463161 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/turnlight/TurnLightViewStatus.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/turnlight/TurnLightViewStatus.kt
@@ -2,6 +2,7 @@ package com.mogo.eagle.core.function.hmi.ui.turnlight
 
 import android.content.Context
 import android.util.AttributeSet
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.animation.AlphaAnimation
@@ -46,10 +47,10 @@ class TurnLightViewStatus @JvmOverloads constructor(
      */
     fun setTurnLight(directionLight: Int) {
         if (!isShowNormalBg && (directionLight == 1 || directionLight == 2)) {
+            isShowNormalBg = true
             GlobalScope.launch(Dispatchers.Main) {
                 showNormalAnimation()
             }
-            isShowNormalBg = true
         }
 
         if (directionLight == 1 || directionLight == 2) {
@@ -62,41 +63,43 @@ class TurnLightViewStatus @JvmOverloads constructor(
         //根据左右进行显示和隐藏，实际要判断每个来的时间和频度
         if (directionLight == 1) { //左转向
             if (!isLeftLight) {
+                isLeftLight = true
+                isRightLight = false
+                isDisappare = false
                 GlobalScope.launch(Dispatchers.Main) {
                     left_select_image.visibility = View.VISIBLE
                     right_select_image.visibility = View.GONE
                     right_select_image.clearAnimation()
                     setAnimation(left_select_image)
                 }
-                isLeftLight = true
-                isRightLight = false
-                isDisappare = false
+
             }
         } else if (directionLight == 2) { //右转向
             if (!isRightLight) {
+                isRightLight = true
+                isLeftLight = false
+                isDisappare = false
                 GlobalScope.launch(Dispatchers.Main) {
                     left_select_image.visibility = View.GONE
                     right_select_image.visibility = View.VISIBLE
                     left_select_image.clearAnimation()
                     setAnimation(right_select_image)
                 }
-                isRightLight = true
-                isLeftLight = false
-                isDisappare = false
             }
 
         } else { //消失
-            CallerVisualAngleManager.changeVisualAngle(Default())
-            isVisualAngleChanged = false
+            if (isVisualAngleChanged) {
+                isVisualAngleChanged = false
+                CallerVisualAngleManager.changeVisualAngle(Default())
+            }
             if (!isDisappare) {
-                GlobalScope.launch(Dispatchers.Main) {
-                    animationDisappear()
-                }
                 isDisappare = true
                 isShowNormalBg = false
                 isLeftLight = false
                 isRightLight = false
-                isDisappare = false
+                GlobalScope.launch(Dispatchers.Main) {
+                    animationDisappear()
+                }
             }
         }
     }
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt
index 59af18a473..72374b2774 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt
@@ -65,7 +65,7 @@ class SpeedPanelView @JvmOverloads constructor(
         override fun run() {
             if (mLatLng != null) {
                 mSpeedLimmit = MogoMapUIController.getInstance()
-                    .getSpeedLimmit(mLatLng!!.longitude, mLatLng!!.latitude, mLatLng!!.bearing)
+                    .getLimitSpeed(mLatLng!!.longitude, mLatLng!!.latitude, mLatLng!!.bearing)
                 UiThreadHandler.post {
                     val speed = (mLatLng!!.speed * 3.6f).toInt()
                     mSpeedChartView.setArcColor(Color.parseColor(if (speed > mSpeedLimmit) "#DB3137" else "#3E77F6"))
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/setting_toggle_button_background.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/setting_toggle_button_background.xml
new file mode 100644
index 0000000000..f977e253e9
--- /dev/null
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/setting_toggle_button_background.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@android:color/transparent" />
+    <stroke
+        android:width="2px"
+        android:color="#0000FF" />
+    <padding
+        android:bottom="1px"
+        android:left="1px"
+        android:right="1px"
+        android:top="1px" />
+
+    <corners android:topRightRadius="4dp" android:bottomRightRadius="4dp" />
+</shape>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml
index 33fb48ffc0..4cb2702ebb 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml
@@ -53,6 +53,18 @@
         app:layout_constraintTop_toBottomOf="@+id/viewSpeedChart"
         app:layout_goneMarginStart="@dimen/module_mogo_autopilot_status_margin_left" />
 
+
+    <ImageView
+        android:id="@+id/ivCameraIcon"
+        android:layout_width="130px"
+        android:layout_height="130px"
+        android:layout_marginTop="38px"
+        android:layout_marginEnd="40px"
+        android:background="@drawable/icon_camera_nor"
+        app:layout_constraintEnd_toStartOf="@id/viewTrafficLightVr"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="visible" />
+
     <com.mogo.eagle.core.function.hmi.ui.widget.TrafficLightView
         android:id="@+id/viewTrafficLightVr"
         android:layout_width="wrap_content"
@@ -66,14 +78,6 @@
         tools:visibility="visible" />
 
 
-    <!--    <com.mogo.eagle.core.function.hmi.ui.widget.SpeedLimitStatusView-->
-    <!--        android:id="@+id/viewSpeedLimitStatusView"-->
-    <!--        android:layout_width="130px"-->
-    <!--        android:layout_height="130px"-->
-    <!--        app:layout_constraintEnd_toEndOf="@+id/viewTrafficLightVr"-->
-    <!--        app:layout_constraintTop_toBottomOf="@+id/viewTrafficLightVr"-->
-    <!--        tools:ignore="MissingConstraints"/>-->
-
     <com.mogo.eagle.core.function.hmi.ui.widget.PerspectiveSwitchView
         android:id="@+id/viewPerspectiveSwitch"
         android:layout_width="wrap_content"
@@ -97,49 +101,38 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@+id/viewPerspectiveSwitch"
         app:layout_goneMarginStart="50px" />
-    
+
     <ImageView
         android:id="@+id/vsBadCaseToolsView"
         android:layout_width="@dimen/module_hmi_check_size"
         android:layout_height="@dimen/module_hmi_check_size"
         android:layout_marginStart="25px"
         android:layout_marginBottom="40px"
-        android:visibility="gone"
         android:background="@drawable/icon_car_ap_badcase_entrance"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@+id/ivToolsIcon"
-        app:layout_goneMarginStart="50px"/>
+        app:layout_goneMarginStart="50px" />
 
     <View
         android:id="@+id/viewUpgradeTips"
         android:layout_width="22px"
         android:layout_height="22px"
-        app:layout_constraintCircle="@id/ivToolsIcon"
-        app:layout_constraintCircleAngle="45"
-        app:layout_constraintCircleRadius="60px"
-        tools:ignore="MissingConstraints"
         android:background="@drawable/version_upgrade_tips_background"
         android:translationZ="30px"
         android:visibility="gone"
-        />
+        app:layout_constraintCircle="@id/ivToolsIcon"
+        app:layout_constraintCircleAngle="45"
+        app:layout_constraintCircleRadius="60px"
+        tools:ignore="MissingConstraints" />
 
 
-    <ImageView
-        android:id="@+id/ivCameraIcon"
-        android:layout_width="130px"
-        android:layout_height="130px"
-        android:layout_marginTop="38px"
-        android:layout_marginEnd="40px"
-        android:background="@drawable/icon_camera_nor"
-        app:layout_constraintEnd_toStartOf="@id/viewTrafficLightVr"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:visibility="visible" />
-
     <com.mogo.eagle.core.function.hmi.ui.widget.LimitingVelocityView
         android:id="@+id/viewLimitingVelocity"
         android:layout_width="130px"
         android:layout_height="130px"
         android:layout_marginTop="30px"
+        android:layout_marginEnd="40px"
         android:background="@drawable/bg_waring_limiting_velocity"
         android:elevation="@dimen/dp_10"
         android:gravity="center"
@@ -149,7 +142,6 @@
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/ivCameraIcon"
-        android:layout_marginEnd="40px"
         app:layout_goneMarginEnd="40px"
         app:layout_goneMarginTop="40px"
         tools:visibility="visible" />
@@ -159,23 +151,23 @@
         android:id="@+id/turnLightView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginTop="42px"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        android:layout_marginTop="42px" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <!--刹车ui-->
     <com.mogo.eagle.core.function.hmi.ui.turnlight.BrakeViewStatus
         android:id="@+id/brakeView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginTop="42px"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        android:layout_marginTop="42px" />
+        app:layout_constraintTop_toTopOf="parent" />
 
-<!--    app:layout_constraintBottom_toBottomOf="parent"-->
-<!--    app:layout_constraintEnd_toEndOf="parent"-->
-<!--    app:layout_constraintStart_toStartOf="parent"-->
+    <!--    app:layout_constraintBottom_toBottomOf="parent"-->
+    <!--    app:layout_constraintEnd_toEndOf="parent"-->
+    <!--    app:layout_constraintStart_toStartOf="parent"-->
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
index 512efa5bde..b0c4f8f304 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
@@ -11,9 +11,8 @@
         android:id="@+id/reportMsgLayout"
         android:layout_width="match_parent"
         android:layout_height="@dimen/dp_350"
-        app:layout_constraintBottom_toBottomOf="parent"
         android:visibility="gone"
-        >
+        app:layout_constraintBottom_toBottomOf="parent">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -22,114 +21,96 @@
 
             <View
                 android:layout_width="match_parent"
-                android:layout_height="3dp"
-                android:background="#F0F0F0"
-                />
+                android:layout_height="6dp"
+                android:background="#F0F0F0" />
 
             <TextView
                 android:id="@+id/tvReportSrc"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
                 style="@style/DebugSettingText"
-                />
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
 
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:background="#F0F0F0"
-                />
+                android:background="#F0F0F0" />
 
             <TextView
                 android:id="@+id/tvReportLevel"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
                 style="@style/DebugSettingText"
-                />
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
 
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:background="#F0F0F0"
-                />
+                android:background="#F0F0F0" />
 
             <TextView
                 android:id="@+id/tvReportMsg"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
                 style="@style/DebugSettingText"
-                />
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
 
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:background="#F0F0F0"
-                />
+                android:background="#F0F0F0" />
 
             <TextView
                 android:id="@+id/tvReportCode"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
                 style="@style/DebugSettingText"
-                />
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
 
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:background="#F0F0F0"
-                />
+                android:background="#F0F0F0" />
 
             <TextView
                 android:id="@+id/tvReportResult"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
                 style="@style/DebugSettingText"
-                />
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
 
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:background="#F0F0F0"
-                />
+                android:background="#F0F0F0" />
 
             <TextView
                 android:id="@+id/tvReportActions"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
                 style="@style/DebugSettingText"
-                />
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
 
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:background="#F0F0F0"
-                />
+                android:background="#F0F0F0" />
 
             <TextView
                 android:id="@+id/tvReportSec"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
                 style="@style/DebugSettingText"
-                />
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
 
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:background="#F0F0F0"
-                />
+                android:background="#F0F0F0" />
 
             <TextView
                 android:id="@+id/tvReportNSec"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
                 style="@style/DebugSettingText"
-                />
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
 
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:background="#F0F0F0"
-                />
-
+                android:background="#F0F0F0" />
 
 
         </LinearLayout>
@@ -141,9 +122,8 @@
         android:id="@+id/svLayout"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toTopOf="@id/reportMsgLayout"
-        >
+        app:layout_constraintTop_toTopOf="parent">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -154,13 +134,12 @@
                 android:id="@+id/tbDeviceBind"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textOff="设备绑定关系"
-                android:textOn="设备绑定关系"
+                android:layout_margin="@dimen/dp_10"
                 android:background="@drawable/radio_button_normal_background_right"
                 android:drawableEnd="@drawable/icon_right"
                 android:padding="@dimen/dp_20"
-                android:layout_margin="@dimen/dp_10"
-                />
+                android:textOff="设备绑定关系"
+                android:textOn="设备绑定关系" />
 
             <LinearLayout
                 android:id="@+id/deviceBindLayout"
@@ -171,68 +150,58 @@
 
                 <TextView
                     android:id="@+id/tvPadSn"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
                     style="@style/DebugSettingText"
-                    />
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
 
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
-                    android:background="#F0F0F0"
-                    />
+                    android:background="#F0F0F0" />
 
                 <TextView
                     android:id="@+id/tvPadCopyrightId"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
                     style="@style/DebugSettingText"
-                    />
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
 
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
-                    android:background="#F0F0F0"
-                    />
+                    android:background="#F0F0F0" />
 
                 <TextView
                     android:id="@+id/tvIPCMac"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
                     style="@style/DebugSettingText"
-                    />
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
 
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
-                    android:background="#F0F0F0"
-                    />
+                    android:background="#F0F0F0" />
 
                 <TextView
                     android:id="@+id/tvUniqueDeviceId"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
                     style="@style/DebugSettingText"
-                    />
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
 
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
-                    android:background="#F0F0F0"
-                    />
+                    android:background="#F0F0F0" />
 
                 <TextView
                     android:id="@+id/tvPlateNumber"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
                     style="@style/DebugSettingText"
-                    />
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
 
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
-                    android:background="#F0F0F0"
-                    />
+                    android:background="#F0F0F0" />
 
             </LinearLayout>
 
@@ -240,13 +209,12 @@
                 android:id="@+id/tbAppVersionInfo"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textOff="版本信息"
-                android:textOn="版本信息"
+                android:layout_margin="@dimen/dp_10"
                 android:background="@drawable/radio_button_normal_background_right"
                 android:drawableEnd="@drawable/icon_right"
                 android:padding="@dimen/dp_20"
-                android:layout_margin="@dimen/dp_10"
-                />
+                android:textOff="版本信息"
+                android:textOn="版本信息" />
 
             <LinearLayout
                 android:id="@+id/appVersionInfoLayout"
@@ -257,146 +225,135 @@
 
                 <TextView
                     android:id="@+id/tvAppVersionName"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
                     style="@style/DebugSettingText"
-                    />
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
 
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
-                    android:background="#F0F0F0"
-                    />
+                    android:background="#F0F0F0" />
 
                 <TextView
                     android:id="@+id/tvAppVersionCode"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
                     style="@style/DebugSettingText"
-                    />
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
 
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
-                    android:background="#F0F0F0"
-                    />
+                    android:background="#F0F0F0" />
 
                 <TextView
                     android:id="@+id/tvObuAppInfo"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
                     style="@style/DebugSettingText"
-                    />
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
 
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
-                    android:background="#F0F0F0"
-                    />
+                    android:background="#F0F0F0" />
 
                 <TextView
                     android:id="@+id/tvObuHliInfo"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
                     style="@style/DebugSettingText"
-                    />
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
 
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
-                    android:background="#F0F0F0"
-                    />
+                    android:background="#F0F0F0" />
 
                 <TextView
                     android:id="@+id/tvObuSdkVersion"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
                     style="@style/DebugSettingText"
-                    />
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
 
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
-                    android:background="#F0F0F0"
-                    />
+                    android:background="#F0F0F0" />
 
                 <TextView
-                    android:id="@+id/tvAutopilotVersionInfo"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:id="@+id/tvAutopilotProtocolVersionInfo"
                     style="@style/DebugSettingText"
-                    />
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
 
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
-                    android:background="#F0F0F0"
-                    />
+                    android:background="#F0F0F0" />
+
+                <TextView
+                    android:id="@+id/tvIpcProtocolVersionInfo"
+                    style="@style/DebugSettingText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="#F0F0F0" />
 
                 <TextView
                     android:id="@+id/tvMoGoMapVersion"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
                     style="@style/DebugSettingText"
-                    />
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
 
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
-                    android:background="#F0F0F0"
-                    />
+                    android:background="#F0F0F0" />
 
                 <TextView
                     android:id="@+id/tvGitBranchInfo"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
                     style="@style/DebugSettingText"
-                    />
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
 
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
-                    android:background="#F0F0F0"
-                    />
+                    android:background="#F0F0F0" />
 
                 <TextView
                     android:id="@+id/tvGitHashInfo"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
                     style="@style/DebugSettingText"
-                    />
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
 
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
-                    android:background="#F0F0F0"
-                    />
+                    android:background="#F0F0F0" />
 
                 <TextView
                     android:id="@+id/tvAndroidSystemVersion"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
                     style="@style/DebugSettingText"
-                    />
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
 
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
-                    android:background="#F0F0F0"
-                    />
+                    android:background="#F0F0F0" />
 
                 <TextView
                     android:id="@+id/tvCPUFrameworkInfo"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
                     style="@style/DebugSettingText"
-                    />
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
 
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
-                    android:background="#F0F0F0"
-                    />
+                    android:background="#F0F0F0" />
 
             </LinearLayout>
 
@@ -404,13 +361,12 @@
                 android:id="@+id/tbStatusCenter"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textOff="状态中心"
-                android:textOn="状态中心"
+                android:layout_margin="@dimen/dp_10"
                 android:background="@drawable/radio_button_normal_background_right"
                 android:drawableEnd="@drawable/icon_right"
                 android:padding="@dimen/dp_20"
-                android:layout_margin="@dimen/dp_10"
-                />
+                android:textOff="状态中心"
+                android:textOn="状态中心" />
 
             <LinearLayout
                 android:id="@+id/statusCenterLayout"
@@ -421,94 +377,80 @@
 
                 <TextView
                     android:id="@+id/tvServerEnvironment"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
                     style="@style/DebugSettingText"
-                    />
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
 
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
-                    android:background="#F0F0F0"
-                    />
+                    android:background="#F0F0F0" />
 
                 <TextView
                     android:id="@+id/tvInternetEnvironment"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
                     style="@style/DebugSettingText"
-                    />
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
 
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
-                    android:background="#F0F0F0"
-                    />
+                    android:background="#F0F0F0" />
 
                 <TextView
                     android:id="@+id/tvServerSocketStatus"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
                     style="@style/DebugSettingText"
-                    />
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
 
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
-                    android:background="#F0F0F0"
-                    />
+                    android:background="#F0F0F0" />
 
                 <TextView
                     android:id="@+id/tvAutopilotConnectStatus"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
                     style="@style/DebugSettingText"
-                    />
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
 
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
-                    android:background="#F0F0F0"
-                    />
+                    android:background="#F0F0F0" />
 
                 <TextView
                     android:id="@+id/tvObuConnectStatus"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
                     style="@style/DebugSettingText"
-                    />
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
 
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
-                    android:background="#F0F0F0"
-                    />
+                    android:background="#F0F0F0" />
 
                 <TextView
                     android:id="@+id/tvDriverServerStartupStatus"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
                     style="@style/DebugSettingText"
-                    />
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
 
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
-                    android:background="#F0F0F0"
-                    />
+                    android:background="#F0F0F0" />
 
                 <TextView
                     android:id="@+id/tvLocationEnabled"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
                     style="@style/DebugSettingText"
-                    />
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
 
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
-                    android:background="#F0F0F0"
-                    />
+                    android:background="#F0F0F0" />
 
             </LinearLayout>
 
@@ -516,33 +458,99 @@
                 android:id="@+id/tbControlCenter"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textOff="控制中心"
-                android:textOn="控制中心"
+                android:layout_margin="@dimen/dp_10"
                 android:background="@drawable/radio_button_normal_background_right"
                 android:drawableEnd="@drawable/icon_right"
                 android:padding="@dimen/dp_20"
-                android:layout_margin="@dimen/dp_10"
-                />
+                android:textOff="控制中心"
+                android:textOn="控制中心" />
 
             <LinearLayout
                 android:id="@+id/controlCenterLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:visibility="gone"
-                >
+                android:visibility="gone">
+
+                <ToggleButton
+                    android:id="@+id/tbEagleEyeController"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="@dimen/dp_10"
+                    android:background="@drawable/setting_toggle_button_background"
+                    android:drawableEnd="@drawable/icon_right"
+                    android:padding="@dimen/dp_20"
+                    android:textOff="鹰眼参数配置"
+                    android:textOn="鹰眼参数配置" />
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/eagleEyeControllerLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone">
+
+                    <Button
+                        android:id="@+id/btnBrakeThreshold"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        android:padding="@dimen/dp_5"
+                        android:text="设置刹车加速度阈值"
+                        android:textSize="@dimen/dp_24"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        android:paddingStart="@dimen/dp_20"
+                        android:paddingEnd="@dimen/dp_20"
+                        />
+
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:layout_width="0dp"
+                        android:layout_height="0dp"
+                        android:layout_marginStart="@dimen/dp_30"
+                        android:layout_marginTop="@dimen/dp_10"
+                        android:layout_marginEnd="@dimen/dp_30"
+                        android:layout_marginBottom="@dimen/dp_10"
+                        android:background="@drawable/debug_setting_edit_bg"
+                        android:focusable="true"
+                        android:focusableInTouchMode="true"
+                        android:orientation="horizontal"
+                        app:layout_constraintBottom_toBottomOf="@id/btnBrakeThreshold"
+                        app:layout_constraintLeft_toRightOf="@id/btnBrakeThreshold"
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toTopOf="@id/btnBrakeThreshold">
+
+                        <androidx.appcompat.widget.AppCompatEditText
+                            android:id="@+id/etInputBrakeThreshold"
+                            style="@style/DebugSettingText"
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:layout_marginStart="90px"
+                            android:layout_weight="1"
+                            android:background="@null"
+                            android:gravity="center"
+                            tools:ignore="SpeakableTextPresentCheck" />
+
+                        <TextView
+                            style="@style/DebugSettingText"
+                            android:layout_width="93px"
+                            android:layout_height="match_parent"
+                            android:gravity="center_vertical"
+                            android:text="m/s²" />
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
 
                 <ToggleButton
                     android:id="@+id/tbDomainController"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:textOff="域控制器"
-                    android:textOn="域控制器"
-                    android:background="@drawable/radio_button_normal_background_right"
+                    android:layout_margin="@dimen/dp_10"
+                    android:background="@drawable/setting_toggle_button_background"
                     android:drawableEnd="@drawable/icon_right"
                     android:padding="@dimen/dp_20"
-                    android:layout_margin="@dimen/dp_10"
-                    />
+                    android:textOff="域控制器"
+                    android:textOn="域控制器" />
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/domainControllerLayout"
@@ -552,19 +560,18 @@
 
                     <TextView
                         android:id="@+id/tvAutopilotInfo"
+                        style="@style/DebugSettingText"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        style="@style/DebugSettingText"
-                        app:layout_constraintTop_toTopOf="parent"
-                        />
+                        android:minLines="6"
+                        app:layout_constraintTop_toTopOf="parent" />
 
                     <View
                         android:id="@+id/autopilotInfoDivider"
                         android:layout_width="match_parent"
                         android:layout_height="1dp"
                         android:background="#F0F0F0"
-                        app:layout_constraintTop_toBottomOf="@id/tvAutopilotInfo"
-                        />
+                        app:layout_constraintTop_toBottomOf="@id/tvAutopilotInfo" />
 
                     <Button
                         android:id="@+id/btnSetAutopilotIP"
@@ -575,84 +582,92 @@
                         android:text="重置IP"
                         android:textSize="@dimen/dp_24"
                         app:layout_constraintLeft_toLeftOf="parent"
-                        app:layout_constraintTop_toBottomOf="@id/autopilotInfoDivider"
-                        />
+                        app:layout_constraintTop_toBottomOf="@id/autopilotInfoDivider" />
 
                     <androidx.appcompat.widget.AppCompatEditText
                         android:id="@+id/etAutopilotIP"
                         android:layout_width="0dp"
                         android:layout_height="0dp"
+                        android:layout_marginStart="@dimen/dp_30"
+                        android:layout_marginTop="@dimen/dp_10"
+                        android:layout_marginEnd="@dimen/dp_20"
+                        android:layout_marginBottom="@dimen/dp_10"
+                        android:background="@drawable/debug_setting_edit_bg"
                         android:gravity="center"
                         android:text="192.168.8.102"
                         android:textColor="#1A1A1A"
                         android:textSize="14sp"
-                        android:background="@drawable/debug_setting_edit_bg"
-                        app:layout_constraintTop_toTopOf="@id/btnSetAutopilotIP"
                         app:layout_constraintBottom_toBottomOf="@id/btnSetAutopilotIP"
                         app:layout_constraintLeft_toRightOf="@id/btnSetAutopilotIP"
-                        app:layout_constraintRight_toRightOf="parent"
-                        android:layout_marginStart="@dimen/dp_30"
+                        app:layout_constraintRight_toLeftOf="@id/btnDisconnectIpc"
+                        app:layout_constraintTop_toTopOf="@id/btnSetAutopilotIP" />
+
+                    <Button
+                        android:id="@+id/btnDisconnectIpc"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
                         android:layout_marginEnd="@dimen/dp_30"
-                        android:layout_marginTop="@dimen/dp_10"
-                        android:layout_marginBottom="@dimen/dp_10"
-                        />
+                        android:gravity="center"
+                        android:paddingStart="@dimen/dp_15"
+                        android:paddingEnd="@dimen/dp_15"
+                        android:text="断开工控机连接"
+                        android:textSize="@dimen/dp_24"
+                        app:layout_constraintBottom_toBottomOf="@id/btnSetAutopilotIP"
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toTopOf="@id/btnSetAutopilotIP" />
 
                     <View
                         android:id="@+id/autopilotIPDivider"
                         android:layout_width="match_parent"
                         android:layout_height="1dp"
                         android:background="#F0F0F0"
-                        app:layout_constraintTop_toBottomOf="@id/btnSetAutopilotIP"
-                        />
+                        app:layout_constraintTop_toBottomOf="@id/btnSetAutopilotIP" />
 
                     <Button
                         android:id="@+id/btnSetAutopilotSpeed"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        app:layout_constraintTop_toBottomOf="@id/autopilotIPDivider"
-                        app:layout_constraintLeft_toLeftOf="parent"
                         android:gravity="center"
                         android:padding="@dimen/dp_5"
                         android:text="设置最大速度"
                         android:textSize="@dimen/dp_24"
-                        />
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/autopilotIPDivider" />
 
                     <androidx.appcompat.widget.LinearLayoutCompat
                         android:id="@+id/llSpeedLayout"
                         android:layout_width="0dp"
                         android:layout_height="0dp"
-                        app:layout_constraintTop_toTopOf="@id/btnSetAutopilotSpeed"
-                        app:layout_constraintBottom_toBottomOf="@id/btnSetAutopilotSpeed"
-                        app:layout_constraintLeft_toRightOf="@id/btnSetAutopilotSpeed"
-                        app:layout_constraintRight_toRightOf="parent"
+                        android:layout_marginStart="@dimen/dp_30"
+                        android:layout_marginTop="@dimen/dp_10"
+                        android:layout_marginEnd="@dimen/dp_30"
+                        android:layout_marginBottom="@dimen/dp_10"
                         android:background="@drawable/debug_setting_edit_bg"
                         android:focusable="true"
                         android:focusableInTouchMode="true"
                         android:orientation="horizontal"
-                        android:layout_marginStart="@dimen/dp_30"
-                        android:layout_marginEnd="@dimen/dp_30"
-                        android:layout_marginTop="@dimen/dp_10"
-                        android:layout_marginBottom="@dimen/dp_10"
-                        >
+                        app:layout_constraintBottom_toBottomOf="@id/btnSetAutopilotSpeed"
+                        app:layout_constraintLeft_toRightOf="@id/btnSetAutopilotSpeed"
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toTopOf="@id/btnSetAutopilotSpeed">
 
                         <androidx.appcompat.widget.AppCompatEditText
                             android:id="@+id/etInputSpeed"
+                            style="@style/DebugSettingText"
                             android:layout_width="0dp"
                             android:layout_height="match_parent"
                             android:layout_marginStart="90px"
                             android:layout_weight="1"
                             android:background="@null"
                             android:gravity="center"
-                            style="@style/DebugSettingText"
                             tools:ignore="SpeakableTextPresentCheck" />
 
                         <TextView
+                            style="@style/DebugSettingText"
                             android:layout_width="93px"
                             android:layout_height="match_parent"
                             android:gravity="center_vertical"
-                            android:text="km/h"
-                            style="@style/DebugSettingText"
-                            />
+                            android:text="km/h" />
 
                     </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -661,56 +676,52 @@
                         android:layout_width="match_parent"
                         android:layout_height="1dp"
                         android:background="#F0F0F0"
-                        app:layout_constraintTop_toBottomOf="@id/btnSetAutopilotSpeed"
-                        />
+                        app:layout_constraintTop_toBottomOf="@id/btnSetAutopilotSpeed" />
 
                     <Button
                         android:id="@+id/btnRecordPackage"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        app:layout_constraintTop_toBottomOf="@id/autopilotSpeedDivider"
-                        app:layout_constraintLeft_toLeftOf="parent"
                         android:gravity="center"
                         android:padding="@dimen/dp_5"
                         android:text="录制Bag包"
                         android:textSize="@dimen/dp_24"
-                        />
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/autopilotSpeedDivider" />
 
                     <androidx.appcompat.widget.LinearLayoutCompat
                         android:layout_width="0dp"
                         android:layout_height="0dp"
+                        android:layout_marginStart="@dimen/dp_30"
+                        android:layout_marginTop="@dimen/dp_10"
+                        android:layout_marginEnd="@dimen/dp_30"
+                        android:layout_marginBottom="@dimen/dp_10"
+                        android:background="@drawable/debug_setting_edit_bg"
                         android:focusable="true"
                         android:focusableInTouchMode="true"
                         android:orientation="horizontal"
-                        app:layout_constraintTop_toTopOf="@id/btnRecordPackage"
                         app:layout_constraintBottom_toBottomOf="@id/btnRecordPackage"
                         app:layout_constraintLeft_toRightOf="@id/btnRecordPackage"
                         app:layout_constraintRight_toRightOf="parent"
-                        android:background="@drawable/debug_setting_edit_bg"
-                        android:layout_marginStart="@dimen/dp_30"
-                        android:layout_marginEnd="@dimen/dp_30"
-                        android:layout_marginTop="@dimen/dp_10"
-                        android:layout_marginBottom="@dimen/dp_10"
-                        >
+                        app:layout_constraintTop_toTopOf="@id/btnRecordPackage">
 
                         <androidx.appcompat.widget.AppCompatEditText
                             android:id="@+id/etInputRecordTime"
+                            style="@style/DebugSettingText"
                             android:layout_width="0dp"
                             android:layout_height="match_parent"
                             android:layout_marginStart="90px"
                             android:layout_weight="1"
                             android:background="@null"
                             android:gravity="center"
-                            style="@style/DebugSettingText"
                             tools:ignore="SpeakableTextPresentCheck" />
 
                         <TextView
+                            style="@style/DebugSettingText"
                             android:layout_width="93px"
                             android:layout_height="match_parent"
                             android:gravity="center_vertical"
-                            android:text="秒"
-                            style="@style/DebugSettingText"
-                            />
+                            android:text="秒" />
 
                     </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -719,61 +730,56 @@
                         android:layout_width="match_parent"
                         android:layout_height="1dp"
                         android:background="#F0F0F0"
-                        app:layout_constraintTop_toBottomOf="@id/btnRecordPackage"
-                        />
+                        app:layout_constraintTop_toBottomOf="@id/btnRecordPackage" />
 
                     <Button
                         android:id="@+id/btnSystemUpgrade"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        app:layout_constraintTop_toBottomOf="@id/recordPackageDivider"
+                        android:text="升级系统"
+                        android:visibility="gone"
                         app:layout_constraintLeft_toLeftOf="parent"
                         app:layout_constraintRight_toLeftOf="@id/btnSystemRestart"
-                        android:text="升级系统"
-                        />
+                        app:layout_constraintTop_toBottomOf="@id/recordPackageDivider" />
 
                     <Button
                         android:id="@+id/btnSystemRestart"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        app:layout_constraintTop_toBottomOf="@id/recordPackageDivider"
-                        app:layout_constraintRight_toRightOf="parent"
-                        app:layout_constraintLeft_toRightOf="@id/btnSystemUpgrade"
                         android:text="重启系统"
-                        />
+                        android:visibility="gone"
+                        app:layout_constraintLeft_toRightOf="@id/btnSystemUpgrade"
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/recordPackageDivider" />
 
 
                     <TextView
                         android:id="@+id/tvCarInfo"
+                        style="@style/DebugSettingText"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        style="@style/DebugSettingText"
-                        app:layout_constraintTop_toBottomOf="@id/btnSystemUpgrade"
-                        />
+                        app:layout_constraintTop_toBottomOf="@id/btnSystemUpgrade" />
 
                     <TextView
                         android:id="@+id/tvIdentifyInfo"
+                        style="@style/DebugSettingText"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        style="@style/DebugSettingText"
-                        app:layout_constraintTop_toBottomOf="@id/tvCarInfo"
-                        />
+                        app:layout_constraintTop_toBottomOf="@id/tvCarInfo" />
 
                     <TextView
                         android:id="@+id/tvTrajectoryInfoSize"
+                        style="@style/DebugSettingText"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        style="@style/DebugSettingText"
-                        app:layout_constraintTop_toBottomOf="@id/tvIdentifyInfo"
-                        />
+                        app:layout_constraintTop_toBottomOf="@id/tvIdentifyInfo" />
 
                     <TextView
                         android:id="@+id/tvRouteInfoSize"
+                        style="@style/DebugSettingText"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        style="@style/DebugSettingText"
-                        app:layout_constraintTop_toBottomOf="@id/tvTrajectoryInfoSize"
-                        />
+                        app:layout_constraintTop_toBottomOf="@id/tvTrajectoryInfoSize" />
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -781,13 +787,12 @@
                     android:id="@+id/tbObuController"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:textOff="OBU"
-                    android:textOn="OBU"
-                    android:background="@drawable/radio_button_normal_background_right"
+                    android:layout_margin="@dimen/dp_10"
+                    android:background="@drawable/setting_toggle_button_background"
                     android:drawableEnd="@drawable/icon_right"
                     android:padding="@dimen/dp_20"
-                    android:layout_margin="@dimen/dp_10"
-                    />
+                    android:textOff="OBU"
+                    android:textOn="OBU" />
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/obuControllerLayout"
@@ -803,167 +808,157 @@
                         android:padding="@dimen/dp_5"
                         android:text="重置IP"
                         android:textSize="@dimen/dp_24"
-                        app:layout_constraintTop_toTopOf="parent"
                         app:layout_constraintLeft_toLeftOf="parent"
-                        />
+                        app:layout_constraintTop_toTopOf="parent" />
 
                     <androidx.appcompat.widget.AppCompatEditText
                         android:id="@+id/etObuIP"
                         android:layout_width="0dp"
                         android:layout_height="0dp"
+                        android:layout_marginStart="@dimen/dp_30"
+                        android:layout_marginTop="@dimen/dp_10"
+                        android:layout_marginEnd="@dimen/dp_30"
+                        android:layout_marginBottom="@dimen/dp_10"
+                        android:background="@drawable/debug_setting_edit_bg"
                         android:gravity="center"
                         android:text="192.168.1.199"
                         android:textColor="#1A1A1A"
                         android:textSize="14sp"
-                        android:background="@drawable/debug_setting_edit_bg"
-                        app:layout_constraintTop_toTopOf="@id/btnSetObuIP"
                         app:layout_constraintBottom_toBottomOf="@id/btnSetObuIP"
                         app:layout_constraintLeft_toRightOf="@id/btnSetObuIP"
                         app:layout_constraintRight_toRightOf="parent"
-                        android:layout_marginStart="@dimen/dp_30"
-                        android:layout_marginEnd="@dimen/dp_30"
-                        android:layout_marginTop="@dimen/dp_10"
-                        android:layout_marginBottom="@dimen/dp_10"
-                        />
+                        app:layout_constraintTop_toTopOf="@id/btnSetObuIP" />
 
                     <View
                         android:id="@+id/obuDivider"
                         android:layout_width="match_parent"
                         android:layout_height="1dp"
                         android:background="#F0F0F0"
-                        app:layout_constraintTop_toBottomOf="@id/btnSetObuIP"
-                        />
+                        app:layout_constraintTop_toBottomOf="@id/btnSetObuIP" />
 
                     <TextView
                         android:id="@+id/tvObuInfo"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:layout_margin="@dimen/dp_10"
+                        android:minLines="4"
                         android:text="OBU配置信息"
                         android:textColor="#000"
                         android:textSize="@dimen/dp_24"
-                        app:layout_constraintTop_toBottomOf="@id/obuDivider"
-                        />
+                        app:layout_constraintTop_toBottomOf="@id/obuDivider" />
+
                     <View
                         android:id="@+id/obuDivider2"
                         android:layout_width="match_parent"
                         android:layout_height="1dp"
                         android:background="#F0F0F0"
-                        app:layout_constraintTop_toBottomOf="@id/tvObuInfo"
-                        />
+                        app:layout_constraintTop_toBottomOf="@id/tvObuInfo" />
+
                     <TextView
                         android:id="@+id/tvObuDelay"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:layout_margin="@dimen/dp_10"
                         android:text="obu时延:"
                         android:textColor="#000"
                         android:textSize="@dimen/dp_24"
-                        app:layout_constraintTop_toBottomOf="@id/obuDivider2"
-                        />
+                        app:layout_constraintTop_toBottomOf="@id/obuDivider2" />
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
                 <ToggleButton
                     android:id="@+id/tbHmiController"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:textOff="HMI控制"
-                    android:textOn="HMI控制"
-                    android:background="@drawable/radio_button_normal_background_right"
+                    android:layout_margin="@dimen/dp_10"
+                    android:background="@drawable/setting_toggle_button_background"
                     android:drawableEnd="@drawable/icon_right"
                     android:padding="@dimen/dp_20"
-                    android:layout_margin="@dimen/dp_10"
-                    />
+                    android:textOff="HMI控制"
+                    android:textOn="HMI控制" />
 
                 <GridLayout
                     android:id="@+id/hmiControllerLayout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:columnCount="2"
-                    android:visibility="gone"
-                    >
+                    android:visibility="gone">
 
                     <ToggleButton
                         android:id="@+id/tbSpeedView"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_columnWeight="1"
                         android:layout_margin="2dp"
                         android:gravity="center"
                         android:textOff="隐藏「脉速表」"
                         android:textOn="显示「脉速表」"
-                        android:textSize="@dimen/dp_24"
-                        android:layout_columnWeight="1"
-                        />
+                        android:textSize="@dimen/dp_24" />
 
                     <ToggleButton
                         android:id="@+id/tbAutopilotStatusView"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_columnWeight="1"
                         android:layout_margin="2dp"
                         android:gravity="center"
                         android:textOff="隐藏「自动驾驶控制按钮」"
                         android:textOn="显示「自动驾驶控制按钮」"
-                        android:textSize="@dimen/dp_24"
-                        android:layout_columnWeight="1"
-                        />
+                        android:textSize="@dimen/dp_24" />
 
                     <ToggleButton
                         android:id="@+id/tbPerspectiveSwitchView"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_columnWeight="1"
                         android:layout_margin="2dp"
                         android:gravity="center"
                         android:textOff="隐藏「视角切换按钮」"
                         android:textOn="显示「视角切换按钮」"
-                        android:textSize="@dimen/dp_24"
-                        android:layout_columnWeight="1"
-                        />
+                        android:textSize="@dimen/dp_24" />
 
                     <ToggleButton
                         android:id="@+id/tbCheckStatusView"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_columnWeight="1"
                         android:layout_margin="2dp"
                         android:gravity="center"
                         android:textOff="隐藏「工具箱」"
                         android:textOn="显示「工具箱」"
-                        android:textSize="@dimen/dp_24"
-                        android:layout_columnWeight="1"
-                        />
+                        android:textSize="@dimen/dp_24" />
 
                     <ToggleButton
                         android:id="@+id/tbControlView"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_columnWeight="1"
                         android:layout_margin="2dp"
                         android:gravity="center"
                         android:textOff="隐藏「小地图」"
                         android:textOn="显示「小地图」"
-                        android:textSize="@dimen/dp_24"
-                        android:layout_columnWeight="1"
-                        />
+                        android:textSize="@dimen/dp_24" />
 
                     <ToggleButton
                         android:id="@+id/tbOpenLight"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_columnWeight="1"
                         android:layout_margin="2dp"
                         android:gravity="center"
                         android:textOff="关闭「转向灯控制」"
                         android:textOn="打开「转向灯控制」"
-                        android:textSize="@dimen/dp_24"
-                        android:layout_columnWeight="1"
-                        />
+                        android:textSize="@dimen/dp_24" />
 
                     <ToggleButton
                         android:id="@+id/tbOpenBrakeLight"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_columnWeight="1"
                         android:layout_margin="2dp"
                         android:gravity="center"
                         android:textOff="关闭「刹车控制」"
                         android:textOn="打开「刹车控制」"
-                        android:textSize="@dimen/dp_24"
-                        android:layout_columnWeight="1"
-                        />
+                        android:textSize="@dimen/dp_24" />
 
                 </GridLayout>
 
@@ -971,13 +966,12 @@
                     android:id="@+id/tbHdMapController"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:textOff="HD地图控制"
-                    android:textOn="HD地图控制"
-                    android:background="@drawable/radio_button_normal_background_right"
+                    android:layout_margin="@dimen/dp_10"
+                    android:background="@drawable/setting_toggle_button_background"
                     android:drawableEnd="@drawable/icon_right"
                     android:padding="@dimen/dp_20"
-                    android:layout_margin="@dimen/dp_10"
-                    />
+                    android:textOff="HD地图控制"
+                    android:textOn="HD地图控制" />
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/hdMapControllerLayout"
@@ -993,10 +987,9 @@
                         android:gravity="center"
                         android:text="切换 顶视角"
                         android:textSize="@dimen/dp_24"
-                        app:layout_constraintTop_toTopOf="parent"
                         app:layout_constraintLeft_toLeftOf="parent"
                         app:layout_constraintRight_toLeftOf="@id/changesight_back_btn"
-                        />
+                        app:layout_constraintTop_toTopOf="parent" />
 
                     <Button
                         android:id="@+id/changesight_back_btn"
@@ -1006,10 +999,9 @@
                         android:gravity="center"
                         android:text="切换 后方来车视角"
                         android:textSize="@dimen/dp_24"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:layout_constraintRight_toRightOf="parent"
                         app:layout_constraintLeft_toRightOf="@id/changesight_top_btn"
-                        />
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
 
                     <Button
                         android:id="@+id/changesight_cross_btn"
@@ -1019,10 +1011,9 @@
                         android:gravity="center"
                         android:text="切换 十字路口视角"
                         android:textSize="@dimen/dp_24"
-                        app:layout_constraintTop_toBottomOf="@id/changesight_top_btn"
                         app:layout_constraintLeft_toLeftOf="parent"
                         app:layout_constraintRight_toLeftOf="@id/changesight_far_btn"
-                        />
+                        app:layout_constraintTop_toBottomOf="@id/changesight_top_btn" />
 
                     <Button
                         android:id="@+id/changesight_far_btn"
@@ -1032,10 +1023,9 @@
                         android:gravity="center"
                         android:text="切换 远视角"
                         android:textSize="@dimen/dp_24"
-                        app:layout_constraintTop_toBottomOf="@id/changesight_back_btn"
-                        app:layout_constraintRight_toRightOf="parent"
                         app:layout_constraintLeft_toRightOf="@id/changesight_cross_btn"
-                        />
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/changesight_back_btn" />
 
                     <Button
                         android:id="@+id/reset_changesight"
@@ -1045,10 +1035,9 @@
                         android:gravity="center"
                         android:text="恢复视角"
                         android:textSize="@dimen/dp_24"
-                        app:layout_constraintTop_toBottomOf="@id/changesight_cross_btn"
                         app:layout_constraintLeft_toLeftOf="@id/changesight_cross_btn"
                         app:layout_constraintRight_toRightOf="@id/changesight_cross_btn"
-                        />
+                        app:layout_constraintTop_toBottomOf="@id/changesight_cross_btn" />
 
                     <ToggleButton
                         android:id="@+id/tbChangeCurrentCarIcon"
@@ -1059,10 +1048,9 @@
                         android:textOff="切换自车为「小巴车」"
                         android:textOn="切换自车为「出租车」"
                         android:textSize="@dimen/dp_24"
-                        app:layout_constraintTop_toBottomOf="@id/reset_changesight"
                         app:layout_constraintLeft_toLeftOf="parent"
                         app:layout_constraintRight_toLeftOf="@id/btnDrawTrolley"
-                        />
+                        app:layout_constraintTop_toBottomOf="@id/reset_changesight" />
 
                     <Button
                         android:id="@+id/btnDrawTrolley"
@@ -1072,10 +1060,9 @@
                         android:gravity="center"
                         android:text="绘制感知「小车」"
                         android:textSize="@dimen/dp_24"
-                        app:layout_constraintTop_toBottomOf="@id/tbChangeCurrentCarIcon"
                         app:layout_constraintLeft_toRightOf="@id/tbChangeCurrentCarIcon"
                         app:layout_constraintRight_toRightOf="parent"
-                        />
+                        app:layout_constraintTop_toBottomOf="@id/tbChangeCurrentCarIcon" />
 
                     <Button
                         android:id="@+id/btnDrawTruck"
@@ -1084,10 +1071,9 @@
                         android:layout_margin="2dp"
                         android:gravity="center"
                         android:text="绘制感知「卡车」"
-                        app:layout_constraintTop_toBottomOf="@id/tbChangeCurrentCarIcon"
                         app:layout_constraintLeft_toLeftOf="parent"
                         app:layout_constraintRight_toLeftOf="@id/btnDrawBus"
-                        />
+                        app:layout_constraintTop_toBottomOf="@id/tbChangeCurrentCarIcon" />
 
                     <Button
                         android:id="@+id/btnDrawBus"
@@ -1096,10 +1082,9 @@
                         android:layout_margin="2dp"
                         android:gravity="center"
                         android:text="绘制感知「大巴」"
-                        app:layout_constraintTop_toBottomOf="@id/tbChangeCurrentCarIcon"
-                        app:layout_constraintRight_toRightOf="parent"
                         app:layout_constraintLeft_toRightOf="@id/btnDrawTruck"
-                        />
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/tbChangeCurrentCarIcon" />
 
                     <Button
                         android:id="@+id/btnDrawBicycle"
@@ -1108,10 +1093,9 @@
                         android:layout_margin="2dp"
                         android:gravity="center"
                         android:text="绘制感知「自行车」"
-                        app:layout_constraintTop_toBottomOf="@id/btnDrawTruck"
                         app:layout_constraintLeft_toLeftOf="parent"
                         app:layout_constraintRight_toLeftOf="@id/btnDrawPedestrian"
-                        />
+                        app:layout_constraintTop_toBottomOf="@id/btnDrawTruck" />
 
                     <Button
                         android:id="@+id/btnDrawPedestrian"
@@ -1120,10 +1104,9 @@
                         android:layout_margin="2dp"
                         android:gravity="center"
                         android:text="绘制感知「行人」"
-                        app:layout_constraintTop_toBottomOf="@id/btnDrawTruck"
-                        app:layout_constraintRight_toRightOf="parent"
                         app:layout_constraintLeft_toRightOf="@id/btnDrawBicycle"
-                        />
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/btnDrawTruck" />
 
                     <Button
                         android:id="@+id/btnDrawMotorcycle"
@@ -1132,10 +1115,9 @@
                         android:layout_margin="2dp"
                         android:gravity="center"
                         android:text="绘制感知「摩托」"
-                        app:layout_constraintTop_toBottomOf="@id/btnDrawBicycle"
                         app:layout_constraintLeft_toLeftOf="parent"
                         app:layout_constraintRight_toLeftOf="@id/btnDrawUnknown"
-                        />
+                        app:layout_constraintTop_toBottomOf="@id/btnDrawBicycle" />
 
                     <Button
                         android:id="@+id/btnDrawUnknown"
@@ -1144,10 +1126,9 @@
                         android:layout_margin="2dp"
                         android:gravity="center"
                         android:text="绘制感知「未知」"
-                        app:layout_constraintTop_toBottomOf="@id/btnDrawBicycle"
-                        app:layout_constraintRight_toRightOf="parent"
                         app:layout_constraintLeft_toRightOf="@id/btnDrawMotorcycle"
-                        />
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/btnDrawBicycle" />
 
                     <Button
                         android:id="@+id/btnOpenObuFusion"
@@ -1156,10 +1137,9 @@
                         android:layout_margin="2dp"
                         android:gravity="center"
                         android:text="开启OBU融合"
-                        app:layout_constraintTop_toBottomOf="@id/btnDrawMotorcycle"
                         app:layout_constraintLeft_toLeftOf="parent"
                         app:layout_constraintRight_toLeftOf="@id/btnDrawObuTrolley"
-                        />
+                        app:layout_constraintTop_toBottomOf="@id/btnDrawMotorcycle" />
 
                     <Button
                         android:id="@+id/btnDrawObuTrolley"
@@ -1168,10 +1148,9 @@
                         android:layout_margin="2dp"
                         android:gravity="center"
                         android:text="绘制OBU「小车」"
-                        app:layout_constraintTop_toBottomOf="@id/btnDrawMotorcycle"
-                        app:layout_constraintRight_toRightOf="parent"
                         app:layout_constraintLeft_toRightOf="@id/btnOpenObuFusion"
-                        />
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/btnDrawMotorcycle" />
 
                     <ToggleButton
                         android:id="@+id/tbIsDrawIdentifyData"
@@ -1182,10 +1161,9 @@
                         android:textOff="显示鹰眼感知"
                         android:textOn="关闭鹰眼感知"
                         android:textSize="@dimen/dp_24"
-                        app:layout_constraintTop_toBottomOf="@id/btnOpenObuFusion"
                         app:layout_constraintLeft_toLeftOf="parent"
                         app:layout_constraintRight_toLeftOf="@id/tbIsDrawUnknownIdentifyData"
-                        />
+                        app:layout_constraintTop_toBottomOf="@id/btnOpenObuFusion" />
 
                     <ToggleButton
                         android:id="@+id/tbIsDrawUnknownIdentifyData"
@@ -1196,10 +1174,9 @@
                         android:textOff="显示「未知类型」感知"
                         android:textOn="关闭「未知类型」感知"
                         android:textSize="@dimen/dp_24"
-                        app:layout_constraintTop_toBottomOf="@id/btnOpenObuFusion"
-                        app:layout_constraintRight_toRightOf="parent"
                         app:layout_constraintLeft_toRightOf="@id/tbIsDrawIdentifyData"
-                        />
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/btnOpenObuFusion" />
 
                     <ToggleButton
                         android:id="@+id/tbIsDemoMode"
@@ -1210,10 +1187,9 @@
                         android:textOff="开启美化模式"
                         android:textOn="关闭美化模式"
                         android:textSize="@dimen/dp_24"
-                        app:layout_constraintTop_toBottomOf="@id/tbIsDrawIdentifyData"
                         app:layout_constraintLeft_toLeftOf="parent"
                         app:layout_constraintRight_toLeftOf="@id/tbIsDrawAutopilotTrajectoryData"
-                        />
+                        app:layout_constraintTop_toBottomOf="@id/tbIsDrawIdentifyData" />
 
                     <ToggleButton
                         android:id="@+id/tbIsDrawAutopilotTrajectoryData"
@@ -1224,9 +1200,9 @@
                         android:textOff="强制绘制引导线"
                         android:textOn="强制绘制引导线"
                         android:textSize="@dimen/dp_24"
-                        app:layout_constraintTop_toBottomOf="@id/btnOpenObuFusion"
-                        app:layout_constraintRight_toRightOf="parent"
                         app:layout_constraintLeft_toRightOf="@id/tbIsDemoMode"
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/btnOpenObuFusion"
 
 
                         />
@@ -1239,10 +1215,9 @@
                         android:textOff="强制绘制路径规划"
                         android:textOn="强制绘制路径规划"
                         android:textSize="@dimen/dp_24"
-                        app:layout_constraintTop_toBottomOf="@id/tbIsDemoMode"
                         app:layout_constraintLeft_toLeftOf="@id/tbIsDemoMode"
                         app:layout_constraintRight_toRightOf="@id/tbIsDemoMode"
-                        />
+                        app:layout_constraintTop_toBottomOf="@id/tbIsDemoMode" />
 
                     <ToggleButton
                         android:id="@+id/tbChangeAutoPilotStatus"
@@ -1253,56 +1228,51 @@
                         android:textOff="开启模拟自动驾驶中"
                         android:textOn="关闭模拟自动驾驶中"
                         android:textSize="@dimen/dp_24"
-                        app:layout_constraintTop_toBottomOf="@id/tbIsDemoMode"
                         app:layout_constraintLeft_toRightOf="@id/tbIsDemoMode"
                         app:layout_constraintRight_toRightOf="parent"
-                        />
+                        app:layout_constraintTop_toBottomOf="@id/tbIsDemoMode" />
 
                     <RadioGroup
                         android:id="@+id/rgGpsProvider"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        app:layout_constraintTop_toBottomOf="@id/tbChangeAutoPilotStatus"
-                        android:orientation="horizontal">
+                        android:orientation="horizontal"
+                        app:layout_constraintTop_toBottomOf="@id/tbChangeAutoPilotStatus">
 
                         <RadioButton
                             android:id="@+id/rbGpsProviderAndroid"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
+                            android:layout_weight="1"
                             android:padding="@dimen/dp_10"
                             android:text="使用Android定位数据"
                             android:textColor="#000"
-                            android:textSize="@dimen/dp_24"
-                            android:layout_weight="1"
-                            />
+                            android:textSize="@dimen/dp_24" />
 
                         <RadioButton
                             android:id="@+id/rbGpsProviderRTK"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
+                            android:layout_weight="1"
                             android:padding="@dimen/dp_10"
                             android:text="使用RTK定位数据"
                             android:textColor="#000"
-                            android:textSize="@dimen/dp_24"
-                            android:layout_weight="1"
-                            />
+                            android:textSize="@dimen/dp_24" />
 
                         <RadioButton
                             android:id="@+id/rbGpsProviderOBU"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
+                            android:layout_weight="1"
                             android:padding="@dimen/dp_10"
                             android:text="使用OBU定位数据"
                             android:textColor="#000"
-                            android:textSize="@dimen/dp_24"
-                            android:layout_weight="1"
-                            />
+                            android:textSize="@dimen/dp_24" />
 
 
                     </RadioGroup>
 
 
-
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
 
@@ -1312,13 +1282,12 @@
                 android:id="@+id/tbLogcatCenter"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textOff="日志中心"
-                android:textOn="日志中心"
+                android:layout_margin="@dimen/dp_10"
                 android:background="@drawable/radio_button_normal_background_right"
                 android:drawableEnd="@drawable/icon_right"
                 android:padding="@dimen/dp_20"
-                android:layout_margin="@dimen/dp_10"
-                />
+                android:textOff="日志中心"
+                android:textOn="日志中心" />
             <!--日志输出控制-->
             <LinearLayout
                 android:id="@+id/logcatCenterLayout"
@@ -1384,49 +1353,91 @@
 
                     <CheckBox
                         android:id="@+id/cbAdasLog"
+                        style="@style/DebugSettingText"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:checked="false"
-                        android:text="ADAS日志"
-                        style="@style/DebugSettingText"
-                        />
+                        android:text="ADAS日志" />
 
                     <CheckBox
                         android:id="@+id/cbObuLog"
+                        style="@style/DebugSettingText"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:checked="false"
-                        android:text="OBU日志"
-                        style="@style/DebugSettingText"
-                        />
+                        android:text="OBU日志" />
 
                     <CheckBox
                         android:id="@+id/cbHmiLog"
+                        style="@style/DebugSettingText"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:checked="false"
-                        android:text="HMI日志"
-                        style="@style/DebugSettingText"
-                        />
+                        android:text="HMI日志" />
 
                     <CheckBox
                         android:id="@+id/cbV2xLog"
+                        style="@style/DebugSettingText"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:checked="false"
-                        android:text="V2X日志"
-                        style="@style/DebugSettingText"
-                        />
+                        android:text="V2X日志" />
 
                     <CheckBox
                         android:id="@+id/cbMapLog"
+                        style="@style/DebugSettingText"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:checked="false"
-                        android:text="地图日志"
-                        style="@style/DebugSettingText"
-                        />
+                        android:text="地图日志" />
 
+                    <CheckBox
+                        android:id="@+id/cbDevaLog"
+                        style="@style/DebugSettingText"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:checked="false"
+                        android:text="DEVA日志" />
+
+                    <CheckBox
+                        android:id="@+id/cbNetworkLog"
+                        style="@style/DebugSettingText"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:checked="false"
+                        android:text="网络模块日志" />
+
+                    <CheckBox
+                        android:id="@+id/cbOldRouteLog"
+                        style="@style/DebugSettingText"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:checked="false"
+                        android:text="ROUTE日志" />
+
+                    <CheckBox
+                        android:id="@+id/cbBusLog"
+                        style="@style/DebugSettingText"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:checked="false"
+                        android:text="BUS日志" />
+
+                    <CheckBox
+                        android:id="@+id/cbTaxiLog"
+                        style="@style/DebugSettingText"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:checked="false"
+                        android:text="TAXI日志" />
+
+                    <CheckBox
+                        android:id="@+id/cbTaxiPLog"
+                        style="@style/DebugSettingText"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:checked="false"
+                        android:text="TAXI_P日志" />
 
                 </com.google.android.flexbox.FlexboxLayout>
 
@@ -1442,27 +1453,25 @@
                         android:gravity="center"
                         android:textOff="开始抓取全量日志"
                         android:textOn="停止抓取全量日志"
-                        android:textSize="@dimen/dp_24"
-                        />
+                        android:textSize="@dimen/dp_24" />
 
 
                     <androidx.appcompat.widget.AppCompatEditText
                         android:id="@+id/etLogCatch"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
+                        android:layout_marginStart="@dimen/dp_30"
+                        android:layout_marginTop="@dimen/dp_10"
+                        android:layout_marginEnd="@dimen/dp_30"
+                        android:layout_marginBottom="@dimen/dp_10"
+                        android:background="@drawable/debug_setting_edit_bg"
                         android:digits="0123456789"
                         android:gravity="center"
                         android:hint="默认10分钟"
                         android:minHeight="48dp"
                         android:padding="@dimen/dp_5"
                         android:textColor="#1A1A1A"
-                        android:textSize="14sp"
-                        android:background="@drawable/debug_setting_edit_bg"
-                        android:layout_marginStart="@dimen/dp_30"
-                        android:layout_marginEnd="@dimen/dp_30"
-                        android:layout_marginTop="@dimen/dp_10"
-                        android:layout_marginBottom="@dimen/dp_10"
-                        />
+                        android:textSize="14sp" />
 
                 </LinearLayout>
 
@@ -1474,17 +1483,52 @@
                     android:textSize="@dimen/dp_24"
                     android:textStyle="bold" />
 
-                <CheckBox
-                    android:id="@+id/cbAdasChainLog"
-                    android:layout_width="wrap_content"
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:checked="false"
-                    android:padding="@dimen/dp_10"
-                    android:text="ADAS长链数据"
-                    android:textColor="#000"
-                    android:textSize="@dimen/dp_24" />
-            </LinearLayout>
+                    android:orientation="vertical">
 
+                    <CheckBox
+                        android:id="@+id/cbAdasAutoPilot"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:checked="false"
+                        android:padding="@dimen/dp_10"
+                        android:text="ADAS自动驾驶链路(包含: 定位,驾驶状态,全局路径,到站提醒,节点信息,异常反馈)"
+                        android:textColor="#000"
+                        android:textSize="@dimen/dp_24" />
+
+                    <CheckBox
+                        android:id="@+id/cbAdasDataTrack"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:checked="false"
+                        android:padding="@dimen/dp_10"
+                        android:text="ADAS感知物体"
+                        android:textColor="#000"
+                        android:textSize="@dimen/dp_24" />
+
+                    <CheckBox
+                        android:id="@+id/cbAdasTrajectory"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:checked="false"
+                        android:padding="@dimen/dp_10"
+                        android:text="ADAS车前引导线"
+                        android:textColor="#000"
+                        android:textSize="@dimen/dp_24" />
+
+                    <CheckBox
+                        android:id="@+id/cbAdasVehicle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:checked="false"
+                        android:padding="@dimen/dp_10"
+                        android:text="ADAS底盘数据"
+                        android:textColor="#000"
+                        android:textSize="@dimen/dp_24" />
+                </LinearLayout>
+            </LinearLayout>
 
         </LinearLayout>
 
diff --git a/core/function-impl/mogo-core-function-main/build.gradle b/core/function-impl/mogo-core-function-main/build.gradle
index 58076f0352..72babe725b 100644
--- a/core/function-impl/mogo-core-function-main/build.gradle
+++ b/core/function-impl/mogo-core-function-main/build.gradle
@@ -48,9 +48,6 @@ dependencies {
     implementation rootProject.ext.dependencies.androidxappcompat
     implementation rootProject.ext.dependencies.boostmultidex
 
-    compileOnly rootProject.ext.dependencies.adasapi
-    compileOnly rootProject.ext.dependencies.adasconfigapi
-
     debugImplementation rootProject.ext.dependencies.debugleakcanary
     releaseImplementation rootProject.ext.dependencies.releaseleakcanary
 
diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/EventDispatchCenter.java b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/EventDispatchCenter.java
index 22af3e7933..b1a07c2242 100644
--- a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/EventDispatchCenter.java
+++ b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/EventDispatchCenter.java
@@ -20,10 +20,6 @@ import com.mogo.map.navi.IMogoNaviListener;
 import com.mogo.map.navi.MogoNaviInfo;
 import com.mogo.map.uicontroller.EnumMapUI;
 import com.mogo.map.uicontroller.VisualAngleMode;
-import com.mogo.service.adas.IMogoADASControlStatusChangedListener;
-import com.zhidao.adasconfig.common.config.EnumCarChatIncognitoMode;
-import com.zhidao.adasconfig.listener.IAdasSettingUIListener;
-import com.zhidao.adasconfig.listener.IAdasSkinStyleListener;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -39,9 +35,7 @@ public class EventDispatchCenter implements
         IMogoMarkerClickListener,
         IMogoCarLocationChangedListener2,
         IMogoMapListener,
-        IMogoLocationListener,
-        IAdasSettingUIListener,
-        IAdasSkinStyleListener {
+        IMogoLocationListener {
 
 
     private static volatile EventDispatchCenter sInstance;
@@ -70,7 +64,7 @@ public class EventDispatchCenter implements
             try {
                 return listener.onMarkerClicked(marker);
             } catch (Exception e) {
-                CallerLogger.INSTANCE.e(M_MAIN +TAG, "onMarkerClicked error : " + e);
+                CallerLogger.INSTANCE.e(M_MAIN + TAG, "onMarkerClicked error : " + e);
             }
         }
         return false;
@@ -87,7 +81,7 @@ public class EventDispatchCenter implements
                 return listener.onStaticMarkerClicked(marker);
             }
         } catch (Exception e) {
-            CallerLogger.INSTANCE.e(M_MAIN +TAG, "onStaticMarkerClicked error : " + e);
+            CallerLogger.INSTANCE.e(M_MAIN + TAG, "onStaticMarkerClicked error : " + e);
         }
         return false;
     }
@@ -138,7 +132,7 @@ public class EventDispatchCenter implements
                 try {
                     listener.onMapLoaded();
                 } catch (Exception e) {
-                    CallerLogger.INSTANCE.e(M_MAIN +TAG, "onMapLoaded error : " + e);
+                    CallerLogger.INSTANCE.e(M_MAIN + TAG, "onMapLoaded error : " + e);
                 }
             }
         }
@@ -156,7 +150,7 @@ public class EventDispatchCenter implements
                 try {
                     listener.onTouch(motionEvent);
                 } catch (Exception e) {
-                    CallerLogger.INSTANCE.e(M_MAIN +TAG, "onTouch error : " + e);
+                    CallerLogger.INSTANCE.e(M_MAIN + TAG, "onTouch error : " + e);
                 }
             }
         }
@@ -174,7 +168,7 @@ public class EventDispatchCenter implements
                 try {
                     listener.onPOIClick(poi);
                 } catch (Exception e) {
-                    CallerLogger.INSTANCE.e(M_MAIN +TAG, "onPOIClick error : " + e);
+                    CallerLogger.INSTANCE.e(M_MAIN + TAG, "onPOIClick error : " + e);
                 }
             }
         }
@@ -192,7 +186,7 @@ public class EventDispatchCenter implements
                 try {
                     listener.onMapClick(latLng);
                 } catch (Exception e) {
-                    CallerLogger.INSTANCE.e(M_MAIN +TAG, "onMapClick error : " + e);
+                    CallerLogger.INSTANCE.e(M_MAIN + TAG, "onMapClick error : " + e);
                 }
             }
         }
@@ -210,7 +204,7 @@ public class EventDispatchCenter implements
                 try {
                     listener.onLockMap(isLock);
                 } catch (Exception e) {
-                    CallerLogger.INSTANCE.e(M_MAIN +TAG, "onLockMap error : " + e);
+                    CallerLogger.INSTANCE.e(M_MAIN + TAG, "onLockMap error : " + e);
                 }
             }
         }
@@ -228,7 +222,7 @@ public class EventDispatchCenter implements
                 try {
                     listener.onMapModeChanged(ui);
                 } catch (Exception e) {
-                    CallerLogger.INSTANCE.e(M_MAIN +TAG, "onMapModeChanged error :" + e);
+                    CallerLogger.INSTANCE.e(M_MAIN + TAG, "onMapModeChanged error :" + e);
                 }
             }
         }
@@ -246,7 +240,7 @@ public class EventDispatchCenter implements
                 try {
                     listener.onMapVisualAngleChanged(visualAngleMode);
                 } catch (Exception e) {
-                    CallerLogger.INSTANCE.e(M_MAIN +TAG, "onMapVisualAngleChanged error : " + e);
+                    CallerLogger.INSTANCE.e(M_MAIN + TAG, "onMapVisualAngleChanged error : " + e);
                 }
             }
         }
@@ -266,7 +260,7 @@ public class EventDispatchCenter implements
                 try {
                     listener.onMapChanged(location, zoom, tilt, bearing);
                 } catch (Exception e) {
-                    CallerLogger.INSTANCE.e(M_MAIN +TAG, "onMapChanged error :" + e);
+                    CallerLogger.INSTANCE.e(M_MAIN + TAG, "onMapChanged error :" + e);
                 }
             }
         }
@@ -284,7 +278,7 @@ public class EventDispatchCenter implements
                 try {
                     listener.onInitNaviFailure();
                 } catch (Exception e) {
-                    CallerLogger.INSTANCE.e(M_MAIN +TAG, "onInitNaviFailure error : " + e);
+                    CallerLogger.INSTANCE.e(M_MAIN + TAG, "onInitNaviFailure error : " + e);
                 }
             }
         }
@@ -302,7 +296,7 @@ public class EventDispatchCenter implements
                 try {
                     listener.onInitNaviSuccess();
                 } catch (Exception e) {
-                    CallerLogger.INSTANCE.e(M_MAIN +TAG, "onInitNaviSuccess error : " + e);
+                    CallerLogger.INSTANCE.e(M_MAIN + TAG, "onInitNaviSuccess error : " + e);
                 }
             }
         }
@@ -321,7 +315,7 @@ public class EventDispatchCenter implements
                 try {
                     listener.onNaviInfoUpdate(naviinfo);
                 } catch (Exception e) {
-                    CallerLogger.INSTANCE.e(M_MAIN +TAG, "onNaviInfoUpdate error : " + e);
+                    CallerLogger.INSTANCE.e(M_MAIN + TAG, "onNaviInfoUpdate error : " + e);
                 }
             }
         }
@@ -340,7 +334,7 @@ public class EventDispatchCenter implements
                 try {
                     listener.onStartNavi();
                 } catch (Exception e) {
-                    CallerLogger.INSTANCE.e(M_MAIN +TAG, "onStartNavi error : " + e);
+                    CallerLogger.INSTANCE.e(M_MAIN + TAG, "onStartNavi error : " + e);
                 }
             }
         }
@@ -358,7 +352,7 @@ public class EventDispatchCenter implements
                 try {
                     listener.onStopNavi();
                 } catch (Exception e) {
-                    CallerLogger.INSTANCE.e(M_MAIN +TAG, "onStopNavi error : " + e);
+                    CallerLogger.INSTANCE.e(M_MAIN + TAG, "onStopNavi error : " + e);
                 }
             }
         }
@@ -376,7 +370,7 @@ public class EventDispatchCenter implements
                 try {
                     listener.onCalculateSuccess();
                 } catch (Exception e) {
-                    CallerLogger.INSTANCE.e(M_MAIN +TAG, "onCalculateSuccess error : " + e);
+                    CallerLogger.INSTANCE.e(M_MAIN + TAG, "onCalculateSuccess error : " + e);
                 }
             }
         }
@@ -394,7 +388,7 @@ public class EventDispatchCenter implements
                 try {
                     listener.onoCalculateFailed();
                 } catch (Exception e) {
-                    CallerLogger.INSTANCE.e(M_MAIN +TAG, "onoCalculateFailed error : " + e);
+                    CallerLogger.INSTANCE.e(M_MAIN + TAG, "onoCalculateFailed error : " + e);
                 }
             }
         }
@@ -414,104 +408,10 @@ public class EventDispatchCenter implements
                 try {
                     listener.onLocationChanged(location);
                 } catch (Exception e) {
-                    CallerLogger.INSTANCE.e(M_MAIN +TAG, "onLocationChanged error : " + e);
+                    CallerLogger.INSTANCE.e(M_MAIN + TAG, "onLocationChanged error : " + e);
                 }
             }
         }
     }
 
-    @Override
-    public void northModel() {
-        Iterator<IMogoADASControlStatusChangedListener> iterator = MogoRegisterCenterHandler.getInstance().getAdasControlStatusChangedListeners();
-        if (iterator == null) {
-            return;
-        }
-        while (iterator.hasNext()) {
-            IMogoADASControlStatusChangedListener listener = iterator.next();
-            if (listener == null) {
-                continue;
-            }
-            try {
-                listener.onMapUiModeChanged(EnumMapUI.NorthUP_2D);
-            } catch (Exception e) {
-                CallerLogger.INSTANCE.e(M_MAIN +TAG, "northModel error : " + e);
-            }
-        }
-    }
-
-    @Override
-    public void carHeadUp() {
-        Iterator<IMogoADASControlStatusChangedListener> iterator = MogoRegisterCenterHandler.getInstance().getAdasControlStatusChangedListeners();
-        if (iterator == null) {
-            return;
-        }
-        while (iterator.hasNext()) {
-            IMogoADASControlStatusChangedListener listener = iterator.next();
-            if (listener == null) {
-                continue;
-            }
-            try {
-                listener.onMapUiModeChanged(EnumMapUI.CarUp_2D);
-            } catch (Exception e) {
-                CallerLogger.INSTANCE.e(M_MAIN +TAG, "carHeadUp error : " + e);
-            }
-        }
-    }
-
-    @Override
-    public void switchCarChat(EnumCarChatIncognitoMode enumCarChatIncognitoMode) {
-        Iterator<IMogoADASControlStatusChangedListener> iterator = MogoRegisterCenterHandler.getInstance().getAdasControlStatusChangedListeners();
-        if (iterator == null) {
-            return;
-        }
-        while (iterator.hasNext()) {
-            IMogoADASControlStatusChangedListener listener = iterator.next();
-            if (listener == null) {
-                continue;
-            }
-            try {
-                listener.onCarStatusChanged(enumCarChatIncognitoMode == EnumCarChatIncognitoMode.OPEN);
-            } catch (Exception e) {
-                CallerLogger.INSTANCE.e(M_MAIN +TAG, "switchCarChat error : " + e);
-            }
-        }
-    }
-
-    @Override
-    public void whiteModel() {
-        Iterator<IMogoADASControlStatusChangedListener> iterator = MogoRegisterCenterHandler.getInstance().getAdasControlStatusChangedListeners();
-        if (iterator == null) {
-            return;
-        }
-        while (iterator.hasNext()) {
-            IMogoADASControlStatusChangedListener listener = iterator.next();
-            if (listener == null) {
-                continue;
-            }
-            try {
-                listener.onMapUiModeChanged(EnumMapUI.Type_Light);
-            } catch (Exception e) {
-                CallerLogger.INSTANCE.e(M_MAIN +TAG, "whiteModel error : " + e);
-            }
-        }
-    }
-
-    @Override
-    public void blackModel() {
-        Iterator<IMogoADASControlStatusChangedListener> iterator = MogoRegisterCenterHandler.getInstance().getAdasControlStatusChangedListeners();
-        if (iterator == null) {
-            return;
-        }
-        while (iterator.hasNext()) {
-            IMogoADASControlStatusChangedListener listener = iterator.next();
-            if (listener == null) {
-                continue;
-            }
-            try {
-                listener.onMapUiModeChanged(EnumMapUI.Type_Night);
-            } catch (Exception e) {
-                CallerLogger.INSTANCE.e(M_MAIN +TAG, "blackModel error : " + e);
-            }
-        }
-    }
 }
diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java
index cf554a11b5..0858fe21b9 100644
--- a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java
+++ b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java
@@ -1,7 +1,7 @@
 package com.mogo.eagle.core.function.main;
 
-import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_MAIN;
 import static com.mogo.eagle.core.function.main.MainPresenter.MOGO_PERMISSION_REQUEST_CODE;
+import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_MAIN;
 
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -24,13 +24,13 @@ import com.mogo.commons.mvp.MvpActivity;
 import com.mogo.commons.mvp.MvpFragment;
 import com.mogo.eagle.core.data.constants.MoGoFragmentPaths;
 import com.mogo.eagle.core.data.map.MogoLocation;
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
 import com.mogo.eagle.core.function.main.cards.MogoModulesManager;
 import com.mogo.eagle.core.function.main.service.MogoMainService;
 import com.mogo.eagle.core.function.main.utils.DisplayEffectsHelper;
 import com.mogo.eagle.core.function.main.windowview.FloatingViewHandler;
 import com.mogo.eagle.core.utilcode.mogo.AppLaunchTimeUtils;
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.mogo.permissions.PermissionsDialogUtils;
 import com.mogo.eagle.core.utilcode.mogo.toast.ResourcesHelper;
 import com.mogo.eagle.core.utilcode.util.NetworkUtils;
@@ -48,9 +48,6 @@ import com.mogo.service.fragmentmanager.IMogoFragmentManager;
 import com.mogo.service.statusmanager.IMogoStatusChangedListener;
 import com.mogo.service.statusmanager.IMogoStatusManager;
 import com.mogo.service.statusmanager.StatusDescriptor;
-import com.zhidao.adasconfig.api.AdasConfigApiController;
-import com.zhidao.adasconfig.common.log.LoggerController;
-import com.zhidao.autopilot.support.api.AutopilotServiceManage;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -183,7 +180,6 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
         }
         mMogoStatusManager = mServiceApis.getStatusManagerApi();
         mMogoStatusManager.setMainPageLaunchedStatus(TAG, true);
-        AutopilotServiceManage.getInstance().init(getContext());
     }
 
     @Override
@@ -253,10 +249,6 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
 
     private void initAdasControlStatusListener() {
         mServiceApis.getRegisterCenterApi().registerADASControlStatusChangedListener(TAG, this);
-        AdasConfigApiController.getInstance().registerAdasSettingUiListener(EventDispatchCenter.getInstance());
-        AdasConfigApiController.getInstance().registerAdasSettingSkinModelListener(EventDispatchCenter.getInstance());
-        AdasConfigApiController.getInstance().init(getApplicationContext());
-        LoggerController.setPrinterLog(DebugConfig.isDebug());
     }
 
     private void startBaseService() {
@@ -394,9 +386,9 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
             mMogoFragmentManager = null;
         }
         IMogoMapUIController mapUIController = CallerMapUIServiceManager.INSTANCE.getMapUIController();
-        if (mapUIController != null) mapUIController.destroy();
-        AdasConfigApiController.getInstance().release();
-        mServiceApis.getAdasControllerApi().release();
+        if (mapUIController != null) {
+            mapUIController.destroy();
+        }
         CallerLogger.INSTANCE.d(M_MAIN + TAG, "destroy.");
         ContextHolderUtil.releaseContext();
         MogoModulesManager.getInstance().onDestroy();
diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java
index 1736c94d14..d8b205af5c 100644
--- a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java
+++ b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java
@@ -323,8 +323,6 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
         MogoModulePaths.addBaseModule(new MogoModule(UpgradeReportConstants.PATH, UpgradeReportConstants.NAME));
         // 初始化 apm 日志采集
         MogoModulePaths.addBaseModule(new MogoModule(CrashReportConstants.PATH, CrashReportConstants.NAME));
-        // 车聊聊，IM
-        MogoModulePaths.addModule(new MogoModule(ChatConsts.CHAT_PROVIDER_PATH, ChatConsts.CHAT_MODULE_NAME));
 
         MogoModulePaths.addBaseModule(new MogoModule(MapApiPath.PATH, "CustomMapApiBuilder"));
         MogoModulePaths.addBaseModule(new MogoModule(ServiceConst.PATH_REFRESH_STRATEGY, ServiceConst.PATH_REFRESH_STRATEGY));
@@ -338,6 +336,8 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
         MogoModulePaths.addModuleFunctionServer(new MogoModule(MogoServicePaths.PATH_AI_MONITORING, "IMoGoMonitoringProvider"));
         // 云公告发布
         MogoModulePaths.addModuleFunctionServer(new MogoModule(MogoServicePaths.PATH_AI_NOTICE, "IMoGoNoticeProvider"));
+        // 车聊聊，IM
+        MogoModulePaths.addModuleFunctionServer(new MogoModule(ChatConsts.CHAT_PROVIDER_PATH, ChatConsts.CHAT_MODULE_NAME));
         // 调度
         MogoModulePaths.addBaseModule(new MogoModule(MogoServicePaths.PATH_AI_DISPATCH, "IDispatchProvider"));
         // V2X 模块
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapFragment.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapFragment.java
index 5b3fba0e35..87466607b4 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapFragment.java
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapFragment.java
@@ -10,6 +10,7 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.mogo.commons.mvp.MvpFragment;
 import com.mogo.eagle.core.data.constants.MoGoFragmentPaths;
 import com.mogo.eagle.core.data.constants.MogoServicePaths;
+import com.mogo.eagle.core.data.map.CenterLine;
 import com.mogo.eagle.core.function.api.map.IMogoMapFrameController;
 import com.mogo.eagle.core.function.api.map.hd.IMoGoMapFragmentProvider;
 import com.mogo.eagle.core.function.call.base.CallerBase;
@@ -18,8 +19,6 @@ import com.mogo.map.IMogoUiSettings;
 import com.mogo.map.MogoMapView;
 import com.mogo.map.uicontroller.EnumMapUI;
 import com.mogo.map.uicontroller.IMogoMapUIController;
-import com.mogo.module.common.MogoApisHandler;
-import com.mogo.service.IMogoServiceApis;
 
 /**
  * @author donghongyu
@@ -29,7 +28,7 @@ import com.mogo.service.IMogoServiceApis;
  * 地图图层，地图操作都在这个图层完成
  */
 @Route(path = MoGoFragmentPaths.PATH_FRAGMENT_MAP)
-public class MapFragment extends MvpFragment< MapView, MapPresenter >
+public class MapFragment extends MvpFragment<MapView, MapPresenter>
         implements MapView, IMogoMapFrameController, IMoGoMapFragmentProvider {
 
     private static final String TAG = "MapFragment";
@@ -55,7 +54,7 @@ public class MapFragment extends MvpFragment< MapView, MapPresenter >
     }
 
     @Override
-    public void initDelegate( IMogoMapFrameController controller ) {
+    public void initDelegate(IMogoMapFrameController controller) {
         // do not implement
     }
 
@@ -67,55 +66,55 @@ public class MapFragment extends MvpFragment< MapView, MapPresenter >
     @Override
     public void changeToVRMode() {
         try {
-            mMogoMapView.getMap().getUIController().changeMapMode( EnumMapUI.Type_VR);
-        } catch ( Exception e ) {
+            mMogoMapView.getMap().getUIController().changeMapMode(EnumMapUI.Type_VR);
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
 
     @Override
-    public void init( Context context ) {
+    public void init(Context context) {
         // do not implement
     }
 
     @Override
-    protected void initViews( Bundle savedInstanceState ) {
-        super.initViews( savedInstanceState );
-        mMogoMapView = findViewById( R.id.module_map_id_map );
-        mMogoMapView.onCreate( savedInstanceState );
+    protected void initViews(Bundle savedInstanceState) {
+        super.initViews(savedInstanceState);
+        mMogoMapView = findViewById(R.id.module_map_id_map);
+        mMogoMapView.onCreate(savedInstanceState);
         mMogoMap = mMogoMapView.getMap();
-        if ( mMogoMap != null ) {
-            mMogoMap.getUIController().showMyLocation( true );
+        if (mMogoMap != null) {
+            mMogoMap.getUIController().showMyLocation(true);
         }
     }
 
     @NonNull
     @Override
     protected MapPresenter createPresenter() {
-        return new MapPresenter( this );
+        return new MapPresenter(this);
     }
 
     @Override
-    public void onActivityCreated( @Nullable Bundle savedInstanceState ) {
-        super.onActivityCreated( savedInstanceState );
+    public void onActivityCreated(@Nullable Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
         initMapView();
     }
 
     @Override
-    public void onSaveInstanceState( @NonNull Bundle outState ) {
-        super.onSaveInstanceState( outState );
-        if ( mMogoMapView != null ) {
-            mMogoMapView.onSaveInstanceState( outState );
+    public void onSaveInstanceState(@NonNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+        if (mMogoMapView != null) {
+            mMogoMapView.onSaveInstanceState(outState);
         }
     }
 
     @Override
     public void onPause() {
         super.onPause();
-        if ( mIsControllerByOthersStatus ) {
+        if (mIsControllerByOthersStatus) {
             return;
         }
-        if ( mMogoMapView != null ) {
+        if (mMogoMapView != null) {
             mMogoMapView.onPause();
         }
     }
@@ -123,10 +122,10 @@ public class MapFragment extends MvpFragment< MapView, MapPresenter >
     @Override
     public void onResume() {
         super.onResume();
-        if ( mIsControllerByOthersStatus ) {
+        if (mIsControllerByOthersStatus) {
             return;
         }
-        if ( mMogoMapView != null ) {
+        if (mMogoMapView != null) {
             mMogoMapView.onResume();
         }
     }
@@ -134,38 +133,38 @@ public class MapFragment extends MvpFragment< MapView, MapPresenter >
     @Override
     public void onLowMemory() {
         super.onLowMemory();
-        if ( mMogoMapView != null ) {
+        if (mMogoMapView != null) {
             mMogoMapView.onLowMemory();
         }
     }
 
     private void initMapView() {
         mMogoMap = mMogoMapView.getMap();
-        if ( mMogoMap == null ) {
+        if (mMogoMap == null) {
             return;
         }
         IMogoUiSettings uiSettings = mMogoMap.getUiSettings();
-        if ( uiSettings != null ) {
+        if (uiSettings != null) {
             //设置所有手势是否可用
-            uiSettings.setAllGesturesEnabled( true );
+            uiSettings.setAllGesturesEnabled(true);
             //设置指南针是否可见。
-            uiSettings.setCompassEnabled( false );
+            uiSettings.setCompassEnabled(false);
             //设置室内地图楼层切换控件是否可见。
-            uiSettings.setIndoorSwitchEnabled( true );
+            uiSettings.setIndoorSwitchEnabled(true);
             //设置定位按钮是否可见。
-            uiSettings.setMyLocationButtonEnabled( false );
+            uiSettings.setMyLocationButtonEnabled(false);
             //设置旋转手势是否可用。
-            uiSettings.setRotateGesturesEnabled( false );
+            uiSettings.setRotateGesturesEnabled(false);
             //设置比例尺控件是否可见
-            uiSettings.setScaleControlsEnabled( true );
+            uiSettings.setScaleControlsEnabled(true);
             //设置拖拽手势是否可用。
-            uiSettings.setScrollGesturesEnabled( true );
+            uiSettings.setScrollGesturesEnabled(true);
             //设置倾斜手势是否可用。
-            uiSettings.setTiltGesturesEnabled( true );
+            uiSettings.setTiltGesturesEnabled(true);
             //设置缩放按钮是否可见。
-            uiSettings.setZoomControlsEnabled( false );
+            uiSettings.setZoomControlsEnabled(false);
             //设置双指缩放手势是否可用。
-            uiSettings.setZoomGesturesEnabled( true );
+            uiSettings.setZoomGesturesEnabled(true);
         }
     }
 
@@ -181,7 +180,7 @@ public class MapFragment extends MvpFragment< MapView, MapPresenter >
 
     @Override
     public void onDestroyView() {
-        if ( mMogoMapView != null ) {
+        if (mMogoMapView != null) {
             mMogoMapView.onDestroy();
             mMogoMapView = null;
             mMogoMap = null;
@@ -208,6 +207,7 @@ public class MapFragment extends MvpFragment< MapView, MapPresenter >
 
     /**
      * sight mode
+     *
      * @param mode
      */
     public static final int SIGHT_MODE_NORMAL = 0;
@@ -218,13 +218,13 @@ public class MapFragment extends MvpFragment< MapView, MapPresenter >
 
     @Override
     public void setMapDAngle(int mode) {
-        float angle =  getSightModeAngle(mode);
+        float angle = getSightModeAngle(mode);
         mMogoMapView.getMap().getUIController().setMapDAngle(angle);
     }
 
     private float getSightModeAngle(int mode) {
         float angle = 0.0f;
-        switch (mode){
+        switch (mode) {
             case SIGHT_MODE_NORMAL:
                 angle = 16.5f;
             case SIGHT_MODE_TOP:
@@ -239,4 +239,9 @@ public class MapFragment extends MvpFragment< MapView, MapPresenter >
         return angle;
     }
 
+    @Nullable
+    @Override
+    public CenterLine getCenterLineInfo(double lon, double lat, float angle) {
+        return mMogoMapView.getMap().getUIController().getCenterLineInfo(lon, lat, angle);
+    }
 }
diff --git a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt
index befc31de96..5321d8fbd2 100644
--- a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt
+++ b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt
@@ -2,6 +2,7 @@ package com.mogo.eagle.core.function.obu.mogo
 
 import android.content.Context
 import android.telecom.Call
+import android.util.Log
 import com.alibaba.android.arouter.launcher.ARouter
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.constants.MogoServicePaths
@@ -394,6 +395,20 @@ class MogoPrivateObuManager private constructor() {
                 && info.ext_info.lights != null
                 && info.ext_info.lights.isNotEmpty()
             ) {
+                //v2i数据传输延迟
+//                val hvMillTime = info.threat_info.hv_time.millisecond
+//                val hvSecondMillTime = (info.threat_info.hv_time.second) * 1000
+//                val hvTime = hvMillTime + hvSecondMillTime
+//                val currentTime = TimeUtils.getNowMills() % 60000
+//                val delayTime = currentTime - hvTime
+
+//                Log.e("liyz", "onCvxIvpThreatIndInfo ---> currentTime =  $currentTime ----- hvTime--->  $hvTime ---hvMillTime = $hvMillTime ----hvSecondMillTime = $hvSecondMillTime ---delayTime---> $delayTime")
+//                CallerObuListenerManager.invokeDelayTime(delayTime)
+//                CallerLogger.e(
+//                        "$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
+//                        "onCvxIvpThreatIndInfo red ---delayTime---> $delayTime"
+//                )
+
                 handlerTrafficLight(
                         info.threat_info.app_id,
                         info.status,
@@ -409,15 +424,18 @@ class MogoPrivateObuManager private constructor() {
             // 交通参与者类型 0x0:未知 UNKNOWN | 0x1:非机动车 NON_MOTOR | 0x2:行人 PEDESTRIAN 0x3:RSU
             if (info != null && (info.ptc_type == 1 || info.ptc_type == 2)) {
                 //v2i数据传输延迟
-                val hvTime = info.threat_info.hv_time.millisecond
-                val currentTime = TimeUtils.getNowMills()
-                val delayTime = currentTime - hvTime
-                CallerObuListenerManager.invokeDelayTime(delayTime)
+//                val hvMillTime = info.threat_info.hv_time.millisecond
+//                val hvSecondMillTime = (info.threat_info.hv_time.second) * 1000
+//                val hvTime = hvMillTime + hvSecondMillTime
+//                val currentTime = TimeUtils.getNowMills() % 60000
+//                val delayTime = currentTime - hvTime
 
-                CallerLogger.d(
-                        "$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
-                        "onCvxPtcInfoIndInfo ---delayTime---> $delayTime"
-                )
+//                Log.e("liyz", "onCvxPtcThreatIndInfo ---> currentTime =  $currentTime ----- hvTime--->  $hvTime ---hvMillTime = $hvMillTime ----hvSecondMillTime = $hvSecondMillTime ---delayTime---> $delayTime")
+//                CallerObuListenerManager.invokeDelayTime(delayTime)
+//                CallerLogger.d(
+//                        "$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
+//                        "onCvxPtcInfoIndInfo ---delayTime---> $delayTime"
+//                )
 
                 CallerLogger.d(
                         "$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
@@ -515,7 +533,7 @@ class MogoPrivateObuManager private constructor() {
                 //预警信息,预警类型 threat_level 2、3
                 info.threat_info?.let {
                     //预警方位
-                    val direction = getMessageDirection(info.ext_info.target_classification)
+                    val direction = getMessageDirection(if (info.ext_info != null) info.ext_info.target_classification else -1)
                     //处理预警类型
                     val appId = info.threat_info.app_id
                     val level = info.threat_info.threat_level
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XRoadEventScenario.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XRoadEventScenario.java
index ed566537b0..72dbae0235 100644
--- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XRoadEventScenario.java
+++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XRoadEventScenario.java
@@ -13,9 +13,13 @@ import com.mogo.eagle.core.function.v2x.events.manager.V2XStatusManager;
 import com.mogo.eagle.core.function.v2x.events.scenario.impl.AbsV2XScenario;
 import com.mogo.eagle.core.function.v2x.events.scenario.view.IV2XMarker;
 import com.mogo.eagle.core.network.utils.GsonUtil;
+import com.mogo.module.common.entity.MarkerExploreWay;
 import com.mogo.module.common.entity.V2XMessageEntity;
 import com.mogo.module.common.entity.V2XRoadEventEntity;
+import com.mogo.module.common.enums.EventTypeEnum;
 import com.mogo.service.analytics.IMogoAnalytics;
+import com.mogo.service.v2x.DisplayEffectsInterface;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -121,8 +125,18 @@ public class V2XRoadEventScenario extends AbsV2XScenario<V2XRoadEventEntity> imp
         CallerVisualAngleManager.INSTANCE.changeVisualAngle(CallerVisualAngleManager.Scene.RoadEvent.INSTANCE);
         CallerHmiManager.INSTANCE.showWarning(WarningDirectionEnum.ALERT_WARNING_TOP, TimeUnit.HOURS.toMillis(1));
         V2XMessageEntity<V2XRoadEventEntity> entity = getV2XMessageEntity();
-        if (entity != null && entity.isNeedAddLine()) {
-            drawPOI();
+        if (entity != null) {
+            if (entity.isNeedAddLine()) {
+                drawPOI();
+            }
+            DisplayEffectsInterface wu = BridgeApi.INSTANCE.displayEffects();
+            V2XRoadEventEntity content = entity.getContent();
+            if (wu != null && content != null) {
+                MarkerExploreWay noveltyInfo = content.getNoveltyInfo();
+                if (noveltyInfo != null && EventTypeEnum.FOURS_FOG.getPoiType().equals(content.getNoveltyInfo().getPoiType())) {
+                    wu.displayEffects(EventTypeEnum.FOURS_FOG.getPoiType());
+                }
+            }
         }
     }
 
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/speedlimit/SpeedLimitDataManager.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/speedlimit/SpeedLimitDataManager.java
index 34072f1dc8..5c236f86c7 100644
--- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/speedlimit/SpeedLimitDataManager.java
+++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/speedlimit/SpeedLimitDataManager.java
@@ -12,6 +12,10 @@ import com.mogo.module.common.MogoApisHandler;
 import java.util.Timer;
 import java.util.TimerTask;
 
+/**
+ * 限速
+ * @author mogoauto
+ */
 public class SpeedLimitDataManager implements IMogoCarLocationChangedListener2 {
 
     private static SpeedLimitDataManager instance ;
@@ -35,7 +39,7 @@ public class SpeedLimitDataManager implements IMogoCarLocationChangedListener2 {
         public void run() {
             if (mLocation != null){
                 if (MogoMapUIController.getInstance() != null) {
-                    int speedLimmit = MogoMapUIController.getInstance().getSpeedLimmit(mLocation.getLongitude(), mLocation.getLatitude(), mLocation.getBearing());
+                    int speedLimmit = MogoMapUIController.getInstance().getLimitSpeed(mLocation.getLongitude(), mLocation.getLatitude(), mLocation.getBearing());
                     UiThreadHandler.post(new Runnable() {
                         @Override
                         public void run() {
diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/AppConfigInfo.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/AppConfigInfo.kt
index abff289ee1..0347ce8be0 100644
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/AppConfigInfo.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/AppConfigInfo.kt
@@ -30,6 +30,8 @@ object AppConfigInfo {
     var plateNumber: String? = null
     //工控机MAC地址
     var iPCMacAddress: String? = null
+    //工控机协议版本
+    var protocolVersionNumber: Int = 0
 
     /**
      * debug 测试环境--2
diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MoGoConfig.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MoGoConfig.kt
index ab33038541..815eb08e8e 100644
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MoGoConfig.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MoGoConfig.kt
@@ -20,4 +20,7 @@ object MoGoConfig {
     // 是否是演示（美化）模式，会存在SP中，方便做现场恢复
     const val IS_DEMO_MODE = "IS_DEMO_MODE"
 
+    //根据加速度判断是否刹车阈值
+    const val BRAKE_ACCELERATION_THRESHOLD = "BRAKE_ACCELERATION_THRESHOLD"
+
 }
\ No newline at end of file
diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt
index 33ca2bcf14..370186546d 100644
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt
@@ -8,14 +8,16 @@ class ChainConstant {
         const val CHAIN_LINK_ADAS = 1
 
         const val CHAIN_LINK_LOG_CONNECT_STATUS = 0
-        const val CHAIN_LINK_LOG_WEB_SOCKET_DATA = 1
+        const val CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT = 1
         const val CHAIN_LINK_LOG_WEB_SOCKET_DATA_TRACKED = 2
         const val CHAIN_LINK_LOG_WEB_SOCKET_TRAJECTORY = 3
-        const val CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT = 4
-        const val CHAIN_LINK_LOG_WEB_SOCKET_BAD_CASE = 5
+        const val CHAIN_LINK_LOG_WEB_SOCKET_VEHICLE = 4
 
         const val CHAIN_LINK_LOG_ADAS_INIT = "-adasInitStatus"
-        const val CHAIN_LINK_LOG_ADAS_MSG = "-adasWsMsg"
+        const val CHAIN_LINK_LOG_ADAS_AUTO = "-adasWsAutoPilot"
+        const val CHAIN_LINK_LOG_ADAS_DATA_TRACK = "-adasWsDataTrack"
+        const val CHAIN_LINK_LOG_ADAS_TRAJECTORY = "-adasWsTrajectory"
+        const val CHAIN_LINK_LOG_ADAS_VEHICLE = "-adasWsVehicle"
 
 
         const val CHAIN_ALIAS_CODE_ADAS_MESSAGE_RECT_DATA = "PAD_ADAS_MESSAGE_AUTOPILOT_RECT_DATA"
@@ -26,6 +28,7 @@ class ChainConstant {
         const val CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_TRAJECTORY = "PAD_ADAS_MESSAGE_AUTOPILOT_TRAJECTORY"
         const val CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_GUARDIAN = "PAD_ADAS_MESSAGE_AUTOPILOT_GUARDIAN"
         const val CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_RECORD = "PAD_ADAS_MESSAGE_AUTOPILOT_RECORD"
+        const val CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_VEHICLE = "PAD_ADAS_MESSAGE_AUTOPILOT_VEHICLE"
         const val CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_WARN = "PAD_ADAS_MESSAGE_AUTOPILOT_WARN"
     }
 }
\ No newline at end of file
diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/CenterLine.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/CenterLine.kt
new file mode 100644
index 0000000000..a1dde64951
--- /dev/null
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/CenterLine.kt
@@ -0,0 +1,19 @@
+package com.mogo.eagle.core.data.map
+
+
+/**
+ * 道路中心经纬度集合
+ */
+class CenterLine {
+    var id = "" //id
+    var tile_id = "" //瓦片id
+    var road_id = ""//道路id
+    var lane_id = ""//车道id
+    var points: ArrayList<LonLatPoint>? = null//道路经纬度
+    var angle: Double? = 0.0//车道线id
+    override fun toString(): String {
+        return "CenterLine(id='$id', tile_id='$tile_id', road_id='$road_id', lane_id='$lane_id', points=$points, angle=$angle)"
+    }
+
+
+}
\ No newline at end of file
diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/LonLatPoint.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/LonLatPoint.java
new file mode 100644
index 0000000000..0f158d20d7
--- /dev/null
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/LonLatPoint.java
@@ -0,0 +1,111 @@
+package com.mogo.eagle.core.data.map;
+
+
+import java.io.Serializable;
+
+public class LonLatPoint implements Serializable {
+
+    private double longitude;
+    private double latitude;
+    private double altitude;
+    private int duration;
+    private double angle = 0;
+    private String provider;
+    private double distance;
+    private double speed;
+
+    public LonLatPoint() {
+    }
+
+    public LonLatPoint(double longitude, double latitude) {
+        this.longitude = longitude;
+        this.latitude = latitude;
+    }
+
+    public LonLatPoint(double longitude, double latitude, double angle) {
+        this.longitude = longitude;
+        this.latitude = latitude;
+        this.angle = angle;
+    }
+
+    public LonLatPoint(double longitude, double latitude, double altitude, double angle) {
+        this.longitude = longitude;
+        this.latitude = latitude;
+        this.altitude = altitude;
+        this.angle = angle;
+    }
+
+    public String getProvider() {
+        return provider;
+    }
+
+    public void setProvider(String provider) {
+        this.provider = provider;
+    }
+
+    public int getDuration() {
+        return duration;
+    }
+
+    public void setDuration(int duration) {
+        this.duration = duration;
+    }
+
+    public double getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(double longitude) {
+        this.longitude = longitude;
+    }
+
+    public double getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(double latitude) {
+        this.latitude = latitude;
+    }
+
+    public double getAltitude() {
+        return altitude;
+    }
+
+    public void setAltitude(double altitude) {
+        this.altitude = altitude;
+    }
+
+    public double getAngle() {
+        return angle;
+    }
+
+    public void setAngle(double angle) {
+        this.angle = angle;
+    }
+
+    public double getDistance() {
+        return distance;
+    }
+
+    public void setDistance(double distance) {
+        this.distance = distance;
+    }
+
+    public double getSpeed() {
+        return speed;
+    }
+
+    public void setSpeed(double speed) {
+        this.speed = speed;
+    }
+
+    @Override
+    public String toString() {
+        return "LonLatPoint{" +
+                "longitude=" + longitude +
+                ", latitude=" + latitude +
+                ", altitude=" + altitude +
+                ", angle=" + angle +
+                '}';
+    }
+}
diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotProvider.kt
index 32c838fee7..3650904216 100644
--- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotProvider.kt
+++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotProvider.kt
@@ -17,6 +17,11 @@ interface IMoGoAutopilotProvider : IMoGoFunctionServerProvider {
      */
     fun resetIpAddress(autoPilotIp: String)
 
+    /**
+     * 断开与工控机的连接
+     */
+    fun disconnectIpc()
+
     /**
      * 开启自动驾驶
      *
@@ -139,4 +144,9 @@ interface IMoGoAutopilotProvider : IMoGoFunctionServerProvider {
      * 域控制器是否连上了
      */
     fun isConnected(): Boolean
+
+    /**
+     *获取协议版本
+     */
+    fun getProtocolVersion(): Int
 }
\ No newline at end of file
diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotVehicleStateListener.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotVehicleStateListener.kt
index d14569289f..ac5f0ae827 100644
--- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotVehicleStateListener.kt
+++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotVehicleStateListener.kt
@@ -18,4 +18,9 @@ interface IMoGoAutopilotVehicleStateListener {
      * @param brakeLight
      */
     fun onAutopilotBrakeLightData(brakeLight: Boolean)
+
+    /**
+     * 车辆刹车灯 根据加速度
+     */
+    fun onAutopilotBrakeLightByAcceleration(acceleration: Double)
 }
\ No newline at end of file
diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt
index 6e0cf18547..1c49d1b112 100644
--- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt
+++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt
@@ -27,7 +27,7 @@ interface IDevaToolsProvider : IProvider {
     /**
      * 停止i抓取日志
      */
-    fun stopLogCatch()
+    fun stopLogCatch(logPrefixName: String?)
 
     /**
      * 获取链路信息
diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IMoGoDevaToolsListener.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IMoGoDevaToolsListener.kt
index 54742a3d82..021bfe69fa 100644
--- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IMoGoDevaToolsListener.kt
+++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IMoGoDevaToolsListener.kt
@@ -7,6 +7,13 @@ import com.mogo.eagle.core.data.deva.scene.SceneModule
  */
 interface IMoGoDevaToolsListener {
 
+    /**
+     * 日志抓取开始回调
+     */
+    fun onLogCatchStart(){
+
+    }
+
     /**
      * 日志抓取关闭回调(日志抓取忘记关闭，默认设置时长计时返回)
      */
diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/hd/IMoGoMapFragmentProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/hd/IMoGoMapFragmentProvider.kt
index 9ad854e209..9c732dd08c 100644
--- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/hd/IMoGoMapFragmentProvider.kt
+++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/hd/IMoGoMapFragmentProvider.kt
@@ -1,6 +1,7 @@
 package com.mogo.eagle.core.function.api.map.hd
 
 import androidx.annotation.RawRes
+import com.mogo.eagle.core.data.map.CenterLine
 import com.mogo.eagle.core.function.api.base.IMoGoFunctionServerProvider
 
 /**
@@ -28,4 +29,9 @@ interface IMoGoMapFragmentProvider : IMoGoFunctionServerProvider {
      * 设置地图视线角度
      */
     fun setMapDAngle(mode: Int)
+
+    /**
+     * 获取车道中心线信息
+     */
+    fun getCenterLineInfo(lon: Double, lat: Double, angle: Float): CenterLine?
 }
\ No newline at end of file
diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotManager.kt
index 24a60a5a5b..0c60fede33 100644
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotManager.kt
@@ -31,6 +31,13 @@ object CallerAutoPilotManager {
         providerApi?.resetIpAddress(autoPilotIp)
     }
 
+    /**
+     * 断开与工控机的连接
+     */
+    fun disconnectIpc(){
+        providerApi?.disconnectIpc()
+    }
+
     /**
      * 开启自动驾驶
      *
@@ -156,4 +163,11 @@ object CallerAutoPilotManager {
     fun getGlobalPath(){
         providerApi?.getGlobalPath()
     }
+
+    /**
+     *获取协议版本
+     */
+    fun getProtocolVersion(): Int{
+        return providerApi?.getProtocolVersion() ?:0
+    }
 }
\ No newline at end of file
diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotVehicleStateListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotVehicleStateListenerManager.kt
index 07d0f97a18..7be50470bd 100644
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotVehicleStateListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotVehicleStateListenerManager.kt
@@ -77,5 +77,16 @@ object CallerAutopilotVehicleStateListenerManager : CallerBase() {
         }
     }
 
+    /**
+     * 车辆刹车根据加速度判断
+     */
+    @Synchronized
+    fun invokeAutopilotBrakeLightByAcceleration(accrleration: Double) {
+        M_AUTOPILOT_VEHICLE_LISTENERS.forEach {
+            val listener = it.value
+            listener.onAutopilotBrakeLightByAcceleration(accrleration)
+        }
+    }
+
 
 }
\ No newline at end of file
diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsListenerManager.kt
index 3009b4de04..1363dd2dad 100644
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsListenerManager.kt
@@ -51,6 +51,13 @@ object CallerDevaToolsListenerManager {
         }
     }
 
+    fun invokeDevaToolsLogCatchStart() {
+        M_DEVA_TOOLS_LISTENER.forEach {
+            val listener = it.value
+            listener.onLogCatchStart()
+        }
+    }
+
     fun invokeDevaToolsLogCatchClose() {
         M_DEVA_TOOLS_LISTENER.forEach {
             val listener = it.value
diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt
index 1350291189..b018c1edf3 100644
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt
@@ -36,8 +36,8 @@ object CallerDevaToolsManager {
     /**
      * 停止抓取全量日志
      */
-    fun stopCatchLog() {
-        devaToolsProviderApi?.stopLogCatch()
+    fun stopCatchLog(logPrefixName:String? = null) {
+        devaToolsProviderApi?.stopLogCatch(logPrefixName)
     }
 
     /**
diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerHDMapManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerHDMapManager.kt
index 89415ff6fa..6da299df62 100644
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerHDMapManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerHDMapManager.kt
@@ -3,6 +3,7 @@ package com.mogo.eagle.core.function.call.map
 import androidx.annotation.RawRes
 import com.alibaba.android.arouter.launcher.ARouter
 import com.mogo.eagle.core.data.constants.MoGoFragmentPaths
+import com.mogo.eagle.core.data.map.CenterLine
 import com.mogo.eagle.core.function.api.map.hd.IMoGoMapFragmentProvider
 import com.mogo.eagle.core.function.call.base.CallerBase
 
@@ -14,7 +15,7 @@ import com.mogo.eagle.core.function.call.base.CallerBase
 object CallerHDMapManager : CallerBase() {
     private val mapProviderApi: IMoGoMapFragmentProvider
         get() = ARouter.getInstance().build(MoGoFragmentPaths.PATH_FRAGMENT_MAP)
-            .navigation() as IMoGoMapFragmentProvider;
+                .navigation() as IMoGoMapFragmentProvider;
 
     /**
      * 修改地图中心点
@@ -32,11 +33,21 @@ object CallerHDMapManager : CallerBase() {
      * 修改高精地图自车图标
      * 传入资源ID
      */
-    fun changeCurrentIcon(@RawRes iconId: Int){
+    fun changeCurrentIcon(@RawRes iconId: Int) {
         mapProviderApi.changeCurrentIcon(iconId)
     }
 
+    /**
+     * 设置地图视线角度
+     */
     fun setMapDAngle(mode: Int) {
         mapProviderApi.setMapDAngle(mode)
     }
+
+    /**
+     * 获取车道中心线信息
+     */
+    fun getCenterLineInfo(lon: Double, lat: Double, angle: Float): CenterLine? {
+        return mapProviderApi.getCenterLineInfo(lon, lat, angle)
+    }
 }
\ No newline at end of file
diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerVisualAngleManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerVisualAngleManager.kt
index 04b6929298..4f77285e52 100644
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerVisualAngleManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerVisualAngleManager.kt
@@ -83,6 +83,16 @@ object CallerVisualAngleManager {
     }
 
     fun init(ctx: Context) {
+        if (Thread.currentThread() != Looper.getMainLooper().thread) {
+            scope.launch {
+                initListen(ctx)
+            }
+        } else {
+            initListen(ctx)
+        }
+    }
+
+    private fun initListen(ctx: Context) {
         ctx.lifeCycleOwner.lifecycle.addObserver(object : LifecycleEventObserver {
             override fun onStateChanged(source: LifecycleOwner, event: Event) {
                 if (event == ON_DESTROY) {
diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/constants/SharedPrefsConstants.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/constants/SharedPrefsConstants.java
index bbcbbb9bb1..ee268eca8a 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/constants/SharedPrefsConstants.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/constants/SharedPrefsConstants.java
@@ -12,4 +12,7 @@ public class SharedPrefsConstants {
     public static final String LOCATION_LATITUDE = "location_latitude";
     public static final String LOCATION_LONGITUDE = "location_longitude";
 
+    public static final String CAR_MODE_TYPE = "car_mode_type";
+
+    public static final String MAC_ADDRESS = "mac_address";
 }
diff --git a/gradle.properties b/gradle.properties
index e4530c9ffa..db4c0100ce 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -56,33 +56,33 @@ bytex.forbidUseLenientMutationDuringGetArtifact=true
 bytex.verifyProguardConfigurationChanged=false
 bytex.ASM_API=ASM7
 
-HOOK_LOG_VERSION=1.5.17
-SERVICE_CHAIN_VERSION=1.0.53
+HOOK_LOG_VERSION=1.6.1
+SERVICE_CHAIN_VERSION=1.1.0
 ################  外部依赖引用 ################
 # loglib
-LOGLIB_VERSION=1.2.20
+LOGLIB_VERSION=1.2.23
 ######## MogoAiCloudSDK Version ########
-# 网络请求
-MOGO_NETWORK_VERSION=1.3.48
+# 网络请求LOGLIB_VERSION
+MOGO_NETWORK_VERSION=1.3.50
 # 鉴权
-MOGO_PASSPORT_VERSION=1.3.48
+MOGO_PASSPORT_VERSION=1.3.50
 # 常链接
-MOGO_SOCKET_VERSION=1.3.48
+MOGO_SOCKET_VERSION=1.3.50
 # 数据采集
-MOGO_REALTIME_VERSION=1.3.48
+MOGO_REALTIME_VERSION=1.3.50
 # 探路，道路事件发布，获取
-MOGO_TANLU_VERSION=1.3.48
+MOGO_TANLU_VERSION=1.3.50
 # 直播推流
-MOGO_LIVE_VERSION=1.3.48
+MOGO_LIVE_VERSION=1.3.50
 # 直播拉流
-MOGO_TRAFFICLIVE_VERSION=1.3.48
+MOGO_TRAFFICLIVE_VERSION=1.3.50
 # 定位服务
-MOGO_LOCATION_VERSION=1.3.48
+MOGO_LOCATION_VERSION=1.3.50
 # 远程通讯模块
-MOGO_TELEMATIC_VERSION=1.3.48
+MOGO_TELEMATIC_VERSION=1.3.50
 ######## MogoAiCloudSDK Version ########
 # 自研地图
-MAP_SDK_VERSION=2.0.9.4
+MAP_SDK_VERSION=2.0.9.6
 MAP_SDK_OPERATION_VERSION=1.0.12
 # websocket
 WEBSOCKET_VERSION=1.1.7
@@ -155,5 +155,5 @@ MOGO_OCH_TAXI_VERSION=2.0.66
 # mogoAiCloud sdk services
 MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.16.10
 # v2x-sdk
-MOGO_V2X_SDK_VERSION=1.3.48
+MOGO_V2X_SDK_VERSION=1.3.50
 ################# 旧版本架构模块版本 #################
diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java
index 89cbc56ab5..c90a05caab 100644
--- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java
+++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java
@@ -171,8 +171,8 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec
         ipcFixationIPHelper.start(ips);
     }
 
-    @ChainLog(linkCode = CHAIN_LINK_ADAS,
-            linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS,
+    @ChainLog(linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS,
+            linkCode = CHAIN_LINK_ADAS,
             endpoint = TracingConstants.Endpoint.PAD,
             nodeAliasCode = CHAIN_ALIAS_CODE_INIT,
             paramIndexes = {-1},
@@ -189,8 +189,8 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec
         connect();
     }
 
-    @ChainLog(linkCode = CHAIN_LINK_ADAS,
-            linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS,
+    @ChainLog(linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS,
+            linkCode = CHAIN_LINK_ADAS,
             endpoint = TracingConstants.Endpoint.PAD,
             nodeAliasCode = CHAIN_ALIAS_CODE_CONNECT_ADDRESS,
             paramIndexes = {0},
diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/socket/FpgaSocket.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/socket/FpgaSocket.java
index d266dce6e3..7238ffe7bb 100644
--- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/socket/FpgaSocket.java
+++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/socket/FpgaSocket.java
@@ -194,8 +194,8 @@ public class FpgaSocket implements IWebSocket {
 
     public class EchoWebSocketListener extends WebSocketListener {
 
-        @ChainLog(linkCode = CHAIN_LINK_ADAS,
-                linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS,
+        @ChainLog(linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS,
+                linkCode = CHAIN_LINK_ADAS,
                 endpoint = TracingConstants.Endpoint.PAD,
                 nodeAliasCode = CHAIN_ALIAS_CODE_WEB_SOCKET_OPEN,
                 paramIndexes = {1},
@@ -214,8 +214,8 @@ public class FpgaSocket implements IWebSocket {
             }
         }
 
-        @ChainLog(linkCode = CHAIN_LINK_ADAS,
-                linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_DATA,
+        @ChainLog(linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_DATA,
+                linkCode = CHAIN_LINK_ADAS,
                 endpoint = TracingConstants.Endpoint.PAD,
                 nodeAliasCode = CHAIN_ALIAS_CODE_WEB_SOCKET_MESSAGE_JSON,
                 paramIndexes = {1},
@@ -234,8 +234,8 @@ public class FpgaSocket implements IWebSocket {
             }
         }
 
-        @ChainLog(linkCode = CHAIN_LINK_ADAS,
-                linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_DATA,
+        @ChainLog(linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_DATA,
+                linkCode = CHAIN_LINK_ADAS,
                 endpoint = TracingConstants.Endpoint.PAD,
                 nodeAliasCode = CHAIN_ALIAS_CODE_WEB_SOCKET_MESSAGE_BYTE,
                 paramIndexes = {-1},
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java
index 9b75c847e6..65cb31af57 100644
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java
@@ -8,6 +8,7 @@ import android.view.View;
 import androidx.annotation.Nullable;
 import androidx.annotation.RawRes;
 
+import com.mogo.eagle.core.data.map.CenterLine;
 import com.mogo.eagle.core.data.map.MogoLatLng;
 
 import org.json.JSONObject;
@@ -108,12 +109,6 @@ public interface IMogoMapUIController {
      */
     void loseLockMode();
 
-    /**
-     * 设置锁车缩放级别
-     *
-     * @param var1 级别 3-20
-     */
-    void setLockZoom(int var1);
 
     /**
      * 预览全程
@@ -200,13 +195,6 @@ public interface IMogoMapUIController {
      */
     float calculateLineDistance(MogoLatLng p1, MogoLatLng p2) throws Exception;
 
-    /**
-     * 当前的视图模式
-     *
-     * @return
-     */
-    EnumMapUI getCurrentUiMode();
-
     /**
      * 锁车状态
      *
@@ -275,8 +263,17 @@ public interface IMogoMapUIController {
      * @param angle
      * @return
      */
-    int getSpeedLimmit(double lon, double lat, float angle);
+    int getLimitSpeed(double lon, double lat, float angle);
 
+    /**
+     * 获取车道中心线信息
+     *
+     * @param lon
+     * @param lat
+     * @param angle
+     * @return
+     */
+    CenterLine getCenterLineInfo(double lon, double lat, float angle);
 
     /**
      * 自研地图是否匹配道路
diff --git a/libraries/mogo-map/build.gradle b/libraries/mogo-map/build.gradle
index 4003766372..72a0a91306 100644
--- a/libraries/mogo-map/build.gradle
+++ b/libraries/mogo-map/build.gradle
@@ -46,6 +46,7 @@ dependencies {
 
     implementation rootProject.ext.dependencies.arouter
     kapt rootProject.ext.dependencies.aroutercompiler
+    // 高精地图
     implementation rootProject.ext.dependencies.mogocustommap
     if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
         implementation rootProject.ext.dependencies.mogo_core_utils
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 83f40c4775..0795fcac04 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
@@ -1,6 +1,5 @@
 package com.mogo.map;
 
-import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_DEVA;
 import static com.mogo.map.uicontroller.VisualAngleMode.MAP_STYLE_VR_ANGLE_300;
 import static com.mogo.map.uicontroller.VisualAngleMode.MAP_STYLE_VR_ANGLE_CROSS;
 import static com.mogo.map.uicontroller.VisualAngleMode.MAP_STYLE_VR_ANGLE_TOP;
@@ -22,6 +21,7 @@ import android.view.View;
 import com.mogo.commons.constants.SharedPrefsConstants;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.eagle.core.data.config.HdMapBuildConfig;
+import com.mogo.eagle.core.data.map.CenterLine;
 import com.mogo.eagle.core.data.map.MapRoadInfo;
 import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.eagle.core.data.map.MogoLocation;
@@ -94,7 +94,6 @@ public class AMapViewWrapper implements IMogoMapView,
         OnMapTouchListener,
         OnMarkClickListener,
         OnMapStyleListener,
-        MapStyleController.IMapStyleAutoChangedListener,
         OnMapViewVisualAngleChangeListener,
         OnRoadInfoListener {
 
@@ -108,14 +107,10 @@ public class AMapViewWrapper implements IMogoMapView,
             .naviCursorRes(R.drawable.ic_amap_navi_cursor)
             .build();
     private CarCursorOption mCarCursorOption = DEFAULT_OPTION;
-    private EnumMapUI mCurrentCarUIMode;
     private EnumMapUI mCurrentUI;
     private VisualAngleMode mVisualAngleMode = MODE_MEDIUM_SIGHT;
 
-    private int mLockZoom = 16;
-    private long startTime;
     private float mDefaultZoomLevel = 16.0f;
-    private boolean mIsCarLocked = false;
     private boolean mIsLightStyle = false;
     private boolean mMapLoaded = false;
     private boolean mIsFirstLocated = true;
@@ -125,7 +120,6 @@ public class AMapViewWrapper implements IMogoMapView,
     private volatile String mRoadId = null;
 
     public AMapViewWrapper(MapAutoView mMapView) {
-        startTime = System.currentTimeMillis();
         CallerLogger.INSTANCE.i(TAG, "autoop--AMapViewWrapper: init");
         this.mMapView = mMapView;
         initViews();
@@ -151,7 +145,6 @@ public class AMapViewWrapper implements IMogoMapView,
             }
             //修改自车模型，未来需区分车的类型
             options.setMyLocationStyle(options.getMyLocationStyle().myLocationIcon(HdMapBuildConfig.currentCarVrIconRes, true));
-//            MapAutoApi.INSTANCE.getMyLocationStyle().myLocationIcon(HdMapBuildConfig.currentCarVrIconRes, true);
         }
     }
 
@@ -179,7 +172,7 @@ public class AMapViewWrapper implements IMogoMapView,
         if (roadId != null && !TextUtils.isEmpty(roadId)) {
             CallerLogger.INSTANCE.d(TAG, "onRoadIdInfo::" + roadId);
             CallerMapRoadListenerManager.INSTANCE.invokeListenersOnRoadIdGet(roadId);
-        } else  {
+        } else {
             CallerLogger.INSTANCE.d(TAG, "onRoadIdInfo::null");
         }
     }
@@ -213,10 +206,10 @@ public class AMapViewWrapper implements IMogoMapView,
                 LonLatPoint p2 = points.get(points.size() - 1);
                 double distanceOfCarToStopLine = MapDataApi.INSTANCE.getNearstFromPointToSegment(carLoc.getLongitude(), carLoc.getLatitude(), p1.longitude, p1.latitude, p2.longitude, p2.latitude) * 10_0000;
                 stopInfo.setDistanceOfCarToStopLine(distanceOfCarToStopLine);
-                CallerLogger.INSTANCE.d(TAG, "onStopLineInfo: --- distance: "+ distanceOfCarToStopLine);
+                CallerLogger.INSTANCE.d(TAG, "onStopLineInfo: --- distance: " + distanceOfCarToStopLine);
                 CallerMapRoadListenerManager.INSTANCE.invokeListenersOnStopLineGet(stopInfo);
             }
-        } else  {
+        } else {
             if (carLoc != null) {
                 CallerLogger.INSTANCE.d(TAG, "onStopLineInfo::null, car_loc:{lon: " + carLoc.getLatitude() + ", lat: " + carLoc.getLongitude() + "}");
             }
@@ -373,32 +366,6 @@ public class AMapViewWrapper implements IMogoMapView,
         if (checkAMapView()) {
             mMapView.getMapAutoViewHelper().setScaleVRMode(true);
             mMapView.getMapAutoViewHelper().setMapStyle(MapAutoApi.MAP_STYLE_VR);
-            // TODO 这里临时修改关闭2D
-//            switch (ui) {
-//                case CarUp_2D:
-//                case CarUp_3D:
-//                case NorthUP_2D:
-//                    setUIMode(ui);
-//                    break;
-//                case Type_VR:
-//                    mMapView.getMapAutoViewHelper().setScaleVRMode(true);
-//                    mMapView.getMapAutoViewHelper().setMapStyle(MapAutoApi.MAP_STYLE_VR);
-//                    return;
-//                case Type_Light:
-//                    mMapView.getMapAutoViewHelper().setAutoSwitchStyle(false);
-//                    mMapView.getMapAutoViewHelper().setMapStyle(MapAutoApi.MAP_STYLE_DAY);
-//                    mIsLightStyle = true;
-//                    break;
-//                case Type_Night:
-//                    mMapView.getMapAutoViewHelper().setAutoSwitchStyle(false);
-//                    mMapView.getMapAutoViewHelper().setMapStyle(MapAutoApi.MAP_STYLE_NIGHT);
-//                    mIsLightStyle = false;
-//                    break;
-//                case Type_AUTO_LIGHT_Night:
-//                    mMapView.getMapAutoViewHelper().setAutoSwitchStyle(true);
-//                    break;
-//            }
-
         }
     }
 
@@ -504,7 +471,6 @@ public class AMapViewWrapper implements IMogoMapView,
             }
             CallerLogger.INSTANCE.d(TAG, "锁车");
             mMapView.getMapAutoViewHelper().setLockMode(true);
-            mIsCarLocked = true;
         }
     }
 
@@ -515,12 +481,6 @@ public class AMapViewWrapper implements IMogoMapView,
         }
         CallerLogger.INSTANCE.d(TAG, "解锁锁车");
         mMapView.getMapAutoViewHelper().setLockMode(false);
-        mIsCarLocked = false;
-    }
-
-    @Override
-    public void setLockZoom(int var1) {
-        mLockZoom = var1;
     }
 
     @Override
@@ -653,12 +613,6 @@ public class AMapViewWrapper implements IMogoMapView,
         return MogoMapUtils.calculateLineDistance(ObjectUtils.fromMogo(p1), ObjectUtils.fromMogo(p2));
     }
 
-
-    @Override
-    public EnumMapUI getCurrentUiMode() {
-        return mCurrentCarUIMode;
-    }
-
     @Override
     public void changeMyLocation(Location location) {
     }
@@ -739,10 +693,15 @@ public class AMapViewWrapper implements IMogoMapView,
     }
 
     @Override
-    public int getSpeedLimmit(double lon, double lat, float angle) {
+    public int getLimitSpeed(double lon, double lat, float angle) {
         return MapDataApi.INSTANCE.getLimitSpeed(lon, lat, angle);
     }
 
+    @Override
+    public CenterLine getCenterLineInfo(double lon, double lat, float angle) {
+        return ObjectUtils.transformCenterLine(MapDataApi.INSTANCE.getCenterLineInfo(lon, lat, angle));
+    }
+
     @Override
     public void onLocationChanged(@NotNull com.zhidaoauto.map.sdk.open.location.MogoLocation location) {
         MogoLocation mLastLocation = ObjectUtils.fromLocation(location);
@@ -786,7 +745,6 @@ public class AMapViewWrapper implements IMogoMapView,
                 mIsFirstLocated = true;
                 mIsDelayed = false;
                 CallerLogger.INSTANCE.d(TAG, "同步定位：" + GsonUtils.toJson(location));
-                MapStyleController.getInstance().onLocationChanged(location, this);
             }
         }
     }
@@ -940,26 +898,6 @@ public class AMapViewWrapper implements IMogoMapView,
         mMapView.getMapAutoViewHelper().setMapViewPerspective(MapAutoApi.MAP_PERSPECTIVE_UP_CAR);
     }
 
-
-    @Override
-    public void onStyleAutoChanged(boolean isVrMode) {
-        if (isVrMode) {
-            if (mCurrentUI != EnumMapUI.Type_VR) {
-                CallerLogger.INSTANCE.d(TAG, "自动切换为vr模式");
-                changeMapMode(EnumMapUI.Type_VR);
-            }
-        } else {
-            if (mCurrentUI == EnumMapUI.Type_VR) {
-                CallerLogger.INSTANCE.d(TAG, "自动切换为2D模式");
-                if (mIsLightStyle) {
-                    changeMapMode(EnumMapUI.Type_Light);
-                } else {
-                    changeMapMode(EnumMapUI.Type_Night);
-                }
-            }
-        }
-    }
-
     private boolean mRtkEnable = false;
 
     @Override
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/Interrupter.java b/libraries/mogo-map/src/main/java/com/mogo/map/Interrupter.java
deleted file mode 100644
index cd56fad840..0000000000
--- a/libraries/mogo-map/src/main/java/com/mogo/map/Interrupter.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.mogo.map;
-
-/**
- * @author congtaowang
- * @since 2020-04-10
- * <p>
- * 拦截器
- */
-public interface Interrupter {
-
-    /**
-     * 是否拦截
-     * @return true - 拦截, false - 不拦截
-     */
-    boolean interrupt();
-}
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MapCenterPoint.java b/libraries/mogo-map/src/main/java/com/mogo/map/MapCenterPoint.java
deleted file mode 100644
index e396fa354d..0000000000
--- a/libraries/mogo-map/src/main/java/com/mogo/map/MapCenterPoint.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.mogo.map;
-
-/**
- * @author congtaowang
- * @since 2020-04-10
- * <p>
- * 地图视图中心点
- */
-public class MapCenterPoint {
-
-    public final double x;
-    public final double y;
-
-    public MapCenterPoint( double x, double y ) {
-        this.x = x;
-        this.y = y;
-    }
-
-}
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MapStyleController.java b/libraries/mogo-map/src/main/java/com/mogo/map/MapStyleController.java
deleted file mode 100644
index 5638199449..0000000000
--- a/libraries/mogo-map/src/main/java/com/mogo/map/MapStyleController.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package com.mogo.map;
-
-
-import com.mogo.commons.debug.DebugConfig;
-import com.zhidaoauto.map.sdk.open.location.MogoLocation;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public
-/**
- * @author congtaowang
- * @since 2020/12/25
- *
- * 地图样式控制
- */
-class MapStyleController {
-
-
-    private static volatile MapStyleController sInstance;
-
-    private boolean mIsInVrMode = false;
-
-    private List< VrAreaFilter > mVrAreaFilters = new ArrayList<>();
-
-    private MapStyleController() {
-        mVrAreaFilters.add( new ShunYiArea() );
-        mVrAreaFilters.add( new OCHArea() );
-//        mVrAreaFilters.add( new HuiXinXiJieArea() );
-    }
-
-    public static MapStyleController getInstance() {
-        if ( sInstance == null ) {
-            synchronized ( MapStyleController.class ) {
-                if ( sInstance == null ) {
-                    sInstance = new MapStyleController();
-                }
-            }
-        }
-        return sInstance;
-    }
-
-    public synchronized void release() {
-        sInstance = null;
-    }
-
-    private Object readResolve() {
-        // 阻止反序列化，必须实现 Serializable 接口
-        return sInstance;
-    }
-
-    public void onLocationChanged( MogoLocation location, IMapStyleAutoChangedListener listener ) {
-        if ( location == null ) {
-            return;
-        }
-
-        // 网约车不自动切换vr、2d模式
-        if ( DebugConfig.isOCHModule() ) {
-            return;
-        }
-
-        boolean isInVrMode = false;
-        for ( VrAreaFilter vrAreaFilter : mVrAreaFilters ) {
-            if ( vrAreaFilter == null ) {
-                continue;
-            }
-            isInVrMode |= vrAreaFilter.isVrArea( location );
-            if ( isInVrMode ) {
-                break;
-            }
-        }
-        if ( isInVrMode ) {
-            if ( !mIsInVrMode ) {
-                // 第一次进入 vr 区域，自动变为 vr 模式
-                mIsInVrMode = true;
-                if ( listener != null ) {
-                    listener.onStyleAutoChanged( true );
-                }
-            }
-        } else {
-            if ( mIsInVrMode ) {
-                // 驶出 vr 区域，自动变为 2d 模式
-                mIsInVrMode = false;
-                if ( listener != null ) {
-                    listener.onStyleAutoChanged( false );
-                }
-            }
-        }
-    }
-
-    public interface IMapStyleAutoChangedListener {
-        void onStyleAutoChanged(boolean isVrMode);
-    }
-
-    public interface VrAreaFilter {
-        default boolean isVrArea(MogoLocation location) {
-            if ( location == null ) {
-                return false;
-            }
-            return location.getLat() > getLeftBottomLat() && location.getLon() > getLeftBottomLon()
-                    && location.getLat() < getRightTopLat() && location.getLon() < getRightTopLon();
-        }
-
-        double getLeftBottomLat();
-
-        double getLeftBottomLon();
-
-        double getRightTopLat();
-
-        double getRightTopLon();
-    }
-
-    public static class ShunYiArea implements VrAreaFilter {
-
-        // 顺义一期高精地图范围（目前圈定了一个矩形区域，认为都是高精地图区域）
-        private final double leftBottomLat = 40.18728;
-        private final double leftBottomLon = 116.71194;
-        private final double rightTopLat = 40.20671;
-        private final double rightTopLon = 116.74804;
-
-        @Override
-        public double getLeftBottomLat() {
-            return leftBottomLat;
-        }
-
-        @Override
-        public double getLeftBottomLon() {
-            return leftBottomLon;
-        }
-
-        @Override
-        public double getRightTopLat() {
-            return rightTopLat;
-        }
-
-        @Override
-        public double getRightTopLon() {
-            return rightTopLon;
-        }
-    }
-
-    public static class OCHArea implements VrAreaFilter {
-
-        @Override
-        public double getLeftBottomLat() {
-            return 39.97645;
-        }
-
-        @Override
-        public double getLeftBottomLon() {
-            return 116.41673;
-        }
-
-        @Override
-        public double getRightTopLat() {
-            return 0;
-        }
-
-        @Override
-        public double getRightTopLon() {
-            return 0;
-        }
-    }
-
-    public static class HuiXinXiJieArea implements VrAreaFilter {
-
-        @Override
-        public double getLeftBottomLat() {
-            return 39.96741320378243;
-        }
-
-        @Override
-        public double getLeftBottomLon() {
-            return 116.41045709250723;
-        }
-
-        @Override
-        public double getRightTopLat() {
-            return 39.98232698552779;
-        }
-
-        @Override
-        public double getRightTopLon() {
-            return 116.41879656379113;
-        }
-    }
-}
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java
index ff51e7363b..d0e275cd76 100644
--- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java
@@ -5,6 +5,7 @@ import android.graphics.Rect;
 import android.location.Location;
 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.utilcode.mogo.logger.CallerLogger;
 import com.mogo.map.uicontroller.CarCursorOption;
@@ -158,13 +159,6 @@ public class MogoMapUIController implements IMogoMapUIController {
         }
     }
 
-    @Override
-    public void setLockZoom(int var1) {
-        initDelegate();
-        if (mDelegate != null) {
-            mDelegate.setLockZoom(var1);
-        }
-    }
 
     @Override
     public void displayOverview(Rect bounds) {
@@ -288,14 +282,6 @@ public class MogoMapUIController implements IMogoMapUIController {
         return 0;
     }
 
-    @Override
-    public EnumMapUI getCurrentUiMode() {
-        initDelegate();
-        if (mDelegate != null) {
-            return mDelegate.getCurrentUiMode();
-        }
-        return null;
-    }
 
     @Override
     public void changeMyLocation(Location location) {
@@ -364,13 +350,21 @@ public class MogoMapUIController implements IMogoMapUIController {
     }
 
     @Override
-    public int getSpeedLimmit(double lon, double lat, float angle) {
+    public int getLimitSpeed(double lon, double lat, float angle) {
         if (mDelegate != null) {
-            return mDelegate.getSpeedLimmit(lon, lat, angle);
+            return mDelegate.getLimitSpeed(lon, lat, angle);
         }
         return 0;
     }
 
+    @Override
+    public CenterLine getCenterLineInfo(double lon, double lat, float angle) {
+        if (mDelegate != null) {
+            return mDelegate.getCenterLineInfo(lon, lat, angle);
+        }
+        return null;
+    }
+
     @Override
     public void rtkEnable(boolean enable) {
         initDelegate();
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/Scene.java b/libraries/mogo-map/src/main/java/com/mogo/map/Scene.java
deleted file mode 100644
index 06b2ac8d91..0000000000
--- a/libraries/mogo-map/src/main/java/com/mogo/map/Scene.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.mogo.map;
-
-/**
- * @author congtaowang
- * @since 2020-04-10
- * <p>
- * 描述
- */
-public interface Scene {
-
-    /**
-     * 普通场景
-     */
-    int COMMON = 0;
-
-    /**
-     * 选点
-     */
-    int CHOOSE_POINT = 1;
-
-    /**
-     * 导航
-     */
-    int NAVI = 2;
-
-    /**
-     * 导航 vs 道路事件
-     */
-    int NAVI_WITH_ROAD_EVENT = 21;
-
-    /**
-     * 巡航
-     */
-    int AIMLESS = 3;
-
-    /**
-     * 巡航 vs 道路事件
-     */
-    int AIMLESS_WITH_ROAD_EVENT = 31;
-
-    /**
-     * 路线规划
-     */
-    int CALCULATE_PATH = 4;
-
-    /**
-     * 分类搜索
-     */
-    int CATEGORY_SEARCH = 5;
-
-    /**
-     * V2X触发了预警场景
-     */
-    int CATEGORY_V2X_EVENT = 6;
-}
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
index 680dbc3eee..d327fa1218 100644
--- 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
@@ -18,7 +18,8 @@ import org.jetbrains.annotations.Nullable;
  */
 public final class AMapInfoWindowAdapter implements InfoWindowAdapter, OnInfoWindowClickListener {
 
-    public View getInfoWindow( Marker marker ) {
+    @Override
+    public View getInfoWindow(Marker marker ) {
         if ( marker.getMObject() instanceof IMogoMarker ) {
             IMogoMarker mogoMarker = ( ( IMogoMarker ) marker.getMObject() );
             IMogoInfoWindowAdapter delegate = mogoMarker.getInfoWindowAdapter();
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/uicontroller/AMapUIController.java b/libraries/mogo-map/src/main/java/com/mogo/map/uicontroller/AMapUIController.java
index bc67adf11f..39051ccaf9 100644
--- a/libraries/mogo-map/src/main/java/com/mogo/map/uicontroller/AMapUIController.java
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/uicontroller/AMapUIController.java
@@ -5,6 +5,7 @@ import android.graphics.Rect;
 import android.location.Location;
 import android.view.View;
 
+import com.mogo.eagle.core.data.map.CenterLine;
 import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.zhidaoauto.map.sdk.open.MapAutoApi;
 
@@ -130,13 +131,6 @@ public class AMapUIController implements IMogoMapUIController {
         }
     }
 
-    @Override
-    public void setLockZoom(int var1) {
-        if (mClient != null) {
-            mClient.setLockZoom(var1);
-        }
-    }
-
     @Override
     public void displayOverview(Rect bounds) {
         if (mClient != null) {
@@ -245,14 +239,6 @@ public class AMapUIController implements IMogoMapUIController {
         return 0;
     }
 
-    @Override
-    public EnumMapUI getCurrentUiMode() {
-        if (mClient != null) {
-            return mClient.getCurrentUiMode();
-        }
-        return null;
-    }
-
     @Override
     public void changeMyLocation(Location location) {
         if (mClient != null) {
@@ -310,8 +296,13 @@ public class AMapUIController implements IMogoMapUIController {
     }
 
     @Override
-    public int getSpeedLimmit(double lon, double lat, float angle) {
-        return mClient.getSpeedLimmit(lon, lat, angle);
+    public int getLimitSpeed(double lon, double lat, float angle) {
+        return mClient.getLimitSpeed(lon, lat, angle);
+    }
+
+    @Override
+    public CenterLine getCenterLineInfo(double lon, double lat, float angle) {
+        return mClient.getCenterLineInfo(lon, lat, angle);
     }
 
     @Override
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 71037e76d5..3b987adb29 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
@@ -5,9 +5,9 @@ import android.graphics.Color;
 import android.text.TextUtils;
 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.eagle.core.data.traffic.TrafficData;
 import com.mogo.map.marker.MogoMarkerOptions;
 import com.mogo.map.overlay.MogoPolylineOptions;
 import com.mogo.map.search.geo.MogoGeocodeAddress;
@@ -193,20 +193,6 @@ public class ObjectUtils {
         return new LonLatPoint(latLng.lon, latLng.lat);
     }
 
-//    public static NaviLatLng fromMogoAsNavi( MogoLatLng latLng ) {
-//        if ( latLng == null ) {
-//            return null;
-//        }
-//        return new NaviLatLng( latLng.lat, latLng.lng );
-//    }
-
-//    public static LatLng fromMogo2( MogoLatLng latLng ) {
-//        if ( latLng == null ) {
-//            return null;
-//        }
-//        return new LatLng( latLng.lat, latLng.lng );
-//    }
-
     public static MogoLatLng fromAMap(LonLatPoint point) {
         if (point == null) {
             return null;
@@ -214,13 +200,6 @@ public class ObjectUtils {
         return new MogoLatLng(point.getLatitude(), point.getLongitude());
     }
 
-//    public static MogoLatLng CameraPositionfromAMap( LatLng point ) {
-//        if ( point == null ) {
-//            return null;
-//        }
-//        return new MogoLatLng( point.latitude, point.longitude );
-//    }
-
     public static GeocodeQuery fromMogo(MogoGeocodeQuery query) {
         if (query == null) {
             return null;
@@ -237,44 +216,6 @@ public class ObjectUtils {
         return q;
     }
 
-//    public static MogoAoiItem fromAMap( AoiItem amapItem ) {
-//        if ( amapItem == null ) {
-//            return null;
-//        }
-//        MogoAoiItem mogoAoiItem = new MogoAoiItem();
-//        mogoAoiItem.setAdCode( amapItem.getAdCode() );
-//        mogoAoiItem.setAoiArea( amapItem.getAoiArea() );
-//        mogoAoiItem.setAoiCenterPoint( fromAMap( amapItem.getAoiCenterPoint() ) );
-//        mogoAoiItem.setAoiId( amapItem.getAoiId() );
-//        mogoAoiItem.setAoiName( amapItem.getAoiName() );
-//        return mogoAoiItem;
-//    }
-//
-//    public static MogoBusinessArea fromAMap( BusinessArea amapItem ) {
-//        if ( amapItem == null ) {
-//            return null;
-//        }
-//        MogoBusinessArea mogoBusinessArea = new MogoBusinessArea();
-//        mogoBusinessArea.setCenterPoint( fromAMap( amapItem.getCenterPoint() ) );
-//        mogoBusinessArea.setName( amapItem.getName() );
-//        return mogoBusinessArea;
-//    }
-//
-//
-//    public static MogoCrossroad fromAMap( Crossroad amapItem ) {
-//        if ( amapItem == null ) {
-//            return null;
-//        }
-//        MogoCrossroad mogoCrossroad = new MogoCrossroad();
-//        mogoCrossroad.setDirection( amapItem.getDirection() );
-//        mogoCrossroad.setDistance( amapItem.getDistance() );
-//        mogoCrossroad.setFirstRoadId( amapItem.getFirstRoadId() );
-//        mogoCrossroad.setFirstRoadName( amapItem.getFirstRoadName() );
-//        mogoCrossroad.setSecondRoadId( amapItem.getSecondRoadId() );
-//        mogoCrossroad.setSecondRoadName( amapItem.getSecondRoadName() );
-//        return mogoCrossroad;
-//    }
-
     public static MogoGeocodeAddress fromAMap(GeocodeAddress address) {
         if (address == null) {
             return null;
@@ -311,77 +252,6 @@ public class ObjectUtils {
         return mogoGeocodeResult;
     }
 
-//    public static MogoIndoorData fromAMap( IndoorData data ) {
-//        if ( data == null ) {
-//            return null;
-//        }
-//        MogoIndoorData mogoIndoorData = new MogoIndoorData();
-//        mogoIndoorData.setFloor( data.getFloor() );
-//        mogoIndoorData.setFloorName( data.getFloorName() );
-//        mogoIndoorData.setPoiId( data.getPoiId() );
-//        return mogoIndoorData;
-//    }
-//
-//    public static MogoPhoto fromAMap( Photo photo ) {
-//        if ( photo == null ) {f
-//            return null;
-//        }
-//        MogoPhoto mogoPhoto = new MogoPhoto();
-//        mogoPhoto.setTitle( photo.getTitle() );
-//        mogoPhoto.setUrl( photo.getUrl() );
-//        return mogoPhoto;
-//    }
-//
-//    public static MogoPoiItemExtension fromAMap( PoiItemExtension poiItemExtension ) {
-//        if ( poiItemExtension == null ) {
-//            return null;
-//        }
-//        MogoPoiItemExtension mogoPoiItemExtension = new MogoPoiItemExtension();
-//        mogoPoiItemExtension.setOpentime( poiItemExtension.getOpentime() );
-//        mogoPoiItemExtension.setRating( poiItemExtension.getmRating() );
-//        return mogoPoiItemExtension;
-//    }
-//
-//    public static MogoRegeocodeRoad fromAMap( RegeocodeRoad regeocodeRoad ) {
-//        if ( regeocodeRoad == null ) {
-//            return null;
-//        }
-//        MogoRegeocodeRoad mogoRegeocodeRoad = new MogoRegeocodeRoad();
-//        mogoRegeocodeRoad.setDirection( regeocodeRoad.getDirection() );
-//        mogoRegeocodeRoad.setDistance( regeocodeRoad.getDistance() );
-//        mogoRegeocodeRoad.setId( regeocodeRoad.getId() );
-//        mogoRegeocodeRoad.setName( regeocodeRoad.getName() );
-//        mogoRegeocodeRoad.setPoint( fromAMap( regeocodeRoad.getLatLngPoint() ) );
-//        return mogoRegeocodeRoad;
-//    }
-//
-//    public static MogoStreetNumber fromAMap( StreetNumber streetNumber ) {
-//        if ( streetNumber == null ) {
-//            return null;
-//        }
-//        MogoStreetNumber mogoStreetNumber = new MogoStreetNumber();
-//        mogoStreetNumber.setDirection( streetNumber.getDirection() );
-//        mogoStreetNumber.setDistance( streetNumber.getDistance() );
-//        mogoStreetNumber.setLatLonPoint( fromAMap( streetNumber.getLatLonPoint() ) );
-//        mogoStreetNumber.setNumber( streetNumber.getNumber() );
-//        mogoStreetNumber.setStreet( streetNumber.getStreet() );
-//        return mogoStreetNumber;
-//    }
-
-//    public static MogoSubPoiItem fromAMap( SubPoiItem subPoiItem ) {
-//        if ( subPoiItem == null ) {
-//            return null;
-//        }
-//        MogoSubPoiItem mogoSubPoiItem = new MogoSubPoiItem();
-//        mogoSubPoiItem.setDistance( subPoiItem.getDistance() );
-//        mogoSubPoiItem.setPoiId( subPoiItem.getPoiId() );
-//        mogoSubPoiItem.setPoint( fromAMap( subPoiItem.getLatLonPoint() ) );
-//        mogoSubPoiItem.setSnippet( subPoiItem.getSnippet() );
-//        mogoSubPoiItem.setSubName( mogoSubPoiItem.getSubName() );
-//        mogoSubPoiItem.setSubTypeDes( mogoSubPoiItem.getSubTypeDes() );
-//        mogoSubPoiItem.setTitle( mogoSubPoiItem.getTitle() );
-//        return mogoSubPoiItem;
-//    }
 
     public static MogoPoiItem fromAMap(PoiItem poiItem) {
         if (poiItem == null) {
@@ -398,20 +268,7 @@ public class ObjectUtils {
         mogoPoiItem.setEmail(poiItem.getEmail());
         mogoPoiItem.setEnter(fromAMap(poiItem.getEnter()));
         mogoPoiItem.setExit(fromAMap(poiItem.getExit()));
-//        mogoPoiItem.setIndoorData( fromAMap( poiItem.getIndoorData() ) );
         mogoPoiItem.setParkingType(poiItem.getParkingType());
-//        mogoPoiItem.setIndoorMap( poiItem.isIndoorMap() );
-//        if ( poiItem.getPhotos() != null ) {
-//            List< MogoPhoto > mogoPhotos = new ArrayList<>();
-//            for ( Photo photo : poiItem.getPhotos() ) {
-//                MogoPhoto mogoPhoto = fromAMap( photo );
-//                if ( mogoPhoto != null ) {
-//                    mogoPhotos.add( mogoPhoto );
-//                }
-//            }
-//            mogoPoiItem.setPhotos( mogoPhotos );
-//        }
-//        mogoPoiItem.setPoiExtension( fromAMap( poiItem.getPoiExtension() ) );
         mogoPoiItem.setPoiId(poiItem.getPoiId());
         mogoPoiItem.setPoint(fromAMap(poiItem.getLonLatPoint()));
         mogoPoiItem.setPostcode(poiItem.getPostcode());
@@ -419,16 +276,6 @@ public class ObjectUtils {
         mogoPoiItem.setProvinceName(poiItem.getProvinceName());
         mogoPoiItem.setShopID(poiItem.getShopID());
         mogoPoiItem.setSnippet(poiItem.getSnippet());
-//        if ( poiItem.getSubPois() != null ) {
-//            List< MogoSubPoiItem > mogoSubPoiItems = new ArrayList<>();
-//            for ( SubPoiItem subPois : poiItem.getSubPois() ) {
-//                MogoSubPoiItem mogoSubPoiItem = fromAMap( subPois );
-//                if ( mogoPoiItem != null ) {
-//                    mogoSubPoiItems.add( mogoSubPoiItem );
-//                }
-//            }
-//            mogoPoiItem.setSubPois( mogoSubPoiItems );
-//        }
         mogoPoiItem.setTel(poiItem.getTel());
         mogoPoiItem.setTypeCode(poiItem.getTypeCode());
         mogoPoiItem.setTitle(poiItem.getTitle());
@@ -443,43 +290,12 @@ public class ObjectUtils {
         }
         MogoRegeocodeAddress mogoRegeocodeAddress = new MogoRegeocodeAddress();
         mogoRegeocodeAddress.setAdCode(regeocodeAddress.getAdCode());
-//        if ( regeocodeAddress.getAois() != null ) {
-//            List< MogoAoiItem > items = new ArrayList<>();
-//            for ( AoiItem aois : regeocodeAddress.getAois() ) {
-//                final MogoAoiItem mogoAoiItem = fromAMap( aois );
-//                if ( mogoAoiItem != null ) {
-//                    items.add( mogoAoiItem );
-//                }
-//            }
-//            mogoRegeocodeAddress.setAois( items );
-//        }
 
         mogoRegeocodeAddress.setBuilding(regeocodeAddress.getBuilding());
-//        if ( regeocodeAddress.getBusinessAreas() != null ) {
-//            List< MogoBusinessArea > mogoBusinessAreas = new ArrayList<>();
-//            for ( BusinessArea businessArea : regeocodeAddress.getBusinessAreas() ) {
-//                MogoBusinessArea mogoBusinessArea = fromAMap( businessArea );
-//                if ( mogoBusinessArea != null ) {
-//                    mogoBusinessAreas.add( mogoBusinessArea );
-//                }
-//            }
-//            mogoRegeocodeAddress.setBusinessAreas( mogoBusinessAreas );
-//        }
 
         mogoRegeocodeAddress.setCity(regeocodeAddress.getCity());
         mogoRegeocodeAddress.setCityCode(regeocodeAddress.getCityCode());
         mogoRegeocodeAddress.setCountry(regeocodeAddress.getCountry());
-//        if ( regeocodeAddress.getCrossroads() != null ) {
-//            List< MogoCrossroad > mogoCrossroads = new ArrayList<>();
-//            for ( Crossroad crossroad : regeocodeAddress.getCrossroads() ) {
-//
-//                MogoCrossroad mogoCrossroad = fromAMap( crossroad );
-//                if ( mogoCrossroad != null ) {
-//                    mogoCrossroads.add( mogoCrossroad );
-//                }
-//            }
-//            mogoRegeocodeAddress.setCrossroads( mogoCrossroads );
-//        }
         mogoRegeocodeAddress.setDistrict(regeocodeAddress.getDistrict());
         mogoRegeocodeAddress.setFormatAddress(regeocodeAddress.getFormatAddress());
         mogoRegeocodeAddress.setNeighborhood(regeocodeAddress.getNeighborhood());
@@ -493,17 +309,6 @@ public class ObjectUtils {
             mogoRegeocodeAddress.setPois(mogoPoiItems);
         }
         mogoRegeocodeAddress.setProvince(regeocodeAddress.getProvince());
-//        if ( regeocodeAddress.getRoads() != null ) {
-//            List< MogoRegeocodeRoad > mogoRegeocodeRoads = new ArrayList<>();
-//            for ( RegeocodeRoad road : regeocodeAddress.getRoads() ) {
-//                MogoRegeocodeRoad mogoRegeocodeRoad = fromAMap( road );
-//                if ( mogoRegeocodeRoad != null ) {
-//                    mogoRegeocodeRoads.add( mogoRegeocodeRoad );
-//                }
-//            }
-//            mogoRegeocodeAddress.setRoads( mogoRegeocodeRoads );
-//        }
-//        mogoRegeocodeAddress.setStreetNumber( fromAMap( regeocodeAddress.getStreetNumber() ) );
         mogoRegeocodeAddress.setTowncode(regeocodeAddress.getTowncode());
         mogoRegeocodeAddress.setTownship(regeocodeAddress.getTownship());
         return mogoRegeocodeAddress;
@@ -544,23 +349,12 @@ public class ObjectUtils {
         return mogoTip;
     }
 
-//    public static MogoPoi fromAMap( Poi poi ) {
-//        if ( poi == null ) {
-//            return null;
-//        }
-//        MogoPoi mogoPoi = new MogoPoi();
-//        mogoPoi.setCoordinate( fromAMap( poi.getCoordinate() ) );
-//        mogoPoi.setName( poi.getName() );
-//        mogoPoi.setPoiId( poi.getPoiId() );
-//        return mogoPoi;
-//    }
 
     public static MogoPoiSearchQuery fromAMap(Query query) {
         if (query == null) {
             return null;
         }
         MogoPoiSearchQuery mogoPoiSearchQuery = new MogoPoiSearchQuery(query.getKeyword(), query.getCategory(), query.getCity());
-//        mogoPoiSearchQuery.setBuilding( query.getBuilding() );
         mogoPoiSearchQuery.setCityLimit(query.getCityLimit());
         mogoPoiSearchQuery.setDistanceSort(query.getDistanceSort());
         mogoPoiSearchQuery.setLocation(fromAMap(query.getLocation()));
@@ -575,9 +369,9 @@ public class ObjectUtils {
         }
         Query psq = new Query(query.getQuery(), "", "");
         String category = getCategory(query.getQuery());
-        if (!category.equals(""))
+        if (!category.equals("")) {
             psq = new Query("", "", getCategory(query.getQuery()));
-//        psq.setBuilding( query.getBuilding() );
+        }
         psq.setCityLimit(query.isCityLimit());
         psq.setDistanceSort(query.isDistanceSort());
         psq.setLocation(fromMogo(query.getLocation()));
@@ -673,11 +467,6 @@ public class ObjectUtils {
         if (options.getColorValues() != null) {
             target.colorValues(options.getColorValues());
         }
-//        target.transparency( options.getTransparency() );
-//        target.aboveMaskLayer( options.isAboveMaskLayer() );
-//        target.lineCapType( PolylineOptions.LineCapType.LineCapRound );
-//        target.lineJoinType( PolylineOptions.LineJoinType.LineJoinRound );
-//        target.setDottedLineType( PolylineOptions.DOTTEDLINE_TYPE_CIRCLE );
         return target;
     }
 
@@ -704,4 +493,36 @@ public class ObjectUtils {
         }
         return category;
     }
+
+    /**
+     * 转换对象
+     *
+     * @return 转换后的对象
+     */
+    public static CenterLine transformCenterLine(com.zhidaoauto.map.sdk.open.road.CenterLine centerLine) {
+        CenterLine resultCenterLine = null;
+        if (centerLine != null) {
+            resultCenterLine = new CenterLine();
+            resultCenterLine.setId(centerLine.id);
+            resultCenterLine.setLane_id(centerLine.lane_id);
+            resultCenterLine.setAngle(centerLine.angle);
+            resultCenterLine.setRoad_id(centerLine.road_id);
+            resultCenterLine.setTile_id(centerLine.tile_id);
+            ArrayList<com.mogo.eagle.core.data.map.LonLatPoint> arrayList = new ArrayList<>();
+            for (com.zhidaoauto.map.sdk.open.query.LonLatPoint point : centerLine.points) {
+                com.mogo.eagle.core.data.map.LonLatPoint lonLatPoint = new com.mogo.eagle.core.data.map.LonLatPoint();
+                lonLatPoint.setAltitude(point.altitude);
+                lonLatPoint.setAngle(point.angle);
+                lonLatPoint.setDistance(point.distance);
+                lonLatPoint.setLatitude(point.latitude);
+                lonLatPoint.setLongitude(point.longitude);
+                lonLatPoint.setProvider(point.provider);
+                lonLatPoint.setSpeed(point.speed);
+                lonLatPoint.setDuration(point.duration);
+                arrayList.add(lonLatPoint);
+            }
+            resultCenterLine.setPoints(arrayList);
+        }
+        return resultCenterLine;
+    }
 }
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/constants/HostConst.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/constants/HostConst.java
index 1c7db8cea1..81f0f468e3 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/constants/HostConst.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/constants/HostConst.java
@@ -19,4 +19,6 @@ public class HostConst {
     public static final String CITY_HOST = "http://dzt-city.zhidaozhixing.com";
     public static final String SOCKET_CENTER_DOMAIN = "socketRegion";
 
+    public static final String BINDING_SN_HOST = "https://mygateway.zhidaozhixing.com/cmdbapi/"; //中台提供的接口服务
+
 }
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/TrafficMarkerDrawer.kt b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/TrafficMarkerDrawer.kt
index 629f16813f..bb45bb1c5d 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/TrafficMarkerDrawer.kt
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/TrafficMarkerDrawer.kt
@@ -4,16 +4,16 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Handler
 import android.os.Message
+import android.text.TextUtils
 import com.mogo.commons.AbsMogoApplication
-import com.mogo.map.marker.IMogoMarker
-import com.mogo.map.marker.MogoMarkerOptions
-import com.mogo.module.common.MogoApisHandler
-import com.mogo.module.common.constants.DataTypes
-import com.mogo.eagle.core.data.traffic.TrafficData
 import com.mogo.eagle.core.data.enums.TrafficTypeEnum
+import com.mogo.eagle.core.data.traffic.TrafficData
 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.module.common.constants.DataTypes
 import java.util.concurrent.ConcurrentHashMap
 
 /**
@@ -98,18 +98,20 @@ object TrafficMarkerDrawer {
      * 更新识别数据颜色
      */
     fun updateITrafficThreatLevelInfo(trafficData: TrafficData) {
-        val tempTraffic = mTrafficMap[trafficData.uuid]
-        if (tempTraffic != null) {
-            tempTraffic.lat = trafficData.lat
-            tempTraffic.lon = trafficData.lon
-            tempTraffic.heading = trafficData.heading
-            tempTraffic.threatLevel = trafficData.threatLevel
-            if (trafficData.uuid != null) {
-                mTrafficMap[trafficData.uuid!!] = tempTraffic
-            }
-        } else {
-            if (trafficData.uuid != null) {
-                mTrafficMap[trafficData.uuid!!] = trafficData
+        if (trafficData != null && !TextUtils.isEmpty(trafficData.uuid)) {
+            val tempTraffic = mTrafficMap[trafficData.uuid]
+            if (tempTraffic != null) {
+                tempTraffic.lat = trafficData.lat
+                tempTraffic.lon = trafficData.lon
+                tempTraffic.heading = trafficData.heading
+                tempTraffic.threatLevel = trafficData.threatLevel
+                if (trafficData.uuid != null) {
+                    mTrafficMap[trafficData.uuid!!] = tempTraffic
+                }
+            } else {
+                if (trafficData.uuid != null) {
+                    mTrafficMap[trafficData.uuid!!] = trafficData
+                }
             }
         }
     }
@@ -157,8 +159,8 @@ object TrafficMarkerDrawer {
      */
     private fun drawObuRecognizedDataMarker(trafficData: TrafficData) {
         CallerLogger.d(
-            TAG,
-            "trafficData.type = " + trafficData.type + "---trafficData.threatLevel = " + trafficData.threatLevel
+                TAG,
+                "trafficData.type = " + trafficData.type + "---trafficData.threatLevel = " + trafficData.threatLevel
         )
         if (trafficData.type != null) {
             val resId: Int = trafficData.type.traffic3DIconId
@@ -175,10 +177,10 @@ object TrafficMarkerDrawer {
                 .icon3DRes(resId)
                 .rotate(trafficData.heading.toFloat())
                 .position(
-                    com.mogo.eagle.core.data.map.MogoLatLng(
-                        trafficData.lat,
-                        trafficData.lon
-                    )
+                        com.mogo.eagle.core.data.map.MogoLatLng(
+                                trafficData.lat,
+                                trafficData.lon
+                        )
                 )
 
             if (trafficData.type != TrafficTypeEnum.TYPE_TRAFFIC_ID_SPECIAL_VEHICLE) {
@@ -213,12 +215,12 @@ object TrafficMarkerDrawer {
      * 带动画的修改Marker
      */
     private fun changeDynamicMarker(
-        marker: IMogoMarker,
-        trafficData: TrafficData
+            marker: IMogoMarker,
+            trafficData: TrafficData
     ) {
         CallerLogger.d(
-            TAG,
-            "trafficData.type = " + trafficData.type + "---trafficData.threatLevel = " + trafficData.threatLevel
+                TAG,
+                "trafficData.type = " + trafficData.type + "---trafficData.threatLevel = " + trafficData.threatLevel
         )
         if (trafficData.type != TrafficTypeEnum.TYPE_TRAFFIC_ID_SPECIAL_VEHICLE) {
             // 修改颜色
@@ -240,14 +242,14 @@ object TrafficMarkerDrawer {
 
         try {
             marker.addDynamicAnchorPosition(
-                com.mogo.eagle.core.data.map.MogoLatLng(
-                    trafficData.lat,
-                    trafficData.lon
-                ),
-                trafficData.heading.toFloat(),
-                stepTime
+                    com.mogo.eagle.core.data.map.MogoLatLng(
+                            trafficData.lat,
+                            trafficData.lon
+                    ),
+                    trafficData.heading.toFloat(),
+                    stepTime
             )
-        } catch (e:Exception) {
+        } catch (e: Exception) {
             e.printStackTrace()
             try {
                 drawObuRecognizedDataMarker(trafficData)
diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java b/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java
index 79661e5e81..a73e21ca1d 100644
--- a/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java
+++ b/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java
@@ -10,8 +10,6 @@ import com.alibaba.android.arouter.facade.template.IProvider;
  */
 public interface IMogoADASController extends IProvider {
 
-    void release();
-
     /**
      * 获取车身的定位纬度
      *
diff --git a/services/mogo-service/build.gradle b/services/mogo-service/build.gradle
index f6c6e92e28..fce6dd6a98 100644
--- a/services/mogo-service/build.gradle
+++ b/services/mogo-service/build.gradle
@@ -48,8 +48,6 @@ dependencies {
     implementation rootProject.ext.dependencies.arouter
     kapt rootProject.ext.dependencies.aroutercompiler
 
-    implementation rootProject.ext.dependencies.adasapi
-    implementation rootProject.ext.dependencies.adasconfigapi
     if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
         api rootProject.ext.dependencies.mogomap
         implementation rootProject.ext.dependencies.mogomapapi
diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
index 2862da2fa0..6a079a3c2a 100644
--- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
+++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
@@ -5,7 +5,6 @@ import android.content.Context;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.mogo.eagle.core.data.constants.MogoServicePaths;
 import com.mogo.service.adas.IMogoADASController;
-import com.zhidao.autopilot.support.api.AutopilotServiceManage;
 
 @Route(path = MogoServicePaths.PATH_ADAS_CONTROLLER)
 public class MogoADASController implements IMogoADASController {
@@ -51,11 +50,6 @@ public class MogoADASController implements IMogoADASController {
 
     }
 
-    @Override
-    public void release() {
-        AutopilotServiceManage.getInstance().release();
-    }
-
 }