From d174d6b69f9de4d6853c13e34bde4b409e57c181 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Thu, 26 Jun 2025 14:37:07 +0800 Subject: [PATCH] =?UTF-8?q?[8.1.0][opt]=E6=9B=BF=E6=8D=A2=E6=96=B0?= =?UTF-8?q?=E7=9A=84=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/bridge/bridge/OchBridgeManager.kt | 2 +- .../src/main/res/raw/parking_model.nt3d | Bin 33494 -> 33658 bytes .../hmi/ui/setting/DebugSettingView.kt | 8 ++++++-- .../main/res/layout/view_debug_setting.xml | 1 + 4 files changed, 8 insertions(+), 3 deletions(-) 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 a93fd230ad..661733f998 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 (FunctionBuildConfig.isParkingOpen && lastUpdateTime > 0 && System.currentTimeMillis() - lastUpdateTime > 1000) { + if (lastUpdateTime > 0 && System.currentTimeMillis() - lastUpdateTime > 1000) { ThreadUtils.getIoPool().execute { CallerMapUIServiceManager.getOverlayManager()?.hidePoint("RenderParkingModel") } diff --git a/OCH/common/bridge/src/main/res/raw/parking_model.nt3d b/OCH/common/bridge/src/main/res/raw/parking_model.nt3d index 6343c9ab9015279ab0751fd55560f45d8cc07ae1..9989e16081774fb60539c9b020dc29aa8f3dbc33 100644 GIT binary patch literal 33658 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 literal 33494 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 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 24afc2201a..e762f22ca2 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 @@ -1108,8 +1108,12 @@ internal class DebugSettingView @JvmOverloads constructor( } }) } - tbParking.setOnCheckedChangeListener { _, isChecked -> - FunctionBuildConfig.isParkingOpen = isChecked + if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) { + tbParking.visibility = View.VISIBLE + tbParking.isChecked = FunctionBuildConfig.isParkingOpen + tbParking.setOnCheckedChangeListener { _, isChecked -> + FunctionBuildConfig.isParkingOpen = isChecked + } } //重启工控机所有节点 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 eb11ceca37..520f95c0c3 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 @@ -2674,6 +2674,7 @@ android:textColor="#000" android:textOff="点击开启进站点展示" android:textOn="点击关闭进站点展示" + android:visibility="gone" android:textSize="@dimen/dp_24" />