diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxi.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxi.java
index fb79ee489e..e0d46e95b7 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxi.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxi.java
@@ -53,11 +53,11 @@ class MogoOCHTaxi implements IMogoOCH , IMogoStatusChangedListener {
         if (ochTaxiFragment == null) {
             Logger.d(TAG, "准备add fragment======");
             ochTaxiFragment = new OCHTaxiFragment();
-            mActivity.getSupportFragmentManager().beginTransaction().add(mContainerId, ochTaxiFragment).commit();
+            mActivity.getSupportFragmentManager().beginTransaction().add(mContainerId, ochTaxiFragment).commitAllowingStateLoss();
             return;
         }
         Logger.d(TAG, "准备show fragment");
-        mActivity.getSupportFragmentManager().beginTransaction().show(ochTaxiFragment).commit();
+        mActivity.getSupportFragmentManager().beginTransaction().show(ochTaxiFragment).commitAllowingStateLoss();
     }
 
     private void hideFragment(){
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml b/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml
index d7b4c3f7d9..7546b93bf8 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/module_och_taxi_layoutview"
     android:layout_width="@dimen/module_mogo_och_autopilot_order_bg_width"
-    android:layout_height="wrap_content"
+    android:layout_height="@dimen/module_mogo_och_autopilot_order_bg_height"
     android:minHeight="@dimen/module_mogo_och_autopilot_order_bg_height"
     android:orientation="vertical">
 
@@ -34,159 +34,55 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/module_och_taxi_order_status" />
 
-<!--    <androidx.constraintlayout.widget.ConstraintLayout-->
-<!--        android:id="@+id/module_och_taxi_order_status_stationInfo"-->
-<!--        android:layout_width="match_parent"-->
-<!--        android:layout_height="0dp"-->
-<!--        android:paddingLeft="@dimen/module_och_taxi_order_status_stationInfo_paddingLeft"-->
-<!--        android:paddingTop="@dimen/module_och_taxi_order_status_stationInfo_paddingTop"-->
-<!--        android:paddingRight="@dimen/module_och_taxi_order_status_stationInfo_paddingRight"-->
-<!--        android:paddingBottom="@dimen/module_och_taxi_order_status_stationInfo_paddingBottom"-->
-<!--        app:layout_constraintBottom_toTopOf="@+id/module_och_taxi_order_distance_container"-->
-<!--        app:layout_constraintEnd_toEndOf="parent"-->
-<!--        app:layout_constraintStart_toStartOf="parent"-->
-<!--        app:layout_constraintTop_toBottomOf="@+id/module_och_taxi_order_status_divider">-->
-
-<!--        <ImageView-->
-<!--            android:id="@+id/greenDot"-->
-<!--            android:layout_width="wrap_content"-->
-<!--            android:layout_height="wrap_content"-->
-<!--            android:src="@drawable/module_mogo_och_icon_arriving_station"-->
-<!--            app:layout_constraintBottom_toBottomOf="@+id/module_och_taxi_order_start_station"-->
-<!--            app:layout_constraintLeft_toLeftOf="parent"-->
-<!--            app:layout_constraintTop_toTopOf="@+id/module_och_taxi_order_start_station" />-->
-
-<!--        <TextView-->
-<!--            android:id="@+id/module_och_taxi_order_start_station"-->
-<!--            android:layout_width="wrap_content"-->
-<!--            android:layout_height="wrap_content"-->
-<!--            android:layout_marginLeft="@dimen/module_och_taxi_order_start_station_marginLeft"-->
-<!--            android:textColor="@color/module_och_order_status_textColor"-->
-<!--            android:textSize="@dimen/module_och_taxi_order_start_station_textSize"-->
-<!--            android:ellipsize="end"-->
-<!--            android:maxWidth="252px"-->
-<!--            android:lines="2"-->
-<!--            android:textStyle="bold"-->
-<!--            app:layout_constraintLeft_toRightOf="@+id/greenDot"-->
-<!--            app:layout_constraintTop_toTopOf="parent"-->
-<!--            tools:text="后路站后路站后路站后路站后路站" />-->
-
-<!--        <TextView-->
-<!--            android:id="@+id/module_och_taxi_order_start_station_anchor"-->
-<!--            android:layout_width="wrap_content"-->
-<!--            android:layout_height="wrap_content"-->
-<!--            android:text="上车"-->
-<!--            android:textColor="@color/module_och_taxi_order_start_station_anchor_textColor"-->
-<!--            android:layout_marginRight="@dimen/module_och_taxi_order_text_marginRight"-->
-<!--            android:textSize="@dimen/module_och_taxi_order_start_station_anchor_textSize"-->
-<!--            android:textStyle="bold"-->
-<!--            app:layout_constraintBottom_toBottomOf="@+id/module_och_taxi_order_start_station"-->
-<!--            app:layout_constraintRight_toRightOf="parent"-->
-<!--            app:layout_constraintTop_toTopOf="@+id/module_och_taxi_order_start_station" />-->
-
-<!--        <ImageView-->
-<!--            android:id="@+id/dotLine"-->
-<!--            android:layout_width="wrap_content"-->
-<!--            android:layout_height="0dp"-->
-<!--            android:scaleType="fitXY"-->
-<!--            android:src="@drawable/module_och_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/module_mogo_och_icon_arrived_station"-->
-<!--            app:layout_constraintBottom_toBottomOf="@+id/module_och_taxi_order_end_station"-->
-<!--            app:layout_constraintLeft_toLeftOf="@+id/greenDot"-->
-<!--            app:layout_constraintTop_toTopOf="@+id/module_och_taxi_order_end_station" />-->
-
-<!--        <TextView-->
-<!--            android:id="@+id/module_och_taxi_order_end_station"-->
-<!--            android:layout_width="wrap_content"-->
-<!--            android:layout_height="wrap_content"-->
-<!--            android:textColor="@color/module_och_order_status_textColor"-->
-<!--            android:textSize="@dimen/module_och_taxi_order_start_station_textSize"-->
-<!--            android:textStyle="bold"-->
-<!--            android:ellipsize="end"-->
-<!--            android:maxWidth="252px"-->
-<!--            android:lines="2"-->
-<!--            app:layout_constraintBottom_toBottomOf="parent"-->
-<!--            app:layout_constraintLeft_toLeftOf="@+id/module_och_taxi_order_start_station"-->
-<!--            app:layout_constraintLeft_toRightOf="@+id/greenDot"-->
-<!--            tools:text="后路站1" />-->
-
-
-<!--        <TextView-->
-<!--            android:id="@+id/module_och_taxi_order_end_station_anchor"-->
-<!--            android:layout_width="wrap_content"-->
-<!--            android:layout_height="wrap_content"-->
-<!--            android:text="下车"-->
-<!--            android:layout_marginRight="@dimen/module_och_taxi_order_text_marginRight"-->
-<!--            android:textColor="@color/module_och_taxi_order_end_station_anchor_textColor"-->
-<!--            android:textSize="@dimen/module_och_taxi_order_end_station_anchor_textSize"-->
-<!--            android:textStyle="bold"-->
-<!--            app:layout_constraintBottom_toBottomOf="@+id/module_och_taxi_order_end_station"-->
-<!--            app:layout_constraintRight_toRightOf="parent"-->
-<!--            app:layout_constraintTop_toTopOf="@+id/module_och_taxi_order_end_station" />-->
-
-<!--    </androidx.constraintlayout.widget.ConstraintLayout>-->
-
-
-    <LinearLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/module_och_taxi_order_status_stationInfo"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
+        android:layout_height="0dp"
         android:paddingLeft="@dimen/module_och_taxi_order_status_stationInfo_paddingLeft"
         android:paddingTop="@dimen/module_och_taxi_order_status_stationInfo_paddingTop"
         android:paddingRight="@dimen/module_och_taxi_order_status_stationInfo_paddingRight"
         android:paddingBottom="@dimen/module_och_taxi_order_status_stationInfo_paddingBottom"
-
+        app:layout_constraintBottom_toTopOf="@+id/module_och_taxi_order_distance_container"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/module_och_taxi_order_status_divider">
-    >
-        <RelativeLayout
-            android:layout_width="match_parent"
+
+        <ImageView
+            android:id="@+id/greenDot"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="horizontal">
-            <ImageView
-                android:id="@+id/greenDot"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/module_mogo_och_icon_arriving_station"
-                android:layout_centerVertical="true"
-                />
+            android:src="@drawable/module_mogo_och_icon_arriving_station"
+            app:layout_constraintBottom_toBottomOf="@+id/module_och_taxi_order_start_station"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/module_och_taxi_order_start_station" />
 
-            <TextView
-                android:id="@+id/module_och_taxi_order_start_station"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/module_och_taxi_order_start_station_marginLeft"
-                android:textColor="@color/module_och_order_status_textColor"
-                android:textSize="@dimen/module_och_taxi_order_start_station_textSize"
-                android:ellipsize="end"
-                android:maxWidth="252px"
-                android:lines="2"
-                android:textStyle="bold"
-                android:layout_toRightOf="@id/greenDot"
-                tools:text="后路站后路站后路站后路站后路站" />
+        <TextView
+            android:id="@+id/module_och_taxi_order_start_station"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/module_och_taxi_order_start_station_marginLeft"
+            android:textColor="@color/module_och_order_status_textColor"
+            android:textSize="@dimen/module_och_taxi_order_start_station_textSize"
+            android:ellipsize="end"
+            android:maxWidth="252px"
+            android:lines="2"
+            android:textStyle="bold"
+            app:layout_constraintLeft_toRightOf="@+id/greenDot"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="后路站后路站后路站后路站后路站" />
 
-            <TextView
-                android:id="@+id/module_och_taxi_order_start_station_anchor"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="上车"
-                android:textColor="@color/module_och_taxi_order_start_station_anchor_textColor"
-                android:layout_marginRight="@dimen/module_och_taxi_order_text_marginRight"
-                android:textSize="@dimen/module_och_taxi_order_start_station_anchor_textSize"
-                android:textStyle="bold"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                />
-        </RelativeLayout>
+        <TextView
+            android:id="@+id/module_och_taxi_order_start_station_anchor"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="上车"
+            android:textColor="@color/module_och_taxi_order_start_station_anchor_textColor"
+            android:layout_marginRight="@dimen/module_och_taxi_order_text_marginRight"
+            android:textSize="@dimen/module_och_taxi_order_start_station_anchor_textSize"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="@+id/module_och_taxi_order_start_station"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/module_och_taxi_order_start_station" />
 
         <ImageView
             android:id="@+id/dotLine"
@@ -199,48 +95,152 @@
             app:layout_constraintRight_toRightOf="@+id/greenDot"
             app:layout_constraintTop_toBottomOf="@+id/greenDot" />
 
-        <RelativeLayout
-            android:layout_width="match_parent"
+        <ImageView
+            android:id="@+id/blueDot"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="horizontal">
-            <ImageView
-                android:id="@+id/blueDot"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/module_mogo_och_icon_arrived_station"
-                android:layout_centerVertical="true"
-                />
+            android:src="@drawable/module_mogo_och_icon_arrived_station"
+            app:layout_constraintBottom_toBottomOf="@+id/module_och_taxi_order_end_station"
+            app:layout_constraintLeft_toLeftOf="@+id/greenDot"
+            app:layout_constraintTop_toTopOf="@+id/module_och_taxi_order_end_station" />
 
-            <TextView
-                android:id="@+id/module_och_taxi_order_end_station"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/module_och_taxi_order_start_station_marginLeft"
-                android:textColor="@color/module_och_order_status_textColor"
-                android:textSize="@dimen/module_och_taxi_order_start_station_textSize"
-                android:textStyle="bold"
-                android:ellipsize="end"
-                android:maxWidth="252px"
-                android:lines="2"
-                android:layout_toRightOf="@id/blueDot"
-                tools:text="后路站后路站后路站后路站后路站" />
+        <TextView
+            android:id="@+id/module_och_taxi_order_end_station"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/module_och_order_status_textColor"
+            android:textSize="@dimen/module_och_taxi_order_start_station_textSize"
+            android:textStyle="bold"
+            android:ellipsize="end"
+            android:maxWidth="252px"
+            android:lines="2"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="@+id/module_och_taxi_order_start_station"
+            app:layout_constraintLeft_toRightOf="@+id/greenDot"
+            tools:text="后路站1" />
 
 
-            <TextView
-                android:id="@+id/module_och_taxi_order_end_station_anchor"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="下车"
-                android:layout_marginRight="@dimen/module_och_taxi_order_text_marginRight"
-                android:textColor="@color/module_och_taxi_order_end_station_anchor_textColor"
-                android:textSize="@dimen/module_och_taxi_order_end_station_anchor_textSize"
-                android:textStyle="bold"
-                android:layout_centerVertical="true"
-                android:layout_alignParentRight="true"
-                />
-        </RelativeLayout>
+        <TextView
+            android:id="@+id/module_och_taxi_order_end_station_anchor"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="下车"
+            android:layout_marginRight="@dimen/module_och_taxi_order_text_marginRight"
+            android:textColor="@color/module_och_taxi_order_end_station_anchor_textColor"
+            android:textSize="@dimen/module_och_taxi_order_end_station_anchor_textSize"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="@+id/module_och_taxi_order_end_station"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/module_och_taxi_order_end_station" />
 
-    </LinearLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+<!--    <LinearLayout-->
+<!--        android:id="@+id/module_och_taxi_order_status_stationInfo"-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_height="wrap_content"-->
+<!--        android:orientation="vertical"-->
+<!--        android:paddingLeft="@dimen/module_och_taxi_order_status_stationInfo_paddingLeft"-->
+<!--        android:paddingTop="@dimen/module_och_taxi_order_status_stationInfo_paddingTop"-->
+<!--        android:paddingRight="@dimen/module_och_taxi_order_status_stationInfo_paddingRight"-->
+<!--        android:paddingBottom="@dimen/module_och_taxi_order_status_stationInfo_paddingBottom"-->
+
+<!--        app:layout_constraintTop_toBottomOf="@+id/module_och_taxi_order_status_divider">-->
+<!--    >-->
+<!--        <RelativeLayout-->
+<!--            android:layout_width="match_parent"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:orientation="horizontal">-->
+<!--            <ImageView-->
+<!--                android:id="@+id/greenDot"-->
+<!--                android:layout_width="wrap_content"-->
+<!--                android:layout_height="wrap_content"-->
+<!--                android:src="@drawable/module_mogo_och_icon_arriving_station"-->
+<!--                android:layout_centerVertical="true"-->
+<!--                />-->
+
+<!--            <TextView-->
+<!--                android:id="@+id/module_och_taxi_order_start_station"-->
+<!--                android:layout_width="wrap_content"-->
+<!--                android:layout_height="wrap_content"-->
+<!--                android:layout_marginLeft="@dimen/module_och_taxi_order_start_station_marginLeft"-->
+<!--                android:textColor="@color/module_och_order_status_textColor"-->
+<!--                android:textSize="@dimen/module_och_taxi_order_start_station_textSize"-->
+<!--                android:ellipsize="end"-->
+<!--                android:maxWidth="252px"-->
+<!--                android:lines="2"-->
+<!--                android:textStyle="bold"-->
+<!--                android:layout_toRightOf="@id/greenDot"-->
+<!--                tools:text="后路站后路站后路站后路站后路站" />-->
+
+<!--            <TextView-->
+<!--                android:id="@+id/module_och_taxi_order_start_station_anchor"-->
+<!--                android:layout_width="wrap_content"-->
+<!--                android:layout_height="wrap_content"-->
+<!--                android:text="上车"-->
+<!--                android:textColor="@color/module_och_taxi_order_start_station_anchor_textColor"-->
+<!--                android:layout_marginRight="@dimen/module_och_taxi_order_text_marginRight"-->
+<!--                android:textSize="@dimen/module_och_taxi_order_start_station_anchor_textSize"-->
+<!--                android:textStyle="bold"-->
+<!--                android:layout_alignParentRight="true"-->
+<!--                android:layout_centerVertical="true"-->
+<!--                />-->
+<!--        </RelativeLayout>-->
+
+<!--        <ImageView-->
+<!--            android:id="@+id/dotLine"-->
+<!--            android:layout_width="wrap_content"-->
+<!--            android:layout_height="0dp"-->
+<!--            android:scaleType="fitXY"-->
+<!--            android:src="@drawable/module_och_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" />-->
+
+<!--        <RelativeLayout-->
+<!--            android:layout_width="match_parent"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:orientation="horizontal">-->
+<!--            <ImageView-->
+<!--                android:id="@+id/blueDot"-->
+<!--                android:layout_width="wrap_content"-->
+<!--                android:layout_height="wrap_content"-->
+<!--                android:src="@drawable/module_mogo_och_icon_arrived_station"-->
+<!--                android:layout_centerVertical="true"-->
+<!--                />-->
+
+<!--            <TextView-->
+<!--                android:id="@+id/module_och_taxi_order_end_station"-->
+<!--                android:layout_width="wrap_content"-->
+<!--                android:layout_height="wrap_content"-->
+<!--                android:layout_marginLeft="@dimen/module_och_taxi_order_start_station_marginLeft"-->
+<!--                android:textColor="@color/module_och_order_status_textColor"-->
+<!--                android:textSize="@dimen/module_och_taxi_order_start_station_textSize"-->
+<!--                android:textStyle="bold"-->
+<!--                android:ellipsize="end"-->
+<!--                android:maxWidth="252px"-->
+<!--                android:lines="2"-->
+<!--                android:layout_toRightOf="@id/blueDot"-->
+<!--                tools:text="后路站后路站后路站后路站后路站" />-->
+
+
+<!--            <TextView-->
+<!--                android:id="@+id/module_och_taxi_order_end_station_anchor"-->
+<!--                android:layout_width="wrap_content"-->
+<!--                android:layout_height="wrap_content"-->
+<!--                android:text="下车"-->
+<!--                android:layout_marginRight="@dimen/module_och_taxi_order_text_marginRight"-->
+<!--                android:textColor="@color/module_och_taxi_order_end_station_anchor_textColor"-->
+<!--                android:textSize="@dimen/module_och_taxi_order_end_station_anchor_textSize"-->
+<!--                android:textStyle="bold"-->
+<!--                android:layout_centerVertical="true"-->
+<!--                android:layout_alignParentRight="true"-->
+<!--                />-->
+<!--        </RelativeLayout>-->
+
+<!--    </LinearLayout>-->
     <FrameLayout
         android:id="@+id/module_och_taxi_order_distance_container"
         android:layout_width="match_parent"