From 8038f5467f8d8776a9ecf22b095a58475f33f066 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Thu, 18 Mar 2021 19:35:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0adas=E8=AF=86=E5=88=AB?= =?UTF-8?q?=E6=B8=B2=E6=9F=93=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/commons/debug/DebugConfig.java | 10 ++++++++++ .../common/drawer/AdasRecognizedResultDrawer.java | 3 ++- .../mogo/module/extensions/navi/VrModeNavInfoView.java | 8 ++++++++ .../mogo/module/service/intent/MockIntentHandler.java | 4 ++++ 4 files changed, 24 insertions(+), 1 deletion(-) diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java index 8aeefeaa99..1713f11156 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java @@ -464,4 +464,14 @@ public class DebugConfig { } return result; } + + private static boolean isUseAdasRecognize = true; + + public static void setUseAdasRecognize(boolean status) { + isUseAdasRecognize = status; + } + + public static boolean isUseAdasRecognize(){ + return isUseAdasRecognize; + } } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java index 2859644b16..77572ca45d 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java @@ -6,6 +6,7 @@ import android.os.Message; import android.text.TextUtils; import com.mogo.commons.AbsMogoApplication; +import com.mogo.commons.debug.DebugConfig; import com.mogo.map.MogoLatLng; import com.mogo.map.marker.IMogoMarker; import com.mogo.map.marker.MogoMarkerOptions; @@ -146,7 +147,7 @@ class AdasRecognizedResultDrawer extends BaseDrawer { * @param resultList */ public void renderAdasRecognizedResult( List< ADASRecognizedResult > resultList ) { - if ( resultList == null || resultList.isEmpty() ) { + if ( resultList == null || resultList.isEmpty() || !DebugConfig.isUseAdasRecognize()) { clearOldMarker(); return; } diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/VrModeNavInfoView.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/VrModeNavInfoView.java index cee3d0dce0..a00b1a9719 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/VrModeNavInfoView.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/VrModeNavInfoView.java @@ -12,9 +12,11 @@ import android.widget.TextView; import androidx.constraintlayout.widget.Group; +import com.mogo.commons.debug.DebugConfig; import com.mogo.map.navi.MogoNaviInfo; import com.mogo.module.extensions.R; import com.mogo.module.extensions.view.VerticalTrafficLightView; +import com.mogo.utils.TipToast; import static com.mogo.module.common.constants.TrafficLightConst.TRAFFIC_LIGHT_COLOR_GRAY; @@ -61,6 +63,12 @@ public class VrModeNavInfoView extends BaseNaviInfoView implements Handler.Callb tvDistance = findViewById(R.id.module_map_id_navi_next_info_distance_in_vr_mode); tvDistanceUnit = findViewById(R.id.module_map_id_navi_next_info_distance_unit_in_vr_mode); tvNextRoad = findViewById(R.id.module_map_id_navi_next_info_road_in_vr_mode); + + tvCurrentSpeed.setOnLongClickListener(v -> { + DebugConfig.setUseAdasRecognize(!DebugConfig.isUseAdasRecognize()); + TipToast.shortTip(DebugConfig.isUseAdasRecognize()?"Adas识别--打开":"Adas识别--关闭"); + return false; + }); } public void startNav() { diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java index 250b8f8b66..9e52d965ae 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java @@ -627,6 +627,10 @@ public class MockIntentHandler implements IntentHandler { case 52: EnvStatusManager.getInstance().showPanel( context ); break; + case 53: + boolean isUseAdasRecognize = intent.getBooleanExtra( "status", false ); + DebugConfig.setUseAdasRecognize(isUseAdasRecognize); + break; } }