diff --git a/module_gjj/src/main/res/layout/activity_int_arr_air_manifest.xml b/module_gjj/src/main/res/layout/activity_int_arr_air_manifest.xml
index f0d41f8..d8aad2d 100644
--- a/module_gjj/src/main/res/layout/activity_int_arr_air_manifest.xml
+++ b/module_gjj/src/main/res/layout/activity_int_arr_air_manifest.xml
@@ -24,16 +24,18 @@
+ android:layout_marginHorizontal="10dp"
+ android:layout_marginTop="10dp"
+ android:gravity="center_vertical"
+ android:orientation="horizontal">
@@ -42,7 +44,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
- hint="@{`请输入航班号`}"
+ hint='@{"请输入航班号"}'
type="@{SearchLayoutType.INPUT}"
value="@={viewModel.flightNo}" />
@@ -51,7 +53,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
- hint="@{`请输入运单号`}"
+ hint='@{"请输入运单号"}'
icon="@{@drawable/scan_code}"
setOnIconClickListener="@{(v)-> viewModel.scanWaybill()}"
type="@{SearchLayoutType.INPUT}"
@@ -62,17 +64,29 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
- hint="@{`请输入分单号`}"
+ hint='@{"请输入分单号"}'
icon="@{@drawable/scan_code}"
setOnIconClickListener="@{(v)-> viewModel.scanHouseNo()}"
type="@{SearchLayoutType.INPUT}"
value="@={viewModel.houseNo}" />
-
+
+
+
+
+
@@ -81,125 +95,121 @@
android:id="@+id/srl"
android:layout_width="match_parent"
android:layout_height="0dp"
- android:layout_weight="1"
- android:layout_marginTop="10dp">
+ android:layout_marginHorizontal="10dp"
+ android:layout_marginTop="10dp"
+ android:layout_weight="1">
-
+
+ android:paddingHorizontal="15dp">
+ android:onClick="@{()-> viewModel.checkAllClick()}"
+ android:orientation="horizontal">
-
+
+ android:text='@{"合计:"+viewModel.totalCount+"票"}'
+ android:textColor="@color/bottom_tool_tips_text_color"
+ android:textSize="18sp"
+ android:textStyle="bold" />
+ android:layout_marginLeft="20dp"
+ android:text='@{"总件数:"+viewModel.totalPc}'
+ android:textColor="@color/bottom_tool_tips_text_color"
+ android:textSize="18sp"
+ android:textStyle="bold" />
+ android:layout_marginLeft="20dp"
+ android:text='@{"总重量:"+viewModel.totalWeight}'
+ android:textColor="@color/bottom_tool_tips_text_color"
+ android:textSize="18sp"
+ android:textStyle="bold" />
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
+
+