From 2583396e8397f7402d5bb422658fb00112e39fa8 Mon Sep 17 00:00:00 2001 From: liyi Date: Thu, 31 Jul 2025 15:24:27 +0800 Subject: [PATCH 01/15] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=A4=87=E7=94=A8?= =?UTF-8?q?=E7=94=B5=E6=B1=A0=E6=98=BE=E7=A4=BA0=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/main/lockDetail/lockDetail/lockDetail_logic.dart | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/main/lockDetail/lockDetail/lockDetail_logic.dart b/lib/main/lockDetail/lockDetail/lockDetail_logic.dart index da62eff6..656dc238 100755 --- a/lib/main/lockDetail/lockDetail/lockDetail_logic.dart +++ b/lib/main/lockDetail/lockDetail/lockDetail_logic.dart @@ -293,6 +293,8 @@ class LockDetailLogic extends BaseGetXController { state.electricQuantity.value = state.keyInfos.value.electricQuantity!; state.isOpenPassageMode.value = state.keyInfos.value.passageMode!; state.lockAlias.value = state.keyInfos.value.lockAlias!; + state.electricQuantityStandby.value = + state.keyInfos.value.electricQuantityStandby ?? 0; Storage.setString(saveLockAlias, state.lockAlias.value); BlueManage().connectDeviceName = From adb7a25d1c1a32c2a11285a7acd2de9d217ca6bd Mon Sep 17 00:00:00 2001 From: liyi Date: Thu, 31 Jul 2025 17:08:46 +0800 Subject: [PATCH 02/15] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=94=81=E6=97=B6=E5=8F=B0=E6=B9=BE=E6=98=BE=E7=A4=BA=E4=B8=BA?= =?UTF-8?q?=E7=B9=81=E4=BD=93=E4=B8=AD=E6=96=87=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lock_voice_setting_logic.dart | 36 +++++++++++++------ 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/lib/mine/addLock/lock_voice_setting/lock_voice_setting_logic.dart b/lib/mine/addLock/lock_voice_setting/lock_voice_setting_logic.dart index 017f6dc9..fde8ba46 100644 --- a/lib/mine/addLock/lock_voice_setting/lock_voice_setting_logic.dart +++ b/lib/mine/addLock/lock_voice_setting/lock_voice_setting_logic.dart @@ -31,6 +31,7 @@ class LockVoiceSettingLogic extends BaseGetXController { LockVoiceSettingState state = LockVoiceSettingState(); StreamSubscription? _replySubscription; bool _isThrottled = false; + // 超时定时器（用于检测是否未收到回复） Timer? _sendTimeoutTimer; @@ -248,16 +249,29 @@ class LockVoiceSettingLogic extends BaseGetXController { data?.forEach((element) { final lang = element.lang; - List parts = lang.split('_'); - final indexOf = locales.indexOf(Locale(parts[0], parts[1])); - final passthroughItem = PassthroughItem( - lang: element.lang, - timbres: element.timbres, - langText: - ExtensionLanguageType.fromLocale(locales[indexOf]).lanTitle, - name: element.name, - ); - state.languages.add(passthroughItem); + if (lang == 'zh_TW') { + // 如果是台湾的话应该显示未简体中文 + List parts = lang.split('_'); + final indexOf = locales.indexOf(Locale(parts[0], parts[1])); + final passthroughItem = PassthroughItem( + lang: element.lang, + timbres: element.timbres, + langText: '简体中文'.tr + '（中国台湾）'.tr, + name: element.name, + ); + state.languages.add(passthroughItem); + } else { + List parts = lang.split('_'); + final indexOf = locales.indexOf(Locale(parts[0], parts[1])); + final passthroughItem = PassthroughItem( + lang: element.lang, + timbres: element.timbres, + langText: + ExtensionLanguageType.fromLocale(locales[indexOf]).lanTitle, + name: element.name, + ); + state.languages.add(passthroughItem); + } }); state.languages.refresh(); final lang = state @@ -314,6 +328,7 @@ class LockVoiceSettingLogic extends BaseGetXController { state.progress.value = 0.0; // 开始前重置进度 _sendNextPackage(); } + void _handleSendTimeout() { _isTimeout = true; // 标记超时状态 dismissEasyLoading(); @@ -347,7 +362,6 @@ class LockVoiceSettingLogic extends BaseGetXController { _handleSendTimeout(); // 触发超时处理 }); - int start = state.voiceSubcontractingIndex * state.voiceSubcontractingSize; int end = start + state.voiceSubcontractingSize; if (end > state.data!.length) end = state.data!.length; From 5a12e2acb4d52d64042d3cf4813e671dd4a0f025 Mon Sep 17 00:00:00 2001 From: liyi Date: Mon, 4 Aug 2025 09:26:14 +0800 Subject: [PATCH 03/15] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E7=BF=BB=E8=AF=91=E5=90=8E=E5=87=BA=E7=8E=B0name?= =?UTF-8?q?=E5=90=8E=E7=BC=80=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lan/lan_ar.json | 2 +- lan/lan_bg.json | 2 +- lan/lan_bn.json | 24 ++++++++++++------------ lan/lan_cs.json | 2 +- lan/lan_da.json | 36 ++++++++++++++++++------------------ lan/lan_de.json | 2 +- lan/lan_el.json | 14 +++++++------- lan/lan_en.json | 2 +- lan/lan_es.json | 2 +- lan/lan_et.json | 26 +++++++++++++------------- lan/lan_fi.json | 12 ++++++------ lan/lan_fr.json | 2 +- lan/lan_he.json | 2 +- lan/lan_hi.json | 4 ++-- lan/lan_hk.json | 2 +- lan/lan_hr.json | 16 ++++++++-------- lan/lan_hu.json | 2 +- lan/lan_hy.json | 2 +- lan/lan_id.json | 2 +- lan/lan_it.json | 2 +- lan/lan_ja.json | 2 +- lan/lan_ka.json | 4 ++-- lan/lan_kk.json | 36 ++++++++++++++++++------------------ lan/lan_ko.json | 2 +- lan/lan_lt.json | 2 +- lan/lan_ms.json | 2 +- lan/lan_nl.json | 2 +- lan/lan_pl.json | 2 +- lan/lan_pt.json | 2 +- lan/lan_ro.json | 24 ++++++++++++------------ lan/lan_ru.json | 2 +- lan/lan_sk.json | 2 +- lan/lan_sr_cyrl.json | 2 +- lan/lan_sv.json | 22 +++++++++++----------- lan/lan_th.json | 2 +- lan/lan_tr.json | 2 +- lan/lan_tw.json | 2 +- lan/lan_uk.json | 2 +- lan/lan_ur.json | 2 +- lan/lan_vi.json | 2 +- lan/lan_zh.json | 2 +- 41 files changed, 139 insertions(+), 139 deletions(-) diff --git a/lan/lan_ar.json b/lan/lan_ar.json index edaa6c96..65ea2bd7 100644 --- a/lan/lan_ar.json +++ b/lan/lan_ar.json @@ -1078,7 +1078,7 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", - "印地语": "हिंदीName", + "印地语": "हिंदी", "乌尔都语": "اوردو", "亚美尼亚语": "Հայերեն", "格鲁吉亚语": "ქართული", diff --git a/lan/lan_bg.json b/lan/lan_bg.json index ac8022fe..31814e15 100644 --- a/lan/lan_bg.json +++ b/lan/lan_bg.json @@ -1078,7 +1078,7 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", - "印地语": "हिंदीName", + "印地语": "हिंदी", "乌尔都语": "اوردو", "亚美尼亚语": "Հայերեն", "格鲁吉亚语": "ქართული", diff --git a/lan/lan_bn.json b/lan/lan_bn.json index a1efaa72..717b2dda 100644 --- a/lan/lan_bn.json +++ b/lan/lan_bn.json @@ -83,8 +83,8 @@ "上班时间": "সিস্টেম", "下班时间": "ক্লাসিং", "本周": "ইঙ্গোনেক", - "单休": "এক-ডে-ওয়েওয়েন্ডName", - "双休": "টেটো-ডেওওয়েলেন্ডName", + "单休": "এক-ডে-ওয়েওয়েন্ড", + "双休": "টেটো-ডেওওয়েলেন্ড", "单双休": "এক-টেটো-ডে-ওওয়েডেন্ড", "年": "ইয়ার", "月": "থ", @@ -104,7 +104,7 @@ "门磁": "ডোরনেসিসর", "自动闭锁": "স্বয়ংক্রিয় লক", "锁声音": "লক", - "防撬报警": "ওয়েটperalertGenericName", + "防撬报警": "ওয়েটperalertGeneric", "重置键": "ইউনিটন", "锁时间": "লকক", "诊断": "অ্যারিওনস", @@ -237,7 +237,7 @@ "搜索所有类型的锁": "স্যাকানাল্ডসপিসফক্স", "门锁": "ডোর-লক", "挂锁": "আনলক", - "保险箱锁": "মাইন্টfelockGenericName", + "保险箱锁": "মাইন্টfelockGeneric", "智能门禁": "লিজেন্টেসেস কন্ট্রোল", "车位锁": "কিকিংলক", "摸亮触摸屏": "টুকরাইকিউট্ট", @@ -343,7 +343,7 @@ "卡": "বিকশিত", "指纹": "ডিগ্রিমপ্রিন", "人脸": "ফেস", - "配件商城": "লককName", + "配件商城": "লকক", "公司名称": "অ্যাকম্পেনিনাম", "请输入公司名字": "কনস্টার অ্যাকম্পেনিনাম", "提示": "চিন্ট", @@ -579,7 +579,7 @@ "请输入wifi名称": "ক্যাপিলাইজ", "虹膜": "নিয়", "手掌": "Pp", - "商城": "XmallName", + "商城": "Xmall", "我的": "My", "微信公众号推送": "ইয়াক", "蓝牙": "নিকট্রিয়াথ", @@ -710,7 +710,7 @@ "传输期间请勿离开当前页面": "নির্দিষ্ট নেতৃত্বাধীন", "机型": "ডাইলস", "硬件版本": "ডার্ওয়ারভেন্স", - "固件版本": "FmwareversionName", + "固件版本": "Fmwareversion", "手动升级": "ধুয়াল ফলাগ্রাড", "设备连接中...": "প্রাচীন...", "未避免异常情况，请在门打开时升级": "সাউন oidযোগ্য exceptionstionsণনশনস, ক্যাপিলাইস", @@ -897,7 +897,7 @@ "配网成功": "নকর্ক ওয়ার্ক", "配网失败": "নবক ওয়ার্ক", "该锁的无线键盘都将被删除": "অলসবিহীন", - "实时画面": "রিয়েল-টাইমপেসিচারName", + "实时画面": "রিয়েল-টাইমপেসিচার", "适合门口较为安全的环境。": "ভিডিওটেবল ফরফরাসী ইলেই মাইউইভেনমেন্টের দরজা।", "仅发生特定事件才录像，并可查看实时画面。": "কেবলমাত্র আলোচনার কোর্সডন্ডথের রিয়েল-টাইমপিসিচার হয়ত।", "一般情况下，满电可使用7-8个月": "আন্ডারমালবিক", @@ -996,7 +996,7 @@ "类型:自定义-永久": "টাইপ:", "实时播放": "রিয়েল-টাইমপিপ্লেব্যাক", "点击对讲": "ক্লিক্টোকম", - "长按开锁": "লংপ্রেসtocunlockGenericName", + "长按开锁": "লংপ্রেসtocunlockGeneric", "接听失败": "ডিফাইরেডটুআনসাইওয়ার", "请在锁设置中开启远程开锁": "ক্যাপিলাইজ এসব... ...সংকলকিং", "接听": "অ্যানসাওয়ার", @@ -1015,7 +1015,7 @@ "呼叫提醒": "ক্যান্সাল", "收到来自": "আইভেদ্রোম", "锁的呼叫": "লোককল", - "加载数据中": "ব্লুডিং-ডাটাName", + "加载数据中": "ব্লুডিং-ডাটা", "搜索所有锁类型": "কোআরসার্লককপিস", "锁电量更新时间": "লক", "1月": "জিনা", @@ -1031,7 +1031,7 @@ "11月": "নভ", "12月": "ব্লিক", "热门城市": "আই", - "导出锁数据": "পোর্টlockdataName", + "导出锁数据": "পোর্টlockdata", "一键开锁": "এক-চ্যাক্লাক", "已开通": "উত্স", "编辑员工": "এডিটওফ", @@ -1078,7 +1078,7 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", - "印地语": "हिंदीName", + "印地语": "हिंदी", "乌尔都语": "اوردو", "亚美尼亚语": "Հայերեն", "格鲁吉亚语": "ქართული", diff --git a/lan/lan_cs.json b/lan/lan_cs.json index 27fbd5b3..f12e2fc8 100644 --- a/lan/lan_cs.json +++ b/lan/lan_cs.json @@ -1078,7 +1078,7 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", - "印地语": "हिंदीName", + "印地语": "हिंदी", "乌尔都语": "اوردو", "亚美尼亚语": "Հայերեն", "格鲁吉亚语": "ქართული", diff --git a/lan/lan_da.json b/lan/lan_da.json index b76a4fc6..6cc679ec 100644 --- a/lan/lan_da.json +++ b/lan/lan_da.json @@ -63,7 +63,7 @@ "授权管理员拥有操作这把锁的重要权限，请确保只发给我你信任的人": "Den autoriserede administrator har flertal tilladelse til at betjene denne lås.", "功能开启后，你将可以通过网关远程开锁。此功能的开启和关闭只能在锁附近通过手机蓝牙进行。": "Denne funktion giver dig mulighed for at låse Smart Lock fjernbetjening via en Gateway. Denne funktion kan kun slås til eller fra via Bluetooth.", "排列方式": "Listetype", - "早到榜": "Tidlig listeName", + "早到榜": "Tidlig liste", "迟到榜": "Forsinkede lister", "当前模式": "Nuværende tilstand", "勤奋榜": "Arbejdshård liste:", @@ -116,7 +116,7 @@ "微信二维码": "Lås op QR- kode", "拥有电子钥匙的人，通过微信扫一扫这个二维码，即可开门。每把锁的二维码都不相同，你可以将其打印出来贴在对应的锁旁边": "Folk med elektroniske nøgler kan åbne døren ved at scanne denne QR-kode gennem WeChat. QR-koden for hver lås er anderledes. Du kan udskrive det ud og indsætte det ved siden af den tilsvarende lås", "锁编号": "Låsnummer", - "电量": "BatteriName", + "电量": "Batteri", "锁分组": "Lås gruppen", "选择分组": "Vælg gruppe", "创建新分组": "Opret en gruppe", @@ -157,7 +157,7 @@ "选择锁类型": "Vælg låstype", "NFC无源锁": "NFC Passiv lås", "添加设备": "Tilføj enhed", - "网关": "GatewayName", + "网关": "Gateway", "客服": "Kundeservice:", "设置": "Indstillinger", "更多设置": "Mere sæt", @@ -185,7 +185,7 @@ "删除账号": "Slet konto", "个人信息": "Kontoinformation", "头像": "Avatar", - "昵称": "NickNameName", + "昵称": "NickName", "请输入昵称": "Indtast venligst dit kaldenavn", "修改昵称": "Omdøb", "修改账号": "Redigér konto", @@ -213,10 +213,10 @@ "网关连接的锁": "Lås forbundet til denne Gateway", "信号强": "Stærk", "选择网关类型": "Vælg gateway- type", - "添加网关": "Tilføj gatewayName", + "添加网关": "Tilføj gateway", "重新通电": "Tilslut kraften", "指示灯": "Indikator Lys", - "选择网关": "Vælg gatewayName", + "选择网关": "Vælg gateway", "不支持5G WiFi网络，请选择2.4G WiFi网络进行配置": "5G understøttes ikke, Vælg et WiFi på 2.4G.", "WiFi密码": "WiFi- adgangskort", "请输入WiFi密码": "Indtast WiFi- adgangskode", @@ -245,7 +245,7 @@ "附近的锁": "Nærlig låse", "如需修改名字请重新命名，点击确定添加锁": "Hvis du vil ændre navnet, skal du omdøbe, klikke på OK for at tilføje låse", "添加锁时，手机必须在锁旁边": "Når du tilføjer en lås, skal telefonen være ved siden af låsen", - "登录": "LoginName", + "登录": "Login", "注册": "Registrer", "我已阅读并同意": "Jeg har læst og indvilliget", "验证码": "Kode", @@ -305,7 +305,7 @@ "胁迫卡": "Stresskort", "员工是否有密码": "Har allerede adgangskode", "员工是否有卡": "Har allerede kort", - "员工是否有指纹": "Sæt fingeraftrykket alleredeName", + "员工是否有指纹": "Sæt fingeraftrykket allerede", "获取钥匙": "Hent nøgle", "获取卡": "Hent kort", "获取指纹": "Hent fingeraftryk", @@ -316,11 +316,11 @@ "开门器": "Døråbnere", "面容开锁": "Ansigt åbnes", "开门方向设置": "Åbningsvejssæt", - "电机功率设置": "Indstilling af MotorPowerName", + "电机功率设置": "Indstilling af MotorPower", "开锁时是否需联网": "Hvis Internet er påkrævet ved oplåsning", "选择要加入分组的锁": "Vælg lockS der skal tilføjes til denne gruppe.", "锁数量": "Låstællinger", - "小米IOT平台": "Xiaomi IOT-platformName", + "小米IOT平台": "Xiaomi IOT-platform", "面容开锁设置": "Ansigtet låser op sæt", "感应距离": "Følelsesafstand", "防误开": "Forhindre forkert åbning", @@ -365,7 +365,7 @@ "员工是否有人脸": "Om medarbejderen har et ansigt", "同时删除员工钥匙": "Slet hans/ hendes ekey", "删除": "Slet", - "确定要删除员工吗?": "Slet denne medarbejderName", + "确定要删除员工吗?": "Slet denne medarbejder", "月统计": "Månedlig statistik", "迟到": "Forsinker", "早退": "Forsvind tidligt", @@ -519,7 +519,7 @@ "网络访问失败,请检查网络是否正常": "Forespørgsel mislykkedes.Netværk utilgængelig, Kontroller og tilslut din enhed til 3G/4G/WIFI", "清空": "Ryd", "是否清空?": "Forstået?", - "消息详情": "Brev- infoName", + "消息详情": "Brev- info", "创建时间": "Oprettelsestid", "管理员详情": "Oplysninger om administrator", "当被胁迫要求强行开锁时，使用胁迫卡会触发报警，报警信息会推送给管理员，该功能需要锁联网。": "Hvis nogen tvinger dig til at åbne døren, kan du bruge dette kort. Alarmen vil blive sendt til administratorerne. For at bruge denne funktion, skal du sørge for din lås er online.", @@ -691,7 +691,7 @@ "请输入身份证号和真实姓名": "Indtast venligst dit ID- nummer og rigtige navn.", "点击返回设备配对": "Tryk på Tilbage til enhedsparing", "无法连接？尝试升级": "Kan ikke forbinde?", - "固件升级提示": "Prompt for opgradering af FirmwareName", + "固件升级提示": "Prompt for opgradering af Firmware", "请先获取固件文件到手机本地，再选择升级": "Få venligst firmware-filen til den lokale telefon først, og vælg derefter Opgrader", "固件升级中": "Firmwaren bliver opgraderet", "取消升级": "Annullér opgraderingen", @@ -703,7 +703,7 @@ "传输中": "I transit", "发送人": "Udstedt af:", "发送时间": "Udstedt tid", - "钥匙详情": "Ekey- infoName", + "钥匙详情": "Ekey- info", "姓名": "Navn", "发送": "Send", "请确认姓名全名和身份证号码是否正确": "Bekræft venligst, at det fulde navn og ID-nummer er korrekt.", @@ -834,7 +834,7 @@ "微信": "WeChat", "朋友圈": "Øjeblikker", "QQ": "QQ", - "QQ空间": "QQZoneName", + "QQ空间": "QQZone", "微博": "Weibo Formand", "FaceBook": "Facebook", "链接": "Tilknytning", @@ -872,7 +872,7 @@ "再返回一次退出": "Afslut igen.", "请先添加锁": "Tilføj venligst låsen først.", "可视对讲": "Visuel interkom.", - "详细日志": "Detaljeret log logName", + "详细日志": "Detaljeret log log", "已复制到剪切板": "Kopieret", "拍照": "Fotografi", "从相册选择": "Vælg mellem albumet", @@ -1078,7 +1078,7 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", - "印地语": "हिंदीName", + "印地语": "हिंदी", "乌尔都语": "اوردو", "亚美尼亚语": "Հայերեն", "格鲁吉亚语": "ქართული", @@ -1099,7 +1099,7 @@ "支持的国家值": "USA, Canada, Storbritannien, Australien, Indien, Tyskland, Frankrig, Italien, Spanien, Japan.", "操作流程": "Driftsprocesser", "操作流程值": "1 Tilføj en lås og gateway med Smart lås APP\n\n2 Aktiver den fjernlåsefunktion af låsen i APP (denne funktion er slukket som standard). Hvis du ikke har denne indstilling, understøtter låsen ikke Alexa\n\n3 Tilføj færdigheder til Alexa og autorisere dem med Smart lås APP konto og adgangskode. Når godkendelsen er vellykket, kan du opdage enheder under kontoen\n\n4 Find låsen i Alexa-appen, tænd stemme oplåsfunktionen og indstille adgangskoden for sproget.\n\n5 Låsen kan betjenes gennem Alexa", - "Google Home": "Google-hjemName", + "Google Home": "Google-hjem", "Action name": "Handlingsnavn", "ScienerSmart": "ScienerSmart", "支持的语言": "Understøttede sprog", diff --git a/lan/lan_de.json b/lan/lan_de.json index 0348fcdf..625698db 100644 --- a/lan/lan_de.json +++ b/lan/lan_de.json @@ -1078,7 +1078,7 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", - "印地语": "हिंदीName", + "印地语": "हिंदी", "乌尔都语": "اوردو", "亚美尼亚语": "Հայերեն", "格鲁吉亚语": "ქართული", diff --git a/lan/lan_el.json b/lan/lan_el.json index b9867673..92bbd502 100644 --- a/lan/lan_el.json +++ b/lan/lan_el.json @@ -97,7 +97,7 @@ "日榜": "Καθημερινά", "月榜": "Μηνιαία", "考勤记录": "Καταγραφή", - "假日信息": "Πληροφορίες διακοπώνName", + "假日信息": "Πληροφορίες διακοπών", "基本信息": "Βασικά", "无线键盘": "Ασύρματο πληκτρολόγιο", "选择无线键盘": "Προσθήκη πληκτρολόγιου", @@ -185,7 +185,7 @@ "删除账号": "Διαγραφή λογαριασμού", "个人信息": "Πληροφορίες λογαριασμού", "头像": "Άβαταρ", - "昵称": "NickNameName", + "昵称": "NickName", "请输入昵称": "Παρακαλώ εισάγετε το ψευδώνυμό σας", "修改昵称": "Μετονομασία", "修改账号": "Επεξεργασία λογαριασμού", @@ -693,7 +693,7 @@ "无法连接？尝试升级": "Δεν μπορείτε να συνδεθείτε;", "固件升级提示": "Προτεινόμενη αναβάθμιση του Firmware", "请先获取固件文件到手机本地，再选择升级": "Παρακαλώ αποκτήστε πρώτα το αρχείο firmware στο τοπικό τηλέφωνο και στη συνέχεια επιλέξτε Αναβάθμιση", - "固件升级中": "Το firmware αναβαθμίζεταιName", + "固件升级中": "Το firmware αναβαθμίζεται", "取消升级": "Ακύρωση της αναβάθμισης", "固件传输中": "Άρθρο 10", "关闭": "Κλείσιμο", @@ -834,7 +834,7 @@ "微信": "WeChat", "朋友圈": "Στιγμές", "QQ": "QQ", - "QQ空间": "QQZoneName", + "QQ空间": "QQZone", "微博": "Γουίβο", "FaceBook": "Βιβλίο Facebook", "链接": "Δεσμός", @@ -1078,7 +1078,7 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", - "印地语": "हिंदीName", + "印地语": "हिंदी", "乌尔都语": "اوردو", "亚美尼亚语": "Հայերեն", "格鲁吉亚语": "ქართული", @@ -1099,12 +1099,12 @@ "支持的国家值": "ΗΠΑ, Καναδάς, Ηνωμένο Βασίλειο, Αυστραλία, Ινδία, Γερμανία, Γαλλία, Ιταλία, Ισπανία, Ιαπωνία", "操作流程": "Διαδικασία λειτουργίας", "操作流程值": "1 Προσθέστε μια κλειδαριά και πύλη με την Smart κλειδαριά APP\n\n2 Ενεργοποιήστε τη λειτουργία απομακρυσμένου ξεκλειδώματος της κλειδαριάς στο APP (αυτή η συνάρτηση είναι απενεργοποιημένη από προεπιλογή). Αν δεν έχετε αυτή την επιλογή, η κλειδαριά δεν υποστηρίζει Alexa\n\n3 Προσθέστε τις δεξιότητες στην Alexa και να τις εξουσιοδοτήσετε με το λογαριασμό και τον κωδικό πρόσβασης Smart. Μετά την επιτυχία της εξουσιοδότησης, μπορείτε να ανακαλύψετε συσκευές κάτω από τον λογαριασμό\n\n4 Εντοπίστε την κλειδαριά στην εφαρμογή Alexa, ενεργοποιήστε τη λειτουργία φωνής ξεκλειδώματος, και να ορίσετε τον κωδικό πρόσβασης γλώσσας\n\n5 Η κλειδαριά μπορεί να λειτουργήσει μέσω Alexa", - "Google Home": "Σπίτι του GoogleName", + "Google Home": "Σπίτι του Google", "Action name": "Όνομα ενέργειας", "ScienerSmart": "ΕπιστήμοναςSmart", "支持的语言": "Υποστηριζόμενες γλώσσες", "英语": "Αγγλική", - "Google Home操作流程的值": "1. Χρησιμοποιήστε το Smart Lock APP για να προσθέσετε κλειδαριές και πύλες\n\n2. Ενεργοποιήστε τη λειτουργία απομακρυσμένου ξεκλειδώματος της κλειδαριάς στο APP (αυτή η λειτουργία είναι απενεργοποιημένη από προεπιλογή). Χωρίς αυτή την επιλογή, η κλειδαριά δεν υποστηρίζει το Google HomeName\n\n3. Εγκαταστήστε το Google Home APP και κάντε κλικ στο \" \" πλήκτρο στην επάνω αριστερή γωνία\n\n4. Στη σελίδα Ρυθμίσεις, επιλέξτε \"Εργασία με Google\"\n\n5. Αναζητήστε το \"ScienerSmart\" και να χρησιμοποιήσετε τον έξυπνο λογαριασμό και τον κωδικό πρόσβασης για να εξουσιοδοτήσει", + "Google Home操作流程的值": "1. Χρησιμοποιήστε το Smart Lock APP για να προσθέσετε κλειδαριές και πύλες\n\n2. Ενεργοποιήστε τη λειτουργία απομακρυσμένου ξεκλειδώματος της κλειδαριάς στο APP (αυτή η λειτουργία είναι απενεργοποιημένη από προεπιλογή). Χωρίς αυτή την επιλογή, η κλειδαριά δεν υποστηρίζει το Google Home\n\n3. Εγκαταστήστε το Google Home APP και κάντε κλικ στο \" \" πλήκτρο στην επάνω αριστερή γωνία\n\n4. Στη σελίδα Ρυθμίσεις, επιλέξτε \"Εργασία με Google\"\n\n5. Αναζητήστε το \"ScienerSmart\" και να χρησιμοποιήσετε τον έξυπνο λογαριασμό και τον κωδικό πρόσβασης για να εξουσιοδοτήσει", "密码需至少包含数字/字母/字符中的2种组合": "Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον 2 από τα ακόλουθα: αριθμούς, γράμματα και ειδικούς χαρακτήρες.", "已开锁": "Ξεκλείδωμα", "已闭锁": "Κλειδωμένο", diff --git a/lan/lan_en.json b/lan/lan_en.json index b6c9f65a..a68e857f 100644 --- a/lan/lan_en.json +++ b/lan/lan_en.json @@ -1080,7 +1080,7 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", - "印地语": "हिंदीName", + "印地语": "हिंदी", "乌尔都语": "اوردو", "亚美尼亚语": "Հայերեն", "格鲁吉亚语": "ქართული", diff --git a/lan/lan_es.json b/lan/lan_es.json index 4e83680c..3671a855 100644 --- a/lan/lan_es.json +++ b/lan/lan_es.json @@ -1078,7 +1078,7 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", - "印地语": "हिंदीName", + "印地语": "हिंदी", "乌尔都语": "اوردو", "亚美尼亚语": "Հայերեն", "格鲁吉亚语": "ქართული", diff --git a/lan/lan_et.json b/lan/lan_et.json index 7447f012..7e18e424 100644 --- a/lan/lan_et.json +++ b/lan/lan_et.json @@ -55,7 +55,7 @@ "密码详情": "Parooli infoComment", "修改密码": "Parooli muutmine", "添加虹膜": "Lisa Iiris", - "添加门磁": "UksessensorName", + "添加门磁": "Uksessensor", "添加无线键盘": "Juhtmeta klaviatuuri", "添加手掌": "Lisa palmi", "请输入员工账号": "Sisesta töötaja konto", @@ -101,7 +101,7 @@ "基本信息": "Põhimõtted", "无线键盘": "Juhtmeta klaviatuuri", "选择无线键盘": "Lisa klaviatuuri", - "门磁": "UksessensorName", + "门磁": "Uksessensor", "自动闭锁": "Automaatne lukustamine", "锁声音": "Heli lukustamine", "防撬报警": "Häire Tamperi", @@ -185,7 +185,7 @@ "删除账号": "Kustuta konto", "个人信息": "Konto teave", "头像": "Avatar", - "昵称": "NikNameName", + "昵称": "NikName", "请输入昵称": "Palun sisesta oma hüüdnimi.", "修改昵称": "Nimeta ümber", "修改账号": "Redigeeri konto", @@ -503,8 +503,8 @@ "您的钥匙已冻结": "Sinu võti on külmutatud", "您的钥匙已过期": "Sinu võti aegus", "常开模式开启": "Lukk on läbisõidurežiimis", - "超级管理员": "Super adminName", - "授权管理员": "Lubatud adminName", + "超级管理员": "Super admin", + "授权管理员": "Lubatud admin", "普通用户": "Tavaline kasutaja", "余": "Saldos", "天": "Päev", @@ -558,7 +558,7 @@ "密码生成后，请在当日23：59前使用，否则过0点后失效。清空码用于清空今天0点之前生成的所有密码。": "Pärast parooli loomist palun kasutage seda enne 23:59 samal päeval, vastasel juhul on see kehtetu pärast kella 0. Selge koodi kasutatakse kõigi loodud paroolide tühjendamiseks täna enne kella 0.", "密码生成后，请在当日23：59前使用，否则过0点后失效。": "Pärast parooli loomist palun kasutage seda enne 23:59 samal päeval, vastasel juhul on see kehtetu pärast kella 0.", "清空密码底部提示": "Parool kehtib kuni 23:59 tühjendamise päeval", - "相机": "KaameraName", + "相机": "Kaamera", "相册": "Fotod", "读写": "Säilitamine", "定位": "Asukoht", @@ -582,7 +582,7 @@ "商城": "Kaubamaja", "我的": "Minu", "微信公众号推送": "Jutt avalik konto", - "蓝牙": "BluetoothName", + "蓝牙": "Bluetooth", "需要访问蓝牙权限才能使用添加钥匙功能的位置信息": "Juurdepääs Bluetooth-i õigustele on vaja, et kasutada asukoha lisamise funktsiooni asukoha teavet", "请输入Email": "Sisesta oma e- postil", "请输入手机号": "Sisesta oma telefoninumber", @@ -604,7 +604,7 @@ "家人": "Pereliigem", "保存": "Salvesta", "APP推送": "APP lükkamine", - "管理员": "AdministraatorName", + "管理员": "Administraator", "未启用": "Pole lubatud", "已启用": "Lubatud", "省电模式": "Energiasäästu režiim", @@ -613,7 +613,7 @@ "自定义模式": "Kohandatud režiim", "猫眼设置": "Kassilmade seadmine", "猫眼工作模式": "Kassilmade töörežiim", - "自动亮屏": "Automaatne erekraanName", + "自动亮屏": "Automaatne erekraan", "亮屏持续时间": "Ekraan õigel ajal", "逗留警告": "Hoiatus.", "异常警告": "Ebatavaline hoiatus.", @@ -745,7 +745,7 @@ "为了让您及时收到重要通知和更新，我们需要获取通知权限。请点击“确定”按钮，然后在设置页面中启用通知权限。": "Oluliste uuenduste saamiseks klõpsake \"OK\" ja lubage teated seaded.", "开启后，可通过长按锁上的设置键重新上电，用APP重新添加": "Pärast sisselülitamist saad uuesti sisse vajutada klahvi lukk ja lisada see uuesti APP abil", "已有": "Praegune", - "新增": "UusName", + "新增": "Uus", "账号格式错误": "Halb vormingus", "接收者信息为空": "Saaja teave on tühi", "请输入时间(秒)": "Palun sisesta kellaaeg (sek)", @@ -770,7 +770,7 @@ "转移成功": "Ülekandmine", "该已锁被删除": "Lukustatud on kustutatud", "授权管理员只能查看和管理自己下发的钥匙、密码等权限": "Volitatud admin saab hallata ainult salakoode,ekeys ja etccreated ise.", - "添加授权管理员": "Loo adminName", + "添加授权管理员": "Loo admin", "导出记录": "Eksporditeenused", "选择时间段": "Vali ajavahemik", "导出": "Eksport", @@ -834,7 +834,7 @@ "微信": "WeChat", "朋友圈": "Hetked", "QQ": "QQ", - "QQ空间": "QQZoneName", + "QQ空间": "QQZone", "微博": "WeiboComment", "FaceBook": "FaceBook", "链接": "Lingi", @@ -1078,7 +1078,7 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", - "印地语": "हिंदीName", + "印地语": "हिंदी", "乌尔都语": "اوردو", "亚美尼亚语": "Հայերեն", "格鲁吉亚语": "ქართული", diff --git a/lan/lan_fi.json b/lan/lan_fi.json index 46d37502..0172ecfd 100644 --- a/lan/lan_fi.json +++ b/lan/lan_fi.json @@ -185,7 +185,7 @@ "删除账号": "Poista tili", "个人信息": "Tilitiedot", "头像": "Avatar", - "昵称": "NickNameName", + "昵称": "NickName", "请输入昵称": "Anna nimitysi", "修改昵称": "Nimeä uudelleen", "修改账号": "Muokkaa tiliä", @@ -216,7 +216,7 @@ "添加网关": "Lisää porttiComment", "重新通电": "Yhdistä teho", "指示灯": "Indikaattori Valo", - "选择网关": "Valitse porttiName", + "选择网关": "Valitse portti", "不支持5G WiFi网络，请选择2.4G WiFi网络进行配置": "5G ei ole tuettu, valitse 2.4G:n WiFi.", "WiFi密码": "WiFi", "请输入WiFi密码": "Syötä WiFi- salasana.", @@ -232,7 +232,7 @@ "使用静态IP": "Käytä staattista IP", "请输入IP地址": "Anna IP- osoite", "请输入子网掩码": "Syötä aliverkkomaa", - "请输入默认网关": "Siirry oletusporttiName", + "请输入默认网关": "Siirry oletusportti", "所有锁": "Kaikki lukot", "搜索所有类型的锁": "Skannaa kaikenlaisia lukkoja", "门锁": "Ovilukko", @@ -582,7 +582,7 @@ "商城": "Ostoskeskus", "我的": "Minun", "微信公众号推送": "Keskustele julkinen tili", - "蓝牙": "BluetoothName", + "蓝牙": "Bluetooth", "需要访问蓝牙权限才能使用添加钥匙功能的位置信息": "Pääsy Bluetooth-oikeuksiin vaaditaan käyttämään sijaintitietoja lisätä avaintoiminnon lisäämiseksi", "请输入Email": "Anna sähköposti", "请输入手机号": "Anna puhelinnumero", @@ -834,7 +834,7 @@ "微信": "Wechat", "朋友圈": "Hetket", "QQ": "QQ", - "QQ空间": "QQZoneName", + "QQ空间": "QQZone", "微博": "Weibo", "FaceBook": "FaceBook", "链接": "Linkkiä", @@ -1078,7 +1078,7 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", - "印地语": "हिंदीName", + "印地语": "हिंदी", "乌尔都语": "اوردو", "亚美尼亚语": "Հայերեն", "格鲁吉亚语": "ქართული", diff --git a/lan/lan_fr.json b/lan/lan_fr.json index 4430ef1f..f592abf0 100644 --- a/lan/lan_fr.json +++ b/lan/lan_fr.json @@ -1078,7 +1078,7 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", - "印地语": "हिंदीName", + "印地语": "हिंदी", "乌尔都语": "اوردو", "亚美尼亚语": "Հայերեն", "格鲁吉亚语": "ქართული", diff --git a/lan/lan_he.json b/lan/lan_he.json index 230e3a86..7814f574 100644 --- a/lan/lan_he.json +++ b/lan/lan_he.json @@ -1078,7 +1078,7 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", - "印地语": "हिंदीName", + "印地语": "हिंदी", "乌尔都语": "اوردو", "亚美尼亚语": "Հայերեն", "格鲁吉亚语": "ქართული", diff --git a/lan/lan_hi.json b/lan/lan_hi.json index 766c91ef..27d5a63d 100644 --- a/lan/lan_hi.json +++ b/lan/lan_hi.json @@ -1080,7 +1080,7 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", - "印地语": "हिंदीName", + "印地语": "हिंदी", "乌尔都语": "اوردو", "亚美尼亚语": "Հայերեն", "格鲁吉亚语": "ქართული", @@ -1145,7 +1145,7 @@ "网关添加成功": "गेटवे सफलतापूर्वक जोड़ा गया", "呼叫目标": "कॉल लक्ष्य", "管理员APP": "व्यवस्थापक एप", - "可视门铃码": "Name", + "可视门铃码": "दृश्यमान दरवाजा घंटी कोड", "电子反锁": "इलेक्ट्रॉनिक विरोधी लॉक", "双重认证": "द्वि-कारक प्रमाणीकरण", "双锁联动": "द्वि पाश सहलग्नता", diff --git a/lan/lan_hk.json b/lan/lan_hk.json index 4e21afc2..d32e5045 100644 --- a/lan/lan_hk.json +++ b/lan/lan_hk.json @@ -1079,7 +1079,7 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", - "印地语": "हिंदीName", + "印地语": "हिंदी", "乌尔都语": "اوردو", "亚美尼亚语": "Հայերեն", "格鲁吉亚语": "ქართული", diff --git a/lan/lan_hr.json b/lan/lan_hr.json index 00dfc10c..d9e14471 100644 --- a/lan/lan_hr.json +++ b/lan/lan_hr.json @@ -185,7 +185,7 @@ "删除账号": "Obriši korisnički račun.", "个人信息": "Informacije o računu", "头像": "Avatar", - "昵称": "NickNameName", + "昵称": "NickName", "请输入昵称": "Molim, unesite svoj nadimak", "修改昵称": "Preimenuj", "修改账号": "Uredi korisnički račun.", @@ -316,7 +316,7 @@ "开门器": "Otvarač vrata", "面容开锁": "Otključa lice", "开门方向设置": "Smjer otvaranja", - "电机功率设置": "Postavljanje MotorPowerName", + "电机功率设置": "Postavljanje MotorPower", "开锁时是否需联网": "Ako je internet potreban prilikom otključavanja", "选择要加入分组的锁": "Odaberite zaključavanje za dodavanje ovoj grupi", "锁数量": "Broj zaključanje", @@ -703,7 +703,7 @@ "传输中": "U provozu", "发送人": "Izdaja", "发送时间": "Izdano vrijeme:", - "钥匙详情": "EKEY InfoName", + "钥匙详情": "EKEY Info", "姓名": "Ime", "发送": "Pošalji", "请确认姓名全名和身份证号码是否正确": "Potvrdite da su puno ime i identifikacijski broj ispravni.", @@ -834,9 +834,9 @@ "微信": "WeChat", "朋友圈": "Trenutaci", "QQ": "QQ", - "QQ空间": "QQZoneName", + "QQ空间": "QQZone", "微博": "Weibo", - "FaceBook": "FacebookName", + "FaceBook": "Facebook", "链接": "Vez", "今天": "Danas", "密码错误": "Nevažeća lozinka", @@ -1078,7 +1078,7 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", - "印地语": "हिंदीName", + "印地语": "हिंदी", "乌尔都语": "اوردو", "亚美尼亚语": "Հայերեն", "格鲁吉亚语": "ქართული", @@ -1103,8 +1103,8 @@ "Action name": "Ime akcije", "ScienerSmart": "ZnanstvenikSmart", "支持的语言": "Podržani jezici", - "英语": "EngleskiName", - "Google Home操作流程的值": "1. Koristite Smart lock APP za dodavanje brava i prolaza\n\n2. Omogućite daljinsku funkciju otključavanja brave u APP (ova funkcija je zadano isključena). Bez ove opcije, brava ne podržava Google HomeName\n\n3. Instalirajte Google Home APP i kliknite \" \" gumb u gornjem lijevom kutu\n\n4. Na stranici podešavanja odaberite \"Radi s Googleom\"\n\n5. Tražite \"ScienerSmart\" i upotrijebite pametni APP račun i lozinku za ovlašćenje", + "英语": "Engleski", + "Google Home操作流程的值": "1. Koristite Smart lock APP za dodavanje brava i prolaza\n\n2. Omogućite daljinsku funkciju otključavanja brave u APP (ova funkcija je zadano isključena). Bez ove opcije, brava ne podržava Google Home\n\n3. Instalirajte Google Home APP i kliknite \" \" gumb u gornjem lijevom kutu\n\n4. Na stranici podešavanja odaberite \"Radi s Googleom\"\n\n5. Tražite \"ScienerSmart\" i upotrijebite pametni APP račun i lozinku za ovlašćenje", "密码需至少包含数字/字母/字符中的2种组合": "Lozinka mora sadržavati najmanje 2 od sljedećih: brojeve, slova i posebne znakove", "已开锁": "Otključan", "已闭锁": "Zaključano", diff --git a/lan/lan_hu.json b/lan/lan_hu.json index 9d160938..20713f6c 100644 --- a/lan/lan_hu.json +++ b/lan/lan_hu.json @@ -1078,7 +1078,7 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", - "印地语": "हिंदीName", + "印地语": "हिंदी", "乌尔都语": "اوردو", "亚美尼亚语": "Հայերեն", "格鲁吉亚语": "ქართული", diff --git a/lan/lan_hy.json b/lan/lan_hy.json index e64c57d8..d84ffba5 100644 --- a/lan/lan_hy.json +++ b/lan/lan_hy.json @@ -1080,7 +1080,7 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Սուոմի", "丹麦语": "Դանսկ", - "印地语": "हिंदीName", + "印地语": "हिंदी", "乌尔都语": "اوردو", "亚美尼亚语": "Հայերեն", "格鲁吉亚语": "ქართული", diff --git a/lan/lan_id.json b/lan/lan_id.json index 8ce5e598..ff57185f 100644 --- a/lan/lan_id.json +++ b/lan/lan_id.json @@ -1078,7 +1078,7 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", - "印地语": "हिंदीName", + "印地语": "हिंदी", "乌尔都语": "اوردو", "亚美尼亚语": "Հայերեն", "格鲁吉亚语": "ქართული", diff --git a/lan/lan_it.json b/lan/lan_it.json index 3662ffaa..952f2314 100644 --- a/lan/lan_it.json +++ b/lan/lan_it.json @@ -1078,7 +1078,7 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", - "印地语": "हिंदीName", + "印地语": "हिंदी", "乌尔都语": "اوردو", "亚美尼亚语": "Հայերեն", "格鲁吉亚语": "ქართული", diff --git a/lan/lan_ja.json b/lan/lan_ja.json index 9499d560..4fea4fe7 100644 --- a/lan/lan_ja.json +++ b/lan/lan_ja.json @@ -1078,7 +1078,7 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", - "印地语": "हिंदीName", + "印地语": "हिंदी", "乌尔都语": "اوردو", "亚美尼亚语": "Հայերեն", "格鲁吉亚语": "ქართული", diff --git a/lan/lan_ka.json b/lan/lan_ka.json index e370fea9..8ba96e84 100644 --- a/lan/lan_ka.json +++ b/lan/lan_ka.json @@ -187,7 +187,7 @@ "删除账号": "ანგარიშის წაშლა", "个人信息": "ანგარიშის ინფორმაცია", "头像": "ავატარი", - "昵称": "ნიკName", + "昵称": "ნიკ", "请输入昵称": "გთხოვთ შეიყვანოთ თქვენი მეტსახელი", "修改昵称": "გადარქმევა", "修改账号": "ანგარიშის რედაქტირება", @@ -1080,7 +1080,7 @@ "印度尼西亚语": "ბაჰასა ინდონეზია", "芬兰语": "სუომი", "丹麦语": "დანსკი", - "印地语": "हिंदीName", + "印地语": "हिंदी", "乌尔都语": "اوردو", "亚美尼亚语": "Հայերեն", "格鲁吉亚语": "ქართული", diff --git a/lan/lan_kk.json b/lan/lan_kk.json index 3b4f69ed..cd0bcd7e 100644 --- a/lan/lan_kk.json +++ b/lan/lan_kk.json @@ -31,8 +31,8 @@ "简写周三": "WW", "简写周四": "T", "简写周五": "F", - "简写周六": "SName", - "简写周日": "SName", + "简写周六": "S", + "简写周日": "S", "周一": "MonComment", "周二": "Туе", "周三": "Жеті", @@ -116,7 +116,7 @@ "微信二维码": "QR кодін ашу", "拥有电子钥匙的人，通过微信扫一扫这个二维码，即可开门。每把锁的二维码都不相同，你可以将其打印出来贴在对应的锁旁边": "Электронлық кілттер бар адамдар осы QR коды \"WeChat\" дегенді сіздеп, шұқсаты ашылады. Әрбір блоктың QR коды басқа. Оны баспаға сәйкесті блоктың жағысын орналаса аласыз.", "锁编号": "Боқталсын", - "电量": "БатареяName", + "电量": "Батарея", "锁分组": "Топты бұғаттау", "选择分组": "Топты таңдау", "创建新分组": "Топты құру", @@ -279,7 +279,7 @@ "发卡工具": "КодтамасыComment", "购买高级功能须知": "Хабарламасы", "购买高级功能提示": "Қосымша мүмкіндіктер құрылғыда, егер керек болса, бұғаттардың санын ашу үшін көмектесіңіз. Қосымша мүмкіндіктері ғана өзіңізді бұғаттарыңыз. Егер әкімгілікті әкімші болса, қызметті ашу үшін блоктау жоғарғы әкімшісін қатынасыз", - "免费体验": "Бос сынауName", + "免费体验": "Бос сынау", "立即开通": "Қазір ашу", "购买短信": "SMS сақтау", "购买邮件": "Эл. поштаны сақтау", @@ -301,8 +301,8 @@ "对于选中的这些锁，当用户用APP开锁时，他的手机需要是连网的，否则无法开锁": "Таңдалған блоктарды APP-мен ашу үшін пайдаланушының телефонын онлайн болу керек.", "配置WiFi": "WiFi баптау", "请输入WiFi名字": "Wifi атын келтіріңіз", - "WiFi配网": "WiFi тарату желіName", - "胁迫卡": "Стрес картасыName", + "WiFi配网": "WiFi тарату желі", + "胁迫卡": "Стрес картасы", "员工是否有密码": "Бастапқы кодтары", "员工是否有卡": "Карта бар ғой", "员工是否有指纹": "Бақылау тізімін орнату", @@ -327,7 +327,7 @@ "防误开已关闭,关门后仍可使用面容开锁": "Ашылмағанды жабылсын", "添加和使用面容开锁时": "Жүктеу кезінде тағы қосу мен қолданылсын", "添加和使用面容开锁时提示": "\n1, бір адам қашықтығы операцияның алдында ұстап көріңіз.\n2, қазірішін бұғаттардың алдында 0,5 ~ 0,8 мсят, әзірін бұғаттарды келтіріңіз.\n3. Өшіріңізді бейімде болсап, өзіңізді таңдаңыз.\n4. Көйін анықтауы дұрыс емес болса, цифриқ пернетінің перне енгізінді қолмен қайта қосу үшін перне іске қоса аласыз.", - "秒": "SName", + "秒": "S", "请根据门锁实际情况，请谨慎选择电机功率：": "Мотодор қуаттандық қадамдастыру үшін таңдаңыз:", "小功率：": "Миноват:", "耗电少": "Қуаттандықтан кейі", @@ -351,7 +351,7 @@ "员工信息": "Жергілікті мәліметі", "员工": "Таңдау", "打卡方式无效": "Қол жеткізбеді", - "中国": "КітаName", + "中国": "Кіта", "选择钥匙": "Eky таңдау", "编辑": "Өңдеу", "无": "Жоқ", @@ -531,7 +531,7 @@ "公司名称不能小于6个字符": "Компанияның атауы 6 таңба болмайды", "WIFI列表": "WIFI тізімі", "刷新": "Жаңарту", - "手动配网": "Қолмен үлестірім желіName", + "手动配网": "Қолмен үлестірім желі", "远距离": "Үл қашықтығы", "中距离": "Орташа қашықтығы", "近距离": "Қысқа қашықтығы", @@ -548,7 +548,7 @@ "管理员密码": "Әдетті өшіру", "如需修改，请输入新的管理员密码(6位)，点击确定即可修改": "Егер өзгерту керек болса, жаңа әкімшіші", "修改": "Өзгерту", - "网络摄像头": "КамераName", + "网络摄像头": "Камера", "重命名": "Атын ауыстыру", "分组下的锁将被移到未分组里": "Топтың төменгі блокталар тобысмен жылжытады", "编辑成功": "Сәтті өңдеу", @@ -574,7 +574,7 @@ "请手动在系统设置中开启": "Жүйелік параметрлерде қолмен іске қосыңыз", "权限以继续使用应用": "Қолданбаны жалғастыру рұқсат ету.", "去设置": "Оны орнату", - "当前网络": "Назардағы желіName", + "当前网络": "Назардағы желі", "位置信息": "Орналасуы ақпарат", "请输入wifi名称": "Wifi атауын келтіріңіз", "虹膜": "Iris", @@ -601,7 +601,7 @@ "提醒方式": "Ескерту жолы", "开门方式": "Қашықты ашылсын", "请选择": "Таңдау", - "家人": "Үлгі мүшесіName", + "家人": "Үлгі мүшесі", "保存": "Сақтау", "APP推送": "APP басы", "管理员": "Adminu", @@ -639,13 +639,13 @@ "全部视频": "Барлық видеолар", "已为本设备免费提供3大滚动视频储存服务": "Құрылғының шкі видео сақтау қызметі орындалды", "视频播放": "Видео ойнау", - "全选": "БарлықтыName", + "全选": "Барлықты", "请选择要删除的视频": "Өшіру келетін видеоін таңдаңыз", "请选择要下载的视频": "Жүктеу үшін осы видеоты таңдаңыз", "欢迎使用": "Қолданға қоша", "用户协议和隐私政策概要": "Пайдаланушы келесі мен бақылау ережесінің ақпарат", "协议概要": "Протоколды тобысы", - "感谢您使用本应用。我们非常重视您的个人信息和隐私保护，在使用本产品之前，请认真阅读": "Бұл қолданба қолданбасы үшін рахмет. Біздің жеке мәліметіңізді әдеттіңізге және жеке ақпараттық қорғастырыңызды. Осы продуктты қолдану алдында, оны ескертін оқыңызName", + "感谢您使用本应用。我们非常重视您的个人信息和隐私保护，在使用本产品之前，请认真阅读": "Бұл қолданба қолданбасы үшін рахмет. Біздің жеке мәліметіңізді әдеттіңізге және жеке ақпараттық қорғастырыңызды. Осы продуктты қолдану алдында, оны ескертін оқыңыз", "《用户协议》": "Пайдаланушы ақпараты", "和": "Сот", "《隐私政策》": "חPrivacy ережес", @@ -805,7 +805,7 @@ "蓝牙未打开，请到设置里面打开蓝牙": "Bluetooth енгізілмеген, Bluetooth баптауларын көрсетіңіз", "删除用户时，会将用户拥有的钥匙一起删除。": "Пайдаланушының келтірілген, егер Пайдаланушыға сәйкес келеді.", "配置网络": "Желі & баптау", - "你好": "ЖарыName", + "你好": "Жары", "成功": "Сәттін", "类型选择": "Таңдау", "请选择要使用哪种类型": "Қолданатын түрін таңдаңыз", @@ -834,8 +834,8 @@ "微信": "WeChat", "朋友圈": "Текшер", "QQ": "QQ", - "QQ空间": "QQZoneName", - "微博": "WeiboName", + "QQ空间": "QQZone", + "微博": "Weibo", "FaceBook": "FaceBook", "链接": "Сілтеме", "今天": "Бүгіз", @@ -1078,7 +1078,7 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", - "印地语": "हिंदीName", + "印地语": "हिंदी", "乌尔都语": "اوردو", "亚美尼亚语": "Հայերեն", "格鲁吉亚语": "ქართული", diff --git a/lan/lan_ko.json b/lan/lan_ko.json index 46580f02..9152fd09 100644 --- a/lan/lan_ko.json +++ b/lan/lan_ko.json @@ -1078,7 +1078,7 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", - "印地语": "हिंदीName", + "印地语": "हिंदी", "乌尔都语": "اوردو", "亚美尼亚语": "Հայերեն", "格鲁吉亚语": "ქართული", diff --git a/lan/lan_lt.json b/lan/lan_lt.json index bffeb650..399b4ac7 100644 --- a/lan/lan_lt.json +++ b/lan/lan_lt.json @@ -1078,7 +1078,7 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", - "印地语": "हिंदीName", + "印地语": "हिंदी", "乌尔都语": "اوردو", "亚美尼亚语": "Հայերեն", "格鲁吉亚语": "ქართული", diff --git a/lan/lan_ms.json b/lan/lan_ms.json index 62f5aa32..13240f71 100644 --- a/lan/lan_ms.json +++ b/lan/lan_ms.json @@ -1078,7 +1078,7 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", - "印地语": "हिंदीName", + "印地语": "हिंदी", "乌尔都语": "اوردو", "亚美尼亚语": "Հայերեն", "格鲁吉亚语": "ქართული", diff --git a/lan/lan_nl.json b/lan/lan_nl.json index 42d0e892..dc59ec9a 100644 --- a/lan/lan_nl.json +++ b/lan/lan_nl.json @@ -1078,7 +1078,7 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", - "印地语": "हिंदीName", + "印地语": "हिंदी", "乌尔都语": "اوردو", "亚美尼亚语": "Հայերեն", "格鲁吉亚语": "ქართული", diff --git a/lan/lan_pl.json b/lan/lan_pl.json index 1748be43..22d90ca8 100644 --- a/lan/lan_pl.json +++ b/lan/lan_pl.json @@ -1078,7 +1078,7 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", - "印地语": "हिंदीName", + "印地语": "हिंदी", "乌尔都语": "اوردو", "亚美尼亚语": "Հայերեն", "格鲁吉亚语": "ქართული", diff --git a/lan/lan_pt.json b/lan/lan_pt.json index 7e2cc1b8..b5481eca 100644 --- a/lan/lan_pt.json +++ b/lan/lan_pt.json @@ -1078,7 +1078,7 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", - "印地语": "हिंदीName", + "印地语": "हिंदी", "乌尔都语": "اوردو", "亚美尼亚语": "Հայերեն", "格鲁吉亚语": "ქართული", diff --git a/lan/lan_ro.json b/lan/lan_ro.json index 578b4c07..48dcde43 100644 --- a/lan/lan_ro.json +++ b/lan/lan_ro.json @@ -104,7 +104,7 @@ "门磁": "Senzor uși", "自动闭锁": "Blocare automată", "锁声音": "Blochează sunetul.", - "防撬报警": "Alertă TamperName", + "防撬报警": "Alertă Tamper", "重置键": "Butonul resitează", "锁时间": "Blochează ceasul", "诊断": "Diagnostică", @@ -185,7 +185,7 @@ "删除账号": "Șterge cont", "个人信息": "Informații cont", "头像": "Avatar", - "昵称": "NickNameName", + "昵称": "NickName", "请输入昵称": "Introduceți porecla dumneavoastră", "修改昵称": "Redenumește:", "修改账号": "Editează cont", @@ -210,7 +210,7 @@ "WiFi名称": "Nume WiFi", "网络MAC": "Rețea MAC", "网关升级": "Actualizare GatewayComment", - "网关连接的锁": "Blocare (blocare) conectat la această GatewayName", + "网关连接的锁": "Blocare (blocare) conectat la această Gateway", "信号强": "Puternică", "选择网关类型": "Alegeți tipul de port", "添加网关": "Adaugă poartă", @@ -316,7 +316,7 @@ "开门器": "Deschizător de uși", "面容开锁": "Fața deblochează", "开门方向设置": "Set de direcție de deschidere", - "电机功率设置": "Setare MotorPowerName", + "电机功率设置": "Setare MotorPower", "开锁时是否需联网": "Dacă Internetul este necesar la deblocarea", "选择要加入分组的锁": "Selectați blocarea S pentru a adăuga la acest grupă", "锁数量": "Blochează numărător", @@ -593,7 +593,7 @@ "开门通知": "Notificare de deschidere.", "N天未开门": "N zile fără deschiderea ușii", "门未关好": "Uşa nu e închisă.", - "防拆报警": "Alarmă TamperName", + "防拆报警": "Alarmă Tamper", "低电量提醒": "Baterie scăzută", "胁迫开门": "Deschiderea ușilor forțate", "有人按门铃": "Cineva sună la uşă.", @@ -633,12 +633,12 @@ "云存": "Stocarea norilor", "本地": "Această localitate:", "3天滚动储存": "3 zile de păstrare rulare", - "去升级": "Actualizare acumName", + "去升级": "Actualizare acum", "下载列表": "Lista descărcării", "已下载": "Descărcat", "全部视频": "Toate videoclipurile", "已为本设备免费提供3大滚动视频储存服务": "Pentru acest dispozitiv au fost furnizate trei servicii de stocare video de derulare gratuite", - "视频播放": "Redare videoName", + "视频播放": "Redare video", "全选": "Toate.", "请选择要删除的视频": "Alegeți videoclipul pe care doriți să o ștergeți.", "请选择要下载的视频": "Vă rugăm să selectați videoclipul pe care doriți să le descărcați", @@ -691,7 +691,7 @@ "请输入身份证号和真实姓名": "Introduceți numărul și numele real.", "点击返回设备配对": "Atinge înapoi la împerecherea dispozitivului", "无法连接？尝试升级": "Nu se poate conecta?", - "固件升级提示": "Prompt de upgrade FirmwareName", + "固件升级提示": "Prompt de upgrade Firmware", "请先获取固件文件到手机本地，再选择升级": "Vă rugăm să obțineți fișierul firmware la telefonul local întâi, și apoi selectați Upgrade.", "固件升级中": "Firware-ul este în actualizare", "取消升级": "Anulează actualizarea", @@ -710,7 +710,7 @@ "传输期间请勿离开当前页面": "Nu părăsi pagina curentă în timpul transferului", "机型": "Modele", "硬件版本": "Versiune hardware", - "固件版本": "Versiunea FirmwareName", + "固件版本": "Versiunea Firmware", "手动升级": "Upgrade manuală", "设备连接中...": "Conectare dispozitivă...", "未避免异常情况，请在门打开时升级": "Excepţii inevitabile, vă rugăm să upgradezi când uşa este deschisă.", @@ -834,7 +834,7 @@ "微信": "WeChat", "朋友圈": "Momente", "QQ": "QQ", - "QQ空间": "QQZoneName", + "QQ空间": "QQZone", "微博": "Weibo.", "FaceBook": "FacebookComment", "链接": "Legătură", @@ -1078,7 +1078,7 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", - "印地语": "हिंदीName", + "印地语": "हिंदी", "乌尔都语": "اوردو", "亚美尼亚语": "Հայերեն", "格鲁吉亚语": "ქართული", @@ -1099,7 +1099,7 @@ "支持的国家值": "Statele Unite ale Americii, Canada, Marea Britanie, Australia, India, Germania, Franța, Italia, Spania, Japonia", "操作流程": "Procesul operațional", "操作流程值": "1 Adăugați o blocare și o poartă cu Smart blocare APP\n\n2 Activați funcția de deblocare la distanță a încuietorii din APP (acesta funcție este oprită implicit). Dacă nu aveți această opțiune, blocarea nu suportă Alexa\n\n3 Adăugați abilități pentru Alexa și autorizați-le cu Smart blocare contul și parola APP. După ce autorizaţia va avea succes, puteţi descoperi dispozitivele sub cont\n\n4 Localizaţi blocarea în aplicaţia Alexa, activaţi funcţia de deblocare vocală, şi setaţi parola limbii\n\n5 Încuietoarea poate fi operată prin Alexa", - "Google Home": "Acasă GoogleName", + "Google Home": "Acasă Google", "Action name": "Nume acțiune", "ScienerSmart": "ScienerSmart", "支持的语言": "Limbi suportate", diff --git a/lan/lan_ru.json b/lan/lan_ru.json index ed10bb80..779e0d2d 100644 --- a/lan/lan_ru.json +++ b/lan/lan_ru.json @@ -1078,7 +1078,7 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", - "印地语": "हिंदीName", + "印地语": "हिंदी", "乌尔都语": "اوردو", "亚美尼亚语": "Հայերեն", "格鲁吉亚语": "ქართული", diff --git a/lan/lan_sk.json b/lan/lan_sk.json index 1334958f..0092a539 100644 --- a/lan/lan_sk.json +++ b/lan/lan_sk.json @@ -1078,7 +1078,7 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", - "印地语": "हिंदीName", + "印地语": "हिंदी", "乌尔都语": "اوردو", "亚美尼亚语": "Հայերեն", "格鲁吉亚语": "ქართული", diff --git a/lan/lan_sr_cyrl.json b/lan/lan_sr_cyrl.json index 21305eb3..87bdfadc 100644 --- a/lan/lan_sr_cyrl.json +++ b/lan/lan_sr_cyrl.json @@ -1078,7 +1078,7 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", - "印地语": "हिंदीName", + "印地语": "हिंदी", "乌尔都语": "اوردو", "亚美尼亚语": "Հայերեն", "格鲁吉亚语": "ქართული", diff --git a/lan/lan_sv.json b/lan/lan_sv.json index a6274e34..b77c58ba 100644 --- a/lan/lan_sv.json +++ b/lan/lan_sv.json @@ -116,7 +116,7 @@ "微信二维码": "Lås upp QR- koden", "拥有电子钥匙的人，通过微信扫一扫这个二维码，即可开门。每把锁的二维码都不相同，你可以将其打印出来贴在对应的锁旁边": "Personer med elektroniska nycklar kan öppna dörren genom att skanna denna QR-kod genom WeChat. QR-koden för varje lås är olika. Du kan skriva ut den och klistra in den bredvid motsvarande lås", "锁编号": "Låsnummer", - "电量": "BatteriName", + "电量": "Batteri", "锁分组": "Lås grupp", "选择分组": "Välj grupp", "创建新分组": "Skapa en grupp", @@ -146,8 +146,8 @@ "上传": "Uppladdning", "本操作将上传锁内数据到服务器，过程可能需要几分钟，请耐心等待": "Ladda upp data från lås till server.Det kan ta flera minuter.", "请选择要从哪把锁导入": "Välj ett lås att importera från", - "有新版本": "Har ny versionName", - "当前版本": "Nuvarande versionName", + "有新版本": "Har ny version", + "当前版本": "Nuvarande version", "升级": "Uppdatera", "空闲": "Lediga", "已入住": "Upptagen", @@ -185,7 +185,7 @@ "删除账号": "Ta bort konto", "个人信息": "Kontoinformation", "头像": "Avatar", - "昵称": "NickNameName", + "昵称": "NickName", "请输入昵称": "Ange ditt smeknamn", "修改昵称": "Byt namn", "修改账号": "Redigera konto", @@ -316,7 +316,7 @@ "开门器": "Dörröppnare", "面容开锁": "Ansiktet upplåsas", "开门方向设置": "Öppningsriktning", - "电机功率设置": "Inställning av motorpowerName", + "电机功率设置": "Inställning av motorpower", "开锁时是否需联网": "Om Internet krävs vid upplåsning", "选择要加入分组的锁": "Välj Lås för att lägga till i gruppen.", "锁数量": "Lås antal", @@ -450,7 +450,7 @@ "是否发送电子钥匙给未注册账号": "Vill du skicka en ekey till ett nytt konto", "取消": "Avbryt", "标记成功": "Markera framgångsrikt", - "微信好友": "WeChat- vännerName", + "微信好友": "WeChat- vänner", "短信": "SMS", "邮件": "E- post@ info: whatsthis", "更多": "Flere", @@ -703,7 +703,7 @@ "传输中": "Under transitering", "发送人": "Utfärdat av:", "发送时间": "Utfärdad tid", - "钥匙详情": "EKEY- infoName", + "钥匙详情": "EKEY- info", "姓名": "Namn", "发送": "Skicka", "请确认姓名全名和身份证号码是否正确": "Bekräfta att fullständigt namn och ID-nummer är korrekt.", @@ -834,8 +834,8 @@ "微信": "Wechat", "朋友圈": "Momentar", "QQ": "QQ", - "QQ空间": "QQZoneName", - "微博": "WeiboName", + "QQ空间": "QQZone", + "微博": "Weibo", "FaceBook": "Facebok", "链接": "Länk", "今天": "Idag", @@ -1078,7 +1078,7 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", - "印地语": "हिंदीName", + "印地语": "हिंदी", "乌尔都语": "اوردو", "亚美尼亚语": "Հայերեն", "格鲁吉亚语": "ქართული", @@ -1099,7 +1099,7 @@ "支持的国家值": "USA, Kanada, Storbritannien, Australien, Indien, Tyskland, Frankrike, Italien, Spanien, Japan.", "操作流程": "Driftsprocess", "操作流程值": "1 Lägg till ett lås och gateway med Smart Lås APP\n\n2 Aktivera fjärrlåsningsfunktionen för låset i APP (denna funktion är avstängd som standard). Om du inte har det här alternativet stöder inte låset Alexa\n\n3 Lägg till färdigheter till Alexa och godkänna dem med Smart lås APP konto och lösenord. När auktorisationen är framgångsrik kan du upptäcka enheter under kontot\n\n4 Hitta låset i Alexa-appen, slå på röst upplåsningsfunktionen och ställa in språklösenordet.\n\n5 Låset kan manövreras genom Alexa", - "Google Home": "Google HomeName", + "Google Home": "Google Home", "Action name": "Åtgärdsnamn", "ScienerSmart": "ScienerSmart", "支持的语言": "Stödda språk", diff --git a/lan/lan_th.json b/lan/lan_th.json index 24617315..c31dc51f 100644 --- a/lan/lan_th.json +++ b/lan/lan_th.json @@ -1078,7 +1078,7 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", - "印地语": "हिंदीName", + "印地语": "हिंदी", "乌尔都语": "اوردو", "亚美尼亚语": "Հայերեն", "格鲁吉亚语": "ქართული", diff --git a/lan/lan_tr.json b/lan/lan_tr.json index e0a6f17a..d9ff0398 100644 --- a/lan/lan_tr.json +++ b/lan/lan_tr.json @@ -1078,7 +1078,7 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", - "印地语": "हिंदीName", + "印地语": "हिंदी", "乌尔都语": "اوردو", "亚美尼亚语": "Հայերեն", "格鲁吉亚语": "ქართული", diff --git a/lan/lan_tw.json b/lan/lan_tw.json index 90d9e0f3..eb1e5814 100644 --- a/lan/lan_tw.json +++ b/lan/lan_tw.json @@ -1078,7 +1078,7 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", - "印地语": "हिंदीName", + "印地语": "हिंदी", "乌尔都语": "اوردو", "亚美尼亚语": "Հայերեն", "格鲁吉亚语": "ქართული", diff --git a/lan/lan_uk.json b/lan/lan_uk.json index bacfed39..f4d5b602 100644 --- a/lan/lan_uk.json +++ b/lan/lan_uk.json @@ -1078,7 +1078,7 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", - "印地语": "हिंदीName", + "印地语": "हिंदी", "乌尔都语": "اوردو", "亚美尼亚语": "Հայերեն", "格鲁吉亚语": "ქართული", diff --git a/lan/lan_ur.json b/lan/lan_ur.json index bd08e555..f2e55d80 100644 --- a/lan/lan_ur.json +++ b/lan/lan_ur.json @@ -1080,7 +1080,7 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", - "印地语": "हिंदीName", + "印地语": "हिंदी", "乌尔都语": "اوردو", "亚美尼亚语": "Հայերեն", "格鲁吉亚语": "ქართული", diff --git a/lan/lan_vi.json b/lan/lan_vi.json index 1270fc98..8e12c59f 100644 --- a/lan/lan_vi.json +++ b/lan/lan_vi.json @@ -1078,7 +1078,7 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", - "印地语": "हिंदीName", + "印地语": "हिंदी", "乌尔都语": "اوردو", "亚美尼亚语": "Հայերեն", "格鲁吉亚语": "ქართული", diff --git a/lan/lan_zh.json b/lan/lan_zh.json index c1b24478..86ddf95b 100755 --- a/lan/lan_zh.json +++ b/lan/lan_zh.json @@ -1083,7 +1083,7 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", - "印地语": "हिंदीName", + "印地语": "हिंदी", "乌尔都语": "اوردو", "亚美尼亚语": "Հայերեն", "格鲁吉亚语": "ქართული", From 93ce93bdd4a0b6df6b41d72d1f1f7cdcf8bfc569 Mon Sep 17 00:00:00 2001 From: liyi Date: Mon, 4 Aug 2025 15:23:58 +0800 Subject: [PATCH 04/15] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E8=BF=9B=E5=85=A5?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=90=8E=E8=BF=98=E6=9C=89loading=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/main/lockDetail/lockSet/lockSet/lockSet_logic.dart | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/main/lockDetail/lockSet/lockSet/lockSet_logic.dart b/lib/main/lockDetail/lockSet/lockSet/lockSet_logic.dart index ca5d7a9d..7178e4d5 100755 --- a/lib/main/lockDetail/lockSet/lockSet/lockSet_logic.dart +++ b/lib/main/lockDetail/lockSet/lockSet/lockSet_logic.dart @@ -442,10 +442,13 @@ class LockSetLogic extends BaseGetXController { } // 获取锁设置信息 - Future getLockSettingInfoData() async { + Future getLockSettingInfoData({ + bool isUnShowLoading = false, + }) async { final LockSetInfoEntity entity = await ApiRepository.to.getLockSettingInfoData( lockId: state.lockId.toString(), + isUnShowLoading: isUnShowLoading, ); if (entity.errorCode!.codeIsSuccessful) { state.lockSetInfoData.value = entity.data!; @@ -718,7 +721,7 @@ class LockSetLogic extends BaseGetXController { records: records, isUnShowLoading: true); if (entity.errorCode!.codeIsSuccessful) { - await getLockSettingInfoData(); + await getLockSettingInfoData(isUnShowLoading: true); update(); } } From aec0bc2b1846a637cd3d42b0dc034ec66cb14948 Mon Sep 17 00:00:00 2001 From: liyi Date: Mon, 4 Aug 2025 15:24:20 +0800 Subject: [PATCH 05/15] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E9=A6=96=E6=AC=A1?= =?UTF-8?q?=E5=8F=91=E8=93=9D=E7=89=99=E7=AB=AF=E5=8F=A3=E5=90=8E=E7=9B=B4?= =?UTF-8?q?=E6=8E=A5=E9=87=8D=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lock_voice_setting_logic.dart | 33 ++----------------- 1 file changed, 3 insertions(+), 30 deletions(-) diff --git a/lib/mine/addLock/lock_voice_setting/lock_voice_setting_logic.dart b/lib/mine/addLock/lock_voice_setting/lock_voice_setting_logic.dart index fde8ba46..17019e57 100644 --- a/lib/mine/addLock/lock_voice_setting/lock_voice_setting_logic.dart +++ b/lib/mine/addLock/lock_voice_setting/lock_voice_setting_logic.dart @@ -167,11 +167,9 @@ class LockVoiceSettingLogic extends BaseGetXController { BluetoothConnectionState.disconnected) { dismissEasyLoading(); cancelBlueConnetctToastTimer(); - // 延迟1秒后重试（避免频繁请求） - Future.delayed(const Duration(seconds: 2), () { - // 递归调用自身，重试次数+1 - sendFileToDevice(data, token); - }); + + // 断开后重发一下 + sendFileToDevice(data, token); // showBlueConnetctToast(); } @@ -294,31 +292,6 @@ class LockVoiceSettingLogic extends BaseGetXController { } } - // 发送获取型号蓝牙命令 - sendGetDeviceModelBleMessage() { - showEasyLoading(); - showBlueConnetctToastTimer(action: () { - dismissEasyLoading(); - }); - BlueManage().blueSendData( - BlueManage().connectDeviceName, - (BluetoothConnectionState deviceConnectionState) async { - if (deviceConnectionState == BluetoothConnectionState.connected) { - BlueManage().writeCharacteristicWithResponse( - GetDeviceModelCommand( - lockID: BlueManage().connectDeviceName, - ).packageData(), - ); - } else if (deviceConnectionState == - BluetoothConnectionState.disconnected) { - dismissEasyLoading(); - cancelBlueConnetctToastTimer(); - showBlueConnetctToast(); - } - }, - ); - } - void _startSendLanguageFile() { if (state.data == null) return; state.voiceSubcontractingIndex = 0; From 5de4d4de5743050fdfcbb52b18b2a10c68f924de Mon Sep 17 00:00:00 2001 From: liyi Date: Mon, 4 Aug 2025 15:24:40 +0800 Subject: [PATCH 06/15] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E6=98=B5=E7=A7=B0=E4=B8=AD=E7=9A=84id=E4=B8=BA=E5=BD=95?= =?UTF-8?q?=E5=85=A5=E6=97=B6=E7=9A=84=E8=AE=B0=E5=BD=95=E5=A7=93=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../doorLockLog/doorLockLog_page.dart | 66 ++++++++++++++++++- 1 file changed, 65 insertions(+), 1 deletion(-) diff --git a/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart b/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart index 51b74482..e84e8cba 100755 --- a/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart +++ b/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart @@ -1,7 +1,9 @@ +import 'package:flustars/flustars.dart'; import 'package:flutter/material.dart'; import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; +import 'package:intl/intl.dart'; import 'package:star_lock/appRouters.dart'; import 'package:star_lock/main/lockDetail/doorLockLog/doorLockLog_entity.dart'; import 'package:star_lock/main/lockDetail/doorLockLog/doorLockLog_logic.dart'; @@ -295,6 +297,68 @@ class _DoorLockLogPageState extends State with RouteAware { ); } + String formatTimestampToHHmm(int timestampMs) { + // 1. 将毫秒时间戳转换为秒（DateTime 需要秒级时间戳） + int timestampSec = timestampMs ~/ 1000; + + // 2. 创建 DateTime 对象 + DateTime dateTime = DateTime.fromMillisecondsSinceEpoch(timestampMs); + + // 3. 使用 DateFormat 格式化为 "HH:mm" + DateFormat formatter = DateFormat('HH:mm'); + return formatter.format(dateTime); + } + + String _buildIDByType(DoorLockLogDataItem item) { + final recordType = item.recordType; + switch (recordType) { + case 10: + return '${formatTimestampToHHmm(item.operateDate!)} ' + + '指纹'.tr + + '开锁'.tr + + '（ID：${item.username}）'; + case 20: + return '${formatTimestampToHHmm(item.operateDate!)} ' + + '密码'.tr + + '开锁'.tr + + '（ID：${item.username}）'; + case 30: + return '${formatTimestampToHHmm(item.operateDate!)} ' + + '卡片'.tr + + '开锁'.tr + + '（ID：${item.username}）'; + case 40: + return item.recordStr ?? ''; + case 50: + return '${formatTimestampToHHmm(item.operateDate!)} ' + + '组合模式'.tr + + '开锁'.tr + + '（ID：${item.username}）'; + case 160: + return '${formatTimestampToHHmm(item.operateDate!)} ' + + '人脸'.tr + + '开锁'.tr + + '（ID：${item.username}）'; + case 190: + return '${formatTimestampToHHmm(item.operateDate!)} ' + + '胁迫指纹'.tr + + '开锁'.tr + + '（ID：${item.username}）'; + case 200: + return '${formatTimestampToHHmm(item.operateDate!)} ' + + '胁迫密码'.tr + + '开锁'.tr + + '（ID：${item.username}）'; + case 210: + return '${formatTimestampToHHmm(item.operateDate!)} ' + + '胁迫卡片'.tr + + '开锁'.tr + + '（ID：${item.username}）'; + default: + return item.recordStr ?? ''; + } + } + TimelineTileBuilder _timelineBuilderWidget() { return TimelineTileBuilder.fromStyle( contentsAlign: ContentsAlign.basic, @@ -315,7 +379,7 @@ class _DoorLockLogPageState extends State with RouteAware { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - timelineData.recordStr ?? '', + _buildIDByType(timelineData), textAlign: TextAlign.left, style: TextStyle( color: Colors.black, From 295ce15fc4c6fa6b32e88f852f09f3c3ed193716 Mon Sep 17 00:00:00 2001 From: liyi Date: Mon, 4 Aug 2025 15:25:00 +0800 Subject: [PATCH 07/15] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0128bit=E7=9A=84?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E4=BD=8D=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/blue/blue_manage.dart | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/lib/blue/blue_manage.dart b/lib/blue/blue_manage.dart index 29ea09f3..128cbaee 100755 --- a/lib/blue/blue_manage.dart +++ b/lib/blue/blue_manage.dart @@ -362,6 +362,27 @@ class BlueManage { // 00=未配对，01=已配对 if (pairStatus == '00') { return true; // 未配对才返回true + } else { + // 将十六进制字符串转换为整数（0~255） + int statusValue = int.parse(pairStatus, radix: 16); + // 提取 byte0（配对状态：第1位） + int byte0 = (statusValue >> 0) & 0x01; // 取最低位 + + // 提取 byte1（事件状态：第2位） + int byte1 = (statusValue >> 1) & 0x01; // 取次低位 + + // 判断是否未配对 + bool isPaired = (byte0 == 1); + + // 判断是否有新事件 + bool hasNewEvent = (byte1 == 1); + + // 返回是否未配对（原逻辑） + if (isPaired) { + return true; // 已配对返回false + } else { + return false; // 未配对返回true + } } // 已配对（01）不返回true，继续判断下一个uuid } From 862b87d5d1725c0a25b0ccc3cde51a063f73a256 Mon Sep 17 00:00:00 2001 From: liyi Date: Mon, 4 Aug 2025 15:25:20 +0800 Subject: [PATCH 08/15] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E8=BF=9B=E5=85=A5?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=90=8E=E8=BF=98=E6=9C=89loading=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/network/api_provider.dart | 24 ++++++++++++++---------- lib/network/api_repository.dart | 7 +++++-- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/lib/network/api_provider.dart b/lib/network/api_provider.dart index 0325b302..af23be71 100755 --- a/lib/network/api_provider.dart +++ b/lib/network/api_provider.dart @@ -428,11 +428,17 @@ class ApiProvider extends BaseProvider { isUnShowLoading: isUnShowLoading); // 获取所有锁设置信息 - Future getLockSettingInfoData(String lockId) => post( - getLockSettingURL.toUrl, - jsonEncode({ - 'lockId': lockId, - })); + Future getLockSettingInfoData( + String lockId, { + bool isUnShowLoading = true, + }) => + post( + getLockSettingURL.toUrl, + jsonEncode({ + 'lockId': lockId, + }), + isUnShowLoading: isUnShowLoading, + ); // 获取所有锁设置信息 Future getLockSettingInfoDataIsNotLoadingIcon(String lockId) => @@ -2824,9 +2830,9 @@ class ApiProvider extends BaseProvider { /// 设置语音包 Future reportBuyRequest( - int lockId, - String type, - ) => + int lockId, + String type, + ) => post( reportBuyRequestURL.toUrl, jsonEncode({ @@ -2836,8 +2842,6 @@ class ApiProvider extends BaseProvider { isShowNetworkErrorMsg: false, isShowErrMsg: false, isUnShowLoading: true); - - } extension ExtensionString on String { diff --git a/lib/network/api_repository.dart b/lib/network/api_repository.dart index f3e2587a..b9ecd53e 100755 --- a/lib/network/api_repository.dart +++ b/lib/network/api_repository.dart @@ -493,8 +493,11 @@ class ApiRepository { // 获取所有锁设置信息 Future getLockSettingInfoData( - {required String lockId}) async { - final res = await apiProvider.getLockSettingInfoData(lockId); + {required String lockId, bool isUnShowLoading = false}) async { + final res = await apiProvider.getLockSettingInfoData( + lockId, + isUnShowLoading: isUnShowLoading, + ); return LockSetInfoEntity.fromJson(res.body); } From 79948ff405864c93a20eae863af43bd9650c374c Mon Sep 17 00:00:00 2001 From: liyi Date: Mon, 4 Aug 2025 15:25:40 +0800 Subject: [PATCH 09/15] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=8C=87=E7=BA=B9=E6=97=B6=E7=9A=84=E5=9B=BE=E7=89=87=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../addFingerprint/addFingerprint_page.dart | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/main/lockDetail/fingerprint/addFingerprint/addFingerprint_page.dart b/lib/main/lockDetail/fingerprint/addFingerprint/addFingerprint_page.dart index 5eb834b1..a330385d 100755 --- a/lib/main/lockDetail/fingerprint/addFingerprint/addFingerprint_page.dart +++ b/lib/main/lockDetail/fingerprint/addFingerprint/addFingerprint_page.dart @@ -122,26 +122,26 @@ class _AddFingerprintPageState extends State with RouteAware String getIconNumber(int number) { String iconPath = ''; switch (number) { - case 0: + case 1: iconPath = 'images/main/icon_addFingerprint_fingerprint_one.png'; break; - case 1: + case 2: iconPath = 'images/main/icon_addFingerprint_fingerprint_two.png'; break; - case 2: + case 3: iconPath = 'images/main/icon_addFingerprint_fingerprint_three.png'; break; - case 3: + case 4: iconPath = 'images/main/icon_addFingerprint_fingerprint_four.png'; break; - case 4: + case 5: iconPath = 'images/main/icon_addFingerprint_fingerprint_five.png'; break; - case 5: + case 6: iconPath = 'images/main/icon_addFingerprint_fingerprint_six.png'; break; default: - iconPath = 'images/main/icon_addFingerprint_fingerprint_six.png'; + iconPath = 'images/main/icon_addFingerprint_fingerprint_one.png'; break; } return iconPath; From 0ab9b5f03a239f215ed7d7053498acc1b8af8eda Mon Sep 17 00:00:00 2001 From: liyi Date: Mon, 4 Aug 2025 15:54:19 +0800 Subject: [PATCH 10/15] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4ios=E5=92=8Candroid?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=8D=E4=B8=80=E8=87=B4=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lock_voice_setting_page.dart | 210 +++++++++--------- 1 file changed, 101 insertions(+), 109 deletions(-) diff --git a/lib/mine/addLock/lock_voice_setting/lock_voice_setting_page.dart b/lib/mine/addLock/lock_voice_setting/lock_voice_setting_page.dart index e4fc66ff..ed5e0ec5 100644 --- a/lib/mine/addLock/lock_voice_setting/lock_voice_setting_page.dart +++ b/lib/mine/addLock/lock_voice_setting/lock_voice_setting_page.dart @@ -37,18 +37,29 @@ class _LockVoiceSettingState extends State { barTitle: '锁语音包设置'.tr, haveBack: false, haveOtherLeftWidget: true, - leftWidget: TextButton( - onPressed: () { - eventBus - .fire(RefreshLockListInfoDataEvent(isUnShowLoading: true)); - Get.offAllNamed(Routers.starLockMain); - }, - child: Text( - '跳过'.tr, - style: TextStyle( - color: Colors.white, - fontSize: 24.sp, - fontWeight: FontWeight.w500, + leftWidget: Container( + width: 60.w, // 手动扩大leading区域宽度，防止内容换行 + child: TextButton( + onPressed: () { + eventBus + .fire(RefreshLockListInfoDataEvent(isUnShowLoading: true)); + Get.offAllNamed(Routers.starLockMain); + }, + style: TextButton.styleFrom( + padding: EdgeInsets.symmetric(horizontal: 4), // 减少两侧空白 + minimumSize: Size.zero, // 避免最小尺寸影响 + tapTargetSize: MaterialTapTargetSize.shrinkWrap, // 紧凑布局 + ), + child: FittedBox( + fit: BoxFit.scaleDown, + child: Text( + '跳过'.tr, + style: TextStyle( + color: Colors.white, + fontSize: 24.sp, // 减小字体，防止换行 + fontWeight: FontWeight.w500, + ), + ), ), ), ), @@ -67,111 +78,92 @@ class _LockVoiceSettingState extends State { ), ], ), - body: _buildBody(), - ), - ); - } - - Widget _buildBody() { - return Obx( - () => SingleChildScrollView( - child: Column( - children: [ - Container( - width: 1.sw, - decoration: BoxDecoration(color: Colors.white), - child: ListView.builder( - itemCount: state.soundTypeList.length, - itemBuilder: (BuildContext context, int index) { - // 判断是否是最后一个元素（索引等于 itemCount - 1） - final isLastItem = index == state.soundTypeList.length - 1; - - // 获取当前平台数据（假设 platFormSet 是 RxList） - final platform = state.soundTypeList.value[index]; - return CommonItem( - leftTitel: state.soundTypeList.value[index], - rightTitle: '', - isHaveLine: !isLastItem, - // 最后一个元素不显示分割线（取反） - isHaveDirection: false, - isHaveRightWidget: true, - rightWidget: Radio( - // Radio 的值：使用平台的唯一标识（如 id） - value: platform, - // 当前选中的值：与 selectPlatFormIndex 关联的 id - groupValue: state.soundTypeList - .value[state.selectSoundTypeIndex.value], - // 选中颜色（可选，默认主题色） - activeColor: AppColors.mainColor, - // 点击 Radio 时回调（更新选中索引） - onChanged: (value) { - if (value != null) { - setState(() { - // 找到当前选中平台的索引（根据 id 匹配） - final newIndex = state.soundTypeList.value - .indexWhere((p) => p == value); - if (newIndex != -1) { - state.selectSoundTypeIndex.value = newIndex; + body: Obx( + () => ListView( + padding: EdgeInsets.zero, + children: [ + // 语音类型选择区 + Container( + width: 1.sw, + color: Colors.white, + child: Column( + children: List.generate( + state.soundTypeList.length, + (index) { + final isLastItem = + index == state.soundTypeList.length - 1; + final soundType = state.soundTypeList.value[index]; + return CommonItem( + leftTitel: soundType, + rightTitle: '', + isHaveLine: !isLastItem, + isHaveDirection: false, + isHaveRightWidget: true, + rightWidget: Radio( + value: soundType, + groupValue: state.soundTypeList + .value[state.selectSoundTypeIndex.value], + activeColor: AppColors.mainColor, + onChanged: (value) { + if (value != null) { + final newIndex = state.soundTypeList.value + .indexWhere((p) => p == value); + if (newIndex != -1) { + state.selectSoundTypeIndex.value = newIndex; + } } - }); - } - }, - ), - action: () { - setState(() { - state.selectSoundTypeIndex.value = index; - }); + }, + ), + action: () { + state.selectSoundTypeIndex.value = index; + }, + ); }, - ); - }, - shrinkWrap: true, - physics: const AlwaysScrollableScrollPhysics(), + ), + ), ), - ), - SizedBox( - height: 8.h, - ), - Column( - children: _buildList(), - ), - ], + SizedBox( + height: 8.h, + ), + // 语言包列表区 + Container( + color: Colors.transparent, + child: Column( + children: List.generate( + state.languages.length, + (index) { + final item = state.languages[index]; + return CommonItem( + leftTitel: item.langText, + rightTitle: '', + isHaveLine: true, + isHaveDirection: false, + isHaveRightWidget: true, + rightWidget: + state.selectPassthroughListIndex.value == index + ? Image( + image: const AssetImage( + 'images/icon_item_checked.png'), + width: 30.w, + height: 30.w, + fit: BoxFit.contain, + ) + : Container(), + action: () { + state.selectPassthroughListIndex.value = index; + }, + ); + }, + ), + ), + ), + ], + ), ), ), ); } - List _buildList() { - final appLocalLanguages = state.languages; - return List.generate( - appLocalLanguages.length, - (index) => _buildItem( - appLocalLanguages[index], - index, - ), - ); - } - - _buildItem(PassthroughItem passthroughItem, index) { - return CommonItem( - leftTitel: passthroughItem.langText, - rightTitle: '', - isHaveLine: true, - isHaveDirection: false, - isHaveRightWidget: true, - rightWidget: state.selectPassthroughListIndex.value == index - ? Image( - image: const AssetImage('images/icon_item_checked.png'), - width: 30.w, - height: 30.w, - fit: BoxFit.contain, - ) - : Container(), - action: () { - state.selectPassthroughListIndex.value = index; - }, - ); - } - @override void dispose() { // TODO: implement dispose From c67db6e324e1f87f04e691d17546776b806129c5 Mon Sep 17 00:00:00 2001 From: liyi Date: Mon, 4 Aug 2025 18:02:14 +0800 Subject: [PATCH 11/15] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=B8=AD=E7=9A=84id=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../doorLockLog/doorLockLog_page.dart | 71 ++++++++++++++++--- .../fingerprintList_logic.dart | 4 +- 2 files changed, 63 insertions(+), 12 deletions(-) diff --git a/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart b/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart index e84e8cba..9335bc27 100755 --- a/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart +++ b/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart @@ -324,16 +324,59 @@ class _DoorLockLogPageState extends State with RouteAware { '（ID：${item.username}）'; case 30: return '${formatTimestampToHHmm(item.operateDate!)} ' + - '卡片'.tr + + '卡'.tr + '开锁'.tr + '（ID：${item.username}）'; case 40: - return item.recordStr ?? ''; + if (item.username != null && item.username != '') { + return '${formatTimestampToHHmm(item.operateDate!)} ' + + '蓝牙'.tr + + '开锁'.tr + + '（' + + 'ID'.tr + + '：${item.username}）'; + } else { + return '${formatTimestampToHHmm(item.operateDate!)} ' + + '蓝牙'.tr + + '开锁'.tr + + '（' + + 'ID'.tr + + '：${item.userid}）'; + } + case 50: return '${formatTimestampToHHmm(item.operateDate!)} ' + '组合模式'.tr + '开锁'.tr + '（ID：${item.username}）'; + case 60: + return '${formatTimestampToHHmm(item.operateDate!)} ' + + '添加指纹'.tr + + '（ID：${item.username}）'; + case 70: + return '${formatTimestampToHHmm(item.operateDate!)} ' + + '添加密码'.tr + + '（ID：${item.username}）'; + case 80: + return '${formatTimestampToHHmm(item.operateDate!)} ' + + '添加卡'.tr + + '（ID：${item.username}）'; + case 90: + return '${formatTimestampToHHmm(item.operateDate!)} ' + + '删除'.tr + + '指纹'.tr + + '（ID：${item.username}）'; + case 100: + return '${formatTimestampToHHmm(item.operateDate!)} ' + + '删除'.tr + + '密码'.tr + + '（ID：${item.username}）'; + case 110: + return '${formatTimestampToHHmm(item.operateDate!)} ' + + '删除'.tr + + '卡'.tr + + '（ID：${item.username}）'; + case 160: return '${formatTimestampToHHmm(item.operateDate!)} ' + '人脸'.tr + @@ -373,18 +416,26 @@ class _DoorLockLogPageState extends State with RouteAware { ); }, child: Padding( - padding: EdgeInsets.only(left: 20.w, top: 20.h), + padding: EdgeInsets.only(left: 20.w, top: 20.h,right: 20.w), child: Column( mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: [ - Text( - _buildIDByType(timelineData), - textAlign: TextAlign.left, - style: TextStyle( - color: Colors.black, - fontSize: 24.sp, - fontWeight: FontWeight.w600, + // 使用 SingleChildScrollView 实现横向滚动 + SingleChildScrollView( + scrollDirection: Axis.horizontal, // 横向滚动 + child: Text( + _buildIDByType(timelineData), + textAlign: TextAlign.left, + style: TextStyle( + color: Colors.black, + fontSize: 24.sp, + fontWeight: FontWeight.w600, + ), + // 关键：禁用换行，强制单行显示 + maxLines: 1, + // 可选：添加省略号（如果文本过长） + overflow: TextOverflow.ellipsis, ), ), SizedBox( diff --git a/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_logic.dart b/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_logic.dart index f2a1a7d9..ab32de1f 100755 --- a/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_logic.dart +++ b/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_logic.dart @@ -340,10 +340,10 @@ class FingerprintListLogic extends BaseGetXController { Future getFingerprintsListData( {required bool isRefresh}) async { // 如果是下拉刷新，清空已有数据 - if (isRefresh) { + // if (isRefresh) { state.fingerprintItemListData.clear(); pageNo = 1; - } + final FingerprintListDataEntity entity = await ApiRepository.to.getFingerprintsListData( lockId: state.lockId.value.toString(), From c6e43651e143bfb649df1968d511aaf4ac37825d Mon Sep 17 00:00:00 2001 From: liyi Date: Tue, 5 Aug 2025 09:31:39 +0800 Subject: [PATCH 12/15] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4=E5=B8=8C=E8=85=8A?= =?UTF-8?q?=E8=AF=AD=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lan/lan_ar.json | 2 +- lan/lan_bg.json | 2 +- lan/lan_bn.json | 2 +- lan/lan_cs.json | 2 +- lan/lan_da.json | 2 +- lan/lan_de.json | 2 +- lan/lan_el.json | 2 +- lan/lan_en.json | 2 +- lan/lan_es.json | 2 +- lan/lan_et.json | 2 +- lan/lan_fi.json | 2 +- lan/lan_fr.json | 2 +- lan/lan_he.json | 2 +- lan/lan_hi.json | 2 +- lan/lan_hk.json | 2 +- lan/lan_hr.json | 2 +- lan/lan_hu.json | 2 +- lan/lan_hy.json | 2 +- lan/lan_id.json | 2 +- lan/lan_it.json | 2 +- lan/lan_ja.json | 2 +- lan/lan_ka.json | 2 +- lan/lan_kk.json | 2 +- lan/lan_ko.json | 2 +- lan/lan_lt.json | 2 +- lan/lan_ms.json | 2 +- lan/lan_nl.json | 2 +- lan/lan_pl.json | 2 +- lan/lan_pt.json | 2 +- lan/lan_ro.json | 2 +- lan/lan_ru.json | 2 +- lan/lan_sk.json | 2 +- lan/lan_sr_cyrl.json | 2 +- lan/lan_sv.json | 2 +- lan/lan_th.json | 2 +- lan/lan_tr.json | 2 +- lan/lan_tw.json | 2 +- lan/lan_uk.json | 2 +- lan/lan_ur.json | 2 +- lan/lan_vi.json | 2 +- lan/lan_zh.json | 2 +- 41 files changed, 41 insertions(+), 41 deletions(-) diff --git a/lan/lan_ar.json b/lan/lan_ar.json index 65ea2bd7..b8d40192 100644 --- a/lan/lan_ar.json +++ b/lan/lan_ar.json @@ -1065,7 +1065,7 @@ "波兰语": "Polski", "斯洛伐克语": "Slovenčina", "捷克语": "Čeština", - "希腊语": "Ελληνικά", + "希腊语": "ελληνικά", "希伯来语": "עברית", "塞尔维亚语": "Српски", "土耳其语": "Türkçe", diff --git a/lan/lan_bg.json b/lan/lan_bg.json index 31814e15..973987ea 100644 --- a/lan/lan_bg.json +++ b/lan/lan_bg.json @@ -1065,7 +1065,7 @@ "波兰语": "Polski", "斯洛伐克语": "Slovenčina", "捷克语": "Čeština", - "希腊语": "Ελληνικά", + "希腊语": "ελληνικά", "希伯来语": "עברית", "塞尔维亚语": "Српски", "土耳其语": "Türkçe", diff --git a/lan/lan_bn.json b/lan/lan_bn.json index 717b2dda..7badc5ab 100644 --- a/lan/lan_bn.json +++ b/lan/lan_bn.json @@ -1065,7 +1065,7 @@ "波兰语": "Polski", "斯洛伐克语": "Slovenčina", "捷克语": "Čeština", - "希腊语": "Ελληνικά", + "希腊语": "ελληνικά", "希伯来语": "עברית", "塞尔维亚语": "Српски", "土耳其语": "Türkçe", diff --git a/lan/lan_cs.json b/lan/lan_cs.json index f12e2fc8..e3bce170 100644 --- a/lan/lan_cs.json +++ b/lan/lan_cs.json @@ -1065,7 +1065,7 @@ "波兰语": "Polski", "斯洛伐克语": "Slovenčina", "捷克语": "Čeština", - "希腊语": "Ελληνικά", + "希腊语": "ελληνικά", "希伯来语": "עברית", "塞尔维亚语": "Српски", "土耳其语": "Türkçe", diff --git a/lan/lan_da.json b/lan/lan_da.json index 6cc679ec..2c816ee0 100644 --- a/lan/lan_da.json +++ b/lan/lan_da.json @@ -1065,7 +1065,7 @@ "波兰语": "Polski", "斯洛伐克语": "Slovenčina", "捷克语": "Čeština", - "希腊语": "Ελληνικά", + "希腊语": "ελληνικά", "希伯来语": "עברית", "塞尔维亚语": "Српски", "土耳其语": "Türkçe", diff --git a/lan/lan_de.json b/lan/lan_de.json index 625698db..1e161734 100644 --- a/lan/lan_de.json +++ b/lan/lan_de.json @@ -1065,7 +1065,7 @@ "波兰语": "Polski", "斯洛伐克语": "Slovenčina", "捷克语": "Čeština", - "希腊语": "Ελληνικά", + "希腊语": "ελληνικά", "希伯来语": "עברית", "塞尔维亚语": "Српски", "土耳其语": "Türkçe", diff --git a/lan/lan_el.json b/lan/lan_el.json index 92bbd502..8fbb36ec 100644 --- a/lan/lan_el.json +++ b/lan/lan_el.json @@ -1065,7 +1065,7 @@ "波兰语": "Polski", "斯洛伐克语": "Slovenčina", "捷克语": "Čeština", - "希腊语": "Ελληνικά", + "希腊语": "ελληνικά", "希伯来语": "עברית", "塞尔维亚语": "Српски", "土耳其语": "Türkçe", diff --git a/lan/lan_en.json b/lan/lan_en.json index a68e857f..2e5dc1cc 100644 --- a/lan/lan_en.json +++ b/lan/lan_en.json @@ -1067,7 +1067,7 @@ "波兰语": "Polski", "斯洛伐克语": "Slovenčina", "捷克语": "Čeština", - "希腊语": "Ελληνικά", + "希腊语": "ελληνικά", "希伯来语": "עברית", "塞尔维亚语": "Српски", "土耳其语": "Türkçe", diff --git a/lan/lan_es.json b/lan/lan_es.json index 3671a855..80e19c93 100644 --- a/lan/lan_es.json +++ b/lan/lan_es.json @@ -1065,7 +1065,7 @@ "波兰语": "Polski", "斯洛伐克语": "Slovenčina", "捷克语": "Čeština", - "希腊语": "Ελληνικά", + "希腊语": "ελληνικά", "希伯来语": "עברית", "塞尔维亚语": "Српски", "土耳其语": "Türkçe", diff --git a/lan/lan_et.json b/lan/lan_et.json index 7e18e424..24f29906 100644 --- a/lan/lan_et.json +++ b/lan/lan_et.json @@ -1065,7 +1065,7 @@ "波兰语": "Polski", "斯洛伐克语": "Slovenčina", "捷克语": "Čeština", - "希腊语": "Ελληνικά", + "希腊语": "ελληνικά", "希伯来语": "עברית", "塞尔维亚语": "Српски", "土耳其语": "Türkçe", diff --git a/lan/lan_fi.json b/lan/lan_fi.json index 0172ecfd..d85b91e5 100644 --- a/lan/lan_fi.json +++ b/lan/lan_fi.json @@ -1065,7 +1065,7 @@ "波兰语": "Polski", "斯洛伐克语": "Slovenčina", "捷克语": "Čeština", - "希腊语": "Ελληνικά", + "希腊语": "ελληνικά", "希伯来语": "עברית", "塞尔维亚语": "Српски", "土耳其语": "Türkçe", diff --git a/lan/lan_fr.json b/lan/lan_fr.json index f592abf0..9bb8fc1c 100644 --- a/lan/lan_fr.json +++ b/lan/lan_fr.json @@ -1065,7 +1065,7 @@ "波兰语": "Polski", "斯洛伐克语": "Slovenčina", "捷克语": "Čeština", - "希腊语": "Ελληνικά", + "希腊语": "ελληνικά", "希伯来语": "עברית", "塞尔维亚语": "Српски", "土耳其语": "Türkçe", diff --git a/lan/lan_he.json b/lan/lan_he.json index 7814f574..5481005d 100644 --- a/lan/lan_he.json +++ b/lan/lan_he.json @@ -1065,7 +1065,7 @@ "波兰语": "Polski", "斯洛伐克语": "Slovenčina", "捷克语": "Čeština", - "希腊语": "Ελληνικά", + "希腊语": "ελληνικά", "希伯来语": "עברית", "塞尔维亚语": "Српски", "土耳其语": "Türkçe", diff --git a/lan/lan_hi.json b/lan/lan_hi.json index 27d5a63d..aaf974d0 100644 --- a/lan/lan_hi.json +++ b/lan/lan_hi.json @@ -1067,7 +1067,7 @@ "波兰语": "Polski", "斯洛伐克语": "Slovenčina", "捷克语": "Čeština", - "希腊语": "Ελληνικά", + "希腊语": "ελληνικά", "希伯来语": "עברית", "塞尔维亚语": "Српски", "土耳其语": "Türkçe", diff --git a/lan/lan_hk.json b/lan/lan_hk.json index d32e5045..c3026b24 100644 --- a/lan/lan_hk.json +++ b/lan/lan_hk.json @@ -1066,7 +1066,7 @@ "波兰语": "Polski", "斯洛伐克语": "Slovenčina", "捷克语": "Čeština", - "希腊语": "Ελληνικά", + "希腊语": "ελληνικά", "希伯来语": "עברית", "塞尔维亚语": "Српски", "土耳其语": "Türkçe", diff --git a/lan/lan_hr.json b/lan/lan_hr.json index d9e14471..6d16c1ee 100644 --- a/lan/lan_hr.json +++ b/lan/lan_hr.json @@ -1065,7 +1065,7 @@ "波兰语": "Polski", "斯洛伐克语": "Slovenčina", "捷克语": "Čeština", - "希腊语": "Ελληνικά", + "希腊语": "ελληνικά", "希伯来语": "עברית", "塞尔维亚语": "Српски", "土耳其语": "Türkçe", diff --git a/lan/lan_hu.json b/lan/lan_hu.json index 20713f6c..e48ff904 100644 --- a/lan/lan_hu.json +++ b/lan/lan_hu.json @@ -1065,7 +1065,7 @@ "波兰语": "Polski", "斯洛伐克语": "Slovenčina", "捷克语": "Čeština", - "希腊语": "Ελληνικά", + "希腊语": "ελληνικά", "希伯来语": "עברית", "塞尔维亚语": "Српски", "土耳其语": "Türkçe", diff --git a/lan/lan_hy.json b/lan/lan_hy.json index d84ffba5..0b83d204 100644 --- a/lan/lan_hy.json +++ b/lan/lan_hy.json @@ -1067,7 +1067,7 @@ "波兰语": "Լեհերեն", "斯洛伐克语": "Սլովենչինա", "捷克语": "Չեշտինա", - "希腊语": "Ελληνικά", + "希腊语": "ελληνικά", "希伯来语": "עברית", "塞尔维亚语": "Српски", "土耳其语": "Türkçe", diff --git a/lan/lan_id.json b/lan/lan_id.json index ff57185f..8049dddf 100644 --- a/lan/lan_id.json +++ b/lan/lan_id.json @@ -1065,7 +1065,7 @@ "波兰语": "Polski", "斯洛伐克语": "Slovenčina", "捷克语": "Čeština", - "希腊语": "Ελληνικά", + "希腊语": "ελληνικά", "希伯来语": "עברית", "塞尔维亚语": "Српски", "土耳其语": "Türkçe", diff --git a/lan/lan_it.json b/lan/lan_it.json index 952f2314..85e2c038 100644 --- a/lan/lan_it.json +++ b/lan/lan_it.json @@ -1065,7 +1065,7 @@ "波兰语": "Polski", "斯洛伐克语": "Slovenčina", "捷克语": "Čeština", - "希腊语": "Ελληνικά", + "希腊语": "ελληνικά", "希伯来语": "עברית", "塞尔维亚语": "Српски", "土耳其语": "Türkçe", diff --git a/lan/lan_ja.json b/lan/lan_ja.json index 4fea4fe7..ef964bea 100644 --- a/lan/lan_ja.json +++ b/lan/lan_ja.json @@ -1065,7 +1065,7 @@ "波兰语": "Polski", "斯洛伐克语": "Slovenčina", "捷克语": "Čeština", - "希腊语": "Ελληνικά", + "希腊语": "ελληνικά", "希伯来语": "עברית", "塞尔维亚语": "Српски", "土耳其语": "Türkçe", diff --git a/lan/lan_ka.json b/lan/lan_ka.json index 8ba96e84..67aaa6f8 100644 --- a/lan/lan_ka.json +++ b/lan/lan_ka.json @@ -1067,7 +1067,7 @@ "波兰语": "პოლსკი", "斯洛伐克语": "Slovenčina", "捷克语": "Čeština", - "希腊语": "Ελληνικά", + "希腊语": "ελληνικά", "希伯来语": "עברית", "塞尔维亚语": "Српски", "土耳其语": "Türkçe", diff --git a/lan/lan_kk.json b/lan/lan_kk.json index cd0bcd7e..6c6716fc 100644 --- a/lan/lan_kk.json +++ b/lan/lan_kk.json @@ -1065,7 +1065,7 @@ "波兰语": "Polski", "斯洛伐克语": "Slovenčina", "捷克语": "Čeština", - "希腊语": "Ελληνικά", + "希腊语": "ελληνικά", "希伯来语": "עברית", "塞尔维亚语": "Српски", "土耳其语": "Türkçe", diff --git a/lan/lan_ko.json b/lan/lan_ko.json index 9152fd09..e9fae44f 100644 --- a/lan/lan_ko.json +++ b/lan/lan_ko.json @@ -1065,7 +1065,7 @@ "波兰语": "Polski", "斯洛伐克语": "Slovenčina", "捷克语": "Čeština", - "希腊语": "Ελληνικά", + "希腊语": "ελληνικά", "希伯来语": "עברית", "塞尔维亚语": "Српски", "土耳其语": "Türkçe", diff --git a/lan/lan_lt.json b/lan/lan_lt.json index 399b4ac7..cfd24cce 100644 --- a/lan/lan_lt.json +++ b/lan/lan_lt.json @@ -1065,7 +1065,7 @@ "波兰语": "Polski", "斯洛伐克语": "Slovenčina", "捷克语": "Čeština", - "希腊语": "Ελληνικά", + "希腊语": "ελληνικά", "希伯来语": "עברית", "塞尔维亚语": "Српски", "土耳其语": "Türkçe", diff --git a/lan/lan_ms.json b/lan/lan_ms.json index 13240f71..833b1381 100644 --- a/lan/lan_ms.json +++ b/lan/lan_ms.json @@ -1065,7 +1065,7 @@ "波兰语": "Polski", "斯洛伐克语": "Slovenčina", "捷克语": "Čeština", - "希腊语": "Ελληνικά", + "希腊语": "ελληνικά", "希伯来语": "עברית", "塞尔维亚语": "Српски", "土耳其语": "Türkçe", diff --git a/lan/lan_nl.json b/lan/lan_nl.json index dc59ec9a..485d6e46 100644 --- a/lan/lan_nl.json +++ b/lan/lan_nl.json @@ -1065,7 +1065,7 @@ "波兰语": "Polski", "斯洛伐克语": "Slovenčina", "捷克语": "Čeština", - "希腊语": "Ελληνικά", + "希腊语": "ελληνικά", "希伯来语": "עברית", "塞尔维亚语": "Српски", "土耳其语": "Türkçe", diff --git a/lan/lan_pl.json b/lan/lan_pl.json index 22d90ca8..85dc5f65 100644 --- a/lan/lan_pl.json +++ b/lan/lan_pl.json @@ -1065,7 +1065,7 @@ "波兰语": "Polski", "斯洛伐克语": "Slovenčina", "捷克语": "Čeština", - "希腊语": "Ελληνικά", + "希腊语": "ελληνικά", "希伯来语": "עברית", "塞尔维亚语": "Српски", "土耳其语": "Türkçe", diff --git a/lan/lan_pt.json b/lan/lan_pt.json index b5481eca..a93f60e2 100644 --- a/lan/lan_pt.json +++ b/lan/lan_pt.json @@ -1065,7 +1065,7 @@ "波兰语": "Polski", "斯洛伐克语": "Slovenčina", "捷克语": "Čeština", - "希腊语": "Ελληνικά", + "希腊语": "ελληνικά", "希伯来语": "עברית", "塞尔维亚语": "Српски", "土耳其语": "Türkçe", diff --git a/lan/lan_ro.json b/lan/lan_ro.json index 48dcde43..7592582a 100644 --- a/lan/lan_ro.json +++ b/lan/lan_ro.json @@ -1065,7 +1065,7 @@ "波兰语": "Polski", "斯洛伐克语": "Slovenčina", "捷克语": "Čeština", - "希腊语": "Ελληνικά", + "希腊语": "ελληνικά", "希伯来语": "עברית", "塞尔维亚语": "Српски", "土耳其语": "Türkçe", diff --git a/lan/lan_ru.json b/lan/lan_ru.json index 779e0d2d..ebf8712c 100644 --- a/lan/lan_ru.json +++ b/lan/lan_ru.json @@ -1065,7 +1065,7 @@ "波兰语": "Polski", "斯洛伐克语": "Slovenčina", "捷克语": "Čeština", - "希腊语": "Ελληνικά", + "希腊语": "ελληνικά", "希伯来语": "עברית", "塞尔维亚语": "Српски", "土耳其语": "Türkçe", diff --git a/lan/lan_sk.json b/lan/lan_sk.json index 0092a539..6f33ec14 100644 --- a/lan/lan_sk.json +++ b/lan/lan_sk.json @@ -1065,7 +1065,7 @@ "波兰语": "Polski", "斯洛伐克语": "Slovenčina", "捷克语": "Čeština", - "希腊语": "Ελληνικά", + "希腊语": "ελληνικά", "希伯来语": "עברית", "塞尔维亚语": "Српски", "土耳其语": "Türkçe", diff --git a/lan/lan_sr_cyrl.json b/lan/lan_sr_cyrl.json index 87bdfadc..8e017246 100644 --- a/lan/lan_sr_cyrl.json +++ b/lan/lan_sr_cyrl.json @@ -1065,7 +1065,7 @@ "波兰语": "Polski", "斯洛伐克语": "Slovenčina", "捷克语": "Čeština", - "希腊语": "Ελληνικά", + "希腊语": "ελληνικά", "希伯来语": "עברית", "塞尔维亚语": "Српски", "土耳其语": "Türkçe", diff --git a/lan/lan_sv.json b/lan/lan_sv.json index b77c58ba..1d3a7b05 100644 --- a/lan/lan_sv.json +++ b/lan/lan_sv.json @@ -1065,7 +1065,7 @@ "波兰语": "Polski", "斯洛伐克语": "Slovenčina", "捷克语": "Čeština", - "希腊语": "Ελληνικά", + "希腊语": "ελληνικά", "希伯来语": "עברית", "塞尔维亚语": "Српски", "土耳其语": "Türkçe", diff --git a/lan/lan_th.json b/lan/lan_th.json index c31dc51f..da3fe4ed 100644 --- a/lan/lan_th.json +++ b/lan/lan_th.json @@ -1065,7 +1065,7 @@ "波兰语": "Polski", "斯洛伐克语": "Slovenčina", "捷克语": "Čeština", - "希腊语": "Ελληνικά", + "希腊语": "ελληνικά", "希伯来语": "עברית", "塞尔维亚语": "Српски", "土耳其语": "Türkçe", diff --git a/lan/lan_tr.json b/lan/lan_tr.json index d9ff0398..d870329b 100644 --- a/lan/lan_tr.json +++ b/lan/lan_tr.json @@ -1065,7 +1065,7 @@ "波兰语": "Polski", "斯洛伐克语": "Slovenčina", "捷克语": "Čeština", - "希腊语": "Ελληνικά", + "希腊语": "ελληνικά", "希伯来语": "עברית", "塞尔维亚语": "Српски", "土耳其语": "Türkçe", diff --git a/lan/lan_tw.json b/lan/lan_tw.json index eb1e5814..f49c8e3e 100644 --- a/lan/lan_tw.json +++ b/lan/lan_tw.json @@ -1065,7 +1065,7 @@ "波兰语": "Polski", "斯洛伐克语": "Slovenčina", "捷克语": "Čeština", - "希腊语": "Ελληνικά", + "希腊语": "ελληνικά", "希伯来语": "עברית", "塞尔维亚语": "Српски", "土耳其语": "Türkçe", diff --git a/lan/lan_uk.json b/lan/lan_uk.json index f4d5b602..c0bcfcd9 100644 --- a/lan/lan_uk.json +++ b/lan/lan_uk.json @@ -1065,7 +1065,7 @@ "波兰语": "Polski", "斯洛伐克语": "Slovenčina", "捷克语": "Čeština", - "希腊语": "Ελληνικά", + "希腊语": "ελληνικά", "希伯来语": "עברית", "塞尔维亚语": "Српски", "土耳其语": "Türkçe", diff --git a/lan/lan_ur.json b/lan/lan_ur.json index f2e55d80..45f7a811 100644 --- a/lan/lan_ur.json +++ b/lan/lan_ur.json @@ -1067,7 +1067,7 @@ "波兰语": "Polski", "斯洛伐克语": "Slovenčina", "捷克语": "Čeština", - "希腊语": "Ελληνικά", + "希腊语": "ελληνικά", "希伯来语": "עברית", "塞尔维亚语": "Српски", "土耳其语": "Türkçe", diff --git a/lan/lan_vi.json b/lan/lan_vi.json index 8e12c59f..e037b39a 100644 --- a/lan/lan_vi.json +++ b/lan/lan_vi.json @@ -1065,7 +1065,7 @@ "波兰语": "Polski", "斯洛伐克语": "Slovenčina", "捷克语": "Čeština", - "希腊语": "Ελληνικά", + "希腊语": "ελληνικά", "希伯来语": "עברית", "塞尔维亚语": "Српски", "土耳其语": "Türkçe", diff --git a/lan/lan_zh.json b/lan/lan_zh.json index 86ddf95b..913c7bf3 100755 --- a/lan/lan_zh.json +++ b/lan/lan_zh.json @@ -1070,7 +1070,7 @@ "波兰语": "Polski", "斯洛伐克语": "Slovenčina", "捷克语": "Čeština", - "希腊语": "Ελληνικά", + "希腊语": "ελληνικά", "希伯来语": "עברית", "塞尔维亚语": "Српски", "土耳其语": "Türkçe", From 23a4008d2da40b9393b5a6da032fa05172e5f6b8 Mon Sep 17 00:00:00 2001 From: liyi Date: Tue, 5 Aug 2025 14:46:11 +0800 Subject: [PATCH 13/15] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4=E6=8A=A5=E8=AD=A6?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=9A=84=E6=96=87=E6=9C=AC=E4=B8=BA=E7=BA=A2?= =?UTF-8?q?=E8=89=B2=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../doorLockLog/doorLockLog_page.dart | 33 +++++++++++++++---- 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart b/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart index 9335bc27..dbbe4187 100755 --- a/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart +++ b/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart @@ -313,10 +313,15 @@ class _DoorLockLogPageState extends State with RouteAware { final recordType = item.recordType; switch (recordType) { case 10: - return '${formatTimestampToHHmm(item.operateDate!)} ' + - '指纹'.tr + - '开锁'.tr + - '（ID：${item.username}）'; + if (item.username != null && item.username != '') { + return '${formatTimestampToHHmm(item.operateDate!)} ' + + '指纹'.tr + + '开锁'.tr + + '（ID：${item.username}）'; + } else { + return item.recordStr ?? ''; + } + case 20: return '${formatTimestampToHHmm(item.operateDate!)} ' + '密码'.tr + @@ -402,6 +407,22 @@ class _DoorLockLogPageState extends State with RouteAware { } } + Color _buildTextColorByType(DoorLockLogDataItem item) { + final recordType = item.recordType; + switch (recordType) { + case 120: + case 150: + case 130: + case 190: + case 200: + case 210: + case 220: + return Colors.red; + default: + return Colors.black; + } + } + TimelineTileBuilder _timelineBuilderWidget() { return TimelineTileBuilder.fromStyle( contentsAlign: ContentsAlign.basic, @@ -416,7 +437,7 @@ class _DoorLockLogPageState extends State with RouteAware { ); }, child: Padding( - padding: EdgeInsets.only(left: 20.w, top: 20.h,right: 20.w), + padding: EdgeInsets.only(left: 20.w, top: 20.h, right: 20.w), child: Column( mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, @@ -428,7 +449,7 @@ class _DoorLockLogPageState extends State with RouteAware { _buildIDByType(timelineData), textAlign: TextAlign.left, style: TextStyle( - color: Colors.black, + color: _buildTextColorByType(timelineData), fontSize: 24.sp, fontWeight: FontWeight.w600, ), From 8752c8dc41fd3191ea5300ead550092eec4e1294 Mon Sep 17 00:00:00 2001 From: liyi Date: Tue, 5 Aug 2025 15:19:42 +0800 Subject: [PATCH 14/15] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4=E5=BD=93=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=AE=8C=E9=94=81=E7=9A=84=E9=94=81=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E5=B7=B2=E8=A2=AB=E9=87=8D=E7=BD=AE=E9=80=BB=E8=BE=91=E7=9A=84?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E8=BF=9E=E6=8E=A5=E6=97=B6=E5=B0=86isReconne?= =?UTF-8?q?ct=E8=AE=BE=E7=BD=AE=E4=B8=BAtrue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/blue/blue_manage.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/blue/blue_manage.dart b/lib/blue/blue_manage.dart index 128cbaee..b49f20a8 100755 --- a/lib/blue/blue_manage.dart +++ b/lib/blue/blue_manage.dart @@ -665,7 +665,7 @@ class BlueManage { scanDevices.clear(); startScanSingle(deviceName, 15, (List scanDevices) { _connectDevice(scanDevices, deviceName, connectStateCallBack, - isAddEquipment: isAddEquipment, isReconnect: false); + isAddEquipment: isAddEquipment, isReconnect: true); }); } else { connectStateCallBack(BluetoothConnectionState.disconnected); From 46303ce2b9244ac30f301326902fb7cf84076c94 Mon Sep 17 00:00:00 2001 From: liyi Date: Tue, 5 Aug 2025 15:20:16 +0800 Subject: [PATCH 15/15] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=8C=87=E7=BA=B9=E6=97=B6=E5=8F=91=E9=80=81=E5=91=BD=E4=BB=A4?= =?UTF-8?q?=E7=9A=84=E9=98=B6=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fingerprint/addFingerprint/addFingerprint_logic.dart | 8 -------- 1 file changed, 8 deletions(-) diff --git a/lib/main/lockDetail/fingerprint/addFingerprint/addFingerprint_logic.dart b/lib/main/lockDetail/fingerprint/addFingerprint/addFingerprint_logic.dart index ebf94158..b878d092 100755 --- a/lib/main/lockDetail/fingerprint/addFingerprint/addFingerprint_logic.dart +++ b/lib/main/lockDetail/fingerprint/addFingerprint/addFingerprint_logic.dart @@ -281,7 +281,6 @@ class AddFingerprintLogic extends BaseGetXController { privateKey: getPrivateKeyList, token: getTokenList, ).toString(); - showBlueConnetctToastTimer(action: () async { final String getMobile = (await Storage.getMobile())!; ApmHelper.instance.trackEvent('add_fingerprint', { @@ -460,14 +459,7 @@ class AddFingerprintLogic extends BaseGetXController { @override void onReady() { super.onReady(); - _initReplySubscription(); - } - - @override - void onInit() { - super.onInit(); - senderAddFingerprint(); }