diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java
index 7a7c938ab0..c341867ff3 100644
--- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java
+++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java
@@ -11,7 +11,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.map.MogoMapUIController;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.och.bus.passenger.constant.BusPassengerConst;
-import com.mogo.och.bus.passenger.ui.BusPassengerBaseFragment;
+import com.mogo.och.bus.passenger.ui.BusPassengerRouteFragment;
 import com.mogo.service.statusmanager.IMogoStatusChangedListener;
 import com.mogo.service.statusmanager.StatusDescriptor;
 
@@ -31,7 +31,7 @@ public class MogoOCHBusPassenger implements IMogoOCH, IMogoStatusChangedListener
 
     private FragmentActivity mActivity;
     private int mContainerId;
-    private BusPassengerBaseFragment mPassengerFragment;
+    private BusPassengerRouteFragment mPassengerFragment;
 
     @Override
     public void createCoverage(FragmentActivity activity, int containerId) {
@@ -90,7 +90,7 @@ public class MogoOCHBusPassenger implements IMogoOCH, IMogoStatusChangedListener
     private void showFragment() {
         if (mPassengerFragment == null) {
             CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "准备add fragment======");
-            mPassengerFragment = new BusPassengerBaseFragment();
+            mPassengerFragment = new BusPassengerRouteFragment();
             mActivity.getSupportFragmentManager().beginTransaction().add(mContainerId, mPassengerFragment).commitAllowingStateLoss();
             return;
         }
diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java
index 17bcd30134..69a68e377b 100644
--- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java
+++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java
@@ -19,7 +19,7 @@ import com.mogo.och.bus.passenger.callback.IBusPassengerAutopilotPlanningCallbac
 import com.mogo.och.bus.passenger.callback.IBusPassengerControllerStatusCallback;
 import com.mogo.och.bus.passenger.callback.IBusPassengerRouteLineInfoCallback;
 import com.mogo.och.bus.passenger.model.BusPassengerModel;
-import com.mogo.och.bus.passenger.ui.BusPassengerBaseFragment;
+import com.mogo.och.bus.passenger.ui.BusPassengerRouteFragment;
 
 import java.util.List;
 
@@ -28,11 +28,11 @@ import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS
 /**
  * Created on 2022/3/31
  */
-public class BaseBusPassengerPresenter extends Presenter<BusPassengerBaseFragment> implements
+public class BaseBusPassengerPresenter extends Presenter<BusPassengerRouteFragment> implements
         IBusPassengerADASStatusCallback, IBusPassengerControllerStatusCallback, IBusPassegerDriverStatusCallback, IBusPassengerRouteLineInfoCallback, IBusPassengerAutopilotPlanningCallback {
     private static final String TAG = BaseBusPassengerPresenter.class.getSimpleName();
 
-    public BaseBusPassengerPresenter(BusPassengerBaseFragment view) {
+    public BaseBusPassengerPresenter(BusPassengerRouteFragment view) {
         super(view);
         BusPassengerModel.getInstance().init(AbsMogoApplication.getApp());
         initListeners();
diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java
index d3b0d2dbd3..be8bdf559d 100644
--- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java
+++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java
@@ -1,40 +1,33 @@
 package com.mogo.och.bus.passenger.ui;
 
-import android.location.Location;
 import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import androidx.annotation.NonNull;
-
-import com.amap.api.maps.model.LatLng;
+import com.mogo.commons.mvp.IView;
 import com.mogo.commons.mvp.MvpFragment;
 
+import com.mogo.commons.mvp.Presenter;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
 import com.mogo.eagle.core.function.call.map.CallerSmpManager;
-
 import com.mogo.och.bus.passenger.R;
 
-import com.mogo.och.bus.passenger.bean.BusPassengerStation;
-import com.mogo.och.bus.passenger.presenter.BaseBusPassengerPresenter;
-
-import java.util.List;
-
-import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS_P;
-
 /**
  * Created on 2022/3/31
  * <p>
  * Bus乘客端基础Fragment
  */
-public class BusPassengerBaseFragment extends MvpFragment<BusPassengerBaseFragment, BaseBusPassengerPresenter> {
+public abstract class BusPassengerBaseFragment<V extends IView, P extends Presenter<V>> extends MvpFragment<V, P> {
     private static final String TAG = BusPassengerBaseFragment.class.getSimpleName();
 
     private TextView mCurrentArriveStation;
     private TextView mCurrentArriveStationTitle;
     private TextView mCurrentArriveTip;
     private ImageView mAutopilotIv;
-    private BusPassengerRouteLineDialogFragment mRouteFragment;
+    private FrameLayout flContainer;
+
     /**
      * 改变自动驾驶状态
      *
@@ -52,6 +45,7 @@ public class BusPassengerBaseFragment extends MvpFragment<BusPassengerBaseFragme
         return TAG;
     }
 
+
     @Override
     protected void initViews() {
         //隐藏小地图
@@ -70,12 +64,19 @@ public class BusPassengerBaseFragment extends MvpFragment<BusPassengerBaseFragme
         super.initViews(savedInstanceState);
     }
 
+    /**
+     * 获取站点面板view，在{@link #initViews()}时候添加到container中
+     *
+     * @return 站点面板view
+     */
+    public abstract int getStationPanelViewId();
+
     /**
      * 显示线路信息
      */
     public void showRouteFragment() {
-        mRouteFragment = new BusPassengerRouteLineDialogFragment();
-        mRouteFragment.showNow(getChildFragmentManager(),"RouteFragment");
+        flContainer = findViewById(R.id.bus_p_route_panel);
+        LayoutInflater.from(getContext()).inflate(getStationPanelViewId(), flContainer);
     }
 
     public void updateArrivedStation(String station,int currentIndex){
@@ -92,33 +93,6 @@ public class BusPassengerBaseFragment extends MvpFragment<BusPassengerBaseFragme
             mCurrentArriveStation.setText(station);
         }
 
-    }
-    @NonNull
-    @Override
-    protected BaseBusPassengerPresenter createPresenter() {
-        return new BaseBusPassengerPresenter(this);
-    }
-
-    public void onCarLocationChanged(Location location){
-       if (mRouteFragment != null) mRouteFragment.onCarLocationChanged(location);
-    }
-
-    public void changeOperationStatus(boolean changeStatus){
-        if (mRouteFragment != null) mRouteFragment.changeOperationStatus(changeStatus);
-    }
-
-    public void updateLineInfo(String lineName, String lineDurTime){
-        if (mRouteFragment != null) mRouteFragment.updateLineInfo(lineName,lineDurTime);
-    }
-
-    public void updateStationsInfo(List<BusPassengerStation> stations, int currentStationIndex){
-        if (mRouteFragment != null) mRouteFragment.updateStationsInfo(stations);
-        updateArrivedStation(stations.get(currentStationIndex).getName(),currentStationIndex);
-    }
-
-    public void routeResult(List<LatLng> models){
-        if (mRouteFragment != null) mRouteFragment.routeResult(models);
-
     }
 
     public void onAutopilotStatusChanged(int status) {
diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteLineDialogFragment.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java
similarity index 84%
rename from OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteLineDialogFragment.java
rename to OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java
index 39c287e65c..90903bfc53 100644
--- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteLineDialogFragment.java
+++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java
@@ -1,25 +1,15 @@
 package com.mogo.och.bus.passenger.ui;
 
-import android.content.Context;
-import android.graphics.Color;
-import android.graphics.Point;
 import android.location.Location;
 import android.os.Bundle;
-import android.view.Gravity;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.view.WindowManager;
 import android.view.animation.Animation;
 import android.view.animation.RotateAnimation;
 import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.ConstraintLayout;
-import androidx.fragment.app.DialogFragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -33,7 +23,9 @@ import com.mogo.och.bus.passenger.adapter.BusPassengerLineStationsAdapter;
 import com.mogo.och.bus.passenger.bean.BusPassengerStation;
 import com.mogo.och.bus.passenger.callback.IBusPassengerMapViewCallback;
 import com.mogo.och.bus.passenger.model.BusPassengerModel;
+import com.mogo.och.bus.passenger.presenter.BaseBusPassengerPresenter;
 
+import org.jetbrains.annotations.NotNull;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -47,11 +39,12 @@ import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS
 
 /**
  * @author: wangmingjun
- * @date: 2022/4/8
+ * @date: 2022/4/12
  */
-public class BusPassengerRouteLineDialogFragment extends DialogFragment implements IBusPassengerMapViewCallback {
+public class BusPassengerRouteFragment extends
+        BusPassengerBaseFragment<BusPassengerRouteFragment, BaseBusPassengerPresenter> implements IBusPassengerMapViewCallback {
 
-    private final String TAG = "BusPassengerRouteLineDialogFragment";
+    private final String TAG = "BusPassengerRouteFragment";
 
     private BusPassengerTrafficLightView mTrafficLightView;
     private List<BusPassengerStation> mStationsList = new ArrayList<>();
@@ -69,93 +62,39 @@ public class BusPassengerRouteLineDialogFragment extends DialogFragment implemen
     private RotateAnimation rotateAnimation;
     private float lastBearing = 0;
     private BusPassengerLineStationsAdapter mAdapter;
-
-    @Nullable
     @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.bus_p_route_fragment, container, false);
-        initView(view);
-        return view;
+    public int getStationPanelViewId() {
+        return R.layout.bus_p_route_fragment;
+    }
+
+    @NonNull
+    @Override
+    protected BaseBusPassengerPresenter createPresenter() {
+        return new BaseBusPassengerPresenter(this);
     }
 
     @Override
-    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        mMapDirectionView = view.findViewById(R.id.bus_p_line_map_view);
-        mMapDirectionView.onCreateView(savedInstanceState);
-        mMapDirectionView.setTaxiPassengerMapViewCallback(this);
-    }
-
-    @Override
-    public void onStart() {
-        super.onStart();
-        setCancelable(false);
-        getDialog().setCanceledOnTouchOutside(false);
-        Window window = getDialog().getWindow();
-        //dialog padding 去掉
-        window.getDecorView().setPadding(0,0,0,0);
-        window.setDimAmount(0f);
-        WindowManager.LayoutParams params = window.getAttributes();
-        CallerLogger.INSTANCE.d(M_BUS_P + TAG,"params.flags= "+params.flags);
-        params.flags = params.flags | WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL;
-        CallerLogger.INSTANCE.d(M_BUS_P + TAG,"params.flags= "+params.flags);
-        params.x = 0;
-        params.y = 0;
-        WindowManager windowManager  = (WindowManager)getContext().getSystemService(Context.WINDOW_SERVICE);
-        Point point = new Point();
-        windowManager.getDefaultDisplay().getSize(point);
-        params.width = (int)(point.x * 0.225);
-        params.height = ViewGroup.LayoutParams.MATCH_PARENT;
-        CallerLogger.INSTANCE.d(M_BUS_P + TAG,"width= "+params.width+"height= "+params.height);
-        window.setAttributes(params);
-        window.getDecorView().setBackgroundColor(Color.parseColor("#00FFFFFF"));//设置背景， 不然显示不全
-        window.setGravity(Gravity.RIGHT|Gravity.BOTTOM);
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        if (mMapDirectionView != null) {
-            mMapDirectionView.onResume();
-        }
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        if (mMapDirectionView != null) {
-            mMapDirectionView.onPause();
-        }
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        if (mMapDirectionView != null) {
-            mMapDirectionView.onDestroy();
-        }
-    }
-
-    private void initView(View view) {
-        mTrafficLightView = view.findViewById(R.id.bus_p_traffic_light_view);
+    protected void initViews() {
+        super.initViews();
+        mTrafficLightView = findViewById(R.id.bus_p_traffic_light_view);
         CallerHmiManager.INSTANCE.setProxyTrafficLightView(mTrafficLightView);
 
-        mSpeedTv = view.findViewById(R.id.bus_p_speed_tv);
+        mSpeedTv = findViewById(R.id.bus_p_speed_tv);
 
-        mNoLineInfoView = view.findViewById(R.id.bus_p_no_order_data_view);
+        mNoLineInfoView =findViewById(R.id.bus_p_no_order_data_view);
 
-        mCarPlateNum = view.findViewById(R.id.bus_p_driver_num_plate_tv);
-        mLineName = view.findViewById(R.id.bus_p_line_name_tv);
-        mOperationTime = view.findViewById(R.id.line_operation_time_tv);
+        mCarPlateNum = findViewById(R.id.bus_p_driver_num_plate_tv);
+        mLineName = findViewById(R.id.bus_p_line_name_tv);
+        mOperationTime = findViewById(R.id.line_operation_time_tv);
 
-        mRouteInfoView = view.findViewById(R.id.bus_p_line_cl);
-        mStationsListRv = view.findViewById(R.id.bus_p_line_stations_rl);
+        mRouteInfoView = findViewById(R.id.bus_p_line_cl);
+        mStationsListRv = findViewById(R.id.bus_p_line_stations_rl);
         LinearLayoutManager manager = new LinearLayoutManager(getContext());
         mStationsListRv.setLayoutManager(manager);
         mAdapter = new BusPassengerLineStationsAdapter(getContext(), mStationsList);
         mStationsListRv.setAdapter(mAdapter);
 
-        mMapArrowIcon = view.findViewById(R.id.bus_p_arrow_nor);
+        mMapArrowIcon = findViewById(R.id.bus_p_arrow_nor);
 
         //测试
         mSpeedTv.setOnLongClickListener(new View.OnLongClickListener() {
@@ -356,6 +295,38 @@ public class BusPassengerRouteLineDialogFragment extends DialogFragment implemen
         });
     }
 
+    @Override
+    protected void initViews(Bundle savedInstanceState) {
+        super.initViews(savedInstanceState);
+        mMapDirectionView = findViewById(R.id.bus_p_line_map_view);
+        mMapDirectionView.onCreateView(savedInstanceState);
+        mMapDirectionView.setTaxiPassengerMapViewCallback(this);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (mMapDirectionView != null) {
+            mMapDirectionView.onResume();
+        }
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        if (mMapDirectionView != null) {
+            mMapDirectionView.onPause();
+        }
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        if (mMapDirectionView != null) {
+            mMapDirectionView.onDestroy();
+        }
+    }
+
     public void routeResult(List<LatLng> latLngList) {
         CallerLogger.INSTANCE.d(M_BUS_P + TAG, "routeResult:" + latLngList.size());
         if (latLngList.size() > 0) {
@@ -410,11 +381,12 @@ public class BusPassengerRouteLineDialogFragment extends DialogFragment implemen
                 || !mCarPlateNum.getText().toString().equals(AppConfigInfo.INSTANCE.getPlateNumber())){
             mLineName.setText(lineName);
             mOperationTime.setText(lineDurTime);
-            mCarPlateNum.setText(null == AppConfigInfo.INSTANCE.getPlateNumber() ? "----" : AppConfigInfo.INSTANCE.getPlateNumber());
+            mCarPlateNum.setText(null == AppConfigInfo.INSTANCE.getPlateNumber() ? "京B45H34" : AppConfigInfo.INSTANCE.getPlateNumber());
         }
     }
 
-    public void updateStationsInfo(List<BusPassengerStation> stations) {
+    public void updateStationsInfo(List<BusPassengerStation> stations, int currentStationIndex) {
+        updateArrivedStation(stations.get(currentStationIndex).getName(),currentStationIndex);
         mStationsList.clear();
         mStationsList.addAll(stations);
         mAdapter.notifyDataSetChanged();
diff --git a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml
index 142e13dc2d..e49813c0f0 100644
--- a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml
+++ b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml
@@ -9,7 +9,7 @@
         android:layout_width="@dimen/dp_300"
         android:layout_height="@dimen/dp_300"
         android:layout_marginLeft="@dimen/dp_90"
-        android:layout_marginTop="@dimen/dp_90"
+        android:layout_marginTop="@dimen/dp_112"
         android:visibility="gone"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -18,7 +18,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/bus_p_curent_station_panel_margin"
-        android:layout_marginTop="@dimen/bus_p_auto_icon_margin_top"
+        android:layout_marginTop="@dimen/dp_112"
         android:scaleType="fitXY"
         android:layout_gravity="center_horizontal"
         android:src="@drawable/bus_p_un_auto_nor"
@@ -76,5 +76,11 @@
         app:layout_constraintLeft_toLeftOf="@+id/bus_p_cur_station_name"
         app:layout_constraintTop_toBottomOf="@+id/bus_p_cur_station_name" />
 
+    <FrameLayout
+        android:id="@+id/bus_p_route_panel"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_route_fragment.xml b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_route_fragment.xml
index a6c029af81..bb36d777a9 100644
--- a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_route_fragment.xml
+++ b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_route_fragment.xml
@@ -44,6 +44,7 @@
             app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
+            android:id="@+id/bus_p_unit_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/dp_10"
@@ -60,11 +61,10 @@
             android:id="@+id/bus_p_traffic_light_view"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/bus_p_route_info_margin_top"
             android:layout_marginRight="@dimen/bus_p_route_info_margin_right"
             android:visibility="gone"
             app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintBottom_toBottomOf="@+id/bus_p_unit_tv"/>
 
         <View
             android:id="@+id/dividing_line_1"
diff --git a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_traffic_light_view.xml b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_traffic_light_view.xml
index c2dabef312..0466fb6843 100644
--- a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_traffic_light_view.xml
+++ b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_traffic_light_view.xml
@@ -17,6 +17,7 @@
         android:id="@+id/bus_p_traffic_light_iv"
         android:layout_width="@dimen/bus_p_traffic_light_icon_size"
         android:layout_height="@dimen/bus_p_traffic_light_icon_size"
+        android:scaleType="fitXY"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent"/>
 
diff --git a/OCH/mogo-och-bus-passenger/src/main/res/values-sw320dp/dimens.xml b/OCH/mogo-och-bus-passenger/src/main/res/values-sw320dp/dimens.xml
index 92c2548a45..d2390c35b3 100644
--- a/OCH/mogo-och-bus-passenger/src/main/res/values-sw320dp/dimens.xml
+++ b/OCH/mogo-och-bus-passenger/src/main/res/values-sw320dp/dimens.xml
@@ -15,8 +15,8 @@
     <dimen name="bus_p_traffic_light_bg_width">158px</dimen>
     <dimen name="bus_p_traffic_light_bg_height">90px</dimen>
     <dimen name="bus_p_traffic_light_time_size">45px</dimen>
-    <dimen name="bus_p_traffic_light_time_view_width">80px</dimen>
-    <dimen name="bus_p_traffic_light_icon_size">90px</dimen>
+    <dimen name="bus_p_traffic_light_time_view_width">100px</dimen>
+    <dimen name="bus_p_traffic_light_icon_size">100px</dimen>
     <dimen name="bus_p_traffic_light_bg_stroke_width">3px</dimen>
 
     <dimen name="bus_p_route_dividing_line2_margin_top">224px</dimen>
diff --git a/OCH/mogo-och-bus-passenger/src/main/res/values/dimens.xml b/OCH/mogo-och-bus-passenger/src/main/res/values/dimens.xml
index 45adaf444a..be748ba23f 100644
--- a/OCH/mogo-och-bus-passenger/src/main/res/values/dimens.xml
+++ b/OCH/mogo-och-bus-passenger/src/main/res/values/dimens.xml
@@ -16,8 +16,8 @@
     <dimen name="bus_p_traffic_light_bg_width">158px</dimen>
     <dimen name="bus_p_traffic_light_bg_height">90px</dimen>
     <dimen name="bus_p_traffic_light_time_size">45px</dimen>
-    <dimen name="bus_p_traffic_light_time_view_width">80px</dimen>
-    <dimen name="bus_p_traffic_light_icon_size">90px</dimen>
+    <dimen name="bus_p_traffic_light_time_view_width">100px</dimen>
+    <dimen name="bus_p_traffic_light_icon_size">100px</dimen>
     <dimen name="bus_p_traffic_light_bg_stroke_width">3px</dimen>
 
     <dimen name="bus_p_route_dividing_line2_margin_top">224px</dimen>
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 6d12e21ed6..8bf210c856 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
@@ -3,7 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:layout_marginTop="@dimen/dp_72">
     <FrameLayout
         android:id="@+id/fl_speed"
         android:layout_width="@dimen/bus_ext_speed_width"
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_blue_circle_bg.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_blue_circle_bg.xml
index b2d27af0ce..7a876437a8 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_blue_circle_bg.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_blue_circle_bg.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
-    <size android:width="12px" android:height="12px"/>
-    <corners android:radius="11px" />
+    <size android:width="14px" android:height="14px"/>
+    <corners android:radius="12px" />
     <gradient
         android:startColor="#D2F4FF"
         android:endColor="#57C5FF"
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_seekbar_calculator_layer.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_seekbar_calculator_layer.xml
index 47335e5667..065554eb7c 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_seekbar_calculator_layer.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_seekbar_calculator_layer.xml
@@ -2,14 +2,14 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- 背景图 -->
     <item android:id="@android:id/background"
-        android:height="@dimen/dp_7"
+        android:height="@dimen/dp_10"
         android:gravity="center_vertical">
         <shape>
             <solid android:color="#1A3FA5FF"/>
         </shape>
     </item>
     <item android:id="@android:id/progress"
-        android:height="@dimen/dp_7"
+        android:height="@dimen/dp_10"
         android:gravity="center_vertical">
         <clip>
             <shape>
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_yellow_circle_bg.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_yellow_circle_bg.xml
index 60938a16f7..28a17cb4d0 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_yellow_circle_bg.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_yellow_circle_bg.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
-    <size android:width="12px" android:height="12px"/>
-    <corners android:radius="11px" />
+    <size android:width="14px" android:height="14px"/>
+    <corners android:radius="12px" />
     <gradient
         android:startColor="#FEB223"
         android:endColor="#FFE2AC"
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_activity_serving_order_view.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_activity_serving_order_view.xml
index f78e86d585..adf86fabd6 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_activity_serving_order_view.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_activity_serving_order_view.xml
@@ -8,11 +8,11 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:cardBackgroundColor="@android:color/transparent"
-        app:cardCornerRadius="@dimen/dp_40"
+        app:cardCornerRadius="@dimen/dp_48"
         app:cardElevation="@dimen/dp_20"
+        android:layout_marginTop="@dimen/dp_30"
         app:cardPreventCornerOverlap="true"
         app:cardUseCompatPadding="true"
-        android:layout_marginTop="@dimen/dp_12"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
@@ -25,23 +25,25 @@
 
             <com.mogo.och.taxi.passenger.ui.TaxiPassengerRadiuImageView
                 android:id="@+id/taxi_p_speed_bg"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:scaleType="fitXY"
+                android:adjustViewBounds="true"
                 android:src="@drawable/taxi_p_speed_light_green_bg"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:taxi_passenger_left_top_radius="@dimen/dp_40"
-                app:taxi_passenger_right_top_radius="@dimen/dp_40" />
+                app:taxi_passenger_left_top_radius="@dimen/dp_48"
+                app:taxi_passenger_right_top_radius="@dimen/dp_48" />
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/taxi_p_order_stations"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_96"
+                android:layout_marginTop="@dimen/dp_116"
                 android:background="#2661A2DC"
-                android:paddingTop="@dimen/dp_24"
-                android:paddingBottom="@dimen/dp_24"
+                android:paddingTop="@dimen/dp_40"
+                android:paddingBottom="@dimen/dp_40"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintTop_toTopOf="parent">
 
@@ -49,12 +51,12 @@
                     android:id="@+id/taxi_p_order_status_start_station_tv"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="68px"
+                    android:layout_marginLeft="@dimen/dp_82"
                     android:ellipsize="end"
                     android:maxLines="1"
                     android:text="--"
                     android:textColor="#FFFFFF"
-                    android:textSize="30px"
+                    android:textSize="@dimen/taxi_p_order_station_size"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
@@ -62,7 +64,7 @@
                     android:id="@+id/taxi_p_blue_dot"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginRight="20px"
+                    android:layout_marginRight="@dimen/dp_22"
                     android:background="@drawable/taxi_p_blue_circle_bg"
                     app:layout_constraintBottom_toBottomOf="@+id/taxi_p_order_status_start_station_tv"
                     app:layout_constraintRight_toLeftOf="@+id/taxi_p_order_status_start_station_tv"
@@ -72,12 +74,12 @@
                     android:id="@+id/taxi_p_order_status_end_station_tv"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="10px"
+                    android:layout_marginTop="@dimen/dp_12"
                     android:ellipsize="end"
                     android:maxLines="1"
                     android:text="--"
                     android:textColor="#FFFFFF"
-                    android:textSize="30px"
+                    android:textSize="@dimen/taxi_p_order_station_size"
                     app:layout_constraintLeft_toLeftOf="@+id/taxi_p_order_status_start_station_tv"
                     app:layout_constraintTop_toBottomOf="@+id/taxi_p_order_status_start_station_tv" />
 
@@ -85,7 +87,7 @@
                     android:id="@+id/taxi_p_yellow_dot"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginRight="20px"
+                    android:layout_marginRight="@dimen/dp_22"
                     android:background="@drawable/taxi_p_yellow_circle_bg"
                     app:layout_constraintBottom_toBottomOf="@+id/taxi_p_order_status_end_station_tv"
                     app:layout_constraintRight_toLeftOf="@+id/taxi_p_order_status_end_station_tv"
@@ -136,8 +138,8 @@
                             android:layout_height="wrap_content"
                             android:includeFontPadding="false"
                             android:text="--"
-                            android:textColor="#84D4FF"
-                            android:textSize="42px"
+                            android:textColor="@color/taxi_p_route_txt_color"
+                            android:textSize="@dimen/taxi_p_order_route_size"
                             android:textStyle="bold" />
 
                         <TextView
@@ -145,12 +147,12 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_above="@+id/taxi_p_order_remain_distance_title"
-                            android:layout_marginLeft="@dimen/dp_6"
+                            android:layout_marginLeft="@dimen/dp_7"
                             android:layout_toRightOf="@+id/taxi_p_order_remain_distance"
                             android:includeFontPadding="false"
                             android:text="公里"
                             android:textColor="#FFFFFF"
-                            android:textSize="20px" />
+                            android:textSize="24px" />
                     </LinearLayout>
 
                     <TextView
@@ -159,11 +161,11 @@
                         android:layout_height="wrap_content"
                         android:layout_below="@+id/taxi_p_order_remain_distance_ll"
                         android:layout_centerHorizontal="true"
-                        android:layout_marginTop="@dimen/dp_10"
+                        android:layout_marginTop="@dimen/dp_12"
                         android:includeFontPadding="false"
                         android:text="距离"
                         android:textColor="#8FB3EF"
-                        android:textSize="20px" />
+                        android:textSize="24px" />
 
                 </RelativeLayout>
 
@@ -189,8 +191,8 @@
                             android:layout_height="wrap_content"
                             android:includeFontPadding="false"
                             android:text="--"
-                            android:textColor="#84D4FF"
-                            android:textSize="42px"
+                            android:textColor="@color/taxi_p_route_txt_color"
+                            android:textSize="@dimen/taxi_p_order_route_size"
                             android:textStyle="bold" />
 
                         <TextView
@@ -198,12 +200,12 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_above="@+id/taxi_p_order_remain_time_title"
-                            android:layout_marginLeft="@dimen/dp_6"
+                            android:layout_marginLeft="@dimen/dp_7"
                             android:layout_toRightOf="@+id/taxi_p_order_remain_time"
                             android:includeFontPadding="false"
                             android:text="分钟"
                             android:textColor="#FFFFFF"
-                            android:textSize="20px" />
+                            android:textSize="24px" />
                     </LinearLayout>
 
                     <TextView
@@ -212,11 +214,11 @@
                         android:layout_height="wrap_content"
                         android:layout_below="@+id/taxi_p_order_remain_distance_ll2"
                         android:layout_centerHorizontal="true"
-                        android:layout_marginTop="@dimen/dp_10"
+                        android:layout_marginTop="@dimen/dp_12"
                         android:includeFontPadding="false"
                         android:text="剩余"
                         android:textColor="#8FB3EF"
-                        android:textSize="20px" />
+                        android:textSize="24px" />
 
                 </RelativeLayout>
 
@@ -236,8 +238,8 @@
                         android:layout_centerHorizontal="true"
                         android:includeFontPadding="false"
                         android:text="--"
-                        android:textColor="#84D4FF"
-                        android:textSize="42px"
+                        android:textColor="@color/taxi_p_route_txt_color"
+                        android:textSize="@dimen/taxi_p_order_route_size"
                         android:textStyle="bold" />
 
                     <TextView
@@ -246,11 +248,11 @@
                         android:layout_height="wrap_content"
                         android:layout_below="@+id/taxi_p_order_remain_arrive_time"
                         android:layout_centerHorizontal="true"
-                        android:layout_marginTop="@dimen/dp_10"
+                        android:layout_marginTop="@dimen/dp_12"
                         android:includeFontPadding="false"
                         android:text="到达"
                         android:textColor="#8FB3EF"
-                        android:textSize="20px" />
+                        android:textSize="24px" />
 
                 </RelativeLayout>
 
@@ -273,13 +275,13 @@
 
             <com.mogo.och.taxi.passenger.ui.CustomSeekBar
                 android:id="@+id/taxi_p_seekbar"
-                android:layout_width="@dimen/dp_250"
-                android:layout_height="@dimen/dp_25"
-                android:layout_marginBottom="20px"
+                android:layout_width="@dimen/dp_296"
+                android:layout_height="@dimen/dp_30"
+                android:layout_marginBottom="@dimen/dp_42"
                 android:fadingEdge="horizontal"
                 android:focusable="true"
-                android:maxHeight="@dimen/dp_25"
-                android:minHeight="@dimen/dp_25"
+                android:maxHeight="@dimen/dp_30"
+                android:minHeight="@dimen/dp_30"
                 android:paddingStart="0dp"
                 android:paddingEnd="0dp"
                 android:thumbOffset="5px"
@@ -293,12 +295,12 @@
                 android:id="@+id/taxi_p_progress_des"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/dp_30"
+                android:layout_marginLeft="@dimen/dp_40"
                 android:paddingRight="@dimen/dp_20"
                 android:textColor="@android:color/white"
                 android:textSize="@dimen/taxi_p_progress_des_size"
                 android:textStyle="italic"
-                android:layout_marginBottom="@dimen/dp_5"
+                android:layout_marginBottom="@dimen/dp_10"
                 android:typeface="monospace"
                 app:layout_constraintBottom_toTopOf="@+id/taxi_p_seekbar"
                 app:layout_constraintLeft_toLeftOf="parent" />
@@ -307,8 +309,8 @@
                 android:id="@+id/taxi_p_arrow_nor"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="@dimen/dp_20"
-                android:layout_marginBottom="@dimen/dp_10"
+                android:layout_marginRight="@dimen/dp_30"
+                android:layout_marginBottom="@dimen/dp_25"
                 android:src="@drawable/taxi_p_arrow_nor"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintRight_toRightOf="parent" />
@@ -319,8 +321,8 @@
         android:layout_width="@dimen/taxi_p_order_panel_width"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:layout_marginLeft="@dimen/dp_36"
-        android:elevation="15dp"
+        android:layout_marginLeft="@dimen/dp_44"
+        android:elevation="@dimen/dp_30"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         android:gravity="bottom">
@@ -333,8 +335,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dp_25"
-                android:layout_marginTop="@dimen/dp_8"
-                android:includeFontPadding = "false"
+                android:layout_marginTop="@dimen/dp_18"
                 android:letterSpacing="-0.05"
                 android:text="0"
                 android:textStyle="bold"
@@ -344,8 +345,8 @@
                 android:id="@+id/taxi_p_speed_tv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_10"
                 android:layout_marginLeft="@dimen/dp_20"
-                android:includeFontPadding = "false"
                 android:letterSpacing="-0.05"
                 android:text="0"
                 android:textStyle="bold"
@@ -359,19 +360,19 @@
             android:layout_marginLeft="@dimen/dp_12"
             android:text="KM/H"
             android:includeFontPadding="false"
-            android:layout_marginBottom="@dimen/dp_15"
+            android:layout_marginBottom="@dimen/dp_12"
             android:textColor="@android:color/white"
-            android:textSize="26px" />
+            android:textSize="@dimen/taxi_p_speed_unit_size" />
 
         <TextView
             android:id="@+id/taxi_p_order_status_tv"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginRight="@dimen/dp_40"
-            android:layout_marginBottom="@dimen/dp_15"
+            android:layout_marginBottom="@dimen/dp_12"
             android:gravity="right"
             android:text="@string/taxi_p_arrive_to_start"
             android:textColor="@android:color/white"
-            android:textSize="26px" />
+            android:textSize="@dimen/taxi_p_order_status_size" />
     </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml
index 6ce6a101f3..11b6cdd96d 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml
@@ -3,7 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:layout_marginTop="@dimen/dp_72">
 
         <ImageView
             android:id="@+id/module_och_autopilot_iv"
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values-sw320dp/dimens.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values-sw320dp/dimens.xml
index 7e4f321016..5f29c64ea0 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/values-sw320dp/dimens.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/values-sw320dp/dimens.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <dimen name="taxi_p_order_map_width">520px</dimen>
+    <dimen name="taxi_p_order_map_height">432px</dimen>
     <dimen name="module_och_taxi_panel_width">560px</dimen>
     <dimen name="module_och_taxi_panel_height">910px</dimen>
     <dimen name="taxi_operation_data_item_width">800px</dimen>
@@ -24,8 +26,8 @@
     <dimen name="taxi_tab_autoaploit_width">420px</dimen>
     <dimen name="taxi_tab_autoaploit_height">220px</dimen>
 
-    <dimen name="taxi_p_order_panel_width">520px</dimen>
-    <dimen name="taxi_p_order_panel_height">820px</dimen>
+    <dimen name="taxi_p_order_panel_width">624px</dimen>
+    <dimen name="taxi_p_order_panel_height">984px</dimen>
 
     <dimen name="taxi_p_traffic_light_layout_width">225px</dimen>
     <dimen name="taxi_p_traffic_light_layout_height">154px</dimen>
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values-xhdpi-2560x1440/dimens.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values-xhdpi-2560x1440/dimens.xml
index 4979821f90..d59b38a6b6 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/values-xhdpi-2560x1440/dimens.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/values-xhdpi-2560x1440/dimens.xml
@@ -24,12 +24,6 @@
     <dimen name="module_mogo_och_operation_status_bg_width">120px</dimen>
     <dimen name="module_mogo_och_operation_status_bg_height">120px</dimen>
 
-    <dimen name="taxi_p_arrived_end_tv_size">82px</dimen>
-    <dimen name="taxi_p_arrived_end_tip_size">42px</dimen>
-
-    <dimen name="taxi_p_speed_size">120px</dimen>
-    <dimen name="taxi_p_progress_des_size">28px</dimen>
-
     <dimen name="module_mogo_och_operation_status_padding">83px</dimen>
 
     <dimen name="module_mogo_och_autopilot_order_m_t">40px</dimen>
@@ -45,8 +39,6 @@
 
     <dimen name="module_mogo_och_notice_text_max_width">460px</dimen>
     <dimen name="module_mogo_och_notice_text_size">30px</dimen>
-    <dimen name="module_och_taxi_panel_width">560px</dimen>
-    <dimen name="module_och_taxi_panel_height">310px</dimen>
     <dimen name="module_och_taxi_order_start_station_marginLeft">15px</dimen>
     <dimen name="module_och_taxi_order_status_marginLeft">25px</dimen>
     <dimen name="module_och_taxi_order_status_marginTop">25px</dimen>
@@ -71,6 +63,10 @@
     <dimen name="module_och_taxi_order_distance_marginRight">17px</dimen>
     <dimen name="module_och_taxi_order_text_marginRight">31.5px</dimen>
 
+    <dimen name="taxi_p_order_map_width">520px</dimen>
+    <dimen name="taxi_p_order_map_height">432px</dimen>
+    <dimen name="module_och_taxi_panel_width">560px</dimen>
+    <dimen name="module_och_taxi_panel_height">910px</dimen>
     <dimen name="taxi_operation_data_item_width">800px</dimen>
     <dimen name="taxi_operation_data_item_height">222px</dimen>
     <dimen name="taxi_order_cancel_width">1120px</dimen>
@@ -93,8 +89,8 @@
     <dimen name="taxi_tab_autoaploit_width">420px</dimen>
     <dimen name="taxi_tab_autoaploit_height">220px</dimen>
 
-    <dimen name="taxi_p_order_panel_width">520px</dimen>
-    <dimen name="taxi_p_order_panel_height">820px</dimen>
+    <dimen name="taxi_p_order_panel_width">624px</dimen>
+    <dimen name="taxi_p_order_panel_height">984px</dimen>
 
     <dimen name="taxi_p_traffic_light_layout_width">225px</dimen>
     <dimen name="taxi_p_traffic_light_layout_height">154px</dimen>
@@ -118,4 +114,10 @@
     <dimen name="taxi_p_v2x_notification_text_margin_left">20px</dimen>
     <dimen name="taxi_p_v2x_notification_text_margin_right">30px</dimen>
 
+    <dimen name="taxi_p_arrived_end_tv_size">82px</dimen>
+    <dimen name="taxi_p_arrived_end_tip_size">42px</dimen>
+
+    <dimen name="taxi_p_speed_size">120px</dimen>
+    <dimen name="taxi_p_progress_des_size">28px</dimen>
+
 </resources>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values/colors.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values/colors.xml
index d9af8fd6e7..90bd4bfd1a 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/values/colors.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/values/colors.xml
@@ -34,6 +34,7 @@
     <color name="taxi_p_speed_warn_color2">#FF6F62</color>
     <color name="taxi_p_speed_normal_color1">#CEEEFF</color>
     <color name="taxi_p_speed_normal_color2">#A1DAFF</color>
+    <color name="taxi_p_route_txt_color">#84D4FF</color>
 
     <color name="taxi_p_map_bg">#00000000</color>
 
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values/dimens.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values/dimens.xml
index a95d5b27b7..730018af11 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/values/dimens.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/values/dimens.xml
@@ -35,8 +35,6 @@
 
     <dimen name="module_mogo_och_notice_text_max_width">460px</dimen>
     <dimen name="module_mogo_och_notice_text_size">30px</dimen>
-    <dimen name="module_och_taxi_panel_width">464px</dimen>
-    <dimen name="module_och_taxi_panel_height">310px</dimen>
     <dimen name="module_och_taxi_order_start_station_marginLeft">5px</dimen>
     <dimen name="module_och_taxi_order_status_marginLeft">20px</dimen>
     <dimen name="module_och_taxi_order_status_marginTop">20px</dimen>
@@ -61,6 +59,10 @@
     <dimen name="module_och_taxi_order_distance_marginRight">17px</dimen>
     <dimen name="module_och_taxi_order_text_marginRight">22.5px</dimen>
 
+    <dimen name="taxi_p_order_map_width">520px</dimen>
+    <dimen name="taxi_p_order_map_height">518px</dimen>
+    <dimen name="module_och_taxi_panel_width">560px</dimen>
+    <dimen name="module_och_taxi_panel_height">910px</dimen>
     <dimen name="taxi_operation_data_item_width">800px</dimen>
     <dimen name="taxi_operation_data_item_height">222px</dimen>
     <dimen name="taxi_order_cancel_width">1120px</dimen>
@@ -83,10 +85,8 @@
     <dimen name="taxi_tab_autoaploit_width">420px</dimen>
     <dimen name="taxi_tab_autoaploit_height">220px</dimen>
 
-    <dimen name="taxi_p_order_panel_width">520px</dimen>
-    <dimen name="taxi_p_order_panel_height">820px</dimen>
-    <dimen name="taxi_p_order_map_width">520px</dimen>
-    <dimen name="taxi_p_order_map_height">432px</dimen>
+    <dimen name="taxi_p_order_panel_width">624px</dimen>
+    <dimen name="taxi_p_order_panel_height">984px</dimen>
 
     <dimen name="taxi_p_traffic_light_layout_width">225px</dimen>
     <dimen name="taxi_p_traffic_light_layout_height">154px</dimen>
@@ -110,10 +110,13 @@
     <dimen name="taxi_p_v2x_notification_text_margin_left">20px</dimen>
     <dimen name="taxi_p_v2x_notification_text_margin_right">30px</dimen>
 
-
     <dimen name="taxi_p_arrived_end_tv_size">82px</dimen>
     <dimen name="taxi_p_arrived_end_tip_size">42px</dimen>
 
-    <dimen name="taxi_p_speed_size">120px</dimen>
-    <dimen name="taxi_p_progress_des_size">28px</dimen>
+    <dimen name="taxi_p_speed_size">144px</dimen>
+    <dimen name="taxi_p_speed_unit_size">32px</dimen>
+    <dimen name="taxi_p_order_status_size">32px</dimen>
+    <dimen name="taxi_p_order_station_size">36px</dimen>
+    <dimen name="taxi_p_order_route_size">50px</dimen>
+    <dimen name="taxi_p_progress_des_size">34px</dimen>
 </resources>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml
index a168e21300..a0bb45d5dd 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml
@@ -3,7 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:layout_marginTop="@dimen/dp_72">
 
     <LinearLayout
         android:id="@+id/module_mogo_och_speed_layout"