From 332043a074b14b95c0343b51cd3487ff415cd9cb Mon Sep 17 00:00:00 2001
From: EmArrow <zhongchao@zhidaoauto.com>
Date: Sun, 29 Sep 2024 15:52:19 +0800
Subject: [PATCH] [6.7.0] shuttle ui bugfix

---
 .../res/layout/shuttle_weak_base_fragment.xml | 132 ++++--------------
 1 file changed, 25 insertions(+), 107 deletions(-)

diff --git a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml
index 069e58cd5a..22f7d8c014 100644
--- a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml
+++ b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml
@@ -1,18 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <com.mogo.eagle.core.function.hmi.map.MapContainerLayout
         android:id="@+id/mapContainerLayout"
         android:layout_width="1560dp"
-        android:layout_marginTop="@dimen/dp_66"
         android:layout_height="1534dp"
+        android:layout_marginTop="@dimen/dp_66"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        />
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <com.mogo.eagle.core.function.hmi.bone.BoneContainerView
+        android:id="@+id/boneContainerView"
+        android:layout_width="@dimen/dp_1046"
+        android:layout_height="match_parent"
+        android:elevation="100dp"
+        android:visibility="visible"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <!--接管提示-->
+    <com.mogo.eagle.core.function.hmi.ui.vehicle.TakeOverView
+        android:layout_width="@dimen/hmi_take_over_request_width"
+        android:layout_height="@dimen/hmi_take_over_request_height"
+        android:layout_marginTop="@dimen/hmi_take_over_request_m_top"
+        android:visibility="gone"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <com.mogo.och.common.module.wigets.LoadingMapStatusView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
 
     <com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugViewTrigger
         android:layout_width="@dimen/dp_400"
@@ -22,25 +43,6 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-    <!--Vip车辆标志-->
-    <com.mogo.eagle.core.function.hmi.ui.widget.VipIdentificationView
-        android:layout_width="@dimen/module_vip_width"
-        android:layout_height="@dimen/module_vip_height"
-        android:layout_marginStart="@dimen/dp_640"
-        android:layout_marginTop="@dimen/dp_80"
-        android:visibility="gone"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <!--pnc行为决策-->
-    <com.mogo.eagle.core.function.hmi.ui.vehicle.PncActionsView
-        android:layout_width="wrap_content"
-        android:layout_height="@dimen/dp_100"
-        android:layout_marginBottom="@dimen/dp_110"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-
     <!--APP、MAP版本-->
     <com.mogo.eagle.core.function.hmi.ui.widget.VersionNameView
         android:id="@+id/viewVersionName"
@@ -51,88 +53,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-    <!--超视距-->
-    <com.mogo.eagle.core.function.hmi.ui.widget.CameraView
-        android:id="@+id/ivCameraIcon"
-        android:layout_width="120dp"
-        android:layout_height="120dp"
-        android:layout_marginTop="45dp"
-        android:layout_marginEnd="40dp"
-        app:layout_constraintRight_toLeftOf="@id/viewTrafficLightVr"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:ignore="SpeakableTextPresentCheck"
-        tools:visibility="visible" />
-
-    <com.mogo.eagle.core.function.hmi.ui.mofang.MoFangStatusView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_71"
-        app:layout_constraintEnd_toEndOf="@+id/viewLimitingVelocity"
-        app:layout_goneMarginEnd="40dp"
-        app:layout_goneMarginTop="@dimen/dp_236"
-        android:visibility="invisible"
-        app:layout_constraintTop_toBottomOf="@+id/viewLimitingVelocity"/>
-
-    <com.mogo.eagle.core.function.hmi.ui.widget.GreenWaveView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_71"
-        app:layout_constraintEnd_toEndOf="@+id/viewLimitingVelocity"
-        app:layout_goneMarginEnd="40dp"
-        app:layout_goneMarginTop="@dimen/dp_236"
-        android:visibility="invisible"
-        app:layout_constraintTop_toBottomOf="@+id/viewLimitingVelocity"/>
-
-    <!--  事件弹框  -->
-    <com.mogo.eagle.core.function.hmi.ui.v2n.RoadV2NEventWindowView
-        android:id="@+id/roadV2NEventWindowView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginRight="@dimen/dp_3"
-        android:layout_marginTop="@dimen/dp_24"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:visibility="gone"/>
-
-    <!--红绿灯-->
-    <com.mogo.eagle.core.function.hmi.ui.widget.SingleTrafficLightView
-        android:id="@+id/viewTrafficLightVr"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/hmi_traffic_light_layout_margin_top"
-        android:layout_marginEnd="@dimen/hmi_traffic_light_layout_margin_right"
-        android:visibility="gone"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <!--接管提示-->
-    <com.mogo.eagle.core.function.hmi.ui.vehicle.TakeOverView
-        android:layout_width="@dimen/hmi_take_over_request_width"
-        android:layout_height="@dimen/hmi_take_over_request_height"
-        android:layout_marginTop="@dimen/hmi_take_over_request_m_top"
-        android:visibility="gone"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <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_28"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
-
-
-    <com.mogo.och.common.module.wigets.LoadingMapStatusView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
-
-    <com.mogo.eagle.core.function.hmi.bone.BoneContainerView
-        android:id="@+id/boneContainerView"
-        android:layout_width="@dimen/dp_1046"
-        android:layout_height="match_parent"
-        android:elevation="100dp"
-        android:visibility="visible"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file