From d1e4df16d14b1fe06997b2270814592007adbaf5 Mon Sep 17 00:00:00 2001
From: bxb <baixiaobing@zhidaoauto.com>
Date: Wed, 17 May 2023 15:26:06 +0800
Subject: [PATCH] =?UTF-8?q?[sweeper-cloud]=E6=A8=A1=E6=8B=9F=E4=BA=91?=
 =?UTF-8?q?=E6=8E=A7=E5=A4=A7=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81=E6=B5=81?=
 =?UTF-8?q?=E8=BD=AC=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sweepercloud/fragment/SweeperFragment.kt  | 45 +++++++++----------
 .../util/SweeperCloudTaskUtils.kt             |  2 +-
 2 files changed, 21 insertions(+), 26 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 c1abd55103..dc97d85451 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
@@ -53,7 +53,7 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
     private var mSubTaskType: TaskModel = TaskModel.DEFAULT_MODEL //1:自动驾驶子任务 2：人工驾驶子任务 -1:未知任务类型
     private var mCurrentSubTaskInfo: SubTaskInfo? = null//当前正在执行的子任务
     private val mLoadingDialog: SweeperCloudLoadingDialog by lazy { SweeperCloudLoadingDialog(requireContext()) }
-    private var mDialog:SweeperCloudDialog?=null
+    private var mDialog: SweeperCloudDialog? = null
 
     override fun getTagName(): String {
         return "SweepersFragment"
@@ -111,7 +111,7 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
         getCurrentView().getAutoBtn().setOnClickListener {
             //前置条件 (1)必须处于人工驾驶状态 （2）必须有正在执行的子任务，且子任务类型为自动驾驶子任务 才能请求云端进入自驾
             mCurrentSubTaskInfo?.let {
-                if (mPresenter?.autopilotState == STATUS_AUTOPILOT_ENABLE&&it.taskModel==TaskModel.AUTO) {
+                if (mPresenter?.autopilotState == STATUS_AUTOPILOT_ENABLE && it.taskModel == TaskModel.AUTO) {
                     mLoadingDialog.showLoading()
                     mPresenter?.sendSweeperAutopilotBootable(mTaskInfo?.taskId, it.subTaskId, it.lineId.toLong())
                 }
@@ -243,7 +243,7 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
             }
             val timeout: String = getTimeSpent(it.taskEndTime)
             //数据重复导致连续弹窗
-            if (mDialog!=null&& mDialog!!.isShowing){
+            if (mDialog != null && mDialog!!.isShowing) {
                 return
             }
             if (stopTaskType == SweeperTaskStop.StopTaskType.NORMAL) {
@@ -253,19 +253,19 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
                     override fun onConfirm() {
                         mPresenter?.sendSweeperStopTaskResp(taskId, SweeperTaskStop.StopTaskCode.MANUAL_CONFIRM)
                         mLoadingDialog.showLoading()
-                        ToastUtils.showLong("确认")
+                        //ToastUtils.showLong("确认")
                     }
 
                     override fun onRefuseOrEnd() {
                         mPresenter?.sendSweeperStopTaskResp(taskId, SweeperTaskStop.StopTaskCode.MANUAL_REFUSE)
                         mLoadingDialog.showLoading()
-                        ToastUtils.showLong("拒绝")
+                        //ToastUtils.showLong("拒绝")
                     }
 
                     override fun onCountDownStop() {
                         mPresenter?.sendSweeperStopTaskResp(taskId, SweeperTaskStop.StopTaskCode.OVER_TIME)
                         mLoadingDialog.showLoading()
-                        ToastUtils.showLong("倒计时")
+                        //ToastUtils.showLong("倒计时")
                     }
 
                     override fun onNext() {
@@ -315,19 +315,14 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
             if (it.taskId != taskId) {
                 return
             }
-            //大任务正常结束
-            if (subTaskStatus == SweeperBigTaskStatus.BigTaskStatus.FINISHED) {
+            //大任务处于取消状态 异常状态pad端都显示无任务列表
+            if (subTaskStatus == SweeperBigTaskStatus.BigTaskStatus.CANCLE || subTaskStatus == SweeperBigTaskStatus.BigTaskStatus.ABNORMAL || subTaskStatus == SweeperBigTaskStatus.BigTaskStatus.FINISHED) {
                 //数据重复导致连续弹窗
-                if (mDialog!=null&& mDialog!!.isShowing){
+                if (mDialog != null && mDialog!!.isShowing) {
                     return
                 }
-                mDialog=sweeperCloudTaskNormalEndDialog()
+                mDialog = sweeperCloudTaskNormalEndDialog()
                 mDialog?.show()
-                return
-            }
-            //大任务处于取消状态 异常状态pad端都显示无任务列表
-            if (subTaskStatus == SweeperBigTaskStatus.BigTaskStatus.CANCLE || subTaskStatus == SweeperBigTaskStatus.BigTaskStatus.ABNORMAL) {
-                resetTaskInfoPanel()
             }
         }
     }
@@ -338,9 +333,9 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
     fun onSweeperCloudAutopilotBootable(taskId: String, subTaskId: String, isBootableResp: SweeperBootable.IsBootableResp) {
         mLoadingDialog.hideLoading()
         if (isBootableResp.code == SweeperCommon.Code.SUCCEED) {
-            ToastUtils.showLong("请求成功")
+            ToastUtils.showLong("上报云控成功")
         } else {
-            ToastUtils.showLong("请求失败")
+            ToastUtils.showLong("上报云控失败")
         }
     }
 
@@ -432,30 +427,30 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
         val subInfo = bySubTaskIdFindSubTaskInfo(subTaskId)
         subInfo?.let {
             //数据重复导致连续弹窗
-            if (mDialog!=null&& mDialog!!.isShowing){
+            if (mDialog != null && mDialog!!.isShowing) {
                 return
             }
             mDialog = createConfirmStartSubTaskDialog(context, object : SweeperCloudDialogClickListener {
                 override fun onConfirm() {
-                    ToastUtils.showLong("确认")
+                    //ToastUtils.showLong("确认")
                     mPresenter?.sendSweeperTaskConfirmResp(taskId, subTaskId, SweeperTaskConfirm.TaskConfirmCode.MANUAL_CONFIRM)
                     mLoadingDialog.showLoading()
                 }
 
                 override fun onRefuseOrEnd() {
-                    ToastUtils.showLong("结束")
+                    //ToastUtils.showLong("结束")
                     mPresenter?.sendSweeperTaskConfirmResp(taskId, subTaskId, SweeperTaskConfirm.TaskConfirmCode.MANUAL_REFUSE_ALL)
                     mLoadingDialog.showLoading()
                 }
 
                 override fun onCountDownStop() {
-                    ToastUtils.showLong("倒计时结束")
+                    //ToastUtils.showLong("倒计时结束")
                     mPresenter?.sendSweeperTaskConfirmResp(taskId, subTaskId, SweeperTaskConfirm.TaskConfirmCode.OVER_TIME)
                     mLoadingDialog.showLoading()
                 }
 
                 override fun onNext() {
-                    ToastUtils.showLong("下一个")
+                    //ToastUtils.showLong("下一个")
                     mPresenter?.sendSweeperTaskConfirmResp(taskId, subTaskId, SweeperTaskConfirm.TaskConfirmCode.MANUAL_REFUSE_SINGLE)
                     mLoadingDialog.showLoading()
                 }
@@ -472,7 +467,7 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
         mTaskInfo?.let {
             mPresenter?.sendSweeperStartTaskResp(it.taskId, SweeperTask.StartTaskCode.RECEIVED)
             //数据重复导致连续弹窗
-            if (mDialog!=null&& mDialog!!.isShowing){
+            if (mDialog != null && mDialog!!.isShowing) {
                 return
             }
             mDialog = createReceivedTaskInfoDialog(context, object : SweeperCloudDialogClickListener {
@@ -487,14 +482,14 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
 
                 override fun onRefuseOrEnd() {
                     //ToastUtils.showLong("拒绝")
-                    setShowCurrentTaskPanelView(false)
                     mPresenter?.sendSweeperStartTaskResp(it.taskId, SweeperTask.StartTaskCode.MANUAL_REFUSE)
                     mLoadingDialog.showLoading()
+                    resetTaskInfoPanel()
                 }
 
                 override fun onCountDownStop() {
                     //ToastUtils.showLong("倒计时结束")
-                    setShowCurrentTaskPanelView(false)
+                    resetTaskInfoPanel()
                     mPresenter?.sendSweeperStartTaskResp(it.taskId, SweeperTask.StartTaskCode.OVER_TIME)
                     mLoadingDialog.showLoading()
                 }
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 0dfbc0ac38..6d1e0d6bd2 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
@@ -202,7 +202,7 @@ object SweeperCloudTaskUtils {
         val builder = SweeperBigTaskStatus.BigTaskStatusPush.newBuilder()
         builder.sn = getDriverSn()
         builder.taskId = "10"
-        builder.taskStatus = BigTaskStatus.RUNNING
+        builder.taskStatus = BigTaskStatus.FINISHED
         builder.systemTime = System.currentTimeMillis()
         SweeperTaskModel.getInstance().onSweeperFutianCloudBigTaskStatus(
             MessageType.CloudPushBigTaskStatus, "${System.currentTimeMillis()}",