From 043b07acecb6ea3afd7c3e7fa0693f8d3c3e80f5 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Wed, 30 Aug 2023 12:22:21 +0800 Subject: [PATCH] =?UTF-8?q?[6.0.0]=20Taxipassenger/unmanned=20Taxipassenge?= =?UTF-8?q?r=20=E5=90=AF=E5=8A=A8=E8=87=AA=E9=A9=BE=E5=9F=8B=E7=82=B9?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0lineId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt | 1 + .../com/mogo/och/taxi/passenger/model/AutopilotManager.kt | 7 +++++-- .../taxi/passenger/utils/TaxiPassengerAnalyticsManager.kt | 4 +++- .../mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt | 1 + .../com/mogo/och/taxi/passenger/model/AutopilotManager.kt | 6 ++++-- .../taxi/passenger/utils/TaxiPassengerAnalyticsManager.kt | 4 +++- 6 files changed, 17 insertions(+), 6 deletions(-) diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt index 15cc6dad4f..078645cb83 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt @@ -38,6 +38,7 @@ class TaxiPassengerConst { const val EVENT_PARAM_START_NAME = "start_name" const val EVENT_PARAM_END_NAME = "end_name" const val EVENT_PARAM_ORDER_NUMBER = "order_num" + const val EVENT_PARAM_LINE_ID = "line_id" const val EVENT_PARAM_START_RESULT = "start_autopilot" // true/false const val EVENT_PARAM_START_FAILURE_CODE = "start_autopilot_failure_code" // 启动自驾失败code const val EVENT_PARAM_START_FAILURE_MSG = "start_autopilot_failure_msg" // 启动自驾失败原因 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 2451c64151..acf69ba1c8 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 @@ -80,7 +80,9 @@ object AutopilotManager : IMoGoAutopilotStatusListener { + " ,startSiteName=" + TaxiPassengerModel.currentOCHOrder!!.startSiteAddr + " ,endSiteName=" + TaxiPassengerModel.currentOCHOrder!!.endSiteAddr ) - TaxiPassengerAnalyticsManager.triggerStartAutopilotEvent(false, false, TaxiPassengerModel.currentOCHOrder!!.startSiteAddr, TaxiPassengerModel.currentOCHOrder!!.endSiteAddr, TaxiPassengerModel.currentOCHOrder!!.orderNo) + TaxiPassengerAnalyticsManager.triggerStartAutopilotEvent(false, false, TaxiPassengerModel.currentOCHOrder!!.startSiteAddr, + TaxiPassengerModel.currentOCHOrder!!.endSiteAddr, TaxiPassengerModel.currentOCHOrder!!.orderNo, + TaxiPassengerModel.currentOCHOrder!!.lineId) } private fun initAutopilotControlParameters(): AutopilotControlParameters? { @@ -162,7 +164,8 @@ object AutopilotManager : IMoGoAutopilotStatusListener { true, TaxiPassengerModel.currentOCHOrder!!.startSiteAddr, TaxiPassengerModel.currentOCHOrder!!.endSiteAddr, - TaxiPassengerModel.currentOCHOrder!!.orderNo + TaxiPassengerModel.currentOCHOrder!!.orderNo, + TaxiPassengerModel.currentOCHOrder!!.lineId ) //startServicePilotDone() } diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.kt index 5b4f60df6b..6116cf7383 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.kt @@ -64,7 +64,8 @@ object TaxiPassengerAnalyticsManager { * @param restart false（点击'开始服务'启动）/true（接管后点击'自动驾驶'按钮启动） * @param send 是否直接发送埋点（15s内开启成功则直接发送成功埋点） */ - fun triggerStartAutopilotEvent(restart: Boolean, send: Boolean, startName: String, endName: String, orderNo: String) { + fun triggerStartAutopilotEvent(restart: Boolean, send: Boolean, startName: String, endName: String, + orderNo: String, lineId: Long) { mStartAutopilotKey = if (restart) TaxiPassengerConst.EVENT_KEY_RESTART_AUTOPILOT else TaxiPassengerConst.EVENT_KEY_START_SERVICE if (send) { @@ -86,6 +87,7 @@ object TaxiPassengerAnalyticsManager { mStartAutopilotParams[TaxiPassengerConst.EVENT_PARAM_START_NAME] = startName mStartAutopilotParams[TaxiPassengerConst.EVENT_PARAM_END_NAME] = endName mStartAutopilotParams[TaxiPassengerConst.EVENT_PARAM_ORDER_NUMBER] = orderNo + mStartAutopilotParams[TaxiPassengerConst.EVENT_PARAM_LINE_ID] = lineId startAutopiloTimeOut = RxUtils.createSubscribeOnOwnThread(TaxiPassengerConst.LOOP_PERIOD_15S) { // 15s内未开启，上报失败埋点 triggerStartAutopilotFailureEvent("", "15s后app等待超时") diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt index 49a0680760..4a12e389ae 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt @@ -27,6 +27,7 @@ class TaxiPassengerConst { const val EVENT_PARAM_START_NAME = "start_name" const val EVENT_PARAM_END_NAME = "end_name" const val EVENT_PARAM_ORDER_NUMBER = "order_num" + const val EVENT_PARAM_LINE_ID = "line_id" const val EVENT_PARAM_START_RESULT = "start_autopilot" // true/false const val EVENT_PARAM_START_FAILURE_CODE = "start_autopilot_failure_code" // 启动自驾失败code const val EVENT_PARAM_START_FAILURE_MSG = "start_autopilot_failure_msg" // 启动自驾失败原因 diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt index d719e36932..15655bb16e 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt @@ -86,7 +86,8 @@ object AutopilotManager : IMoGoAutopilotStatusListener { false, TaxiPassengerModel.currentOCHOrder!!.orderStartSite.siteName, TaxiPassengerModel.currentOCHOrder!!.orderEndSite.siteName, - TaxiPassengerModel.currentOCHOrder!!.orderNo + TaxiPassengerModel.currentOCHOrder!!.orderNo, + TaxiPassengerModel.currentLineId ) } @@ -173,7 +174,8 @@ object AutopilotManager : IMoGoAutopilotStatusListener { true, TaxiPassengerModel.currentOCHOrder!!.orderStartSite.siteName, TaxiPassengerModel.currentOCHOrder!!.orderEndSite.siteName, - TaxiPassengerModel.currentOCHOrder!!.orderNo + TaxiPassengerModel.currentOCHOrder!!.orderNo, + TaxiPassengerModel.currentLineId ) //startServicePilotDone() } diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.kt index 5b4f60df6b..54a0848119 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.kt @@ -64,7 +64,8 @@ object TaxiPassengerAnalyticsManager { * @param restart false（点击'开始服务'启动）/true（接管后点击'自动驾驶'按钮启动） * @param send 是否直接发送埋点（15s内开启成功则直接发送成功埋点） */ - fun triggerStartAutopilotEvent(restart: Boolean, send: Boolean, startName: String, endName: String, orderNo: String) { + fun triggerStartAutopilotEvent(restart: Boolean, send: Boolean, startName: String, endName: String, + orderNo: String, lineId: Long?) { mStartAutopilotKey = if (restart) TaxiPassengerConst.EVENT_KEY_RESTART_AUTOPILOT else TaxiPassengerConst.EVENT_KEY_START_SERVICE if (send) { @@ -86,6 +87,7 @@ object TaxiPassengerAnalyticsManager { mStartAutopilotParams[TaxiPassengerConst.EVENT_PARAM_START_NAME] = startName mStartAutopilotParams[TaxiPassengerConst.EVENT_PARAM_END_NAME] = endName mStartAutopilotParams[TaxiPassengerConst.EVENT_PARAM_ORDER_NUMBER] = orderNo + mStartAutopilotParams[TaxiPassengerConst.EVENT_PARAM_LINE_ID] = lineId ?: 0 startAutopiloTimeOut = RxUtils.createSubscribeOnOwnThread(TaxiPassengerConst.LOOP_PERIOD_15S) { // 15s内未开启，上报失败埋点 triggerStartAutopilotFailureEvent("", "15s后app等待超时")