From d7430b8dfdb89f489affa3d30608d7496259f292 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Sun, 8 Jun 2025 11:26:46 +0800 Subject: [PATCH] =?UTF-8?q?[8.1.0]=E5=A4=9A=E9=93=BE=E8=B7=AF=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datacenter/obu/MogoObuDcCombineManager.kt | 4 +- .../obu/MogoPrivateObuNewManager.kt | 6 +- .../hmi/ui/operate/OperatePanelLayout.kt | 12 +-- .../function/hmi/ui/setting/SOPSettingView.kt | 16 ++-- .../core/data/config/FunctionBuildConfig.kt | 84 ++++++++++++++++++- .../eagle/core/data/config/HmiBuildConfig.kt | 25 +----- 6 files changed, 101 insertions(+), 46 deletions(-) diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt index 439d5e5ccb..b172f96feb 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt @@ -1,7 +1,6 @@ package com.mogo.eagle.core.function.datacenter.obu import android.content.Context -import com.mogo.eagle.core.data.R import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.data.config.HmiBuildConfig import com.mogo.eagle.core.data.enums.CommunicationType @@ -27,7 +26,6 @@ import com.mogo.eagle.core.function.datacenter.obu.utils.TrafficDataConvertUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OBU import com.mogo.eagle.core.utilcode.util.ConvertUtils -import com.mogo.skin.utils.SkinResources import com.mogo.support.obu.ObuScene import com.zhidao.support.obu.constants.MogoObuShowConstants import kotlin.math.roundToInt @@ -341,7 +339,7 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener * RSM预警信息 CvxPtcThreatIndInfo CvxPtcInfoIndInfo（主车与弱势交通参与者之间的预警（如：弱势交通参与者碰撞预警）） */ fun onMogoObuDcRsmWarning(rsmWarningData: ObuScene.RsmWarningData?) { - if (HmiBuildConfig.v2iWeaknessTraffic) { + if (FunctionBuildConfig.v2iWeakTrafficParticipant) { CallerLogger.d( "${M_OBU}${TAG}", "MogoObuDcCombineManager onMogoObuRsmWarning ------> ${rsmWarningData.toString()}" diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt index bda0b7989c..1291e731b1 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt @@ -1,7 +1,6 @@ package com.mogo.eagle.core.function.datacenter.obu import android.content.Context -import com.mogo.eagle.core.data.R import com.mogo.eagle.core.data.app.AppConfigInfo import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.data.config.HmiBuildConfig @@ -26,7 +25,6 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_ import com.mogo.eagle.core.utilcode.util.ConvertUtils import com.mogo.eagle.core.utilcode.util.FileUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler -import com.mogo.skin.utils.SkinResources import com.mogo.support.obu.ObuBase import com.mogo.support.obu.ObuScene import com.mogo.support.obu.constants.* @@ -298,7 +296,7 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener { * v2v预警信息 CvxRvInfoIndInfo CvxV2vThreatIndInfo 他车 */ override fun onObuRvWarning(data: ObuScene.RvWarningData) { - if (FunctionBuildConfig.v2xTotalSwitch && HmiBuildConfig.v2vTotalSwitch) { + if (FunctionBuildConfig.v2xTotalSwitch && FunctionBuildConfig.v2vDownwardSwitch) { if (data.warningMsg != null) { // 更新数据，远车数据，之前要匹配uuid data.vehBasicsMsg?.let { @@ -646,7 +644,7 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener { "onMogoObuRsmWarning ------> ${data?.toString()}" ) if (FunctionBuildConfig.v2xTotalSwitch && HmiBuildConfig.v2iTotalSwitch) { - if (HmiBuildConfig.v2iWeaknessTraffic) { + if (FunctionBuildConfig.v2iWeakTrafficParticipant) { // 交通参与者类型 0x0:未知 UNKNOWN | 1机动车 2:非机动车 NON_MOTOR | 3:行人 PEDESTRIAN 4:obu if (data != null && data.participant != null) { val v2xType = when (data.participant.ptcType) { 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 6985bba724..c8033afb04 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 @@ -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(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 diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt index d8b9928078..ca69f7427c 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt @@ -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总开关 diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt index aa7c97d2f7..dd1c8f58a3 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt @@ -308,14 +308,14 @@ object FunctionBuildConfig { */ @Volatile @JvmField - var v2xTotalSwitch = Utils.getApp().resources.getBoolean(R.bool.v2x_total_switch) + var v2xTotalSwitch = true /** * V2N总开关,其子开关包括V2N新链路、V2N场景进PNC */ @Volatile @JvmField - var v2nTotalSwitch = Utils.getApp().resources.getBoolean(R.bool.v2n_total_switch) + var v2nTotalSwitch = true /** * 是否开启PNC障碍物颜色提醒 @@ -381,12 +381,90 @@ object FunctionBuildConfig { @JvmField var isShowExamWindow = false + /** + * NDE（数据上车）上行 + */ + @JvmField + @Volatile + var ndeUpwardSwitch = Utils.getApp().resources.getBoolean(R.bool.nde_upward_switch) + /** * 车辆图像上传行云大模型 */ @Volatile @JvmField - var isImageUpload = false + var isImageUpload = Utils.getApp().resources.getBoolean(R.bool.image_upload_switch) + + /** + * NDE（数据上车）下行 + */ + @Volatile + @JvmField + var ndeDownwardSwitch = Utils.getApp().resources.getBoolean(R.bool.nde_downward_switch) + + /** + * 事件数据进PNC应用 + */ + @Volatile + @JvmField + var ndeEventDataToPnc = Utils.getApp().resources.getBoolean(R.bool.nde_event_data_to_pnc) + + /** + * 感知数据进PNC应用 + */ + @Volatile + @JvmField + var ndePerceptionDataToPnc = Utils.getApp().resources.getBoolean(R.bool.nde_perception_data_to_pnc) + + /** + * 云控基础平台上行 + */ + @Volatile + @JvmField + var cloudControlUpward = Utils.getApp().resources.getBoolean(R.bool.cloud_control_upward) + + /** + * 云控基础平台下行 + */ + @Volatile + @JvmField + var cloudControlDownward = Utils.getApp().resources.getBoolean(R.bool.cloud_control_downward) + + /** + * OBU上报(V2I、V2V上行) + */ + @Volatile + @JvmField + var obuUpwardSwitch = Utils.getApp().resources.getBoolean(R.bool.obu_upward_switch) + + /** + * V2I下行默认开关 + */ + @Volatile + @JvmField + var v2iDownwardSwitch = Utils.getApp().resources.getBoolean(R.bool.v2i_downward_switch) + + /** + * 是否展示V2I的弱势交通 + */ + @JvmField + @Volatile + var v2iWeakTrafficParticipant = Utils.getApp().resources.getBoolean(R.bool.v2i_weak_traffic_participant) + + /** + * 感知数据进PNC应用 + */ + @JvmField + @Volatile + var v2iPerceptionDataToPnc = Utils.getApp().resources.getBoolean(R.bool.v2i_perception_data_to_pnc) + + /** + * 是否展示obu的v2v + */ + @JvmField + @Volatile + var v2vDownwardSwitch = Utils.getApp().resources.getBoolean(R.bool.v2v_downward_switch) + /** * 清扫车 默认业务模式（打包时默认的模式） diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HmiBuildConfig.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HmiBuildConfig.kt index d50c3ea8f1..0d77e83d6c 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HmiBuildConfig.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HmiBuildConfig.kt @@ -40,19 +40,7 @@ object HmiBuildConfig { @Volatile var isShowRouteStrategy = !AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode) - /** - * 是否展示路沿、车道线 - */ - @JvmField - @Volatile - var isShowLaneMark: Boolean = false - /** - * 是否展示obu的弱势交通 - */ - @JvmField - @Volatile - var v2iWeaknessTraffic = Utils.getApp().resources.getBoolean(R.bool.v2i_weakness_traffic) /** * 是否展示云端的弱势交通 @@ -61,34 +49,27 @@ object HmiBuildConfig { @Volatile var isShowCloudWeaknessTrafficView = false - /** - * 是否展示obu的v2v - */ - @JvmField - @Volatile - var v2vTotalSwitch = Utils.getApp().resources.getBoolean(R.bool.v2v_total_switch) - /** * 是否展示obu的v2i * 6.6.2版本根据运营需求-产品设计默认开启 */ @JvmField @Volatile - var v2iTotalSwitch = Utils.getApp().resources.getBoolean(R.bool.v2i_total_switch) + var v2iTotalSwitch = true /** * 是否展示绿波通行 */ @JvmField @Volatile - var isShowGreenWaveView = Utils.getApp().resources.getBoolean(R.bool.v2n_green_wave) + var isShowGreenWaveView = false /** * 是否展示闯红灯预警 */ @JvmField @Volatile - var v2iRedLightWarning = Utils.getApp().resources.getBoolean(R.bool.v2i_red_green_warning) + var v2iRedLightWarning = false /** * 是否展示转向灯