From 79b387b3909250fdcb96ea8fb8d5a3e62f0ec436 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AD=8F=E5=B0=91=E9=98=B3?= <786612630@qq.com> Date: Tue, 25 Jun 2024 10:02:32 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=20=E5=9C=A8=E9=94=81=E7=AB=AF?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E2=80=9C=E5=88=86=E7=BB=84=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E2=80=9D=E5=90=8E=EF=BC=8C=E4=B8=8D=E7=AE=A1=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E9=82=A3=E4=B8=AA=E5=88=86=E7=BB=84=E3=80=82App=20=E9=83=BD?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=88=A0=E9=99=A4=E6=89=80=E6=9C=89=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=BA=94=E8=AF=A5=E5=8C=BA=E5=88=86=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E7=9A=84=E7=B1=BB=E5=9E=8B=202=E3=80=81=E5=BC=80=E9=94=81?= =?UTF-8?q?=E4=B8=8D=E5=9C=A8=E5=90=8C=E6=AD=A5=E6=93=8D=E4=BD=9C=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=EF=BC=8C=E5=9C=A8=E6=93=8D=E4=BD=9C=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E9=A1=B5=E5=90=8C=E6=AD=A5=EF=BC=88=E6=9B=B9=E6=80=BB=E6=8F=90?= =?UTF-8?q?=E5=87=BA=EF=BC=89=203=E3=80=81=20=E9=94=81=E5=AE=9A=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E9=94=81=E5=AE=9A,App=E6=93=8D=E4=BD=9C=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E6=98=BE=E7=A4=BA=E2=80=9C=E6=89=8B=E6=9C=BA=E7=94=A8?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8A=A5=E8=AD=A6=E2=80=9D=EF=BC=8C=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E7=9B=B4=E6=8E=A5=E6=98=BE=E7=A4=BA=E2=80=9C=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E6=8A=A5=E8=AD=A6=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/blue/io_protocol/io_addFace.dart | 34 +++++++++---------- lib/blue/io_protocol/io_addFaceCancel.dart | 2 +- .../massSendElectronicKey_page.dart | 2 +- .../lockDetail/lockDetail_logic.dart | 2 +- .../lockSet/lockSet/lockSet_logic.dart | 2 +- .../passwordKeyDetail_logic.dart | 4 +-- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/lib/blue/io_protocol/io_addFace.dart b/lib/blue/io_protocol/io_addFace.dart index f77668bd..9383071c 100755 --- a/lib/blue/io_protocol/io_addFace.dart +++ b/lib/blue/io_protocol/io_addFace.dart @@ -1,14 +1,14 @@ import 'dart:convert'; +import 'package:crypto/crypto.dart' as crypto; import 'package:star_lock/tools/dateTool.dart'; -import '../io_tool/io_tool.dart'; -import '../sm4Encipher/sm4.dart'; import '../io_reply.dart'; import '../io_sender.dart'; +import '../io_tool/io_tool.dart'; import '../io_type.dart'; -import 'package:crypto/crypto.dart' as crypto; +import '../sm4Encipher/sm4.dart'; ///TODO:添加人脸 /* @@ -70,7 +70,7 @@ class SenderAddFaceCommand extends SenderProtocol { @override List messageDetail() { - List data = []; + final List data = []; List subData = []; List ebcData = []; @@ -82,13 +82,13 @@ class SenderAddFaceCommand extends SenderProtocol { data.add(81); // keyID 40 - int keyIDLength = utf8.encode(keyID!).length; + final int keyIDLength = utf8.encode(keyID!).length; subData.addAll(utf8.encode(keyID!)); subData = getFixedLengthList(subData, 40 - keyIDLength); // AppLog.log("keyID:$keyID utf8.encode(keyID!):${utf8.encode(keyID!)}"); //userID 20 - int userIDLength = utf8.encode(userID!).length; + final int userIDLength = utf8.encode(userID!).length; subData.addAll(utf8.encode(userID!)); subData = getFixedLengthList(subData, 20 - userIDLength); // AppLog.log("userID:$userID utf8.encode(userID!):${utf8.encode(userID!)}"); @@ -129,28 +129,28 @@ class SenderAddFaceCommand extends SenderProtocol { subData.add((startDate! & 0xff000000) >> 24); subData.add((startDate! & 0xff0000) >> 16); subData.add((startDate! & 0xff00) >> 8); - subData.add((startDate! & 0xff)); + subData.add(startDate! & 0xff); // endDate 4 subData.add((endDate! & 0xff000000) >> 24); subData.add((endDate! & 0xff0000) >> 16); subData.add((endDate! & 0xff00) >> 8); - subData.add((endDate! & 0xff)); + subData.add(endDate! & 0xff); // AppLog.log("addFingerprint startDate:${DateTool().dateToYMDHNString(startDate.toString())} endDate:${DateTool().dateToYMDHNString(endDate.toString())}"); // startTime 4 - List startTimeList = [0,0,0,0]; - if(startTime!.contains(":")){ - List getStartTimeList = startTime!.split(":"); + final List startTimeList = [0,0,0,0]; + if(startTime!.contains(':')){ + final List getStartTimeList = startTime!.split(':'); startTimeList[2] = int.parse(getStartTimeList[0]); startTimeList[3] = int.parse(getStartTimeList[1]); } subData.addAll(startTimeList); // endTime 4 - List endTimeList = [0,0,0,0]; - if(endTime!.contains(":")){ - List getendTimeList = endTime!.split(":"); + final List endTimeList = [0,0,0,0]; + if(endTime!.contains(':')){ + final List getendTimeList = endTime!.split(':'); endTimeList[2] = int.parse(getendTimeList[0]); endTimeList[3] = int.parse(getendTimeList[1]); } @@ -160,7 +160,7 @@ class SenderAddFaceCommand extends SenderProtocol { //AuthCodeLen 1 subData.add(0); } else { - List authCodeData = []; + final List authCodeData = []; //KeyID authCodeData.addAll(utf8.encode(keyID!)); @@ -173,7 +173,7 @@ class SenderAddFaceCommand extends SenderProtocol { authCodeData.addAll(signKey!); // 把KeyID、authUserID、时间戳、公钥通过md5加密之后就是authCode - var authCode = crypto.md5.convert(authCodeData); + final authCode = crypto.md5.convert(authCodeData); subData.add(authCode.bytes.length); subData.addAll(authCode.bytes); @@ -183,7 +183,7 @@ class SenderAddFaceCommand extends SenderProtocol { data.addAll(subData); if ((data.length % 16) != 0) { - int add = (16 - data.length % 16); + final int add = 16 - data.length % 16; for (int i = 0; i < add; i++) { data.add(0); } diff --git a/lib/blue/io_protocol/io_addFaceCancel.dart b/lib/blue/io_protocol/io_addFaceCancel.dart index 60d0b417..a89c2ac0 100755 --- a/lib/blue/io_protocol/io_addFaceCancel.dart +++ b/lib/blue/io_protocol/io_addFaceCancel.dart @@ -80,7 +80,7 @@ class SenderCancelAddFaceCommand extends SenderProtocol { data.addAll(subData); if ((data.length % 16) != 0) { - int add = (16 - data.length % 16); + int add = 16 - data.length % 16; for (int i = 0; i < add; i++) { data.add(0); } diff --git a/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendElectronicKey/massSendElectronicKey_page.dart b/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendElectronicKey/massSendElectronicKey_page.dart index b806b4b1..9986ff1e 100755 --- a/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendElectronicKey/massSendElectronicKey_page.dart +++ b/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendElectronicKey/massSendElectronicKey_page.dart @@ -4,7 +4,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:star_lock/app_settings/app_colors.dart'; -import 'package:star_lock/main/lockDetail/electronicKey/massSendElectronicKey/massSendElectronicKey/massSendElectronicKey_state.dart'; import 'package:star_lock/tools/pickers/pickers.dart'; import 'package:star_lock/tools/pickers/time_picker/model/date_mode.dart'; import 'package:star_lock/tools/pickers/time_picker/model/pduration.dart'; @@ -16,6 +15,7 @@ import '../../../../../tools/dateTool.dart'; import '../../../../../tools/storage.dart'; import '../../../../../translations/trans_lib.dart'; import 'massSendElectronicKey_logic.dart'; +import 'massSendElectronicKey_state.dart'; class MassSendElectronicKeyPage extends StatefulWidget { const MassSendElectronicKeyPage({required this.type, Key? key}) : super(key: key); diff --git a/lib/main/lockDetail/lockDetail/lockDetail_logic.dart b/lib/main/lockDetail/lockDetail/lockDetail_logic.dart index b0728bf9..268bb6d9 100755 --- a/lib/main/lockDetail/lockDetail/lockDetail_logic.dart +++ b/lib/main/lockDetail/lockDetail/lockDetail_logic.dart @@ -90,7 +90,7 @@ class LockDetailLogic extends BaseGetXController { // 更新电量 uploadElectricQuantityRequest(); //锁数据更新 - getLockRecordLastUploadDataTime(); + // getLockRecordLastUploadDataTime(); resetOpenDoorState(); state.animationController!.stop(); break; diff --git a/lib/main/lockDetail/lockSet/lockSet/lockSet_logic.dart b/lib/main/lockDetail/lockSet/lockSet/lockSet_logic.dart index 4ac123e7..83849fc0 100755 --- a/lib/main/lockDetail/lockSet/lockSet/lockSet_logic.dart +++ b/lib/main/lockDetail/lockSet/lockSet/lockSet_logic.dart @@ -525,7 +525,7 @@ class LockSetLogic extends BaseGetXController { } /// 以下为删除逻辑 - deleyLockLogicOfRoles() { + void deleyLockLogicOfRoles() { if (state.lockBasicInfo.value.isLockOwner == 1) { // 超级管理员必须通过连接蓝牙删除 ShowTipView().showIosTipWithContentDialog('删除锁后，所有信息都会一起删除，确定删除锁吗？'.tr, diff --git a/lib/main/lockDetail/passwordKey/passwordKeyDetail/passwordKeyDetail_logic.dart b/lib/main/lockDetail/passwordKey/passwordKeyDetail/passwordKeyDetail_logic.dart index c4c759cc..924077f6 100755 --- a/lib/main/lockDetail/passwordKey/passwordKeyDetail/passwordKeyDetail_logic.dart +++ b/lib/main/lockDetail/passwordKey/passwordKeyDetail/passwordKeyDetail_logic.dart @@ -57,7 +57,7 @@ class PasswordKeyDetailLogic extends BaseGetXController { pwdNo: state.itemData.value.pwdUserNo!, pwd: state.inputPwdController.text, useCountLimit: 0xffff, - operate: state.isDeletPasswordKey.value == true ? 2 : 1, + operate: state.itemData.value.isCustom == 1 ? (state.isDeletPasswordKey.value == true ? 2 : 1) : 3, isAdmin: state.isAdministrator.value == true ? 1 : 0, startTime:state.itemData.value.startDate! ~/ 1000, endTime:state.itemData.value.endDate! ~/ 1000, @@ -147,7 +147,7 @@ class PasswordKeyDetailLogic extends BaseGetXController { pwdNo: state.itemData.value.pwdUserNo!, pwd: state.inputPwdController.text, useCountLimit: 0xffff, - operate: state.itemData.value.isCustom == 1 ? state.isDeletPasswordKey.value == true ? 2 : 1 : 3, + operate: state.itemData.value.isCustom == 1 ? (state.isDeletPasswordKey.value == true ? 2 : 1) : 3, isAdmin: state.isAdministrator.value == true ? 1 : 0, startTime:state.itemData.value.startDate! ~/ 1000, endTime:state.itemData.value.endDate! ~/ 1000,