From b0e216657f3c00194efd55ccc9b1cde9aa55f524 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 9 Jul 2024 17:32:03 +0800 Subject: [PATCH] =?UTF-8?q?[6.5.0]=20[fix]=20[=E5=8F=82=E6=95=B0=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/taxi/passenger/model/AutopilotManager.kt | 8 ++++---- .../mogo/och/unmanned/passenger/model/AutopilotManager.kt | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt index 5223d90d6c..6ba57e5115 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt @@ -125,8 +125,8 @@ object AutopilotManager : IOchAutopilotStatusListener { false, TaxiPassengerModel.currentOCHOrder!!.startSiteAddr, TaxiPassengerModel.currentOCHOrder!!.endSiteAddr, - TaxiPassengerModel.currentOCHOrder!!.orderNo.toInt(), - TaxiPassengerModel.currentOCHOrder!!.lineId.toString(), + TaxiPassengerModel.currentOCHOrder!!.lineId.toInt(), + TaxiPassengerModel.currentOCHOrder!!.orderNo, System.currentTimeMillis() ) return "" @@ -211,8 +211,8 @@ object AutopilotManager : IOchAutopilotStatusListener { true, TaxiPassengerModel.currentOCHOrder!!.startSiteAddr, TaxiPassengerModel.currentOCHOrder!!.endSiteAddr, - TaxiPassengerModel.currentOCHOrder!!.orderNo.toInt(), - TaxiPassengerModel.currentOCHOrder!!.lineId.toString(), + TaxiPassengerModel.currentOCHOrder!!.lineId.toInt(), + TaxiPassengerModel.currentOCHOrder!!.orderNo, System.currentTimeMillis() ) //startServicePilotDone() diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/AutopilotManager.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/AutopilotManager.kt index f1eb532d68..b61efe64ab 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/AutopilotManager.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/AutopilotManager.kt @@ -107,13 +107,14 @@ object AutopilotManager : IOchAutopilotStatusListener { + " ,startSiteName=" + TaxiPassengerModel.currentOCHOrder!!.orderStartSite.siteName + " ,endSiteName=" + TaxiPassengerModel.currentOCHOrder!!.orderEndSite.siteName ) + val lineId = TaxiPassengerModel.currentLineId?:-1 TaxiPassengerAnalyticsManager.triggerStartAutopilotEvent( false, false, TaxiPassengerModel.currentOCHOrder!!.orderStartSite.siteName, TaxiPassengerModel.currentOCHOrder!!.orderEndSite.siteName, - TaxiPassengerModel.currentOCHOrder!!.orderNo.toInt(), - TaxiPassengerModel.currentLineId.toString(), + lineId.toInt(), + TaxiPassengerModel.currentOCHOrder!!.orderNo, System.currentTimeMillis() ) needSpeakByStartAutopilot = true