diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
deleted file mode 100644
index f00d59c..0000000
--- a/app/src/main/res/drawable/bg_layout.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file

diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
deleted file mode 100644
index f00d59c..0000000
--- a/app/src/main/res/drawable/bg_layout.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_20.xml b/app/src/main/res/drawable/bg_layout_radius_20.xml
deleted file mode 100644
index 0c2abfe..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainBackColor" />
-
-    <corners
-        android:topLeftRadius="@dimen/dp_20"
-        android:topRightRadius="@dimen/dp_20" />
-</shape>
\ No newline at end of file

diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
deleted file mode 100644
index f00d59c..0000000
--- a/app/src/main/res/drawable/bg_layout.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_20.xml b/app/src/main/res/drawable/bg_layout_radius_20.xml
deleted file mode 100644
index 0c2abfe..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainBackColor" />
-
-    <corners
-        android:topLeftRadius="@dimen/dp_20"
-        android:topRightRadius="@dimen/dp_20" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_5.xml b/app/src/main/res/drawable/bg_layout_radius_5.xml
deleted file mode 100644
index 5a90f4e..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_5.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="5dp" />
-</shape>
\ No newline at end of file

diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
deleted file mode 100644
index f00d59c..0000000
--- a/app/src/main/res/drawable/bg_layout.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_20.xml b/app/src/main/res/drawable/bg_layout_radius_20.xml
deleted file mode 100644
index 0c2abfe..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainBackColor" />
-
-    <corners
-        android:topLeftRadius="@dimen/dp_20"
-        android:topRightRadius="@dimen/dp_20" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_5.xml b/app/src/main/res/drawable/bg_layout_radius_5.xml
deleted file mode 100644
index 5a90f4e..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_5.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="5dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
deleted file mode 100644
index bca9c08..0000000
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <size android:height="155dp" />
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_3" />
-</shape>
\ No newline at end of file

diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
deleted file mode 100644
index f00d59c..0000000
--- a/app/src/main/res/drawable/bg_layout.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_20.xml b/app/src/main/res/drawable/bg_layout_radius_20.xml
deleted file mode 100644
index 0c2abfe..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainBackColor" />
-
-    <corners
-        android:topLeftRadius="@dimen/dp_20"
-        android:topRightRadius="@dimen/dp_20" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_5.xml b/app/src/main/res/drawable/bg_layout_radius_5.xml
deleted file mode 100644
index 5a90f4e..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_5.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="5dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
deleted file mode 100644
index bca9c08..0000000
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <size android:height="155dp" />
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_3" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
deleted file mode 100644
index 15e6a4b..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/transparentBlack" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file

diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
deleted file mode 100644
index f00d59c..0000000
--- a/app/src/main/res/drawable/bg_layout.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_20.xml b/app/src/main/res/drawable/bg_layout_radius_20.xml
deleted file mode 100644
index 0c2abfe..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainBackColor" />
-
-    <corners
-        android:topLeftRadius="@dimen/dp_20"
-        android:topRightRadius="@dimen/dp_20" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_5.xml b/app/src/main/res/drawable/bg_layout_radius_5.xml
deleted file mode 100644
index 5a90f4e..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_5.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="5dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
deleted file mode 100644
index bca9c08..0000000
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <size android:height="155dp" />
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_3" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
deleted file mode 100644
index 15e6a4b..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/transparentBlack" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_color.xml b/app/src/main/res/drawable/bg_solid_layout_main_color.xml
deleted file mode 100644
index e329b7d..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_main_color.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainThemeColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file

diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
deleted file mode 100644
index f00d59c..0000000
--- a/app/src/main/res/drawable/bg_layout.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_20.xml b/app/src/main/res/drawable/bg_layout_radius_20.xml
deleted file mode 100644
index 0c2abfe..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainBackColor" />
-
-    <corners
-        android:topLeftRadius="@dimen/dp_20"
-        android:topRightRadius="@dimen/dp_20" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_5.xml b/app/src/main/res/drawable/bg_layout_radius_5.xml
deleted file mode 100644
index 5a90f4e..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_5.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="5dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
deleted file mode 100644
index bca9c08..0000000
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <size android:height="155dp" />
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_3" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
deleted file mode 100644
index 15e6a4b..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/transparentBlack" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_color.xml b/app/src/main/res/drawable/bg_solid_layout_main_color.xml
deleted file mode 100644
index e329b7d..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_main_color.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainThemeColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
new file mode 100644
index 0000000..e329b7d
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_5" />
+</shape>
\ No newline at end of file

diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
deleted file mode 100644
index f00d59c..0000000
--- a/app/src/main/res/drawable/bg_layout.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_20.xml b/app/src/main/res/drawable/bg_layout_radius_20.xml
deleted file mode 100644
index 0c2abfe..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainBackColor" />
-
-    <corners
-        android:topLeftRadius="@dimen/dp_20"
-        android:topRightRadius="@dimen/dp_20" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_5.xml b/app/src/main/res/drawable/bg_layout_radius_5.xml
deleted file mode 100644
index 5a90f4e..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_5.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="5dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
deleted file mode 100644
index bca9c08..0000000
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <size android:height="155dp" />
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_3" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
deleted file mode 100644
index 15e6a4b..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/transparentBlack" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_color.xml b/app/src/main/res/drawable/bg_solid_layout_main_color.xml
deleted file mode 100644
index e329b7d..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_main_color.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainThemeColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
new file mode 100644
index 0000000..e329b7d
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_5" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
new file mode 100644
index 0000000..15e6a4b
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/transparentBlack" />
+
+    <corners android:radius="@dimen/dp_10" />
+</shape>
\ No newline at end of file

diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
deleted file mode 100644
index f00d59c..0000000
--- a/app/src/main/res/drawable/bg_layout.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_20.xml b/app/src/main/res/drawable/bg_layout_radius_20.xml
deleted file mode 100644
index 0c2abfe..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainBackColor" />
-
-    <corners
-        android:topLeftRadius="@dimen/dp_20"
-        android:topRightRadius="@dimen/dp_20" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_5.xml b/app/src/main/res/drawable/bg_layout_radius_5.xml
deleted file mode 100644
index 5a90f4e..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_5.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="5dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
deleted file mode 100644
index bca9c08..0000000
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <size android:height="155dp" />
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_3" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
deleted file mode 100644
index 15e6a4b..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/transparentBlack" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_color.xml b/app/src/main/res/drawable/bg_solid_layout_main_color.xml
deleted file mode 100644
index e329b7d..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_main_color.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainThemeColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
new file mode 100644
index 0000000..e329b7d
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_5" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
new file mode 100644
index 0000000..15e6a4b
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/transparentBlack" />
+
+    <corners android:radius="@dimen/dp_10" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
new file mode 100644
index 0000000..5a90f4e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners android:radius="5dp" />
+</shape>
\ No newline at end of file

diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
deleted file mode 100644
index f00d59c..0000000
--- a/app/src/main/res/drawable/bg_layout.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_20.xml b/app/src/main/res/drawable/bg_layout_radius_20.xml
deleted file mode 100644
index 0c2abfe..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainBackColor" />
-
-    <corners
-        android:topLeftRadius="@dimen/dp_20"
-        android:topRightRadius="@dimen/dp_20" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_5.xml b/app/src/main/res/drawable/bg_layout_radius_5.xml
deleted file mode 100644
index 5a90f4e..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_5.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="5dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
deleted file mode 100644
index bca9c08..0000000
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <size android:height="155dp" />
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_3" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
deleted file mode 100644
index 15e6a4b..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/transparentBlack" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_color.xml b/app/src/main/res/drawable/bg_solid_layout_main_color.xml
deleted file mode 100644
index e329b7d..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_main_color.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainThemeColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
new file mode 100644
index 0000000..e329b7d
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_5" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
new file mode 100644
index 0000000..15e6a4b
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/transparentBlack" />
+
+    <corners android:radius="@dimen/dp_10" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
new file mode 100644
index 0000000..5a90f4e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners android:radius="5dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
new file mode 100644
index 0000000..0c2abfe
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainBackColor" />
+
+    <corners
+        android:topLeftRadius="@dimen/dp_20"
+        android:topRightRadius="@dimen/dp_20" />
+</shape>
\ No newline at end of file

diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
deleted file mode 100644
index f00d59c..0000000
--- a/app/src/main/res/drawable/bg_layout.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_20.xml b/app/src/main/res/drawable/bg_layout_radius_20.xml
deleted file mode 100644
index 0c2abfe..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainBackColor" />
-
-    <corners
-        android:topLeftRadius="@dimen/dp_20"
-        android:topRightRadius="@dimen/dp_20" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_5.xml b/app/src/main/res/drawable/bg_layout_radius_5.xml
deleted file mode 100644
index 5a90f4e..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_5.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="5dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
deleted file mode 100644
index bca9c08..0000000
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <size android:height="155dp" />
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_3" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
deleted file mode 100644
index 15e6a4b..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/transparentBlack" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_color.xml b/app/src/main/res/drawable/bg_solid_layout_main_color.xml
deleted file mode 100644
index e329b7d..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_main_color.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainThemeColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
new file mode 100644
index 0000000..e329b7d
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_5" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
new file mode 100644
index 0000000..15e6a4b
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/transparentBlack" />
+
+    <corners android:radius="@dimen/dp_10" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
new file mode 100644
index 0000000..5a90f4e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners android:radius="5dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
new file mode 100644
index 0000000..0c2abfe
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainBackColor" />
+
+    <corners
+        android:topLeftRadius="@dimen/dp_20"
+        android:topRightRadius="@dimen/dp_20" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
new file mode 100644
index 0000000..bca9c08
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <size android:height="155dp" />
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_3" />
+</shape>
\ No newline at end of file

diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
deleted file mode 100644
index f00d59c..0000000
--- a/app/src/main/res/drawable/bg_layout.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_20.xml b/app/src/main/res/drawable/bg_layout_radius_20.xml
deleted file mode 100644
index 0c2abfe..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainBackColor" />
-
-    <corners
-        android:topLeftRadius="@dimen/dp_20"
-        android:topRightRadius="@dimen/dp_20" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_5.xml b/app/src/main/res/drawable/bg_layout_radius_5.xml
deleted file mode 100644
index 5a90f4e..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_5.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="5dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
deleted file mode 100644
index bca9c08..0000000
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <size android:height="155dp" />
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_3" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
deleted file mode 100644
index 15e6a4b..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/transparentBlack" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_color.xml b/app/src/main/res/drawable/bg_solid_layout_main_color.xml
deleted file mode 100644
index e329b7d..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_main_color.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainThemeColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
new file mode 100644
index 0000000..e329b7d
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_5" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
new file mode 100644
index 0000000..15e6a4b
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/transparentBlack" />
+
+    <corners android:radius="@dimen/dp_10" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
new file mode 100644
index 0000000..5a90f4e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners android:radius="5dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
new file mode 100644
index 0000000..0c2abfe
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainBackColor" />
+
+    <corners
+        android:topLeftRadius="@dimen/dp_20"
+        android:topRightRadius="@dimen/dp_20" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
new file mode 100644
index 0000000..bca9c08
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <size android:height="155dp" />
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_3" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_order_completed_detail.xml b/app/src/main/res/layout/activity_order_completed_detail.xml
index 4333635..f2f88f4 100644
--- a/app/src/main/res/layout/activity_order_completed_detail.xml
+++ b/app/src/main/res/layout/activity_order_completed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">

diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
deleted file mode 100644
index f00d59c..0000000
--- a/app/src/main/res/drawable/bg_layout.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_20.xml b/app/src/main/res/drawable/bg_layout_radius_20.xml
deleted file mode 100644
index 0c2abfe..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainBackColor" />
-
-    <corners
-        android:topLeftRadius="@dimen/dp_20"
-        android:topRightRadius="@dimen/dp_20" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_5.xml b/app/src/main/res/drawable/bg_layout_radius_5.xml
deleted file mode 100644
index 5a90f4e..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_5.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="5dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
deleted file mode 100644
index bca9c08..0000000
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <size android:height="155dp" />
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_3" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
deleted file mode 100644
index 15e6a4b..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/transparentBlack" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_color.xml b/app/src/main/res/drawable/bg_solid_layout_main_color.xml
deleted file mode 100644
index e329b7d..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_main_color.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainThemeColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
new file mode 100644
index 0000000..e329b7d
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_5" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
new file mode 100644
index 0000000..15e6a4b
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/transparentBlack" />
+
+    <corners android:radius="@dimen/dp_10" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
new file mode 100644
index 0000000..5a90f4e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners android:radius="5dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
new file mode 100644
index 0000000..0c2abfe
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainBackColor" />
+
+    <corners
+        android:topLeftRadius="@dimen/dp_20"
+        android:topRightRadius="@dimen/dp_20" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
new file mode 100644
index 0000000..bca9c08
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <size android:height="155dp" />
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_3" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_order_completed_detail.xml b/app/src/main/res/layout/activity_order_completed_detail.xml
index 4333635..f2f88f4 100644
--- a/app/src/main/res/layout/activity_order_completed_detail.xml
+++ b/app/src/main/res/layout/activity_order_completed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml
index e406795..0e59210 100644
--- a/app/src/main/res/layout/activity_order_in_handle_detail.xml
+++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -123,7 +123,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:inputType="textMultiLine"
                     android:padding="@dimen/dp_3"
@@ -149,7 +149,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">

diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
deleted file mode 100644
index f00d59c..0000000
--- a/app/src/main/res/drawable/bg_layout.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_20.xml b/app/src/main/res/drawable/bg_layout_radius_20.xml
deleted file mode 100644
index 0c2abfe..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainBackColor" />
-
-    <corners
-        android:topLeftRadius="@dimen/dp_20"
-        android:topRightRadius="@dimen/dp_20" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_5.xml b/app/src/main/res/drawable/bg_layout_radius_5.xml
deleted file mode 100644
index 5a90f4e..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_5.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="5dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
deleted file mode 100644
index bca9c08..0000000
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <size android:height="155dp" />
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_3" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
deleted file mode 100644
index 15e6a4b..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/transparentBlack" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_color.xml b/app/src/main/res/drawable/bg_solid_layout_main_color.xml
deleted file mode 100644
index e329b7d..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_main_color.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainThemeColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
new file mode 100644
index 0000000..e329b7d
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_5" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
new file mode 100644
index 0000000..15e6a4b
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/transparentBlack" />
+
+    <corners android:radius="@dimen/dp_10" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
new file mode 100644
index 0000000..5a90f4e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners android:radius="5dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
new file mode 100644
index 0000000..0c2abfe
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainBackColor" />
+
+    <corners
+        android:topLeftRadius="@dimen/dp_20"
+        android:topRightRadius="@dimen/dp_20" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
new file mode 100644
index 0000000..bca9c08
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <size android:height="155dp" />
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_3" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_order_completed_detail.xml b/app/src/main/res/layout/activity_order_completed_detail.xml
index 4333635..f2f88f4 100644
--- a/app/src/main/res/layout/activity_order_completed_detail.xml
+++ b/app/src/main/res/layout/activity_order_completed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml
index e406795..0e59210 100644
--- a/app/src/main/res/layout/activity_order_in_handle_detail.xml
+++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -123,7 +123,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:inputType="textMultiLine"
                     android:padding="@dimen/dp_3"
@@ -149,7 +149,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
index cac4f32..4a02759 100644
--- a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -48,7 +48,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:hint="请输入现场情况"
                     android:inputType="textMultiLine"
@@ -112,7 +112,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">

diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
deleted file mode 100644
index f00d59c..0000000
--- a/app/src/main/res/drawable/bg_layout.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_20.xml b/app/src/main/res/drawable/bg_layout_radius_20.xml
deleted file mode 100644
index 0c2abfe..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainBackColor" />
-
-    <corners
-        android:topLeftRadius="@dimen/dp_20"
-        android:topRightRadius="@dimen/dp_20" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_5.xml b/app/src/main/res/drawable/bg_layout_radius_5.xml
deleted file mode 100644
index 5a90f4e..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_5.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="5dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
deleted file mode 100644
index bca9c08..0000000
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <size android:height="155dp" />
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_3" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
deleted file mode 100644
index 15e6a4b..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/transparentBlack" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_color.xml b/app/src/main/res/drawable/bg_solid_layout_main_color.xml
deleted file mode 100644
index e329b7d..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_main_color.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainThemeColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
new file mode 100644
index 0000000..e329b7d
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_5" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
new file mode 100644
index 0000000..15e6a4b
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/transparentBlack" />
+
+    <corners android:radius="@dimen/dp_10" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
new file mode 100644
index 0000000..5a90f4e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners android:radius="5dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
new file mode 100644
index 0000000..0c2abfe
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainBackColor" />
+
+    <corners
+        android:topLeftRadius="@dimen/dp_20"
+        android:topRightRadius="@dimen/dp_20" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
new file mode 100644
index 0000000..bca9c08
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <size android:height="155dp" />
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_3" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_order_completed_detail.xml b/app/src/main/res/layout/activity_order_completed_detail.xml
index 4333635..f2f88f4 100644
--- a/app/src/main/res/layout/activity_order_completed_detail.xml
+++ b/app/src/main/res/layout/activity_order_completed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml
index e406795..0e59210 100644
--- a/app/src/main/res/layout/activity_order_in_handle_detail.xml
+++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -123,7 +123,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:inputType="textMultiLine"
                     android:padding="@dimen/dp_3"
@@ -149,7 +149,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
index cac4f32..4a02759 100644
--- a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -48,7 +48,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:hint="请输入现场情况"
                     android:inputType="textMultiLine"
@@ -112,7 +112,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_not_processed_detail.xml b/app/src/main/res/layout/activity_order_not_processed_detail.xml
index 5db1395..b68ae42 100644
--- a/app/src/main/res/layout/activity_order_not_processed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_processed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">

diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
deleted file mode 100644
index f00d59c..0000000
--- a/app/src/main/res/drawable/bg_layout.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_20.xml b/app/src/main/res/drawable/bg_layout_radius_20.xml
deleted file mode 100644
index 0c2abfe..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainBackColor" />
-
-    <corners
-        android:topLeftRadius="@dimen/dp_20"
-        android:topRightRadius="@dimen/dp_20" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_5.xml b/app/src/main/res/drawable/bg_layout_radius_5.xml
deleted file mode 100644
index 5a90f4e..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_5.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="5dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
deleted file mode 100644
index bca9c08..0000000
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <size android:height="155dp" />
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_3" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
deleted file mode 100644
index 15e6a4b..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/transparentBlack" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_color.xml b/app/src/main/res/drawable/bg_solid_layout_main_color.xml
deleted file mode 100644
index e329b7d..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_main_color.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainThemeColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
new file mode 100644
index 0000000..e329b7d
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_5" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
new file mode 100644
index 0000000..15e6a4b
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/transparentBlack" />
+
+    <corners android:radius="@dimen/dp_10" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
new file mode 100644
index 0000000..5a90f4e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners android:radius="5dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
new file mode 100644
index 0000000..0c2abfe
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainBackColor" />
+
+    <corners
+        android:topLeftRadius="@dimen/dp_20"
+        android:topRightRadius="@dimen/dp_20" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
new file mode 100644
index 0000000..bca9c08
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <size android:height="155dp" />
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_3" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_order_completed_detail.xml b/app/src/main/res/layout/activity_order_completed_detail.xml
index 4333635..f2f88f4 100644
--- a/app/src/main/res/layout/activity_order_completed_detail.xml
+++ b/app/src/main/res/layout/activity_order_completed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml
index e406795..0e59210 100644
--- a/app/src/main/res/layout/activity_order_in_handle_detail.xml
+++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -123,7 +123,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:inputType="textMultiLine"
                     android:padding="@dimen/dp_3"
@@ -149,7 +149,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
index cac4f32..4a02759 100644
--- a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -48,7 +48,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:hint="请输入现场情况"
                     android:inputType="textMultiLine"
@@ -112,7 +112,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_not_processed_detail.xml b/app/src/main/res/layout/activity_order_not_processed_detail.xml
index 5db1395..b68ae42 100644
--- a/app/src/main/res/layout/activity_order_not_processed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_processed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml
index 858051d..99b8b40 100644
--- a/app/src/main/res/layout/activity_order_search.xml
+++ b/app/src/main/res/layout/activity_order_search.xml
@@ -19,7 +19,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/dp_10"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <LinearLayout

diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
deleted file mode 100644
index f00d59c..0000000
--- a/app/src/main/res/drawable/bg_layout.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_20.xml b/app/src/main/res/drawable/bg_layout_radius_20.xml
deleted file mode 100644
index 0c2abfe..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainBackColor" />
-
-    <corners
-        android:topLeftRadius="@dimen/dp_20"
-        android:topRightRadius="@dimen/dp_20" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_5.xml b/app/src/main/res/drawable/bg_layout_radius_5.xml
deleted file mode 100644
index 5a90f4e..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_5.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="5dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
deleted file mode 100644
index bca9c08..0000000
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <size android:height="155dp" />
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_3" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
deleted file mode 100644
index 15e6a4b..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/transparentBlack" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_color.xml b/app/src/main/res/drawable/bg_solid_layout_main_color.xml
deleted file mode 100644
index e329b7d..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_main_color.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainThemeColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
new file mode 100644
index 0000000..e329b7d
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_5" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
new file mode 100644
index 0000000..15e6a4b
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/transparentBlack" />
+
+    <corners android:radius="@dimen/dp_10" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
new file mode 100644
index 0000000..5a90f4e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners android:radius="5dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
new file mode 100644
index 0000000..0c2abfe
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainBackColor" />
+
+    <corners
+        android:topLeftRadius="@dimen/dp_20"
+        android:topRightRadius="@dimen/dp_20" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
new file mode 100644
index 0000000..bca9c08
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <size android:height="155dp" />
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_3" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_order_completed_detail.xml b/app/src/main/res/layout/activity_order_completed_detail.xml
index 4333635..f2f88f4 100644
--- a/app/src/main/res/layout/activity_order_completed_detail.xml
+++ b/app/src/main/res/layout/activity_order_completed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml
index e406795..0e59210 100644
--- a/app/src/main/res/layout/activity_order_in_handle_detail.xml
+++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -123,7 +123,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:inputType="textMultiLine"
                     android:padding="@dimen/dp_3"
@@ -149,7 +149,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
index cac4f32..4a02759 100644
--- a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -48,7 +48,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:hint="请输入现场情况"
                     android:inputType="textMultiLine"
@@ -112,7 +112,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_not_processed_detail.xml b/app/src/main/res/layout/activity_order_not_processed_detail.xml
index 5db1395..b68ae42 100644
--- a/app/src/main/res/layout/activity_order_not_processed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_processed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml
index 858051d..99b8b40 100644
--- a/app/src/main/res/layout/activity_order_search.xml
+++ b/app/src/main/res/layout/activity_order_search.xml
@@ -19,7 +19,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/dp_10"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <LinearLayout
diff --git a/app/src/main/res/layout/activity_user_detail.xml b/app/src/main/res/layout/activity_user_detail.xml
index c7be5d1..1464e4d 100644
--- a/app/src/main/res/layout/activity_user_detail.xml
+++ b/app/src/main/res/layout/activity_user_detail.xml
@@ -16,7 +16,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <RelativeLayout

diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
deleted file mode 100644
index f00d59c..0000000
--- a/app/src/main/res/drawable/bg_layout.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_20.xml b/app/src/main/res/drawable/bg_layout_radius_20.xml
deleted file mode 100644
index 0c2abfe..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainBackColor" />
-
-    <corners
-        android:topLeftRadius="@dimen/dp_20"
-        android:topRightRadius="@dimen/dp_20" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_5.xml b/app/src/main/res/drawable/bg_layout_radius_5.xml
deleted file mode 100644
index 5a90f4e..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_5.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="5dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
deleted file mode 100644
index bca9c08..0000000
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <size android:height="155dp" />
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_3" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
deleted file mode 100644
index 15e6a4b..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/transparentBlack" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_color.xml b/app/src/main/res/drawable/bg_solid_layout_main_color.xml
deleted file mode 100644
index e329b7d..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_main_color.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainThemeColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
new file mode 100644
index 0000000..e329b7d
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_5" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
new file mode 100644
index 0000000..15e6a4b
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/transparentBlack" />
+
+    <corners android:radius="@dimen/dp_10" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
new file mode 100644
index 0000000..5a90f4e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners android:radius="5dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
new file mode 100644
index 0000000..0c2abfe
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainBackColor" />
+
+    <corners
+        android:topLeftRadius="@dimen/dp_20"
+        android:topRightRadius="@dimen/dp_20" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
new file mode 100644
index 0000000..bca9c08
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <size android:height="155dp" />
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_3" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_order_completed_detail.xml b/app/src/main/res/layout/activity_order_completed_detail.xml
index 4333635..f2f88f4 100644
--- a/app/src/main/res/layout/activity_order_completed_detail.xml
+++ b/app/src/main/res/layout/activity_order_completed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml
index e406795..0e59210 100644
--- a/app/src/main/res/layout/activity_order_in_handle_detail.xml
+++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -123,7 +123,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:inputType="textMultiLine"
                     android:padding="@dimen/dp_3"
@@ -149,7 +149,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
index cac4f32..4a02759 100644
--- a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -48,7 +48,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:hint="请输入现场情况"
                     android:inputType="textMultiLine"
@@ -112,7 +112,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_not_processed_detail.xml b/app/src/main/res/layout/activity_order_not_processed_detail.xml
index 5db1395..b68ae42 100644
--- a/app/src/main/res/layout/activity_order_not_processed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_processed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml
index 858051d..99b8b40 100644
--- a/app/src/main/res/layout/activity_order_search.xml
+++ b/app/src/main/res/layout/activity_order_search.xml
@@ -19,7 +19,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/dp_10"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <LinearLayout
diff --git a/app/src/main/res/layout/activity_user_detail.xml b/app/src/main/res/layout/activity_user_detail.xml
index c7be5d1..1464e4d 100644
--- a/app/src/main/res/layout/activity_user_detail.xml
+++ b/app/src/main/res/layout/activity_user_detail.xml
@@ -16,7 +16,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <RelativeLayout
diff --git a/app/src/main/res/layout/activity_well_detail.xml b/app/src/main/res/layout/activity_well_detail.xml
index 46dee2d..59c2bb4 100644
--- a/app/src/main/res/layout/activity_well_detail.xml
+++ b/app/src/main/res/layout/activity_well_detail.xml
@@ -23,7 +23,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -160,7 +160,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView

diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
deleted file mode 100644
index f00d59c..0000000
--- a/app/src/main/res/drawable/bg_layout.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_20.xml b/app/src/main/res/drawable/bg_layout_radius_20.xml
deleted file mode 100644
index 0c2abfe..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainBackColor" />
-
-    <corners
-        android:topLeftRadius="@dimen/dp_20"
-        android:topRightRadius="@dimen/dp_20" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_5.xml b/app/src/main/res/drawable/bg_layout_radius_5.xml
deleted file mode 100644
index 5a90f4e..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_5.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="5dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
deleted file mode 100644
index bca9c08..0000000
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <size android:height="155dp" />
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_3" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
deleted file mode 100644
index 15e6a4b..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/transparentBlack" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_color.xml b/app/src/main/res/drawable/bg_solid_layout_main_color.xml
deleted file mode 100644
index e329b7d..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_main_color.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainThemeColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
new file mode 100644
index 0000000..e329b7d
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_5" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
new file mode 100644
index 0000000..15e6a4b
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/transparentBlack" />
+
+    <corners android:radius="@dimen/dp_10" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
new file mode 100644
index 0000000..5a90f4e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners android:radius="5dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
new file mode 100644
index 0000000..0c2abfe
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainBackColor" />
+
+    <corners
+        android:topLeftRadius="@dimen/dp_20"
+        android:topRightRadius="@dimen/dp_20" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
new file mode 100644
index 0000000..bca9c08
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <size android:height="155dp" />
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_3" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_order_completed_detail.xml b/app/src/main/res/layout/activity_order_completed_detail.xml
index 4333635..f2f88f4 100644
--- a/app/src/main/res/layout/activity_order_completed_detail.xml
+++ b/app/src/main/res/layout/activity_order_completed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml
index e406795..0e59210 100644
--- a/app/src/main/res/layout/activity_order_in_handle_detail.xml
+++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -123,7 +123,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:inputType="textMultiLine"
                     android:padding="@dimen/dp_3"
@@ -149,7 +149,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
index cac4f32..4a02759 100644
--- a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -48,7 +48,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:hint="请输入现场情况"
                     android:inputType="textMultiLine"
@@ -112,7 +112,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_not_processed_detail.xml b/app/src/main/res/layout/activity_order_not_processed_detail.xml
index 5db1395..b68ae42 100644
--- a/app/src/main/res/layout/activity_order_not_processed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_processed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml
index 858051d..99b8b40 100644
--- a/app/src/main/res/layout/activity_order_search.xml
+++ b/app/src/main/res/layout/activity_order_search.xml
@@ -19,7 +19,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/dp_10"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <LinearLayout
diff --git a/app/src/main/res/layout/activity_user_detail.xml b/app/src/main/res/layout/activity_user_detail.xml
index c7be5d1..1464e4d 100644
--- a/app/src/main/res/layout/activity_user_detail.xml
+++ b/app/src/main/res/layout/activity_user_detail.xml
@@ -16,7 +16,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <RelativeLayout
diff --git a/app/src/main/res/layout/activity_well_detail.xml b/app/src/main/res/layout/activity_well_detail.xml
index 46dee2d..59c2bb4 100644
--- a/app/src/main/res/layout/activity_well_detail.xml
+++ b/app/src/main/res/layout/activity_well_detail.xml
@@ -23,7 +23,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -160,7 +160,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
diff --git a/app/src/main/res/layout/dialog_bottom_sheet.xml b/app/src/main/res/layout/dialog_bottom_sheet.xml
index b88bd9d..bb7acf2 100644
--- a/app/src/main/res/layout/dialog_bottom_sheet.xml
+++ b/app/src/main/res/layout/dialog_bottom_sheet.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
     android:padding="@dimen/dp_10">
 

diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
deleted file mode 100644
index f00d59c..0000000
--- a/app/src/main/res/drawable/bg_layout.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_20.xml b/app/src/main/res/drawable/bg_layout_radius_20.xml
deleted file mode 100644
index 0c2abfe..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainBackColor" />
-
-    <corners
-        android:topLeftRadius="@dimen/dp_20"
-        android:topRightRadius="@dimen/dp_20" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_5.xml b/app/src/main/res/drawable/bg_layout_radius_5.xml
deleted file mode 100644
index 5a90f4e..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_5.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="5dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
deleted file mode 100644
index bca9c08..0000000
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <size android:height="155dp" />
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_3" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
deleted file mode 100644
index 15e6a4b..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/transparentBlack" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_color.xml b/app/src/main/res/drawable/bg_solid_layout_main_color.xml
deleted file mode 100644
index e329b7d..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_main_color.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainThemeColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
new file mode 100644
index 0000000..e329b7d
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_5" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
new file mode 100644
index 0000000..15e6a4b
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/transparentBlack" />
+
+    <corners android:radius="@dimen/dp_10" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
new file mode 100644
index 0000000..5a90f4e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners android:radius="5dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
new file mode 100644
index 0000000..0c2abfe
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainBackColor" />
+
+    <corners
+        android:topLeftRadius="@dimen/dp_20"
+        android:topRightRadius="@dimen/dp_20" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
new file mode 100644
index 0000000..bca9c08
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <size android:height="155dp" />
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_3" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_order_completed_detail.xml b/app/src/main/res/layout/activity_order_completed_detail.xml
index 4333635..f2f88f4 100644
--- a/app/src/main/res/layout/activity_order_completed_detail.xml
+++ b/app/src/main/res/layout/activity_order_completed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml
index e406795..0e59210 100644
--- a/app/src/main/res/layout/activity_order_in_handle_detail.xml
+++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -123,7 +123,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:inputType="textMultiLine"
                     android:padding="@dimen/dp_3"
@@ -149,7 +149,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
index cac4f32..4a02759 100644
--- a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -48,7 +48,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:hint="请输入现场情况"
                     android:inputType="textMultiLine"
@@ -112,7 +112,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_not_processed_detail.xml b/app/src/main/res/layout/activity_order_not_processed_detail.xml
index 5db1395..b68ae42 100644
--- a/app/src/main/res/layout/activity_order_not_processed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_processed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml
index 858051d..99b8b40 100644
--- a/app/src/main/res/layout/activity_order_search.xml
+++ b/app/src/main/res/layout/activity_order_search.xml
@@ -19,7 +19,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/dp_10"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <LinearLayout
diff --git a/app/src/main/res/layout/activity_user_detail.xml b/app/src/main/res/layout/activity_user_detail.xml
index c7be5d1..1464e4d 100644
--- a/app/src/main/res/layout/activity_user_detail.xml
+++ b/app/src/main/res/layout/activity_user_detail.xml
@@ -16,7 +16,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <RelativeLayout
diff --git a/app/src/main/res/layout/activity_well_detail.xml b/app/src/main/res/layout/activity_well_detail.xml
index 46dee2d..59c2bb4 100644
--- a/app/src/main/res/layout/activity_well_detail.xml
+++ b/app/src/main/res/layout/activity_well_detail.xml
@@ -23,7 +23,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -160,7 +160,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
diff --git a/app/src/main/res/layout/dialog_bottom_sheet.xml b/app/src/main/res/layout/dialog_bottom_sheet.xml
index b88bd9d..bb7acf2 100644
--- a/app/src/main/res/layout/dialog_bottom_sheet.xml
+++ b/app/src/main/res/layout/dialog_bottom_sheet.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
     android:padding="@dimen/dp_10">
 
diff --git a/app/src/main/res/layout/dialog_single_choice.xml b/app/src/main/res/layout/dialog_single_choice.xml
index 2559b8d..2c92ace 100644
--- a/app/src/main/res/layout/dialog_single_choice.xml
+++ b/app/src/main/res/layout/dialog_single_choice.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical">
 
     <RelativeLayout

diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
deleted file mode 100644
index f00d59c..0000000
--- a/app/src/main/res/drawable/bg_layout.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_20.xml b/app/src/main/res/drawable/bg_layout_radius_20.xml
deleted file mode 100644
index 0c2abfe..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainBackColor" />
-
-    <corners
-        android:topLeftRadius="@dimen/dp_20"
-        android:topRightRadius="@dimen/dp_20" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_5.xml b/app/src/main/res/drawable/bg_layout_radius_5.xml
deleted file mode 100644
index 5a90f4e..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_5.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="5dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
deleted file mode 100644
index bca9c08..0000000
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <size android:height="155dp" />
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_3" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
deleted file mode 100644
index 15e6a4b..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/transparentBlack" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_color.xml b/app/src/main/res/drawable/bg_solid_layout_main_color.xml
deleted file mode 100644
index e329b7d..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_main_color.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainThemeColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
new file mode 100644
index 0000000..e329b7d
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_5" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
new file mode 100644
index 0000000..15e6a4b
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/transparentBlack" />
+
+    <corners android:radius="@dimen/dp_10" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
new file mode 100644
index 0000000..5a90f4e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners android:radius="5dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
new file mode 100644
index 0000000..0c2abfe
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainBackColor" />
+
+    <corners
+        android:topLeftRadius="@dimen/dp_20"
+        android:topRightRadius="@dimen/dp_20" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
new file mode 100644
index 0000000..bca9c08
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <size android:height="155dp" />
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_3" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_order_completed_detail.xml b/app/src/main/res/layout/activity_order_completed_detail.xml
index 4333635..f2f88f4 100644
--- a/app/src/main/res/layout/activity_order_completed_detail.xml
+++ b/app/src/main/res/layout/activity_order_completed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml
index e406795..0e59210 100644
--- a/app/src/main/res/layout/activity_order_in_handle_detail.xml
+++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -123,7 +123,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:inputType="textMultiLine"
                     android:padding="@dimen/dp_3"
@@ -149,7 +149,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
index cac4f32..4a02759 100644
--- a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -48,7 +48,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:hint="请输入现场情况"
                     android:inputType="textMultiLine"
@@ -112,7 +112,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_not_processed_detail.xml b/app/src/main/res/layout/activity_order_not_processed_detail.xml
index 5db1395..b68ae42 100644
--- a/app/src/main/res/layout/activity_order_not_processed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_processed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml
index 858051d..99b8b40 100644
--- a/app/src/main/res/layout/activity_order_search.xml
+++ b/app/src/main/res/layout/activity_order_search.xml
@@ -19,7 +19,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/dp_10"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <LinearLayout
diff --git a/app/src/main/res/layout/activity_user_detail.xml b/app/src/main/res/layout/activity_user_detail.xml
index c7be5d1..1464e4d 100644
--- a/app/src/main/res/layout/activity_user_detail.xml
+++ b/app/src/main/res/layout/activity_user_detail.xml
@@ -16,7 +16,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <RelativeLayout
diff --git a/app/src/main/res/layout/activity_well_detail.xml b/app/src/main/res/layout/activity_well_detail.xml
index 46dee2d..59c2bb4 100644
--- a/app/src/main/res/layout/activity_well_detail.xml
+++ b/app/src/main/res/layout/activity_well_detail.xml
@@ -23,7 +23,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -160,7 +160,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
diff --git a/app/src/main/res/layout/dialog_bottom_sheet.xml b/app/src/main/res/layout/dialog_bottom_sheet.xml
index b88bd9d..bb7acf2 100644
--- a/app/src/main/res/layout/dialog_bottom_sheet.xml
+++ b/app/src/main/res/layout/dialog_bottom_sheet.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
     android:padding="@dimen/dp_10">
 
diff --git a/app/src/main/res/layout/dialog_single_choice.xml b/app/src/main/res/layout/dialog_single_choice.xml
index 2559b8d..2c92ace 100644
--- a/app/src/main/res/layout/dialog_single_choice.xml
+++ b/app/src/main/res/layout/dialog_single_choice.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical">
 
     <RelativeLayout
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 4f02f1f..30e607e 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -44,7 +44,7 @@
             android:id="@+id/bottomBehaviorLayout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@drawable/bg_layout_radius_20"
+            android:background="@drawable/bg_solid_layout_white_radius_top_20"
             android:orientation="vertical"
             app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
@@ -64,7 +64,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
-                android:background="@drawable/bg_layout">
+                android:background="@drawable/bg_solid_layout_white_radius_10">
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/homeRecyclerView"
@@ -77,7 +77,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
@@ -142,7 +142,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView

diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
deleted file mode 100644
index f00d59c..0000000
--- a/app/src/main/res/drawable/bg_layout.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_20.xml b/app/src/main/res/drawable/bg_layout_radius_20.xml
deleted file mode 100644
index 0c2abfe..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainBackColor" />
-
-    <corners
-        android:topLeftRadius="@dimen/dp_20"
-        android:topRightRadius="@dimen/dp_20" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_5.xml b/app/src/main/res/drawable/bg_layout_radius_5.xml
deleted file mode 100644
index 5a90f4e..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_5.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="5dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
deleted file mode 100644
index bca9c08..0000000
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <size android:height="155dp" />
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_3" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
deleted file mode 100644
index 15e6a4b..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/transparentBlack" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_color.xml b/app/src/main/res/drawable/bg_solid_layout_main_color.xml
deleted file mode 100644
index e329b7d..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_main_color.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainThemeColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
new file mode 100644
index 0000000..e329b7d
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_5" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
new file mode 100644
index 0000000..15e6a4b
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/transparentBlack" />
+
+    <corners android:radius="@dimen/dp_10" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
new file mode 100644
index 0000000..5a90f4e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners android:radius="5dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
new file mode 100644
index 0000000..0c2abfe
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainBackColor" />
+
+    <corners
+        android:topLeftRadius="@dimen/dp_20"
+        android:topRightRadius="@dimen/dp_20" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
new file mode 100644
index 0000000..bca9c08
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <size android:height="155dp" />
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_3" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_order_completed_detail.xml b/app/src/main/res/layout/activity_order_completed_detail.xml
index 4333635..f2f88f4 100644
--- a/app/src/main/res/layout/activity_order_completed_detail.xml
+++ b/app/src/main/res/layout/activity_order_completed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml
index e406795..0e59210 100644
--- a/app/src/main/res/layout/activity_order_in_handle_detail.xml
+++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -123,7 +123,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:inputType="textMultiLine"
                     android:padding="@dimen/dp_3"
@@ -149,7 +149,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
index cac4f32..4a02759 100644
--- a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -48,7 +48,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:hint="请输入现场情况"
                     android:inputType="textMultiLine"
@@ -112,7 +112,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_not_processed_detail.xml b/app/src/main/res/layout/activity_order_not_processed_detail.xml
index 5db1395..b68ae42 100644
--- a/app/src/main/res/layout/activity_order_not_processed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_processed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml
index 858051d..99b8b40 100644
--- a/app/src/main/res/layout/activity_order_search.xml
+++ b/app/src/main/res/layout/activity_order_search.xml
@@ -19,7 +19,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/dp_10"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <LinearLayout
diff --git a/app/src/main/res/layout/activity_user_detail.xml b/app/src/main/res/layout/activity_user_detail.xml
index c7be5d1..1464e4d 100644
--- a/app/src/main/res/layout/activity_user_detail.xml
+++ b/app/src/main/res/layout/activity_user_detail.xml
@@ -16,7 +16,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <RelativeLayout
diff --git a/app/src/main/res/layout/activity_well_detail.xml b/app/src/main/res/layout/activity_well_detail.xml
index 46dee2d..59c2bb4 100644
--- a/app/src/main/res/layout/activity_well_detail.xml
+++ b/app/src/main/res/layout/activity_well_detail.xml
@@ -23,7 +23,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -160,7 +160,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
diff --git a/app/src/main/res/layout/dialog_bottom_sheet.xml b/app/src/main/res/layout/dialog_bottom_sheet.xml
index b88bd9d..bb7acf2 100644
--- a/app/src/main/res/layout/dialog_bottom_sheet.xml
+++ b/app/src/main/res/layout/dialog_bottom_sheet.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
     android:padding="@dimen/dp_10">
 
diff --git a/app/src/main/res/layout/dialog_single_choice.xml b/app/src/main/res/layout/dialog_single_choice.xml
index 2559b8d..2c92ace 100644
--- a/app/src/main/res/layout/dialog_single_choice.xml
+++ b/app/src/main/res/layout/dialog_single_choice.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical">
 
     <RelativeLayout
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 4f02f1f..30e607e 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -44,7 +44,7 @@
             android:id="@+id/bottomBehaviorLayout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@drawable/bg_layout_radius_20"
+            android:background="@drawable/bg_solid_layout_white_radius_top_20"
             android:orientation="vertical"
             app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
@@ -64,7 +64,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
-                android:background="@drawable/bg_layout">
+                android:background="@drawable/bg_solid_layout_white_radius_10">
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/homeRecyclerView"
@@ -77,7 +77,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
@@ -142,7 +142,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index 9cb9a90..8ede317 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -30,7 +30,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp_20"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <RelativeLayout

diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
deleted file mode 100644
index f00d59c..0000000
--- a/app/src/main/res/drawable/bg_layout.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_20.xml b/app/src/main/res/drawable/bg_layout_radius_20.xml
deleted file mode 100644
index 0c2abfe..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainBackColor" />
-
-    <corners
-        android:topLeftRadius="@dimen/dp_20"
-        android:topRightRadius="@dimen/dp_20" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_5.xml b/app/src/main/res/drawable/bg_layout_radius_5.xml
deleted file mode 100644
index 5a90f4e..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_5.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="5dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
deleted file mode 100644
index bca9c08..0000000
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <size android:height="155dp" />
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_3" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
deleted file mode 100644
index 15e6a4b..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/transparentBlack" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_color.xml b/app/src/main/res/drawable/bg_solid_layout_main_color.xml
deleted file mode 100644
index e329b7d..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_main_color.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainThemeColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
new file mode 100644
index 0000000..e329b7d
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_5" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
new file mode 100644
index 0000000..15e6a4b
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/transparentBlack" />
+
+    <corners android:radius="@dimen/dp_10" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
new file mode 100644
index 0000000..5a90f4e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners android:radius="5dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
new file mode 100644
index 0000000..0c2abfe
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainBackColor" />
+
+    <corners
+        android:topLeftRadius="@dimen/dp_20"
+        android:topRightRadius="@dimen/dp_20" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
new file mode 100644
index 0000000..bca9c08
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <size android:height="155dp" />
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_3" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_order_completed_detail.xml b/app/src/main/res/layout/activity_order_completed_detail.xml
index 4333635..f2f88f4 100644
--- a/app/src/main/res/layout/activity_order_completed_detail.xml
+++ b/app/src/main/res/layout/activity_order_completed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml
index e406795..0e59210 100644
--- a/app/src/main/res/layout/activity_order_in_handle_detail.xml
+++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -123,7 +123,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:inputType="textMultiLine"
                     android:padding="@dimen/dp_3"
@@ -149,7 +149,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
index cac4f32..4a02759 100644
--- a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -48,7 +48,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:hint="请输入现场情况"
                     android:inputType="textMultiLine"
@@ -112,7 +112,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_not_processed_detail.xml b/app/src/main/res/layout/activity_order_not_processed_detail.xml
index 5db1395..b68ae42 100644
--- a/app/src/main/res/layout/activity_order_not_processed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_processed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml
index 858051d..99b8b40 100644
--- a/app/src/main/res/layout/activity_order_search.xml
+++ b/app/src/main/res/layout/activity_order_search.xml
@@ -19,7 +19,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/dp_10"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <LinearLayout
diff --git a/app/src/main/res/layout/activity_user_detail.xml b/app/src/main/res/layout/activity_user_detail.xml
index c7be5d1..1464e4d 100644
--- a/app/src/main/res/layout/activity_user_detail.xml
+++ b/app/src/main/res/layout/activity_user_detail.xml
@@ -16,7 +16,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <RelativeLayout
diff --git a/app/src/main/res/layout/activity_well_detail.xml b/app/src/main/res/layout/activity_well_detail.xml
index 46dee2d..59c2bb4 100644
--- a/app/src/main/res/layout/activity_well_detail.xml
+++ b/app/src/main/res/layout/activity_well_detail.xml
@@ -23,7 +23,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -160,7 +160,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
diff --git a/app/src/main/res/layout/dialog_bottom_sheet.xml b/app/src/main/res/layout/dialog_bottom_sheet.xml
index b88bd9d..bb7acf2 100644
--- a/app/src/main/res/layout/dialog_bottom_sheet.xml
+++ b/app/src/main/res/layout/dialog_bottom_sheet.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
     android:padding="@dimen/dp_10">
 
diff --git a/app/src/main/res/layout/dialog_single_choice.xml b/app/src/main/res/layout/dialog_single_choice.xml
index 2559b8d..2c92ace 100644
--- a/app/src/main/res/layout/dialog_single_choice.xml
+++ b/app/src/main/res/layout/dialog_single_choice.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical">
 
     <RelativeLayout
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 4f02f1f..30e607e 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -44,7 +44,7 @@
             android:id="@+id/bottomBehaviorLayout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@drawable/bg_layout_radius_20"
