2024-05-20 修改

修改

1. 部分界面UI调整

app/src/main/java/com/pan_american/android/data/model/group_op/ground_convey_payment_insert/adapter/GroundConveyListAdapter.kt

@@ -66,7 +66,6 @@ class GroundConveyListAdapter(private val groundConveyList: ArrayList<GroundConv
             holder.thisTimePayment.text = String.format("%.2f (%s)", payThenMoney, currencyStr)
             holder.balancePayment.text = String.format("%.2f (%s)", remainingBalance, currencyStr)
             holder.serviceDuringTime.text = String.format("%s - %s", serviceStartTime, serviceEndTime)
-
             holder.priceType.text = priceTypeStr.ifBlank {
                 "暂无"
             }

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

@@ -14,15 +14,13 @@
         android:id="@+id/payment_list"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_marginTop="@dimen/common_padding"
-        android:layout_marginBottom="@dimen/common_padding"
         android:layout_weight="1" />
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/common_padding"
         android:background="@color/background_color"
+        android:baselineAligned="false"
         android:orientation="horizontal">
 
         <LinearLayout
@@ -54,8 +52,8 @@
         <LinearLayout
             android:layout_width="0dp"
             android:layout_height="@dimen/button_height"
-            android:layout_weight="2"
             android:layout_margin="@dimen/common_padding"
+            android:layout_weight="2"
             android:background="@drawable/shape_corner_solid_blue"
             android:orientation="horizontal">
 

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

@@ -1,22 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:tools="http://schemas.android.com/tools"
     android:background="@color/white"
     android:orientation="vertical"
     tools:viewBindingIgnore="true">
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/line"
-        android:layout_margin="@dimen/common_padding"
-        android:background="@color/line_color" />
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/common_padding"
+        android:layout_marginStart="@dimen/common_padding"
+        android:layout_marginTop="@dimen/common_padding_huge"
+        android:layout_marginEnd="@dimen/common_padding"
+        android:layout_marginBottom="@dimen/common_padding"
         android:orientation="horizontal">
 
         <TextView
@@ -131,7 +128,10 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/common_padding"
+        android:layout_marginStart="@dimen/common_padding"
+        android:layout_marginTop="@dimen/common_padding"
+        android:layout_marginEnd="@dimen/common_padding"
+        android:layout_marginBottom="@dimen/common_padding_huge"
         android:orientation="horizontal">
 
         <TextView

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

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout 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"
     android:background="@color/background_color"
+    android:orientation="vertical"
     tools:context=".ui.workspace.WorkspaceFragment">
 
     <LinearLayout
         android:id="@+id/workspace_title"
         android:layout_width="match_parent"
         android:layout_height="@dimen/title_height"
-        android:layout_alignParentTop="true"
         android:background="@color/title_background_color"
         android:orientation="vertical">
 
@@ -30,8 +30,6 @@
         android:id="@+id/user_info"
         android:layout_width="match_parent"
         android:layout_height="80dp"
-        android:layout_below="@+id/workspace_title"
-        android:layout_marginTop="@dimen/common_padding"
         android:background="@color/white"
         android:orientation="horizontal">
 
@@ -39,18 +37,18 @@
             android:id="@+id/user_icon"
             android:layout_width="50dp"
             android:layout_height="50dp"
-            android:layout_marginStart="25dp"
             android:layout_gravity="center_vertical"
+            android:layout_marginStart="25dp"
             android:src="@mipmap/icon_user"
-            tools:ignore="ContentDescription"/>
+            tools:ignore="ContentDescription" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_gravity="center"
             android:layout_marginStart="@dimen/common_padding"
             android:layout_marginEnd="@dimen/common_padding"
-            android:orientation="vertical"
-            android:layout_gravity="center">
+            android:orientation="vertical">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -125,7 +123,7 @@
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/user_info"
+        android:layout_marginTop="@dimen/common_padding"
         android:scrollbars="none">
 
         <LinearLayout
@@ -140,11 +138,6 @@
                 android:background="@color/white"
                 android:orientation="vertical">
 
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/common_padding"
-                    android:background="@color/background_color" />
-
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -946,4 +939,4 @@
 
     </ScrollView>
 
-</RelativeLayout>
+</LinearLayout>

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

@@ -10,7 +10,10 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/common_padding"
+        android:layout_marginStart="@dimen/common_padding"
+        android:layout_marginTop="@dimen/common_padding_huge"
+        android:layout_marginEnd="@dimen/common_padding"
+        android:layout_marginBottom="@dimen/common_padding"
         android:orientation="horizontal">
 
         <TextView
@@ -70,7 +73,7 @@
         android:layout_marginStart="@dimen/common_padding"
         android:layout_marginTop="@dimen/common_padding"
         android:layout_marginEnd="@dimen/common_padding"
-        android:layout_marginBottom="@dimen/common_padding"
+        android:layout_marginBottom="@dimen/common_padding_huge"
         android:orientation="horizontal">
 
         <TextView
@@ -84,6 +87,7 @@
             android:id="@+id/payment_type"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/common_padding"
             android:gravity="end"
             android:orientation="horizontal">