[6.2.0][魔方] 埋点添加docker版本

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoFangAnalyticUtils.kt

@@ -43,6 +43,7 @@ internal class MoFangAnalyticUtils {
         const val EVENT_EXECUTE_PARAMS_ACC = "acc" // 执行时自车加速度
         const val EVENT_EXECUTE_PARAMS_HEADING = "head" // 执行时自车航向角
         const val EVENT_EXECUTE_PARAMS_LINE_ID = "line_id" // 执行时的路线id
+        const val EVENT_EXECUTE_PARAMS_DOCKER_VERSION = "docker" // docker版本
 
 
         // 魔方按键指令回执-工控机收到
@@ -56,6 +57,7 @@ internal class MoFangAnalyticUtils {
         const val EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_ACC = "acc" // 执行时自车加速度
         const val EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_HEADING = "head" // 执行时自车航向角
         const val EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_LINE_ID = "line_id" // 执行时的路线id
+        const val EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_DOCKER_VERSION = "docker" // docker版本
 
         // 魔方按键指令回执-工控机执行
         const val EVENT_EXECUTE_FEEDBACK_EXECUTE = "event_mofang_fb_execute"
@@ -68,6 +70,7 @@ internal class MoFangAnalyticUtils {
         const val EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_ACC = "acc" // 执行时自车加速度
         const val EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_HEADING = "head" // 执行时自车航向角
         const val EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_LINE_ID = "line_id" // 执行时的路线id
+        const val EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_DOCKER_VERSION = "docker" // docker版本
 
         private val handler by lazy { HandlerThread("mofang-analytic-worker", Process.THREAD_PRIORITY_BACKGROUND).let { it.start(); Handler(it.looper) } }
 

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoFangCommandExecutor.kt

@@ -14,6 +14,7 @@ import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companio
 import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_EXECUTE
 import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_ACC
 import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_CODE
+import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_DOCKER_VERSION
 import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_HEADING
 import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_LAT
 import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_LINE_ID
@@ -24,6 +25,7 @@ import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companio
 import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_RECEIVE
 import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_ACC
 import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_CODE
+import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_DOCKER_VERSION
 import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_HEADING
 import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_LAT
 import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_LINE_ID
@@ -32,6 +34,7 @@ import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companio
 import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_NODE
 import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_SPEED
 import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_PARAMS_ACC
+import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_PARAMS_DOCKER_VERSION
 import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_PARAMS_HEADING
 import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_PARAMS_KEYCODE
 import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_PARAMS_LAT
@@ -123,7 +126,8 @@ internal class MoFangCommandExecutor {
                             EVENT_EXECUTE_PARAMS_SPEED to location.gnssSpeed,
                             EVENT_EXECUTE_PARAMS_ACC to location.acceleration,
                             EVENT_EXECUTE_PARAMS_HEADING to location.heading,
-                            EVENT_EXECUTE_PARAMS_LINE_ID to CallerAutoPilotStatusListenerManager.getLineId()
+                            EVENT_EXECUTE_PARAMS_LINE_ID to CallerAutoPilotStatusListenerManager.getLineId(),
+                            EVENT_EXECUTE_PARAMS_DOCKER_VERSION to (CallerAutoPilotStatusListenerManager.getDockerVersion() ?: "")
                         ))
                         linkedLog?.record(mapOf("执行:${System.currentTimeMillis()}" to "$message, $acc"))
                         CallerAutoPilotControlManager.sendOperatorSetAcceleratedSpeed(acc)
@@ -151,7 +155,8 @@ internal class MoFangCommandExecutor {
                         EVENT_EXECUTE_PARAMS_SPEED to location.gnssSpeed,
                         EVENT_EXECUTE_PARAMS_ACC to location.acceleration,
                         EVENT_EXECUTE_PARAMS_HEADING to location.heading,
-                        EVENT_EXECUTE_PARAMS_LINE_ID to CallerAutoPilotStatusListenerManager.getLineId()
+                        EVENT_EXECUTE_PARAMS_LINE_ID to CallerAutoPilotStatusListenerManager.getLineId(),
+                        EVENT_EXECUTE_PARAMS_DOCKER_VERSION to (CallerAutoPilotStatusListenerManager.getDockerVersion() ?: "")
                         ))
                     if (isLeft) {
                         linkedLog?.record(mapOf("执行:${System.currentTimeMillis()}" to "$message"))
@@ -180,7 +185,8 @@ internal class MoFangCommandExecutor {
                         EVENT_EXECUTE_PARAMS_SPEED to location.gnssSpeed,
                         EVENT_EXECUTE_PARAMS_ACC to location.acceleration,
                         EVENT_EXECUTE_PARAMS_HEADING to location.heading,
-                        EVENT_EXECUTE_PARAMS_LINE_ID to CallerAutoPilotStatusListenerManager.getLineId()
+                        EVENT_EXECUTE_PARAMS_LINE_ID to CallerAutoPilotStatusListenerManager.getLineId(),
+                        EVENT_EXECUTE_PARAMS_DOCKER_VERSION to (CallerAutoPilotStatusListenerManager.getDockerVersion() ?: "")
                         ))
                     linkedLog?.record(mapOf("执行:${System.currentTimeMillis()}" to "$message, $json"))
                     Log.d(TAG, "--- 启动自驾 ----入参:$json")
@@ -211,7 +217,8 @@ internal class MoFangCommandExecutor {
                             EVENT_EXECUTE_PARAMS_SPEED to location.gnssSpeed,
                             EVENT_EXECUTE_PARAMS_ACC to location.acceleration,
                             EVENT_EXECUTE_PARAMS_HEADING to location.heading,
-                            EVENT_EXECUTE_PARAMS_LINE_ID to CallerAutoPilotStatusListenerManager.getLineId()
+                            EVENT_EXECUTE_PARAMS_LINE_ID to CallerAutoPilotStatusListenerManager.getLineId(),
+                            EVENT_EXECUTE_PARAMS_DOCKER_VERSION to (CallerAutoPilotStatusListenerManager.getDockerVersion() ?: "")
                             ))
                         linkedLog?.record(mapOf("执行:${System.currentTimeMillis()}" to "$message, $value"))
                         CallerAutoPilotControlManager.sendOperatorSetHorn(value)
