支付完成倒计时3秒返回首页;秤默认置零取消,打开直接识别物品;人脸识别图片显示拉伸优化;设置页面切换是否收费模式首页逻辑处理;

This commit is contained in:
2025-12-18 18:25:15 +08:00
parent 1d0e1a62e2
commit ab3109f36a
26 changed files with 540 additions and 258 deletions
@@ -204,7 +204,8 @@
android:background="@drawable/bg_gray"
android:text="返回"
android:textSize="30sp"
android:textStyle="bold" />
android:textStyle="bold"
android:textAllCaps="false" />
</LinearLayout>
@@ -15,7 +15,7 @@
android:textColor="#FF5E7585"
android:textSize="24sp"
android:textStyle="bold"
android:layout_marginTop="33dp"
android:layout_marginTop="28dp"
android:layout_marginStart="41dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
@@ -38,7 +38,7 @@
android:id="@+id/divider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="33dp"
android:layout_marginTop="28dp"
android:layout_marginHorizontal="28dp"
android:background="#FF5E7585"
app:layout_constraintTop_toBottomOf="@id/tv_user_name" />
@@ -64,10 +64,12 @@
android:textStyle="bold"
tools:ignore="HardcodedText" />
<!-- android:layout_width="300dp"-->
<!-- android:layout_height="510dp"-->
<FrameLayout
android:id="@+id/flFace"
android:layout_width="match_parent"
android:layout_height="456dp"
android:layout_width="300dp"
android:layout_height="510dp"
android:layout_marginHorizontal="28dp"
android:layout_marginTop="56dp">
@@ -24,23 +24,29 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginVertical="50dp"
android:layout_marginVertical="30dp"
android:text="餐品识别中..."
android:textColor="#ff0a1428"
android:textSize="40sp"
android:textStyle="bold" />
<!-- android:layout_width="300dp"-->
<!-- android:layout_height="450dp"-->
<!-- android:layout_width="330dp"-->
<!-- android:layout_height="495dp"-->
<FrameLayout
android:id="@+id/flCameraView"
android:layout_width="match_parent"
android:layout_height="456dp"
android:layout_height="510dp"
android:layout_gravity="center_horizontal"
android:layout_marginHorizontal="28dp"
android:visibility="visible">
<FrameLayout
android:id="@+id/flFace"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_width="300dp"
android:layout_height="510dp"
android:layout_gravity="center_horizontal"
android:visibility="gone">
<TextureView
android:id="@+id/dual_camera_texture_preview_rgb"
@@ -73,26 +79,34 @@
android:textSize="24sp"
android:visibility="gone" />
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="28dp"
android:background="@drawable/ic_camera_rect" />
</FrameLayout>
<!-- android:layout_height="456dp"-->
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/ivPreviewImage"
android:layout_width="match_parent"
android:layout_height="456dp"
android:layout_height="match_parent"
android:scaleType="centerCrop"
app:shapeAppearance="@style/round10dpCornerStyle"
tools:background="@mipmap/ic_launcher"/>
tools:src="@mipmap/ic_launcher"/>
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/ivRecImage"
android:layout_width="match_parent"
android:layout_height="456dp"
android:layout_height="match_parent"
android:scaleType="centerCrop"
tools:background="@mipmap/ic_launcher_round"
tools:src="@mipmap/ic_launcher_round"
app:shapeAppearance="@style/round10dpCornerStyle"
android:visibility="gone"/>
<ImageView
android:id="@+id/ivFrame"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="28dp"
@@ -164,7 +178,6 @@
android:textColor="#ffff3232"
android:textSize="80sp"
android:textStyle="bold"
android:layout_marginTop="42dp"
android:background="@drawable/setting_border" />
<include
+2 -1
View File
@@ -1,6 +1,7 @@
<resources>
<!-- Base application theme. -->
<style name="Base.Theme.DualScreen" parent="Theme.Material3.DayNight.NoActionBar">
<!-- <style name="Base.Theme.DualScreen" parent="Theme.Material3.DayNight.NoActionBar">-->
<style name="Base.Theme.DualScreen" parent="Theme.AppCompat.Light.NoActionBar">
<!-- Customize your light theme here. -->
<!-- <item name="colorPrimary">@color/my_light_primary</item> -->
</style>