diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle index 31c8e8ebee..56e4020d79 100644 --- a/libraries/map-custom/build.gradle +++ b/libraries/map-custom/build.gradle @@ -55,7 +55,7 @@ dependencies { implementation project(':foudations:mogo-commons') } - implementation 'com.zhidaoauto.machine:map:1.0.0-online-18' + implementation 'com.zhidaoauto.machine:map:1.0.0-online-19' } apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java index f1ad2a1afc..317fab173f 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java @@ -50,6 +50,16 @@ public class V2XTestConsoleWindow extends ConstraintLayout { private Button mBtnTriggerParkEvent; private Button mBtnTriggerCallUserInfo; + private Button btnTriggerRearVIPCarTip, + btnTriggerVehicleBrakes, + btnTriggerRearDangerousVehicles, + btnTriggerReverseVehicleRoutePrediction, + btnTriggerVIPLightChange, + btnTriggerObstacleDetour, + btnTriggerPedestrianWarning, + btnTriggerCongestedRouteRecommendation, + btnTriggerDoubleFlash; + public static V2XTestConsoleWindow getInstance(Context context) { if (mV2XTestConsoleWindow == null) { synchronized (V2XTestConsoleWindow.class) { @@ -89,6 +99,17 @@ public class V2XTestConsoleWindow extends ConstraintLayout { mBtnTriggerParkEvent = findViewById(R.id.btnTriggerParkEvent); mBtnTriggerCallUserInfo = findViewById(R.id.btnTriggerCallUserInfo); + btnTriggerRearVIPCarTip = findViewById(R.id.btnTriggerRearVIPCarTip); + btnTriggerVehicleBrakes = findViewById(R.id.btnTriggerVehicleBrakes); + btnTriggerRearDangerousVehicles = findViewById(R.id.btnTriggerRearDangerousVehicles); + btnTriggerReverseVehicleRoutePrediction = findViewById(R.id.btnTriggerReverseVehicleRoutePrediction); + btnTriggerVIPLightChange = findViewById(R.id.btnTriggerVIPLightChange); + btnTriggerObstacleDetour = findViewById(R.id.btnTriggerObstacleDetour); + btnTriggerPedestrianWarning = findViewById(R.id.btnTriggerPedestrianWarning); + btnTriggerCongestedRouteRecommendation = findViewById(R.id.btnTriggerCongestedRouteRecommendation); + btnTriggerDoubleFlash = findViewById(R.id.btnTriggerDoubleFlash); + + mBtnTriggerCallUserInfo.setOnClickListener(v -> { MogoDriverInfo mogoDriverInfo = new MogoDriverInfo(); mogoDriverInfo.setAge(24); diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_test_console.xml b/modules/mogo-module-v2x/src/main/res/layout/window_test_console.xml index ab57767085..7b52dcf96f 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/window_test_console.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/window_test_console.xml @@ -24,9 +24,11 @@ android:id="@+id/btnTriggerOpen" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginEnd="@dimen/dp_10" + android:layout_marginBottom="@dimen/dp_10" + android:background="#FFF" android:padding="@dimen/dp_10" android:text="隐藏测试按钮面板" - android:background="#FFF" android:textColor="#000" android:textSize="@dimen/dp_22" app:layout_constraintBottom_toBottomOf="parent" @@ -36,6 +38,8 @@ android:id="@+id/btnClearRoadEvent" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginEnd="@dimen/dp_10" + android:layout_marginBottom="@dimen/dp_10" android:background="#6BCF23" android:padding="@dimen/dp_10" android:text="清除缓存播报" @@ -44,10 +48,24 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" /> + +