From a72a97ea8c4f9e116047edccca8612693d8048f8 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Fri, 25 Oct 2024 09:52:44 +0800
Subject: [PATCH] =?UTF-8?q?[6.7.0]=20[=E9=80=82=E9=85=8D]=20[1536x2560]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../res/layout/shuttle_weak_switch_biz.xml    | 32 +++++++++++++++----
 .../res/layout/shuttle_weak_switch_line.xml   |  3 +-
 .../res/layout/shuttle_weak_switch_task.xml   |  3 +-
 .../res/layout/shuttle_weak_task_running.xml  |  3 +-
 .../src/main/res/values/dimens.xml            |  1 -
 .../routingrunning/RoutingRunningView.kt      |  4 +--
 .../res/layout/unmanned_routing_running.xml   | 22 ++++---------
 .../res/layout/unmanned_routing_select.xml    |  3 +-
 .../res/layout/unmanned_routing_switch.xml    |  3 +-
 .../main/res/layout/unmanned_switch_biz.xml   | 25 ++++++++++++---
 .../res/layout/unmanned_switch_itinerary.xml  |  3 +-
 .../main/res/layout/view_bone_container.xml   |  3 +-
 12 files changed, 66 insertions(+), 39 deletions(-)

diff --git a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_biz.xml b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_biz.xml
index 5e1fca3986..f5b1760fd2 100644
--- a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_biz.xml
+++ b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_biz.xml
@@ -2,9 +2,20 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="@dimen/dp_962"
-    android:layout_height="@dimen/dp_1047"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:background="@drawable/bus_biz_bg">
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/aciv_bg"
+        android:src="@drawable/bus_biz_bg"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginBottom="@dimen/dp_167"
+        android:scaleType="fitXY"
+        android:layout_width="@dimen/dp_962"
+        android:layout_height="@dimen/dp_0"/>
 
     <androidx.appcompat.widget.AppCompatImageView
         android:src="@drawable/bus_biz_bg_header"
@@ -19,7 +30,8 @@
         android:id="@+id/loading_biz"
         android:visibility="gone"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toBottomOf="@+id/aciv_bg"
+        android:layout_marginBottom="@dimen/dp_60"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         android:layout_width="wrap_content"
@@ -32,8 +44,10 @@
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="@+id/aciv_bg"
+        android:layout_marginBottom="@dimen/dp_60"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:layout_height="0dp"/>
 
     <com.mogo.och.weaknet.ui.switchtask.SwitchTaskView
         android:id="@+id/swtichTask"
@@ -42,8 +56,10 @@
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="@+id/aciv_bg"
+        android:layout_marginBottom="@dimen/dp_60"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:layout_height="0dp"/>
 
     <com.mogo.och.weaknet.ui.taskrunning.TaskRunningView
         android:id="@+id/taskRunning"
@@ -52,7 +68,9 @@
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="@+id/aciv_bg"
+        android:layout_marginBottom="@dimen/dp_60"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:layout_height="0dp"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_line.xml b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_line.xml
index 2aa5f7ad18..1c0e065ac9 100644
--- a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_line.xml
+++ b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_line.xml
@@ -2,7 +2,8 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="@dimen/dp_880"
-    android:layout_height="@dimen/dp_966"
+    android:layout_height="match_parent"
+    tools:layout_height="@dimen/dp_966"
     xmlns:tools="http://schemas.android.com/tools">
 
     <TextView
diff --git a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_task.xml b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_task.xml
index 328b10aae9..2eee25dd42 100644
--- a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_task.xml
+++ b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_task.xml
@@ -3,7 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="@dimen/dp_880"
-    android:layout_height="@dimen/dp_966"
+    android:layout_height="match_parent"
+    tools:layout_height="@dimen/dp_966"
     tools:background="@drawable/bus_switch_line_normal">
 
     <TextView
diff --git a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_task_running.xml b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_task_running.xml
index c76e2eecf8..3c41d3e5b1 100644
--- a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_task_running.xml
+++ b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_task_running.xml
@@ -2,7 +2,8 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="@dimen/dp_880"
-    android:layout_height="@dimen/dp_966"
+    android:layout_height="match_parent"
+    tools:layout_height="@dimen/dp_966"
     tools:background="@drawable/bus_switch_line_normal"
     xmlns:tools="http://schemas.android.com/tools">
 
