diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt
index 33369c39d8..ec75137b43 100644
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt
@@ -192,6 +192,7 @@ class PM2DrivingModel private constructor() {
 
     private val moGoAutopilotPlanningListener = object : IMoGoPlanningRottingListener{
         override fun onAutopilotRotting(globalPathResp: MessagePad.GlobalPathResp?) {
+            d(SceneConstant.M_BUS_P + TAG, "och-rotting==globalPathResp = " + GsonUtils.toJson(globalPathResp))
             globalPathResp?.let {
                 d(SceneConstant.M_BUS_P + TAG, "och-rotting==wayPointsSize = " + it.wayPointsList.size)
                 updateRoutePoints(it.wayPointsList)
diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt
index 8dce8fed96..831a2d1b72 100644
--- a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt
+++ b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt
@@ -3,6 +3,8 @@ package com.magic.mogo.och.charter.fragment
 import android.os.Bundle
 import android.os.CountDownTimer
 import android.view.View
+import android.view.View.GONE
+import android.view.View.VISIBLE
 import com.alibaba.android.arouter.launcher.ARouter
 import com.magic.mogo.och.charter.R
 import com.magic.mogo.och.charter.base.CharterBaseFragment
@@ -51,10 +53,11 @@ class DriverM1Fragment : CharterBaseFragment<DriverM1Fragment?, DriverM1Presente
     }
 
     fun showOrHideOrderUI(show:Boolean){
-        if (show){
-            group_stations_panel.visibility = View.VISIBLE
-        }else{
-            group_stations_panel.visibility = View.GONE
+        if (show && group_stations_panel.visibility == GONE){
+            group_stations_panel.visibility = VISIBLE
+            no_line_data_view.visibility = GONE
+        }else if (!show){
+            group_stations_panel.visibility = GONE
             hideSlidePanel()
         }
     }
@@ -62,6 +65,7 @@ class DriverM1Fragment : CharterBaseFragment<DriverM1Fragment?, DriverM1Presente
 
     fun updateOrderUI(orderStatus: QueryCurrentOrderResponse.Result){
         requireActivity().runOnUiThread {
+            showOrHideOrderUI(true)
             driverm1_line_name.text = orderStatus.lineName
             driverm1StationName1Tv.text = orderStatus.startSiteName
             driverm1StationName2Tv.text = orderStatus.siteName
@@ -158,10 +162,10 @@ class DriverM1Fragment : CharterBaseFragment<DriverM1Fragment?, DriverM1Presente
     fun updateReturnCarStatus(returnSuccess: Boolean) {
         requireActivity().runOnUiThread {
             if (returnSuccess){
-                group_stations_panel.visibility = View.GONE
-                no_line_data_view.visibility = View.VISIBLE
+                group_stations_panel.visibility = GONE
+                no_line_data_view.visibility = VISIBLE
             }else{
-                slidePanelView?.visibility = View.VISIBLE
+                slidePanelView?.visibility = VISIBLE
             }
         }
     }
diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
index 7328011f81..cef453485a 100644
--- a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
+++ b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
@@ -400,26 +400,6 @@ class DriverM1Model {
 
     }
 
-    /**
-     * 关闭美化模式
-     */
-    fun closeBeautificationMode() {
-        if (FunctionBuildConfig.isDemoMode) { //收车结束美化
-            FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData =
-                false //是否强制绘制引导线
-            setIgnoreConditionDraw(false) // 同步给乘客屏
-            setIPCDemoMode(false) //是否自动启动自驾
-            d(SceneConstant.M_CHARTER_D + TAG, "美化模式-ignore：置为false")
-        }
-    }
-
-    fun startBeautificationMode() {
-        FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = true
-        setIgnoreConditionDraw(true)
-        setIPCDemoMode(true)
-    }
-
-
     /**
      * 延时查询站点信心
      */
@@ -567,6 +547,9 @@ class DriverM1Model {
                     if (data == null || data.code != 0){
                         return
                     }
+                    d(SceneConstant.M_CHARTER_D + TAG, "queryCurrentServiceStatus success = "
+                      + GsonUtils.toJson(data.data))
+
                     if (data.data.businessStatus == 2){
                         if (TextUtils.isEmpty(data.data.orderNo)){//还未换车，显示还车状态
                             mOrderCallback?.updateReturnCarStatus(false)
@@ -590,25 +573,27 @@ class DriverM1Model {
         DriverM1ServiceManager.queryCurrentOrder(mContext
             ,object: OchCommonServiceCallback<QueryCurrentOrderResponse>{
                 override fun onSuccess(data: QueryCurrentOrderResponse?) {
-                    if (data == null || data.code == 0 || mCurrentOrder === data.data) return
+                    if (data == null || data.code != 0 || mCurrentOrder === data.data) return
+                    d(SceneConstant.M_CHARTER_D + TAG, "queryCurrentOrder order =" +
+                            GsonUtils.toJson(data.data))
                     mCurrentOrder = data.data
                     mOrderCallback?.updateOrderUI(data.data)
                     // 倒计时校验开始
-                    startOrStopCheckCountDown(true)
+                    checkOrderCountDown()
                 }
 
                 override fun onFail(code: Int, msg: String?) {
-                    TODO("Not yet implemented")
+                    d(SceneConstant.M_CHARTER_D + TAG, "queryCurrentOrder onFail = $msg")
                 }
             })
     }
 
     private fun startOrStopCheckCountDown(start: Boolean) {
-        if (start){
-            DriverM1LooperManager.starCountDownLoop()
-        }else{
-            DriverM1LooperManager.stopCountDownLoop()
-        }
+//        if (start){
+//            DriverM1LooperManager.starCountDownLoop()
+//        }else{
+//            DriverM1LooperManager.stopCountDownLoop()
+//        }
     }
 
     fun checkOrderCountDown() {
@@ -618,6 +603,7 @@ class DriverM1Model {
                     if (data?.data == null || data.code != 0){
                         return
                     }
+                    d(SceneConstant.M_CHARTER_D,"checkOrderCountDown = "+ GsonUtils.toJson(data.data))
                     val  gap = data.data.endTime - data.data.currentTime
                     if (gap >= 0){
                         mOrderCallback?.updateOverCountDown((gap/1000/60).toInt())
@@ -645,6 +631,7 @@ class DriverM1Model {
                override fun onSuccess(data: BaseData?) {
                    if (data != null && data.code == 0){
                        d(SceneConstant.M_CHARTER_D + TAG, "confirmed station .")
+                       queryCurrentServiceStatus()
                        sendCommitMsgToClient(true)
                    }
                }
diff --git a/OCH/mogo-och-charter/src/driverm1/res/layout/fragment_driver_m1.xml b/OCH/mogo-och-charter/src/driverm1/res/layout/fragment_driver_m1.xml
index c55fe1aeb0..dc40998949 100644
--- a/OCH/mogo-och-charter/src/driverm1/res/layout/fragment_driver_m1.xml
+++ b/OCH/mogo-och-charter/src/driverm1/res/layout/fragment_driver_m1.xml
@@ -99,6 +99,7 @@
         android:textStyle="bold"
         android:textColor="@color/bus_arrived_station_name_text_color"
         android:includeFontPadding = "false"
+        android:layout_marginTop="@dimen/dp_10"
         android:maxLines="2"
         android:ellipsize="marquee"
         android:marqueeRepeatLimit="marquee_forever"
@@ -111,6 +112,7 @@
         android:layout_height="wrap_content"
         android:text="--"
         android:textSize="@dimen/module_mogo_och_bus_station_name_text_size"
+        android:layout_marginTop="@dimen/dp_10"
         android:textStyle="bold"
         android:textColor="@color/bus_arrived_station_name_text_color"
         android:includeFontPadding = "false"
@@ -164,7 +166,7 @@
     <View
         android:id="@+id/line3"
         android:layout_width="0dp"
-        android:layout_height="@dimen/dp_1"
+        android:layout_height="0.5dp"
         android:layout_marginTop="@dimen/dp_40"
         android:background="#FFFFFF"
         app:layout_constraintTop_toBottomOf="@+id/driverm1StationName2Tv"
diff --git a/OCH/mogo-och-charter/src/main/java/com/magic/mogo/och/charter/base/CharterBaseFragment.kt b/OCH/mogo-och-charter/src/main/java/com/magic/mogo/och/charter/base/CharterBaseFragment.kt
index 02cc66f32c..9f24640842 100644
--- a/OCH/mogo-och-charter/src/main/java/com/magic/mogo/och/charter/base/CharterBaseFragment.kt
+++ b/OCH/mogo-och-charter/src/main/java/com/magic/mogo/och/charter/base/CharterBaseFragment.kt
@@ -93,6 +93,7 @@ abstract class CharterBaseFragment<V : IView?, P : Presenter<V>?>() :
         flStationPanelContainer = findViewById(R.id.module_mogo_och_station_panel_container)
 
         slidePanelView = findViewById(R.id.charter_slide_panel)
+        slidePanelView?.setText(resources.getString(R.string.back_car))
         slidePanelView?.setOnSlidePanelMoveToEndListener(onSlideToEndListener)
 
         mTrafficDataView = findViewById<View>(R.id.bus_arc) as TrafficDataView?
diff --git a/OCH/mogo-och-charter/src/main/res/values/strings.xml b/OCH/mogo-och-charter/src/main/res/values/strings.xml
index 10075df0c5..27b49dfd20 100644
--- a/OCH/mogo-och-charter/src/main/res/values/strings.xml
+++ b/OCH/mogo-och-charter/src/main/res/values/strings.xml
@@ -49,5 +49,6 @@
     <!-- endregion   -->
 
     <string name="bus_before_tips_s">距离发车时间还有%1$s分钟</string>
+    <string name="back_car">确认还车</string>
 
 </resources>
diff --git a/app/productFlavors/ochDriverM1.gradle b/app/productFlavors/ochDriverM1.gradle
index f1f736167d..f805b17349 100644
--- a/app/productFlavors/ochDriverM1.gradle
+++ b/app/productFlavors/ochDriverM1.gradle
@@ -48,5 +48,8 @@ project.android.productFlavors {
 
         // 构建 是否支持多屏异显异交互
         buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false'
+
+        //Bus不能启动自驾的档位
+        buildConfigField 'java.util.Set<chassis.Chassis.GearPosition>', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet<chassis.Chassis.GearPosition>(){{add(chassis.Chassis.GearPosition.GEAR_N);add(chassis.Chassis.GearPosition.GEAR_R);}}'
     }
 }
\ No newline at end of file