diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersRequest.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersRequest.java
index 0ea411d4d7..acea5172a8 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersRequest.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersRequest.java
@@ -10,8 +10,9 @@ import com.mogo.commons.network.Utils;
 public class QueryLeaveAwayPassengersRequest {
     private String sn;
     private int endSiteId;
+    private int orderDispatchType = 4;
 
-    public QueryLeaveAwayPassengersRequest( int siteId ) {
+    public QueryLeaveAwayPassengersRequest(int siteId) {
         this.sn = Utils.getSn();
         this.endSiteId = siteId;
     }
@@ -20,7 +21,7 @@ public class QueryLeaveAwayPassengersRequest {
         return sn;
     }
 
-    public void setSn( String sn ) {
+    public void setSn(String sn) {
         this.sn = sn;
     }
 
@@ -31,4 +32,12 @@ public class QueryLeaveAwayPassengersRequest {
     public void setEndSiteId(int endSiteId) {
         this.endSiteId = endSiteId;
     }
+
+    public int getOrderDispatchType() {
+        return orderDispatchType;
+    }
+
+    public void setOrderDispatchType(int orderDispatchType) {
+        this.orderDispatchType = orderDispatchType;
+    }
 }
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 c56a60c069..f3ceb8d44e 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
@@ -221,9 +221,11 @@ public class OchBusFragment extends BaseOchFragment< OchBusFragment, OchBusPrese
         if ( launch ) {
             tvOperationStatus.setText( "收车" );
             showSlidePanle("准备出发");
+            showPanel();
         } else {
             tvOperationStatus.setText( "出车" );
             hideSlidePanel();
+            hidPanel();
         }
     }
 }
diff --git a/OCH/mogo-och-bus/src/main/res/raw/bus_station_list1.json b/OCH/mogo-och-bus/src/main/res/raw/bus_station_list1.json
index f9ac00fca0..c74daa1174 100644
--- a/OCH/mogo-och-bus/src/main/res/raw/bus_station_list1.json
+++ b/OCH/mogo-och-bus/src/main/res/raw/bus_station_list1.json
@@ -26,27 +26,27 @@
       },
       {
         "lineId": 1.0,
-        "siteId": 1.0,
-        "siteName": "万集东门站",
+        "siteId": 2.0,
+        "siteName": "市政府前街18号",
         "cityCode": "010",
         "areaCode": "1001",
         "areaName": "顺义区",
         "currentLocation": [
-          116.7374429112,
-          40.2023987087
+          116.729134342,
+          40.1953113732
         ],
-        "lon": 116.7374429112,
-        "lat": 40.2023987087,
-        "siteDesc": "万集东门站",
+        "lon": 116.729134342,
+        "lat": 40.1953113732,
+        "siteDesc": "市政府前街18号",
         "siteState": 1.0,
-        "isCurrentSite": 1.0,
-        "siteColor": 1.0,
+        "isCurrentSite": 3.0,
+        "siteColor": 2.0,
         "peoples": "0",
-        "ifStop": 1.0
+        "ifStop": 0.0
       },
       {
         "lineId": 1.0,
-        "siteId": 2.0,
+        "siteId": 3.0,
         "siteName": "顺密路口站",
         "cityCode": "010",
         "areaCode": "1001",
@@ -59,486 +59,6 @@
         "lat": 40.1940181096,
         "siteDesc": "顺密路口站",
         "siteState": 1.0,
-        "isCurrentSite": 3.0,
-        "siteColor": 2.0,
-        "peoples": "0",
-        "ifStop": 1.0
-      },
-      {
-        "lineId": 1.0,
-        "siteId": 2.0,
-        "siteName": "顺密路口站",
-        "cityCode": "010",
-        "areaCode": "1001",
-        "areaName": "顺义区",
-        "currentLocation": [
-          116.723146,
-          40.179637
-        ],
-        "lon": 116.723146,
-        "lat": 40.179637,
-        "siteDesc": "顺密路口站",
-        "siteState": 1.0,
-        "isCurrentSite": 3.0,
-        "siteColor": 2.0,
-        "peoples": "0",
-        "ifStop": 1.0
-      },
-      {
-        "lineId": 2.0,
-        "siteId": 2.0,
-        "siteName": "顺密路口站",
-        "cityCode": "010",
-        "areaCode": "1001",
-        "areaName": "顺义区",
-        "currentLocation": [
-          116.738835502,
-          40.2023958306
-        ],
-        "lon": 116.738835502,
-        "lat": 40.2023958306,
-        "siteDesc": "顺密路口站",
-        "siteState": 1.0,
-        "isCurrentSite": 3.0,
-        "siteColor": 2.0,
-        "peoples": "0",
-        "ifStop": 1.0
-      },
-      {
-        "lineId": 1.0,
-        "siteId": 3.0,
-        "siteName": "第三站",
-        "cityCode": "010",
-        "areaCode": "1001",
-        "areaName": "顺义区",
-        "currentLocation": [
-          116.723232,
-          40.180637
-        ],
-        "lon": 116.723232,
-        "lat": 40.180637,
-        "siteDesc": "这里是第三站",
-        "siteState": 1.0,
-        "isCurrentSite": 0.0,
-        "siteColor": 0.0,
-        "peoples": "0",
-        "ifStop": 0.0
-      },
-      {
-        "lineId": 1.0,
-        "siteId": 4.0,
-        "siteName": "第四站",
-        "cityCode": "010",
-        "areaCode": "1001",
-        "areaName": "顺义区",
-        "currentLocation": [
-          116.72343,
-          40.182092
-        ],
-        "lon": 116.72343,
-        "lat": 40.182092,
-        "siteDesc": "这里是第四站",
-        "siteState": 1.0,
-        "isCurrentSite": 0.0,
-        "siteColor": 0.0,
-        "peoples": "0",
-        "ifStop": 0.0
-      },
-      {
-        "lineId": 1.0,
-        "siteId": 5.0,
-        "siteName": "第五站",
-        "cityCode": "010",
-        "areaCode": "1001",
-        "areaName": "顺义区",
-        "currentLocation": [
-          116.7235,
-          40.182699
-        ],
-        "lon": 116.7235,
-        "lat": 40.182699,
-        "siteDesc": "这里是第五站",
-        "siteState": 1.0,
-        "isCurrentSite": 0.0,
-        "siteColor": 0.0,
-        "peoples": "0",
-        "ifStop": 0.0
-      },
-      {
-        "lineId": 1.0,
-        "siteId": 6.0,
-        "siteName": "第六站",
-        "cityCode": "010",
-        "areaCode": "1001",
-        "areaName": "顺义区",
-        "currentLocation": [
-          116.723789,
-          40.185416
-        ],
-        "lon": 116.723789,
-        "lat": 40.185416,
-        "siteDesc": "这里是第六站",
-        "siteState": 1.0,
-        "isCurrentSite": 0.0,
-        "siteColor": 0.0,
-        "peoples": "0",
-        "ifStop": 0.0
-      },
-      {
-        "lineId": 1.0,
-        "siteId": 7.0,
-        "siteName": "第七站",
-        "cityCode": "010",
-        "areaCode": "1001",
-        "areaName": "顺义区",
-        "currentLocation": [
-          116.723977,
-          40.18701
-        ],
-        "lon": 116.723977,
-        "lat": 40.18701,
-        "siteDesc": "这里是第七站",
-        "siteState": 1.0,
-        "isCurrentSite": 0.0,
-        "siteColor": 0.0,
-        "peoples": "0",
-        "ifStop": 0.0
-      },
-      {
-        "lineId": 1.0,
-        "siteId": 8.0,
-        "siteName": "第八站",
-        "cityCode": "010",
-        "areaCode": "1001",
-        "areaName": "顺义区",
-        "currentLocation": [
-          116.72431,
-          40.190182
-        ],
-        "lon": 116.72431,
-        "lat": 40.190182,
-        "siteDesc": "这里是第八站",
-        "siteState": 1.0,
-        "isCurrentSite": 0.0,
-        "siteColor": 0.0,
-        "peoples": "0",
-        "ifStop": 0.0
-      },
-      {
-        "lineId": 1.0,
-        "siteId": 9.0,
-        "siteName": "第九站",
-        "cityCode": "010",
-        "areaCode": "1001",
-        "areaName": "顺义区",
-        "currentLocation": [
-          116.72431,
-          40.190182
-        ],
-        "lon": 116.72431,
-        "lat": 40.190182,
-        "siteDesc": "这里是第九站",
-        "siteState": 1.0,
-        "isCurrentSite": 0.0,
-        "siteColor": 0.0,
-        "peoples": "0",
-        "ifStop": 0.0
-      },
-      {
-        "lineId": 1.0,
-        "siteId": 10.0,
-        "siteName": "第十站",
-        "cityCode": "010",
-        "areaCode": "1001",
-        "areaName": "顺义区",
-        "currentLocation": [
-          116.724503,
-          40.192026
-        ],
-        "lon": 116.724503,
-        "lat": 40.192026,
-        "siteDesc": "这里是第十站",
-        "siteState": 1.0,
-        "isCurrentSite": 0.0,
-        "siteColor": 0.0,
-        "peoples": "0",
-        "ifStop": 0.0
-      },
-      {
-        "lineId": 1.0,
-        "siteId": 11.0,
-        "siteName": "第十一站",
-        "cityCode": "010",
-        "areaCode": "1001",
-        "areaName": "顺义区",
-        "currentLocation": [
-          116.724873,
-          40.19489
-        ],
-        "lon": 116.724873,
-        "lat": 40.19489,
-        "siteDesc": "这里是第十一站",
-        "siteState": 1.0,
-        "isCurrentSite": 0.0,
-        "siteColor": 0.0,
-        "peoples": "0",
-        "ifStop": 0.0
-      },
-      {
-        "lineId": 1.0,
-        "siteId": 14.0,
-        "siteName": "第十四站",
-        "cityCode": "010",
-        "areaCode": "1001",
-        "areaName": "顺义区",
-        "currentLocation": [
-          116.728258,
-          40.195255
-        ],
-        "lon": 116.728258,
-        "lat": 40.195255,
-        "siteDesc": "这里是第十四站",
-        "siteState": 1.0,
-        "isCurrentSite": 0.0,
-        "siteColor": 0.0,
-        "peoples": "0",
-        "ifStop": 0.0
-      },
-      {
-        "lineId": 1.0,
-        "siteId": 15.0,
-        "siteName": "第十五站",
-        "cityCode": "010",
-        "areaCode": "1001",
-        "areaName": "顺义区",
-        "currentLocation": [
-          116.729288,
-          40.195476
-        ],
-        "lon": 116.729288,
-        "lat": 40.195476,
-        "siteDesc": "这里是第十五站",
-        "siteState": 1.0,
-        "isCurrentSite": 0.0,
-        "siteColor": 0.0,
-        "peoples": "0",
-        "ifStop": 0.0
-      },
-      {
-        "lineId": 1.0,
-        "siteId": 16.0,
-        "siteName": "第十六站",
-        "cityCode": "010",
-        "areaCode": "1001",
-        "areaName": "顺义区",
-        "currentLocation": [
-          116.730554,
-          40.195952
-        ],
-        "lon": 116.730554,
-        "lat": 40.195952,
-        "siteDesc": "这里是第十六站",
-        "siteState": 1.0,
-        "isCurrentSite": 0.0,
-        "siteColor": 0.0,
-        "peoples": "0",
-        "ifStop": 0.0
-      },
-      {
-        "lineId": 1.0,
-        "siteId": 17.0,
-        "siteName": "第十七站",
-        "cityCode": "010",
-        "areaCode": "1001",
-        "areaName": "顺义区",
-        "currentLocation": [
-          116.732227,
-          40.196374
-        ],
-        "lon": 116.732227,
-        "lat": 40.196374,
-        "siteDesc": "这里是第十七站",
-        "siteState": 1.0,
-        "isCurrentSite": 0.0,
-        "siteColor": 0.0,
-        "peoples": "0",
-        "ifStop": 0.0
-      },
-      {
-        "lineId": 1.0,
-        "siteId": 18.0,
-        "siteName": "第十八站",
-        "cityCode": "010",
-        "areaCode": "1001",
-        "areaName": "顺义区",
-        "currentLocation": [
-          116.732978,
-          40.196443
-        ],
-        "lon": 116.732978,
-        "lat": 40.196443,
-        "siteDesc": "这里是第十八站",
-        "siteState": 1.0,
-        "isCurrentSite": 0.0,
-        "siteColor": 0.0,
-        "peoples": "0",
-        "ifStop": 0.0
-      },
-      {
-        "lineId": 1.0,
-        "siteId": 19.0,
-        "siteName": "第十九站",
-        "cityCode": "010",
-        "areaCode": "1001",
-        "areaName": "顺义区",
-        "currentLocation": [
-          116.733671,
-          40.196497
-        ],
-        "lon": 116.733671,
-        "lat": 40.196497,
-        "siteDesc": "这里是第十九站",
-        "siteState": 1.0,
-        "isCurrentSite": 0.0,
-        "siteColor": 0.0,
-        "peoples": "0",
-        "ifStop": 0.0
-      },
-      {
-        "lineId": 1.0,
-        "siteId": 20.0,
-        "siteName": "第二十站",
-        "cityCode": "010",
-        "areaCode": "1001",
-        "areaName": "顺义区",
-        "currentLocation": [
-          116.736852,
-          40.196493
-        ],
-        "lon": 116.736852,
-        "lat": 40.196493,
-        "siteDesc": "这里是第二十站",
-        "siteState": 1.0,
-        "isCurrentSite": 0.0,
-        "siteColor": 0.0,
-        "peoples": "0",
-        "ifStop": 0.0
-      },
-      {
-        "lineId": 1.0,
-        "siteId": 21.0,
-        "siteName": "第二十一站",
-        "cityCode": "010",
-        "areaCode": "1001",
-        "areaName": "顺义区",
-        "currentLocation": [
-          116.737866,
-          40.19646
-        ],
-        "lon": 116.737866,
-        "lat": 40.19646,
-        "siteDesc": "这里是第二十一站",
-        "siteState": 1.0,
-        "isCurrentSite": 0.0,
-        "siteColor": 0.0,
-        "peoples": "0",
-        "ifStop": 0.0
-      },
-      {
-        "lineId": 1.0,
-        "siteId": 22.0,
-        "siteName": "第二十二站",
-        "cityCode": "010",
-        "areaCode": "1001",
-        "areaName": "顺义区",
-        "currentLocation": [
-          116.745177,
-          40.19646
-        ],
-        "lon": 116.745177,
-        "lat": 40.19646,
-        "siteDesc": "这里是第二十二站",
-        "siteState": 1.0,
-        "isCurrentSite": 0.0,
-        "siteColor": 0.0,
-        "peoples": "0",
-        "ifStop": 0.0
-      },
-      {
-        "lineId": 1.0,
-        "siteId": 23.0,
-        "siteName": "第二十三站",
-        "cityCode": "010",
-        "areaCode": "1001",
-        "areaName": "顺义区",
-        "currentLocation": [
-          116.750644,
-          40.196402
-        ],
-        "lon": 116.750644,
-        "lat": 40.196402,
-        "siteDesc": "这里是第二十三站",
-        "siteState": 1.0,
-        "isCurrentSite": 0.0,
-        "siteColor": 0.0,
-        "peoples": "0",
-        "ifStop": 0.0
-      },
-      {
-        "lineId": 10000.0,
-        "siteId": 10000.0,
-        "siteName": "0409第一站",
-        "cityCode": "010",
-        "areaCode": "1001",
-        "areaName": "顺义区",
-        "currentLocation": [
-          116.7389159039,
-          40.1992312592
-        ],
-        "lon": 116.7389159039,
-        "lat": 40.1992312592,
-        "siteDesc": "0409这里第一站",
-        "siteState": 1.0,
-        "isCurrentSite": 0.0,
-        "siteColor": 0.0,
-        "peoples": "0",
-        "ifStop": 0.0
-      },
-      {
-        "lineId": 10000.0,
-        "siteId": 10000.0,
-        "siteName": "0409第一站",
-        "cityCode": "010",
-        "areaCode": "1001",
-        "areaName": "顺义区",
-        "currentLocation": [
-          116.7389159039,
-          40.1992312592
-        ],
-        "lon": 116.7389159039,
-        "lat": 40.1992312592,
-        "siteDesc": "0409这里第一站",
-        "siteState": 1.0,
-        "isCurrentSite": 0.0,
-        "siteColor": 0.0,
-        "peoples": "0",
-        "ifStop": 0.0
-      },
-      {
-        "lineId": 10001.0,
-        "siteId": 10002.0,
-        "siteName": "0409第二站",
-        "cityCode": "010",
-        "areaCode": "1001",
-        "areaName": "顺义区",
-        "currentLocation": [
-          116.7375553739,
-          40.1992677344
-        ],
-        "lon": 116.7375553739,
-        "lat": 40.1992677344,
-        "siteDesc": "这里是第二站",
-        "siteState": 1.0,
         "isCurrentSite": 0.0,
         "siteColor": 0.0,
         "peoples": "0",
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java
index 775f882092..a8861ae85e 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java
@@ -74,6 +74,7 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i
         mEndStationName = findViewById( R.id.module_och_taxi_order_end_station );
         mDistance = findViewById( R.id.module_och_taxi_order_distance );
 
+        showPanel();
         initListeners();
         updateOrderStatus();
         if ( MogoApisHandler.getInstance()
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml b/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml
index 99ca32287c..0f357cd739 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml
@@ -2,9 +2,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="wrap_content"
-    android:background="@drawable/module_och_taxi_panel_bkg"
+    android:layout_width="300px"
+    android:layout_height="270px"
     android:orientation="vertical">
 
     <TextView
diff --git a/OCH/mogo-och/src/main/java/com/mogo/och/BaseOchFragment.java b/OCH/mogo-och/src/main/java/com/mogo/och/BaseOchFragment.java
index dfb8b37169..eacee5b82f 100644
--- a/OCH/mogo-och/src/main/java/com/mogo/och/BaseOchFragment.java
+++ b/OCH/mogo-och/src/main/java/com/mogo/och/BaseOchFragment.java
@@ -185,6 +185,18 @@ public abstract class BaseOchFragment<V extends IView, P extends Presenter<V>> e
         });
     }
 
