diff --git a/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt
index ef593f4..a7755a9 100644
--- a/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt
@@ -37,9 +37,7 @@
 import com.casic.smarttube.vm.ProjectGroupViewModel
 import com.casic.smarttube.widgets.GaoDeClusterMarkerView
 import com.google.android.material.bottomsheet.BottomSheetBehavior
-import com.pengxh.kt.lite.extensions.dp2px
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.extensions.obtainScreenHeight
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.vm.LoadState
@@ -108,18 +106,6 @@
             easyPopupWindow.showAsDropDown(homeView.rightOptionView, x, 0)
         }
 
-        //代码设置底部拉升距离
-        val bottomSheetBehavior = BottomSheetBehavior.from(homeView.bottomBehaviorLayout)
-        homeView.coordinatorLayout.post {
-            bottomSheetBehavior.isFitToContents = false
-            bottomSheetBehavior.halfExpandedRatio = 0.33f
-            bottomSheetBehavior.isHideable = false
-            bottomSheetBehavior.peekHeight = 30f.dp2px(requireContext())
-            bottomSheetBehavior.setExpandedOffset(
-                (requireContext().obtainScreenHeight() * 0.3).toInt()
-            )
-        }
-
         //初始化vm
         deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
         groupViewModel = ViewModelProvider(this).get(ProjectGroupViewModel::class.java)
@@ -431,6 +417,8 @@
                 return infoView
             }
         }
+
+        //TODO 需要根据点击的Popup显示列表
         deviceModels.forEach {
             multiDevice.add(it.devcode)
         }

diff --git a/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt
index ef593f4..a7755a9 100644
--- a/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt
@@ -37,9 +37,7 @@
 import com.casic.smarttube.vm.ProjectGroupViewModel
 import com.casic.smarttube.widgets.GaoDeClusterMarkerView
 import com.google.android.material.bottomsheet.BottomSheetBehavior
-import com.pengxh.kt.lite.extensions.dp2px
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.extensions.obtainScreenHeight
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.vm.LoadState
@@ -108,18 +106,6 @@
             easyPopupWindow.showAsDropDown(homeView.rightOptionView, x, 0)
         }
 
-        //代码设置底部拉升距离
-        val bottomSheetBehavior = BottomSheetBehavior.from(homeView.bottomBehaviorLayout)
-        homeView.coordinatorLayout.post {
-            bottomSheetBehavior.isFitToContents = false
-            bottomSheetBehavior.halfExpandedRatio = 0.33f
-            bottomSheetBehavior.isHideable = false
-            bottomSheetBehavior.peekHeight = 30f.dp2px(requireContext())
-            bottomSheetBehavior.setExpandedOffset(
-                (requireContext().obtainScreenHeight() * 0.3).toInt()
-            )
-        }
-
         //初始化vm
         deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
         groupViewModel = ViewModelProvider(this).get(ProjectGroupViewModel::class.java)
@@ -431,6 +417,8 @@
                 return infoView
             }
         }
+
+        //TODO 需要根据点击的Popup显示列表
         deviceModels.forEach {
             multiDevice.add(it.devcode)
         }
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 4a4b77e..433fd65 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -30,56 +30,48 @@
             android:src="@drawable/ic_change_map" />
     </RelativeLayout>
 
-    <FrameLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:id="@+id/coordinatorLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/mainBackColor">
 
-        <androidx.coordinatorlayout.widget.CoordinatorLayout
-            android:id="@+id/coordinatorLayout"
+        <com.amap.api.maps.MapView
+            android:id="@+id/mapView"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent" />
 
-            <com.amap.api.maps.MapView
-                android:id="@+id/mapView"
+        <LinearLayout
+            android:id="@+id/bottomBehaviorLayout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@drawable/bg_solid_layout_white_radius_top_20"
+            android:orientation="vertical"
+            app:behavior_fitToContents="false"
+            app:behavior_halfExpandedRatio="0.425"
+            app:behavior_hideable="true"
+            app:behavior_peekHeight="30dp"
+            app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
+
+            <!--顶部短横线-->
+            <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent" />
+                android:layout_height="@dimen/dp_30">
 
-            <LinearLayout
-                android:id="@+id/bottomBehaviorLayout"
+                <View
+                    android:layout_width="@dimen/dp_30"
+                    android:layout_height="@dimen/dp_3"
+                    android:layout_centerInParent="true"
+                    android:background="@drawable/bottom_short_line" />
+            </RelativeLayout>
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/homeRecyclerView"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@drawable/bg_solid_layout_white_radius_top_20"
-                android:orientation="vertical"
-                app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
-
-
-                <!--顶部短横线-->
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/dp_30">
-
-                    <View
-                        android:layout_width="@dimen/dp_30"
-                        android:layout_height="@dimen/dp_3"
-                        android:layout_centerInParent="true"
-                        android:background="@drawable/bottom_short_line" />
-                </RelativeLayout>
-
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_solid_layout_white_radius_10">
-
-                    <androidx.recyclerview.widget.RecyclerView
-                        android:id="@+id/homeRecyclerView"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-                </RelativeLayout>
-            </LinearLayout>
-        </androidx.coordinatorlayout.widget.CoordinatorLayout>
+                android:layout_height="wrap_content"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+        </LinearLayout>
 
         <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
             android:id="@+id/addDeviceButton"
