diff --git a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml
index 22f7d8c014..542cee2d0e 100644
--- a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml
+++ b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml
@@ -6,7 +6,7 @@
 
     <com.mogo.eagle.core.function.hmi.map.MapContainerLayout
         android:id="@+id/mapContainerLayout"
-        android:layout_width="1560dp"
+        android:layout_width="1860dp"
         android:layout_height="1534dp"
         android:layout_marginTop="@dimen/dp_66"
         app:layout_constraintEnd_toEndOf="parent"
@@ -35,22 +35,4 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-    <com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugViewTrigger
-        android:layout_width="@dimen/dp_400"
-        android:layout_height="@dimen/dp_100"
-        android:longClickable="true"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <!--APP、MAP版本-->
-    <com.mogo.eagle.core.function.hmi.ui.widget.VersionNameView
-        android:id="@+id/viewVersionName"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="45dp"
-        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/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml b/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml
index bd2467b60b..0122d3af7d 100644
--- a/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml
+++ b/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml
@@ -6,7 +6,7 @@
 
     <com.mogo.eagle.core.function.hmi.map.MapContainerLayout
         android:id="@+id/mapContainerLayout"
-        android:layout_width="1560dp"
+        android:layout_width="1860dp"
         android:layout_height="1533dp"
         android:layout_marginTop="@dimen/dp_76"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/build.gradle b/app/build.gradle
index 101a12d2e0..d356c96e47 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
-apply from: rootProject.file('gradle/bytex/bytex.gradle')
+//apply from: rootProject.file('gradle/bytex/bytex.gradle')
 
 Properties properties = new Properties()
 properties.load(project.rootProject.file("gradle.properties").newDataInputStream())
diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/biz/DataCenterBizProvider.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/biz/DataCenterBizProvider.kt
index 8de5c8f99a..5f7dd9229d 100644
--- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/biz/DataCenterBizProvider.kt
+++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/biz/DataCenterBizProvider.kt
@@ -49,6 +49,10 @@ class DataCenterBizProvider:IDataCenterBizProvider {
         CallerDataCenterBizListener.invokeLoginStatus(isLogin)
     }
 
+    override fun notifyOrderID(orderID: String) {
+        CallerDataCenterBizListener.invokeOrderID(orderID)
+    }
+
     override fun onDestroy() {
 
     }
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_map_container.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_map_container.xml
index ceb8e9d966..00e79aba2b 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_map_container.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_map_container.xml
@@ -23,7 +23,7 @@
         android:id="@+id/overMapView"
         android:layout_width="270dp"
         android:layout_height="270dp"
-        android:layout_marginStart="1230dp"
+        android:layout_marginStart="1530dp"
         android:layout_marginTop="1204dp"
         app:bottomPadding="160"
         app:carDrawable="@drawable/taxt_u_p_map_car"
@@ -197,4 +197,22 @@
         app:pressed_enabled="false"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
+
+    <com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugViewTrigger
+        android:layout_width="@dimen/dp_400"
+        android:layout_height="@dimen/dp_100"
+        android:longClickable="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <!--APP、MAP版本-->
+    <com.mogo.eagle.core.function.hmi.ui.widget.VersionNameView
+        android:id="@+id/viewVersionName"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="45dp"
+        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_version_name.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_version_name.xml
index 8109c27c76..b483047a60 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_version_name.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_version_name.xml
@@ -8,8 +8,8 @@
         android:id="@+id/tvAppVersionName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textSize="@dimen/dp_28"
-        android:textColor="#FFBEC6EF"
+        android:textSize="@dimen/dp_23"
+        android:textColor="@color/color_80BEC6EF"
         android:layout_gravity="center_horizontal"
         />
 
@@ -17,8 +17,8 @@
         android:id="@+id/tvMapVersionName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textSize="@dimen/dp_28"
-        android:textColor="#FFBEC6EF"
+        android:textSize="@dimen/dp_23"
+        android:textColor="@color/color_80BEC6EF"
         android:layout_gravity="center_horizontal"
         />
 
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml
index ab050fbd38..01a3926fcc 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml
@@ -27,6 +27,7 @@
     <color name="color_D4D8DC">#D4D8DC</color>
     <color name="color_B2BED9">#B2BED9</color>
     <color name="color_FF1943">#FF1943</color>
+    <color name="color_80BEC6EF">#80BEC6EF</color>
     <color name="color_00FFFFFF">#00FFFFFF</color>
     <color name="color_FF1BB7FF">#FF1BB7FF</color>
     <color name="color_FF2EACFF">#FF2EACFF</color>
diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/IDataCenterBizListener.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/IDataCenterBizListener.kt
index cabf588b3c..d5d6feadd9 100644
--- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/IDataCenterBizListener.kt
+++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/IDataCenterBizListener.kt
@@ -22,4 +22,6 @@ interface IDataCenterBizListener {
         return false
     }
 
+    fun invokeAutopilotOrderId(orderID:String){}
+
 }
\ No newline at end of file
diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/och/IEagleBaseFunctionCall4Och.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/och/IEagleBaseFunctionCall4Och.kt
index 3403cdc785..524801ef31 100644
--- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/och/IEagleBaseFunctionCall4Och.kt
+++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/och/IEagleBaseFunctionCall4Och.kt
@@ -108,6 +108,6 @@ interface IEagleBaseFunctionCall4Och {
     /**
      * Och设置 启动自动驾驶附带的orderId
      */
-    fun setOchAutopilotOrderId(orderId:String?){}
+    fun setOchAutopilotOrderId(orderId:String){}
 
 }
\ No newline at end of file
diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/och/IOchFunctionCallNotify.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/och/IOchFunctionCallNotify.kt
index fa98dd7b99..722eb0cd57 100644
--- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/och/IOchFunctionCallNotify.kt
+++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/och/IOchFunctionCallNotify.kt
@@ -34,4 +34,6 @@ interface IOchFunctionCallNotify {
 
     // 登录状态变化
     fun notifyLoginStatus(isLogin: Boolean)
+
+    fun notifyOrderID(orderID:String)
 }
\ No newline at end of file
diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/datacenter/CallerDataCenterBizListener.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/datacenter/CallerDataCenterBizListener.kt
index 19034b94df..a9a70de0f9 100644
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/datacenter/CallerDataCenterBizListener.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/datacenter/CallerDataCenterBizListener.kt
@@ -18,6 +18,9 @@ object CallerDataCenterBizListener : CallerBase<IDataCenterBizListener>() {
     @Volatile
     private var inOrder: Boolean = false
 
+    @Volatile
+    private var orderId: String = ""
+
     private val isLoginStatus by lazy { AtomicBoolean(false) }
 
     override fun doSomeAfterAddListener(tag: String, listener: IDataCenterBizListener) {
@@ -26,6 +29,7 @@ object CallerDataCenterBizListener : CallerBase<IDataCenterBizListener>() {
         listener.invokeLoginNo(loginNo)
         listener.invokeCarNo(no)
         listener.invokeOrderStatus(inOrder)
+        listener.invokeAutopilotOrderId(orderId)
     }
 
     fun invokeLoginNo(loginNo: String?) {
@@ -84,4 +88,11 @@ object CallerDataCenterBizListener : CallerBase<IDataCenterBizListener>() {
     fun isLoginStatus(): Boolean {
         return isLoginStatus.get()
     }
+
+    fun invokeOrderID(orderId: String) {
+        this.orderId = orderId
+        M_LISTENERS.forEach {
+            it.value.invokeAutopilotOrderId(orderId)
+        }
+    }
 }
\ No newline at end of file
diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/datacenter/CallerDataCenterBizManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/datacenter/CallerDataCenterBizManager.kt
index 29939a3444..f0abf4c039 100644
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/datacenter/CallerDataCenterBizManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/datacenter/CallerDataCenterBizManager.kt
@@ -48,4 +48,8 @@ object CallerDataCenterBizManager: IOchFunctionCallNotify {
         dataCenterBizProviderApi?.notifyLoginStatus(isLogin)
     }
 
+    override fun notifyOrderID(orderID: String) {
+        dataCenterBizProviderApi?.notifyOrderID(orderID)
+    }
+
 }
\ No newline at end of file
diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/och/CallerEagleBaseFunctionCall4OchManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/och/CallerEagleBaseFunctionCall4OchManager.kt
index 2beb3c9586..49a6cb4c64 100644
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/och/CallerEagleBaseFunctionCall4OchManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/och/CallerEagleBaseFunctionCall4OchManager.kt
@@ -124,7 +124,7 @@ object CallerEagleBaseFunctionCall4OchManager : IEagleBaseFunctionCall4Och {
         CallerDataCenterBizManager.notifyOrderRemoval()
     }
 
-    override fun setOchAutopilotOrderId(orderId: String?) {
-
+    override fun setOchAutopilotOrderId(orderId: String) {
+        CallerDataCenterBizManager.notifyOrderID(orderId)
     }
 }
\ No newline at end of file