+    public void hidPanel(){
+        getActivity().runOnUiThread(()->{
+            flStationPanelContainer.setVisibility(View.GONE);
+        });
+    }
+
+    public void showPanel(){
+        getActivity().runOnUiThread(()->{
+            flStationPanelContainer.setVisibility(View.VISIBLE);
+        });
+    }
+
     public View getPanelView() {
         return panelView;
     }
diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi/module_mogo_och_operation_status_bg.png b/OCH/mogo-och/src/main/res/drawable-xhdpi/img_module_mogo_och_operation_status_bg.png
similarity index 100%
rename from OCH/mogo-och/src/main/res/drawable-xhdpi/module_mogo_och_operation_status_bg.png
rename to OCH/mogo-och/src/main/res/drawable-xhdpi/img_module_mogo_och_operation_status_bg.png
diff --git a/OCH/mogo-och/src/main/res/drawable/module_mogo_och_autopilot_status_bg_check.png b/OCH/mogo-och/src/main/res/drawable/module_mogo_och_autopilot_status_bg_check.png
new file mode 100644
index 0000000000..28857974b5
Binary files /dev/null and b/OCH/mogo-och/src/main/res/drawable/module_mogo_och_autopilot_status_bg_check.png differ
diff --git a/OCH/mogo-och/src/main/res/drawable/module_mogo_och_autopilot_status_bg_nor.png b/OCH/mogo-och/src/main/res/drawable/module_mogo_och_autopilot_status_bg_nor.png
new file mode 100644
index 0000000000..f7d4f92c4b
Binary files /dev/null and b/OCH/mogo-och/src/main/res/drawable/module_mogo_och_autopilot_status_bg_nor.png differ
diff --git a/OCH/mogo-och/src/main/res/drawable/module_mogo_och_operation_status_bg.xml b/OCH/mogo-och/src/main/res/drawable/module_mogo_och_operation_status_bg.xml
new file mode 100644
index 0000000000..84b729bc63
--- /dev/null
+++ b/OCH/mogo-och/src/main/res/drawable/module_mogo_och_operation_status_bg.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="@dimen/module_mogo_och_autopilot_status_bg_corner" />
+    <gradient
+        android:startColor="#FF405591"
+        android:endColor="#FF28376B"
+        android:angle="315"/>
+
+</shape>
\ No newline at end of file
diff --git a/OCH/mogo-och/src/main/res/drawable/module_och_panel_bkg.xml b/OCH/mogo-och/src/main/res/drawable/module_och_panel_bkg.xml
new file mode 100644
index 0000000000..204c5fc692
--- /dev/null
+++ b/OCH/mogo-och/src/main/res/drawable/module_och_panel_bkg.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <corners android:radius="17px" />
+            <solid android:color="#3B4577"/>
+        </shape>
+    </item>
+    <item
+        android:bottom="3px"
+        android:left="3px"
+        android:right="3px"
+        android:top="3px">
+        <shape>
+            <corners android:radius="17px" />
+            <solid android:color="#3B4577"/>
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml b/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml
index 509d3e5f16..4ae3c37821 100644
--- a/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml
+++ b/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml
@@ -4,16 +4,17 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingStart="@dimen/module_mogo_och_margin_left"
     android:paddingBottom="@dimen/module_mogo_och_margin_bottom">
 
     <CheckedTextView
         android:id="@+id/module_mogo_och_autopilot_status"
         android:layout_width="@dimen/module_mogo_och_autopilot_status_bg_width"
         android:layout_height="@dimen/module_mogo_och_autopilot_status_bg_height"
