From 493fc1903336581318ebe0063994ef29d3933857 Mon Sep 17 00:00:00 2001
From: liyi <m18269109817@163.com>
Date: Fri, 8 Aug 2025 09:54:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4=E5=BE=AA=E7=8E=AF?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E7=9A=84=E5=A4=B1=E6=95=88=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../passwordKey_perpetual_page.dart           | 88 +++++++++++--------
 1 file changed, 49 insertions(+), 39 deletions(-)

diff --git a/lib/main/lockDetail/passwordKey/passwordKey_perpetual/passwordKey_perpetual_page.dart b/lib/main/lockDetail/passwordKey/passwordKey_perpetual/passwordKey_perpetual_page.dart
index 7b99294e..a72c9e7d 100755
--- a/lib/main/lockDetail/passwordKey/passwordKey_perpetual/passwordKey_perpetual_page.dart
+++ b/lib/main/lockDetail/passwordKey/passwordKey_perpetual/passwordKey_perpetual_page.dart
@@ -295,21 +295,24 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage>
             action: () {
               final PDuration selectDate =
                   PDuration.parse(DateTime.tryParse(state.endTime.value));
-              Pickers.showDatePicker(context,
-                  selectDate: selectDate,
-                  // maxDate传入三年以后得今天的时间
-                  maxDate: PDuration(
-                      year: DateTime.now().year + 3,
-                      month: DateTime.now().month,
-                      day: DateTime.now().day),
-                  minDate: PDuration(
-                      year: DateTime.now().year,
-                      month: DateTime.now().month,
-                      day: DateTime.now().day),
-                  mode: DateMode.YMDH,
-                  hourShow24: true, onConfirm: (PDuration p) {
-                state.endTime.value = DateTool().getYMDHNDateString(p, 4);
-              });
+              Pickers.showDatePicker(
+                context,
+                selectDate: selectDate,
+                // maxDate传入三年以后得今天的时间
+                maxDate: PDuration(
+                    year: DateTime.now().year + 3,
+                    month: DateTime.now().month,
+                    day: DateTime.now().day),
+                minDate: PDuration(
+                    year: DateTime.now().year,
+                    month: DateTime.now().month,
+                    day: DateTime.now().day),
+                mode: DateMode.YMDH,
+                hourShow24: true,
+                onConfirm: (PDuration p) {
+                  state.endTime.value = DateTool().getYMDHNDateString(p, 4);
+                },
+              );
             }),
         Container(height: 10.h),
       ],
@@ -427,19 +430,20 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage>
                   CommonDataManage().currentKeyInfo.model ==
                       IoModelVendor.model_XL_WIFI),
           child: CommonItem(
-              leftTitel: '结束日期'.tr,
-              rightTitle: state.endTime.value,
-              isHaveLine: true,
-              isHaveDirection: true,
-              action: () {
-                final PDuration selectDate =
-                    PDuration.parse(DateTime.tryParse(state.endTime.value));
-                Pickers.showDatePicker(context,
-                    selectDate: selectDate,
-                    mode: DateMode.YMDH, onConfirm: (PDuration p) {
-                  state.endTime.value = DateTool().getYMDHNDateString(p, 4);
-                });
-              }),
+            leftTitel: '结束日期'.tr,
+            rightTitle: state.endTime.value,
+            isHaveLine: true,
+            isHaveDirection: true,
+            action: () {
+              final PDuration selectDate =
+                  PDuration.parse(DateTime.tryParse(state.endTime.value));
+              Pickers.showDatePicker(context,
+                  selectDate: selectDate,
+                  mode: DateMode.YMDH, onConfirm: (PDuration p) {
+                state.endTime.value = DateTool().getYMDHNDateString(p, 4);
+              });
+            },
+          ),
         ),
         CommonItem(
             leftTitel: '生效时间'.tr,
@@ -458,20 +462,26 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage>
               }, hourShow24: true);
             }),
         CommonItem(
-            leftTitel: '失效时间'.tr,
-            rightTitle: state.loopFailureDate.value,
-            isHaveDirection: true,
-            action: () {
-              final PDuration selectDate = PDuration.parse(
-                  DateTool().dateToDateTime(state.loopFailureDate.value, 0));
-              Pickers.showDatePicker(context,
-                  selectDate: selectDate,
-                  mode: DateMode.H, onConfirm: (PDuration p) {
+          leftTitel: '失效时间'.tr,
+          rightTitle: state.loopFailureDate.value,
+          isHaveDirection: true,
+          action: () {
+            final PDuration selectDate = PDuration.parse(
+                DateTool().dateToDateTime(state.loopFailureDate.value, 0));
+            Pickers.showDatePicker(
+              context,
+              selectDate: selectDate,
+              mode: DateMode.H,
+              onConfirm: (PDuration p) {
                 state.loopFailureDate.value =
                     DateTool().getYMDHNDateString(p, 5);
                 state.loopEndHours.value = p.hour!;
-              }, hourShow24: true);
-            }),
+                state.endTime.value = DateTool().getYMDHNDateString(p, 4);
+              },
+              hourShow24: true,
+            );
+          },
+        ),
       ],
     );
   }