Merge branch 'dev_arch_opt_3.0' into dev_robosweeper-d_app-module_221230_1.1.0

# Conflicts:
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperOrderModel.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperAnalyticsManager.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficDataView.java
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotControlProvider.kt

@@ -290,4 +290,28 @@ interface IMoGoAutopilotControlProvider : IMoGoFunctionServerProvider {
      * @param isDrawPointCloud 是否绘制点云
      */
     fun setIsDrawPointCloud(isDrawPointCloud: Boolean)
+
+    fun sendRoboBusJinlvM1FrontDoorCmd(switchCmd: Int): Boolean
+
+    fun sendRoboBusJinlvM1AirConditionerCmd(
+        switchCmd: Int,
+        modeCmd: Int,
+        windSpeedCmd: Int,
+        temperatureCmd: Int
+    ): Boolean
+
+    fun sendRoboBusJinlvM1HeaderCmd(switchCmd: Int, windSpeedCmd: Int): Boolean
+
+    fun sendRoboBusJinlvM1MainLamp1Cmd(switchCmd: Int): Boolean
+
+    fun sendRoboBusJinlvM1MainLamp2Cmd(switchCmd: Int): Boolean
+
+    /**
+     * 车门控制
+     */
+    fun sendRoboBusJinlvM1SmallLampCmd(switchCmd: Int): Boolean
+
+    fun sendRoboBusJinlvM1TaskCmd(roboBusJinlvM1Cmd: SpecialVehicleTaskCmdOuterClass.RoboBusJinlvM1Cmd): Boolean
+
+    fun sendPlanningCmd(cmd: Int): Boolean
 }

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotStatisticsListener.kt

@@ -1,6 +1,6 @@
 package com.mogo.eagle.core.function.api.autopilot
 
