From b18cae9677fba4618365e3022c7af0260e851c2d Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Tue, 30 Aug 2022 15:10:28 +0800 Subject: [PATCH] opt --- .../core/function/autopilot/MoGoAutopilotProvider.kt | 10 +++++----- .../eagle/core/function/main/MainLauncherActivity.java | 7 ------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt index 4b2f8680b7..eb426b94f2 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt @@ -433,15 +433,15 @@ class MoGoAutopilotProvider : */ override fun sendOperatorChangeLaneLeft() { // Log.d("liyz", "MoGoAutopilotProvider sendOperatorChangeLaneLeft -------> ") -// AdasManager.getInstance().sendOperatorCmdChangeLaneLeft() + AdasManager.getInstance().sendOperatorCmdChangeLaneLeft() } /** * 向右变道 */ override fun sendOperatorChangeLaneRight() { - Log.d("liyz", "MoGoAutopilotProvider sendOperatorChangeLaneRight -------> ") -// AdasManager.getInstance().sendOperatorCmdChangeLaneRight() +// Log.d("liyz", "MoGoAutopilotProvider sendOperatorChangeLaneRight -------> ") + AdasManager.getInstance().sendOperatorCmdChangeLaneRight() } /** @@ -449,7 +449,7 @@ class MoGoAutopilotProvider : */ override fun sendOperatorSetAcceleratedSpeed(cc: Double) { // Log.d("liyz", "MoGoAutopilotProvider sendOperatorSetAcceleratedSpeed cc $cc ") -// AdasManager.getInstance().sendOperatorCmdSetAcceleratedSpeed(cc) + AdasManager.getInstance().sendOperatorCmdSetAcceleratedSpeed(cc) } /** @@ -457,7 +457,7 @@ class MoGoAutopilotProvider : */ override fun sendOperatorSetHorn(value: Double) { // Log.d("liyz", "MoGoAutopilotProvider sendOperatorSetHorn value $value ") -// AdasManager.getInstance().sendOperatorCmdSetHorn(value) + AdasManager.getInstance().sendOperatorCmdSetHorn(value) } /** diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java index 010768e236..d3dc6ecefb 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java @@ -271,12 +271,6 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis } return super.dispatchTouchEvent(event); - -// if (SharedPrefsMgr.getInstance(getContext()).getBoolean("BLUETOOTH", false)) { -// return false; -// } else { -// return super.dispatchTouchEvent(event); -// } } @Override @@ -380,7 +374,6 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis connectBluetooth(); //主动连接一次 }, 4000L); } - } catch (NoSuchMethodException e) { e.printStackTrace(); } catch (IllegalAccessException e) {