提交入库参数、采集数据优化

app/src/main/java/com/sw/inbound/activity/FoodCollectionActivity.kt

@@ -249,6 +249,7 @@ class FoodCollectionActivity : ComponentActivity() {
             toast("每次只允许保存${MAX_COUNT}条数据")
             return
         }
+        showWaitingDialog2("加载中")
         cameraUtils.takePhoto(cameraCallback)
     }
 
@@ -287,6 +288,7 @@ class FoodCollectionActivity : ComponentActivity() {
         val index = collectList.indexOfFirst { it.imageFile == null }
         if (index == -1) {
             toast("每次只允许保存${MAX_COUNT}条数据")
+            showWaitingDialog2("加载中")
             rerurn@ cameraCallback
         }
 //        toast("index=$index")
@@ -302,6 +304,7 @@ class FoodCollectionActivity : ComponentActivity() {
                     FoodModule.bitmap2FloatArray(cropBitmap, false)
                 } catch (e: Exception) {
                     e.printStackTrace()
+                    hideWaitingDialog()
                     toast("操作失败")
                     return@let
                 }
@@ -309,6 +312,7 @@ class FoodCollectionActivity : ComponentActivity() {
                 val filterList =
                     foodList.filter { it.score < FoodModule.BAG_RATE && it.name.contains("黑袋子") }
                 if (filterList.isNotEmpty()) {
+                    hideWaitingDialog()
                     toast("当前物品可能被袋子遮挡，请检查后重试")
                     return@let
                 }
@@ -333,9 +337,11 @@ class FoodCollectionActivity : ComponentActivity() {
                 if (bitmap.isRecycled.not()) {
                     bitmap.recycle()
                 }
+                hideWaitingDialog()
             }
         } catch (e: Exception) {
             e.printStackTrace()
+            hideWaitingDialog()
             toast("程序异常${e.message}")
         }
     }
@@ -549,35 +555,40 @@ class FoodCollectionActivity : ComponentActivity() {
     /**
      * 显示等待提示框
      */
-    fun showWaitingDialog(tip: String?): Dialog? {
-        hideWaitingDialog()
-        val view = View.inflate(this, R.layout.dialog_waiting, null)
-        if (!TextUtils.isEmpty(tip)) (view.findViewById<View?>(R.id.tvTip) as TextView).text = tip
-        mDialogWaiting = CustomDialog(this, view, R.style.MyDialog)
-        mDialogWaiting!!.show()
-        mDialogWaiting!!.setCancelable(true)
-        return mDialogWaiting
+    fun showWaitingDialog(tip: String?) {
+        runOnUiThread {
+            hideWaitingDialog()
+            val view = View.inflate(this, R.layout.dialog_waiting, null)
+            if (!TextUtils.isEmpty(tip)) (view.findViewById<View?>(R.id.tvTip) as TextView).text = tip
+            mDialogWaiting = CustomDialog(this, view, R.style.MyDialog)
+            mDialogWaiting!!.show()
+            mDialogWaiting!!.setCancelable(true)
+        }
     }
 
     /**
      * 隐藏等待提示框
      */
     fun hideWaitingDialog() {
-        mDialogWaiting?.dismiss()
-        mDialogWaiting = null
+        runOnUiThread {
+            mDialogWaiting?.dismiss()
+            mDialogWaiting = null
+        }
     }
 
     fun showWaitingDialog2(tip: String?) {
-        if (mDialogWaiting == null) {
-            hideWaitingDialog()
-            val view = View.inflate(this, R.layout.dialog_waiting, null)
-            mDialogWaiting = CustomDialog(this, view, R.style.MyDialog)
-            mDialogWaiting!!.show()
-            mDialogWaiting!!.setCancelable(true)
+        runOnUiThread {
+            if (mDialogWaiting == null) {
+                hideWaitingDialog()
+                val view = View.inflate(this, R.layout.dialog_waiting, null)
+                mDialogWaiting = CustomDialog(this, view, R.style.MyDialog)
+                mDialogWaiting!!.show()
+                mDialogWaiting!!.setCancelable(true)
+            }
+            val contentView = mDialogWaiting?.findViewById<ViewGroup>(android.R.id.content)
+            val tvTip = contentView?.findViewById<TextView>(R.id.tvTip)
+            tvTip?.text = tip
         }
-        val contentView = mDialogWaiting?.findViewById<ViewGroup>(android.R.id.content)
-        val tvTip = contentView?.findViewById<TextView>(R.id.tvTip)
-        tvTip?.text = tip
     }
 
     /**