自采入库、新增物品、上传图片、全部收货接口调试，其它逻辑优化

app/src/main/res/drawable/bg_selector_radius12_stroke2.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="false">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/white"/>
+            <stroke android:color="#FFDCDCF0" android:width="2dp"/>
+            <corners android:radius="12dp"/>
+        </shape>
+    </item>
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/white"/>
+            <stroke android:color="#ff999999" android:width="2dp"/>
+            <corners android:radius="12dp"/>
+        </shape>
+    </item>
+</selector>

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

@@ -56,6 +56,7 @@
         android:paddingHorizontal="20dp">
 
         <LinearLayout
+            android:id="@+id/layoutTop"
             android:layout_width="match_parent"
             android:layout_height="100dp"
             android:gravity="center_vertical"
@@ -68,12 +69,13 @@
                 android:textColor="#ff333333"
                 android:textSize="24sp"
                 android:textStyle="bold"
+                android:paddingVertical="8dp"
                 tools:text="采购单号：CG2506190526" />
 
-            <androidx.camera.view.PreviewView
-                android:id="@+id/previewView"
-                android:layout_width="2dp"
-                android:layout_height="2dp"
+            <FrameLayout
+                android:id="@+id/flCameraPreview"
+                android:layout_width="1dp"
+                android:layout_height="1dp"
                 android:layout_marginStart="5dp" />
 
             <Space
@@ -129,6 +131,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:overScrollMode="never"
+            tools:listitem="@layout/list_item_receipt_goods"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             tools:itemCount="8" />
 

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

@@ -36,50 +36,60 @@
             android:layout_width="430dp"
             android:layout_height="322dp"
             android:layout_marginTop="40dp"
-            android:background="@drawable/bg_white_radius10_stroke2_dash"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/llGoodsInfo">
+            app:layout_constraintTop_toTopOf="@+id/llGoodsInfo"
+            android:background="@drawable/bg_white_radius10_stroke2_dash">
 
-            <LinearLayout
-                android:id="@+id/llStartPreview"
+<!--            <LinearLayout-->
+<!--                android:id="@+id/llStartPreview"-->
+<!--                android:layout_width="wrap_content"-->
+<!--                android:layout_height="wrap_content"-->
+<!--                android:layout_gravity="center"-->
+<!--                android:gravity="center"-->
+<!--                android:orientation="vertical"-->
+<!--                android:visibility="gone">-->
+
+<!--                <ImageView-->
+<!--                    android:layout_width="96dp"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:layout_gravity="center"-->
+<!--                    android:scaleType="centerCrop"-->
+<!--                    android:src="@mipmap/ic_camera_gray"-->
+<!--                    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="24sp" />-->
+<!--            </LinearLayout>-->
+
+            <FrameLayout
+                android:id="@+id/flCameraPreview"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:gravity="center"
-                android:orientation="vertical"
-                android:visibility="gone">
+                android:layout_gravity="center"/>
+
+            <androidx.cardview.widget.CardView
+                android:id="@+id/cvImageBg"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                app:cardBackgroundColor="@color/white"
+                app:cardCornerRadius="10dp"
+                android:layout_margin="3dp"
+                app:cardElevation="0dp">
 
                 <ImageView
-                    android:layout_width="96dp"
-                    android:layout_height="wrap_content"
+                    android:id="@+id/ivGoodsImage"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
                     android:layout_gravity="center"
                     android:scaleType="centerCrop"
-                    android:src="@mipmap/ic_camera_gray"
                     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="24sp" />
-            </LinearLayout>
-
-            <androidx.camera.view.PreviewView
-                android:id="@+id/previewView"
-                android:layout_width="428dp"
-                android:layout_height="320dp"
-                android:layout_gravity="center"
-                android:visibility="gone"/>
-
-            <ImageView
-                android:id="@+id/ivGoodsImage"
-                android:layout_width="428dp"
-                android:layout_height="320dp"
-                android:layout_gravity="center"
-                android:scaleType="centerCrop"
-                tools:ignore="ContentDescription" />
+            </androidx.cardview.widget.CardView>
         </FrameLayout>
 
         <Button
@@ -120,6 +130,20 @@
                 tools:ignore="UseCompatTextViewDrawableXml" />
         </LinearLayout>
 
