From f6aca28b24ad6805f0c7af10629512b53c8c5e0f Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 4 Dec 2023 16:40:19 +0800 Subject: [PATCH] =?UTF-8?q?[6.2.0=20->=20master]=20[=E5=86=B2=E7=AA=81?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 3 +++ .../core/function/hmi/ui/setting/SOPSettingView.kt | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/app/build.gradle b/app/build.gradle index dd5f3f7892..b2792e571b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -139,6 +139,9 @@ android { // 是否支持卡顿检测 buildConfigField 'boolean', 'IS_SUPPORT_JUNK_DETECT', "${rootProject.isJunkDetectEnable()}" + + buildConfigField 'String', 'SWEEPER_DEFAULT_MODE', '\"Cloud\"' + buildConfigField 'boolean', 'SWEEPER_CAN_SWITCH_MODE', 'true' } mogo { 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 c31baefd9c..8293bbed28 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 @@ -41,12 +41,20 @@ import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.zhjt.mogo.adas.data.AdasConstants import com.zhjt.mogo.adas.data.bean.AdasParam +import kotlinx.android.synthetic.main.view_sop_setting.view.btnSpeedOverTakeSet import kotlinx.android.synthetic.main.view_sop_setting.view.btnSpeedSet import kotlinx.android.synthetic.main.view_sop_setting.view.ivSpeedAdd +import kotlinx.android.synthetic.main.view_sop_setting.view.ivSpeedOverTakeAdd +import kotlinx.android.synthetic.main.view_sop_setting.view.ivSpeedOverTakeReduce import kotlinx.android.synthetic.main.view_sop_setting.view.ivSpeedReduce import kotlinx.android.synthetic.main.view_sop_setting.view.mfStatusLayout import kotlinx.android.synthetic.main.view_sop_setting.view.mfTest +import kotlinx.android.synthetic.main.view_sop_setting.view.rbFifteen +import kotlinx.android.synthetic.main.view_sop_setting.view.rbFive +import kotlinx.android.synthetic.main.view_sop_setting.view.rbFortyFive +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.scDemoMode import kotlinx.android.synthetic.main.view_sop_setting.view.scDrawPointCloudData @@ -74,7 +82,9 @@ import kotlinx.android.synthetic.main.view_sop_setting.view.scV2iPnc import kotlinx.android.synthetic.main.view_sop_setting.view.scV2nPnc import kotlinx.android.synthetic.main.view_sop_setting.view.scWeakNetSlowDown import kotlinx.android.synthetic.main.view_sop_setting.view.sopLayout +import kotlinx.android.synthetic.main.view_sop_setting.view.tvOverTakeLimit import kotlinx.android.synthetic.main.view_sop_setting.view.tvSpeed +import kotlinx.android.synthetic.main.view_sop_setting.view.tvSpeedOverTakeLimit import kotlinx.android.synthetic.main.view_sop_setting.view.tvSpeedThresholdTitle import mogo.telematics.pad.MessagePad