From 25ca7ffda53d6142e761bc407c4d840c559fd9a0 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Fri, 12 Jul 2024 15:52:18 +0800
Subject: [PATCH] =?UTF-8?q?[6.5.0]=20[fix]=20[=E9=A1=B5=E9=9D=A2=E7=94=9F?=
 =?UTF-8?q?=E5=91=BD=E5=91=A8=E6=9C=9F=E9=97=AE=E9=A2=98]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/och/taxi/ui/BaseTaxiTabFragment.java | 34 +++++++++++--------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
index a95db728aa..f436e8361c 100644
--- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
+++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
@@ -255,6 +255,7 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
             overMapDialog.destory();
             overMapDialog = null;
         }
+        super.onDestroyView();
         ctvAutopilotStatusRL = null;
         tvOperationStatus = null;
         mDriverRole = null;
@@ -273,7 +274,6 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
         ochAmapNaviFragment = null;
         taxiRottingNaviFragment = null;
         smallMapView = null;
-        super.onDestroyView();
         CallerAutopilotRecordListenerManager.INSTANCE.removeListener(TAG);
     }
 
@@ -434,14 +434,16 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
         UiThreadHandler.post(new Runnable() {
             @Override
             public void run() {
-                flStationPanelContainer.setVisibility(View.GONE);
-                ConstraintLayout.LayoutParams layoutParams = (ConstraintLayout.LayoutParams) visualViewDirver.getLayoutParams();
-                layoutParams.startToStart = ConstraintLayout.LayoutParams.PARENT_ID;
-                layoutParams.bottomToTop = R.id.toolsView;
-                if(getContext()!=null) {
-                    layoutParams.setMarginStart(AutoSizeUtils.dp2px(getContext(), 29));
+                if(flStationPanelContainer!=null) {
+                    flStationPanelContainer.setVisibility(View.GONE);
+                    ConstraintLayout.LayoutParams layoutParams = (ConstraintLayout.LayoutParams) visualViewDirver.getLayoutParams();
+                    layoutParams.startToStart = ConstraintLayout.LayoutParams.PARENT_ID;
+                    layoutParams.bottomToTop = R.id.toolsView;
+                    if (getContext() != null) {
+                        layoutParams.setMarginStart(AutoSizeUtils.dp2px(getContext(), 29));
+                    }
+                    visualViewDirver.setLayoutParams(layoutParams);
                 }
-                visualViewDirver.setLayoutParams(layoutParams);
             }
         },UiThreadHandler.MODE.QUEUE);
     }
@@ -450,14 +452,16 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
         UiThreadHandler.post(new Runnable() {
             @Override
             public void run() {
-                flStationPanelContainer.setVisibility(View.VISIBLE);
-                ConstraintLayout.LayoutParams layoutParams = (ConstraintLayout.LayoutParams) visualViewDirver.getLayoutParams();
-                layoutParams.startToStart = ConstraintLayout.LayoutParams.PARENT_ID;
-                layoutParams.bottomToTop = R.id.toolsView;
-                if(getContext()!=null) {
-                    layoutParams.setMarginStart(AutoSizeUtils.dp2px(getContext(), 618));
+                if(flStationPanelContainer!=null) {
+                    flStationPanelContainer.setVisibility(View.VISIBLE);
+                    ConstraintLayout.LayoutParams layoutParams = (ConstraintLayout.LayoutParams) visualViewDirver.getLayoutParams();
+                    layoutParams.startToStart = ConstraintLayout.LayoutParams.PARENT_ID;
+                    layoutParams.bottomToTop = R.id.toolsView;
+                    if (getContext() != null) {
+                        layoutParams.setMarginStart(AutoSizeUtils.dp2px(getContext(), 618));
+                    }
+                    visualViewDirver.setLayoutParams(layoutParams);
                 }
-                visualViewDirver.setLayoutParams(layoutParams);
             }
         },UiThreadHandler.MODE.QUEUE);
     }