From 0967bf1e1bb75c95f572ab7644031fdccef7d281 Mon Sep 17 00:00:00 2001
From: aibingbing <aibingbing@zhidaoauto.com>
Date: Wed, 26 Jul 2023 15:38:58 +0800
Subject: [PATCH] =?UTF-8?q?[Sweeper=20Cloud]=20feat:=20=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E5=A4=A7=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81=20=E7=BB=93?=
 =?UTF-8?q?=E6=9D=9F=E6=97=B6=E5=A2=9E=E5=8A=A0isPop=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=9D=A5=E6=8E=A7=E5=88=B6=E6=98=AF=E5=90=A6=E5=BC=B9=E6=A1=86?=
 =?UTF-8?q?=EF=BC=9B=20fix=EF=BC=9A=E4=B8=8B=E5=8F=91=E4=B8=AD=E6=AD=A2?=
 =?UTF-8?q?=E5=A4=A7=E4=BB=BB=E5=8A=A1=E6=97=B6=EF=BC=8C=E5=8F=AA=E6=98=AF?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E6=8F=90=E7=A4=BA=E5=BC=B9=E6=A1=86=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=20resetTaskpanel()=20;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../callback/ISweeperCloudTaskCallback.kt     |  2 +-
 .../sweepercloud/fragment/SweeperFragment.kt  | 24 +++++++++----------
 .../sweepercloud/model/SweeperTaskModel.java  |  2 +-
 .../presenter/SweeperPresenter.java           |  4 ++--
 .../util/SweeperCloudTaskUtils.kt             |  2 +-
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ISweeperCloudTaskCallback.kt b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ISweeperCloudTaskCallback.kt
index 179b88c41f..d564062e3d 100644
--- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ISweeperCloudTaskCallback.kt
+++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/callback/ISweeperCloudTaskCallback.kt
@@ -52,7 +52,7 @@ interface ISweeperCloudTaskCallback {
     /**
      * 云端同步大任务状态
      */
-    fun onSweeperCloudBigTaskStatus(taskId:String, bigTaskStatus: SweeperCommon.TaskStatus)
+    fun onSweeperCloudBigTaskStatus(taskId:String, bigTaskStatus: SweeperCommon.TaskStatus, isPop:Boolean)
 
     /**
      * 云端同步大任务暂停 / 恢复 指令
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 cc2d4814cd..5f8b22339e 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
@@ -331,7 +331,7 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
     }
 
     /**
-     * 结束任务弹窗处理
+     * 中止任务弹窗处理
      */
     private fun sweeperCloudTaskStopDialog(
         taskId: String,
@@ -345,15 +345,13 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
         if (mDialog != null && mDialog!!.isShowing) {
             return
         }
-        mPresenter?.isHasTaskInfo(false)
-        resetTaskInfoPanel()
 
         if (stopTaskType == SweeperTaskStop.StopTaskType.NORMAL) {
             mDialog = sweeperCloudTaskNormalEndDialog()
             showNotice("任务已结束")
             ToastUtils.showLong("任务已结束")
         } else {
-            // 产品确认有弹框时不需要同步弹toast,只需有TTS
+            // 产品确认有弹框时不需要同步弹toast, 只需有TTS
             mDialog = createSweeperTaskEndDialog(context, object : SweeperCloudDialogClickListener {
                 override fun onConfirm() {
 //                    mPresenter?.sendSweeperStopTaskResp(taskId, SweeperTaskStop.StopTaskCode.MANUAL_CONFIRM)
@@ -374,6 +372,7 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
                 }
 
                 override fun onNext() {
+
                 }
 
             }, stopTaskType, timeoutHintString)
@@ -439,7 +438,7 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
     /**
      * 云端同步大任务状态
      */
-    fun onSweeperCloudBigTaskStatus(taskId: String, bigTaskStatus: SweeperCommon.TaskStatus) {
+    fun onSweeperCloudBigTaskStatus(taskId: String, bigTaskStatus: SweeperCommon.TaskStatus, isPop: Boolean) {
         //隐藏loading
         mLoadingDialog.hideLoading()
         mTaskInfo?.let {
@@ -457,13 +456,14 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
                 if (mDialog != null && mDialog!!.isShowing) {
                     return
                 }
-                mDialog = if (bigTaskStatus == SweeperCommon.TaskStatus.CANCEL
-                    || bigTaskStatus == SweeperCommon.TaskStatus.ABNORMAL
-                )
-                    sweeperCloudTaskExceptionEndDialog(bigTaskStatus == SweeperCommon.TaskStatus.CANCEL)
-                else
-                    sweeperCloudTaskNormalEndDialog()
-                mDialog?.show()
+                if (isPop) {
+                    mDialog = if (bigTaskStatus == SweeperCommon.TaskStatus.CANCEL
+                        || bigTaskStatus == SweeperCommon.TaskStatus.ABNORMAL){
+                        sweeperCloudTaskExceptionEndDialog(bigTaskStatus == SweeperCommon.TaskStatus.CANCEL)}
+                    else
+                        sweeperCloudTaskNormalEndDialog()
+                    mDialog?.show()
+                }
 
                 showNotice("任务已结束")
                 resetTaskInfoPanel()
diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/model/SweeperTaskModel.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/model/SweeperTaskModel.java
index 0bd94c549f..ed362650cb 100644
--- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/model/SweeperTaskModel.java
+++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/model/SweeperTaskModel.java
@@ -405,7 +405,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM
                 "onSweeperFutianCloudBigTaskStatus：" + printMessage(bigTaskStatusPush));
         if (mSweeperTaskCallback != null && bigTaskStatusPush != null) {
             msgTypeAndReqNo.put(messageType.getNumber(), reqNo);
-            mSweeperTaskCallback.onSweeperCloudBigTaskStatus(bigTaskStatusPush.getTaskId(), bigTaskStatusPush.getTaskStatus());
+            mSweeperTaskCallback.onSweeperCloudBigTaskStatus(bigTaskStatusPush.getTaskId(), bigTaskStatusPush.getTaskStatus(), bigTaskStatusPush.getIsPop());
         }
     }
 
diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/presenter/SweeperPresenter.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/presenter/SweeperPresenter.java
index d3a63d6d8f..22a874e2a6 100644
--- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/presenter/SweeperPresenter.java
+++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/presenter/SweeperPresenter.java
@@ -221,8 +221,8 @@ public class SweeperPresenter extends Presenter<SweeperFragment>
     }
 
     @Override
-    public void onSweeperCloudBigTaskStatus(@NonNull String taskId, SweeperCommon.TaskStatus bigTaskStatus) {
-        ThreadUtils.runOnUiThread(() -> mView.onSweeperCloudBigTaskStatus(taskId, bigTaskStatus));
+    public void onSweeperCloudBigTaskStatus(@NonNull String taskId, SweeperCommon.TaskStatus bigTaskStatus, boolean isPop) {
+        ThreadUtils.runOnUiThread(() -> mView.onSweeperCloudBigTaskStatus(taskId, bigTaskStatus, isPop));
     }
 
     @Override
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 bf4adfe76a..2f59cc17cf 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
@@ -283,7 +283,7 @@ object SweeperCloudTaskUtils {
     }
 
     /**
-     * 创建结束任务弹窗
+     * 创建任务中止弹窗
      */
     @JvmStatic
     fun createSweeperTaskEndDialog(