From 198ea5dce03d0981856f6b461d0972c2b12eedff Mon Sep 17 00:00:00 2001
From: aibingbing <aibingbing@zhidaoauto.com>
Date: Tue, 5 Sep 2023 15:10:27 +0800
Subject: [PATCH] =?UTF-8?q?[Taxi=E6=97=A0=E4=BA=BA=E5=8C=96]refactor:=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=87=AA=E8=BD=A6=E5=AE=9A=E4=BD=8D=E5=9B=9E?=
 =?UTF-8?q?=E8=B0=83=20=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt
index 688952c541..5e45c87776 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt
@@ -530,7 +530,7 @@ object TaxiTaskModel {
             "judgeDriveToNearestStationTaskStation() ${virtualTask.siteName} distance = $distance"
         )
         if (distance <= TaxiUnmannedConst.ARRIVE_AT_START_STATION_DISTANCE) { // 15米内到站
-            DebugView.printInfoMsg("[高德定位围栏] 触发围栏，任务类型：DriveToNearestStationTask，围栏范围：${TaxiUnmannedConst.ARRIVE_AT_START_STATION_DISTANCE}米")
+            DebugView.printInfoMsg("[自车定位围栏] 触发围栏，任务类型：DriveToNearestStationTask，围栏范围：${TaxiUnmannedConst.ARRIVE_AT_START_STATION_DISTANCE}米")
             submitArriveSite(virtualTask.siteId, true, isArrivedNearestStation = true)
         }
     }
@@ -898,7 +898,7 @@ object TaxiTaskModel {
     }
 
     fun prepareNextTask(siteId: Long) {
-        DebugView.printInfoMsg("[PrepareNextTask] 准备发送请求 siteId = $siteId")
+        DebugView.printInfoMsg("[PrepareNextTask] 准备发送请求, siteId=$siteId")
         TaxiTaskWithOrderServiceManager.prepareTask(
             mContext,
             siteId,
@@ -939,13 +939,13 @@ object TaxiTaskModel {
             val listener = it.value
             listener.onStartPrepareTask120s(true)
         }
-        DebugView.printInfoMsg("[PrepareNextTask] 倒计时${TaxiUnmannedConst.TIMER_PREPARE_TASK_INTERVAL_120S/1000}秒后prepareNextTask siteId = $siteId")
+        DebugView.printInfoMsg("[PrepareNextTask] 倒计时${TaxiUnmannedConst.TIMER_PREPARE_TASK_INTERVAL_120S/1000}秒后prepareNextTask, siteId=$siteId")
         UiThreadHandler.postDelayed(mPrepareTaskDelay120SRunnable, TaxiUnmannedConst.TIMER_PREPARE_TASK_INTERVAL_120S)
     }
 
     fun removePrepareTaskDelay120S() {
         if (mPrepareTaskDelay120SRunnable != null){
-            DebugView.printInfoMsg("[PrepareNextTask] removeCallbacks prepareNextTask120s")
+            DebugView.printInfoMsg("[PrepareNextTask] removeCallbacks, 取消prepareNextTask倒计时")
             UiThreadHandler.removeCallbacks(mPrepareTaskDelay120SRunnable)
             mTaxiTaskWithOrderCallbackMap.forEach {
                 val listener = it.value
@@ -1244,7 +1244,7 @@ object TaxiTaskModel {
             if (stationAngle > 90) {
                 i(TAG, "judgeEndStation() = 刚过站且在15m内")
                 DebugView.printInfoMsg(
-                    "[高德定位围栏] 触发围栏，任务类型：${
+                    "[自车定位围栏] 触发围栏，任务类型：${
                         TaskTypeEnum.valueOf(
                             mCurrentTaskWithOrder?.taskType ?: 0
                         )?.name
@@ -1256,7 +1256,7 @@ object TaxiTaskModel {
                 if (currentLocation.gnssSpeed < 0.5) {
                     i(TAG, "judgeEndStation() = 没有过站、速度基本为零且在15m内")
                     DebugView.printInfoMsg(
-                        "[高德定位围栏] 触发围栏，任务类型：${
+                        "[自车定位围栏] 触发围栏，任务类型：${
                             TaskTypeEnum.valueOf(
                                 mCurrentTaskWithOrder?.taskType ?: 0
                             )?.name