From ee303ec3577b1098ad64a46fa55762ba34861fa7 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Fri, 5 Sep 2025 16:51:35 +0800 Subject: [PATCH] =?UTF-8?q?[8.2.2][feat]=E6=96=B0=E5=A2=9EB2=E7=BE=8E?= =?UTF-8?q?=E5=8C=96=E5=91=88=E7=8E=B0=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../autopilot/telematic/TeleMsgHandler.kt | 7 +++++++ .../hmi/ui/operate/OperatePanelLayout.kt | 19 +++++++++++++++++++ .../operate_panel_preference_details_demo.xml | 7 +++++++ .../data/multidisplay/TelematicConstant.kt | 1 + 4 files changed, 34 insertions(+) diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt index e3f28418eb..52a063654c 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt @@ -387,6 +387,13 @@ class TeleMsgHandler : IMsgHandler { ) } + TelematicConstant.CONTROL_B2_PRETTIFY_SWITCH -> { + CallerTelematicListenerManager.invokeReceivedMsg( + TelematicConstant.CONTROL_B2_PRETTIFY_SWITCH, + it.body + ) + } + TelematicConstant.SHOW_TRAFFIC_LIGHT -> { val trafficLightJson = String(it.body) CallerTrafficLightListenerManager.invokeTrafficLightStatus( 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 c27148cf64..8c29a90da5 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 @@ -878,6 +878,7 @@ class OperatePanelLayout : LinearLayout { private const val KEY_DEMO_SWITCH = "demo_switch" private const val KEY_RECORD_BAG_DIALOG = "record_bag_dialog" private const val KEY_TAKE_OVER_WAKE = "take_over_wake" + private const val KEY_MOGO_PRETTIFY_SWITCH = "mogo_prettify_switch" } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { @@ -915,6 +916,9 @@ class OperatePanelLayout : LinearLayout { KEY_TAKE_OVER_WAKE -> { return FunctionBuildConfig.isTakeoverRemind } + KEY_MOGO_PRETTIFY_SWITCH -> { + return false + } } return super.getDefaultVal(pref) } @@ -952,6 +956,21 @@ class OperatePanelLayout : LinearLayout { clickEventAnalytics("接管提醒", isChecked) return true } + KEY_MOGO_PRETTIFY_SWITCH -> { + val isChecked = newValue as? Boolean ?: false + if (isChecked) { + CallerTelematicManager.sendMsgToAllClients( + TelematicConstant.CONTROL_B2_PRETTIFY_SWITCH, + "1".toByteArray() + ) + } else { + CallerTelematicManager.sendMsgToAllClients( + TelematicConstant.CONTROL_B2_PRETTIFY_SWITCH, + "0".toByteArray() + ) + } + return true + } } return super.onPreferenceChange(preference, newValue) } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/xml/operate_panel_preference_details_demo.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/xml/operate_panel_preference_details_demo.xml index 057d64502c..17914a8c7c 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/xml/operate_panel_preference_details_demo.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/xml/operate_panel_preference_details_demo.xml @@ -19,5 +19,12 @@ android:persistent="false" android:layout="@layout/layout_operate_panel_preference_switch_compat" android:widgetLayout="@layout/layout_operate_panel_preference_widget_switch_compat"/> + \ No newline at end of file diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/multidisplay/TelematicConstant.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/multidisplay/TelematicConstant.kt index c2e98a2e06..092cd03b3d 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/multidisplay/TelematicConstant.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/multidisplay/TelematicConstant.kt @@ -14,6 +14,7 @@ class TelematicConstant { const val V2N_AI_ROAD_DATA_TO_PASSENGER = 106 // V2N老链路云端下发给司机屏的数据，转发给乘客端 const val WEATHER_SWITCH_STATUS = 107 // 司机屏的天气效果开关发给乘客端 const val CONTROL_PASSENGER_AI_SWITCH = 108 + const val CONTROL_B2_PRETTIFY_SWITCH = 109 const val OBU_RUNREDLIGHT_WARNING = 200 //闯红灯预警开关 const val OBU_GREENWAVE_WARNING = 201 //绿波通行开关