From 077b3399561677546c936bd87699a6abca0200ef Mon Sep 17 00:00:00 2001 From: aibingbing Date: Tue, 18 Jul 2023 21:00:12 +0800 Subject: [PATCH] =?UTF-8?q?[Sweeper=20Cloud]=20refactor:=20=E4=BA=91?= =?UTF-8?q?=E6=8E=A7=E6=B5=81=E7=A8=8B=E9=87=8D=E6=9E=84=20&=20=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=BC=98=E5=8C=96=20step=201;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../callback/ISweeperCloudTaskCallback.kt | 2 +- .../sweepercloud/fragment/SweeperFragment.kt | 181 +++++++++--------- .../presenter/SweeperPresenter.java | 4 +- .../util/SweeperCloudTaskUtils.kt | 42 ++-- 4 files changed, 119 insertions(+), 110 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 92fc78aafb..4fb6c26c85 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,subTaskStatus: SweeperBigTaskStatus.BigTaskStatus) + fun onSweeperCloudBigTaskStatus(taskId:String, bigTaskStatus: SweeperBigTaskStatus.BigTaskStatus) /** * 设置轨迹坐标点集合 */ 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 4037a3845d..3bb836cdc9 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 @@ -5,7 +5,6 @@ import android.view.View import androidx.lifecycle.lifecycleScope import chassis.ChassisStatesOuterClass import com.amap.api.maps.model.LatLng -import com.elegant.utils.UiThreadHandler import com.mogo.eagle.core.data.map.MogoLocation import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener.Companion.STATUS_AUTOPILOT_ENABLE import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger @@ -21,7 +20,7 @@ import com.mogo.och.sweepercloud.ui.dialog.SweeperCloudDialog import com.mogo.och.sweepercloud.ui.dialog.SweeperCloudLoadingDialog import com.mogo.och.sweepercloud.util.SweeperCloudTaskUtils import com.mogo.och.sweepercloud.util.SweeperCloudTaskUtils.createConfirmStartSubTaskDialog -import com.mogo.och.sweepercloud.util.SweeperCloudTaskUtils.createReceivedTaskInfoDialog +import com.mogo.och.sweepercloud.util.SweeperCloudTaskUtils.createReceivedBigTaskInfoDialog import com.mogo.och.sweepercloud.util.SweeperCloudTaskUtils.createSweeperTaskEndDialog import com.mogo.och.sweepercloud.util.SweeperCloudTaskUtils.createSweeperTaskExceptionEndDialog import com.mogo.och.sweepercloud.util.SweeperCloudTaskUtils.createSweeperTaskNormalEndDialog @@ -56,7 +55,7 @@ class SweeperFragment : BaseSweeperTabFragment } @Override - public void onSweeperCloudBigTaskStatus(@NonNull String taskId, SweeperBigTaskStatus.BigTaskStatus subTaskStatus) { - ThreadUtils.runOnUiThread(() -> mView.onSweeperCloudBigTaskStatus(taskId, subTaskStatus)); + public void onSweeperCloudBigTaskStatus(@NonNull String taskId, SweeperBigTaskStatus.BigTaskStatus bigTaskStatus) { + ThreadUtils.runOnUiThread(() -> mView.onSweeperCloudBigTaskStatus(taskId, bigTaskStatus)); } @Override 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 515a50bb32..702ac105e2 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 @@ -235,15 +235,15 @@ object SweeperCloudTaskUtils { } /** - * 创建接收任务弹窗 + * 创建接收大任务弹窗 */ @JvmStatic - fun createReceivedTaskInfoDialog(context: Context?, listener: SweeperCloudDialogClickListener?, taskInfo: TaskInfo): SweeperCloudDialog? { + fun createReceivedBigTaskInfoDialog(context: Context?, listener: SweeperCloudDialogClickListener?, taskInfo: TaskInfo): SweeperCloudDialog? { var builder: SweeperCloudDialog.Builder = SweeperCloudDialog.Builder() val startCalendar = DateTimeUtil.formatLongToCalendar(taskInfo.taskStartTime) val endCalendar = DateTimeUtil.formatLongToCalendar(taskInfo.taskEndTime) builder.titleStr = "任务接取" - builder.contentStr = "请确认是否接取${taskInfo.taskName}" + builder.contentStr = "已为您接取任务${taskInfo.taskName}" builder.tipStr = "（任务时间${DateTimeUtil.formatCalendarToString(startCalendar, DateTimeUtil.HH_mm)}-${ DateTimeUtil.formatCalendarToString( endCalendar, @@ -252,8 +252,8 @@ object SweeperCloudTaskUtils { }）" builder.leftStr = "确认" builder.middleStr = "" - builder.rightStr = "拒绝" - builder.countDownTime = 15 + builder.rightStr = "" + builder.countDownTime = 10 builder.listener = listener return context?.let { it1 -> builder.build(it1) } } @@ -268,14 +268,14 @@ object SweeperCloudTaskUtils { subTaskInfo: SubTaskInfo ): SweeperCloudDialog? { var builder: SweeperCloudDialog.Builder = SweeperCloudDialog.Builder() - builder.titleStr = "任务确认" - builder.contentStr = "请确认是否执行${subTaskInfo.subTaskName}" + builder.titleStr = "子任务确认" + builder.contentStr = "请确认并执行${subTaskInfo.subTaskName}" builder.tipStr = if (subTaskInfo.taskModel == TaskModel.MANUAL) "[需手动驾驶至终点${subTaskInfo.endLocation.siteName}]" else "[自动驾驶至终点${subTaskInfo.endLocation.siteName}]" builder.leftStr = "确认" - builder.middleStr = "下一个" - builder.rightStr = "结束" - builder.countDownTime = 15 + builder.middleStr = "" + builder.rightStr = "" + builder.countDownTime = 10 builder.listener = listener return context?.let { it1 -> builder.build(it1) } } @@ -295,24 +295,24 @@ object SweeperCloudTaskUtils { when (stopTaskType) { //任务提前结束 SweeperTaskStop.StopTaskType.ADVANCE -> { - builder.contentStr = "云端请求终止任务，请确认" - builder.tipStr = "【确认后请接管停车】" + builder.contentStr = "云端中止任务，注意车辆即将停车！" + builder.tipStr = "" builder.leftStr = "确认" builder.middleStr = "" - builder.rightStr = "拒绝" - VoiceNotice.showNotice("云端请求终止任务，请确认") + builder.rightStr = "" + VoiceNotice.showNotice("云端中止任务") } - //任务超时结束 - SweeperTaskStop.StopTaskType.TIMEOUT -> { - builder.contentStr = "任务已超时${timeoutStr},请确认是否结束" - builder.tipStr = "【结束后请接管停车】" + //任务异常结束 + SweeperTaskStop.StopTaskType.EXCEPTION -> { + builder.contentStr = "云端异常结束任务！" + builder.tipStr = "" builder.leftStr = "确认" builder.middleStr = "" - builder.rightStr = "拒绝" - VoiceNotice.showNotice("任务已超时${timeoutStr},请确认是否结束") + builder.rightStr = "" + VoiceNotice.showNotice("云端异常结束任务") } } - builder.countDownTime = 15 + builder.countDownTime = 10 builder.listener = listener return context?.let { it1 -> builder.build(it1) } }