修改layout目录改为layout_sw800dp，优化调料显示UI，其它细节优化

app/src/main/res/drawable/bg_bottom_line.xml

@@ -0,0 +1,14 @@
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@android:color/transparent" />
+        </shape>
+    </item>
+
+    <item android:gravity="bottom">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/gray_eb" />
+            <size android:height="1dp" />
+        </shape>
+    </item>
+</layer-list>

app/src/main/res/layout-sw800dp/activity_device_config.xml

@@ -5,11 +5,13 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:background="@drawable/bg_other_page">
+    tools:background="@drawable/bg_other_page"
+    tools:ignore="HardcodedText">
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
+        android:layout_weight="1"
         android:layout_marginStart="30dp"
         android:layout_marginEnd="30dp"
         android:background="@drawable/shape_white_30_corners"
@@ -18,8 +20,9 @@
         <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="106dp"
-            android:paddingStart="30dp"
-            android:paddingEnd="30dp">
+            android:layout_marginStart="30dp"
+            android:layout_marginEnd="30dp"
+            android:background="@drawable/bg_bottom_line">
 
             <TextView
                 android:layout_width="wrap_content"
@@ -40,76 +43,80 @@
                 android:textSize="28sp" />
         </FrameLayout>
 
-        <com.google.android.material.divider.MaterialDivider
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginStart="30dp"
-            android:layout_marginEnd="30dp"
-            android:background="@color/gray_eb" />
+<!--        <com.google.android.material.divider.MaterialDivider-->
+<!--            android:layout_width="match_parent"-->
+<!--            android:layout_height="1dp"-->
+<!--            android:layout_marginStart="30dp"-->
+<!--            android:layout_marginEnd="30dp"-->
+<!--            android:background="@color/gray_eb" />-->
 
         <LinearLayout
             android:id="@+id/modeRadioGroup"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:orientation="vertical">
 
             <RadioButton
                 android:id="@+id/rbModeCook"
                 android:layout_width="match_parent"
-                android:layout_height="190dp"
+                android:layout_height="0dp"
+                android:layout_weight="1"
                 android:layout_marginStart="30dp"
                 android:layout_marginEnd="30dp"
-                android:background="@color/white"
                 android:button="@null"
                 android:drawableEnd="@drawable/mode_select"
+                android:background="@drawable/bg_bottom_line"
                 android:textSize="36sp"
                 tools:text="制作模式" />
 
-            <com.google.android.material.divider.MaterialDivider
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginStart="30dp"
-                android:layout_marginEnd="30dp"
-                android:background="@color/gray_eb" />
+<!--            <com.google.android.material.divider.MaterialDivider-->
+<!--                android:layout_width="match_parent"-->
+<!--                android:layout_height="1dp"-->
+<!--                android:layout_marginStart="30dp"-->
+<!--                android:layout_marginEnd="30dp"-->
+<!--                android:background="@color/gray_eb" />-->
 
             <RadioButton
                 android:id="@+id/rbModeSampling"
                 android:layout_width="match_parent"
-                android:layout_height="190dp"
+                android:layout_height="0dp"
+                android:layout_weight="1"
                 android:layout_marginStart="30dp"
                 android:layout_marginEnd="30dp"
-                android:background="@color/white"
                 android:button="@null"
                 android:drawableEnd="@drawable/mode_select"
+                android:background="@drawable/bg_bottom_line"
                 android:textSize="36sp"
                 tools:text="采样模式" />
+
+<!--            <com.google.android.material.divider.MaterialDivider-->
+<!--                android:layout_width="match_parent"-->
+<!--                android:layout_height="1dp"-->
+<!--                android:layout_marginStart="30dp"-->
+<!--                android:layout_marginEnd="30dp"-->
+<!--                android:background="@color/gray_eb" />-->
+
+            <RadioButton
+                android:id="@+id/rbModeQuality"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:layout_marginStart="30dp"
+                android:layout_marginEnd="30dp"
+                android:button="@null"
+                android:drawableEnd="@drawable/ic_dish_disable"
+                android:enabled="false"
+                android:textColor="@color/gray_b4"
+                android:textSize="36sp"
+                tools:text="品控模式" />
         </LinearLayout>
-
-        <com.google.android.material.divider.MaterialDivider
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginStart="30dp"
-            android:layout_marginEnd="30dp"
-            android:background="@color/gray_eb" />
-
-        <RadioButton
-            android:id="@+id/rbModeQuality"
-            android:layout_width="match_parent"
-            android:layout_height="190dp"
-            android:layout_marginStart="30dp"
-            android:layout_marginEnd="30dp"
-            android:button="@null"
-            android:drawableEnd="@drawable/ic_dish_disable"
-            android:enabled="false"
-            android:textColor="@color/gray_b4"
-            android:textSize="36sp"
-            tools:text="品控模式" />
     </LinearLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="30dp"
+        android:layout_marginBottom="60dp"
         android:background="@drawable/shape_white_30_corners"
         android:orientation="vertical"
         android:layout_marginStart="30dp"

app/src/main/res/layout-sw800dp/activity_submit_food.xml

@@ -3,9 +3,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:background="@drawable/bg_other_page">
+    tools:background="@drawable/bg_other_page"
+    tools:ignore="HardcodedText">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -39,14 +40,13 @@
         android:layout_height="0dp"
         android:layout_weight="1"
         android:layout_marginStart="30dp"
-        android:layout_marginTop="10dp"
+        android:layout_marginTop="30dp"
         android:layout_marginEnd="30dp"
         android:background="@drawable/shape_white_30_corners"
         android:orientation="vertical"
         android:paddingStart="30dp"
         android:paddingEnd="30dp">
 
-
         <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
@@ -78,8 +78,7 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
+            android:layout_height="match_parent"
             android:gravity="center"
             android:orientation="vertical">
 

app/src/main/res/layout-sw800dp/fragment_sampling_list.xml

@@ -65,7 +65,7 @@
 <!--            android:textSize="28sp"-->
 <!--            android:visibility="gone"/>-->
 
-<!--        <com.scwang.smart.refresh.layout.SmartRefreshLayout-->
+<!--        <com.scwang.smart.refresh.layout-sw800dp.SmartRefreshLayout-->
 <!--            android:id="@+id/refreshLayout"-->
 <!--            android:layout_width="match_parent"-->
 <!--            android:layout_height="match_parent"-->
@@ -81,13 +81,13 @@
 <!--                android:layout_width="match_parent"-->
 <!--                android:layout_height="match_parent"-->
 <!--                android:overScrollMode="never"-->
-<!--                tools:listitem="@layout/list_item_dish" />-->
+<!--                tools:listitem="@layout-sw800dp/list_item_dish" />-->
 
 <!--            <com.scwang.smart.refresh.footer.ClassicsFooter-->
 <!--                android:layout_width="match_parent"-->
 <!--                android:layout_height="wrap_content" />-->
 
-<!--        </com.scwang.smart.refresh.layout.SmartRefreshLayout>-->
+<!--        </com.scwang.smart.refresh.layout-sw800dp.SmartRefreshLayout>-->
 <!--    </LinearLayout>-->
 
 <!--    <TextView-->

app/src/main/res/layout-sw800dp/layout_grid.xml

@@ -195,7 +195,7 @@
 
     <TextView
         android:layout_width="0dp"
-        android:layout_height="120dp"
+        android:layout_height="255dp"
         android:layout_marginStart="7dp"
         android:layout_marginEnd="8dp"
         android:layout_marginTop="7dp"
@@ -209,9 +209,31 @@
         android:textSize="28sp"
         android:textStyle="bold"
         app:layout_column="0"
+        app:layout_columnSpan="2"
+        app:layout_gravity="fill_horizontal"
+        app:layout_row="3"
+        app:layout_rowSpan="2"
+        tools:text="9" />
+
+    <TextView
+        android:layout_width="0dp"
+        android:layout_height="120dp"
+        android:layout_marginStart="7dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginTop="7dp"
+        android:layout_marginBottom="8dp"
+        android:background="@drawable/selector_text_cell"
+        android:ellipsize="end"
+        android:gravity="center"
+        android:maxLines="2"
+        android:tag="10"
+        android:textColor="@color/black"
+        android:textSize="28sp"
+        android:textStyle="bold"
+        app:layout_column="2"
         app:layout_columnWeight="1"
         app:layout_row="3"
-        tools:text="9" />
+        tools:text="10" />
 
     <TextView
         android:layout_width="0dp"
@@ -228,31 +250,8 @@
         android:textColor="@color/black"
         android:textSize="28sp"
         android:textStyle="bold"
-        app:layout_column="0"
+        app:layout_column="2"
         app:layout_columnWeight="1"
         app:layout_row="4"
         tools:text="11" />
-
-    <TextView
-        android:layout_width="0dp"
-        android:layout_height="255dp"
-        android:layout_marginStart="7dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginTop="7dp"
-        android:layout_marginBottom="8dp"
-        android:background="@drawable/selector_text_cell"
-        android:ellipsize="end"
-        android:gravity="center"
-        android:maxLines="2"
-        android:tag="10"
-        android:textColor="@color/black"
-        android:textSize="28sp"
-        android:textStyle="bold"
-        app:layout_column="1"
-        app:layout_columnSpan="2"
-        app:layout_gravity="fill_horizontal"
-        app:layout_row="3"
-        app:layout_rowSpan="2"
-        tools:text="10" />
-
 </androidx.gridlayout.widget.GridLayout>

app/src/main/res/values-night/themes.xml

@@ -12,5 +12,6 @@
         <!-- Status bar color. -->
         <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
+<!--        <item name="android:layout_width">828dp</item>-->
     </style>
 </resources>

app/src/main/res/values/themes.xml

@@ -12,6 +12,7 @@
         <!-- Status bar color. -->
         <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
+<!--        <item name="android:layout_width">828dp</item>-->
     </style>
 
     <style name="CookButtonStyle" parent="Widget.MaterialComponents.Button">