Merge remote-tracking branch 'origin/dev_robosweeper-d_app-module_221230_1.1.0' into dev_robosweeper-d_app-module_221230_1.1.0

OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt

@@ -3,6 +3,7 @@ package com.mogo.och.sweeper.fragment
 import android.graphics.Color
 import android.os.Bundle
 import android.view.View
+import android.view.View.OnClickListener
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import chassis.ChassisStatesOuterClass
@@ -29,8 +30,6 @@ import kotlinx.android.synthetic.main.sweeper_current_task_info.view.*
 import kotlinx.android.synthetic.main.sweeper_no_data_common_view.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import java.math.BigDecimal
-import java.math.RoundingMode
 import kotlin.math.roundToInt
 
 /**
@@ -260,7 +259,6 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
     fun updateSubTaskStatus(typeEnum: TaskStatusEnum, isLastSubTask: Boolean) {
         if (isLastSubTask) {
             showAmapNaviToStationFragment(false)
-            mPresenter?.getMainTaskList(false)
             clearAllMarkerAndPolyline()
             //整个大任务结束，则删除它相关的贴边数据缓存
             lifecycleScope.launch(Dispatchers.IO) {
@@ -268,7 +266,18 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
                 mPresenter?.clearRouteList()
             }
             setTaskProgress("0")
-            ToastUtils.showLong("当前任务已完成，已刷新列表")
+
+            val builder = SweeperManualDrivingDialog.Builder()
+            val endConfirmDialog = builder
+                .tips("任务已完成")
+                .confirmStr("确认")
+                .build(requireContext())
+            endConfirmDialog?.setClickListener(object: SweeperManualDrivingDialog.ClickListener{
+                override fun confirm() {
+                    mPresenter?.getMainTaskList(false)
+                }
+            })
+            endConfirmDialog?.show()
             return
         }
         when (typeEnum.code) {