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-08-05 09:57:16 +08:00
parent cde870128a
commit ab8d555f23
23 changed files with 96 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
lan/lan_en.json
View File

@ -2,14 +2,14 @@
"星锁": "Star Lock",
"锁通通": "Lock Through",
"点击开锁，长按闭锁": "Click To Unlock And Hold Down to Close",
"考勤": "Check In",
"考勤设置": "Check In Settings",
"电子钥匙": "Electronic Key",
"考勤": "Attendance",
"考勤设置": "Attendance Settings",
"电子钥匙": "eKeys",
"添加卡": "Add Card",
"卡号": "Card Number",
"添加指纹": "Add Fingerprint",
"指纹号": "Fingerprint Number",
"遥控": "Remote Control",
"遥控": "Remote",
"添加人脸": "添加人脸",
"门锁日志": "Door lock log",
"密码号": "Password Number",
@ -186,8 +186,8 @@
"接收人信息": "Receiver Information",
"转移网关": "Transfer Gateway",
"锁屏": "Lock Screen",
"已关闭": "Closed",
"已开启": "Opened",
"已关闭": "Off",
"已开启": "On",
"开启": "Open",
"确定要开启重置键?": "Are you sure you want to open the reset key?",
"确定要关闭重置键?": "Are you sure you want to close the reset key?",
@ -323,9 +323,9 @@
"获取指纹": "Get Fingerprint",
"安全验证": "Security verification",
"删除账号后，你的所有信息及相关记录都会从平台彻底删除，且不可恢复，是否删除？": "After deleting the account, all your information and related records will be completely deleted from the platform, and can not be recovered, delete or not",
"监控": "Monitoring",
"监控": "Monitor",
"视频日志": "Video Log",
"网关设备": "Gateway Device",
"网关设备": "Gateway",
"开门器": "Door Opener",
"面容开锁": "Face Unlocks",
"开门方向设置": "Opening Direction Set",
@ -355,7 +355,7 @@
"密码": "Password",
"卡": "Card",
"指纹": "Finger",
"指纹": "Fingerprint",
"人脸": "Face",
"配件商城": "Lock Mall",
"公司名称": "Company Name",
@ -520,8 +520,8 @@
"您的钥匙已冻结": "Your key has been frozen",
"您的钥匙已过期": "Your key has expired",
"常开模式开启": "Open mode on",
"超级管理员": "Super administrator",
"授权管理员": "Authorized administrator",
"超级管理员": "Super admin",
"授权管理员": "Authorized admin",
"普通用户": "Ordinary user",
"余": "Balance",
"天": "Day",
@ -608,7 +608,7 @@
"家人到家": "Family gets home",
"添加家人": "Add family",
"若锁没有联网，除电子钥匙外，密码、卡、指纹等开门提醒无法及时发送，请根据你的实际情况选择。": "If the lock is not connected to the Internet, in addition to the electronic key, the password, card, fingerprint and other door reminders can not be sent in time, please choose according to your actual situation",
"消息提醒": "Message reminder",
"消息提醒": "Reminder",
"开门通知": "Opening notice",
"N天未开门": "N days without opening the door",
"门未关好": "The door is not closed",
@ -718,7 +718,7 @@
"固件传输中": "Firmware in transit",
"关闭": "Shut down",
"传输中'": "In transit",
"操作记录": "Operation record",
"操作记录": "Record",
"修改姓名": "Modify name",
"传输中": "In transit",
"发送人": "Sender",
@ -819,5 +819,16 @@
"感应到门前约0.5米有人时,将自动启动面部识别开锁。": "When someone is sensed about 0.5 meters in front of the door, the face recognition unlocking will be automatically started.",
"感应距离已关闭,需手动触摸键盘任意键,进行面部识别开锁。": "The sensing distance has been turned off, you need to manually touch any key on the keyboard to perform face recognition unlocking.",
"防误开已打开,开锁后": "The anti-mistake opening has been turned on, and after unlocking",
"秒内不可使用面容开锁": "Face unlocking cannot be used within seconds"
"秒内不可使用面容开锁": "Face unlocking cannot be used within seconds",
"掌静脉": "Palm vein",
"添加掌静脉": "Add palm vein",
"胁迫掌静脉": "Forced palm vein",
"请不要将胁迫掌静脉用于日常开锁": "Please do not use coercion palm veins for daily unlocking",
"添加掌静脉提示": "添加掌静脉提示",
"已连接到锁,请自然张开手掌，掌心正对摄像头": "Connected to the lock, please naturally open your palm, the palm is facing the camera",
"掌静脉详情": "Palm vein details",
"掌静脉号": "Palm vein number",
"蓝牙未打开，请到设置里面打开蓝牙": "Bluetooth is not turned on, please turn on Bluetooth in the settings",
"删除用户时，会将用户拥有的钥匙一起删除。": "When deleting a user, the keys owned by the user will be deleted together."
}

