联调优化

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?) {

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

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"-->