From 7c2b7f1a2fd3b71d31913fccf23c9e5184024c9d 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, 26 Jul 2024 14:12:26 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=9B=BD=E9=99=85=E5=8C=96?= =?UTF-8?q?=E5=88=B0=E5=B8=B8=E5=BC=80=E6=97=A5=E6=9C=9F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lan/lan_en.json | 29 +++-- lan/lan_keys.json | 31 +++-- lan/lan_zh.json | 33 ++--- .../authorizedAdmin/authorizedAdmin_page.dart | 11 +- .../volumeAuthorizationLock_page.dart | 2 +- .../otherTypeKeyChangeValidityDate_page.dart | 14 +- .../checkingInList/checkingInList_page.dart | 8 +- .../checkingInList/checkingInList_state.dart | 2 +- .../checkingInSet/checkingInSet_page.dart | 3 +- .../checkingInSetWorkTime_page.dart | 3 +- .../checkingInAddStaff_page.dart | 6 +- .../electronicKeyPeriodValidity_page.dart | 14 +- .../lockOperatingRecord_page.dart | 23 ---- .../automaticBlocking_page.dart | 11 +- .../burglarAlarm/burglarAlarm_page.dart | 2 +- .../lockSet/lockSet/lockSet_page.dart | 4 +- .../normallyOpenMode_page.dart | 47 ++++--- .../remoteUnlocking/remoteUnlocking_page.dart | 18 +-- .../lockSet/resetButton/resetButton_page.dart | 31 ++--- .../demoModeLockSet/demoModeLockSet_page.dart | 4 +- .../addAuthorizedAdministrator_page.dart | 4 +- .../hideInvalidUnlockPermissions_page.dart | 13 +- .../mineSet/lockScreen/lockScreen_page.dart | 10 +- .../expireKeyChangeValidityDate_page.dart | 6 +- lib/translations/lanKeyEntity.dart | 121 +++++++++--------- 25 files changed, 214 insertions(+), 236 deletions(-) diff --git a/lan/lan_en.json b/lan/lan_en.json index 12d66206..42904aba 100755 --- a/lan/lan_en.json +++ b/lan/lan_en.json @@ -61,15 +61,25 @@ "添加门磁": "Add Door Magnetic", "添加无线键盘": "Add Wireless Keyboard", "添加手掌": "Add Palm", + "请输入员工账号": "Please enter the employee account", + "批量授权锁": "Batch Authorize Lock", + "授权管理员拥有操作这把锁的重要权限，请确保只发给我你信任的人": "Authorized administrators have important permissions to operate this lock, please make sure to send it to someone you trust", + "功能开启后，你将可以通过网关远程开锁。此功能的开启和关闭只能在锁附近通过手机蓝牙进行。":"After the function is turned on, you will be able to unlock remotely through the gateway. The opening and closing of this function can only be done through the phone Bluetooth near the lock.", + "排列榜": "Leaderboard", + "早到榜": "Early List", + "迟到榜": "Late List", + "当前模式": "Current Mode", + "勤奋榜": "Diligent List", + "延迟时间": "Delay Time", + "经过以上设定的时间，锁会自动关闭。开启或修改设置后，请先开一次锁，使时间生效。": "After the set time above, the lock will automatically close. After opening or modifying the settings, please open the lock once to make the time effective.", + "时间": "Time", + "开始时间": "Start Time", + "结束时间": "End Time", + "工作时间设置": "Working Time Settings", + "常开模式": "Normal Open Mode", + "常开时间": "Normal Open Time", + "常开日期": "Normal Open Date", - "accountNumber": "AccountNumber", - "volumeAuthorizationLock": "Volume Authorization Lock", - "authorizedAdminTip": "The authorized administrator has important access to this lock, so make sure you only send it to people you trust", - "lockOperatingRecordTip": "The historical records can be retained only for a certain period of time. If you want to retain historical records, export them in the upper right corner", - "rankingList": "Ranking List", - "earlyArrivalList": "Early Arrival List", - "lateList": "Late List", - "hardWorkingList": "Hard Working List", "company": "Company", "staff": "Staff", "work": "Work", @@ -141,11 +151,8 @@ "nearbyEquipment": "Nearby Equipment", "noData": "No Data", "doorMagneticListTopTip": "You can query the open and close status of a door by using the door status sensor. Add a door magnet to each lock", - "remoteUnlockingPageTip": "When enabled, you will be able to open the lock remotely through the gateway. This function can only be turned on and off near the lock via Bluetooth on the phone.", - "currentMode": "Current Mode", "delayTime": "Delay Time", "automaticBlockingTip": "After the time set above, the lock will automatically close. After you enable or modify the Settings, open the lock once for the time to take effect.", - "time": "Time", "normallyOpen": "Normally Open", "date": "Date", "begin": "Begin", diff --git a/lan/lan_keys.json b/lan/lan_keys.json index 0445b481..e7389fe5 100755 --- a/lan/lan_keys.json +++ b/lan/lan_keys.json @@ -61,15 +61,25 @@ "添加门磁": "添加门磁", "添加无线键盘": "添加无线键盘", "添加手掌": "添加手掌", + "请输入员工账号": "请输入员工账号", + "批量授权锁": "批量授权锁", + "授权管理员拥有操作这把锁的重要权限，请确保只发给我你信任的人":"授权管理员拥有操作这把锁的重要权限，请确保只发给我你信任的人", + "功能开启后，你将可以通过网关远程开锁。此功能的开启和关闭只能在锁附近通过手机蓝牙进行。":"功能开启后，你将可以通过网关远程开锁。此功能的开启和关闭只能在锁附近通过手机蓝牙进行。", + "排列榜": "排列榜", + "早到榜": "早到榜", + "迟到榜": "迟到榜", + "当前模式": "当前模式", + "勤奋榜":"勤奋榜", + "延迟时间": "延迟时间", + "经过以上设定的时间，锁会自动关闭。开启或修改设置后，请先开一次锁，使时间生效。": "经过以上设定的时间，锁会自动关闭。开启或修改设置后，请先开一次锁，使时间生效。", + "时间": "时间", + "开始时间": "开始时间", + "结束时间": "结束时间", + "工作时间设置": "工作时间设置", + "常开模式":"常开模式", + "常开时间": "常开时间", + "常开日期": "常开日期", - "accountNumber":"accountNumber", - "volumeAuthorizationLock":"volumeAuthorizationLock", - "authorizedAdminTip":"authorizedAdminTip", - "lockOperatingRecordTip":"lockOperatingRecordTip", - "rankingList":"rankingList", - "earlyArrivalList":"earlyArrivalList", - "lateList":"lateList", - "hardWorkingList":"hardWorkingList", "company":"company", "staff":"staff", "work":"work", @@ -109,7 +119,6 @@ "doorMagnetic":"doorMagnetic", "remoteUnlocking":"remoteUnlocking", "automaticBlocking":"automaticBlocking", - "normallyOpenMode":"normallyOpenMode", "automaticUnLock":"automaticUnLock", "automaticUnLockTip":"automaticUnLockTip", "lockSound":"lockSound", @@ -142,12 +151,8 @@ "nearbyEquipment":"nearbyEquipment", "noData":"noData", "doorMagneticListTopTip":"doorMagneticListTopTip", - "remoteUnlockingPageTip":"remoteUnlockingPageTip", - "currentMode":"currentMode", "delayTime":"delayTime", "automaticBlockingTip":"automaticBlockingTip", - "time":"time", - "normallyOpen":"normallyOpen", "date":"date", "begin":"begin", "end":"end", diff --git a/lan/lan_zh.json b/lan/lan_zh.json index 6b833cb2..abe18616 100755 --- a/lan/lan_zh.json +++ b/lan/lan_zh.json @@ -61,15 +61,25 @@ "添加门磁": "添加门磁", "添加无线键盘": "添加无线键盘", "添加手掌": "添加手掌", + "请输入员工账号": "请输入员工账号", + "批量授权锁": "批量授权锁", + "授权管理员拥有操作这把锁的重要权限，请确保只发给我你信任的人": "授权管理员拥有操作这把锁的重要权限，请确保只发给我你信任的人", + "功能开启后，你将可以通过网关远程开锁。此功能的开启和关闭只能在锁附近通过手机蓝牙进行。": "功能开启后，你将可以通过网关远程开锁。此功能的开启和关闭只能在锁附近通过手机蓝牙进行。", + "排列榜": "排列榜", + "早到榜": "早到榜", + "迟到榜": "迟到榜", + "当前模式": "当前模式", + "勤奋榜": "勤奋榜", + "延迟时间": "延迟时间", + "经过以上设定的时间，锁会自动关闭。开启或修改设置后，请先开一次锁，使时间生效。": "经过以上设定的时间，锁会自动关闭。开启或修改设置后，请先开一次锁，使时间生效。", + "时间": "时间", + "开始时间": "开始时间", + "结束时间": "结束时间", + "工作时间设置": "工作时间设置", + "常开模式": "常开模式", + "常开时间": "常开时间", + "常开日期": "常开日期", - "accountNumber": "账号", - "volumeAuthorizationLock": "批量授权锁", - "authorizedAdminTip": "授权管理员拥有操作这把锁的重要权限，请确保只发给我你信任的人", - "lockOperatingRecordTip": "只能保留一定时间内的记录，如果您需要保留历史记录，可以在右上角导出", - "rankingList": "排列榜", - "earlyArrivalList": "早到榜", - "lateList": "迟到榜", - "hardWorkingList": "勤奋榜", "company": "公司", "staff": "员工", "work": "工作", @@ -108,7 +118,6 @@ "doorMagnetic": "门磁", "remoteUnlocking": "远程开锁", "automaticBlocking": "自动闭锁", - "normallyOpenMode": "常开模式", "automaticUnLock": "自动开锁", "automaticUnLockTip": "开启后锁将在常开模式开始时自动打开", "lockSound": "锁声音", @@ -141,12 +150,6 @@ "nearbyEquipment": "附近的设备", "noData": "暂无数据", "doorMagneticListTopTip": "通过门磁可查询门的开、关状态。每把锁咳添加一个门磁", - "remoteUnlockingPageTip": "功能开启后，你将可以通过网关远程开锁。此功能的开启和关闭只能在锁附近通过手机蓝牙进行。", - "currentMode": "当前模式", - "delayTime": "延迟时间", - "automaticBlockingTip": "经过以上设定的时间，锁会自动关闭。开启或修改设置后，请先开一次锁，使时间生效。", - "time": "时间", - "normallyOpen": "常开", "date": "日期", "begin": "开始", "end": "结束", diff --git a/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_page.dart b/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_page.dart index 0270b018..641a4a1c 100755 --- a/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_page.dart +++ b/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_page.dart @@ -83,8 +83,7 @@ class _AuthorizedAdminPageState extends State keyInfoWidget(), keyTimeWidget(), keyOnlyManageWidget(), - keyBottomWidget( - TranslationLoader.lanKeys!.authorizedAdminTip!.tr) + keyBottomWidget('授权管理员拥有操作这把锁的重要权限，请确保只发给我你信任的人'.tr) ], ), ); @@ -96,8 +95,7 @@ class _AuthorizedAdminPageState extends State children: [ keyInfoWidget(), keyOnlyManageWidget(), - keyBottomWidget( - TranslationLoader.lanKeys!.authorizedAdminTip!.tr) + keyBottomWidget('授权管理员拥有操作这把锁的重要权限，请确保只发给我你信任的人'.tr) ], ), ); @@ -259,9 +257,8 @@ class _AuthorizedAdminPageState extends State } }, child: Text( - TranslationLoader.lanKeys!.volumeAuthorizationLock!.tr, - style: - TextStyle(color: AppColors.mainColor, fontSize: 24.sp), + '批量授权锁'.tr, + style: TextStyle(color: AppColors.mainColor, fontSize: 24.sp), )), ], ), diff --git a/lib/main/lockDetail/authorizedAdmin/volumeAuthorizationLock/volumeAuthorizationLock_page.dart b/lib/main/lockDetail/authorizedAdmin/volumeAuthorizationLock/volumeAuthorizationLock_page.dart index 09e671c6..2dee0dff 100755 --- a/lib/main/lockDetail/authorizedAdmin/volumeAuthorizationLock/volumeAuthorizationLock_page.dart +++ b/lib/main/lockDetail/authorizedAdmin/volumeAuthorizationLock/volumeAuthorizationLock_page.dart @@ -85,7 +85,7 @@ class _VolumeAuthorizationLockPageState return Column( children: [ CommonItem( - leftTitel: TranslationLoader.lanKeys!.accountNumber!.tr, + leftTitel: '账号'.tr, rightTitle: '', isHaveLine: true, isHaveRightWidget: true, diff --git a/lib/main/lockDetail/card/otherTypeKeyChangeValidityDate/otherTypeKeyChangeValidityDate_page.dart b/lib/main/lockDetail/card/otherTypeKeyChangeValidityDate/otherTypeKeyChangeValidityDate_page.dart index e7927024..efd6c34e 100755 --- a/lib/main/lockDetail/card/otherTypeKeyChangeValidityDate/otherTypeKeyChangeValidityDate_page.dart +++ b/lib/main/lockDetail/card/otherTypeKeyChangeValidityDate/otherTypeKeyChangeValidityDate_page.dart @@ -112,7 +112,7 @@ class _OtherTypeKeyChangeValidityDatePageState extends State[ Obx(() => CommonItem( - leftTitel: - "${TranslationLoader.lanKeys!.begin!.tr}${TranslationLoader.lanKeys!.time!.tr}", + leftTitel: '开始时间'.tr, rightTitle: state.starTime.value, isHaveDirection: true, isHaveLine: true, action: () { - PDuration selectDate = PDuration.parse(DateTool().dateToDateTime(state.starTime.value, 0)); + final PDuration selectDate = PDuration.parse(DateTool().dateToDateTime(state.starTime.value, 0)); Pickers.showDatePicker(context, selectDate: selectDate, mode: DateMode.HM, onConfirm: (PDuration p) { @@ -261,12 +260,11 @@ class _OtherTypeKeyChangeValidityDatePageState extends State CommonItem( - leftTitel: - "${TranslationLoader.lanKeys!.end!.tr}${TranslationLoader.lanKeys!.time!.tr}", + leftTitel: '结束时间'.tr, rightTitle: state.endTime.value, isHaveDirection: true, action: () { - PDuration selectDate = PDuration.parse(DateTool().dateToDateTime(state.endTime.value, 0)); + final PDuration selectDate = PDuration.parse(DateTool().dateToDateTime(state.endTime.value, 0)); Pickers.showDatePicker(context, selectDate: selectDate, mode: DateMode.HM, onConfirm: (PDuration p) { diff --git a/lib/main/lockDetail/checkingIn/checkingInList/checkingInList_page.dart b/lib/main/lockDetail/checkingIn/checkingInList/checkingInList_page.dart index 0864fc3b..23f9f4a1 100755 --- a/lib/main/lockDetail/checkingIn/checkingInList/checkingInList_page.dart +++ b/lib/main/lockDetail/checkingIn/checkingInList/checkingInList_page.dart @@ -525,16 +525,16 @@ class _CheckingInListPageState extends State { void showListType() { final List list = [ - TranslationLoader.lanKeys!.earlyArrivalList!.tr, - TranslationLoader.lanKeys!.lateList!.tr, - TranslationLoader.lanKeys!.hardWorkingList!.tr + '早到榜'.tr, + '迟到榜'.tr, + '勤奋榜'.tr ]; ShowBottomSheetTool().showSingleRowPicker( //上下文 context, //默认的索引 normalIndex: 0, - title: TranslationLoader.lanKeys!.rankingList!.tr, + title: '排列榜'.tr, cancelTitle: '取消'.tr, sureTitle: '确定'.tr, //要显示的列表 diff --git a/lib/main/lockDetail/checkingIn/checkingInList/checkingInList_state.dart b/lib/main/lockDetail/checkingIn/checkingInList/checkingInList_state.dart index 21726b4b..a67ba98b 100755 --- a/lib/main/lockDetail/checkingIn/checkingInList/checkingInList_state.dart +++ b/lib/main/lockDetail/checkingIn/checkingInList/checkingInList_state.dart @@ -16,7 +16,7 @@ class CheckingInListState{// 未打车 final RxString companyId = ''.obs; final RxString listType = '1'.obs;// 1早到榜 2迟到榜 3勤奋榜 - final RxString listTypeStr = TranslationLoader.lanKeys!.earlyArrivalList!.tr.obs;// 1早到榜 2迟到榜 3勤奋榜 + final RxString listTypeStr = '早到榜'.tr.obs;// 1早到榜 2迟到榜 3勤奋榜 final RxBool isDay = true.obs;// 日榜还是月榜 final RxInt checkListDateTimestamp = DateTime.now().millisecondsSinceEpoch.obs;// 查询日期时间戳 final RxString checkListDate = formatDate(DateTime.now(), [mm,'-',dd]).obs;// 查询日期 diff --git a/lib/main/lockDetail/checkingIn/checkingInSet/checkingInSet_page.dart b/lib/main/lockDetail/checkingIn/checkingInSet/checkingInSet_page.dart index f96de974..337ce4f7 100755 --- a/lib/main/lockDetail/checkingIn/checkingInSet/checkingInSet_page.dart +++ b/lib/main/lockDetail/checkingIn/checkingInSet/checkingInSet_page.dart @@ -59,8 +59,7 @@ class _CheckingInSetPageState extends State { }); })), Obx(() => CommonItem( - leftTitel: - '${TranslationLoader.lanKeys!.work!.tr}${TranslationLoader.lanKeys!.time!.tr}', + leftTitel: '工作时间'.tr, rightTitle: (state.beginTime.value.isNotEmpty) ? '${state.beginTime.value} - ${state.endTime.value}' : '', isHaveLine: true, isHaveDirection: true, diff --git a/lib/main/lockDetail/checkingIn/checkingInSetWorkTime/checkingInSetWorkTime_page.dart b/lib/main/lockDetail/checkingIn/checkingInSetWorkTime/checkingInSetWorkTime_page.dart index fde37ccc..2002d346 100755 --- a/lib/main/lockDetail/checkingIn/checkingInSetWorkTime/checkingInSetWorkTime_page.dart +++ b/lib/main/lockDetail/checkingIn/checkingInSetWorkTime/checkingInSetWorkTime_page.dart @@ -31,8 +31,7 @@ class _CheckingInSetWorkTimePageState extends State { return Scaffold( backgroundColor: AppColors.mainBackgroundColor, appBar: TitleAppBar( - barTitle: - '${TranslationLoader.lanKeys!.work!.tr} ${TranslationLoader.lanKeys!.time!.tr} ${TranslationLoader.lanKeys!.set!.tr}', + barTitle: '工作时间设置'.tr, haveBack: true, backgroundColor: AppColors.mainColor), body: buildMainUI(), diff --git a/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_page.dart b/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_page.dart index 839054b7..71dd3526 100755 --- a/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_page.dart +++ b/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_page.dart @@ -106,12 +106,12 @@ class _CheckingInAddStaffPageState extends State { child: Column( children: [ CommonItem( - leftTitel: TranslationLoader.lanKeys!.accountNumber!.tr, + leftTitel: '账号'.tr, rightTitle: '', isHaveLine: true, isHaveRightWidget: true, rightWidget: getTFWidget( - "${'请输入'.tr}${"员工".tr}${TranslationLoader.lanKeys!.accountNumber!.tr}", + '请输入员工账号'.tr, state.staffAccountController)), CommonItem( leftTitel: @@ -447,7 +447,7 @@ class _CheckingInAddStaffPageState extends State { String title = ''; switch (int.parse(state.selectPrintingMethodType.value)) { case 1: - title = TranslationLoader.lanKeys!.accountNumber!.tr; + title = '账号'.tr; break; case 2: title = '密码'.tr; diff --git a/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyPeriodValidity/electronicKeyPeriodValidity_page.dart b/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyPeriodValidity/electronicKeyPeriodValidity_page.dart index 4ef35035..f75e8721 100755 --- a/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyPeriodValidity/electronicKeyPeriodValidity_page.dart +++ b/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyPeriodValidity/electronicKeyPeriodValidity_page.dart @@ -69,7 +69,7 @@ class _ElectronicKeyPeriodValidityPageState isHaveDirection: true, isHaveLine: true, action: () { - PDuration selectDate = + final PDuration selectDate = PDuration.parse(DateTime.tryParse(state.endTime.value)); Pickers.showDatePicker(context, selectDate: selectDate, @@ -83,7 +83,7 @@ class _ElectronicKeyPeriodValidityPageState rightTitle: state.endDate.value, isHaveDirection: true, action: () { - PDuration selectDate = + final PDuration selectDate = PDuration.parse(DateTime.tryParse(state.endDate.value)); Pickers.showDatePicker(context, selectDate: selectDate, @@ -202,13 +202,12 @@ class _ElectronicKeyPeriodValidityPageState child: Column( children: [ Obx(() => CommonItem( - leftTitel: - "${TranslationLoader.lanKeys!.begin!.tr}${TranslationLoader.lanKeys!.time!.tr}", + leftTitel: '开始时间'.tr, rightTitle: state.starTime.value, isHaveDirection: true, isHaveLine: true, action: () { - PDuration selectDate = PDuration.parse(DateTool().dateToDateTime(state.starTime.value, 0)); + final PDuration selectDate = PDuration.parse(DateTool().dateToDateTime(state.starTime.value, 0)); Pickers.showDatePicker(context, selectDate: selectDate, mode: DateMode.HM, onConfirm: (PDuration p) { @@ -219,12 +218,11 @@ class _ElectronicKeyPeriodValidityPageState }); })), Obx(() => CommonItem( - leftTitel: - "${TranslationLoader.lanKeys!.end!.tr}${TranslationLoader.lanKeys!.time!.tr}", + leftTitel: '结束时间'.tr, rightTitle: state.endTime.value, isHaveDirection: true, action: () { - PDuration selectDate = PDuration.parse(DateTool().dateToDateTime(state.endTime.value, 0)); + final PDuration selectDate = PDuration.parse(DateTool().dateToDateTime(state.endTime.value, 0)); Pickers.showDatePicker(context, selectDate: selectDate, mode: DateMode.HM, onConfirm: (PDuration p) { diff --git a/lib/main/lockDetail/lockOperatingRecord/lockOperatingRecord_page.dart b/lib/main/lockDetail/lockOperatingRecord/lockOperatingRecord_page.dart index 17752fd5..46b02d8e 100755 --- a/lib/main/lockDetail/lockOperatingRecord/lockOperatingRecord_page.dart +++ b/lib/main/lockDetail/lockOperatingRecord/lockOperatingRecord_page.dart @@ -86,29 +86,6 @@ class _LockOperatingRecordPageState extends State with }, child: Column( children: [ - // (CommonDataManage().currentKeyInfo.isLockOwner == 1 || - // CommonDataManage().currentKeyInfo.keyRight == 1) - // ? Column( - // children: [ - // Container( - // padding: EdgeInsets.only(left:20.h, right: 20.h, top: 20.h), - // child: Text( - // TranslationLoader.lanKeys!.lockOperatingRecordTip!.tr, - // textAlign: TextAlign.start, - // style: TextStyle(fontSize: 20.sp), - // ), - // ), - // KeySearchWidget( - // editingController: state.searchController, - // onSubmittedAction: () { - // logic.pageNo = 1; - // getHttpData(); - // }, - // ), - // ], - // ) - // : Container(), - // SizedBox(height: 10.h), Expanded(child: _buildMainUI()), ], ), diff --git a/lib/main/lockDetail/lockSet/automaticBlocking/automaticBlocking_page.dart b/lib/main/lockDetail/lockSet/automaticBlocking/automaticBlocking_page.dart index 51e85f47..2eb9d943 100755 --- a/lib/main/lockDetail/lockSet/automaticBlocking/automaticBlocking_page.dart +++ b/lib/main/lockDetail/lockSet/automaticBlocking/automaticBlocking_page.dart @@ -77,7 +77,7 @@ class _AutomaticBlockingPageState extends State ), Builder(builder: (BuildContext context) { return Obx(() => CommonItem( - leftTitel: TranslationLoader.lanKeys!.delayTime!.tr, + leftTitel: '延迟时间'.tr, rightTitle: state.isCustomLockTime.value == true ? '自定义'.tr : (state.autoLockTime.value.isNotEmpty && @@ -103,7 +103,7 @@ class _AutomaticBlockingPageState extends State context, //默认的索引 normalIndex: 0, - title: TranslationLoader.lanKeys!.time!.tr, + title: '时间'.tr, cancelTitle:'取消'.tr, sureTitle: '确定'.tr, //要显示的列表 @@ -134,7 +134,7 @@ class _AutomaticBlockingPageState extends State Row( children: [ Text( - TranslationLoader.lanKeys!.time!.tr, + '时间'.tr, style: TextStyle(fontSize: 24.sp), ), ], @@ -178,9 +178,8 @@ class _AutomaticBlockingPageState extends State child: Row( mainAxisAlignment: MainAxisAlignment.start, children: [ - Expanded( - child: Text( - TranslationLoader.lanKeys!.automaticBlockingTip!.tr, + Expanded(child: Text( + '经过以上设定的时间，锁会自动关闭。开启或修改设置后，请先开一次锁，使时间生效。'.tr, style: TextStyle(fontSize: 20.sp), )), ], diff --git a/lib/main/lockDetail/lockSet/burglarAlarm/burglarAlarm_page.dart b/lib/main/lockDetail/lockSet/burglarAlarm/burglarAlarm_page.dart index 308f80b5..cacbbb80 100755 --- a/lib/main/lockDetail/lockSet/burglarAlarm/burglarAlarm_page.dart +++ b/lib/main/lockDetail/lockSet/burglarAlarm/burglarAlarm_page.dart @@ -52,7 +52,7 @@ class _BurglarAlarmPageState extends State with RouteAware{ children: [ Expanded( child: Text( - "${TranslationLoader.lanKeys!.currentMode!.tr} : ${state.burglarAlarmEnable.value == 1 ? TranslationLoader.lanKeys!.opened!.tr : TranslationLoader.lanKeys!.closed!.tr}", + "${"当前模式".tr} : ${state.burglarAlarmEnable.value == 1 ? TranslationLoader.lanKeys!.opened!.tr : TranslationLoader.lanKeys!.closed!.tr}", style: TextStyle(fontSize: 22.sp, fontWeight: FontWeight.w600), )), diff --git a/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart b/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart index dea517aa..d73cfaaf 100755 --- a/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart +++ b/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart @@ -131,7 +131,7 @@ class _LockSetPageState extends State Obx(() => Visibility( visible: state.lockFeature.value.passageMode == 1, child: CommonItem( - leftTitel: TranslationLoader.lanKeys!.normallyOpenMode!.tr, + leftTitel: '常开模式'.tr, rightTitle: (state.lockSettingInfo.value.passageMode ?? 0) == 1 ? TranslationLoader.lanKeys!.opened!.tr : TranslationLoader.lanKeys!.closed!.tr, @@ -324,7 +324,7 @@ class _LockSetPageState extends State visible: state.lockFeature.value.passageMode == 1, // visible: true, child: CommonItem( - leftTitel: TranslationLoader.lanKeys!.normallyOpenMode!.tr, + leftTitel: '常开模式'.tr, rightTitle: (state.lockSettingInfo.value.passageMode ?? 0) == 1 ? TranslationLoader.lanKeys!.opened!.tr : TranslationLoader.lanKeys!.closed!.tr, diff --git a/lib/main/lockDetail/lockSet/normallyOpenMode/normallyOpenMode_page.dart b/lib/main/lockDetail/lockSet/normallyOpenMode/normallyOpenMode_page.dart index 2e923da7..1890018a 100755 --- a/lib/main/lockDetail/lockSet/normallyOpenMode/normallyOpenMode_page.dart +++ b/lib/main/lockDetail/lockSet/normallyOpenMode/normallyOpenMode_page.dart @@ -3,6 +3,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; +import 'package:star_lock/main/lockDetail/lockSet/normallyOpenMode/normallyOpenMode_state.dart'; import 'package:star_lock/tools/pickers/pickers.dart'; import 'package:star_lock/tools/pickers/time_picker/model/date_mode.dart'; import 'package:star_lock/tools/pickers/time_picker/model/pduration.dart'; @@ -23,23 +24,22 @@ class NormallyOpenModePage extends StatefulWidget { State createState() => _NormallyOpenModePageState(); } -class _NormallyOpenModePageState extends State - with RouteAware { - final logic = Get.put(NormallyOpenModeLogic()); - final state = Get.find().state; +class _NormallyOpenModePageState extends State with RouteAware { + final NormallyOpenModeLogic logic = Get.put(NormallyOpenModeLogic()); + final NormallyOpenModeState state = Get.find().state; @override Widget build(BuildContext context) { return Scaffold( backgroundColor: AppColors.mainBackgroundColor, appBar: TitleAppBar( - barTitle: TranslationLoader.lanKeys!.normallyOpenMode!.tr, + barTitle: '常开模式'.tr, haveBack: true, backgroundColor: AppColors.mainColor), body: Obx(() => ListView( - children: [ + children: [ CommonItem( - leftTitel: TranslationLoader.lanKeys!.normallyOpenMode!.tr, + leftTitel: '常开模式'.tr, rightTitle: '', isHaveLine: false, isHaveRightWidget: true, @@ -56,7 +56,7 @@ class _NormallyOpenModePageState extends State color: Colors.white, child: Row( mainAxisAlignment: MainAxisAlignment.start, - children: [ + children: [ Expanded( child: Text( TranslationLoader.lanKeys!.normallyOpenModeTip!.tr, @@ -73,7 +73,7 @@ class _NormallyOpenModePageState extends State child: Container( color: Colors.white, child: Column( - children: [ + children: [ // CommonItem( // leftTitel: TranslationLoader.lanKeys!.automaticUnLock!.tr, // rightTitle: "", @@ -134,15 +134,14 @@ class _NormallyOpenModePageState extends State color: Colors.white, child: Column( crossAxisAlignment: CrossAxisAlignment.start, - children: [ + children: [ Container( height: 60.h, // color: Colors.red, padding: EdgeInsets.only(left: 30.w, top: 15.h), child: Text( - "${TranslationLoader.lanKeys!.normallyOpen!.tr}${TranslationLoader.lanKeys!.date!.tr}", - style: - TextStyle(fontSize: 24.sp, fontWeight: FontWeight.w600))), + '常开日期'.tr, + style: TextStyle(fontSize: 24.sp, fontWeight: FontWeight.w600))), Container( height: 100.h, padding: EdgeInsets.only(left: 10.w, right: 10.w, bottom: 10.h), @@ -151,7 +150,7 @@ class _NormallyOpenModePageState extends State crossAxisCount: 7, childAspectRatio: 1.0), itemCount: 7, physics: const NeverScrollableScrollPhysics(), - itemBuilder: (context, index) { + itemBuilder: (BuildContext context, int index) { index += 1; return btnItem(index); })), @@ -228,14 +227,13 @@ class _NormallyOpenModePageState extends State Widget bottomWidget() { return Column( - children: [ + children: [ Container( color: AppColors.mainBackgroundColor, height: 10.h, ), Obx(() => CommonItem( - leftTitel: - "${TranslationLoader.lanKeys!.normallyOpen!.tr}${TranslationLoader.lanKeys!.time!.tr}", + leftTitel: '常开时间'.tr, rightTitle: '', isHaveLine: true, isHaveRightWidget: true, @@ -254,7 +252,7 @@ class _NormallyOpenModePageState extends State setState(() {}); }, child: Row( - children: [ + children: [ Text( TranslationLoader.lanKeys!.allDay!.tr, style: TextStyle(fontSize: 22.sp), @@ -277,10 +275,10 @@ class _NormallyOpenModePageState extends State child: Container( color: Colors.white, child: Column( - children: [ + children: [ Obx(() => CommonItem( leftTitel: - "${TranslationLoader.lanKeys!.begin!.tr}${TranslationLoader.lanKeys!.time!.tr}", + '开始时间'.tr, rightTitle: state.beginTime.value, isHaveDirection: true, isHaveLine: true, @@ -292,7 +290,7 @@ class _NormallyOpenModePageState extends State DateTime.tryParse(state.beginTime.value)); Pickers.showDatePicker(context, selectDate: selectDate, - mode: DateMode.HM, onConfirm: (p) { + mode: DateMode.HM, onConfirm: (PDuration p) { setState(() { state.beginTimeMinute.value = p.hour! * 60 + p.minute!; @@ -301,8 +299,7 @@ class _NormallyOpenModePageState extends State }); })), Obx(() => CommonItem( - leftTitel: - "${TranslationLoader.lanKeys!.end!.tr}${TranslationLoader.lanKeys!.time!.tr}", + leftTitel: '结束时间'.tr, rightTitle: state.endTime.value, isHaveDirection: true, action: () { @@ -313,7 +310,7 @@ class _NormallyOpenModePageState extends State DateTime.tryParse(state.endTime.value)); Pickers.showDatePicker(context, selectDate: selectDate, - mode: DateMode.HM, onConfirm: (p) { + mode: DateMode.HM, onConfirm: (PDuration p) { setState(() { state.endTimeMinute.value = p.hour! * 60 + p.minute!; @@ -337,7 +334,7 @@ class _NormallyOpenModePageState extends State value: state.isOpenNormallyOpenMode.value, onChanged: state.isJustForShow.value == true ? null - : (value) { + : (bool value) { setState(() { state.isOpenNormallyOpenMode.value = value; }); diff --git a/lib/main/lockDetail/lockSet/remoteUnlocking/remoteUnlocking_page.dart b/lib/main/lockDetail/lockSet/remoteUnlocking/remoteUnlocking_page.dart index f23a5d45..2f7685c8 100755 --- a/lib/main/lockDetail/lockSet/remoteUnlocking/remoteUnlocking_page.dart +++ b/lib/main/lockDetail/lockSet/remoteUnlocking/remoteUnlocking_page.dart @@ -4,6 +4,7 @@ import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:star_lock/main/lockDetail/lockSet/remoteUnlocking/remoteUnlocking_logic.dart'; +import 'package:star_lock/main/lockDetail/lockSet/remoteUnlocking/remoteUnlocking_state.dart'; import '../../../../app_settings/app_colors.dart'; import '../../../../blue/blue_manage.dart'; @@ -19,10 +20,9 @@ class RemoteUnlockingPage extends StatefulWidget { State createState() => _RemoteUnlockingPageState(); } -class _RemoteUnlockingPageState extends State - with RouteAware { - final logic = Get.put(RemoteUnlockingLogic()); - final state = Get.find().state; +class _RemoteUnlockingPageState extends State with RouteAware { + final RemoteUnlockingLogic logic = Get.put(RemoteUnlockingLogic()); + final RemoteUnlockingState state = Get.find().state; @override Widget build(BuildContext context) { @@ -35,13 +35,13 @@ class _RemoteUnlockingPageState extends State body: Container( padding: EdgeInsets.all(30.w), child: Column( - children: [ + children: [ Row( mainAxisAlignment: MainAxisAlignment.start, - children: [ + children: [ Expanded( child: Text( - TranslationLoader.lanKeys!.remoteUnlockingPageTip!.tr, + '功能开启后，你将可以通过网关远程开锁。此功能的开启和关闭只能在锁附近通过手机蓝牙进行。'.tr, style: TextStyle( fontSize: 20.sp, color: AppColors.darkGrayTextColor), )), @@ -53,10 +53,10 @@ class _RemoteUnlockingPageState extends State Obx(() { return Row( mainAxisAlignment: MainAxisAlignment.start, - children: [ + children: [ Expanded( child: Text( - "${TranslationLoader.lanKeys!.currentMode!.tr} : ${state.remoteEnable.value == 1 ? TranslationLoader.lanKeys!.opened!.tr : TranslationLoader.lanKeys!.closed!.tr}", + "${"当前模式".tr} : ${state.remoteEnable.value == 1 ? TranslationLoader.lanKeys!.opened!.tr : TranslationLoader.lanKeys!.closed!.tr}", style: TextStyle( fontWeight: FontWeight.w600, fontSize: 22.sp), )), diff --git a/lib/main/lockDetail/lockSet/resetButton/resetButton_page.dart b/lib/main/lockDetail/lockSet/resetButton/resetButton_page.dart index 936adeec..3c343801 100755 --- a/lib/main/lockDetail/lockSet/resetButton/resetButton_page.dart +++ b/lib/main/lockDetail/lockSet/resetButton/resetButton_page.dart @@ -2,9 +2,10 @@ import 'package:flutter/material.dart'; import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; -import '../../../../flavors.dart'; +import 'package:star_lock/main/lockDetail/lockSet/resetButton/resetButton_state.dart'; import '../../../../app_settings/app_colors.dart'; +import '../../../../flavors.dart'; import '../../../../tools/appRouteObserver.dart'; import '../../../../tools/showTipView.dart'; import '../../../../tools/submitBtn.dart'; @@ -20,8 +21,8 @@ class ResetButtonPage extends StatefulWidget { } class _ResetButtonPageState extends State with RouteAware { - final logic = Get.put(ResetButtonLogic()); - final state = Get.find().state; + final ResetButtonLogic logic = Get.put(ResetButtonLogic()); + final ResetButtonState state = Get.find().state; @override Widget build(BuildContext context) { @@ -34,15 +35,15 @@ class _ResetButtonPageState extends State with RouteAware { body: Container( padding: EdgeInsets.all(30.w), child: Column( - children: [ + children: [ Row( mainAxisAlignment: MainAxisAlignment.start, - children: [ + children: [ Expanded( child: Column( mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, - children: [ + children: [ if (F.isSKY) Text( TranslationLoader.lanKeys!.resetButtonTip1!.tr, @@ -69,10 +70,10 @@ class _ResetButtonPageState extends State with RouteAware { ), Obx(() => Row( mainAxisAlignment: MainAxisAlignment.start, - children: [ + children: [ Expanded( child: Text( - "${TranslationLoader.lanKeys!.currentMode!.tr} : ${state.resetButtonEnable.value == 1 ? TranslationLoader.lanKeys!.opened!.tr : TranslationLoader.lanKeys!.closed!.tr}", + "${"当前模式".tr} : ${state.resetButtonEnable.value == 1 ? TranslationLoader.lanKeys!.opened!.tr : TranslationLoader.lanKeys!.closed!.tr}", style: TextStyle( fontWeight: FontWeight.w600, fontSize: 20.sp), )), @@ -93,9 +94,7 @@ class _ResetButtonPageState extends State with RouteAware { // showDeletAlertTipDialog(context); ShowTipView().showIosTipWithContentDialog( '确定要${state.resetButtonEnable.value == 1 ? TranslationLoader.lanKeys!.close!.tr : TranslationLoader.lanKeys!.open!.tr}重置键？', - () { - logic.sendBurglarAlarm(); - }); + logic.sendBurglarAlarm); })), ], ), @@ -104,7 +103,6 @@ class _ResetButtonPageState extends State with RouteAware { @override void didChangeDependencies() { - // TODO: implement didChangeDependencies super.didChangeDependencies(); /// 路由订阅 @@ -113,7 +111,6 @@ class _ResetButtonPageState extends State with RouteAware { @override void dispose() { - // TODO: implement dispose /// 取消路由订阅 AppRouteObserver().routeObserver.unsubscribe(this); super.dispose(); @@ -131,7 +128,9 @@ class _ResetButtonPageState extends State with RouteAware { void didPop() { super.didPop(); logic.cancelBlueConnetctToastTimer(); - if (EasyLoading.isShow) EasyLoading.dismiss(animation: true); + if (EasyLoading.isShow) { + EasyLoading.dismiss(animation: true); + } state.ifCurrentScreen.value = false; state.sureBtnState.value = 0; } @@ -148,7 +147,9 @@ class _ResetButtonPageState extends State with RouteAware { void didPushNext() { super.didPushNext(); logic.cancelBlueConnetctToastTimer(); - if (EasyLoading.isShow) EasyLoading.dismiss(animation: true); + if (EasyLoading.isShow) { + EasyLoading.dismiss(animation: true); + } state.ifCurrentScreen.value = false; state.sureBtnState.value = 0; } diff --git a/lib/main/lockMian/demoMode/demoModeLockSet/demoModeLockSet_page.dart b/lib/main/lockMian/demoMode/demoModeLockSet/demoModeLockSet_page.dart index 29c499a8..50a635b8 100755 --- a/lib/main/lockMian/demoMode/demoModeLockSet/demoModeLockSet_page.dart +++ b/lib/main/lockMian/demoMode/demoModeLockSet/demoModeLockSet_page.dart @@ -20,7 +20,6 @@ class DemoModeLockSetPage extends StatefulWidget { class _DemoModeLockSetPageState extends State { @override void initState() { - // TODO: implement initState super.initState(); } @@ -131,8 +130,7 @@ class _DemoModeLockSetPageState extends State { SizedBox(height: 10.h), // 常开模式 CommonItem( - leftTitel: - TranslationLoader.lanKeys!.normallyOpenMode!.tr, + leftTitel:'常开模式'.tr, rightTitle: TranslationLoader.lanKeys!.closed!.tr, isHaveLine: true, isHaveDirection: true, diff --git a/lib/mine/mineSet/authorizedAdministrator/addAuthorizedAdministrator/addAuthorizedAdministrator_page.dart b/lib/mine/mineSet/authorizedAdministrator/addAuthorizedAdministrator/addAuthorizedAdministrator_page.dart index 9dc930e0..d4b80a33 100755 --- a/lib/mine/mineSet/authorizedAdministrator/addAuthorizedAdministrator/addAuthorizedAdministrator_page.dart +++ b/lib/mine/mineSet/authorizedAdministrator/addAuthorizedAdministrator/addAuthorizedAdministrator_page.dart @@ -177,7 +177,7 @@ class _AddAuthorizedAdministratorPageState return Column( children: [ CommonItem( - leftTitel: TranslationLoader.lanKeys!.accountNumber!.tr, + leftTitel: '账号'.tr, rightTitle: '', isHaveLine: true, isHaveRightWidget: true, @@ -402,7 +402,7 @@ class _AddAuthorizedAdministratorPageState context, Routers.volumeAuthorizationLockManagePage); }, child: Text( - TranslationLoader.lanKeys!.volumeAuthorizationLock!.tr, + '批量授权锁'.tr, style: TextStyle( color: AppColors.mainColor, fontWeight: FontWeight.w500), diff --git a/lib/mine/mineSet/hideInvalidUnlockPermissions/hideInvalidUnlockPermissions_page.dart b/lib/mine/mineSet/hideInvalidUnlockPermissions/hideInvalidUnlockPermissions_page.dart index 30ce4543..fed02dbb 100755 --- a/lib/mine/mineSet/hideInvalidUnlockPermissions/hideInvalidUnlockPermissions_page.dart +++ b/lib/mine/mineSet/hideInvalidUnlockPermissions/hideInvalidUnlockPermissions_page.dart @@ -1,3 +1,4 @@ + import 'package:flutter/material.dart'; import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; @@ -34,9 +35,9 @@ class _HideInvalidUnlockPermissionsPageState @override Widget build(BuildContext context) { if (_isFirst) { - dynamic obj = ModalRoute.of(context)?.settings.arguments; - if (obj != null && (obj["isOn"] != null)) { - int getValue = obj["isOn"]; + final dynamic obj = ModalRoute.of(context)?.settings.arguments; + if (obj != null && (obj['isOn'] != null)) { + final int getValue = obj['isOn']; if (getValue == 1) { _isOn = true; } else { @@ -76,7 +77,7 @@ class _HideInvalidUnlockPermissionsPageState children: [ Expanded( child: Text( - "${TranslationLoader.lanKeys!.currentMode!.tr} : ${_isOn == true ? TranslationLoader.lanKeys!.opened!.tr : TranslationLoader.lanKeys!.closed!.tr}", + '${"当前模式".tr} : ${_isOn == true ? TranslationLoader.lanKeys!.opened!.tr : TranslationLoader.lanKeys!.closed!.tr}', style: TextStyle(fontWeight: FontWeight.w600, fontSize: 22.sp), )), @@ -107,10 +108,10 @@ class _HideInvalidUnlockPermissionsPageState //锁屏/隐藏无效开锁权限 1:锁屏 2:隐藏无效开锁权限 Future changeSettingsRequest() async { - ExpireLockListEntity entity = + final ExpireLockListEntity entity = await ApiRepository.to.changeSettings(_isOn == true ? '1' : '2', '2'); if (entity.errorCode!.codeIsSuccessful) { - EasyLoading.showToast("操作成功",duration: 2000.milliseconds); + EasyLoading.showToast('操作成功',duration: 2000.milliseconds); } } } diff --git a/lib/mine/mineSet/lockScreen/lockScreen_page.dart b/lib/mine/mineSet/lockScreen/lockScreen_page.dart index b7822d9e..f146cc79 100755 --- a/lib/mine/mineSet/lockScreen/lockScreen_page.dart +++ b/lib/mine/mineSet/lockScreen/lockScreen_page.dart @@ -32,9 +32,9 @@ class _LockScreenPageState extends State { @override Widget build(BuildContext context) { if (_isFirst) { - dynamic obj = ModalRoute.of(context)?.settings.arguments; - if (obj != null && (obj["isOn"] != null)) { - int getValue = obj["isOn"]; + final dynamic obj = ModalRoute.of(context)?.settings.arguments; + if (obj != null && (obj['isOn'] != null)) { + final int getValue = obj['isOn']; if (getValue == 1) { _isOn = true; } else { @@ -80,7 +80,7 @@ class _LockScreenPageState extends State { children: [ Expanded( child: Text( - "${TranslationLoader.lanKeys!.currentMode!.tr} : ${_isOn == true ? TranslationLoader.lanKeys!.opened!.tr : TranslationLoader.lanKeys!.closed!.tr}", + '${"当前模式".tr} : ${_isOn == true ? TranslationLoader.lanKeys!.opened!.tr : TranslationLoader.lanKeys!.closed!.tr}', style: TextStyle(fontWeight: FontWeight.w600, fontSize: 22.sp), )), @@ -107,7 +107,7 @@ class _LockScreenPageState extends State { //锁屏/隐藏无效开锁权限 1:锁屏 2:隐藏无效开锁权限 Future changeSettingsRequest() async { - ExpireLockListEntity entity = + final ExpireLockListEntity entity = await ApiRepository.to.changeSettings(_isOn == true ? '1' : '2', '1'); if (entity.errorCode!.codeIsSuccessful) { EasyLoading.showToast('操作成功',duration: 2000.milliseconds); diff --git a/lib/mine/mineSet/lockUserManage/expireLockList/expireKeyChangeValidityDate/expireKeyChangeValidityDate_page.dart b/lib/mine/mineSet/lockUserManage/expireLockList/expireKeyChangeValidityDate/expireKeyChangeValidityDate_page.dart index 30127ec6..7412af74 100644 --- a/lib/mine/mineSet/lockUserManage/expireLockList/expireKeyChangeValidityDate/expireKeyChangeValidityDate_page.dart +++ b/lib/mine/mineSet/lockUserManage/expireLockList/expireKeyChangeValidityDate/expireKeyChangeValidityDate_page.dart @@ -244,8 +244,7 @@ class _ExpireKeyChangeValidityDatePageState extends State[ Obx(() => CommonItem( - leftTitel: - "${TranslationLoader.lanKeys!.begin!.tr}${TranslationLoader.lanKeys!.time!.tr}", + leftTitel: '开始时间'.tr, rightTitle: state.starTime.value, isHaveDirection: true, isHaveLine: true, @@ -261,8 +260,7 @@ class _ExpireKeyChangeValidityDatePageState extends State CommonItem( - leftTitel: - "${TranslationLoader.lanKeys!.end!.tr}${TranslationLoader.lanKeys!.time!.tr}", + leftTitel:'结束时间'.tr, rightTitle: state.endTime.value, isHaveDirection: true, action: () { diff --git a/lib/translations/lanKeyEntity.dart b/lib/translations/lanKeyEntity.dart index 7065149a..356237f2 100755 --- a/lib/translations/lanKeyEntity.dart +++ b/lib/translations/lanKeyEntity.dart @@ -80,20 +80,20 @@ class LanKeyEntity { // this.cancel, // this.add, - this.accountNumber, - this.volumeAuthorizationLock, - this.authorizedAdminTip, - this.lockOperatingRecordTip, - this.rankingList, - this.earlyArrivalList, - this.lateList, - this.hardWorkingList, + // this.accountNumber, + // this.volumeAuthorizationLock, + // this.authorizedAdminTip, + // this.lockOperatingRecordTip, + // this.rankingList, + // this.earlyArrivalList, + // this.lateList, + // this.hardWorkingList, this.basicInformation, this.wirelessKeyboard, this.doorMagnetic, this.remoteUnlocking, this.automaticBlocking, - this.normallyOpenMode, + // this.normallyOpenMode, this.automaticUnLock, this.automaticUnLockTip, this.lockSound, @@ -126,12 +126,12 @@ class LanKeyEntity { this.nearbyEquipment, this.noData, this.doorMagneticListTopTip, - this.remoteUnlockingPageTip, - this.currentMode, - this.delayTime, - this.automaticBlockingTip, - this.time, - this.normallyOpen, + // this.remoteUnlockingPageTip, + // this.currentMode, + // this.delayTime, + // this.automaticBlockingTip, + // this.time, + // this.normallyOpen, this.date, this.begin, this.end, @@ -540,16 +540,16 @@ class LanKeyEntity { // sure = json['sure']; // cancel = json['cancel']; // add = json['add']; - accountNumber = json['accountNumber']; - volumeAuthorizationLock = json['volumeAuthorizationLock']; - authorizedAdminTip = json['authorizedAdminTip']; - lockOperatingRecordTip = json['lockOperatingRecordTip']; - remoteUnlockingPageTip = json['remoteUnlockingPageTip']; - currentMode = json['currentMode']; - delayTime = json['delayTime']; - automaticBlockingTip = json['automaticBlockingTip']; - time = json['time']; - normallyOpen = json['normallyOpen']; + // accountNumber = json['accountNumber']; + // volumeAuthorizationLock = json['volumeAuthorizationLock']; + // authorizedAdminTip = json['authorizedAdminTip']; + // lockOperatingRecordTip = json['lockOperatingRecordTip']; + // remoteUnlockingPageTip = json['remoteUnlockingPageTip']; + // currentMode = json['currentMode']; + // delayTime = json['delayTime']; + // automaticBlockingTip = json['automaticBlockingTip']; + // time = json['time']; + // normallyOpen = json['normallyOpen']; date = json['date']; begin = json['begin']; end = json['end']; @@ -584,7 +584,7 @@ class LanKeyEntity { doorMagnetic = json['doorMagnetic']; remoteUnlocking = json['remoteUnlocking']; automaticBlocking = json['automaticBlocking']; - normallyOpenMode = json['normallyOpenMode']; + // normallyOpenMode = json['normallyOpenMode']; automaticUnLock = json['automaticUnLock']; automaticUnLockTip = json['automaticUnLockTip']; lockSound = json['lockSound']; @@ -619,10 +619,10 @@ class LanKeyEntity { nearbyEquipment = json['nearbyEquipment']; noData = json['noData']; doorMagneticListTopTip = json['doorMagneticListTopTip']; - rankingList = json['rankingList']; - earlyArrivalList = json['earlyArrivalList']; - lateList = json['lateList']; - hardWorkingList = json['hardWorkingList']; + // rankingList = json['rankingList']; + // earlyArrivalList = json['earlyArrivalList']; + // lateList = json['lateList']; + // hardWorkingList = json['hardWorkingList']; company = json['company']; staff = json['staff']; work = json['work']; @@ -1049,16 +1049,16 @@ class LanKeyEntity { // String? sure; // String? cancel; // String? add; - String? accountNumber; - String? volumeAuthorizationLock; - String? authorizedAdminTip; - String? lockOperatingRecordTip; - String? remoteUnlockingPageTip; - String? currentMode; - String? delayTime; - String? automaticBlockingTip; - String? time; - String? normallyOpen; + // String? accountNumber; + // String? volumeAuthorizationLock; + // String? authorizedAdminTip; + // String? lockOperatingRecordTip; + // String? remoteUnlockingPageTip; + // String? currentMode; + // String? delayTime; + // String? automaticBlockingTip; + // String? time; + // String? normallyOpen; String? date; String? begin; String? end; @@ -1087,10 +1087,10 @@ class LanKeyEntity { String? upgrade; String? leisure; String? checkedIn; - String? rankingList; - String? earlyArrivalList; - String? lateList; - String? hardWorkingList; + // String? rankingList; + // String? earlyArrivalList; + // String? lateList; + // String? hardWorkingList; String? company; String? staff; String? work; @@ -1129,7 +1129,7 @@ class LanKeyEntity { String? doorMagnetic; String? remoteUnlocking; String? automaticBlocking; - String? normallyOpenMode; + // String? normallyOpenMode; String? automaticUnLock; String? automaticUnLockTip; String? lockSound; @@ -1547,16 +1547,17 @@ class LanKeyEntity { // map['sure'] = sure; // map['cancel'] = cancel; // map['add'] = add; - map['accountNumber'] = accountNumber; - map['volumeAuthorizationLock'] = volumeAuthorizationLock; - map['authorizedAdminTip'] = authorizedAdminTip; - map['lockOperatingRecordTip'] = lockOperatingRecordTip; - map['remoteUnlockingPageTip'] = remoteUnlockingPageTip; - map['currentMode'] = currentMode; - map['delayTime'] = delayTime; - map['automaticBlockingTip'] = automaticBlockingTip; - map['time'] = time; - map['normallyOpen'] = normallyOpen; + // map['accountNumber'] = accountNumber; + // map['volumeAuthorizationLock'] = volumeAuthorizationLock; + // map['authorizedAdminTip'] = authorizedAdminTip; + // map['lockOperatingRecordTip'] = lockOperatingRecordTip; + // map['remoteUnlockingPageTip'] = remoteUnlockingPageTip; + + // map['currentMode'] = currentMode; + // map['delayTime'] = delayTime; + // map['automaticBlockingTip'] = automaticBlockingTip; + // map['time'] = time; + // map['normallyOpen'] = normallyOpen; map['date'] = date; map['begin'] = begin; map['end'] = end; @@ -1585,17 +1586,17 @@ class LanKeyEntity { map['upgrade'] = upgrade; map['leisure'] = leisure; map['checkedIn'] = checkedIn; - map['rankingList'] = rankingList; - map['earlyArrivalList'] = earlyArrivalList; - map['lateList'] = lateList; - map['hardWorkingList'] = hardWorkingList; + // map['rankingList'] = rankingList; + // map['earlyArrivalList'] = earlyArrivalList; + // map['lateList'] = lateList; + // map['hardWorkingList'] = hardWorkingList; map['basicInformation'] = basicInformation; map['wirelessKeyboard'] = wirelessKeyboard; map['doorMagnetic'] = doorMagnetic; map['remoteUnlocking'] = remoteUnlocking; map['automaticBlocking'] = automaticBlocking; - map['normallyOpenMode'] = normallyOpenMode; + // map['normallyOpenMode'] = normallyOpenMode; map['automaticUnLock'] = automaticUnLock; map['automaticUnLockTip'] = automaticUnLockTip; map['lockSound'] = lockSound;