13
lan/lan_keys.json
View File

@ -848,5 +848,16 @@
"感应到门前约0.5米有人时,将自动启动面部识别开锁。": "感应到门前约0.5米有人时,将自动启动面部识别开锁。",
"感应距离已关闭,需手动触摸键盘任意键,进行面部识别开锁。": "感应距离已关闭,需手动触摸键盘任意键,进行面部识别开锁。",
"防误开已打开,开锁后": "防误开已打开,开锁后",
"秒内不可使用面容开锁": "秒内不可使用面容开锁"
"秒内不可使用面容开锁": "秒内不可使用面容开锁",
"掌静脉": "掌静脉",
"添加掌静脉": "添加掌静脉",
"胁迫掌静脉": "胁迫掌静脉",
"请不要将胁迫掌静脉用于日常开锁": "请不要将胁迫掌静脉用于日常开锁",
"添加掌静脉提示": "添加掌静脉提示",
"已连接到锁,请自然张开手掌，掌心正对摄像头": "已连接到锁,请自然张开手掌，掌心正对摄像头",
"掌静脉详情": "掌静脉详情",
"掌静脉号": "掌静脉号",
"蓝牙未打开，请到设置里面打开蓝牙": "蓝牙未打开，请到设置里面打开蓝牙",
"删除用户时，会将用户拥有的钥匙一起删除。": "删除用户时，会将用户拥有的钥匙一起删除。"
}

14
lan/lan_zh.json
View File

@ -813,5 +813,17 @@
"感应到门前约0.5米有人时,将自动启动面部识别开锁。": "感应到门前约0.5米有人时,将自动启动面部识别开锁。",
"感应距离已关闭,需手动触摸键盘任意键,进行面部识别开锁。": "感应距离已关闭,需手动触摸键盘任意键,进行面部识别开锁。",
"防误开已打开,开锁后": "防误开已打开,开锁后",
"秒内不可使用面容开锁": "秒内不可使用面容开锁"
"秒内不可使用面容开锁": "秒内不可使用面容开锁",
"掌静脉": "掌静脉",
"添加掌静脉": "添加掌静脉",
"胁迫掌静脉": "胁迫掌静脉",
"请不要将胁迫掌静脉用于日常开锁": "请不要将胁迫掌静脉用于日常开锁",
"添加掌静脉提示": "添加掌静脉提示",
"已连接到锁,请自然张开手掌，掌心正对摄像头": "已连接到锁,请自然张开手掌，掌心正对摄像头",
"掌静脉详情": "掌静脉详情",
"掌静脉号": "掌静脉号",
"蓝牙未打开，请到设置里面打开蓝牙": "蓝牙未打开，请到设置里面打开蓝牙",
"删除用户时，会将用户拥有的钥匙一起删除。": "删除用户时，会将用户拥有的钥匙一起删除。"
}

12
lib/blue/io_protocol/io_getPublicKey.dart
View File