@@ -425,6 +432,7 @@ internal class MoFangCommandExecutor {
                         it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_SPEED]  = location.gnssSpeed
                         it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_HEADING]  = location.heading
                         it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_LINE_ID]  = CallerAutoPilotStatusListenerManager.getLineId()
+                        it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_DOCKER_VERSION]  = CallerAutoPilotStatusListenerManager.getDockerVersion() ?: ""
                     })
                 }
 
@@ -441,6 +449,7 @@ internal class MoFangCommandExecutor {
                             it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_SPEED]  = location.gnssSpeed
                             it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_HEADING]  = location.heading
                             it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_LINE_ID]  = CallerAutoPilotStatusListenerManager.getLineId()
+                            it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_DOCKER_VERSION]  = CallerAutoPilotStatusListenerManager.getDockerVersion() ?: ""
                         })
                     }
                 }
@@ -456,6 +465,7 @@ internal class MoFangCommandExecutor {
                         it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_SPEED]  = location.gnssSpeed
                         it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_HEADING]  = location.heading
                         it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_LINE_ID]  = CallerAutoPilotStatusListenerManager.getLineId()
+                        it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_DOCKER_VERSION]  = CallerAutoPilotStatusListenerManager.getDockerVersion() ?: ""
                     })
                 }
 
@@ -478,6 +488,7 @@ internal class MoFangCommandExecutor {
                                 it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_SPEED]  = location.gnssSpeed
                                 it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_HEADING]  = location.heading
                                 it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_LINE_ID]  = CallerAutoPilotStatusListenerManager.getLineId()
+                                it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_DOCKER_VERSION]  = CallerAutoPilotStatusListenerManager.getDockerVersion() ?: ""
                             })
                         }
                     }
@@ -503,6 +514,7 @@ internal class MoFangCommandExecutor {
                         it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_SPEED]  = location.gnssSpeed
                         it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_HEADING]  = location.heading
                         it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_LINE_ID]  = CallerAutoPilotStatusListenerManager.getLineId()
+                        it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_DOCKER_VERSION]  = CallerAutoPilotStatusListenerManager.getDockerVersion() ?: ""
                     })
                 }
 
@@ -519,6 +531,7 @@ internal class MoFangCommandExecutor {
                             it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_SPEED]  = location.gnssSpeed
                             it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_HEADING]  = location.heading
                             it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_LINE_ID]  = CallerAutoPilotStatusListenerManager.getLineId()
+                            it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_DOCKER_VERSION]  = CallerAutoPilotStatusListenerManager.getDockerVersion() ?: ""
                         })
                     }
                 }
@@ -534,6 +547,7 @@ internal class MoFangCommandExecutor {
                         it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_SPEED]  = location.gnssSpeed
                         it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_HEADING]  = location.heading
                         it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_LINE_ID]  = CallerAutoPilotStatusListenerManager.getLineId()
+                        it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_DOCKER_VERSION]  = CallerAutoPilotStatusListenerManager.getDockerVersion() ?: ""
                     })
                 }
                 IMF.SPEED_CHANGE_EXECUTE -> {
@@ -555,6 +569,7 @@ internal class MoFangCommandExecutor {
                                 it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_SPEED]  = location.gnssSpeed
                                 it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_HEADING]  = location.heading
                                 it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_LINE_ID]  = CallerAutoPilotStatusListenerManager.getLineId()
+                                it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_DOCKER_VERSION]  = CallerAutoPilotStatusListenerManager.getDockerVersion() ?: ""
                             })
                         }
                     }