-import com.zhidao.support.adas.high.bean.AutopilotStatistics
+import com.zhjt.mogo.adas.data.bean.AutopilotStatistics
 
 /**
  * 启动自动驾驶状态统计监听

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoChassisGearStateListener.kt

@@ -3,12 +3,12 @@ package com.mogo.eagle.core.function.api.autopilot
 import chassis.Chassis
 
 /**
- * 车辆挂挡档位 数据 回调监听
+ * 车辆挂档档位 数据 回调监听
  */
 interface IMoGoChassisGearStateListener {
 
     /**
-     * 车辆挂挡档位
+     * 车辆挂档档位
      * @param gear 档位
      */
     fun onAutopilotGearData(gear: Chassis.GearPosition)

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/biz/IFuncBizProvider.kt

@@ -1,7 +1,7 @@
-package com.mogo.eagle.core.function.api.v2x
+package com.mogo.eagle.core.function.api.biz
 
 import com.mogo.eagle.core.data.map.Infrastructure
-import com.mogo.eagle.core.data.v2x.V2XEvent
+import com.mogo.eagle.core.data.v2x.V2XEventData
 
 interface IFuncBizProvider {
     /**
@@ -12,5 +12,5 @@ interface IFuncBizProvider {
     /**
      * 根据lineId获取整条道路的V2X事件
      */
-    fun onV2XEvents(v2xEvents: List<V2XEvent>?) {}
+    fun onV2XEvents(v2XEventData: List<V2XEventData>?) {}
 }

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/biz/IMoGoFuncBizProvider.kt

@@ -56,4 +56,8 @@ interface IMoGoFuncBizProvider : IMoGoFunctionServerProvider {
     fun fetchInfStructures()
 
     fun getAllV2XEvents()
+
+    fun queryV2XEvents()
+
+
 }

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/chat/biz/IMoGoChatFacade.kt

@@ -200,5 +200,5 @@ interface IMoGoMediaFacade {
 
 interface IMoGoAnalyticsFacade {
 
-    fun track(eventType: String, data: Map<String, Any>? = hashMapOf())
+    fun track(eventType: String, data: MutableMap<String, Any> = hashMapOf())
 }

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/cloud/IMoGoCloudListener.kt

@@ -1,6 +1,25 @@
 package com.mogo.eagle.core.function.api.cloud
 
-interface IMoGoCloudListener {
+import com.mogo.eagle.core.data.v2x.V2XEvent
 
-    fun tokenGot(token: String, sn: String)
+interface IMoGoCloudListener{
+
+    fun tokenGot(token: String, sn: String){}
+
+    /**
+     * 获取到V2X事件成功回调
+     * @param event
+     * - 参数说明：目前此参数支持以下类型
+     * - [V2XEvent.ForwardsWarning]: 路口碰撞预警、盲区预警等预警事件, 数据实体取自[V2XEvent.ForwardsWarning.data]
+     * - [V2XEvent.Road]: 道路事件, 数据实体取自[V2XEvent.Road.data]
+     * - [V2XEvent.Warning]: 预警目标物事件, 数据实体取自[V2XEvent.Warning.data]
+     * - [V2XEvent.Marker]: 道路标记事件, 数据实体取自[V2XEvent.Marker.data]
+     */
+    fun onAck(event: V2XEvent){}
+
+    /**
+     * V2X事件获取过程中，出现的异常信息，用于问题排查
+     * @param msg 异常信息
+     */
+    fun onFail(msg: String){}
 }

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/msgbox/IMsgBoxEventListener.kt

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.api.msgbox
+package com.mogo.eagle.core.function.api.datacenter.msgbox
 
 import com.mogo.eagle.core.data.msgbox.MsgBoxBean
 

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/msgbox/IMsgBoxListener.kt

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.api.msgbox
+package com.mogo.eagle.core.function.api.datacenter.msgbox
 
 import com.mogo.eagle.core.data.msgbox.MsgBoxBean
 import com.mogo.eagle.core.data.msgbox.MsgCategory

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/msgbox/IMsgBoxProvider.kt

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.api.msgbox
+package com.mogo.eagle.core.function.api.datacenter.msgbox
 
 import android.content.Context
 import com.mogo.eagle.core.data.msgbox.MsgBoxBean

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/union/ILimitingVelocityListener.kt

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.api.v2x
+package com.mogo.eagle.core.function.api.datacenter.union
 
 import com.mogo.eagle.core.data.enums.DataSourceType
 

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/union/IMoGoTrafficLightListener.kt

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.api.v2x
+package com.mogo.eagle.core.function.api.datacenter.union
 
 import com.mogo.eagle.core.data.enums.DataSourceType
 import com.mogo.eagle.core.data.enums.TrafficLightEnum

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt

@@ -11,6 +11,7 @@ import com.mogo.eagle.core.data.deva.chain.ChainLogParam
 import com.mogo.eagle.core.data.deva.scene.SceneModule
 import com.mogo.eagle.core.data.deva.scene.SceneTAG
 import com.mogo.eagle.core.data.msgbox.MsgBoxBean
+import com.mogo.eagle.core.function.api.devatools.apm.*
 
 /**
  * 开发套件工具接口
@@ -182,4 +183,6 @@ interface IDevaToolsProvider : IProvider {
     fun envConfigChange(cityCode: String, netMode: Int)
 
     fun dockerVersion(dockerVersion: String?)
+
+    fun apmEnvProvider(): IApmEnvProvider
 }

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/apm/IApmEnvProvider.kt

@@ -0,0 +1,10 @@
+package com.mogo.eagle.core.function.api.devatools.apm
+
+interface IApmEnvProvider {
+
+    fun init(buildType: String, netType: String, dockerVersion: String)
+
+    fun onEnvChanged(buildType: String, netType: String, dockerVersion: String)
+
+    fun isDebugEnabled(): Boolean?
+}

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/autopilot/IMoGoCheckAutoPilotBtnListener.kt

@@ -6,5 +6,7 @@ package com.mogo.eagle.core.function.api.hmi.autopilot
  * 自动驾驶控制按钮回调监听
  */
 interface IMoGoCheckAutoPilotBtnListener {
-    fun onCheck(isChecked: Boolean)
+    fun onCheck(isChecked: Boolean) {}
+
+    fun updateHDDataCacheStatus(isCached: Boolean) {}
 }

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/listener/IGaoDeMapLocationListener.kt

@@ -14,5 +14,5 @@ interface IGaoDeMapLocationListener {
      *
      * @param location 新定位点
      */
-    fun onLocationChanged(location: MogoLocation, from: Int, isGps: Boolean)
+    fun onMoGoLocationChanged(location: MogoLocation)
 }

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/mofang/IMoGoMoFangListener.kt

@@ -0,0 +1,17 @@
+package com.mogo.eagle.core.function.api.mofang
+
+
+/**
+ * 魔方数据的数据处理
+ * @author lixiaopeng
+ * @date 2023-02-20
+ */
+interface IMoGoMoFangListener {
+    /**
+     * 魔方数据的数据处理
+     * @param keyCode 按键类型
+     * @param action 按键状态
+     */
+    fun onMofangHandle(keyCode: Int, action: Int): Boolean
+
+}

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/obu/IMoGoObuProvider.kt

@@ -14,4 +14,6 @@ interface IMoGoObuProvider : IMoGoFunctionServerProvider {
     fun disConnect()
 
     fun isConnected(): Boolean
+
+    fun setObuLog(isChecked: Boolean)
 }

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/obu/IMoGoObuSaveMessageListener.kt

@@ -0,0 +1,20 @@
+package com.mogo.eagle.core.function.api.obu
+
+import com.mogo.eagle.core.data.enums.DataSourceType
+
+/**
+ * OBU 数据保存
+ * @author lixiaopeng
+ * @date 2023-02-01
+ */
+interface IMoGoObuSaveMessageListener {
+
+    /**
+     * @param type 事件id，类似与uuid
+     * @param content 事件内容
+     * @param tts 事件语音播报
+     * @param sourceType 来源
+     */
+    fun onMoGoObuSaveMessage(type: String, content: String, tts: String, sourceType: DataSourceType)
+
+}

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/obucombine/IMoGoObuDcCombineListener.kt

@@ -13,5 +13,4 @@ interface IMoGoObuDcCombineListener {
      */
     fun onMoGoObuDcCombineData(obuWarningData: ObuWarningEvent.ObuWarningData?)
 
-
  }

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/v2x/IV2XEventProvider.kt

@@ -1,7 +0,0 @@
-package com.mogo.eagle.core.function.api.v2x
-
-import com.mogo.eagle.core.function.api.base.IMoGoFunctionServerProvider
-
-interface IV2XEventProvider: IMoGoFunctionServerProvider {
-    fun queryWholeRoadEvents()
-}