From b7d8218ad39353edd722f02eef0165173cf1617c Mon Sep 17 00:00:00 2001
From: aibingbing <aibingbing@zhidaoauto.com>
Date: Mon, 12 Jun 2023 17:47:59 +0800
Subject: [PATCH] =?UTF-8?q?[sweeper-cloud]=20fix:=20100009=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=90=8C=E6=AD=A5=E5=A4=A7=E4=BB=BB=E5=8A=A1=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=EF=BC=8C=E5=8F=96=E6=B6=88/=E5=BC=82=E5=B8=B8/?=
 =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E7=BB=93=E6=9D=9F=20=E6=97=B6=E5=81=9A?=
 =?UTF-8?q?=E6=96=87=E6=A1=88=E5=8C=BA=E5=88=86=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sweepercloud/fragment/SweeperFragment.kt  | 33 ++++++++++++++++++-
 .../util/SweeperCloudTaskUtils.kt             | 21 ++++++++++++
 2 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/SweeperFragment.kt b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/SweeperFragment.kt
index a59f2c0fd7..1dc67cae43 100644
--- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/SweeperFragment.kt
+++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/SweeperFragment.kt
@@ -22,6 +22,7 @@ import com.mogo.och.sweepercloud.ui.dialog.SweeperCloudLoadingDialog
 import com.mogo.och.sweepercloud.util.SweeperCloudTaskUtils.createConfirmStartSubTaskDialog
 import com.mogo.och.sweepercloud.util.SweeperCloudTaskUtils.createReceivedTaskInfoDialog
 import com.mogo.och.sweepercloud.util.SweeperCloudTaskUtils.createSweeperTaskEndDialog
+import com.mogo.och.sweepercloud.util.SweeperCloudTaskUtils.createSweeperTaskExceptionEndDialog
 import com.mogo.och.sweepercloud.util.SweeperCloudTaskUtils.createSweeperTaskNormalEndDialog
 import com.mogo.och.sweepercloud.util.SweeperCloudTaskUtils.printMessage
 import com.mogo.och.sweepercloud.view.SweeperCurrentTaskInfoView
@@ -338,6 +339,32 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
         })
     }
 
+    /**
+     * 大任务异常结束弹窗（异常 / 取消）
+     */
+    private fun sweeperCloudTaskExceptionEndDialog(isCancel: Boolean): SweeperCloudDialog? {
+        return createSweeperTaskExceptionEndDialog(context, object : SweeperCloudDialogClickListener {
+            override fun onConfirm() {
+                ToastUtils.showLong("任务已结束")
+                resetTaskInfoPanel()
+            }
+
+            override fun onRefuseOrEnd() {
+
+            }
+
+            override fun onCountDownStop() {
+                ToastUtils.showLong("任务已结束")
+                resetTaskInfoPanel()
+            }
+
+            override fun onNext() {
+
+            }
+
+        }, isCancel)
+    }
+
     /**
      * 云端同步大任务状态
      */
@@ -356,7 +383,11 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
                 if (mDialog != null && mDialog!!.isShowing) {
                     return
                 }
-                mDialog = sweeperCloudTaskNormalEndDialog()
+                mDialog = if (subTaskStatus == SweeperBigTaskStatus.BigTaskStatus.CANCLE
+                               || subTaskStatus == SweeperBigTaskStatus.BigTaskStatus.ABNORMAL)
+                              sweeperCloudTaskExceptionEndDialog(subTaskStatus == SweeperBigTaskStatus.BigTaskStatus.CANCLE)
+                          else
+                              sweeperCloudTaskNormalEndDialog()
                 mDialog?.show()
                 showNotice("任务已结束")
             }
diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperCloudTaskUtils.kt b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperCloudTaskUtils.kt
index 25fb456c39..9bcd53b6be 100644
--- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperCloudTaskUtils.kt
+++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperCloudTaskUtils.kt
@@ -337,6 +337,27 @@ object SweeperCloudTaskUtils {
         return context?.let { it1 -> builder.build(it1) }
     }
 
+    /**
+     * 任务异常结束弹窗 （异常 / 取消）
+     */
+    @JvmStatic
+    fun createSweeperTaskExceptionEndDialog(
+        context: Context?,
+        listener: SweeperCloudDialogClickListener?,
+        isCancel: Boolean
+    ): SweeperCloudDialog? {
+        var builder: SweeperCloudDialog.Builder = SweeperCloudDialog.Builder()
+        builder.titleStr = "任务结束"
+        builder.contentStr = if (isCancel) "任务已取消！" else "任务已异常结束！"
+        builder.tipStr = ""
+        builder.leftStr = "确认"
+        builder.middleStr = ""
+        builder.rightStr = ""
+        builder.countDownTime = 10
+        builder.listener = listener
+        return context?.let { it1 -> builder.build(it1) }
+    }
+
     @JvmStatic
     fun printMessage(message: MessageOrBuilder): String {
         return "\n"+TextFormat.printer().escapingNonAscii(false).printToString(message)