diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt index f8a6fec0f3..0e854d9a85 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt @@ -147,6 +147,7 @@ internal object V2NIdentifyDrawer { object : IMoGoWarningStatusListener { override fun onShow() { super.onShow() + runCatching { CallerHmiManager.notifyXiaoZhiStatusChanged(V2N(EventTypeEnumNew.valueOf(poiType)), State.START) } CallerVisualAngleManager.changeAngle( RoadEvent( itx.longitude, @@ -158,6 +159,7 @@ internal object V2NIdentifyDrawer { override fun onDismiss() { super.onDismiss() + runCatching { CallerHmiManager.notifyXiaoZhiStatusChanged(V2N(EventTypeEnumNew.valueOf(poiType)), State.STOP) } CallerVisualAngleManager.changeAngle(Default()) } }, diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/mofang/MoFangStatusView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/mofang/MoFangStatusView.kt index 3c953893a7..3cda1fea21 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/mofang/MoFangStatusView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/mofang/MoFangStatusView.kt @@ -93,17 +93,15 @@ class MoFangStatusView : LinearLayout, OnMoFangStatusListener, IMoGoAutopilotSta override fun onMoFangBatteryChanged(battery: Int) {} override fun onMoFangClicked(keyCode: Int) { - if (!CallerAutoPilotStatusListenerManager.isConnect()) { - ToastUtils.showShort("工控机连接异常,无法执行魔方命令") - return - } - val enabled = CallerDevaToolsManager.mofang()?.isEnabled(1, keyCode) ?: true if (!enabled) { Log.d(TAG, "单击 -> 按键:${keyCode}被禁用...") return } - + if (!CallerAutoPilotStatusListenerManager.isConnect()) { + ToastUtils.showShort("工控机连接异常,无法执行魔方命令") + return + } if (keyCode == KeyEvent.KEYCODE_A) { if (tv_icon_2?.tag != 2 && tv_icon_2?.isSelected == true) { tv_icon_2?.isSelected = false @@ -174,17 +172,15 @@ class MoFangStatusView : LinearLayout, OnMoFangStatusListener, IMoGoAutopilotSta } override fun onMoFangLongClicked(keyCode: Int) { - if (!CallerAutoPilotStatusListenerManager.isConnect()) { - ToastUtils.showShort("工控机连接异常,无法执行魔方命令") - return - } - val isEnabled = CallerDevaToolsManager.mofang()?.isEnabled(2, keyCode) ?: true if (!isEnabled) { Log.d(TAG, "长按 -> 按键:${keyCode}被禁用...") return } - + if (!CallerAutoPilotStatusListenerManager.isConnect()) { + ToastUtils.showShort("工控机连接异常,无法执行魔方命令") + return + } if (keyCode == KeyEvent.KEYCODE_A) { if (tv_icon_2?.tag != 2 && tv_icon_2?.isSelected == true) { tv_icon_2?.isSelected = false @@ -228,6 +224,11 @@ class MoFangStatusView : LinearLayout, OnMoFangStatusListener, IMoGoAutopilotSta } override fun onMoFangCombineClicked(vararg keyCodes: Int) { + val isEnabled = CallerDevaToolsManager.mofang()?.isEnabled(3, *keyCodes) ?: true + if (!isEnabled) { + Log.d(TAG, "组合 -> 按键:${keyCodes.joinToString(",")}被禁用...") + return + } if (!CallerAutoPilotStatusListenerManager.isConnect()) { ToastUtils.showShort("工控机连接异常,无法执行魔方命令") return @@ -235,11 +236,6 @@ class MoFangStatusView : LinearLayout, OnMoFangStatusListener, IMoGoAutopilotSta if (keyCodes.size != 2) { return } - val isEnabled = CallerDevaToolsManager.mofang()?.isEnabled(3, *keyCodes) ?: true - if (!isEnabled) { - Log.d(TAG, "组合 -> 按键:${keyCodes.joinToString(",")}被禁用...") - return - } val key1 = keyCodes[0] val key2 = keyCodes[1] if (key1 == KeyEvent.KEYCODE_A && key2 == KeyEvent.KEYCODE_B || (key1 == KeyEvent.KEYCODE_B && key2 == KeyEvent.KEYCODE_A)) {