From 49352a0d97a2c04fe1c8dd94f1c580be55c5f92d 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 18:58:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=93=8D=E4=BD=9C=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E9=97=AE=E9=A2=98=EF=BC=8C=E5=8D=A1=E6=8C=87=E7=BA=B9?= =?UTF-8?q?=E4=BA=BA=E8=84=B8=E4=B8=8D=E9=80=89=E6=8B=A9=E6=9C=89=E6=95=88?= =?UTF-8?q?=E6=97=A5=E6=8F=90=E4=BA=A4=E6=9C=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- star_lock/images/lan/lan_en.json | 7 +++---- star_lock/images/lan/lan_keys.json | 3 ++- star_lock/images/lan/lan_zh.json | 3 ++- .../otherTypeKeyChangeValidityDate_page.dart | 5 +++++ .../lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart | 1 + 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/star_lock/images/lan/lan_en.json b/star_lock/images/lan/lan_en.json index 27e1c76e..d6efba2c 100644 --- a/star_lock/images/lan/lan_en.json +++ b/star_lock/images/lan/lan_en.json @@ -337,8 +337,7 @@ "customSMSTemplate": "Custom SMS Template", "customMailTemplate": "Custom Mail Template", "record": "Record", - "buyRealNameTip": "When an electronic key is sent to the user, the user can be required to authenticate with his real name before unlocking to ensure that he is operating. The real-name authentication calls the interface of the national Public security system. For the payment function, please purchase the number of times before using it.", - "buyRealNameSelectYouWantBuyTip": "Please select the frequency of real name authentication you want", + "forTheFirstTime": "For the first time", "onceDay": "once a day", "weekOnce": "once a week", @@ -854,6 +853,6 @@ "异常事件":"Abnormal event", "门铃事件":"Doorbell event", "视频事件":"Video event", - "请开启蓝牙":"Please turn on Bluetooth" - + "请开启蓝牙":"Please turn on Bluetooth", + "请选择有效日":"Please select the effective day" } diff --git a/star_lock/images/lan/lan_keys.json b/star_lock/images/lan/lan_keys.json index 3d671b57..52f94c2d 100644 --- a/star_lock/images/lan/lan_keys.json +++ b/star_lock/images/lan/lan_keys.json @@ -882,5 +882,6 @@ "异常事件":"异常事件", "门铃事件":"门铃事件", "视频事件":"视频事件", - "请开启蓝牙":"请开启蓝牙" + "请开启蓝牙":"请开启蓝牙", + "请选择有效日":"请选择有效日" } diff --git a/star_lock/images/lan/lan_zh.json b/star_lock/images/lan/lan_zh.json index 1bd2b742..51476b7a 100644 --- a/star_lock/images/lan/lan_zh.json +++ b/star_lock/images/lan/lan_zh.json @@ -852,5 +852,6 @@ "异常事件":"异常事件", "门铃事件":"门铃事件", "视频事件":"视频事件", - "请开启蓝牙":"请开启蓝牙" + "请开启蓝牙":"请开启蓝牙", + "请选择有效日":"请选择有效日" } diff --git a/star_lock/lib/main/lockDetail/card/otherTypeKeyChangeValidityDate/otherTypeKeyChangeValidityDate_page.dart b/star_lock/lib/main/lockDetail/card/otherTypeKeyChangeValidityDate/otherTypeKeyChangeValidityDate_page.dart index 13d1e249..021183c4 100644 --- a/star_lock/lib/main/lockDetail/card/otherTypeKeyChangeValidityDate/otherTypeKeyChangeValidityDate_page.dart +++ b/star_lock/lib/main/lockDetail/card/otherTypeKeyChangeValidityDate/otherTypeKeyChangeValidityDate_page.dart @@ -62,6 +62,11 @@ class _OtherTypeKeyChangeValidityDatePageState return; } + if(state.weekDay.value.isEmpty){ + logic.showToast("请选择有效日".tr); + return; + } + if (state.starTimeTimestamp.value >= state.endTimeTimestamp.value) { logic.showToast("失效时间要大于生效时间".tr); diff --git a/star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart b/star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart index ab06c222..4852578a 100644 --- a/star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart +++ b/star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart @@ -64,6 +64,7 @@ class DoorLockLogLogic extends BaseGetXController { var passwordData = indexList.sublist(7, 17); var password = utf8String(passwordData); indexMap["user"] = password.toString(); + }else { int userNo = (indexList[1] * 256) + indexList[2]; indexMap["user"] = userNo.toString(); }