From 2caaaa31357d7bb51a3a5391ceff9cc429863cb0 Mon Sep 17 00:00:00 2001
From: aibingbing <aibingbing@zhidaoauto.com>
Date: Tue, 16 May 2023 16:16:29 +0800
Subject: [PATCH] =?UTF-8?q?[sweeper-cloud]=20feat:=20=E5=A2=9E=E5=8A=A0=20?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=BD=93=E5=89=8D=E4=BB=BB=E5=8A=A1=20?=
 =?UTF-8?q?=E4=BA=91=E6=8E=A7=E6=8E=A5=E5=8F=A3mock=20;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fragment/BaseSweeperTabFragment.java       |  4 ++++
 .../sweepercloud/model/SweeperTaskModel.java   |  7 ++++---
 .../sweepercloud/util/SweeperCloudTaskUtils.kt |  8 ++++++++
 .../main/res/layout/sweeper_base_fragment.xml  | 18 ++++++++++++++----
 4 files changed, 30 insertions(+), 7 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 0f493d7d2b..498efa56b5 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
@@ -118,6 +118,10 @@ public abstract class BaseSweeperTabFragment<V extends IView, P extends Presente
         setMessageBox();
         //设置左下角四个按钮监听事件
         setBottomBtnListener();
+        // 模拟 查询当前任务
+        findViewById(R.id.btnQueryCurrentTask).setOnClickListener(view ->
+               SweeperCloudTaskUtils.mockQueryCurrentTaskInfo()
+        );
         // 模拟 云端发送任务
         findViewById(R.id.btnSendTask).setOnClickListener(view ->
                 mockSendCloudTaskInfo()
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 f0afe7818e..3151da5159 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
@@ -300,6 +300,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM
     @Override
     public void onSweeperFutianCloudTask(@NonNull SweeperCloudTask.MessageType messageType, String reqNo, long sysTime,
                                          SweeperTask.TaskInfo taskInfo) {
+
         if (taskInfo != null) {
             CallerLogger.INSTANCE.d(M_SWEEPER + TAG,
                     "onSweeperFutianCloudTask：" + printMessage(taskInfo) + "mSweeperTaskCallback：" + mSweeperTaskCallback);
@@ -461,9 +462,9 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM
         CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "getCurrentTask:" + printMessage(getTaskReq) + " reqNo:" + reqNo);
         getAutoPilotControlManager().sendSweeperGetTaskReq(reqNo, getTaskReq);
         // TODO: 2023/5/5 模拟云控获取任务
-        UiThreadHandler.postDelayed(() -> {
-            SweeperCloudTaskUtils.mockSendCloudTaskInfo(SweeperCloudTask.MessageType.PadSendGetTaskReq);
-        }, 1000);
+//        UiThreadHandler.postDelayed(() -> {
+//            SweeperCloudTaskUtils.mockSendCloudTaskInfo(SweeperCloudTask.MessageType.PadSendGetTaskReq);
+//        }, 1000);
 
     }
 
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 b929c977da..d7fbcb046c 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
@@ -22,6 +22,14 @@ import com.zhjt.mogo.adas.data.sweeper.task.stop.SweeperTaskStop
 object SweeperCloudTaskUtils {
     const val TAG = "SweeperCloudTaskUtils"
 
+    /**
+     * 模拟发送查询当前任务的请求
+     */
+    @JvmStatic
+    fun mockQueryCurrentTaskInfo() {
+        SweeperTaskModel.getInstance().getCurrentTask()
+    }
+
     /**
      * 模拟云控发送任务给pad
      */
diff --git a/OCH/sweeper/sweeper-cloud/src/main/res/layout/sweeper_base_fragment.xml b/OCH/sweeper/sweeper-cloud/src/main/res/layout/sweeper_base_fragment.xml
index ab9eac8b72..e2ca50b4fd 100644
--- a/OCH/sweeper/sweeper-cloud/src/main/res/layout/sweeper_base_fragment.xml
+++ b/OCH/sweeper/sweeper-cloud/src/main/res/layout/sweeper_base_fragment.xml
@@ -196,16 +196,26 @@
         tools:visibility="visible" />
 
     <Button
-        android:id="@+id/btnSendTask"
+        android:id="@+id/btnQueryCurrentTask"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/dp_200"
-        android:background="#f00"
-        android:text="发送任务"
+        android:background="#f80"
+        android:text="查询当前任务"
         android:textSize="30sp"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <Button
+        android:id="@+id/btnSendTask"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="#f00"
+        android:text="发送任务"
+        android:textSize="30sp"
+        app:layout_constraintRight_toRightOf="@+id/btnQueryCurrentTask"
+        app:layout_constraintTop_toBottomOf="@+id/btnQueryCurrentTask" />
+
     <Button
         android:id="@+id/btnSendSubTaskConfirm"
         android:layout_width="wrap_content"
@@ -253,7 +263,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:visibility="gone"
-        app:constraint_referenced_ids="btnSendTask,btnSendSubTaskConfirm,btnSendEndTask
+        app:constraint_referenced_ids="btnQueryCurrentTask,btnSendTask,btnSendSubTaskConfirm,btnSendEndTask
         ,btnSendSubtaskStatus,btnSendTaskStatus"
         tools:visibility="visible" />