From e60f6b6271faa34b1f5bcc63eacd2aa6edc059ca Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Mon, 17 Jul 2023 19:21:57 +0800 Subject: [PATCH] =?UTF-8?q?[3.4.0]=E8=BF=90=E8=90=A5=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BC=B1=E7=BD=91=E5=87=8F=E9=80=9F=E5=81=9C?= =?UTF-8?q?=E8=BD=A6=E7=AD=96=E7=95=A5=E5=BC=80=E5=85=B3=E3=80=81=E6=95=85?= =?UTF-8?q?=E9=9A=9C=E5=87=8F=E9=80=9F=E5=81=9C=E8=BD=A6=E7=AD=96=E8=B7=AF?= =?UTF-8?q?=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/hmi/ui/setting/SOPSettingView.kt | 17 + .../src/main/res/layout/view_sop_setting.xml | 749 +++++++++--------- .../core/data/config/FunctionBuildConfig.kt | 15 + 3 files changed, 423 insertions(+), 358 deletions(-) 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 ce037cd70d..729f16b572 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 @@ -245,6 +245,23 @@ internal class SOPSettingView @JvmOverloads constructor( } } + //弱网减速停车 + tbWeakNetSlowDown.isChecked = FunctionBuildConfig.isWeakNetSlowDown + tbWeakNetSlowDown.setOnCheckedChangeListener{_, isChecked -> + FunctionBuildConfig.isWeakNetSlowDown = isChecked + CallerAutoPilotControlManager.sendWeakNetSlowDown(isChecked) + hmiAction("SOP 弱网减速停车, ",isChecked) + } + + //故障减速停车 + tbFaultSlowDown.isChecked = FunctionBuildConfig.isFaultSlowDown + tbFaultSlowDown.setOnCheckedChangeListener{_, isChecked -> + FunctionBuildConfig.isFaultSlowDown = isChecked + CallerAutoPilotControlManager.sendBreakdownSlowDown(isChecked) + hmiAction("SOP 故障减速停车, ",isChecked) + } + + //变道绕障的目标障碍物速度阈值 tvSpeed.text = "${FunctionBuildConfig.detouringSpeed} m/s" ivSpeedReduce.setOnClickListener { 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 67901a5fbc..6f483b07a9 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 @@ -1,368 +1,401 @@ - + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -