优化

app/src/main/java/com/sw/inbound/dialog/BaseDialog.kt

@@ -16,7 +16,8 @@ import com.sw.inbound.utils.ext.hideKeyboard
 abstract class BaseDialog(
     context: Context,
     var defWidth: Int = 1500.dp,
-    var defHeight: Int = 900.dp
+//    var defHeight: Int = 900.dp
+    var defHeight: Int = 750.dp
 ) : Dialog(context, R.style.DialogTheme) {
 
     override fun onCreate(savedInstanceState: Bundle?) {

app/src/main/java/com/sw/inbound/dialog/GoodsRecognizeDialog.kt

@@ -90,7 +90,7 @@ class GoodsRecognizeDialog(
 //        }
         binding.ivClose.setOnClickListener {
             dismiss()
-            activity?.delayRecognizeFood()
+//            activity?.delayRecognizeFood()
             //activity?.startTime = System.currentTimeMillis()
         }
         binding.btnManuallyFind.setOnClickListener {

app/src/main/java/com/sw/inbound/dialog/GoodsStoreDialog.kt

@@ -37,6 +37,8 @@ import com.sw.inbound.utils.CameraUtils
 import com.sw.inbound.utils.ImageUtil
 import com.sw.inbound.utils.ext.dp
 import com.sw.inbound.utils.ext.gone
+import com.sw.inbound.utils.ext.hideKeyboard
+import com.sw.inbound.utils.ext.invisible
 import com.sw.inbound.utils.ext.roundedDecimalPlace
 import com.sw.inbound.utils.ext.toast
 import com.sw.inbound.utils.ext.visible
@@ -103,6 +105,7 @@ class GoodsStoreDialog(
 //            AddProcurementUnitDialog(context).show()
 //        }
         binding.flUnitDropdown.setOnClickListener { v ->
+            v.hideKeyboard()
             if (dropdownPopup == null) {
                 dropdownPopup = DropdownPopup(
                     context = context,
@@ -111,6 +114,7 @@ class GoodsStoreDialog(
                     popHeight = min(dropdownList.size, 4) * 71.dp
                 ) { dictType ->
                     try {
+                        v.hideKeyboard()
                         binding.tvProcurementUnit.run {
                             text = dictType.value
                             tag = dictType.id
@@ -164,8 +168,8 @@ class GoodsStoreDialog(
         addPriceInputListener(binding.etProcurementAmount) {
             val countText = binding.etProcurementCount.text.trim().toString()
             val count = if (countText.isNotBlank()) countText.toDouble() else 0.toDouble()
-            if (count == 0.toDouble()) {
-                //context.toast("入库数量不能为0")
+            if (count == 0.toDouble() || it == (-1).toDouble()) {
+                binding.tvProcurementPrice.text = ""
                 return@addPriceInputListener
             }
             val price = (it / count).roundedDecimalPlace(2)
@@ -198,6 +202,11 @@ class GoodsStoreDialog(
                 }
             })
         }
+        binding.tvProcurementPrice.addTextChangedListener {
+            binding.tvPriceUnit.run {
+                if (it.isNullOrBlank()) invisible() else visible()
+            }
+        }
         addWeightListener()
     }
 
@@ -239,6 +248,7 @@ class GoodsStoreDialog(
             addTextChangedListener(onTextChanged = { it, _, _, _ ->
                 try {
                     if (it.isNullOrBlank()) {
+                        action((-1).toDouble())
                         return@addTextChangedListener
                     }
                     val input = it.toString()