From c95b6a9487490aa9a9115850e78cb90ab2d9e8cd Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Mon, 8 Jul 2024 16:55:41 +0800
Subject: [PATCH] =?UTF-8?q?[6.5.0]=20[fix]=20[=E5=8F=B8=E6=9C=BA=E5=B1=8F?=
 =?UTF-8?q?=20=E8=A7=86=E8=A7=92=E5=88=87=E6=8D=A2]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/och/taxi/ui/BaseTaxiTabFragment.java | 21 +++++++++++++++++++
 .../main/res/layout/taxi_base_fragment.xml    |  8 ++++---
 2 files changed, 26 insertions(+), 3 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 acf91553a2..ca9bd30ef8 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
@@ -8,6 +8,7 @@ import android.os.Handler;
 import android.os.Looper;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.animation.LinearInterpolator;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
@@ -15,6 +16,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.Group;
 import androidx.fragment.app.FragmentTransaction;
 
@@ -39,8 +41,11 @@ import com.mogo.map.listener.IMogoMapListener;
 import com.mogo.och.common.module.utils.ResourcesUtils;
 import com.mogo.och.common.module.wigets.map.orderstatus.OrderStatusView;
 import com.mogo.och.common.module.wigets.map.overmapview.OverMapDialog;
+import com.mogo.och.common.module.wigets.map.switchvisual.VisualViewDirver;
 import com.mogo.och.taxi.R;
 
+import me.jessyan.autosize.utils.AutoSizeUtils;
+
 
 /**
  * 网约车基础Fragment，主要负责布局通用界面，处理站点面板和通话面板互斥情况
@@ -68,6 +73,7 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
     protected DriverMsgBoxButtonView driverMsgBoxButtonView;
     protected DriverMsgBoxListView viewDriverMsgBoxList;
     protected DriverMsgBoxBubbleView viewDriverMsgBoxBubble;
+    protected VisualViewDirver visualViewDirver;
 
     protected TaxiAmapNaviFragment ochAmapNaviFragment = null;
     protected TaxiRottingNaviFragment taxiRottingNaviFragment = null;
@@ -97,6 +103,7 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
         driverMsgBoxButtonView = findViewById(R.id.viewDriverMsgBoxButton);
         viewDriverMsgBoxList = findViewById(R.id.viewDriverMsgBoxList);
         viewDriverMsgBoxBubble = findViewById(R.id.viewDriverMsgBoxBubble);
+        visualViewDirver = findViewById(R.id.vvd_change_angle);
 
         mSpeedView = findViewById(R.id.taxi_speed_contain);
         if (mSpeedView != null) {
@@ -426,6 +433,13 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
             @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));
+                }
+                visualViewDirver.setLayoutParams(layoutParams);
             }
         },UiThreadHandler.MODE.QUEUE);
     }
@@ -435,6 +449,13 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
             @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));
+                }
+                visualViewDirver.setLayoutParams(layoutParams);
             }
         },UiThreadHandler.MODE.QUEUE);
     }
diff --git a/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml b/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml
index 2f12e04013..ee5501e1c5 100644
--- a/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml
+++ b/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml
@@ -256,9 +256,11 @@
         tools:visibility="visible" />
 
     <com.mogo.och.common.module.wigets.map.switchvisual.VisualViewDirver
-        app:layout_constraintStart_toEndOf="@+id/module_mogo_och_station_panel_container"
-        app:layout_constraintBottom_toBottomOf="@+id/module_mogo_och_station_panel_container"
-        android:layout_marginBottom="@dimen/dp_32"
+        android:id="@+id/vvd_change_angle"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/toolsView"
+        android:layout_marginBottom="@dimen/dp_48"
+        android:layout_marginStart="@dimen/dp_618"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>