@ -7,10 +7,10 @@ import '../io_sender.dart';
import '../io_type.dart';
class GetPublicKeyCommand extends SenderProtocol {
String? lockID;
GetPublicKeyCommand({
this.lockID,
}) : super(CommandType.getLockPublicKey);
String? lockID;
@override
@ -23,14 +23,14 @@ class GetPublicKeyCommand extends SenderProtocol {
List<int> data = [];
// 指令类型
int type = commandType!.typeValue;
double typeDouble = type / 256;
int type1 = typeDouble.toInt();
int type2 = type % 256;
final int type = commandType!.typeValue;
final double typeDouble = type / 256;
final int type1 = typeDouble.toInt();
final int type2 = type % 256;
data.add(type1);
data.add(type2);
int length = utf8.encode(lockID!).length;
final int length = utf8.encode(lockID!).length;
data.addAll(utf8.encode(lockID!));
data = getFixedLengthList(data, 40 - length);

2
lib/main/lockDetail/checkingIn/checkingInHolidays/checkingInAddHolidays/checkingInAddHolidays_logic.dart
View File

@ -11,7 +11,7 @@ class CheckingInAddHolidaysLogic extends BaseGetXController{
// 添加假期
Future<void> editStaffLoadData() async{
if(state.staffNameController.text.isEmpty){
showToast('请输入姓名');
showToast('请输入姓名'.tr);
return;
}

2
lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_logic.dart
View File

@ -107,7 +107,7 @@ class CheckingInAddStaffLogic extends BaseGetXController {
//获取密码请求
Future<void> getKeyboardPwdRequest() async {
if (state.staffNameController.text.isEmpty) {
showToast('请输入姓名');
showToast('请输入姓名'.tr);
return;
}
final PasswordKeyEntity entity = await ApiRepository.to.getPasswordKey(

2
lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendReceiver/massSendReceiverCell.dart
View File

@ -117,7 +117,7 @@ class _MassSendReceiverCellState extends State<MassSendReceiverCell> {
isContactPickerEnabled: false,
onSubmitted: (String text) {
if (text.trim() == '') {
errorTxt.value = '请输入姓名';
errorTxt.value = '请输入姓名'.tr;
} else if (text.length > 50) {
errorTxt.value = '姓名长度不能超过50个字符哦';
}

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

@ -275,13 +275,13 @@ class _AddFaceTypePageState extends State<AddFaceTypePage> with SingleTickerProv
final bool? isDemoMode = await Storage.getBool(ifIsDemoModeOrNot);
if (isDemoMode == false) {
if (state.nameController.text.isEmpty) {
logic.showToast('请输入姓名');
logic.showToast('请输入姓名'.tr);
return;
}
logic.checkFaceNameDuplicated(state.nameController.text);
} else {
// Get.toNamed(Routers.selectLockTypePage);
logic.showToast('演示模式');
logic.showToast('演示模式'.tr);
}
}),
],

2
lib/main/lockDetail/iris/addIrisType/addIrisType_page.dart
View File

@ -261,7 +261,7 @@ class _AddIrisTypePageState extends State<AddIrisTypePage> {
final bool? isDemoMode = await Storage.getBool(ifIsDemoModeOrNot);
if (isDemoMode == false) {
if (state.nameController.text.isEmpty) {
logic.showToast('请输入姓名');
logic.showToast('请输入姓名'.tr);
return;
}
logic.checkIrisNameDuplicated(state.nameController.text);

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

@ -316,7 +316,7 @@ class _CardDetailPageState extends State<CardDetailPage> with RouteAware {
controller: state.changeNameController,
sureClick: () {
if (state.changeNameController.text.isEmpty) {
logic.showToast('请输入姓名');
logic.showToast('请输入姓名'.tr);
return;
}
Get.back();

4
lib/main/lockDetail/iris/irisList/irisList_page.dart
View File

@ -183,8 +183,8 @@ class _IrisListPageState extends State<IrisListPage> {
context: context,
builder: (BuildContext context) {
return ShowIosTipView(
title: '提示',
tipTitle: '确定要删除吗?',
title: '提示'.tr,
tipTitle: '确定要删除吗?'.tr,
sureClick: () async {
Get.back();
state.isDeletFaceData = true;

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

@ -1122,7 +1122,7 @@ class _LockDetailPageState extends State<LockDetailPage>
);
}
if (state.keyInfos.value.lockFeature!.palmVein == 1) {
// if (state.keyInfos.value.lockFeature!.palmVein == 1) {
showWidgetArr.add(
bottomItem(
'images/main/icon_palm.png', '掌静脉'.tr, state.bottomBtnisEable.value,
@ -1132,7 +1132,7 @@ class _LockDetailPageState extends State<LockDetailPage>
});
}),
);
}
// }
//可视对讲门锁新增->监控
if (state.keyInfos.value.lockFeature!.videoIntercom == 1) {
@ -1255,7 +1255,6 @@ class _LockDetailPageState extends State<LockDetailPage>
),
xhjCall: () => Container(
color: Colors.white,
margin: EdgeInsets.symmetric(vertical: 5.h),
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
@ -1274,9 +1273,10 @@ class _LockDetailPageState extends State<LockDetailPage>
fit: BoxFit.fitWidth),
),
),
SizedBox(height: 20.h),
SizedBox(height: 5.h),
Text(
name,
textAlign: TextAlign.center,
style: TextStyle(
fontSize: 20.sp,
color: bottomBtnisEable

8
lib/main/lockDetail/palm/addPalm/addPalm_page.dart
View File

@ -25,7 +25,7 @@ class _AddPalmPageState extends State<AddPalmPage> with RouteAware{
return Scaffold(
backgroundColor: Colors.white,
appBar: TitleAppBar(
barTitle: '添加掌静脉',
barTitle: '添加掌静脉'.tr,
haveBack: true,
backgroundColor: AppColors.mainColor),
body: ListView(
@ -51,7 +51,7 @@ class _AddPalmPageState extends State<AddPalmPage> with RouteAware{
children: <Widget>[
Expanded(
child: Text(
'请自然张开手掌，掌心正对摄像头，距离约一个成年\n人手掌宽度(约10厘米)。',
'添加掌静脉提示'.tr,
textAlign: TextAlign.left,
maxLines: null,
style:
@ -92,8 +92,8 @@ class _AddPalmPageState extends State<AddPalmPage> with RouteAware{
child: Center(
child: Text(
state.ifConnectScuess.value
? '已连接到锁,请自然张开手掌，掌心正对摄像头'
: '尝试连接设备...',
? '已连接到锁,请自然张开手掌，掌心正对摄像头'.tr
: '尝试连接设备...'.tr,
style: TextStyle(color: Colors.white, fontSize: 24.sp))),
)
)

6
lib/main/lockDetail/palm/addPalmType/addPalmType_page.dart
View File

@ -18,10 +18,8 @@ import '../../../../tools/commonItem.dart';
import '../../../../tools/storage.dart';
import '../../../../tools/submitBtn.dart';
import '../../../../tools/titleAppBar.dart';
import '../../../../translations/trans_lib.dart';
class AddPalmTypePage extends StatefulWidget { // 从添加员工进入 传入员工名字
const AddPalmTypePage({Key? key}) : super(key: key);
@override
@ -269,7 +267,7 @@ class _AddPalmTypePageState extends State<AddPalmTypePage> with SingleTickerProv
SizedBox(width: 60.w, height: 50.h, child: _isAdmin())))),
SizedBox(height: 10.h),
Obx(() => CommonItem(
leftTitel: '胁迫掌静脉',
leftTitel: '胁迫掌静脉'.tr,
rightTitle: '',
isTipsImg: false,
isHaveRightWidget: true,
@ -279,7 +277,7 @@ class _AddPalmTypePageState extends State<AddPalmTypePage> with SingleTickerProv
color: Colors.white,
padding: EdgeInsets.only(left: 20.w, right: 20.w, bottom: 20.h),
child: Text(
"${"当被胁迫要求强行开锁时，使用胁迫卡会触发报警，报警信息会推送给管理员，该功能需要锁联网。".tr}\n${"请不要将胁迫掌静脉用于日常开锁"}",
"${"当被胁迫要求强行开锁时，使用胁迫卡会触发报警，报警信息会推送给管理员，该功能需要锁联网。".tr}\n${"请不要将胁迫掌静脉用于日常开锁".tr}",
style: TextStyle(
fontSize: 22.sp, color: AppColors.darkGrayTextColor),
)),

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

@ -1,9 +1,9 @@
import 'dart:async';
import 'package:flutter_blue_plus/flutter_blue_plus.dart';
import 'package:get/get.dart';
import 'package:star_lock/blue/io_protocol/io_addPalmWithTimeCycleCoercion.dart';
import 'package:star_lock/blue/io_type.dart';
import 'package:star_lock/main/lockDetail/palm/palmDetail/palmDetail_state.dart';
import 'package:star_lock/tools/baseGetXController.dart';
import 'package:star_lock/tools/eventBusEventManage.dart';

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

@ -34,14 +34,14 @@ class _PalmDetailPageState extends State<PalmDetailPage> with RouteAware {
return Scaffold(
backgroundColor: AppColors.mainBackgroundColor,
appBar: TitleAppBar(
barTitle: '掌静脉详情',
barTitle: '掌静脉详情'.tr,
haveBack: true,
backgroundColor: AppColors.mainColor,
),
body: ListView(
children: <Widget>[
Obx(() => CommonItem(
leftTitel: '掌静脉号',
leftTitel: '掌静脉号'.tr,
rightTitle: state.typeNumber.value,
isHaveDirection: false,
isHaveLine: true)),
@ -129,7 +129,7 @@ class _PalmDetailPageState extends State<PalmDetailPage> with RouteAware {
Obx(() => Visibility(
visible: state.keyType.value == 4,
child: Obx(() => CommonItem(
leftTitel: '有效时间',
leftTitel: '有效时间'.tr,
rightTitle:
'${DateTool().dateToHNString(state.starTime.value)}-${DateTool().dateToHNString(state.endTime.value)}',
isHaveDirection: true,
@ -163,7 +163,7 @@ class _PalmDetailPageState extends State<PalmDetailPage> with RouteAware {
)),
SizedBox(height: 10.h),
Obx(() => CommonItem(
leftTitel: '胁迫掌静脉',
leftTitel: '胁迫掌静脉'.tr,
rightTitle: '',
isTipsImg: false,
isHaveLine: true,
@ -216,7 +216,7 @@ class _PalmDetailPageState extends State<PalmDetailPage> with RouteAware {
controller: state.changeNameController,
sureClick: () {
if (state.changeNameController.text.isEmpty) {
logic.showToast('请输入姓名');
logic.showToast('请输入姓名'.tr);
return;
}
Get.back();
@ -235,8 +235,8 @@ class _PalmDetailPageState extends State<PalmDetailPage> with RouteAware {
context: context,
builder: (BuildContext context) {
return ShowIosTipView(
title: '提示',
tipTitle: '确定要删除吗?',
title: '提示'.tr,
tipTitle: '确定要删除吗?'.tr,
sureClick: () async {
Get.back();
// String? idStr = await Storage.getUid();

8
lib/main/lockDetail/palm/palmList/palmList_page.dart
View File

@ -1,4 +1,4 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_easyloading/flutter_easyloading.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
@ -16,12 +16,10 @@ import '../../../../app_settings/app_colors.dart';
import '../../../../tools/EasyRefreshTool.dart';
import '../../../../tools/appRouteObserver.dart';
import '../../../../tools/noData.dart';
import '../../../../tools/showIosTipView.dart';
import '../../../../tools/showTipView.dart';
import '../../../../tools/storage.dart';
import '../../../../tools/submitBtn.dart';
import '../../../../tools/titleAppBar.dart';
import '../../../../translations/trans_lib.dart';
class PalmListPage extends StatefulWidget {
const PalmListPage({Key? key}) : super(key: key);
@ -59,7 +57,7 @@ class _PalmListPageState extends State<PalmListPage> with RouteAware {
backgroundColor: AppColors.mainBackgroundColor,
resizeToAvoidBottomInset: false,
appBar: TitleAppBar(
barTitle: '掌静脉',
barTitle: '掌静脉'.tr,
haveBack: true,
backgroundColor: AppColors.mainColor,
actionsList: <Widget>[
@ -109,7 +107,7 @@ class _PalmListPageState extends State<PalmListPage> with RouteAware {
SizedBox(height: 20.h),
Expanded(child: _buildMainUI()),
AddBottomWhiteBtn(
btnName: '添加掌静脉',
btnName: '添加掌静脉'.tr,
onClick: () async {
final data = await Get.toNamed(Routers.addPalmTypePage, arguments: <String, int>{
'lockId': state.lockId.value,

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

@ -188,7 +188,7 @@ class _DemoModeLockDetailPageState extends State<DemoModeLockDetailPage> {
width: 6.w,
),
Text(
'网关设备',
'网关设备'.tr,
style:
TextStyle(fontSize: 20.sp, color: AppColors.btnDisableColor),
),

4
lib/mine/mineSet/lockUserManage/lockUserManageList/lockUserManageList_page.dart
View File

@ -240,8 +240,8 @@ class _LockUserManageListPageState extends State<LockUserManageListPage> {
context: context,
builder: (BuildContext context) {
return ShowIosTipView(
title: '提示',
tipTitle: '删除用户时，会将用户拥有的钥匙一起删除。',
title: '提示'.tr,
tipTitle: '删除用户时，会将用户拥有的钥匙一起删除。'.tr,
sureClick: () {
Get.back();
logic.deletelockUserRequest(lockUserData.uid!);

4
lib/tools/baseGetXController.dart
View File

@ -162,8 +162,8 @@ class BaseGetXController extends GetxController {
context: Get.context!,
builder: (BuildContext context) {
return ShowIosTipView(
title: '提示',
tipTitle: '蓝牙未打开，请到设置里面打开蓝牙',
title: '提示'.tr,
tipTitle: '蓝牙未打开，请到设置里面打开蓝牙'.tr,
sureClick: () {
Get.back();
if (Platform.isIOS) {

4
lib/tools/showTipView.dart
View File

@ -78,11 +78,11 @@ class ShowTipView {
content: Text(contentStr),
actions: <Widget>[
CupertinoDialogAction(
child: Text('取消', style: TextStyle(color: AppColors.mainColor)),
child: Text('取消'.tr, style: TextStyle(color: AppColors.mainColor)),
onPressed: Get.back,
),
CupertinoDialogAction(
child: Text('确定', style: TextStyle(color: AppColors.mainColor)),
child: Text('确定'.tr, style: TextStyle(color: AppColors.mainColor)),
onPressed: () {
Get.back();
sureClick();

1
lib/translations/trans_lib.dart
View File

@ -4,6 +4,5 @@ import 'dart:convert';
import 'dart:ui';
import 'package:flutter/services.dart';
import 'package:get/get.dart';
import 'lanKeyEntity.dart';
part 'translation_loader.dart';
part 'translation_message.dart';

6
lib/translations/translation_loader.dart
View File

@ -13,8 +13,8 @@ class TranslationLoader {
static Map<String,String> get zhDic => _zhMap;
static Map<String,String> get enDic => _enMap;
static LanKeyEntity? _lanKeyEntity;
static LanKeyEntity? get lanKeys => _lanKeyEntity;
// static LanKeyEntity? _lanKeyEntity;
// static LanKeyEntity? get lanKeys => _lanKeyEntity;
static Future<void> loadTranslation({
String? zhSource,
@ -23,7 +23,7 @@ class TranslationLoader {
_zhMap = await _loadJsonFile(zhSource!);
_enMap = await _loadJsonFile(enSource!);
_keyMap = await _loadJsonFile(keySource!);
_lanKeyEntity = LanKeyEntity.fromJson(_keyMap);
// _lanKeyEntity = LanKeyEntity.fromJson(_keyMap);
}
static Future<Map<String,String>> _loadJsonFile(String filePath) async => rootBundle.loadString(filePath).then((String jsonString){