sky/app-starlock
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1，fix提测问题：蓝牙APP侧滑删除，默认有登录密码存在已修改

Browse Source 
2，fix提测问题：修改人脸姓名时，名字跟时效一起修改后，退出再进入，姓名未修改过来
This commit is contained in:
“DaisyWu” 2024-07-16 15:45:36 +08:00
parent 76ba648bc9
commit d98f39721d
2 changed files with 73 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
lib/main/lockDetail/face/faceDetail/faceDetail_logic.dart
View File

@ -1,4 +1,3 @@
import 'dart:async'; import 'dart:async';
import 'package:flutter_blue_plus/flutter_blue_plus.dart'; import 'package:flutter_blue_plus/flutter_blue_plus.dart';
@ -32,7 +31,8 @@ class FaceDetailLogic extends BaseGetXController {
_replySubscription = _replySubscription =
EventBusManager().eventBus!.on<Reply>().listen((Reply reply) { EventBusManager().eventBus!.on<Reply>().listen((Reply reply) {
// 添加人脸开始(此处用作删除人脸) // 添加人脸开始(此处用作删除人脸)
if ((reply is SenderAddFaceReply) && (state.ifCurrentScreen.value == true)) { if ((reply is SenderAddFaceReply) &&
(state.ifCurrentScreen.value == true)) {
_replyAddFaceBegin(reply); _replyAddFaceBegin(reply);
} }
}); });
@ -48,18 +48,21 @@ class FaceDetailLogic extends BaseGetXController {
state.sureBtnState.value = 0; state.sureBtnState.value = 0;
cancelBlueConnetctToastTimer(); cancelBlueConnetctToastTimer();
dismissEasyLoading(); dismissEasyLoading();
if(state.isDeletFace.value == true){ if (state.isDeletFace.value == true) {
deletFaceData(); deletFaceData();
}else{ } else {
editFaceData(); editFaceData();
} }
break; break;
case 0x06: case 0x06:
//无权限 //无权限
final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey); final List<String>? privateKey =
final List<int> getPrivateKeyList = changeStringListToIntList(privateKey!); await Storage.getStringList(saveBluePrivateKey);
final List<int> getPrivateKeyList =
changeStringListToIntList(privateKey!);
final List<String>? signKey = await Storage.getStringList(saveBlueSignKey); final List<String>? signKey =
await Storage.getStringList(saveBlueSignKey);
final List<int> signKeyDataList = changeStringListToIntList(signKey!); final List<int> signKeyDataList = changeStringListToIntList(signKey!);
final List<int> token = reply.data.sublist(5, 9); final List<int> token = reply.data.sublist(5, 9);
@ -67,25 +70,25 @@ class FaceDetailLogic extends BaseGetXController {
Storage.setStringList(saveBlueToken, saveStrList); Storage.setStringList(saveBlueToken, saveStrList);
IoSenderManage.senderAddFaceCommand( IoSenderManage.senderAddFaceCommand(
keyID:state.keyId.value.toString(), keyID: state.keyId.value.toString(),
userID:await Storage.getUid(), userID: await Storage.getUid(),
faceNo:int.parse(state.typeNumber.value), faceNo: int.parse(state.typeNumber.value),
useCountLimit:0xffff, useCountLimit: 0xffff,
operate:state.isDeletFace.value ? 2 : 1, // 0:注册 1：修改 2:删除 3：删除全部 operate: state.isDeletFace.value ? 2 : 1, // 0:注册 1：修改 2:删除 3：删除全部
isAdmin:state.isAdministrator.value == true ? 1 : 0, isAdmin: state.isAdministrator.value == true ? 1 : 0,
isForce:state.isStressFace.value == true ? 1 : 0, // 是否是胁迫 isForce: state.isStressFace.value == true ? 1 : 0, // 是否是胁迫
isRound:state.keyType.value == 4 ? 1: 0, // 是否是循环 isRound: state.keyType.value == 4 ? 1 : 0, // 是否是循环
weekRound:DateTool().accordingTheCycleIntoTheCorrespondingNumber(state.weekDay.value), // 周循环 weekRound: DateTool().accordingTheCycleIntoTheCorrespondingNumber(
startDate: int.parse(state.startDate.value)~/1000, state.weekDay.value), // 周循环
endDate: int.parse(state.endDate.value)~/1000, startDate: int.parse(state.startDate.value) ~/ 1000,
startTime:DateTool().dateToHNString(state.startTime.value), endDate: int.parse(state.endDate.value) ~/ 1000,
endTime:DateTool().dateToHNString(state.endTime.value), startTime: DateTool().dateToHNString(state.startTime.value),
needAuthor:1, endTime: DateTool().dateToHNString(state.endTime.value),
signKey:signKeyDataList, needAuthor: 1,
privateKey:getPrivateKeyList, signKey: signKeyDataList,
token: token, privateKey: getPrivateKeyList,
isBeforeAddUser: false token: token,
); isBeforeAddUser: false);
break; break;
default: default:
//失败 //失败
@ -108,35 +111,38 @@ class FaceDetailLogic extends BaseGetXController {
BlueManage().blueSendData(BlueManage().connectDeviceName, BlueManage().blueSendData(BlueManage().connectDeviceName,
(BluetoothConnectionState deviceConnectionState) async { (BluetoothConnectionState deviceConnectionState) async {
if (deviceConnectionState == BluetoothConnectionState.connected) { if (deviceConnectionState == BluetoothConnectionState.connected) {
final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey); final List<String>? privateKey =
final List<int> getPrivateKeyList = changeStringListToIntList(privateKey!); await Storage.getStringList(saveBluePrivateKey);
final List<int> getPrivateKeyList =
changeStringListToIntList(privateKey!);
final List<String>? token = await Storage.getStringList(saveBlueToken); final List<String>? token = await Storage.getStringList(saveBlueToken);
final List<int> getTokenList = changeStringListToIntList(token!); final List<int> getTokenList = changeStringListToIntList(token!);
final List<String>? signKey = await Storage.getStringList(saveBlueSignKey); final List<String>? signKey =
await Storage.getStringList(saveBlueSignKey);
final List<int> signKeyDataList = changeStringListToIntList(signKey!); final List<int> signKeyDataList = changeStringListToIntList(signKey!);
IoSenderManage.senderAddFaceCommand( IoSenderManage.senderAddFaceCommand(
keyID:state.keyId.value.toString(), keyID: state.keyId.value.toString(),
userID:await Storage.getUid(), userID: await Storage.getUid(),
faceNo:int.parse(state.typeNumber.value), faceNo: int.parse(state.typeNumber.value),
useCountLimit:0xffff, useCountLimit: 0xffff,
operate:state.isDeletFace.value ? 2 : 1, // 0:注册 1：修改 2:删除 3：删除全部 operate: state.isDeletFace.value ? 2 : 1, // 0:注册 1：修改 2:删除 3：删除全部
isAdmin:state.isAdministrator.value == true ? 1 : 0, isAdmin: state.isAdministrator.value == true ? 1 : 0,
isForce:state.isStressFace.value == true ? 1 : 0, // 是否是胁迫 isForce: state.isStressFace.value == true ? 1 : 0, // 是否是胁迫
isRound:state.keyType.value == 4 ? 1: 0, // 是否是循环 isRound: state.keyType.value == 4 ? 1 : 0, // 是否是循环
weekRound:DateTool().accordingTheCycleIntoTheCorrespondingNumber(state.weekDay.value), // 周循环 weekRound: DateTool().accordingTheCycleIntoTheCorrespondingNumber(
startDate: int.parse(state.startDate.value)~/1000, state.weekDay.value), // 周循环
endDate: int.parse(state.endDate.value)~/1000, startDate: int.parse(state.startDate.value) ~/ 1000,
startTime:DateTool().dateToHNString(state.startTime.value), endDate: int.parse(state.endDate.value) ~/ 1000,
endTime:DateTool().dateToHNString(state.endTime.value), startTime: DateTool().dateToHNString(state.startTime.value),
needAuthor:1, endTime: DateTool().dateToHNString(state.endTime.value),
signKey:signKeyDataList, needAuthor: 1,
privateKey:getPrivateKeyList, signKey: signKeyDataList,
token: getTokenList, privateKey: getPrivateKeyList,
isBeforeAddUser: false token: getTokenList,
); isBeforeAddUser: false);
} else if (deviceConnectionState == } else if (deviceConnectionState ==
BluetoothConnectionState.disconnected) { BluetoothConnectionState.disconnected) {
dismissEasyLoading(); dismissEasyLoading();
@ -170,11 +176,11 @@ class FaceDetailLogic extends BaseGetXController {
faceName: state.changeNameController.text, faceName: state.changeNameController.text,
); );
if (entity.errorCode!.codeIsSuccessful) { if (entity.errorCode!.codeIsSuccessful) {
state.faceItemData.value.fingerprintName = state.changeNameController.text; state.faceItemData.value.faceName = state.changeNameController.text;
showToast('修改成功', something: () { showToast('修改成功', something: () {
Get.back(result: 'addScuess'); Get.back(result: 'addScuess');
}); });
}else{ } else {
Get.back(); Get.back();
} }
} }
@ -210,13 +216,14 @@ class FaceDetailLogic extends BaseGetXController {
useDateStr = '永久'.tr; useDateStr = '永久'.tr;
} else if (state.keyType.value == 2) { } else if (state.keyType.value == 2) {
useDateStr = useDateStr =
'${DateTool().dateToYMDHNString(state.startDate.value)}\n${DateTool().dateToYMDHNString(state.endDate.value)}'; '${DateTool().dateToYMDHNString(state.startDate.value)}\n${DateTool().dateToYMDHNString(state.endDate.value)}';
} else if (state.keyType.value == 4) { } else if (state.keyType.value == 4) {
useDateStr = useDateStr =
'${DateTool().dateToYMDString(state.startDate.value)}\n${DateTool().dateToYMDString(state.endDate.value)}'; '${DateTool().dateToYMDString(state.startDate.value)}\n${DateTool().dateToYMDString(state.endDate.value)}';
} }
return useDateStr; return useDateStr;
} }
@override @override
void onReady() { void onReady() {
super.onReady(); super.onReady();

16
lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart
View File

@ -27,7 +27,8 @@ class LockSetPage extends StatefulWidget {
State<LockSetPage> createState() => _LockSetPageState(); State<LockSetPage> createState() => _LockSetPageState();
} }
class _LockSetPageState extends State<LockSetPage> with RouteAware { class _LockSetPageState extends State<LockSetPage>
with WidgetsBindingObserver, RouteAware {
final LockSetLogic logic = Get.put(LockSetLogic()); final LockSetLogic logic = Get.put(LockSetLogic());
final LockSetState state = Get.find<LockSetLogic>().state; final LockSetState state = Get.find<LockSetLogic>().state;
@ -41,6 +42,8 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
void initState() { void initState() {
super.initState(); super.initState();
WidgetsBinding.instance.addObserver(this);
logic.initLoadDataAction(() { logic.initLoadDataAction(() {
setState(() {}); setState(() {});
}); });
@ -646,7 +649,7 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
} }
Widget rightText(String rightTitle) { Widget rightText(String rightTitle) {
return Text(rightTitle ?? '', return Text(rightTitle,
textAlign: TextAlign.end, textAlign: TextAlign.end,
style: TextStyle(fontSize: 22.sp, color: AppColors.darkGrayTextColor)); style: TextStyle(fontSize: 22.sp, color: AppColors.darkGrayTextColor));
} }
@ -771,10 +774,19 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
AppRouteObserver().routeObserver.subscribe(this, ModalRoute.of(context)!); AppRouteObserver().routeObserver.subscribe(this, ModalRoute.of(context)!);
} }
@override
void didChangeAppLifecycleState(AppLifecycleState state) {
if (state == AppLifecycleState.paused) {
// 应用程序推入后台时清空输入框内容
logic.state.passwordTF.clear();
}
}
@override @override
void dispose() { void dispose() {
/// 取消路由订阅 /// 取消路由订阅
AppRouteObserver().routeObserver.unsubscribe(this); AppRouteObserver().routeObserver.unsubscribe(this);
WidgetsBinding.instance.removeObserver(this);
super.dispose(); super.dispose();
} }