diff --git a/star_lock/lib/main/lockDetail/card/otherTypeKeyChangeValidityDate/otherTypeKeyChangeValidityDate_logic.dart b/star_lock/lib/main/lockDetail/card/otherTypeKeyChangeValidityDate/otherTypeKeyChangeValidityDate_logic.dart index 3eac5852..7fa54f98 100644 --- a/star_lock/lib/main/lockDetail/card/otherTypeKeyChangeValidityDate/otherTypeKeyChangeValidityDate_logic.dart +++ b/star_lock/lib/main/lockDetail/card/otherTypeKeyChangeValidityDate/otherTypeKeyChangeValidityDate_logic.dart @@ -70,7 +70,7 @@ class OtherTypeKeyChangeValidityDateLogic extends BaseGetXController{ Storage.setStringList(saveBlueToken, saveStrList); IoSenderManage.senderAddFaceCommand( - keyID:state.fingerprintItemData.value.cardId!.toString(), + keyID:state.fingerprintItemData.value.faceId!.toString(), userID:await Storage.getUid(), faceNo:int.parse(state.fingerprintItemData.value.faceNumber!), useCountLimit:0xffff, @@ -119,7 +119,7 @@ class OtherTypeKeyChangeValidityDateLogic extends BaseGetXController{ List signKeyDataList = changeStringListToIntList(signKey!); IoSenderManage.senderAddFaceCommand( - keyID:state.fingerprintItemData.value.cardId!.toString(), + keyID:state.fingerprintItemData.value.faceId!.toString(), userID:await Storage.getUid(), faceNo:int.parse(state.fingerprintItemData.value.faceNumber!), useCountLimit:0xffff, @@ -426,7 +426,7 @@ class OtherTypeKeyChangeValidityDateLogic extends BaseGetXController{ endDate: state.endDateTimestamp.value, startTime: state.starTimeTimestamp.value, endTime: state.endTimeTimestamp.value, - faceType: 2, + faceType: 4, weekDay: state.weekDay.value, faceName: state.fingerprintItemData.value.faceName!, addType: "1", @@ -435,6 +435,7 @@ class OtherTypeKeyChangeValidityDateLogic extends BaseGetXController{ ); if (entity.errorCode!.codeIsSuccessful) { showToast("修改成功", something: () { + eventBus.fire(OtherTypeRefreshListEvent()); Get.back(result: { "starDate":state.starDateTimestamp.value.toString(), "endDate":state.endDateTimestamp.value.toString(), diff --git a/star_lock/lib/main/lockDetail/face/faceDetail/faceDetail_page.dart b/star_lock/lib/main/lockDetail/face/faceDetail/faceDetail_page.dart index b90a8157..577361ba 100644 --- a/star_lock/lib/main/lockDetail/face/faceDetail/faceDetail_page.dart +++ b/star_lock/lib/main/lockDetail/face/faceDetail/faceDetail_page.dart @@ -105,7 +105,7 @@ class _FaceDetailPageState extends State with RouteAware { state.endDate.value = data["endDate"]; state.startTime.value = data["starTime"]; state.endTime.value = data["endTime"]; - state.weekDay.value = data["weekDay"]; + state.weekDay.value = data["validityValue"]; }); } } @@ -121,7 +121,7 @@ class _FaceDetailPageState extends State with RouteAware { var data = await Get.toNamed( Routers.otherTypeKeyChangeValidityDatePage, arguments: { - "pushType": 0, + "pushType": 3, "fingerprintItemData": state.faceItemData.value, }); if (data != null) { @@ -130,7 +130,7 @@ class _FaceDetailPageState extends State with RouteAware { state.endDate.value = data["endDate"]; state.startTime.value = data["starTime"]; state.endTime.value = data["endTime"]; - state.weekDay.value = data["weekDay"]; + state.weekDay.value = data["validityValue"]; }); } })))), @@ -139,13 +139,13 @@ class _FaceDetailPageState extends State with RouteAware { child: Obx(() => CommonItem( leftTitel: "有效时间", rightTitle: - "${DateTool().dateToHNString(state.startDate.value)}-${DateTool().dateToHNString(state.endDate.value)}", + "${DateTool().dateToHNString(state.startTime.value)}-${DateTool().dateToHNString(state.endTime.value)}", isHaveDirection: true, action: () async { var data = await Get.toNamed( Routers.otherTypeKeyChangeValidityDatePage, arguments: { - "pushType": 0, + "pushType": 3, "fingerprintItemData": state.faceItemData.value, }); if (data != null) {