From e27c98d930ffaba0959c5a84369cd5e7b039f9e7 Mon Sep 17 00:00:00 2001
From: aibingbing <aibingbing@zhidaoauto.com>
Date: Fri, 28 Jul 2023 22:37:56 +0800
Subject: [PATCH] =?UTF-8?q?[SweeperCloud]=20refactor:=20=E5=A6=82=E6=9E=9C?=
 =?UTF-8?q?=E6=98=AFisPop=3Dtrue,=20=E5=8F=91=E9=80=81=E6=94=B6=E5=88=B0?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=9B=9E=E6=89=A7=E6=BB=9E=E5=90=8E=E5=88=B0?=
 =?UTF-8?q?=E5=BC=B9=E6=A1=86=E5=90=8E=E7=82=B9=E5=87=BB=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=EF=BC=8C=E9=81=BF=E5=85=8D=E4=BA=91=E6=8E=A7=E4=B8=8B=E5=8F=91?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=BF=87=E5=BF=AB=E5=AF=BC=E8=87=B4=E5=BC=B9?=
 =?UTF-8?q?=E6=A1=86=E5=86=B2=E7=AA=81=E5=8F=8A=E4=B8=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sweepercloud/fragment/SweeperFragment.kt  | 104 +++++++++++++-----
 1 file changed, 75 insertions(+), 29 deletions(-)

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 01db091efa..8f1eefa0cb 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
@@ -228,14 +228,14 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
             addTaskData()
             mPresenter?.isHasTaskInfo(true)
 
-            // 默认发送接收到消息的ACK回执
-            mPresenter?.sendSweeperStartTaskResp(
-                taskInfo.taskId,
-                SweeperTask.StartTaskCode.RECEIVED
-            )
-
             if (taskInfo.isPop) {
                 showReceivedBigTaskDialog()
+            } else {
+                // 默认发送接收到消息的ACK回执
+                mPresenter?.sendSweeperStartTaskResp(
+                    taskInfo.taskId,
+                    SweeperTask.StartTaskCode.RECEIVED
+                )
             }
             //设置任务进度
             this.mSubMutableList?.let {
@@ -328,10 +328,12 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
             if (taskId != it.taskId) {
                 return
             }
-            // 发送接收到信息的ACK回执
-            mPresenter?.sendSweeperStopTaskResp(taskId, SweeperTaskStop.StopTaskCode.RECEIVED)
+
             if (isPop) {
                 sweeperCloudTaskStopDialog(taskId, stopTaskType, it)
+            } else {
+                // 发送接收到信息的ACK回执
+                mPresenter?.sendSweeperStopTaskResp(taskId, SweeperTaskStop.StopTaskCode.RECEIVED)
             }
         }
     }
@@ -363,6 +365,8 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
 //                    mPresenter?.sendSweeperStopTaskResp(taskId, SweeperTaskStop.StopTaskCode.MANUAL_CONFIRM)
 //                    mLoadingDialog.showLoading()
 //                    //ToastUtils.showLong("确认")
+                    // 发送接收到信息的ACK回执
+                    mPresenter?.sendSweeperStopTaskResp(taskId, SweeperTaskStop.StopTaskCode.RECEIVED)
                 }
 
                 override fun onRefuseOrEnd() {
@@ -375,6 +379,8 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
 //                    mPresenter?.sendSweeperStopTaskResp(taskId, SweeperTaskStop.StopTaskCode.OVER_TIME)
 //                    mLoadingDialog.showLoading()
 //                    //ToastUtils.showLong("倒计时")
+                    // 发送接收到信息的ACK回执
+                    mPresenter?.sendSweeperStopTaskResp(taskId, SweeperTaskStop.StopTaskCode.RECEIVED)
                 }
 
                 override fun onNext() {
@@ -517,11 +523,6 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
             if (it.taskId != taskId) {
                 return
             }
-            // 发送接收到信息的ACK回执
-            mPresenter?.sendSweeperSuspendResumeTaskResp(
-                taskId,
-                SweeperTaskCloudSuspendResume.Code.RECEIVED
-            )
             if (isPop) {
                 //数据重复导致连续弹窗
                 if (mDialog != null && mDialog!!.isShowing) {
@@ -529,7 +530,7 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
                 }
                 when (actionType) {
                     SweeperTaskCloudSuspendResume.ActionType.SUSPENDED -> {
-                        mDialog = sweeperCloudTaskSuspendDialog()
+                        mDialog = sweeperCloudTaskSuspendDialog(it.taskId)
                         showNotice("云端暂停任务，注意车辆即将停车！")
                     }
 
@@ -553,10 +554,16 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
                             }
                         }
                         showNotice(ttsString)
-                        mDialog = sweeperCloudTaskResumeDialog(ttsString)
+                        mDialog = sweeperCloudTaskResumeDialog(ttsString, it.taskId)
                     }
                 }
                 mDialog?.show()
+            } else {
+                // 发送接收到信息的ACK回执
+                mPresenter?.sendSweeperSuspendResumeTaskResp(
+                    taskId,
+                    SweeperTaskCloudSuspendResume.Code.RECEIVED
+                )
             }
         }
     }
@@ -668,16 +675,17 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
         if (mTaskInfo?.taskId != taskId) return
         val subInfo = getSubTaskInfoBySubId(subTaskId)
         subInfo?.let {
-            // 发送接收到消息的ACK回执
-            mPresenter?.sendSweeperTaskConfirmResp(
-                taskId,
-                subTaskId,
-                SweeperTaskConfirm.TaskConfirmCode.RECEIVED
-            )
             updateSubTaskInfo(taskId, subTaskId, SweeperCommon.TaskStatus.RUNNING)
 
             if (isPop) {
                 showSubTaskConfirmDialog(taskId, subTaskId, it)
+            } else {
+                // 发送接收到消息的ACK回执
+                mPresenter?.sendSweeperTaskConfirmResp(
+                    taskId,
+                    subTaskId,
+                    SweeperTaskConfirm.TaskConfirmCode.RECEIVED
+                )
             }
         }
     }
@@ -705,6 +713,12 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
 //                //mPresenter?.setPreLineId(-1)
 //                updateSubTaskInfo(taskId, subTaskId, SweeperCommon.TaskStatus.RUNNING)
 //                mLoadingDialog.showLoading()
+                    // 发送接收到消息的ACK回执
+                    mPresenter?.sendSweeperTaskConfirmResp(
+                        taskId,
+                        subTaskId,
+                        SweeperTaskConfirm.TaskConfirmCode.RECEIVED
+                    )
                 }
 
                 override fun onRefuseOrEnd() {
@@ -717,6 +731,12 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
 //                //ToastUtils.showLong("倒计时结束")
 //                mPresenter?.sendSweeperTaskConfirmResp(taskId, subTaskId, SweeperTaskConfirm.TaskConfirmCode.OVER_TIME)
 //                mLoadingDialog.showLoading()
+                    // 发送接收到消息的ACK回执
+                    mPresenter?.sendSweeperTaskConfirmResp(
+                        taskId,
+                        subTaskId,
+                        SweeperTaskConfirm.TaskConfirmCode.RECEIVED
+                    )
                 }
 
                 override fun onNext() {
@@ -753,6 +773,11 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
 //                    mLoadingDialog.showLoading()
 //                    addTaskData()
 //                    mPresenter?.isHasTaskInfo(true)
+                        // 默认发送接收到消息的ACK回执
+                        mPresenter?.sendSweeperStartTaskResp(
+                            it.taskId,
+                            SweeperTask.StartTaskCode.RECEIVED
+                        )
                     }
 
                     override fun onRefuseOrEnd() {
@@ -767,6 +792,11 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
 //                    resetTaskInfoPanel()
 //                    mPresenter?.sendSweeperStartTaskResp(it.taskId, SweeperTask.StartTaskCode.OVER_TIME)
 //                    mLoadingDialog.showLoading()
+                        // 默认发送接收到消息的ACK回执
+                        mPresenter?.sendSweeperStartTaskResp(
+                            it.taskId,
+                            SweeperTask.StartTaskCode.RECEIVED
+                        )
                     }
 
                     override fun onNext() {
@@ -781,10 +811,14 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
     /**
      * 大任务暂停弹框
      */
-    private fun sweeperCloudTaskSuspendDialog(): SweeperCloudDialog? {
+    private fun sweeperCloudTaskSuspendDialog(taskId: String): SweeperCloudDialog? {
         return createSweeperTaskSuspendDialog(context, object : SweeperCloudDialogClickListener {
             override fun onConfirm() {
-
+                // 发送接收到信息的ACK回执
+                mPresenter?.sendSweeperSuspendResumeTaskResp(
+                    taskId,
+                    SweeperTaskCloudSuspendResume.Code.RECEIVED
+                )
             }
 
             override fun onRefuseOrEnd() {
@@ -792,7 +826,11 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
             }
 
             override fun onCountDownStop() {
-
+                // 发送接收到信息的ACK回执
+                mPresenter?.sendSweeperSuspendResumeTaskResp(
+                    taskId,
+                    SweeperTaskCloudSuspendResume.Code.RECEIVED
+                )
             }
 
             override fun onNext() {
@@ -804,10 +842,14 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
     /**
      * 大任务恢复弹框
      */
-    private fun sweeperCloudTaskResumeDialog(contentStr: String): SweeperCloudDialog? {
+    private fun sweeperCloudTaskResumeDialog(contentStr: String, taskId: String): SweeperCloudDialog? {
         return createSweeperTaskResumeDialog(context, object : SweeperCloudDialogClickListener {
             override fun onConfirm() {
-
+                // 发送接收到信息的ACK回执
+                mPresenter?.sendSweeperSuspendResumeTaskResp(
+                    taskId,
+                    SweeperTaskCloudSuspendResume.Code.RECEIVED
+                )
             }
 
             override fun onRefuseOrEnd() {
@@ -815,7 +857,11 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
             }
 
             override fun onCountDownStop() {
-
+                // 发送接收到信息的ACK回执
+                mPresenter?.sendSweeperSuspendResumeTaskResp(
+                    taskId,
+                    SweeperTaskCloudSuspendResume.Code.RECEIVED
+                )
             }
 
             override fun onNext() {
@@ -861,7 +907,7 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
         //开启线程执行起终点marker设置
         val setMapMarkerRunnable = Runnable {
             CallerLogger.d(
-                SceneConstant.M_SWEEPER + TAG + "setMapMaker",
+                SceneConstant.M_SWEEPER + "-" +TAG + "-setMapMaker",
                 "threadName=${Thread.currentThread().name}, uuid=$uuid, latitude=$latitude, longitude=$longitude"
             )
 
@@ -898,7 +944,7 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
         //开启线程移除起终点marker设置
         val removeMapMarkerRunnable = Runnable {
             CallerLogger.d(
-                SceneConstant.M_SWEEPER + TAG + "RemoveMapMaker",
+                SceneConstant.M_SWEEPER + "-" +TAG + "-RemoveMapMaker",
                 "threadName=${Thread.currentThread().name}"
             )
             val overlayManager = CallerMapUIServiceManager.getOverlayManager()