diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/constant/SweeperConst.kt b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/constant/SweeperConst.kt index aa96c7f40d..1c4f5891e8 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/constant/SweeperConst.kt +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/constant/SweeperConst.kt @@ -55,9 +55,9 @@ class SweeperConst { const val EVENT_PARAM_UNABLE_START_REASON = "unable_start_reason"; /** - * 订单起终点Marker类型 + * 子任务起终点Marker类型 */ - const val TYPE_MARKER_SWEEPER_ORDER = "TYPE_MARKER_SWEEPER_ORDER" + const val TYPE_MARKER_SWEEPER_SUBTASK_START_END = "TYPE_MARKER_SWEEPER_SUBTASK_START_END" const val TIMER_START_AUTOPILOT_INTERVAL = 20 * 1000L 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 a1d88cea14..6329c9c5db 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 @@ -7,13 +7,18 @@ import chassis.ChassisStatesOuterClass import com.amap.api.maps.model.LatLng 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.function.call.map.CallerMapUIServiceManager import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.ToastUtils +import com.mogo.map.overlay.core.Level +import com.mogo.map.overlay.point.Point +import com.mogo.och.common.module.utils.OCHThreadPoolManager import com.mogo.och.common.module.voice.VoiceNotice.showNotice import com.mogo.och.sweepercloud.R import com.mogo.och.sweepercloud.bean.SweeperRoutePlanningUpdateReqBean import com.mogo.och.sweepercloud.callback.SweeperCloudDialogClickListener +import com.mogo.och.sweepercloud.constant.SweeperConst.Companion.TYPE_MARKER_SWEEPER_SUBTASK_START_END import com.mogo.och.sweepercloud.database.MyDataBase import com.mogo.och.sweepercloud.presenter.SweeperPresenter import com.mogo.och.sweepercloud.ui.dialog.SweeperCloudDialog @@ -59,7 +64,11 @@ class SweeperFragment : BaseSweeperTabFragment { mDialog = sweeperCloudTaskResumeDialog() var ttsString = "云端恢复任务,注意车辆即将启动!" mCurrentSuspendSubTaskInfo?.also { suspendSub -> - val isAutoPoilotState = mPresenter?.autopilotState == STATUS_AUTOPILOT_ENABLE + val isAutoPoilotState = + mPresenter?.autopilotState == STATUS_AUTOPILOT_ENABLE when { suspendSub.taskModel == TaskModel.MANUAL -> { ttsString = "云端恢复任务,请继续手动驾驶完成任务!" } + suspendSub.taskModel == TaskModel.AUTO && isAutoPoilotState -> { ttsString = "云端恢复任务,注意车辆即将启动!" } + suspendSub.taskModel == TaskModel.AUTO && !isAutoPoilotState -> { ttsString = "云端恢复任务,请到达合适的位置后开启自动驾驶!" } @@ -485,7 +552,11 @@ class SweeperFragment : BaseSweeperTabFragment