优化

app/src/main/java/com/sw/dualscreen/activity/BaseActivity.kt

@@ -69,39 +69,43 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
     }
 
     open fun registerDataChange() {
-        lifecycleScope.launch {
-            viewModel.showLoading.collect {
-                Timber.d("registerDataChange 用户 showLoading = $it")
-                if (it) {
-                    showWaitingDialog("")
-                } else {
-                    hideWaitingDialog()
-                }
-            }
-        }
+//        lifecycleScope.launch {
+//            viewModel.showLoading.collect {
+//                Timber.d("registerDataChange 用户 showLoading = $it")
+//                if (it) {
+//                    showWaitingDialog("")
+//                } else {
+//                    hideWaitingDialog()
+//                }
+//            }
+//        }
     }
 
     /**
      * 显示等待提示框
      */
-    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).apply {
-            setCancelable(true)
-            setCanceledOnTouchOutside(true)
-            show()
+    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).apply {
+                setCancelable(true)
+                setCanceledOnTouchOutside(true)
+                show()
+            }
         }
-        return mDialogWaiting
     }
 
     /**
      * 隐藏等待提示框
      */
     fun hideWaitingDialog() {
-        mDialogWaiting?.dismiss()
-        mDialogWaiting = null
+        runOnUiThread {
+            mDialogWaiting?.dismiss()
+            mDialogWaiting = null
+        }
     }
 
     fun showWaitingDialog2(tip: String?) {

app/src/main/java/com/sw/dualscreen/activity/fragment/CollectFragment.kt

@@ -103,6 +103,7 @@ class CollectFragment : BaseFragment<FragmentCollectBinding>() {
             val index = foodCollectionList.indexOfFirst { it.imageFile == null }
             if (index == -1) {
                 ToastUtils.showToast("每次只允许保存${MAX_COUNT}条数据")
+                settingActivity?.hideWaitingDialog()
                 rerurn@cameraCallback
             }
             ImageUtil.uriToBitmap(requireActivity(), uri)?.let { bitmap ->
@@ -117,6 +118,7 @@ class CollectFragment : BaseFragment<FragmentCollectBinding>() {
                 } catch (e: Exception) {
                     e.printStackTrace()
                     ToastUtils.showToast("操作失败")
+                    settingActivity?.hideWaitingDialog()
                     return@let
                 }
                 val file = BitmapSaver.saveToAppFilesDir(
@@ -134,10 +136,12 @@ class CollectFragment : BaseFragment<FragmentCollectBinding>() {
                 if (bitmap.isRecycled.not()) {
                     bitmap.recycle()
                 }
+                settingActivity?.hideWaitingDialog()
             }
         } catch (e: Exception) {
             e.printStackTrace()
-            ToastUtils.showToast("程序异常")
+            settingActivity?.hideWaitingDialog()
+            ToastUtils.showToast("程序异常${e.message}")
         }
     }
 
@@ -148,7 +152,11 @@ class CollectFragment : BaseFragment<FragmentCollectBinding>() {
             ToastUtils.showToast("每次只允许保存${MAX_COUNT}条数据")
             return
         }
-        cameraUtils.takePhoto(cameraCallback)
+        settingActivity?.showWaitingDialog("拍照中……")
+        cameraUtils.takePhoto(cameraCallback) { errMsg ->
+            ToastUtils.showToast(errMsg)
+            settingActivity?.hideWaitingDialog()
+        }
     }
 
     override fun initialize() {