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-11 15:38:06 +08:00
parent 4086f9c0b7
commit fc326a8f42
8 changed files with 61 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/layout/activity_main.xml
+1
View File
@@ -60,6 +60,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:contentDescription="食物图预览"
android:scaleType="centerCrop"
android:visibility="gone" />
<View
app/src/main/res/layout/item_user_nutrition.xml
+4 -4
View File
@@ -68,7 +68,7 @@
<View
android:id="@+id/divKcalView"
android:layout_width="1dp"
android:layout_height="@dimen/dp16"
android:layout_height="@dimen/dp30"
app:layout_constraintBottom_toTopOf="@id/customKcalColumn"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" />
@@ -128,7 +128,7 @@
<View
android:id="@+id/divTotalFoodView"
android:layout_width="1dp"
android:layout_height="@dimen/dp16"
android:layout_height="@dimen/dp30"
app:layout_constraintBottom_toTopOf="@id/customFoodColumn"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" />
@@ -181,7 +181,7 @@
<View
android:id="@+id/divVegetableView"
android:layout_width="1dp"
android:layout_height="@dimen/dp16"
android:layout_height="@dimen/dp30"
app:layout_constraintBottom_toTopOf="@id/customVegetableColumn"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" />
@@ -234,7 +234,7 @@
<View
android:id="@+id/divMeatView"
android:layout_width="1dp"
android:layout_height="@dimen/dp16"
android:layout_height="@dimen/dp30"
app:layout_constraintBottom_toTopOf="@id/customMeatColumn"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" />
app/src/main/res/layout/presentation_secondary_screen.xml
+8 -8
View File
@@ -5,8 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@mipmap/bg"
android:gravity="center_horizontal"
android:orientation="vertical"
android:visibility="visible"
tools:context=".activity.MainActivity">
<!--人脸识别-->
@@ -47,18 +46,18 @@
</FrameLayout>
</FrameLayout>
<ImageView
android:id="@+id/iv_face_bg"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_width="wrap_content"
android:layout_height="1406dp"
android:background="@drawable/bg_face"
android:contentDescription="相机遮盖层"
android:visibility="gone" />
android:visibility="visible" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical"
android:padding="80dp">
@@ -107,6 +106,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:contentDescription="img"
android:scaleType="centerCrop"
android:visibility="visible" />
<View
@@ -119,7 +119,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="486dp"
android:layout_marginTop="633dp"
android:layout_gravity="bottom"
android:background="@drawable/rounded_border_transparent"
android:gravity="center">