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: { - // 'pwdTimestamp': state.timestampValue * 1000, - // 'lockInfo': state.lockInfo, - // 'featureValue': state.featureValue, - // 'featureSettingValue': state.featureSettingValue, - // 'featureSettingParams': state.featureSettingParams, - // }); - Get.toNamed(Routers.saveLockPage, arguments: { - '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: { + 'addressInfo': {}, + 'pwdTimestamp': state.timestampValue * 1000, + 'lockInfo': state.lockInfo, + 'featureValue': state.featureValue, + 'featureSettingValue': state.featureSettingValue, + 'featureSettingParams': state.featureSettingParams, + 'isFromMap': 0, + }); + } break; case 0x06: