From e4729d2202ec4bc862380a30e8922bf1a81aaeee Mon Sep 17 00:00:00 2001
From: qiji4215 <qiji4215@navinfo.com>
Date: Sat, 6 May 2023 10:55:26 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BE=8E=E5=8C=96=E6=8A=A5=E5=91=8A=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/activity_main.xml     | 120 +++++++++---------
 .../res/layout/fragment_evaluation_result.xml |   2 +-
 .../main/res/layout/fragment_phenomenon.xml   |   4 +-
 .../main/res/layout/fragment_problem_link.xml |  17 +--
 app/src/main/res/values/dimens.xml            |   2 +
 5 files changed, 69 insertions(+), 76 deletions(-)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 18b5f885..7490a06a 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -56,10 +56,70 @@
                 app:layout_constraintLeft_toLeftOf="@id/main_activity_person_center"
                 app:layout_constraintTop_toBottomOf="@id/main_activity_person_center" />
 
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="8dp"
+                android:layout_marginBottom="108dp"
+                app:layout_constraintRight_toLeftOf="@+id/main_activity_right_fragment"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                tools:ignore="MissingConstraints">
+
+                <ImageButton
+                    android:id="@+id/main_activity_voice"
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:src="@drawable/icon_add_voice"
+                    android:background="@null" />
+
+                <ImageButton
+                    android:id="@+id/main_activity_line"
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:onClick="@{()->mainActivity.voiceOnclick()}"
+                    android:src="@drawable/icon_add_data"
+                    android:background="@null" />
+
+                <ImageButton
+                    android:id="@+id/main_activity_location"
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:onClick="@{()->viewModel.onClickLocationButton()}"
+                    android:src="@drawable/icon_location"
+                    android:background="@null" />
+
+            </LinearLayout>
+
+            <fragment
+                android:id="@+id/main_activity_middle_fragment"
+                android:name="androidx.navigation.fragment.NavHostFragment"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintHorizontal_weight="6"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toLeftOf="@+id/main_activity_right_fragment"
+                app:layout_constraintTop_toTopOf="parent"
+                app:navGraph="@navigation/middle_fragment_nav_graph" />
+
+            <fragment
+                android:id="@id/main_activity_right_fragment"
+                android:name="androidx.navigation.fragment.NavHostFragment"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintLeft_toRightOf="@id/main_activity_middle_fragment"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:navGraph="@navigation/right_fragment_nav_graph" />
+
             <LinearLayout
                 android:orientation="horizontal"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                app:layout_constraintRight_toLeftOf="@+id/main_activity_right_fragment"
                 android:layout_marginRight="10dp"
                 android:layout_marginTop="10dp"
                 app:layout_constraintTop_toTopOf="parent"
@@ -123,66 +183,6 @@
             </LinearLayout>
 
 
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginRight="8dp"
-                android:layout_marginBottom="108dp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                tools:ignore="MissingConstraints">
-
-                <ImageButton
-                    android:id="@+id/main_activity_voice"
-                    android:layout_width="48dp"
-                    android:layout_height="48dp"
-                    android:src="@drawable/icon_add_voice"
-                    android:background="@null" />
-
-                <ImageButton
-                    android:id="@+id/main_activity_line"
-                    android:layout_width="48dp"
-                    android:layout_height="48dp"
-                    android:onClick="@{()->mainActivity.voiceOnclick()}"
-                    android:src="@drawable/icon_add_data"
-                    android:background="@null" />
-
-                <ImageButton
-                    android:id="@+id/main_activity_location"
-                    android:layout_width="48dp"
-                    android:layout_height="48dp"
-                    android:onClick="@{()->viewModel.onClickLocationButton()}"
-                    android:src="@drawable/icon_location"
-                    android:background="@null" />
-
-            </LinearLayout>
-
-
-            <fragment
-                android:id="@+id/main_activity_middle_fragment"
-                android:name="androidx.navigation.fragment.NavHostFragment"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintHorizontal_weight="6"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toLeftOf="@+id/main_activity_right_fragment"
-                app:layout_constraintTop_toTopOf="parent"
-                app:navGraph="@navigation/middle_fragment_nav_graph" />
-
-            <fragment
-                android:id="@id/main_activity_right_fragment"
-                android:name="androidx.navigation.fragment.NavHostFragment"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintHorizontal_weight="2"
-                app:layout_constraintLeft_toRightOf="@id/main_activity_middle_fragment"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:navGraph="@navigation/right_fragment_nav_graph" />
-
 
             <ImageButton
                 android:id="@+id/main_activity_camera2"
