From 2729e18043ada7110f62ccbe29347762b30da643 Mon Sep 17 00:00:00 2001
From: YANGJIANKUAN <tim.yee@hotmail.com>
Date: Sun, 8 Mar 2026 19:11:25 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=88=AA=E7=8F=AD=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E5=8D=87=E7=BA=A7=E4=B8=BAPadDataLayoutNew?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=B9=B6=E4=BC=98=E5=8C=96=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../details/FlightQueryDetailsActivity.kt     |   2 +-
 .../layout/activity_flight_query_details.xml  | 449 +++++++++---------
 2 files changed, 227 insertions(+), 224 deletions(-)

diff --git a/app/src/main/java/com/lukouguoji/aerologic/page/flight/query/details/FlightQueryDetailsActivity.kt b/app/src/main/java/com/lukouguoji/aerologic/page/flight/query/details/FlightQueryDetailsActivity.kt
index 4be6417..ed76c2f 100644
--- a/app/src/main/java/com/lukouguoji/aerologic/page/flight/query/details/FlightQueryDetailsActivity.kt
+++ b/app/src/main/java/com/lukouguoji/aerologic/page/flight/query/details/FlightQueryDetailsActivity.kt
@@ -6,7 +6,7 @@ import android.os.Bundle
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.lukouguoji.aerologic.R
 import com.lukouguoji.aerologic.databinding.ActivityFlightQueryDetailsBinding
-import com.lukouguoji.aerologic.databinding.ActivityGnjStashDetailsBinding
+
 import com.lukouguoji.module_base.base.BaseBindingActivity
 import com.lukouguoji.module_base.common.Constant
 import com.lukouguoji.module_base.router.ARouterConstants
diff --git a/app/src/main/res/layout/activity_flight_query_details.xml b/app/src/main/res/layout/activity_flight_query_details.xml
index b62e553..888509d 100644
--- a/app/src/main/res/layout/activity_flight_query_details.xml
+++ b/app/src/main/res/layout/activity_flight_query_details.xml
@@ -13,265 +13,268 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/backgroud_gray"
+        android:background="@color/color_f2"
         android:orientation="vertical">
 
         <include layout="@layout/title_tool_bar" />
 
-        <androidx.core.widget.NestedScrollView
+        <ScrollView
             android:layout_width="match_parent"
+            android:layout_height="0dp"
             android:layout_weight="1"
-            android:layout_height="0dp">
+            android:fillViewport="true">
 
             <LinearLayout
                 android:layout_width="match_parent"
+                android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:layout_height="match_parent">
-
+                android:padding="15dp">
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_margin="10dp">
+                    android:background="@drawable/bg_white_radius_8"
+                    android:orientation="vertical"
+                    android:padding="15dp">
 
-                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayout
-                        enable="@{false}"
-                        title='@{"航班日期："}'
-                        titleLength="@{5}"
-                        type="@{DataLayoutType.INPUT}"
-                        value='@{viewModel.dataBean.fdate}'
-                        android:layout_width="0dp"
+                    <!-- 第1行：航班日期、航班号、航程 -->
+                    <LinearLayout
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1" />
+                        android:orientation="horizontal">
 
-                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayout
-                        enable="@{false}"
-                        hint='@{" "}'
-                        title='@{"航班号："}'
-                        titleLength="@{5}"
-                        type="@{DataLayoutType.INPUT}"
-                        value='@{viewModel.dataBean.fno}'
-                        android:layout_width="0dp"
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"航班日期"}'
+                            titleLength="@{4}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{viewModel.dataBean.fdate}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"航班号"}'
+                            titleLength="@{4}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{viewModel.dataBean.fno}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"航程"}'
+                            titleLength="@{4}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{viewModel.dataBean.range}' />
+
+                    </LinearLayout>
+
+                    <!-- 第2行：地区类型、服务类型、经停站 -->
+                    <LinearLayout
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1" />
+                        android:layout_marginTop="8dp"
+                        android:orientation="horizontal">
 
