Merge branch 'master' of https://gitee.com/weishaoyang/star_lock

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;

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

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(