diff --git a/app/src/main/res/layout/fragment_evaluation_result.xml b/app/src/main/res/layout/fragment_evaluation_result.xml
index a7ddc410..e9274368 100644
--- a/app/src/main/res/layout/fragment_evaluation_result.xml
+++ b/app/src/main/res/layout/fragment_evaluation_result.xml
@@ -15,7 +15,7 @@
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
+        android:layout_width="256dp"
         android:layout_height="match_parent"
         android:background="@color/white"
         tools:context=".ui.fragment.evaluationresult.EvaluationResultFragment">
diff --git a/app/src/main/res/layout/fragment_phenomenon.xml b/app/src/main/res/layout/fragment_phenomenon.xml
index 9957ad52..01c3a88d 100644
--- a/app/src/main/res/layout/fragment_phenomenon.xml
+++ b/app/src/main/res/layout/fragment_phenomenon.xml
@@ -5,8 +5,8 @@
     android:layout_height="match_parent"
     android:gravity="right|center_vertical"
     android:orientation="horizontal"
-    android:paddingTop="64dp"
-    android:paddingLeft="380dp"
+    android:paddingTop="@dimen/fragment_margin_top"
+    android:paddingLeft="@dimen/fragment_margin_left"
     tools:context="com.navinfo.omqs.ui.fragment.evaluationresult.PhenomenonFragment">
 
     <ImageView
diff --git a/app/src/main/res/layout/fragment_problem_link.xml b/app/src/main/res/layout/fragment_problem_link.xml
index c0862ccb..5900708e 100644
--- a/app/src/main/res/layout/fragment_problem_link.xml
+++ b/app/src/main/res/layout/fragment_problem_link.xml
@@ -5,10 +5,12 @@
     android:layout_height="match_parent"
     android:gravity="right|center_vertical"
     android:orientation="horizontal"
-    android:paddingLeft="100dp"
+    android:paddingTop="@dimen/fragment_margin_top"
+    android:paddingLeft="@dimen/fragment_margin_left"
     tools:context="com.navinfo.omqs.ui.fragment.evaluationresult.ProblemLinkFragment">
 
     <ImageView
+        android:visibility="gone"
         android:id="@+id/link_drawer"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -25,18 +27,6 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <TextView
-            android:id="@+id/link_title_bg"
-            android:layout_width="match_parent"
-            android:layout_height="65dp"
-            android:background="@color/default_blue"
-            android:clickable="true"
-            android:focusable="true"
-            android:gravity="center"
-            android:text="问题列表"
-            android:textColor="@color/white"
-            android:textSize="20sp" />
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -45,6 +35,7 @@
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/link_middle_recyclerview"
                 android:layout_width="0dp"
+                android:visibility="invisible"
                 android:layout_height="match_parent"
                 android:layout_weight="2"
                 android:background="@color/white" />
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 03822f9d..d55153f0 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -28,6 +28,8 @@
     <dimen name="twenty">20dp</dimen>
     <dimen name="twenty_two">22dp</dimen>
     <dimen name="twenty_four">24dp</dimen>
+    <dimen name="fragment_margin_top">64dp</dimen>
+    <dimen name="fragment_margin_left">400dp</dimen>
     <!-- 相机设置iv距离上方间距-->
     <dimen name="camear_dialog_iv_margin_top" comment="相机设置窗体高度">25dp</dimen>
     <!-- 相机设置窗体高度-->