diff --git a/OCH/shuttle/driver_weaknet/src/main/res/values/dimens.xml b/OCH/shuttle/driver_weaknet/src/main/res/values/dimens.xml
index fd1ec0cd92..c45fa5d21e 100644
--- a/OCH/shuttle/driver_weaknet/src/main/res/values/dimens.xml
+++ b/OCH/shuttle/driver_weaknet/src/main/res/values/dimens.xml
@@ -22,7 +22,6 @@
     <color name="bus_switch_map_bg">#323C6F</color>
     <dimen name="bus_dp_10">10dp</dimen>
     <dimen name="bus_dp_20">20dp</dimen>
-    <dimen name="bus_dp_200">200dp</dimen>
     <dimen name="bus_dp_52">52dp</dimen>
     <dimen name="bus_dp_65">65dp</dimen>
     <dimen name="bus_layout_margin_bottom">20dp</dimen>
diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/routingrunning/RoutingRunningView.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/routingrunning/RoutingRunningView.kt
index e22fefd1c3..f89b04ef30 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/routingrunning/RoutingRunningView.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/routingrunning/RoutingRunningView.kt
@@ -34,7 +34,6 @@ import kotlinx.android.synthetic.main.unmanned_routing_running.view.actv_distanc
 import kotlinx.android.synthetic.main.unmanned_routing_running.view.actv_end_routing
 import kotlinx.android.synthetic.main.unmanned_routing_running.view.actv_routing_name
 import kotlinx.android.synthetic.main.unmanned_routing_running.view.actv_submit_task
-import kotlinx.android.synthetic.main.unmanned_routing_running.view.actv_time_end
 import kotlinx.android.synthetic.main.unmanned_routing_running.view.goutp_show_routing_info
 import kotlinx.android.synthetic.main.unmanned_routing_running.view.include_empty
 import kotlinx.android.synthetic.main.unmanned_routing_running.view.naviToStart
@@ -196,8 +195,7 @@ class RoutingRunningView: ConstraintLayout, RoutingRunningModel.RoutingRuningCal
                     )
                 }"
             )
-            actv_distance_end.text =TaskUtils.getCurrentTaskDistance(meters)
-            actv_time_end.text =TaskUtils.getCurrentTaskTime(timeInSecond)
+            actv_distance_end.text = "${TaskUtils.getCurrentTaskDistance(meters)}  ${TaskUtils.getCurrentTaskTime(timeInSecond)}"
         }
     }
 
diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_running.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_running.xml
index c53c29dd26..865a2f1d6e 100644
--- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_running.xml
+++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_running.xml
@@ -3,7 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout"
     android:layout_width="@dimen/dp_880"
-    android:layout_height="@dimen/dp_966"
+    android:layout_height="match_parent"
+    tools:layout_height="@dimen/dp_966"
     tools:background="@drawable/shape_itinerary_bg_default"
     xmlns:tools="http://schemas.android.com/tools">
 
@@ -41,7 +42,7 @@
         android:layout_marginEnd="@dimen/dp_52"
         android:layout_width="match_parent"
         android:background="@drawable/shape_itinerary_bg_default"
-        android:layout_height="@dimen/dp_351"/>
+        android:layout_height="@dimen/dp_272"/>
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/aciv_current_itinerary_start_point"
@@ -61,7 +62,7 @@
         android:layout_marginTop="@dimen/dp_8"
         android:background="@color/taxi_color_4D000000"
         android:layout_width="@dimen/dp_6"
-        android:layout_height="@dimen/dp_171"/>
+        android:layout_height="@dimen/dp_92"/>
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/aciv_current_itinerary_end_point"
@@ -95,6 +96,7 @@
         android:layout_width="@dimen/dp_46"
         android:layout_height="@dimen/dp_46"/>
 
+
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/actv_distance_end"
         android:text="5.2公里"
@@ -102,22 +104,10 @@
         android:textColor="@color/taxi_color_CCCCCC"
         app:layout_constraintTop_toBottomOf="@+id/actv_current_itinerary_start_name"
         app:layout_constraintStart_toStartOf="@+id/actv_current_itinerary_start_name"
-        app:layout_constraintBottom_toTopOf="@+id/actv_time_end"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/actv_time_end"
-        android:text="1小时36分钟"
-        android:textSize="@dimen/dp_32"
-        android:textColor="@color/taxi_color_CCCCCC"
-        app:layout_constraintTop_toBottomOf="@+id/actv_distance_end"
-        app:layout_constraintStart_toStartOf="@+id/actv_current_itinerary_start_name"
         app:layout_constraintBottom_toTopOf="@+id/actv_current_itinerary_end_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