+            android:background="@drawable/bg_solid_layout_white_radius_top_20"
             android:orientation="vertical"
             app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
@@ -64,7 +64,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
-                android:background="@drawable/bg_layout">
+                android:background="@drawable/bg_solid_layout_white_radius_10">
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/homeRecyclerView"
@@ -77,7 +77,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
@@ -142,7 +142,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index 9cb9a90..8ede317 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -30,7 +30,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp_20"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <RelativeLayout
diff --git a/app/src/main/res/layout/include_base_order_detail.xml b/app/src/main/res/layout/include_base_order_detail.xml
index 5c2c11a..d84aec4 100644
--- a/app/src/main/res/layout/include_base_order_detail.xml
+++ b/app/src/main/res/layout/include_base_order_detail.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical">
 
     <RelativeLayout style="@style/itemLayoutStyle">

diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
deleted file mode 100644
index f00d59c..0000000
--- a/app/src/main/res/drawable/bg_layout.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_20.xml b/app/src/main/res/drawable/bg_layout_radius_20.xml
deleted file mode 100644
index 0c2abfe..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainBackColor" />
-
-    <corners
-        android:topLeftRadius="@dimen/dp_20"
-        android:topRightRadius="@dimen/dp_20" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_5.xml b/app/src/main/res/drawable/bg_layout_radius_5.xml
deleted file mode 100644
index 5a90f4e..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_5.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="5dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
deleted file mode 100644
index bca9c08..0000000
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <size android:height="155dp" />
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_3" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
deleted file mode 100644
index 15e6a4b..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/transparentBlack" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_color.xml b/app/src/main/res/drawable/bg_solid_layout_main_color.xml
deleted file mode 100644
index e329b7d..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_main_color.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainThemeColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
new file mode 100644
index 0000000..e329b7d
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_5" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
new file mode 100644
index 0000000..15e6a4b
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/transparentBlack" />
+
+    <corners android:radius="@dimen/dp_10" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
new file mode 100644
index 0000000..5a90f4e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners android:radius="5dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
new file mode 100644
index 0000000..0c2abfe
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainBackColor" />
+
+    <corners
+        android:topLeftRadius="@dimen/dp_20"
+        android:topRightRadius="@dimen/dp_20" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
new file mode 100644
index 0000000..bca9c08
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <size android:height="155dp" />
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_3" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_order_completed_detail.xml b/app/src/main/res/layout/activity_order_completed_detail.xml
index 4333635..f2f88f4 100644
--- a/app/src/main/res/layout/activity_order_completed_detail.xml
+++ b/app/src/main/res/layout/activity_order_completed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml
index e406795..0e59210 100644
--- a/app/src/main/res/layout/activity_order_in_handle_detail.xml
+++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -123,7 +123,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:inputType="textMultiLine"
                     android:padding="@dimen/dp_3"
@@ -149,7 +149,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
index cac4f32..4a02759 100644
--- a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -48,7 +48,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:hint="请输入现场情况"
                     android:inputType="textMultiLine"
@@ -112,7 +112,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_not_processed_detail.xml b/app/src/main/res/layout/activity_order_not_processed_detail.xml
index 5db1395..b68ae42 100644
--- a/app/src/main/res/layout/activity_order_not_processed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_processed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml
index 858051d..99b8b40 100644
--- a/app/src/main/res/layout/activity_order_search.xml
+++ b/app/src/main/res/layout/activity_order_search.xml
@@ -19,7 +19,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/dp_10"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <LinearLayout
diff --git a/app/src/main/res/layout/activity_user_detail.xml b/app/src/main/res/layout/activity_user_detail.xml
index c7be5d1..1464e4d 100644
--- a/app/src/main/res/layout/activity_user_detail.xml
+++ b/app/src/main/res/layout/activity_user_detail.xml
@@ -16,7 +16,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <RelativeLayout
diff --git a/app/src/main/res/layout/activity_well_detail.xml b/app/src/main/res/layout/activity_well_detail.xml
index 46dee2d..59c2bb4 100644
--- a/app/src/main/res/layout/activity_well_detail.xml
+++ b/app/src/main/res/layout/activity_well_detail.xml
@@ -23,7 +23,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -160,7 +160,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
diff --git a/app/src/main/res/layout/dialog_bottom_sheet.xml b/app/src/main/res/layout/dialog_bottom_sheet.xml
index b88bd9d..bb7acf2 100644
--- a/app/src/main/res/layout/dialog_bottom_sheet.xml
+++ b/app/src/main/res/layout/dialog_bottom_sheet.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
     android:padding="@dimen/dp_10">
 
diff --git a/app/src/main/res/layout/dialog_single_choice.xml b/app/src/main/res/layout/dialog_single_choice.xml
index 2559b8d..2c92ace 100644
--- a/app/src/main/res/layout/dialog_single_choice.xml
+++ b/app/src/main/res/layout/dialog_single_choice.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical">
 
     <RelativeLayout
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 4f02f1f..30e607e 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -44,7 +44,7 @@
             android:id="@+id/bottomBehaviorLayout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@drawable/bg_layout_radius_20"
+            android:background="@drawable/bg_solid_layout_white_radius_top_20"
             android:orientation="vertical"
             app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
@@ -64,7 +64,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
-                android:background="@drawable/bg_layout">
+                android:background="@drawable/bg_solid_layout_white_radius_10">
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/homeRecyclerView"
@@ -77,7 +77,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
@@ -142,7 +142,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index 9cb9a90..8ede317 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -30,7 +30,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp_20"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <RelativeLayout
diff --git a/app/src/main/res/layout/include_base_order_detail.xml b/app/src/main/res/layout/include_base_order_detail.xml
index 5c2c11a..d84aec4 100644
--- a/app/src/main/res/layout/include_base_order_detail.xml
+++ b/app/src/main/res/layout/include_base_order_detail.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical">
 
     <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/include_search_bar.xml b/app/src/main/res/layout/include_search_bar.xml
index 968f77b..64a106f 100644
--- a/app/src/main/res/layout/include_search_bar.xml
+++ b/app/src/main/res/layout/include_search_bar.xml
@@ -36,7 +36,7 @@
         android:layout_marginVertical="7dp"
         android:layout_marginEnd="@dimen/dp_10"
         android:layout_weight="3"
-        android:background="@drawable/bg_layout_radius_5">
+        android:background="@drawable/bg_solid_layout_white_radius_5">
 
         <ImageView
             android:id="@+id/searchImageView"

diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
deleted file mode 100644
index f00d59c..0000000
--- a/app/src/main/res/drawable/bg_layout.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_20.xml b/app/src/main/res/drawable/bg_layout_radius_20.xml
deleted file mode 100644
index 0c2abfe..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainBackColor" />
-
-    <corners
-        android:topLeftRadius="@dimen/dp_20"
-        android:topRightRadius="@dimen/dp_20" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_5.xml b/app/src/main/res/drawable/bg_layout_radius_5.xml
deleted file mode 100644
index 5a90f4e..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_5.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="5dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
deleted file mode 100644
index bca9c08..0000000
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <size android:height="155dp" />
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_3" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
deleted file mode 100644
index 15e6a4b..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/transparentBlack" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_color.xml b/app/src/main/res/drawable/bg_solid_layout_main_color.xml
deleted file mode 100644
index e329b7d..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_main_color.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainThemeColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
new file mode 100644
index 0000000..e329b7d
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_5" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
new file mode 100644
index 0000000..15e6a4b
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/transparentBlack" />
+
+    <corners android:radius="@dimen/dp_10" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
new file mode 100644
index 0000000..5a90f4e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners android:radius="5dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
new file mode 100644
index 0000000..0c2abfe
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainBackColor" />
+
+    <corners
+        android:topLeftRadius="@dimen/dp_20"
+        android:topRightRadius="@dimen/dp_20" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
new file mode 100644
index 0000000..bca9c08
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <size android:height="155dp" />
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_3" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_order_completed_detail.xml b/app/src/main/res/layout/activity_order_completed_detail.xml
index 4333635..f2f88f4 100644
--- a/app/src/main/res/layout/activity_order_completed_detail.xml
+++ b/app/src/main/res/layout/activity_order_completed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml
index e406795..0e59210 100644
--- a/app/src/main/res/layout/activity_order_in_handle_detail.xml
+++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -123,7 +123,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:inputType="textMultiLine"
                     android:padding="@dimen/dp_3"
@@ -149,7 +149,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
index cac4f32..4a02759 100644
--- a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -48,7 +48,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:hint="请输入现场情况"
                     android:inputType="textMultiLine"
@@ -112,7 +112,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_not_processed_detail.xml b/app/src/main/res/layout/activity_order_not_processed_detail.xml
index 5db1395..b68ae42 100644
--- a/app/src/main/res/layout/activity_order_not_processed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_processed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml
index 858051d..99b8b40 100644
--- a/app/src/main/res/layout/activity_order_search.xml
+++ b/app/src/main/res/layout/activity_order_search.xml
@@ -19,7 +19,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/dp_10"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <LinearLayout
diff --git a/app/src/main/res/layout/activity_user_detail.xml b/app/src/main/res/layout/activity_user_detail.xml
index c7be5d1..1464e4d 100644
--- a/app/src/main/res/layout/activity_user_detail.xml
+++ b/app/src/main/res/layout/activity_user_detail.xml
@@ -16,7 +16,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <RelativeLayout
diff --git a/app/src/main/res/layout/activity_well_detail.xml b/app/src/main/res/layout/activity_well_detail.xml
index 46dee2d..59c2bb4 100644
--- a/app/src/main/res/layout/activity_well_detail.xml
+++ b/app/src/main/res/layout/activity_well_detail.xml
@@ -23,7 +23,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -160,7 +160,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
diff --git a/app/src/main/res/layout/dialog_bottom_sheet.xml b/app/src/main/res/layout/dialog_bottom_sheet.xml
index b88bd9d..bb7acf2 100644
--- a/app/src/main/res/layout/dialog_bottom_sheet.xml
+++ b/app/src/main/res/layout/dialog_bottom_sheet.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
     android:padding="@dimen/dp_10">
 
diff --git a/app/src/main/res/layout/dialog_single_choice.xml b/app/src/main/res/layout/dialog_single_choice.xml
index 2559b8d..2c92ace 100644
--- a/app/src/main/res/layout/dialog_single_choice.xml
+++ b/app/src/main/res/layout/dialog_single_choice.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical">
 
     <RelativeLayout
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 4f02f1f..30e607e 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -44,7 +44,7 @@
             android:id="@+id/bottomBehaviorLayout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@drawable/bg_layout_radius_20"
+            android:background="@drawable/bg_solid_layout_white_radius_top_20"
             android:orientation="vertical"
             app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
@@ -64,7 +64,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
-                android:background="@drawable/bg_layout">
+                android:background="@drawable/bg_solid_layout_white_radius_10">
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/homeRecyclerView"
@@ -77,7 +77,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
@@ -142,7 +142,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index 9cb9a90..8ede317 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -30,7 +30,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp_20"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <RelativeLayout
diff --git a/app/src/main/res/layout/include_base_order_detail.xml b/app/src/main/res/layout/include_base_order_detail.xml
index 5c2c11a..d84aec4 100644
--- a/app/src/main/res/layout/include_base_order_detail.xml
+++ b/app/src/main/res/layout/include_base_order_detail.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical">
 
     <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/include_search_bar.xml b/app/src/main/res/layout/include_search_bar.xml
index 968f77b..64a106f 100644
--- a/app/src/main/res/layout/include_search_bar.xml
+++ b/app/src/main/res/layout/include_search_bar.xml
@@ -36,7 +36,7 @@
         android:layout_marginVertical="7dp"
         android:layout_marginEnd="@dimen/dp_10"
         android:layout_weight="3"
-        android:background="@drawable/bg_layout_radius_5">
+        android:background="@drawable/bg_solid_layout_white_radius_5">
 
         <ImageView
             android:id="@+id/searchImageView"
diff --git a/app/src/main/res/layout/item_order_completed_recycleview.xml b/app/src/main/res/layout/item_order_completed_recycleview.xml
index f1b1a76..ed6910e 100644
--- a/app/src/main/res/layout/item_order_completed_recycleview.xml
+++ b/app/src/main/res/layout/item_order_completed_recycleview.xml
@@ -3,11 +3,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
-    android:padding="@dimen/dp_10">
+    android:padding="@dimen/dp_5">
 
     <RelativeLayout
         android:layout_width="match_parent"

diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
deleted file mode 100644
index f00d59c..0000000
--- a/app/src/main/res/drawable/bg_layout.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_20.xml b/app/src/main/res/drawable/bg_layout_radius_20.xml
deleted file mode 100644
index 0c2abfe..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainBackColor" />
-
-    <corners
-        android:topLeftRadius="@dimen/dp_20"
-        android:topRightRadius="@dimen/dp_20" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_5.xml b/app/src/main/res/drawable/bg_layout_radius_5.xml
deleted file mode 100644
index 5a90f4e..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_5.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="5dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
deleted file mode 100644
index bca9c08..0000000
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <size android:height="155dp" />
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_3" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
deleted file mode 100644
index 15e6a4b..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/transparentBlack" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_color.xml b/app/src/main/res/drawable/bg_solid_layout_main_color.xml
deleted file mode 100644
index e329b7d..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_main_color.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainThemeColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
new file mode 100644
index 0000000..e329b7d
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_5" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
new file mode 100644
index 0000000..15e6a4b
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/transparentBlack" />
+
+    <corners android:radius="@dimen/dp_10" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
new file mode 100644
index 0000000..5a90f4e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners android:radius="5dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
new file mode 100644
index 0000000..0c2abfe
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainBackColor" />
+
+    <corners
+        android:topLeftRadius="@dimen/dp_20"
+        android:topRightRadius="@dimen/dp_20" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
new file mode 100644
index 0000000..bca9c08
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <size android:height="155dp" />
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_3" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_order_completed_detail.xml b/app/src/main/res/layout/activity_order_completed_detail.xml
index 4333635..f2f88f4 100644
--- a/app/src/main/res/layout/activity_order_completed_detail.xml
+++ b/app/src/main/res/layout/activity_order_completed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml
index e406795..0e59210 100644
--- a/app/src/main/res/layout/activity_order_in_handle_detail.xml
+++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -123,7 +123,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:inputType="textMultiLine"
                     android:padding="@dimen/dp_3"
@@ -149,7 +149,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
index cac4f32..4a02759 100644
--- a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -48,7 +48,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:hint="请输入现场情况"
                     android:inputType="textMultiLine"
@@ -112,7 +112,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_not_processed_detail.xml b/app/src/main/res/layout/activity_order_not_processed_detail.xml
index 5db1395..b68ae42 100644
--- a/app/src/main/res/layout/activity_order_not_processed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_processed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml
index 858051d..99b8b40 100644
--- a/app/src/main/res/layout/activity_order_search.xml
+++ b/app/src/main/res/layout/activity_order_search.xml
@@ -19,7 +19,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/dp_10"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <LinearLayout
diff --git a/app/src/main/res/layout/activity_user_detail.xml b/app/src/main/res/layout/activity_user_detail.xml
index c7be5d1..1464e4d 100644
--- a/app/src/main/res/layout/activity_user_detail.xml
+++ b/app/src/main/res/layout/activity_user_detail.xml
@@ -16,7 +16,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <RelativeLayout
diff --git a/app/src/main/res/layout/activity_well_detail.xml b/app/src/main/res/layout/activity_well_detail.xml
index 46dee2d..59c2bb4 100644
--- a/app/src/main/res/layout/activity_well_detail.xml
+++ b/app/src/main/res/layout/activity_well_detail.xml
@@ -23,7 +23,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -160,7 +160,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
diff --git a/app/src/main/res/layout/dialog_bottom_sheet.xml b/app/src/main/res/layout/dialog_bottom_sheet.xml
index b88bd9d..bb7acf2 100644
--- a/app/src/main/res/layout/dialog_bottom_sheet.xml
+++ b/app/src/main/res/layout/dialog_bottom_sheet.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
     android:padding="@dimen/dp_10">
 
diff --git a/app/src/main/res/layout/dialog_single_choice.xml b/app/src/main/res/layout/dialog_single_choice.xml
index 2559b8d..2c92ace 100644
--- a/app/src/main/res/layout/dialog_single_choice.xml
+++ b/app/src/main/res/layout/dialog_single_choice.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical">
 
     <RelativeLayout
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 4f02f1f..30e607e 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -44,7 +44,7 @@
             android:id="@+id/bottomBehaviorLayout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@drawable/bg_layout_radius_20"
+            android:background="@drawable/bg_solid_layout_white_radius_top_20"
             android:orientation="vertical"
             app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
@@ -64,7 +64,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
-                android:background="@drawable/bg_layout">
+                android:background="@drawable/bg_solid_layout_white_radius_10">
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/homeRecyclerView"
@@ -77,7 +77,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
@@ -142,7 +142,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index 9cb9a90..8ede317 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -30,7 +30,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp_20"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <RelativeLayout
diff --git a/app/src/main/res/layout/include_base_order_detail.xml b/app/src/main/res/layout/include_base_order_detail.xml
index 5c2c11a..d84aec4 100644
--- a/app/src/main/res/layout/include_base_order_detail.xml
+++ b/app/src/main/res/layout/include_base_order_detail.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical">
 
     <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/include_search_bar.xml b/app/src/main/res/layout/include_search_bar.xml
index 968f77b..64a106f 100644
--- a/app/src/main/res/layout/include_search_bar.xml
+++ b/app/src/main/res/layout/include_search_bar.xml
@@ -36,7 +36,7 @@
         android:layout_marginVertical="7dp"
         android:layout_marginEnd="@dimen/dp_10"
         android:layout_weight="3"
-        android:background="@drawable/bg_layout_radius_5">
+        android:background="@drawable/bg_solid_layout_white_radius_5">
 
         <ImageView
             android:id="@+id/searchImageView"
diff --git a/app/src/main/res/layout/item_order_completed_recycleview.xml b/app/src/main/res/layout/item_order_completed_recycleview.xml
index f1b1a76..ed6910e 100644
--- a/app/src/main/res/layout/item_order_completed_recycleview.xml
+++ b/app/src/main/res/layout/item_order_completed_recycleview.xml
@@ -3,11 +3,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
-    android:padding="@dimen/dp_10">
+    android:padding="@dimen/dp_5">
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_order_in_handle_recycleview.xml b/app/src/main/res/layout/item_order_in_handle_recycleview.xml
index f1b1a76..ed6910e 100644
--- a/app/src/main/res/layout/item_order_in_handle_recycleview.xml
+++ b/app/src/main/res/layout/item_order_in_handle_recycleview.xml
@@ -3,11 +3,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
-    android:padding="@dimen/dp_10">
+    android:padding="@dimen/dp_5">
 
     <RelativeLayout
         android:layout_width="match_parent"

diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
deleted file mode 100644
index f00d59c..0000000
--- a/app/src/main/res/drawable/bg_layout.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_20.xml b/app/src/main/res/drawable/bg_layout_radius_20.xml
deleted file mode 100644
index 0c2abfe..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainBackColor" />
-
-    <corners
-        android:topLeftRadius="@dimen/dp_20"
-        android:topRightRadius="@dimen/dp_20" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_5.xml b/app/src/main/res/drawable/bg_layout_radius_5.xml
deleted file mode 100644
index 5a90f4e..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_5.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="5dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
deleted file mode 100644
index bca9c08..0000000
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <size android:height="155dp" />
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_3" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
deleted file mode 100644
index 15e6a4b..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/transparentBlack" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_color.xml b/app/src/main/res/drawable/bg_solid_layout_main_color.xml
deleted file mode 100644
index e329b7d..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_main_color.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainThemeColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
new file mode 100644
index 0000000..e329b7d
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_5" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
new file mode 100644
index 0000000..15e6a4b
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/transparentBlack" />
+
+    <corners android:radius="@dimen/dp_10" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
new file mode 100644
index 0000000..5a90f4e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners android:radius="5dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
new file mode 100644
index 0000000..0c2abfe
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainBackColor" />
+
+    <corners
+        android:topLeftRadius="@dimen/dp_20"
+        android:topRightRadius="@dimen/dp_20" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
new file mode 100644
index 0000000..bca9c08
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <size android:height="155dp" />
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_3" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_order_completed_detail.xml b/app/src/main/res/layout/activity_order_completed_detail.xml
index 4333635..f2f88f4 100644
--- a/app/src/main/res/layout/activity_order_completed_detail.xml
+++ b/app/src/main/res/layout/activity_order_completed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml
index e406795..0e59210 100644
--- a/app/src/main/res/layout/activity_order_in_handle_detail.xml
+++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -123,7 +123,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:inputType="textMultiLine"
                     android:padding="@dimen/dp_3"
@@ -149,7 +149,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
index cac4f32..4a02759 100644
--- a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -48,7 +48,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:hint="请输入现场情况"
                     android:inputType="textMultiLine"
@@ -112,7 +112,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_not_processed_detail.xml b/app/src/main/res/layout/activity_order_not_processed_detail.xml
index 5db1395..b68ae42 100644
--- a/app/src/main/res/layout/activity_order_not_processed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_processed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml
index 858051d..99b8b40 100644
--- a/app/src/main/res/layout/activity_order_search.xml
+++ b/app/src/main/res/layout/activity_order_search.xml
@@ -19,7 +19,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/dp_10"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <LinearLayout
diff --git a/app/src/main/res/layout/activity_user_detail.xml b/app/src/main/res/layout/activity_user_detail.xml
index c7be5d1..1464e4d 100644
--- a/app/src/main/res/layout/activity_user_detail.xml
+++ b/app/src/main/res/layout/activity_user_detail.xml
@@ -16,7 +16,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <RelativeLayout
diff --git a/app/src/main/res/layout/activity_well_detail.xml b/app/src/main/res/layout/activity_well_detail.xml
index 46dee2d..59c2bb4 100644
--- a/app/src/main/res/layout/activity_well_detail.xml
+++ b/app/src/main/res/layout/activity_well_detail.xml
@@ -23,7 +23,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -160,7 +160,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
diff --git a/app/src/main/res/layout/dialog_bottom_sheet.xml b/app/src/main/res/layout/dialog_bottom_sheet.xml
index b88bd9d..bb7acf2 100644
--- a/app/src/main/res/layout/dialog_bottom_sheet.xml
+++ b/app/src/main/res/layout/dialog_bottom_sheet.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
     android:padding="@dimen/dp_10">
 
diff --git a/app/src/main/res/layout/dialog_single_choice.xml b/app/src/main/res/layout/dialog_single_choice.xml
index 2559b8d..2c92ace 100644
--- a/app/src/main/res/layout/dialog_single_choice.xml
+++ b/app/src/main/res/layout/dialog_single_choice.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical">
 
     <RelativeLayout
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 4f02f1f..30e607e 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -44,7 +44,7 @@
             android:id="@+id/bottomBehaviorLayout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@drawable/bg_layout_radius_20"
+            android:background="@drawable/bg_solid_layout_white_radius_top_20"
             android:orientation="vertical"
             app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
@@ -64,7 +64,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
-                android:background="@drawable/bg_layout">
+                android:background="@drawable/bg_solid_layout_white_radius_10">
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/homeRecyclerView"
@@ -77,7 +77,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
@@ -142,7 +142,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index 9cb9a90..8ede317 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -30,7 +30,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp_20"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <RelativeLayout
diff --git a/app/src/main/res/layout/include_base_order_detail.xml b/app/src/main/res/layout/include_base_order_detail.xml
index 5c2c11a..d84aec4 100644
--- a/app/src/main/res/layout/include_base_order_detail.xml
+++ b/app/src/main/res/layout/include_base_order_detail.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical">
 
     <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/include_search_bar.xml b/app/src/main/res/layout/include_search_bar.xml
