[6.0.0] Taxipassenger/unmanned Taxipassenger 启动自驾埋点增加lineId

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" // 启动自驾失败原因

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()
                 }

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等待超时")

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" // 启动自驾失败原因

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()
                 }

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等待超时")