Merge branch 'master' into release_robosweeper-d_100-sweeper_220830_1.0.0.1_merge

# Conflicts: # app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java # core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt # core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt # core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt # core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TrafficDataView.java # core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapPointCloudSubscriber.kt # core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotProvider.kt # gradle.properties # libraries/mogo-adas-data/src/main/proto/message_pad.proto # libraries/mogo-adas-data/src/main/proto/special_vehicle_task_cmd.proto # libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java # libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasManager.java # libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/IAdasNetCommApi.java # libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/MessageType.java
2022-09-26 19:16:37 +08:00
parent bbb467b0b1 eba88750d8
commit 6a21e175b4
266 changed files with 9667 additions and 771 deletions
--- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotPlanningActionsListener.kt
+++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotPlanningActionsListener.kt
@@ -0,0 +1,14 @@
+package com.mogo.eagle.core.function.api.autopilot
+
+import mogo.telematics.pad.MessagePad
+
+/**
+ * 自动驾驶决策行为相关的监听
+ */
+interface IMoGoAutopilotPlanningActionsListener {
+
+    /**
+     * pnc actions 决策 驾驶的意图
+     */
+    fun pncActions(planningActionMsg: MessagePad.PlanningActionMsg)
+}
--- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotPointCloudListener.kt
+++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotPointCloudListener.kt
@@ -18,9 +18,4 @@ interface IMoGoAutopilotPointCloudListener {
     */
    fun onAutopilotPointCloudDataUpdate(pointCloud: ByteArray?)

-    /**
-     *
-     */
-    fun onAutopilotPointCloudDataUpdate(header: MessagePad.Header?, pointCloud: MogoPointCloudOuterClass.MogoPointCloud?)
-
 }
--- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotProvider.kt
+++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotProvider.kt
@@ -126,11 +126,18 @@ interface IMoGoAutopilotProvider : IMoGoFunctionServerProvider {

    /**
     * 演示模式（美化模式）该设置作用域只限定于鹰眼
+     * 司机屏同步给乘客屏
     * isEnable = true  开启
     * isEnable = false 关闭
     */
    fun setDemoMode(isEnable: Boolean)

+    /**
+     * 是否忽略条件直接绘制
+     * 司机屏同步给乘客屏
+     */
+    fun setIgnoreConditionDraw(isIgnore: Boolean)
+
    /**
     * 设置工控机演示模式（美化模式）开启、关闭
     * isEnable = true  开启
@@ -208,7 +215,27 @@ interface IMoGoAutopilotProvider : IMoGoFunctionServerProvider {
    fun sendStatusQueryReq()

    /**
-     * 福田清扫车业务指令下发
+     * 向左变道
     */
-    fun sendSweeperFuTianTaskCmd(fuTianTaskCmd: SpecialVehicleTaskCmdOuterClass.RoboSweeperFuTianTaskCmd)
+    fun sendOperatorChangeLaneLeft()
+
+    /**
+     * 向右变道
+     */
+    fun sendOperatorChangeLaneRight()
+
+    /**
+     * 设置加速度
+     */
+    fun sendOperatorSetAcceleratedSpeed(cc: Double)
+
+    /**
+     * 鸣笛 开始：1，结束：2
+     */
+    fun sendOperatorSetHorn(value: Double)
+
+   /**
+    * 福田清扫车业务指令下发
+    */
+   fun sendSweeperFuTianTaskCmd(fuTianTaskCmd: SpecialVehicleTaskCmdOuterClass.RoboSweeperFuTianTaskCmd)
 }
--- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt
+++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt
@@ -113,4 +113,8 @@ interface IDevaToolsProvider : IProvider {
     * 隐藏状态栏
     */
    fun hideStatusBar()
+
+    fun startMonitor()
+
+    fun stopMonitor()
 }
--- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/view/IOchBusView.kt
+++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/view/IOchBusView.kt
@@ -0,0 +1,16 @@
+package com.mogo.eagle.core.function.api.hmi.view
+
+import android.content.Context
+import android.util.AttributeSet
+import android.widget.LinearLayout
+
+/**
+ * 定义红绿灯View具备的功能接口
+ */
+abstract class IOchBusView(context: Context?, attrs: AttributeSet?, defStyleAttr: Int) :
+        LinearLayout(context, attrs, defStyleAttr) {
+
+    open fun showBusOperation(){}
+
+    open fun changerOperationStatus(isOut:Boolean){}
+}
--- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt
+++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt
@@ -8,6 +8,7 @@ import com.mogo.eagle.core.data.notice.NoticeNormalData
 import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData
 import com.mogo.eagle.core.data.report.ReportEntity
 import com.mogo.eagle.core.function.api.hmi.IMoGoHmiViewProxy
+import com.mogo.eagle.core.function.api.hmi.view.IOchBusView

 /**
 * @author xiaoyuzhou
@@ -187,6 +188,10 @@ interface IMoGoWaringProvider : IMoGoHmiViewProxy {

    fun hideToolsView()

+    fun showMaskView()
+
+    fun hideMaskView()
+
    /**
     * 加载全览模式图层
     */
@@ -251,4 +256,8 @@ interface IMoGoWaringProvider : IMoGoHmiViewProxy {
    fun showIPCReportWindow(errorReportList: ArrayList<ReportEntity>,warningReportList: ArrayList<ReportEntity>,reportLevel: Int)

    fun showVideoDialog(infList: List<Infrastructure>)
+
+    fun changeBusOperationStatus(isOut:Boolean)
+
+    fun setBusOperationView(view:IOchBusView)
 }
--- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/obu/IMoGoObuStatusListener.kt
+++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/obu/IMoGoObuStatusListener.kt
@@ -1,6 +1,7 @@
 package com.mogo.eagle.core.function.api.obu

 import com.mogo.eagle.core.data.obu.ObuStatusInfo
+import com.mogo.eagle.core.data.traffic.TrafficData

 /**
 * @author xiaoyuzhou
@@ -12,11 +13,29 @@ interface IMoGoObuStatusListener {
     * 检查OBU连链接信息
     * @param obuStatusInfo OBU 状态信息
     */
-    fun onObuStatusResponse(obuStatusInfo: ObuStatusInfo)
+    fun onObuStatusResponse(obuStatusInfo: ObuStatusInfo){
+
+    }

    /**
     * v2i时延
     */
-    fun onObuV2iDelayTime(delayTime: Long)
+    fun onObuV2iDelayTime(delayTime: Long){
+
+    }
+
+    /**
+     * 更新obu Tracker 预警信息
+     */
+    fun updateTrackerWarningInfo(trafficData: TrafficData){
+
+    }
+
+    /**
+     * 移除obu Tracker 预警信息
+     */
+    fun removeTrackerWarningInfo(trafficData: TrafficData){
+
+    }

 }