+        android:layout_marginLeft="@dimen/module_mogo_och_margin_left"
         android:layout_marginTop="@dimen/module_mogo_och_station_panel_container_margin_top_no_call"
         android:background="@drawable/module_mogo_och_autopilot_status_bg"
         android:drawableLeft="@drawable/module_och_bus_ic_autopilot"
+        android:elevation="@dimen/dp_10"
         android:gravity="center"
         android:paddingLeft="35px"
         android:text="自动驾驶"
@@ -30,9 +31,13 @@
         android:layout_width="300px"
         android:layout_height="270px"
         android:layout_marginTop="16px"
+        android:background="@drawable/module_och_panel_bkg"
+        android:elevation="@dimen/dp_10"
+        android:visibility="gone"
         app:layout_constraintLeft_toLeftOf="@+id/module_mogo_och_autopilot_status"
         app:layout_constraintTop_toBottomOf="@id/module_mogo_och_autopilot_status"
-        app:layout_goneMarginTop="@dimen/module_mogo_och_station_panel_container_margin_top_no_call" />
+        app:layout_goneMarginTop="@dimen/module_mogo_och_station_panel_container_margin_top_no_call"
+        tools:visibility="visible" />
 
     <CheckedTextView
         android:id="@+id/module_mogo_och_operation_status"
