From a1f118990f4ff6954e901b888add144db91b12c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 2 Nov 2020 10:35:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E6=B5=8B=E8=AF=95=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scene/test/V2XTestConsoleWindow.java | 97 ---------- .../main/res/layout/window_test_console.xml | 168 ------------------ 2 files changed, 265 deletions(-) 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 4e244d0d3b..2828b96b13 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 @@ -43,7 +43,6 @@ public class V2XTestConsoleWindow extends ConstraintLayout { private LinearLayout mFlTestPanel; private FlexboxLayout flTestPanelShunNormal; private FlexboxLayout flTestPanelShunYi; - private FlexboxLayout flTestPanelVR; private Button mBtnTriggerOpen; private Button mBtnTriggerRoadEvent; private Button mBtnClearRoadEvent; @@ -56,16 +55,6 @@ public class V2XTestConsoleWindow extends ConstraintLayout { private Button mBtnTriggerCallUserInfo; private Button mBtnTriggerEventUgc; - private Button btnTriggerRearVIPCarTip, - btnTriggerVehicleBrakes, - btnTriggerRearDangerousVehicles, - btnTriggerReverseVehicleRoutePrediction, - btnTriggerVIPLightChange, - btnTriggerObstacleDetour, - btnTriggerPedestrianWarning, - btnTriggerCongestedRouteRecommendation, - btnTriggerDoubleFlash; - public static V2XTestConsoleWindow getInstance(Context context, int showType) { if (mV2XTestConsoleWindow == null) { synchronized (V2XTestConsoleWindow.class) { @@ -101,7 +90,6 @@ public class V2XTestConsoleWindow extends ConstraintLayout { mFlTestPanel = findViewById(R.id.flTestPanel); flTestPanelShunNormal = findViewById(R.id.flTestPanelShunNormal); flTestPanelShunYi = findViewById(R.id.flTestPanelShunYi); - flTestPanelVR = findViewById(R.id.flTestPanelVR); mBtnTriggerOpen = findViewById(R.id.btnTriggerOpen); mBtnClearRoadEvent = findViewById(R.id.btnClearRoadEvent); mBtnTriggerRoadEvent = findViewById(R.id.btnTriggerRoadEvent); @@ -114,22 +102,10 @@ public class V2XTestConsoleWindow extends ConstraintLayout { mBtnTriggerEventUgc = findViewById(R.id.btnTriggerEventUgc); 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); - - switch (showType) { case 0: flTestPanelShunNormal.setVisibility(View.VISIBLE); flTestPanelShunYi.setVisibility(View.VISIBLE); - flTestPanelVR.setVisibility(View.VISIBLE); break; case 1: flTestPanelShunNormal.setVisibility(View.VISIBLE); @@ -137,9 +113,6 @@ public class V2XTestConsoleWindow extends ConstraintLayout { case 2: flTestPanelShunYi.setVisibility(View.VISIBLE); break; - case 3: - flTestPanelVR.setVisibility(View.VISIBLE); - break; } @@ -241,76 +214,6 @@ public class V2XTestConsoleWindow extends ConstraintLayout { LocalBroadcastManager.getInstance(getContext()).sendBroadcast(intent); }); - /* - *后方VIP车辆提示 - * */ - btnTriggerRearVIPCarTip.setOnClickListener(v -> { - - }); - /* - *前车急刹 - * */ - btnTriggerVehicleBrakes.setOnClickListener(v -> { - - }); - /* - *后方危险车辆预警 - * */ - btnTriggerRearDangerousVehicles.setOnClickListener(v -> { - - }); - - /* - * 逆向车辆路线预判 - * */ - btnTriggerReverseVehicleRoutePrediction.setOnClickListener(v -> { - V2XMessageEntity v2XMessageEntity = - TestOnLineCarUtils.getV2XScenarionVRReverseCarData(); - - Intent intent = new Intent(V2XConst.BROADCAST_SCENE_HANDLER_ACTION); - intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2XMessageEntity); - LocalBroadcastManager.getInstance(getContext()).sendBroadcast(intent); - }); - - /* - *VIP变灯通行 - * */ - btnTriggerVIPLightChange.setOnClickListener(v -> { - - }); - - /* - *障碍物绕行 - * */ - btnTriggerObstacleDetour.setOnClickListener(v -> { - - }); - - /* - *行人预警，行人路线预测 - * */ - btnTriggerPedestrianWarning.setOnClickListener(v -> { - - }); - - /* - *拥堵路线推荐 - * */ - btnTriggerCongestedRouteRecommendation.setOnClickListener(v -> { - V2XMessageEntity v2XMessageEntity = - TestOnLineCarUtils.getV2XScenarioPushVR(); - - Intent intent = new Intent(V2XConst.BROADCAST_SCENE_HANDLER_ACTION); - intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2XMessageEntity); - LocalBroadcastManager.getInstance(getContext()).sendBroadcast(intent); - }); - - /* - *双闪车辆，自动绕行 - * */ - btnTriggerDoubleFlash.setOnClickListener(v -> { - - }); } } 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 a9ec871198..70d9c116d6 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 @@ -152,20 +152,6 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" /> -