From caac5f2a55ec9d1d24536731e33a700d996413fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=8F=E5=B0=91=E9=98=B3?= <786612630@qq.com>
Date: Wed, 24 Jul 2024 10:12:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=B5=E5=AD=90=E9=92=A5?=
 =?UTF-8?q?=E5=8C=99=E5=BC=80=E9=94=81=E6=88=90=E5=8A=9F=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lockDetail/lockDetail_logic.dart          | 21 ++++++++++++++++++-
 lib/network/api_provider.dart                 |  9 ++++++++
 lib/network/api_repository.dart               |  7 +++++++
 pre_build.sh                                  |  0
 pubspec.yaml                                  |  2 +-
 5 files changed, 37 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 pre_build.sh

diff --git a/lib/main/lockDetail/lockDetail/lockDetail_logic.dart b/lib/main/lockDetail/lockDetail/lockDetail_logic.dart
index 268bb6d9..ed4dd52e 100755
--- a/lib/main/lockDetail/lockDetail/lockDetail_logic.dart
+++ b/lib/main/lockDetail/lockDetail/lockDetail_logic.dart
@@ -88,7 +88,10 @@ class LockDetailLogic extends BaseGetXController {
           state.electricQuantityStandby.value = powerStandby;
         }
         // 更新电量
-        uploadElectricQuantityRequest();
+        await uploadElectricQuantityRequest();
+
+        // 开锁成功上报
+        lockReportLockSuccessfullyUploadData();
         //锁数据更新
         // getLockRecordLastUploadDataTime();
         resetOpenDoorState();
@@ -491,6 +494,22 @@ class LockDetailLogic extends BaseGetXController {
     }
   }
 
+  // 电子钥匙开锁成功上报
+  Future<void> lockReportLockSuccessfullyUploadData() async {
+    final KeyOperationRecordEntity entity = await ApiRepository.to.lockReportLockSuccessfullyUploadData(
+        lockId: state.keyInfos.value.lockId ?? 0,
+        keyId: state.keyInfos.value.keyId ?? 0
+    );
+    if (entity.errorCode!.codeIsSuccessful) {
+      // mockNetworkDataRequest();
+      AppLog.log('state.keyInfos.value.keyType:${state.keyInfos.value.keyType}');
+      if (state.keyInfos.value.keyType == XSConstantMacro.keyTypeOnce) {
+        // 单次删除
+        deletKeyData();
+      }
+    }
+  }
+
   // 普通用户或者授权管理员删除钥匙
   Future<void> deletKeyData() async {
     final ElectronicKeyListEntity entity = await ApiRepository.to
diff --git a/lib/network/api_provider.dart b/lib/network/api_provider.dart
index 8499afa5..f6bc9df6 100755
--- a/lib/network/api_provider.dart
+++ b/lib/network/api_provider.dart
@@ -339,6 +339,15 @@ class ApiProvider extends BaseProvider {
         isShowErrMsg: false,
       );
 
+  // 锁记录上传
+  Future<Response> lockReportLockSuccessfullyUploadData(int lockId, int keyId) => post(
+      lockRecordUploadURL.toUrl,
+      jsonEncode({
+        'lockId': lockId,
+        'keyId': keyId,
+      }),
+      isUnShowLoading: true);
+
   // 获取手机联网token
   Future<Response> getLockNetToken(String lockId) => post(
       getLockNetTokenURL.toUrl,
diff --git a/lib/network/api_repository.dart b/lib/network/api_repository.dart
index d41935dd..ee5e211c 100755
--- a/lib/network/api_repository.dart
+++ b/lib/network/api_repository.dart
@@ -308,6 +308,13 @@ class ApiRepository {
     return LockOperatingRecordGetLastRecordTimeEntity.fromJson(res.body);
   }
 
+  // 电子钥匙开锁成功上报
+  Future<KeyOperationRecordEntity> lockReportLockSuccessfullyUploadData(
+      {required int lockId, required int keyId}) async {
+    final res = await apiProvider.lockReportLockSuccessfullyUploadData(lockId, keyId);
+    return KeyOperationRecordEntity.fromJson(res.body);
+  }
+
   // 获取手机联网token
   Future<LockNetTokenEntity> getLockNetToken({required String lockId}) async {
     final res = await apiProvider.getLockNetToken(lockId);
diff --git a/pre_build.sh b/pre_build.sh
old mode 100644
new mode 100755
diff --git a/pubspec.yaml b/pubspec.yaml
index f36ec4e2..f2a66206 100755
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -78,7 +78,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # 1.0.69+2024070301：xhj 线上环境，提交测试:周常 bug 修复
 # 1.0.69+2024070302：xhj 线上环境，提交测试:周常 bug 修复
 
-version: 1.0.69+2024070302
+version: 1.0.70+2024072401
 
 environment:
   sdk: '>=2.12.0 <3.0.0'