From 903cacab3785b30ac90764a6a824f6c53fd480b5 Mon Sep 17 00:00:00 2001 From: liyi Date: Mon, 7 Apr 2025 09:50:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4=E5=AD=97=E8=8A=82?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io_changeAdministratorPassword.dart | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/lib/blue/io_protocol/io_changeAdministratorPassword.dart b/lib/blue/io_protocol/io_changeAdministratorPassword.dart index 17862cfe..12172139 100755 --- a/lib/blue/io_protocol/io_changeAdministratorPassword.dart +++ b/lib/blue/io_protocol/io_changeAdministratorPassword.dart @@ -1,6 +1,6 @@ - import 'dart:convert'; +import 'package:star_lock/flavors.dart'; import 'package:star_lock/tools/dateTool.dart'; import '../../app_settings/app_settings.dart'; @@ -13,7 +13,6 @@ import 'package:crypto/crypto.dart' as crypto; // 修改管理员密码 class ChangeAdministratorPasswordCommand extends SenderProtocol { - ChangeAdministratorPasswordCommand({ this.keyID, this.userID, @@ -40,7 +39,6 @@ class ChangeAdministratorPasswordCommand extends SenderProtocol { List? signKey; List? privateKey; - @override String toString() { return 'ChangeAdministratorPasswordCommand{keyID: $keyID, userID: $userID,' @@ -80,7 +78,12 @@ class ChangeAdministratorPasswordCommand extends SenderProtocol { subData = getFixedLengthList(subData, 20 - userIDLength); // PwdNo - subData.addAll(intChangList(pwdNo!)); + if (F.isSKY) { + subData.add(pwdNo! & 0xFF); // 低字节 + subData.add((pwdNo! >> 8) & 0xFF); // 高字节 + } else { + subData.addAll(intChangList(pwdNo!)); + } // pwd 20 final int pwdLength = utf8.encode(pwd!).length; @@ -105,7 +108,7 @@ class ChangeAdministratorPasswordCommand extends SenderProtocol { subData.add((endTime! & 0xff00) >> 8); subData.add(endTime! & 0xff); - if(needAuthor == 0){ + if (needAuthor == 0) { //AuthCodeLen 1 subData.add(0); } else { @@ -147,10 +150,11 @@ class ChangeAdministratorPasswordCommand extends SenderProtocol { } class ChangeAdministratorPasswordReply extends Reply { - ChangeAdministratorPasswordReply.parseData(CommandType commandType, List dataDetail) + ChangeAdministratorPasswordReply.parseData( + CommandType commandType, List dataDetail) : super.parseData(commandType, dataDetail) { data = dataDetail; final int status = data[2]; errorWithStstus(status); } -} \ No newline at end of file +}