1.fixed 用户设置页面UI显示

app/src/main/res/layout/activity_user_settings.xml

@@ -86,8 +86,9 @@
             android:id="@+id/tabContent"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:layout_constraintTop_toTopOf="@id/tabContainer"
-            app:layout_constraintStart_toEndOf="@id/tabContainer"/>
+            app:layout_constraintTop_toBottomOf="@id/settingsTitle"
+            app:layout_constraintStart_toEndOf="@id/tabContainer"
+            app:layout_constraintBottom_toTopOf="@id/goHome"/>
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/more"
             android:layout_width="wrap_content"

app/src/main/res/layout/fixed_info_layout.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
-    android:layout_height="@dimen/dp_578"
+    android:layout_height="wrap_content"
     tools:context=".ui.settings.UserSettingsActivity">
     <androidx.appcompat.widget.AppCompatTextView
         android:layout_width="wrap_content"
@@ -310,7 +310,6 @@
         android:textColor="@color/color_ff333333"
         app:layout_constraintTop_toBottomOf="@id/fixedInfoLayout"
         app:layout_constraintStart_toStartOf="@id/fixedDeviceAngleLayout"/>
-
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/fixedDeviceAngleLayout"
         android:layout_width="@dimen/dp_296"
@@ -494,18 +493,19 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/dp_20"
+        android:layout_marginTop="@dimen/dp_10"
         android:text="@string/fixed_main_antenna_position"
         android:textSize="@dimen/sp_18"
         android:textColor="@color/color_ff333333"
-        app:layout_constraintTop_toTopOf="@id/fixedMainAntennaPositionLayout"
-        app:layout_constraintBottom_toTopOf="@id/fixedMainAntennaPositionLayout"
-        app:layout_constraintStart_toStartOf="@id/fixedMainAntennaPositionLayout"/>
+        app:layout_constraintTop_toBottomOf="@id/fixedIMUPositionLayout"
+        app:layout_constraintStart_toStartOf="parent" />
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/fixedMainAntennaPositionLayout"
         android:layout_width="@dimen/dp_296"
         android:layout_height="@dimen/dp_216"
+        android:layout_marginTop="@dimen/dp_14"
         android:background="@drawable/background_user_settings_item2"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="@id/fixedMainAntennaPositionTitle"
         app:layout_constraintStart_toStartOf="parent">
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="wrap_content"
@@ -667,19 +667,20 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/dp_20"
+        android:layout_marginTop="@dimen/dp_10"
         android:text="@string/fixed_secondary_antenna_position"
         android:textSize="@dimen/sp_18"
         android:textColor="@color/color_ff333333"
-        app:layout_constraintTop_toTopOf="@id/fixedSecondaryAntennaPositionLayout"
-        app:layout_constraintBottom_toTopOf="@id/fixedSecondaryAntennaPositionLayout"
+        app:layout_constraintTop_toBottomOf="@id/fixedDeviceAngleLayout"
         app:layout_constraintStart_toStartOf="@id/fixedSecondaryAntennaPositionLayout"/>
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/fixedSecondaryAntennaPositionLayout"
         android:layout_width="@dimen/dp_296"
         android:layout_height="@dimen/dp_216"
+        android:layout_marginTop="@dimen/dp_14"
         android:background="@drawable/background_user_settings_item2"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="@id/fixedInfoLayout">
+        app:layout_constraintEnd_toEndOf="@id/fixedInfoLayout"
+        app:layout_constraintTop_toTopOf="@id/fixedSecondaryAntennaPositionTitle">
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

app/src/main/res/layout/network_settings_layout.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
-    android:layout_height="@dimen/dp_578"
+    android:layout_height="wrap_content"
     android:orientation="vertical"
     tools:context=".ui.settings.UserSettingsActivity">
     <androidx.constraintlayout.widget.ConstraintLayout

app/src/main/res/layout/vehicle_info_layout.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
-    android:layout_height="@dimen/dp_578"
+    android:layout_height="wrap_content"
     android:layout_marginStart="@dimen/dp_26"
     tools:context=".ui.settings.UserSettingsActivity">
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -86,8 +86,9 @@
         android:id="@+id/vehicleInfoLayout2"
         android:layout_width="@dimen/dp_364"
         android:layout_height="@dimen/dp_280"
+        android:layout_marginTop="@dimen/dp_20"
         android:background="@drawable/background_user_settings_vehicle_info"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/vehicleInfoLayout1"
         app:layout_constraintStart_toStartOf="parent">
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/userSettingsVehicleLength"
@@ -158,7 +159,7 @@
     </androidx.constraintlayout.widget.ConstraintLayout>
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/vehicleInfoImage"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/dp_51"
         app:layout_constraintEnd_toEndOf="parent"