[6.2.0 -> master]

[冲突业务]
This commit is contained in:
yangyakun
2023-12-04 16:40:19 +08:00
parent 36e3342e64
commit f6aca28b24
2 changed files with 13 additions and 0 deletions

View File

@@ -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 {

View File

@@ -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