diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/operate/OperatePanelLayout.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/operate/OperatePanelLayout.kt index befe4cd071..ec2a545ec9 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/operate/OperatePanelLayout.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/operate/OperatePanelLayout.kt @@ -477,6 +477,18 @@ class OperatePanelLayout : LinearLayout { }else{ preferenceScreen.findPreferenceReal(NDE_EVENT_DATA_TO_PNC)?.also { changeValue(it, false) }//事件数据进PNC应用 preferenceScreen.findPreferenceReal(NDE_PERCEPTION_DATA_TO_PNC)?.also { changeValue(it, false) }//感知数据进PNC应用 + //关闭事件数据进PNC应用 + CallerAutoPilotControlManager.sendNdeDownEventToPnc(0) + //查询事件数据进PNC应用 + UiThreadHandler.postDelayed({ + CallerAutoPilotControlManager.sendGetParamReq(AdasConstants.MapSystemParamType.V2N_TO_PNC) + }, 500) + //关闭感知数据进PNC应用 + CallerAutoPilotControlManager.sendNdeDownPerceptionToPnc(0) + //查询感知数据进PNC应用 + UiThreadHandler.postDelayed({ + CallerAutoPilotControlManager.sendGetParamReq(AdasConstants.MapSystemParamType.PERCEPTION_TO_PNC) + }, 500) } return true } @@ -570,6 +582,15 @@ class OperatePanelLayout : LinearLayout { CallerAutoPilotControlManager.sendV2iDownPerceptionToPnc(1) }else{ CallerAutoPilotControlManager.sendV2iDownPerceptionToPnc(0) + //关闭弱势交通参与者 + FunctionBuildConfig.v2iWeakTrafficParticipant = false + //关闭感知数据进PNC应用 + FunctionBuildConfig.v2iPerceptionDataToPnc = false + CallerAutoPilotControlManager.sendV2iDownPerceptionToPnc(0) + //查询V2I下行感知进PNC开关状态 + UiThreadHandler.postDelayed({ + CallerAutoPilotControlManager.sendGetParamReq(AdasConstants.MapSystemParamType.V2I_TO_PNC) + }, 500) } hmiAction("V2I下行, ", isChecked) clickEventAnalytics("V2I下行", isChecked) @@ -632,14 +653,18 @@ class OperatePanelLayout : LinearLayout { 0->{ FunctionBuildConfig.ndeUpwardSwitch = it.enable FunctionBuildConfig.ndeDownwardSwitch = it.enable + preferenceScreen.findPreferenceReal(NDE_UPWARD_SWITCH)?.also { changeValue(it, FunctionBuildConfig.ndeUpwardSwitch) } + preferenceScreen.findPreferenceReal(NDE_DOWNWARD_SWITCH)?.also { changeValue(it, FunctionBuildConfig.ndeDownwardSwitch) } } //上行 1->{ FunctionBuildConfig.ndeUpwardSwitch = it.enable + preferenceScreen.findPreferenceReal(NDE_UPWARD_SWITCH)?.also { changeValue(it, FunctionBuildConfig.ndeUpwardSwitch) } } //下行 2->{ FunctionBuildConfig.ndeDownwardSwitch = it.enable + preferenceScreen.findPreferenceReal(NDE_DOWNWARD_SWITCH)?.also { changeValue(it, FunctionBuildConfig.ndeDownwardSwitch) } } } } @@ -650,14 +675,18 @@ class OperatePanelLayout : LinearLayout { 0->{ FunctionBuildConfig.cloudControlUpward = it.enable FunctionBuildConfig.cloudControlDownward = it.enable + preferenceScreen.findPreferenceReal(CLOUD_CONTROL_UPWARD)?.also { changeValue(it, FunctionBuildConfig.cloudControlUpward) } + preferenceScreen.findPreferenceReal(CLOUD_CONTROL_DOWNWARD)?.also { changeValue(it, FunctionBuildConfig.cloudControlDownward) } } //上行 1->{ FunctionBuildConfig.cloudControlUpward = it.enable + preferenceScreen.findPreferenceReal(CLOUD_CONTROL_UPWARD)?.also { changeValue(it, FunctionBuildConfig.cloudControlUpward) } } //下行 2->{ FunctionBuildConfig.cloudControlDownward = it.enable + preferenceScreen.findPreferenceReal(CLOUD_CONTROL_DOWNWARD)?.also { changeValue(it, FunctionBuildConfig.cloudControlDownward) } } } }