From a4e48a5b5afa2df3eca106572eb425e3c3db544d Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Tue, 30 Aug 2022 11:02:14 +0800 Subject: [PATCH 1/2] opt --- .../core/function/autopilot/MoGoAutopilotProvider.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 eb426b94f2..4b2f8680b7 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) } /** From d27cea94e67db927ea36d9fc63aa4c8daa09d2db Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Tue, 30 Aug 2022 11:20:04 +0800 Subject: [PATCH 2/2] fixed bug --- .../mogo/eagle/core/function/main/MainLauncherActivity.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 8f171372f6..010768e236 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 @@ -413,7 +413,9 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis } } // Log.d("liyz", "connectBluetooth macAddress = " + macAddress + "---pos = " + pos); - method.invoke(mAreadlyConnectedList.get(pos)); + if (mAreadlyConnectedList.size() > pos && (pos >= 0)) { + method.invoke(mAreadlyConnectedList.get(pos)); + } } catch (NoSuchMethodException e) { e.printStackTrace();