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

[6.6.2] 默认链接工控打开全融合，v2i默认开启，v2i->pnc打开fusion融合替换

Browse Source
This commit is contained in:
EmArrow
2024-09-12 12:11:55 +08:00
parent ad249ec6f0
commit f0a5adac29
5 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt
View File

@@ -137,6 +137,8 @@ class MoGoAdasMsgConnectStatusListenerImpl :
}
//每次工控机连接成功后，需同步当前设置的雨天模式状态
CallerAutoPilotControlManager.setRainMode(FunctionBuildConfig.isRainMode)
// 6.6.2 版本默认开启
CallerAutoPilotControlManager.sendFusionMode(FunctionBuildConfig.fusionMode)
connectToast("域控已连接")
}

2
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt
View File

@@ -250,6 +250,7 @@ internal class SOPSettingView @JvmOverloads constructor(
if (isChecked) {
//V2I场景进PNC
scV2iPnc.isChecked = FunctionBuildConfig.v2iToPNC
FunctionBuildConfig.isFusionColor = true //6.6.2版本基于运营需求-产品设计-开启v2i进pnc,开启感知目标颜色替换
hmiAction("SOP V2I场景进PNC, ", FunctionBuildConfig.v2iToPNC)
CallerAutoPilotControlManager.sendV2iToPncCmd(FunctionBuildConfig.v2iToPNC)
//闯红灯预警
@@ -265,6 +266,7 @@ internal class SOPSettingView @JvmOverloads constructor(
} else {
//V2I场景进PNC
scV2iPnc.isChecked = false
FunctionBuildConfig.isFusionColor = false //6.6.2版本基于运营需求-产品设计-关闭v2i进pnc,关闭感知目标颜色替换
CallerAutoPilotControlManager.sendV2iToPncCmd(false)
hmiAction("SOP V2I场景进PNC, ", false)
//闯红灯预警

3
core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/roadcross/RoadCrossCameraManager.kt
View File

@@ -81,9 +81,6 @@ class RoadCrossCameraManager : IMoGoMapRoadListener {
)
}
if(AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){
AIAssist.getInstance(mContext).speakTTSVoice("蘑菇检测到前方${distance.toInt()}米您将通过路口，已为您切换展示路口全息影像")
}
if (roadCrossEnd != null) {
ndeRoadCameraNetWorkModel.getRoadCrossInfo(roadCrossEnd,
onSuccess = {

7
core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamView.kt
View File

@@ -211,8 +211,11 @@ class RoadCrossRoamView @JvmOverloads constructor(
//播放语音
val dis = CallerMapRoadListenerManager.getStopLineDistance()?.toInt() ?: 0
if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
AIAssist.getInstance(context)
.speakTTSVoice("前方${dis}米将通过路口，蘑菇为您提供路口全息影像，助力出行")
var disStr = "前方即将通过路口，蘑菇为您提供路口全息影像，助力出行"
if(dis >= 80){
disStr = "前方${dis}米将通过路口，蘑菇为您提供路口全息影像，助力出行"
}
AIAssist.getInstance(context).speakTTSVoice(disStr)
}
CallerHmiViewControlListenerManager.invokeV2XEvent(View.VISIBLE, TAG)
bringToFront()