canteen/StallDualScreen
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

采集向量优化调试

Browse Source
This commit is contained in:
lvmeng
2026-01-08 15:02:44 +08:00
parent 378e6088e7
commit 2a55ddb617
35 changed files with 663 additions and 1112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/drawable-xxhdpi/ic_empty_view.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 16 KiB

app/src/main/res/drawable-xxhdpi/ic_tip_warn.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 9.3 KiB

app/src/main/res/drawable/bg_btn_save.xml
+1 -1
View File
@@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#FFFF3232"/>
<corners android:radius="10dp"/>
<corners android:radius="12dp"/>
</shape>
app/src/main/res/drawable/bg_blue_ripple.xml → app/src/main/res/drawable/bg_red_ripple.xml
+2 -2
View File
@@ -3,8 +3,8 @@
android:color="#30000000">
<item>
<shape android:shape="rectangle">
<solid android:color="#FF0032C8" />
<corners android:radius="10dp" />
<solid android:color="#FFFF3232" />
<corners android:radius="12dp" />
</shape>
</item>
</ripple>
app/src/main/res/drawable/bg_white_stroke_blue_ripple.xml → app/src/main/res/drawable/bg_white_stroke_red_ripple.xml
+2 -2
View File
@@ -4,8 +4,8 @@
<item>
<shape android:shape="rectangle">
<solid android:color="@color/white"/>
<stroke android:color="#FF0032C8" android:width="1dp"/>
<corners android:radius="10dp"/>
<stroke android:color="#FFFF3232" android:width="1dp"/>
<corners android:radius="12dp"/>
</shape>
</item>
</ripple>
app/src/main/res/drawable/line_shape_horizontal.xml
+2 -2
View File
@@ -3,14 +3,14 @@
<item android:state_checked="true">
<shape android:shape="rectangle">
<solid android:color="#FFFF3232"/>
<size android:width="120dp" android:height="5dp"/>
<size android:width="120dp" android:height="3dp"/>
<corners android:radius="5dp"/>
</shape>
</item>
<item android:state_checked="false">
<shape android:shape="rectangle">
<solid android:color="@color/transparent"/>
<size android:width="120dp" android:height="5dp"/>
<size android:width="120dp" android:height="3dp"/>
<corners android:radius="5dp"/>
</shape>
</item>
app/src/main/res/layout/activity_collected_data.xml
-92
View File
@@ -1,92 +0,0 @@
<?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:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="88dp"
android:layout_marginTop="24dp">
<ImageView
android:id="@+id/ivBack"
android:layout_width="68dp"
android:layout_height="68dp"
android:padding="10dp"
android:src="@drawable/ic_back" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="已采集菜品"
android:textColor="@color/black"
android:textSize="26sp" />
</FrameLayout>
<FrameLayout
android:id="@+id/flSearchBlock"
android:layout_width="match_parent"
android:layout_height="80dp"
android:layout_marginHorizontal="20dp"
android:background="@drawable/bg_gray">
<EditText
android:id="@+id/etInputGoods"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#00000000"
android:gravity="center"
android:hint="输入菜品名称"
android:maxLines="1"
android:paddingStart="10dp"
android:paddingEnd="80dp"
android:textColor="#FF666666"
android:textColorHint="#FFC7C8DC"
android:textSize="30sp"
android:inputType="text"
android:imeOptions="actionSearch" />
<ImageView
android:id="@+id/ivGoodsSearch"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_gravity="end|center_vertical"
android:layout_marginEnd="16dp"
android:padding="14dp"
android:src="@drawable/ic_goods_search" />
</FrameLayout>
<!-- <com.scwang.smart.refresh.layout.SmartRefreshLayout-->
<!-- android:id="@+id/refreshLayout"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="0dp"-->
<!-- android:layout_marginHorizontal="130dp"-->
<!-- android:layout_marginTop="40dp"-->
<!-- android:layout_marginBottom="58dp"-->
<!-- app:layout_constraintBottom_toTopOf="@id/dividerLine"-->
<!-- app:layout_constraintTop_toBottomOf="@id/flSearchBlock">-->
<!-- <com.scwang.smart.refresh.header.ClassicsHeader-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content" />-->
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rvFoodList"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:overScrollMode="never"
android:layout_margin="10dp"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
tools:itemCount="8"
tools:listitem="@layout/list_item_collected_data" />
<!-- <com.scwang.smart.refresh.footer.ClassicsFooter-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content" />-->
<!-- </com.scwang.smart.refresh.layout.SmartRefreshLayout>-->
</LinearLayout>
app/src/main/res/layout/activity_food_collection.xml
-182
View File
@@ -1,182 +0,0 @@
<?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">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="88dp"
android:layout_marginTop="24dp">
<ImageView
android:id="@+id/ivBack"
android:layout_width="68dp"
android:layout_height="68dp"
android:padding="15dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_back" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="菜品采集"
android:textColor="@color/black"
android:textSize="26sp" />
</FrameLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginBottom="24dp">
<FrameLayout
android:id="@+id/flPreview"
android:layout_width="180dp"
android:layout_height="180dp"
android:layout_marginStart="24dp">
<androidx.cardview.widget.CardView
android:id="@+id/flCameraPreview"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_margin="2dp"
app:cardCornerRadius="10dp"
app:cardElevation="0dp"/>
<LinearLayout
android:id="@+id/llCameraFlag"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:gravity="center"
android:background="@color/white"
android:orientation="vertical"
android:visibility="visible">
<ImageView
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_gravity="center"
android:scaleType="fitCenter"
android:src="@drawable/ic_camera256"
tools:ignore="ContentDescription" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:text="图片采集"
android:textColor="#ffb4b4c8"
android:textSize="16sp" />
</LinearLayout>
</FrameLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginStart="20dp"
android:orientation="horizontal"
android:gravity="center_vertical">
<Button
android:id="@+id/btnTakePhoto"
android:layout_width="140dp"
android:layout_height="80dp"
android:gravity="center"
android:text="开始拍照"
android:textColor="#ffffff"
android:textSize="18sp" />
<Button
android:id="@+id/btnClearData"
android:layout_width="120dp"
android:layout_height="80dp"
android:gravity="center"
android:text="清除"
android:layout_marginHorizontal="10dp"
android:textColor="#ffffff"
android:textSize="18sp" />
<Button
android:id="@+id/btnCollectedGoods"
android:layout_width="220dp"
android:layout_height="80dp"
android:gravity="center"
android:text="已采集菜品"
android:textColor="#ffffff"
android:textSize="18sp" />
</LinearLayout>
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rvFoodCollection"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_marginHorizontal="3dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
app:spanCount="3"
tools:itemCount="3"
tools:listitem="@layout/list_item_food_collection" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="66dp"
android:layout_marginLeft="24dp"
android:layout_marginTop="24dp"
android:layout_marginRight="24dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<EditText
android:id="@+id/editFoodName"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/bg_gray"
android:gravity="center_vertical"
android:hint="输入菜品名称"
android:imeOptions="actionSearch"
android:paddingStart="15dp"
android:paddingEnd="15dp"
android:singleLine="true"
android:textColor="@color/black"
android:textSize="26sp" />
<Button
android:id="@+id/btnFoodSearch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="12dp"
android:text="菜品检索"
android:textColor="#ffffff"
android:textSize="26sp" />
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerview"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginStart="24dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="24dp"
android:layout_weight="1" />
<Button
android:id="@+id/btnSave"
android:layout_width="260dp"
android:layout_height="60dp"
android:layout_gravity="center"
android:layout_marginVertical="24dp"
android:text="保存"
android:textColor="#ffffff"
android:textSize="26sp" />
</LinearLayout>
app/src/main/res/layout/activity_main.xml
+4 -4
View File
@@ -157,17 +157,17 @@
android:id="@+id/flPay"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:visibility="gone">
<!-- android:background="@color/white"-->
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btnPay"
android:layout_width="match_parent"
android:layout_margin="28dp"
android:layout_height="87dp"
android:layout_margin="32dp"
android:layout_height="100dp"
android:textStyle="bold"
android:text="去结算"
android:textSize="35sp"
android:textSize="40sp"
android:background="@drawable/bg_btn_save"
android:textColor="@color/white"/>
app/src/main/res/layout/activity_setting.xml
+30 -19
View File
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#FFE7EFF8"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical">
<include
@@ -16,47 +16,58 @@
android:layout_height="90dp"
android:orientation="horizontal">
<RadioButton
android:id="@+id/rbBusiness"
<Space
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginStart="50dp"
android:layout_marginEnd="25dp"
android:layout_weight="1"
android:layout_weight="1" />
<RadioButton
android:id="@+id/rbBusiness"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:button="@null"
tools:checked="true"
android:drawableBottom="@drawable/line_shape_horizontal"
android:gravity="center_horizontal"
android:maxLines="1"
android:paddingHorizontal="50dp"
android:paddingTop="8dp"
android:paddingBottom="35dp"
android:text="经营设置"
android:paddingTop="6dp"
android:paddingBottom="32dp"
android:textColor="@color/setting_radio"
android:textSize="30sp"
android:drawableBottom="@drawable/line_shape_horizontal"
android:textStyle="bold" />
android:textStyle="bold"
tools:checked="true" />
<Space
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1" />
<RadioButton
android:id="@+id/rbCollect"
android:layout_width="0dp"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginStart="25dp"
android:layout_marginEnd="50dp"
android:layout_weight="1"
android:button="@null"
android:drawableBottom="@drawable/line_shape_horizontal"
android:gravity="center_horizontal"
android:maxLines="1"
android:paddingHorizontal="50dp"
android:paddingTop="8dp"
android:paddingBottom="35dp"
android:text="餐品采集"
android:paddingTop="6dp"
android:paddingBottom="32dp"
android:textColor="@color/setting_radio"
android:textSize="30sp"
android:drawableBottom="@drawable/line_shape_horizontal"
android:textStyle="bold" />
<Space
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1" />
</RadioGroup>
<androidx.fragment.app.FragmentContainerView
android:id="@+id/fragmentContainerView"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
android:layout_height="match_parent" />
</LinearLayout>
app/src/main/res/layout/bottom_sheet_dialog.xml
+1
View File
@@ -69,6 +69,7 @@
android:layout_marginHorizontal="14dp"
app:spanCount="2"
tools:itemCount="12"
android:overScrollMode="never"
tools:listitem="@layout/list_item_search_food"
app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"/>
</LinearLayout>
app/src/main/res/layout/dialog_warn.xml
+19 -15
View File
@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="500dp"
android:layout_height="300dp"
android:gravity="center"
android:gravity="center_horizontal"
android:orientation="vertical"
android:background="@drawable/bg_white_radius12"
tools:ignore="HardcodedText">
@@ -11,42 +11,46 @@
<ImageView
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_marginTop="20dp"
android:src="@drawable/ic_tip_warn"
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/tvWarnContent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_marginHorizontal="30dp"
android:layout_marginVertical="30dp"
android:layout_marginTop="20dp"
android:gravity="center"
tools:text="存在未收货的物品，请确认是否放弃收货，若放弃则数据不会保存？"
tools:text="这里显示弹窗内容？\n这里显示弹窗内容？\n这里显示弹窗内容？"
android:textColor="#ff141428"
android:maxLines="3"
android:ellipsize="end"
android:textSize="22sp" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:layout_width="match_parent"
android:layout_height="90dp"
android:gravity="center"
android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btnCancel"
android:layout_width="130dp"
android:layout_height="60dp"
android:background="@drawable/bg_white_stroke_blue_ripple"
android:layout_width="135dp"
android:layout_height="50dp"
android:background="@drawable/bg_white_stroke_red_ripple"
android:text="取消"
android:gravity="center"
android:textColor="#FF0033CC"
android:textColor="#FFFF3232"
android:textSize="22sp" />
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btnConfirm"
android:layout_width="130dp"
android:layout_height="60dp"
android:layout_marginStart="40dp"
android:background="@drawable/bg_blue_ripple"
android:layout_width="135dp"
android:layout_height="50dp"
android:layout_marginStart="50dp"
android:background="@drawable/bg_red_ripple"
android:text="确认"
android:gravity="center"
android:textColor="@color/white"
app/src/main/res/layout/fragment_business.xml
+2 -2
View File
@@ -187,9 +187,9 @@
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btnConfirm"
android:layout_width="match_parent"
android:layout_height="87dp"
android:layout_height="100dp"
android:layout_marginHorizontal="32dp"
android:layout_marginBottom="48dp"
android:layout_marginBottom="32dp"
android:text="确定"
android:background="@drawable/bg_btn_save"
android:textColor="@color/white"
app/src/main/res/layout/fragment_collect.xml
+6 -4
View File
@@ -111,7 +111,7 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rvFoodList"
android:layout_width="match_parent"
android:layout_height="400dp"
android:layout_height="382dp"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="16dp"
app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
@@ -164,20 +164,22 @@
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="24dp"
android:layout_marginTop="18dp"
android:minHeight="348dp"
android:layout_weight="1"
app:spanCount="2"
tools:itemCount="10"
android:overScrollMode="never"
app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
tools:listitem="@layout/list_item_search_food"/>
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btnSave"
android:layout_width="match_parent"
android:layout_height="87dp"
android:layout_height="100dp"
android:layout_marginHorizontal="32dp"
android:layout_marginBottom="48dp"
android:layout_marginBottom="32dp"
android:layout_marginTop="20dp"
android:text="保存"
android:background="@drawable/bg_btn_save"
android:textColor="@color/white"
app/src/main/res/layout/layout_empty_search.xml
+11 -12
View File
@@ -10,7 +10,7 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="80dp"
android:layout_height="100dp"
android:src="@drawable/ic_empty_view"
tools:ignore="ContentDescription" />
@@ -18,18 +18,17 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:layout_marginBottom="39dp"
android:text="暂无采集记录"
android:textColor="#ff000000"
android:textSize="36sp"
android:textColor="@color/black"
android:textSize="40sp"
android:textStyle="bold" />
<TextView
android:id="@+id/tvContent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="请确认菜品名称，或稍后重试"
android:textColor="#ff999999"
android:gravity="center"
android:textSize="30sp" />
<!-- <TextView-->
<!-- android:id="@+id/tvContent"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:text="请确认菜品名称，或稍后重试"-->
<!-- android:textColor="#ff999999"-->
<!-- android:gravity="center"-->
<!-- android:textSize="30sp" />-->
</LinearLayout>
app/src/main/res/layout/list_item_collected_food.xml
+1 -1
View File
@@ -42,7 +42,7 @@
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_marginEnd="75dp"
android:paddingHorizontal="13dp"
android:paddingHorizontal="18dp"
android:src="@drawable/ic_close2"
tools:ignore="ContentDescription"
android:visibility="visible"/>