diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 8f68f94..3a8b4fa 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -11,7 +11,7 @@ android {
         applicationId = "com.shuwei.intelligent.shelves"
         minSdk = 25
         //noinspection ExpiredTargetSdkVersion
-        targetSdk = 25
+        targetSdk = 30
         versionCode = 1
         versionName = "1.0"
 
@@ -50,19 +50,21 @@ dependencies {
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
     implementation("androidx.activity:activity-ktx:1.8.0")
+    implementation("androidx.work:work-runtime-ktx:2.8.1")
+
     implementation("io.github.cymchad:BaseRecyclerViewAdapterHelper4:4.1.2")
 
     implementation("com.squareup.okhttp3:okhttp:4.9.1")
     implementation("com.google.code.gson:gson:2.10.1")
 
-//    implementation("io.github.jeremyliao:live-event-bus-x:1.8.0")
-
-
-//    implementation("com.hoho:android-usb-serial:1.3.0")
-
     implementation("io.github.jeadyx:kmp-serialport:1.0.0")
+    
+    // 基础依赖包，必须要依赖
+    implementation("com.geyifeng.immersionbar:immersionbar:3.2.2")
+    // kotlin扩展（可选）
+    implementation("com.geyifeng.immersionbar:immersionbar-ktx:3.2.2")
 
+//    implementation("io.github.jeremyliao:live-event-bus-x:1.8.0")
+//    implementation("com.hoho:android-usb-serial:1.3.0")
 //    implementation("io.github.jeadyx:jserialport:1.5")
-
-    implementation("androidx.work:work-runtime-ktx:2.8.1")
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/shuwei/intelligent/shelves/adapter/SearchAdapter.kt b/app/src/main/java/com/shuwei/intelligent/shelves/adapter/SearchAdapter.kt
index aa5ff6a..47a3725 100644
--- a/app/src/main/java/com/shuwei/intelligent/shelves/adapter/SearchAdapter.kt
+++ b/app/src/main/java/com/shuwei/intelligent/shelves/adapter/SearchAdapter.kt
@@ -27,7 +27,7 @@ class SearchAdapter(list: MutableList<SearchModel>) :
     override fun onBindViewHolder(holder: VH, position: Int, item: SearchModel?) {
         val binding = holder.binding
         binding.btnFoodName.run {
-            text = item!!.foodName
+            text = " ${item!!.foodName}"
             setTextColor(
                 getColor(if (item.isClicked) R.color.shelf_name_blue else R.color.black999)
             )
diff --git a/app/src/main/java/com/shuwei/intelligent/shelves/base/BaseActivity.kt b/app/src/main/java/com/shuwei/intelligent/shelves/base/BaseActivity.kt
index 5691937..9796a88 100644
--- a/app/src/main/java/com/shuwei/intelligent/shelves/base/BaseActivity.kt
+++ b/app/src/main/java/com/shuwei/intelligent/shelves/base/BaseActivity.kt
@@ -1,14 +1,19 @@
 package com.shuwei.intelligent.shelves.base
 
 import android.content.Intent
+import android.os.Build
 import android.os.Bundle
 import android.view.View
+import android.view.WindowInsets
+import android.view.WindowInsetsController
 import android.widget.TextView
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
+import com.gyf.immersionbar.BarHide
+import com.gyf.immersionbar.ImmersionBar
 import com.shuwei.intelligent.shelves.R
 import com.shuwei.intelligent.shelves.databinding.ActivityBaseBinding
 
@@ -33,7 +38,7 @@ open class BaseActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         binding = ActivityBaseBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        statusBarDarkFont(enable = false)
+        statusBarDarkFont()
         launcher =
             registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
                 if (result.resultCode == RESULT_OK) {
@@ -41,22 +46,29 @@ open class BaseActivity : AppCompatActivity() {
                 }
             }
 
-//        window.setDecorFitsSystemWindows(false) // 启用 Edge-to-Edge
-//        window.insetsController?.apply {
-//            hide(WindowInsets.Type.statusBars()) // 隐藏状态栏
-//            systemBarsBehavior =
-//                WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE // 滑动时临时显示
-//        }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            window.setDecorFitsSystemWindows(false)
+            window.insetsController?.apply {
+                hide(WindowInsets.Type.statusBars()) // 隐藏状态栏
+                systemBarsBehavior =
+                    WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE // 滑动时临时显示
+            }
+        }
+
     }
 
     fun hideStatusBar() {
-        enableEdgeToEdge()
+//        enableEdgeToEdge()
 //        val uiOptions = (View.SYSTEM_UI_FLAG_FULLSCREEN // 隐藏状态栏
 //                or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) // 隐藏导航栏（可选）
-        window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_FULLSCREEN
+//        window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_FULLSCREEN
+
+        ImmersionBar.with(this)
+            .hideBar(BarHide.FLAG_HIDE_STATUS_BAR)
+            .init()
     }
 
-    fun statusBarDarkFont(enable: Boolean) {
+    fun statusBarDarkFont() {
         //window.decorView.systemUiVisibility = if (enable) View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR else 0
         val color = ContextCompat.getColor(this, R.color.white)
         binding.tvLeftStatus.setTextColor(color)
diff --git a/app/src/main/res/layout-sw360dp/activity_base.xml b/app/src/main/res/layout-sw360dp/activity_base.xml
new file mode 100644
index 0000000..61f3bc4
--- /dev/null
+++ b/app/src/main/res/layout-sw360dp/activity_base.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:fitsSystemWindows="false"
+    android:background="@color/bg_page">
+
+    <FrameLayout
+        android:id="@+id/flStatusBar"
+        android:layout_width="match_parent"
+        android:layout_height="30dp"
+        android:paddingStart="12dp"
+        android:paddingEnd="12dp"
+        android:paddingTop="9dp">
+
+        <TextView
+            android:id="@+id/tv_left_status"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/white"
+            android:layout_gravity="start"
+            android:textSize="12sp"
+            android:fontFamily="sans-serif-medium"
+            tools:text="1-1冷藏柜  -2°C / 87%" />
+
+        <TextView
+            android:id="@+id/tv_right_status"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/white"
+            android:layout_gravity="end"
+            android:fontFamily="sans-serif-medium"
+            android:textSize="12sp"
+            tools:text="6月22日 星期日  15:26:33" />
+    </FrameLayout>
+
+
+    <FrameLayout
+        android:id="@+id/flContainer"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw360dp/activity_home.xml b/app/src/main/res/layout-sw360dp/activity_home.xml
new file mode 100644
index 0000000..8ceae06
--- /dev/null
+++ b/app/src/main/res/layout-sw360dp/activity_home.xml
@@ -0,0 +1,20 @@
+<?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="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:background="@color/bg_page">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rvShelf"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+        app:spanCount="2"
+        android:overScrollMode="never"
+        android:layout_marginStart="6dp"
+        android:layout_marginEnd="6dp"
+        tools:listitem="@layout/list_item_shelf"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw360dp/activity_shelf.xml b/app/src/main/res/layout-sw360dp/activity_shelf.xml
new file mode 100644
index 0000000..8124a52
--- /dev/null
+++ b/app/src/main/res/layout-sw360dp/activity_shelf.xml
@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:background="@color/bg_page">
+
+    <com.google.android.material.card.MaterialCardView
+        android:layout_width="match_parent"
+        android:layout_height="190dp"
+        android:layout_marginStart="12dp"
+        android:layout_marginTop="6dp"
+        android:layout_marginEnd="12dp"
+        app:cardBackgroundColor="@color/white"
+        app:cardCornerRadius="6dp"
+        app:cardElevation="0dp">
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_gravity="center"
+                android:layout_marginStart="12dp"
+                android:layout_marginEnd="12dp"
+                android:gravity="center_horizontal"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/tvShelfName"
+                    android:layout_width="wrap_content"
+                    android:layout_height="30dp"
+                    android:layout_marginTop="12dp"
+                    android:gravity="center"
+                    android:textColor="@color/bg_page"
+                    android:textSize="15sp"
+                    android:fontFamily="sans-serif-medium"
+                    tools:text="货架 - 03" />
+
+                <Space
+                    android:layout_width="wrap_content"
+                    android:layout_height="0dp"
+                    android:layout_weight="1" />
+
+                <TextView
+                    android:id="@+id/tvFoodWeight"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:ellipsize="end"
+                    android:includeFontPadding="false"
+                    android:maxLines="1"
+                    android:textColor="@color/food_weight_orange"
+                    android:textSize="30sp"
+                    android:textStyle="bold"
+                    tools:text="1506克" />
+
+                <Space
+                    android:layout_width="wrap_content"
+                    android:layout_height="0dp"
+                    android:layout_weight="1" />
+
+                <TextView
+                    android:id="@+id/tvFoodName"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:ellipsize="end"
+                    android:maxLines="1"
+                    android:textColor="@color/food_name_black"
+                    android:textSize="18sp"
+                    android:textStyle="bold"
+                    tools:text="金针菇" />
+
+                <Space
+                    android:layout_width="wrap_content"
+                    android:layout_height="0dp"
+                    android:layout_weight="1" />
+            </LinearLayout>
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/btnClearZero"
+                android:layout_width="65dp"
+                android:layout_height="30dp"
+                android:layout_gravity="top|end"
+                android:layout_marginTop="12dp"
+                android:layout_marginEnd="12dp"
+                android:backgroundTint="@color/bg_page"
+                android:ellipsize="end"
+                android:insetTop="0dp"
+                android:insetBottom="0dp"
+                android:maxLines="1"
+                android:text="清零"
+                android:fontFamily="sans-serif-medium"
+                android:textColor="@color/white"
+                android:textSize="15sp"
+                app:cornerRadius="6dp"
+                app:elevation="0dp"
+                tools:ignore="HardcodedText" />
+
+        </FrameLayout>
+
+    </com.google.android.material.card.MaterialCardView>
+
+    <com.google.android.material.card.MaterialCardView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginStart="12dp"
+        android:layout_marginTop="12dp"
+        android:layout_marginEnd="12dp"
+        android:layout_marginBottom="12dp"
+        app:cardBackgroundColor="@color/white"
+        app:cardCornerRadius="6dp"
+        app:cardElevation="0dp">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginEnd="16dp"
+                android:background="@drawable/shape_search"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="16dp"
+                    android:layout_height="16dp"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginEnd="12dp"
+                    android:src="@drawable/ic_search_food" />
+
+                <EditText
+                    android:id="@+id/etInputFood"
+                    android:layout_width="match_parent"
+                    android:layout_height="36dp"
+                    android:layout_marginEnd="12dp"
+                    android:background="@null"
+                    android:hint="输入食材名称"
+                    android:maxLines="1"
+                    android:inputType="text"
+                    android:text=""
+                    android:imeOptions="actionSearch"
+                    android:textColor="@color/food_name_black"
+                    android:paddingStart="1dp"
+                    android:paddingEnd="1dp"
+                    android:textColorHint="#B4BEC8"
+                    android:fontFamily="sans-serif-medium"
+                    android:textSize="15sp"
+                    tools:ignore="Autofill,HardcodedText,TextFields" />
+            </LinearLayout>
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rvSearch"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:paddingStart="12dp"
+                android:paddingBottom="4dp"
+                android:layout_marginTop="8dp"
+                android:paddingTop="4dp"
+                android:paddingEnd="12dp"
+                android:clipToPadding="false"
+                android:layout_weight="1"
+                android:overScrollMode="never"
+                tools:listitem="@layout/list_item_search"
+                app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+                app:spanCount="2"
+                tools:itemCount="10"/>
+
+<!--            android:layout_marginTop="48dp"-->
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/btnConfirm"
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:layout_marginTop="12dp"
+                android:layout_marginEnd="24dp"
+                android:layout_marginStart="24dp"
+                android:layout_marginBottom="24dp"
+                android:backgroundTint="@color/bg_page"
+                android:ellipsize="end"
+                android:insetTop="0dp"
+                android:insetBottom="0dp"
+                android:maxLines="1"
+                android:text="确定"
+                android:textStyle="bold"
+                android:textColor="@color/white"
+                android:textSize="15sp"
+                app:cornerRadius="6dp"
+                app:elevation="0dp"
+                tools:ignore="HardcodedText" />
+
+        </LinearLayout>
+
+    </com.google.android.material.card.MaterialCardView>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw360dp/custom_toast.xml b/app/src/main/res/layout-sw360dp/custom_toast.xml
new file mode 100644
index 0000000..cc72175
--- /dev/null
+++ b/app/src/main/res/layout-sw360dp/custom_toast.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@drawable/shape_dialog">
+
+    <TextView
+        android:id="@+id/tvMessage"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:paddingStart="12dp"
+        android:paddingTop="6dp"
+        android:paddingBottom="6dp"
+        android:paddingEnd="12dp"
+        android:textColor="@color/white_f6"
+        android:textSize="16sp"
+        tools:text="暂无数据" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw360dp/list_item_search.xml b/app/src/main/res/layout-sw360dp/list_item_search.xml
new file mode 100644
index 0000000..d4278a7
--- /dev/null
+++ b/app/src/main/res/layout-sw360dp/list_item_search.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?><!--<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"-->
+<!--    xmlns:tools="http://schemas.android.com/tools"-->
+<!--    android:layout_width="match_parent"-->
+<!--    android:layout_height="80dp"-->
+<!--    android:layout_margin="12dp">-->
+
+<!--    <TextView-->
+<!--        android:id="@+id/btnFoodName"-->
+<!--        android:layout_width="wrap_content"-->
+<!--        android:layout_height="wrap_content"-->
+<!--        android:layout_gravity="center"-->
+<!--        android:ellipsize="end"-->
+<!--        android:gravity="center"-->
+<!--        android:maxLines="1"-->
+<!--        android:paddingStart="5dp"-->
+<!--        android:paddingEnd="5dp"-->
+<!--        android:fontFamily="sans-serif-medium"-->
+<!--        android:textColor="@color/black999"-->
+<!--        android:textSize="30sp"-->
+<!--        tools:text="土豆丝" />-->
+<!--</FrameLayout>-->
+<com.google.android.material.button.MaterialButton xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/btnFoodName"
+    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+    android:layout_width="match_parent"
+    android:layout_height="40dp"
+    android:layout_margin="6dp"
+    android:ellipsize="end"
+    android:fontFamily="sans-serif-medium"
+    android:gravity="center"
+    android:insetTop="0dp"
+    android:insetBottom="0dp"
+    android:maxLines="1"
+    android:insetRight="0dp"
+    android:insetLeft="0dp"
+    android:paddingHorizontal="8dp"
+    android:textColor="@color/black999"
+    android:textSize="15sp"
+    app:cornerRadius="6dp"
+    app:strokeWidth="1dp"
+    tools:text="土豆丝土豆丝土豆丝土豆丝土豆丝土豆丝" />
+    <!--    android:paddingHorizontal="2dp"-->
+    <!--    android:paddingLeft="5dp"-->
+    <!--    android:paddingRight="5dp"-->
+
diff --git a/app/src/main/res/layout-sw360dp/list_item_shelf.xml b/app/src/main/res/layout-sw360dp/list_item_shelf.xml
new file mode 100644
index 0000000..ff79b9a
--- /dev/null
+++ b/app/src/main/res/layout-sw360dp/list_item_shelf.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/layoutCard"
+    android:layout_width="match_parent"
+    android:layout_height="140dp"
+    android:layout_margin="6dp"
+    app:cardBackgroundColor="@color/bg_card_blue"
+    app:cardCornerRadius="6dp"
+    app:cardElevation="2dp"
+    app:rippleColor="#B0BEC5">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        android:padding="12dp">
+
+        <TextView
+            android:id="@+id/tvShelfName"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textColor="@color/shelf_name_white"
+            android:textSize="12sp"
+            android:textStyle="bold"
+            tools:text="货架-01" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1" />
+
+        <TextView
+            android:id="@+id/tvFoodName"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textColor="@color/white"
+            android:textSize="16sp"
+            android:textStyle="bold"
+            tools:text="空" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="0.833" />
+
+        <TextView
+            android:id="@+id/tvFoodWeight"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textColor="@color/food_weight_blue"
+            android:textSize="14sp"
+            android:textStyle="bold"
+            tools:text="0千克" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="0.933" />
+
+        <TextView
+            android:id="@+id/tvStoreDate"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textColor="@color/food_weight_blue"
+            android:textSize="12sp"
+            tools:text="-" />
+    </LinearLayout>
+
+
+</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_item_search.xml b/app/src/main/res/layout/list_item_search.xml
index 343c584..5c00083 100644
--- a/app/src/main/res/layout/list_item_search.xml
+++ b/app/src/main/res/layout/list_item_search.xml
@@ -36,6 +36,9 @@
     android:maxLines="1"
     app:paddingStart="5dp"
     app:paddingEnd="5dp"
+    android:insetRight="0dp"
+    android:insetLeft="0dp"
+    android:paddingHorizontal="8dp"
     android:textColor="@color/black999"
     android:textSize="30sp"
     app:cornerRadius="12dp"
diff --git a/app/src/main/res/layout/list_item_shelf.xml b/app/src/main/res/layout/list_item_shelf.xml
index 1ff3323..3945ebb 100644
--- a/app/src/main/res/layout/list_item_shelf.xml
+++ b/app/src/main/res/layout/list_item_shelf.xml
@@ -13,7 +13,7 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="216dp"
+        android:layout_height="match_parent"
         android:gravity="center_horizontal"
         android:orientation="vertical"
         android:padding="24dp">