From bec3c70443cead7df974e0baca269ad4b817c359 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=8F=E5=B0=91=E9=98=B3?= <786612630@qq.com>
Date: Fri, 17 May 2024 15:05:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BF=AE=E6=94=B9=E4=BA=BA?=
 =?UTF-8?q?=E8=84=B8=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../otherTypeKeyChangeValidityDate_logic.dart          |  7 ++++---
 .../lockDetail/face/faceDetail/faceDetail_page.dart    | 10 +++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

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<int> 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<FaceDetailPage> 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<FaceDetailPage> 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<FaceDetailPage> 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<FaceDetailPage> 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) {