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

[8.1.0]多链路数据控制

Browse Source
This commit is contained in:
xuxinchao
2025-06-08 11:26:46 +08:00
parent 6a2c64289b
commit d7430b8dfd
6 changed files with 101 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/operate/OperatePanelLayout.kt
View File

@@ -400,11 +400,11 @@ class OperatePanelLayout : LinearLayout {
}
//V2I下行
V2I_DOWNWARD_SWITCH->{
return HmiBuildConfig.v2iTotalSwitch
return FunctionBuildConfig.v2iDownwardSwitch
}
//弱势交通参与者
V2I_WEAK_TRAFFIC_PARTICIPANT->{
return HmiBuildConfig.v2iWeaknessTraffic
return FunctionBuildConfig.v2iWeakTrafficParticipant
}
//感知数据进PNC应用
V2I_PERCEPTION_DATA_TO_PNC->{
@@ -412,7 +412,7 @@ class OperatePanelLayout : LinearLayout {
}
//V2V下行
V2V_DOWNWARD_SWITCH->{
return HmiBuildConfig.v2vTotalSwitch
return FunctionBuildConfig.v2vDownwardSwitch
}
}
return super.getDefaultVal(pref)
@@ -466,7 +466,7 @@ class OperatePanelLayout : LinearLayout {
//V2I下行
V2I_DOWNWARD_SWITCH->{
val isChecked = newValue as? Boolean ?: false
HmiBuildConfig.v2iTotalSwitch = isChecked
FunctionBuildConfig.v2iDownwardSwitch = isChecked
hmiAction("V2I下行, ", isChecked)
if (!isChecked) {
preferenceScreen.findPreferenceReal<SwitchPreferenceCompat>(V2I_WEAK_TRAFFIC_PARTICIPANT)?.also { changeValue(it, false) }
@@ -478,7 +478,7 @@ class OperatePanelLayout : LinearLayout {
//弱势交通参与者
V2I_WEAK_TRAFFIC_PARTICIPANT->{
val isChecked = newValue as? Boolean ?: false
HmiBuildConfig.v2iWeaknessTraffic = isChecked
FunctionBuildConfig.v2iWeakTrafficParticipant = isChecked
clickEventAnalytics("V2I弱势交通参与者", isChecked)
hmiAction("V2I弱势交通参与者, ", isChecked)
return true
@@ -490,7 +490,7 @@ class OperatePanelLayout : LinearLayout {
//V2V下行
V2V_DOWNWARD_SWITCH->{
val isChecked = newValue as? Boolean ?: false
HmiBuildConfig.v2vTotalSwitch = isChecked
FunctionBuildConfig.v2vDownwardSwitch = isChecked
clickEventAnalytics("V2V下行", isChecked)
hmiAction("V2V下行, ", isChecked)
return true

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

@@ -155,8 +155,8 @@ internal class SOPSettingView @JvmOverloads constructor(
scV2ISwitch.isChecked = HmiBuildConfig.v2iTotalSwitch
hmiAction("SOP V2I总开关, ", HmiBuildConfig.v2iTotalSwitch)
//V2V总开关
scObuV2vView.isChecked = HmiBuildConfig.v2vTotalSwitch
hmiAction("SOP V2V总开关, ", HmiBuildConfig.v2vTotalSwitch)
scObuV2vView.isChecked = FunctionBuildConfig.v2vDownwardSwitch
hmiAction("SOP V2V总开关, ", FunctionBuildConfig.v2vDownwardSwitch)
//obu总开关
scObu.isChecked = obuConnectStatus
hmiAction("SOP obu总开关, ", obuConnectStatus)
@@ -264,8 +264,8 @@ internal class SOPSettingView @JvmOverloads constructor(
"1".toByteArray()
)
//路侧弱势交通参与者
scObuWeaknessTrafficSop.isChecked = HmiBuildConfig.v2iWeaknessTraffic
hmiAction("SOP obu弱势交通控制, ", HmiBuildConfig.v2iWeaknessTraffic)
scObuWeaknessTrafficSop.isChecked = FunctionBuildConfig.v2iWeakTrafficParticipant
hmiAction("SOP obu弱势交通控制, ", FunctionBuildConfig.v2iWeakTrafficParticipant)
} else {
//V2I场景进PNC
scV2iPnc.isChecked = false
@@ -382,25 +382,25 @@ internal class SOPSettingView @JvmOverloads constructor(
}
//路侧弱势交通参与者(默认开启)
scObuWeaknessTrafficSop.isChecked = HmiBuildConfig.v2iWeaknessTraffic
scObuWeaknessTrafficSop.isChecked = FunctionBuildConfig.v2iWeakTrafficParticipant
scObuWeaknessTrafficSop.setOnCheckedChangeListener { compoundButton, isChecked ->
if (!compoundButton.isPressed) {
return@setOnCheckedChangeListener
}
clickEventAnalytics("路侧弱势交通参与者",isChecked)
hmiAction("SOP obu弱势交通控制, ", isChecked)
HmiBuildConfig.v2iWeaknessTraffic = isChecked
FunctionBuildConfig.v2iWeakTrafficParticipant = isChecked
}
//V2V总开关(默认关闭)
scObuV2vView.isChecked = HmiBuildConfig.v2vTotalSwitch
scObuV2vView.isChecked = FunctionBuildConfig.v2vDownwardSwitch
scObuV2vView.setOnCheckedChangeListener { compoundButton, isChecked ->
if (!compoundButton.isPressed) {
return@setOnCheckedChangeListener
}
clickEventAnalytics("V2V总开关",isChecked)
hmiAction("SOP obuV2V开关, ", isChecked)
HmiBuildConfig.v2vTotalSwitch = isChecked
FunctionBuildConfig.v2vDownwardSwitch = isChecked
}
//obu总开关