@@ -46,7 +51,7 @@
         android:textSize="@dimen/module_mogo_och_autopilot_status_text_size"
         android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent" />
+        app:layout_constraintLeft_toLeftOf="@+id/module_mogo_och_autopilot_status" />
 
     <com.mogo.och.view.SlidePanelView
         android:id="@+id/module_mogo_och_slide_panel"
diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
index bf0a59f349..25b899c7ca 100644
--- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
+++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
@@ -30,7 +30,7 @@
         android:id="@+id/fl_speed"
         android:layout_width="@dimen/dp_300"
         android:layout_height="@dimen/dp_300"
-        android:layout_marginLeft="@dimen/dp_10"
+        android:layout_marginLeft="@dimen/dp_20"
         android:layout_marginTop="@dimen/dp_10"
         android:background="@drawable/yi_biao_pan_bg_nor"
         android:elevation="@dimen/dp_10"
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XSocketManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XSocketManager.java
index 0bfa95e762..584c4e5650 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XSocketManager.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XSocketManager.java
@@ -115,7 +115,7 @@ public class V2XSocketManager {
         if (mV2XMessageListener_402000 != null) {
             V2XServiceManager
                     .getMoGoSocketManager()
-                    .unregisterOnMessageListener(401019, mV2XMessageListener_402000);
+                    .unregisterOnMessageListener(402000, mV2XMessageListener_402000);
         }
     }
 
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/overlay/V2XOptimalRouteOverlay.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/overlay/V2XOptimalRouteOverlay.java
index ae97a08626..1f8ca14a4b 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/overlay/V2XOptimalRouteOverlay.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/overlay/V2XOptimalRouteOverlay.java
@@ -57,7 +57,7 @@ public class V2XOptimalRouteOverlay {
                 }
             }
 
