From 91f831e05577bf5d5ff96aa8ec91f6de71e676d1 Mon Sep 17 00:00:00 2001 From: lianglihui Date: Thu, 1 Jul 2021 15:35:02 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E7=BA=A6=E8=BD=A6=20=E7=AB=99?= =?UTF-8?q?=E7=82=B9=E5=90=8D=E7=A7=B0=E8=BF=87=E9=95=BF=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20=E4=BA=A7=E5=93=81=E5=86=B3=E5=AE=9A=E5=BB=B6?= =?UTF-8?q?=E5=90=8E=E5=A4=84=E7=90=86=20=E5=A4=84=E7=90=86bugly=20#582025?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/och/taxi/MogoOCHTaxi.java | 4 +- .../main/res/layout/module_och_taxi_panel.xml | 362 +++++++++--------- 2 files changed, 183 insertions(+), 183 deletions(-) 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" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - > - - + 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" /> - + - - + - - + 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" /> - + - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +