From d694732689d3e668261110e1544c454764d50f5a Mon Sep 17 00:00:00 2001
From: aibingbing <aibingbing@zhidaoauto.com>
Date: Wed, 20 Sep 2023 12:49:25 +0800
Subject: [PATCH] =?UTF-8?q?[6.1.0]=20fix:=20=E4=BF=AE=E5=A4=8DSweeperCloud?=
 =?UTF-8?q?=E7=9A=84=E7=BC=96=E8=AF=91=E9=94=99=E8=AF=AF=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../och/sweepercloud/fragment/BaseSweeperTabFragment.java   | 4 ++--
 .../com/mogo/och/sweepercloud/fragment/SweeperFragment.kt   | 6 +++---
 .../mogo/och/sweepercloud/presenter/SweeperPresenter.java   | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/BaseSweeperTabFragment.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/BaseSweeperTabFragment.java
index b7cdb653fd..360cc70e59 100644
--- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/BaseSweeperTabFragment.java
+++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/BaseSweeperTabFragment.java
@@ -48,7 +48,7 @@ import com.mogo.och.sweepercloud.util.AutopilotModeConfigManager;
 import com.mogo.och.sweepercloud.util.SweeperCloudTaskUtils;
 import com.mogo.och.sweepercloud.view.SweeperTrafficDataView;
 import com.mogo.och.sweepercloud.view.WeltSmallMapView;
-import com.zhjt.mogo.adas.data.sweeper.SweeperCloudTask;
+import com.zhjt.mogo.adas.data.AiCloudTask;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -183,7 +183,7 @@ public abstract class BaseSweeperTabFragment<V extends IView, P extends Presente
         );
         // 模拟 云端发送任务
         findViewById(R.id.btnSendTask).setOnClickListener(view -> {
-                    SweeperCloudTaskUtils.mockSendCloudTaskInfo(SweeperCloudTask.MessageType.CloudPushTask);
+                    SweeperCloudTaskUtils.mockSendCloudTaskInfo(AiCloudTask.MessageType.CloudPushTask);
                     UiThreadHandler.postDelayed(() -> {
                         debugEndSubTask();
                     }, 5000);
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 361c88dcbe..a1449db700 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
@@ -34,7 +34,7 @@ import com.mogo.och.sweepercloud.util.SweeperCloudTaskUtils.createSweeperTaskRes
 import com.mogo.och.sweepercloud.util.SweeperCloudTaskUtils.createSweeperTaskSuspendDialog
 import com.mogo.och.sweepercloud.util.SweeperCloudTaskUtils.printMessage
 import com.mogo.och.sweepercloud.view.SweeperCurrentTaskInfoView
-import com.zhjt.mogo.adas.data.sweeper.SweeperCloudTask
+import com.zhjt.mogo.adas.data.AiCloudTask
 import com.zhjt.mogo.adas.data.sweeper.bootable.SweeperBootable
 import com.zhjt.mogo.adas.data.sweeper.common.SweeperCommon
 import com.zhjt.mogo.adas.data.sweeper.common.SweeperCommon.TaskStatus
@@ -204,7 +204,7 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
      * 设置云端任务信息
      */
     fun onSweeperCloudTask(
-        messageType: SweeperCloudTask.MessageType,
+        messageType: AiCloudTask.MessageType,
         taskInfo: SweeperTask.TaskInfo?
     ) {
         this.mTaskInfo = taskInfo
@@ -215,7 +215,7 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
             return
         }
         //主动拉取云端正在执行的任务，有则直接在任务列表展示
-        if (messageType == SweeperCloudTask.MessageType.PadSendGetTaskReq) {
+        if (messageType == AiCloudTask.MessageType.PadSendGetTaskReq) {
             getCurrentTaskView().setData(taskInfo, getCurrentRunningSubTaskPosition())
             setShowCurrentTaskPanelView(true)
             addTaskData()
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 5c8cf98409..1e4b15569d 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
@@ -17,7 +17,7 @@ import com.mogo.och.sweepercloud.callback.ISweeperTaskRouteCallback;
 import com.mogo.och.sweepercloud.database.bean.WeltDataBean;
 import com.mogo.och.sweepercloud.fragment.SweeperFragment;
 import com.mogo.och.sweepercloud.model.SweeperTaskModel;
-import com.zhjt.mogo.adas.data.sweeper.SweeperCloudTask;
+import com.zhjt.mogo.adas.data.AiCloudTask;
 import com.zhjt.mogo.adas.data.sweeper.bootable.SweeperBootable;
 import com.zhjt.mogo.adas.data.sweeper.common.SweeperCommon;
 import com.zhjt.mogo.adas.data.sweeper.task.SweeperTask;
@@ -190,7 +190,7 @@ public class SweeperPresenter extends Presenter<SweeperFragment>
     }
 
     @Override
-    public void onSweeperCloudTask(@NonNull SweeperCloudTask.MessageType messageType, SweeperTask.TaskInfo taskInfo) {
+    public void onSweeperCloudTask(@NonNull AiCloudTask.MessageType messageType, SweeperTask.TaskInfo taskInfo) {
         ThreadUtils.runOnUiThread(() -> mView.onSweeperCloudTask(messageType, taskInfo));
     }
 
@@ -210,7 +210,7 @@ public class SweeperPresenter extends Presenter<SweeperFragment>
     }
 
     @Override
-    public void onSweeperCloudTaskSuspendResume(@NonNull SweeperCloudTask.MessageType messageType, @NonNull String taskId,
+    public void onSweeperCloudTaskSuspendResume(@NonNull AiCloudTask.MessageType messageType, @NonNull String taskId,
                                                 @NonNull String subTaskId, SweeperCommon.Code code) {
 
     }