From 6cd9bab9e1952078010b642d9abc32d8feefac84 Mon Sep 17 00:00:00 2001
From: squallzhjch <zhangjingchao@navinfo.com>
Date: Wed, 14 Jun 2023 14:42:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=AD=E6=8E=A7=E8=81=94?=
 =?UTF-8?q?=E5=8A=A8UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/console_on.xml | 38 +++++++++++++++++++++-----
 app/src/main/res/values/styles.xml     |  2 +-
 vtm                                    |  2 +-
 3 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/app/src/main/res/layout/console_on.xml b/app/src/main/res/layout/console_on.xml
index 86beb031..74e210d1 100644
--- a/app/src/main/res/layout/console_on.xml
+++ b/app/src/main/res/layout/console_on.xml
@@ -128,12 +128,16 @@
         android:src="@drawable/icon_console_task"
         app:layout_constraintBottom_toBottomOf="@id/console_task_bg"
         app:layout_constraintLeft_toLeftOf="@id/console_task_bg"
-        app:layout_constraintTop_toTopOf="@id/console_task_bg" />
+        app:layout_constraintRight_toLeftOf="@id/console_task_icon_text"
+        app:layout_constraintTop_toTopOf="@id/console_task_bg"
+        app:layout_constraintVertical_chainStyle="packed" />
 
     <TextView
+        android:id="@+id/console_task_icon_text"
         style="@style/console_on_left_bottom_text"
         android:text="测评任务"
         app:layout_constraintBottom_toBottomOf="@id/console_task_bg"
+        app:layout_constraintLeft_toRightOf="@id/console_task_icon"
         app:layout_constraintRight_toRightOf="@id/console_task_bg"
         app:layout_constraintTop_toTopOf="@id/console_task_bg" />
 
@@ -154,12 +158,16 @@
         android:src="@drawable/icon_console_evaluation"
         app:layout_constraintBottom_toBottomOf="@id/console_evaluation_bg"
         app:layout_constraintLeft_toLeftOf="@id/console_evaluation_bg"
-        app:layout_constraintTop_toTopOf="@id/console_evaluation_bg" />
+        app:layout_constraintRight_toLeftOf="@id/console_evaluation_icon_text"
+        app:layout_constraintTop_toTopOf="@id/console_evaluation_bg"
+        app:layout_constraintVertical_chainStyle="packed" />
 
     <TextView
+        android:id="@+id/console_evaluation_icon_text"
         style="@style/console_on_left_bottom_text"
         android:text="测评结果"
         app:layout_constraintBottom_toBottomOf="@id/console_evaluation_bg"
+        app:layout_constraintLeft_toRightOf="@id/console_evaluation_icon"
         app:layout_constraintRight_toRightOf="@id/console_evaluation_bg"
         app:layout_constraintTop_toTopOf="@id/console_evaluation_bg" />
 
@@ -180,12 +188,16 @@
         android:src="@drawable/icon_console_offline_map"
         app:layout_constraintBottom_toBottomOf="@id/console_offline_map_bg"
         app:layout_constraintLeft_toLeftOf="@id/console_offline_map_bg"
-        app:layout_constraintTop_toTopOf="@id/console_offline_map_bg" />
+        app:layout_constraintRight_toLeftOf="@id/console_offline_map_icon_text"
+        app:layout_constraintTop_toTopOf="@id/console_offline_map_bg"
+        app:layout_constraintVertical_chainStyle="packed" />
 
     <TextView
+        android:id="@+id/console_offline_map_icon_text"
         style="@style/console_on_left_bottom_text"
         android:text="离线地图"
         app:layout_constraintBottom_toBottomOf="@id/console_offline_map_bg"
+        app:layout_constraintLeft_toRightOf="@id/console_offline_map_icon"
         app:layout_constraintRight_toRightOf="@id/console_offline_map_bg"
         app:layout_constraintTop_toTopOf="@id/console_offline_map_bg" />
 
@@ -205,12 +217,16 @@
         android:src="@drawable/icon_console_route"
         app:layout_constraintBottom_toBottomOf="@id/console_route_bg"
         app:layout_constraintLeft_toLeftOf="@id/console_route_bg"
