diff --git a/app/src/main/java/com/casic/br/operationsite/view/check/GuardiansActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/check/GuardiansActivity.kt index 32d1b92..e099389 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/check/GuardiansActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/check/GuardiansActivity.kt @@ -114,21 +114,7 @@ }) binding.endTaskButton.setOnClickListener { - AlertControlDialog.Builder().setContext(this).setTitle("温馨提示") - .setMessage("确定结束此次施工?").setNegativeButton("取消").setPositiveButton("确定") - .setOnDialogButtonClickListener(object : - AlertControlDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - constructionCheckViewModel.setCurrentPhase("stop") - -// navigatePageTo() - ActivityStackManager.finishAllActivity() - navigatePageTo() - finish() - } - - override fun onCancelClick() {} - }).build().show() + endOperationTask() } binding.showMapButton.setOnClickListener { @@ -288,7 +274,7 @@ binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { override fun onLeftClick() { - finish() + endOperationTask() } override fun onRightClick() { @@ -297,6 +283,23 @@ }) } + private fun endOperationTask() { + AlertControlDialog.Builder().setContext(this).setTitle("温馨提示") + .setMessage("确定结束此次施工?").setNegativeButton("取消").setPositiveButton("确定") + .setOnDialogButtonClickListener(object : + AlertControlDialog.OnDialogButtonClickListener { + override fun onConfirmClick() { + constructionCheckViewModel.setCurrentPhase("stop") + + ActivityStackManager.finishAllActivity() + navigatePageTo() + finish() + } + + override fun onCancelClick() {} + }).build().show() + } + override fun onDestroy() { super.onDestroy() GSYVideoManager.releaseAllVideos() diff --git a/app/src/main/java/com/casic/br/operationsite/view/check/GuardiansActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/check/GuardiansActivity.kt index 32d1b92..e099389 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/check/GuardiansActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/check/GuardiansActivity.kt @@ -114,21 +114,7 @@ }) binding.endTaskButton.setOnClickListener { - AlertControlDialog.Builder().setContext(this).setTitle("温馨提示") - .setMessage("确定结束此次施工?").setNegativeButton("取消").setPositiveButton("确定") - .setOnDialogButtonClickListener(object : - AlertControlDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - constructionCheckViewModel.setCurrentPhase("stop") - -// navigatePageTo() - ActivityStackManager.finishAllActivity() - navigatePageTo() - finish() - } - - override fun onCancelClick() {} - }).build().show() + endOperationTask() } binding.showMapButton.setOnClickListener { @@ -288,7 +274,7 @@ binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { override fun onLeftClick() { - finish() + endOperationTask() } override fun onRightClick() { @@ -297,6 +283,23 @@ }) } + private fun endOperationTask() { + AlertControlDialog.Builder().setContext(this).setTitle("温馨提示") + .setMessage("确定结束此次施工?").setNegativeButton("取消").setPositiveButton("确定") + .setOnDialogButtonClickListener(object : + AlertControlDialog.OnDialogButtonClickListener { + override fun onConfirmClick() { + constructionCheckViewModel.setCurrentPhase("stop") + + ActivityStackManager.finishAllActivity() + navigatePageTo() + finish() + } + + override fun onCancelClick() {} + }).build().show() + } + override fun onDestroy() { super.onDestroy() GSYVideoManager.releaseAllVideos() diff --git a/app/src/main/java/com/casic/br/operationsite/view/check/SuppliesActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/check/SuppliesActivity.kt index 8949056..bffdc12 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/check/SuppliesActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/check/SuppliesActivity.kt @@ -95,6 +95,25 @@ imageAdapter.notifyDataSetChanged() } }) + + binding.skipSuppliesCheckButton.setOnClickListener { + AlertControlDialog.Builder() + .setContext(this) + .setTitle("温馨提示") + .setMessage("请确认施工前劳保用品是否已经准备完毕?") + .setNegativeButton("取消") + .setPositiveButton("确定") + .setOnDialogButtonClickListener(object : + AlertControlDialog.OnDialogButtonClickListener { + override fun onConfirmClick() { + navigatePageTo() + } + + override fun onCancelClick() { + + } + }).build().show() + } } private val startVideoLauncher = registerForActivityResult( @@ -214,7 +233,9 @@ navigatePageTo() } - override fun onCancelClick() {} + override fun onCancelClick() { + binding.skipSuppliesCheckButton.visibility = View.VISIBLE + } }).build().show() } } diff --git a/app/src/main/java/com/casic/br/operationsite/view/check/GuardiansActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/check/GuardiansActivity.kt index 32d1b92..e099389 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/check/GuardiansActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/check/GuardiansActivity.kt @@ -114,21 +114,7 @@ }) binding.endTaskButton.setOnClickListener { - AlertControlDialog.Builder().setContext(this).setTitle("温馨提示") - .setMessage("确定结束此次施工?").setNegativeButton("取消").setPositiveButton("确定") - .setOnDialogButtonClickListener(object : - AlertControlDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - constructionCheckViewModel.setCurrentPhase("stop") - -// navigatePageTo() - ActivityStackManager.finishAllActivity() - navigatePageTo() - finish() - } - - override fun onCancelClick() {} - }).build().show() + endOperationTask() } binding.showMapButton.setOnClickListener { @@ -288,7 +274,7 @@ binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { override fun onLeftClick() { - finish() + endOperationTask() } override fun onRightClick() { @@ -297,6 +283,23 @@ }) } + private fun endOperationTask() { + AlertControlDialog.Builder().setContext(this).setTitle("温馨提示") + .setMessage("确定结束此次施工?").setNegativeButton("取消").setPositiveButton("确定") + .setOnDialogButtonClickListener(object : + AlertControlDialog.OnDialogButtonClickListener { + override fun onConfirmClick() { + constructionCheckViewModel.setCurrentPhase("stop") + + ActivityStackManager.finishAllActivity() + navigatePageTo() + finish() + } + + override fun onCancelClick() {} + }).build().show() + } + override fun onDestroy() { super.onDestroy() GSYVideoManager.releaseAllVideos() diff --git a/app/src/main/java/com/casic/br/operationsite/view/check/SuppliesActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/check/SuppliesActivity.kt index 8949056..bffdc12 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/check/SuppliesActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/check/SuppliesActivity.kt @@ -95,6 +95,25 @@ imageAdapter.notifyDataSetChanged() } }) + + binding.skipSuppliesCheckButton.setOnClickListener { + AlertControlDialog.Builder() + .setContext(this) + .setTitle("温馨提示") + .setMessage("请确认施工前劳保用品是否已经准备完毕?") + .setNegativeButton("取消") + .setPositiveButton("确定") + .setOnDialogButtonClickListener(object : + AlertControlDialog.OnDialogButtonClickListener { + override fun onConfirmClick() { + navigatePageTo() + } + + override fun onCancelClick() { + + } + }).build().show() + } } private val startVideoLauncher = registerForActivityResult( @@ -214,7 +233,9 @@ navigatePageTo() } - override fun onCancelClick() {} + override fun onCancelClick() { + binding.skipSuppliesCheckButton.visibility = View.VISIBLE + } }).build().show() } } diff --git a/app/src/main/res/layout/activity_supplies.xml b/app/src/main/res/layout/activity_supplies.xml index 84ce250..4ab8bc9 100644 --- a/app/src/main/res/layout/activity_supplies.xml +++ b/app/src/main/res/layout/activity_supplies.xml @@ -67,5 +67,15 @@ android:layout_weight="1" app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" app:spanCount="3" /> + +