From 67989b8820bf39484c9bf2fedda03e9dd09296d3 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Wed, 25 Jun 2025 19:22:46 +0800 Subject: [PATCH] =?UTF-8?q?[8.1.0][opt]=E6=B8=B2=E6=9F=93=E8=BF=9B?= =?UTF-8?q?=E7=AB=99=E7=82=B9=E5=8A=9F=E8=83=BD=E9=80=9A=E8=BF=87=E5=BC=80?= =?UTF-8?q?=E5=85=B3=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/bridge/bridge/OchBridgeManager.kt | 3 ++- .../core/function/hmi/ui/setting/DebugSettingView.kt | 6 ++++++ .../src/main/res/layout/view_debug_setting.xml | 12 ++++++++++++ .../eagle/core/data/config/FunctionBuildConfig.kt | 7 +++++++ 4 files changed, 27 insertions(+), 1 deletion(-) diff --git a/OCH/common/bridge/src/main/java/com/mogo/och/bridge/bridge/OchBridgeManager.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/bridge/OchBridgeManager.kt index 08ed71c320..a93fd230ad 100644 --- a/OCH/common/bridge/src/main/java/com/mogo/och/bridge/bridge/OchBridgeManager.kt +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/bridge/OchBridgeManager.kt @@ -120,7 +120,7 @@ object OchBridgeManager: IMoGoPlanningTrajectoryListener, IMoGoAutopilotIdentify } private fun timeCheck() { - if (lastUpdateTime > 0 && System.currentTimeMillis() - lastUpdateTime > 1000) { + if (FunctionBuildConfig.isParkingOpen && lastUpdateTime > 0 && System.currentTimeMillis() - lastUpdateTime > 1000) { ThreadUtils.getIoPool().execute { CallerMapUIServiceManager.getOverlayManager()?.hidePoint("RenderParkingModel") } @@ -130,6 +130,7 @@ object OchBridgeManager: IMoGoPlanningTrajectoryListener, IMoGoAutopilotIdentify } override fun pncActions(planningActionMsg: MessagePad.PlanningActionMsg) { + if (!FunctionBuildConfig.isParkingOpen) return val timeStamp = System.currentTimeMillis() lastUpdateTime = timeStamp if (timeStamp - lastTime >= 1000) { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index 29e50f52b0..6407a4e79c 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt @@ -14,6 +14,7 @@ import android.os.Process import android.text.Html import android.text.TextUtils import android.util.AttributeSet +import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -257,6 +258,7 @@ import kotlinx.android.synthetic.main.view_debug_setting.view.tbObuLog import kotlinx.android.synthetic.main.view_debug_setting.view.tbObuWarningFusionUnion import kotlinx.android.synthetic.main.view_debug_setting.view.tbOpenAcceleration import kotlinx.android.synthetic.main.view_debug_setting.view.tbOpenSnBinding +import kotlinx.android.synthetic.main.view_debug_setting.view.tbParking import kotlinx.android.synthetic.main.view_debug_setting.view.tbParrallelDriveViewShowControl import kotlinx.android.synthetic.main.view_debug_setting.view.tbReportMore import kotlinx.android.synthetic.main.view_debug_setting.view.tbReportWarning @@ -1106,6 +1108,10 @@ internal class DebugSettingView @JvmOverloads constructor( } }) } + tbParking.setOnCheckedChangeListener { _, isChecked -> + Log.d("cff", "===>isChecked is:$isChecked") + FunctionBuildConfig.isParkingOpen = isChecked + } //重启工控机所有节点 btnIpcReboot.onClick { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml index c8dac5aab8..eb11ceca37 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml @@ -2663,6 +2663,18 @@ android:textOff="开启QUIC协议(目前QA环境可用)" android:textOn="关闭QUIC协议" android:textSize="@dimen/dp_24" /> + + 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 7d6b471d49..49ba83eed7 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 @@ -71,6 +71,13 @@ object FunctionBuildConfig { @JvmField var isOpenOvertake = false + /** + * PNC-进站停车 + */ + @Volatile + @JvmField + var isParkingOpen = false + /** * 变道绕障的目标障碍物速度阈值 * 默认 3 m/s