index 968f77b..64a106f 100644
--- a/app/src/main/res/layout/include_search_bar.xml
+++ b/app/src/main/res/layout/include_search_bar.xml
@@ -36,7 +36,7 @@
         android:layout_marginVertical="7dp"
         android:layout_marginEnd="@dimen/dp_10"
         android:layout_weight="3"
-        android:background="@drawable/bg_layout_radius_5">
+        android:background="@drawable/bg_solid_layout_white_radius_5">
 
         <ImageView
             android:id="@+id/searchImageView"
diff --git a/app/src/main/res/layout/item_order_completed_recycleview.xml b/app/src/main/res/layout/item_order_completed_recycleview.xml
index f1b1a76..ed6910e 100644
--- a/app/src/main/res/layout/item_order_completed_recycleview.xml
+++ b/app/src/main/res/layout/item_order_completed_recycleview.xml
@@ -3,11 +3,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
-    android:padding="@dimen/dp_10">
+    android:padding="@dimen/dp_5">
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_order_in_handle_recycleview.xml b/app/src/main/res/layout/item_order_in_handle_recycleview.xml
index f1b1a76..ed6910e 100644
--- a/app/src/main/res/layout/item_order_in_handle_recycleview.xml
+++ b/app/src/main/res/layout/item_order_in_handle_recycleview.xml
@@ -3,11 +3,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
-    android:padding="@dimen/dp_10">
+    android:padding="@dimen/dp_5">
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml b/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml
index 8c86055..05ff231 100644
--- a/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml
+++ b/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml
@@ -2,11 +2,11 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
-    android:padding="@dimen/dp_10">
+    android:padding="@dimen/dp_5">
 
     <RelativeLayout
         android:layout_width="match_parent"

diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
deleted file mode 100644
index f00d59c..0000000
--- a/app/src/main/res/drawable/bg_layout.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_20.xml b/app/src/main/res/drawable/bg_layout_radius_20.xml
deleted file mode 100644
index 0c2abfe..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainBackColor" />
-
-    <corners
-        android:topLeftRadius="@dimen/dp_20"
-        android:topRightRadius="@dimen/dp_20" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_5.xml b/app/src/main/res/drawable/bg_layout_radius_5.xml
deleted file mode 100644
index 5a90f4e..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_5.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="5dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
deleted file mode 100644
index bca9c08..0000000
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <size android:height="155dp" />
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_3" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
deleted file mode 100644
index 15e6a4b..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/transparentBlack" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_color.xml b/app/src/main/res/drawable/bg_solid_layout_main_color.xml
deleted file mode 100644
index e329b7d..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_main_color.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainThemeColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
new file mode 100644
index 0000000..e329b7d
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_5" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
new file mode 100644
index 0000000..15e6a4b
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/transparentBlack" />
+
+    <corners android:radius="@dimen/dp_10" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
new file mode 100644
index 0000000..5a90f4e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners android:radius="5dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
new file mode 100644
index 0000000..0c2abfe
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainBackColor" />
+
+    <corners
+        android:topLeftRadius="@dimen/dp_20"
+        android:topRightRadius="@dimen/dp_20" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
new file mode 100644
index 0000000..bca9c08
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <size android:height="155dp" />
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_3" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_order_completed_detail.xml b/app/src/main/res/layout/activity_order_completed_detail.xml
index 4333635..f2f88f4 100644
--- a/app/src/main/res/layout/activity_order_completed_detail.xml
+++ b/app/src/main/res/layout/activity_order_completed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml
index e406795..0e59210 100644
--- a/app/src/main/res/layout/activity_order_in_handle_detail.xml
+++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -123,7 +123,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:inputType="textMultiLine"
                     android:padding="@dimen/dp_3"
@@ -149,7 +149,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
index cac4f32..4a02759 100644
--- a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -48,7 +48,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:hint="请输入现场情况"
                     android:inputType="textMultiLine"
@@ -112,7 +112,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_not_processed_detail.xml b/app/src/main/res/layout/activity_order_not_processed_detail.xml
index 5db1395..b68ae42 100644
--- a/app/src/main/res/layout/activity_order_not_processed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_processed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml
index 858051d..99b8b40 100644
--- a/app/src/main/res/layout/activity_order_search.xml
+++ b/app/src/main/res/layout/activity_order_search.xml
@@ -19,7 +19,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/dp_10"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <LinearLayout
diff --git a/app/src/main/res/layout/activity_user_detail.xml b/app/src/main/res/layout/activity_user_detail.xml
index c7be5d1..1464e4d 100644
--- a/app/src/main/res/layout/activity_user_detail.xml
+++ b/app/src/main/res/layout/activity_user_detail.xml
@@ -16,7 +16,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <RelativeLayout
diff --git a/app/src/main/res/layout/activity_well_detail.xml b/app/src/main/res/layout/activity_well_detail.xml
index 46dee2d..59c2bb4 100644
--- a/app/src/main/res/layout/activity_well_detail.xml
+++ b/app/src/main/res/layout/activity_well_detail.xml
@@ -23,7 +23,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -160,7 +160,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
diff --git a/app/src/main/res/layout/dialog_bottom_sheet.xml b/app/src/main/res/layout/dialog_bottom_sheet.xml
index b88bd9d..bb7acf2 100644
--- a/app/src/main/res/layout/dialog_bottom_sheet.xml
+++ b/app/src/main/res/layout/dialog_bottom_sheet.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
     android:padding="@dimen/dp_10">
 
diff --git a/app/src/main/res/layout/dialog_single_choice.xml b/app/src/main/res/layout/dialog_single_choice.xml
index 2559b8d..2c92ace 100644
--- a/app/src/main/res/layout/dialog_single_choice.xml
+++ b/app/src/main/res/layout/dialog_single_choice.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical">
 
     <RelativeLayout
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 4f02f1f..30e607e 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -44,7 +44,7 @@
             android:id="@+id/bottomBehaviorLayout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@drawable/bg_layout_radius_20"
+            android:background="@drawable/bg_solid_layout_white_radius_top_20"
             android:orientation="vertical"
             app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
@@ -64,7 +64,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
-                android:background="@drawable/bg_layout">
+                android:background="@drawable/bg_solid_layout_white_radius_10">
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/homeRecyclerView"
@@ -77,7 +77,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
@@ -142,7 +142,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index 9cb9a90..8ede317 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -30,7 +30,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp_20"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <RelativeLayout
diff --git a/app/src/main/res/layout/include_base_order_detail.xml b/app/src/main/res/layout/include_base_order_detail.xml
index 5c2c11a..d84aec4 100644
--- a/app/src/main/res/layout/include_base_order_detail.xml
+++ b/app/src/main/res/layout/include_base_order_detail.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical">
 
     <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/include_search_bar.xml b/app/src/main/res/layout/include_search_bar.xml
index 968f77b..64a106f 100644
--- a/app/src/main/res/layout/include_search_bar.xml
+++ b/app/src/main/res/layout/include_search_bar.xml
@@ -36,7 +36,7 @@
         android:layout_marginVertical="7dp"
         android:layout_marginEnd="@dimen/dp_10"
         android:layout_weight="3"
-        android:background="@drawable/bg_layout_radius_5">
+        android:background="@drawable/bg_solid_layout_white_radius_5">
 
         <ImageView
             android:id="@+id/searchImageView"
diff --git a/app/src/main/res/layout/item_order_completed_recycleview.xml b/app/src/main/res/layout/item_order_completed_recycleview.xml
index f1b1a76..ed6910e 100644
--- a/app/src/main/res/layout/item_order_completed_recycleview.xml
+++ b/app/src/main/res/layout/item_order_completed_recycleview.xml
@@ -3,11 +3,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
-    android:padding="@dimen/dp_10">
+    android:padding="@dimen/dp_5">
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_order_in_handle_recycleview.xml b/app/src/main/res/layout/item_order_in_handle_recycleview.xml
index f1b1a76..ed6910e 100644
--- a/app/src/main/res/layout/item_order_in_handle_recycleview.xml
+++ b/app/src/main/res/layout/item_order_in_handle_recycleview.xml
@@ -3,11 +3,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
-    android:padding="@dimen/dp_10">
+    android:padding="@dimen/dp_5">
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml b/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml
index 8c86055..05ff231 100644
--- a/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml
+++ b/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml
@@ -2,11 +2,11 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
-    android:padding="@dimen/dp_10">
+    android:padding="@dimen/dp_5">
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_order_not_processed_recycleview.xml b/app/src/main/res/layout/item_order_not_processed_recycleview.xml
index fcb0402..d9153c7 100644
--- a/app/src/main/res/layout/item_order_not_processed_recycleview.xml
+++ b/app/src/main/res/layout/item_order_not_processed_recycleview.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
-    android:padding="@dimen/dp_10">
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
 
     <LinearLayout
-        android:id="@+id/tempLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
@@ -33,43 +33,50 @@
             android:textColor="@color/subTextColor" />
     </LinearLayout>
 
-    <TextView
-        android:id="@+id/wellCodeView"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/tempLayout"
-        android:layout_marginTop="@dimen/dp_5"
-        android:text="@string/app_name"
-        android:textColor="@color/subTextColor" />
+        android:layout_marginVertical="@dimen/dp_5">
 
-    <TextView
-        android:id="@+id/alarmValueView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/tempLayout"
-        android:layout_alignParentEnd="true"
-        android:layout_marginTop="@dimen/dp_5"
-        android:text="5.5"
-        android:textColor="@color/redTextColor" />
+        <TextView
+            android:id="@+id/wellCodeView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/dp_5"
+            android:layout_weight="1"
+            android:text="@string/app_name"
+            android:textColor="@color/subTextColor" />
 
-    <TextView
-        android:id="@+id/wellLocationView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/wellCodeView"
-        android:layout_marginTop="@dimen/dp_5"
-        android:text="航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所"
-        android:textColor="@color/subTextColor" />
+        <TextView
+            android:id="@+id/alarmValueView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="5.5"
+            android:textColor="@color/redTextColor" />
+    </LinearLayout>
 
-    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-        android:id="@+id/operationButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/wellLocationView"
-        android:layout_alignParentEnd="true"
-        android:paddingHorizontal="@dimen/dp_10"
-        android:paddingVertical="@dimen/dp_3"
-        android:text="接单"
-        android:textColor="@color/mainThemeColor"
-        app:qmui_borderColor="@color/mainThemeColor" />
-</RelativeLayout>
\ No newline at end of file
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/wellLocationView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所"
+            android:textColor="@color/subTextColor" />
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+            android:id="@+id/operationButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="@dimen/dp_10"
+            android:paddingHorizontal="@dimen/dp_20"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="接单"
+            android:textColor="@color/mainThemeColor"
+            app:qmui_borderColor="@color/mainThemeColor" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file

diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
deleted file mode 100644
index f00d59c..0000000
--- a/app/src/main/res/drawable/bg_layout.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_20.xml b/app/src/main/res/drawable/bg_layout_radius_20.xml
deleted file mode 100644
index 0c2abfe..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainBackColor" />
-
-    <corners
-        android:topLeftRadius="@dimen/dp_20"
-        android:topRightRadius="@dimen/dp_20" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_5.xml b/app/src/main/res/drawable/bg_layout_radius_5.xml
deleted file mode 100644
index 5a90f4e..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_5.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="5dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
deleted file mode 100644
index bca9c08..0000000
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <size android:height="155dp" />
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_3" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
deleted file mode 100644
index 15e6a4b..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/transparentBlack" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_color.xml b/app/src/main/res/drawable/bg_solid_layout_main_color.xml
deleted file mode 100644
index e329b7d..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_main_color.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainThemeColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
new file mode 100644
index 0000000..e329b7d
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_5" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
new file mode 100644
index 0000000..15e6a4b
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/transparentBlack" />
+
+    <corners android:radius="@dimen/dp_10" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
new file mode 100644
index 0000000..5a90f4e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners android:radius="5dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
new file mode 100644
index 0000000..0c2abfe
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainBackColor" />
+
+    <corners
+        android:topLeftRadius="@dimen/dp_20"
+        android:topRightRadius="@dimen/dp_20" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
new file mode 100644
index 0000000..bca9c08
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <size android:height="155dp" />
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_3" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_order_completed_detail.xml b/app/src/main/res/layout/activity_order_completed_detail.xml
index 4333635..f2f88f4 100644
--- a/app/src/main/res/layout/activity_order_completed_detail.xml
+++ b/app/src/main/res/layout/activity_order_completed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml
index e406795..0e59210 100644
--- a/app/src/main/res/layout/activity_order_in_handle_detail.xml
+++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -123,7 +123,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:inputType="textMultiLine"
                     android:padding="@dimen/dp_3"
@@ -149,7 +149,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
index cac4f32..4a02759 100644
--- a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -48,7 +48,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:hint="请输入现场情况"
                     android:inputType="textMultiLine"
@@ -112,7 +112,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_not_processed_detail.xml b/app/src/main/res/layout/activity_order_not_processed_detail.xml
index 5db1395..b68ae42 100644
--- a/app/src/main/res/layout/activity_order_not_processed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_processed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml
index 858051d..99b8b40 100644
--- a/app/src/main/res/layout/activity_order_search.xml
+++ b/app/src/main/res/layout/activity_order_search.xml
@@ -19,7 +19,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/dp_10"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <LinearLayout
diff --git a/app/src/main/res/layout/activity_user_detail.xml b/app/src/main/res/layout/activity_user_detail.xml
index c7be5d1..1464e4d 100644
--- a/app/src/main/res/layout/activity_user_detail.xml
+++ b/app/src/main/res/layout/activity_user_detail.xml
@@ -16,7 +16,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <RelativeLayout
diff --git a/app/src/main/res/layout/activity_well_detail.xml b/app/src/main/res/layout/activity_well_detail.xml
index 46dee2d..59c2bb4 100644
--- a/app/src/main/res/layout/activity_well_detail.xml
+++ b/app/src/main/res/layout/activity_well_detail.xml
@@ -23,7 +23,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -160,7 +160,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
diff --git a/app/src/main/res/layout/dialog_bottom_sheet.xml b/app/src/main/res/layout/dialog_bottom_sheet.xml
index b88bd9d..bb7acf2 100644
--- a/app/src/main/res/layout/dialog_bottom_sheet.xml
+++ b/app/src/main/res/layout/dialog_bottom_sheet.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
     android:padding="@dimen/dp_10">
 
diff --git a/app/src/main/res/layout/dialog_single_choice.xml b/app/src/main/res/layout/dialog_single_choice.xml
index 2559b8d..2c92ace 100644
--- a/app/src/main/res/layout/dialog_single_choice.xml
+++ b/app/src/main/res/layout/dialog_single_choice.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical">
 
     <RelativeLayout
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 4f02f1f..30e607e 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -44,7 +44,7 @@
             android:id="@+id/bottomBehaviorLayout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@drawable/bg_layout_radius_20"
+            android:background="@drawable/bg_solid_layout_white_radius_top_20"
             android:orientation="vertical"
             app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
@@ -64,7 +64,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
-                android:background="@drawable/bg_layout">
+                android:background="@drawable/bg_solid_layout_white_radius_10">
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/homeRecyclerView"
@@ -77,7 +77,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
@@ -142,7 +142,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index 9cb9a90..8ede317 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -30,7 +30,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp_20"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <RelativeLayout
diff --git a/app/src/main/res/layout/include_base_order_detail.xml b/app/src/main/res/layout/include_base_order_detail.xml
index 5c2c11a..d84aec4 100644
--- a/app/src/main/res/layout/include_base_order_detail.xml
+++ b/app/src/main/res/layout/include_base_order_detail.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical">
 
     <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/include_search_bar.xml b/app/src/main/res/layout/include_search_bar.xml
index 968f77b..64a106f 100644
--- a/app/src/main/res/layout/include_search_bar.xml
+++ b/app/src/main/res/layout/include_search_bar.xml
@@ -36,7 +36,7 @@
         android:layout_marginVertical="7dp"
         android:layout_marginEnd="@dimen/dp_10"
         android:layout_weight="3"
-        android:background="@drawable/bg_layout_radius_5">
+        android:background="@drawable/bg_solid_layout_white_radius_5">
 
         <ImageView
             android:id="@+id/searchImageView"
diff --git a/app/src/main/res/layout/item_order_completed_recycleview.xml b/app/src/main/res/layout/item_order_completed_recycleview.xml
index f1b1a76..ed6910e 100644
--- a/app/src/main/res/layout/item_order_completed_recycleview.xml
+++ b/app/src/main/res/layout/item_order_completed_recycleview.xml
@@ -3,11 +3,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
-    android:padding="@dimen/dp_10">
+    android:padding="@dimen/dp_5">
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_order_in_handle_recycleview.xml b/app/src/main/res/layout/item_order_in_handle_recycleview.xml
index f1b1a76..ed6910e 100644
--- a/app/src/main/res/layout/item_order_in_handle_recycleview.xml
+++ b/app/src/main/res/layout/item_order_in_handle_recycleview.xml
@@ -3,11 +3,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
-    android:padding="@dimen/dp_10">
+    android:padding="@dimen/dp_5">
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml b/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml
index 8c86055..05ff231 100644
--- a/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml
+++ b/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml
@@ -2,11 +2,11 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
-    android:padding="@dimen/dp_10">
+    android:padding="@dimen/dp_5">
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_order_not_processed_recycleview.xml b/app/src/main/res/layout/item_order_not_processed_recycleview.xml
index fcb0402..d9153c7 100644
--- a/app/src/main/res/layout/item_order_not_processed_recycleview.xml
+++ b/app/src/main/res/layout/item_order_not_processed_recycleview.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
-    android:padding="@dimen/dp_10">
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
 
     <LinearLayout
-        android:id="@+id/tempLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
@@ -33,43 +33,50 @@
             android:textColor="@color/subTextColor" />
     </LinearLayout>
 
-    <TextView
-        android:id="@+id/wellCodeView"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/tempLayout"
-        android:layout_marginTop="@dimen/dp_5"
-        android:text="@string/app_name"
-        android:textColor="@color/subTextColor" />
+        android:layout_marginVertical="@dimen/dp_5">
 
-    <TextView
-        android:id="@+id/alarmValueView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/tempLayout"
-        android:layout_alignParentEnd="true"
-        android:layout_marginTop="@dimen/dp_5"
-        android:text="5.5"
-        android:textColor="@color/redTextColor" />
+        <TextView
+            android:id="@+id/wellCodeView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/dp_5"
+            android:layout_weight="1"
+            android:text="@string/app_name"
+            android:textColor="@color/subTextColor" />
 
-    <TextView
-        android:id="@+id/wellLocationView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/wellCodeView"
-        android:layout_marginTop="@dimen/dp_5"
-        android:text="航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所"
-        android:textColor="@color/subTextColor" />
+        <TextView
+            android:id="@+id/alarmValueView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="5.5"
+            android:textColor="@color/redTextColor" />
+    </LinearLayout>
 
-    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-        android:id="@+id/operationButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/wellLocationView"
-        android:layout_alignParentEnd="true"
-        android:paddingHorizontal="@dimen/dp_10"
-        android:paddingVertical="@dimen/dp_3"
-        android:text="接单"
-        android:textColor="@color/mainThemeColor"
-        app:qmui_borderColor="@color/mainThemeColor" />
-</RelativeLayout>
\ No newline at end of file
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/wellLocationView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所"
+            android:textColor="@color/subTextColor" />
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+            android:id="@+id/operationButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="@dimen/dp_10"
+            android:paddingHorizontal="@dimen/dp_20"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="接单"
+            android:textColor="@color/mainThemeColor"
+            app:qmui_borderColor="@color/mainThemeColor" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_search_result_recycleview.xml b/app/src/main/res/layout/item_search_result_recycleview.xml
index 5a560ae..2ff5fa4 100644
--- a/app/src/main/res/layout/item_search_result_recycleview.xml
+++ b/app/src/main/res/layout/item_search_result_recycleview.xml
@@ -3,11 +3,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
-    android:padding="@dimen/dp_10">
+    android:padding="@dimen/dp_5">
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -78,7 +78,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
-            android:paddingHorizontal="@dimen/dp_10"
+            android:paddingHorizontal="@dimen/dp_15"
             android:paddingVertical="@dimen/dp_3"
             android:text="接单"
             android:textColor="@color/mainThemeColor"

diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
deleted file mode 100644
index f00d59c..0000000
--- a/app/src/main/res/drawable/bg_layout.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_20.xml b/app/src/main/res/drawable/bg_layout_radius_20.xml
deleted file mode 100644
index 0c2abfe..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainBackColor" />
-
-    <corners
-        android:topLeftRadius="@dimen/dp_20"
-        android:topRightRadius="@dimen/dp_20" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_5.xml b/app/src/main/res/drawable/bg_layout_radius_5.xml
deleted file mode 100644
index 5a90f4e..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_5.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="5dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
deleted file mode 100644
index bca9c08..0000000
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <size android:height="155dp" />
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_3" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
deleted file mode 100644
index 15e6a4b..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/transparentBlack" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_color.xml b/app/src/main/res/drawable/bg_solid_layout_main_color.xml
deleted file mode 100644
index e329b7d..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_main_color.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainThemeColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
new file mode 100644
index 0000000..e329b7d
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_5" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
new file mode 100644
index 0000000..15e6a4b
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/transparentBlack" />
+
+    <corners android:radius="@dimen/dp_10" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
new file mode 100644
index 0000000..5a90f4e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners android:radius="5dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
new file mode 100644
index 0000000..0c2abfe
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainBackColor" />
+
+    <corners
+        android:topLeftRadius="@dimen/dp_20"
+        android:topRightRadius="@dimen/dp_20" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
new file mode 100644
index 0000000..bca9c08
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <size android:height="155dp" />
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_3" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_order_completed_detail.xml b/app/src/main/res/layout/activity_order_completed_detail.xml
index 4333635..f2f88f4 100644
--- a/app/src/main/res/layout/activity_order_completed_detail.xml
+++ b/app/src/main/res/layout/activity_order_completed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml
index e406795..0e59210 100644
--- a/app/src/main/res/layout/activity_order_in_handle_detail.xml
+++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -123,7 +123,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:inputType="textMultiLine"
                     android:padding="@dimen/dp_3"
@@ -149,7 +149,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
index cac4f32..4a02759 100644
--- a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -48,7 +48,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:hint="请输入现场情况"
                     android:inputType="textMultiLine"
@@ -112,7 +112,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_not_processed_detail.xml b/app/src/main/res/layout/activity_order_not_processed_detail.xml
index 5db1395..b68ae42 100644
--- a/app/src/main/res/layout/activity_order_not_processed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_processed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml
index 858051d..99b8b40 100644
--- a/app/src/main/res/layout/activity_order_search.xml
+++ b/app/src/main/res/layout/activity_order_search.xml
@@ -19,7 +19,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/dp_10"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <LinearLayout
diff --git a/app/src/main/res/layout/activity_user_detail.xml b/app/src/main/res/layout/activity_user_detail.xml
index c7be5d1..1464e4d 100644
--- a/app/src/main/res/layout/activity_user_detail.xml
+++ b/app/src/main/res/layout/activity_user_detail.xml
@@ -16,7 +16,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <RelativeLayout
diff --git a/app/src/main/res/layout/activity_well_detail.xml b/app/src/main/res/layout/activity_well_detail.xml
index 46dee2d..59c2bb4 100644
--- a/app/src/main/res/layout/activity_well_detail.xml
+++ b/app/src/main/res/layout/activity_well_detail.xml
@@ -23,7 +23,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -160,7 +160,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
diff --git a/app/src/main/res/layout/dialog_bottom_sheet.xml b/app/src/main/res/layout/dialog_bottom_sheet.xml
index b88bd9d..bb7acf2 100644
--- a/app/src/main/res/layout/dialog_bottom_sheet.xml
+++ b/app/src/main/res/layout/dialog_bottom_sheet.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
     android:padding="@dimen/dp_10">
 
diff --git a/app/src/main/res/layout/dialog_single_choice.xml b/app/src/main/res/layout/dialog_single_choice.xml
index 2559b8d..2c92ace 100644
--- a/app/src/main/res/layout/dialog_single_choice.xml
+++ b/app/src/main/res/layout/dialog_single_choice.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical">
 
     <RelativeLayout
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 4f02f1f..30e607e 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -44,7 +44,7 @@
             android:id="@+id/bottomBehaviorLayout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@drawable/bg_layout_radius_20"
+            android:background="@drawable/bg_solid_layout_white_radius_top_20"
             android:orientation="vertical"
             app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
@@ -64,7 +64,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
-                android:background="@drawable/bg_layout">
+                android:background="@drawable/bg_solid_layout_white_radius_10">
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/homeRecyclerView"
@@ -77,7 +77,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
@@ -142,7 +142,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index 9cb9a90..8ede317 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -30,7 +30,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp_20"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <RelativeLayout
diff --git a/app/src/main/res/layout/include_base_order_detail.xml b/app/src/main/res/layout/include_base_order_detail.xml
index 5c2c11a..d84aec4 100644
--- a/app/src/main/res/layout/include_base_order_detail.xml
+++ b/app/src/main/res/layout/include_base_order_detail.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical">
 
     <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/include_search_bar.xml b/app/src/main/res/layout/include_search_bar.xml
index 968f77b..64a106f 100644
--- a/app/src/main/res/layout/include_search_bar.xml
+++ b/app/src/main/res/layout/include_search_bar.xml
@@ -36,7 +36,7 @@
         android:layout_marginVertical="7dp"
         android:layout_marginEnd="@dimen/dp_10"
         android:layout_weight="3"
-        android:background="@drawable/bg_layout_radius_5">
+        android:background="@drawable/bg_solid_layout_white_radius_5">
 
         <ImageView
             android:id="@+id/searchImageView"
diff --git a/app/src/main/res/layout/item_order_completed_recycleview.xml b/app/src/main/res/layout/item_order_completed_recycleview.xml
index f1b1a76..ed6910e 100644
--- a/app/src/main/res/layout/item_order_completed_recycleview.xml
+++ b/app/src/main/res/layout/item_order_completed_recycleview.xml
@@ -3,11 +3,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
-    android:padding="@dimen/dp_10">
+    android:padding="@dimen/dp_5">
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_order_in_handle_recycleview.xml b/app/src/main/res/layout/item_order_in_handle_recycleview.xml
index f1b1a76..ed6910e 100644
--- a/app/src/main/res/layout/item_order_in_handle_recycleview.xml
+++ b/app/src/main/res/layout/item_order_in_handle_recycleview.xml
@@ -3,11 +3,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
-    android:padding="@dimen/dp_10">
+    android:padding="@dimen/dp_5">
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml b/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml
index 8c86055..05ff231 100644
--- a/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml
+++ b/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml
@@ -2,11 +2,11 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
-    android:padding="@dimen/dp_10">
+    android:padding="@dimen/dp_5">
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_order_not_processed_recycleview.xml b/app/src/main/res/layout/item_order_not_processed_recycleview.xml
index fcb0402..d9153c7 100644
--- a/app/src/main/res/layout/item_order_not_processed_recycleview.xml
+++ b/app/src/main/res/layout/item_order_not_processed_recycleview.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
-    android:padding="@dimen/dp_10">
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
 
     <LinearLayout
-        android:id="@+id/tempLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
@@ -33,43 +33,50 @@
             android:textColor="@color/subTextColor" />
     </LinearLayout>
 
-    <TextView
-        android:id="@+id/wellCodeView"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/tempLayout"
-        android:layout_marginTop="@dimen/dp_5"
-        android:text="@string/app_name"
-        android:textColor="@color/subTextColor" />
+        android:layout_marginVertical="@dimen/dp_5">
 
-    <TextView
-        android:id="@+id/alarmValueView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/tempLayout"
-        android:layout_alignParentEnd="true"
-        android:layout_marginTop="@dimen/dp_5"
-        android:text="5.5"
-        android:textColor="@color/redTextColor" />
+        <TextView
+            android:id="@+id/wellCodeView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/dp_5"
+            android:layout_weight="1"
+            android:text="@string/app_name"
+            android:textColor="@color/subTextColor" />
 
-    <TextView
-        android:id="@+id/wellLocationView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/wellCodeView"
-        android:layout_marginTop="@dimen/dp_5"
-        android:text="航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所"
-        android:textColor="@color/subTextColor" />
+        <TextView
+            android:id="@+id/alarmValueView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="5.5"
+            android:textColor="@color/redTextColor" />
+    </LinearLayout>
 
-    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-        android:id="@+id/operationButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/wellLocationView"
-        android:layout_alignParentEnd="true"
-        android:paddingHorizontal="@dimen/dp_10"
-        android:paddingVertical="@dimen/dp_3"
-        android:text="接单"
-        android:textColor="@color/mainThemeColor"
-        app:qmui_borderColor="@color/mainThemeColor" />
-</RelativeLayout>
\ No newline at end of file
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/wellLocationView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所"
+            android:textColor="@color/subTextColor" />
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+            android:id="@+id/operationButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="@dimen/dp_10"
+            android:paddingHorizontal="@dimen/dp_20"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="接单"
+            android:textColor="@color/mainThemeColor"
+            app:qmui_borderColor="@color/mainThemeColor" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_search_result_recycleview.xml b/app/src/main/res/layout/item_search_result_recycleview.xml
index 5a560ae..2ff5fa4 100644
--- a/app/src/main/res/layout/item_search_result_recycleview.xml
+++ b/app/src/main/res/layout/item_search_result_recycleview.xml
@@ -3,11 +3,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
-    android:padding="@dimen/dp_10">
+    android:padding="@dimen/dp_5">
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -78,7 +78,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
-            android:paddingHorizontal="@dimen/dp_10"
+            android:paddingHorizontal="@dimen/dp_15"
             android:paddingVertical="@dimen/dp_3"
             android:text="接单"
             android:textColor="@color/mainThemeColor"
diff --git a/app/src/main/res/layout/item_sensor_recycleview.xml b/app/src/main/res/layout/item_sensor_recycleview.xml
index e59b3f3..1fb8eed 100644
--- a/app/src/main/res/layout/item_sensor_recycleview.xml
+++ b/app/src/main/res/layout/item_sensor_recycleview.xml
@@ -1,36 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
-    android:padding="@dimen/dp_10">
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
 
-    <TextView
-        android:id="@+id/wellCodeView"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_toStartOf="@id/wellStateView"
-        android:text="412021160186"
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
+        android:orientation="horizontal">
 
-    <TextView
-        android:id="@+id/wellStateView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:text="离线"
-        android:textColor="@color/subTextColor" />
+        <TextView
+            android:id="@+id/wellCodeView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/dp_5"
+            android:layout_weight="1"
+            android:text="412021160186"
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/sp_16" />
+
+        <TextView
+            android:id="@+id/wellStateView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="离线"
+            android:textColor="@color/subTextColor" />
+    </LinearLayout>
 
     <TextView
         android:id="@+id/watchDataView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/wellCodeView"
-        android:layout_alignParentEnd="true"
-        android:layout_marginTop="@dimen/dp_5"
+        android:layout_marginVertical="@dimen/dp_5"
         android:gravity="center_vertical"
         android:text="井内水位：3m"
         android:textColor="@color/subTextColor" />
@@ -39,8 +44,6 @@
         android:id="@+id/installDateView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/watchDataView"
-        android:layout_marginTop="@dimen/dp_5"
         android:text="安装时间：2022-03-01"
         android:textColor="@color/subTextColor" />
 
@@ -48,8 +51,7 @@
         android:id="@+id/logTimeView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/installDateView"
         android:layout_marginTop="@dimen/dp_5"
         android:text="上报时间：2022-03-01 22:22:22"
         android:textColor="@color/subTextColor" />
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file

diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
deleted file mode 100644
index f00d59c..0000000
--- a/app/src/main/res/drawable/bg_layout.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_20.xml b/app/src/main/res/drawable/bg_layout_radius_20.xml
deleted file mode 100644
index 0c2abfe..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainBackColor" />
-
-    <corners
-        android:topLeftRadius="@dimen/dp_20"
-        android:topRightRadius="@dimen/dp_20" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_5.xml b/app/src/main/res/drawable/bg_layout_radius_5.xml
deleted file mode 100644
index 5a90f4e..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_5.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="5dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
deleted file mode 100644
index bca9c08..0000000
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <size android:height="155dp" />
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_3" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
deleted file mode 100644
index 15e6a4b..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/transparentBlack" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_color.xml b/app/src/main/res/drawable/bg_solid_layout_main_color.xml
deleted file mode 100644
index e329b7d..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_main_color.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainThemeColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
new file mode 100644
index 0000000..e329b7d
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_5" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
new file mode 100644
index 0000000..15e6a4b
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/transparentBlack" />
+
+    <corners android:radius="@dimen/dp_10" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
new file mode 100644
index 0000000..5a90f4e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners android:radius="5dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
new file mode 100644
index 0000000..0c2abfe
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainBackColor" />
+
+    <corners
+        android:topLeftRadius="@dimen/dp_20"
+        android:topRightRadius="@dimen/dp_20" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
new file mode 100644
index 0000000..bca9c08
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <size android:height="155dp" />
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_3" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_order_completed_detail.xml b/app/src/main/res/layout/activity_order_completed_detail.xml
index 4333635..f2f88f4 100644
--- a/app/src/main/res/layout/activity_order_completed_detail.xml
+++ b/app/src/main/res/layout/activity_order_completed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml
index e406795..0e59210 100644
--- a/app/src/main/res/layout/activity_order_in_handle_detail.xml
+++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -123,7 +123,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:inputType="textMultiLine"
                     android:padding="@dimen/dp_3"
@@ -149,7 +149,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
index cac4f32..4a02759 100644
--- a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -48,7 +48,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:hint="请输入现场情况"
                     android:inputType="textMultiLine"
@@ -112,7 +112,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_not_processed_detail.xml b/app/src/main/res/layout/activity_order_not_processed_detail.xml
index 5db1395..b68ae42 100644
--- a/app/src/main/res/layout/activity_order_not_processed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_processed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml
index 858051d..99b8b40 100644
--- a/app/src/main/res/layout/activity_order_search.xml
+++ b/app/src/main/res/layout/activity_order_search.xml
@@ -19,7 +19,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/dp_10"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <LinearLayout
diff --git a/app/src/main/res/layout/activity_user_detail.xml b/app/src/main/res/layout/activity_user_detail.xml
index c7be5d1..1464e4d 100644
--- a/app/src/main/res/layout/activity_user_detail.xml
+++ b/app/src/main/res/layout/activity_user_detail.xml
@@ -16,7 +16,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <RelativeLayout
diff --git a/app/src/main/res/layout/activity_well_detail.xml b/app/src/main/res/layout/activity_well_detail.xml
index 46dee2d..59c2bb4 100644
--- a/app/src/main/res/layout/activity_well_detail.xml
+++ b/app/src/main/res/layout/activity_well_detail.xml
@@ -23,7 +23,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -160,7 +160,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
diff --git a/app/src/main/res/layout/dialog_bottom_sheet.xml b/app/src/main/res/layout/dialog_bottom_sheet.xml
index b88bd9d..bb7acf2 100644
--- a/app/src/main/res/layout/dialog_bottom_sheet.xml
+++ b/app/src/main/res/layout/dialog_bottom_sheet.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
     android:padding="@dimen/dp_10">
 
diff --git a/app/src/main/res/layout/dialog_single_choice.xml b/app/src/main/res/layout/dialog_single_choice.xml
index 2559b8d..2c92ace 100644
--- a/app/src/main/res/layout/dialog_single_choice.xml
+++ b/app/src/main/res/layout/dialog_single_choice.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical">
 
     <RelativeLayout
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 4f02f1f..30e607e 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -44,7 +44,7 @@
             android:id="@+id/bottomBehaviorLayout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@drawable/bg_layout_radius_20"
+            android:background="@drawable/bg_solid_layout_white_radius_top_20"
             android:orientation="vertical"
             app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
@@ -64,7 +64,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
-                android:background="@drawable/bg_layout">
+                android:background="@drawable/bg_solid_layout_white_radius_10">
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/homeRecyclerView"
@@ -77,7 +77,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
@@ -142,7 +142,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index 9cb9a90..8ede317 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -30,7 +30,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp_20"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <RelativeLayout
diff --git a/app/src/main/res/layout/include_base_order_detail.xml b/app/src/main/res/layout/include_base_order_detail.xml
index 5c2c11a..d84aec4 100644
--- a/app/src/main/res/layout/include_base_order_detail.xml
+++ b/app/src/main/res/layout/include_base_order_detail.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical">
 
     <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/include_search_bar.xml b/app/src/main/res/layout/include_search_bar.xml
index 968f77b..64a106f 100644
--- a/app/src/main/res/layout/include_search_bar.xml
+++ b/app/src/main/res/layout/include_search_bar.xml
@@ -36,7 +36,7 @@
         android:layout_marginVertical="7dp"
         android:layout_marginEnd="@dimen/dp_10"
         android:layout_weight="3"
-        android:background="@drawable/bg_layout_radius_5">
+        android:background="@drawable/bg_solid_layout_white_radius_5">
 
         <ImageView
             android:id="@+id/searchImageView"
diff --git a/app/src/main/res/layout/item_order_completed_recycleview.xml b/app/src/main/res/layout/item_order_completed_recycleview.xml
index f1b1a76..ed6910e 100644
--- a/app/src/main/res/layout/item_order_completed_recycleview.xml
+++ b/app/src/main/res/layout/item_order_completed_recycleview.xml
@@ -3,11 +3,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
-    android:padding="@dimen/dp_10">
+    android:padding="@dimen/dp_5">
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_order_in_handle_recycleview.xml b/app/src/main/res/layout/item_order_in_handle_recycleview.xml
index f1b1a76..ed6910e 100644
--- a/app/src/main/res/layout/item_order_in_handle_recycleview.xml
+++ b/app/src/main/res/layout/item_order_in_handle_recycleview.xml
@@ -3,11 +3,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
-    android:padding="@dimen/dp_10">
+    android:padding="@dimen/dp_5">
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml b/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml
index 8c86055..05ff231 100644
--- a/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml
+++ b/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml
@@ -2,11 +2,11 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
-    android:padding="@dimen/dp_10">
+    android:padding="@dimen/dp_5">
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_order_not_processed_recycleview.xml b/app/src/main/res/layout/item_order_not_processed_recycleview.xml
index fcb0402..d9153c7 100644
--- a/app/src/main/res/layout/item_order_not_processed_recycleview.xml
+++ b/app/src/main/res/layout/item_order_not_processed_recycleview.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
-    android:padding="@dimen/dp_10">
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
 
     <LinearLayout
-        android:id="@+id/tempLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
@@ -33,43 +33,50 @@
             android:textColor="@color/subTextColor" />
     </LinearLayout>
 
-    <TextView
-        android:id="@+id/wellCodeView"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/tempLayout"
-        android:layout_marginTop="@dimen/dp_5"
-        android:text="@string/app_name"
-        android:textColor="@color/subTextColor" />
+        android:layout_marginVertical="@dimen/dp_5">
 
-    <TextView
-        android:id="@+id/alarmValueView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/tempLayout"
-        android:layout_alignParentEnd="true"
-        android:layout_marginTop="@dimen/dp_5"
-        android:text="5.5"
-        android:textColor="@color/redTextColor" />
+        <TextView
+            android:id="@+id/wellCodeView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/dp_5"
+            android:layout_weight="1"
+            android:text="@string/app_name"
+            android:textColor="@color/subTextColor" />
 
-    <TextView
-        android:id="@+id/wellLocationView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/wellCodeView"
-        android:layout_marginTop="@dimen/dp_5"
-        android:text="航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所"
-        android:textColor="@color/subTextColor" />
+        <TextView
+            android:id="@+id/alarmValueView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="5.5"
+            android:textColor="@color/redTextColor" />
+    </LinearLayout>
 
-    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-        android:id="@+id/operationButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/wellLocationView"
-        android:layout_alignParentEnd="true"
-        android:paddingHorizontal="@dimen/dp_10"
-        android:paddingVertical="@dimen/dp_3"
-        android:text="接单"
-        android:textColor="@color/mainThemeColor"
-        app:qmui_borderColor="@color/mainThemeColor" />
-</RelativeLayout>
\ No newline at end of file
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/wellLocationView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所"
+            android:textColor="@color/subTextColor" />
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+            android:id="@+id/operationButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="@dimen/dp_10"
+            android:paddingHorizontal="@dimen/dp_20"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="接单"
+            android:textColor="@color/mainThemeColor"
+            app:qmui_borderColor="@color/mainThemeColor" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_search_result_recycleview.xml b/app/src/main/res/layout/item_search_result_recycleview.xml
index 5a560ae..2ff5fa4 100644
--- a/app/src/main/res/layout/item_search_result_recycleview.xml
+++ b/app/src/main/res/layout/item_search_result_recycleview.xml
@@ -3,11 +3,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
-    android:padding="@dimen/dp_10">
+    android:padding="@dimen/dp_5">
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -78,7 +78,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
-            android:paddingHorizontal="@dimen/dp_10"
+            android:paddingHorizontal="@dimen/dp_15"
             android:paddingVertical="@dimen/dp_3"
             android:text="接单"
             android:textColor="@color/mainThemeColor"
diff --git a/app/src/main/res/layout/item_sensor_recycleview.xml b/app/src/main/res/layout/item_sensor_recycleview.xml
index e59b3f3..1fb8eed 100644
--- a/app/src/main/res/layout/item_sensor_recycleview.xml
+++ b/app/src/main/res/layout/item_sensor_recycleview.xml
@@ -1,36 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
-    android:padding="@dimen/dp_10">
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
 
-    <TextView
-        android:id="@+id/wellCodeView"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_toStartOf="@id/wellStateView"
-        android:text="412021160186"
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
+        android:orientation="horizontal">
 
-    <TextView
-        android:id="@+id/wellStateView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:text="离线"
-        android:textColor="@color/subTextColor" />
+        <TextView
+            android:id="@+id/wellCodeView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/dp_5"
+            android:layout_weight="1"
+            android:text="412021160186"
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/sp_16" />
+
+        <TextView
+            android:id="@+id/wellStateView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="离线"
+            android:textColor="@color/subTextColor" />
+    </LinearLayout>
 
     <TextView
         android:id="@+id/watchDataView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/wellCodeView"
-        android:layout_alignParentEnd="true"
-        android:layout_marginTop="@dimen/dp_5"
+        android:layout_marginVertical="@dimen/dp_5"
         android:gravity="center_vertical"
         android:text="井内水位：3m"
         android:textColor="@color/subTextColor" />
@@ -39,8 +44,6 @@
         android:id="@+id/installDateView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/watchDataView"
-        android:layout_marginTop="@dimen/dp_5"
         android:text="安装时间：2022-03-01"
         android:textColor="@color/subTextColor" />
 
@@ -48,8 +51,7 @@
         android:id="@+id/logTimeView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/installDateView"
         android:layout_marginTop="@dimen/dp_5"
         android:text="上报时间：2022-03-01 22:22:22"
         android:textColor="@color/subTextColor" />
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_well_operation_recycleview.xml b/app/src/main/res/layout/item_well_operation_recycleview.xml
index 8a71c8b..2071e25 100644
--- a/app/src/main/res/layout/item_well_operation_recycleview.xml
+++ b/app/src/main/res/layout/item_well_operation_recycleview.xml
@@ -86,7 +86,7 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/dp_10"
             android:layout_toStartOf="@id/operationButton"
-            android:paddingHorizontal="@dimen/dp_10"
+            android:paddingHorizontal="@dimen/dp_15"
             android:paddingVertical="@dimen/dp_3"
             android:text="前往"
             android:textColor="@color/subTextColor"
@@ -97,7 +97,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
-            android:paddingHorizontal="@dimen/dp_10"
+            android:paddingHorizontal="@dimen/dp_15"
             android:paddingVertical="@dimen/dp_3"
             android:text="布防"
             android:textColor="@color/mainThemeColor"

diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
deleted file mode 100644
index f00d59c..0000000
--- a/app/src/main/res/drawable/bg_layout.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_20.xml b/app/src/main/res/drawable/bg_layout_radius_20.xml
deleted file mode 100644
index 0c2abfe..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainBackColor" />
-
-    <corners
-        android:topLeftRadius="@dimen/dp_20"
-        android:topRightRadius="@dimen/dp_20" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_5.xml b/app/src/main/res/drawable/bg_layout_radius_5.xml
deleted file mode 100644
index 5a90f4e..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_5.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="5dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
deleted file mode 100644
index bca9c08..0000000
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <size android:height="155dp" />
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_3" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
deleted file mode 100644
index 15e6a4b..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/transparentBlack" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_color.xml b/app/src/main/res/drawable/bg_solid_layout_main_color.xml
deleted file mode 100644
index e329b7d..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_main_color.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainThemeColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
new file mode 100644
index 0000000..e329b7d
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_5" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
new file mode 100644
index 0000000..15e6a4b
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/transparentBlack" />
+
+    <corners android:radius="@dimen/dp_10" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
new file mode 100644
index 0000000..5a90f4e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners android:radius="5dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
new file mode 100644
index 0000000..0c2abfe
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainBackColor" />
+
+    <corners
+        android:topLeftRadius="@dimen/dp_20"
+        android:topRightRadius="@dimen/dp_20" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
new file mode 100644
index 0000000..bca9c08
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <size android:height="155dp" />
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_3" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_order_completed_detail.xml b/app/src/main/res/layout/activity_order_completed_detail.xml
index 4333635..f2f88f4 100644
--- a/app/src/main/res/layout/activity_order_completed_detail.xml
+++ b/app/src/main/res/layout/activity_order_completed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml
index e406795..0e59210 100644
--- a/app/src/main/res/layout/activity_order_in_handle_detail.xml
+++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -123,7 +123,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:inputType="textMultiLine"
                     android:padding="@dimen/dp_3"
@@ -149,7 +149,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
index cac4f32..4a02759 100644
--- a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -48,7 +48,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:hint="请输入现场情况"
                     android:inputType="textMultiLine"
@@ -112,7 +112,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_not_processed_detail.xml b/app/src/main/res/layout/activity_order_not_processed_detail.xml
index 5db1395..b68ae42 100644
--- a/app/src/main/res/layout/activity_order_not_processed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_processed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml
index 858051d..99b8b40 100644
--- a/app/src/main/res/layout/activity_order_search.xml
+++ b/app/src/main/res/layout/activity_order_search.xml
@@ -19,7 +19,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/dp_10"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <LinearLayout
diff --git a/app/src/main/res/layout/activity_user_detail.xml b/app/src/main/res/layout/activity_user_detail.xml
index c7be5d1..1464e4d 100644
--- a/app/src/main/res/layout/activity_user_detail.xml
+++ b/app/src/main/res/layout/activity_user_detail.xml
@@ -16,7 +16,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <RelativeLayout
diff --git a/app/src/main/res/layout/activity_well_detail.xml b/app/src/main/res/layout/activity_well_detail.xml
index 46dee2d..59c2bb4 100644
--- a/app/src/main/res/layout/activity_well_detail.xml
+++ b/app/src/main/res/layout/activity_well_detail.xml
@@ -23,7 +23,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -160,7 +160,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
diff --git a/app/src/main/res/layout/dialog_bottom_sheet.xml b/app/src/main/res/layout/dialog_bottom_sheet.xml
index b88bd9d..bb7acf2 100644
--- a/app/src/main/res/layout/dialog_bottom_sheet.xml
+++ b/app/src/main/res/layout/dialog_bottom_sheet.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
     android:padding="@dimen/dp_10">
 
