diff --git a/star_lock/images/lan/lan_en.json b/star_lock/images/lan/lan_en.json index 76e14461..2898b9b3 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", @@ -855,6 +854,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 ed1eaa51..3f091d55 100644 --- a/star_lock/images/lan/lan_keys.json +++ b/star_lock/images/lan/lan_keys.json @@ -883,5 +883,6 @@ "异常事件":"异常事件", "门铃事件":"门铃事件", "视频事件":"视频事件", - "请开启蓝牙":"请开启蓝牙" + "请开启蓝牙":"请开启蓝牙", + "请选择有效日":"请选择有效日" } diff --git a/star_lock/images/lan/lan_zh.json b/star_lock/images/lan/lan_zh.json index 7a31ca86..c47e1cc2 100644 --- a/star_lock/images/lan/lan_zh.json +++ b/star_lock/images/lan/lan_zh.json @@ -853,5 +853,6 @@ "异常事件":"异常事件", "门铃事件":"门铃事件", "视频事件":"视频事件", - "请开启蓝牙":"请开启蓝牙" + "请开启蓝牙":"请开启蓝牙", + "请选择有效日":"请选择有效日" } 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/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(); } 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) { diff --git a/star_lock/pubspec.yaml b/star_lock/pubspec.yaml index 1ba6be2a..f5c1f26a 100644 --- a/star_lock/pubspec.yaml +++ b/star_lock/pubspec.yaml @@ -44,8 +44,13 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # 1.0.34+2024051402：打包给欧阳回归测试 # 1.0.35+2024051501：打包给欧阳回归测试 # 1.0.36+2024051601：打包给欧阳回归测试 +# 1.0.37+2024051701：打包给欧阳回归测试 +# 1.0.38+2024051702：打包给欧阳回归测试 +# 1.0.39+2024051703：打包给欧阳回归测试 +# 1.0.40+2024051704：打包给欧阳回归测试 +# 1.0.41+2024051705：打包给公司测试 -version: 1.0.36+2024051601 +version: 1.0.41+2024051705 environment: sdk: '>=2.12.0 <3.0.0'