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

fix: 修改国际化bug

Browse Source
This commit is contained in:
魏少阳 2024-11-06 09:28:18 +08:00
parent 03cb9c9451
commit 38f5f429e4
8 changed files with 84 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lan/lan_en.json
View File

@ -1088,5 +1088,6 @@
"购买记录": "Purchase record", "购买记录": "Purchase record",
"使用记录": "User Record", "使用记录": "User Record",
"失效时间要大于当前时间": "The expiration time must be longer than the current time" "失效时间要大于当前时间": "The expiration time must be longer than the current time",
"修改名字": "Edit name"
} }

2
lan/lan_et.json
View File

@ -583,7 +583,7 @@
"虹膜": "Iiris", "虹膜": "Iiris",
"手掌": "Palmi", "手掌": "Palmi",
"商城": "Kaubamaja", "商城": "Kaubamaja",
"我的": "Minu...", "我的": "Minu",
"微信公众号推送": "Jutt avalik konto", "微信公众号推送": "Jutt avalik konto",
"开启微信接收报警消息需要先关注斯凯智能锁微信公众号，请保存二维码并使用微信扫一扫设置": "Et avada häiresõnumite vastuvõtmiseks, peate esmalt tähelepanu Skye Smart Locki avalikule kontole, palun salvesta QR koodi ja kasuta seadistuste skaneerimiseks", "开启微信接收报警消息需要先关注斯凯智能锁微信公众号，请保存二维码并使用微信扫一扫设置": "Et avada häiresõnumite vastuvõtmiseks, peate esmalt tähelepanu Skye Smart Locki avalikule kontole, palun salvesta QR koodi ja kasuta seadistuste skaneerimiseks",
"蓝牙": "BluetoothName", "蓝牙": "BluetoothName",

2
lan/lan_fi.json
View File

@ -583,7 +583,7 @@
"虹膜": "Iiris", "虹膜": "Iiris",
"手掌": "Palmu", "手掌": "Palmu",
"商城": "Ostoskeskus", "商城": "Ostoskeskus",
"我的": "Minun...", "我的": "Minun",
"微信公众号推送": "Keskustele julkinen tili", "微信公众号推送": "Keskustele julkinen tili",
"开启微信接收报警消息需要先关注斯凯智能锁微信公众号，请保存二维码并使用微信扫一扫设置": "Voidakseen avata keskustelua hälytysviestien vastaanottamiseksi sinun on kiinnitettävä huomiota Skye Smart Lockin julkiseen keskusteluun. Tallenna QR-koodi ja käytä keskustelua asetusten kartoittamiseen", "开启微信接收报警消息需要先关注斯凯智能锁微信公众号，请保存二维码并使用微信扫一扫设置": "Voidakseen avata keskustelua hälytysviestien vastaanottamiseksi sinun on kiinnitettävä huomiota Skye Smart Lockin julkiseen keskusteluun. Tallenna QR-koodi ja käytä keskustelua asetusten kartoittamiseen",
"蓝牙": "BluetoothName", "蓝牙": "BluetoothName",

3
lan/lan_keys.json
View File

@ -1088,5 +1088,6 @@
"购买记录": "购买记录", "购买记录": "购买记录",
"使用记录": "使用记录", "使用记录": "使用记录",
"失效时间要大于当前时间": "失效时间要大于当前时间" "失效时间要大于当前时间": "失效时间要大于当前时间",
"修改名字": "修改名字"
} }

3
lan/lan_zh.json
View File

@ -1088,5 +1088,6 @@
"购买记录": "购买记录", "购买记录": "购买记录",
"使用记录": "使用记录", "使用记录": "使用记录",
"失效时间要大于当前时间": "失效时间要大于当前时间" "失效时间要大于当前时间": "失效时间要大于当前时间",
"修改名字": "修改名字"
} }

16
lib/blue/sender_data.dart
View File

@ -1,4 +1,3 @@
import 'dart:async'; import 'dart:async';
import '../app_settings/app_settings.dart'; import '../app_settings/app_settings.dart';
@ -31,7 +30,9 @@ class CommandSenderManager {
List<int> dataBeforeAddTheUser = <int>[]; List<int> dataBeforeAddTheUser = <int>[];
void _initLockAddUserSucceedEvent() { void _initLockAddUserSucceedEvent() {
// 蓝牙协议通知传输跟蓝牙之外的数据传输类不一样 eventBus // 蓝牙协议通知传输跟蓝牙之外的数据传输类不一样 eventBus
_passCurrentLockInformationEvent = eventBus.on<LockAddUserSucceedEvent>().listen((LockAddUserSucceedEvent event) { _passCurrentLockInformationEvent = eventBus
.on<LockAddUserSucceedEvent>()
.listen((LockAddUserSucceedEvent event) {
if (event.type == 0) { if (event.type == 0) {
sendNormalData(dataBeforeAddTheUser); sendNormalData(dataBeforeAddTheUser);
} else { } else {
@ -44,7 +45,8 @@ class CommandSenderManager {
List<int> dataTransferSmartLock = <int>[]; List<int> dataTransferSmartLock = <int>[];
void _initTransferSmartLockSucceedEvent() { void _initTransferSmartLockSucceedEvent() {
// 蓝牙协议通知传输跟蓝牙之外的数据传输类不一样 eventBus // 蓝牙协议通知传输跟蓝牙之外的数据传输类不一样 eventBus
_transferSmartLockEvent = eventBus.on<LockInitUserNoEvent>().listen((LockInitUserNoEvent event) { _transferSmartLockEvent =
eventBus.on<LockInitUserNoEvent>().listen((LockInitUserNoEvent event) {
sendNormalData(dataTransferSmartLock); sendNormalData(dataTransferSmartLock);
}); });
} }
@ -69,8 +71,9 @@ class CommandSenderManager {
sendNormalData(value); sendNormalData(value);
} else { } else {
// 当前锁被转移了 需要更新锁的userid 调用转移锁协议 // 当前锁被转移了 需要更新锁的userid 调用转移锁协议
if(CommonDataManage().initUserNo == 1){ if (CommonDataManage().initUserNo == 1) {
final List<int> entity = await SenderBeforeDataManage().getTransferSmartLockData(); final List<int> entity =
await SenderBeforeDataManage().getTransferSmartLockData();
sendNormalData(entity); sendNormalData(entity);
dataTransferSmartLock = value; dataTransferSmartLock = value;
return; return;
@ -78,7 +81,8 @@ class CommandSenderManager {
// 添加用户之后调用协议就要判断是否添加用户 // 添加用户之后调用协议就要判断是否添加用户
if (CommonDataManage().currentLockUserNo == 0) { if (CommonDataManage().currentLockUserNo == 0) {
// 如果LockUserNo为0，先添加用户 // 如果LockUserNo为0，先添加用户
final List<int> entity = await SenderBeforeDataManage().getAddUserKeyData(); final List<int> entity =
await SenderBeforeDataManage().getAddUserKeyData();
sendNormalData(entity); sendNormalData(entity);
dataBeforeAddTheUser = value; dataBeforeAddTheUser = value;
} else { } else {

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

@ -1,4 +1,3 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
@ -37,8 +36,7 @@ class _CheckingInSetPageState extends State<CheckingInSetPage> {
body: Column( body: Column(
children: <Widget>[ children: <Widget>[
Obx(() => CommonItem( Obx(() => CommonItem(
leftTitel: leftTitel: '公司名称'.tr,
'公司名称'.tr,
rightTitle: state.companyName.value ?? '', rightTitle: state.companyName.value ?? '',
// isHaveRightWidget: true, // isHaveRightWidget: true,
// rightWidget: getTFWidget(), // rightWidget: getTFWidget(),
@ -53,44 +51,52 @@ class _CheckingInSetPageState extends State<CheckingInSetPage> {
isHaveLine: true, isHaveLine: true,
isHaveDirection: true, isHaveDirection: true,
action: () { action: () {
Get.toNamed(Routers.checkingInStaffManagePage, arguments: <String, Object>{ Get.toNamed(Routers.checkingInStaffManagePage,
'getKeyInfosData': state.getKeyInfosData.value, arguments: <String, Object>{
'companyId': state.companyId.value 'getKeyInfosData': state.getKeyInfosData.value,
}); 'companyId': state.companyId.value
});
})), })),
Obx(() => CommonItem( Obx(() => CommonItem(
leftTitel: '工作时间'.tr, leftTitel: '工作时间'.tr,
rightTitle: (state.beginTime.value.isNotEmpty) ? '${state.beginTime.value} - ${state.endTime.value}' : '', rightTitle: (state.beginTime.value.isNotEmpty)
? '${state.beginTime.value} - ${state.endTime.value}'
: '',
isHaveLine: true, isHaveLine: true,
isHaveDirection: true, isHaveDirection: true,
action: () async { action: () async {
var data = await Get.toNamed(Routers.checkingInSetWorkTimePage, arguments: <String, Object>{ var data = await Get.toNamed(Routers.checkingInSetWorkTimePage,
// "getKeyInfosData": state.getKeyInfosData.value, arguments: <String, Object>{
'companyId': state.companyId.value, // "getKeyInfosData": state.getKeyInfosData.value,
'pushType': '2', 'companyId': state.companyId.value,
'checkingInSetInfo': state.checkingInSetInfo.value, 'pushType': '2',
}); 'checkingInSetInfo': state.checkingInSetInfo.value,
if(data != null) { });
if (data != null) {
setState(logic.getCheckInSetInfoData); setState(logic.getCheckInSetInfoData);
} }
})), })),
Obx(() => CommonItem( Obx(() => CommonItem(
leftTitel: '工作日设置'.tr, leftTitel: '工作日设置'.tr,
rightTitle: state.isCustom.value == true ? state.weekDaysStr.value : (state.weekDays.value.length == 6 ? '单休' : '双休'), rightTitle: state.isCustom.value == true
? state.weekDaysStr.value
: (state.weekDays.value.length == 6 ? '单休'.tr : '双休'.tr),
isHaveLine: true, isHaveLine: true,
isHaveDirection: true, isHaveDirection: true,
action: () async { action: () async {
var data = await Get.toNamed(Routers.checkingInSetWorkdaySet, arguments: <String, Object>{ var data = await Get.toNamed(Routers.checkingInSetWorkdaySet,
'getKeyInfosData': state.getKeyInfosData.value, arguments: <String, Object>{
'companyId': state.companyId.value, 'getKeyInfosData': state.getKeyInfosData.value,
'pushType': '2', 'companyId': state.companyId.value,
'checkingInSetInfo': state.checkingInSetInfo.value, 'pushType': '2',
}); 'checkingInSetInfo': state.checkingInSetInfo.value,
if(data != null) { });
if (data != null) {
state.isCustom.value = data['attendanceType']; state.isCustom.value = data['attendanceType'];
state.weekDays.value = data['weekDays']; state.weekDays.value = data['weekDays'];
state.weekDaysStr.value = state.weekDays.join(','); state.weekDaysStr.value = state.weekDays.join(',');
AppLog.log('state.weekDays.value:${state.weekDays.value} state.weekDaysStr.value:${state.weekDaysStr.value}'); AppLog.log(
'state.weekDays.value:${state.weekDays.value} state.weekDaysStr.value:${state.weekDaysStr.value}');
setState(() {}); setState(() {});
} }
})), })),
@ -100,9 +106,10 @@ class _CheckingInSetPageState extends State<CheckingInSetPage> {
isHaveLine: false, isHaveLine: false,
isHaveDirection: true, isHaveDirection: true,
action: () { action: () {
Get.toNamed(Routers.checkingInSetHolidaysPage, arguments: <String, String>{ Get.toNamed(Routers.checkingInSetHolidaysPage,
'companyId': state.companyId.value arguments: <String, String>{
}); 'companyId': state.companyId.value
});
}), }),
SizedBox( SizedBox(
height: 30.h, height: 30.h,
@ -117,7 +124,8 @@ class _CheckingInSetPageState extends State<CheckingInSetPage> {
margin: EdgeInsets.only(left: 30.w, right: 30.w, top: 20.w), margin: EdgeInsets.only(left: 30.w, right: 30.w, top: 20.w),
padding: EdgeInsets.only(top: 20.w, bottom: 20.w), padding: EdgeInsets.only(top: 20.w, bottom: 20.w),
onClick: () { onClick: () {
ShowTipView().showIosTipWithContentDialog('是否删除？'.tr, logic.deletCompanyData); ShowTipView().showIosTipWithContentDialog(
'是否删除？'.tr, logic.deletCompanyData);
// showDeletCompanyAlertDialog(context); // showDeletCompanyAlertDialog(context);
}), }),
), ),
@ -135,14 +143,14 @@ class _CheckingInSetPageState extends State<CheckingInSetPage> {
tipTitle: '', tipTitle: '',
controller: state.changeNameController, controller: state.changeNameController,
inputFormatters: <TextInputFormatter>[ inputFormatters: <TextInputFormatter>[
LengthLimitingTextInputFormatter(30), LengthLimitingTextInputFormatter(30),
], ],
sureClick: () { sureClick: () {
if(state.changeNameController.text.isEmpty){ if (state.changeNameController.text.isEmpty) {
logic.showToast('请输入公司名字'.tr); logic.showToast('请输入公司名字'.tr);
return; return;
} }
if(state.changeNameController.text.length <6){ if (state.changeNameController.text.length < 6) {
logic.showToast('公司名字长度不能小于 6 '.tr); logic.showToast('公司名字长度不能小于 6 '.tr);
return; return;
} }
@ -151,7 +159,8 @@ class _CheckingInSetPageState extends State<CheckingInSetPage> {
}, },
cancelClick: () { cancelClick: () {
Get.back(); Get.back();
},); },
);
}); });
} }
@ -175,7 +184,8 @@ class _CheckingInSetPageState extends State<CheckingInSetPage> {
FilteringTextInputFormatter.deny('\n'), FilteringTextInputFormatter.deny('\n'),
LengthLimitingTextInputFormatter(30), LengthLimitingTextInputFormatter(30),
], ],
style: TextStyle(fontSize: 22.sp, color: AppColors.darkGrayTextColor), style: TextStyle(
fontSize: 22.sp, color: AppColors.darkGrayTextColor),
controller: state.nameController, controller: state.nameController,
autofocus: false, autofocus: false,
enabled: false, enabled: false,
@ -185,10 +195,18 @@ class _CheckingInSetPageState extends State<CheckingInSetPage> {
// contentPadding: const EdgeInsets.only(top: 12.0, bottom: 8.0), // contentPadding: const EdgeInsets.only(top: 12.0, bottom: 8.0),
// hintText: state.companyName.value ?? "", // hintText: state.companyName.value ?? "",
hintStyle: TextStyle(fontSize: 22.sp), hintStyle: TextStyle(fontSize: 22.sp),
focusedBorder: const OutlineInputBorder(borderSide: BorderSide(width: 0, color: Colors.transparent)), focusedBorder: const OutlineInputBorder(
disabledBorder: const OutlineInputBorder(borderSide: BorderSide(width: 0, color: Colors.transparent)), borderSide:
enabledBorder: const OutlineInputBorder(borderSide: BorderSide(width: 0, color: Colors.transparent)), BorderSide(width: 0, color: Colors.transparent)),
border: const OutlineInputBorder(borderSide: BorderSide(width: 0, color: Colors.transparent)), disabledBorder: const OutlineInputBorder(
borderSide:
BorderSide(width: 0, color: Colors.transparent)),
enabledBorder: const OutlineInputBorder(
borderSide:
BorderSide(width: 0, color: Colors.transparent)),
border: const OutlineInputBorder(
borderSide:
BorderSide(width: 0, color: Colors.transparent)),
contentPadding: const EdgeInsets.symmetric(vertical: 0), contentPadding: const EdgeInsets.symmetric(vertical: 0),
), ),
), ),
@ -200,5 +218,4 @@ class _CheckingInSetPageState extends State<CheckingInSetPage> {
), ),
); );
} }
} }

31
lib/main/lockDetail/lockSet/faceUnlock/faceUnlock_state.dart
View File

@ -1,4 +1,3 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
@ -6,7 +5,6 @@ import 'package:star_lock/app_settings/app_colors.dart';
import 'package:star_lock/main/lockDetail/lockSet/lockSet/lockSetInfo_entity.dart'; import 'package:star_lock/main/lockDetail/lockSet/lockSet/lockSetInfo_entity.dart';
class FaceUnlockState { class FaceUnlockState {
FaceUnlockState() { FaceUnlockState() {
Map map = Get.arguments; Map map = Get.arguments;
if (map['lockSetInfoData'] != null) { if (map['lockSetInfoData'] != null) {
@ -14,25 +12,26 @@ class FaceUnlockState {
faceOn.value = lockSetInfoData.value.lockSettingInfo!.faceSwitch != 0; faceOn.value = lockSetInfoData.value.lockSettingInfo!.faceSwitch != 0;
// autoBright.value = lockSetInfoData.value.lockSettingInfo!.faceAutoLightScreen != 0; // autoBright.value = lockSetInfoData.value.lockSettingInfo!.faceAutoLightScreen != 0;
switch(lockSetInfoData.value.lockSettingInfo!.faceInductionDistance!){ switch (lockSetInfoData.value.lockSettingInfo!.faceInductionDistance!) {
case 1: case 1:
senseDistance.value = '近距离'; senseDistance.value = '近距离'.tr;
break; break;
case 2: case 2:
senseDistance.value = '中距离'; senseDistance.value = '中距离'.tr;
break; break;
case 3: case 3:
senseDistance.value = '远距离'.tr; senseDistance.value = '远距离'.tr;
break; break;
case 0: case 0:
senseDistance.value = '关闭'; senseDistance.value = '关闭'.tr;
break; break;
} }
antiMisoperation.value = lockSetInfoData.value.lockSettingInfo!.faceEnErrUnlock!; antiMisoperation.value =
lockSetInfoData.value.lockSettingInfo!.faceEnErrUnlock!;
} }
for(int i = 0; i < 31; i++) { for (int i = 0; i < 31; i++) {
antiMisoperationStrList.add(i.toString() + '秒'.tr); antiMisoperationStrList.add(i.toString() + '秒'.tr);
} }
} }
@ -43,12 +42,8 @@ class FaceUnlockState {
// RxBool autoBright = false.obs; //自动亮屏 // RxBool autoBright = false.obs; //自动亮屏
RxString senseDistance = '远距离'.tr.obs; //感应距离 RxString senseDistance = '远距离'.tr.obs; //感应距离
RxInt antiMisoperation = 0.obs; //防误开 RxInt antiMisoperation = 0.obs; //防误开
RxList<String> senseDistanceList = <String>[ RxList<String> senseDistanceList =
'远距离'.tr, <String>['远距离'.tr, '中距离'.tr, '近距离'.tr, '关闭'.tr].obs;
'中距离'.tr,
'近距离'.tr,
'关闭'.tr
].obs;
// RxList<int> antiMisoperationList = <int>[0, 5, 10, 15, 30, 60].obs; // RxList<int> antiMisoperationList = <int>[0, 5, 10, 15, 30, 60].obs;
RxList<String> antiMisoperationStrList = <String>[].obs; RxList<String> antiMisoperationStrList = <String>[].obs;
@ -62,12 +57,8 @@ class FaceUnlockState {
TextStyle(color: AppColors.placeholderTextColor, fontSize: 22.sp); TextStyle(color: AppColors.placeholderTextColor, fontSize: 22.sp);
late InlineSpan tipsPreviewSpan = TextSpan(children: <InlineSpan>[ late InlineSpan tipsPreviewSpan = TextSpan(children: <InlineSpan>[
TextSpan( TextSpan(text: '${"添加和使用面容开锁时".tr}:\n', style: titleStyle),
text: '${"添加和使用面容开锁时".tr}:\n', TextSpan(text: '添加和使用面容开锁时提示'.tr, style: subTipsStyle),
style: titleStyle),
TextSpan(
text: '添加和使用面容开锁时提示'.tr,
style: subTipsStyle),
]); ]);
RxBool ifCurrentScreen = true.obs; // 是否是当前界面,用于判断是否需要针对当前界面进行展示 RxBool ifCurrentScreen = true.obs; // 是否是当前界面,用于判断是否需要针对当前界面进行展示