From 377963c41dc179e2b9c002b09016d07851dba76d 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, 22 Aug 2024 14:53:03 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E9=83=A8=E5=88=86=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .DS_Store                                     | Bin 12292 -> 12292 bytes
 lan/lan_en.json                               |  29 +++++++++---------
 lan/lan_keys.json                             |   3 +-
 lan/lan_zh.json                               |   3 +-
 .../selectCountryRegion_page.dart             |   2 +-
 .../view/sendElectronicKeyView_state.dart     |   8 ++---
 6 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index fe3e2efc289170c93b9d541257d2ee3b50af3c3b..b72c7f421723e29d6c5996b63575df1deed8736e 100755
GIT binary patch
delta 187
zcmZokXi1nL#l*-lQO1~Ghk=2CnSnuofgvxcytrUuoaV#_4U-LYSSEJ!FeXmEr`W_{
zWMH79U}9i4IYwQ2@=gJz$&HF~lm9AkY`nz8wwaxSg+rVdY)B46B12wTa8X`PeqK6I
zgmK~owaq*Nhxr-hHuET)W1l=vTuTNh&I-gppur6!T!B{e0F`nuFeq?uy!f7ZGQW;4
XPyi?d#0@|^*+*yN=ASALnLyeBS0^m8

delta 234
zcmZokXi1nL#l+AyQO1~Gn}LCWnSnuofg#B=CqH>&oaST$9hS-5j69Py1?2f$T#|C~
zlYnYCRONHaHeZymVxQQ+xtX1Vg@ciMvxmT8{)r7XjPjd#6wa}`fsM*xNMy(>3ogpb
z$<Ip%iZK2M0U(2cftR6}p#&&h1mduQ2nGfXZXn?bbN~;KZew6j;NC3A^qzS#zm6^^
gBT(o75Hn1+;gOykqceB&UzNK|T0jA22BNG104HQOF#rGn

diff --git a/lan/lan_en.json b/lan/lan_en.json
index 9c3e88fb..3d7aa7e6 100755
--- a/lan/lan_en.json
+++ b/lan/lan_en.json
@@ -1,7 +1,7 @@
 {
   "星锁": "Star Lock",
   "锁通通": "Lock Through",
-  "点击开锁，长按闭锁": "Click To Unlock And Hold Down to Close",
+  "点击开锁，长按闭锁": "Touch to Unlock,Hold to Lock",
   "考勤": "Attendance",
   "考勤设置": "Attendance Settings",
   "电子钥匙": "eKeys",
@@ -10,15 +10,15 @@
   "添加指纹": "Add Fingerprint",
   "指纹号": "Fingerprint Number",
   "遥控": "Remote",
-  "添加人脸": "添加人脸",
+  "添加人脸": "Add Face",
   "门锁日志": "Door lock log",
   "密码号": "Password Number",
-  "添加者": "Adder",
-  "添加时间": "Add Time",
+  "添加者": "Operator",
+  "添加时间": "Time",
   "重置": "Reset",
-  "请输入手机号或者邮箱": "Please enter the number or email",
+  "请输入手机号或者邮箱": "Phone Number or Email",
   "工作时间": "Working Time",
-  "工作日设置": "Workday Settings",
+  "工作日设置": "Workday Setting",
   "星期一": "Monday",
   "星期二": "Tuesday",
   "星期三": "Wednesday",
@@ -43,14 +43,14 @@
   "周六": "Sat",
   "周日": "Sun",
 
-  "群发钥匙": "Send Group Key",
+  "群发钥匙": "Send multiple ekeys",
   "锁": "Lock",
-  "请添加": "Please Add",
-  "允许远程开锁": "Remote Unlocking Allowed",
-  "请输入验证码": "Please enter the verification code",
-  "获取密码": "Get Password",
-  "请给密码命名": "Please Name Your Password",
-  "密码有限期为6个小时，只能使用一次": "The password is valid for 6 hours and can only be used once",
+  "请添加": "Recipient",
+  "允许远程开锁": "Remote Unlock",
+  "请输入验证码": "Verification Code",
+  "获取密码": "Generate Passcode",
+  "请给密码命名": "Enter a name for this Passcode",
+  "密码有限期为6个小时，只能使用一次": "This Passcode MUST BE used within 6 Hours from the Current Time or it will be SUSPENDED for security Reasons.This Passcode can Only be used ONCE.",
   "手动输入6-9位数字作为密码。可在锁旁边通过手机蓝牙添加，也可以通过网关远程添加": "Manually enter 6-9 digits as the password. Can be added by phone Bluetooth next to the lock, or remotely added through the gateway",
   "获取": "Get",
   "添加": "Add",
@@ -1038,5 +1038,6 @@
   "开门失败": "Failed to open the door",
   "呼叫提醒": "Call reminder",
   "收到来自": "Received from",
-  "锁的呼叫": "Lock call"
+  "锁的呼叫": "Lock call",
+  "加载数据中": "Loading data"
 }
diff --git a/lan/lan_keys.json b/lan/lan_keys.json
index 4408b2aa..a62b070d 100755
--- a/lan/lan_keys.json
+++ b/lan/lan_keys.json
@@ -1070,5 +1070,6 @@
   "开门失败": "开门失败",
   "呼叫提醒": "呼叫提醒",
   "收到来自": "收到来自",
-  "锁的呼叫": "锁的呼叫"
+  "锁的呼叫": "锁的呼叫",
+  "加载数据中": "加载数据中"
 }
diff --git a/lan/lan_zh.json b/lan/lan_zh.json
index 239100d8..b1f58178 100755
--- a/lan/lan_zh.json
+++ b/lan/lan_zh.json
@@ -1036,5 +1036,6 @@
   "开门失败": "开门失败",
   "呼叫提醒": "呼叫提醒",
   "收到来自": "收到来自",
-  "锁的呼叫": "锁的呼叫"
+  "锁的呼叫": "锁的呼叫",
+  "加载数据中": "加载数据中"
 }
diff --git a/lib/login/selectCountryRegion/selectCountryRegion_page.dart b/lib/login/selectCountryRegion/selectCountryRegion_page.dart
index bd0a0762..91c21bae 100755
--- a/lib/login/selectCountryRegion/selectCountryRegion_page.dart
+++ b/lib/login/selectCountryRegion/selectCountryRegion_page.dart
@@ -40,7 +40,7 @@ class _SelectCountryRegionPageState extends State<SelectCountryRegionPage> {
     if (entity.errorCode!.codeIsSuccessful) {
       countriesList.addAll(entity.dataList!);
       for(final CountryRegionModel model in countriesList){
-        if(model.name! == '中国'.tr){
+        if(model.name! == '中国'){
           topCountriesList.add(model);
           break;
         }
diff --git a/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_state.dart b/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_state.dart
index 86ee7dce..8f8244bc 100755
--- a/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_state.dart
+++ b/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_state.dart
@@ -34,8 +34,8 @@ class SendElectronicKeyViewState {
   RxBool isRequireAuth = false.obs; //是否需要实名认证的必填项
   RxInt userNameType = 0.obs; //1:手机号 2:邮箱
 
-  final String timeLimitTips = '接收者在有效期内可以不限次数使用'; //限时
-  final String permanentTips = '接收者可以使用此App开关锁'; //永久
-  final String onceLimitTips = '单次钥匙有效期为1小时，只能使用一次'; //单次
-  final String cycleLimitTips = '接收者可以在有效期内的固定时间段里，不限次数使用'; //循环
+  final String timeLimitTips = '接收者在有效期内可以不限次数使用'.tr; //限时
+  final String permanentTips = '接收者可以使用此App开关锁'.tr; //永久
+  final String onceLimitTips = '单次钥匙有效期为1小时，只能使用一次'.tr; //单次
+  final String cycleLimitTips = '接收者可以在有效期内的固定时间段里，不限次数使用'.tr; //循环
 }