-
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/actv_current_itinerary_end_name"
         app:layout_constraintTop_toTopOf="@+id/aciv_current_itinerary_end_point"
@@ -162,7 +152,7 @@
 
     <androidx.constraintlayout.widget.Group
         android:id="@+id/goutp_show_routing_info"
-        app:constraint_referenced_ids="actv_end_routing,actv_submit_task,actv_current_itinerary_end_name,actv_time_end,actv_distance_end,actv_current_itinerary_start_name,aciv_current_itinerary_end_point,v_line_current_start_end,aciv_current_itinerary_start_point,v_bg_itinerary_info,actv_routing_name,naviToStart"
+        app:constraint_referenced_ids="actv_end_routing,actv_submit_task,actv_current_itinerary_end_name,actv_distance_end,actv_current_itinerary_start_name,aciv_current_itinerary_end_point,v_line_current_start_end,aciv_current_itinerary_start_point,v_bg_itinerary_info,actv_routing_name,naviToStart"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_select.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_select.xml
index 481fb6f4e7..b41c1767a4 100644
--- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_select.xml
+++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_select.xml
@@ -3,7 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout"
     android:layout_width="@dimen/dp_880"
-    android:layout_height="@dimen/dp_966"
+    android:layout_height="match_parent"
+    tools:layout_height="@dimen/dp_966"
     tools:background="@drawable/shape_itinerary_bg_default"
     xmlns:tools="http://schemas.android.com/tools">
 
diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_switch.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_switch.xml
index f123ba232c..7e1a136add 100644
--- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_switch.xml
+++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_switch.xml
@@ -2,7 +2,8 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="@dimen/dp_880"
-    android:layout_height="@dimen/dp_966"
+    android:layout_height="match_parent"
+    tools:layout_height="@dimen/dp_966"
     xmlns:tools="http://schemas.android.com/tools"
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
 
diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_biz.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_biz.xml
index bdbf10549f..15b1f5a5ab 100644
--- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_biz.xml
+++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_biz.xml
@@ -2,9 +2,20 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="@dimen/dp_962"
-    android:layout_height="@dimen/dp_1047"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:background="@drawable/taxi_biz_bg">
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/aciv_bg"
+        android:src="@drawable/taxi_biz_bg"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginBottom="@dimen/dp_167"
+        android:scaleType="fitXY"
+        android:layout_width="@dimen/dp_962"
+        android:layout_height="@dimen/dp_0"/>
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline_h_top"
@@ -41,15 +52,19 @@
         app:layout_constraintTop_toTopOf="@+id/guideline_h_top"
         app:layout_constraintStart_toStartOf="@+id/guideline_v_left"
         app:layout_constraintEnd_toEndOf="@+id/guideline_v_right"
+        app:layout_constraintBottom_toBottomOf="@+id/aciv_bg"
+        android:layout_marginBottom="@dimen/dp_60"
         android:layout_width="@dimen/dp_880"
-        android:layout_height="@dimen/dp_966"/>
+        android:layout_height="0dp"/>
 
     <com.mogo.och.unmanned.taxi.ui.routing.RoutingSwitchView
         android:id="@+id/routingSwitchView"
         app:layout_constraintTop_toTopOf="@+id/guideline_h_top"
         app:layout_constraintStart_toStartOf="@+id/guideline_v_left"
         app:layout_constraintEnd_toEndOf="@+id/guideline_v_right"
+        app:layout_constraintBottom_toBottomOf="@+id/aciv_bg"
+        android:layout_marginBottom="@dimen/dp_60"
         android:layout_width="@dimen/dp_880"
-        android:layout_height="@dimen/dp_966"/>
+        android:layout_height="0dp"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_itinerary.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_itinerary.xml
index d2790945a0..4dd327a9aa 100644
--- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_itinerary.xml
+++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_itinerary.xml
@@ -2,7 +2,8 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="@dimen/dp_880"
-    android:layout_height="@dimen/dp_966"
+    android:layout_height="match_parent"
+    tools:layout_height="@dimen/dp_966"
     xmlns:tools="http://schemas.android.com/tools"
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
 
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml
index 5e5fef813b..2f2f5e8065 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml
@@ -19,10 +19,11 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/clBoneBiz"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:layout_marginTop="@dimen/dp_385"
         android:layout_marginStart="@dimen/dp_19"
         android:elevation="1dp"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent" />