diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
index b8f589c..9b25651 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
@@ -4,7 +4,6 @@
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
-import android.view.View
 import android.view.animation.LinearInterpolator
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -23,7 +22,6 @@
 import com.casic.app.smartwell.vm.WellTypeViewModel
 import com.casic.app.smartwell.widgets.EasyPopupWindow
 import kotlinx.android.synthetic.main.activity_well_management.*
-import kotlinx.android.synthetic.main.include_base_title.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_search_bar.*
 import java.lang.ref.WeakReference
@@ -48,9 +46,7 @@
     override fun initLayoutView(): Int = R.layout.activity_well_management
 
     override fun setupTopBarLayout() {
-        titleView.text = "窨井管理"
-        leftBackView.visibility = View.VISIBLE
-        leftBackView.setOnClickListener { finish() }
+
     }
 
     override fun initData() {

diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
index b8f589c..9b25651 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
@@ -4,7 +4,6 @@
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
-import android.view.View
 import android.view.animation.LinearInterpolator
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -23,7 +22,6 @@
 import com.casic.app.smartwell.vm.WellTypeViewModel
 import com.casic.app.smartwell.widgets.EasyPopupWindow
 import kotlinx.android.synthetic.main.activity_well_management.*
-import kotlinx.android.synthetic.main.include_base_title.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_search_bar.*
 import java.lang.ref.WeakReference
@@ -48,9 +46,7 @@
     override fun initLayoutView(): Int = R.layout.activity_well_management
 
     override fun setupTopBarLayout() {
-        titleView.text = "窨井管理"
-        leftBackView.visibility = View.VISIBLE
-        leftBackView.setOnClickListener { finish() }
+
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
index 9876f1e..561d5d4 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
@@ -4,7 +4,6 @@
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
-import android.view.View
 import android.view.animation.LinearInterpolator
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -27,7 +26,6 @@
 import com.casic.app.smartwell.widgets.EasyPopupWindow
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.activity_well_operation.*
-import kotlinx.android.synthetic.main.include_base_title.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_search_bar.*
 import java.lang.ref.WeakReference
@@ -53,9 +51,7 @@
     override fun initLayoutView(): Int = R.layout.activity_well_operation
 
     override fun setupTopBarLayout() {
-        titleView.text = "布防撤防"
-        leftBackView.visibility = View.VISIBLE
-        leftBackView.setOnClickListener { finish() }
+
     }
 
     override fun initData() {

diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
index b8f589c..9b25651 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
@@ -4,7 +4,6 @@
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
-import android.view.View
 import android.view.animation.LinearInterpolator
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -23,7 +22,6 @@
 import com.casic.app.smartwell.vm.WellTypeViewModel
 import com.casic.app.smartwell.widgets.EasyPopupWindow
 import kotlinx.android.synthetic.main.activity_well_management.*
-import kotlinx.android.synthetic.main.include_base_title.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_search_bar.*
 import java.lang.ref.WeakReference
@@ -48,9 +46,7 @@
     override fun initLayoutView(): Int = R.layout.activity_well_management
 
     override fun setupTopBarLayout() {
-        titleView.text = "窨井管理"
-        leftBackView.visibility = View.VISIBLE
-        leftBackView.setOnClickListener { finish() }
+
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
index 9876f1e..561d5d4 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
@@ -4,7 +4,6 @@
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
-import android.view.View
 import android.view.animation.LinearInterpolator
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -27,7 +26,6 @@
 import com.casic.app.smartwell.widgets.EasyPopupWindow
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.activity_well_operation.*
-import kotlinx.android.synthetic.main.include_base_title.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_search_bar.*
 import java.lang.ref.WeakReference
@@ -53,9 +51,7 @@
     override fun initLayoutView(): Int = R.layout.activity_well_operation
 
     override fun setupTopBarLayout() {
-        titleView.text = "布防撤防"
-        leftBackView.visibility = View.VISIBLE
-        leftBackView.setOnClickListener { finish() }
+
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
index ed8f009..78e7414 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
@@ -28,6 +28,8 @@
 import com.casic.app.smartwell.vm.WellListViewModel
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.pengxh.app.multilib.utils.SizeUtil
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.fragment_home.view.*
 import kotlinx.android.synthetic.main.include_base_title.view.*
@@ -62,6 +64,18 @@
         homeView = inflater.inflate(R.layout.fragment_home, container, false)
         homeView.titleView.text = "首页"
 
+        //代码设置底部拉升距离
+        val bottomSheetBehavior = BottomSheetBehavior.from(homeView.bottomBehaviorLayout)
+        homeView.coordinatorLayout.post {
+            bottomSheetBehavior.isFitToContents = false
+            bottomSheetBehavior.halfExpandedRatio = 0.23f
+            bottomSheetBehavior.isHideable = false
+            bottomSheetBehavior.peekHeight = SizeUtil.dp2px(requireContext(), 30f)
+            bottomSheetBehavior.setExpandedOffset(
+                (SizeUtil.getScreenHeight(requireContext()) * 0.3).toInt()
+            )
+        }
+
         //初始化vm
         wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java)
         workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)

diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
index b8f589c..9b25651 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
@@ -4,7 +4,6 @@
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
-import android.view.View
 import android.view.animation.LinearInterpolator
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -23,7 +22,6 @@
 import com.casic.app.smartwell.vm.WellTypeViewModel
 import com.casic.app.smartwell.widgets.EasyPopupWindow
 import kotlinx.android.synthetic.main.activity_well_management.*
-import kotlinx.android.synthetic.main.include_base_title.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_search_bar.*
 import java.lang.ref.WeakReference
@@ -48,9 +46,7 @@
     override fun initLayoutView(): Int = R.layout.activity_well_management
 
     override fun setupTopBarLayout() {
-        titleView.text = "窨井管理"
-        leftBackView.visibility = View.VISIBLE
-        leftBackView.setOnClickListener { finish() }
+
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
index 9876f1e..561d5d4 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
@@ -4,7 +4,6 @@
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
-import android.view.View
 import android.view.animation.LinearInterpolator
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -27,7 +26,6 @@
 import com.casic.app.smartwell.widgets.EasyPopupWindow
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.activity_well_operation.*
-import kotlinx.android.synthetic.main.include_base_title.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_search_bar.*
 import java.lang.ref.WeakReference
@@ -53,9 +51,7 @@
     override fun initLayoutView(): Int = R.layout.activity_well_operation
 
     override fun setupTopBarLayout() {
-        titleView.text = "布防撤防"
-        leftBackView.visibility = View.VISIBLE
-        leftBackView.setOnClickListener { finish() }
+
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
index ed8f009..78e7414 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
@@ -28,6 +28,8 @@
 import com.casic.app.smartwell.vm.WellListViewModel
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.pengxh.app.multilib.utils.SizeUtil
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.fragment_home.view.*
 import kotlinx.android.synthetic.main.include_base_title.view.*
@@ -62,6 +64,18 @@
         homeView = inflater.inflate(R.layout.fragment_home, container, false)
         homeView.titleView.text = "首页"
 
+        //代码设置底部拉升距离
+        val bottomSheetBehavior = BottomSheetBehavior.from(homeView.bottomBehaviorLayout)
+        homeView.coordinatorLayout.post {
+            bottomSheetBehavior.isFitToContents = false
+            bottomSheetBehavior.halfExpandedRatio = 0.23f
+            bottomSheetBehavior.isHideable = false
+            bottomSheetBehavior.peekHeight = SizeUtil.dp2px(requireContext(), 30f)
+            bottomSheetBehavior.setExpandedOffset(
+                (SizeUtil.getScreenHeight(requireContext()) * 0.3).toInt()
+            )
+        }
+
         //初始化vm
         wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java)
         workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
index d56f439..f00d59c 100644
--- a/app/src/main/res/drawable/bg_layout.xml
+++ b/app/src/main/res/drawable/bg_layout.xml
@@ -4,5 +4,5 @@
 
     <solid android:color="@color/white" />
 
-    <corners android:radius="10dp" />
+    <corners android:radius="@dimen/dp_10" />
 </shape>
\ No newline at end of file

diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
index b8f589c..9b25651 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
@@ -4,7 +4,6 @@
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
-import android.view.View
 import android.view.animation.LinearInterpolator
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -23,7 +22,6 @@
 import com.casic.app.smartwell.vm.WellTypeViewModel
 import com.casic.app.smartwell.widgets.EasyPopupWindow
 import kotlinx.android.synthetic.main.activity_well_management.*
-import kotlinx.android.synthetic.main.include_base_title.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_search_bar.*
 import java.lang.ref.WeakReference
@@ -48,9 +46,7 @@
     override fun initLayoutView(): Int = R.layout.activity_well_management
 
     override fun setupTopBarLayout() {
-        titleView.text = "窨井管理"
-        leftBackView.visibility = View.VISIBLE
-        leftBackView.setOnClickListener { finish() }
+
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
index 9876f1e..561d5d4 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
@@ -4,7 +4,6 @@
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
-import android.view.View
 import android.view.animation.LinearInterpolator
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -27,7 +26,6 @@
 import com.casic.app.smartwell.widgets.EasyPopupWindow
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.activity_well_operation.*
-import kotlinx.android.synthetic.main.include_base_title.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_search_bar.*
 import java.lang.ref.WeakReference
@@ -53,9 +51,7 @@
     override fun initLayoutView(): Int = R.layout.activity_well_operation
 
     override fun setupTopBarLayout() {
-        titleView.text = "布防撤防"
-        leftBackView.visibility = View.VISIBLE
-        leftBackView.setOnClickListener { finish() }
+
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
index ed8f009..78e7414 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
@@ -28,6 +28,8 @@
 import com.casic.app.smartwell.vm.WellListViewModel
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.pengxh.app.multilib.utils.SizeUtil
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.fragment_home.view.*
 import kotlinx.android.synthetic.main.include_base_title.view.*
@@ -62,6 +64,18 @@
         homeView = inflater.inflate(R.layout.fragment_home, container, false)
         homeView.titleView.text = "首页"
 
+        //代码设置底部拉升距离
+        val bottomSheetBehavior = BottomSheetBehavior.from(homeView.bottomBehaviorLayout)
+        homeView.coordinatorLayout.post {
+            bottomSheetBehavior.isFitToContents = false
+            bottomSheetBehavior.halfExpandedRatio = 0.23f
+            bottomSheetBehavior.isHideable = false
+            bottomSheetBehavior.peekHeight = SizeUtil.dp2px(requireContext(), 30f)
+            bottomSheetBehavior.setExpandedOffset(
+                (SizeUtil.getScreenHeight(requireContext()) * 0.3).toInt()
+            )
+        }
+
         //初始化vm
         wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java)
         workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
index d56f439..f00d59c 100644
--- a/app/src/main/res/drawable/bg_layout.xml
+++ b/app/src/main/res/drawable/bg_layout.xml
@@ -4,5 +4,5 @@
 
     <solid android:color="@color/white" />
 
-    <corners android:radius="10dp" />
+    <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
index ba81626..0c2abfe 100644
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ b/app/src/main/res/drawable/bg_layout_radius_20.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="@color/white" />
+    <solid android:color="@color/mainBackColor" />
 
     <corners
         android:topLeftRadius="@dimen/dp_20"

diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
index b8f589c..9b25651 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
@@ -4,7 +4,6 @@
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
-import android.view.View
 import android.view.animation.LinearInterpolator
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -23,7 +22,6 @@
 import com.casic.app.smartwell.vm.WellTypeViewModel
 import com.casic.app.smartwell.widgets.EasyPopupWindow
 import kotlinx.android.synthetic.main.activity_well_management.*
-import kotlinx.android.synthetic.main.include_base_title.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_search_bar.*
 import java.lang.ref.WeakReference
@@ -48,9 +46,7 @@
     override fun initLayoutView(): Int = R.layout.activity_well_management
 
     override fun setupTopBarLayout() {
-        titleView.text = "窨井管理"
-        leftBackView.visibility = View.VISIBLE
-        leftBackView.setOnClickListener { finish() }
+
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
index 9876f1e..561d5d4 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
@@ -4,7 +4,6 @@
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
-import android.view.View
 import android.view.animation.LinearInterpolator
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -27,7 +26,6 @@
 import com.casic.app.smartwell.widgets.EasyPopupWindow
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.activity_well_operation.*
-import kotlinx.android.synthetic.main.include_base_title.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_search_bar.*
 import java.lang.ref.WeakReference
@@ -53,9 +51,7 @@
     override fun initLayoutView(): Int = R.layout.activity_well_operation
 
     override fun setupTopBarLayout() {
-        titleView.text = "布防撤防"
-        leftBackView.visibility = View.VISIBLE
-        leftBackView.setOnClickListener { finish() }
+
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
index ed8f009..78e7414 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
@@ -28,6 +28,8 @@
 import com.casic.app.smartwell.vm.WellListViewModel
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.pengxh.app.multilib.utils.SizeUtil
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.fragment_home.view.*
 import kotlinx.android.synthetic.main.include_base_title.view.*
@@ -62,6 +64,18 @@
         homeView = inflater.inflate(R.layout.fragment_home, container, false)
         homeView.titleView.text = "首页"
 
+        //代码设置底部拉升距离
+        val bottomSheetBehavior = BottomSheetBehavior.from(homeView.bottomBehaviorLayout)
+        homeView.coordinatorLayout.post {
+            bottomSheetBehavior.isFitToContents = false
+            bottomSheetBehavior.halfExpandedRatio = 0.23f
+            bottomSheetBehavior.isHideable = false
+            bottomSheetBehavior.peekHeight = SizeUtil.dp2px(requireContext(), 30f)
+            bottomSheetBehavior.setExpandedOffset(
+                (SizeUtil.getScreenHeight(requireContext()) * 0.3).toInt()
+            )
+        }
+
         //初始化vm
         wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java)
         workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
index d56f439..f00d59c 100644
--- a/app/src/main/res/drawable/bg_layout.xml
+++ b/app/src/main/res/drawable/bg_layout.xml
@@ -4,5 +4,5 @@
 
     <solid android:color="@color/white" />
 
-    <corners android:radius="10dp" />
+    <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
index ba81626..0c2abfe 100644
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ b/app/src/main/res/drawable/bg_layout_radius_20.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="@color/white" />
+    <solid android:color="@color/mainBackColor" />
 
     <corners
         android:topLeftRadius="@dimen/dp_20"
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
index 122b9cd..bca9c08 100644
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
@@ -6,7 +6,7 @@
 
     <stroke
         android:width="1dp"
-        android:color="@color/mainBackground" />
+        android:color="@color/mainBackColor" />
 
     <corners android:radius="@dimen/dp_3" />
 </shape>
\ No newline at end of file

diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
index b8f589c..9b25651 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
@@ -4,7 +4,6 @@
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
-import android.view.View
 import android.view.animation.LinearInterpolator
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -23,7 +22,6 @@
 import com.casic.app.smartwell.vm.WellTypeViewModel
 import com.casic.app.smartwell.widgets.EasyPopupWindow
 import kotlinx.android.synthetic.main.activity_well_management.*
-import kotlinx.android.synthetic.main.include_base_title.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_search_bar.*
 import java.lang.ref.WeakReference
@@ -48,9 +46,7 @@
     override fun initLayoutView(): Int = R.layout.activity_well_management
 
     override fun setupTopBarLayout() {
-        titleView.text = "窨井管理"
-        leftBackView.visibility = View.VISIBLE
-        leftBackView.setOnClickListener { finish() }
+
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
index 9876f1e..561d5d4 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
@@ -4,7 +4,6 @@
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
-import android.view.View
 import android.view.animation.LinearInterpolator
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -27,7 +26,6 @@
 import com.casic.app.smartwell.widgets.EasyPopupWindow
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.activity_well_operation.*
-import kotlinx.android.synthetic.main.include_base_title.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_search_bar.*
 import java.lang.ref.WeakReference
@@ -53,9 +51,7 @@
     override fun initLayoutView(): Int = R.layout.activity_well_operation
 
     override fun setupTopBarLayout() {
-        titleView.text = "布防撤防"
-        leftBackView.visibility = View.VISIBLE
-        leftBackView.setOnClickListener { finish() }
+
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
index ed8f009..78e7414 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
@@ -28,6 +28,8 @@
 import com.casic.app.smartwell.vm.WellListViewModel
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.pengxh.app.multilib.utils.SizeUtil
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.fragment_home.view.*
 import kotlinx.android.synthetic.main.include_base_title.view.*
@@ -62,6 +64,18 @@
         homeView = inflater.inflate(R.layout.fragment_home, container, false)
         homeView.titleView.text = "首页"
 
+        //代码设置底部拉升距离
+        val bottomSheetBehavior = BottomSheetBehavior.from(homeView.bottomBehaviorLayout)
+        homeView.coordinatorLayout.post {
+            bottomSheetBehavior.isFitToContents = false
+            bottomSheetBehavior.halfExpandedRatio = 0.23f
+            bottomSheetBehavior.isHideable = false
+            bottomSheetBehavior.peekHeight = SizeUtil.dp2px(requireContext(), 30f)
+            bottomSheetBehavior.setExpandedOffset(
+                (SizeUtil.getScreenHeight(requireContext()) * 0.3).toInt()
+            )
+        }
+
         //初始化vm
         wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java)
         workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
index d56f439..f00d59c 100644
--- a/app/src/main/res/drawable/bg_layout.xml
+++ b/app/src/main/res/drawable/bg_layout.xml
@@ -4,5 +4,5 @@
 
     <solid android:color="@color/white" />
 
-    <corners android:radius="10dp" />
+    <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
index ba81626..0c2abfe 100644
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ b/app/src/main/res/drawable/bg_layout_radius_20.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="@color/white" />
+    <solid android:color="@color/mainBackColor" />
 
     <corners
         android:topLeftRadius="@dimen/dp_20"
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
index 122b9cd..bca9c08 100644
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
@@ -6,7 +6,7 @@
 
     <stroke
         android:width="1dp"
-        android:color="@color/mainBackground" />
+        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/bottom_short_line.xml b/app/src/main/res/drawable/bottom_short_line.xml
new file mode 100644
index 0000000..10c9062
--- /dev/null
+++ b/app/src/main/res/drawable/bottom_short_line.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">
+
+    <solid android:color="@color/subTextColor" />
+
+    <corners android:radius="@dimen/dp_10" />
+
+    <size
+        android:width="@dimen/dp_30"
+        android:height="@dimen/dp_3" />
+</shape>
\ No newline at end of file

diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
index b8f589c..9b25651 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
@@ -4,7 +4,6 @@
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
-import android.view.View
 import android.view.animation.LinearInterpolator
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -23,7 +22,6 @@
 import com.casic.app.smartwell.vm.WellTypeViewModel
 import com.casic.app.smartwell.widgets.EasyPopupWindow
 import kotlinx.android.synthetic.main.activity_well_management.*
-import kotlinx.android.synthetic.main.include_base_title.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_search_bar.*
 import java.lang.ref.WeakReference
@@ -48,9 +46,7 @@
     override fun initLayoutView(): Int = R.layout.activity_well_management
 
     override fun setupTopBarLayout() {
-        titleView.text = "窨井管理"
-        leftBackView.visibility = View.VISIBLE
-        leftBackView.setOnClickListener { finish() }
+
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
index 9876f1e..561d5d4 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
@@ -4,7 +4,6 @@
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
-import android.view.View
 import android.view.animation.LinearInterpolator
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -27,7 +26,6 @@
 import com.casic.app.smartwell.widgets.EasyPopupWindow
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.activity_well_operation.*
-import kotlinx.android.synthetic.main.include_base_title.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_search_bar.*
 import java.lang.ref.WeakReference
@@ -53,9 +51,7 @@
     override fun initLayoutView(): Int = R.layout.activity_well_operation
 
     override fun setupTopBarLayout() {
-        titleView.text = "布防撤防"
-        leftBackView.visibility = View.VISIBLE
-        leftBackView.setOnClickListener { finish() }
+
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
index ed8f009..78e7414 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
@@ -28,6 +28,8 @@
 import com.casic.app.smartwell.vm.WellListViewModel
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.pengxh.app.multilib.utils.SizeUtil
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.fragment_home.view.*
 import kotlinx.android.synthetic.main.include_base_title.view.*
@@ -62,6 +64,18 @@
         homeView = inflater.inflate(R.layout.fragment_home, container, false)
         homeView.titleView.text = "首页"
 
+        //代码设置底部拉升距离
+        val bottomSheetBehavior = BottomSheetBehavior.from(homeView.bottomBehaviorLayout)
+        homeView.coordinatorLayout.post {
+            bottomSheetBehavior.isFitToContents = false
+            bottomSheetBehavior.halfExpandedRatio = 0.23f
+            bottomSheetBehavior.isHideable = false
+            bottomSheetBehavior.peekHeight = SizeUtil.dp2px(requireContext(), 30f)
+            bottomSheetBehavior.setExpandedOffset(
+                (SizeUtil.getScreenHeight(requireContext()) * 0.3).toInt()
+            )
+        }
+
         //初始化vm
         wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java)
         workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
index d56f439..f00d59c 100644
--- a/app/src/main/res/drawable/bg_layout.xml
+++ b/app/src/main/res/drawable/bg_layout.xml
@@ -4,5 +4,5 @@
 
     <solid android:color="@color/white" />
 
-    <corners android:radius="10dp" />
+    <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
index ba81626..0c2abfe 100644
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ b/app/src/main/res/drawable/bg_layout_radius_20.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="@color/white" />
+    <solid android:color="@color/mainBackColor" />
 
     <corners
         android:topLeftRadius="@dimen/dp_20"
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
index 122b9cd..bca9c08 100644
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
@@ -6,7 +6,7 @@
 
     <stroke
         android:width="1dp"
-        android:color="@color/mainBackground" />
+        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/bottom_short_line.xml b/app/src/main/res/drawable/bottom_short_line.xml
new file mode 100644
index 0000000..10c9062
--- /dev/null
+++ b/app/src/main/res/drawable/bottom_short_line.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">
+
+    <solid android:color="@color/subTextColor" />
+
+    <corners android:radius="@dimen/dp_10" />
+
+    <size
+        android:width="@dimen/dp_30"
+        android:height="@dimen/dp_3" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_up.xml b/app/src/main/res/drawable/ic_up.xml
index 151a0cb..75c718f 100644
--- a/app/src/main/res/drawable/ic_up.xml
+++ b/app/src/main/res/drawable/ic_up.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
+        android:fillColor="@color/white"
         android:pathData="M938.7,704c0,10.9 -4.2,21.8 -12.5,30.2 -16.7,16.7 -43.7,16.7 -60.3,0L512,380.3 158.2,734.2c-16.7,16.7 -43.7,16.7 -60.3,0s-16.7,-43.7 0,-60.3l384,-384c16.7,-16.7 43.7,-16.7 60.3,0l384,384c8.3,8.3 12.5,19.2 12.5,30.1z" />
 </vector>

diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
index b8f589c..9b25651 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
@@ -4,7 +4,6 @@
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
-import android.view.View
 import android.view.animation.LinearInterpolator
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -23,7 +22,6 @@
 import com.casic.app.smartwell.vm.WellTypeViewModel
 import com.casic.app.smartwell.widgets.EasyPopupWindow
 import kotlinx.android.synthetic.main.activity_well_management.*
-import kotlinx.android.synthetic.main.include_base_title.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_search_bar.*
 import java.lang.ref.WeakReference
@@ -48,9 +46,7 @@
     override fun initLayoutView(): Int = R.layout.activity_well_management
 
     override fun setupTopBarLayout() {
-        titleView.text = "窨井管理"
-        leftBackView.visibility = View.VISIBLE
-        leftBackView.setOnClickListener { finish() }
+
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
index 9876f1e..561d5d4 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
@@ -4,7 +4,6 @@
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
-import android.view.View
 import android.view.animation.LinearInterpolator
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -27,7 +26,6 @@
 import com.casic.app.smartwell.widgets.EasyPopupWindow
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.activity_well_operation.*
-import kotlinx.android.synthetic.main.include_base_title.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_search_bar.*
 import java.lang.ref.WeakReference
@@ -53,9 +51,7 @@
     override fun initLayoutView(): Int = R.layout.activity_well_operation
 
     override fun setupTopBarLayout() {
-        titleView.text = "布防撤防"
-        leftBackView.visibility = View.VISIBLE
-        leftBackView.setOnClickListener { finish() }
+
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
index ed8f009..78e7414 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
@@ -28,6 +28,8 @@
 import com.casic.app.smartwell.vm.WellListViewModel
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.pengxh.app.multilib.utils.SizeUtil
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.fragment_home.view.*
 import kotlinx.android.synthetic.main.include_base_title.view.*
@@ -62,6 +64,18 @@
         homeView = inflater.inflate(R.layout.fragment_home, container, false)
         homeView.titleView.text = "首页"
 
+        //代码设置底部拉升距离
+        val bottomSheetBehavior = BottomSheetBehavior.from(homeView.bottomBehaviorLayout)
+        homeView.coordinatorLayout.post {
+            bottomSheetBehavior.isFitToContents = false
+            bottomSheetBehavior.halfExpandedRatio = 0.23f
+            bottomSheetBehavior.isHideable = false
+            bottomSheetBehavior.peekHeight = SizeUtil.dp2px(requireContext(), 30f)
+            bottomSheetBehavior.setExpandedOffset(
+                (SizeUtil.getScreenHeight(requireContext()) * 0.3).toInt()
+            )
+        }
+
         //初始化vm
         wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java)
         workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
index d56f439..f00d59c 100644
--- a/app/src/main/res/drawable/bg_layout.xml
+++ b/app/src/main/res/drawable/bg_layout.xml
@@ -4,5 +4,5 @@
 
     <solid android:color="@color/white" />
 
-    <corners android:radius="10dp" />
+    <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
index ba81626..0c2abfe 100644
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ b/app/src/main/res/drawable/bg_layout_radius_20.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="@color/white" />
+    <solid android:color="@color/mainBackColor" />
 
     <corners
         android:topLeftRadius="@dimen/dp_20"
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
index 122b9cd..bca9c08 100644
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
@@ -6,7 +6,7 @@
 
     <stroke
         android:width="1dp"
-        android:color="@color/mainBackground" />
+        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/bottom_short_line.xml b/app/src/main/res/drawable/bottom_short_line.xml
new file mode 100644
index 0000000..10c9062
--- /dev/null
+++ b/app/src/main/res/drawable/bottom_short_line.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">
+
+    <solid android:color="@color/subTextColor" />
+
+    <corners android:radius="@dimen/dp_10" />
+
+    <size
+        android:width="@dimen/dp_30"
+        android:height="@dimen/dp_3" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_up.xml b/app/src/main/res/drawable/ic_up.xml
index 151a0cb..75c718f 100644
--- a/app/src/main/res/drawable/ic_up.xml
+++ b/app/src/main/res/drawable/ic_up.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
+        android:fillColor="@color/white"
         android:pathData="M938.7,704c0,10.9 -4.2,21.8 -12.5,30.2 -16.7,16.7 -43.7,16.7 -60.3,0L512,380.3 158.2,734.2c-16.7,16.7 -43.7,16.7 -60.3,0s-16.7,-43.7 0,-60.3l384,-384c16.7,-16.7 43.7,-16.7 60.3,0l384,384c8.3,8.3 12.5,19.2 12.5,30.1z" />
 </vector>
diff --git a/app/src/main/res/drawable/tag_normal.xml b/app/src/main/res/drawable/tag_normal.xml
index bb88697..d38b7cc 100644
--- a/app/src/main/res/drawable/tag_normal.xml
+++ b/app/src/main/res/drawable/tag_normal.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/mainBackground" />
+    <solid android:color="@color/mainBackColor" />
 
     <corners android:radius="@dimen/dp_3" />
 

diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
index b8f589c..9b25651 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
@@ -4,7 +4,6 @@
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
-import android.view.View
 import android.view.animation.LinearInterpolator
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -23,7 +22,6 @@
 import com.casic.app.smartwell.vm.WellTypeViewModel
 import com.casic.app.smartwell.widgets.EasyPopupWindow
 import kotlinx.android.synthetic.main.activity_well_management.*
-import kotlinx.android.synthetic.main.include_base_title.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_search_bar.*
 import java.lang.ref.WeakReference
@@ -48,9 +46,7 @@
     override fun initLayoutView(): Int = R.layout.activity_well_management
 
     override fun setupTopBarLayout() {
-        titleView.text = "窨井管理"
-        leftBackView.visibility = View.VISIBLE
-        leftBackView.setOnClickListener { finish() }
+
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
index 9876f1e..561d5d4 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
@@ -4,7 +4,6 @@
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
-import android.view.View
 import android.view.animation.LinearInterpolator
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -27,7 +26,6 @@
 import com.casic.app.smartwell.widgets.EasyPopupWindow
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.activity_well_operation.*
-import kotlinx.android.synthetic.main.include_base_title.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_search_bar.*
 import java.lang.ref.WeakReference
@@ -53,9 +51,7 @@
     override fun initLayoutView(): Int = R.layout.activity_well_operation
 
     override fun setupTopBarLayout() {
-        titleView.text = "布防撤防"
-        leftBackView.visibility = View.VISIBLE
-        leftBackView.setOnClickListener { finish() }
+
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
index ed8f009..78e7414 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
@@ -28,6 +28,8 @@
 import com.casic.app.smartwell.vm.WellListViewModel
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.pengxh.app.multilib.utils.SizeUtil
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.fragment_home.view.*
 import kotlinx.android.synthetic.main.include_base_title.view.*
@@ -62,6 +64,18 @@
         homeView = inflater.inflate(R.layout.fragment_home, container, false)
         homeView.titleView.text = "首页"
 
+        //代码设置底部拉升距离
+        val bottomSheetBehavior = BottomSheetBehavior.from(homeView.bottomBehaviorLayout)
+        homeView.coordinatorLayout.post {
+            bottomSheetBehavior.isFitToContents = false
+            bottomSheetBehavior.halfExpandedRatio = 0.23f
+            bottomSheetBehavior.isHideable = false
+            bottomSheetBehavior.peekHeight = SizeUtil.dp2px(requireContext(), 30f)
+            bottomSheetBehavior.setExpandedOffset(
+                (SizeUtil.getScreenHeight(requireContext()) * 0.3).toInt()
+            )
+        }
+
         //初始化vm
         wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java)
         workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
index d56f439..f00d59c 100644
--- a/app/src/main/res/drawable/bg_layout.xml
+++ b/app/src/main/res/drawable/bg_layout.xml
@@ -4,5 +4,5 @@
 
     <solid android:color="@color/white" />
 
-    <corners android:radius="10dp" />
+    <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
index ba81626..0c2abfe 100644
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ b/app/src/main/res/drawable/bg_layout_radius_20.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="@color/white" />
+    <solid android:color="@color/mainBackColor" />
 
     <corners
         android:topLeftRadius="@dimen/dp_20"
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
index 122b9cd..bca9c08 100644
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
@@ -6,7 +6,7 @@
 
     <stroke
         android:width="1dp"
-        android:color="@color/mainBackground" />
+        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/bottom_short_line.xml b/app/src/main/res/drawable/bottom_short_line.xml
new file mode 100644
index 0000000..10c9062
--- /dev/null
+++ b/app/src/main/res/drawable/bottom_short_line.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">
+
+    <solid android:color="@color/subTextColor" />
+
+    <corners android:radius="@dimen/dp_10" />
+
+    <size
+        android:width="@dimen/dp_30"
+        android:height="@dimen/dp_3" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_up.xml b/app/src/main/res/drawable/ic_up.xml
index 151a0cb..75c718f 100644
--- a/app/src/main/res/drawable/ic_up.xml
+++ b/app/src/main/res/drawable/ic_up.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
+        android:fillColor="@color/white"
         android:pathData="M938.7,704c0,10.9 -4.2,21.8 -12.5,30.2 -16.7,16.7 -43.7,16.7 -60.3,0L512,380.3 158.2,734.2c-16.7,16.7 -43.7,16.7 -60.3,0s-16.7,-43.7 0,-60.3l384,-384c16.7,-16.7 43.7,-16.7 60.3,0l384,384c8.3,8.3 12.5,19.2 12.5,30.1z" />
 </vector>
diff --git a/app/src/main/res/drawable/tag_normal.xml b/app/src/main/res/drawable/tag_normal.xml
index bb88697..d38b7cc 100644
--- a/app/src/main/res/drawable/tag_normal.xml
+++ b/app/src/main/res/drawable/tag_normal.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/mainBackground" />
+    <solid android:color="@color/mainBackColor" />
 
     <corners android:radius="@dimen/dp_3" />
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a7fbbba..a2ccde6 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -22,6 +22,5 @@
         android:background="@color/white"
         app:itemIconTint="@drawable/bottom_text_color"
         app:itemTextColor="@drawable/bottom_text_color"
-        app:labelVisibilityMode="labeled"
         app:menu="@menu/bottom_nav_menu" />
 </LinearLayout>
\ No newline at end of file

diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
index b8f589c..9b25651 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
@@ -4,7 +4,6 @@
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
-import android.view.View
 import android.view.animation.LinearInterpolator
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -23,7 +22,6 @@
 import com.casic.app.smartwell.vm.WellTypeViewModel
 import com.casic.app.smartwell.widgets.EasyPopupWindow
 import kotlinx.android.synthetic.main.activity_well_management.*
-import kotlinx.android.synthetic.main.include_base_title.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_search_bar.*
 import java.lang.ref.WeakReference
@@ -48,9 +46,7 @@
     override fun initLayoutView(): Int = R.layout.activity_well_management
 
     override fun setupTopBarLayout() {
-        titleView.text = "窨井管理"
-        leftBackView.visibility = View.VISIBLE
-        leftBackView.setOnClickListener { finish() }
+
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
index 9876f1e..561d5d4 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
@@ -4,7 +4,6 @@
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
-import android.view.View
 import android.view.animation.LinearInterpolator
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -27,7 +26,6 @@
 import com.casic.app.smartwell.widgets.EasyPopupWindow
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.activity_well_operation.*
-import kotlinx.android.synthetic.main.include_base_title.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_search_bar.*
 import java.lang.ref.WeakReference
@@ -53,9 +51,7 @@
     override fun initLayoutView(): Int = R.layout.activity_well_operation
 
     override fun setupTopBarLayout() {
-        titleView.text = "布防撤防"
-        leftBackView.visibility = View.VISIBLE
-        leftBackView.setOnClickListener { finish() }
+
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
index ed8f009..78e7414 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
@@ -28,6 +28,8 @@
 import com.casic.app.smartwell.vm.WellListViewModel
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.pengxh.app.multilib.utils.SizeUtil
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.fragment_home.view.*
 import kotlinx.android.synthetic.main.include_base_title.view.*
@@ -62,6 +64,18 @@
         homeView = inflater.inflate(R.layout.fragment_home, container, false)
         homeView.titleView.text = "首页"
 
+        //代码设置底部拉升距离
+        val bottomSheetBehavior = BottomSheetBehavior.from(homeView.bottomBehaviorLayout)
+        homeView.coordinatorLayout.post {
+            bottomSheetBehavior.isFitToContents = false
+            bottomSheetBehavior.halfExpandedRatio = 0.23f
+            bottomSheetBehavior.isHideable = false
+            bottomSheetBehavior.peekHeight = SizeUtil.dp2px(requireContext(), 30f)
+            bottomSheetBehavior.setExpandedOffset(
+                (SizeUtil.getScreenHeight(requireContext()) * 0.3).toInt()
+            )
+        }
+
         //初始化vm
         wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java)
         workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
index d56f439..f00d59c 100644
--- a/app/src/main/res/drawable/bg_layout.xml
+++ b/app/src/main/res/drawable/bg_layout.xml
@@ -4,5 +4,5 @@
 
     <solid android:color="@color/white" />
 
-    <corners android:radius="10dp" />
+    <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
index ba81626..0c2abfe 100644
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ b/app/src/main/res/drawable/bg_layout_radius_20.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="@color/white" />
+    <solid android:color="@color/mainBackColor" />
 
     <corners
         android:topLeftRadius="@dimen/dp_20"
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
index 122b9cd..bca9c08 100644
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
@@ -6,7 +6,7 @@
 
     <stroke
         android:width="1dp"
-        android:color="@color/mainBackground" />
+        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/bottom_short_line.xml b/app/src/main/res/drawable/bottom_short_line.xml
new file mode 100644
index 0000000..10c9062
--- /dev/null
+++ b/app/src/main/res/drawable/bottom_short_line.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">
+
+    <solid android:color="@color/subTextColor" />
+
+    <corners android:radius="@dimen/dp_10" />
+
+    <size
+        android:width="@dimen/dp_30"
+        android:height="@dimen/dp_3" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_up.xml b/app/src/main/res/drawable/ic_up.xml
index 151a0cb..75c718f 100644
--- a/app/src/main/res/drawable/ic_up.xml
+++ b/app/src/main/res/drawable/ic_up.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
+        android:fillColor="@color/white"
         android:pathData="M938.7,704c0,10.9 -4.2,21.8 -12.5,30.2 -16.7,16.7 -43.7,16.7 -60.3,0L512,380.3 158.2,734.2c-16.7,16.7 -43.7,16.7 -60.3,0s-16.7,-43.7 0,-60.3l384,-384c16.7,-16.7 43.7,-16.7 60.3,0l384,384c8.3,8.3 12.5,19.2 12.5,30.1z" />
 </vector>
diff --git a/app/src/main/res/drawable/tag_normal.xml b/app/src/main/res/drawable/tag_normal.xml
index bb88697..d38b7cc 100644
--- a/app/src/main/res/drawable/tag_normal.xml
+++ b/app/src/main/res/drawable/tag_normal.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/mainBackground" />
+    <solid android:color="@color/mainBackColor" />
 
     <corners android:radius="@dimen/dp_3" />
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a7fbbba..a2ccde6 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -22,6 +22,5 @@
         android:background="@color/white"
         app:itemIconTint="@drawable/bottom_text_color"
         app:itemTextColor="@drawable/bottom_text_color"
-        app:labelVisibilityMode="labeled"
         app:menu="@menu/bottom_nav_menu" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_order_overtime.xml b/app/src/main/res/layout/activity_order_overtime.xml
index fdc1aab..914cb85 100644
--- a/app/src/main/res/layout/activity_order_overtime.xml
+++ b/app/src/main/res/layout/activity_order_overtime.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackground"
+    android:background="@color/mainBackColor"
     android:orientation="vertical"
     tools:context=".view.OvertimeOrderActivity">
 

diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
index b8f589c..9b25651 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
@@ -4,7 +4,6 @@
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
-import android.view.View
 import android.view.animation.LinearInterpolator
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -23,7 +22,6 @@
 import com.casic.app.smartwell.vm.WellTypeViewModel
 import com.casic.app.smartwell.widgets.EasyPopupWindow
 import kotlinx.android.synthetic.main.activity_well_management.*
-import kotlinx.android.synthetic.main.include_base_title.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_search_bar.*
 import java.lang.ref.WeakReference
@@ -48,9 +46,7 @@
     override fun initLayoutView(): Int = R.layout.activity_well_management
 
     override fun setupTopBarLayout() {
-        titleView.text = "窨井管理"
-        leftBackView.visibility = View.VISIBLE
-        leftBackView.setOnClickListener { finish() }
+
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
index 9876f1e..561d5d4 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
@@ -4,7 +4,6 @@
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
-import android.view.View
 import android.view.animation.LinearInterpolator
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -27,7 +26,6 @@
 import com.casic.app.smartwell.widgets.EasyPopupWindow
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.activity_well_operation.*
-import kotlinx.android.synthetic.main.include_base_title.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_search_bar.*
 import java.lang.ref.WeakReference
@@ -53,9 +51,7 @@
     override fun initLayoutView(): Int = R.layout.activity_well_operation
 
     override fun setupTopBarLayout() {
-        titleView.text = "布防撤防"
-        leftBackView.visibility = View.VISIBLE
-        leftBackView.setOnClickListener { finish() }
+
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
index ed8f009..78e7414 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
@@ -28,6 +28,8 @@
 import com.casic.app.smartwell.vm.WellListViewModel
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.pengxh.app.multilib.utils.SizeUtil
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.fragment_home.view.*
 import kotlinx.android.synthetic.main.include_base_title.view.*
@@ -62,6 +64,18 @@
         homeView = inflater.inflate(R.layout.fragment_home, container, false)
         homeView.titleView.text = "首页"
 
+        //代码设置底部拉升距离
+        val bottomSheetBehavior = BottomSheetBehavior.from(homeView.bottomBehaviorLayout)
+        homeView.coordinatorLayout.post {
+            bottomSheetBehavior.isFitToContents = false
+            bottomSheetBehavior.halfExpandedRatio = 0.23f
+            bottomSheetBehavior.isHideable = false
+            bottomSheetBehavior.peekHeight = SizeUtil.dp2px(requireContext(), 30f)
+            bottomSheetBehavior.setExpandedOffset(
+                (SizeUtil.getScreenHeight(requireContext()) * 0.3).toInt()
+            )
+        }
+
         //初始化vm
         wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java)
         workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
index d56f439..f00d59c 100644
--- a/app/src/main/res/drawable/bg_layout.xml
+++ b/app/src/main/res/drawable/bg_layout.xml
@@ -4,5 +4,5 @@
 
     <solid android:color="@color/white" />
 
-    <corners android:radius="10dp" />
+    <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
index ba81626..0c2abfe 100644
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ b/app/src/main/res/drawable/bg_layout_radius_20.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="@color/white" />
+    <solid android:color="@color/mainBackColor" />
 
     <corners
         android:topLeftRadius="@dimen/dp_20"
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
index 122b9cd..bca9c08 100644
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
@@ -6,7 +6,7 @@
 
     <stroke
         android:width="1dp"
-        android:color="@color/mainBackground" />
+        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/bottom_short_line.xml b/app/src/main/res/drawable/bottom_short_line.xml
new file mode 100644
index 0000000..10c9062
--- /dev/null
+++ b/app/src/main/res/drawable/bottom_short_line.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">
+
+    <solid android:color="@color/subTextColor" />
+
+    <corners android:radius="@dimen/dp_10" />
+
+    <size
+        android:width="@dimen/dp_30"
+        android:height="@dimen/dp_3" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_up.xml b/app/src/main/res/drawable/ic_up.xml
index 151a0cb..75c718f 100644
--- a/app/src/main/res/drawable/ic_up.xml
+++ b/app/src/main/res/drawable/ic_up.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
+        android:fillColor="@color/white"
         android:pathData="M938.7,704c0,10.9 -4.2,21.8 -12.5,30.2 -16.7,16.7 -43.7,16.7 -60.3,0L512,380.3 158.2,734.2c-16.7,16.7 -43.7,16.7 -60.3,0s-16.7,-43.7 0,-60.3l384,-384c16.7,-16.7 43.7,-16.7 60.3,0l384,384c8.3,8.3 12.5,19.2 12.5,30.1z" />
 </vector>
diff --git a/app/src/main/res/drawable/tag_normal.xml b/app/src/main/res/drawable/tag_normal.xml
index bb88697..d38b7cc 100644
--- a/app/src/main/res/drawable/tag_normal.xml
+++ b/app/src/main/res/drawable/tag_normal.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/mainBackground" />
+    <solid android:color="@color/mainBackColor" />
 
     <corners android:radius="@dimen/dp_3" />
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a7fbbba..a2ccde6 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -22,6 +22,5 @@
         android:background="@color/white"
         app:itemIconTint="@drawable/bottom_text_color"
         app:itemTextColor="@drawable/bottom_text_color"
-        app:labelVisibilityMode="labeled"
         app:menu="@menu/bottom_nav_menu" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_order_overtime.xml b/app/src/main/res/layout/activity_order_overtime.xml
index fdc1aab..914cb85 100644
--- a/app/src/main/res/layout/activity_order_overtime.xml
+++ b/app/src/main/res/layout/activity_order_overtime.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackground"
+    android:background="@color/mainBackColor"
     android:orientation="vertical"
     tools:context=".view.OvertimeOrderActivity">
 
diff --git a/app/src/main/res/layout/activity_well_management.xml b/app/src/main/res/layout/activity_well_management.xml
index 819d37f..c87a5a3 100644
--- a/app/src/main/res/layout/activity_well_management.xml
+++ b/app/src/main/res/layout/activity_well_management.xml
@@ -7,8 +7,6 @@
     android:orientation="vertical"
     tools:context=".view.WellManagementActivity">
 
-    <include layout="@layout/include_base_title" />
-
     <include layout="@layout/include_search_bar" />
 
     <include layout="@layout/include_empty_view" />

diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
index b8f589c..9b25651 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
@@ -4,7 +4,6 @@
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
-import android.view.View
 import android.view.animation.LinearInterpolator
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -23,7 +22,6 @@
 import com.casic.app.smartwell.vm.WellTypeViewModel
 import com.casic.app.smartwell.widgets.EasyPopupWindow
 import kotlinx.android.synthetic.main.activity_well_management.*
-import kotlinx.android.synthetic.main.include_base_title.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_search_bar.*
 import java.lang.ref.WeakReference
@@ -48,9 +46,7 @@
     override fun initLayoutView(): Int = R.layout.activity_well_management
 
     override fun setupTopBarLayout() {
-        titleView.text = "窨井管理"
-        leftBackView.visibility = View.VISIBLE
-        leftBackView.setOnClickListener { finish() }
+
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
index 9876f1e..561d5d4 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
@@ -4,7 +4,6 @@
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
-import android.view.View
 import android.view.animation.LinearInterpolator
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -27,7 +26,6 @@
 import com.casic.app.smartwell.widgets.EasyPopupWindow
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.activity_well_operation.*
-import kotlinx.android.synthetic.main.include_base_title.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_search_bar.*
 import java.lang.ref.WeakReference
@@ -53,9 +51,7 @@
     override fun initLayoutView(): Int = R.layout.activity_well_operation
 
     override fun setupTopBarLayout() {
-        titleView.text = "布防撤防"
-        leftBackView.visibility = View.VISIBLE
-        leftBackView.setOnClickListener { finish() }
+
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
index ed8f009..78e7414 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
@@ -28,6 +28,8 @@
 import com.casic.app.smartwell.vm.WellListViewModel
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.pengxh.app.multilib.utils.SizeUtil
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.fragment_home.view.*
 import kotlinx.android.synthetic.main.include_base_title.view.*
@@ -62,6 +64,18 @@
         homeView = inflater.inflate(R.layout.fragment_home, container, false)
         homeView.titleView.text = "首页"
 
+        //代码设置底部拉升距离
+        val bottomSheetBehavior = BottomSheetBehavior.from(homeView.bottomBehaviorLayout)
+        homeView.coordinatorLayout.post {
+            bottomSheetBehavior.isFitToContents = false
+            bottomSheetBehavior.halfExpandedRatio = 0.23f
+            bottomSheetBehavior.isHideable = false
+            bottomSheetBehavior.peekHeight = SizeUtil.dp2px(requireContext(), 30f)
+            bottomSheetBehavior.setExpandedOffset(
+                (SizeUtil.getScreenHeight(requireContext()) * 0.3).toInt()
+            )
+        }
+
         //初始化vm
         wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java)
         workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
index d56f439..f00d59c 100644
--- a/app/src/main/res/drawable/bg_layout.xml
+++ b/app/src/main/res/drawable/bg_layout.xml
@@ -4,5 +4,5 @@
 
     <solid android:color="@color/white" />
 
-    <corners android:radius="10dp" />
+    <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
index ba81626..0c2abfe 100644
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ b/app/src/main/res/drawable/bg_layout_radius_20.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="@color/white" />
+    <solid android:color="@color/mainBackColor" />
 
     <corners
         android:topLeftRadius="@dimen/dp_20"
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
index 122b9cd..bca9c08 100644
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
@@ -6,7 +6,7 @@
 
     <stroke
         android:width="1dp"
-        android:color="@color/mainBackground" />
+        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/bottom_short_line.xml b/app/src/main/res/drawable/bottom_short_line.xml
new file mode 100644
index 0000000..10c9062
--- /dev/null
+++ b/app/src/main/res/drawable/bottom_short_line.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">
+
+    <solid android:color="@color/subTextColor" />
+
+    <corners android:radius="@dimen/dp_10" />
+
+    <size
+        android:width="@dimen/dp_30"
+        android:height="@dimen/dp_3" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_up.xml b/app/src/main/res/drawable/ic_up.xml
index 151a0cb..75c718f 100644
--- a/app/src/main/res/drawable/ic_up.xml
+++ b/app/src/main/res/drawable/ic_up.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
+        android:fillColor="@color/white"
         android:pathData="M938.7,704c0,10.9 -4.2,21.8 -12.5,30.2 -16.7,16.7 -43.7,16.7 -60.3,0L512,380.3 158.2,734.2c-16.7,16.7 -43.7,16.7 -60.3,0s-16.7,-43.7 0,-60.3l384,-384c16.7,-16.7 43.7,-16.7 60.3,0l384,384c8.3,8.3 12.5,19.2 12.5,30.1z" />
 </vector>
diff --git a/app/src/main/res/drawable/tag_normal.xml b/app/src/main/res/drawable/tag_normal.xml
index bb88697..d38b7cc 100644
--- a/app/src/main/res/drawable/tag_normal.xml
+++ b/app/src/main/res/drawable/tag_normal.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/mainBackground" />
+    <solid android:color="@color/mainBackColor" />
 
     <corners android:radius="@dimen/dp_3" />
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a7fbbba..a2ccde6 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -22,6 +22,5 @@
         android:background="@color/white"
         app:itemIconTint="@drawable/bottom_text_color"
         app:itemTextColor="@drawable/bottom_text_color"
-        app:labelVisibilityMode="labeled"
         app:menu="@menu/bottom_nav_menu" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_order_overtime.xml b/app/src/main/res/layout/activity_order_overtime.xml
index fdc1aab..914cb85 100644
--- a/app/src/main/res/layout/activity_order_overtime.xml
+++ b/app/src/main/res/layout/activity_order_overtime.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackground"
+    android:background="@color/mainBackColor"
     android:orientation="vertical"
     tools:context=".view.OvertimeOrderActivity">
 
diff --git a/app/src/main/res/layout/activity_well_management.xml b/app/src/main/res/layout/activity_well_management.xml
index 819d37f..c87a5a3 100644
--- a/app/src/main/res/layout/activity_well_management.xml
+++ b/app/src/main/res/layout/activity_well_management.xml
@@ -7,8 +7,6 @@
     android:orientation="vertical"
     tools:context=".view.WellManagementActivity">
 
-    <include layout="@layout/include_base_title" />
-
     <include layout="@layout/include_search_bar" />
 
     <include layout="@layout/include_empty_view" />
diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml
index a3f1334..a695043 100644
--- a/app/src/main/res/layout/activity_well_operation.xml
+++ b/app/src/main/res/layout/activity_well_operation.xml
@@ -7,8 +7,6 @@
     android:orientation="vertical"
     tools:context=".view.WellOperationActivity">
 
-    <include layout="@layout/include_base_title" />
-
     <include layout="@layout/include_search_bar" />
 
     <include layout="@layout/include_empty_view" />

diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
index b8f589c..9b25651 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
@@ -4,7 +4,6 @@
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
-import android.view.View
 import android.view.animation.LinearInterpolator
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -23,7 +22,6 @@
 import com.casic.app.smartwell.vm.WellTypeViewModel
 import com.casic.app.smartwell.widgets.EasyPopupWindow
 import kotlinx.android.synthetic.main.activity_well_management.*
-import kotlinx.android.synthetic.main.include_base_title.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_search_bar.*
 import java.lang.ref.WeakReference
@@ -48,9 +46,7 @@
     override fun initLayoutView(): Int = R.layout.activity_well_management
 
     override fun setupTopBarLayout() {
-        titleView.text = "窨井管理"
-        leftBackView.visibility = View.VISIBLE
-        leftBackView.setOnClickListener { finish() }
+
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
index 9876f1e..561d5d4 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
@@ -4,7 +4,6 @@
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
-import android.view.View
 import android.view.animation.LinearInterpolator
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -27,7 +26,6 @@
 import com.casic.app.smartwell.widgets.EasyPopupWindow
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.activity_well_operation.*
-import kotlinx.android.synthetic.main.include_base_title.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_search_bar.*
 import java.lang.ref.WeakReference
@@ -53,9 +51,7 @@
     override fun initLayoutView(): Int = R.layout.activity_well_operation
 
     override fun setupTopBarLayout() {
-        titleView.text = "布防撤防"
-        leftBackView.visibility = View.VISIBLE
-        leftBackView.setOnClickListener { finish() }
+
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
index ed8f009..78e7414 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
@@ -28,6 +28,8 @@
 import com.casic.app.smartwell.vm.WellListViewModel
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.pengxh.app.multilib.utils.SizeUtil
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.fragment_home.view.*
 import kotlinx.android.synthetic.main.include_base_title.view.*
@@ -62,6 +64,18 @@
         homeView = inflater.inflate(R.layout.fragment_home, container, false)
         homeView.titleView.text = "首页"
 
+        //代码设置底部拉升距离
+        val bottomSheetBehavior = BottomSheetBehavior.from(homeView.bottomBehaviorLayout)
+        homeView.coordinatorLayout.post {
+            bottomSheetBehavior.isFitToContents = false
+            bottomSheetBehavior.halfExpandedRatio = 0.23f
+            bottomSheetBehavior.isHideable = false
+            bottomSheetBehavior.peekHeight = SizeUtil.dp2px(requireContext(), 30f)
+            bottomSheetBehavior.setExpandedOffset(
+                (SizeUtil.getScreenHeight(requireContext()) * 0.3).toInt()
+            )
+        }
+
         //初始化vm
         wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java)
         workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
index d56f439..f00d59c 100644
--- a/app/src/main/res/drawable/bg_layout.xml
+++ b/app/src/main/res/drawable/bg_layout.xml
@@ -4,5 +4,5 @@
 
     <solid android:color="@color/white" />
 
-    <corners android:radius="10dp" />
+    <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
index ba81626..0c2abfe 100644
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ b/app/src/main/res/drawable/bg_layout_radius_20.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="@color/white" />
+    <solid android:color="@color/mainBackColor" />
 
     <corners
         android:topLeftRadius="@dimen/dp_20"
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
index 122b9cd..bca9c08 100644
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
@@ -6,7 +6,7 @@
 
     <stroke
         android:width="1dp"
-        android:color="@color/mainBackground" />
+        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/bottom_short_line.xml b/app/src/main/res/drawable/bottom_short_line.xml
new file mode 100644
index 0000000..10c9062
--- /dev/null
+++ b/app/src/main/res/drawable/bottom_short_line.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">
+
+    <solid android:color="@color/subTextColor" />
+
+    <corners android:radius="@dimen/dp_10" />
+
+    <size
+        android:width="@dimen/dp_30"
+        android:height="@dimen/dp_3" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_up.xml b/app/src/main/res/drawable/ic_up.xml
index 151a0cb..75c718f 100644
--- a/app/src/main/res/drawable/ic_up.xml
+++ b/app/src/main/res/drawable/ic_up.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
+        android:fillColor="@color/white"
         android:pathData="M938.7,704c0,10.9 -4.2,21.8 -12.5,30.2 -16.7,16.7 -43.7,16.7 -60.3,0L512,380.3 158.2,734.2c-16.7,16.7 -43.7,16.7 -60.3,0s-16.7,-43.7 0,-60.3l384,-384c16.7,-16.7 43.7,-16.7 60.3,0l384,384c8.3,8.3 12.5,19.2 12.5,30.1z" />
 </vector>
diff --git a/app/src/main/res/drawable/tag_normal.xml b/app/src/main/res/drawable/tag_normal.xml
index bb88697..d38b7cc 100644
--- a/app/src/main/res/drawable/tag_normal.xml
+++ b/app/src/main/res/drawable/tag_normal.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/mainBackground" />
+    <solid android:color="@color/mainBackColor" />
 
     <corners android:radius="@dimen/dp_3" />
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a7fbbba..a2ccde6 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -22,6 +22,5 @@
         android:background="@color/white"
         app:itemIconTint="@drawable/bottom_text_color"
         app:itemTextColor="@drawable/bottom_text_color"
-        app:labelVisibilityMode="labeled"
         app:menu="@menu/bottom_nav_menu" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_order_overtime.xml b/app/src/main/res/layout/activity_order_overtime.xml
index fdc1aab..914cb85 100644
--- a/app/src/main/res/layout/activity_order_overtime.xml
+++ b/app/src/main/res/layout/activity_order_overtime.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackground"
+    android:background="@color/mainBackColor"
     android:orientation="vertical"
     tools:context=".view.OvertimeOrderActivity">
 
diff --git a/app/src/main/res/layout/activity_well_management.xml b/app/src/main/res/layout/activity_well_management.xml
index 819d37f..c87a5a3 100644
--- a/app/src/main/res/layout/activity_well_management.xml
+++ b/app/src/main/res/layout/activity_well_management.xml
@@ -7,8 +7,6 @@
     android:orientation="vertical"
     tools:context=".view.WellManagementActivity">
 
-    <include layout="@layout/include_base_title" />
-
     <include layout="@layout/include_search_bar" />
 
     <include layout="@layout/include_empty_view" />
diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml
index a3f1334..a695043 100644
--- a/app/src/main/res/layout/activity_well_operation.xml
+++ b/app/src/main/res/layout/activity_well_operation.xml
@@ -7,8 +7,6 @@
     android:orientation="vertical"
     tools:context=".view.WellOperationActivity">
 
-    <include layout="@layout/include_base_title" />
-
     <include layout="@layout/include_search_bar" />
 
     <include layout="@layout/include_empty_view" />
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 37d50e5..8c5f4a4 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -9,6 +9,7 @@
     <include layout="@layout/include_base_title" />
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:id="@+id/coordinatorLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
@@ -18,193 +19,179 @@
             android:layout_height="match_parent" />
 
         <LinearLayout
+            android:id="@+id/bottomBehaviorLayout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="@drawable/bg_layout_radius_20"
             android:orientation="vertical"
-            app:behavior_fitToContents="false"
-            app:behavior_halfExpandedRatio="0.25"
-            app:behavior_hideable="false"
-            app:behavior_peekHeight="@dimen/titleViewHeight"
             app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
             <!--顶部短横线-->
             <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/titleViewHeight"
-                android:paddingVertical="22dp">
+                android:layout_height="@dimen/dp_30">
 
-                <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_marginHorizontal="150dp"
-                    app:qmui_backgroundColor="@color/hintTextColor"
-                    app:qmui_borderColor="@color/hintTextColor" />
+                <View
+                    android:layout_width="@dimen/dp_30"
+                    android:layout_height="@dimen/dp_3"
+                    android:layout_centerInParent="true"
+                    android:background="@drawable/bottom_short_line" />
             </RelativeLayout>
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/mainBackground" />
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/homeRecyclerView"
+            <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_10" />
+                android:layout_marginHorizontal="@dimen/dp_10"
+                android:background="@drawable/bg_layout">
 
-            <androidx.cardview.widget.CardView
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/homeRecyclerView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+            </RelativeLayout>
+
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10"
-                app:cardCornerRadius="@dimen/dp_5">
+                android:background="@drawable/bg_layout"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:paddingVertical="@dimen/dp_5"
+                    android:text="闸井监控"
+                    android:textColor="@color/mainTextColor"
+                    android:textSize="@dimen/titleFontSize" />
+
+                <View style="@style/dividerViewStyle" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:orientation="vertical">
+                    android:orientation="horizontal">
 
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:paddingVertical="@dimen/dp_5"
-                        android:text="闸井监控"
-                        android:textColor="@color/mainTextColor"
-                        android:textSize="@dimen/titleFontSize" />
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                    <View style="@style/dividerViewStyle" />
+                        <TextView
+                            android:id="@+id/unDeployedWellView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/redTextColor" />
 
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:orientation="horizontal">
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="已撤防" />
+                    </LinearLayout>
 
-                        <LinearLayout style="@style/homeLayoutStyle">
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                            <TextView
-                                android:id="@+id/unDeployedWellView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/redTextColor" />
+                        <TextView
+                            android:id="@+id/deployedWellView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/yellowTextColor" />
 
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="已撤防" />
-                        </LinearLayout>
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="已布防" />
+                    </LinearLayout>
 
-                        <LinearLayout style="@style/homeLayoutStyle">
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                            <TextView
-                                android:id="@+id/deployedWellView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/yellowTextColor" />
+                        <TextView
+                            android:id="@+id/allWellDataView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/greenTextColor" />
 
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="已布防" />
-                        </LinearLayout>
-
-                        <LinearLayout style="@style/homeLayoutStyle">
-
-                            <TextView
-                                android:id="@+id/allWellDataView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/greenTextColor" />
-
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="全部" />
-                        </LinearLayout>
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="全部" />
                     </LinearLayout>
                 </LinearLayout>
-            </androidx.cardview.widget.CardView>
+            </LinearLayout>
 
-            <androidx.cardview.widget.CardView
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10"
-                app:cardCornerRadius="@dimen/dp_5">
+                android:background="@drawable/bg_layout"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:paddingVertical="@dimen/dp_5"
+                    android:text="工\u3000\u3000单"
+                    android:textColor="@color/mainTextColor"
+                    android:textSize="@dimen/titleFontSize" />
+
+                <View style="@style/dividerViewStyle" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:orientation="vertical">
+                    android:orientation="horizontal">
 
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:paddingVertical="@dimen/dp_5"
-                        android:text="工\u3000\u3000单"
-                        android:textColor="@color/mainTextColor"
-                        android:textSize="@dimen/titleFontSize" />
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                    <View style="@style/dividerViewStyle" />
+                        <TextView
+                            android:id="@+id/todoDataView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/redTextColor" />
 
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:orientation="horizontal">
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="待处理" />
+                    </LinearLayout>
 
-                        <LinearLayout style="@style/homeLayoutStyle">
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                            <TextView
-                                android:id="@+id/todoDataView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/redTextColor" />
+                        <TextView
+                            android:id="@+id/undeterminedDataView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/yellowTextColor" />
 
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="待处理" />
-                        </LinearLayout>
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="待确认" />
+                    </LinearLayout>
 
-                        <LinearLayout style="@style/homeLayoutStyle">
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                            <TextView
-                                android:id="@+id/undeterminedDataView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/yellowTextColor" />
+                        <TextView
+                            android:id="@+id/inHandleDataView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/mainThemeColor" />
 
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="待确认" />
-                        </LinearLayout>
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="处理中" />
+                    </LinearLayout>
 
-                        <LinearLayout style="@style/homeLayoutStyle">
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                            <TextView
-                                android:id="@+id/inHandleDataView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/mainThemeColor" />
+                        <TextView
+                            android:id="@+id/completedDataView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/greenTextColor" />
 
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="处理中" />
-                        </LinearLayout>
-
-                        <LinearLayout style="@style/homeLayoutStyle">
-
-                            <TextView
-                                android:id="@+id/completedDataView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/greenTextColor" />
-
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="已完成" />
-                        </LinearLayout>
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="已完成" />
                     </LinearLayout>
                 </LinearLayout>
-            </androidx.cardview.widget.CardView>
+            </LinearLayout>
         </LinearLayout>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </LinearLayout>
\ No newline at end of file

diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
index b8f589c..9b25651 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
@@ -4,7 +4,6 @@
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
-import android.view.View
 import android.view.animation.LinearInterpolator
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -23,7 +22,6 @@
 import com.casic.app.smartwell.vm.WellTypeViewModel
 import com.casic.app.smartwell.widgets.EasyPopupWindow
 import kotlinx.android.synthetic.main.activity_well_management.*
-import kotlinx.android.synthetic.main.include_base_title.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_search_bar.*
 import java.lang.ref.WeakReference
@@ -48,9 +46,7 @@
     override fun initLayoutView(): Int = R.layout.activity_well_management
 
     override fun setupTopBarLayout() {
-        titleView.text = "窨井管理"
-        leftBackView.visibility = View.VISIBLE
-        leftBackView.setOnClickListener { finish() }
+
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
index 9876f1e..561d5d4 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
@@ -4,7 +4,6 @@
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
-import android.view.View
 import android.view.animation.LinearInterpolator
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -27,7 +26,6 @@
 import com.casic.app.smartwell.widgets.EasyPopupWindow
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.activity_well_operation.*
-import kotlinx.android.synthetic.main.include_base_title.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_search_bar.*
 import java.lang.ref.WeakReference
@@ -53,9 +51,7 @@
     override fun initLayoutView(): Int = R.layout.activity_well_operation
 
     override fun setupTopBarLayout() {
-        titleView.text = "布防撤防"
-        leftBackView.visibility = View.VISIBLE
-        leftBackView.setOnClickListener { finish() }
+
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
index ed8f009..78e7414 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
@@ -28,6 +28,8 @@
 import com.casic.app.smartwell.vm.WellListViewModel
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.pengxh.app.multilib.utils.SizeUtil
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.fragment_home.view.*
 import kotlinx.android.synthetic.main.include_base_title.view.*
@@ -62,6 +64,18 @@
         homeView = inflater.inflate(R.layout.fragment_home, container, false)
         homeView.titleView.text = "首页"
 
+        //代码设置底部拉升距离
+        val bottomSheetBehavior = BottomSheetBehavior.from(homeView.bottomBehaviorLayout)
+        homeView.coordinatorLayout.post {
+            bottomSheetBehavior.isFitToContents = false
+            bottomSheetBehavior.halfExpandedRatio = 0.23f
+            bottomSheetBehavior.isHideable = false
+            bottomSheetBehavior.peekHeight = SizeUtil.dp2px(requireContext(), 30f)
+            bottomSheetBehavior.setExpandedOffset(
+                (SizeUtil.getScreenHeight(requireContext()) * 0.3).toInt()
+            )
+        }
+
         //初始化vm
         wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java)
         workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
index d56f439..f00d59c 100644
--- a/app/src/main/res/drawable/bg_layout.xml
+++ b/app/src/main/res/drawable/bg_layout.xml
@@ -4,5 +4,5 @@
 
     <solid android:color="@color/white" />
 
-    <corners android:radius="10dp" />
+    <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
index ba81626..0c2abfe 100644
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ b/app/src/main/res/drawable/bg_layout_radius_20.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="@color/white" />
+    <solid android:color="@color/mainBackColor" />
 
     <corners
         android:topLeftRadius="@dimen/dp_20"
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
index 122b9cd..bca9c08 100644
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
@@ -6,7 +6,7 @@
 
     <stroke
         android:width="1dp"
-        android:color="@color/mainBackground" />
+        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/bottom_short_line.xml b/app/src/main/res/drawable/bottom_short_line.xml
new file mode 100644
index 0000000..10c9062
--- /dev/null
+++ b/app/src/main/res/drawable/bottom_short_line.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">
+
+    <solid android:color="@color/subTextColor" />
+
+    <corners android:radius="@dimen/dp_10" />
+
+    <size
+        android:width="@dimen/dp_30"
+        android:height="@dimen/dp_3" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_up.xml b/app/src/main/res/drawable/ic_up.xml
index 151a0cb..75c718f 100644
--- a/app/src/main/res/drawable/ic_up.xml
+++ b/app/src/main/res/drawable/ic_up.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
+        android:fillColor="@color/white"
         android:pathData="M938.7,704c0,10.9 -4.2,21.8 -12.5,30.2 -16.7,16.7 -43.7,16.7 -60.3,0L512,380.3 158.2,734.2c-16.7,16.7 -43.7,16.7 -60.3,0s-16.7,-43.7 0,-60.3l384,-384c16.7,-16.7 43.7,-16.7 60.3,0l384,384c8.3,8.3 12.5,19.2 12.5,30.1z" />
 </vector>
diff --git a/app/src/main/res/drawable/tag_normal.xml b/app/src/main/res/drawable/tag_normal.xml
index bb88697..d38b7cc 100644
--- a/app/src/main/res/drawable/tag_normal.xml
+++ b/app/src/main/res/drawable/tag_normal.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/mainBackground" />
+    <solid android:color="@color/mainBackColor" />
 
     <corners android:radius="@dimen/dp_3" />
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a7fbbba..a2ccde6 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -22,6 +22,5 @@
         android:background="@color/white"
         app:itemIconTint="@drawable/bottom_text_color"
         app:itemTextColor="@drawable/bottom_text_color"
-        app:labelVisibilityMode="labeled"
         app:menu="@menu/bottom_nav_menu" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_order_overtime.xml b/app/src/main/res/layout/activity_order_overtime.xml
index fdc1aab..914cb85 100644
--- a/app/src/main/res/layout/activity_order_overtime.xml
+++ b/app/src/main/res/layout/activity_order_overtime.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackground"
+    android:background="@color/mainBackColor"
     android:orientation="vertical"
     tools:context=".view.OvertimeOrderActivity">
 
diff --git a/app/src/main/res/layout/activity_well_management.xml b/app/src/main/res/layout/activity_well_management.xml
index 819d37f..c87a5a3 100644
--- a/app/src/main/res/layout/activity_well_management.xml
+++ b/app/src/main/res/layout/activity_well_management.xml
@@ -7,8 +7,6 @@
     android:orientation="vertical"
     tools:context=".view.WellManagementActivity">
 
-    <include layout="@layout/include_base_title" />
-
     <include layout="@layout/include_search_bar" />
 
     <include layout="@layout/include_empty_view" />
diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml
index a3f1334..a695043 100644
--- a/app/src/main/res/layout/activity_well_operation.xml
+++ b/app/src/main/res/layout/activity_well_operation.xml
@@ -7,8 +7,6 @@
     android:orientation="vertical"
     tools:context=".view.WellOperationActivity">
 
-    <include layout="@layout/include_base_title" />
-
     <include layout="@layout/include_search_bar" />
 
     <include layout="@layout/include_empty_view" />
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 37d50e5..8c5f4a4 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -9,6 +9,7 @@
     <include layout="@layout/include_base_title" />
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:id="@+id/coordinatorLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
@@ -18,193 +19,179 @@
             android:layout_height="match_parent" />
 
         <LinearLayout
+            android:id="@+id/bottomBehaviorLayout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="@drawable/bg_layout_radius_20"
             android:orientation="vertical"
-            app:behavior_fitToContents="false"
-            app:behavior_halfExpandedRatio="0.25"
-            app:behavior_hideable="false"
-            app:behavior_peekHeight="@dimen/titleViewHeight"
             app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
             <!--顶部短横线-->
             <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/titleViewHeight"
-                android:paddingVertical="22dp">
+                android:layout_height="@dimen/dp_30">
 
-                <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_marginHorizontal="150dp"
-                    app:qmui_backgroundColor="@color/hintTextColor"
-                    app:qmui_borderColor="@color/hintTextColor" />
+                <View
+                    android:layout_width="@dimen/dp_30"
+                    android:layout_height="@dimen/dp_3"
+                    android:layout_centerInParent="true"
+                    android:background="@drawable/bottom_short_line" />
             </RelativeLayout>
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/mainBackground" />
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/homeRecyclerView"
+            <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_10" />
+                android:layout_marginHorizontal="@dimen/dp_10"
+                android:background="@drawable/bg_layout">
 
-            <androidx.cardview.widget.CardView
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/homeRecyclerView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+            </RelativeLayout>
+
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10"
-                app:cardCornerRadius="@dimen/dp_5">
+                android:background="@drawable/bg_layout"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:paddingVertical="@dimen/dp_5"
+                    android:text="闸井监控"
+                    android:textColor="@color/mainTextColor"
+                    android:textSize="@dimen/titleFontSize" />
+
+                <View style="@style/dividerViewStyle" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:orientation="vertical">
+                    android:orientation="horizontal">
 
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:paddingVertical="@dimen/dp_5"
-                        android:text="闸井监控"
-                        android:textColor="@color/mainTextColor"
-                        android:textSize="@dimen/titleFontSize" />
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                    <View style="@style/dividerViewStyle" />
+                        <TextView
+                            android:id="@+id/unDeployedWellView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/redTextColor" />
 
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:orientation="horizontal">
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="已撤防" />
+                    </LinearLayout>
 
-                        <LinearLayout style="@style/homeLayoutStyle">
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                            <TextView
-                                android:id="@+id/unDeployedWellView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/redTextColor" />
+                        <TextView
+                            android:id="@+id/deployedWellView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/yellowTextColor" />
 
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="已撤防" />
-                        </LinearLayout>
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="已布防" />
+                    </LinearLayout>
 
-                        <LinearLayout style="@style/homeLayoutStyle">
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                            <TextView
-                                android:id="@+id/deployedWellView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/yellowTextColor" />
+                        <TextView
+                            android:id="@+id/allWellDataView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/greenTextColor" />
 
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="已布防" />
-                        </LinearLayout>
-
-                        <LinearLayout style="@style/homeLayoutStyle">
-
-                            <TextView
-                                android:id="@+id/allWellDataView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/greenTextColor" />
-
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="全部" />
-                        </LinearLayout>
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="全部" />
                     </LinearLayout>
                 </LinearLayout>
-            </androidx.cardview.widget.CardView>
+            </LinearLayout>
 
-            <androidx.cardview.widget.CardView
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10"
-                app:cardCornerRadius="@dimen/dp_5">
+                android:background="@drawable/bg_layout"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:paddingVertical="@dimen/dp_5"
+                    android:text="工\u3000\u3000单"
+                    android:textColor="@color/mainTextColor"
+                    android:textSize="@dimen/titleFontSize" />
+
+                <View style="@style/dividerViewStyle" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:orientation="vertical">
+                    android:orientation="horizontal">
 
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:paddingVertical="@dimen/dp_5"
-                        android:text="工\u3000\u3000单"
-                        android:textColor="@color/mainTextColor"
-                        android:textSize="@dimen/titleFontSize" />
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                    <View style="@style/dividerViewStyle" />
+                        <TextView
+                            android:id="@+id/todoDataView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/redTextColor" />
 
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:orientation="horizontal">
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="待处理" />
+                    </LinearLayout>
 
-                        <LinearLayout style="@style/homeLayoutStyle">
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                            <TextView
-                                android:id="@+id/todoDataView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/redTextColor" />
+                        <TextView
+                            android:id="@+id/undeterminedDataView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/yellowTextColor" />
 
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="待处理" />
-                        </LinearLayout>
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="待确认" />
+                    </LinearLayout>
 
-                        <LinearLayout style="@style/homeLayoutStyle">
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                            <TextView
-                                android:id="@+id/undeterminedDataView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/yellowTextColor" />
+                        <TextView
+                            android:id="@+id/inHandleDataView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/mainThemeColor" />
 
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="待确认" />
-                        </LinearLayout>
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="处理中" />
+                    </LinearLayout>
 
-                        <LinearLayout style="@style/homeLayoutStyle">
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                            <TextView
-                                android:id="@+id/inHandleDataView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/mainThemeColor" />
+                        <TextView
+                            android:id="@+id/completedDataView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/greenTextColor" />
 
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="处理中" />
-                        </LinearLayout>
-
-                        <LinearLayout style="@style/homeLayoutStyle">
-
-                            <TextView
-                                android:id="@+id/completedDataView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/greenTextColor" />
-
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="已完成" />
-                        </LinearLayout>
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="已完成" />
                     </LinearLayout>
                 </LinearLayout>
-            </androidx.cardview.widget.CardView>
+            </LinearLayout>
         </LinearLayout>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_order.xml b/app/src/main/res/layout/fragment_order.xml
index e798ed8..06dc5dc 100644
--- a/app/src/main/res/layout/fragment_order.xml
+++ b/app/src/main/res/layout/fragment_order.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackground"
+    android:background="@color/mainBackColor"
     android:orientation="vertical">
 
     <RelativeLayout

diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
index b8f589c..9b25651 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
@@ -4,7 +4,6 @@
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
-import android.view.View
 import android.view.animation.LinearInterpolator
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -23,7 +22,6 @@
 import com.casic.app.smartwell.vm.WellTypeViewModel
 import com.casic.app.smartwell.widgets.EasyPopupWindow
 import kotlinx.android.synthetic.main.activity_well_management.*
-import kotlinx.android.synthetic.main.include_base_title.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_search_bar.*
 import java.lang.ref.WeakReference
@@ -48,9 +46,7 @@
     override fun initLayoutView(): Int = R.layout.activity_well_management
 
     override fun setupTopBarLayout() {
-        titleView.text = "窨井管理"
-        leftBackView.visibility = View.VISIBLE
-        leftBackView.setOnClickListener { finish() }
+
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
index 9876f1e..561d5d4 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
@@ -4,7 +4,6 @@
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
-import android.view.View
 import android.view.animation.LinearInterpolator
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -27,7 +26,6 @@
 import com.casic.app.smartwell.widgets.EasyPopupWindow
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.activity_well_operation.*
-import kotlinx.android.synthetic.main.include_base_title.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_search_bar.*
 import java.lang.ref.WeakReference
@@ -53,9 +51,7 @@
     override fun initLayoutView(): Int = R.layout.activity_well_operation
 
     override fun setupTopBarLayout() {
-        titleView.text = "布防撤防"
-        leftBackView.visibility = View.VISIBLE
-        leftBackView.setOnClickListener { finish() }
+
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
index ed8f009..78e7414 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
@@ -28,6 +28,8 @@
 import com.casic.app.smartwell.vm.WellListViewModel
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.pengxh.app.multilib.utils.SizeUtil
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.fragment_home.view.*
 import kotlinx.android.synthetic.main.include_base_title.view.*
@@ -62,6 +64,18 @@
         homeView = inflater.inflate(R.layout.fragment_home, container, false)
         homeView.titleView.text = "首页"
 
+        //代码设置底部拉升距离
+        val bottomSheetBehavior = BottomSheetBehavior.from(homeView.bottomBehaviorLayout)
+        homeView.coordinatorLayout.post {
+            bottomSheetBehavior.isFitToContents = false
+            bottomSheetBehavior.halfExpandedRatio = 0.23f
+            bottomSheetBehavior.isHideable = false
+            bottomSheetBehavior.peekHeight = SizeUtil.dp2px(requireContext(), 30f)
+            bottomSheetBehavior.setExpandedOffset(
+                (SizeUtil.getScreenHeight(requireContext()) * 0.3).toInt()
+            )
+        }
+
         //初始化vm
         wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java)
         workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
index d56f439..f00d59c 100644
--- a/app/src/main/res/drawable/bg_layout.xml
+++ b/app/src/main/res/drawable/bg_layout.xml
@@ -4,5 +4,5 @@
 
     <solid android:color="@color/white" />
 
-    <corners android:radius="10dp" />
+    <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
index ba81626..0c2abfe 100644
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ b/app/src/main/res/drawable/bg_layout_radius_20.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="@color/white" />
+    <solid android:color="@color/mainBackColor" />
 
     <corners
         android:topLeftRadius="@dimen/dp_20"
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
index 122b9cd..bca9c08 100644
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
@@ -6,7 +6,7 @@
 
     <stroke
         android:width="1dp"
-        android:color="@color/mainBackground" />
+        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/bottom_short_line.xml b/app/src/main/res/drawable/bottom_short_line.xml
new file mode 100644
index 0000000..10c9062
--- /dev/null
+++ b/app/src/main/res/drawable/bottom_short_line.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">
+
+    <solid android:color="@color/subTextColor" />
+
+    <corners android:radius="@dimen/dp_10" />
+
+    <size
+        android:width="@dimen/dp_30"
+        android:height="@dimen/dp_3" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_up.xml b/app/src/main/res/drawable/ic_up.xml
index 151a0cb..75c718f 100644
--- a/app/src/main/res/drawable/ic_up.xml
+++ b/app/src/main/res/drawable/ic_up.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
+        android:fillColor="@color/white"
         android:pathData="M938.7,704c0,10.9 -4.2,21.8 -12.5,30.2 -16.7,16.7 -43.7,16.7 -60.3,0L512,380.3 158.2,734.2c-16.7,16.7 -43.7,16.7 -60.3,0s-16.7,-43.7 0,-60.3l384,-384c16.7,-16.7 43.7,-16.7 60.3,0l384,384c8.3,8.3 12.5,19.2 12.5,30.1z" />
 </vector>
diff --git a/app/src/main/res/drawable/tag_normal.xml b/app/src/main/res/drawable/tag_normal.xml
index bb88697..d38b7cc 100644
--- a/app/src/main/res/drawable/tag_normal.xml
+++ b/app/src/main/res/drawable/tag_normal.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/mainBackground" />
+    <solid android:color="@color/mainBackColor" />
 
     <corners android:radius="@dimen/dp_3" />
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a7fbbba..a2ccde6 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -22,6 +22,5 @@
         android:background="@color/white"
         app:itemIconTint="@drawable/bottom_text_color"
         app:itemTextColor="@drawable/bottom_text_color"
-        app:labelVisibilityMode="labeled"
         app:menu="@menu/bottom_nav_menu" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_order_overtime.xml b/app/src/main/res/layout/activity_order_overtime.xml
index fdc1aab..914cb85 100644
--- a/app/src/main/res/layout/activity_order_overtime.xml
+++ b/app/src/main/res/layout/activity_order_overtime.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackground"
+    android:background="@color/mainBackColor"
     android:orientation="vertical"
     tools:context=".view.OvertimeOrderActivity">
 
diff --git a/app/src/main/res/layout/activity_well_management.xml b/app/src/main/res/layout/activity_well_management.xml
index 819d37f..c87a5a3 100644
--- a/app/src/main/res/layout/activity_well_management.xml
+++ b/app/src/main/res/layout/activity_well_management.xml
@@ -7,8 +7,6 @@
     android:orientation="vertical"
     tools:context=".view.WellManagementActivity">
 
-    <include layout="@layout/include_base_title" />
-
     <include layout="@layout/include_search_bar" />
 
     <include layout="@layout/include_empty_view" />
diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml
index a3f1334..a695043 100644
--- a/app/src/main/res/layout/activity_well_operation.xml
+++ b/app/src/main/res/layout/activity_well_operation.xml
@@ -7,8 +7,6 @@
     android:orientation="vertical"
     tools:context=".view.WellOperationActivity">
 
-    <include layout="@layout/include_base_title" />
-
     <include layout="@layout/include_search_bar" />
 
     <include layout="@layout/include_empty_view" />
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 37d50e5..8c5f4a4 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -9,6 +9,7 @@
     <include layout="@layout/include_base_title" />
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:id="@+id/coordinatorLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
@@ -18,193 +19,179 @@
             android:layout_height="match_parent" />
 
         <LinearLayout
+            android:id="@+id/bottomBehaviorLayout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="@drawable/bg_layout_radius_20"
             android:orientation="vertical"
-            app:behavior_fitToContents="false"
-            app:behavior_halfExpandedRatio="0.25"
-            app:behavior_hideable="false"
-            app:behavior_peekHeight="@dimen/titleViewHeight"
             app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
             <!--顶部短横线-->
             <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/titleViewHeight"
-                android:paddingVertical="22dp">
+                android:layout_height="@dimen/dp_30">
 
-                <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_marginHorizontal="150dp"
-                    app:qmui_backgroundColor="@color/hintTextColor"
-                    app:qmui_borderColor="@color/hintTextColor" />
+                <View
+                    android:layout_width="@dimen/dp_30"
+                    android:layout_height="@dimen/dp_3"
+                    android:layout_centerInParent="true"
+                    android:background="@drawable/bottom_short_line" />
             </RelativeLayout>
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/mainBackground" />
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/homeRecyclerView"
+            <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_10" />
+                android:layout_marginHorizontal="@dimen/dp_10"
+                android:background="@drawable/bg_layout">
 
-            <androidx.cardview.widget.CardView
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/homeRecyclerView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+            </RelativeLayout>
+
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10"
-                app:cardCornerRadius="@dimen/dp_5">
+                android:background="@drawable/bg_layout"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:paddingVertical="@dimen/dp_5"
+                    android:text="闸井监控"
+                    android:textColor="@color/mainTextColor"
+                    android:textSize="@dimen/titleFontSize" />
+
+                <View style="@style/dividerViewStyle" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:orientation="vertical">
+                    android:orientation="horizontal">
 
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:paddingVertical="@dimen/dp_5"
-                        android:text="闸井监控"
-                        android:textColor="@color/mainTextColor"
-                        android:textSize="@dimen/titleFontSize" />
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                    <View style="@style/dividerViewStyle" />
+                        <TextView
+                            android:id="@+id/unDeployedWellView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/redTextColor" />
 
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:orientation="horizontal">
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="已撤防" />
+                    </LinearLayout>
 
-                        <LinearLayout style="@style/homeLayoutStyle">
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                            <TextView
-                                android:id="@+id/unDeployedWellView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/redTextColor" />
+                        <TextView
+                            android:id="@+id/deployedWellView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/yellowTextColor" />
 
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="已撤防" />
-                        </LinearLayout>
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="已布防" />
+                    </LinearLayout>
 
-                        <LinearLayout style="@style/homeLayoutStyle">
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                            <TextView
-                                android:id="@+id/deployedWellView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/yellowTextColor" />
+                        <TextView
+                            android:id="@+id/allWellDataView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/greenTextColor" />
 
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="已布防" />
-                        </LinearLayout>
-
-                        <LinearLayout style="@style/homeLayoutStyle">
-
-                            <TextView
-                                android:id="@+id/allWellDataView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/greenTextColor" />
-
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="全部" />
-                        </LinearLayout>
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="全部" />
                     </LinearLayout>
                 </LinearLayout>
-            </androidx.cardview.widget.CardView>
+            </LinearLayout>
 
-            <androidx.cardview.widget.CardView
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10"
-                app:cardCornerRadius="@dimen/dp_5">
+                android:background="@drawable/bg_layout"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:paddingVertical="@dimen/dp_5"
+                    android:text="工\u3000\u3000单"
+                    android:textColor="@color/mainTextColor"
+                    android:textSize="@dimen/titleFontSize" />
+
+                <View style="@style/dividerViewStyle" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:orientation="vertical">
+                    android:orientation="horizontal">
 
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:paddingVertical="@dimen/dp_5"
-                        android:text="工\u3000\u3000单"
-                        android:textColor="@color/mainTextColor"
-                        android:textSize="@dimen/titleFontSize" />
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                    <View style="@style/dividerViewStyle" />
+                        <TextView
+                            android:id="@+id/todoDataView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/redTextColor" />
 
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:orientation="horizontal">
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="待处理" />
+                    </LinearLayout>
 
-                        <LinearLayout style="@style/homeLayoutStyle">
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                            <TextView
-                                android:id="@+id/todoDataView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/redTextColor" />
+                        <TextView
+                            android:id="@+id/undeterminedDataView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/yellowTextColor" />
 
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="待处理" />
-                        </LinearLayout>
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="待确认" />
+                    </LinearLayout>
 
-                        <LinearLayout style="@style/homeLayoutStyle">
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                            <TextView
-                                android:id="@+id/undeterminedDataView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/yellowTextColor" />
+                        <TextView
+                            android:id="@+id/inHandleDataView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/mainThemeColor" />
 
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="待确认" />
-                        </LinearLayout>
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="处理中" />
+                    </LinearLayout>
 
-                        <LinearLayout style="@style/homeLayoutStyle">
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                            <TextView
-                                android:id="@+id/inHandleDataView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/mainThemeColor" />
+                        <TextView
+                            android:id="@+id/completedDataView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/greenTextColor" />
 
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="处理中" />
-                        </LinearLayout>
-
-                        <LinearLayout style="@style/homeLayoutStyle">
-
-                            <TextView
-                                android:id="@+id/completedDataView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/greenTextColor" />
-
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="已完成" />
-                        </LinearLayout>
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="已完成" />
                     </LinearLayout>
                 </LinearLayout>
-            </androidx.cardview.widget.CardView>
+            </LinearLayout>
         </LinearLayout>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_order.xml b/app/src/main/res/layout/fragment_order.xml
index e798ed8..06dc5dc 100644
--- a/app/src/main/res/layout/fragment_order.xml
+++ b/app/src/main/res/layout/fragment_order.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackground"
+    android:background="@color/mainBackColor"
     android:orientation="vertical">
 
     <RelativeLayout
diff --git a/app/src/main/res/layout/include_search_bar.xml b/app/src/main/res/layout/include_search_bar.xml
index 48a3f79..a8c60f0 100644
--- a/app/src/main/res/layout/include_search_bar.xml
+++ b/app/src/main/res/layout/include_search_bar.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="48dp"
-    android:background="@color/mainBackground"
+    android:layout_height="@dimen/titleViewHeight"
+    android:background="@color/mainThemeColor"
     android:orientation="horizontal">
 
     <LinearLayout
@@ -18,8 +18,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/dp_3"
-            android:text="全　部"
-            android:textColor="@color/mainTextColor" />
+            android:text="全\u3000部"
+            android:textColor="@color/white"
+            android:textSize="14sp" />
 
         <ImageView
             android:id="@+id/arrowImageView"
@@ -32,7 +33,7 @@
     <RelativeLayout
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginVertical="8dp"
+        android:layout_marginVertical="7dp"
         android:layout_marginEnd="@dimen/dp_10"
         android:layout_weight="3"
         android:background="@drawable/bg_layout_radius_5">
@@ -42,14 +43,14 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:layout_marginStart="5dp"
+            android:layout_marginStart="@dimen/dp_5"
             android:src="@drawable/ic_search" />
 
         <com.pengxh.app.multilib.widget.EditTextWithDelete
             android:id="@+id/searchInputView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginStart="5dp"
+            android:layout_marginStart="@dimen/dp_5"
             android:layout_toStartOf="@id/lineView"
             android:layout_toEndOf="@id/searchImageView"
             android:background="@null"
@@ -75,6 +76,7 @@
             android:layout_centerVertical="true"
             android:layout_marginHorizontal="@dimen/dp_10"
             android:text="搜索"
-            android:textColor="@color/colorText" />
+            android:textColor="@color/colorText"
+            android:textSize="14sp" />
     </RelativeLayout>
 </LinearLayout>
\ No newline at end of file

diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
index b8f589c..9b25651 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
@@ -4,7 +4,6 @@
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
-import android.view.View
 import android.view.animation.LinearInterpolator
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -23,7 +22,6 @@
 import com.casic.app.smartwell.vm.WellTypeViewModel
 import com.casic.app.smartwell.widgets.EasyPopupWindow
 import kotlinx.android.synthetic.main.activity_well_management.*
-import kotlinx.android.synthetic.main.include_base_title.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_search_bar.*
 import java.lang.ref.WeakReference
@@ -48,9 +46,7 @@
     override fun initLayoutView(): Int = R.layout.activity_well_management
 
     override fun setupTopBarLayout() {
-        titleView.text = "窨井管理"
-        leftBackView.visibility = View.VISIBLE
-        leftBackView.setOnClickListener { finish() }
+
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
index 9876f1e..561d5d4 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
@@ -4,7 +4,6 @@
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
-import android.view.View
 import android.view.animation.LinearInterpolator
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -27,7 +26,6 @@
 import com.casic.app.smartwell.widgets.EasyPopupWindow
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.activity_well_operation.*
-import kotlinx.android.synthetic.main.include_base_title.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_search_bar.*
 import java.lang.ref.WeakReference
@@ -53,9 +51,7 @@
     override fun initLayoutView(): Int = R.layout.activity_well_operation
 
     override fun setupTopBarLayout() {
-        titleView.text = "布防撤防"
-        leftBackView.visibility = View.VISIBLE
-        leftBackView.setOnClickListener { finish() }
+
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
index ed8f009..78e7414 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
@@ -28,6 +28,8 @@
 import com.casic.app.smartwell.vm.WellListViewModel
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.pengxh.app.multilib.utils.SizeUtil
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.fragment_home.view.*
 import kotlinx.android.synthetic.main.include_base_title.view.*
@@ -62,6 +64,18 @@
         homeView = inflater.inflate(R.layout.fragment_home, container, false)
         homeView.titleView.text = "首页"
 
+        //代码设置底部拉升距离
+        val bottomSheetBehavior = BottomSheetBehavior.from(homeView.bottomBehaviorLayout)
+        homeView.coordinatorLayout.post {
+            bottomSheetBehavior.isFitToContents = false
+            bottomSheetBehavior.halfExpandedRatio = 0.23f
+            bottomSheetBehavior.isHideable = false
+            bottomSheetBehavior.peekHeight = SizeUtil.dp2px(requireContext(), 30f)
+            bottomSheetBehavior.setExpandedOffset(
+                (SizeUtil.getScreenHeight(requireContext()) * 0.3).toInt()
+            )
+        }
+
         //初始化vm
         wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java)
         workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
index d56f439..f00d59c 100644
--- a/app/src/main/res/drawable/bg_layout.xml
+++ b/app/src/main/res/drawable/bg_layout.xml
@@ -4,5 +4,5 @@
 
     <solid android:color="@color/white" />
 
-    <corners android:radius="10dp" />
+    <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
index ba81626..0c2abfe 100644
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ b/app/src/main/res/drawable/bg_layout_radius_20.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="@color/white" />
+    <solid android:color="@color/mainBackColor" />
 
     <corners
         android:topLeftRadius="@dimen/dp_20"
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
index 122b9cd..bca9c08 100644
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
@@ -6,7 +6,7 @@
 
     <stroke
         android:width="1dp"
-        android:color="@color/mainBackground" />
+        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/bottom_short_line.xml b/app/src/main/res/drawable/bottom_short_line.xml
new file mode 100644
index 0000000..10c9062
--- /dev/null
+++ b/app/src/main/res/drawable/bottom_short_line.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">
+
+    <solid android:color="@color/subTextColor" />
+
+    <corners android:radius="@dimen/dp_10" />
+
+    <size
+        android:width="@dimen/dp_30"
+        android:height="@dimen/dp_3" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_up.xml b/app/src/main/res/drawable/ic_up.xml
index 151a0cb..75c718f 100644
--- a/app/src/main/res/drawable/ic_up.xml
+++ b/app/src/main/res/drawable/ic_up.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
+        android:fillColor="@color/white"
         android:pathData="M938.7,704c0,10.9 -4.2,21.8 -12.5,30.2 -16.7,16.7 -43.7,16.7 -60.3,0L512,380.3 158.2,734.2c-16.7,16.7 -43.7,16.7 -60.3,0s-16.7,-43.7 0,-60.3l384,-384c16.7,-16.7 43.7,-16.7 60.3,0l384,384c8.3,8.3 12.5,19.2 12.5,30.1z" />
 </vector>
diff --git a/app/src/main/res/drawable/tag_normal.xml b/app/src/main/res/drawable/tag_normal.xml
index bb88697..d38b7cc 100644
--- a/app/src/main/res/drawable/tag_normal.xml
+++ b/app/src/main/res/drawable/tag_normal.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/mainBackground" />
+    <solid android:color="@color/mainBackColor" />
 
     <corners android:radius="@dimen/dp_3" />
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a7fbbba..a2ccde6 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -22,6 +22,5 @@
         android:background="@color/white"
         app:itemIconTint="@drawable/bottom_text_color"
         app:itemTextColor="@drawable/bottom_text_color"
-        app:labelVisibilityMode="labeled"
         app:menu="@menu/bottom_nav_menu" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_order_overtime.xml b/app/src/main/res/layout/activity_order_overtime.xml
index fdc1aab..914cb85 100644
--- a/app/src/main/res/layout/activity_order_overtime.xml
+++ b/app/src/main/res/layout/activity_order_overtime.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackground"
+    android:background="@color/mainBackColor"
     android:orientation="vertical"
     tools:context=".view.OvertimeOrderActivity">
 
diff --git a/app/src/main/res/layout/activity_well_management.xml b/app/src/main/res/layout/activity_well_management.xml
index 819d37f..c87a5a3 100644
--- a/app/src/main/res/layout/activity_well_management.xml
+++ b/app/src/main/res/layout/activity_well_management.xml
@@ -7,8 +7,6 @@
     android:orientation="vertical"
     tools:context=".view.WellManagementActivity">
 
-    <include layout="@layout/include_base_title" />
-
     <include layout="@layout/include_search_bar" />
 
     <include layout="@layout/include_empty_view" />
diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml
index a3f1334..a695043 100644
--- a/app/src/main/res/layout/activity_well_operation.xml
+++ b/app/src/main/res/layout/activity_well_operation.xml
@@ -7,8 +7,6 @@
     android:orientation="vertical"
     tools:context=".view.WellOperationActivity">
 
-    <include layout="@layout/include_base_title" />
-
     <include layout="@layout/include_search_bar" />
 
     <include layout="@layout/include_empty_view" />
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 37d50e5..8c5f4a4 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -9,6 +9,7 @@
     <include layout="@layout/include_base_title" />
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:id="@+id/coordinatorLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
@@ -18,193 +19,179 @@
             android:layout_height="match_parent" />
 
         <LinearLayout
+            android:id="@+id/bottomBehaviorLayout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="@drawable/bg_layout_radius_20"
             android:orientation="vertical"
-            app:behavior_fitToContents="false"
-            app:behavior_halfExpandedRatio="0.25"
-            app:behavior_hideable="false"
-            app:behavior_peekHeight="@dimen/titleViewHeight"
             app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
             <!--顶部短横线-->
             <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/titleViewHeight"
-                android:paddingVertical="22dp">
+                android:layout_height="@dimen/dp_30">
 
-                <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_marginHorizontal="150dp"
-                    app:qmui_backgroundColor="@color/hintTextColor"
-                    app:qmui_borderColor="@color/hintTextColor" />
+                <View
+                    android:layout_width="@dimen/dp_30"
+                    android:layout_height="@dimen/dp_3"
+                    android:layout_centerInParent="true"
+                    android:background="@drawable/bottom_short_line" />
             </RelativeLayout>
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/mainBackground" />
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/homeRecyclerView"
+            <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_10" />
+                android:layout_marginHorizontal="@dimen/dp_10"
+                android:background="@drawable/bg_layout">
 
-            <androidx.cardview.widget.CardView
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/homeRecyclerView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+            </RelativeLayout>
+
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10"
-                app:cardCornerRadius="@dimen/dp_5">
+                android:background="@drawable/bg_layout"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:paddingVertical="@dimen/dp_5"
+                    android:text="闸井监控"
+                    android:textColor="@color/mainTextColor"
+                    android:textSize="@dimen/titleFontSize" />
+
+                <View style="@style/dividerViewStyle" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:orientation="vertical">
+                    android:orientation="horizontal">
 
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:paddingVertical="@dimen/dp_5"
-                        android:text="闸井监控"
-                        android:textColor="@color/mainTextColor"
-                        android:textSize="@dimen/titleFontSize" />
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                    <View style="@style/dividerViewStyle" />
+                        <TextView
+                            android:id="@+id/unDeployedWellView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/redTextColor" />
 
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:orientation="horizontal">
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="已撤防" />
+                    </LinearLayout>
 
-                        <LinearLayout style="@style/homeLayoutStyle">
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                            <TextView
-                                android:id="@+id/unDeployedWellView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/redTextColor" />
+                        <TextView
+                            android:id="@+id/deployedWellView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/yellowTextColor" />
 
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="已撤防" />
-                        </LinearLayout>
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="已布防" />
+                    </LinearLayout>
 
-                        <LinearLayout style="@style/homeLayoutStyle">
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                            <TextView
-                                android:id="@+id/deployedWellView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/yellowTextColor" />
+                        <TextView
+                            android:id="@+id/allWellDataView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/greenTextColor" />
 
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="已布防" />
-                        </LinearLayout>
-
-                        <LinearLayout style="@style/homeLayoutStyle">
-
-                            <TextView
-                                android:id="@+id/allWellDataView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/greenTextColor" />
-
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="全部" />
-                        </LinearLayout>
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="全部" />
                     </LinearLayout>
                 </LinearLayout>
-            </androidx.cardview.widget.CardView>
+            </LinearLayout>
 
-            <androidx.cardview.widget.CardView
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10"
-                app:cardCornerRadius="@dimen/dp_5">
+                android:background="@drawable/bg_layout"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:paddingVertical="@dimen/dp_5"
+                    android:text="工\u3000\u3000单"
+                    android:textColor="@color/mainTextColor"
+                    android:textSize="@dimen/titleFontSize" />
+
+                <View style="@style/dividerViewStyle" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:orientation="vertical">
+                    android:orientation="horizontal">
 
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:paddingVertical="@dimen/dp_5"
-                        android:text="工\u3000\u3000单"
-                        android:textColor="@color/mainTextColor"
-                        android:textSize="@dimen/titleFontSize" />
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                    <View style="@style/dividerViewStyle" />
+                        <TextView
+                            android:id="@+id/todoDataView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/redTextColor" />
 
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:orientation="horizontal">
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="待处理" />
+                    </LinearLayout>
 
-                        <LinearLayout style="@style/homeLayoutStyle">
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                            <TextView
-                                android:id="@+id/todoDataView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/redTextColor" />
+                        <TextView
+                            android:id="@+id/undeterminedDataView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/yellowTextColor" />
 
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="待处理" />
-                        </LinearLayout>
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="待确认" />
+                    </LinearLayout>
 
-                        <LinearLayout style="@style/homeLayoutStyle">
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                            <TextView
-                                android:id="@+id/undeterminedDataView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/yellowTextColor" />
+                        <TextView
+                            android:id="@+id/inHandleDataView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/mainThemeColor" />
 
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="待确认" />
-                        </LinearLayout>
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="处理中" />
+                    </LinearLayout>
 
-                        <LinearLayout style="@style/homeLayoutStyle">
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                            <TextView
-                                android:id="@+id/inHandleDataView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/mainThemeColor" />
+                        <TextView
+                            android:id="@+id/completedDataView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/greenTextColor" />
 
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="处理中" />
-                        </LinearLayout>
-
-                        <LinearLayout style="@style/homeLayoutStyle">
-
-                            <TextView
-                                android:id="@+id/completedDataView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/greenTextColor" />
-
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="已完成" />
-                        </LinearLayout>
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="已完成" />
                     </LinearLayout>
                 </LinearLayout>
-            </androidx.cardview.widget.CardView>
+            </LinearLayout>
         </LinearLayout>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_order.xml b/app/src/main/res/layout/fragment_order.xml
index e798ed8..06dc5dc 100644
--- a/app/src/main/res/layout/fragment_order.xml
+++ b/app/src/main/res/layout/fragment_order.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackground"
+    android:background="@color/mainBackColor"
     android:orientation="vertical">
 
     <RelativeLayout
diff --git a/app/src/main/res/layout/include_search_bar.xml b/app/src/main/res/layout/include_search_bar.xml
index 48a3f79..a8c60f0 100644
--- a/app/src/main/res/layout/include_search_bar.xml
+++ b/app/src/main/res/layout/include_search_bar.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="48dp"
-    android:background="@color/mainBackground"
+    android:layout_height="@dimen/titleViewHeight"
+    android:background="@color/mainThemeColor"
     android:orientation="horizontal">
 
     <LinearLayout
@@ -18,8 +18,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/dp_3"
-            android:text="全　部"
-            android:textColor="@color/mainTextColor" />
+            android:text="全\u3000部"
+            android:textColor="@color/white"
+            android:textSize="14sp" />
 
         <ImageView
             android:id="@+id/arrowImageView"
@@ -32,7 +33,7 @@
     <RelativeLayout
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginVertical="8dp"
+        android:layout_marginVertical="7dp"
         android:layout_marginEnd="@dimen/dp_10"
         android:layout_weight="3"
         android:background="@drawable/bg_layout_radius_5">
@@ -42,14 +43,14 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:layout_marginStart="5dp"
+            android:layout_marginStart="@dimen/dp_5"
             android:src="@drawable/ic_search" />
 
         <com.pengxh.app.multilib.widget.EditTextWithDelete
             android:id="@+id/searchInputView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginStart="5dp"
+            android:layout_marginStart="@dimen/dp_5"
             android:layout_toStartOf="@id/lineView"
             android:layout_toEndOf="@id/searchImageView"
             android:background="@null"
@@ -75,6 +76,7 @@
             android:layout_centerVertical="true"
             android:layout_marginHorizontal="@dimen/dp_10"
             android:text="搜索"
-            android:textColor="@color/colorText" />
+            android:textColor="@color/colorText"
+            android:textSize="14sp" />
     </RelativeLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_choice_dialog.xml b/app/src/main/res/layout/item_choice_dialog.xml
index c792afd..a8fe9f3 100644
--- a/app/src/main/res/layout/item_choice_dialog.xml
+++ b/app/src/main/res/layout/item_choice_dialog.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="46dp">
+    android:layout_height="@dimen/titleViewHeight">
 
     <TextView
         android:id="@+id/choiceItemView"

diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
index b8f589c..9b25651 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
@@ -4,7 +4,6 @@
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
-import android.view.View
 import android.view.animation.LinearInterpolator
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -23,7 +22,6 @@
 import com.casic.app.smartwell.vm.WellTypeViewModel
 import com.casic.app.smartwell.widgets.EasyPopupWindow
 import kotlinx.android.synthetic.main.activity_well_management.*
-import kotlinx.android.synthetic.main.include_base_title.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_search_bar.*
 import java.lang.ref.WeakReference
@@ -48,9 +46,7 @@
     override fun initLayoutView(): Int = R.layout.activity_well_management
 
     override fun setupTopBarLayout() {
-        titleView.text = "窨井管理"
-        leftBackView.visibility = View.VISIBLE
-        leftBackView.setOnClickListener { finish() }
+
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
index 9876f1e..561d5d4 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
@@ -4,7 +4,6 @@
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
-import android.view.View
 import android.view.animation.LinearInterpolator
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -27,7 +26,6 @@
 import com.casic.app.smartwell.widgets.EasyPopupWindow
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.activity_well_operation.*
-import kotlinx.android.synthetic.main.include_base_title.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_search_bar.*
 import java.lang.ref.WeakReference
@@ -53,9 +51,7 @@
     override fun initLayoutView(): Int = R.layout.activity_well_operation
 
     override fun setupTopBarLayout() {
-        titleView.text = "布防撤防"
-        leftBackView.visibility = View.VISIBLE
-        leftBackView.setOnClickListener { finish() }
+
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
index ed8f009..78e7414 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
@@ -28,6 +28,8 @@
 import com.casic.app.smartwell.vm.WellListViewModel
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.pengxh.app.multilib.utils.SizeUtil
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.fragment_home.view.*
 import kotlinx.android.synthetic.main.include_base_title.view.*
@@ -62,6 +64,18 @@
         homeView = inflater.inflate(R.layout.fragment_home, container, false)
         homeView.titleView.text = "首页"
 
+        //代码设置底部拉升距离
+        val bottomSheetBehavior = BottomSheetBehavior.from(homeView.bottomBehaviorLayout)
+        homeView.coordinatorLayout.post {
+            bottomSheetBehavior.isFitToContents = false
+            bottomSheetBehavior.halfExpandedRatio = 0.23f
+            bottomSheetBehavior.isHideable = false
+            bottomSheetBehavior.peekHeight = SizeUtil.dp2px(requireContext(), 30f)
+            bottomSheetBehavior.setExpandedOffset(
+                (SizeUtil.getScreenHeight(requireContext()) * 0.3).toInt()
+            )
+        }
+
         //初始化vm
         wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java)
         workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
index d56f439..f00d59c 100644
--- a/app/src/main/res/drawable/bg_layout.xml
+++ b/app/src/main/res/drawable/bg_layout.xml
@@ -4,5 +4,5 @@
 
     <solid android:color="@color/white" />
 
-    <corners android:radius="10dp" />
+    <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
index ba81626..0c2abfe 100644
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ b/app/src/main/res/drawable/bg_layout_radius_20.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="@color/white" />
+    <solid android:color="@color/mainBackColor" />
 
     <corners
         android:topLeftRadius="@dimen/dp_20"
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
index 122b9cd..bca9c08 100644
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
@@ -6,7 +6,7 @@
 
     <stroke
         android:width="1dp"
-        android:color="@color/mainBackground" />
+        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/bottom_short_line.xml b/app/src/main/res/drawable/bottom_short_line.xml
new file mode 100644
index 0000000..10c9062
--- /dev/null
+++ b/app/src/main/res/drawable/bottom_short_line.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">
+
+    <solid android:color="@color/subTextColor" />
+
+    <corners android:radius="@dimen/dp_10" />
+
+    <size
+        android:width="@dimen/dp_30"
+        android:height="@dimen/dp_3" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_up.xml b/app/src/main/res/drawable/ic_up.xml
index 151a0cb..75c718f 100644
--- a/app/src/main/res/drawable/ic_up.xml
+++ b/app/src/main/res/drawable/ic_up.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
+        android:fillColor="@color/white"
         android:pathData="M938.7,704c0,10.9 -4.2,21.8 -12.5,30.2 -16.7,16.7 -43.7,16.7 -60.3,0L512,380.3 158.2,734.2c-16.7,16.7 -43.7,16.7 -60.3,0s-16.7,-43.7 0,-60.3l384,-384c16.7,-16.7 43.7,-16.7 60.3,0l384,384c8.3,8.3 12.5,19.2 12.5,30.1z" />
 </vector>
diff --git a/app/src/main/res/drawable/tag_normal.xml b/app/src/main/res/drawable/tag_normal.xml
index bb88697..d38b7cc 100644
--- a/app/src/main/res/drawable/tag_normal.xml
+++ b/app/src/main/res/drawable/tag_normal.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/mainBackground" />
+    <solid android:color="@color/mainBackColor" />
 
     <corners android:radius="@dimen/dp_3" />
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a7fbbba..a2ccde6 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -22,6 +22,5 @@
         android:background="@color/white"
         app:itemIconTint="@drawable/bottom_text_color"
         app:itemTextColor="@drawable/bottom_text_color"
-        app:labelVisibilityMode="labeled"
         app:menu="@menu/bottom_nav_menu" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_order_overtime.xml b/app/src/main/res/layout/activity_order_overtime.xml
index fdc1aab..914cb85 100644
--- a/app/src/main/res/layout/activity_order_overtime.xml
+++ b/app/src/main/res/layout/activity_order_overtime.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackground"
+    android:background="@color/mainBackColor"
     android:orientation="vertical"
     tools:context=".view.OvertimeOrderActivity">
 
diff --git a/app/src/main/res/layout/activity_well_management.xml b/app/src/main/res/layout/activity_well_management.xml
index 819d37f..c87a5a3 100644
--- a/app/src/main/res/layout/activity_well_management.xml
+++ b/app/src/main/res/layout/activity_well_management.xml
@@ -7,8 +7,6 @@
     android:orientation="vertical"
     tools:context=".view.WellManagementActivity">
 
-    <include layout="@layout/include_base_title" />
-
     <include layout="@layout/include_search_bar" />
 
     <include layout="@layout/include_empty_view" />
diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml
index a3f1334..a695043 100644
--- a/app/src/main/res/layout/activity_well_operation.xml
+++ b/app/src/main/res/layout/activity_well_operation.xml
@@ -7,8 +7,6 @@
     android:orientation="vertical"
     tools:context=".view.WellOperationActivity">
 
-    <include layout="@layout/include_base_title" />
-
     <include layout="@layout/include_search_bar" />
 
     <include layout="@layout/include_empty_view" />
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 37d50e5..8c5f4a4 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -9,6 +9,7 @@
     <include layout="@layout/include_base_title" />
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:id="@+id/coordinatorLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
@@ -18,193 +19,179 @@
             android:layout_height="match_parent" />
 
         <LinearLayout
+            android:id="@+id/bottomBehaviorLayout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="@drawable/bg_layout_radius_20"
             android:orientation="vertical"
-            app:behavior_fitToContents="false"
-            app:behavior_halfExpandedRatio="0.25"
-            app:behavior_hideable="false"
-            app:behavior_peekHeight="@dimen/titleViewHeight"
             app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
             <!--顶部短横线-->
             <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/titleViewHeight"
-                android:paddingVertical="22dp">
+                android:layout_height="@dimen/dp_30">
 
-                <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_marginHorizontal="150dp"
-                    app:qmui_backgroundColor="@color/hintTextColor"
-                    app:qmui_borderColor="@color/hintTextColor" />
+                <View
+                    android:layout_width="@dimen/dp_30"
+                    android:layout_height="@dimen/dp_3"
+                    android:layout_centerInParent="true"
+                    android:background="@drawable/bottom_short_line" />
             </RelativeLayout>
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/mainBackground" />
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/homeRecyclerView"
+            <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_10" />
+                android:layout_marginHorizontal="@dimen/dp_10"
+                android:background="@drawable/bg_layout">
 
-            <androidx.cardview.widget.CardView
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/homeRecyclerView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+            </RelativeLayout>
+
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10"
-                app:cardCornerRadius="@dimen/dp_5">
+                android:background="@drawable/bg_layout"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:paddingVertical="@dimen/dp_5"
+                    android:text="闸井监控"
+                    android:textColor="@color/mainTextColor"
+                    android:textSize="@dimen/titleFontSize" />
+
+                <View style="@style/dividerViewStyle" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:orientation="vertical">
+                    android:orientation="horizontal">
 
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:paddingVertical="@dimen/dp_5"
-                        android:text="闸井监控"
-                        android:textColor="@color/mainTextColor"
-                        android:textSize="@dimen/titleFontSize" />
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                    <View style="@style/dividerViewStyle" />
+                        <TextView
+                            android:id="@+id/unDeployedWellView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/redTextColor" />
 
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:orientation="horizontal">
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="已撤防" />
+                    </LinearLayout>
 
-                        <LinearLayout style="@style/homeLayoutStyle">
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                            <TextView
-                                android:id="@+id/unDeployedWellView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/redTextColor" />
+                        <TextView
+                            android:id="@+id/deployedWellView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/yellowTextColor" />
 
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="已撤防" />
-                        </LinearLayout>
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="已布防" />
+                    </LinearLayout>
 
-                        <LinearLayout style="@style/homeLayoutStyle">
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                            <TextView
-                                android:id="@+id/deployedWellView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/yellowTextColor" />
+                        <TextView
+                            android:id="@+id/allWellDataView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/greenTextColor" />
 
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="已布防" />
-                        </LinearLayout>
-
-                        <LinearLayout style="@style/homeLayoutStyle">
-
-                            <TextView
-                                android:id="@+id/allWellDataView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/greenTextColor" />
-
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="全部" />
-                        </LinearLayout>
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="全部" />
                     </LinearLayout>
                 </LinearLayout>
-            </androidx.cardview.widget.CardView>
+            </LinearLayout>
 
-            <androidx.cardview.widget.CardView
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10"
-                app:cardCornerRadius="@dimen/dp_5">
+                android:background="@drawable/bg_layout"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:paddingVertical="@dimen/dp_5"
+                    android:text="工\u3000\u3000单"
+                    android:textColor="@color/mainTextColor"
+                    android:textSize="@dimen/titleFontSize" />
+
+                <View style="@style/dividerViewStyle" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:orientation="vertical">
+                    android:orientation="horizontal">
 
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:paddingVertical="@dimen/dp_5"
-                        android:text="工\u3000\u3000单"
-                        android:textColor="@color/mainTextColor"
-                        android:textSize="@dimen/titleFontSize" />
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                    <View style="@style/dividerViewStyle" />
+                        <TextView
+                            android:id="@+id/todoDataView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/redTextColor" />
 
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:orientation="horizontal">
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="待处理" />
+                    </LinearLayout>
 
-                        <LinearLayout style="@style/homeLayoutStyle">
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                            <TextView
-                                android:id="@+id/todoDataView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/redTextColor" />
+                        <TextView
+                            android:id="@+id/undeterminedDataView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/yellowTextColor" />
 
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="待处理" />
-                        </LinearLayout>
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="待确认" />
+                    </LinearLayout>
 
-                        <LinearLayout style="@style/homeLayoutStyle">
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                            <TextView
-                                android:id="@+id/undeterminedDataView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/yellowTextColor" />
+                        <TextView
+                            android:id="@+id/inHandleDataView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/mainThemeColor" />
 
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="待确认" />
-                        </LinearLayout>
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="处理中" />
+                    </LinearLayout>
 
-                        <LinearLayout style="@style/homeLayoutStyle">
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                            <TextView
-                                android:id="@+id/inHandleDataView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/mainThemeColor" />
+                        <TextView
+                            android:id="@+id/completedDataView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/greenTextColor" />
 
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="处理中" />
-                        </LinearLayout>
-
-                        <LinearLayout style="@style/homeLayoutStyle">
-
-                            <TextView
-                                android:id="@+id/completedDataView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/greenTextColor" />
-
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="已完成" />
-                        </LinearLayout>
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="已完成" />
                     </LinearLayout>
                 </LinearLayout>
-            </androidx.cardview.widget.CardView>
+            </LinearLayout>
         </LinearLayout>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_order.xml b/app/src/main/res/layout/fragment_order.xml
index e798ed8..06dc5dc 100644
--- a/app/src/main/res/layout/fragment_order.xml
+++ b/app/src/main/res/layout/fragment_order.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackground"
+    android:background="@color/mainBackColor"
     android:orientation="vertical">
 
     <RelativeLayout
diff --git a/app/src/main/res/layout/include_search_bar.xml b/app/src/main/res/layout/include_search_bar.xml
index 48a3f79..a8c60f0 100644
--- a/app/src/main/res/layout/include_search_bar.xml
+++ b/app/src/main/res/layout/include_search_bar.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="48dp"
-    android:background="@color/mainBackground"
+    android:layout_height="@dimen/titleViewHeight"
+    android:background="@color/mainThemeColor"
     android:orientation="horizontal">
 
     <LinearLayout
@@ -18,8 +18,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/dp_3"
-            android:text="全　部"
-            android:textColor="@color/mainTextColor" />
+            android:text="全\u3000部"
+            android:textColor="@color/white"
+            android:textSize="14sp" />
 
         <ImageView
             android:id="@+id/arrowImageView"
@@ -32,7 +33,7 @@
     <RelativeLayout
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginVertical="8dp"
+        android:layout_marginVertical="7dp"
         android:layout_marginEnd="@dimen/dp_10"
         android:layout_weight="3"
         android:background="@drawable/bg_layout_radius_5">
@@ -42,14 +43,14 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:layout_marginStart="5dp"
+            android:layout_marginStart="@dimen/dp_5"
             android:src="@drawable/ic_search" />
 
         <com.pengxh.app.multilib.widget.EditTextWithDelete
             android:id="@+id/searchInputView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginStart="5dp"
+            android:layout_marginStart="@dimen/dp_5"
             android:layout_toStartOf="@id/lineView"
             android:layout_toEndOf="@id/searchImageView"
             android:background="@null"
@@ -75,6 +76,7 @@
             android:layout_centerVertical="true"
             android:layout_marginHorizontal="@dimen/dp_10"
             android:text="搜索"
-            android:textColor="@color/colorText" />
+            android:textColor="@color/colorText"
+            android:textSize="14sp" />
     </RelativeLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_choice_dialog.xml b/app/src/main/res/layout/item_choice_dialog.xml
index c792afd..a8fe9f3 100644
--- a/app/src/main/res/layout/item_choice_dialog.xml
+++ b/app/src/main/res/layout/item_choice_dialog.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="46dp">
+    android:layout_height="@dimen/titleViewHeight">
 
     <TextView
         android:id="@+id/choiceItemView"
diff --git a/app/src/main/res/layout/item_popup.xml b/app/src/main/res/layout/item_popup.xml
index 05033c4..454146c 100644
--- a/app/src/main/res/layout/item_popup.xml
+++ b/app/src/main/res/layout/item_popup.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center"
-    android:padding="10dp">
+    android:padding="@dimen/dp_10">
 
     <TextView
         android:id="@+id/popupTitle"

diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
index b8f589c..9b25651 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
@@ -4,7 +4,6 @@
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
-import android.view.View
 import android.view.animation.LinearInterpolator
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -23,7 +22,6 @@
 import com.casic.app.smartwell.vm.WellTypeViewModel
 import com.casic.app.smartwell.widgets.EasyPopupWindow
 import kotlinx.android.synthetic.main.activity_well_management.*
-import kotlinx.android.synthetic.main.include_base_title.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_search_bar.*
 import java.lang.ref.WeakReference
@@ -48,9 +46,7 @@
     override fun initLayoutView(): Int = R.layout.activity_well_management
 
     override fun setupTopBarLayout() {
-        titleView.text = "窨井管理"
-        leftBackView.visibility = View.VISIBLE
-        leftBackView.setOnClickListener { finish() }
+
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
index 9876f1e..561d5d4 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
@@ -4,7 +4,6 @@
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
-import android.view.View
 import android.view.animation.LinearInterpolator
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -27,7 +26,6 @@
 import com.casic.app.smartwell.widgets.EasyPopupWindow
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.activity_well_operation.*
-import kotlinx.android.synthetic.main.include_base_title.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_search_bar.*
 import java.lang.ref.WeakReference
@@ -53,9 +51,7 @@
     override fun initLayoutView(): Int = R.layout.activity_well_operation
 
     override fun setupTopBarLayout() {
-        titleView.text = "布防撤防"
-        leftBackView.visibility = View.VISIBLE
-        leftBackView.setOnClickListener { finish() }
+
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
index ed8f009..78e7414 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
@@ -28,6 +28,8 @@
 import com.casic.app.smartwell.vm.WellListViewModel
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.pengxh.app.multilib.utils.SizeUtil
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.fragment_home.view.*
 import kotlinx.android.synthetic.main.include_base_title.view.*
@@ -62,6 +64,18 @@
         homeView = inflater.inflate(R.layout.fragment_home, container, false)
         homeView.titleView.text = "首页"
 
+        //代码设置底部拉升距离
+        val bottomSheetBehavior = BottomSheetBehavior.from(homeView.bottomBehaviorLayout)
+        homeView.coordinatorLayout.post {
+            bottomSheetBehavior.isFitToContents = false
+            bottomSheetBehavior.halfExpandedRatio = 0.23f
+            bottomSheetBehavior.isHideable = false
+            bottomSheetBehavior.peekHeight = SizeUtil.dp2px(requireContext(), 30f)
+            bottomSheetBehavior.setExpandedOffset(
+                (SizeUtil.getScreenHeight(requireContext()) * 0.3).toInt()
+            )
+        }
+
         //初始化vm
         wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java)
         workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
index d56f439..f00d59c 100644
--- a/app/src/main/res/drawable/bg_layout.xml
+++ b/app/src/main/res/drawable/bg_layout.xml
@@ -4,5 +4,5 @@
 
     <solid android:color="@color/white" />
 
-    <corners android:radius="10dp" />
+    <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
index ba81626..0c2abfe 100644
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ b/app/src/main/res/drawable/bg_layout_radius_20.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="@color/white" />
+    <solid android:color="@color/mainBackColor" />
 
     <corners
         android:topLeftRadius="@dimen/dp_20"
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
index 122b9cd..bca9c08 100644
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
@@ -6,7 +6,7 @@
 
     <stroke
         android:width="1dp"
-        android:color="@color/mainBackground" />
+        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/bottom_short_line.xml b/app/src/main/res/drawable/bottom_short_line.xml
new file mode 100644
index 0000000..10c9062
--- /dev/null
+++ b/app/src/main/res/drawable/bottom_short_line.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">
+
+    <solid android:color="@color/subTextColor" />
+
+    <corners android:radius="@dimen/dp_10" />
+
+    <size
+        android:width="@dimen/dp_30"
+        android:height="@dimen/dp_3" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_up.xml b/app/src/main/res/drawable/ic_up.xml
index 151a0cb..75c718f 100644
--- a/app/src/main/res/drawable/ic_up.xml
+++ b/app/src/main/res/drawable/ic_up.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
+        android:fillColor="@color/white"
         android:pathData="M938.7,704c0,10.9 -4.2,21.8 -12.5,30.2 -16.7,16.7 -43.7,16.7 -60.3,0L512,380.3 158.2,734.2c-16.7,16.7 -43.7,16.7 -60.3,0s-16.7,-43.7 0,-60.3l384,-384c16.7,-16.7 43.7,-16.7 60.3,0l384,384c8.3,8.3 12.5,19.2 12.5,30.1z" />
 </vector>
diff --git a/app/src/main/res/drawable/tag_normal.xml b/app/src/main/res/drawable/tag_normal.xml
index bb88697..d38b7cc 100644
--- a/app/src/main/res/drawable/tag_normal.xml
+++ b/app/src/main/res/drawable/tag_normal.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/mainBackground" />
+    <solid android:color="@color/mainBackColor" />
 
     <corners android:radius="@dimen/dp_3" />
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a7fbbba..a2ccde6 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -22,6 +22,5 @@
         android:background="@color/white"
         app:itemIconTint="@drawable/bottom_text_color"
         app:itemTextColor="@drawable/bottom_text_color"
-        app:labelVisibilityMode="labeled"
         app:menu="@menu/bottom_nav_menu" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_order_overtime.xml b/app/src/main/res/layout/activity_order_overtime.xml
index fdc1aab..914cb85 100644
--- a/app/src/main/res/layout/activity_order_overtime.xml
+++ b/app/src/main/res/layout/activity_order_overtime.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackground"
+    android:background="@color/mainBackColor"
     android:orientation="vertical"
     tools:context=".view.OvertimeOrderActivity">
 
diff --git a/app/src/main/res/layout/activity_well_management.xml b/app/src/main/res/layout/activity_well_management.xml
index 819d37f..c87a5a3 100644
--- a/app/src/main/res/layout/activity_well_management.xml
+++ b/app/src/main/res/layout/activity_well_management.xml
@@ -7,8 +7,6 @@
     android:orientation="vertical"
     tools:context=".view.WellManagementActivity">
 
-    <include layout="@layout/include_base_title" />
-
     <include layout="@layout/include_search_bar" />
 
     <include layout="@layout/include_empty_view" />
diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml
index a3f1334..a695043 100644
--- a/app/src/main/res/layout/activity_well_operation.xml
+++ b/app/src/main/res/layout/activity_well_operation.xml
@@ -7,8 +7,6 @@
     android:orientation="vertical"
     tools:context=".view.WellOperationActivity">
 
-    <include layout="@layout/include_base_title" />
-
     <include layout="@layout/include_search_bar" />
 
     <include layout="@layout/include_empty_view" />
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 37d50e5..8c5f4a4 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -9,6 +9,7 @@
     <include layout="@layout/include_base_title" />
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:id="@+id/coordinatorLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
@@ -18,193 +19,179 @@
             android:layout_height="match_parent" />
 
         <LinearLayout
+            android:id="@+id/bottomBehaviorLayout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="@drawable/bg_layout_radius_20"
             android:orientation="vertical"
-            app:behavior_fitToContents="false"
-            app:behavior_halfExpandedRatio="0.25"
-            app:behavior_hideable="false"
-            app:behavior_peekHeight="@dimen/titleViewHeight"
             app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
             <!--顶部短横线-->
             <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/titleViewHeight"
-                android:paddingVertical="22dp">
+                android:layout_height="@dimen/dp_30">
 
-                <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_marginHorizontal="150dp"
-                    app:qmui_backgroundColor="@color/hintTextColor"
-                    app:qmui_borderColor="@color/hintTextColor" />
+                <View
+                    android:layout_width="@dimen/dp_30"
+                    android:layout_height="@dimen/dp_3"
+                    android:layout_centerInParent="true"
+                    android:background="@drawable/bottom_short_line" />
             </RelativeLayout>
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/mainBackground" />
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/homeRecyclerView"
+            <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_10" />
+                android:layout_marginHorizontal="@dimen/dp_10"
+                android:background="@drawable/bg_layout">
 
-            <androidx.cardview.widget.CardView
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/homeRecyclerView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+            </RelativeLayout>
+
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10"
-                app:cardCornerRadius="@dimen/dp_5">
+                android:background="@drawable/bg_layout"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:paddingVertical="@dimen/dp_5"
+                    android:text="闸井监控"
+                    android:textColor="@color/mainTextColor"
+                    android:textSize="@dimen/titleFontSize" />
+
+                <View style="@style/dividerViewStyle" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:orientation="vertical">
+                    android:orientation="horizontal">
 
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:paddingVertical="@dimen/dp_5"
-                        android:text="闸井监控"
-                        android:textColor="@color/mainTextColor"
-                        android:textSize="@dimen/titleFontSize" />
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                    <View style="@style/dividerViewStyle" />
+                        <TextView
+                            android:id="@+id/unDeployedWellView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/redTextColor" />
 
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:orientation="horizontal">
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="已撤防" />
+                    </LinearLayout>
 
-                        <LinearLayout style="@style/homeLayoutStyle">
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                            <TextView
-                                android:id="@+id/unDeployedWellView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/redTextColor" />
+                        <TextView
+                            android:id="@+id/deployedWellView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/yellowTextColor" />
 
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="已撤防" />
-                        </LinearLayout>
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="已布防" />
+                    </LinearLayout>
 
-                        <LinearLayout style="@style/homeLayoutStyle">
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                            <TextView
-                                android:id="@+id/deployedWellView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/yellowTextColor" />
+                        <TextView
+                            android:id="@+id/allWellDataView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/greenTextColor" />
 
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="已布防" />
-                        </LinearLayout>
-
-                        <LinearLayout style="@style/homeLayoutStyle">
-
-                            <TextView
-                                android:id="@+id/allWellDataView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/greenTextColor" />
-
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="全部" />
-                        </LinearLayout>
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="全部" />
                     </LinearLayout>
                 </LinearLayout>
-            </androidx.cardview.widget.CardView>
+            </LinearLayout>
 
-            <androidx.cardview.widget.CardView
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10"
-                app:cardCornerRadius="@dimen/dp_5">
+                android:background="@drawable/bg_layout"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:paddingVertical="@dimen/dp_5"
+                    android:text="工\u3000\u3000单"
+                    android:textColor="@color/mainTextColor"
+                    android:textSize="@dimen/titleFontSize" />
+
+                <View style="@style/dividerViewStyle" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:orientation="vertical">
+                    android:orientation="horizontal">
 
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:paddingVertical="@dimen/dp_5"
-                        android:text="工\u3000\u3000单"
-                        android:textColor="@color/mainTextColor"
-                        android:textSize="@dimen/titleFontSize" />
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                    <View style="@style/dividerViewStyle" />
+                        <TextView
+                            android:id="@+id/todoDataView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/redTextColor" />
 
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:orientation="horizontal">
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="待处理" />
+                    </LinearLayout>
 
-                        <LinearLayout style="@style/homeLayoutStyle">
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                            <TextView
-                                android:id="@+id/todoDataView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/redTextColor" />
+                        <TextView
+                            android:id="@+id/undeterminedDataView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/yellowTextColor" />
 
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="待处理" />
-                        </LinearLayout>
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="待确认" />
+                    </LinearLayout>
 
-                        <LinearLayout style="@style/homeLayoutStyle">
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                            <TextView
-                                android:id="@+id/undeterminedDataView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/yellowTextColor" />
+                        <TextView
+                            android:id="@+id/inHandleDataView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/mainThemeColor" />
 
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="待确认" />
-                        </LinearLayout>
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="处理中" />
+                    </LinearLayout>
 
-                        <LinearLayout style="@style/homeLayoutStyle">
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                            <TextView
-                                android:id="@+id/inHandleDataView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/mainThemeColor" />
+                        <TextView
+                            android:id="@+id/completedDataView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/greenTextColor" />
 
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="处理中" />
-                        </LinearLayout>
-
-                        <LinearLayout style="@style/homeLayoutStyle">
-
-                            <TextView
-                                android:id="@+id/completedDataView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/greenTextColor" />
-
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="已完成" />
-                        </LinearLayout>
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="已完成" />
                     </LinearLayout>
                 </LinearLayout>
-            </androidx.cardview.widget.CardView>
+            </LinearLayout>
         </LinearLayout>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_order.xml b/app/src/main/res/layout/fragment_order.xml
index e798ed8..06dc5dc 100644
--- a/app/src/main/res/layout/fragment_order.xml
+++ b/app/src/main/res/layout/fragment_order.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackground"
+    android:background="@color/mainBackColor"
     android:orientation="vertical">
 
     <RelativeLayout
diff --git a/app/src/main/res/layout/include_search_bar.xml b/app/src/main/res/layout/include_search_bar.xml
index 48a3f79..a8c60f0 100644
--- a/app/src/main/res/layout/include_search_bar.xml
+++ b/app/src/main/res/layout/include_search_bar.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="48dp"
-    android:background="@color/mainBackground"
+    android:layout_height="@dimen/titleViewHeight"
+    android:background="@color/mainThemeColor"
     android:orientation="horizontal">
 
     <LinearLayout
@@ -18,8 +18,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/dp_3"
-            android:text="全　部"
-            android:textColor="@color/mainTextColor" />
+            android:text="全\u3000部"
+            android:textColor="@color/white"
+            android:textSize="14sp" />
 
         <ImageView
             android:id="@+id/arrowImageView"
@@ -32,7 +33,7 @@
     <RelativeLayout
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginVertical="8dp"
+        android:layout_marginVertical="7dp"
         android:layout_marginEnd="@dimen/dp_10"
         android:layout_weight="3"
         android:background="@drawable/bg_layout_radius_5">
@@ -42,14 +43,14 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:layout_marginStart="5dp"
+            android:layout_marginStart="@dimen/dp_5"
             android:src="@drawable/ic_search" />
 
         <com.pengxh.app.multilib.widget.EditTextWithDelete
             android:id="@+id/searchInputView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginStart="5dp"
+            android:layout_marginStart="@dimen/dp_5"
             android:layout_toStartOf="@id/lineView"
             android:layout_toEndOf="@id/searchImageView"
             android:background="@null"
@@ -75,6 +76,7 @@
             android:layout_centerVertical="true"
             android:layout_marginHorizontal="@dimen/dp_10"
             android:text="搜索"
-            android:textColor="@color/colorText" />
+            android:textColor="@color/colorText"
+            android:textSize="14sp" />
     </RelativeLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_choice_dialog.xml b/app/src/main/res/layout/item_choice_dialog.xml
index c792afd..a8fe9f3 100644
--- a/app/src/main/res/layout/item_choice_dialog.xml
+++ b/app/src/main/res/layout/item_choice_dialog.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="46dp">
+    android:layout_height="@dimen/titleViewHeight">
 
     <TextView
         android:id="@+id/choiceItemView"
diff --git a/app/src/main/res/layout/item_popup.xml b/app/src/main/res/layout/item_popup.xml
index 05033c4..454146c 100644
--- a/app/src/main/res/layout/item_popup.xml
+++ b/app/src/main/res/layout/item_popup.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center"
-    android:padding="10dp">
+    android:padding="@dimen/dp_10">
 
     <TextView
         android:id="@+id/popupTitle"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index ac97c98..7c23aa0 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,7 +3,7 @@
     <color name="mainThemeColor">#1D55C6</color>
     <color name="mainTextColor">#333333</color>
     <color name="subTextColor">#626262</color>
-    <color name="mainBackColor">#F7F7F7</color>
+    <color name="mainBackColor">#F7F7FA</color>
     <color name="hintTextColor">#CCCCCC</color>
     <color name="greenTextColor">#00A000</color>
     <color name="redTextColor">#FF0000</color>

diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
index b8f589c..9b25651 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
@@ -4,7 +4,6 @@
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
-import android.view.View
 import android.view.animation.LinearInterpolator
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -23,7 +22,6 @@
 import com.casic.app.smartwell.vm.WellTypeViewModel
 import com.casic.app.smartwell.widgets.EasyPopupWindow
 import kotlinx.android.synthetic.main.activity_well_management.*
-import kotlinx.android.synthetic.main.include_base_title.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_search_bar.*
 import java.lang.ref.WeakReference
@@ -48,9 +46,7 @@
     override fun initLayoutView(): Int = R.layout.activity_well_management
 
     override fun setupTopBarLayout() {
-        titleView.text = "窨井管理"
-        leftBackView.visibility = View.VISIBLE
-        leftBackView.setOnClickListener { finish() }
+
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
index 9876f1e..561d5d4 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
@@ -4,7 +4,6 @@
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
-import android.view.View
 import android.view.animation.LinearInterpolator
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -27,7 +26,6 @@
 import com.casic.app.smartwell.widgets.EasyPopupWindow
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.activity_well_operation.*
-import kotlinx.android.synthetic.main.include_base_title.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_search_bar.*
 import java.lang.ref.WeakReference
@@ -53,9 +51,7 @@
     override fun initLayoutView(): Int = R.layout.activity_well_operation
 
     override fun setupTopBarLayout() {
-        titleView.text = "布防撤防"
-        leftBackView.visibility = View.VISIBLE
-        leftBackView.setOnClickListener { finish() }
+
     }
 
     override fun initData() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
index ed8f009..78e7414 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt
@@ -28,6 +28,8 @@
 import com.casic.app.smartwell.vm.WellListViewModel
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.pengxh.app.multilib.utils.SizeUtil
 import com.pengxh.app.multilib.widget.dialog.AlertControlDialog
 import kotlinx.android.synthetic.main.fragment_home.view.*
 import kotlinx.android.synthetic.main.include_base_title.view.*
@@ -62,6 +64,18 @@
         homeView = inflater.inflate(R.layout.fragment_home, container, false)
         homeView.titleView.text = "首页"
 
+        //代码设置底部拉升距离
+        val bottomSheetBehavior = BottomSheetBehavior.from(homeView.bottomBehaviorLayout)
+        homeView.coordinatorLayout.post {
+            bottomSheetBehavior.isFitToContents = false
+            bottomSheetBehavior.halfExpandedRatio = 0.23f
+            bottomSheetBehavior.isHideable = false
+            bottomSheetBehavior.peekHeight = SizeUtil.dp2px(requireContext(), 30f)
+            bottomSheetBehavior.setExpandedOffset(
+                (SizeUtil.getScreenHeight(requireContext()) * 0.3).toInt()
+            )
+        }
+
         //初始化vm
         wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java)
         workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
diff --git a/app/src/main/res/drawable/bg_layout.xml b/app/src/main/res/drawable/bg_layout.xml
index d56f439..f00d59c 100644
--- a/app/src/main/res/drawable/bg_layout.xml
+++ b/app/src/main/res/drawable/bg_layout.xml
@@ -4,5 +4,5 @@
 
     <solid android:color="@color/white" />
 
-    <corners android:radius="10dp" />
+    <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
index ba81626..0c2abfe 100644
--- a/app/src/main/res/drawable/bg_layout_radius_20.xml
+++ b/app/src/main/res/drawable/bg_layout_radius_20.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="@color/white" />
+    <solid android:color="@color/mainBackColor" />
 
     <corners
         android:topLeftRadius="@dimen/dp_20"
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
index 122b9cd..bca9c08 100644
--- a/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
+++ b/app/src/main/res/drawable/bg_layout_stroke_radius_3.xml
@@ -6,7 +6,7 @@
 
     <stroke
         android:width="1dp"
-        android:color="@color/mainBackground" />
+        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/bottom_short_line.xml b/app/src/main/res/drawable/bottom_short_line.xml
new file mode 100644
index 0000000..10c9062
--- /dev/null
+++ b/app/src/main/res/drawable/bottom_short_line.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">
+
+    <solid android:color="@color/subTextColor" />
+
+    <corners android:radius="@dimen/dp_10" />
+
+    <size
+        android:width="@dimen/dp_30"
+        android:height="@dimen/dp_3" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_up.xml b/app/src/main/res/drawable/ic_up.xml
index 151a0cb..75c718f 100644
--- a/app/src/main/res/drawable/ic_up.xml
+++ b/app/src/main/res/drawable/ic_up.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
+        android:fillColor="@color/white"
         android:pathData="M938.7,704c0,10.9 -4.2,21.8 -12.5,30.2 -16.7,16.7 -43.7,16.7 -60.3,0L512,380.3 158.2,734.2c-16.7,16.7 -43.7,16.7 -60.3,0s-16.7,-43.7 0,-60.3l384,-384c16.7,-16.7 43.7,-16.7 60.3,0l384,384c8.3,8.3 12.5,19.2 12.5,30.1z" />
 </vector>
diff --git a/app/src/main/res/drawable/tag_normal.xml b/app/src/main/res/drawable/tag_normal.xml
index bb88697..d38b7cc 100644
--- a/app/src/main/res/drawable/tag_normal.xml
+++ b/app/src/main/res/drawable/tag_normal.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/mainBackground" />
+    <solid android:color="@color/mainBackColor" />
 
     <corners android:radius="@dimen/dp_3" />
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a7fbbba..a2ccde6 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -22,6 +22,5 @@
         android:background="@color/white"
         app:itemIconTint="@drawable/bottom_text_color"
         app:itemTextColor="@drawable/bottom_text_color"
-        app:labelVisibilityMode="labeled"
         app:menu="@menu/bottom_nav_menu" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_order_overtime.xml b/app/src/main/res/layout/activity_order_overtime.xml
index fdc1aab..914cb85 100644
--- a/app/src/main/res/layout/activity_order_overtime.xml
+++ b/app/src/main/res/layout/activity_order_overtime.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackground"
+    android:background="@color/mainBackColor"
     android:orientation="vertical"
     tools:context=".view.OvertimeOrderActivity">
 
diff --git a/app/src/main/res/layout/activity_well_management.xml b/app/src/main/res/layout/activity_well_management.xml
index 819d37f..c87a5a3 100644
--- a/app/src/main/res/layout/activity_well_management.xml
+++ b/app/src/main/res/layout/activity_well_management.xml
@@ -7,8 +7,6 @@
     android:orientation="vertical"
     tools:context=".view.WellManagementActivity">
 
-    <include layout="@layout/include_base_title" />
-
     <include layout="@layout/include_search_bar" />
 
     <include layout="@layout/include_empty_view" />
diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml
index a3f1334..a695043 100644
--- a/app/src/main/res/layout/activity_well_operation.xml
+++ b/app/src/main/res/layout/activity_well_operation.xml
@@ -7,8 +7,6 @@
     android:orientation="vertical"
     tools:context=".view.WellOperationActivity">
 
-    <include layout="@layout/include_base_title" />
-
     <include layout="@layout/include_search_bar" />
 
     <include layout="@layout/include_empty_view" />
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 37d50e5..8c5f4a4 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -9,6 +9,7 @@
     <include layout="@layout/include_base_title" />
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:id="@+id/coordinatorLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
@@ -18,193 +19,179 @@
             android:layout_height="match_parent" />
 
         <LinearLayout
+            android:id="@+id/bottomBehaviorLayout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="@drawable/bg_layout_radius_20"
             android:orientation="vertical"
-            app:behavior_fitToContents="false"
-            app:behavior_halfExpandedRatio="0.25"
-            app:behavior_hideable="false"
-            app:behavior_peekHeight="@dimen/titleViewHeight"
             app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
             <!--顶部短横线-->
             <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/titleViewHeight"
-                android:paddingVertical="22dp">
+                android:layout_height="@dimen/dp_30">
 
-                <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_marginHorizontal="150dp"
-                    app:qmui_backgroundColor="@color/hintTextColor"
-                    app:qmui_borderColor="@color/hintTextColor" />
+                <View
+                    android:layout_width="@dimen/dp_30"
+                    android:layout_height="@dimen/dp_3"
+                    android:layout_centerInParent="true"
+                    android:background="@drawable/bottom_short_line" />
             </RelativeLayout>
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/mainBackground" />
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/homeRecyclerView"
+            <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_10" />
+                android:layout_marginHorizontal="@dimen/dp_10"
+                android:background="@drawable/bg_layout">
 
-            <androidx.cardview.widget.CardView
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/homeRecyclerView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+            </RelativeLayout>
+
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10"
-                app:cardCornerRadius="@dimen/dp_5">
+                android:background="@drawable/bg_layout"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:paddingVertical="@dimen/dp_5"
+                    android:text="闸井监控"
+                    android:textColor="@color/mainTextColor"
+                    android:textSize="@dimen/titleFontSize" />
+
+                <View style="@style/dividerViewStyle" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:orientation="vertical">
+                    android:orientation="horizontal">
 
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:paddingVertical="@dimen/dp_5"
-                        android:text="闸井监控"
-                        android:textColor="@color/mainTextColor"
-                        android:textSize="@dimen/titleFontSize" />
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                    <View style="@style/dividerViewStyle" />
+                        <TextView
+                            android:id="@+id/unDeployedWellView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/redTextColor" />
 
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:orientation="horizontal">
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="已撤防" />
+                    </LinearLayout>
 
-                        <LinearLayout style="@style/homeLayoutStyle">
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                            <TextView
-                                android:id="@+id/unDeployedWellView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/redTextColor" />
+                        <TextView
+                            android:id="@+id/deployedWellView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/yellowTextColor" />
 
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="已撤防" />
-                        </LinearLayout>
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="已布防" />
+                    </LinearLayout>
 
-                        <LinearLayout style="@style/homeLayoutStyle">
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                            <TextView
-                                android:id="@+id/deployedWellView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/yellowTextColor" />
+                        <TextView
+                            android:id="@+id/allWellDataView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/greenTextColor" />
 
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="已布防" />
-                        </LinearLayout>
-
-                        <LinearLayout style="@style/homeLayoutStyle">
-
-                            <TextView
-                                android:id="@+id/allWellDataView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/greenTextColor" />
-
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="全部" />
-                        </LinearLayout>
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="全部" />
                     </LinearLayout>
                 </LinearLayout>
-            </androidx.cardview.widget.CardView>
+            </LinearLayout>
 
-            <androidx.cardview.widget.CardView
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10"
-                app:cardCornerRadius="@dimen/dp_5">
+                android:background="@drawable/bg_layout"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:paddingVertical="@dimen/dp_5"
+                    android:text="工\u3000\u3000单"
+                    android:textColor="@color/mainTextColor"
+                    android:textSize="@dimen/titleFontSize" />
+
+                <View style="@style/dividerViewStyle" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:orientation="vertical">
+                    android:orientation="horizontal">
 
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:paddingVertical="@dimen/dp_5"
-                        android:text="工\u3000\u3000单"
-                        android:textColor="@color/mainTextColor"
-                        android:textSize="@dimen/titleFontSize" />
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                    <View style="@style/dividerViewStyle" />
+                        <TextView
+                            android:id="@+id/todoDataView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/redTextColor" />
 
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:orientation="horizontal">
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="待处理" />
+                    </LinearLayout>
 
-                        <LinearLayout style="@style/homeLayoutStyle">
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                            <TextView
-                                android:id="@+id/todoDataView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/redTextColor" />
+                        <TextView
+                            android:id="@+id/undeterminedDataView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/yellowTextColor" />
 
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="待处理" />
-                        </LinearLayout>
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="待确认" />
+                    </LinearLayout>
 
-                        <LinearLayout style="@style/homeLayoutStyle">
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                            <TextView
-                                android:id="@+id/undeterminedDataView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/yellowTextColor" />
+                        <TextView
+                            android:id="@+id/inHandleDataView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/mainThemeColor" />
 
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="待确认" />
-                        </LinearLayout>
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="处理中" />
+                    </LinearLayout>
 
-                        <LinearLayout style="@style/homeLayoutStyle">
+                    <LinearLayout style="@style/homeLayoutStyle">
 
-                            <TextView
-                                android:id="@+id/inHandleDataView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/mainThemeColor" />
+                        <TextView
+                            android:id="@+id/completedDataView"
+                            style="@style/homeDataTextViewStyle"
+                            android:text="0"
+                            android:textColor="@color/greenTextColor" />
 
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="处理中" />
-                        </LinearLayout>
-
-                        <LinearLayout style="@style/homeLayoutStyle">
-
-                            <TextView
-                                android:id="@+id/completedDataView"
-                                style="@style/homeDataTextViewStyle"
-                                android:text="0"
-                                android:textColor="@color/greenTextColor" />
-
-                            <TextView
-                                style="@style/homeTextViewStyle"
-                                android:text="已完成" />
-                        </LinearLayout>
+                        <TextView
+                            style="@style/homeTextViewStyle"
+                            android:text="已完成" />
                     </LinearLayout>
                 </LinearLayout>
-            </androidx.cardview.widget.CardView>
+            </LinearLayout>
         </LinearLayout>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_order.xml b/app/src/main/res/layout/fragment_order.xml
index e798ed8..06dc5dc 100644
--- a/app/src/main/res/layout/fragment_order.xml
+++ b/app/src/main/res/layout/fragment_order.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackground"
+    android:background="@color/mainBackColor"
     android:orientation="vertical">
 
     <RelativeLayout
diff --git a/app/src/main/res/layout/include_search_bar.xml b/app/src/main/res/layout/include_search_bar.xml
index 48a3f79..a8c60f0 100644
--- a/app/src/main/res/layout/include_search_bar.xml
+++ b/app/src/main/res/layout/include_search_bar.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="48dp"
-    android:background="@color/mainBackground"
+    android:layout_height="@dimen/titleViewHeight"
+    android:background="@color/mainThemeColor"
     android:orientation="horizontal">
 
     <LinearLayout
@@ -18,8 +18,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/dp_3"
-            android:text="全　部"
-            android:textColor="@color/mainTextColor" />
+            android:text="全\u3000部"
+            android:textColor="@color/white"
+            android:textSize="14sp" />
 
         <ImageView
             android:id="@+id/arrowImageView"
@@ -32,7 +33,7 @@
     <RelativeLayout
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginVertical="8dp"
+        android:layout_marginVertical="7dp"
         android:layout_marginEnd="@dimen/dp_10"
         android:layout_weight="3"
         android:background="@drawable/bg_layout_radius_5">
@@ -42,14 +43,14 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:layout_marginStart="5dp"
+            android:layout_marginStart="@dimen/dp_5"
             android:src="@drawable/ic_search" />
 
         <com.pengxh.app.multilib.widget.EditTextWithDelete
             android:id="@+id/searchInputView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginStart="5dp"
+            android:layout_marginStart="@dimen/dp_5"
             android:layout_toStartOf="@id/lineView"
             android:layout_toEndOf="@id/searchImageView"
             android:background="@null"
@@ -75,6 +76,7 @@
             android:layout_centerVertical="true"
             android:layout_marginHorizontal="@dimen/dp_10"
             android:text="搜索"
-            android:textColor="@color/colorText" />
+            android:textColor="@color/colorText"
+            android:textSize="14sp" />
     </RelativeLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_choice_dialog.xml b/app/src/main/res/layout/item_choice_dialog.xml
index c792afd..a8fe9f3 100644
--- a/app/src/main/res/layout/item_choice_dialog.xml
+++ b/app/src/main/res/layout/item_choice_dialog.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="46dp">
+    android:layout_height="@dimen/titleViewHeight">
 
     <TextView
         android:id="@+id/choiceItemView"
diff --git a/app/src/main/res/layout/item_popup.xml b/app/src/main/res/layout/item_popup.xml
index 05033c4..454146c 100644
--- a/app/src/main/res/layout/item_popup.xml
+++ b/app/src/main/res/layout/item_popup.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center"
-    android:padding="10dp">
+    android:padding="@dimen/dp_10">
 
     <TextView
         android:id="@+id/popupTitle"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index ac97c98..7c23aa0 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,7 +3,7 @@
     <color name="mainThemeColor">#1D55C6</color>
     <color name="mainTextColor">#333333</color>
     <color name="subTextColor">#626262</color>
-    <color name="mainBackColor">#F7F7F7</color>
+    <color name="mainBackColor">#F7F7FA</color>
     <color name="hintTextColor">#CCCCCC</color>
     <color name="greenTextColor">#00A000</color>
     <color name="redTextColor">#FF0000</color>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index eb48ef2..1a79924 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -23,7 +23,7 @@
     <dimen name="itemLayoutHeight">56dp</dimen>
 
     <!--title栏高度-->
-    <dimen name="titleViewHeight">48dp</dimen>
+    <dimen name="titleViewHeight">46dp</dimen>
 
     <!--绝对尺寸-->
     <dimen name="iconSize">48px</dimen>