diff --git a/module_base/src/main/res/drawable/bg_red_btn_bottom.xml b/module_base/src/main/res/drawable/bg_red_btn_bottom.xml
new file mode 100644
index 0000000..6b0c984
--- /dev/null
+++ b/module_base/src/main/res/drawable/bg_red_btn_bottom.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/module_base/src/main/res/drawable/bg_red_radius_4.xml b/module_base/src/main/res/drawable/bg_red_radius_4.xml
index f9f5377..6c54de2 100644
--- a/module_base/src/main/res/drawable/bg_red_radius_4.xml
+++ b/module_base/src/main/res/drawable/bg_red_radius_4.xml
@@ -1,8 +1,7 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/module_base/src/main/res/values/colors.xml b/module_base/src/main/res/values/colors.xml
index 29f3275..4ace2b5 100644
--- a/module_base/src/main/res/values/colors.xml
+++ b/module_base/src/main/res/values/colors.xml
@@ -39,4 +39,6 @@
#EEEEEE
#00000000
+ #797979
+
\ No newline at end of file
diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpArriveViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpArriveViewModel.kt
index 21d8589..fc516e5 100644
--- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpArriveViewModel.kt
+++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpArriveViewModel.kt
@@ -110,6 +110,13 @@ class IntExpArriveViewModel : BasePageViewModel() {
}
}
+ /**
+ * 删除申报
+ */
+ fun deleteDeclareClick() {
+
+ }
+
/**
* 运抵申报
*/
diff --git a/module_gjc/src/main/res/layout/activity_int_exp_arrive.xml b/module_gjc/src/main/res/layout/activity_int_exp_arrive.xml
index cf47bfa..c796ab0 100644
--- a/module_gjc/src/main/res/layout/activity_int_exp_arrive.xml
+++ b/module_gjc/src/main/res/layout/activity_int_exp_arrive.xml
@@ -31,44 +31,44 @@
+ value="@={viewModel.flightDate}"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1" />
+ value="@={viewModel.flightNo}"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1" />
+ value="@={viewModel.waybillNo}"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1" />
+ value="@={viewModel.hno}"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1" />
@@ -98,11 +100,11 @@
@@ -113,7 +115,7 @@
@@ -123,8 +125,8 @@
android:layout_height="wrap_content"
android:layout_marginEnd="5dp"
android:gravity="center_vertical"
- android:orientation="horizontal"
- android:onClick="@{()-> viewModel.checkAllClick()}">
+ android:onClick="@{()-> viewModel.checkAllClick()}"
+ android:orientation="horizontal">
@@ -155,7 +157,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text='@{"合计:"+viewModel.totalCount+"票"}'
- android:textColor="@color/white"
+ android:textColor="@color/bottom_tool_tips_text_color"
android:textSize="18sp"
android:textStyle="bold" />
@@ -164,7 +166,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:text='@{"总件数:"+viewModel.totalPc}'
- android:textColor="@color/white"
+ android:textColor="@color/bottom_tool_tips_text_color"
android:textSize="18sp"
android:textStyle="bold" />
@@ -173,7 +175,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:text='@{"总重量:"+viewModel.totalWeight}'
- android:textColor="@color/white"
+ android:textColor="@color/bottom_tool_tips_text_color"
android:textSize="18sp"
android:textStyle="bold" />
@@ -187,13 +189,22 @@
+
+
+
diff --git a/module_gjc/src/main/res/layout/activity_int_exp_out_handover.xml b/module_gjc/src/main/res/layout/activity_int_exp_out_handover.xml
index ae4400d..3b8b44f 100644
--- a/module_gjc/src/main/res/layout/activity_int_exp_out_handover.xml
+++ b/module_gjc/src/main/res/layout/activity_int_exp_out_handover.xml
@@ -31,42 +31,42 @@
+ value="@={viewModel.flightDate}"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1" />
+ value="@={viewModel.flightNo}"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1" />
+ value="@={viewModel.fdest}"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1" />
+ value="@={viewModel.uldNo}"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1" />
@@ -96,11 +97,11 @@
@@ -111,7 +112,7 @@
@@ -121,8 +122,8 @@
android:layout_height="wrap_content"
android:layout_marginEnd="5dp"
android:gravity="center_vertical"
- android:orientation="horizontal"
- android:onClick="@{()-> viewModel.checkAllClick()}">
+ android:onClick="@{()-> viewModel.checkAllClick()}"
+ android:orientation="horizontal">
@@ -153,7 +154,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text='@{"合计:"+viewModel.totalCount+"票"}'
- android:textColor="@color/white"
+ android:textColor="@color/bottom_tool_tips_text_color"
android:textSize="18sp"
android:textStyle="bold" />
@@ -162,7 +163,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:text='@{"总件数:"+viewModel.totalPc}'
- android:textColor="@color/white"
+ android:textColor="@color/bottom_tool_tips_text_color"
android:textSize="18sp"
android:textStyle="bold" />
@@ -171,7 +172,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:text='@{"总重量:"+viewModel.totalWeight}'
- android:textColor="@color/white"
+ android:textColor="@color/bottom_tool_tips_text_color"
android:textSize="18sp"
android:textStyle="bold" />