From 6ca19aab6ad5d955faf6bf0aca512b7b9b8f1246 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E5=A2=9E=E9=A3=9E?= <331023091@qq.com>
Date: Tue, 11 Nov 2025 15:18:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=94=E8=B0=83=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/sw/inbound/dialog/BaseDialog.kt  |  2 +-
 .../com/sw/inbound/dialog/GoodsStoreDialog.kt | 28 ++++++++++++++-----
 .../main/res/layout/dialog_goods_store.xml    |  2 +-
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/sw/inbound/dialog/BaseDialog.kt b/app/src/main/java/com/sw/inbound/dialog/BaseDialog.kt
index 753a633..ac24391 100644
--- a/app/src/main/java/com/sw/inbound/dialog/BaseDialog.kt
+++ b/app/src/main/java/com/sw/inbound/dialog/BaseDialog.kt
@@ -16,7 +16,7 @@ import com.sw.inbound.utils.ext.hideKeyboard
 abstract class BaseDialog(
     context: Context,
     var defWidth: Int = 1500.dp,
-    var defHeight: Int = 800.dp
+    var defHeight: Int = 900.dp
 ) : Dialog(context, R.style.DialogTheme) {
 
     override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/sw/inbound/dialog/GoodsStoreDialog.kt b/app/src/main/java/com/sw/inbound/dialog/GoodsStoreDialog.kt
index 634e5ec..a279467 100644
--- a/app/src/main/java/com/sw/inbound/dialog/GoodsStoreDialog.kt
+++ b/app/src/main/java/com/sw/inbound/dialog/GoodsStoreDialog.kt
@@ -10,12 +10,16 @@ import android.text.style.StyleSpan
 import android.view.LayoutInflater
 import android.view.View
 import android.widget.EditText
+import android.widget.FrameLayout
+import android.widget.LinearLayout
 import androidx.camera.view.PreviewView
 import androidx.core.graphics.toColorInt
+import androidx.core.view.updateLayoutParams
 import androidx.core.widget.addTextChangedListener
 import coil.load
 import com.shuwei.intelligent.shelves.utils.ext.appendText
 import com.shuwei.intelligent.shelves.utils.ext.buildSpannableString
+import com.sw.inbound.R
 import com.sw.inbound.activity.GoodsListActivity
 import com.sw.inbound.databinding.DialogGoodsStoreBinding
 import com.sw.inbound.databinding.LayoutImagePreviewBinding
@@ -359,13 +363,15 @@ class GoodsStoreDialog(
 
     override fun show() {
         super.show()
-        takePhotoBinding?.let {
-            cameraUtils.setPreviewController(previewView)
-            cameraUtils.bind()
-            it.llCameraFlag.run {
-                postDelayed({
-                    gone()
-                }, 1000)
+        if (funcType == 1) {
+            takePhotoBinding?.let {
+                cameraUtils.setPreviewController(previewView)
+                cameraUtils.bind()
+                it.llCameraFlag.run {
+                    postDelayed({
+                        gone()
+                    }, 1000)
+                }
             }
         }
     }
@@ -410,6 +416,14 @@ class GoodsStoreDialog(
         //只显示原始图片
         imagePreviewBinding = LayoutImagePreviewBinding.inflate(inflater, binding.flContainer)
         imagePreviewBinding?.imageView?.load(goods.relativeUrl)
+        binding.flContainer.let {
+            it.setBackgroundResource(R.drawable.bg_white_radius10_stroke2)
+            it.updateLayoutParams<LinearLayout.LayoutParams> {
+                width = 488.dp
+                height = 356.dp
+                bottomMargin = 35.dp
+            }
+        }
     }
 
     private var box: Box<Food>? = null
diff --git a/app/src/main/res/layout/dialog_goods_store.xml b/app/src/main/res/layout/dialog_goods_store.xml
index 763fa8a..ac11f0a 100644
--- a/app/src/main/res/layout/dialog_goods_store.xml
+++ b/app/src/main/res/layout/dialog_goods_store.xml
@@ -302,7 +302,7 @@
 
             <FrameLayout
                 android:id="@+id/flContainer"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="15dp"/>
 <!--            android:padding="2dp"-->