From 7bbd260b997fc22dcec163c9ee18292a44da0f1a Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Fri, 11 Oct 2024 11:45:28 +0800 Subject: [PATCH] =?UTF-8?q?[6.7.0]=E7=BA=A2=E7=BB=BF=E7=81=AF=E8=87=AA?= =?UTF-8?q?=E8=BD=A6=E6=84=9F=E7=9F=A5=E9=BB=98=E8=AE=A4=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E6=8E=89=E8=BF=90=E8=90=A5=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=E7=BA=A2=E7=BB=BF=E7=81=AF=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datacenter/v2x/TrafficLightDispatcher.kt | 66 ++++++++----------- .../hmi/ui/operate/OperatePanelLayout.kt | 27 -------- .../function/hmi/ui/setting/SOPSettingView.kt | 22 ------- .../hmi/ui/widget/SingleTrafficLightView.kt | 4 +- .../src/main/res/layout/view_sop_setting.xml | 29 +------- ...rate_panel_preference_details_business.xml | 12 ---- .../eagle/core/data/config/HmiBuildConfig.kt | 13 ---- 7 files changed, 31 insertions(+), 142 deletions(-) diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt index 87bf10f51f..48fff17aeb 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt @@ -150,18 +150,16 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight if(light.nextState == null || light.nextState == FusionTrafficLightOuterClass.FusionLightState.STATE_OFF_FUSION || light.nextTwoState == null || light.nextTwoState == FusionTrafficLightOuterClass.FusionLightState.STATE_OFF_FUSION){ - if (HmiBuildConfig.isShowCarSourceTrafficLightView) { - var lightRemain = light.duration.toInt() - val source = when (trafficLights.source) { - 1 -> DataSourceType.TELEMATIC_UNION_V2I - 2 -> DataSourceType.TELEMATIC_UNION_V2N - else -> { - lightRemain = 0 - DataSourceType.TELEMATIC - } + var lightRemain = light.duration.toInt() + val source = when (trafficLights.source) { + 1 -> DataSourceType.TELEMATIC_UNION_V2I + 2 -> DataSourceType.TELEMATIC_UNION_V2N + else -> { + lightRemain = 0 + DataSourceType.TELEMATIC } - onTrafficLightPlusSource(convert(light.state), lightRemain, source) } + onTrafficLightPlusSource(convert(light.state), lightRemain, source) }else{ Log.i(TAG,"current state="+light.state+" current duration="+light.duration+ " nextState="+light.nextState+" nextDuration="+light.nextDuration+ @@ -305,27 +303,25 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight */ override fun onEnterCrossRoad(enter: Boolean) { CallerLogger.d("${SceneConstant.M_D_C}${TAG}", "onEnterCrossRoad enter = $enter ") - if (HmiBuildConfig.isShowCarSourceTrafficLightView) { - return - } - if (!enter) { - Handler().postDelayed({ - hasAiLightStatus = false - hasObuLightStatus = false - hasFusionLightStatus = false - }, 5000) - if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) { - CallerTelematicManager.sendMsgToAllClients( - TelematicConstant.HIDE_TRAFFIC_LIGHT, - "0".toByteArray() - ) - } - //如果没有OBU灯态则进行隐藏，如果有OBU灯态，则交由OBU管理 - if (!hasObuLightStatus) { - CallerTrafficLightListenerManager.resetTrafficLightStatus(!hasObuLightStatus) -// hide("云端离开路口隐藏", DataSourceType.AICLOUD) - } - } + +// if (!enter) { +// Handler().postDelayed({ +// hasAiLightStatus = false +// hasObuLightStatus = false +// hasFusionLightStatus = false +// }, 5000) +// if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) { +// CallerTelematicManager.sendMsgToAllClients( +// TelematicConstant.HIDE_TRAFFIC_LIGHT, +// "0".toByteArray() +// ) +// } +// //如果没有OBU灯态则进行隐藏，如果有OBU灯态，则交由OBU管理 +// if (!hasObuLightStatus) { +// CallerTrafficLightListenerManager.resetTrafficLightStatus(!hasObuLightStatus) +//// hide("云端离开路口隐藏", DataSourceType.AICLOUD) +// } +// } } /** @@ -336,9 +332,6 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight "${SceneConstant.M_D_C}${TAG}", "onTrafficRequestError hasObuLightStatus = $hasObuLightStatus ------> " ) - if (HmiBuildConfig.isShowCarSourceTrafficLightView) { - return - } CallerTrafficLightListenerManager.resetTrafficLightStatus(hasAiLightStatus) hasAiLightStatus = false // if (!hasObuLightStatus) { @@ -515,9 +508,6 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight } private fun updateTrafficLight(trafficLightResult: TrafficLightResult) { - if(HmiBuildConfig.isShowCarSourceTrafficLightView){ - return - } val currentTrafficLight = trafficLightResult.currentRoadTrafficLight() CallerLogger.d( "${SceneConstant.M_D_C}${TAG}", @@ -536,7 +526,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight } private fun filterTelematicUnion(source: DataSourceType): Boolean { - return HmiBuildConfig.isShowCarSourceTrafficLightView && source != DataSourceType.TELEMATIC_UNION_V2N && source != DataSourceType.TELEMATIC_UNION_V2I && source != DataSourceType.TELEMATIC + return source != DataSourceType.TELEMATIC_UNION_V2N && source != DataSourceType.TELEMATIC_UNION_V2I && source != DataSourceType.TELEMATIC } fun destroy() { 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 dd3966d056..dd19d91f7e 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 @@ -652,8 +652,6 @@ class OperatePanelLayout : LinearLayout { class BusinessPreferenceFragmentCompat : OperatePanelDetailBase() { companion object { - private const val KEY_RED_OR_GREEN_LIGHT_MARKER = "red_or_green_light_marker" - private const val KEY_RED_OR_GREEN_LIGHT_MERGE_MARKER = "red_or_green_light_merge_marker" private const val KEY_FAULT_REPORT_TIP = "fault_report_tip" private const val KEY_LIMIT_SPEED_MARKER = "limit_speed_marker" private const val KEY_WEATHER_EFFECT_SWITCH = "weather_effect_switch" @@ -666,12 +664,6 @@ class OperatePanelLayout : LinearLayout { override fun getDefaultVal(pref: Preference): Any? { when (pref.key) { - KEY_RED_OR_GREEN_LIGHT_MARKER -> { - return HmiBuildConfig.isShowTrafficLightView - } - KEY_RED_OR_GREEN_LIGHT_MERGE_MARKER -> { - return HmiBuildConfig.isShowCarSourceTrafficLightView - } KEY_FAULT_REPORT_TIP -> { return FunctionBuildConfig.isReportWarning } @@ -748,25 +740,6 @@ class OperatePanelLayout : LinearLayout { override fun onPreferenceChange(preference: Preference, newValue: Any?): Boolean { when (preference.key) { - KEY_RED_OR_GREEN_LIGHT_MARKER -> { - val isChecked = newValue as? Boolean ?: false - hmiAction("SOP 红绿灯标识开关, ", isChecked) - HmiBuildConfig.isShowTrafficLightView = isChecked - clickEventAnalytics("红绿灯标识", isChecked) - if (isChecked) { - CallerHmiManager.showTrafficLightView() - } else { - CallerHmiManager.hideTrafficLightView() - } - return true - } - KEY_RED_OR_GREEN_LIGHT_MERGE_MARKER -> { - val isChecked = newValue as? Boolean ?: false - hmiAction("SOP 红绿灯车端来源标识开关, ", isChecked) - clickEventAnalytics("红绿灯车端融合标识", isChecked) - HmiBuildConfig.isShowCarSourceTrafficLightView = isChecked - return true - } KEY_FAULT_REPORT_TIP -> { val isChecked = newValue as? Boolean ?: false hmiAction("SOP 是否开启异常上报, ", isChecked) 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 e613c87307..b4646a4443 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 @@ -58,7 +58,6 @@ import kotlinx.android.synthetic.main.view_sop_setting.view.rbThirty import kotlinx.android.synthetic.main.view_sop_setting.view.rgFusionMode import kotlinx.android.synthetic.main.view_sop_setting.view.rgPullTime import kotlinx.android.synthetic.main.view_sop_setting.view.scCarAperture -import kotlinx.android.synthetic.main.view_sop_setting.view.scCarUnionTrafficLight import kotlinx.android.synthetic.main.view_sop_setting.view.scConnectionSwitch import kotlinx.android.synthetic.main.view_sop_setting.view.scDemoMode import kotlinx.android.synthetic.main.view_sop_setting.view.scDrawPointCloudData @@ -83,7 +82,6 @@ import kotlinx.android.synthetic.main.view_sop_setting.view.scShowBagRecordWindo import kotlinx.android.synthetic.main.view_sop_setting.view.scSpeedLimit import kotlinx.android.synthetic.main.view_sop_setting.view.scSweeperModeSwitch import kotlinx.android.synthetic.main.view_sop_setting.view.scTakeOverRemind -import kotlinx.android.synthetic.main.view_sop_setting.view.scTrafficLight import kotlinx.android.synthetic.main.view_sop_setting.view.scV2ISwitch import kotlinx.android.synthetic.main.view_sop_setting.view.scV2NSwitch import kotlinx.android.synthetic.main.view_sop_setting.view.scV2XSwitch @@ -718,26 +716,6 @@ internal class SOPSettingView @JvmOverloads constructor( * 其他类别开关设置 */ private fun otherSetting() { - //红绿灯标识开关 - scTrafficLight.isChecked = !HmiBuildConfig.isShowTrafficLightView - scTrafficLight.setOnCheckedChangeListener { _, isChecked -> - hmiAction("SOP 红绿灯标识开关, ", isChecked) - clickEventAnalytics("红绿灯标识",isChecked) - if (isChecked) { - CallerHmiManager.showTrafficLightView() - } else { - CallerHmiManager.hideTrafficLightView() - } - } - - //红绿灯车端来源标识开关 - scCarUnionTrafficLight.isChecked = HmiBuildConfig.isShowCarSourceTrafficLightView - scCarUnionTrafficLight.setOnCheckedChangeListener { _, isChecked -> - hmiAction("SOP 红绿灯车端来源标识开关, ", isChecked) - clickEventAnalytics("红绿灯车端融合标识",isChecked) - HmiBuildConfig.isShowCarSourceTrafficLightView = isChecked - } - //系统启动状态展示 scConnectionSwitch.isChecked = HmiBuildConfig.isShowConnectionProgressView scConnectionSwitch.setOnCheckedChangeListener { _, isChecked -> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SingleTrafficLightView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SingleTrafficLightView.kt index fe5bd2eccc..895532f53b 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SingleTrafficLightView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SingleTrafficLightView.kt @@ -120,9 +120,7 @@ class SingleTrafficLightView @JvmOverloads constructor( UiThreadHandler.post { CallerLogger.d("$M_HMI$TAG","update checkLightId:$checkLightId, lightSource: $lightSource") mCurrentLightId = checkLightId - if (!HmiBuildConfig.isShowTrafficLightView) { - updateTrafficLightIcon(checkLightId, lightSource) - } + updateTrafficLightIcon(checkLightId, lightSource) } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml index 79507f4ee8..90c277557e 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml @@ -727,31 +727,6 @@ app:layout_constraintLeft_toLeftOf="@id/tvOtherTitle" app:layout_constraintRight_toRightOf="parent" /> - - - - - + app:layout_constraintTop_toBottomOf="@id/tvOtherTitle" /> + app:layout_constraintTop_toBottomOf="@id/tvOtherTitle" /> - -