[6.6.0]

[fea]
[自驾事件上报]

OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt

@@ -423,7 +423,7 @@ object OrderModel {
 
         firstStartAutopilot++
 
-        triggerStartServiceEvent(isRestart, false)
+        triggerStartServiceEvent(isRestart, false,0)
 
         val parameters = initAutopilotControlParameters()
         if (null == parameters) {
@@ -703,7 +703,7 @@ object OrderModel {
     }
 
     @JvmStatic
-    fun triggerStartServiceEvent(isRestart: Boolean, send: Boolean) {
+    fun triggerStartServiceEvent(isRestart: Boolean, send: Boolean,source:Int) {
         LineManager.startStation?.let {startStation->
             LineManager.endStation?.let {endStation->
                 OchAutopilotAnalytics.triggerStartAutopilotEvent(
@@ -713,7 +713,8 @@ object OrderModel {
                     endStation.name,
                     LineManager.lineInfos!!.lineId.toInt(),
                     "",
-                    System.currentTimeMillis()
+                    System.currentTimeMillis(),
+                    source
                 )
             }
         }

OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/presenter/BusPresenter.kt

@@ -155,7 +155,7 @@ class BusPresenter(view: ShuttleFragment?) : Presenter<ShuttleFragment?>(view),
             }
 
             IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING -> {
-                OrderModel.triggerStartServiceEvent(OrderModel.isRestartAutopilot, true)
+                OrderModel.triggerStartServiceEvent(OrderModel.isRestartAutopilot, true,0)
                 // 改变UI自动驾驶状态
                 UiThreadHandler.post({
                     if (mView != null) {
@@ -172,6 +172,14 @@ class BusPresenter(view: ShuttleFragment?) : Presenter<ShuttleFragment?>(view),
         }
     }
 
+    override fun onAutopilotStatusResponseFromCan(state: Int) {
+        when (state) {
+            IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING -> {
+                OrderModel.triggerStartServiceEvent(OrderModel.isRestartAutopilot, true,1)
+            }
+        }
+    }
+
     override fun startOpenAutopilot() {
         //非美化模式下启动动画
         UiThreadHandler.post({