From 306f6a17c090cb4c08e0d17523661b19bb2ec5d6 Mon Sep 17 00:00:00 2001
From: aibingbing <aibingbing@zhidaoauto.com>
Date: Thu, 20 Jul 2023 16:03:33 +0800
Subject: [PATCH] =?UTF-8?q?[Sweeper-cloud]=20refactor:=20=E5=A4=A7?=
 =?UTF-8?q?=E5=B0=8F=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81=E6=9E=9A=E4=B8=BE?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=EF=BC=9B=E4=B8=9A=E5=8A=A1=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=BB=93=E6=9D=9F/=E6=9A=82=E5=81=9C=20?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=90=8C=E6=AD=A5=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../callback/ISweeperCloudTaskCallback.kt     |  2 +-
 .../sweepercloud/fragment/SweeperFragment.kt  | 36 ++++++++++---------
 .../presenter/SweeperPresenter.java           |  2 +-
 3 files changed, 22 insertions(+), 18 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 4fb6c26c85..b39f3a8923 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
@@ -50,7 +50,7 @@ interface ISweeperCloudTaskCallback {
     /**
      * 云端同步大任务状态
      */
-    fun onSweeperCloudBigTaskStatus(taskId:String, bigTaskStatus: SweeperBigTaskStatus.BigTaskStatus)
+    fun onSweeperCloudBigTaskStatus(taskId:String, bigTaskStatus: SweeperCommon.TaskStatus)
     /**
      * 设置轨迹坐标点集合
      */
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 3bb836cdc9..5724914e47 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
@@ -194,7 +194,6 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
             getCurrentTaskView().setData(taskInfo, getCurrentRunningSubTaskPosition())
             setShowCurrentTaskPanelView(true)
             addTaskData()
-
             mPresenter?.isHasTaskInfo(true)
         } else {//云端下发的大任务信息需要弹窗提示（V3.2.0开始不需要安全员确认接取任务，只能默认接收）
             //是否需要弹窗确认
@@ -292,11 +291,12 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
         mPresenter?.isHasTaskInfo(false)
         resetTaskInfoPanel()
 
-        ToastUtils.showLong("任务已结束")
         if (stopTaskType == SweeperTaskStop.StopTaskType.NORMAL) {
             mDialog = sweeperCloudTaskNormalEndDialog()
             showNotice("任务已结束")
+            ToastUtils.showLong("任务已结束")
         } else {
+            // 产品确认有弹框时不需要同步弹toast,只需有TTS
             mDialog = createSweeperTaskEndDialog(context, object : SweeperCloudDialogClickListener {
                 override fun onConfirm() {
 //                    mPresenter?.sendSweeperStopTaskResp(taskId, SweeperTaskStop.StopTaskCode.MANUAL_CONFIRM)
@@ -355,8 +355,8 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
     private fun sweeperCloudTaskExceptionEndDialog(isCancel: Boolean): SweeperCloudDialog? {
         return createSweeperTaskExceptionEndDialog(context, object : SweeperCloudDialogClickListener {
             override fun onConfirm() {
-                ToastUtils.showLong("任务已结束")
-                resetTaskInfoPanel()
+//                ToastUtils.showLong("任务已结束")
+//                resetTaskInfoPanel()
             }
 
             override fun onRefuseOrEnd() {
@@ -364,8 +364,8 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
             }
 
             override fun onCountDownStop() {
-                ToastUtils.showLong("任务已结束")
-                resetTaskInfoPanel()
+//                ToastUtils.showLong("任务已结束")
+//                resetTaskInfoPanel()
             }
 
             override fun onNext() {
@@ -378,7 +378,7 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
     /**
      * 云端同步大任务状态
      */
-    fun onSweeperCloudBigTaskStatus(taskId: String, bigTaskStatus: SweeperBigTaskStatus.BigTaskStatus) {
+    fun onSweeperCloudBigTaskStatus(taskId: String, bigTaskStatus: SweeperCommon.TaskStatus) {
         //隐藏loading
         mLoadingDialog.hideLoading()
         mTaskInfo?.let {
@@ -386,24 +386,28 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
             if (it.taskId != taskId) {
                 return
             }
-            //大任务处于取消状态 异常状态pad端都显示无任务列表
-            if (bigTaskStatus == SweeperBigTaskStatus.BigTaskStatus.CANCLE
-                || bigTaskStatus == SweeperBigTaskStatus.BigTaskStatus.ABNORMAL
-                || bigTaskStatus == SweeperBigTaskStatus.BigTaskStatus.FINISHED) {
+            //大任务处于取消状态/异常结束/正常结束 时都代表大任务结束了，任务列表切换为无任务列表状态
+            if (bigTaskStatus == SweeperCommon.TaskStatus.CANCEL
+                || bigTaskStatus == SweeperCommon.TaskStatus.ABNORMAL
+                || bigTaskStatus == SweeperCommon.TaskStatus.FINISHED) {
                 mPresenter?.isHasTaskInfo(false)
                 //数据重复导致连续弹窗
                 if (mDialog != null && mDialog!!.isShowing) {
                     return
                 }
-                mDialog = if (bigTaskStatus == SweeperBigTaskStatus.BigTaskStatus.CANCLE
-                               || bigTaskStatus == SweeperBigTaskStatus.BigTaskStatus.ABNORMAL)
-                              sweeperCloudTaskExceptionEndDialog(bigTaskStatus == SweeperBigTaskStatus.BigTaskStatus.CANCLE)
+                mDialog = if (bigTaskStatus == SweeperCommon.TaskStatus.CANCEL
+                               || bigTaskStatus == SweeperCommon.TaskStatus.ABNORMAL)
+                              sweeperCloudTaskExceptionEndDialog(bigTaskStatus == SweeperCommon.TaskStatus.CANCEL)
                           else
                               sweeperCloudTaskNormalEndDialog()
                 mDialog?.show()
-                showNotice("任务已结束")
-            } else if (bigTaskStatus == SweeperBigTaskStatus.BigTaskStatus.SUSPENDED) {// 暂停
 
+                showNotice("任务已结束")
+                resetTaskInfoPanel()
+            } else if (bigTaskStatus == SweeperCommon.TaskStatus.SUSPENDED) {// 暂停
+                showNotice("任务已暂停")
+                ToastUtils.showLong("任务已暂停")
+                //更新任务列表中大任务状态
             }
         }
     }
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 c519b12a69..6a2300da90 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
@@ -212,7 +212,7 @@ public class SweeperPresenter extends Presenter<SweeperFragment>
     }
 
     @Override
-    public void onSweeperCloudBigTaskStatus(@NonNull String taskId, SweeperBigTaskStatus.BigTaskStatus bigTaskStatus) {
+    public void onSweeperCloudBigTaskStatus(@NonNull String taskId, SweeperCommon.TaskStatus bigTaskStatus) {
         ThreadUtils.runOnUiThread(() -> mView.onSweeperCloudBigTaskStatus(taskId, bigTaskStatus));
     }