From 787e2ef9eda078770ae98bec5f81b8468041bfe2 Mon Sep 17 00:00:00 2001
From: anfe <448468458@qq.com>
Date: Sat, 15 Jun 2024 16:41:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=20ota=20=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lockSet/lockEscalation/lockEscalation_logic.dart           | 3 +--
 lib/main/lockDetail/lockSet/lockEscalation/version_entity.dart | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/main/lockDetail/lockSet/lockEscalation/lockEscalation_logic.dart b/lib/main/lockDetail/lockSet/lockEscalation/lockEscalation_logic.dart
index 563c9d9e..47e04211 100755
--- a/lib/main/lockDetail/lockSet/lockEscalation/lockEscalation_logic.dart
+++ b/lib/main/lockDetail/lockSet/lockEscalation/lockEscalation_logic.dart
@@ -17,7 +17,6 @@ import 'package:star_lock/blue/io_reply.dart';
 import 'package:star_lock/blue/io_tool/io_tool.dart';
 import 'package:star_lock/blue/io_tool/manager_event_bus.dart';
 import 'package:star_lock/blue/sender_manage.dart';
-import 'package:star_lock/main/lockDetail/lockSet/lockEscalation/updateLockInfo_entity.dart';
 import 'package:star_lock/main/lockDetail/lockSet/lockEscalation/version_entity.dart';
 import 'package:star_lock/network/api_repository.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
@@ -351,10 +350,10 @@ class LockEscalationLogic extends BaseGetXController {
         otaIndex++;
         processOtaUpgrade();
       } else if (reply is ConfirmationOTAUpgradeReply && reply.status == 0x00) {
-        closeOTADAta();
         ApiRepository.to.getLockUpdateLockInfo(
             lockId: CommonDataManage().currentKeyInfo.lockId ?? 0,
             fwVersion: state.showNewVersion.value);
+        closeOTADAta();
         showToast('固件升级完成'.tr);
       } else if (reply is GetStarLockStatuInfoReply) {
         _replyGetStarLockStatusInfo(reply);
diff --git a/lib/main/lockDetail/lockSet/lockEscalation/version_entity.dart b/lib/main/lockDetail/lockSet/lockEscalation/version_entity.dart
index 74e6d8e0..41fcec8e 100644
--- a/lib/main/lockDetail/lockSet/lockEscalation/version_entity.dart
+++ b/lib/main/lockDetail/lockSet/lockEscalation/version_entity.dart
@@ -30,6 +30,7 @@ class Data {
     isUpdate = json['isUpdate'];
     downloadUrl = json['downloadUrl'];
     description = json['description'];
+    version = json['version'];
   }
 
   int? isUpdate;