From 9cddd58f6c24a52025fbc380f42037345c483039 Mon Sep 17 00:00:00 2001
From: Daisy <>
Date: Sat, 21 Oct 2023 13:49:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicInformation/basicInformation/KeyDetailEntity.dart      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/star_lock/lib/main/lockDetail/lcokSet/basicInformation/basicInformation/KeyDetailEntity.dart b/star_lock/lib/main/lockDetail/lcokSet/basicInformation/basicInformation/KeyDetailEntity.dart
index 91d2aba3..737cf866 100644
--- a/star_lock/lib/main/lockDetail/lcokSet/basicInformation/basicInformation/KeyDetailEntity.dart
+++ b/star_lock/lib/main/lockDetail/lcokSet/basicInformation/basicInformation/KeyDetailEntity.dart
@@ -42,7 +42,7 @@ class LockData {
   int? lockUserNo;
   LockItem? lockData;
   String? lockMac;
-  int? noKeyPwd;
+  String? noKeyPwd;
   int? electricQuantity;
   String? featureValue;
   int? groupId;

From b48f922186b76aca1b28d6d6b71b63b8d28726c9 Mon Sep 17 00:00:00 2001
From: Daisy <>
Date: Sat, 21 Oct 2023 14:25:48 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=94=B5=E9=87=8F=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicInformation/basicInformation_page.dart      |  3 ++-
 .../uploadElectricQuantity_page.dart                 | 12 ++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/star_lock/lib/main/lockDetail/lcokSet/basicInformation/basicInformation/basicInformation_page.dart b/star_lock/lib/main/lockDetail/lcokSet/basicInformation/basicInformation/basicInformation_page.dart
index c8971ce7..b0a2bb7c 100644
--- a/star_lock/lib/main/lockDetail/lcokSet/basicInformation/basicInformation/basicInformation_page.dart
+++ b/star_lock/lib/main/lockDetail/lcokSet/basicInformation/basicInformation/basicInformation_page.dart
@@ -84,7 +84,8 @@ class _BasicInformationPageState extends State<BasicInformationPage> {
                                 isHaveDirection: true,
                                 action: () {
                                   Navigator.pushNamed(context,
-                                      Routers.uploadElectricQuantityPage);
+                                      Routers.uploadElectricQuantityPage,
+                                      arguments: {'keyInfo': keyInfo});
                                 }),
                             CommonItem(
                                 leftTitel: TranslationLoader
diff --git a/star_lock/lib/main/lockDetail/lcokSet/basicInformation/uploadElectricQuantity/uploadElectricQuantity_page.dart b/star_lock/lib/main/lockDetail/lcokSet/basicInformation/uploadElectricQuantity/uploadElectricQuantity_page.dart
index dbfdb61f..ceeb0a5d 100644
--- a/star_lock/lib/main/lockDetail/lcokSet/basicInformation/uploadElectricQuantity/uploadElectricQuantity_page.dart
+++ b/star_lock/lib/main/lockDetail/lcokSet/basicInformation/uploadElectricQuantity/uploadElectricQuantity_page.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyDetail/keyOperationRecordEntity.dart';
+import 'package:star_lock/main/lockMian/entity/lockInfoEntity.dart';
 import 'package:star_lock/network/api_repository.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
 import 'package:star_lock/tools/toast.dart';
@@ -21,10 +22,12 @@ class UploadElectricQuantityPage extends StatefulWidget {
 
 class _UploadElectricQuantityPageState
     extends State<UploadElectricQuantityPage> {
+  late KeyInfos keyInfo;
+
   //电量更新请求
   Future<void> uploadElectricQuantityRequest() async {
-    KeyOperationRecordEntity entity =
-        await ApiRepository.to.uploadElectricQuantity('100', '28');
+    KeyOperationRecordEntity entity = await ApiRepository.to
+        .uploadElectricQuantity('100', keyInfo.lockId.toString());
     if (entity.errorCode!.codeIsSuccessful) {
       print("锁电量更新成功啦啦啦啦啦");
       Toast.show(msg: "锁电量更新成功");
@@ -33,6 +36,11 @@ class _UploadElectricQuantityPageState
 
   @override
   Widget build(BuildContext context) {
+    dynamic obj = ModalRoute.of(context)?.settings.arguments;
+    if (obj != null && (obj["keyInfo"] != null)) {
+      keyInfo = obj["keyInfo"];
+    }
+
     return Scaffold(
         backgroundColor: AppColors.mainBackgroundColor,
         appBar: TitleAppBar(