From 6f61f1c82c47a87f9ea3f14392082e1879ea7ef9 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Thu, 24 Mar 2022 10:03:30 +0800
Subject: [PATCH] =?UTF-8?q?[Taxi=20passenger=20V1.1.0]=20Taxi=20passenger?=
 =?UTF-8?q?=20=E4=BC=98=E5=8C=96=E8=AE=A2=E5=8D=95fragment=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/TaxiPassengerBaseFragment.java         | 21 ++++++++++++-------
 .../ui/TaxiPassengerMapDirectionView.java     |  2 +-
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java
index c3cfb460f2..418730eaaf 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java
@@ -210,22 +210,27 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
         FragmentTransaction transaction = getChildFragmentManager().beginTransaction();
 
         if (isShow){
-            ochServingOrderFragment = new TaxiPassengerServingOrderFragment().newInstance();
+            flNaviPanelContainer.setVisibility(View.VISIBLE);
+            if (ochServingOrderFragment == null){
+                ochServingOrderFragment = new TaxiPassengerServingOrderFragment().newInstance();
+            }
+            if (ochServingOrderFragment.isHidden()){
+                transaction.show(ochServingOrderFragment).commitAllowingStateLoss();
+                return;
+            }
             if (ochServingOrderFragment.isAdded()){
-                transaction.show(ochServingOrderFragment);
+                transaction.show(ochServingOrderFragment).commitAllowingStateLoss();
                 return;
             }
             transaction.add(R.id.module_mogo_och_navi_panel_container, ochServingOrderFragment)
-                    .show(ochServingOrderFragment);
+                    .show(ochServingOrderFragment).commitAllowingStateLoss();
 
-            flNaviPanelContainer.setVisibility(View.VISIBLE);
         }else {
-            if (ochServingOrderFragment != null){
-                transaction.hide(ochServingOrderFragment);
-            }
             flNaviPanelContainer.setVisibility(View.GONE);
+            if (ochServingOrderFragment != null){
+                transaction.hide(ochServingOrderFragment).commitAllowingStateLoss();
+            }
         }
-        transaction.commitAllowingStateLoss();
     }
 
     /**
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerMapDirectionView.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerMapDirectionView.java
index 199381d4a9..35ed7236f0 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerMapDirectionView.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerMapDirectionView.java
@@ -182,7 +182,7 @@ public class TaxiPassengerMapDirectionView
         //更新车辆位置
         if (mCarMarker != null) {
             CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "location.getBearing() = " + location.getBearing());
-            mCarMarker.setRotateAngle(360 - location.getBearing());
+            mCarMarker.setRotateAngle(location.getBearing());
             mCarMarker.setPosition(currentLatLng);
             mCarMarker.setToTop();
         }