接口调试、增加人脸识别后主副屏支付金额逻辑、其它优化

app/src/main/res/layout/presentation_main_screen.xml

@@ -2,7 +2,6 @@
 <FrameLayout 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">
 
@@ -18,14 +17,14 @@
             android:layout_height="wrap_content"
             android:background="@drawable/setting_border"
             android:orientation="vertical"
-            android:paddingBottom="28dp">
+            android:paddingBottom="26dp">
 
             <TextView
                 android:id="@+id/tvFoodName"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
-                android:layout_marginVertical="60dp"
+                android:layout_marginVertical="50dp"
                 android:text="餐品识别中..."
                 android:textColor="#ff0a1428"
                 android:textSize="40sp"
@@ -76,17 +75,20 @@
 
                 </FrameLayout>
 
-                <ImageView
+                <com.google.android.material.imageview.ShapeableImageView
                     android:id="@+id/ivPreviewImage"
                     android:layout_width="match_parent"
                     android:layout_height="456dp"
+                    app:shapeAppearance="@style/round10dpCornerStyle"
                     tools:background="@mipmap/ic_launcher"/>
 
-<!--                <ImageView-->
-<!--                    android:id="@+id/ivRecImage"-->
-<!--                    android:layout_width="match_parent"-->
-<!--                    android:layout_height="456dp"-->
-<!--                    tools:background="@mipmap/ic_launcher"/>-->
+                <com.google.android.material.imageview.ShapeableImageView
+                    android:id="@+id/ivRecImage"
+                    android:layout_width="match_parent"
+                    android:layout_height="456dp"
+                    tools:background="@mipmap/ic_launcher_round"
+                    app:shapeAppearance="@style/round10dpCornerStyle"
+                    android:visibility="gone"/>
 
                 <ImageView
                     android:layout_width="match_parent"
@@ -100,13 +102,13 @@
                 android:id="@+id/llPriceInfo"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="28dp"
+                android:layout_marginTop="26dp"
                 android:layout_gravity="center_horizontal"
                 android:gravity="center_vertical"
                 android:visibility="gone">
 
                 <TextView
-                    android:id="@+id/tvOldPrice"
+                    android:id="@+id/tvNormalPrice"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textColor="#ff0a1428"