restaurant/Inbound
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
lvmeng
2025-10-29 20:08:12 +08:00
parent 0611005d04
commit 7930ba0cd1
24 changed files with 651 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/layout/dialog_add_goods.xml
+62 -37
View File
@@ -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