diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt index bc149e3a74..e09be69d5a 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt @@ -1029,6 +1029,9 @@ object TaxiTaskModel { * ⑥ 拉取任务失败后5s后重试 */ fun startPrepareTaskDelay(delayTime: Long, siteId: Long) { + if(delayTime<0){ + return + } removePrepareTaskDelay() mPrepareTaskDelayRunnable = Runnable { diff --git a/app/script/vehicleFlavors/T1T2.gradle b/app/script/vehicleFlavors/T1T2.gradle index a653f6a7d1..0f06f2e528 100644 --- a/app/script/vehicleFlavors/T1T2.gradle +++ b/app/script/vehicleFlavors/T1T2.gradle @@ -20,6 +20,8 @@ project.android.productFlavors { // ③能启动自驾的档位 MAP<360代码中会移除P档 buildConfigField 'java.util.Set', 'LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet(){{add(chassis.Chassis.GearPosition.GEAR_D);add(chassis.Chassis.GearPosition.GEAR_N);add(chassis.Chassis.GearPosition.GEAR_P);}}' + // ④是否支持多屏显示 + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' } } \ No newline at end of file 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 fd70e350cf..fe22693028 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 @@ -53,6 +53,7 @@ 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.rbNo 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 @@ -898,6 +899,7 @@ internal class SOPSettingView @JvmOverloads constructor( rbFifteen.isChecked = virtualTaskPullTaskInterval == 15 rbThirty.isChecked = virtualTaskPullTaskInterval == 30 rbFortyFive.isChecked = virtualTaskPullTaskInterval == 45 + rbNo.isChecked = virtualTaskPullTaskInterval == -1 rgPullTime.setOnCheckedChangeListener { _, checkedId -> when (checkedId) { R.id.rbFortyFive -> { @@ -912,6 +914,9 @@ internal class SOPSettingView @JvmOverloads constructor( R.id.rbFive -> { CallerUnmannedListenerManager.dispatchVirtualTaskPullTaskInterval(5) } + R.id.rbNo -> { + CallerUnmannedListenerManager.dispatchVirtualTaskPullTaskInterval(-1) + } } clickEventAnalytics("Taxi无人化演练任务拉取时间间隔",true) } 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 7991eff6d9..79507f4ee8 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 @@ -930,6 +930,13 @@ android:layout_margin="10dp" android:text="5s" android:textSize="32dp" /> +