diff --git a/app/src/main/res/layout/dialog_single_choice.xml b/app/src/main/res/layout/dialog_single_choice.xml
index 2559b8d..2c92ace 100644
--- a/app/src/main/res/layout/dialog_single_choice.xml
+++ b/app/src/main/res/layout/dialog_single_choice.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical">
 
     <RelativeLayout
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 4f02f1f..30e607e 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -44,7 +44,7 @@
             android:id="@+id/bottomBehaviorLayout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@drawable/bg_layout_radius_20"
+            android:background="@drawable/bg_solid_layout_white_radius_top_20"
             android:orientation="vertical"
             app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
@@ -64,7 +64,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
-                android:background="@drawable/bg_layout">
+                android:background="@drawable/bg_solid_layout_white_radius_10">
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/homeRecyclerView"
@@ -77,7 +77,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
@@ -142,7 +142,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index 9cb9a90..8ede317 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -30,7 +30,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp_20"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <RelativeLayout
diff --git a/app/src/main/res/layout/include_base_order_detail.xml b/app/src/main/res/layout/include_base_order_detail.xml
index 5c2c11a..d84aec4 100644
--- a/app/src/main/res/layout/include_base_order_detail.xml
+++ b/app/src/main/res/layout/include_base_order_detail.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical">
 
     <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/include_search_bar.xml b/app/src/main/res/layout/include_search_bar.xml
index 968f77b..64a106f 100644
--- a/app/src/main/res/layout/include_search_bar.xml
+++ b/app/src/main/res/layout/include_search_bar.xml
@@ -36,7 +36,7 @@
         android:layout_marginVertical="7dp"
         android:layout_marginEnd="@dimen/dp_10"
         android:layout_weight="3"
-        android:background="@drawable/bg_layout_radius_5">
+        android:background="@drawable/bg_solid_layout_white_radius_5">
 
         <ImageView
             android:id="@+id/searchImageView"
diff --git a/app/src/main/res/layout/item_order_completed_recycleview.xml b/app/src/main/res/layout/item_order_completed_recycleview.xml
index f1b1a76..ed6910e 100644
--- a/app/src/main/res/layout/item_order_completed_recycleview.xml
+++ b/app/src/main/res/layout/item_order_completed_recycleview.xml
@@ -3,11 +3,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
-    android:padding="@dimen/dp_10">
+    android:padding="@dimen/dp_5">
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_order_in_handle_recycleview.xml b/app/src/main/res/layout/item_order_in_handle_recycleview.xml
index f1b1a76..ed6910e 100644
--- a/app/src/main/res/layout/item_order_in_handle_recycleview.xml
+++ b/app/src/main/res/layout/item_order_in_handle_recycleview.xml
@@ -3,11 +3,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
-    android:padding="@dimen/dp_10">
+    android:padding="@dimen/dp_5">
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml b/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml
index 8c86055..05ff231 100644
--- a/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml
+++ b/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml
@@ -2,11 +2,11 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
-    android:padding="@dimen/dp_10">
+    android:padding="@dimen/dp_5">
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_order_not_processed_recycleview.xml b/app/src/main/res/layout/item_order_not_processed_recycleview.xml
index fcb0402..d9153c7 100644
--- a/app/src/main/res/layout/item_order_not_processed_recycleview.xml
+++ b/app/src/main/res/layout/item_order_not_processed_recycleview.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
-    android:padding="@dimen/dp_10">
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
 
     <LinearLayout
-        android:id="@+id/tempLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
@@ -33,43 +33,50 @@
             android:textColor="@color/subTextColor" />
     </LinearLayout>
 
-    <TextView
-        android:id="@+id/wellCodeView"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/tempLayout"
-        android:layout_marginTop="@dimen/dp_5"
-        android:text="@string/app_name"
-        android:textColor="@color/subTextColor" />
+        android:layout_marginVertical="@dimen/dp_5">
 
-    <TextView
-        android:id="@+id/alarmValueView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/tempLayout"
-        android:layout_alignParentEnd="true"
-        android:layout_marginTop="@dimen/dp_5"
-        android:text="5.5"
-        android:textColor="@color/redTextColor" />
+        <TextView
+            android:id="@+id/wellCodeView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/dp_5"
+            android:layout_weight="1"
+            android:text="@string/app_name"
+            android:textColor="@color/subTextColor" />
 
-    <TextView
-        android:id="@+id/wellLocationView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/wellCodeView"
-        android:layout_marginTop="@dimen/dp_5"
-        android:text="航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所"
-        android:textColor="@color/subTextColor" />
+        <TextView
+            android:id="@+id/alarmValueView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="5.5"
+            android:textColor="@color/redTextColor" />
+    </LinearLayout>
 
-    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-        android:id="@+id/operationButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/wellLocationView"
-        android:layout_alignParentEnd="true"
-        android:paddingHorizontal="@dimen/dp_10"
-        android:paddingVertical="@dimen/dp_3"
-        android:text="接单"
-        android:textColor="@color/mainThemeColor"
-        app:qmui_borderColor="@color/mainThemeColor" />
-</RelativeLayout>
\ No newline at end of file
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/wellLocationView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所"
+            android:textColor="@color/subTextColor" />
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+            android:id="@+id/operationButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="@dimen/dp_10"
+            android:paddingHorizontal="@dimen/dp_20"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="接单"
+            android:textColor="@color/mainThemeColor"
+            app:qmui_borderColor="@color/mainThemeColor" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_search_result_recycleview.xml b/app/src/main/res/layout/item_search_result_recycleview.xml
index 5a560ae..2ff5fa4 100644
--- a/app/src/main/res/layout/item_search_result_recycleview.xml
+++ b/app/src/main/res/layout/item_search_result_recycleview.xml
@@ -3,11 +3,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
-    android:padding="@dimen/dp_10">
+    android:padding="@dimen/dp_5">
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -78,7 +78,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
-            android:paddingHorizontal="@dimen/dp_10"
+            android:paddingHorizontal="@dimen/dp_15"
             android:paddingVertical="@dimen/dp_3"
             android:text="接单"
             android:textColor="@color/mainThemeColor"
diff --git a/app/src/main/res/layout/item_sensor_recycleview.xml b/app/src/main/res/layout/item_sensor_recycleview.xml
index e59b3f3..1fb8eed 100644
--- a/app/src/main/res/layout/item_sensor_recycleview.xml
+++ b/app/src/main/res/layout/item_sensor_recycleview.xml
@@ -1,36 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
-    android:padding="@dimen/dp_10">
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
 
-    <TextView
-        android:id="@+id/wellCodeView"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_toStartOf="@id/wellStateView"
-        android:text="412021160186"
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
+        android:orientation="horizontal">
 
-    <TextView
-        android:id="@+id/wellStateView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:text="离线"
-        android:textColor="@color/subTextColor" />
+        <TextView
+            android:id="@+id/wellCodeView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/dp_5"
+            android:layout_weight="1"
+            android:text="412021160186"
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/sp_16" />
+
+        <TextView
+            android:id="@+id/wellStateView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="离线"
+            android:textColor="@color/subTextColor" />
+    </LinearLayout>
 
     <TextView
         android:id="@+id/watchDataView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/wellCodeView"
-        android:layout_alignParentEnd="true"
-        android:layout_marginTop="@dimen/dp_5"
+        android:layout_marginVertical="@dimen/dp_5"
         android:gravity="center_vertical"
         android:text="井内水位：3m"
         android:textColor="@color/subTextColor" />
@@ -39,8 +44,6 @@
         android:id="@+id/installDateView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/watchDataView"
-        android:layout_marginTop="@dimen/dp_5"
         android:text="安装时间：2022-03-01"
         android:textColor="@color/subTextColor" />
 
@@ -48,8 +51,7 @@
         android:id="@+id/logTimeView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/installDateView"
         android:layout_marginTop="@dimen/dp_5"
         android:text="上报时间：2022-03-01 22:22:22"
         android:textColor="@color/subTextColor" />
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_well_operation_recycleview.xml b/app/src/main/res/layout/item_well_operation_recycleview.xml
index 8a71c8b..2071e25 100644
--- a/app/src/main/res/layout/item_well_operation_recycleview.xml
+++ b/app/src/main/res/layout/item_well_operation_recycleview.xml
@@ -86,7 +86,7 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/dp_10"
             android:layout_toStartOf="@id/operationButton"
-            android:paddingHorizontal="@dimen/dp_10"
+            android:paddingHorizontal="@dimen/dp_15"
             android:paddingVertical="@dimen/dp_3"
             android:text="前往"
             android:textColor="@color/subTextColor"
@@ -97,7 +97,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
-            android:paddingHorizontal="@dimen/dp_10"
+            android:paddingHorizontal="@dimen/dp_15"
             android:paddingVertical="@dimen/dp_3"
             android:text="布防"
             android:textColor="@color/mainThemeColor"
diff --git a/app/src/main/res/layout/item_well_recycleview.xml b/app/src/main/res/layout/item_well_recycleview.xml
index b5ba53c..f153bc3 100644
--- a/app/src/main/res/layout/item_well_recycleview.xml
+++ b/app/src/main/res/layout/item_well_recycleview.xml
@@ -67,22 +67,28 @@
         android:text="权属单位：燃气集团总公司"
         android:textColor="@color/subTextColor" />
 
-    <TextView
-        android:id="@+id/wellLocationView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="闸井位置：航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所"
-        android:textColor="@color/subTextColor" />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
-    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-        android:id="@+id/navigationButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end"
-        android:layout_marginVertical="@dimen/dp_5"
-        android:paddingHorizontal="@dimen/dp_10"
-        android:paddingVertical="@dimen/dp_3"
-        android:text="前往"
-        android:textColor="@color/mainThemeColor"
-        app:qmui_borderColor="@color/mainThemeColor" />
+        <TextView
+            android:id="@+id/wellLocationView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="井位置：航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所"
+            android:textColor="@color/subTextColor" />
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+            android:id="@+id/navigationButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="@dimen/dp_10"
+            android:paddingHorizontal="@dimen/dp_20"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="前往"
+            android:textColor="@color/mainThemeColor"
+            app:qmui_borderColor="@color/mainThemeColor" />
+    </LinearLayout>
 </LinearLayout>
\ No newline at end of file

diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
deleted file mode 100644
index f00d59c..0000000
--- a/app/src/main/res/drawable/bg_layout.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_20.xml b/app/src/main/res/drawable/bg_layout_radius_20.xml
deleted file mode 100644
index 0c2abfe..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainBackColor" />
-
-    <corners
-        android:topLeftRadius="@dimen/dp_20"
-        android:topRightRadius="@dimen/dp_20" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_5.xml b/app/src/main/res/drawable/bg_layout_radius_5.xml
deleted file mode 100644
index 5a90f4e..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_5.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="5dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
deleted file mode 100644
index bca9c08..0000000
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <size android:height="155dp" />
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_3" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
deleted file mode 100644
index 15e6a4b..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/transparentBlack" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_color.xml b/app/src/main/res/drawable/bg_solid_layout_main_color.xml
deleted file mode 100644
index e329b7d..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_main_color.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainThemeColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
new file mode 100644
index 0000000..e329b7d
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_5" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
new file mode 100644
index 0000000..15e6a4b
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/transparentBlack" />
+
+    <corners android:radius="@dimen/dp_10" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
new file mode 100644
index 0000000..5a90f4e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners android:radius="5dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
new file mode 100644
index 0000000..0c2abfe
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainBackColor" />
+
+    <corners
+        android:topLeftRadius="@dimen/dp_20"
+        android:topRightRadius="@dimen/dp_20" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
new file mode 100644
index 0000000..bca9c08
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <size android:height="155dp" />
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_3" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_order_completed_detail.xml b/app/src/main/res/layout/activity_order_completed_detail.xml
index 4333635..f2f88f4 100644
--- a/app/src/main/res/layout/activity_order_completed_detail.xml
+++ b/app/src/main/res/layout/activity_order_completed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml
index e406795..0e59210 100644
--- a/app/src/main/res/layout/activity_order_in_handle_detail.xml
+++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -123,7 +123,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:inputType="textMultiLine"
                     android:padding="@dimen/dp_3"
@@ -149,7 +149,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
index cac4f32..4a02759 100644
--- a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -48,7 +48,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:hint="请输入现场情况"
                     android:inputType="textMultiLine"
@@ -112,7 +112,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_not_processed_detail.xml b/app/src/main/res/layout/activity_order_not_processed_detail.xml
index 5db1395..b68ae42 100644
--- a/app/src/main/res/layout/activity_order_not_processed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_processed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml
index 858051d..99b8b40 100644
--- a/app/src/main/res/layout/activity_order_search.xml
+++ b/app/src/main/res/layout/activity_order_search.xml
@@ -19,7 +19,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/dp_10"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <LinearLayout
diff --git a/app/src/main/res/layout/activity_user_detail.xml b/app/src/main/res/layout/activity_user_detail.xml
index c7be5d1..1464e4d 100644
--- a/app/src/main/res/layout/activity_user_detail.xml
+++ b/app/src/main/res/layout/activity_user_detail.xml
@@ -16,7 +16,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <RelativeLayout
diff --git a/app/src/main/res/layout/activity_well_detail.xml b/app/src/main/res/layout/activity_well_detail.xml
index 46dee2d..59c2bb4 100644
--- a/app/src/main/res/layout/activity_well_detail.xml
+++ b/app/src/main/res/layout/activity_well_detail.xml
@@ -23,7 +23,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -160,7 +160,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
diff --git a/app/src/main/res/layout/dialog_bottom_sheet.xml b/app/src/main/res/layout/dialog_bottom_sheet.xml
index b88bd9d..bb7acf2 100644
--- a/app/src/main/res/layout/dialog_bottom_sheet.xml
+++ b/app/src/main/res/layout/dialog_bottom_sheet.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
     android:padding="@dimen/dp_10">
 
diff --git a/app/src/main/res/layout/dialog_single_choice.xml b/app/src/main/res/layout/dialog_single_choice.xml
index 2559b8d..2c92ace 100644
--- a/app/src/main/res/layout/dialog_single_choice.xml
+++ b/app/src/main/res/layout/dialog_single_choice.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical">
 
     <RelativeLayout
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 4f02f1f..30e607e 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -44,7 +44,7 @@
             android:id="@+id/bottomBehaviorLayout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@drawable/bg_layout_radius_20"
+            android:background="@drawable/bg_solid_layout_white_radius_top_20"
             android:orientation="vertical"
             app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
@@ -64,7 +64,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
-                android:background="@drawable/bg_layout">
+                android:background="@drawable/bg_solid_layout_white_radius_10">
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/homeRecyclerView"
@@ -77,7 +77,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
@@ -142,7 +142,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index 9cb9a90..8ede317 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -30,7 +30,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp_20"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <RelativeLayout
diff --git a/app/src/main/res/layout/include_base_order_detail.xml b/app/src/main/res/layout/include_base_order_detail.xml
index 5c2c11a..d84aec4 100644
--- a/app/src/main/res/layout/include_base_order_detail.xml
+++ b/app/src/main/res/layout/include_base_order_detail.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical">
 
     <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/include_search_bar.xml b/app/src/main/res/layout/include_search_bar.xml
index 968f77b..64a106f 100644
--- a/app/src/main/res/layout/include_search_bar.xml
+++ b/app/src/main/res/layout/include_search_bar.xml
@@ -36,7 +36,7 @@
         android:layout_marginVertical="7dp"
         android:layout_marginEnd="@dimen/dp_10"
         android:layout_weight="3"
-        android:background="@drawable/bg_layout_radius_5">
+        android:background="@drawable/bg_solid_layout_white_radius_5">
 
         <ImageView
             android:id="@+id/searchImageView"
diff --git a/app/src/main/res/layout/item_order_completed_recycleview.xml b/app/src/main/res/layout/item_order_completed_recycleview.xml
index f1b1a76..ed6910e 100644
--- a/app/src/main/res/layout/item_order_completed_recycleview.xml
+++ b/app/src/main/res/layout/item_order_completed_recycleview.xml
@@ -3,11 +3,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
-    android:padding="@dimen/dp_10">
+    android:padding="@dimen/dp_5">
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_order_in_handle_recycleview.xml b/app/src/main/res/layout/item_order_in_handle_recycleview.xml
index f1b1a76..ed6910e 100644
--- a/app/src/main/res/layout/item_order_in_handle_recycleview.xml
+++ b/app/src/main/res/layout/item_order_in_handle_recycleview.xml
@@ -3,11 +3,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
-    android:padding="@dimen/dp_10">
+    android:padding="@dimen/dp_5">
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml b/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml
index 8c86055..05ff231 100644
--- a/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml
+++ b/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml
@@ -2,11 +2,11 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
-    android:padding="@dimen/dp_10">
+    android:padding="@dimen/dp_5">
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_order_not_processed_recycleview.xml b/app/src/main/res/layout/item_order_not_processed_recycleview.xml
index fcb0402..d9153c7 100644
--- a/app/src/main/res/layout/item_order_not_processed_recycleview.xml
+++ b/app/src/main/res/layout/item_order_not_processed_recycleview.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
-    android:padding="@dimen/dp_10">
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
 
     <LinearLayout
-        android:id="@+id/tempLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
@@ -33,43 +33,50 @@
             android:textColor="@color/subTextColor" />
     </LinearLayout>
 
-    <TextView
-        android:id="@+id/wellCodeView"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/tempLayout"
-        android:layout_marginTop="@dimen/dp_5"
-        android:text="@string/app_name"
-        android:textColor="@color/subTextColor" />
+        android:layout_marginVertical="@dimen/dp_5">
 
-    <TextView
-        android:id="@+id/alarmValueView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/tempLayout"
-        android:layout_alignParentEnd="true"
-        android:layout_marginTop="@dimen/dp_5"
-        android:text="5.5"
-        android:textColor="@color/redTextColor" />
+        <TextView
+            android:id="@+id/wellCodeView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/dp_5"
+            android:layout_weight="1"
+            android:text="@string/app_name"
+            android:textColor="@color/subTextColor" />
 
-    <TextView
-        android:id="@+id/wellLocationView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/wellCodeView"
-        android:layout_marginTop="@dimen/dp_5"
-        android:text="航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所"
-        android:textColor="@color/subTextColor" />
+        <TextView
+            android:id="@+id/alarmValueView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="5.5"
+            android:textColor="@color/redTextColor" />
+    </LinearLayout>
 
-    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-        android:id="@+id/operationButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/wellLocationView"
-        android:layout_alignParentEnd="true"
-        android:paddingHorizontal="@dimen/dp_10"
-        android:paddingVertical="@dimen/dp_3"
-        android:text="接单"
-        android:textColor="@color/mainThemeColor"
-        app:qmui_borderColor="@color/mainThemeColor" />
-</RelativeLayout>
\ No newline at end of file
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/wellLocationView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所"
+            android:textColor="@color/subTextColor" />
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+            android:id="@+id/operationButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="@dimen/dp_10"
+            android:paddingHorizontal="@dimen/dp_20"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="接单"
+            android:textColor="@color/mainThemeColor"
+            app:qmui_borderColor="@color/mainThemeColor" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_search_result_recycleview.xml b/app/src/main/res/layout/item_search_result_recycleview.xml
index 5a560ae..2ff5fa4 100644
--- a/app/src/main/res/layout/item_search_result_recycleview.xml
+++ b/app/src/main/res/layout/item_search_result_recycleview.xml
@@ -3,11 +3,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
-    android:padding="@dimen/dp_10">
+    android:padding="@dimen/dp_5">
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -78,7 +78,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
-            android:paddingHorizontal="@dimen/dp_10"
+            android:paddingHorizontal="@dimen/dp_15"
             android:paddingVertical="@dimen/dp_3"
             android:text="接单"
             android:textColor="@color/mainThemeColor"
diff --git a/app/src/main/res/layout/item_sensor_recycleview.xml b/app/src/main/res/layout/item_sensor_recycleview.xml
index e59b3f3..1fb8eed 100644
--- a/app/src/main/res/layout/item_sensor_recycleview.xml
+++ b/app/src/main/res/layout/item_sensor_recycleview.xml
@@ -1,36 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
-    android:padding="@dimen/dp_10">
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
 
-    <TextView
-        android:id="@+id/wellCodeView"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_toStartOf="@id/wellStateView"
-        android:text="412021160186"
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
+        android:orientation="horizontal">
 
-    <TextView
-        android:id="@+id/wellStateView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:text="离线"
-        android:textColor="@color/subTextColor" />
+        <TextView
+            android:id="@+id/wellCodeView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/dp_5"
+            android:layout_weight="1"
+            android:text="412021160186"
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/sp_16" />
+
+        <TextView
+            android:id="@+id/wellStateView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="离线"
+            android:textColor="@color/subTextColor" />
+    </LinearLayout>
 
     <TextView
         android:id="@+id/watchDataView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/wellCodeView"
-        android:layout_alignParentEnd="true"
-        android:layout_marginTop="@dimen/dp_5"
+        android:layout_marginVertical="@dimen/dp_5"
         android:gravity="center_vertical"
         android:text="井内水位：3m"
         android:textColor="@color/subTextColor" />
@@ -39,8 +44,6 @@
         android:id="@+id/installDateView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/watchDataView"
-        android:layout_marginTop="@dimen/dp_5"
         android:text="安装时间：2022-03-01"
         android:textColor="@color/subTextColor" />
 
@@ -48,8 +51,7 @@
         android:id="@+id/logTimeView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/installDateView"
         android:layout_marginTop="@dimen/dp_5"
         android:text="上报时间：2022-03-01 22:22:22"
         android:textColor="@color/subTextColor" />
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_well_operation_recycleview.xml b/app/src/main/res/layout/item_well_operation_recycleview.xml
index 8a71c8b..2071e25 100644
--- a/app/src/main/res/layout/item_well_operation_recycleview.xml
+++ b/app/src/main/res/layout/item_well_operation_recycleview.xml
@@ -86,7 +86,7 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/dp_10"
             android:layout_toStartOf="@id/operationButton"
-            android:paddingHorizontal="@dimen/dp_10"
+            android:paddingHorizontal="@dimen/dp_15"
             android:paddingVertical="@dimen/dp_3"
             android:text="前往"
             android:textColor="@color/subTextColor"
@@ -97,7 +97,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
-            android:paddingHorizontal="@dimen/dp_10"
+            android:paddingHorizontal="@dimen/dp_15"
             android:paddingVertical="@dimen/dp_3"
             android:text="布防"
             android:textColor="@color/mainThemeColor"
diff --git a/app/src/main/res/layout/item_well_recycleview.xml b/app/src/main/res/layout/item_well_recycleview.xml
index b5ba53c..f153bc3 100644
--- a/app/src/main/res/layout/item_well_recycleview.xml
+++ b/app/src/main/res/layout/item_well_recycleview.xml
@@ -67,22 +67,28 @@
         android:text="权属单位：燃气集团总公司"
         android:textColor="@color/subTextColor" />
 
-    <TextView
-        android:id="@+id/wellLocationView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="闸井位置：航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所"
-        android:textColor="@color/subTextColor" />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
-    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-        android:id="@+id/navigationButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end"
-        android:layout_marginVertical="@dimen/dp_5"
-        android:paddingHorizontal="@dimen/dp_10"
-        android:paddingVertical="@dimen/dp_3"
-        android:text="前往"
-        android:textColor="@color/mainThemeColor"
-        app:qmui_borderColor="@color/mainThemeColor" />
+        <TextView
+            android:id="@+id/wellLocationView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="井位置：航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所"
+            android:textColor="@color/subTextColor" />
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+            android:id="@+id/navigationButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="@dimen/dp_10"
+            android:paddingHorizontal="@dimen/dp_20"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="前往"
+            android:textColor="@color/mainThemeColor"
+            app:qmui_borderColor="@color/mainThemeColor" />
+    </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/marker_gaode.xml b/app/src/main/res/layout/marker_gaode.xml
index 9bd62c2..15e9368 100644
--- a/app/src/main/res/layout/marker_gaode.xml
+++ b/app/src/main/res/layout/marker_gaode.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_solid_layout_main_color"
+    android:background="@drawable/bg_solid_layout_main_radius_5"
     android:orientation="vertical"
     android:paddingVertical="@dimen/dp_3">
 

diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
deleted file mode 100644
index f00d59c..0000000
--- a/app/src/main/res/drawable/bg_layout.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_20.xml b/app/src/main/res/drawable/bg_layout_radius_20.xml
deleted file mode 100644
index 0c2abfe..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainBackColor" />
-
-    <corners
-        android:topLeftRadius="@dimen/dp_20"
-        android:topRightRadius="@dimen/dp_20" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_5.xml b/app/src/main/res/drawable/bg_layout_radius_5.xml
deleted file mode 100644
index 5a90f4e..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_5.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="5dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
deleted file mode 100644
index bca9c08..0000000
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <size android:height="155dp" />
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_3" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
deleted file mode 100644
index 15e6a4b..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/transparentBlack" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_color.xml b/app/src/main/res/drawable/bg_solid_layout_main_color.xml
deleted file mode 100644
index e329b7d..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_main_color.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainThemeColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
new file mode 100644
index 0000000..e329b7d
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_5" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
new file mode 100644
index 0000000..15e6a4b
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/transparentBlack" />
+
+    <corners android:radius="@dimen/dp_10" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
new file mode 100644
index 0000000..5a90f4e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners android:radius="5dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
new file mode 100644
index 0000000..0c2abfe
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainBackColor" />
+
+    <corners
+        android:topLeftRadius="@dimen/dp_20"
+        android:topRightRadius="@dimen/dp_20" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
new file mode 100644
index 0000000..bca9c08
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <size android:height="155dp" />
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_3" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_order_completed_detail.xml b/app/src/main/res/layout/activity_order_completed_detail.xml
index 4333635..f2f88f4 100644
--- a/app/src/main/res/layout/activity_order_completed_detail.xml
+++ b/app/src/main/res/layout/activity_order_completed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml
index e406795..0e59210 100644
--- a/app/src/main/res/layout/activity_order_in_handle_detail.xml
+++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -123,7 +123,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:inputType="textMultiLine"
                     android:padding="@dimen/dp_3"
@@ -149,7 +149,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
index cac4f32..4a02759 100644
--- a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -48,7 +48,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:hint="请输入现场情况"
                     android:inputType="textMultiLine"
@@ -112,7 +112,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_not_processed_detail.xml b/app/src/main/res/layout/activity_order_not_processed_detail.xml
index 5db1395..b68ae42 100644
--- a/app/src/main/res/layout/activity_order_not_processed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_processed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml
index 858051d..99b8b40 100644
--- a/app/src/main/res/layout/activity_order_search.xml
+++ b/app/src/main/res/layout/activity_order_search.xml
@@ -19,7 +19,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/dp_10"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <LinearLayout
diff --git a/app/src/main/res/layout/activity_user_detail.xml b/app/src/main/res/layout/activity_user_detail.xml
index c7be5d1..1464e4d 100644
--- a/app/src/main/res/layout/activity_user_detail.xml
+++ b/app/src/main/res/layout/activity_user_detail.xml
@@ -16,7 +16,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <RelativeLayout
diff --git a/app/src/main/res/layout/activity_well_detail.xml b/app/src/main/res/layout/activity_well_detail.xml
index 46dee2d..59c2bb4 100644
--- a/app/src/main/res/layout/activity_well_detail.xml
+++ b/app/src/main/res/layout/activity_well_detail.xml
@@ -23,7 +23,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -160,7 +160,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
diff --git a/app/src/main/res/layout/dialog_bottom_sheet.xml b/app/src/main/res/layout/dialog_bottom_sheet.xml
index b88bd9d..bb7acf2 100644
--- a/app/src/main/res/layout/dialog_bottom_sheet.xml
+++ b/app/src/main/res/layout/dialog_bottom_sheet.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
     android:padding="@dimen/dp_10">
 
diff --git a/app/src/main/res/layout/dialog_single_choice.xml b/app/src/main/res/layout/dialog_single_choice.xml
index 2559b8d..2c92ace 100644
--- a/app/src/main/res/layout/dialog_single_choice.xml
+++ b/app/src/main/res/layout/dialog_single_choice.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical">
 
     <RelativeLayout
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 4f02f1f..30e607e 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -44,7 +44,7 @@
             android:id="@+id/bottomBehaviorLayout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@drawable/bg_layout_radius_20"
+            android:background="@drawable/bg_solid_layout_white_radius_top_20"
             android:orientation="vertical"
             app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
@@ -64,7 +64,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
-                android:background="@drawable/bg_layout">
+                android:background="@drawable/bg_solid_layout_white_radius_10">
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/homeRecyclerView"
@@ -77,7 +77,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
@@ -142,7 +142,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index 9cb9a90..8ede317 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -30,7 +30,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp_20"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <RelativeLayout
diff --git a/app/src/main/res/layout/include_base_order_detail.xml b/app/src/main/res/layout/include_base_order_detail.xml
index 5c2c11a..d84aec4 100644
--- a/app/src/main/res/layout/include_base_order_detail.xml
+++ b/app/src/main/res/layout/include_base_order_detail.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical">
 
     <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/include_search_bar.xml b/app/src/main/res/layout/include_search_bar.xml
index 968f77b..64a106f 100644
--- a/app/src/main/res/layout/include_search_bar.xml
+++ b/app/src/main/res/layout/include_search_bar.xml
@@ -36,7 +36,7 @@
         android:layout_marginVertical="7dp"
         android:layout_marginEnd="@dimen/dp_10"
         android:layout_weight="3"
-        android:background="@drawable/bg_layout_radius_5">
+        android:background="@drawable/bg_solid_layout_white_radius_5">
 
         <ImageView
             android:id="@+id/searchImageView"
diff --git a/app/src/main/res/layout/item_order_completed_recycleview.xml b/app/src/main/res/layout/item_order_completed_recycleview.xml
index f1b1a76..ed6910e 100644
--- a/app/src/main/res/layout/item_order_completed_recycleview.xml
+++ b/app/src/main/res/layout/item_order_completed_recycleview.xml
@@ -3,11 +3,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
-    android:padding="@dimen/dp_10">
+    android:padding="@dimen/dp_5">
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_order_in_handle_recycleview.xml b/app/src/main/res/layout/item_order_in_handle_recycleview.xml
index f1b1a76..ed6910e 100644
--- a/app/src/main/res/layout/item_order_in_handle_recycleview.xml
+++ b/app/src/main/res/layout/item_order_in_handle_recycleview.xml
@@ -3,11 +3,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
-    android:padding="@dimen/dp_10">
+    android:padding="@dimen/dp_5">
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml b/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml
index 8c86055..05ff231 100644
--- a/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml
+++ b/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml
@@ -2,11 +2,11 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
-    android:padding="@dimen/dp_10">
+    android:padding="@dimen/dp_5">
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_order_not_processed_recycleview.xml b/app/src/main/res/layout/item_order_not_processed_recycleview.xml
index fcb0402..d9153c7 100644
--- a/app/src/main/res/layout/item_order_not_processed_recycleview.xml
+++ b/app/src/main/res/layout/item_order_not_processed_recycleview.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
-    android:padding="@dimen/dp_10">
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
 
     <LinearLayout
-        android:id="@+id/tempLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
@@ -33,43 +33,50 @@
             android:textColor="@color/subTextColor" />
     </LinearLayout>
 
-    <TextView
-        android:id="@+id/wellCodeView"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/tempLayout"
-        android:layout_marginTop="@dimen/dp_5"
-        android:text="@string/app_name"
-        android:textColor="@color/subTextColor" />
+        android:layout_marginVertical="@dimen/dp_5">
 
-    <TextView
-        android:id="@+id/alarmValueView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/tempLayout"
-        android:layout_alignParentEnd="true"
-        android:layout_marginTop="@dimen/dp_5"
-        android:text="5.5"
-        android:textColor="@color/redTextColor" />
+        <TextView
+            android:id="@+id/wellCodeView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/dp_5"
+            android:layout_weight="1"
+            android:text="@string/app_name"
+            android:textColor="@color/subTextColor" />
 
-    <TextView
-        android:id="@+id/wellLocationView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/wellCodeView"
-        android:layout_marginTop="@dimen/dp_5"
-        android:text="航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所"
-        android:textColor="@color/subTextColor" />
+        <TextView
+            android:id="@+id/alarmValueView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="5.5"
+            android:textColor="@color/redTextColor" />
+    </LinearLayout>
 
-    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-        android:id="@+id/operationButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/wellLocationView"
-        android:layout_alignParentEnd="true"
-        android:paddingHorizontal="@dimen/dp_10"
-        android:paddingVertical="@dimen/dp_3"
-        android:text="接单"
-        android:textColor="@color/mainThemeColor"
-        app:qmui_borderColor="@color/mainThemeColor" />
-</RelativeLayout>
\ No newline at end of file
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/wellLocationView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所"
+            android:textColor="@color/subTextColor" />
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+            android:id="@+id/operationButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="@dimen/dp_10"
+            android:paddingHorizontal="@dimen/dp_20"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="接单"
+            android:textColor="@color/mainThemeColor"
+            app:qmui_borderColor="@color/mainThemeColor" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_search_result_recycleview.xml b/app/src/main/res/layout/item_search_result_recycleview.xml
index 5a560ae..2ff5fa4 100644
--- a/app/src/main/res/layout/item_search_result_recycleview.xml
+++ b/app/src/main/res/layout/item_search_result_recycleview.xml
@@ -3,11 +3,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
-    android:padding="@dimen/dp_10">
+    android:padding="@dimen/dp_5">
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -78,7 +78,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
-            android:paddingHorizontal="@dimen/dp_10"
+            android:paddingHorizontal="@dimen/dp_15"
             android:paddingVertical="@dimen/dp_3"
             android:text="接单"
             android:textColor="@color/mainThemeColor"
diff --git a/app/src/main/res/layout/item_sensor_recycleview.xml b/app/src/main/res/layout/item_sensor_recycleview.xml
index e59b3f3..1fb8eed 100644
--- a/app/src/main/res/layout/item_sensor_recycleview.xml
+++ b/app/src/main/res/layout/item_sensor_recycleview.xml
@@ -1,36 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
-    android:padding="@dimen/dp_10">
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
 
-    <TextView
-        android:id="@+id/wellCodeView"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_toStartOf="@id/wellStateView"
-        android:text="412021160186"
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
+        android:orientation="horizontal">
 
-    <TextView
-        android:id="@+id/wellStateView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:text="离线"
-        android:textColor="@color/subTextColor" />
+        <TextView
+            android:id="@+id/wellCodeView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/dp_5"
+            android:layout_weight="1"
+            android:text="412021160186"
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/sp_16" />
+
+        <TextView
+            android:id="@+id/wellStateView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="离线"
+            android:textColor="@color/subTextColor" />
+    </LinearLayout>
 
     <TextView
         android:id="@+id/watchDataView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/wellCodeView"
-        android:layout_alignParentEnd="true"
-        android:layout_marginTop="@dimen/dp_5"
+        android:layout_marginVertical="@dimen/dp_5"
         android:gravity="center_vertical"
         android:text="井内水位：3m"
         android:textColor="@color/subTextColor" />
@@ -39,8 +44,6 @@
         android:id="@+id/installDateView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/watchDataView"
-        android:layout_marginTop="@dimen/dp_5"
         android:text="安装时间：2022-03-01"
         android:textColor="@color/subTextColor" />
 
@@ -48,8 +51,7 @@
         android:id="@+id/logTimeView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/installDateView"
         android:layout_marginTop="@dimen/dp_5"
         android:text="上报时间：2022-03-01 22:22:22"
         android:textColor="@color/subTextColor" />
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_well_operation_recycleview.xml b/app/src/main/res/layout/item_well_operation_recycleview.xml
index 8a71c8b..2071e25 100644
--- a/app/src/main/res/layout/item_well_operation_recycleview.xml
+++ b/app/src/main/res/layout/item_well_operation_recycleview.xml
@@ -86,7 +86,7 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/dp_10"
             android:layout_toStartOf="@id/operationButton"
-            android:paddingHorizontal="@dimen/dp_10"
+            android:paddingHorizontal="@dimen/dp_15"
             android:paddingVertical="@dimen/dp_3"
             android:text="前往"
             android:textColor="@color/subTextColor"
@@ -97,7 +97,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
-            android:paddingHorizontal="@dimen/dp_10"
+            android:paddingHorizontal="@dimen/dp_15"
             android:paddingVertical="@dimen/dp_3"
             android:text="布防"
             android:textColor="@color/mainThemeColor"
diff --git a/app/src/main/res/layout/item_well_recycleview.xml b/app/src/main/res/layout/item_well_recycleview.xml
index b5ba53c..f153bc3 100644
--- a/app/src/main/res/layout/item_well_recycleview.xml
+++ b/app/src/main/res/layout/item_well_recycleview.xml
@@ -67,22 +67,28 @@
         android:text="权属单位：燃气集团总公司"
         android:textColor="@color/subTextColor" />
 
-    <TextView
-        android:id="@+id/wellLocationView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="闸井位置：航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所"
-        android:textColor="@color/subTextColor" />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
-    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-        android:id="@+id/navigationButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end"
-        android:layout_marginVertical="@dimen/dp_5"
-        android:paddingHorizontal="@dimen/dp_10"
-        android:paddingVertical="@dimen/dp_3"
-        android:text="前往"
-        android:textColor="@color/mainThemeColor"
-        app:qmui_borderColor="@color/mainThemeColor" />
+        <TextView
+            android:id="@+id/wellLocationView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="井位置：航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所"
+            android:textColor="@color/subTextColor" />
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+            android:id="@+id/navigationButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="@dimen/dp_10"
+            android:paddingHorizontal="@dimen/dp_20"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="前往"
+            android:textColor="@color/mainThemeColor"
+            app:qmui_borderColor="@color/mainThemeColor" />
+    </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/marker_gaode.xml b/app/src/main/res/layout/marker_gaode.xml
index 9bd62c2..15e9368 100644
--- a/app/src/main/res/layout/marker_gaode.xml
+++ b/app/src/main/res/layout/marker_gaode.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_solid_layout_main_color"
+    android:background="@drawable/bg_solid_layout_main_radius_5"
     android:orientation="vertical"
     android:paddingVertical="@dimen/dp_3">
 
diff --git a/app/src/main/res/layout/popu_map_info.xml b/app/src/main/res/layout/popu_map_info.xml
index 9ef64e9..bd6b147 100644
--- a/app/src/main/res/layout/popu_map_info.xml
+++ b/app/src/main/res/layout/popu_map_info.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_solid_layout_black_transparent_radius_10"
+    android:background="@drawable/bg_solid_layout_transparent_radius_10"
     android:orientation="vertical"
     android:padding="@dimen/dp_10">
 

diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
deleted file mode 100644
index f00d59c..0000000
--- a/app/src/main/res/drawable/bg_layout.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_20.xml b/app/src/main/res/drawable/bg_layout_radius_20.xml
deleted file mode 100644
index 0c2abfe..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainBackColor" />
-
-    <corners
-        android:topLeftRadius="@dimen/dp_20"
-        android:topRightRadius="@dimen/dp_20" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_5.xml b/app/src/main/res/drawable/bg_layout_radius_5.xml
deleted file mode 100644
index 5a90f4e..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_5.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="5dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
deleted file mode 100644
index bca9c08..0000000
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <size android:height="155dp" />
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_3" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
deleted file mode 100644
index 15e6a4b..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/transparentBlack" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_color.xml b/app/src/main/res/drawable/bg_solid_layout_main_color.xml
deleted file mode 100644
index e329b7d..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_main_color.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainThemeColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
new file mode 100644
index 0000000..e329b7d
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_5" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
new file mode 100644
index 0000000..15e6a4b
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/transparentBlack" />
+
+    <corners android:radius="@dimen/dp_10" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
new file mode 100644
index 0000000..5a90f4e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners android:radius="5dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
new file mode 100644
index 0000000..0c2abfe
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainBackColor" />
+
+    <corners
+        android:topLeftRadius="@dimen/dp_20"
+        android:topRightRadius="@dimen/dp_20" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
new file mode 100644
index 0000000..bca9c08
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <size android:height="155dp" />
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_3" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_order_completed_detail.xml b/app/src/main/res/layout/activity_order_completed_detail.xml
index 4333635..f2f88f4 100644
--- a/app/src/main/res/layout/activity_order_completed_detail.xml
+++ b/app/src/main/res/layout/activity_order_completed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml
index e406795..0e59210 100644
--- a/app/src/main/res/layout/activity_order_in_handle_detail.xml
+++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -123,7 +123,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:inputType="textMultiLine"
                     android:padding="@dimen/dp_3"
@@ -149,7 +149,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
index cac4f32..4a02759 100644
--- a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -48,7 +48,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:hint="请输入现场情况"
                     android:inputType="textMultiLine"
@@ -112,7 +112,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_not_processed_detail.xml b/app/src/main/res/layout/activity_order_not_processed_detail.xml
index 5db1395..b68ae42 100644
--- a/app/src/main/res/layout/activity_order_not_processed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_processed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml
index 858051d..99b8b40 100644
--- a/app/src/main/res/layout/activity_order_search.xml
+++ b/app/src/main/res/layout/activity_order_search.xml
@@ -19,7 +19,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/dp_10"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <LinearLayout
diff --git a/app/src/main/res/layout/activity_user_detail.xml b/app/src/main/res/layout/activity_user_detail.xml
index c7be5d1..1464e4d 100644
--- a/app/src/main/res/layout/activity_user_detail.xml
+++ b/app/src/main/res/layout/activity_user_detail.xml
@@ -16,7 +16,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <RelativeLayout
diff --git a/app/src/main/res/layout/activity_well_detail.xml b/app/src/main/res/layout/activity_well_detail.xml
index 46dee2d..59c2bb4 100644
--- a/app/src/main/res/layout/activity_well_detail.xml
+++ b/app/src/main/res/layout/activity_well_detail.xml
@@ -23,7 +23,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -160,7 +160,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
diff --git a/app/src/main/res/layout/dialog_bottom_sheet.xml b/app/src/main/res/layout/dialog_bottom_sheet.xml
index b88bd9d..bb7acf2 100644
--- a/app/src/main/res/layout/dialog_bottom_sheet.xml
+++ b/app/src/main/res/layout/dialog_bottom_sheet.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
     android:padding="@dimen/dp_10">
 
diff --git a/app/src/main/res/layout/dialog_single_choice.xml b/app/src/main/res/layout/dialog_single_choice.xml
index 2559b8d..2c92ace 100644
--- a/app/src/main/res/layout/dialog_single_choice.xml
+++ b/app/src/main/res/layout/dialog_single_choice.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical">
 
     <RelativeLayout
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 4f02f1f..30e607e 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -44,7 +44,7 @@
             android:id="@+id/bottomBehaviorLayout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@drawable/bg_layout_radius_20"
+            android:background="@drawable/bg_solid_layout_white_radius_top_20"
             android:orientation="vertical"
             app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
@@ -64,7 +64,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
-                android:background="@drawable/bg_layout">
+                android:background="@drawable/bg_solid_layout_white_radius_10">
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/homeRecyclerView"
@@ -77,7 +77,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
@@ -142,7 +142,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index 9cb9a90..8ede317 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -30,7 +30,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp_20"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <RelativeLayout
diff --git a/app/src/main/res/layout/include_base_order_detail.xml b/app/src/main/res/layout/include_base_order_detail.xml
index 5c2c11a..d84aec4 100644
--- a/app/src/main/res/layout/include_base_order_detail.xml
+++ b/app/src/main/res/layout/include_base_order_detail.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical">
 
     <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/include_search_bar.xml b/app/src/main/res/layout/include_search_bar.xml
index 968f77b..64a106f 100644
--- a/app/src/main/res/layout/include_search_bar.xml
+++ b/app/src/main/res/layout/include_search_bar.xml
@@ -36,7 +36,7 @@
         android:layout_marginVertical="7dp"
         android:layout_marginEnd="@dimen/dp_10"
         android:layout_weight="3"
-        android:background="@drawable/bg_layout_radius_5">
+        android:background="@drawable/bg_solid_layout_white_radius_5">
 
         <ImageView
             android:id="@+id/searchImageView"
diff --git a/app/src/main/res/layout/item_order_completed_recycleview.xml b/app/src/main/res/layout/item_order_completed_recycleview.xml
index f1b1a76..ed6910e 100644
--- a/app/src/main/res/layout/item_order_completed_recycleview.xml
+++ b/app/src/main/res/layout/item_order_completed_recycleview.xml
@@ -3,11 +3,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
-    android:padding="@dimen/dp_10">
+    android:padding="@dimen/dp_5">
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_order_in_handle_recycleview.xml b/app/src/main/res/layout/item_order_in_handle_recycleview.xml
index f1b1a76..ed6910e 100644
--- a/app/src/main/res/layout/item_order_in_handle_recycleview.xml
+++ b/app/src/main/res/layout/item_order_in_handle_recycleview.xml
@@ -3,11 +3,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
-    android:padding="@dimen/dp_10">
+    android:padding="@dimen/dp_5">
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml b/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml
index 8c86055..05ff231 100644
--- a/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml
+++ b/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml
@@ -2,11 +2,11 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
-    android:padding="@dimen/dp_10">
+    android:padding="@dimen/dp_5">
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_order_not_processed_recycleview.xml b/app/src/main/res/layout/item_order_not_processed_recycleview.xml
index fcb0402..d9153c7 100644
--- a/app/src/main/res/layout/item_order_not_processed_recycleview.xml
+++ b/app/src/main/res/layout/item_order_not_processed_recycleview.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
-    android:padding="@dimen/dp_10">
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
 
     <LinearLayout
-        android:id="@+id/tempLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
@@ -33,43 +33,50 @@
             android:textColor="@color/subTextColor" />
     </LinearLayout>
 
-    <TextView
-        android:id="@+id/wellCodeView"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/tempLayout"
-        android:layout_marginTop="@dimen/dp_5"
-        android:text="@string/app_name"
-        android:textColor="@color/subTextColor" />
+        android:layout_marginVertical="@dimen/dp_5">
 
-    <TextView
-        android:id="@+id/alarmValueView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/tempLayout"
-        android:layout_alignParentEnd="true"
-        android:layout_marginTop="@dimen/dp_5"
-        android:text="5.5"
-        android:textColor="@color/redTextColor" />
+        <TextView
+            android:id="@+id/wellCodeView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/dp_5"
+            android:layout_weight="1"
+            android:text="@string/app_name"
+            android:textColor="@color/subTextColor" />
 
-    <TextView
-        android:id="@+id/wellLocationView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/wellCodeView"
-        android:layout_marginTop="@dimen/dp_5"
-        android:text="航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所"
-        android:textColor="@color/subTextColor" />
+        <TextView
+            android:id="@+id/alarmValueView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="5.5"
+            android:textColor="@color/redTextColor" />
+    </LinearLayout>
 
-    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-        android:id="@+id/operationButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/wellLocationView"
-        android:layout_alignParentEnd="true"
-        android:paddingHorizontal="@dimen/dp_10"
-        android:paddingVertical="@dimen/dp_3"
-        android:text="接单"
-        android:textColor="@color/mainThemeColor"
-        app:qmui_borderColor="@color/mainThemeColor" />
-</RelativeLayout>
\ No newline at end of file
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/wellLocationView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所"
+            android:textColor="@color/subTextColor" />
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+            android:id="@+id/operationButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="@dimen/dp_10"
+            android:paddingHorizontal="@dimen/dp_20"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="接单"
+            android:textColor="@color/mainThemeColor"
+            app:qmui_borderColor="@color/mainThemeColor" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_search_result_recycleview.xml b/app/src/main/res/layout/item_search_result_recycleview.xml
index 5a560ae..2ff5fa4 100644
--- a/app/src/main/res/layout/item_search_result_recycleview.xml
+++ b/app/src/main/res/layout/item_search_result_recycleview.xml
@@ -3,11 +3,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
-    android:padding="@dimen/dp_10">
+    android:padding="@dimen/dp_5">
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -78,7 +78,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
-            android:paddingHorizontal="@dimen/dp_10"
+            android:paddingHorizontal="@dimen/dp_15"
             android:paddingVertical="@dimen/dp_3"
             android:text="接单"
             android:textColor="@color/mainThemeColor"
diff --git a/app/src/main/res/layout/item_sensor_recycleview.xml b/app/src/main/res/layout/item_sensor_recycleview.xml
index e59b3f3..1fb8eed 100644
--- a/app/src/main/res/layout/item_sensor_recycleview.xml
+++ b/app/src/main/res/layout/item_sensor_recycleview.xml
@@ -1,36 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
-    android:padding="@dimen/dp_10">
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
 
-    <TextView
-        android:id="@+id/wellCodeView"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_toStartOf="@id/wellStateView"
-        android:text="412021160186"
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
+        android:orientation="horizontal">
 
-    <TextView
-        android:id="@+id/wellStateView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:text="离线"
-        android:textColor="@color/subTextColor" />
+        <TextView
+            android:id="@+id/wellCodeView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/dp_5"
+            android:layout_weight="1"
+            android:text="412021160186"
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/sp_16" />
+
+        <TextView
+            android:id="@+id/wellStateView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="离线"
+            android:textColor="@color/subTextColor" />
+    </LinearLayout>
 
     <TextView
         android:id="@+id/watchDataView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/wellCodeView"
-        android:layout_alignParentEnd="true"
-        android:layout_marginTop="@dimen/dp_5"
+        android:layout_marginVertical="@dimen/dp_5"
         android:gravity="center_vertical"
         android:text="井内水位：3m"
         android:textColor="@color/subTextColor" />
@@ -39,8 +44,6 @@
         android:id="@+id/installDateView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/watchDataView"
-        android:layout_marginTop="@dimen/dp_5"
         android:text="安装时间：2022-03-01"
         android:textColor="@color/subTextColor" />
 
@@ -48,8 +51,7 @@
         android:id="@+id/logTimeView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/installDateView"
         android:layout_marginTop="@dimen/dp_5"
         android:text="上报时间：2022-03-01 22:22:22"
         android:textColor="@color/subTextColor" />
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_well_operation_recycleview.xml b/app/src/main/res/layout/item_well_operation_recycleview.xml
index 8a71c8b..2071e25 100644
--- a/app/src/main/res/layout/item_well_operation_recycleview.xml
+++ b/app/src/main/res/layout/item_well_operation_recycleview.xml
@@ -86,7 +86,7 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/dp_10"
             android:layout_toStartOf="@id/operationButton"
-            android:paddingHorizontal="@dimen/dp_10"
+            android:paddingHorizontal="@dimen/dp_15"
             android:paddingVertical="@dimen/dp_3"
             android:text="前往"
             android:textColor="@color/subTextColor"
@@ -97,7 +97,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
-            android:paddingHorizontal="@dimen/dp_10"
+            android:paddingHorizontal="@dimen/dp_15"
             android:paddingVertical="@dimen/dp_3"
             android:text="布防"
             android:textColor="@color/mainThemeColor"
diff --git a/app/src/main/res/layout/item_well_recycleview.xml b/app/src/main/res/layout/item_well_recycleview.xml
index b5ba53c..f153bc3 100644
--- a/app/src/main/res/layout/item_well_recycleview.xml
+++ b/app/src/main/res/layout/item_well_recycleview.xml
@@ -67,22 +67,28 @@
         android:text="权属单位：燃气集团总公司"
         android:textColor="@color/subTextColor" />
 
-    <TextView
-        android:id="@+id/wellLocationView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="闸井位置：航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所"
-        android:textColor="@color/subTextColor" />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
-    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-        android:id="@+id/navigationButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end"
-        android:layout_marginVertical="@dimen/dp_5"
-        android:paddingHorizontal="@dimen/dp_10"
-        android:paddingVertical="@dimen/dp_3"
-        android:text="前往"
-        android:textColor="@color/mainThemeColor"
-        app:qmui_borderColor="@color/mainThemeColor" />
+        <TextView
+            android:id="@+id/wellLocationView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="井位置：航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所"
+            android:textColor="@color/subTextColor" />
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+            android:id="@+id/navigationButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="@dimen/dp_10"
+            android:paddingHorizontal="@dimen/dp_20"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="前往"
+            android:textColor="@color/mainThemeColor"
+            app:qmui_borderColor="@color/mainThemeColor" />
+    </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/marker_gaode.xml b/app/src/main/res/layout/marker_gaode.xml
index 9bd62c2..15e9368 100644
--- a/app/src/main/res/layout/marker_gaode.xml
+++ b/app/src/main/res/layout/marker_gaode.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_solid_layout_main_color"
+    android:background="@drawable/bg_solid_layout_main_radius_5"
     android:orientation="vertical"
     android:paddingVertical="@dimen/dp_3">
 
diff --git a/app/src/main/res/layout/popu_map_info.xml b/app/src/main/res/layout/popu_map_info.xml
index 9ef64e9..bd6b147 100644
--- a/app/src/main/res/layout/popu_map_info.xml
+++ b/app/src/main/res/layout/popu_map_info.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_solid_layout_black_transparent_radius_10"
+    android:background="@drawable/bg_solid_layout_transparent_radius_10"
     android:orientation="vertical"
     android:padding="@dimen/dp_10">
 
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 90d2fde..63aa779 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -13,6 +13,7 @@
     <dimen name="dp_5">5dp</dimen>
     <dimen name="dp_7">7dp</dimen>
     <dimen name="dp_10">10dp</dimen>
+    <dimen name="dp_15">15dp</dimen>
     <dimen name="dp_20">20dp</dimen>
     <dimen name="dp_25">25dp</dimen>
     <dimen name="dp_30">30dp</dimen>

diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
deleted file mode 100644
index f00d59c..0000000
--- a/app/src/main/res/drawable/bg_layout.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_20.xml b/app/src/main/res/drawable/bg_layout_radius_20.xml
deleted file mode 100644
index 0c2abfe..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainBackColor" />
-
-    <corners
-        android:topLeftRadius="@dimen/dp_20"
-        android:topRightRadius="@dimen/dp_20" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_radius_5.xml b/app/src/main/res/drawable/bg_layout_radius_5.xml
deleted file mode 100644
index 5a90f4e..0000000
--- a/app/src/main/res/drawable/bg_layout_radius_5.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="5dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
deleted file mode 100644
index bca9c08..0000000
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <size android:height="155dp" />
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_3" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
deleted file mode 100644
index 15e6a4b..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_black_transparent_radius_10.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/transparentBlack" />
-
-    <corners android:radius="@dimen/dp_10" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_color.xml b/app/src/main/res/drawable/bg_solid_layout_main_color.xml
deleted file mode 100644
index e329b7d..0000000
--- a/app/src/main/res/drawable/bg_solid_layout_main_color.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/mainThemeColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
new file mode 100644
index 0000000..e329b7d
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_main_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_5" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
new file mode 100644
index 0000000..15e6a4b
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_transparent_radius_10.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/transparentBlack" />
+
+    <corners android:radius="@dimen/dp_10" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
new file mode 100644
index 0000000..5a90f4e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners android:radius="5dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
new file mode 100644
index 0000000..0c2abfe
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_20.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainBackColor" />
+
+    <corners
+        android:topLeftRadius="@dimen/dp_20"
+        android:topRightRadius="@dimen/dp_20" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
new file mode 100644
index 0000000..bca9c08
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <size android:height="155dp" />
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_3" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_order_completed_detail.xml b/app/src/main/res/layout/activity_order_completed_detail.xml
index 4333635..f2f88f4 100644
--- a/app/src/main/res/layout/activity_order_completed_detail.xml
+++ b/app/src/main/res/layout/activity_order_completed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml
index e406795..0e59210 100644
--- a/app/src/main/res/layout/activity_order_in_handle_detail.xml
+++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -101,7 +101,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -123,7 +123,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:inputType="textMultiLine"
                     android:padding="@dimen/dp_3"
@@ -149,7 +149,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
index cac4f32..4a02759 100644
--- a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -48,7 +48,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_layout_stroke_radius_3"
+                    android:background="@drawable/bg_stroke_layout_radius_3"
                     android:gravity="top"
                     android:hint="请输入现场情况"
                     android:inputType="textMultiLine"
@@ -112,7 +112,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_not_processed_detail.xml b/app/src/main/res/layout/activity_order_not_processed_detail.xml
index 5db1395..b68ae42 100644
--- a/app/src/main/res/layout/activity_order_not_processed_detail.xml
+++ b/app/src/main/res/layout/activity_order_not_processed_detail.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml
index 858051d..99b8b40 100644
--- a/app/src/main/res/layout/activity_order_search.xml
+++ b/app/src/main/res/layout/activity_order_search.xml
@@ -19,7 +19,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/dp_10"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <LinearLayout
diff --git a/app/src/main/res/layout/activity_user_detail.xml b/app/src/main/res/layout/activity_user_detail.xml
index c7be5d1..1464e4d 100644
--- a/app/src/main/res/layout/activity_user_detail.xml
+++ b/app/src/main/res/layout/activity_user_detail.xml
@@ -16,7 +16,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <RelativeLayout
diff --git a/app/src/main/res/layout/activity_well_detail.xml b/app/src/main/res/layout/activity_well_detail.xml
index 46dee2d..59c2bb4 100644
--- a/app/src/main/res/layout/activity_well_detail.xml
+++ b/app/src/main/res/layout/activity_well_detail.xml
@@ -23,7 +23,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <RelativeLayout style="@style/itemLayoutStyle">
@@ -160,7 +160,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
diff --git a/app/src/main/res/layout/dialog_bottom_sheet.xml b/app/src/main/res/layout/dialog_bottom_sheet.xml
index b88bd9d..bb7acf2 100644
--- a/app/src/main/res/layout/dialog_bottom_sheet.xml
+++ b/app/src/main/res/layout/dialog_bottom_sheet.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
     android:padding="@dimen/dp_10">
 
diff --git a/app/src/main/res/layout/dialog_single_choice.xml b/app/src/main/res/layout/dialog_single_choice.xml
index 2559b8d..2c92ace 100644
--- a/app/src/main/res/layout/dialog_single_choice.xml
+++ b/app/src/main/res/layout/dialog_single_choice.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical">
 
     <RelativeLayout
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 4f02f1f..30e607e 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -44,7 +44,7 @@
             android:id="@+id/bottomBehaviorLayout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@drawable/bg_layout_radius_20"
+            android:background="@drawable/bg_solid_layout_white_radius_top_20"
             android:orientation="vertical"
             app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
@@ -64,7 +64,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
-                android:background="@drawable/bg_layout">
+                android:background="@drawable/bg_solid_layout_white_radius_10">
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/homeRecyclerView"
@@ -77,7 +77,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
@@ -142,7 +142,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/bg_layout"
+                android:background="@drawable/bg_solid_layout_white_radius_10"
                 android:orientation="vertical">
 
                 <TextView
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index 9cb9a90..8ede317 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -30,7 +30,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp_20"
-            android:background="@drawable/bg_layout"
+            android:background="@drawable/bg_solid_layout_white_radius_10"
             android:orientation="vertical">
 
             <RelativeLayout
diff --git a/app/src/main/res/layout/include_base_order_detail.xml b/app/src/main/res/layout/include_base_order_detail.xml
index 5c2c11a..d84aec4 100644
--- a/app/src/main/res/layout/include_base_order_detail.xml
+++ b/app/src/main/res/layout/include_base_order_detail.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_layout"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical">
 
     <RelativeLayout style="@style/itemLayoutStyle">
diff --git a/app/src/main/res/layout/include_search_bar.xml b/app/src/main/res/layout/include_search_bar.xml
index 968f77b..64a106f 100644
--- a/app/src/main/res/layout/include_search_bar.xml
+++ b/app/src/main/res/layout/include_search_bar.xml
@@ -36,7 +36,7 @@
         android:layout_marginVertical="7dp"
         android:layout_marginEnd="@dimen/dp_10"
         android:layout_weight="3"
-        android:background="@drawable/bg_layout_radius_5">
+        android:background="@drawable/bg_solid_layout_white_radius_5">
 
         <ImageView
             android:id="@+id/searchImageView"
diff --git a/app/src/main/res/layout/item_order_completed_recycleview.xml b/app/src/main/res/layout/item_order_completed_recycleview.xml
index f1b1a76..ed6910e 100644
--- a/app/src/main/res/layout/item_order_completed_recycleview.xml
+++ b/app/src/main/res/layout/item_order_completed_recycleview.xml
@@ -3,11 +3,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
-    android:padding="@dimen/dp_10">
+    android:padding="@dimen/dp_5">
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_order_in_handle_recycleview.xml b/app/src/main/res/layout/item_order_in_handle_recycleview.xml
index f1b1a76..ed6910e 100644
--- a/app/src/main/res/layout/item_order_in_handle_recycleview.xml
+++ b/app/src/main/res/layout/item_order_in_handle_recycleview.xml
@@ -3,11 +3,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
-    android:padding="@dimen/dp_10">
+    android:padding="@dimen/dp_5">
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml b/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml
index 8c86055..05ff231 100644
--- a/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml
+++ b/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml
@@ -2,11 +2,11 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
-    android:padding="@dimen/dp_10">
+    android:padding="@dimen/dp_5">
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_order_not_processed_recycleview.xml b/app/src/main/res/layout/item_order_not_processed_recycleview.xml
index fcb0402..d9153c7 100644
--- a/app/src/main/res/layout/item_order_not_processed_recycleview.xml
+++ b/app/src/main/res/layout/item_order_not_processed_recycleview.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
-    android:padding="@dimen/dp_10">
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
 
     <LinearLayout
-        android:id="@+id/tempLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
@@ -33,43 +33,50 @@
             android:textColor="@color/subTextColor" />
     </LinearLayout>
 
-    <TextView
-        android:id="@+id/wellCodeView"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/tempLayout"
-        android:layout_marginTop="@dimen/dp_5"
-        android:text="@string/app_name"
-        android:textColor="@color/subTextColor" />
+        android:layout_marginVertical="@dimen/dp_5">
 
-    <TextView
-        android:id="@+id/alarmValueView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/tempLayout"
-        android:layout_alignParentEnd="true"
-        android:layout_marginTop="@dimen/dp_5"
-        android:text="5.5"
-        android:textColor="@color/redTextColor" />
+        <TextView
+            android:id="@+id/wellCodeView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/dp_5"
+            android:layout_weight="1"
+            android:text="@string/app_name"
+            android:textColor="@color/subTextColor" />
 
-    <TextView
-        android:id="@+id/wellLocationView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/wellCodeView"
-        android:layout_marginTop="@dimen/dp_5"
-        android:text="航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所"
-        android:textColor="@color/subTextColor" />
+        <TextView
+            android:id="@+id/alarmValueView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="5.5"
+            android:textColor="@color/redTextColor" />
+    </LinearLayout>
 
-    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-        android:id="@+id/operationButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/wellLocationView"
-        android:layout_alignParentEnd="true"
-        android:paddingHorizontal="@dimen/dp_10"
-        android:paddingVertical="@dimen/dp_3"
-        android:text="接单"
-        android:textColor="@color/mainThemeColor"
-        app:qmui_borderColor="@color/mainThemeColor" />
-</RelativeLayout>
\ No newline at end of file
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/wellLocationView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所"
+            android:textColor="@color/subTextColor" />
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+            android:id="@+id/operationButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="@dimen/dp_10"
+            android:paddingHorizontal="@dimen/dp_20"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="接单"
+            android:textColor="@color/mainThemeColor"
+            app:qmui_borderColor="@color/mainThemeColor" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_search_result_recycleview.xml b/app/src/main/res/layout/item_search_result_recycleview.xml
index 5a560ae..2ff5fa4 100644
--- a/app/src/main/res/layout/item_search_result_recycleview.xml
+++ b/app/src/main/res/layout/item_search_result_recycleview.xml
@@ -3,11 +3,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
     android:orientation="vertical"
-    android:padding="@dimen/dp_10">
+    android:padding="@dimen/dp_5">
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -78,7 +78,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
-            android:paddingHorizontal="@dimen/dp_10"
+            android:paddingHorizontal="@dimen/dp_15"
             android:paddingVertical="@dimen/dp_3"
             android:text="接单"
             android:textColor="@color/mainThemeColor"
diff --git a/app/src/main/res/layout/item_sensor_recycleview.xml b/app/src/main/res/layout/item_sensor_recycleview.xml
index e59b3f3..1fb8eed 100644
--- a/app/src/main/res/layout/item_sensor_recycleview.xml
+++ b/app/src/main/res/layout/item_sensor_recycleview.xml
@@ -1,36 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/dp_10"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_layout"
-    android:padding="@dimen/dp_10">
+    android:layout_marginHorizontal="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:background="@drawable/bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
 
-    <TextView
-        android:id="@+id/wellCodeView"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_toStartOf="@id/wellStateView"
-        android:text="412021160186"
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
+        android:orientation="horizontal">
 
-    <TextView
-        android:id="@+id/wellStateView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:text="离线"
-        android:textColor="@color/subTextColor" />
+        <TextView
+            android:id="@+id/wellCodeView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/dp_5"
+            android:layout_weight="1"
+            android:text="412021160186"
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/sp_16" />
+
+        <TextView
+            android:id="@+id/wellStateView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="离线"
+            android:textColor="@color/subTextColor" />
+    </LinearLayout>
 
     <TextView
         android:id="@+id/watchDataView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/wellCodeView"
-        android:layout_alignParentEnd="true"
-        android:layout_marginTop="@dimen/dp_5"
+        android:layout_marginVertical="@dimen/dp_5"
         android:gravity="center_vertical"
         android:text="井内水位：3m"
         android:textColor="@color/subTextColor" />
@@ -39,8 +44,6 @@
         android:id="@+id/installDateView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/watchDataView"
-        android:layout_marginTop="@dimen/dp_5"
         android:text="安装时间：2022-03-01"
         android:textColor="@color/subTextColor" />
 
@@ -48,8 +51,7 @@
         android:id="@+id/logTimeView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/installDateView"
         android:layout_marginTop="@dimen/dp_5"
         android:text="上报时间：2022-03-01 22:22:22"
         android:textColor="@color/subTextColor" />
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_well_operation_recycleview.xml b/app/src/main/res/layout/item_well_operation_recycleview.xml
index 8a71c8b..2071e25 100644
--- a/app/src/main/res/layout/item_well_operation_recycleview.xml
+++ b/app/src/main/res/layout/item_well_operation_recycleview.xml
@@ -86,7 +86,7 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/dp_10"
             android:layout_toStartOf="@id/operationButton"
-            android:paddingHorizontal="@dimen/dp_10"
+            android:paddingHorizontal="@dimen/dp_15"
             android:paddingVertical="@dimen/dp_3"
             android:text="前往"
             android:textColor="@color/subTextColor"
@@ -97,7 +97,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
-            android:paddingHorizontal="@dimen/dp_10"
+            android:paddingHorizontal="@dimen/dp_15"
             android:paddingVertical="@dimen/dp_3"
             android:text="布防"
             android:textColor="@color/mainThemeColor"
diff --git a/app/src/main/res/layout/item_well_recycleview.xml b/app/src/main/res/layout/item_well_recycleview.xml
index b5ba53c..f153bc3 100644
--- a/app/src/main/res/layout/item_well_recycleview.xml
+++ b/app/src/main/res/layout/item_well_recycleview.xml
@@ -67,22 +67,28 @@
         android:text="权属单位：燃气集团总公司"
         android:textColor="@color/subTextColor" />
 
-    <TextView
-        android:id="@+id/wellLocationView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="闸井位置：航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所"
-        android:textColor="@color/subTextColor" />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
-    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-        android:id="@+id/navigationButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end"
-        android:layout_marginVertical="@dimen/dp_5"
-        android:paddingHorizontal="@dimen/dp_10"
-        android:paddingVertical="@dimen/dp_3"
-        android:text="前往"
-        android:textColor="@color/mainThemeColor"
-        app:qmui_borderColor="@color/mainThemeColor" />
+        <TextView
+            android:id="@+id/wellLocationView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="井位置：航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所"
+            android:textColor="@color/subTextColor" />
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+            android:id="@+id/navigationButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="@dimen/dp_10"
+            android:paddingHorizontal="@dimen/dp_20"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="前往"
+            android:textColor="@color/mainThemeColor"
+            app:qmui_borderColor="@color/mainThemeColor" />
+    </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/marker_gaode.xml b/app/src/main/res/layout/marker_gaode.xml
index 9bd62c2..15e9368 100644
--- a/app/src/main/res/layout/marker_gaode.xml
+++ b/app/src/main/res/layout/marker_gaode.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_solid_layout_main_color"
+    android:background="@drawable/bg_solid_layout_main_radius_5"
     android:orientation="vertical"
     android:paddingVertical="@dimen/dp_3">
 
diff --git a/app/src/main/res/layout/popu_map_info.xml b/app/src/main/res/layout/popu_map_info.xml
index 9ef64e9..bd6b147 100644
--- a/app/src/main/res/layout/popu_map_info.xml
+++ b/app/src/main/res/layout/popu_map_info.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_solid_layout_black_transparent_radius_10"
+    android:background="@drawable/bg_solid_layout_transparent_radius_10"
     android:orientation="vertical"
     android:padding="@dimen/dp_10">
 
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 90d2fde..63aa779 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -13,6 +13,7 @@
     <dimen name="dp_5">5dp</dimen>
     <dimen name="dp_7">7dp</dimen>
     <dimen name="dp_10">10dp</dimen>
+    <dimen name="dp_15">15dp</dimen>
     <dimen name="dp_20">20dp</dimen>
     <dimen name="dp_25">25dp</dimen>
     <dimen name="dp_30">30dp</dimen>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 34b67f8..f1a040f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -40,7 +40,7 @@
     <style name="itemLayoutStyle">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">@dimen/itemLayoutHeight</item>
-        <item name="android:background">@drawable/bg_layout</item>
+        <item name="android:background">@drawable/bg_solid_layout_white_radius_10</item>
     </style>
 
     <!--等高RelativeLayout 里面TextView样式-->