-        app:layout_constraintTop_toTopOf="@id/console_route_bg" />
+        app:layout_constraintRight_toLeftOf="@id/console_route_icon_text"
+        app:layout_constraintTop_toTopOf="@id/console_route_bg"
+        app:layout_constraintVertical_chainStyle="packed" />
 
     <TextView
+        android:id="@+id/console_route_icon_text"
         style="@style/console_on_left_bottom_text"
         android:text="路径规划"
         app:layout_constraintBottom_toBottomOf="@id/console_route_bg"
+        app:layout_constraintLeft_toRightOf="@id/console_route_icon"
         app:layout_constraintRight_toRightOf="@id/console_route_bg"
         app:layout_constraintTop_toTopOf="@id/console_route_bg" />
 
@@ -232,12 +248,16 @@
         android:src="@drawable/icon_console_layer_setting"
         app:layout_constraintBottom_toBottomOf="@id/console_layer_setting_bg"
         app:layout_constraintLeft_toLeftOf="@id/console_layer_setting_bg"
-        app:layout_constraintTop_toTopOf="@id/console_layer_setting_bg" />
+        app:layout_constraintRight_toLeftOf="@id/console_layer_setting_icon_text"
+        app:layout_constraintTop_toTopOf="@id/console_layer_setting_bg"
+        app:layout_constraintVertical_chainStyle="packed" />
 
     <TextView
+        android:id="@+id/console_layer_setting_icon_text"
         style="@style/console_on_left_bottom_text"
         android:text="图层设置"
         app:layout_constraintBottom_toBottomOf="@id/console_layer_setting_bg"
+        app:layout_constraintLeft_toRightOf="@id/console_layer_setting_icon"
         app:layout_constraintRight_toRightOf="@id/console_layer_setting_bg"
         app:layout_constraintTop_toTopOf="@id/console_layer_setting_bg" />
 
@@ -257,12 +277,16 @@
         android:src="@drawable/icon_console_personal_center"
         app:layout_constraintBottom_toBottomOf="@id/console_personal_center_bg"
         app:layout_constraintLeft_toLeftOf="@id/console_personal_center_bg"
-        app:layout_constraintTop_toTopOf="@id/console_personal_center_bg" />
+        app:layout_constraintRight_toLeftOf="@id/console_personal_center_icon_text"
+        app:layout_constraintTop_toTopOf="@id/console_personal_center_bg"
+        app:layout_constraintVertical_chainStyle="packed" />
 
     <TextView
+        android:id="@+id/console_personal_center_icon_text"
         style="@style/console_on_left_bottom_text"
         android:text="个人中心"
         app:layout_constraintBottom_toBottomOf="@id/console_personal_center_bg"
+        app:layout_constraintLeft_toRightOf="@id/console_personal_center_icon"
         app:layout_constraintRight_toRightOf="@id/console_personal_center_bg"
         app:layout_constraintTop_toTopOf="@id/console_personal_center_bg" />
 
@@ -469,7 +493,7 @@
         app:layout_constraintLeft_toLeftOf="@id/console_track_bg"
         app:layout_constraintRight_toLeftOf="@id/console_track_text"
         app:layout_constraintTop_toTopOf="@id/console_track_bg"
-        app:layout_constraintVertical_chainStyle="spread" />
+        app:layout_constraintVertical_chainStyle="packed" />
 
     <ImageView
         android:id="@+id/console_track_icon"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d0a4d202..5193314e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -24,7 +24,7 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:textColor">@color/white</item>
         <item name="android:textSize">18sp</item>
-        <item name="android:layout_margin">5dp</item>
+
     </style>
 
     <style name="title_default_style" comment="默认顶标题样式">
diff --git a/vtm b/vtm
index dd13e533..1ee201a4 160000
--- a/vtm
+++ b/vtm
@@ -1 +1 @@
-Subproject commit dd13e533c38b5738ab404c2737d7ccadeff01323
+Subproject commit 1ee201a41f78f169873848209a3f3bdac36f185a