From b238d7ba5a9af9cb7b263477beee9aa405198b72 Mon Sep 17 00:00:00 2001
From: wuyaxi <18682150237@163.com>
Date: Fri, 18 Jul 2025 10:31:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=E9=94=81=E9=80=89=E6=8B=A9=E6=96=87=E4=BB=B6=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E8=B7=B3=E8=BD=AC=E9=94=99=E8=AF=AF=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../addLock/nearbyLock/nearbyLock_logic.dart  | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/lib/mine/addLock/nearbyLock/nearbyLock_logic.dart b/lib/mine/addLock/nearbyLock/nearbyLock_logic.dart
index 34d9b240..d2d40ad2 100755
--- a/lib/mine/addLock/nearbyLock/nearbyLock_logic.dart
+++ b/lib/mine/addLock/nearbyLock/nearbyLock_logic.dart
@@ -330,22 +330,23 @@ class NearbyLockLogic extends BaseGetXController {
         state.featureSettingParams = featureParaTotalList;
         AppLog.log('featureParaTotalList:$featureParaTotalList');
 
-        // Get.toNamed(Routers.lockAddressGaoDePage, arguments: <String, Object>{
-        //   'pwdTimestamp': state.timestampValue * 1000,
-        //   'lockInfo': state.lockInfo,
-        //   'featureValue': state.featureValue,
-        //   'featureSettingValue': state.featureSettingValue,
-        //   'featureSettingParams': state.featureSettingParams,
-        // });
-        Get.toNamed(Routers.saveLockPage, arguments: <String, Object?>{
-          'addressInfo': {},
-          'pwdTimestamp': state.timestampValue * 1000,
-          'lockInfo': state.lockInfo,
-          'featureValue': state.featureValue,
-          'featureSettingValue': state.featureSettingValue,
-          'featureSettingParams': state.featureSettingParams,
-          'isFromMap': 0,
-        });
+        // 如果是固件升级模式，不跳转到添加锁页面，停留在当前页面进行升级
+        if (state.otaState.value) {
+          // 固件升级模式：开始升级流程
+          dismissEasyLoading();
+          otaUpdate();
+        } else {
+          // 正常添加锁模式：跳转到保存锁页面
+          Get.toNamed(Routers.saveLockPage, arguments: <String, Object?>{
+            'addressInfo': {},
+            'pwdTimestamp': state.timestampValue * 1000,
+            'lockInfo': state.lockInfo,
+            'featureValue': state.featureValue,
+            'featureSettingValue': state.featureSettingValue,
+            'featureSettingParams': state.featureSettingParams,
+            'isFromMap': 0,
+          });
+        }
 
         break;
       case 0x06: