diff --git a/module_gjc/src/main/res/layout/activity_gjc_box_weighing_add.xml b/module_gjc/src/main/res/layout/activity_gjc_box_weighing_add.xml
index b281f91..c8a582a 100644
--- a/module_gjc/src/main/res/layout/activity_gjc_box_weighing_add.xml
+++ b/module_gjc/src/main/res/layout/activity_gjc_box_weighing_add.xml
@@ -374,15 +374,15 @@
android:id="@+id/sCenter"
android:layout_width="32dp"
android:layout_height="wrap_content"
- android:layout_centerInParent="true"/>
+ android:layout_centerInParent="true" />
@@ -116,7 +118,7 @@
@@ -131,7 +133,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="全选"
- android:textColor="@color/white"
+ android:textColor="@color/c666666"
android:textSize="16sp" />
@@ -166,7 +168,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="16sp"
android:textStyle="bold"
tools:text="总件数:100" />
@@ -176,7 +178,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="16sp"
android:textStyle="bold"
tools:text="总重量:100" />
diff --git a/module_gjc/src/main/res/layout/activity_gjc_inspection_details.xml b/module_gjc/src/main/res/layout/activity_gjc_inspection_details.xml
index 0db2014..39296a3 100644
--- a/module_gjc/src/main/res/layout/activity_gjc_inspection_details.xml
+++ b/module_gjc/src/main/res/layout/activity_gjc_inspection_details.xml
@@ -95,7 +95,7 @@
diff --git a/module_gjc/src/main/res/layout/activity_gjc_weighing_list.xml b/module_gjc/src/main/res/layout/activity_gjc_weighing_list.xml
index 392f620..bac435f 100644
--- a/module_gjc/src/main/res/layout/activity_gjc_weighing_list.xml
+++ b/module_gjc/src/main/res/layout/activity_gjc_weighing_list.xml
@@ -87,17 +87,17 @@
android:gravity="center">
@@ -126,7 +126,7 @@
@@ -142,7 +142,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"
tools:text="合计:1票" />
@@ -152,7 +152,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"
tools:text="总件数:100" />
@@ -162,7 +162,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"
tools:text="总重量:100" />
@@ -172,7 +172,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:text='@{"总货重:"+viewModel.cargoWeight}'
- android:textColor="@color/white"
+ android:textColor="@color/bottom_tool_tips_text_color"
android:textSize="18sp"
android:textStyle="bold"
tools:text="总货重:100" />
diff --git a/module_gjc/src/main/res/layout/activity_gjc_weighing_record_list.xml b/module_gjc/src/main/res/layout/activity_gjc_weighing_record_list.xml
index 479841c..6c32851 100644
--- a/module_gjc/src/main/res/layout/activity_gjc_weighing_record_list.xml
+++ b/module_gjc/src/main/res/layout/activity_gjc_weighing_record_list.xml
@@ -87,7 +87,8 @@
android:gravity="center">
@@ -117,7 +118,7 @@
@@ -133,7 +134,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"
tools:text="合计:1票" />
@@ -143,7 +144,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"
tools:text="总件数:100" />
@@ -153,7 +154,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"
tools:text="总重量:100" />
@@ -163,7 +164,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:text='@{"总货重:"+viewModel.cargoWeight}'
- android:textColor="@color/white"
+ android:textColor="@color/bottom_tool_tips_text_color"
android:textSize="18sp"
android:textStyle="bold"
tools:text="总货重:100" />
diff --git a/module_gjc/src/main/res/layout/activity_gjc_weighing_start.xml b/module_gjc/src/main/res/layout/activity_gjc_weighing_start.xml
index 799bd45..392c8da 100644
--- a/module_gjc/src/main/res/layout/activity_gjc_weighing_start.xml
+++ b/module_gjc/src/main/res/layout/activity_gjc_weighing_start.xml
@@ -30,12 +30,13 @@
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="15dp">
+
+ android:padding="15dp">
+ android:layout_marginTop="8dp" />
@@ -394,9 +395,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
- android:paddingTop="15dp"
android:orientation="horizontal"
- android:padding="15dp">
+ android:padding="15dp"
+ android:paddingTop="15dp">
-
-