From f5b79303a85c6102c3af0bccfbbbf2094139e3dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AD=8F=E5=B0=91=E9=98=B3?= <786612630@qq.com> Date: Thu, 25 Jul 2024 14:40:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95=E3=80=81?= =?UTF-8?q?=E5=8D=A1=E3=80=81=E6=8C=87=E7=BA=B9=E3=80=81=E4=BA=BA=E8=84=B8?= =?UTF-8?q?=E3=80=81=E9=81=A5=E6=8E=A7=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lan/lan_en.json | 29 ++--- lan/lan_keys.json | 28 ++--- lan/lan_zh.json | 29 ++--- lib/flavors.dart | 14 +-- .../starLock_forgetPassword_page.dart | 17 ++- .../starLock_forgetPassword_xhj_page.dart | 12 +-- lib/login/login/starLock_login_page.dart | 3 +- lib/login/login/starLock_login_xhj_page.dart | 3 +- .../register/starLock_register_page.dart | 6 +- .../register/starLock_register_xhj_page.dart | 32 +++--- .../card/addCardType/addCardType_page.dart | 3 +- .../card/addICCard/addICCard_page.dart | 3 +- .../card/cardDetail/cardDetail_page.dart | 6 +- .../card/cardList/cardList_page.dart | 4 +- .../checkingInSet/checkingInSet_page.dart | 3 +- .../checkingInAddStaff_page.dart | 6 +- .../doorLockLog/doorLockLog_page.dart | 2 +- .../electronicKeyList_page.dart | 2 +- .../lockDetail/face/addFace/addFace_page.dart | 2 +- .../face/addFaceType/addFaceType_page.dart | 3 +- .../face/faceDetail/faceDetail_page.dart | 2 +- .../face/faceList/faceList_page.dart | 4 +- .../addFingerprint/addFingerprint_page.dart | 2 +- .../addFingerprintType_page.dart | 3 +- .../fingerprintDetail_page.dart | 5 +- .../fingerprintList/fingerprintList_page.dart | 4 +- .../iris/irisDetail/irisDetail_page.dart | 89 +++++++-------- .../lockDetail/lockDetail_logic.dart | 2 +- .../lockDetail/lockDetail_page.dart | 21 ++-- .../lockOperatingRecord_page.dart | 2 +- .../adminOpenLockPassword_page.dart | 2 +- .../lockSet/lockSet/lockSet_page.dart | 2 +- .../palm/palmDetail/palmDetail_page.dart | 2 +- .../passwordKeyDetail_page.dart | 6 +- .../passwordKeyList/passwordKeyList_page.dart | 2 +- .../passwordKey_perpetual_page.dart | 2 +- .../remoteControlDetail_page.dart | 2 +- .../demoModeLockDetail_page.dart | 102 ++++++++---------- .../demoModeLockSet/demoModeLockSet_page.dart | 48 ++++----- .../minePersonInfoEditIphone_page.dart | 4 +- .../expireLockManage_tabbar.dart | 10 +- lib/translations/lanKeyEntity.dart | 84 ++++++++------- 42 files changed, 291 insertions(+), 316 deletions(-) diff --git a/lan/lan_en.json b/lan/lan_en.json index f8755200..d1f5dc3f 100755 --- a/lan/lan_en.json +++ b/lan/lan_en.json @@ -1,15 +1,17 @@ { - "starLock": "Star Lock", - "lockThrough": "Lock Through", - "clickUnlockAndHoldDownClose": "Click To Unlock And Hold Down to Close", - "checkingIn": "CheckIn", - "electronicKey": "KeyCard", - "password": "Password", - "card": "Card", - "fingerprint": "Finger", - "remoteControl": "RemCtrl", - "face": "face", - "operatingRecord": "OpLog", + "星锁": "Star Lock", + "锁通通": "Lock Through", + "点击开锁，长按闭锁": "Click To Unlock And Hold Down to Close", + "考勤": "Check In", + "考勤设置": "Check In Settings", + "电子钥匙": "Electronic Key", + "添加卡": "Add Card", + "卡号": "Card Number", + "添加指纹": "Add Fingerprint", + "指纹号": "Fingerprint Number", + "遥控": "Remote Control", + "添加人脸": "添加人脸", + "doorLockLog": "Door lock log", "number": "Number", "additive": "Additive", @@ -246,7 +248,7 @@ "nickName": "NickName", "changeNickName": "Change NickName", "modifyAccount": "Modify Account", - "resetPasswords": "Reset Passwords", + "重置密码": "Reset Passwords", "safetyProblem": "Safety Problem", "modifyAccountTip": "For the security of your account, please use the account password verification before modifying the account", "pleaseEnterAccountNumber": "Please enter your account number", @@ -256,7 +258,7 @@ "goBind": "Go Bind", "originalPassword": "Original Password", "newPassword": "New Password", - "surePassword": "Sure Password", + "确认密码": "Sure Password", "safetyProblemTip": "When you lose your phone, you can log in to the new device by answering the security questions you set", "problemOne": "Problem One", "problemTwo": "Problem Two", @@ -452,6 +454,7 @@ "judgmentMethodContent": "The man stood outside the house, facing the entrance door. \nIf the hinge or shaft of the door is on the left, the door is left open; \nA door is right-open if its hinge or shaft is on the right. \nIf the setting is wrong, it will not open and close the door properly. \nRecommended to be operated by installation or maintenance personnel.", "customMode": "Custom mode", "videoSlot": "Video slot", + "密码": "Password", "卡": "Card", "指纹": "Finger", diff --git a/lan/lan_keys.json b/lan/lan_keys.json index bf7404a6..77799a11 100755 --- a/lan/lan_keys.json +++ b/lan/lan_keys.json @@ -1,15 +1,17 @@ { - "starLock":"starLock", - "lockThrough":"lockThrough", - "clickUnlockAndHoldDownClose":"clickUnlockAndHoldDownClose", - "checkingIn":"checkingIn", - "electronicKey":"electronicKey", - "password":"password", - "card":"card", - "fingerprint":"fingerprint", - "remoteControl":"remoteControl", - "face":"face", - "operatingRecord":"operatingRecord", + "星锁":"星锁", + "锁通通":"锁通通", + "点击开锁，长按闭锁":"点击开锁，长按闭锁", + "考勤":"考勤", + "考勤设置": "考勤设置", + "电子钥匙":"电子钥匙", + "添加卡": "添加卡", + "卡号": "卡号", + "添加指纹": "添加指纹", + "指纹号": "指纹号", + "遥控": "遥控", + "添加人脸": "添加人脸", + "doorLockLog":"doorLockLog", "number":"number", "additive":"additive", @@ -248,7 +250,7 @@ "nickName":"nickName", "changeNickName":"changeNickName", "modifyAccount":"modifyAccount", - "resetPasswords":"resetPasswords", + "重置密码":"重置密码", "safetyProblem":"safetyProblem", "modifyAccountTip":"modifyAccountTip", "pleaseEnterAccountNumber":"pleaseEnterAccountNumber", @@ -258,7 +260,7 @@ "goBind":"goBind", "originalPassword":"originalPassword", "newPassword":"newPassword", - "surePassword":"surePassword", + "确认密码":"确认密码", "safetyProblemTip":"safetyProblemTip", "problemOne":"problemOne", "problemTwo":"problemTwo", diff --git a/lan/lan_zh.json b/lan/lan_zh.json index bcf35060..950249a0 100755 --- a/lan/lan_zh.json +++ b/lan/lan_zh.json @@ -1,15 +1,17 @@ { - "starLock": "星锁", - "lockThrough": "锁通通", - "clickUnlockAndHoldDownClose": "点击开锁，长按闭锁", - "checkingIn": "考勤", - "electronicKey": "电子钥匙", - "password": "密码", - "card": "卡", - "fingerprint": "指纹", - "remoteControl": "遥控", - "face": "人脸", - "operatingRecord": "操作记录", + "星锁": "星锁", + "锁通通": "锁通通", + "点击开锁，长按闭锁": "点击开锁，长按闭锁", + "考勤": "考勤", + "考勤设置": "考勤设置", + "电子钥匙": "电子钥匙", + "添加卡": "添加卡", + "卡号": "卡号", + "添加指纹": "添加指纹", + "指纹号": "指纹号", + "遥控": "遥控", + "添加人脸": "添加人脸", + "doorLockLog": "门锁日志", "number": "号", "additive": "添加者", @@ -243,7 +245,7 @@ "nickName": "昵称", "changeNickName": "修改昵称", "modifyAccount": "修改账号", - "resetPasswords": "重置密码", + "重置密码": "重置密码", "safetyProblem": "安全问题", "modifyAccountTip": "为了你的账号安全，修改账号前请先使用验证码验证", "pleaseEnterAccountNumber": "请输入账号", @@ -253,7 +255,7 @@ "goBind": "去绑定", "originalPassword": "原密码", "newPassword": "新密码", - "surePassword": "确认密码", + "确认密码": "确认密码", "safetyProblemTip": "当你手机丢了，可以通过回答设置的安全问题来登录新设备", "problemOne": "问题一", "problemTwo": "问题二", @@ -723,7 +725,6 @@ "有人按门铃": "有人按门铃", "有人出现在门口": "有人出现在门口", "提醒方式": "提醒方式", - "电子钥匙": "电子钥匙", "开门方式": "开门方式", "请选择": "请选择", "家人": "家人", diff --git a/lib/flavors.dart b/lib/flavors.dart index 723078df..982acd95 100755 --- a/lib/flavors.dart +++ b/lib/flavors.dart @@ -58,9 +58,9 @@ class F { case Flavor.pre: return '星锁-pre'; case Flavor.sky: - return '锁通通'; + return '锁通通'.tr; case Flavor.xhj: - return '星星锁'; + return '星星锁'.tr; default: throw Exception('flavor[$name] title not found'); } @@ -69,15 +69,15 @@ class F { static String get navTitle { switch (appFlavor) { case Flavor.local: - return '${"starLock".tr}-local'; + return '${"星锁".tr}-local'; case Flavor.dev: - return '${"starLock".tr}-dev'; + return '${"星锁".tr}-dev'; case Flavor.pre: - return 'starLock'.tr; + return '星锁'.tr; case Flavor.sky: - return '锁通通'; + return '锁通通'.tr; case Flavor.xhj: - return '星星锁'; + return '星星锁'.tr; default: throw Exception('flavor[$name] title not found'); } diff --git a/lib/login/forgetPassword/starLock_forgetPassword_page.dart b/lib/login/forgetPassword/starLock_forgetPassword_page.dart index f71c5186..eba5eee9 100755 --- a/lib/login/forgetPassword/starLock_forgetPassword_page.dart +++ b/lib/login/forgetPassword/starLock_forgetPassword_page.dart @@ -1,18 +1,15 @@ -import 'dart:async'; - import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; -import 'package:star_lock/app_settings/app_settings.dart'; import 'package:star_lock/login/forgetPassword/starLock_forgetPassword_logic.dart'; import 'package:star_lock/login/forgetPassword/starLock_forgetPassword_state.dart'; import 'package:star_lock/main/lockMian/lockMain/lockMain_logic.dart'; import '../../appRouters.dart'; import '../../app_settings/app_colors.dart'; -import '../../tools/tf_loginInput.dart'; import '../../tools/submitBtn.dart'; +import '../../tools/tf_loginInput.dart'; import '../../tools/titleAppBar.dart'; import '../../translations/trans_lib.dart'; @@ -132,7 +129,7 @@ class _StarLockForgetPasswordPageState ), ), hintText: - "${TranslationLoader.lanKeys!.pleaseEnter!.tr}${TranslationLoader.lanKeys!.password!.tr}", + '请输入密码'.tr, inputFormatters: [ LengthLimitingTextInputFormatter(20), ]), @@ -160,7 +157,7 @@ class _StarLockForgetPasswordPageState ), ), hintText: - "${TranslationLoader.lanKeys!.sure!.tr}${TranslationLoader.lanKeys!.password!.tr}", + '确认密码'.tr, inputFormatters: [ LengthLimitingTextInputFormatter(20), ]), @@ -180,8 +177,7 @@ class _StarLockForgetPasswordPageState height: 30.w, ), ), - hintText: - "${TranslationLoader.lanKeys!.pleaseEnter!.tr}${TranslationLoader.lanKeys!.verificationCode!.tr}", + hintText: "${TranslationLoader.lanKeys!.pleaseEnter!.tr}${TranslationLoader.lanKeys!.verificationCode!.tr}", inputFormatters: [ LengthLimitingTextInputFormatter(20), ]), @@ -200,7 +196,7 @@ class _StarLockForgetPasswordPageState 'account': state.phoneStr.value }); logic.state.xWidth.value = - (result as Map)['xWidth']; + (result! as Map)['xWidth']; logic.sendValidationCode(); } : null, @@ -230,8 +226,7 @@ class _StarLockForgetPasswordPageState SizedBox(height: 50.w), Obx(() { return SubmitBtn( - btnName: - '${TranslationLoader.lanKeys!.reset!.tr}${TranslationLoader.lanKeys!.password!.tr}', + btnName: '重置密码'.tr, // backgroundColorList: state.canSub.value ? [AppColors.mainColor] :[Colors.grey], fontSize: 30.sp, borderRadius: 20.w, diff --git a/lib/login/forgetPassword/starLock_forgetPassword_xhj_page.dart b/lib/login/forgetPassword/starLock_forgetPassword_xhj_page.dart index f40ad1a8..9baf9798 100755 --- a/lib/login/forgetPassword/starLock_forgetPassword_xhj_page.dart +++ b/lib/login/forgetPassword/starLock_forgetPassword_xhj_page.dart @@ -43,7 +43,7 @@ class _StarLockForgetPasswordPageState children: [ GestureDetector( onTap: () async { - Object? result = await Navigator.pushNamed( + final Object? result = await Navigator.pushNamed( context, Routers.selectCountryRegionPage); if (result != null) { result as Map; @@ -103,8 +103,7 @@ class _StarLockForgetPasswordPageState leftWidget: Padding( padding: EdgeInsets.only(top: 30.w, bottom: 20.w, left: 5.w), ), - label: - '${TranslationLoader.lanKeys!.pleaseEnter!.tr}${TranslationLoader.lanKeys!.password!.tr}', + label:'请输入密码'.tr, inputFormatters: [ LengthLimitingTextInputFormatter(20), ]), @@ -124,7 +123,7 @@ class _StarLockForgetPasswordPageState padding: EdgeInsets.only(top: 30.w, bottom: 20.w, left: 5.w), ), label: - '${TranslationLoader.lanKeys!.sure!.tr}${TranslationLoader.lanKeys!.password!.tr}', + '确认密码'.tr, inputFormatters: [ LengthLimitingTextInputFormatter(20), ]), @@ -146,7 +145,7 @@ class _StarLockForgetPasswordPageState Obx(() => GestureDetector( onTap: (state.phoneStrIsOK.value && state.canResend.value) ? () async { - Object? result = await Navigator.pushNamed( + final Object? result = await Navigator.pushNamed( context, Routers.safetyVerificationPage, arguments: { 'countryCode': state.countryCode.value, @@ -180,8 +179,7 @@ class _StarLockForgetPasswordPageState SizedBox(height: 50.w), Obx(() { return SubmitBtn( - btnName: - '${TranslationLoader.lanKeys!.reset!.tr}${TranslationLoader.lanKeys!.password!.tr}', + btnName:'重置密码'.tr, // backgroundColorList: state.canSub.value ? [AppColors.mainColor] :[Colors.grey], fontSize: 30.sp, borderRadius: 20.w, diff --git a/lib/login/login/starLock_login_page.dart b/lib/login/login/starLock_login_page.dart index c34904dd..ef178693 100755 --- a/lib/login/login/starLock_login_page.dart +++ b/lib/login/login/starLock_login_page.dart @@ -145,8 +145,7 @@ class _StarLockLoginPageState extends State { height: 36.w, ), ), - hintText: - '${TranslationLoader.lanKeys!.pleaseEnter!.tr}${TranslationLoader.lanKeys!.password!.tr}', + hintText: '请输入密码'.tr, inputFormatters: [ LengthLimitingTextInputFormatter(20), ]), diff --git a/lib/login/login/starLock_login_xhj_page.dart b/lib/login/login/starLock_login_xhj_page.dart index a6ce5e3f..4ef9a0a0 100755 --- a/lib/login/login/starLock_login_xhj_page.dart +++ b/lib/login/login/starLock_login_xhj_page.dart @@ -145,8 +145,7 @@ class _StarLockLoginPageState extends State { bottom: 20.w, ), ), - label: - '${TranslationLoader.lanKeys!.pleaseEnter!.tr}${TranslationLoader.lanKeys!.password!.tr}', + label: '请输入密码'.tr, inputFormatters: [ LengthLimitingTextInputFormatter(20), ]), diff --git a/lib/login/register/starLock_register_page.dart b/lib/login/register/starLock_register_page.dart index 357095b1..9960861e 100755 --- a/lib/login/register/starLock_register_page.dart +++ b/lib/login/register/starLock_register_page.dart @@ -238,8 +238,7 @@ class _StarLockRegisterPageState extends State { height: 30.w, ), ), - hintText: - '${TranslationLoader.lanKeys!.pleaseEnter!.tr}${TranslationLoader.lanKeys!.password!.tr}', + hintText:'请输入密码'.tr, inputFormatters: [ LengthLimitingTextInputFormatter(20), ]), @@ -265,8 +264,7 @@ class _StarLockRegisterPageState extends State { height: 30.w, ), ), - hintText: - '${TranslationLoader.lanKeys!.sure!.tr}${TranslationLoader.lanKeys!.password!.tr}', + hintText: '确认密码'.tr, inputFormatters: [ LengthLimitingTextInputFormatter(20), ]), diff --git a/lib/login/register/starLock_register_xhj_page.dart b/lib/login/register/starLock_register_xhj_page.dart index 0185d9a3..493e1ad7 100755 --- a/lib/login/register/starLock_register_xhj_page.dart +++ b/lib/login/register/starLock_register_xhj_page.dart @@ -1,3 +1,4 @@ + import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; @@ -6,8 +7,8 @@ import 'package:get/get.dart'; import '../../appRouters.dart'; import '../../app_settings/app_colors.dart'; import '../../common/XSConstantMacro/XSConstantMacro.dart'; -import '../../tools/tf_loginInput.dart'; import '../../tools/submitBtn.dart'; +import '../../tools/tf_loginInput.dart'; import '../../tools/titleAppBar.dart'; import '../../translations/trans_lib.dart'; import 'starLock_register_logic.dart'; @@ -99,14 +100,14 @@ class _StarLockRegisterPageState extends State { ), GestureDetector( onTap: () async { - var result = await Get.toNamed(Routers.selectCountryRegionPage); + final result = await Get.toNamed(Routers.selectCountryRegionPage); if (result != null) { result as Map; state.countryCode.value = result['code']; state.countryName.value = result['countryName']; logic.checkIpAction(); } - Get.log("路由返回值: $result, countryCode:${logic.state.countryCode}"); + // Get.log("路由返回值: $result, countryCode:${logic.state.countryCode}"); }, child: Obx(() => Container( color: Colors.white, @@ -155,8 +156,7 @@ class _StarLockRegisterPageState extends State { }, isPwd: true, leftWidget: SizedBox(), - label: - "${TranslationLoader.lanKeys!.pleaseEnter!.tr}${TranslationLoader.lanKeys!.password!.tr}", + label: '请输入密码'.tr, inputFormatters: [ LengthLimitingTextInputFormatter(20), ]), @@ -172,8 +172,7 @@ class _StarLockRegisterPageState extends State { }, isPwd: true, leftWidget: SizedBox(), - label: - "${TranslationLoader.lanKeys!.sure!.tr}${TranslationLoader.lanKeys!.password!.tr}", + label: '确认密码'.tr, inputFormatters: [ LengthLimitingTextInputFormatter(20), ]), @@ -186,8 +185,7 @@ class _StarLockRegisterPageState extends State { logic.checkNext(state.codeController); }, leftWidget: SizedBox(), - label: - "${TranslationLoader.lanKeys!.pleaseEnter!.tr}${TranslationLoader.lanKeys!.verificationCode!.tr}", + label: "${TranslationLoader.lanKeys!.pleaseEnter!.tr}${TranslationLoader.lanKeys!.verificationCode!.tr}", inputFormatters: [ LengthLimitingTextInputFormatter(20), ]), @@ -198,14 +196,14 @@ class _StarLockRegisterPageState extends State { ? () async { // Navigator.pushNamed(context, Routers.safetyVerificationPage, arguments: {"countryCode":"+86", "account":state.phoneOrEmailStr.value}); if (state.pwd.value != state.surePwd.value) { - logic.showToast("密码不一致哦".tr); + logic.showToast('密码不一致哦'.tr); return; } - var result = await Get.toNamed( + final result = await Get.toNamed( Routers.safetyVerificationPage, arguments: { - "countryCode": state.countryCode, - "account": state.phoneOrEmailStr.value + 'countryCode': state.countryCode, + 'account': state.phoneOrEmailStr.value }); state.xWidth.value = (result as Map)['xWidth']; @@ -272,8 +270,8 @@ class _StarLockRegisterPageState extends State { color: AppColors.mainColor, fontSize: 20.sp)), onTap: () { Get.toNamed(Routers.webviewShowPage, arguments: { - "url": XSConstantMacro.userAgreementURL, - "title": '用户协议'.tr + 'url': XSConstantMacro.userAgreementURL, + 'title': '用户协议'.tr }); }, )), @@ -286,8 +284,8 @@ class _StarLockRegisterPageState extends State { color: AppColors.mainColor, fontSize: 20.sp)), onTap: () { Get.toNamed(Routers.webviewShowPage, arguments: { - "url": XSConstantMacro.privacyPolicyURL, - "title": '隐私政策'.tr + 'url': XSConstantMacro.privacyPolicyURL, + 'title': '隐私政策'.tr }); }, )), diff --git a/lib/main/lockDetail/card/addCardType/addCardType_page.dart b/lib/main/lockDetail/card/addCardType/addCardType_page.dart index e01c81a8..11721ed7 100755 --- a/lib/main/lockDetail/card/addCardType/addCardType_page.dart +++ b/lib/main/lockDetail/card/addCardType/addCardType_page.dart @@ -59,8 +59,7 @@ class _AddCardPageState extends State return Scaffold( backgroundColor: AppColors.mainBackgroundColor, appBar: TitleAppBar( - barTitle: - '${TranslationLoader.lanKeys!.addTip!.tr}${TranslationLoader.lanKeys!.card!.tr}', + barTitle: '添加卡'.tr, haveBack: true, backgroundColor: AppColors.mainColor), body: Column( diff --git a/lib/main/lockDetail/card/addICCard/addICCard_page.dart b/lib/main/lockDetail/card/addICCard/addICCard_page.dart index d1fdade1..ea42b681 100755 --- a/lib/main/lockDetail/card/addICCard/addICCard_page.dart +++ b/lib/main/lockDetail/card/addICCard/addICCard_page.dart @@ -8,7 +8,6 @@ import 'package:star_lock/main/lockDetail/card/addICCard/addICCard_state.dart'; import '../../../../app_settings/app_colors.dart'; import '../../../../tools/appRouteObserver.dart'; import '../../../../tools/titleAppBar.dart'; -import '../../../../translations/trans_lib.dart'; import 'addICCard_logic.dart'; class AddICCardPage extends StatefulWidget { @@ -27,7 +26,7 @@ class _AddICCardPageState extends State with RouteAware { return Scaffold( backgroundColor: AppColors.mainBackgroundColor, appBar: TitleAppBar( - barTitle: '${TranslationLoader.lanKeys!.add!.tr}${TranslationLoader.lanKeys!.card!.tr}', + barTitle: '添加卡'.tr, haveBack: true, backgroundColor: AppColors.mainColor, ), diff --git a/lib/main/lockDetail/card/cardDetail/cardDetail_page.dart b/lib/main/lockDetail/card/cardDetail/cardDetail_page.dart index 08b2b7e9..b075427b 100755 --- a/lib/main/lockDetail/card/cardDetail/cardDetail_page.dart +++ b/lib/main/lockDetail/card/cardDetail/cardDetail_page.dart @@ -1,3 +1,4 @@ + import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; @@ -41,8 +42,7 @@ class _CardDetailPageState extends State with RouteAware { body: ListView( children: [ Obx(() => CommonItem( - leftTitel: - '${TranslationLoader.lanKeys!.card!.tr}${TranslationLoader.lanKeys!.number!.tr}', + leftTitel: '卡号'.tr, rightTitle: state.typeNumber.value, isHaveDirection: false, isHaveLine: true)), @@ -191,7 +191,7 @@ class _CardDetailPageState extends State with RouteAware { SizedBox(width: 60.w, height: 50.h, child: _isAdmin()))), Container(height: 10.h), CommonItem( - leftTitel: TranslationLoader.lanKeys!.operatingRecord!.tr, + leftTitel: '操作记录'.tr, rightTitle: '', isHaveDirection: true, action: () { diff --git a/lib/main/lockDetail/card/cardList/cardList_page.dart b/lib/main/lockDetail/card/cardList/cardList_page.dart index ae3558d7..b04ab445 100755 --- a/lib/main/lockDetail/card/cardList/cardList_page.dart +++ b/lib/main/lockDetail/card/cardList/cardList_page.dart @@ -57,7 +57,7 @@ class _CardListPageState extends State with RouteAware { backgroundColor: AppColors.mainBackgroundColor, resizeToAvoidBottomInset: false, appBar: TitleAppBar( - barTitle: TranslationLoader.lanKeys!.card!.tr, + barTitle: '卡'.tr, haveBack: true, backgroundColor: AppColors.mainColor, actionsList: [ @@ -109,7 +109,7 @@ class _CardListPageState extends State with RouteAware { Expanded(child: _buildMainUI()), AddBottomWhiteBtn( btnName: - '${TranslationLoader.lanKeys!.add!.tr}${TranslationLoader.lanKeys!.card!.tr}', + '添加卡'.tr, onClick: () async { final data = await Get.toNamed(Routers.addCardPage, arguments: { diff --git a/lib/main/lockDetail/checkingIn/checkingInSet/checkingInSet_page.dart b/lib/main/lockDetail/checkingIn/checkingInSet/checkingInSet_page.dart index 4943900c..f4a0795e 100755 --- a/lib/main/lockDetail/checkingIn/checkingInSet/checkingInSet_page.dart +++ b/lib/main/lockDetail/checkingIn/checkingInSet/checkingInSet_page.dart @@ -31,8 +31,7 @@ class _CheckingInSetPageState extends State { return Scaffold( backgroundColor: AppColors.mainBackgroundColor, appBar: TitleAppBar( - barTitle: - '${TranslationLoader.lanKeys!.checkingIn!.tr}${TranslationLoader.lanKeys!.set!.tr}', + barTitle: '考勤设置'.tr, haveBack: true, backgroundColor: AppColors.mainColor), body: Column( diff --git a/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_page.dart b/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_page.dart index 5bf58a1a..6c70a739 100755 --- a/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_page.dart +++ b/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_page.dart @@ -450,13 +450,13 @@ class _CheckingInAddStaffPageState extends State { title = TranslationLoader.lanKeys!.accountNumber!.tr; break; case 2: - title = TranslationLoader.lanKeys!.password!.tr; + title = '密码'.tr; break; case 3: - title = TranslationLoader.lanKeys!.card!.tr; + title = '卡'.tr; break; case 4: - title = TranslationLoader.lanKeys!.fingerprint!.tr; + title = '指纹'.tr; break; case 5: title = TranslationLoader.lanKeys!.humanFace!.tr; diff --git a/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart b/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart index bfe242b1..e5ac1bd9 100755 --- a/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart +++ b/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart @@ -37,7 +37,7 @@ class _DoorLockLogPageState extends State with RouteAware { return Scaffold( backgroundColor: AppColors.mainBackgroundColor, appBar: TitleAppBar( - barTitle: TranslationLoader.lanKeys!.operatingRecord!.tr, + barTitle: '操作记录'.tr, haveBack: true, backgroundColor: AppColors.mainColor, actionsList: [ diff --git a/lib/main/lockDetail/electronicKey/electronicKeyList/electronicKeyList_page.dart b/lib/main/lockDetail/electronicKey/electronicKeyList/electronicKeyList_page.dart index c3ca83fd..e06e1fdd 100755 --- a/lib/main/lockDetail/electronicKey/electronicKeyList/electronicKeyList_page.dart +++ b/lib/main/lockDetail/electronicKey/electronicKeyList/electronicKeyList_page.dart @@ -54,7 +54,7 @@ class _ElectronicKeyListPageState extends State { backgroundColor: AppColors.mainBackgroundColor, resizeToAvoidBottomInset: false, appBar: TitleAppBar( - barTitle: TranslationLoader.lanKeys!.electronicKey!.tr, + barTitle: '电子钥匙'.tr, haveBack: true, backgroundColor: AppColors.mainColor, actionsList: [ diff --git a/lib/main/lockDetail/face/addFace/addFace_page.dart b/lib/main/lockDetail/face/addFace/addFace_page.dart index 980b335b..92c51fa6 100755 --- a/lib/main/lockDetail/face/addFace/addFace_page.dart +++ b/lib/main/lockDetail/face/addFace/addFace_page.dart @@ -27,7 +27,7 @@ class _AddFacePageState extends State with RouteAware { return Scaffold( backgroundColor: Colors.white, appBar: TitleAppBar( - barTitle: '${TranslationLoader.lanKeys!.addTip!.tr}${TranslationLoader.lanKeys!.face!.tr}', + barTitle: '添加人脸'.tr, haveBack: true, backgroundColor: AppColors.mainColor), body: ListView( diff --git a/lib/main/lockDetail/face/addFaceType/addFaceType_page.dart b/lib/main/lockDetail/face/addFaceType/addFaceType_page.dart index f4e7146b..9ec37cf0 100755 --- a/lib/main/lockDetail/face/addFaceType/addFaceType_page.dart +++ b/lib/main/lockDetail/face/addFaceType/addFaceType_page.dart @@ -58,8 +58,7 @@ class _AddFaceTypePageState extends State with SingleTickerProv return Scaffold( backgroundColor: AppColors.mainBackgroundColor, appBar: TitleAppBar( - barTitle: - '${TranslationLoader.lanKeys!.addTip!.tr}${TranslationLoader.lanKeys!.face!.tr}', + barTitle: '添加人脸'.tr, haveBack: true, backgroundColor: AppColors.mainColor), body: Column( diff --git a/lib/main/lockDetail/face/faceDetail/faceDetail_page.dart b/lib/main/lockDetail/face/faceDetail/faceDetail_page.dart index 4556f2bf..90d0ff6f 100755 --- a/lib/main/lockDetail/face/faceDetail/faceDetail_page.dart +++ b/lib/main/lockDetail/face/faceDetail/faceDetail_page.dart @@ -185,7 +185,7 @@ class _FaceDetailPageState extends State with RouteAware { SizedBox(width: 60.w, height: 50.h, child: _isAdmin()))), Container(height: 10.h), CommonItem( - leftTitel: TranslationLoader.lanKeys!.operatingRecord!.tr, + leftTitel: '操作记录'.tr, rightTitle: '', isHaveDirection: true, action: () { diff --git a/lib/main/lockDetail/face/faceList/faceList_page.dart b/lib/main/lockDetail/face/faceList/faceList_page.dart index 825af7f2..bdaeb54a 100755 --- a/lib/main/lockDetail/face/faceList/faceList_page.dart +++ b/lib/main/lockDetail/face/faceList/faceList_page.dart @@ -55,7 +55,7 @@ class _FaceListPageState extends State with RouteAware { backgroundColor: AppColors.mainBackgroundColor, resizeToAvoidBottomInset: false, appBar: TitleAppBar( - barTitle: TranslationLoader.lanKeys!.face!.tr, + barTitle: '人脸'.tr, haveBack: true, backgroundColor: AppColors.mainColor, actionsList: [ @@ -113,7 +113,7 @@ class _FaceListPageState extends State with RouteAware { Expanded(child: _buildMainUI()), AddBottomWhiteBtn( btnName: - '${TranslationLoader.lanKeys!.add!.tr}${TranslationLoader.lanKeys!.face!.tr}', + '添加人脸'.tr, onClick: () async { final data = await Get.toNamed(Routers.addFaceTypePage, arguments: { diff --git a/lib/main/lockDetail/fingerprint/addFingerprint/addFingerprint_page.dart b/lib/main/lockDetail/fingerprint/addFingerprint/addFingerprint_page.dart index 28160109..37b278b7 100755 --- a/lib/main/lockDetail/fingerprint/addFingerprint/addFingerprint_page.dart +++ b/lib/main/lockDetail/fingerprint/addFingerprint/addFingerprint_page.dart @@ -26,7 +26,7 @@ class _AddFingerprintPageState extends State with RouteAware return Scaffold( backgroundColor: Colors.white, appBar: TitleAppBar( - barTitle: '${TranslationLoader.lanKeys!.addTip!.tr}${TranslationLoader.lanKeys!.fingerprint!.tr}', + barTitle: '添加指纹'.tr, haveBack: true, backgroundColor: AppColors.mainColor), body: ListView( diff --git a/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintType_page.dart b/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintType_page.dart index 4af1853e..43940779 100755 --- a/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintType_page.dart +++ b/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintType_page.dart @@ -55,8 +55,7 @@ class _AddFingerprintTypePageState extends State with Si return Scaffold( backgroundColor: AppColors.mainBackgroundColor, appBar: TitleAppBar( - barTitle: - '${TranslationLoader.lanKeys!.addTip!.tr}${TranslationLoader.lanKeys!.fingerprint!.tr}', + barTitle:'添加指纹'.tr, haveBack: true, backgroundColor: AppColors.mainColor), body: Column( diff --git a/lib/main/lockDetail/fingerprint/fingerprintDetail/fingerprintDetail_page.dart b/lib/main/lockDetail/fingerprint/fingerprintDetail/fingerprintDetail_page.dart index 096c7c3a..4d947886 100755 --- a/lib/main/lockDetail/fingerprint/fingerprintDetail/fingerprintDetail_page.dart +++ b/lib/main/lockDetail/fingerprint/fingerprintDetail/fingerprintDetail_page.dart @@ -42,8 +42,7 @@ class _FingerprintDetailPageState extends State body: Column( children: [ Obx(() => CommonItem( - leftTitel: - '${TranslationLoader.lanKeys!.fingerprint!.tr}${TranslationLoader.lanKeys!.number!.tr}', + leftTitel:'指纹号'.tr, rightTitle: state.typeNumber.value, isHaveDirection: false, isHaveLine: true)), @@ -193,7 +192,7 @@ class _FingerprintDetailPageState extends State SizedBox(width: 60.w, height: 50.h, child: _isAdmin()))), Container(height: 10.h), CommonItem( - leftTitel: TranslationLoader.lanKeys!.operatingRecord!.tr, + leftTitel: '操作记录'.tr, rightTitle: '', isHaveDirection: true, action: () { diff --git a/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_page.dart b/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_page.dart index c3ba3bb0..d162a20f 100755 --- a/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_page.dart +++ b/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_page.dart @@ -58,7 +58,7 @@ class _FingerprintListPageState extends State backgroundColor: AppColors.mainBackgroundColor, resizeToAvoidBottomInset: false, appBar: TitleAppBar( - barTitle: TranslationLoader.lanKeys!.fingerprint!.tr, + barTitle: '指纹'.tr, haveBack: true, backgroundColor: AppColors.mainColor, actionsList: [ @@ -111,7 +111,7 @@ class _FingerprintListPageState extends State Expanded(child: _buildMainUI()), AddBottomWhiteBtn( btnName: - '${TranslationLoader.lanKeys!.add!.tr}${TranslationLoader.lanKeys!.fingerprint!.tr}', + '添加指纹'.tr, onClick: () async { final data = await Get.toNamed(Routers.addFingerprintTypePage, arguments: { diff --git a/lib/main/lockDetail/iris/irisDetail/irisDetail_page.dart b/lib/main/lockDetail/iris/irisDetail/irisDetail_page.dart index 05bd6edf..4e9c9618 100755 --- a/lib/main/lockDetail/iris/irisDetail/irisDetail_page.dart +++ b/lib/main/lockDetail/iris/irisDetail/irisDetail_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/iris/irisDetail/irisDetail_logic.dart'; +import 'package:star_lock/main/lockDetail/iris/irisDetail/irisDetail_state.dart'; import '../../../../appRouters.dart'; import '../../../../app_settings/app_colors.dart'; @@ -26,23 +27,23 @@ class CardDetailPage extends StatefulWidget { } class _CardDetailPageState extends State with RouteAware { - final logic = Get.put(IrisDetailLogic()); - final state = Get.find().state; + final IrisDetailLogic logic = Get.put(IrisDetailLogic()); + final IrisDetailState state = Get.find().state; @override Widget build(BuildContext context) { return Scaffold( backgroundColor: AppColors.mainBackgroundColor, appBar: TitleAppBar( - barTitle: "虹膜详情", + barTitle: '虹膜详情', haveBack: true, backgroundColor: AppColors.mainColor, ), body: ListView( - children: [ + children: [ Obx(() => CommonItem( leftTitel: - "${TranslationLoader.lanKeys!.card!.tr}${TranslationLoader.lanKeys!.number!.tr}", + '虹膜', rightTitle: state.typeNumber.value, isHaveDirection: false, isHaveLine: true)), @@ -72,15 +73,15 @@ class _CardDetailPageState extends State with RouteAware { // 限时 var data = await Get.toNamed( Routers.otherTypeKeyChangeDatePage, - arguments: { - "pushType": 0, - "fingerprintItemData": + arguments: { + 'pushType': 0, + 'fingerprintItemData': state.fingerprintItemData.value, }); if (data != null) { setState(() { - state.starDate.value = data["beginTimeTimestamp"]; - state.endDate.value = data["endTimeTimestamp"]; + state.starDate.value = data['beginTimeTimestamp']; + state.endDate.value = data['endTimeTimestamp']; state.keyType.value = 2; }); } @@ -88,18 +89,18 @@ class _CardDetailPageState extends State with RouteAware { // 循环 var data = await Get.toNamed( Routers.otherTypeKeyChangeValidityDatePage, - arguments: { - "pushType": 0, - "fingerprintItemData": + arguments: { + 'pushType': 0, + 'fingerprintItemData': state.fingerprintItemData.value, }); if (data != null) { setState(() { - state.starDate.value = data["starDate"]; - state.endDate.value = data["endDate"]; - state.starTime.value = data["starTime"]; - state.endTime.value = data["endTime"]; - state.weekDay.value = data["weekDay"]; + state.starDate.value = data['starDate']; + state.endDate.value = data['endDate']; + state.starTime.value = data['starTime']; + state.endTime.value = data['endTime']; + state.weekDay.value = data['weekDay']; }); } } @@ -114,43 +115,43 @@ class _CardDetailPageState extends State with RouteAware { action: () async { var data = await Get.toNamed( Routers.otherTypeKeyChangeValidityDatePage, - arguments: { - "pushType": 0, - "fingerprintItemData": + arguments: { + 'pushType': 0, + 'fingerprintItemData': state.fingerprintItemData.value, }); if (data != null) { setState(() { - state.starDate.value = data["starDate"]; - state.endDate.value = data["endDate"]; - state.starTime.value = data["starTime"]; - state.endTime.value = data["endTime"]; - state.weekDay.value = data["weekDay"]; + state.starDate.value = data['starDate']; + state.endDate.value = data['endDate']; + state.starTime.value = data['starTime']; + state.endTime.value = data['endTime']; + state.weekDay.value = data['weekDay']; }); } })))), Obx(() => Visibility( visible: state.keyType.value == 4 ? true : false, child: Obx(() => CommonItem( - leftTitel: "有效时间", + leftTitel: '有效时间', rightTitle: - "${DateTool().dateToHNString(state.starTime.value)}-${DateTool().dateToHNString(state.endTime.value)}", + '${DateTool().dateToHNString(state.starTime.value)}-${DateTool().dateToHNString(state.endTime.value)}', isHaveDirection: true, action: () async { var data = await Get.toNamed( Routers.otherTypeKeyChangeValidityDatePage, - arguments: { - "pushType": 0, - "fingerprintItemData": + arguments: { + 'pushType': 0, + 'fingerprintItemData': state.fingerprintItemData.value, }); if (data != null) { setState(() { - state.starDate.value = data["starDate"]; - state.endDate.value = data["endDate"]; - state.starTime.value = data["starTime"]; - state.endTime.value = data["endTime"]; - state.weekDay.value = data["validityValue"]; + state.starDate.value = data['starDate']; + state.endDate.value = data['endDate']; + state.starTime.value = data['starTime']; + state.endTime.value = data['endTime']; + state.weekDay.value = data['validityValue']; }); } })))), @@ -167,15 +168,15 @@ class _CardDetailPageState extends State with RouteAware { SizedBox(height: 10.h), Obx(() => CommonItem( leftTitel: TranslationLoader.lanKeys!.stressCard!.tr, - rightTitle: "", + rightTitle: '', isTipsImg: false, isHaveRightWidget: true, rightWidget: SizedBox( width: 60.w, height: 50.h, child: _isStressFingerprint()))), Container(height: 10.h), CommonItem( - leftTitel: TranslationLoader.lanKeys!.operatingRecord!.tr, - rightTitle: "", + leftTitel: '操作记录'.tr, + rightTitle: '', isHaveDirection: true, action: () { // Get.toNamed(Routers.keyOperationRecordPage, arguments: { @@ -208,7 +209,7 @@ class _CardDetailPageState extends State with RouteAware { trackColor: CupertinoColors.systemGrey5, thumbColor: CupertinoColors.white, value: state.isStressFingerprint.value, - onChanged: (value) { + onChanged: (bool value) { setState(() { state.isStressFingerprint.value = value; logic.editICCardData(); @@ -314,11 +315,11 @@ class _CardDetailPageState extends State with RouteAware { return ShowTFView( title: "${TranslationLoader.lanKeys!.amend!.tr}${TranslationLoader.lanKeys!.name!.tr}", - tipTitle: "", + tipTitle: '', controller: state.changeNameController, sureClick: () { if (state.changeNameController.text.isEmpty) { - logic.showToast("请输入姓名"); + logic.showToast('请输入姓名'); return; } Get.back(); @@ -337,8 +338,8 @@ class _CardDetailPageState extends State with RouteAware { context: context, builder: (BuildContext context) { return ShowIosTipView( - title: "提示", - tipTitle: "确定要删除吗?", + title: '提示', + tipTitle: '确定要删除吗?', sureClick: () async { Get.back(); String? idStr = await Storage.getUid(); diff --git a/lib/main/lockDetail/lockDetail/lockDetail_logic.dart b/lib/main/lockDetail/lockDetail/lockDetail_logic.dart index ed4dd52e..d30aae0e 100755 --- a/lib/main/lockDetail/lockDetail/lockDetail_logic.dart +++ b/lib/main/lockDetail/lockDetail/lockDetail_logic.dart @@ -584,7 +584,7 @@ class LockDetailLogic extends BaseGetXController { } else { text = state.isOpenPassageMode.value == 1 ? '常开模式启动！长按闭锁'.tr - : TranslationLoader.lanKeys!.clickUnlockAndHoldDownClose!.tr; + : '点击开锁，长按闭锁'.tr; } return text; } diff --git a/lib/main/lockDetail/lockDetail/lockDetail_page.dart b/lib/main/lockDetail/lockDetail/lockDetail_page.dart index 320616f5..d49cab76 100755 --- a/lib/main/lockDetail/lockDetail/lockDetail_page.dart +++ b/lib/main/lockDetail/lockDetail/lockDetail_page.dart @@ -444,8 +444,7 @@ class _LockDetailPageState extends State crossAxisAlignment: CrossAxisAlignment.center, children: [ Text( - TranslationLoader - .lanKeys!.clickUnlockAndHoldDownClose!.tr, + '点击开锁，长按闭锁'.tr, style: TextStyle( color: AppColors.darkGrayTextColor, fontSize: 20.sp, @@ -1002,7 +1001,7 @@ class _LockDetailPageState extends State if (state.isAttendance.value == 1) { showWidgetArr.add(bottomItem( 'images/main/icon_main_clockingIn.png', - TranslationLoader.lanKeys!.checkingIn!.tr, + '考勤'.tr, state.bottomBtnisEable.value, () { Get.toNamed(Routers.checkingInListPage, arguments: state.keyInfos.value); @@ -1011,7 +1010,7 @@ class _LockDetailPageState extends State // 操作记录 showWidgetArr.add(bottomItem( 'images/main/icon_main_operatingRecord.png', - TranslationLoader.lanKeys!.operatingRecord!.tr, + '操作记录'.tr, state.bottomBtnisEable.value, () { Get.toNamed(Routers.doorLockLogPage, arguments: { @@ -1040,7 +1039,7 @@ class _LockDetailPageState extends State if (state.isAttendance.value == 1) { showWidgetArr.add(bottomItem( 'images/main/icon_main_clockingIn.png', - TranslationLoader.lanKeys!.checkingIn!.tr, + '考勤'.tr, state.bottomBtnisEable.value, () { Get.toNamed(Routers.checkingInListPage, arguments: state.keyInfos.value); @@ -1050,7 +1049,7 @@ class _LockDetailPageState extends State // 电子钥匙 showWidgetArr.add(bottomItem( 'images/main/icon_main_electronicKey.png', - TranslationLoader.lanKeys!.electronicKey!.tr, + '电子钥匙'.tr, state.bottomBtnisEable.value, () { Get.toNamed(Routers.electronicKeyListPage); })); @@ -1058,7 +1057,7 @@ class _LockDetailPageState extends State // 密码 showWidgetArr.add(bottomItem( 'images/main/icon_main_password.png', - TranslationLoader.lanKeys!.password!.tr, + '密码'.tr, state.bottomBtnisEable.value, () { Get.toNamed(Routers.passwordKeyListPage, arguments: { @@ -1070,7 +1069,7 @@ class _LockDetailPageState extends State if (state.keyInfos.value.lockFeature!.icCard == 1) { showWidgetArr.add(bottomItem( 'images/main/icon_main_icCard.png', - TranslationLoader.lanKeys!.card!.tr, + '卡'.tr, state.bottomBtnisEable.value, () { Get.toNamed(Routers.cardListPage, arguments: { 'lockId': state.keyInfos.value.lockId, @@ -1082,7 +1081,7 @@ class _LockDetailPageState extends State if (state.keyInfos.value.lockFeature!.fingerprint == 1) { showWidgetArr.add(bottomItem( 'images/main/icon_main_fingerprint.png', - TranslationLoader.lanKeys!.fingerprint!.tr, + '指纹'.tr, state.bottomBtnisEable.value, () { Get.toNamed(Routers.fingerprintListPage, arguments: { 'lockId': state.keyInfos.value.lockId, @@ -1094,7 +1093,7 @@ class _LockDetailPageState extends State if (state.keyInfos.value.lockFeature!.bluetoothRemoteControl == 1) { showWidgetArr.add(bottomItem( 'images/main/icon_main_remoteControl.png', - TranslationLoader.lanKeys!.remoteControl!.tr, + '遥控'.tr, state.bottomBtnisEable.value, () { Get.toNamed(Routers.remoteControlListPage, arguments: { 'lockId': state.keyInfos.value.lockId, @@ -1173,7 +1172,7 @@ class _LockDetailPageState extends State // 操作记录 bottomItem( 'images/main/icon_main_operatingRecord.png', - TranslationLoader.lanKeys!.operatingRecord!.tr, + '操作记录'.tr, state.bottomBtnisEable.value, () { // Get.toNamed(Routers.lockOperatingRecordPage, // arguments: {"keyInfo": state.keyInfos.value}); diff --git a/lib/main/lockDetail/lockOperatingRecord/lockOperatingRecord_page.dart b/lib/main/lockDetail/lockOperatingRecord/lockOperatingRecord_page.dart index 27177cf5..17752fd5 100755 --- a/lib/main/lockDetail/lockOperatingRecord/lockOperatingRecord_page.dart +++ b/lib/main/lockDetail/lockOperatingRecord/lockOperatingRecord_page.dart @@ -51,7 +51,7 @@ class _LockOperatingRecordPageState extends State with return Scaffold( backgroundColor: AppColors.mainBackgroundColor, appBar: TitleAppBar( - barTitle: state.recordName.value.isNotEmpty? state.recordName.value : TranslationLoader.lanKeys!.operatingRecord!.tr, + barTitle: state.recordName.value.isNotEmpty? state.recordName.value : '操作记录'.tr, haveBack: true, backgroundColor: AppColors.mainColor, // actionsList: [ diff --git a/lib/main/lockDetail/lockSet/basicInformation/adminOpenLockPassword/adminOpenLockPassword_page.dart b/lib/main/lockDetail/lockSet/basicInformation/adminOpenLockPassword/adminOpenLockPassword_page.dart index 55929a40..2ada492d 100755 --- a/lib/main/lockDetail/lockSet/basicInformation/adminOpenLockPassword/adminOpenLockPassword_page.dart +++ b/lib/main/lockDetail/lockSet/basicInformation/adminOpenLockPassword/adminOpenLockPassword_page.dart @@ -35,7 +35,7 @@ class _AdminOpenLockPasswordPageState extends State w body: Column( children: [ Obx(() => CommonItem( - leftTitel: TranslationLoader.lanKeys!.password!.tr, + leftTitel: '密码'.tr, rightTitle: state.adminPwd.value, isHaveLine: false, isHaveDirection: true, diff --git a/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart b/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart index 182d3be7..76accdf2 100755 --- a/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart +++ b/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart @@ -507,7 +507,7 @@ class _LockSetPageState extends State visible: state.lockBasicInfo.value.isLockOwner == 1 && state.lockFeature.value.attendance == 1, child: CommonItem( - leftTitel: TranslationLoader.lanKeys!.checkingIn!.tr, + leftTitel: '考勤'.tr, rightTitle: '', isHaveLine: true, isHaveRightWidget: true, diff --git a/lib/main/lockDetail/palm/palmDetail/palmDetail_page.dart b/lib/main/lockDetail/palm/palmDetail/palmDetail_page.dart index b7865dfc..a36a8394 100755 --- a/lib/main/lockDetail/palm/palmDetail/palmDetail_page.dart +++ b/lib/main/lockDetail/palm/palmDetail/palmDetail_page.dart @@ -165,7 +165,7 @@ class _PalmDetailPageState extends State with RouteAware { )), SizedBox(height: 10.h), CommonItem( - leftTitel: TranslationLoader.lanKeys!.operatingRecord!.tr, + leftTitel: '操作记录'.tr, rightTitle: '', isHaveDirection: true, action: () { diff --git a/lib/main/lockDetail/passwordKey/passwordKeyDetail/passwordKeyDetail_page.dart b/lib/main/lockDetail/passwordKey/passwordKeyDetail/passwordKeyDetail_page.dart index 9a6bd464..7bb44309 100755 --- a/lib/main/lockDetail/passwordKey/passwordKeyDetail/passwordKeyDetail_page.dart +++ b/lib/main/lockDetail/passwordKey/passwordKeyDetail/passwordKeyDetail_page.dart @@ -64,7 +64,7 @@ class _PasswordKeyDetailPageState extends State isHaveLine: true), )), Obx(() => CommonItem( - leftTitel: TranslationLoader.lanKeys!.password!.tr, + leftTitel: '密码'.tr, rightTitle: state.keyboardPwd.value, isHaveDirection: state.itemData.value.isCustom! == 1, isHaveLine: true, @@ -152,7 +152,7 @@ class _PasswordKeyDetailPageState extends State Visibility( visible: state.itemData.value.keyboardPwdType != 4, child: CommonItem( - leftTitel: TranslationLoader.lanKeys!.operatingRecord!.tr, + leftTitel: '操作记录'.tr, rightTitle: '', isHaveDirection: true, action: () { @@ -289,7 +289,7 @@ class _PasswordKeyDetailPageState extends State return ShowTFView( title: inputController == state.inputNameController ? '${TranslationLoader.lanKeys!.amend!.tr}${TranslationLoader.lanKeys!.name!.tr}' - : '${TranslationLoader.lanKeys!.amend!.tr}${TranslationLoader.lanKeys!.password!.tr}', + : '${TranslationLoader.lanKeys!.amend!.tr}${'密码'.tr}', tipTitle: inputController.text.isNotEmpty ? inputController.text : '请输入6-9位密码', diff --git a/lib/main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_page.dart b/lib/main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_page.dart index ccc90b5b..04604367 100755 --- a/lib/main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_page.dart +++ b/lib/main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_page.dart @@ -55,7 +55,7 @@ class _PasswordKeyListPageState extends State backgroundColor: AppColors.mainBackgroundColor, resizeToAvoidBottomInset: false, appBar: TitleAppBar( - barTitle: TranslationLoader.lanKeys!.password!.tr, + barTitle: '密码'.tr, haveBack: true, backgroundColor: AppColors.mainColor, actionsList: [ 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 500a310f..ffcf2ab3 100755 --- a/lib/main/lockDetail/passwordKey/passwordKey_perpetual/passwordKey_perpetual_page.dart +++ b/lib/main/lockDetail/passwordKey/passwordKey_perpetual/passwordKey_perpetual_page.dart @@ -154,7 +154,7 @@ class _PasswordKeyPerpetualPageState extends State state.nameController), perpetualKeyWidget( false, - TranslationLoader.lanKeys!.password!.tr, + '密码'.tr, '请输入6-9位数字', state.pwdController), keyIfAdministratorWidget(), diff --git a/lib/main/lockDetail/remoteControl/remoteControlDetail/remoteControlDetail_page.dart b/lib/main/lockDetail/remoteControl/remoteControlDetail/remoteControlDetail_page.dart index 585c749d..d08386b7 100755 --- a/lib/main/lockDetail/remoteControl/remoteControlDetail/remoteControlDetail_page.dart +++ b/lib/main/lockDetail/remoteControl/remoteControlDetail/remoteControlDetail_page.dart @@ -190,7 +190,7 @@ class _RemoteControlDetailPageState extends State with // SizedBox(width: 60.w, height: 50.h, child: _isAdmin()))), // Container(height: 10.h), CommonItem( - leftTitel: TranslationLoader.lanKeys!.operatingRecord!.tr, + leftTitel: '操作记录'.tr, rightTitle: '', isHaveDirection: true, action: () { diff --git a/lib/main/lockMian/demoMode/demoModeLockDetail/demoModeLockDetail_page.dart b/lib/main/lockMian/demoMode/demoModeLockDetail/demoModeLockDetail_page.dart index 39568fe0..421e77cd 100755 --- a/lib/main/lockMian/demoMode/demoModeLockDetail/demoModeLockDetail_page.dart +++ b/lib/main/lockMian/demoMode/demoModeLockDetail/demoModeLockDetail_page.dart @@ -17,7 +17,7 @@ class DemoModeLockDetailPage extends StatefulWidget { } class _DemoModeLockDetailPageState extends State { - final logic = Get.put(DemoModeLockDetailLogic()); + final DemoModeLockDetailLogic logic = Get.put(DemoModeLockDetailLogic()); // final state = Get.find().state; @override @@ -30,18 +30,18 @@ class _DemoModeLockDetailPageState extends State { return Scaffold( backgroundColor: AppColors.mainBackgroundColor, appBar: TitleAppBar( - barTitle: "演示模式", + barTitle: '演示模式', haveBack: true, backgroundColor: AppColors.mainColor, ), body: ListView( - children: [ + children: [ Container( width: 1.sw, height: 1.sh - ScreenUtil().statusBarHeight, color: Colors.white, child: Column( - children: [ + children: [ topTip(), topWidget(), Expanded(child: bottomWidget()) @@ -58,11 +58,11 @@ class _DemoModeLockDetailPageState extends State { width: 1.sw, margin: EdgeInsets.all(15.w), child: Column( - children: [ + children: [ Row( - children: [ + children: [ Expanded( - child: Text("提示:当前界面为展示界面,添加设备后才能继续使用", + child: Text('提示:当前界面为展示界面,添加设备后才能继续使用', style: TextStyle( fontSize: 24.sp, color: AppColors.mainColor))), ], @@ -76,23 +76,23 @@ class _DemoModeLockDetailPageState extends State { // KeyInfos keyInfo = widget.lockMainEntity.data!.keyInfos![0]; return Column( mainAxisSize: MainAxisSize.min, - children: [ + children: [ SizedBox(height: 30.h), Stack( alignment: Alignment.centerRight, - children: [ + children: [ Align( alignment: Alignment.center, child: Text( - "TMH_78f16712781a", + 'TMH_78f16712781a', style: TextStyle(fontSize: 22.sp, fontWeight: FontWeight.w400), )), Row( mainAxisAlignment: MainAxisAlignment.end, - children: [ + children: [ Text( - "100%", + '100%', style: TextStyle( fontSize: 18.sp, color: AppColors.darkGrayTextColor), ), @@ -113,12 +113,10 @@ class _DemoModeLockDetailPageState extends State { color: Colors.white, height: 280.w, child: Stack( - children: [ + children: [ Center( child: GestureDetector( - onTap: () { - gotoLogin(); - }, + onTap: gotoLogin, child: Image.asset('images/main/icon_main_openLockBtn.png', width: 268.w, height: 268.w), )), @@ -128,7 +126,7 @@ class _DemoModeLockDetailPageState extends State { SizedBox(height: 30.h), Row( mainAxisAlignment: MainAxisAlignment.center, - children: [ + children: [ Text( '门已上锁', style: TextStyle( @@ -143,9 +141,9 @@ class _DemoModeLockDetailPageState extends State { ), Row( mainAxisAlignment: MainAxisAlignment.center, - children: [ + children: [ Text( - TranslationLoader.lanKeys!.clickUnlockAndHoldDownClose!.tr, + '点击开锁，长按闭锁'.tr, style: TextStyle( fontSize: 22.sp, color: AppColors.btnDisableColor, @@ -158,7 +156,7 @@ class _DemoModeLockDetailPageState extends State { ), Row( mainAxisAlignment: MainAxisAlignment.center, - children: [ + children: [ Image.asset( 'images/icon_electronicKey_admin.png', width: 24.w, @@ -226,64 +224,57 @@ class _DemoModeLockDetailPageState extends State { } List getShowWidget() { - var showWidgetArr = []; + final List showWidgetArr = []; // 考勤 // if (state.keyInfos.value.isAttendance == 1) { showWidgetArr.add(bottomItem('images/main/icon_main_clockingIn.png', - TranslationLoader.lanKeys!.checkingIn!.tr, () { + '考勤'.tr, () { // gotoLogin(); Get.toNamed(Routers.checkingInListPage, arguments: LockListInfoItemEntity()); })); // } - var defaultWidgetArr = [ + final List defaultWidgetArr = [ // 电子钥匙 bottomItem('images/main/icon_main_electronicKey.png', - TranslationLoader.lanKeys!.electronicKey!.tr, () { + '电子钥匙'.tr, () { // gotoLogin(); Get.toNamed(Routers.electronicKeyListPage, - arguments: {"keyInfo": LockListInfoItemEntity()}); + arguments: {'keyInfo': LockListInfoItemEntity()}); }), // 密码 bottomItem('images/main/icon_main_password.png', - TranslationLoader.lanKeys!.password!.tr, () { + '密码'.tr, () { // gotoLogin(); Get.toNamed(Routers.passwordKeyListPage, - arguments: {"keyInfo": LockListInfoItemEntity()}); + arguments: {'keyInfo': LockListInfoItemEntity()}); }), // ic卡 bottomItem('images/main/icon_main_icCard.png', - TranslationLoader.lanKeys!.card!.tr, () { + '卡'.tr, () { // gotoLogin(); - Get.toNamed(Routers.cardListPage, arguments: {"lockId": 0}); + Get.toNamed(Routers.cardListPage, arguments: {'lockId': 0}); }), // 指纹 bottomItem('images/main/icon_main_fingerprint.png', - TranslationLoader.lanKeys!.fingerprint!.tr, () { + '指纹'.tr, () { // gotoLogin(); Get.toNamed(Routers.fingerprintListPage, - arguments: {"lockId": 1, "fromType": 1}); + arguments: {'lockId': 1, 'fromType': 1}); }), // 遥控 bottomItem('images/main/icon_main_remoteControl.png', - TranslationLoader.lanKeys!.remoteControl!.tr, () { - gotoLogin(); - - // Get.toNamed(Routers.otherTypeKeyListPage, arguments: { - // "lockId": "2", - // "fromType": 2 - // }); - }), + '遥控'.tr, gotoLogin), ]; showWidgetArr.addAll(defaultWidgetArr); @@ -292,46 +283,39 @@ class _DemoModeLockDetailPageState extends State { bottomItem('images/main/icon_face.png', '人脸', () { // gotoLogin(); - Get.toNamed(Routers.faceListPage, arguments: { - "lockId": 1, + Get.toNamed(Routers.faceListPage, arguments: { + 'lockId': 1, }); }), ); //可视对讲门锁新增->监控 showWidgetArr.add( - bottomItem('images/main/icon_catEyes.png', '监控', () { - gotoLogin(); - - // Navigator.pushNamed(context, Routers.otherTypeKeyListPage, - // arguments: 1); - // Toast.show(msg: "功能暂未开放"); - }), + bottomItem('images/main/icon_catEyes.png', '监控', gotoLogin), ); - var endWiddget = [ + final List endWiddget = [ // 授权管理员 bottomItem('images/main/icon_main_authorizedAdmin.png', TranslationLoader.lanKeys!.authorizedAdmin!.tr, () { // gotoLogin(); Get.toNamed(Routers.authorizedAdminListPage, - arguments: {"keyInfo": LockListInfoItemEntity()}); + arguments: {'keyInfo': LockListInfoItemEntity()}); }), // 操作记录 - bottomItem('images/main/icon_main_operatingRecord.png', - TranslationLoader.lanKeys!.operatingRecord!.tr, () { + bottomItem('images/main/icon_main_operatingRecord.png', '操作记录'.tr, () { // gotoLogin(); Get.toNamed(Routers.lockOperatingRecordPage, - arguments: {"keyInfo": LockListInfoItemEntity()}); + arguments: {'keyInfo': LockListInfoItemEntity()}); }), // 视频日志 - bottomItem('images/main/icon_lockDetail_videoLog.png', "视频日志", () { + bottomItem('images/main/icon_lockDetail_videoLog.png', '视频日志', () { //视频日志 Get.toNamed(Routers.videoLogPage); }), // 消息提醒 - bottomItem('images/main/icon_lockDetail_messageReminding.png', "消息提醒", + bottomItem('images/main/icon_lockDetail_messageReminding.png', '消息提醒', () { Get.toNamed(Routers.msgNotificationPage); }), @@ -347,8 +331,8 @@ class _DemoModeLockDetailPageState extends State { } Widget bottomItem(String iconUrl, String name, Function() onClick) { - var width = 42.w; - var height = 42.h; + final double width = 42.w; + final double height = 42.h; return GestureDetector( onTap: onClick, child: Container( @@ -356,7 +340,7 @@ class _DemoModeLockDetailPageState extends State { color: Colors.white, child: Column( crossAxisAlignment: CrossAxisAlignment.center, - children: [ + children: [ SizedBox( width: width, height: height, @@ -376,6 +360,6 @@ class _DemoModeLockDetailPageState extends State { void gotoLogin() { // Get.toNamed(Routers.selectLockTypePage); - logic.showToast("演示模式"); + logic.showToast('演示模式'); } } diff --git a/lib/main/lockMian/demoMode/demoModeLockSet/demoModeLockSet_page.dart b/lib/main/lockMian/demoMode/demoModeLockSet/demoModeLockSet_page.dart index 6c42dcf8..29c499a8 100755 --- a/lib/main/lockMian/demoMode/demoModeLockSet/demoModeLockSet_page.dart +++ b/lib/main/lockMian/demoMode/demoModeLockSet/demoModeLockSet_page.dart @@ -41,7 +41,7 @@ class _DemoModeLockSetPageState extends State { CommonItem( leftTitel: TranslationLoader.lanKeys!.basicInformation!.tr, - rightTitle: "", + rightTitle: '', isHaveLine: false, isHaveDirection: true, action: () { @@ -56,7 +56,7 @@ class _DemoModeLockSetPageState extends State { // 门磁 CommonItem( leftTitel: TranslationLoader.lanKeys!.doorMagnetic!.tr, - rightTitle: "", + rightTitle: '', isHaveLine: true, isHaveDirection: true, action: () { @@ -68,7 +68,7 @@ class _DemoModeLockSetPageState extends State { CommonItem( leftTitel: TranslationLoader.lanKeys!.wirelessKeyboard!.tr, - rightTitle: "", + rightTitle: '', isHaveLine: false, isHaveDirection: true, action: () { @@ -79,7 +79,7 @@ class _DemoModeLockSetPageState extends State { // 照明 CommonItem( leftTitel: '照明', - rightTitle: "", + rightTitle: '', isHaveLine: true, isHaveDirection: true, action: () { @@ -88,7 +88,7 @@ class _DemoModeLockSetPageState extends State { // 开门器 CommonItem( leftTitel: '开门器', - rightTitle: "", + rightTitle: '', isHaveLine: false, isHaveDirection: true, action: () { @@ -110,7 +110,7 @@ class _DemoModeLockSetPageState extends State { // 锁声音 CommonItem( leftTitel: TranslationLoader.lanKeys!.lockSound!.tr, - rightTitle: "", + rightTitle: '', isHaveLine: true, isHaveDirection: true, action: () { @@ -166,7 +166,7 @@ class _DemoModeLockSetPageState extends State { //---田总新增展示 CommonItem( leftTitel: '面容开锁', - rightTitle: "", + rightTitle: '', isHaveLine: true, isHaveDirection: true, action: () { @@ -174,7 +174,7 @@ class _DemoModeLockSetPageState extends State { }), CommonItem( leftTitel: '消息提醒', - rightTitle: "", + rightTitle: '', isHaveLine: true, isHaveDirection: true, action: () { @@ -182,7 +182,7 @@ class _DemoModeLockSetPageState extends State { }), CommonItem( leftTitel: '猫眼设置', - rightTitle: "", + rightTitle: '', isHaveLine: true, isHaveDirection: true, action: () { @@ -190,7 +190,7 @@ class _DemoModeLockSetPageState extends State { }), CommonItem( leftTitel: '开门方向设置', - rightTitle: "", + rightTitle: '', isHaveDirection: true, isHaveLine: true, action: () { @@ -198,7 +198,7 @@ class _DemoModeLockSetPageState extends State { }), CommonItem( leftTitel: '电机功率设置', - rightTitle: "", + rightTitle: '', isHaveLine: true, isHaveDirection: true, action: () { @@ -207,7 +207,7 @@ class _DemoModeLockSetPageState extends State { // 支持蓝牙广播（关闭则不能使用蓝牙主动开锁） CommonItem( leftTitel: '蓝牙广播', - rightTitle: "", + rightTitle: '', isHaveLine: false, isHaveRightWidget: true, rightWidget: _lockRemindSwitch()), @@ -226,21 +226,21 @@ class _DemoModeLockSetPageState extends State { // }), // 考勤 CommonItem( - leftTitel: TranslationLoader.lanKeys!.checkingIn!.tr, - rightTitle: "", + leftTitel: '考勤'.tr, + rightTitle: '', isHaveLine: true, isHaveRightWidget: true, rightWidget: _openCheckInSwitch()), // 开锁提醒 CommonItem( leftTitel: TranslationLoader.lanKeys!.unlockReminder!.tr, - rightTitle: "", + rightTitle: '', isHaveLine: false, isHaveRightWidget: true, rightWidget: _lockRemindSwitch()), CommonItem( - leftTitel: "开锁时是否需联网", - rightTitle: "", + leftTitel: '开锁时是否需联网', + rightTitle: '', isHaveLine: false, isHaveRightWidget: true, rightWidget: _lockRemindSwitch()), @@ -249,7 +249,7 @@ class _DemoModeLockSetPageState extends State { CommonItem( leftTitel: TranslationLoader .lanKeys!.wifiDistributionNetwork!.tr, - rightTitle: "", + rightTitle: '', isHaveLine: true, isHaveDirection: true, action: () { @@ -258,7 +258,7 @@ class _DemoModeLockSetPageState extends State { // 锁时间 CommonItem( leftTitel: TranslationLoader.lanKeys!.lockTime!.tr, - rightTitle: "", + rightTitle: '', isHaveLine: true, isHaveDirection: true, action: () { @@ -267,7 +267,7 @@ class _DemoModeLockSetPageState extends State { // 诊断 CommonItem( leftTitel: TranslationLoader.lanKeys!.diagnose!.tr, - rightTitle: "", + rightTitle: '', isHaveLine: true, isHaveDirection: true, action: () { @@ -276,7 +276,7 @@ class _DemoModeLockSetPageState extends State { // 上传数据 CommonItem( leftTitel: TranslationLoader.lanKeys!.uploadData!.tr, - rightTitle: "", + rightTitle: '', isHaveLine: true, isHaveDirection: true, action: () { @@ -294,7 +294,7 @@ class _DemoModeLockSetPageState extends State { // 锁升级 CommonItem( leftTitel: TranslationLoader.lanKeys!.lockEscalation!.tr, - rightTitle: "", + rightTitle: '', isHaveLine: false, isHaveDirection: true, action: () { @@ -305,7 +305,7 @@ class _DemoModeLockSetPageState extends State { padding: EdgeInsets.only(left: 20.w, right: 20.w, bottom: 30.h), child: SubmitBtn( - btnName: "退出演示模式", + btnName: '退出演示模式', isDelete: true, onClick: () { Get.close(2); @@ -344,6 +344,6 @@ class _DemoModeLockSetPageState extends State { void gotoAddLock() { // Get.toNamed(Routers.selectLockTypePage); - EasyLoading.showToast("演示模式", duration: 2000.milliseconds); + EasyLoading.showToast('演示模式', duration: 2000.milliseconds); } } diff --git a/lib/mine/minePersonInfo/minePersonInfoEditIphone/minePersonInfoEditIphone_page.dart b/lib/mine/minePersonInfo/minePersonInfoEditIphone/minePersonInfoEditIphone_page.dart index 93bff920..59965e8e 100755 --- a/lib/mine/minePersonInfo/minePersonInfoEditIphone/minePersonInfoEditIphone_page.dart +++ b/lib/mine/minePersonInfo/minePersonInfoEditIphone/minePersonInfoEditIphone_page.dart @@ -67,7 +67,7 @@ class _MinePersonInfoEditIphonePageState mainAxisAlignment: MainAxisAlignment.end, children: [ Text( - "中国+86", + '中国+86', textAlign: TextAlign.end, style: TextStyle( fontSize: 22.sp, fontWeight: FontWeight.w500), @@ -94,7 +94,7 @@ class _MinePersonInfoEditIphonePageState isPwd: true, leftWidget: const SizedBox(), hintText: - "${TranslationLoader.lanKeys!.sure!.tr}${TranslationLoader.lanKeys!.password!.tr}", + '密码'.tr, inputFormatters: [ // LengthLimitingTextInputFormatter(20), ]), diff --git a/lib/mine/mineSet/lockUserManage/expireLockList/expireLockManage_tabbar.dart b/lib/mine/mineSet/lockUserManage/expireLockList/expireLockManage_tabbar.dart index d6f6001b..73b2f8fe 100755 --- a/lib/mine/mineSet/lockUserManage/expireLockList/expireLockManage_tabbar.dart +++ b/lib/mine/mineSet/lockUserManage/expireLockList/expireLockManage_tabbar.dart @@ -24,11 +24,11 @@ class _ExpireLockManageTabbarState extends State with Si late TabController _tabController; final List _itemTabs = [ - ItemView(title: TranslationLoader.lanKeys!.electronicKey!.tr, selectType: '0'), - ItemView(title: TranslationLoader.lanKeys!.password!.tr, selectType: '1'), - ItemView(title: TranslationLoader.lanKeys!.card!.tr, selectType: '2'), - ItemView(title: TranslationLoader.lanKeys!.fingerprint!.tr, selectType: '3'), - ItemView(title: TranslationLoader.lanKeys!.face!.tr, selectType: '4'), + ItemView(title: '电子钥匙'.tr, selectType: '0'), + ItemView(title: '密码'.tr, selectType: '1'), + ItemView(title: '卡'.tr, selectType: '2'), + ItemView(title: '指纹'.tr, selectType: '3'), + ItemView(title: '人脸'.tr, selectType: '4'), ]; @override diff --git a/lib/translations/lanKeyEntity.dart b/lib/translations/lanKeyEntity.dart index 705ff8fe..0d83267c 100755 --- a/lib/translations/lanKeyEntity.dart +++ b/lib/translations/lanKeyEntity.dart @@ -1,15 +1,16 @@ class LanKeyEntity { LanKeyEntity({ - this.starLock, - this.clickUnlockAndHoldDownClose, - this.checkingIn, - this.electronicKey, - this.password, - this.card, - this.fingerprint, - this.remoteControl, - this.face, - this.operatingRecord, + // this.starLock, + // this.clickUnlockAndHoldDownClose, + // this.checkingIn, + // this.electronicKey, + // this.password, + // this.card, + // this.fingerprint, + // this.remoteControl, + // this.face, + // this.operatingRecord, + this.doorLockLog, this.number, this.additive, @@ -457,16 +458,17 @@ class LanKeyEntity { }); LanKeyEntity.fromJson(dynamic json) { - starLock = json['starLock']; - clickUnlockAndHoldDownClose = json['clickUnlockAndHoldDownClose']; - checkingIn = json['checkingIn']; - electronicKey = json['electronicKey']; - password = json['password']; - card = json['card']; - fingerprint = json['fingerprint']; - remoteControl = json['remoteControl']; - face = json['face']; - operatingRecord = json['operatingRecord']; + // starLock = json['starLock']; + // clickUnlockAndHoldDownClose = json['clickUnlockAndHoldDownClose']; + // checkingIn = json['checkingIn']; + // electronicKey = json['electronicKey']; + // password = json['password']; + // card = json['card']; + // fingerprint = json['fingerprint']; + // remoteControl = json['remoteControl']; + // face = json['face']; + // operatingRecord = json['operatingRecord']; + doorLockLog = json['doorLockLog']; number = json['number']; additive = json['additive']; @@ -965,16 +967,17 @@ class LanKeyEntity { permissionDialogGoSetUp = json['permission_dialog_go_set_up']; } - String? starLock; - String? clickUnlockAndHoldDownClose; - String? checkingIn; - String? electronicKey; - String? password; - String? card; - String? fingerprint; - String? remoteControl; - String? face; - String? operatingRecord; + // String? starLock; + // String? clickUnlockAndHoldDownClose; + // String? checkingIn; + // String? electronicKey; + // String? password; + // String? card; + // String? fingerprint; + // String? remoteControl; + // String? face; + // String? operatingRecord; + String? doorLockLog; String? number; String? additive; @@ -1461,16 +1464,17 @@ class LanKeyEntity { Map toJson() { final map = {}; - map['starLock'] = starLock; - map['clickUnlockAndHoldDownClose'] = clickUnlockAndHoldDownClose; - map['checkingIn'] = checkingIn; - map['electronicKey'] = electronicKey; - map['password'] = password; - map['card'] = card; - map['fingerprint'] = fingerprint; - map['remoteControl'] = remoteControl; - map['face'] = face; - map['operatingRecord'] = operatingRecord; + // map['starLock'] = starLock; + // map['clickUnlockAndHoldDownClose'] = clickUnlockAndHoldDownClose; + // map['checkingIn'] = checkingIn; + // map['electronicKey'] = electronicKey; + // map['password'] = password; + // map['card'] = card; + // map['fingerprint'] = fingerprint; + // map['remoteControl'] = remoteControl; + // map['face'] = face; + // map['operatingRecord'] = operatingRecord; + map['doorLockLog'] = doorLockLog; map['number'] = number; map['additive'] = additive;