diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt index d40dd34..2e588f8 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt @@ -75,6 +75,7 @@ private var checkItemCount = 0 private var checkPassCount = 0 private var troubleCount = 0 + private var isOnStopCheck = false override fun initOnCreate(savedInstanceState: Bundle?) { window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) @@ -160,7 +161,7 @@ timer.schedule(object : TimerTask() { override fun run() { runOnUiThread { - if (!checkItemDialog.isShowing && checkItemLinkedList.isNotEmpty() && !addHiddenTroubleDialog.isShowing) { + if (!checkItemDialog.isShowing && !addHiddenTroubleDialog.isShowing && !isOnStopCheck && checkItemLinkedList.isNotEmpty()) { headItem = checkItemLinkedList.poll()!! checkItemDialog.updateCheckItemView(headItem.checkItem, object : CheckItemDialog.OnDialogButtonClickListener { @@ -183,8 +184,7 @@ imageFileViewModel.uploadImage(file) } } - } - ).show() + }).show() } } } @@ -195,8 +195,10 @@ addHiddenTroubleDialog.initDialogContentView(object : AddHiddenTroubleDialog.OnDialogButtonClickListener { override fun onConfirmClick( - mainType: DictionaryModel.DataModel, subType: DictionaryModel.DataModel, - troubleName: String, troubleContent: String + mainType: DictionaryModel.DataModel, + subType: DictionaryModel.DataModel, + troubleName: String, + troubleContent: String ) { hiddenTroubleViewModel.addHiddenTrouble( context, @@ -254,12 +256,10 @@ } private fun stopCheck() { - AlertControlDialog.Builder() - .setContext(this) - .setTitle("温馨提示") + isOnStopCheck = true + AlertControlDialog.Builder().setContext(this).setTitle("温馨提示") .setMessage("所有检查均已完成,共${checkPassCount}项通过,存在${troubleCount}项隐患,是否结束检查?") - .setNegativeButton("取消") - .setPositiveButton("结束检查") + .setNegativeButton("取消").setPositiveButton("结束检查") .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { @@ -269,7 +269,7 @@ } override fun onCancelClick() { - + isOnStopCheck = false } }).build().show() } @@ -364,13 +364,9 @@ override fun handleMessage(msg: Message): Boolean { if (msg.what == 2024082901) { val scene = msg.obj as String - AlertControlDialog.Builder() - .setContext(this) - .setTitle("温馨提示") - .setMessage("识别到${scene}场景,是否开始检查?") - .setNegativeButton("重新识别") - .setPositiveButton("开始检查") - .setOnDialogButtonClickListener(object : + AlertControlDialog.Builder().setContext(this).setTitle("温馨提示") + .setMessage("识别到${scene}场景,是否开始检查?").setNegativeButton("重新识别") + .setPositiveButton("开始检查").setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { //暂停算法