yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# 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
This commit is contained in:
aibingbing
2022-09-26 19:16:37 +08:00
parent bbb467b0b1 eba88750d8
commit 6a21e175b4
266 changed files with 9667 additions and 771 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotManager.kt
View File

@@ -161,6 +161,14 @@ object CallerAutoPilotManager {
providerApi?.setDemoMode(isEnable)
}
/**
* 是否忽略条件直接绘制
* 司机屏同步给乘客屏
*/
fun setIgnoreConditionDraw(isIgnore: Boolean) {
providerApi?.setIgnoreConditionDraw(isIgnore)
}
/**
* 设置工控机演示模式（美化模式）开启、关闭
* isEnable = true 开启
@@ -186,6 +194,34 @@ object CallerAutoPilotManager {
providerApi?.getBadCaseConfig()
}
/**
* 向左变道
*/
fun sendOperatorChangeLaneLeft() {
providerApi?.sendOperatorChangeLaneLeft()
}
/**
* 向右变道
*/
fun sendOperatorChangeLaneRight() {
providerApi?.sendOperatorChangeLaneRight()
}
/**
* 发送设置加速度 acc>0加速 acc<0减速 acc=0复位
*/
fun sendOperatorSetAcceleratedSpeed(cc: Double) {
providerApi?.sendOperatorSetAcceleratedSpeed(cc)
}
/**
* 鸣笛 value 1: honk 2: stop honking
*/
fun sendOperatorSetHorn(value: Double) {
providerApi?.sendOperatorSetHorn(value)
}
/**
* 发送工控机所有节点重启命令
*/

10
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt
View File

@@ -1,10 +1,12 @@
package com.mogo.eagle.core.function.call.autopilot
import android.util.*
import androidx.annotation.Nullable
import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
import com.mogo.eagle.core.function.call.base.CallerBase
import com.mogo.eagle.core.utilcode.kotlin.*
import com.mogo.eagle.core.utilcode.mogo.logger.*
import com.mogo.eagle.core.utilcode.util.GsonUtils
import mogo.telematics.pad.MessagePad
import mogo_msg.MogoReportMsg
@@ -29,6 +31,10 @@ object CallerAutoPilotStatusListenerManager : CallerBase() {
@Volatile
private var autoPilotMessageCode: String = ""
@Volatile
private var autoPilotMessageContent: String = ""
/**
* 查询AutoPilot状态
*/
@@ -45,6 +51,8 @@ object CallerAutoPilotStatusListenerManager : CallerBase() {
fun getAutoPilotReportMessageCode(): String = autoPilotMessageCode
fun getAutoPilotReportMessageContent(): String = autoPilotMessageContent
/**
* 通过Gnss定位更新来同步更新自动驾驶状态
*/
@@ -171,6 +179,8 @@ object CallerAutoPilotStatusListenerManager : CallerBase() {
M_AUTOPILOT_STATUS_LISTENERS.forEach {
val listener = it.value
autoPilotMessageCode = guardianInfo?.code ?: ""
autoPilotMessageContent = guardianInfo?.msg ?: ""
Logger.d("XXXXX", "code: ${guardianInfo?.code}, msg: ${guardianInfo?.msg}")
listener.onAutopilotGuardian(guardianInfo)
}
}

69
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotPlanningActionsListenerManager.kt Normal file
View File

@@ -0,0 +1,69 @@
package com.mogo.eagle.core.function.call.autopilot
import androidx.annotation.Nullable
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotPlanningActionsListener
import com.mogo.eagle.core.function.call.base.CallerBase
import mogo.telematics.pad.MessagePad
import java.util.concurrent.ConcurrentHashMap
/**
* PNC 决策行为相关监听
*/
object CallerAutopilotPlanningActionsListenerManager : CallerBase() {
private val M_AUTOPILOT_PLANNING_ACTIONS_LISTENER: ConcurrentHashMap<String, IMoGoAutopilotPlanningActionsListener> =
ConcurrentHashMap()
/**
* 添加监听
* @param tag 标记，用来注销监听使用
* @param listener 监听回调
*/
fun addListener(
@Nullable tag: String,
@Nullable listener: IMoGoAutopilotPlanningActionsListener
) {
if (M_AUTOPILOT_PLANNING_ACTIONS_LISTENER.containsKey(tag)) {
return
}
M_AUTOPILOT_PLANNING_ACTIONS_LISTENER[tag] = listener
}
/**
* 删除监听
* @param tag 标记，用来注销监听使用
*/
fun removeListener(@Nullable tag: String) {
if (!M_AUTOPILOT_PLANNING_ACTIONS_LISTENER.containsKey(tag)) {
return
}
M_AUTOPILOT_PLANNING_ACTIONS_LISTENER.remove(tag)
}
/**
* 删除自动驾驶按钮选中监听
* @param listener 要删除的监听对象
*/
fun removeListener(@Nullable listener: IMoGoAutopilotPlanningActionsListener) {
M_AUTOPILOT_PLANNING_ACTIONS_LISTENER.forEach {
if (it.value == listener) {
M_AUTOPILOT_PLANNING_ACTIONS_LISTENER.remove(it.key)
}
}
}
/**
* pnc actions 决策回调
* @param planningActionMsg 具体决策
*/
@Synchronized
fun invokePNCActions(planningActionMsg: MessagePad.PlanningActionMsg) {
M_AUTOPILOT_PLANNING_ACTIONS_LISTENER.forEach {
val tag = it.key
val listener = it.value
listener.pncActions(planningActionMsg)
}
}
}

12
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotPointCloudListenerManager.kt
View File

@@ -68,16 +68,4 @@ object CallerAutopilotPointCloudListenerManager : CallerBase() {
}
}
/**
* 点云数据 回调
*/
@Synchronized
fun invokeAutopilotPointCloudDataUpdate(header: MessagePad.Header?, pointCloud: MogoPointCloudOuterClass.MogoPointCloud?) {
M_POINT_CLOUD_LISTENERS.forEach {
val tag = it.key
val listener = it.value
listener.onAutopilotPointCloudDataUpdate(header, pointCloud)
}
}
}