+        <Button
+            android:id="@+id/btnUploadImg"
+            android:layout_width="210dp"
+            android:layout_height="70dp"
+            android:layout_marginTop="39dp"
+            android:background="@drawable/bg_white_stroke_green_ripple"
+            android:text="上传图片"
+            android:textColor="#FF14CD71"
+            android:textSize="30sp"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="@id/btnTakePhoto"
+            app:layout_constraintStart_toStartOf="@id/btnStartPreview"
+            app:layout_constraintTop_toBottomOf="@id/btnTakePhoto" />
+
         <LinearLayout
             android:id="@+id/llGoodsInfo"
             android:layout_width="0dp"
@@ -242,7 +266,7 @@
                     android:id="@+id/flGoodsType"
                     android:layout_width="432dp"
                     android:layout_height="60dp"
-                    android:background="@drawable/bg_white_radius10_stroke2">
+                    android:background="@drawable/bg_gray_radius10">
 
                     <TextView
                         android:id="@+id/tvGoodsType"
@@ -253,7 +277,7 @@
                         android:layout_marginEnd="20dp"
                         android:ellipsize="end"
                         android:hint="请选择"
-                        android:textColor="#ff141428"
+                        android:textColor="#ff96a0aa"
                         android:textColorHint="#FF96A0AA"
                         android:textSize="24sp"
                         android:textStyle="bold"
@@ -265,7 +289,8 @@
                         android:layout_gravity="end|center_vertical"
                         android:layout_marginEnd="20dp"
                         android:src="@mipmap/ic_triangle_down"
-                        tools:ignore="ContentDescription" />
+                        tools:ignore="ContentDescription"
+                        android:visibility="invisible"/>
                 </FrameLayout>
 
                 <FrameLayout

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

@@ -108,21 +108,20 @@
         android:background="#FFDCDCF0"
         app:layout_constraintBottom_toBottomOf="parent" />
 
-<!--    <Button-->
-<!--        android:id="@+id/btnAddGoods"-->
-<!--        android:layout_width="240dp"-->
-<!--        android:layout_height="80dp"-->
-<!--        android:background="@drawable/bg_white_stroke_blue_ripple"-->
-<!--        android:text="添加物品"-->
-<!--        android:textColor="#FF0033CC"-->
-<!--        android:textSize="30sp"-->
-<!--        android:textStyle="bold"-->
-<!--        app:layout_constraintBottom_toBottomOf="parent"-->
-<!--        app:layout_constraintEnd_toStartOf="@+id/btnConfirm"-->
-<!--        app:layout_constraintHorizontal_chainStyle="packed"-->
-<!--        app:layout_constraintStart_toStartOf="parent"-->
-<!--        app:layout_constraintTop_toTopOf="@id/dividerLine"-->
-<!--        android:visibility="gone"/>-->
+    <Button
+        android:id="@+id/btnAddGoods"
+        android:layout_width="240dp"
+        android:layout_height="80dp"
+        android:background="@drawable/bg_white_stroke_blue_ripple"
+        android:text="添加物品"
+        android:textColor="#FF0033CC"
+        android:textSize="30sp"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/btnConfirm"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/dividerLine" />
 
     <Button
         android:id="@+id/btnConfirm"
@@ -133,9 +132,10 @@
         android:textColor="@color/white"
         android:textSize="30sp"
         android:textStyle="bold"
+        android:layout_marginStart="30dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintStart_toEndOf="@id/btnAddGoods"
         app:layout_constraintTop_toTopOf="@id/dividerLine" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -170,6 +170,7 @@
                         tools:ignore="Autofill,TextFields" />
 
                     <TextView
+                        android:id="@+id/tvCountUnit"
                         android:layout_width="70dp"
                         android:layout_height="70dp"
                         android:layout_gravity="end|center_vertical"

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+    <androidx.camera.view.PreviewView
+        android:id="@+id/previewView"
+        android:layout_width="428dp"
+        android:layout_height="320dp"
+        android:layout_gravity="center"/>
+</merge>

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

@@ -4,6 +4,7 @@
     android:layout_height="wrap_content"
     android:layout_marginHorizontal="10dp"
     android:padding="2dp"
+    android:background="@drawable/bg_selector_radius12_stroke2"
     xmlns:tools="http://schemas.android.com/tools">
 
     <ImageView