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

解决循环密码参数不合法问题（由于后台需结束日期字段）

Browse Source
This commit is contained in:
Daisy 2023-12-14 14:33:12 +08:00
parent 77494e6630
commit cacf3528e3
2 changed files with 42 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_page.dart
View File

@ -276,9 +276,8 @@ class _SendElectronicKeyPageState extends State<SendElectronicKeyPage> {
state.keyNameController.text.isNotEmpty) { state.keyNameController.text.isNotEmpty) {
if (int.parse(widget.type) == 0) { if (int.parse(widget.type) == 0) {
//失效时间大于生效时间 //失效时间大于生效时间
if (state.failureDateTime.value if (state.effectiveDateTime.value
.compareTo(state.effectiveDateTime.value) == .isBefore(state.failureDateTime.value)) {
1) {
logic.sendElectronicKeyRequest(context); logic.sendElectronicKeyRequest(context);
} else { } else {
Toast.show(msg: '失效时间需大于生效时间'); Toast.show(msg: '失效时间需大于生效时间');

47
star_lock/lib/main/lockDetail/passwordKey/passwordKey_perpetual/passwordKey_perpetual_page.dart
View File

@ -288,6 +288,28 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage> {
]; ];
showPickerView(context, pickerDataList); showPickerView(context, pickerDataList);
}), }),
CommonItem(
leftTitel: '结束日期',
rightTitle: state.selectFailureDate.value,
isHaveLine: true,
isHaveDirection: true,
action: () {
Pickers.showDatePicker(context, mode: DateMode.YMDH,
onConfirm: (p) {
state.failureDateTime.value = DateTime.parse(
'${p.year}-${intToStr(p.month!)}-${intToStr(p.day!)} ${intToStr(p.hour!)}');
state.selectFailureDate.value =
"${formatDate(state.failureDateTime.value, [
yyyy,
'-',
mm,
'-',
dd,
' ',
HH
])}:00";
});
}),
CommonItem( CommonItem(
leftTitel: TranslationLoader.lanKeys!.effectiveTime!.tr, leftTitel: TranslationLoader.lanKeys!.effectiveTime!.tr,
rightTitle: state.loopEffectiveDate.value, rightTitle: state.loopEffectiveDate.value,
@ -387,11 +409,10 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage> {
return; return;
} }
//限时||循环 //限时
if (getWidgetNumber == 1) { if (getWidgetNumber == 1) {
if (state.failureDateTime.value if (!state.effectiveDateTime.value
.compareTo(state.effectiveDateTime.value) != .isBefore(state.failureDateTime.value)) {
1) {
Toast.show(msg: '失效时间需大于生效时间'); Toast.show(msg: '失效时间需大于生效时间');
return; return;
} }
@ -406,9 +427,8 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage> {
} }
//非永久 须有时限 //非永久 须有时限
if (state.isPermanent.value == false) { if (state.isPermanent.value == false) {
if (state.failureDateTime.value if (!state.effectiveDateTime.value
.compareTo(state.effectiveDateTime.value) != .isBefore(state.failureDateTime.value)) {
1) {
Toast.show(msg: '失效时间需大于生效时间'); Toast.show(msg: '失效时间需大于生效时间');
return; return;
} }
@ -417,6 +437,19 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage> {
logic.addKeyboardPwdRequest(); logic.addKeyboardPwdRequest();
} }
//循环密码
if (getWidgetNumber == 4) {
if (!state.effectiveDateTime.value
.isBefore(state.failureDateTime.value)) {
Toast.show(msg: '结束时间需大于当前时间');
return;
}
if (state.loopEndHours.value <= state.loopStartHours.value) {
Toast.show(msg: '失效时间需大于生效时间');
return;
}
}
logic.getKeyboardPwdRequest(); logic.getKeyboardPwdRequest();
} else { } else {
Toast.show(msg: '演示模式'); Toast.show(msg: '演示模式');