diff --git a/app_ipc_monitoring/build.gradle b/app_ipc_monitoring/build.gradle index 164272dd71..d52b8fbaea 100644 --- a/app_ipc_monitoring/build.gradle +++ b/app_ipc_monitoring/build.gradle @@ -92,7 +92,7 @@ android { it.buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR_BUS', 'new java.util.HashSet(){{add(chassis.Chassis.GearPosition.GEAR_N);add(chassis.Chassis.GearPosition.GEAR_R);}}' it.buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR_M1', 'null' it.buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR_M2', 'new java.util.HashSet(){{add(chassis.Chassis.GearPosition.GEAR_N);add(chassis.Chassis.GearPosition.GEAR_P);add(chassis.Chassis.GearPosition.GEAR_R);}}' - it.buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR_SWEEPER', 'new java.util.HashSet(){{add(chassis.Chassis.GearPosition.GEAR_N);}}' + it.buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR_SWEEPER', 'null' it.buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR_VAN', 'null' } compileOptions { diff --git a/app_ipc_monitoring/gradle.properties b/app_ipc_monitoring/gradle.properties index 82f55b7698..20893e085c 100644 --- a/app_ipc_monitoring/gradle.properties +++ b/app_ipc_monitoring/gradle.properties @@ -1,2 +1,2 @@ -#Wed Mar 01 12:23:40 CST 2023 -VERSION_CODE=1 +#Thu Mar 02 14:18:22 CST 2023 +VERSION_CODE=2 diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/VersionFragment.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/VersionFragment.java index 2a19084ab1..a6420d2506 100644 --- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/VersionFragment.java +++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/VersionFragment.java @@ -195,30 +195,36 @@ public class VersionFragment extends BaseFragment { public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.rb_taxi) { AutopilotAbilityManager.getInstance().setUnableLaunchAutopilotGear(BuildConfig.UNABLE_LAUNCH_AUTOPILOT_GEAR_TAXI); - gear("TAXI", Arrays.toString(BuildConfig.UNABLE_LAUNCH_AUTOPILOT_GEAR_TAXI.toArray())); + gear("TAXI", BuildConfig.UNABLE_LAUNCH_AUTOPILOT_GEAR_TAXI); } else if (checkedId == R.id.rb_bus) { AutopilotAbilityManager.getInstance().setUnableLaunchAutopilotGear(BuildConfig.UNABLE_LAUNCH_AUTOPILOT_GEAR_BUS); - gear("BUS", Arrays.toString(BuildConfig.UNABLE_LAUNCH_AUTOPILOT_GEAR_BUS.toArray())); + gear("BUS", BuildConfig.UNABLE_LAUNCH_AUTOPILOT_GEAR_BUS); } else if (checkedId == R.id.rb_sweeper) { AutopilotAbilityManager.getInstance().setUnableLaunchAutopilotGear(BuildConfig.UNABLE_LAUNCH_AUTOPILOT_GEAR_SWEEPER); - gear("SWEEPER", Arrays.toString(BuildConfig.UNABLE_LAUNCH_AUTOPILOT_GEAR_SWEEPER.toArray())); + gear("SWEEPER", BuildConfig.UNABLE_LAUNCH_AUTOPILOT_GEAR_SWEEPER); } else if (checkedId == R.id.rb_m1) { AutopilotAbilityManager.getInstance().setUnableLaunchAutopilotGear(BuildConfig.UNABLE_LAUNCH_AUTOPILOT_GEAR_M1); - gear("M1", "无限制"); + gear("M1", BuildConfig.UNABLE_LAUNCH_AUTOPILOT_GEAR_M1); } else if (checkedId == R.id.rb_m2) { AutopilotAbilityManager.getInstance().setUnableLaunchAutopilotGear(BuildConfig.UNABLE_LAUNCH_AUTOPILOT_GEAR_M2); - gear("M1", Arrays.toString(BuildConfig.UNABLE_LAUNCH_AUTOPILOT_GEAR_M2.toArray())); + gear("M1", BuildConfig.UNABLE_LAUNCH_AUTOPILOT_GEAR_M2); } else if (checkedId == R.id.rb_van) { AutopilotAbilityManager.getInstance().setUnableLaunchAutopilotGear(BuildConfig.UNABLE_LAUNCH_AUTOPILOT_GEAR_VAN); - gear("VAN", "无限制"); + gear("VAN", BuildConfig.UNABLE_LAUNCH_AUTOPILOT_GEAR_VAN); } } }); - gear("TAXI", Arrays.toString(BuildConfig.UNABLE_LAUNCH_AUTOPILOT_GEAR_TAXI.toArray())); + gear("TAXI", BuildConfig.UNABLE_LAUNCH_AUTOPILOT_GEAR_TAXI); } - private void gear(String car, String gear) { + private void gear(String car, Set unableLaunchAutopilotGear) { title_gear.setText(car + "不能启动自动驾驶的档位:"); + String gear; + if (unableLaunchAutopilotGear == null) { + gear = "无限制"; + } else { + gear = Arrays.toString(unableLaunchAutopilotGear.toArray()); + } this.gear.setText(gear); } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt index 36443407ea..f3a10804ea 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt @@ -183,10 +183,6 @@ class BindingCarNetWorkManager private constructor() { CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(R.raw.huanwei) HdMapBuildConfig.currentCarVrIconRes = R.raw.huanwei } - else -> { - CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(R.raw.chuzuche) - HdMapBuildConfig.currentCarVrIconRes = R.raw.chuzuche - } } }