@@ -96,5 +88,5 @@
             app:icon="@drawable/ic_add"
             app:iconPadding="0dp"
             app:iconTint="@color/white" />
-    </FrameLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </LinearLayout>
\ No newline at end of file

diff --git a/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt
index ef593f4..a7755a9 100644
--- a/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt
@@ -37,9 +37,7 @@
 import com.casic.smarttube.vm.ProjectGroupViewModel
 import com.casic.smarttube.widgets.GaoDeClusterMarkerView
 import com.google.android.material.bottomsheet.BottomSheetBehavior
-import com.pengxh.kt.lite.extensions.dp2px
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.extensions.obtainScreenHeight
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.vm.LoadState
@@ -108,18 +106,6 @@
             easyPopupWindow.showAsDropDown(homeView.rightOptionView, x, 0)
         }
 
-        //代码设置底部拉升距离
-        val bottomSheetBehavior = BottomSheetBehavior.from(homeView.bottomBehaviorLayout)
-        homeView.coordinatorLayout.post {
-            bottomSheetBehavior.isFitToContents = false
-            bottomSheetBehavior.halfExpandedRatio = 0.33f
-            bottomSheetBehavior.isHideable = false
-            bottomSheetBehavior.peekHeight = 30f.dp2px(requireContext())
-            bottomSheetBehavior.setExpandedOffset(
-                (requireContext().obtainScreenHeight() * 0.3).toInt()
-            )
-        }
-
         //初始化vm
         deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
         groupViewModel = ViewModelProvider(this).get(ProjectGroupViewModel::class.java)
@@ -431,6 +417,8 @@
                 return infoView
             }
         }
+
+        //TODO 需要根据点击的Popup显示列表
         deviceModels.forEach {
             multiDevice.add(it.devcode)
         }
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 4a4b77e..433fd65 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -30,56 +30,48 @@
             android:src="@drawable/ic_change_map" />
     </RelativeLayout>
 
-    <FrameLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:id="@+id/coordinatorLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/mainBackColor">
 
-        <androidx.coordinatorlayout.widget.CoordinatorLayout
-            android:id="@+id/coordinatorLayout"
+        <com.amap.api.maps.MapView
+            android:id="@+id/mapView"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent" />
 
-            <com.amap.api.maps.MapView
-                android:id="@+id/mapView"
+        <LinearLayout
+            android:id="@+id/bottomBehaviorLayout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@drawable/bg_solid_layout_white_radius_top_20"
+            android:orientation="vertical"
+            app:behavior_fitToContents="false"
+            app:behavior_halfExpandedRatio="0.425"
+            app:behavior_hideable="true"
+            app:behavior_peekHeight="30dp"
+            app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
+
+            <!--顶部短横线-->
+            <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent" />
+                android:layout_height="@dimen/dp_30">
 
-            <LinearLayout
-                android:id="@+id/bottomBehaviorLayout"
+                <View
+                    android:layout_width="@dimen/dp_30"
+                    android:layout_height="@dimen/dp_3"
+                    android:layout_centerInParent="true"
+                    android:background="@drawable/bottom_short_line" />
+            </RelativeLayout>
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/homeRecyclerView"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@drawable/bg_solid_layout_white_radius_top_20"
-                android:orientation="vertical"
-                app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
-
-
-                <!--顶部短横线-->
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/dp_30">
-
-                    <View
-                        android:layout_width="@dimen/dp_30"
-                        android:layout_height="@dimen/dp_3"
-                        android:layout_centerInParent="true"
-                        android:background="@drawable/bottom_short_line" />
-                </RelativeLayout>
-
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginHorizontal="@dimen/dp_10"
-                    android:background="@drawable/bg_solid_layout_white_radius_10">
-
-                    <androidx.recyclerview.widget.RecyclerView
-                        android:id="@+id/homeRecyclerView"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-                </RelativeLayout>
-            </LinearLayout>
-        </androidx.coordinatorlayout.widget.CoordinatorLayout>
+                android:layout_height="wrap_content"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+        </LinearLayout>
 
         <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
             android:id="@+id/addDeviceButton"
@@ -96,5 +88,5 @@
             app:icon="@drawable/ic_add"
             app:iconPadding="0dp"
             app:iconTint="@color/white" />
-    </FrameLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_group_rv.xml b/app/src/main/res/layout/item_group_rv.xml
index 954e873..e410627 100644
--- a/app/src/main/res/layout/item_group_rv.xml
+++ b/app/src/main/res/layout/item_group_rv.xml
@@ -2,8 +2,9 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_solid_layout_white_radius_10"
-    android:padding="@dimen/dp_5">
+    android:background="@color/white"
+    android:paddingStart="@dimen/dp_10"
+    android:paddingEnd="@dimen/dp_5">
 
     <LinearLayout
         android:layout_width="match_parent"