From e81df4f55c9d089cd71d075d2ee61c4c8b1e99b0 Mon Sep 17 00:00:00 2001
From: mazengfei <331023091@qq.com>
Date: Wed, 13 May 2026 09:55:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/sw/inbound/dialog/GoodsStoreDialog.kt | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

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 43abf9b..07a510b 100644
--- a/app/src/main/java/com/sw/inbound/dialog/GoodsStoreDialog.kt
+++ b/app/src/main/java/com/sw/inbound/dialog/GoodsStoreDialog.kt
@@ -424,7 +424,7 @@ class GoodsStoreDialog(
 
     override fun show() {
         super.show()
-        if (funcType == 1) {
+//        if (funcType == 1) {
             takePhotoBinding?.let {
                 cameraUtils.setPreviewController(previewView)
                 cameraUtils.bind()
@@ -434,7 +434,7 @@ class GoodsStoreDialog(
                     }, 1000)
                 }
             }
-        }
+//        }
         binding.root.postDelayed({
             SensorScaleUtils.startScale()
         }, 2600)
@@ -455,7 +455,7 @@ class GoodsStoreDialog(
     private var imagePreviewBinding: LayoutImagePreviewBinding? = null
     private fun addChildToContainer() {
         val inflater = LayoutInflater.from(context)
-        if (funcType == 1) {
+//        if (funcType == 1) {
             //预览及拍照
             takePhotoBinding = LayoutTakePhotoBinding.inflate(inflater, binding.flContainer, true)
             activity?.unBindCamera()
@@ -466,7 +466,7 @@ class GoodsStoreDialog(
             takePhotoBinding?.let {
                 previewView = it.previewView
                 it.flCameraPreview.visible()
-                it.cvImageBg.gone()
+//                it.cvImageBg.gone()
 //                it.btnStartPreview.setOnClickListener { _ ->
 //                    it.cvImageBg.gone()
 //                    it.flCameraPreview.visible()
@@ -475,19 +475,19 @@ class GoodsStoreDialog(
 //                    cameraUtils.takePhoto(takePhotoCallback)
 //                }
             }
-            return
-        }
-        //只显示原始图片
-        imagePreviewBinding = LayoutImagePreviewBinding.inflate(inflater, binding.flContainer)
-        imagePreviewBinding?.imageView?.load(goods.relativeUrl) {
-            transformations(RoundedCornersTransformation(radius = 10.dp.toFloat()))
-        }
-        binding.flContainer.let {
-            it.setBackgroundResource(R.drawable.bg_white_radius10_stroke2)
-            it.updateLayoutParams<LinearLayout.LayoutParams> {
-                width = 488.dp
-                height = 356.dp
-                bottomMargin = 35.dp
+         if(funcType != 1){
+            //只显示原始图片
+            imagePreviewBinding = LayoutImagePreviewBinding.inflate(inflater, binding.flContainer)
+            imagePreviewBinding?.imageView?.load(goods.relativeUrl) {
+                transformations(RoundedCornersTransformation(radius = 10.dp.toFloat()))
+            }
+            binding.flContainer.let {
+                it.setBackgroundResource(R.drawable.bg_white_radius10_stroke2)
+                it.updateLayoutParams<LinearLayout.LayoutParams> {
+                    width = 488.dp
+                    height = 356.dp
+                    bottomMargin = 35.dp
+                }
             }
         }
     }