From 91c895ad0f909fa1da69c29893273ca7080c5801 Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Tue, 24 Oct 2023 14:30:21 +0800
Subject: [PATCH] [6.1.2] taxi fix bug of rain mode in mapview

---
 .../main/res/layout/taxi_base_fragment.xml    | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

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 502f11874d..2299ba82c5 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
@@ -9,16 +9,17 @@
     <com.mogo.eagle.core.function.view.MapBizView
         android:id="@+id/mapBizView"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        app:isWeatherEnable="false" />
 
     <com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugViewTrigger
         android:layout_width="@dimen/dp_400"
         android:layout_height="@dimen/dp_100"
         android:longClickable="true"
-        app:locationIcon3DRes="@raw/chuzuche"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:locationIcon3DRes="@raw/chuzuche" />
 
     <LinearLayout
         android:id="@+id/module_mogo_och_speed_layout"
@@ -305,7 +306,7 @@
             android:layout_width="@dimen/dp_70"
             android:layout_height="@dimen/dp_70"
             android:layout_gravity="center"
-            android:background="@drawable/bad_case_selector_och"/>
+            android:background="@drawable/bad_case_selector_och" />
     </LinearLayout>
 
     <com.mogo.eagle.core.function.hmi.ui.widget.RomaTaxiView
@@ -314,35 +315,34 @@
         app:layout_constraintBottom_toBottomOf="@id/module_och_taxi_badcase_ll"
         app:layout_constraintLeft_toRightOf="@id/module_och_taxi_badcase_ll"
         app:layout_constraintTop_toTopOf="@id/module_och_taxi_badcase_ll"
-        app:roma_open_bg="@drawable/taxi_operation_status_select_bg"
         app:roma_close_bg="@drawable/taxi_operation_status_bg"
-        />
+        app:roma_open_bg="@drawable/taxi_operation_status_select_bg" />
 
     <com.mogo.eagle.core.function.hmi.ui.widget.RomaDistanceView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/dp_10"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
-        android:layout_marginBottom="@dimen/dp_10"
         app:layout_constraintRight_toRightOf="parent" />
 
-<!--    <LinearLayout-->
-<!--        android:id="@+id/module_och_taxi_ai_collect_ll"-->
-<!--        android:layout_width="@dimen/module_mogo_och_operation_status_bg_width"-->
-<!--        android:layout_height="@dimen/module_mogo_och_operation_status_bg_height"-->
-<!--        android:layout_marginLeft="40dp"-->
-<!--        android:layout_marginBottom="@dimen/module_mogo_och_margin_bottom"-->
-<!--        android:elevation="@dimen/dp_10"-->
-<!--        android:gravity="center"-->
-<!--        android:background="@drawable/taxi_operation_status_bg_selector"-->
-<!--        app:layout_constraintBottom_toBottomOf="parent"-->
-<!--        app:layout_constraintLeft_toRightOf="@id/module_och_taxi_badcase_ll">-->
-<!--        <ImageView-->
-<!--            android:layout_width="@dimen/dp_70"-->
-<!--            android:layout_height="@dimen/dp_70"-->
-<!--            android:layout_gravity="center"-->
-<!--            android:background="@drawable/ai_collect_selector_och"/>-->
-<!--    </LinearLayout>-->
+    <!--    <LinearLayout-->
+    <!--        android:id="@+id/module_och_taxi_ai_collect_ll"-->
+    <!--        android:layout_width="@dimen/module_mogo_och_operation_status_bg_width"-->
+    <!--        android:layout_height="@dimen/module_mogo_och_operation_status_bg_height"-->
+    <!--        android:layout_marginLeft="40dp"-->
+    <!--        android:layout_marginBottom="@dimen/module_mogo_och_margin_bottom"-->
+    <!--        android:elevation="@dimen/dp_10"-->
+    <!--        android:gravity="center"-->
+    <!--        android:background="@drawable/taxi_operation_status_bg_selector"-->
+    <!--        app:layout_constraintBottom_toBottomOf="parent"-->
+    <!--        app:layout_constraintLeft_toRightOf="@id/module_och_taxi_badcase_ll">-->
+    <!--        <ImageView-->
+    <!--            android:layout_width="@dimen/dp_70"-->
+    <!--            android:layout_height="@dimen/dp_70"-->
+    <!--            android:layout_gravity="center"-->
+    <!--            android:background="@drawable/ai_collect_selector_och"/>-->
+    <!--    </LinearLayout>-->
 
     <Button
         android:id="@+id/btnAutopilotDisable"