-                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayout
-                        enable="@{false}"
-                        hint='@{" "}'
-                        title='@{"航程："}'
-                        titleLength="@{5}"
-                        type="@{DataLayoutType.INPUT}"
-                        value='@{viewModel.dataBean.range}'
-                        android:layout_width="0dp"
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"地区类型"}'
+                            titleLength="@{4}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{viewModel.dataBean.countryType}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"服务类型"}'
+                            titleLength="@{4}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{viewModel.dataBean.serviceType}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"经停站"}'
+                            titleLength="@{4}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{viewModel.dataBean.jtz}' />
+
+                    </LinearLayout>
+
+                    <!-- 第3行：计划起飞、预计起飞、实际起飞 -->
+                    <LinearLayout
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1" />
+                        android:layout_marginTop="8dp"
+                        android:orientation="horizontal">
 
-                </LinearLayout>
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"计划起飞"}'
+                            titleLength="@{4}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{viewModel.dataBean.scheduledTackOff}' />
 
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="10dp">
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"预计起飞"}'
+                            titleLength="@{4}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{viewModel.dataBean.estimatedTakeOff}' />
 
-                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayout
-                        enable="@{false}"
-                        title='@{"地区类型："}'
-                        titleLength="@{5}"
-                        type="@{DataLayoutType.SPINNER}"
-                        value='@{viewModel.dataBean.countryType}'
-                        android:layout_width="0dp"
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"实际起飞"}'
+                            titleLength="@{4}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{viewModel.dataBean.actualTakeOff}' />
+
+                    </LinearLayout>
+
+                    <!-- 第4行：计划降落、预计降落、实际降落 -->
+                    <LinearLayout
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1" />
+                        android:layout_marginTop="8dp"
+                        android:orientation="horizontal">
 
-                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayout
-                        enable="@{false}"
-                        title='@{"服务类型："}'
-                        titleLength="@{5}"
-                        type="@{DataLayoutType.SPINNER}"
-                        value='@{viewModel.dataBean.serviceType}'
-                        android:layout_width="0dp"
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"计划降落"}'
+                            titleLength="@{4}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{viewModel.dataBean.scheduledArrival}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"预计降落"}'
+                            titleLength="@{4}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{viewModel.dataBean.estimatedArrival}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"实际降落"}'
+                            titleLength="@{4}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{viewModel.dataBean.actualArrival}' />
+
+                    </LinearLayout>
+
+                    <!-- 第5行：飞行状态、航班状态、延误原因 -->
+                    <LinearLayout
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1" />
+                        android:layout_marginTop="8dp"
+                        android:orientation="horizontal">
 
-                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayout
-                        enable="@{false}"
-                        title='@{"经停站："}'
-                        titleLength="@{5}"
-                        type="@{DataLayoutType.INPUT}"
-                        value='@{viewModel.dataBean.jtz}'
-                        android:layout_width="0dp"
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"飞行状态"}'
+                            titleLength="@{4}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{viewModel.dataBean.portCode}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"航班状态"}'
+                            titleLength="@{4}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{viewModel.dataBean.flightStatus}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"延误原因"}'
+                            titleLength="@{4}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{viewModel.dataBean.delayFreeText}' />
+
+                    </LinearLayout>
+
+                    <!-- 第6行：机号、机型、机位 -->
+                    <LinearLayout
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1" />
+                        android:layout_marginTop="8dp"
+                        android:orientation="horizontal">
 
-                </LinearLayout>
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"机号"}'
+                            titleLength="@{4}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{viewModel.dataBean.registration}' />
 
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="10dp">
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"机型"}'
+                            titleLength="@{4}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{viewModel.dataBean.aircraftCode}' />
 
