diff --git a/module_gjc/src/main/res/drawable/bg_arrive_sub_header.xml b/module_base/src/main/res/drawable/bg_arrive_sub_header.xml
similarity index 100%
rename from module_gjc/src/main/res/drawable/bg_arrive_sub_header.xml
rename to module_base/src/main/res/drawable/bg_arrive_sub_header.xml
diff --git a/module_gjc/src/main/res/drawable/tag_status_blue.xml b/module_base/src/main/res/drawable/tag_status_blue.xml
similarity index 100%
rename from module_gjc/src/main/res/drawable/tag_status_blue.xml
rename to module_base/src/main/res/drawable/tag_status_blue.xml
diff --git a/module_gjc/src/main/res/drawable/tag_status_gray.xml b/module_base/src/main/res/drawable/tag_status_gray.xml
similarity index 100%
rename from module_gjc/src/main/res/drawable/tag_status_gray.xml
rename to module_base/src/main/res/drawable/tag_status_gray.xml
diff --git a/module_gjc/src/main/res/drawable/tag_status_green.xml b/module_base/src/main/res/drawable/tag_status_green.xml
similarity index 100%
rename from module_gjc/src/main/res/drawable/tag_status_green.xml
rename to module_base/src/main/res/drawable/tag_status_green.xml
diff --git a/module_gjc/src/main/res/drawable/tag_status_orange.xml b/module_base/src/main/res/drawable/tag_status_orange.xml
similarity index 100%
rename from module_gjc/src/main/res/drawable/tag_status_orange.xml
rename to module_base/src/main/res/drawable/tag_status_orange.xml
diff --git a/module_gjc/src/main/res/layout/item_int_exp_assemble.xml b/module_gjc/src/main/res/layout/item_int_exp_assemble.xml
index 62d8b24..67e38f9 100644
--- a/module_gjc/src/main/res/layout/item_int_exp_assemble.xml
+++ b/module_gjc/src/main/res/layout/item_int_exp_assemble.xml
@@ -163,9 +163,12 @@
+ android:textColor="@{bean.wtDate != null && !bean.wtDate.isEmpty() ? @color/text_green : @color/text_gray}"
+ android:textSize="14sp" />
@@ -188,9 +191,13 @@
+ android:textColor="@{`2`.equals(bean.fillWeightFlag) ? @color/text_green : (`1`.equals(bean.fillWeightFlag) ? @color/text_orange : @color/text_gray)}"
+ android:textSize="14sp"
+ android:visibility="@{bean.fillWeightFlagText != null && !bean.fillWeightFlagText.isEmpty() ? View.VISIBLE : View.GONE}" />
@@ -377,8 +384,8 @@
visible="@{bean.showMore}"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="5dp"
- android:background="#e3f6e0"
+ android:layout_marginTop="10dp"
+ android:background="@drawable/bg_white_radius_8"
android:orientation="vertical"
android:visibility="gone">
@@ -416,14 +423,15 @@
android:textSize="14sp"
android:visibility="gone" />
-
+
diff --git a/module_gjc/src/main/res/layout/item_int_exp_assemble_sub.xml b/module_gjc/src/main/res/layout/item_int_exp_assemble_sub.xml
index 309b320..e4a06b9 100644
--- a/module_gjc/src/main/res/layout/item_int_exp_assemble_sub.xml
+++ b/module_gjc/src/main/res/layout/item_int_exp_assemble_sub.xml
@@ -1,5 +1,6 @@
-
+
@@ -110,7 +111,7 @@
+ app:dividerColor="@color/sub_list_divider" />
diff --git a/module_gjc/src/main/res/layout/item_int_exp_storage_use.xml b/module_gjc/src/main/res/layout/item_int_exp_storage_use.xml
index b75196c..eea3de2 100644
--- a/module_gjc/src/main/res/layout/item_int_exp_storage_use.xml
+++ b/module_gjc/src/main/res/layout/item_int_exp_storage_use.xml
@@ -246,8 +246,13 @@
+ android:textColor="@{`1`.equals(bean.clearNormal) ? @color/text_green : (`0`.equals(bean.clearNormal) ? @color/text_orange : @color/text_gray)}"
+ android:textSize="14sp"
+ android:visibility="@{bean.clearNormalText != null && !bean.clearNormalText.isEmpty() ? View.VISIBLE : View.GONE}" />
@@ -319,18 +324,19 @@
visible="@{bean.showMore}"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="5dp"
- android:background="#e3f6e0"
+ android:layout_marginTop="10dp"
+ android:background="@drawable/bg_white_radius_8"
android:orientation="vertical"
android:visibility="gone">
-
+
+ android:paddingHorizontal="10dp"
+ android:paddingVertical="10dp">
+ app:dividerColor="@color/sub_list_divider" />
@@ -95,7 +96,7 @@
+ app:dividerColor="@color/sub_list_divider" />
diff --git a/module_gjc/src/main/res/layout/item_int_exp_tally.xml b/module_gjc/src/main/res/layout/item_int_exp_tally.xml
index 70fdeda..f4a1415 100644
--- a/module_gjc/src/main/res/layout/item_int_exp_tally.xml
+++ b/module_gjc/src/main/res/layout/item_int_exp_tally.xml
@@ -25,7 +25,7 @@
-
+
@@ -84,7 +84,7 @@
android:src="@mipmap/img_down" />
-
+
-
+
@@ -113,7 +113,7 @@
android:id="@+id/divider_header"
android:layout_width="match_parent"
android:layout_height="1px"
- android:background="@color/sub_list_divider"/>
+ app:dividerColor="@color/sub_list_divider"/>
diff --git a/module_gjc/src/main/res/layout/item_int_exp_tally_sub.xml b/module_gjc/src/main/res/layout/item_int_exp_tally_sub.xml
index 9b53add..d316e0a 100644
--- a/module_gjc/src/main/res/layout/item_int_exp_tally_sub.xml
+++ b/module_gjc/src/main/res/layout/item_int_exp_tally_sub.xml
@@ -5,6 +5,8 @@
+
+
@@ -67,15 +69,26 @@
android:textColor="@color/text_normal"
android:textSize="14sp" />
-
-
+
+ android:orientation="horizontal">
+
+
+
+
+ app:dividerColor="@color/sub_list_divider" />
diff --git a/module_gjj/src/main/res/layout/item_int_imp_manifest.xml b/module_gjj/src/main/res/layout/item_int_imp_manifest.xml
index e9f684d..6e86c46 100644
--- a/module_gjj/src/main/res/layout/item_int_imp_manifest.xml
+++ b/module_gjj/src/main/res/layout/item_int_imp_manifest.xml
@@ -349,13 +349,13 @@
-
+
@@ -371,14 +371,15 @@
android:textSize="14sp"
android:visibility="gone" />
-
+
+ android:paddingHorizontal="10dp"
+ android:paddingVertical="10dp">
+ app:dividerColor="@color/sub_list_divider" />
+
+
@@ -87,31 +90,53 @@
android:textColor="@color/text_normal"
android:textSize="14sp" />
-
-
+
+ android:orientation="horizontal">
-
-
+
+
+
+
+
+ android:orientation="horizontal">
+
+
+
+
+ app:dividerColor="@color/sub_list_divider" />
diff --git a/module_gjj/src/main/res/layout/item_int_imp_storage_use.xml b/module_gjj/src/main/res/layout/item_int_imp_storage_use.xml
index 12924ef..0045227 100644
--- a/module_gjj/src/main/res/layout/item_int_imp_storage_use.xml
+++ b/module_gjj/src/main/res/layout/item_int_imp_storage_use.xml
@@ -247,8 +247,13 @@
+ android:textColor="@{`1`.equals(bean.clearNormal) ? @color/text_green : (`0`.equals(bean.clearNormal) ? @color/text_orange : @color/text_gray)}"
+ android:textSize="14sp"
+ android:visibility="@{bean.clearNormalText != null && !bean.clearNormalText.isEmpty() ? View.VISIBLE : View.GONE}" />
@@ -319,8 +324,8 @@
visible="@{bean.showMore}"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="5dp"
- android:background="#e3f6e0"
+ android:layout_marginTop="10dp"
+ android:background="@drawable/bg_white_radius_8"
android:orientation="vertical"
android:visibility="gone">
@@ -336,14 +341,15 @@
android:textSize="14sp"
android:visibility="gone" />
-
+
+ android:paddingHorizontal="10dp"
+ android:paddingVertical="10dp">
+ app:dividerColor="@color/sub_list_divider" />
@@ -95,7 +96,7 @@
+ app:dividerColor="@color/sub_list_divider" />
diff --git a/module_gjj/src/main/res/layout/item_int_imp_tally.xml b/module_gjj/src/main/res/layout/item_int_imp_tally.xml
index 0811d19..7dc4c9b 100644
--- a/module_gjj/src/main/res/layout/item_int_imp_tally.xml
+++ b/module_gjj/src/main/res/layout/item_int_imp_tally.xml
@@ -109,9 +109,13 @@
+ android:textColor="@{`01`.equals(bean.status) ? @color/text_green : (`W`.equals(bean.status) ? @color/colorPrimary : @color/text_gray)}"
+ android:visibility="@{bean.status != null && !bean.status.isEmpty() ? View.VISIBLE : View.GONE}" />
@@ -340,8 +344,8 @@
visible="@{bean.showMore}"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="5dp"
- android:background="#e3f6e0"
+ android:layout_marginTop="10dp"
+ android:background="@drawable/bg_white_radius_8"
android:orientation="vertical"
android:visibility="gone">
@@ -357,14 +361,15 @@
android:textSize="14sp"
android:visibility="gone" />
-
+
+ android:paddingHorizontal="10dp"
+ android:paddingVertical="10dp">
+ app:dividerColor="@color/sub_list_divider" />
+
+
@@ -68,16 +71,27 @@
android:textColor="@color/text_normal"
android:textSize="14sp" />
-
-
+
+ android:orientation="horizontal">
+
+
+
+
+ app:dividerColor="@color/sub_list_divider" />