8
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt
View File

@@ -164,4 +164,12 @@ object CallerDevaToolsManager {
devaToolsProviderApi?.hideStatusBar()
}
}
fun startMonitor() {
devaToolsProviderApi?.startMonitor()
}
fun stopMonitor() {
devaToolsProviderApi?.stopMonitor()
}
}

25
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt
View File

@@ -10,6 +10,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.IViewNotificationProvider
import com.mogo.eagle.core.function.api.hmi.view.IOchBusView
import com.mogo.eagle.core.function.api.hmi.view.IViewLimitingVelocity
import com.mogo.eagle.core.function.api.hmi.view.IViewNotification
import com.mogo.eagle.core.function.api.hmi.view.IViewTrafficLight
@@ -310,6 +311,14 @@ object CallerHmiManager : CallerBase() {
waringProviderApi?.hideSmallFragment()
}
fun showMaskView() {
waringProviderApi?.showMaskView()
}
fun hideMaskView() {
waringProviderApi?.hideMaskView()
}
/**
*注册工控机升级提示圆点View的回调
* @param 提示圆点View
@@ -364,4 +373,20 @@ object CallerHmiManager : CallerBase() {
fun showVideoDialog(infList: List<Infrastructure>) {
waringProviderApi?.showVideoDialog(infList)
}
/**
* bus出车/收车状态设置
* true : 显示收车； false：显示出车
*/
fun changeBusOperationStatus(isOut:Boolean){
waringProviderApi?.changeBusOperationStatus(isOut)
}
/**
* 设置 bus出车/收车View
* @param view
*/
fun setBusOperationView(view: IOchBusView) {
waringProviderApi?.setBusOperationView(view)
}
}

14
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuListenerManager.kt
View File

@@ -2,6 +2,7 @@ package com.mogo.eagle.core.function.call.obu
import androidx.annotation.Nullable
import com.mogo.eagle.core.data.obu.ObuStatusInfo
import com.mogo.eagle.core.data.traffic.TrafficData
import com.mogo.eagle.core.function.api.obu.IMoGoObuStatusListener
import com.mogo.eagle.core.function.call.base.CallerBase
import com.mogo.eagle.core.utilcode.util.GsonUtils
@@ -105,5 +106,18 @@ object CallerObuListenerManager : CallerBase() {
}
}
fun invokeTrackerWarningInfo(trafficData: TrafficData){
mObuStatusListeners.forEach {
val listener = it.value
listener.updateTrackerWarningInfo(trafficData)
}
}
fun removeTrackerWarningInfo(trafficData: TrafficData){
mObuStatusListeners.forEach {
val listener = it.value
listener.removeTrackerWarningInfo(trafficData)
}
}
}

2
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/trafficlight/CallTrafficLightListenerManager.kt → core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/trafficlight/CallerTrafficLightListenerManager.kt
View File

@@ -5,7 +5,7 @@ import com.mogo.eagle.core.data.trafficlight.TrafficLightResult
import com.mogo.eagle.core.function.api.trafficlight.IMoGoTrafficLightListener
import java.util.concurrent.ConcurrentHashMap
object CallTrafficLightListenerManager {
object CallerTrafficLightListenerManager {
private val M_TRAFFIC_LIGHT_LISTENER: ConcurrentHashMap<String, IMoGoTrafficLightListener> =
ConcurrentHashMap()

2
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/trafficlight/CallTrafficLightManager.kt → core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/trafficlight/CallerTrafficLightManager.kt
View File

@@ -4,7 +4,7 @@ import com.mogo.eagle.core.data.constants.MogoServicePaths
import com.mogo.eagle.core.function.api.trafficlight.ITrafficLightProvider
import com.mogo.eagle.core.function.call.base.CallerBase
object CallTrafficLightManager : CallerBase() {
object CallerTrafficLightManager : CallerBase() {
fun getTrafficLightProvider(): ITrafficLightProvider {
return getApiInstance(