sky/app-starlock
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改登录、卡、指纹、人脸、遥控国际化

Browse Source
This commit is contained in:
魏少阳 2024-07-25 14:40:02 +08:00
parent 8401514838
commit f5b79303a8
42 changed files with 291 additions and 316 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lan/lan_en.json
View File

@ -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",

28
lan/lan_keys.json
View File

@ -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",

29
lan/lan_zh.json
View File

@ -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 @@
"有人按门铃": "有人按门铃",
"有人出现在门口": "有人出现在门口",
"提醒方式": "提醒方式",
"电子钥匙": "电子钥匙",
"开门方式": "开门方式",
"请选择": "请选择",
"家人": "家人",

14
lib/flavors.dart
View File

@ -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');
}

17
lib/login/forgetPassword/starLock_forgetPassword_page.dart
View File

@ -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: <TextInputFormatter>[
LengthLimitingTextInputFormatter(20),
]),
@ -160,7 +157,7 @@ class _StarLockForgetPasswordPageState
),
),
hintText:
"${TranslationLoader.lanKeys!.sure!.tr}${TranslationLoader.lanKeys!.password!.tr}",
'确认密码'.tr,
inputFormatters: <TextInputFormatter>[
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: <TextInputFormatter>[
LengthLimitingTextInputFormatter(20),
]),
@ -200,7 +196,7 @@ class _StarLockForgetPasswordPageState
'account': state.phoneStr.value
});
logic.state.xWidth.value =
(result as Map<String, dynamic>)['xWidth'];
(result! as Map<String, dynamic>)['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,

12
lib/login/forgetPassword/starLock_forgetPassword_xhj_page.dart
View File

@ -43,7 +43,7 @@ class _StarLockForgetPasswordPageState
children: <Widget>[
GestureDetector(
onTap: () async {
Object? result = await Navigator.pushNamed(
final Object? result = await Navigator.pushNamed(
context, Routers.selectCountryRegionPage);
if (result != null) {
result as Map<String, dynamic>;
@ -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: <TextInputFormatter>[
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: <TextInputFormatter>[
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: <String, String>{
'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,

3
lib/login/login/starLock_login_page.dart
View File

@ -145,8 +145,7 @@ class _StarLockLoginPageState extends State<StarLockLoginPage> {
height: 36.w,
),
),
hintText:
'${TranslationLoader.lanKeys!.pleaseEnter!.tr}${TranslationLoader.lanKeys!.password!.tr}',
hintText: '请输入密码'.tr,
inputFormatters: <TextInputFormatter>[
LengthLimitingTextInputFormatter(20),
]),

3
lib/login/login/starLock_login_xhj_page.dart
View File

@ -145,8 +145,7 @@ class _StarLockLoginPageState extends State<StarLockLoginXHJPage> {
bottom: 20.w,
),
),
label:
'${TranslationLoader.lanKeys!.pleaseEnter!.tr}${TranslationLoader.lanKeys!.password!.tr}',
label: '请输入密码'.tr,
inputFormatters: <TextInputFormatter>[
LengthLimitingTextInputFormatter(20),
]),

6
lib/login/register/starLock_register_page.dart
View File

@ -238,8 +238,7 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
height: 30.w,
),
),
hintText:
'${TranslationLoader.lanKeys!.pleaseEnter!.tr}${TranslationLoader.lanKeys!.password!.tr}',
hintText:'请输入密码'.tr,
inputFormatters: <TextInputFormatter>[
LengthLimitingTextInputFormatter(20),
]),
@ -265,8 +264,7 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
height: 30.w,
),
),
hintText:
'${TranslationLoader.lanKeys!.sure!.tr}${TranslationLoader.lanKeys!.password!.tr}',
hintText: '确认密码'.tr,
inputFormatters: <TextInputFormatter>[
LengthLimitingTextInputFormatter(20),
]),

32
lib/login/register/starLock_register_xhj_page.dart
View File

