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 82dff7fa39..2504f00c71 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 @@ -23,6 +23,7 @@ import androidx.annotation.Nullable; import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.commons.debug.DebugConfig; import com.mogo.eagle.core.data.config.FunctionBuildConfig; +import com.mogo.eagle.core.data.config.HdMapBuildConfig; import com.mogo.eagle.core.function.api.base.IMoGoFunctionProvider; import com.mogo.eagle.core.function.api.setting.IMoGoSkinModeChangeListener; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager; @@ -34,6 +35,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr; import com.mogo.eagle.core.utilcode.util.BarUtils; import com.mogo.eagle.core.utilcode.util.ToastUtils; +import com.mogo.eagle.core.utilcode.util.UiThreadHandler; import com.mogo.map.MogoMapUIController; import com.mogo.service.intent.IMogoIntentListener; import com.rousetime.android_startup.model.CostTimesModel; @@ -183,16 +185,18 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis @Override public boolean onKeyDown(int keyCode, KeyEvent event) { - if (keyCode == KeyEvent.KEYCODE_VOLUME_UP) { //向上长按 + if (keyCode == KeyEvent.KEYCODE_VOLUME_UP) { //向上长按 开启自动驾驶 MogoMapUIController.getInstance().setScrollGesturesEnable(false); long currentTime = System.currentTimeMillis() / (1000); long oldTime = SharedPrefsMgr.getInstance(getContext()).getLong("old_time_up", 0); // Log.d("liyz", "time = " + (currentTime - oldTime)); if (currentTime - oldTime > 8) { SharedPrefsMgr.getInstance(getContext()).putLong("old_time_up", System.currentTimeMillis() / 1000); -// ToastUtils.showShort("长按 ↑↑↑"); +// ToastUtils.showShort("长按 ↑↑↑ 开启自动驾驶"); CallerAutoPilotManager.INSTANCE.setControlAutopilotCarAuto(true); } + recoverMapControl(); + return true; } else if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) { //下和中间键盘长按,减速为-2 MogoMapUIController.getInstance().setScrollGesturesEnable(false); @@ -200,9 +204,10 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis long oldTime = SharedPrefsMgr.getInstance(getContext()).getLong("old_time_down", 0); if (currentTime - oldTime > 8) { SharedPrefsMgr.getInstance(getContext()).putLong("old_time_down", System.currentTimeMillis() / 1000); -// ToastUtils.showShort("长按 ↓↓↓"); +// ToastUtils.showShort("长按 ↓↓↓ 减速 -2 "); sendAcc(true, -2); } + recoverMapControl(); return true; } return super.onKeyDown(keyCode, event); @@ -216,6 +221,9 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis // ToastUtils.showShort("← 向左变道"); // MogoMapUIController.getInstance().setLockMode( true ); CallerAutoPilotManager.INSTANCE.sendOperatorChangeLaneLeft(); + + recoverMapControl(); + return true; } else if (event.getX() == -1096.25 && event.getY() == 132.5) { //鸣笛 MogoMapUIController.getInstance().setScrollGesturesEnable(false); @@ -233,21 +241,28 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis } }, 500); + recoverMapControl(); + return true; } else if (event.getX() == -863.4375 && event.getY() == 690.0) { //向右变道 MogoMapUIController.getInstance().setScrollGesturesEnable(false); CallerAutoPilotManager.INSTANCE.sendOperatorChangeLaneRight(); // ToastUtils.showShort("→ 向右变道"); + recoverMapControl(); return true; } else if (event.getX() == -1096.25 && event.getY() == 1099.0) { // -1减速 MogoMapUIController.getInstance().setScrollGesturesEnable(false); sendAcc(true, -1); -// ToastUtils.showShort("↓ 减速"); +// ToastUtils.showShort("↓ 减速 -1 "); + recoverMapControl(); + return true; } else if (event.getX() == -1096.25 && event.getY() == 690.0) { //复原 - MogoMapUIController.getInstance().setScrollGesturesEnable(true); + MogoMapUIController.getInstance().setScrollGesturesEnable(false); // ToastUtils.showShort("O 复原 "); sendAcc(false, 0.0); + + recoverMapControl(); return true; } @@ -268,7 +283,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis //→ x:-863.4375 y: 690.0 //↓ x:-1096.25 y:1099.0 //O x:-1096.25 y:690.0 - Log.d("liyz", "onTouchEvent event.getX() = " + event.getX() + "--event.getY() = " + event.getY()); +// Log.d("liyz", "onTouchEvent event.getX() = " + event.getX() + "--event.getY() = " + event.getY()); if (event.getX() == -1469.6875 && event.getY() == 530.0) { // ToastUtils.showShort("←"); @@ -320,6 +335,13 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis } } + private void recoverMapControl() { + UiThreadHandler.postDelayed(() -> { + MogoMapUIController.getInstance().setScrollGesturesEnable(true); + }, 5_00L + ); + } + /** * 初始化蓝牙广播 */