diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java
index aaa13e9e27..058f443a5d 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java
@@ -15,6 +15,7 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.Group;
 
@@ -49,6 +50,7 @@ import com.mogo.och.bus.util.BDRouteDataTestUtils;
 import com.mogo.och.bus.view.BusArcView;
 import com.mogo.och.bus.view.SlidePanelView;
 
+import mogo.telematics.pad.MessagePad;
 import record_cache.RecordPanelOuterClass;
 
 /**
@@ -204,21 +206,12 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
 
         // mBadcaseBtn的visible显示逻辑在showBadcaseEntrance内处理
         mBadcaseBtn = findViewById(R.id.module_mogo_och_badcase_iv);
-//        CallerHmiManager.INSTANCE.registerBadCaseCallback(
-//                () -> { // onShow()
-//                    return mBadcaseBtn; },
-//                () -> { // onHide()
-//                    return null; });
-
         if (mBadcaseBtn != null) {
-            CallerDevaToolsManager.INSTANCE.initBadCase(mBadcaseBtn, null, null);
+            CallerDevaToolsManager.INSTANCE.initBadCase(mBadcaseBtn);
             if (!HmiBuildConfig.isShowBadCaseView) {
                 CallerAutopilotRecordListenerManager.INSTANCE.addListener(TAG, this);
             }
         }
-        //设置升级小红点提示 默认隐藏
-        mUpgradeTipIv = findViewById(R.id.module_och_bus_upgrade_red_tip);
-        CallerHmiManager.INSTANCE.registerUpgradeTipsCallback(() -> mUpgradeTipIv);
     }
 
     private void updateSwitchMapIcon(){
@@ -251,6 +244,10 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
         }
     }
 
+    @Override
+    public void onAutopilotRecordConfig(@NonNull MessagePad.RecordDataConfig config) {
+    }
+
 
     /**
      * 测试到站
diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java
index 8b753cb167..3347997c0e 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java
@@ -42,10 +42,9 @@ public class BusFragment extends BaseBusTabFragment<BusFragment, BusPresenter>
     private static final String TAG = "BusFragment";
 
     private TextView mCurrentStationName;
-    private TextView mStartStationFlag;
     private TextView mNextStationName;
-    private TextView mEndStationFlag;
-    //    private TextView mDebugArrive;
+    private TextView mCurrentTag;
+    private TextView mNextTag;
     private TextView mSwitchLine; //切换路线
     private int mCurrentStation = 0;
 
@@ -64,11 +63,10 @@ public class BusFragment extends BaseBusTabFragment<BusFragment, BusPresenter>
         super.initViews();
         mBus = findViewById(R.id.module_och_bus_tag);
         mCurrentStationName = findViewById(R.id.module_och_bus_current_station);
-        mStartStationFlag = findViewById(R.id.module_och_bus_start_station_tag);
+        mCurrentTag = findViewById(R.id.module_och_bus_current_station_anchor);
         mNextStationName = findViewById(R.id.module_och_bus_order_end_station);
-        mEndStationFlag = findViewById(R.id.module_och_bus_end_station_tag);
+        mNextTag = findViewById(R.id.module_och_bus_next_station_anchor);
         mSwitchLine = findViewById(R.id.switch_line_btn);
-//        mDebugArrive = findViewById(R.id.module_och_bus_arrive_station);
 
         if (DebugConfig.isDebug()) {
             mBus.setOnClickListener(view -> {
@@ -76,10 +74,6 @@ public class BusFragment extends BaseBusTabFragment<BusFragment, BusPresenter>
                 mPresenter.queryBusRoutes();
             });
 
-//            mBus.setOnLongClickListener(view -> {
-//                getActivity().finish();
-//                return true;
-//            });
             //debug下调用测试面板
             mCurrentStationName.setOnLongClickListener(v -> {
                 debugTestBar();
@@ -156,8 +150,6 @@ public class BusFragment extends BaseBusTabFragment<BusFragment, BusPresenter>
         CallerLogger.INSTANCE.d(M_BUS + "MapMaker ", "currentStation=" + currentStation + ",nextStation=" + nextStation + "isArrived=" + isArrived);
         String currentStationName = null;
         String nextStationName = null;
-        int startStationFlagVisibility = View.INVISIBLE;
-        int endStationFlagVisibility = View.INVISIBLE;
 
         boolean isArriveEndStation = false;
         boolean isArriveAtStation = false;
@@ -171,9 +163,8 @@ public class BusFragment extends BaseBusTabFragment<BusFragment, BusPresenter>
 
         // 是否到达起点
         if (currentStation == 0) {
-            startStationFlagVisibility = View.VISIBLE;
             isArriveAtStartStation = true;
-            mStartStationFlag.setText(getResources().getString(R.string.bus_arrive_to_end_start));
+            mCurrentTag.setText(getResources().getString(R.string.bus_arrive_to_end_start));
 
             setOrRemoveMapMaker(true, BusConst.BUS_START_MAP_MAKER, startStation.getLat()
                     , startStation.getLon(),R.raw.star_marker);
@@ -181,6 +172,8 @@ public class BusFragment extends BaseBusTabFragment<BusFragment, BusPresenter>
                     , endStation.getLon(),R.raw.end_marker);
         } else if (currentStation > 0 && currentStation < stationList.size() - 1) {// 是否到达站点
             isArriveAtStation = true;
+            mCurrentTag.setText(getResources().getString(R.string.bus_arrive_to_current_tag));
+            mNextTag.setText(getResources().getString(R.string.bus_arrive_to_next_tag));
 
             setOrRemoveMapMaker(false, BusConst.BUS_START_MAP_MAKER, startStation.getLat()
                     , startStation.getLon(),R.raw.star_marker);
@@ -189,9 +182,7 @@ public class BusFragment extends BaseBusTabFragment<BusFragment, BusPresenter>
         } else if (currentStation == stationList.size() - 1) {// 是否到达终点
             isArriveEndStation = true;
             nextStationName = "--";
-            mStartStationFlag.setText(getResources().getString(R.string.bus_arrive_to_end_end));
-            startStationFlagVisibility = View.VISIBLE;
-            endStationFlagVisibility = View.INVISIBLE;
+            mNextTag.setText(getResources().getString(R.string.bus_arrive_to_end_end));
 
             setOrRemoveMapMaker(false, BusConst.BUS_START_MAP_MAKER, startStation.getLat()
                     , startStation.getLon(),R.raw.star_marker);
@@ -211,8 +202,10 @@ public class BusFragment extends BaseBusTabFragment<BusFragment, BusPresenter>
         }
 
         // 是否到达终点
-        if (nextStation == stationList.size() - 1) {
-            endStationFlagVisibility = View.VISIBLE;
+        if ( nextStation == stationList.size() - 1 || nextStation == -1) {
+            mNextTag.setText(getResources().getString(R.string.bus_arrive_to_end_end));
+        }else {
+            mNextTag.setText(getResources().getString(R.string.bus_arrive_to_next_tag));
         }
 
         // 重置滑动按钮文字
@@ -226,9 +219,6 @@ public class BusFragment extends BaseBusTabFragment<BusFragment, BusPresenter>
 
         mCurrentStationName.setText(currentStationName);
         mNextStationName.setText(nextStationName);
-        mStartStationFlag.setVisibility(startStationFlagVisibility);
-        mEndStationFlag.setVisibility(endStationFlagVisibility);
-
         updateBusTestBarInfo();
     }
 
@@ -374,5 +364,4 @@ public class BusFragment extends BaseBusTabFragment<BusFragment, BusPresenter>
             startActivity(intent);
         }
     }
-
 }
diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java
index dffee2123e..da9473fef0 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java
@@ -79,7 +79,7 @@ import mogo.telematics.pad.MessagePad;
 public class BusOrderModel {
     private final String TAG = BusOrderModel.class.getSimpleName();
     private int currentLineId = -1;
-    private int currentStationIndex = 0; //因为服务端和前台对于当前站不一致，所以设置两个current index， 一个用于前台展示， 一个用于服务端接口请求
+//    private int currentStationIndex = 0; //因为服务端和前台对于当前站不一致，所以设置两个current index， 一个用于前台展示， 一个用于服务端接口请求
     private int backgroundCurrentStationIndex = 0;//A->B 此处值是A站点索引
     /**
      * 运营状态、后端更具运营状态来判断车辆是否派单
@@ -246,12 +246,12 @@ public class BusOrderModel {
      * 上报订单全路径规划数据
      */
     public void updateOrderRoute() {
-        if (!isGoingToNextStation || currentStationIndex >= stationList.size() || currentStationIndex-1 < 0 || points.size() == 0){
+        if (!isGoingToNextStation || backgroundCurrentStationIndex+1 >= stationList.size() || points.size() == 0){
             return;
         }
 
-        BusStationBean currentStation = stationList.get( currentStationIndex -1);
-        BusStationBean nextStation = stationList.get( currentStationIndex);
+        BusStationBean currentStation = stationList.get( backgroundCurrentStationIndex);
+        BusStationBean nextStation = stationList.get( backgroundCurrentStationIndex +1);
 
         BusServiceManager.getInstance().updateOrderRoute(mContext, currentLineId, currentStation.getSiteId()
                 , nextStation.getSiteId(), points, new IBusServiceCallback<BaseData>() {
@@ -446,11 +446,10 @@ public class BusOrderModel {
                 if (!isOneWayOver){
                     CallerLogger.INSTANCE.d( M_BUS + TAG, "自动驾驶开启开往下一站====" );
                     //需要更改当前站和下一站的状态 然后渲染
-                    RenderLeaveStationSuccess(o.getResult(),isRestart);
+                    leaveStationSuccess(o.getResult(),isRestart);
                 }else {
                     CallerLogger.INSTANCE.d( M_BUS + TAG, "单程真的结束了====" );
                     isGoingToNextStation = false;
-                    currentStationIndex = 0;
                     backgroundCurrentStationIndex = 0;
                     CallerAutoPilotManager.INSTANCE.cancelAutoPilot();
                     queryBusRoutes();
@@ -480,7 +479,7 @@ public class BusOrderModel {
             paramIndexes = {0},
             clientPkFileName = "sn"
     )
-    private void RenderLeaveStationSuccess(BusRoutesResult result, boolean isRestart) {
+    private void leaveStationSuccess(BusRoutesResult result, boolean isRestart) {
         renderBusStationsStatus(result);
         if (slidePannelHideCallback != null) {
             slidePannelHideCallback.hideSlidePanel();
@@ -500,8 +499,8 @@ public class BusOrderModel {
      * @param isRestart
      */
     private void startAutopilot(boolean isRestart) {
-        BusStationBean currentStation = stationList.get( currentStationIndex -1);
-        BusStationBean nextStation = stationList.get( currentStationIndex);
+        BusStationBean currentStation = stationList.get( backgroundCurrentStationIndex);
+        BusStationBean nextStation = stationList.get( backgroundCurrentStationIndex + 1);
 
 //        if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE
 //                == CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState()) {
@@ -540,9 +539,13 @@ public class BusOrderModel {
      * 到站后重置站点状态
      */
     private void arriveSiteStation(boolean isRestart) {
-        CallerLogger.INSTANCE.d(M_BUS + TAG,"arriveSiteStation-currentStationIndex = "+currentStationIndex);
+        CallerLogger.INSTANCE.d(M_BUS + TAG,"arriveSiteStation-currentStationIndex = "+ backgroundCurrentStationIndex +1);
+        int arrivedStationIndex = 0;
+        if (!isRestart){
+            arrivedStationIndex = backgroundCurrentStationIndex + 1;
+        }
         BusServiceManager.getInstance().arriveSiteStation(mContext
-                , stationList.get(currentStationIndex).getSeq(), stationList.get(currentStationIndex).getSiteId()
+                , stationList.get(backgroundCurrentStationIndex).getSeq(), stationList.get(arrivedStationIndex).getSiteId()
                 , new IBusServiceCallback<BaseData>() {
                     @Override
                     public void onSuccess(BaseData o) {
@@ -567,9 +570,9 @@ public class BusOrderModel {
     private void renderArriveBusStation() {
         List<BusStationBean> site = busRoutesResult.getSites();
         if (site != null && site.size() > 0){
-            backgroundCurrentStationIndex = currentStationIndex;
+            backgroundCurrentStationIndex ++;
             if (refreshBusStationsCallback != null){
-                refreshBusStationsCallback.refreshBusStations(stationList, currentStationIndex
+                refreshBusStationsCallback.refreshBusStations(stationList, backgroundCurrentStationIndex
                         , getNextStopStation(),true);
             }
         }
@@ -582,7 +585,7 @@ public class BusOrderModel {
         CallerLogger.INSTANCE.d( M_BUS + TAG, "查询到站下车乘客");
 
         BusServiceManager.getInstance().queryStationLeaveAwayPassengers(mContext
-                , stationList.get(currentStationIndex).getSeq(), stationList.get(currentStationIndex).getSiteId()
+                , stationList.get(backgroundCurrentStationIndex +1).getSeq(), stationList.get(backgroundCurrentStationIndex+1).getSiteId()
                 , new IBusServiceCallback<QueryLeaveAwayPassengersResponse>() {
                     @Override
                     public void onSuccess(QueryLeaveAwayPassengersResponse o) {
@@ -646,7 +649,7 @@ public class BusOrderModel {
                 startOrStopOrderLoop(mIsWorking);
                 if ( stationList != null && stationList.size() > 0 ) {
                     AIAssist.getInstance( mContext ).speakTTSVoice( "车辆已整备完毕，请前往"
-                            + stationList.get( currentStationIndex ).getName() + "站点" );
+                            + stationList.get( backgroundCurrentStationIndex ).getName() + "站点" );
                 }
                 carOperationStatusCallback.changeOperationStatus(isWorking());
                 queryBusRoutes();
@@ -723,36 +726,38 @@ public class BusOrderModel {
             }
             // 当前站点信息
             if (s.getDrivingStatus() == STATION_STATUS_STOPPED ) {
-                currentStationIndex = i;
+                backgroundCurrentStationIndex = i;
                 break;
             }
         }
-        backgroundCurrentStationIndex = currentStationIndex;
-        BusStationBean currentStation = stationList.get(currentStationIndex);
-        CallerLogger.INSTANCE.d( M_BUS + TAG, "渲染站点信息服务端currentStationIndex="+currentStationIndex
+//        backgroundCurrentStationIndex = currentStationIndex;
+        BusStationBean currentStation = stationList.get(backgroundCurrentStationIndex);
+        CallerLogger.INSTANCE.d( M_BUS + TAG, "渲染站点信息服务端currentStationIndex="+backgroundCurrentStationIndex
                 +"  isLeaving()="+currentStation.isLeaving());
         //当前站点是始发站，告诉服务端到达始发站。 如果没有这个节点， 服务器不知道始发站到达状态
         // ，订单开始站下在始发站的状态流转有问题
-        if (currentStationIndex == 0 && !currentStation.isLeaving()){
+        if (backgroundCurrentStationIndex == 0 && !currentStation.isLeaving()){
             arriveSiteStation(true);
         }
         // 美化是否开始
-        if (FunctionBuildConfig.isDemoMode && (currentStationIndex >= 0
-                && currentStationIndex <= stationList.size()-1)
-                && stationList.get(currentStationIndex).isLeaving()){//行驶过程中设置美化
+        if (FunctionBuildConfig.isDemoMode && (backgroundCurrentStationIndex >= 0
+                && backgroundCurrentStationIndex <= stationList.size()-1)
+                && stationList.get(backgroundCurrentStationIndex).isLeaving()){//行驶过程中设置美化
             FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = true;
             CallerAutoPilotManager.INSTANCE.setDemoMode(true);
             CallerLogger.INSTANCE.d(M_BUS + TAG, "美化模式-ignore：置为true（每次滑动出发）");
         }
         if (refreshBusStationsCallback != null){
-            if (currentStation.isLeaving()){//如果服务端的当前站是leaving状态，展示当前站需要+1
-                currentStationIndex ++;
-                refreshBusStationsCallback.refreshBusStations(stationList
-                        , currentStationIndex, getNextStopStation(),false);
-            }else{
-                refreshBusStationsCallback.refreshBusStations(stationList
-                        , currentStationIndex, getNextStopStation(),true);
-            }
+//            if (currentStation.isLeaving()){//如果服务端的当前站是leaving状态，展示当前站需要+1
+//                currentStationIndex ++;
+//                refreshBusStationsCallback.refreshBusStations(stationList
+//                        , currentStationIndex, getNextStopStation(),false);
+//            }else{
+//                refreshBusStationsCallback.refreshBusStations(stationList
+//                        , currentStationIndex, getNextStopStation(),true);
+//            }
+            refreshBusStationsCallback.refreshBusStations(stationList
+                    , backgroundCurrentStationIndex, getNextStopStation(),true);
         }
         if ( currentStation.isLeaving() && slidePannelHideCallback != null) {
             slidePannelHideCallback.hideSlidePanel();
@@ -768,10 +773,10 @@ public class BusOrderModel {
      * @return -1 当前已是最后一个站点
      */
     private int getNextStopStation() {
-        if ( currentStationIndex >= stationList.size() - 1 ) {
+        if ( backgroundCurrentStationIndex >= stationList.size() - 1 ) {
             return -1;
         }
-        int nextStationIndex = currentStationIndex + 1;
+        int nextStationIndex = backgroundCurrentStationIndex + 1;
         for ( ; nextStationIndex < stationList.size() - 1; nextStationIndex++ ) {
             if ( stationList.get( nextStationIndex ).getIfStop() == 1 ) {
                 break;
@@ -802,12 +807,12 @@ public class BusOrderModel {
      * @param awayPassengersResponse
      */
     private void playLeavePassengersMsg( QueryLeaveAwayPassengersResponse awayPassengersResponse ) {
-        CallerLogger.INSTANCE.d( M_BUS + TAG, "播报下车乘客信息currentStationIndex="+currentStationIndex);
+        CallerLogger.INSTANCE.d( M_BUS + TAG, "播报下车乘客信息currentStationIndex="+backgroundCurrentStationIndex+1);
 
-        if ( currentStationIndex > stationList.size() - 1 ) {
+        if ( backgroundCurrentStationIndex +1 > stationList.size() - 1 ) {
             return;
         }
-        String station = stationList.get( currentStationIndex ).getName();
+        String station = stationList.get( backgroundCurrentStationIndex+1 ).getName();
         StringBuilder builder = new StringBuilder( "已到达" );
         builder.append( station );
         if ( !station.endsWith( "站" ) ) {
@@ -856,7 +861,7 @@ public class BusOrderModel {
     private void travelOver() {
 //        CallerLogger.INSTANCE.d( M_BUS + TAG, "行程结束");
 
-        if ( currentStationIndex >= stationList.size() ) {
+        if ( backgroundCurrentStationIndex >= stationList.size() ) {
             CallerLogger.INSTANCE.e( M_BUS + TAG, "travel over index out of station list" );
             return;
         }
@@ -875,16 +880,16 @@ public class BusOrderModel {
      * @param data
      */
     public void onArriveAt( MessagePad.ArrivalNotification data){
-        if ( currentStationIndex > stationList.size() - 1 ) {
+        if ( backgroundCurrentStationIndex +1 > stationList.size() - 1 ) {
             CallerLogger.INSTANCE.e( M_BUS + TAG, "到站异常，取消后续操作结束" );
             return;
         }
-        if (FunctionBuildConfig.isDemoMode && currentStationIndex <= stationList.size() - 1) {//到达一站结束美化
+        if (FunctionBuildConfig.isDemoMode && backgroundCurrentStationIndex <= stationList.size() - 1) {//到达一站结束美化
             FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false;
             CallerAutoPilotManager.INSTANCE.setDemoMode(false);
             CallerLogger.INSTANCE.d(M_BUS + TAG, "美化模式-ignore：置为false（到最后一站）");
         }
-        CallerLogger.INSTANCE.d( M_BUS + TAG, "到站====currentStationIndex=" + currentStationIndex);
+        CallerLogger.INSTANCE.d( M_BUS + TAG, "到站====currentStationIndex=" + backgroundCurrentStationIndex);
         isGoingToNextStation = false;
         // 到达站点后，更新站点状态
 //        currentStationIndex = getNextStopStation();
@@ -930,11 +935,11 @@ public class BusOrderModel {
     }
 
     public void triggerStartServiceEvent(boolean isRestart, boolean send) {
-        if (stationList == null || currentStationIndex >= stationList.size() || currentStationIndex == 0) {
+        if (stationList == null || backgroundCurrentStationIndex >= stationList.size() || backgroundCurrentStationIndex == 0) {
             return;
         }
-        BusStationBean currentStation = stationList.get( currentStationIndex -1);
-        BusStationBean nextStation = stationList.get( currentStationIndex);
+        BusStationBean currentStation = stationList.get( backgroundCurrentStationIndex);
+        BusStationBean nextStation = stationList.get( backgroundCurrentStationIndex +1);
         BusAnalyticsManager.getInstance().triggerStartAutopilotEvent(isRestart, send,
                 currentStation.getName(), nextStation.getName(), currentLineId);
     }
@@ -944,6 +949,6 @@ public class BusOrderModel {
     }
 
     public int getCurrentStationIndex() {
-        return currentStationIndex;
+        return backgroundCurrentStationIndex;
     }
 }
diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_line_panel_bg.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_line_panel_bg.png
new file mode 100755
index 0000000000..3166d20e37
Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_line_panel_bg.png differ
diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_line_panel_bg.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_line_panel_bg.png
new file mode 100755
index 0000000000..3166d20e37
Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_line_panel_bg.png differ
diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_line_panel_bg.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_line_panel_bg.png
new file mode 100755
index 0000000000..3166d20e37
Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_line_panel_bg.png differ
diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_switch_line_btn.xml b/OCH/mogo-och-bus/src/main/res/drawable/bus_switch_line_btn.xml
index 8062bcf093..5576b9e191 100644
--- a/OCH/mogo-och-bus/src/main/res/drawable/bus_switch_line_btn.xml
+++ b/OCH/mogo-och-bus/src/main/res/drawable/bus_switch_line_btn.xml
@@ -3,10 +3,9 @@
     <item>
         <shape android:shape="rectangle">
 
-            <corners android:bottomLeftRadius="27px"
-                android:bottomRightRadius="27px"/>
-
-            <solid android:color="#2A67EF"></solid>
+            <corners android:bottomLeftRadius="40px"
+                android:bottomRightRadius="40px"/>
+            <gradient android:angle="180" android:endColor="#20AAFF" android:startColor="#004DFF" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml b/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml
index 461842718e..ceae357b15 100644
--- a/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml
+++ b/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml
@@ -59,10 +59,9 @@
 
     <FrameLayout
         android:id="@+id/module_mogo_och_station_panel_container"
-        android:layout_width="@dimen/module_mogo_och_autopilot_order_bg_width"
-        android:layout_height="@dimen/module_mogo_och_autopilot_order_bg_height"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/module_mogo_och_autopilot_order_m_t"
-        android:background="@drawable/bus_panel_bkg"
         android:elevation="@dimen/bus_dp_10"
         android:visibility="gone"
         app:layout_constraintLeft_toLeftOf="@+id/module_mogo_och_autopilot_status"
@@ -126,16 +125,6 @@
         android:elevation="@dimen/dp_10"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toRightOf="@id/bus_switch_model_layout">
-        <ImageView
-            android:id="@+id/module_och_bus_upgrade_red_tip"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentTop="true"
-            android:layout_gravity="right"
-            android:visibility="gone"
-            android:elevation="8px"
-            android:background="@drawable/bus_setting_tip_red_cir_bg" />
         <ImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/OCH/mogo-och-bus/src/main/res/layout/fragment_och_bus.xml b/OCH/mogo-och-bus/src/main/res/layout/fragment_och_bus.xml
index 0c307b9d24..f7be014921 100644
--- a/OCH/mogo-och-bus/src/main/res/layout/fragment_och_bus.xml
+++ b/OCH/mogo-och-bus/src/main/res/layout/fragment_och_bus.xml
@@ -2,41 +2,34 @@
 <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_och_bus_order_status_stationInfo"
     android:layout_width="@dimen/module_mogo_och_autopilot_order_bg_width"
     android:layout_height="@dimen/module_mogo_och_autopilot_order_bg_height"
-    android:background="@drawable/bus_panel_bkg">
+    android:background="@drawable/bus_line_panel_bg"
+    android:paddingBottom="@dimen/module_och_bus_order_status_stationInfo_paddingBottom"
+    app:layout_constraintLeft_toLeftOf="parent"
+    app:layout_constraintTop_toTopOf="parent">
 
-<!--    <TextView-->
-<!--        android:id="@+id/module_och_bus_arrive_to_end_title"-->
-<!--        android:layout_width="wrap_content"-->
-<!--        android:layout_height="wrap_content"-->
-<!--        android:layout_marginTop="@dimen/dp_32"-->
-<!--        android:layout_marginLeft="@dimen/dp_27"-->
-<!--        android:text="@string/bus_arrive_to_end_title"-->
-<!--        android:textColor="#FFF"-->
-<!--        android:textSize="@dimen/dp_27"-->
-<!--        app:layout_constraintLeft_toLeftOf="parent"-->
-<!--        app:layout_constraintTop_toTopOf="parent"-->
-<!--        android:textStyle="bold" />-->
-
-<!--    <View-->
-<!--        android:id="@+id/module_och_bus_arrive_to_end_deviler_line"-->
-<!--        android:layout_width="match_parent"-->
-<!--        android:layout_height="@dimen/dp_1"-->
-<!--        android:layout_marginTop="@dimen/dp_23"-->
-<!--        app:layout_constraintLeft_toLeftOf="@+id/module_och_bus_arrive_to_end_title"-->
-<!--        app:layout_constraintTop_toBottomOf="@+id/module_och_bus_arrive_to_end_title"-->
-<!--        android:background="#707DBE">-->
-
-<!--    </View>-->
+    <TextView
+        android:id="@+id/module_och_bus_line_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/dp_30"
+        android:layout_marginTop="@dimen/dp_10"
+        android:text="--"
+        android:textColor="#FFF"
+        android:textSize="38px"
+        android:textStyle="bold"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/module_och_bus_tag"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="right"
-        android:layout_marginTop="@dimen/module_mogo_och_autopilot_order_tag_m_t"
-        android:layout_marginRight="@dimen/module_mogo_och_autopilot_order_tag_m_r"
+        android:layout_marginTop="@dimen/dp_10"
+        android:layout_marginRight="@dimen/dp_30"
         android:background="@drawable/bus_panel_anchor_bkg"
         android:paddingLeft="@dimen/module_mogo_och_autopilot_order_tag_p_r"
         android:paddingTop="2px"
@@ -46,144 +39,131 @@
         android:textColor="#FFF"
         android:textSize="@dimen/module_mogo_och_autopilot_order_tag_height"
         android:textStyle="bold"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintRight_toRightOf="parent"/>
+        app:layout_constraintBottom_toBottomOf="@+id/module_och_bus_line_name"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="@id/module_och_bus_line_name" />
 
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/module_och_bus_order_status_stationInfo"
+    <View
+        android:id="@+id/line1"
         android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_2"
+        android:layout_marginLeft="@dimen/dp_16"
+        android:layout_marginTop="@dimen/dp_24"
+        android:layout_marginRight="@dimen/dp_15"
+        android:background="@color/bus_arrived_dash_color"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/module_och_bus_tag" />
+
+    <View
+        android:id="@+id/line2"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_2"
+        android:layout_marginLeft="@dimen/dp_16"
+        android:layout_marginRight="@dimen/dp_15"
+        android:background="@color/bus_arriving_start_dash_color"
+        app:layout_constraintLeft_toLeftOf="@+id/line1"
+        app:layout_constraintRight_toRightOf="@+id/line1"
+        app:layout_constraintTop_toBottomOf="@+id/line1" />
+
+    <TextView
+        android:id="@+id/module_och_bus_current_station_anchor"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingLeft="@dimen/module_och_bus_order_status_stationInfo_paddingLeft"
-        android:paddingTop="8px"
-        android:paddingRight="@dimen/module_och_bus_order_status_stationInfo_paddingRight"
-        android:paddingBottom="@dimen/module_och_bus_order_status_stationInfo_paddingBottom"
-        app:layout_constraintTop_toBottomOf="@+id/module_och_bus_tag"
-        app:layout_constraintLeft_toLeftOf="parent">
+        android:layout_marginLeft="14px"
+        android:layout_marginTop="@dimen/dp_32"
+        android:text="当前站点："
+        android:textColor="#CAD6FF"
+        android:textSize="@dimen/module_och_bus_order_start_station_anchor_textSize"
+        android:textStyle="bold"
+        app:layout_constraintLeft_toRightOf="@+id/greenDot"
+        app:layout_constraintTop_toBottomOf="@+id/line2" />
 
-        <TextView
-            android:id="@+id/module_och_bus_current_station_anchor"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="14px"
-            android:text="当前站点："
-            android:textColor="#8E9DD4"
-            android:textSize="@dimen/module_och_bus_order_start_station_anchor_textSize"
-            android:textStyle="bold"
-            app:layout_constraintLeft_toRightOf="@+id/greenDot"
-            app:layout_constraintTop_toTopOf="parent" />
+    <TextView
+        android:id="@+id/module_och_bus_current_station"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="6px"
+        android:layout_marginRight="@dimen/module_och_bus_order_status_stationInfo_paddingRight"
+        android:ellipsize="end"
+        android:maxLines="2"
+        android:text="--"
+        android:textColor="#FFF"
+        android:textSize="@dimen/module_mogo_och_bus_station_name_text_size"
+        android:textStyle="bold"
+        app:layout_constraintLeft_toLeftOf="@+id/module_och_bus_current_station_anchor"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/module_och_bus_current_station_anchor" />
 
-        <TextView
-            android:id="@+id/module_och_bus_current_station"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="6px"
-            android:text="--"
-            android:textColor="#FFF"
-            android:textSize="@dimen/module_mogo_och_bus_station_name_text_size"
-            android:textStyle="bold"
-            android:maxLines="1"
-            android:ellipsize="end"
-            app:layout_constraintRight_toLeftOf="@+id/module_och_bus_start_station_tag"
-            app:layout_constraintLeft_toLeftOf="@+id/module_och_bus_current_station_anchor"
-            app:layout_constraintTop_toBottomOf="@+id/module_och_bus_current_station_anchor"
-            tools:text="后路站" />
+    <TextView
+        android:id="@+id/module_och_bus_next_station_anchor"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/module_och_bus_order_distance_anchor_marginTop"
+        android:text="下一站："
+        android:textColor="#CAD6FF"
+        android:textSize="@dimen/module_och_bus_order_start_station_anchor_textSize"
+        android:textStyle="bold"
+        app:layout_constraintLeft_toLeftOf="@+id/module_och_bus_current_station"
+        app:layout_constraintTop_toBottomOf="@+id/module_och_bus_current_station" />
 
-        <TextView
-            android:id="@+id/module_och_bus_start_station_tag"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="始"
-            android:textColor="#8E9DD4"
-            android:textSize="@dimen/module_mogo_och_bus_station_notice_text_size"
-            android:textStyle="bold"
-            android:visibility="invisible"
-            app:layout_constraintBottom_toBottomOf="@+id/module_och_bus_current_station"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/module_och_bus_current_station"
-            tools:visibility="visible" />
+    <TextView
+        android:id="@+id/module_och_bus_order_end_station"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="@dimen/module_och_bus_order_status_stationInfo_paddingRight"
+        android:ellipsize="end"
+        android:maxLines="2"
+        android:text="--"
+        android:textColor="#FFF"
+        android:textSize="@dimen/module_mogo_och_bus_station_name_text_size"
+        android:textStyle="bold"
+        app:layout_constraintLeft_toLeftOf="@+id/module_och_bus_next_station_anchor"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/module_och_bus_next_station_anchor"
+        tools:text="后路站1" />
 
-        <TextView
-            android:id="@+id/module_och_bus_next_station_anchor"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/module_och_bus_order_distance_anchor_marginTop"
-            android:text="下一站："
-            android:textColor="#8E9DD4"
-            android:textSize="@dimen/module_och_bus_order_start_station_anchor_textSize"
-            android:textStyle="bold"
-            app:layout_constraintLeft_toLeftOf="@+id/module_och_bus_current_station"
-            app:layout_constraintTop_toBottomOf="@+id/module_och_bus_current_station" />
+    <ImageView
+        android:id="@+id/greenDot"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="14px"
+        android:src="@drawable/bus_icon_arrived_station"
+        app:layout_constraintBottom_toBottomOf="@+id/module_och_bus_current_station"
+        app:layout_constraintLeft_toLeftOf="@+id/module_och_bus_line_name"
+        app:layout_constraintTop_toTopOf="@+id/module_och_bus_current_station" />
 
-        <TextView
-            android:id="@+id/module_och_bus_order_end_station"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:text="--"
-            android:textColor="#FFF"
-            android:textSize="@dimen/module_mogo_och_bus_station_name_text_size"
-            android:textStyle="bold"
-            android:maxLines="1"
-            android:ellipsize="end"
-            app:layout_constraintRight_toLeftOf="@+id/module_och_bus_end_station_tag"
-            app:layout_constraintLeft_toLeftOf="@+id/module_och_bus_next_station_anchor"
-            app:layout_constraintTop_toBottomOf="@+id/module_och_bus_next_station_anchor"
-            tools:text="后路站1" />
+    <ImageView
+        android:id="@+id/dotLine"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:scaleType="fitXY"
+        android:src="@drawable/bus_dot_line"
+        app:layout_constraintBottom_toTopOf="@+id/blueDot"
+        app:layout_constraintLeft_toLeftOf="@+id/greenDot"
+        app:layout_constraintRight_toRightOf="@+id/greenDot"
+        app:layout_constraintTop_toBottomOf="@+id/greenDot" />
 
-        <TextView
-            android:id="@+id/module_och_bus_end_station_tag"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="终"
-            android:textColor="#8E9DD4"
-            android:textSize="@dimen/module_mogo_och_bus_station_notice_text_size"
-            android:textStyle="bold"
-            android:visibility="invisible"
-            app:layout_constraintBottom_toBottomOf="@+id/module_och_bus_order_end_station"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/module_och_bus_order_end_station"
-            tools:visibility="visible" />
+    <ImageView
+        android:id="@+id/blueDot"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/bus_icon_arriving_station"
+        app:layout_constraintBottom_toBottomOf="@+id/module_och_bus_order_end_station"
+        app:layout_constraintLeft_toLeftOf="@+id/greenDot"
+        app:layout_constraintTop_toTopOf="@+id/module_och_bus_order_end_station" />
 
-        <ImageView
-            android:id="@+id/greenDot"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="14px"
-            android:src="@drawable/bus_icon_arrived_station"
-            app:layout_constraintBottom_toBottomOf="@+id/module_och_bus_current_station"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/module_och_bus_current_station" />
 
-        <ImageView
-            android:id="@+id/dotLine"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:scaleType="fitXY"
-            android:src="@drawable/bus_dot_line"
-            app:layout_constraintBottom_toTopOf="@+id/blueDot"
-            app:layout_constraintLeft_toLeftOf="@+id/greenDot"
-            app:layout_constraintRight_toRightOf="@+id/greenDot"
-            app:layout_constraintTop_toBottomOf="@+id/greenDot" />
-
-        <ImageView
-            android:id="@+id/blueDot"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/bus_icon_arriving_station"
-            app:layout_constraintBottom_toBottomOf="@+id/module_och_bus_order_end_station"
-            app:layout_constraintLeft_toLeftOf="@+id/greenDot"
-            app:layout_constraintTop_toTopOf="@+id/module_och_bus_order_end_station" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
     <TextView
         android:id="@+id/switch_line_btn"
-        android:layout_width="@dimen/module_mogo_och_autopilot_order_bg_width"
-        android:layout_height="@dimen/bus_switch_line_btn"
-        android:text="@string/bus_switch_line_btn"
+        android:layout_width="@dimen/bus_switch_line_btn_width_1"
+        android:layout_height="@dimen/bus_switch_line_btn_height_1"
+        android:layout_marginLeft="@dimen/dp_10"
+        android:background="@drawable/bus_switch_line_btn"
         android:gravity="center"
+        android:text="@string/bus_switch_line_btn"
         android:textColor="@android:color/white"
         android:textSize="@dimen/module_mogo_och_bus_station_notice_text_size"
-        android:background="@drawable/bus_switch_line_btn"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"/>
+        app:layout_constraintLeft_toLeftOf="parent" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1440/dimens.xml b/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1440/dimens.xml
index a27b69ae1d..bfe32ddbef 100644
--- a/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1440/dimens.xml
+++ b/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1440/dimens.xml
@@ -13,7 +13,7 @@
 
     <dimen name="module_mogo_och_bus_current_station_name_text_size">32px</dimen>
     <dimen name="module_mogo_och_bus_current_station_notice_text_size">20px</dimen>
-    <dimen name="module_mogo_och_bus_station_name_text_size">42px</dimen>
+    <dimen name="module_mogo_och_bus_station_name_text_size">40px</dimen>
     <dimen name="module_mogo_och_bus_station_notice_text_size">32px</dimen>
 
     <dimen name="module_mogo_och_bus_station_name_margin_left">15px</dimen>
@@ -44,17 +44,17 @@
     <dimen name="module_och_bus_order_status_stationInfo_paddingRight">30px</dimen>
     <dimen name="module_och_bus_order_status_stationInfo_paddingBottom">23px</dimen>
     <dimen name="module_och_bus_order_start_station_textSize">26px</dimen>
-    <dimen name="module_och_bus_order_start_station_anchor_textSize">32px</dimen>
+    <dimen name="module_och_bus_order_start_station_anchor_textSize">34px</dimen>
     <dimen name="module_och_bus_order_end_station_anchor_textSize">20px</dimen>
     <dimen name="module_och_bus_order_distance_container_height">80px</dimen>
     <dimen name="module_och_bus_order_distance_container_marginLeft">3px</dimen>
-    <dimen name="module_och_bus_order_distance_anchor_marginTop">44.5px</dimen>
+    <dimen name="module_och_bus_order_distance_anchor_marginTop">34px</dimen>
     <dimen name="module_och_bus_order_distance_anchor_textSize">20px</dimen>
     <dimen name="module_och_bus_order_distance_textSize">28px</dimen>
     <dimen name="module_och_bus_order_distance_marginRight">27px</dimen>
 
 
-    <dimen name="module_mogo_och_autopilot_order_tag_height">25.6px</dimen>
+    <dimen name="module_mogo_och_autopilot_order_tag_height">28px</dimen>
     <dimen name="module_mogo_och_autopilot_order_tag_m_t">20px</dimen>
     <dimen name="module_mogo_och_autopilot_order_tag_m_r">20px</dimen>
     <dimen name="module_mogo_och_autopilot_order_tag_p_r">16px</dimen>
@@ -86,8 +86,8 @@
     <dimen name="module_mogo_och_operation_status_padding">92px</dimen>
 
     <dimen name="module_mogo_och_autopilot_order_m_t">30px</dimen>
-    <dimen name="module_mogo_och_autopilot_order_bg_width">466px</dimen>
-    <dimen name="module_mogo_och_autopilot_order_bg_height">446px</dimen>
+    <dimen name="module_mogo_och_autopilot_order_bg_width">616px</dimen>
+    <dimen name="module_mogo_och_autopilot_order_bg_height">754px</dimen>
 
 
     <dimen name="module_mogo_och_autopilot_status_text_size">36px</dimen>
@@ -120,7 +120,8 @@
     <dimen name="bus_switch_line_title">46px</dimen>
     <dimen name="bus_switch_line_btn_width">700px</dimen>
     <dimen name="bus_switch_line_btn_height">120px</dimen>
-    <dimen name="bus_switch_line_btn">86px</dimen>
+    <dimen name="bus_switch_line_btn_width_1">560px</dimen>
+    <dimen name="bus_switch_line_btn_height_1">116px</dimen>
 
     <dimen name="bus_switch_line_btn_margin_b">20px</dimen>
 
diff --git a/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1600/dimens.xml b/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1600/dimens.xml
index 9c23585e71..0d52cd0aaa 100644
--- a/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1600/dimens.xml
+++ b/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1600/dimens.xml
@@ -13,7 +13,7 @@
 
     <dimen name="module_mogo_och_bus_current_station_name_text_size">32px</dimen>
     <dimen name="module_mogo_och_bus_current_station_notice_text_size">20px</dimen>
-    <dimen name="module_mogo_och_bus_station_name_text_size">42px</dimen>
+    <dimen name="module_mogo_och_bus_station_name_text_size">40px</dimen>
     <dimen name="module_mogo_och_bus_station_notice_text_size">32px</dimen>
 
     <dimen name="module_mogo_och_bus_station_name_margin_left">15px</dimen>
@@ -44,11 +44,11 @@
     <dimen name="module_och_bus_order_status_stationInfo_paddingRight">30px</dimen>
     <dimen name="module_och_bus_order_status_stationInfo_paddingBottom">23px</dimen>
     <dimen name="module_och_bus_order_start_station_textSize">26px</dimen>
-    <dimen name="module_och_bus_order_start_station_anchor_textSize">32px</dimen>
+    <dimen name="module_och_bus_order_start_station_anchor_textSize">34px</dimen>
     <dimen name="module_och_bus_order_end_station_anchor_textSize">20px</dimen>
     <dimen name="module_och_bus_order_distance_container_height">80px</dimen>
     <dimen name="module_och_bus_order_distance_container_marginLeft">3px</dimen>
-    <dimen name="module_och_bus_order_distance_anchor_marginTop">44.5px</dimen>
+    <dimen name="module_och_bus_order_distance_anchor_marginTop">34px</dimen>
     <dimen name="module_och_bus_order_distance_anchor_textSize">20px</dimen>
     <dimen name="module_och_bus_order_distance_textSize">28px</dimen>
     <dimen name="module_och_bus_order_distance_marginRight">27px</dimen>
@@ -86,8 +86,8 @@
     <dimen name="module_mogo_och_operation_status_padding">92px</dimen>
 
     <dimen name="module_mogo_och_autopilot_order_m_t">30px</dimen>
-    <dimen name="module_mogo_och_autopilot_order_bg_width">466px</dimen>
-    <dimen name="module_mogo_och_autopilot_order_bg_height">446px</dimen>
+    <dimen name="module_mogo_och_autopilot_order_bg_width">616px</dimen>
+    <dimen name="module_mogo_och_autopilot_order_bg_height">754px</dimen>
 
 
     <dimen name="module_mogo_och_autopilot_status_text_size">36px</dimen>
@@ -119,7 +119,8 @@
     <dimen name="bus_switch_line_title">46px</dimen>
     <dimen name="bus_switch_line_btn_width">700px</dimen>
     <dimen name="bus_switch_line_btn_height">120px</dimen>
-    <dimen name="bus_switch_line_btn">86px</dimen>
+    <dimen name="bus_switch_line_btn_width_1">560px</dimen>
+    <dimen name="bus_switch_line_btn_height_1">116px</dimen>
     <dimen name="bus_switch_line_btn_margin_b">50px</dimen>
 
     <dimen name="bus_traffic_light_layout_width">225px</dimen>
diff --git a/OCH/mogo-och-bus/src/main/res/values/dimens.xml b/OCH/mogo-och-bus/src/main/res/values/dimens.xml
index 51d39b3e5c..85e4768fcc 100644
--- a/OCH/mogo-och-bus/src/main/res/values/dimens.xml
+++ b/OCH/mogo-och-bus/src/main/res/values/dimens.xml
@@ -135,7 +135,8 @@
     <dimen name="bus_switch_line_title">30px</dimen>
     <dimen name="bus_switch_line_btn_width">450px</dimen>
     <dimen name="bus_switch_line_btn_height">72px</dimen>
-    <dimen name="bus_switch_line_btn">52px</dimen>
+    <dimen name="bus_switch_line_btn_width_1">280px</dimen>
+    <dimen name="bus_switch_line_btn_height_1">58px</dimen>
     <dimen name="bus_switch_line_btn_margin_b">20px</dimen>
 
     <dimen name="bus_traffic_light_layout_width">225px</dimen>
diff --git a/OCH/mogo-och-bus/src/main/res/values/strings.xml b/OCH/mogo-och-bus/src/main/res/values/strings.xml
index 0e7050b014..fdbca6ea6b 100644
--- a/OCH/mogo-och-bus/src/main/res/values/strings.xml
+++ b/OCH/mogo-och-bus/src/main/res/values/strings.xml
@@ -19,9 +19,9 @@
     <string name="bus_change_line_commit_tip_s">更换路线成功</string>
     <string name="bus_change_line_commit_tip_f">更换路线失败</string>
 <!--    <string name="bus_arrive_to_end_title">去往下车地点</string>-->
-    <string name="bus_arrive_to_end_start">始</string>
-<!--    <string name="bus_arrive_to_end_start1">上车</string>-->
-    <string name="bus_arrive_to_end_end">终</string>
-<!--    <string name="bus_arrive_to_end_end1">下车</string>-->
+    <string name="bus_arrive_to_end_start">起点：</string>
+    <string name="bus_arrive_to_end_end">终点：</string>
+    <string name="bus_arrive_to_current_tag">当前站点：</string>
+    <string name="bus_arrive_to_next_tag">下一站：</string>
     <string name="bus_auto_disable_tip">自动驾驶状态为0不可用</string>
 </resources>