@ -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<StarLockRegisterXHJPage> {
),
GestureDetector(
onTap: () async {
var result = await Get.toNamed(Routers.selectCountryRegionPage);
final result = await Get.toNamed(Routers.selectCountryRegionPage);
if (result != null) {
result as Map<String, dynamic>;
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<StarLockRegisterXHJPage> {
},
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<StarLockRegisterXHJPage> {
},
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<StarLockRegisterXHJPage> {
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<StarLockRegisterXHJPage> {
? () 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<String, dynamic>)['xWidth'];
@ -272,8 +270,8 @@ class _StarLockRegisterPageState extends State<StarLockRegisterXHJPage> {
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<StarLockRegisterXHJPage> {
color: AppColors.mainColor, fontSize: 20.sp)),
onTap: () {
Get.toNamed(Routers.webviewShowPage, arguments: {
"url": XSConstantMacro.privacyPolicyURL,
"title": '隐私政策'.tr
'url': XSConstantMacro.privacyPolicyURL,
'title': '隐私政策'.tr
});
},
)),

3
lib/main/lockDetail/card/addCardType/addCardType_page.dart
View File

@ -59,8 +59,7 @@ class _AddCardPageState extends State<AddCardPage>
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(

3
lib/main/lockDetail/card/addICCard/addICCard_page.dart
View File

@ -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<AddICCardPage> 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,
),

6
lib/main/lockDetail/card/cardDetail/cardDetail_page.dart
View File

@ -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<CardDetailPage> with RouteAware {
body: ListView(
children: <Widget>[
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<CardDetailPage> 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: () {

4
lib/main/lockDetail/card/cardList/cardList_page.dart
View File

@ -57,7 +57,7 @@ class _CardListPageState extends State<CardListPage> with RouteAware {
backgroundColor: AppColors.mainBackgroundColor,
resizeToAvoidBottomInset: false,
appBar: TitleAppBar(
barTitle: TranslationLoader.lanKeys!.card!.tr,
barTitle: '卡'.tr,
haveBack: true,
backgroundColor: AppColors.mainColor,
actionsList: <Widget>[
@ -109,7 +109,7 @@ class _CardListPageState extends State<CardListPage> 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: <String, int>{

3
lib/main/lockDetail/checkingIn/checkingInSet/checkingInSet_page.dart
View File

@ -31,8 +31,7 @@ class _CheckingInSetPageState extends State<CheckingInSetPage> {
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(

6
lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_page.dart
View File

@ -450,13 +450,13 @@ class _CheckingInAddStaffPageState extends State<CheckingInAddStaffPage> {
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;

2
lib/main/lockDetail/doorLockLog/doorLockLog_page.dart
View File

@ -37,7 +37,7 @@ class _DoorLockLogPageState extends State<DoorLockLogPage> with RouteAware {
return Scaffold(
backgroundColor: AppColors.mainBackgroundColor,
appBar: TitleAppBar(
barTitle: TranslationLoader.lanKeys!.operatingRecord!.tr,
barTitle: '操作记录'.tr,
haveBack: true,
backgroundColor: AppColors.mainColor,
actionsList: <Widget>[

2
lib/main/lockDetail/electronicKey/electronicKeyList/electronicKeyList_page.dart
View File

@ -54,7 +54,7 @@ class _ElectronicKeyListPageState extends State<ElectronicKeyListPage> {
backgroundColor: AppColors.mainBackgroundColor,
resizeToAvoidBottomInset: false,
appBar: TitleAppBar(
barTitle: TranslationLoader.lanKeys!.electronicKey!.tr,
barTitle: '电子钥匙'.tr,
haveBack: true,
backgroundColor: AppColors.mainColor,
actionsList: <Widget>[

2
lib/main/lockDetail/face/addFace/addFace_page.dart
View File

@ -27,7 +27,7 @@ class _AddFacePageState extends State<AddFacePage> 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(

3
lib/main/lockDetail/face/addFaceType/addFaceType_page.dart
View File

@ -58,8 +58,7 @@ class _AddFaceTypePageState extends State<AddFaceTypePage> 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(

2
lib/main/lockDetail/face/faceDetail/faceDetail_page.dart
View File

@ -185,7 +185,7 @@ class _FaceDetailPageState extends State<FaceDetailPage> 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: () {

4
lib/main/lockDetail/face/faceList/faceList_page.dart
View File

@ -55,7 +55,7 @@ class _FaceListPageState extends State<FaceListPage> with RouteAware {
backgroundColor: AppColors.mainBackgroundColor,
resizeToAvoidBottomInset: false,
appBar: TitleAppBar(
barTitle: TranslationLoader.lanKeys!.face!.tr,
barTitle: '人脸'.tr,
haveBack: true,
backgroundColor: AppColors.mainColor,
actionsList: <Widget>[
@ -113,7 +113,7 @@ class _FaceListPageState extends State<FaceListPage> 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: <String, int>{

2
lib/main/lockDetail/fingerprint/addFingerprint/addFingerprint_page.dart
View File

@ -26,7 +26,7 @@ class _AddFingerprintPageState extends State<AddFingerprintPage> 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(

3
lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintType_page.dart
View File

@ -55,8 +55,7 @@ class _AddFingerprintTypePageState extends State<AddFingerprintTypePage> 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(

5
lib/main/lockDetail/fingerprint/fingerprintDetail/fingerprintDetail_page.dart
View File

@ -42,8 +42,7 @@ class _FingerprintDetailPageState extends State<FingerprintDetailPage>
body: Column(
children: <Widget>[
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<FingerprintDetailPage>
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: () {

4
lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_page.dart
View File

@ -58,7 +58,7 @@ class _FingerprintListPageState extends State<FingerprintListPage>
backgroundColor: AppColors.mainBackgroundColor,
resizeToAvoidBottomInset: false,
appBar: TitleAppBar(
barTitle: TranslationLoader.lanKeys!.fingerprint!.tr,
barTitle: '指纹'.tr,
haveBack: true,
backgroundColor: AppColors.mainColor,
actionsList: <Widget>[
@ -111,7 +111,7 @@ class _FingerprintListPageState extends State<FingerprintListPage>
Expanded(child: _buildMainUI()),
AddBottomWhiteBtn(
btnName:
'${TranslationLoader.lanKeys!.add!.tr}${TranslationLoader.lanKeys!.fingerprint!.tr}',
'添加指纹'.tr,
onClick: () async {
final data = await Get.toNamed(Routers.addFingerprintTypePage,
arguments: <String, int>{

89
lib/main/lockDetail/iris/irisDetail/irisDetail_page.dart
View File

@ -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<CardDetailPage> with RouteAware {
final logic = Get.put(IrisDetailLogic());
final state = Get.find<IrisDetailLogic>().state;
final IrisDetailLogic logic = Get.put(IrisDetailLogic());
final IrisDetailState state = Get.find<IrisDetailLogic>().state;
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: AppColors.mainBackgroundColor,
appBar: TitleAppBar(
barTitle: "虹膜详情",
barTitle: '虹膜详情',
haveBack: true,
backgroundColor: AppColors.mainColor,
),
body: ListView(
children: [
children: <Widget>[
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<CardDetailPage> with RouteAware {
// 限时
var data = await Get.toNamed(
Routers.otherTypeKeyChangeDatePage,
arguments: {
"pushType": 0,
"fingerprintItemData":
arguments: <String, Object>{
'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<CardDetailPage> with RouteAware {
// 循环
var data = await Get.toNamed(
Routers.otherTypeKeyChangeValidityDatePage,
arguments: {
"pushType": 0,
"fingerprintItemData":
arguments: <String, Object>{
'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<CardDetailPage> with RouteAware {
action: () async {
var data = await Get.toNamed(
Routers.otherTypeKeyChangeValidityDatePage,
arguments: {
"pushType": 0,
"fingerprintItemData":
arguments: <String, Object>{
'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: <String, Object>{
'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<CardDetailPage> 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<CardDetailPage> 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<CardDetailPage> 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<CardDetailPage> with RouteAware {
context: context,
builder: (BuildContext context) {
return ShowIosTipView(
title: "提示",
tipTitle: "确定要删除吗?",
title: '提示',
tipTitle: '确定要删除吗?',
sureClick: () async {
Get.back();
String? idStr = await Storage.getUid();

2
lib/main/lockDetail/lockDetail/lockDetail_logic.dart
View File

@ -584,7 +584,7 @@ class LockDetailLogic extends BaseGetXController {
} else {
text = state.isOpenPassageMode.value == 1
? '常开模式启动！长按闭锁'.tr
: TranslationLoader.lanKeys!.clickUnlockAndHoldDownClose!.tr;
: '点击开锁，长按闭锁'.tr;
}
return text;
}

21
lib/main/lockDetail/lockDetail/lockDetail_page.dart
View File

@ -444,8 +444,7 @@ class _LockDetailPageState extends State<LockDetailPage>
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
Text(
TranslationLoader
.lanKeys!.clickUnlockAndHoldDownClose!.tr,
'点击开锁，长按闭锁'.tr,
style: TextStyle(
color: AppColors.darkGrayTextColor,
fontSize: 20.sp,
@ -1002,7 +1001,7 @@ class _LockDetailPageState extends State<LockDetailPage>
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<LockDetailPage>
// 操作记录
showWidgetArr.add(bottomItem(
'images/main/icon_main_operatingRecord.png',
TranslationLoader.lanKeys!.operatingRecord!.tr,
'操作记录'.tr,
state.bottomBtnisEable.value, () {
Get.toNamed(Routers.doorLockLogPage,
arguments: <String, LockListInfoItemEntity>{
@ -1040,7 +1039,7 @@ class _LockDetailPageState extends State<LockDetailPage>
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<LockDetailPage>
// 电子钥匙
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<LockDetailPage>
// 密码
showWidgetArr.add(bottomItem(
'images/main/icon_main_password.png',
TranslationLoader.lanKeys!.password!.tr,
'密码'.tr,
state.bottomBtnisEable.value, () {
Get.toNamed(Routers.passwordKeyListPage,
arguments: <String, LockListInfoItemEntity>{
@ -1070,7 +1069,7 @@ class _LockDetailPageState extends State<LockDetailPage>
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: <String, int?>{
'lockId': state.keyInfos.value.lockId,
@ -1082,7 +1081,7 @@ class _LockDetailPageState extends State<LockDetailPage>
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: <String, int?>{
'lockId': state.keyInfos.value.lockId,
@ -1094,7 +1093,7 @@ class _LockDetailPageState extends State<LockDetailPage>
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: <String, int?>{
'lockId': state.keyInfos.value.lockId,
@ -1173,7 +1172,7 @@ class _LockDetailPageState extends State<LockDetailPage>
// 操作记录
bottomItem(
'images/main/icon_main_operatingRecord.png',
TranslationLoader.lanKeys!.operatingRecord!.tr,
'操作记录'.tr,
state.bottomBtnisEable.value, () {
// Get.toNamed(Routers.lockOperatingRecordPage,
// arguments: {"keyInfo": state.keyInfos.value});

2
lib/main/lockDetail/lockOperatingRecord/lockOperatingRecord_page.dart
View File

@ -51,7 +51,7 @@ class _LockOperatingRecordPageState extends State<LockOperatingRecordPage> 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: [

2
lib/main/lockDetail/lockSet/basicInformation/adminOpenLockPassword/adminOpenLockPassword_page.dart
View File

@ -35,7 +35,7 @@ class _AdminOpenLockPasswordPageState extends State<AdminOpenLockPasswordPage> w
body: Column(
children: <Widget>[
Obx(() => CommonItem(
leftTitel: TranslationLoader.lanKeys!.password!.tr,
leftTitel: '密码'.tr,
rightTitle: state.adminPwd.value,
isHaveLine: false,
isHaveDirection: true,

2
lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart
View File

@ -507,7 +507,7 @@ class _LockSetPageState extends State<LockSetPage>
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,

2
lib/main/lockDetail/palm/palmDetail/palmDetail_page.dart
View File

@ -165,7 +165,7 @@ class _PalmDetailPageState extends State<PalmDetailPage> with RouteAware {
)),
SizedBox(height: 10.h),
CommonItem(
leftTitel: TranslationLoader.lanKeys!.operatingRecord!.tr,
leftTitel: '操作记录'.tr,
rightTitle: '',
isHaveDirection: true,
action: () {

6
lib/main/lockDetail/passwordKey/passwordKeyDetail/passwordKeyDetail_page.dart
View File

@ -64,7 +64,7 @@ class _PasswordKeyDetailPageState extends State<PasswordKeyDetailPage>
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<PasswordKeyDetailPage>
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<PasswordKeyDetailPage>
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位密码',

2
lib/main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_page.dart
View File

@ -55,7 +55,7 @@ class _PasswordKeyListPageState extends State<PasswordKeyListPage>
backgroundColor: AppColors.mainBackgroundColor,
resizeToAvoidBottomInset: false,
appBar: TitleAppBar(
barTitle: TranslationLoader.lanKeys!.password!.tr,
barTitle: '密码'.tr,
haveBack: true,
backgroundColor: AppColors.mainColor,
actionsList: <Widget>[

2
lib/main/lockDetail/passwordKey/passwordKey_perpetual/passwordKey_perpetual_page.dart
View File

@ -154,7 +154,7 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage>
state.nameController),
perpetualKeyWidget(
false,
TranslationLoader.lanKeys!.password!.tr,
'密码'.tr,
'请输入6-9位数字',
state.pwdController),
keyIfAdministratorWidget(),

2
lib/main/lockDetail/remoteControl/remoteControlDetail/remoteControlDetail_page.dart
View File

@ -190,7 +190,7 @@ class _RemoteControlDetailPageState extends State<RemoteControlDetailPage> 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: () {

102
lib/main/lockMian/demoMode/demoModeLockDetail/demoModeLockDetail_page.dart
View File

@ -17,7 +17,7 @@ class DemoModeLockDetailPage extends StatefulWidget {
}
class _DemoModeLockDetailPageState extends State<DemoModeLockDetailPage> {
final logic = Get.put(DemoModeLockDetailLogic());
final DemoModeLockDetailLogic logic = Get.put(DemoModeLockDetailLogic());
// final state = Get.find<DemoModeLockDetailLogic>().state;
@override
@ -30,18 +30,18 @@ class _DemoModeLockDetailPageState extends State<DemoModeLockDetailPage> {
return Scaffold(
backgroundColor: AppColors.mainBackgroundColor,
appBar: TitleAppBar(
barTitle: "演示模式",
barTitle: '演示模式',
haveBack: true,
backgroundColor: AppColors.mainColor,
),
body: ListView(
children: [
children: <Widget>[
Container(
width: 1.sw,
height: 1.sh - ScreenUtil().statusBarHeight,
color: Colors.white,
child: Column(
children: [
children: <Widget>[
topTip(),
topWidget(),
Expanded(child: bottomWidget())
@ -58,11 +58,11 @@ class _DemoModeLockDetailPageState extends State<DemoModeLockDetailPage> {
width: 1.sw,
margin: EdgeInsets.all(15.w),
child: Column(
children: [
children: <Widget>[
Row(
children: [
children: <Widget>[
Expanded(
child: Text("提示:当前界面为展示界面,添加设备后才能继续使用",
child: Text('提示:当前界面为展示界面,添加设备后才能继续使用',
style: TextStyle(
fontSize: 24.sp, color: AppColors.mainColor))),
],
@ -76,23 +76,23 @@ class _DemoModeLockDetailPageState extends State<DemoModeLockDetailPage> {
// KeyInfos keyInfo = widget.lockMainEntity.data!.keyInfos![0];
return Column(
mainAxisSize: MainAxisSize.min,
children: [
children: <Widget>[
SizedBox(height: 30.h),
Stack(
alignment: Alignment.centerRight,
children: [
children: <Widget>[
Align(
alignment: Alignment.center,
child: Text(
"TMH_78f16712781a",
'TMH_78f16712781a',
style:
TextStyle(fontSize: 22.sp, fontWeight: FontWeight.w400),
)),
Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
children: <Widget>[
Text(
"100%",
'100%',
style: TextStyle(
fontSize: 18.sp, color: AppColors.darkGrayTextColor),
),
@ -113,12 +113,10 @@ class _DemoModeLockDetailPageState extends State<DemoModeLockDetailPage> {
color: Colors.white,
height: 280.w,
child: Stack(
children: [
children: <Widget>[
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<DemoModeLockDetailPage> {
SizedBox(height: 30.h),
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
children: <Widget>[
Text(
'门已上锁',
style: TextStyle(
@ -143,9 +141,9 @@ class _DemoModeLockDetailPageState extends State<DemoModeLockDetailPage> {
),
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
children: <Widget>[
Text(
TranslationLoader.lanKeys!.clickUnlockAndHoldDownClose!.tr,
'点击开锁，长按闭锁'.tr,
style: TextStyle(
fontSize: 22.sp,
color: AppColors.btnDisableColor,
@ -158,7 +156,7 @@ class _DemoModeLockDetailPageState extends State<DemoModeLockDetailPage> {
),
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
children: <Widget>[
Image.asset(
'images/icon_electronicKey_admin.png',
width: 24.w,
@ -226,64 +224,57 @@ class _DemoModeLockDetailPageState extends State<DemoModeLockDetailPage> {
}
List<Widget> getShowWidget() {
var showWidgetArr = <Widget>[];
final List<Widget> showWidgetArr = <Widget>[];
// 考勤
// 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<Widget> defaultWidgetArr = <Widget>[
// 电子钥匙
bottomItem('images/main/icon_main_electronicKey.png',
TranslationLoader.lanKeys!.electronicKey!.tr, () {
'电子钥匙'.tr, () {
// gotoLogin();
Get.toNamed(Routers.electronicKeyListPage,
arguments: {"keyInfo": LockListInfoItemEntity()});
arguments: <String, LockListInfoItemEntity>{'keyInfo': LockListInfoItemEntity()});
}),
// 密码
bottomItem('images/main/icon_main_password.png',
TranslationLoader.lanKeys!.password!.tr, () {
'密码'.tr, () {
// gotoLogin();
Get.toNamed(Routers.passwordKeyListPage,
arguments: {"keyInfo": LockListInfoItemEntity()});
arguments: <String, LockListInfoItemEntity>{'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: <String, int>{'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: <String, int>{'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<DemoModeLockDetailPage> {
bottomItem('images/main/icon_face.png', '人脸', () {
// gotoLogin();
Get.toNamed(Routers.faceListPage, arguments: {
"lockId": 1,
Get.toNamed(Routers.faceListPage, arguments: <String, int>{
'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<Widget> endWiddget = <Widget>[
// 授权管理员
bottomItem('images/main/icon_main_authorizedAdmin.png',
TranslationLoader.lanKeys!.authorizedAdmin!.tr, () {
// gotoLogin();
Get.toNamed(Routers.authorizedAdminListPage,
arguments: {"keyInfo": LockListInfoItemEntity()});
arguments: <String, LockListInfoItemEntity>{'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: <String, LockListInfoItemEntity>{'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<DemoModeLockDetailPage> {
}
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<DemoModeLockDetailPage> {
color: Colors.white,
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
children: <Widget>[
SizedBox(
width: width,
height: height,
@ -376,6 +360,6 @@ class _DemoModeLockDetailPageState extends State<DemoModeLockDetailPage> {
void gotoLogin() {
// Get.toNamed(Routers.selectLockTypePage);
logic.showToast("演示模式");
logic.showToast('演示模式');
}
}

48
lib/main/lockMian/demoMode/demoModeLockSet/demoModeLockSet_page.dart
View File

@ -41,7 +41,7 @@ class _DemoModeLockSetPageState extends State<DemoModeLockSetPage> {
CommonItem(
leftTitel:
TranslationLoader.lanKeys!.basicInformation!.tr,
rightTitle: "",
rightTitle: '',
isHaveLine: false,
isHaveDirection: true,
action: () {
@ -56,7 +56,7 @@ class _DemoModeLockSetPageState extends State<DemoModeLockSetPage> {
// 门磁
CommonItem(
leftTitel: TranslationLoader.lanKeys!.doorMagnetic!.tr,
rightTitle: "",
rightTitle: '',
isHaveLine: true,
isHaveDirection: true,
action: () {
@ -68,7 +68,7 @@ class _DemoModeLockSetPageState extends State<DemoModeLockSetPage> {
CommonItem(
leftTitel:
TranslationLoader.lanKeys!.wirelessKeyboard!.tr,
rightTitle: "",
rightTitle: '',
isHaveLine: false,
isHaveDirection: true,
action: () {
@ -79,7 +79,7 @@ class _DemoModeLockSetPageState extends State<DemoModeLockSetPage> {
// 照明
CommonItem(
leftTitel: '照明',
rightTitle: "",
rightTitle: '',
isHaveLine: true,
isHaveDirection: true,
action: () {
@ -88,7 +88,7 @@ class _DemoModeLockSetPageState extends State<DemoModeLockSetPage> {
// 开门器
CommonItem(
leftTitel: '开门器',
rightTitle: "",
rightTitle: '',
isHaveLine: false,
isHaveDirection: true,
action: () {
@ -110,7 +110,7 @@ class _DemoModeLockSetPageState extends State<DemoModeLockSetPage> {
// 锁声音
CommonItem(
leftTitel: TranslationLoader.lanKeys!.lockSound!.tr,
rightTitle: "",
rightTitle: '',
isHaveLine: true,
isHaveDirection: true,
action: () {
@ -166,7 +166,7 @@ class _DemoModeLockSetPageState extends State<DemoModeLockSetPage> {
//---田总新增展示
CommonItem(
leftTitel: '面容开锁',
rightTitle: "",
rightTitle: '',
isHaveLine: true,
isHaveDirection: true,
action: () {
@ -174,7 +174,7 @@ class _DemoModeLockSetPageState extends State<DemoModeLockSetPage> {
}),
CommonItem(
leftTitel: '消息提醒',
rightTitle: "",
rightTitle: '',
isHaveLine: true,
isHaveDirection: true,
action: () {
@ -182,7 +182,7 @@ class _DemoModeLockSetPageState extends State<DemoModeLockSetPage> {
}),
CommonItem(
leftTitel: '猫眼设置',
rightTitle: "",
rightTitle: '',
isHaveLine: true,
isHaveDirection: true,
action: () {
@ -190,7 +190,7 @@ class _DemoModeLockSetPageState extends State<DemoModeLockSetPage> {
}),
CommonItem(
leftTitel: '开门方向设置',
rightTitle: "",
rightTitle: '',
isHaveDirection: true,
isHaveLine: true,
action: () {
@ -198,7 +198,7 @@ class _DemoModeLockSetPageState extends State<DemoModeLockSetPage> {
}),
CommonItem(
leftTitel: '电机功率设置',
rightTitle: "",
rightTitle: '',
isHaveLine: true,
isHaveDirection: true,
action: () {
@ -207,7 +207,7 @@ class _DemoModeLockSetPageState extends State<DemoModeLockSetPage> {
// 支持蓝牙广播（关闭则不能使用蓝牙主动开锁）
CommonItem(
leftTitel: '蓝牙广播',
rightTitle: "",
rightTitle: '',
isHaveLine: false,
isHaveRightWidget: true,
rightWidget: _lockRemindSwitch()),
@ -226,21 +226,21 @@ class _DemoModeLockSetPageState extends State<DemoModeLockSetPage> {
// }),
// 考勤
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<DemoModeLockSetPage> {
CommonItem(
leftTitel: TranslationLoader
.lanKeys!.wifiDistributionNetwork!.tr,
rightTitle: "",
rightTitle: '',
isHaveLine: true,
isHaveDirection: true,
action: () {
@ -258,7 +258,7 @@ class _DemoModeLockSetPageState extends State<DemoModeLockSetPage> {
// 锁时间
CommonItem(
leftTitel: TranslationLoader.lanKeys!.lockTime!.tr,
rightTitle: "",
rightTitle: '',
isHaveLine: true,
isHaveDirection: true,
action: () {
@ -267,7 +267,7 @@ class _DemoModeLockSetPageState extends State<DemoModeLockSetPage> {
// 诊断
CommonItem(
leftTitel: TranslationLoader.lanKeys!.diagnose!.tr,
rightTitle: "",
rightTitle: '',
isHaveLine: true,
isHaveDirection: true,
action: () {
@ -276,7 +276,7 @@ class _DemoModeLockSetPageState extends State<DemoModeLockSetPage> {
// 上传数据
CommonItem(
leftTitel: TranslationLoader.lanKeys!.uploadData!.tr,
rightTitle: "",
rightTitle: '',
isHaveLine: true,
isHaveDirection: true,
action: () {
@ -294,7 +294,7 @@ class _DemoModeLockSetPageState extends State<DemoModeLockSetPage> {
// 锁升级
CommonItem(
leftTitel: TranslationLoader.lanKeys!.lockEscalation!.tr,
rightTitle: "",
rightTitle: '',
isHaveLine: false,
isHaveDirection: true,
action: () {
@ -305,7 +305,7 @@ class _DemoModeLockSetPageState extends State<DemoModeLockSetPage> {
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<DemoModeLockSetPage> {
void gotoAddLock() {
// Get.toNamed(Routers.selectLockTypePage);
EasyLoading.showToast("演示模式", duration: 2000.milliseconds);
EasyLoading.showToast('演示模式', duration: 2000.milliseconds);
}
}

4
lib/mine/minePersonInfo/minePersonInfoEditIphone/minePersonInfoEditIphone_page.dart
View File

@ -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),
]),

10
lib/mine/mineSet/lockUserManage/expireLockList/expireLockManage_tabbar.dart
View File

@ -24,11 +24,11 @@ class _ExpireLockManageTabbarState extends State<ExpireLockManageTabbar> with Si
late TabController _tabController;
final List<ItemView> _itemTabs = <ItemView>[
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

84
lib/translations/lanKeyEntity.dart
View File

@ -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<String, dynamic> toJson() {
final map = <String, dynamic>{};
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;