-                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayout
-                        enable="@{false}"
-                        hint='@{" "}'
-                        title='@{"计划起飞："}'
-                        titleLength="@{5}"
-                        type="@{DataLayoutType.INPUT}"
-                        value='@{viewModel.dataBean.scheduledTackOff}'
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1" />
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"机位"}'
+                            titleLength="@{4}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{viewModel.dataBean.standId}' />
 
-                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayout
-                        enable="@{false}"
-                        hint='@{" "}'
-                        title='@{"预计起飞："}'
-                        titleLength="@{5}"
-                        type="@{DataLayoutType.INPUT}"
-                        value='@{viewModel.dataBean.estimatedTakeOff}'
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1" />
-
-                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayout
-                        enable="@{false}"
-                        hint='@{" "}'
-                        title='@{"实际起飞："}'
-                        titleLength="@{5}"
-                        type="@{DataLayoutType.INPUT}"
-                        value='@{viewModel.dataBean.actualTakeOff}'
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1" />
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="10dp">
-
-                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayout
-                        enable="@{false}"
-                        title='@{"计划降落："}'
-                        titleLength="@{5}"
-                        type="@{DataLayoutType.INPUT}"
-                        value='@{viewModel.dataBean.scheduledArrival}'
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1" />
-
-                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayout
-                        enable="@{false}"
-                        hint='@{" "}'
-                        title='@{"预计降落："}'
-                        titleLength="@{5}"
-                        type="@{DataLayoutType.INPUT}"
-                        value='@{viewModel.dataBean.estimatedArrival}'
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1" />
-
-                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayout
-                        enable="@{false}"
-                        hint='@{" "}'
-                        title='@{"实际降落："}'
-                        titleLength="@{5}"
-                        type="@{DataLayoutType.INPUT}"
-                        value='@{viewModel.dataBean.actualArrival}'
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1" />
-
-                </LinearLayout>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="10dp">
-
-                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayout
-                        enable="@{false}"
-                        title='@{"飞行状态："}'
-                        titleLength="@{5}"
-                        type="@{DataLayoutType.SPINNER}"
-                        value='@{viewModel.dataBean.portCode}'
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1" />
-
-                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayout
-                        enable="@{false}"
-                        hint='@{" "}'
-                        title='@{"航班状态："}'
-                        titleLength="@{5}"
-                        type="@{DataLayoutType.SPINNER}"
-                        value='@{viewModel.dataBean.flightStatus}'
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1" />
-
-                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayout
-                        enable="@{false}"
-                        hint='@{" "}'
-                        title='@{"延误原因："}'
-                        titleLength="@{5}"
-                        type="@{DataLayoutType.INPUT}"
-                        value='@{viewModel.dataBean.delayFreeText}'
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1" />
-
-                </LinearLayout>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="10dp">
-
-                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayout
-                        enable="@{false}"
-                        title='@{"机号："}'
-                        titleLength="@{5}"
-                        type="@{DataLayoutType.INPUT}"
-                        value='@{viewModel.dataBean.registration}'
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1" />
-
-                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayout
-                        enable="@{false}"
-                        hint='@{" "}'
-                        title='@{"机型："}'
-                        titleLength="@{5}"
-                        type="@{DataLayoutType.INPUT}"
-                        value='@{viewModel.dataBean.aircraftCode}'
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1" />
-
-                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayout
-                        enable="@{false}"
-                        hint='@{" "}'
-                        title='@{"机位："}'
-                        titleLength="@{5}"
-                        type="@{DataLayoutType.INPUT}"
-                        value='@{viewModel.dataBean.standId}'
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1" />
+                    </LinearLayout>
 
                 </LinearLayout>
 
             </LinearLayout>
 
-        </androidx.core.widget.NestedScrollView>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:background="#5c6890"
-            android:gravity="center_vertical|end"
-            android:paddingHorizontal="15dp">
-
-        </LinearLayout>
+        </ScrollView>
 
     </LinearLayout>
-</layout>
\ No newline at end of file
+</layout>