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

添加了副屏显示逻辑控制

Browse Source
This commit is contained in:
zxj
2025-08-01 15:57:12 +08:00
parent de4c5f1c75
commit c78279a66e
27 changed files with 817 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/drawable/bg_avatar.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 952 KiB

app/src/main/res/drawable/bg_detection_selector.xml
+1 -1
View File
@@ -8,5 +8,5 @@
android:topRightRadius="12dp" />
<stroke
android:width="2dp"
android:color="#ffece7d0" />
android:color="#33343B" />
</shape>
app/src/main/res/drawable/bg_face.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 94 KiB

After

Width:  |  Height:  |  Size: 1.0 MiB

app/src/main/res/drawable/grid_item_normal.xml
+3
View File
@@ -5,4 +5,7 @@
android:bottomRightRadius="12dp"
android:topLeftRadius="12dp"
android:topRightRadius="12dp" />
<stroke
android:color="#ECE7D0"
android:width="2dp" />
</shape>
app/src/main/res/drawable/shape_for_custom_spinner.xml
+10
View File
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 填充颜色 -->
<solid android:color="@color/black" />
<stroke
android:width="2dp"
android:color="#33343B" />
<!-- 矩形的圆角半径 -->
<corners android:radius="12dp" />
</shape>
app/src/main/res/layout/activity_main.xml
+14 -7
View File
@@ -1,6 +1,5 @@
<?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:id="@+id/main"
android:layout_width="match_parent"
@@ -21,21 +20,22 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:padding="28dp"
android:background="@drawable/bg_detection_selector">
<com.sw.dualscreen.view.CustomSpinner
<Spinner
android:id="@+id/spinner"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:spinnerTextColor="#ffece7d0"
app:spinnerTextSize="26sp" />
style="@style/customSpinnerStyle"
android:layout_gravity="end"
android:padding="0dp"
android:popupBackground="@drawable/shape_for_custom_spinner" />
</LinearLayout>
</FrameLayout>
<TextView
android:id="@+id/tv_goods"
android:id="@+id/tv_food_name"
style="@style/text_title_blob"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -46,7 +46,7 @@
android:layout_width="match_parent"
android:layout_height="531dp"
android:layout_marginHorizontal="60dp"
android:layout_marginTop="120dp"
android:layout_marginTop="110dp"
android:layout_marginBottom="90dp"
android:visibility="visible">
@@ -55,6 +55,13 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />
<ImageView
android:id="@+id/iv_img"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:contentDescription="食物图预览"
android:visibility="gone" />
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
app/src/main/res/layout/item_food_info.xml
+2 -3
View File
@@ -6,7 +6,7 @@
android:background="@drawable/grid_item_checked"
android:gravity="center"
android:orientation="vertical"
android:paddingVertical="42dp">
android:paddingVertical="40dp">
<TextView
android:id="@+id/tv_name"
@@ -16,7 +16,6 @@
android:maxLines="1"
android:ellipsize="end"
android:textColor="#ff031127"
android:textSize="36sp"
android:textStyle="bold" />
android:textSize="36sp" />
</LinearLayout>
app/src/main/res/layout/item_for_custom_spinner.xml
+12
View File
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:gravity="center"
android:paddingHorizontal="40dp"
android:paddingVertical="24dp"
android:singleLine="true"
android:text="下拉列表项样式"
android:textColor="#ECE7D0"
android:textSize="26dp" />
app/src/main/res/layout/item_search_food_info.xml
+2 -3
View File
@@ -6,7 +6,7 @@
android:background="@drawable/grid_search_item_checked"
android:gravity="center"
android:orientation="vertical"
android:paddingVertical="42dp">
android:paddingVertical="35dp">
<TextView
android:id="@+id/tv_name"
@@ -16,7 +16,6 @@
android:maxLines="1"
android:ellipsize="end"
android:textColor="#FF9900"
android:textSize="30sp"
android:textStyle="bold" />
android:textSize="30sp" />
</LinearLayout>
app/src/main/res/layout/item_user_heat.xml → app/src/main/res/layout/item_user_nutrition.xml
+12 -10
View File
@@ -1,26 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout 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/cl_nutritionData"
android:layout_width="540dp"
android:layout_height="487dp"
android:background="@drawable/rounded_border_transparent"
android:visibility="visible"
android:padding="28dp">
<TextView
android:id="@+id/tv_user_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="夏*秋"
tools:text="夏*秋"
android:textColor="#ffece7d0"
android:textSize="20sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_heat"
android:id="@+id/tv_recommend_heat"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="推荐热量：680kcal"
tools:text="推荐热量：680kcal"
android:textColor="#ffece7d0"
android:textSize="20sp"
app:layout_constraintEnd_toEndOf="parent"
@@ -87,9 +89,9 @@
<com.sw.dualscreen.view.CustomImageView
android:id="@+id/iv_staple_food"
android:layout_width="87dp"
android:src="#99CC99"
android:layout_height="100dp"
android:layout_gravity="bottom|center"
android:layout_height="100dp" />
android:src="#99CC99" />
<ImageView
android:layout_width="wrap_content"
@@ -106,8 +108,8 @@
<com.sw.dualscreen.view.CustomImageView
android:id="@+id/iv_fruits_vegetables"
android:layout_width="87dp"
android:layout_gravity="bottom|center"
android:layout_height="match_parent" />
android:layout_height="match_parent"
android:layout_gravity="bottom|center" />
<ImageView
android:layout_width="wrap_content"
@@ -124,8 +126,8 @@
<com.sw.dualscreen.view.CustomImageView
android:id="@+id/iv_meat_eggs"
android:layout_width="87dp"
android:layout_gravity="bottom|center"
android:layout_height="match_parent" />
android:layout_height="match_parent"
android:layout_gravity="bottom|center" />
<ImageView
android:layout_width="wrap_content"
app/src/main/res/layout/presentation_secondary_screen.xml
+62 -75
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main"
android:layout_width="match_parent"
@@ -9,11 +9,42 @@
android:orientation="vertical"
tools:context=".activity.MainActivity">
<LinearLayout
<!--人脸识别-->
<FrameLayout
android:id="@+id/fl_face"
android:layout_width="376dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:paddingTop="1dp"
android:visibility="gone">
<TextureView
android:id="@+id/dual_camera_texture_preview_rgb"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:visibility="visible" />
<com.sw.plate.utils.arcface.FaceRectView
android:id="@+id/dual_camera_face_rect_view"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</FrameLayout>
<ImageView
android:id="@+id/iv_face_bg"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:background="@drawable/bg_face"
android:contentDescription="相机遮盖层"
android:visibility="visible" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="80dp"
android:paddingTop="80dp">
android:orientation="vertical"
android:padding="80dp">
<LinearLayout
android:layout_width="match_parent"
@@ -24,55 +55,19 @@
android:visibility="visible">
<TextView
android:id="@+id/tv_goods"
android:id="@+id/tv_food_info"
style="@style/text_title_blob_2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="羊肉臊子荞面饸饹" />
tools:text="羊肉臊子荞面饸饹" />
</LinearLayout>
</LinearLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="40dp"
android:visibility="visible">
<FrameLayout
android:id="@+id/fl_face"
android:layout_width="376dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:paddingTop="1dp"
android:visibility="gone">
<TextureView
android:id="@+id/dual_camera_texture_preview_rgb"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:visibility="visible" />
<com.sw.plate.utils.arcface.FaceRectView
android:id="@+id/dual_camera_face_rect_view"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</FrameLayout>
<ImageView
android:id="@+id/iv_face_bg"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:background="@drawable/bg_avatar"
android:visibility="gone" />
<TextView
android:id="@+id/tv_face_tip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="376dp"
android:layout_marginTop="566dp"
android:text="请正视屏幕"
android:textColor="#ffece7d0"
android:textSize="24sp"
@@ -82,21 +77,21 @@
android:id="@+id/fl_preview"
android:layout_width="match_parent"
android:layout_height="420dp"
android:visibility="visible"
android:paddingHorizontal="80dp">
android:layout_marginTop="174dp"
android:visibility="visible">
<androidx.camera.view.PreviewView
android:id="@+id/previewView"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<!-- <androidx.camera.view.PreviewView-->
<!-- android:id="@+id/previewView"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- android:visibility="gone" />-->
<ImageView
android:id="@+id/iv_img"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="visible"
android:contentDescription="img" />
android:contentDescription="img"
android:visibility="visible" />
<View
android:layout_width="match_parent"
@@ -107,30 +102,22 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:paddingHorizontal="80dp"
android:paddingBottom="80dp">
android:layout_height="486dp"
android:layout_marginTop="633dp"
android:background="@drawable/rounded_border_transparent"
android:gravity="center">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="486dp"
android:background="@drawable/rounded_border_transparent"
android:gravity="center">
<TextView
android:id="@+id/tv_bottom_tip"
style="@style/text_100_2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="先识别 后取餐"
android:visibility="visible" />
<TextView
android:id="@+id/tv_bottom_tip"
style="@style/text_100_2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="先识别 后取餐"
android:visibility="gone" />
<include
android:id="@+id/include_user_heat"
layout="@layout/item_user_heat"
android:visibility="visible" />
</LinearLayout>
<include
android:id="@+id/include_user_nutrition"
layout="@layout/item_user_nutrition" />
</LinearLayout>
</FrameLayout>
</LinearLayout>
</FrameLayout>
app/src/main/res/values/colors.xml
+5
View File
@@ -7,4 +7,9 @@
<color name="beige_ECE7D0">#ECE7D0</color>
<color name="blue_6498DD">#6498DD</color>
<color name="black_031127">#031127</color>
<color name="identify_checked">#031127</color>
<color name="identify_normal">#6498DD</color>
<color name="search_checked">#FF9900</color>
<color name="search_normal">#666666</color>
</resources>
app/src/main/res/values/themes.xml
+6
View File
@@ -60,4 +60,10 @@
<item name="android:textSize">26sp</item>
<item name="android:textColor">#ffece7d0</item>
</style>
<style name="customSpinnerStyle" parent="android:Widget.ListView.DropDown">
<item name="android:textAlignment">center</item>
<item name="divider">@color/white</item>
<item name="android:dividerHeight">1dp</item>
</style>
</resources>