From c5407d3a2b08334c75ddbfe716a34000ca387fd9 Mon Sep 17 00:00:00 2001
From: renwj <renwenjie@zhidaoauto.com>
Date: Mon, 25 Mar 2024 14:59:11 +0800
Subject: [PATCH] =?UTF-8?q?[6.3.0][=E8=98=91=E6=96=B9=E4=BC=98=E5=8C=96]?=
 =?UTF-8?q?=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hmi/ui/mofang/MoFangStatusView.kt         | 30 ++++++++-----------
 1 file changed, 13 insertions(+), 17 deletions(-)

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)) {