-            mPolylineColors.addAll(ColorUtils.gradientAlpha("#002965ED", "#FF2965ED", mPolylinePointList.size() / 3));
+            mPolylineColors.addAll(ColorUtils.gradientAlpha("#FF2965ED", "#FF2965ED", mPolylinePointList.size() ));
 
             // 替换路径集合
             mPolylineOptions.points(mPolylinePointList);
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/AbsV2XScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/AbsV2XScenario.java
index e18667a293..1ba53e3872 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/AbsV2XScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/AbsV2XScenario.java
@@ -55,7 +55,7 @@ public abstract class AbsV2XScenario<T> implements IV2XScenario {
     @Override
     public void speakTTSVoice(@Nullable String msg, IMogoVoiceCmdCallBack callBack) {
         if (!TextUtils.isEmpty(msg)) {
-            Logger.w(V2XConst.MODULE_NAME, "调用TTS播放语音：" + msg);
+            Logger.d(V2XConst.MODULE_NAME, "调用TTS播放语音：" + msg);
             AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice(msg, VoicePreemptType.PREEMPT_TYPE_IMMEADIATELY, callBack);
         }
     }
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/route/V2XOptimalRouteVREventMarker.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/route/V2XOptimalRouteVREventMarker.java
index f4a2898d3c..a5d78f20ca 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/route/V2XOptimalRouteVREventMarker.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/route/V2XOptimalRouteVREventMarker.java
@@ -21,7 +21,7 @@ public class V2XOptimalRouteVREventMarker implements IV2XMarker<V2XOptimalRouteD
 
     @Override
     public void drawPOI(V2XOptimalRouteDataRes entity) {
-        Logger.w(V2XConst.MODULE_NAME + "_" + TAG, "drawPOI 绘制VR Marker");
+        Logger.d(V2XConst.MODULE_NAME + "_" + TAG, "drawPOI 绘制VR Marker");
 
         try {
             // 清除道路事件
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java
index 70a8ad59e8..473c13257a 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java
@@ -461,7 +461,7 @@ public class TestOnLineCarUtils {
         try {
             InputStream inputStream = V2XUtils.getApp()
                     .getResources()
-                    .openRawResource(R.raw.scenario_push_vr_event_data_yongdu_gongsi_1);
+                    .openRawResource(R.raw.test_data_v2x_zuiyouluxian);
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
             int len = -1;
             byte[] buffer = new byte[1024];
diff --git a/modules/mogo-module-v2x/src/main/res/raw/test_data_v2x_zuiyouluxian.json b/modules/mogo-module-v2x/src/main/res/raw/test_data_v2x_zuiyouluxian.json
new file mode 100644
index 0000000000..7f939ee42c
--- /dev/null
+++ b/modules/mogo-module-v2x/src/main/res/raw/test_data_v2x_zuiyouluxian.json
@@ -0,0 +1,30 @@
+{
+  "current_lane_id": "1903",
+  "current_lane_num": -2,
+  "locus_list": [
+    {
+      "lat": 39.974323417486,
+      "lng": 0.0,
+      "lon": 116.411520335961
+    },
+    {
+      "lat": 39.974407914698,
+      "lng": 0.0,
+      "lon": 116.411515520661
+    },
+    {
+      "lat": 39.974658553869,
+      "lng": 0.0,
+      "lon": 116.411505432781
+    },
+    {
+      "lat": 39.974881303401,
+      "lng": 0.0,
+      "lon": 116.411499467848
+    }
+  ],
+  "most_lane_num": -3,
+  "most_speed": 8.0,
+  "road_id": "400139",
+  "sn": "F803EB2046PZD00149"
+}
\ No newline at end of file