restaurant/DishMatch
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化设备配置提交菜品页面数据刷新和显示位置、未配置调料增加提示

Browse Source
This commit is contained in:
lvmeng
2025-09-16 14:35:49 +08:00
parent e269e75bc6
commit 7ac095c56e
20 changed files with 716 additions and 1468 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/drawable/bg_oval.xml
+5
View File
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="@color/dish_green"/>
</shape>
app/src/main/res/layout/layout_grid.xml
+354 -123
View File
@@ -5,253 +5,484 @@
android:layout_width="match_parent"
android:layout_height="725dp"
android:paddingStart="23dp"
android:paddingEnd="22dp"
android:paddingTop="30dp"
android:paddingEnd="22dp"
android:paddingBottom="20dp"
app:columnCount="3"
app:orientation="vertical"
app:rowCount="5">
app:rowCount="5"
tools:ignore="HardcodedText">
<!-- 第1行 -->
<TextView
<FrameLayout
android:layout_width="0dp"
android:layout_height="120dp"
android:layout_marginStart="7dp"
android:layout_marginEnd="8dp"
android:layout_marginTop="7dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:background="@drawable/selector_text_cell"
android:ellipsize="end"
android:gravity="center"
android:maxLines="2"
android:tag="0"
android:textColor="@color/black"
android:textSize="28sp"
android:textStyle="bold"
app:layout_column="0"
app:layout_columnWeight="1"
app:layout_row="0"
tools:text="0" />
app:layout_row="0">
<TextView
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:ellipsize="end"
android:gravity="center"
android:maxLines="2"
android:textColor="@color/black"
android:textSize="28sp"
android:textStyle="bold"
tools:text="0" />
<TextView
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_gravity="top|end"
android:layout_marginTop="5dp"
android:layout_marginEnd="5dp"
android:background="@drawable/bg_oval"
android:gravity="center"
android:includeFontPadding="false"
android:maxLines="1"
android:text="1"
android:textColor="@color/white"
android:textSize="20sp" />
</FrameLayout>
<FrameLayout
android:layout_width="0dp"
android:layout_height="120dp"
android:layout_marginStart="7dp"
android:layout_marginEnd="8dp"
android:layout_marginTop="7dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:background="@drawable/selector_text_cell"
android:ellipsize="end"
android:gravity="center"
android:maxLines="2"
android:tag="1"
android:textColor="@color/black"
android:textSize="28sp"
android:textStyle="bold"
app:layout_column="1"
app:layout_columnWeight="1"
app:layout_row="0"
tools:text="1" />
app:layout_row="0">
<TextView
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:ellipsize="end"
android:gravity="center"
android:maxLines="2"
android:textColor="@color/black"
android:textSize="28sp"
android:textStyle="bold"
tools:text="0" />
<TextView
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_gravity="top|end"
android:layout_marginTop="5dp"
android:layout_marginEnd="5dp"
android:background="@drawable/bg_oval"
android:gravity="center"
android:includeFontPadding="false"
android:maxLines="1"
android:text="2"
android:textColor="@color/white"
android:textSize="20sp" />
</FrameLayout>
<FrameLayout
android:layout_width="0dp"
android:layout_height="120dp"
android:layout_marginStart="7dp"
android:layout_marginEnd="8dp"
android:layout_marginTop="7dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:background="@drawable/selector_text_cell"
android:ellipsize="end"
android:gravity="center"
android:maxLines="2"
android:tag="2"
android:textColor="@color/black"
android:textSize="28sp"
android:textStyle="bold"
app:layout_column="2"
app:layout_columnWeight="1"
app:layout_row="0"
tools:text="2" />
app:layout_row="0">
<TextView
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:ellipsize="end"
android:gravity="center"
android:maxLines="2"
android:textColor="@color/black"
android:textSize="28sp"
android:textStyle="bold"
tools:text="0" />
<TextView
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_gravity="top|end"
android:layout_marginTop="5dp"
android:layout_marginEnd="5dp"
android:background="@drawable/bg_oval"
android:gravity="center"
android:includeFontPadding="false"
android:maxLines="1"
android:text="3"
android:textColor="@color/white"
android:textSize="20sp" />
</FrameLayout>
<FrameLayout
android:layout_width="0dp"
android:layout_height="120dp"
android:layout_marginStart="7dp"
android:layout_marginEnd="8dp"
android:layout_marginTop="7dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:background="@drawable/selector_text_cell"
android:ellipsize="end"
android:gravity="center"
android:maxLines="2"
android:tag="3"
android:textColor="@color/black"
android:textSize="28sp"
android:textStyle="bold"
app:layout_column="0"
app:layout_columnWeight="1"
app:layout_row="1"
tools:text="3" />
app:layout_row="1">
<TextView
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:ellipsize="end"
android:gravity="center"
android:maxLines="2"
android:textColor="@color/black"
android:textSize="28sp"
android:textStyle="bold"
tools:text="0" />
<TextView
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_gravity="top|end"
android:layout_marginTop="5dp"
android:layout_marginEnd="5dp"
android:background="@drawable/bg_oval"
android:gravity="center"
android:includeFontPadding="false"
android:maxLines="1"
android:text="4"
android:textColor="@color/white"
android:textSize="20sp" />
</FrameLayout>
<FrameLayout
android:layout_width="0dp"
android:layout_height="120dp"
android:layout_marginStart="7dp"
android:layout_marginEnd="8dp"
android:layout_marginTop="7dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:background="@drawable/selector_text_cell"
android:ellipsize="end"
android:gravity="center"
android:maxLines="2"
android:tag="4"
android:textColor="@color/black"
android:textSize="28sp"
android:textStyle="bold"
app:layout_column="1"
app:layout_columnWeight="1"
app:layout_row="1"
tools:text="4" />
app:layout_row="1">
<TextView
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:ellipsize="end"
android:gravity="center"
android:maxLines="2"
android:textColor="@color/black"
android:textSize="28sp"
android:textStyle="bold"
tools:text="0" />
<TextView
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_gravity="top|end"
android:layout_marginTop="5dp"
android:layout_marginEnd="5dp"
android:background="@drawable/bg_oval"
android:gravity="center"
android:includeFontPadding="false"
android:maxLines="1"
android:text="5"
android:textColor="@color/white"
android:textSize="20sp" />
</FrameLayout>
<FrameLayout
android:layout_width="0dp"
android:layout_height="120dp"
android:layout_marginStart="7dp"
android:layout_marginEnd="8dp"
android:layout_marginTop="7dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:background="@drawable/selector_text_cell"
android:ellipsize="end"
android:gravity="center"
android:maxLines="2"
android:tag="5"
android:textColor="@color/black"
android:textSize="28sp"
android:textStyle="bold"
app:layout_column="2"
app:layout_columnWeight="1"
app:layout_row="1"
tools:text="5" />
app:layout_row="1">
<TextView
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:ellipsize="end"
android:gravity="center"
android:maxLines="2"
android:textColor="@color/black"
android:textSize="28sp"
android:textStyle="bold"
tools:text="0" />
<TextView
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_gravity="top|end"
android:layout_marginTop="5dp"
android:layout_marginEnd="5dp"
android:background="@drawable/bg_oval"
android:gravity="center"
android:includeFontPadding="false"
android:maxLines="1"
android:text="6"
android:textColor="@color/white"
android:textSize="20sp" />
</FrameLayout>
<FrameLayout
android:layout_width="0dp"
android:layout_height="120dp"
android:layout_marginStart="7dp"
android:layout_marginEnd="8dp"
android:layout_marginTop="7dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:background="@drawable/selector_text_cell"
android:ellipsize="end"
android:gravity="center"
android:maxLines="2"
android:tag="6"
android:textColor="@color/black"
android:textSize="28sp"
android:textStyle="bold"
app:layout_column="0"
app:layout_columnWeight="1"
app:layout_row="2"
tools:text="6" />
app:layout_row="2">
<TextView
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:ellipsize="end"
android:gravity="center"
android:maxLines="2"
android:textColor="@color/black"
android:textSize="28sp"
android:textStyle="bold"
tools:text="0" />
<TextView
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_gravity="top|end"
android:layout_marginTop="5dp"
android:layout_marginEnd="5dp"
android:background="@drawable/bg_oval"
android:gravity="center"
android:includeFontPadding="false"
android:maxLines="1"
android:text="7"
android:textColor="@color/white"
android:textSize="20sp" />
</FrameLayout>
<FrameLayout
android:layout_width="0dp"
android:layout_height="120dp"
android:layout_marginStart="7dp"
android:layout_marginEnd="8dp"
android:layout_marginTop="7dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:background="@drawable/selector_text_cell"
android:ellipsize="end"
android:gravity="center"
android:maxLines="2"
android:tag="7"
android:textColor="@color/black"
android:textSize="28sp"
android:textStyle="bold"
app:layout_column="1"
app:layout_columnWeight="1"
app:layout_row="2"
tools:text="7" />
app:layout_row="2">
<TextView
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:ellipsize="end"
android:gravity="center"
android:maxLines="2"
android:textColor="@color/black"
android:textSize="28sp"
android:textStyle="bold"
tools:text="0" />
<TextView
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_gravity="top|end"
android:layout_marginTop="5dp"
android:layout_marginEnd="5dp"
android:background="@drawable/bg_oval"
android:gravity="center"
android:includeFontPadding="false"
android:maxLines="1"
android:text="8"
android:textColor="@color/white"
android:textSize="20sp" />
</FrameLayout>
<FrameLayout
android:layout_width="0dp"
android:layout_height="120dp"
android:layout_marginStart="7dp"
android:layout_marginEnd="8dp"
android:layout_marginTop="7dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:background="@drawable/selector_text_cell"
android:ellipsize="end"
android:gravity="center"
android:maxLines="2"
android:tag="8"
android:textColor="@color/black"
android:textSize="28sp"
android:textStyle="bold"
app:layout_column="2"
app:layout_columnWeight="1"
app:layout_row="2"
tools:text="8" />
app:layout_row="2">
<TextView
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:ellipsize="end"
android:gravity="center"
android:maxLines="2"
android:textColor="@color/black"
android:textSize="28sp"
android:textStyle="bold"
tools:text="0" />
<TextView
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_gravity="top|end"
android:layout_marginTop="5dp"
android:layout_marginEnd="5dp"
android:background="@drawable/bg_oval"
android:gravity="center"
android:includeFontPadding="false"
android:maxLines="1"
android:text="9"
android:textColor="@color/white"
android:textSize="20sp" />
</FrameLayout>
<FrameLayout
android:layout_width="0dp"
android:layout_height="255dp"
android:layout_marginStart="7dp"
android:layout_marginEnd="8dp"
android:layout_marginTop="7dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:background="@drawable/selector_text_cell"
android:ellipsize="end"
android:gravity="center"
android:maxLines="2"
android:tag="9"
android:textColor="@color/black"
android:textSize="28sp"
android:textStyle="bold"
app:layout_column="0"
app:layout_columnSpan="2"
app:layout_columnWeight="1"
app:layout_gravity="fill_horizontal"
app:layout_row="3"
app:layout_rowSpan="2"
tools:text="9" />
app:layout_rowSpan="2">
<TextView
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:ellipsize="end"
android:gravity="center"
android:maxLines="2"
android:textColor="@color/black"
android:textSize="28sp"
android:textStyle="bold"
tools:text="0" />
<TextView
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_gravity="top|end"
android:layout_marginTop="5dp"
android:layout_marginEnd="5dp"
android:background="@drawable/bg_oval"
android:gravity="center"
android:includeFontPadding="false"
android:maxLines="1"
android:text="10"
android:textColor="@color/white"
android:textSize="20sp" />
</FrameLayout>
<FrameLayout
android:layout_width="0dp"
android:layout_height="120dp"
android:layout_marginStart="7dp"
android:layout_marginEnd="8dp"
android:layout_marginTop="7dp"
android:layout_marginEnd="8dp"
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="10" />
app:layout_row="3">
<TextView
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:ellipsize="end"
android:gravity="center"
android:maxLines="2"
android:textColor="@color/black"
android:textSize="28sp"
android:textStyle="bold"
tools:text="0" />
<TextView
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_gravity="top|end"
android:layout_marginTop="5dp"
android:layout_marginEnd="5dp"
android:background="@drawable/bg_oval"
android:gravity="center"
android:includeFontPadding="false"
android:maxLines="1"
android:text="11"
android:textColor="@color/white"
android:textSize="20sp" />
</FrameLayout>
<FrameLayout
android:layout_width="0dp"
android:layout_height="120dp"
android:layout_marginStart="7dp"
android:layout_marginEnd="8dp"
android:layout_marginTop="7dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:background="@drawable/selector_text_cell"
android:ellipsize="end"
android:gravity="center"
android:maxLines="2"
android:tag="11"
android:textColor="@color/black"
android:textSize="28sp"
android:textStyle="bold"
app:layout_column="2"
app:layout_columnWeight="1"
app:layout_row="4"
tools:text="11" />
app:layout_row="4">
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:ellipsize="end"
android:gravity="center"
android:maxLines="2"
android:textColor="@color/black"
android:textSize="28sp"
android:textStyle="bold"
tools:text="0" />
<TextView
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_gravity="top|end"
android:layout_marginTop="5dp"
android:layout_marginEnd="5dp"
android:background="@drawable/bg_oval"
android:gravity="center"
android:includeFontPadding="false"
android:maxLines="1"
android:text="12"
android:textColor="@color/white"
android:textSize="20sp" />
</FrameLayout>
</androidx.gridlayout.widget.GridLayout>