From d6ca149344a9c2fcc42d59feb753d89e8c230401 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AD=8F=E5=B0=91=E9=98=B3?= <786612630@qq.com> Date: Tue, 12 Nov 2024 16:49:51 +0800 Subject: [PATCH] =?UTF-8?q?fix:=201=E3=80=81=E4=BF=AE=E5=A4=8D=E5=9B=BD?= =?UTF-8?q?=E5=AE=B6=E5=8C=96=E7=9C=8B=E5=85=B6=E4=BB=96=E5=9B=BD=E5=AE=B6?= =?UTF-8?q?=E8=AF=AD=E8=A8=80=E6=98=AF=E7=8E=B0=E6=9C=89=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=E3=80=822?= =?UTF-8?q?=E3=80=81=E7=BD=91=E5=85=B3=E6=B7=BB=E5=8A=A0=E4=BB=8E=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=99=A8=E6=8B=89=E5=8F=96=E7=BD=91=E5=85=B3=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lan/lan_ar.json | 70 ++--- lan/lan_bg.json | 68 ++--- lan/lan_bn.json | 72 ++--- lan/lan_cs.json | 72 ++--- lan/lan_da.json | 70 ++--- lan/lan_de.json | 70 ++--- lan/lan_el.json | 72 ++--- lan/lan_en.json | 72 ++--- lan/lan_es.json | 68 ++--- lan/lan_et.json | 72 ++--- lan/lan_fi.json | 72 ++--- lan/lan_fr.json | 70 ++--- lan/lan_he.json | 72 ++--- lan/lan_hr.json | 70 ++--- lan/lan_hu.json | 70 ++--- lan/lan_id.json | 72 ++--- lan/lan_it.json | 70 ++--- lan/lan_ja.json | 72 ++--- lan/lan_kk.json | 72 ++--- lan/lan_ko.json | 70 ++--- lan/lan_lt.json | 72 ++--- lan/lan_ms.json | 72 ++--- lan/lan_nl.json | 70 ++--- lan/lan_pl.json | 72 ++--- lan/lan_pt.json | 68 ++--- lan/lan_ro.json | 70 ++--- lan/lan_ru.json | 70 ++--- lan/lan_sk.json | 70 ++--- lan/lan_sr_cyrl.json | 70 ++--- lan/lan_sv.json | 70 ++--- lan/lan_th.json | 72 ++--- lan/lan_tr.json | 70 ++--- lan/lan_tw.json | 70 ++--- lan/lan_uk.json | 70 ++--- lan/lan_vi.json | 70 ++--- lan/lan_zh.json | 72 ++--- .../io_gateway_configuringWifi.dart | 21 +- lib/blue/sender_manage.dart | 262 ++++++++-------- .../lockMain/xhj/lockMain_xhj_logic.dart | 5 +- .../gatewayConfigurationWifi_logic.dart | 81 +++-- .../gatewayConfigurationWifi_state.dart | 10 +- .../getGatewayConfiguration_entity.dart | 30 ++ .../selectGateway/getGatewayInfo_model.dart | 5 +- .../selectGatewayList_logic.dart | 40 +-- .../minePersonInfo_entity.dart | 34 +-- lib/network/api.dart | 16 +- lib/network/api_provider.dart | 279 +++++++++--------- lib/network/api_repository.dart | 47 +-- lib/tools/dateTool.dart | 14 +- 49 files changed, 1734 insertions(+), 1654 deletions(-) create mode 100644 lib/mine/gateway/addGateway/gatewayConfigurationWifi/getGatewayConfiguration_entity.dart diff --git a/lan/lan_ar.json b/lan/lan_ar.json index 053e8393..495f25d3 100644 --- a/lan/lan_ar.json +++ b/lan/lan_ar.json @@ -151,7 +151,6 @@ "升级": "تحديث", "空闲": "شاغر", "已入住": "محتل", - "英文": "الانجليزية", "多语言": "اللغات", "添加锁": "إضافة قفل", "锁地址": "عنوان القفل", @@ -1047,41 +1046,42 @@ "五": "خمسة", "六": "ستة", "日": "الشمس", - "简体中文": "الصينية المبسطة", - "繁体中文": "الصينية التقليدية", - "法语": "الفرنسية", - "俄语": "روسي", - "德语": "الألمانية", - "日语": "ياباني", - "韩语": "كوري", - "意大利语": "الإيطالية", - "乌克兰语": "أوقية", - "葡萄牙语": "البرتغالية", - "西班牙语": "إسبانية", + "英文": "English", + "简体中文": "简体中文", + "繁体中文": "繁體中文", + "法语": "Français", + "俄语": "Русский", + "德语": "Deutsch", + "日语": "日本語", + "韩语": "한국어", + "意大利语": "Italiano", + "乌克兰语": "Українська", + "葡萄牙语": "Português", + "西班牙语": "Español", "阿拉伯语": "العربية", - "越南语": "فيتنامي", - "马莱语": "ماليزي", - "荷兰语": "هولندي", - "罗马尼亚语": "الرومانية", - "立陶宛语": "الليتوانية", - "瑞典语": "سويدية", - "爱沙尼亚语": "الإستونية", - "波兰语": "البولندية", - "斯洛伐克语": "سلوفاك", - "捷克语": "تشيكي", - "希腊语": "اليونانية", - "希伯来语": "العبرية", - "塞尔维亚语": "الصربي", - "土耳其语": "التركية", - "匈牙利语": "هنغاري", - "保加利亚语": "البلغارية", - "哈萨克斯坦语": "كازاخ", - "孟加拉语": "بنغالي", - "克罗地亚语": "الكرواتيين", - "泰语": "تايلاندي", - "印度尼西亚语": "الأندونيسية", - "芬兰语": "الفنلندية", - "丹麦语": "دانماركي", + "越南语": "Tiếng Việt", + "马来语": "Bahasa Melayu", + "荷兰语": "Nederlands", + "罗马尼亚语": "Română", + "立陶宛语": "Lietuvių", + "瑞典语": "Svenska", + "爱沙尼亚语": "Eesti", + "波兰语": "Polski", + "斯洛伐克语": "Slovenčina", + "捷克语": "Čeština", + "希腊语": "Ελληνικά", + "希伯来语": "עברית", + "塞尔维亚语": "Српски", + "土耳其语": "Türkçe", + "匈牙利语": "Magyar", + "保加利亚语": "Български", + "哈萨克斯坦语": "Қазақ", + "孟加拉语": "বাংলা", + "克罗地亚语": "Hrvatski", + "泰语": "ไทย", + "印度尼西亚语": "Bahasa Indonesia", + "芬兰语": "Suomi", + "丹麦语": "Dansk", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "بعد إعادة الضبط ، سيتم حذف الأوردة المشطية للقفل. هل أنت متأكد أنك تريد إعادة الضبط ؟", "在线": "الإنترنت", "离线": "غير متصل" diff --git a/lan/lan_bg.json b/lan/lan_bg.json index da41ae7c..20098797 100644 --- a/lan/lan_bg.json +++ b/lan/lan_bg.json @@ -1047,41 +1047,41 @@ "五": "Пет", "六": "Шеста", "日": "Слънце", - "简体中文": "Опростен китайски", - "繁体中文": "Традиционен китайски", - "法语": "Френски", - "俄语": "Руски", - "德语": "Немски", - "日语": "Японски", - "韩语": "Корейски", - "意大利语": "Италиански", - "乌克兰语": "Украински", - "葡萄牙语": "Португалски", - "西班牙语": "Испански", - "阿拉伯语": "Арабски", - "越南语": "Виетнамци", - "马莱语": "Малайски", - "荷兰语": "Холандски", - "罗马尼亚语": "Румънски", - "立陶宛语": "Литовски", - "瑞典语": "Шведски", - "爱沙尼亚语": "Естонски", - "波兰语": "Полски", - "斯洛伐克语": "Словашки", - "捷克语": "Чешки", - "希腊语": "Гръцки", - "希伯来语": "Иврит", - "塞尔维亚语": "Сръбски", - "土耳其语": "Турски", - "匈牙利语": "Унгарски", + "简体中文": "简体中文", + "繁体中文": "繁體中文", + "法语": "Français", + "俄语": "Русский", + "德语": "Deutsch", + "日语": "日本語", + "韩语": "한국어", + "意大利语": "Italiano", + "乌克兰语": "Українська", + "葡萄牙语": "Português", + "西班牙语": "Español", + "阿拉伯语": "العربية", + "越南语": "Tiếng Việt", + "马来语": "Bahasa Melayu", + "荷兰语": "Nederlands", + "罗马尼亚语": "Română", + "立陶宛语": "Lietuvių", + "瑞典语": "Svenska", + "爱沙尼亚语": "Eesti", + "波兰语": "Polski", + "斯洛伐克语": "Slovenčina", + "捷克语": "Čeština", + "希腊语": "Ελληνικά", + "希伯来语": "עברית", + "塞尔维亚语": "Српски", + "土耳其语": "Türkçe", + "匈牙利语": "Magyar", "保加利亚语": "Български", - "哈萨克斯坦语": "Казахски", - "孟加拉语": "Бенгалски език", - "克罗地亚语": "Хърватски", - "泰语": "Тай", - "印度尼西亚语": "Индонезийски", - "芬兰语": "Финландски", - "丹麦语": "Датски", + "哈萨克斯坦语": "Қазақ", + "孟加拉语": "বাংলা", + "克罗地亚语": "Hrvatski", + "泰语": "ไทย", + "印度尼西亚语": "Bahasa Indonesia", + "芬兰语": "Suomi", + "丹麦语": "Dansk", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "След нулиране, метакарпалните вени на ключалката ще бъдат изтрити. Сигурен ли сте, че искате да се възстанови?", "在线": "Онлайн", "离线": "Офлайн" diff --git a/lan/lan_bn.json b/lan/lan_bn.json index d5596ea9..a3ef79f7 100644 --- a/lan/lan_bn.json +++ b/lan/lan_bn.json @@ -151,7 +151,6 @@ "升级": "আন্ডারেট", "空闲": "ছোয়ান্ট", "已入住": "নিয়ন্ত্র", - "英文": "সেনডেনলিশ", "多语言": "Langu▁রেজ", "添加锁": "লক", "锁地址": "অ্যান্ডলক", @@ -1047,41 +1046,42 @@ "五": "এক্ষেভ", "六": "শিরোনাম", "日": "সুন", - "简体中文": "ঊর্ধ", - "繁体中文": "ম্যানুয়াল", - "法语": "নীচ", - "俄语": "রিস্টসিয়ান", - "德语": "ম্যান", - "日语": "আনজনেস", - "韩语": "ছাত্রা", - "意大利语": "ষচ", - "乌克兰语": "ইউডস্কোয়ানিয়ান", - "葡萄牙语": "রুমিনিস", - "西班牙语": "ছোনাইশ", - "阿拉伯语": "অ্যারোবলিক", - "越南语": "নির্বাচন", - "马莱语": "Malay", - "荷兰语": "নিচ", - "罗马尼亚语": "শ্রোভিয়ান", - "立陶宛语": "লুউনাইয়ান", - "瑞典语": "ইবোজেনিশ", - "爱沙尼亚语": "অ্যালিউনিয়েন", - "波兰语": "নিশ", - "斯洛伐克语": "স্লোভেক", - "捷克语": "চালুকা", - "希腊语": "ফেরেক", - "希伯来语": "চালু", - "塞尔维亚语": "নিবিয়ান", - "土耳其语": "Tur▁কাশিশ", - "匈牙利语": "আইভিরচিয়ান", - "保加利亚语": "ডাউলিয়ান", - "哈萨克斯坦语": "সাদাজখ", - "孟加拉语": "ব্রেনফেনালিCity in Ontario Canada", - "克罗地亚语": "পরীক্ষা", - "泰语": "সার্বজনীন", - "印度尼西亚语": "কেসিয়ান", - "芬兰语": "F", - "丹麦语": "দেননিশ", + "英文": "English", + "简体中文": "简体中文", + "繁体中文": "繁體中文", + "法语": "Français", + "俄语": "Русский", + "德语": "Deutsch", + "日语": "日本語", + "韩语": "한국어", + "意大利语": "Italiano", + "乌克兰语": "Українська", + "葡萄牙语": "Português", + "西班牙语": "Español", + "阿拉伯语": "العربية", + "越南语": "Tiếng Việt", + "马来语": "Bahasa Melayu", + "荷兰语": "Nederlands", + "罗马尼亚语": "Română", + "立陶宛语": "Lietuvių", + "瑞典语": "Svenska", + "爱沙尼亚语": "Eesti", + "波兰语": "Polski", + "斯洛伐克语": "Slovenčina", + "捷克语": "Čeština", + "希腊语": "Ελληνικά", + "希伯来语": "עברית", + "塞尔维亚语": "Српски", + "土耳其语": "Türkçe", + "匈牙利语": "Magyar", + "保加利亚语": "Български", + "哈萨克斯坦语": "Қазақ", + "孟加拉语": "বাংলা", + "克罗地亚语": "Hrvatski", + "泰语": "ไทย", + "印度尼西亚语": "Bahasa Indonesia", + "芬兰语": "Suomi", + "丹麦语": "Dansk", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "ব্যান্ডোটারআইসেট, হাসিপাল রিরিইনস্ফথেলকবইল্ডজেডড।?", "在线": "কনলাইন", "离线": "দেউন্টলাইনCity in Ontario Canada" diff --git a/lan/lan_cs.json b/lan/lan_cs.json index 0ee87b61..2b11ad68 100644 --- a/lan/lan_cs.json +++ b/lan/lan_cs.json @@ -151,7 +151,6 @@ "升级": "Aktualizace", "空闲": "Prázdné", "已入住": "Obsazen", - "英文": "English", "多语言": "Jazyky", "添加锁": "Přidat zámek", "锁地址": "Adresa uzamčení", @@ -1047,41 +1046,42 @@ "五": "Pět", "六": "Šest", "日": "Sun", - "简体中文": "Zjednodušená čínština", - "繁体中文": "Tradiční čínština", - "法语": "Francouzština", - "俄语": "Rusky", - "德语": "Němčina", - "日语": "Japonština", - "韩语": "Korejština", - "意大利语": "Italština", - "乌克兰语": "Ukrajinština", - "葡萄牙语": "Portugalština", - "西班牙语": "Španělština", - "阿拉伯语": "Arabština", - "越南语": "Vietnamština", - "马莱语": "Malajština", - "荷兰语": "Nizozemština", - "罗马尼亚语": "Rumunština", - "立陶宛语": "Litva", - "瑞典语": "Švédština", - "爱沙尼亚语": "Estonština", - "波兰语": "Polský", - "斯洛伐克语": "Slovak", - "捷克语": "Czech", - "希腊语": "Greek", - "希伯来语": "Hebrejština", - "塞尔维亚语": "Srbština", - "土耳其语": "Turečtina", - "匈牙利语": "Maďarština", - "保加利亚语": "Bulharština", - "哈萨克斯坦语": "Kazašština", - "孟加拉语": "Bengálština", - "克罗地亚语": "Chorvatština", - "泰语": "Thajština", - "印度尼西亚语": "Indonéština", - "芬兰语": "Finština", - "丹麦语": "Dánština", + "英文": "English", + "简体中文": "简体中文", + "繁体中文": "繁體中文", + "法语": "Français", + "俄语": "Русский", + "德语": "Deutsch", + "日语": "日本語", + "韩语": "한국어", + "意大利语": "Italiano", + "乌克兰语": "Українська", + "葡萄牙语": "Português", + "西班牙语": "Español", + "阿拉伯语": "العربية", + "越南语": "Tiếng Việt", + "马来语": "Bahasa Melayu", + "荷兰语": "Nederlands", + "罗马尼亚语": "Română", + "立陶宛语": "Lietuvių", + "瑞典语": "Svenska", + "爱沙尼亚语": "Eesti", + "波兰语": "Polski", + "斯洛伐克语": "Slovenčina", + "捷克语": "Čeština", + "希腊语": "Ελληνικά", + "希伯来语": "עברית", + "塞尔维亚语": "Српски", + "土耳其语": "Türkçe", + "匈牙利语": "Magyar", + "保加利亚语": "Български", + "哈萨克斯坦语": "Қазақ", + "孟加拉语": "বাংলা", + "克罗地亚语": "Hrvatski", + "泰语": "ไทย", + "印度尼西亚语": "Bahasa Indonesia", + "芬兰语": "Suomi", + "丹麦语": "Dansk", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "Po resetování budou metakarpální žíly zámku odstraněny. Jste si jistý, že chcete resetovat?", "在线": "Online", "离线": "Offline" diff --git a/lan/lan_da.json b/lan/lan_da.json index ef66d4a9..4f24dec4 100644 --- a/lan/lan_da.json +++ b/lan/lan_da.json @@ -151,7 +151,6 @@ "升级": "Opdater", "空闲": "Ledige:", "已入住": "Optaget", - "英文": "Engelsk", "多语言": "Sprog", "添加锁": "Tilføj lås", "锁地址": "Lås adresse", @@ -1047,40 +1046,41 @@ "五": "Fem", "六": "Seks", "日": "Solen", - "简体中文": "Forenklet kinesisk", - "繁体中文": "Traditionel kinesisk", - "法语": "Fransk", - "俄语": "Russisk", - "德语": "Tysk", - "日语": "Japansk", - "韩语": "Koreansk", - "意大利语": "Italiensk", - "乌克兰语": "Ukrainsk", - "葡萄牙语": "Portugisisk", - "西班牙语": "Spansk", - "阿拉伯语": "Arabisk", - "越南语": "Vietnamesisk", - "马莱语": "Malay", - "荷兰语": "Nederlandsk", - "罗马尼亚语": "Rumænsk", - "立陶宛语": "Litauisk", - "瑞典语": "Svenske", - "爱沙尼亚语": "Estisk", - "波兰语": "Polsk", - "斯洛伐克语": "Slovakisk", - "捷克语": "Tjekkisk", - "希腊语": "Græsk", - "希伯来语": "Hebraisk", - "塞尔维亚语": "Serbisk", - "土耳其语": "Tyrkisk", - "匈牙利语": "Ungarsk", - "保加利亚语": "Bulgarsk", - "哈萨克斯坦语": "Kasakkisk", - "孟加拉语": "Bengalsk", - "克罗地亚语": "Kroatisk", - "泰语": "Thai", - "印度尼西亚语": "Indonesisk", - "芬兰语": "Finsk", + "英文": "English", + "简体中文": "简体中文", + "繁体中文": "繁體中文", + "法语": "Français", + "俄语": "Русский", + "德语": "Deutsch", + "日语": "日本語", + "韩语": "한국어", + "意大利语": "Italiano", + "乌克兰语": "Українська", + "葡萄牙语": "Português", + "西班牙语": "Español", + "阿拉伯语": "العربية", + "越南语": "Tiếng Việt", + "马来语": "Bahasa Melayu", + "荷兰语": "Nederlands", + "罗马尼亚语": "Română", + "立陶宛语": "Lietuvių", + "瑞典语": "Svenska", + "爱沙尼亚语": "Eesti", + "波兰语": "Polski", + "斯洛伐克语": "Slovenčina", + "捷克语": "Čeština", + "希腊语": "Ελληνικά", + "希伯来语": "עברית", + "塞尔维亚语": "Српски", + "土耳其语": "Türkçe", + "匈牙利语": "Magyar", + "保加利亚语": "Български", + "哈萨克斯坦语": "Қазақ", + "孟加拉语": "বাংলা", + "克罗地亚语": "Hrvatski", + "泰语": "ไทย", + "印度尼西亚语": "Bahasa Indonesia", + "芬兰语": "Suomi", "丹麦语": "Dansk", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "Efter nulstilling, de metacarpal vener i låsen vil blive slettet. Er du sikker på at du vil nulstille?", "在线": "OnlineComment", diff --git a/lan/lan_de.json b/lan/lan_de.json index 08cdbcce..def3bfa4 100644 --- a/lan/lan_de.json +++ b/lan/lan_de.json @@ -151,7 +151,6 @@ "升级": "Aktualisieren", "空闲": "Leerstand", "已入住": "Besetzt", - "英文": "Englisch", "多语言": "Sprachen", "添加锁": "Schloss hinzufügen", "锁地址": "Sperr adresse", @@ -1047,41 +1046,42 @@ "五": "Fünf", "六": "Sechs", "日": "Sonne", - "简体中文": "Vereinfachtes Chinesisch", - "繁体中文": "Traditionelles Chinesisch", - "法语": "Französisch", - "俄语": "Russisch", + "英文": "English", + "简体中文": "简体中文", + "繁体中文": "繁體中文", + "法语": "Français", + "俄语": "Русский", "德语": "Deutsch", - "日语": "Japanisch", - "韩语": "Koreanisch", - "意大利语": "Italienisch", - "乌克兰语": "Ukrainisch", - "葡萄牙语": "Portugiesisch", - "西班牙语": "Spanisch", - "阿拉伯语": "Arabisch", - "越南语": "Vietnam esisch", - "马莱语": "Malaiisch", - "荷兰语": "Nieder län disch", - "罗马尼亚语": "Rumänisch", - "立陶宛语": "Litauisch", - "瑞典语": "Schwedisch", - "爱沙尼亚语": "Estnisch", - "波兰语": "Polnisch", - "斯洛伐克语": "Slowakisch", - "捷克语": "Tschechisch", - "希腊语": "Griechisch", - "希伯来语": "Hebräisch", - "塞尔维亚语": "Serbisch", - "土耳其语": "Türkisch", - "匈牙利语": "Ungarisch", - "保加利亚语": "Bulgarisch", - "哈萨克斯坦语": "Kasachisch", - "孟加拉语": "Bengali", - "克罗地亚语": "Kroatisch", - "泰语": "Thailändisch", - "印度尼西亚语": "Indonesisch", - "芬兰语": "Finnisch", - "丹麦语": "Dänisch", + "日语": "日本語", + "韩语": "한국어", + "意大利语": "Italiano", + "乌克兰语": "Українська", + "葡萄牙语": "Português", + "西班牙语": "Español", + "阿拉伯语": "العربية", + "越南语": "Tiếng Việt", + "马来语": "Bahasa Melayu", + "荷兰语": "Nederlands", + "罗马尼亚语": "Română", + "立陶宛语": "Lietuvių", + "瑞典语": "Svenska", + "爱沙尼亚语": "Eesti", + "波兰语": "Polski", + "斯洛伐克语": "Slovenčina", + "捷克语": "Čeština", + "希腊语": "Ελληνικά", + "希伯来语": "עברית", + "塞尔维亚语": "Српски", + "土耳其语": "Türkçe", + "匈牙利语": "Magyar", + "保加利亚语": "Български", + "哈萨克斯坦语": "Қазақ", + "孟加拉语": "বাংলা", + "克罗地亚语": "Hrvatski", + "泰语": "ไทย", + "印度尼西亚语": "Bahasa Indonesia", + "芬兰语": "Suomi", + "丹麦语": "Dansk", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "Nach dem Zurücksetzen werden die Mittelhand adern des Schlosses gelöscht. Sind Sie sicher, dass Sie zurücksetzen wollen?", "在线": "Online", "离线": "Offline" diff --git a/lan/lan_el.json b/lan/lan_el.json index a0b1de0c..e9df61fe 100644 --- a/lan/lan_el.json +++ b/lan/lan_el.json @@ -151,7 +151,6 @@ "升级": "Ενημέρωση", "空闲": "Κενό", "已入住": "Καταλημένες", - "英文": "Αγγλική", "多语言": "Γλώσσες", "添加锁": "Προσθήκη κλειδώματος", "锁地址": "Κλείδωση", @@ -1047,41 +1046,42 @@ "五": "Πέντε.", "六": "Έξι.", "日": "Ήλιο", - "简体中文": "Απλοποιημένα κινεζικά", - "繁体中文": "Παραδοσιακά κινέζικα", - "法语": "Γαλλικά", - "俄语": "Ρωσική", - "德语": "Γερμανικός", - "日语": "Ιαπωνικά", - "韩语": "Κορεάτικα", - "意大利语": "Ιταλική", - "乌克兰语": "Ουκρανικά", - "葡萄牙语": "Πορτογαλική", - "西班牙语": "Ισπανικά", - "阿拉伯语": "Αραβικά", - "越南语": "Βιετναμέζικα", - "马莱语": "Μαλαισία", - "荷兰语": "Ολλανδικά", - "罗马尼亚语": "Ρουμάνικα", - "立陶宛语": "Λιθουανικά", - "瑞典语": "Σουηδικά", - "爱沙尼亚语": "Εσθονικά", - "波兰语": "Πολωνικά", - "斯洛伐克语": "Σλοβακικός", - "捷克语": "Τσέχικα", - "希腊语": "Ελληνική", - "希伯来语": "Εβραϊκά", - "塞尔维亚语": "Σερβική", - "土耳其语": "Τουρκικά", - "匈牙利语": "Ουγγρικά", - "保加利亚语": "Βουλγαρική", - "哈萨克斯坦语": "Καζακικά", - "孟加拉语": "Βενγκάλια", - "克罗地亚语": "Κροατικά", - "泰语": "Ταϊλάνδης", - "印度尼西亚语": "Ινδονησιακά", - "芬兰语": "Φινλανδικά", - "丹麦语": "Δανικά", + "英文": "English", + "简体中文": "简体中文", + "繁体中文": "繁體中文", + "法语": "Français", + "俄语": "Русский", + "德语": "Deutsch", + "日语": "日本語", + "韩语": "한국어", + "意大利语": "Italiano", + "乌克兰语": "Українська", + "葡萄牙语": "Português", + "西班牙语": "Español", + "阿拉伯语": "العربية", + "越南语": "Tiếng Việt", + "马来语": "Bahasa Melayu", + "荷兰语": "Nederlands", + "罗马尼亚语": "Română", + "立陶宛语": "Lietuvių", + "瑞典语": "Svenska", + "爱沙尼亚语": "Eesti", + "波兰语": "Polski", + "斯洛伐克语": "Slovenčina", + "捷克语": "Čeština", + "希腊语": "Ελληνικά", + "希伯来语": "עברית", + "塞尔维亚语": "Српски", + "土耳其语": "Türkçe", + "匈牙利语": "Magyar", + "保加利亚语": "Български", + "哈萨克斯坦语": "Қазақ", + "孟加拉语": "বাংলা", + "克罗地亚语": "Hrvatski", + "泰语": "ไทย", + "印度尼西亚语": "Bahasa Indonesia", + "芬兰语": "Suomi", + "丹麦语": "Dansk", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "Μετά την επαναφορά, οι μετακάρπιες φλέβες της κλειδαριάς θα διαγραφούν. Είστε σίγουροι ότι θέλετε να επαναφέρετε;", "在线": "Σε απευθείας σύνδεση", "离线": "Εκτός σύνδεσης:" diff --git a/lan/lan_en.json b/lan/lan_en.json index 2324a4de..267c232b 100644 --- a/lan/lan_en.json +++ b/lan/lan_en.json @@ -152,8 +152,6 @@ "升级": "Update", "空闲": "Vacant", "已入住": "Occupied", - "英文": "English", - "简体中文": "Simplified Chinese", "多语言": "Languages", "添加锁": "Add Lock", "锁地址": "Lock Address", @@ -1048,40 +1046,42 @@ "导出锁数据": "Export lock data", "一键开锁": "One-click unlock", "已开通": "Opened", - "繁体中文": "Traditional Chinese", - "法语": "French", - "俄语": "Russian", - "德语": "German", - "日语": "Japanese", - "韩语": "Korean", - "意大利语": "Italian", - "乌克兰语": "Ukrainian", - "葡萄牙语": "Portuguese", - "西班牙语": "Spanish", - "阿拉伯语": "Arabic", - "越南语": "Vietnamese", - "马莱语": "Malay", - "荷兰语": "Dutch", - "罗马尼亚语": "Romanian", - "立陶宛语": "Lithuanian", - "瑞典语": "Swedish", - "爱沙尼亚语": "Estonian", - "波兰语": "Polish", - "斯洛伐克语": "Slovak", - "捷克语": "Czech", - "希腊语": "Greek", - "希伯来语": "Hebrew", - "塞尔维亚语": "Serbian", - "土耳其语": "Turkish", - "匈牙利语": "Hungarian", - "保加利亚语": "Bulgarian", - "哈萨克斯坦语": "Kazakh", - "孟加拉语": "Bengali", - "克罗地亚语": "Croatian", - "泰语": "Thai", - "印度尼西亚语": "Indonesian", - "芬兰语": "Finnish", - "丹麦语": "Danish", + "英文": "English", + "简体中文": "简体中文", + "繁体中文": "繁體中文", + "法语": "Français", + "俄语": "Русский", + "德语": "Deutsch", + "日语": "日本語", + "韩语": "한국어", + "意大利语": "Italiano", + "乌克兰语": "Українська", + "葡萄牙语": "Português", + "西班牙语": "Español", + "阿拉伯语": "العربية", + "越南语": "Tiếng Việt", + "马来语": "Bahasa Melayu", + "荷兰语": "Nederlands", + "罗马尼亚语": "Română", + "立陶宛语": "Lietuvių", + "瑞典语": "Svenska", + "爱沙尼亚语": "Eesti", + "波兰语": "Polski", + "斯洛伐克语": "Slovenčina", + "捷克语": "Čeština", + "希腊语": "Ελληνικά", + "希伯来语": "עברית", + "塞尔维亚语": "Српски", + "土耳其语": "Türkçe", + "匈牙利语": "Magyar", + "保加利亚语": "Български", + "哈萨克斯坦语": "Қазақ", + "孟加拉语": "বাংলা", + "克罗地亚语": "Hrvatski", + "泰语": "ไทย", + "印度尼西亚语": "Bahasa Indonesia", + "芬兰语": "Suomi", + "丹麦语": "Dansk", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "After reset, the metacarpal veins of the lock will be deleted. Are you sure you want to reset?", "在线": "Online", "离线": "Offline", diff --git a/lan/lan_es.json b/lan/lan_es.json index 1f5de08e..2e8a4f34 100644 --- a/lan/lan_es.json +++ b/lan/lan_es.json @@ -151,7 +151,6 @@ "升级": "Actualización", "空闲": "Vacante", "已入住": "Ocupado", - "英文": "Inglés", "多语言": "Idiomas", "添加锁": "Añadir bloqueo", "锁地址": "Dirección de bloqueo", @@ -1047,41 +1046,42 @@ "五": "Cinco", "六": "Seis", "日": "Sol", - "简体中文": "Chino simplificado", - "繁体中文": "Chino tradicional", - "法语": "Francés", - "俄语": "Ruso", - "德语": "Alemán", - "日语": "Japonés", - "韩语": "Coreano", + "英文": "English", + "简体中文": "简体中文", + "繁体中文": "繁體中文", + "法语": "Français", + "俄语": "Русский", + "德语": "Deutsch", + "日语": "日本語", + "韩语": "한국어", "意大利语": "Italiano", - "乌克兰语": "Ucraniano", - "葡萄牙语": "Portugués", + "乌克兰语": "Українська", + "葡萄牙语": "Português", "西班牙语": "Español", - "阿拉伯语": "Árabe", - "越南语": "Vietnamita", - "马莱语": "Malayo", - "荷兰语": "Holandés", - "罗马尼亚语": "Rumano", - "立陶宛语": "Lituano", - "瑞典语": "Sueco", - "爱沙尼亚语": "Estonio", - "波兰语": "Polaco", - "斯洛伐克语": "Eslovaco", - "捷克语": "Checo", - "希腊语": "Griego", - "希伯来语": "Hebreo", - "塞尔维亚语": "Serbio", - "土耳其语": "Turco", - "匈牙利语": "Húngaro", - "保加利亚语": "Búlgaro", - "哈萨克斯坦语": "Kazajo", - "孟加拉语": "Bengalí", - "克罗地亚语": "Croata", - "泰语": "Tailandés", - "印度尼西亚语": "Indonesio", - "芬兰语": "Finlandés", - "丹麦语": "Danés", + "阿拉伯语": "العربية", + "越南语": "Tiếng Việt", + "马来语": "Bahasa Melayu", + "荷兰语": "Nederlands", + "罗马尼亚语": "Română", + "立陶宛语": "Lietuvių", + "瑞典语": "Svenska", + "爱沙尼亚语": "Eesti", + "波兰语": "Polski", + "斯洛伐克语": "Slovenčina", + "捷克语": "Čeština", + "希腊语": "Ελληνικά", + "希伯来语": "עברית", + "塞尔维亚语": "Српски", + "土耳其语": "Türkçe", + "匈牙利语": "Magyar", + "保加利亚语": "Български", + "哈萨克斯坦语": "Қазақ", + "孟加拉语": "বাংলা", + "克罗地亚语": "Hrvatski", + "泰语": "ไทย", + "印度尼西亚语": "Bahasa Indonesia", + "芬兰语": "Suomi", + "丹麦语": "Dansk", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "Después del reinicio, se eliminarán las venas metacarpiales de la cerradura. ¿Está seguro de que desea restablecer?", "在线": "En línea", "离线": "Offline" diff --git a/lan/lan_et.json b/lan/lan_et.json index 296f1779..73f598a1 100644 --- a/lan/lan_et.json +++ b/lan/lan_et.json @@ -151,7 +151,6 @@ "升级": "Uuendamine", "空闲": "Vabanenud", "已入住": "Hõivatud", - "英文": "Inglise keel", "多语言": "Keeled", "添加锁": "Lisa lukus", "锁地址": "Lukusta aadress", @@ -1047,41 +1046,42 @@ "五": "Viis.", "六": "Kuus.", "日": "Päikesel", - "简体中文": "Hiina lihtsustatud", - "繁体中文": "Traditsiooniline hiini", - "法语": "Prantsuse prantse", - "俄语": "Vene keel", - "德语": "Saksa", - "日语": "Jaapani", - "韩语": "Korea keel", - "意大利语": "ItaaliaName", - "乌克兰语": "Ukraina", - "葡萄牙语": "Portugali", - "西班牙语": "Hispaania keel", - "阿拉伯语": "Araabia", - "越南语": "Vietnami", - "马莱语": "Malai", - "荷兰语": "Hollandi keel", - "罗马尼亚语": "Rumeenia keel", - "立陶宛语": "Leedu", - "瑞典语": "Rootsi", - "爱沙尼亚语": "Eesti keel", - "波兰语": "Poola", - "斯洛伐克语": "Slovakia", - "捷克语": "Tšehi", - "希腊语": "Kreeka keel", - "希伯来语": "Heebrea", - "塞尔维亚语": "Serbia", - "土耳其语": "Türgi keel", - "匈牙利语": "Ungari keel", - "保加利亚语": "Bulgaaria", - "哈萨克斯坦语": "Kasaha", - "孟加拉语": "Bengalia", - "克罗地亚语": "Horvaatia", - "泰语": "Taii", - "印度尼西亚语": "Indoneesia keeles", - "芬兰语": "Soome keel", - "丹麦语": "Taani keel", + "英文": "English", + "简体中文": "简体中文", + "繁体中文": "繁體中文", + "法语": "Français", + "俄语": "Русский", + "德语": "Deutsch", + "日语": "日本語", + "韩语": "한국어", + "意大利语": "Italiano", + "乌克兰语": "Українська", + "葡萄牙语": "Português", + "西班牙语": "Español", + "阿拉伯语": "العربية", + "越南语": "Tiếng Việt", + "马来语": "Bahasa Melayu", + "荷兰语": "Nederlands", + "罗马尼亚语": "Română", + "立陶宛语": "Lietuvių", + "瑞典语": "Svenska", + "爱沙尼亚语": "Eesti", + "波兰语": "Polski", + "斯洛伐克语": "Slovenčina", + "捷克语": "Čeština", + "希腊语": "Ελληνικά", + "希伯来语": "עברית", + "塞尔维亚语": "Српски", + "土耳其语": "Türkçe", + "匈牙利语": "Magyar", + "保加利亚语": "Български", + "哈萨克斯坦语": "Қазақ", + "孟加拉语": "বাংলা", + "克罗地亚语": "Hrvatski", + "泰语": "ไทย", + "印度尼西亚语": "Bahasa Indonesia", + "芬兰语": "Suomi", + "丹麦语": "Dansk", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "Pärast lähtestamist kustutatakse luku metakarpaalveenid. Kas tõesti soovid lähtestada?", "在线": "Võrgus", "离线": "Mitte ühendust" diff --git a/lan/lan_fi.json b/lan/lan_fi.json index bca1b2f4..70bc46f9 100644 --- a/lan/lan_fi.json +++ b/lan/lan_fi.json @@ -151,7 +151,6 @@ "升级": "Päivitä", "空闲": "Tyhjät", "已入住": "Hyväksytty", - "英文": "Englanti", "多语言": "Kielet", "添加锁": "Lisää lukko", "锁地址": "Lukitse osoite", @@ -1047,41 +1046,42 @@ "五": "Viisi.", "六": "Kuusi.", "日": "Aurinko", - "简体中文": "Yksinkertaistettu kiinalainen", - "繁体中文": "Perinteinen kiinalainen", - "法语": "Ranskan", - "俄语": "Venäjä", - "德语": "Saksa", - "日语": "Japani", - "韩语": "Korean", - "意大利语": "Italiaa", - "乌克兰语": "Ukraina", - "葡萄牙语": "Portugali", - "西班牙语": "Espanja", - "阿拉伯语": "Arabia", - "越南语": "Vietnamia", - "马莱语": "Malai", - "荷兰语": "Hollanti", - "罗马尼亚语": "Romania", - "立陶宛语": "Liettua", - "瑞典语": "Ruotsi", - "爱沙尼亚语": "Viro", - "波兰语": "Puolan", - "斯洛伐克语": "Slovakia", - "捷克语": "Tšekki", - "希腊语": "Krekki", - "希伯来语": "Heprea", - "塞尔维亚语": "Serbian", - "土耳其语": "Turkki", - "匈牙利语": "Unkarin", - "保加利亚语": "Bulgaria", - "哈萨克斯坦语": "Kazaki", - "孟加拉语": "Bengalia", - "克罗地亚语": "Kroatia", - "泰语": "Thai", - "印度尼西亚语": "Indonesian", - "芬兰语": "Suomen kieli", - "丹麦语": "Tanskan", + "英文": "English", + "简体中文": "简体中文", + "繁体中文": "繁體中文", + "法语": "Français", + "俄语": "Русский", + "德语": "Deutsch", + "日语": "日本語", + "韩语": "한국어", + "意大利语": "Italiano", + "乌克兰语": "Українська", + "葡萄牙语": "Português", + "西班牙语": "Español", + "阿拉伯语": "العربية", + "越南语": "Tiếng Việt", + "马来语": "Bahasa Melayu", + "荷兰语": "Nederlands", + "罗马尼亚语": "Română", + "立陶宛语": "Lietuvių", + "瑞典语": "Svenska", + "爱沙尼亚语": "Eesti", + "波兰语": "Polski", + "斯洛伐克语": "Slovenčina", + "捷克语": "Čeština", + "希腊语": "Ελληνικά", + "希伯来语": "עברית", + "塞尔维亚语": "Српски", + "土耳其语": "Türkçe", + "匈牙利语": "Magyar", + "保加利亚语": "Български", + "哈萨克斯坦语": "Қазақ", + "孟加拉语": "বাংলা", + "克罗地亚语": "Hrvatski", + "泰语": "ไทย", + "印度尼西亚语": "Bahasa Indonesia", + "芬兰语": "Suomi", + "丹麦语": "Dansk", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "Kun lukko on nollattu, metakarppinen suoneet poistetaan. Haluatko varmasti palauttaa?", "在线": "Verkossa", "离线": "Offline-verkosto" diff --git a/lan/lan_fr.json b/lan/lan_fr.json index 0d644d59..e390d100 100644 --- a/lan/lan_fr.json +++ b/lan/lan_fr.json @@ -151,7 +151,6 @@ "升级": "Mise à jour", "空闲": "Vacant", "已入住": "Occupé", - "英文": "Anglais", "多语言": "Langues", "添加锁": "Ajouter un verrou", "锁地址": "Adresse de verrouillage", @@ -1047,41 +1046,42 @@ "五": "Cinq", "六": "Six", "日": "Soleil", - "简体中文": "Chinois simplifié", - "繁体中文": "Chinois traditionnel", + "英文": "English", + "简体中文": "简体中文", + "繁体中文": "繁體中文", "法语": "Français", - "俄语": "Russe", - "德语": "Allemand", - "日语": "Japonais", - "韩语": "Coréen", - "意大利语": "Italien", - "乌克兰语": "Ukrainien", - "葡萄牙语": "Portugais", - "西班牙语": "Espagnol", - "阿拉伯语": "Arabe", - "越南语": "Vietnamien", - "马莱语": "Malais", - "荷兰语": "Néerlandais", - "罗马尼亚语": "Roumain", - "立陶宛语": "Lituanien", - "瑞典语": "Suédois", - "爱沙尼亚语": "Estonien", - "波兰语": "Polonais", - "斯洛伐克语": "Slovaque", - "捷克语": "Tchèque", - "希腊语": "Grec", - "希伯来语": "Hébreu", - "塞尔维亚语": "Serbe", - "土耳其语": "Turc", - "匈牙利语": "Hongrois", - "保加利亚语": "Bulgare", - "哈萨克斯坦语": "Kazakh", - "孟加拉语": "Bengali", - "克罗地亚语": "Croate", - "泰语": "Thaï", - "印度尼西亚语": "Indonésien", - "芬兰语": "Finlandais", - "丹麦语": "Danois", + "俄语": "Русский", + "德语": "Deutsch", + "日语": "日本語", + "韩语": "한국어", + "意大利语": "Italiano", + "乌克兰语": "Українська", + "葡萄牙语": "Português", + "西班牙语": "Español", + "阿拉伯语": "العربية", + "越南语": "Tiếng Việt", + "马来语": "Bahasa Melayu", + "荷兰语": "Nederlands", + "罗马尼亚语": "Română", + "立陶宛语": "Lietuvių", + "瑞典语": "Svenska", + "爱沙尼亚语": "Eesti", + "波兰语": "Polski", + "斯洛伐克语": "Slovenčina", + "捷克语": "Čeština", + "希腊语": "Ελληνικά", + "希伯来语": "עברית", + "塞尔维亚语": "Српски", + "土耳其语": "Türkçe", + "匈牙利语": "Magyar", + "保加利亚语": "Български", + "哈萨克斯坦语": "Қазақ", + "孟加拉语": "বাংলা", + "克罗地亚语": "Hrvatski", + "泰语": "ไทย", + "印度尼西亚语": "Bahasa Indonesia", + "芬兰语": "Suomi", + "丹麦语": "Dansk", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "Après réinitialisation, les veines métacarpiennes de la serrure seront supprimées. Êtes-vous sûr de vouloir réinitialiser?", "在线": "En ligne", "离线": "Hors ligne" diff --git a/lan/lan_he.json b/lan/lan_he.json index 32875dd8..503e43c9 100644 --- a/lan/lan_he.json +++ b/lan/lan_he.json @@ -151,7 +151,6 @@ "升级": "עדכון", "空闲": "ריק", "已入住": "הכבושה", - "英文": "אנגלית", "多语言": "שפות", "添加锁": "הוסף מנעול", "锁地址": "כתובת נעילה", @@ -1047,41 +1046,42 @@ "五": "חמש", "六": "6", "日": "שמש", - "简体中文": "סינית מפושטת", - "繁体中文": "סינית מסורתית", - "法语": "צרפתית", - "俄语": "רוסיות", - "德语": "גרמנית", - "日语": "יפניות", - "韩语": "קוריאניות", - "意大利语": "איטלקית", - "乌克兰语": "אוקראינית", - "葡萄牙语": "מפורטוגוזית", - "西班牙语": "ספרדית", - "阿拉伯语": "ערבית", - "越南语": "וייטנאמיות", - "马莱语": "מלאית", - "荷兰语": "הולנדיות", - "罗马尼亚语": "רומנית", - "立陶宛语": "ליטואנית", - "瑞典语": "סוואדיש", - "爱沙尼亚语": "אסטוני", - "波兰语": "פוליש", - "斯洛伐克语": "סלובק", - "捷克语": "צ 'כית", - "希腊语": "יוונית", - "希伯来语": "היברו", - "塞尔维亚语": "סרבי", - "土耳其语": "טורקי", - "匈牙利语": "הונגרית", - "保加利亚语": "הבולגריות", - "哈萨克斯坦语": "קאזח", - "孟加拉语": "בנגלי", - "克罗地亚语": "קרואטי", - "泰语": "תאילנדי", - "印度尼西亚语": "אינדונזית", - "芬兰语": "עיטורי", - "丹麦语": "דני", + "英文": "English", + "简体中文": "简体中文", + "繁体中文": "繁體中文", + "法语": "Français", + "俄语": "Русский", + "德语": "Deutsch", + "日语": "日本語", + "韩语": "한국어", + "意大利语": "Italiano", + "乌克兰语": "Українська", + "葡萄牙语": "Português", + "西班牙语": "Español", + "阿拉伯语": "العربية", + "越南语": "Tiếng Việt", + "马来语": "Bahasa Melayu", + "荷兰语": "Nederlands", + "罗马尼亚语": "Română", + "立陶宛语": "Lietuvių", + "瑞典语": "Svenska", + "爱沙尼亚语": "Eesti", + "波兰语": "Polski", + "斯洛伐克语": "Slovenčina", + "捷克语": "Čeština", + "希腊语": "Ελληνικά", + "希伯来语": "עברית", + "塞尔维亚语": "Српски", + "土耳其语": "Türkçe", + "匈牙利语": "Magyar", + "保加利亚语": "Български", + "哈萨克斯坦语": "Қазақ", + "孟加拉语": "বাংলা", + "克罗地亚语": "Hrvatski", + "泰语": "ไทย", + "印度尼西亚语": "Bahasa Indonesia", + "芬兰语": "Suomi", + "丹麦语": "Dansk", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "לאחר איפוס, הורידים של המנעול יימחקו. אתה בטוח שברצונך לאפס?", "在线": "באינטרנט", "离线": "מנותק" diff --git a/lan/lan_hr.json b/lan/lan_hr.json index 40591d38..be9f30a6 100644 --- a/lan/lan_hr.json +++ b/lan/lan_hr.json @@ -151,7 +151,6 @@ "升级": "Ažuriraj", "空闲": "Prazno", "已入住": "Zauzeto", - "英文": "EngleskiName", "多语言": "Jezici", "添加锁": "Dodaj zaključanje", "锁地址": "Zaključaj adresu", @@ -1047,41 +1046,42 @@ "五": "Pet.", "六": "Šest.", "日": "Sunce", - "简体中文": "Pojednostavljeni kineski", - "繁体中文": "Tradicionalni kineski", - "法语": "Francuski", - "俄语": "Ruski", - "德语": "Njemački", - "日语": "JapanskiName", - "韩语": "Korejski", - "意大利语": "Talijanski", - "乌克兰语": "Ukrajini", - "葡萄牙语": "Portugalski", - "西班牙语": "Španjolski", - "阿拉伯语": "Arapski", - "越南语": "Vijetnamski", - "马莱语": "Malajski", - "荷兰语": "Nizozemski", - "罗马尼亚语": "Rumunjski", - "立陶宛语": "Litvanski", - "瑞典语": "Švedski", - "爱沙尼亚语": "Estonski", - "波兰语": "Poljski", - "斯洛伐克语": "SlovačkiName", - "捷克语": "Češka", - "希腊语": "Grčki", - "希伯来语": "Hebrejski", - "塞尔维亚语": "Srpski", - "土耳其语": "Turski", - "匈牙利语": "Mađarski", - "保加利亚语": "Bugarski", - "哈萨克斯坦语": "Kazahki", - "孟加拉语": "Bengala", + "英文": "English", + "简体中文": "简体中文", + "繁体中文": "繁體中文", + "法语": "Français", + "俄语": "Русский", + "德语": "Deutsch", + "日语": "日本語", + "韩语": "한국어", + "意大利语": "Italiano", + "乌克兰语": "Українська", + "葡萄牙语": "Português", + "西班牙语": "Español", + "阿拉伯语": "العربية", + "越南语": "Tiếng Việt", + "马来语": "Bahasa Melayu", + "荷兰语": "Nederlands", + "罗马尼亚语": "Română", + "立陶宛语": "Lietuvių", + "瑞典语": "Svenska", + "爱沙尼亚语": "Eesti", + "波兰语": "Polski", + "斯洛伐克语": "Slovenčina", + "捷克语": "Čeština", + "希腊语": "Ελληνικά", + "希伯来语": "עברית", + "塞尔维亚语": "Српски", + "土耳其语": "Türkçe", + "匈牙利语": "Magyar", + "保加利亚语": "Български", + "哈萨克斯坦语": "Қазақ", + "孟加拉语": "বাংলা", "克罗地亚语": "Hrvatski", - "泰语": "Tajlandska", - "印度尼西亚语": "Indonezijski", - "芬兰语": "Finski", - "丹麦语": "Danski", + "泰语": "ไทย", + "印度尼西亚语": "Bahasa Indonesia", + "芬兰语": "Suomi", + "丹麦语": "Dansk", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "Nakon resetiranja, metakarpalne vene brave će biti izbrisane. Jeste li sigurni da želite resetiranje?", "在线": "Na internetu", "离线": "Odspojeno" diff --git a/lan/lan_hu.json b/lan/lan_hu.json index 3aca4aef..2f49c9a8 100644 --- a/lan/lan_hu.json +++ b/lan/lan_hu.json @@ -151,7 +151,6 @@ "升级": "Frissítés", "空闲": "Üresen", "已入住": "Megszállt", - "英文": "Angol", "多语言": "Nyelvek", "添加锁": "Lock hozzáadása", "锁地址": "Lock cím", @@ -1047,41 +1046,42 @@ "五": "Öt", "六": "Hatos", "日": "Sun", - "简体中文": "Egyszerűsített kínai", - "繁体中文": "Hagyományos kínai", - "法语": "Francia", - "俄语": "Orosz", - "德语": "Német", - "日语": "Japán", - "韩语": "Koreai", - "意大利语": "Olasz", - "乌克兰语": "Ukrán", - "葡萄牙语": "Portugál", - "西班牙语": "Spanyol", - "阿拉伯语": "Arab", - "越南语": "Vietnami", - "马莱语": "Maláj", - "荷兰语": "Holland", - "罗马尼亚语": "Román", - "立陶宛语": "Litván", - "瑞典语": "Svéd", - "爱沙尼亚语": "Észt", - "波兰语": "Lengyel", - "斯洛伐克语": "Szlovák", - "捷克语": "Cseh", - "希腊语": "Görög", - "希伯来语": "Héber", - "塞尔维亚语": "Szerb", - "土耳其语": "Török", + "英文": "English", + "简体中文": "简体中文", + "繁体中文": "繁體中文", + "法语": "Français", + "俄语": "Русский", + "德语": "Deutsch", + "日语": "日本語", + "韩语": "한국어", + "意大利语": "Italiano", + "乌克兰语": "Українська", + "葡萄牙语": "Português", + "西班牙语": "Español", + "阿拉伯语": "العربية", + "越南语": "Tiếng Việt", + "马来语": "Bahasa Melayu", + "荷兰语": "Nederlands", + "罗马尼亚语": "Română", + "立陶宛语": "Lietuvių", + "瑞典语": "Svenska", + "爱沙尼亚语": "Eesti", + "波兰语": "Polski", + "斯洛伐克语": "Slovenčina", + "捷克语": "Čeština", + "希腊语": "Ελληνικά", + "希伯来语": "עברית", + "塞尔维亚语": "Српски", + "土耳其语": "Türkçe", "匈牙利语": "Magyar", - "保加利亚语": "Bolgár", - "哈萨克斯坦语": "Kazah", - "孟加拉语": "Bengáli nyelv", - "克罗地亚语": "Horvát", - "泰语": "Thai", - "印度尼西亚语": "Indonéz", - "芬兰语": "Finn", - "丹麦语": "Dán", + "保加利亚语": "Български", + "哈萨克斯坦语": "Қазақ", + "孟加拉语": "বাংলা", + "克罗地亚语": "Hrvatski", + "泰语": "ไทย", + "印度尼西亚语": "Bahasa Indonesia", + "芬兰语": "Suomi", + "丹麦语": "Dansk", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "A reset után a zár metakarpális erei törlődnek. Biztos vagy benne, hogy vissza akarsz állítani?", "在线": "Online", "离线": "Offline" diff --git a/lan/lan_id.json b/lan/lan_id.json index d10ae22f..fc2ab4bb 100644 --- a/lan/lan_id.json +++ b/lan/lan_id.json @@ -151,7 +151,6 @@ "升级": "Perbarui", "空闲": "Kosong", "已入住": "Sibuk", - "英文": "Inggris", "多语言": "Bahasa", "添加锁": "Tambah kunci", "锁地址": "Kunci alamat", @@ -1047,41 +1046,42 @@ "五": "Lima", "六": "Enam", "日": "Matahari", - "简体中文": "Mandarin sederhana", - "繁体中文": "China Tradisional", - "法语": "Prancis", - "俄语": "Rusia", - "德语": "Jerman", - "日语": "Jepang", - "韩语": "Korea", - "意大利语": "Italia", - "乌克兰语": "Ukraina", - "葡萄牙语": "Portugis", - "西班牙语": "Spanyol", - "阿拉伯语": "Arab", - "越南语": "Vietnam", - "马莱语": "Melayu", - "荷兰语": "Belanda", - "罗马尼亚语": "Rumania", - "立陶宛语": "Pertanyaan Umum", - "瑞典语": "Swedia", - "爱沙尼亚语": "Amnya", - "波兰语": "Semir", - "斯洛伐克语": "Longgar", - "捷克语": "Ceko", - "希腊语": "Yunani", - "希伯来语": "Ibrani", - "塞尔维亚语": "Topi kasual", - "土耳其语": "Turki", - "匈牙利语": "Hungaria", - "保加利亚语": "Bulgarian", - "哈萨克斯坦语": "Kazakhstan", - "孟加拉语": "Berbayang", - "克罗地亚语": "Kroasia", - "泰语": "Thailand", - "印度尼西亚语": "Indonesia", - "芬兰语": "Finlandia", - "丹麦语": "Denmark", + "英文": "English", + "简体中文": "简体中文", + "繁体中文": "繁體中文", + "法语": "Français", + "俄语": "Русский", + "德语": "Deutsch", + "日语": "日本語", + "韩语": "한국어", + "意大利语": "Italiano", + "乌克兰语": "Українська", + "葡萄牙语": "Português", + "西班牙语": "Español", + "阿拉伯语": "العربية", + "越南语": "Tiếng Việt", + "马来语": "Bahasa Melayu", + "荷兰语": "Nederlands", + "罗马尼亚语": "Română", + "立陶宛语": "Lietuvių", + "瑞典语": "Svenska", + "爱沙尼亚语": "Eesti", + "波兰语": "Polski", + "斯洛伐克语": "Slovenčina", + "捷克语": "Čeština", + "希腊语": "Ελληνικά", + "希伯来语": "עברית", + "塞尔维亚语": "Српски", + "土耳其语": "Türkçe", + "匈牙利语": "Magyar", + "保加利亚语": "Български", + "哈萨克斯坦语": "Қазақ", + "孟加拉语": "বাংলা", + "克罗地亚语": "Hrvatski", + "泰语": "ไทย", + "印度尼西亚语": "Bahasa Indonesia", + "芬兰语": "Suomi", + "丹麦语": "Dansk", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "Setelah mengulang, pembuluh darah metakarpal dari kunci akan dihapus. Yakin ingin mengatur ulang?", "在线": "Online", "离线": "Offline" diff --git a/lan/lan_it.json b/lan/lan_it.json index 46df6491..918556ab 100644 --- a/lan/lan_it.json +++ b/lan/lan_it.json @@ -151,7 +151,6 @@ "升级": "Aggiornamento", "空闲": "Sgomberato", "已入住": "Occupato", - "英文": "Inglese", "多语言": "Lingue", "添加锁": "Aggiungi blocco", "锁地址": "Blocca indirizzo", @@ -1047,41 +1046,42 @@ "五": "Cinque", "六": "Sei", "日": "Sole", - "简体中文": "Cinese semplificato", - "繁体中文": "Cinese tradizionale", - "法语": "Francese", - "俄语": "Russo", - "德语": "Tedesco", - "日语": "Giapponese", - "韩语": "Coreano", + "英文": "English", + "简体中文": "简体中文", + "繁体中文": "繁體中文", + "法语": "Français", + "俄语": "Русский", + "德语": "Deutsch", + "日语": "日本語", + "韩语": "한국어", "意大利语": "Italiano", - "乌克兰语": "Ucraino", - "葡萄牙语": "Portoghese", - "西班牙语": "Spagnolo", - "阿拉伯语": "Arabo", - "越南语": "Vietnamita", - "马莱语": "Malese", - "荷兰语": "Olandese", - "罗马尼亚语": "Rumeno", - "立陶宛语": "Lituano", - "瑞典语": "Svedese", - "爱沙尼亚语": "Estone", - "波兰语": "Polacco", - "斯洛伐克语": "Slovacco", - "捷克语": "Ceco", - "希腊语": "Greco", - "希伯来语": "Ebraico", - "塞尔维亚语": "Serbo", - "土耳其语": "Turco", - "匈牙利语": "Ungherese", - "保加利亚语": "Bulgaro", - "哈萨克斯坦语": "Kazako", - "孟加拉语": "Bengalese", - "克罗地亚语": "Croato", - "泰语": "Tailandese", - "印度尼西亚语": "Indonesiano", - "芬兰语": "Finlandese", - "丹麦语": "Danese", + "乌克兰语": "Українська", + "葡萄牙语": "Português", + "西班牙语": "Español", + "阿拉伯语": "العربية", + "越南语": "Tiếng Việt", + "马来语": "Bahasa Melayu", + "荷兰语": "Nederlands", + "罗马尼亚语": "Română", + "立陶宛语": "Lietuvių", + "瑞典语": "Svenska", + "爱沙尼亚语": "Eesti", + "波兰语": "Polski", + "斯洛伐克语": "Slovenčina", + "捷克语": "Čeština", + "希腊语": "Ελληνικά", + "希伯来语": "עברית", + "塞尔维亚语": "Српски", + "土耳其语": "Türkçe", + "匈牙利语": "Magyar", + "保加利亚语": "Български", + "哈萨克斯坦语": "Қазақ", + "孟加拉语": "বাংলা", + "克罗地亚语": "Hrvatski", + "泰语": "ไทย", + "印度尼西亚语": "Bahasa Indonesia", + "芬兰语": "Suomi", + "丹麦语": "Dansk", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "Dopo il reset, le vene metacarpali della serratura verranno cancellate. Sei sicuro di voler reimpostare?", "在线": "Online", "离线": "Offline" diff --git a/lan/lan_ja.json b/lan/lan_ja.json index b019425a..e0820b72 100644 --- a/lan/lan_ja.json +++ b/lan/lan_ja.json @@ -151,7 +151,6 @@ "升级": "更新", "空闲": "空いている", "已入住": "占有", - "英文": "英語", "多语言": "言語", "添加锁": "ロックの追加", "锁地址": "アドレスをロック", @@ -1047,41 +1046,42 @@ "五": "5", "六": "6つ", "日": "太陽", - "简体中文": "簡体字中国語", - "繁体中文": "伝統的な中国語", - "法语": "フランス語", - "俄语": "ロシア語", - "德语": "ドイツ語", - "日语": "日语", - "韩语": "韓国語", - "意大利语": "イタリア語", - "乌克兰语": "ウクライナ", - "葡萄牙语": "ポルトガル语", - "西班牙语": "スペイン語", - "阿拉伯语": "アラビア語", - "越南语": "ベトナム人", - "马莱语": "マレー", - "荷兰语": "オランダ語", - "罗马尼亚语": "ルーマニア", - "立陶宛语": "リトアニア語", - "瑞典语": "スウェーデン語", - "爱沙尼亚语": "エストニア語", - "波兰语": "ポーランド語", - "斯洛伐克语": "スロバキア", - "捷克语": "チェコ", - "希腊语": "ギリシャ語", - "希伯来语": "ヘブライ語", - "塞尔维亚语": "セルビア語", - "土耳其语": "トルコ語", - "匈牙利语": "ハンガリー語", - "保加利亚语": "ブルガリア語", - "哈萨克斯坦语": "カザフ", - "孟加拉语": "ベンガル語", - "克罗地亚语": "クロアチア语", - "泰语": "タイ", - "印度尼西亚语": "インドネシア语", - "芬兰语": "フィンランド語", - "丹麦语": "デンマーク语", + "英文": "English", + "简体中文": "简体中文", + "繁体中文": "繁體中文", + "法语": "Français", + "俄语": "Русский", + "德语": "Deutsch", + "日语": "日本語", + "韩语": "한국어", + "意大利语": "Italiano", + "乌克兰语": "Українська", + "葡萄牙语": "Português", + "西班牙语": "Español", + "阿拉伯语": "العربية", + "越南语": "Tiếng Việt", + "马来语": "Bahasa Melayu", + "荷兰语": "Nederlands", + "罗马尼亚语": "Română", + "立陶宛语": "Lietuvių", + "瑞典语": "Svenska", + "爱沙尼亚语": "Eesti", + "波兰语": "Polski", + "斯洛伐克语": "Slovenčina", + "捷克语": "Čeština", + "希腊语": "Ελληνικά", + "希伯来语": "עברית", + "塞尔维亚语": "Српски", + "土耳其语": "Türkçe", + "匈牙利语": "Magyar", + "保加利亚语": "Български", + "哈萨克斯坦语": "Қазақ", + "孟加拉语": "বাংলা", + "克罗地亚语": "Hrvatski", + "泰语": "ไทย", + "印度尼西亚语": "Bahasa Indonesia", + "芬兰语": "Suomi", + "丹麦语": "Dansk", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "リセット後、ロックの中手骨静脈が削除されます。リセットしてもよろしいですか。", "在线": "オンライン", "离线": "オフライン" diff --git a/lan/lan_kk.json b/lan/lan_kk.json index de091adf..c24eee0e 100644 --- a/lan/lan_kk.json +++ b/lan/lan_kk.json @@ -151,7 +151,6 @@ "升级": "Жаңарту", "空闲": "Таңдау", "已入住": "Бетті", - "英文": "Англияс", "多语言": "Тілдер", "添加锁": "Осы қосу", "锁地址": "Адресті бұғаттау", @@ -1047,41 +1046,42 @@ "五": "Бест", "六": "Алтынта", "日": "Күн", - "简体中文": "ҚытайшаComment", - "繁体中文": "Қытайша (Картықты)", - "法语": "Француз", - "俄语": "Орусы", - "德语": "Немис", - "日语": "ЖапоныName", - "韩语": "КорейшеName", - "意大利语": "ИталияName", - "乌克兰语": "УкраинаName", - "葡萄牙语": "Португал", - "西班牙语": "ІспаншаName", - "阿拉伯语": "АрабшаName", - "越南语": "ВьетнамыName", - "马莱语": "Малайя", - "荷兰语": "Ниландық", - "罗马尼亚语": "РумынName", - "立陶宛语": "ЛитваName", - "瑞典语": "ШведшаName", - "爱沙尼亚语": "ЕстоншаName", - "波兰语": "ПолякшаName", - "斯洛伐克语": "Словак", - "捷克语": "Чехі", - "希腊语": "Грек", - "希伯来语": "Иврит", - "塞尔维亚语": "СербName", - "土耳其语": "ТүркшеName", - "匈牙利语": "ВенгрияName", - "保加利亚语": "БолгарыName", - "哈萨克斯坦语": "Қазак", - "孟加拉语": "Бенгальа", - "克罗地亚语": "Хорватия", - "泰语": "Тайи", - "印度尼西亚语": "ИндонезияName", - "芬兰语": "Финл", - "丹麦语": "Даниш", + "英文": "English", + "简体中文": "简体中文", + "繁体中文": "繁體中文", + "法语": "Français", + "俄语": "Русский", + "德语": "Deutsch", + "日语": "日本語", + "韩语": "한국어", + "意大利语": "Italiano", + "乌克兰语": "Українська", + "葡萄牙语": "Português", + "西班牙语": "Español", + "阿拉伯语": "العربية", + "越南语": "Tiếng Việt", + "马来语": "Bahasa Melayu", + "荷兰语": "Nederlands", + "罗马尼亚语": "Română", + "立陶宛语": "Lietuvių", + "瑞典语": "Svenska", + "爱沙尼亚语": "Eesti", + "波兰语": "Polski", + "斯洛伐克语": "Slovenčina", + "捷克语": "Čeština", + "希腊语": "Ελληνικά", + "希伯来语": "עברית", + "塞尔维亚语": "Српски", + "土耳其语": "Türkçe", + "匈牙利语": "Magyar", + "保加利亚语": "Български", + "哈萨克斯坦语": "Қазақ", + "孟加拉语": "বাংলা", + "克罗地亚语": "Hrvatski", + "泰语": "ไทย", + "印度尼西亚语": "Bahasa Indonesia", + "芬兰语": "Suomi", + "丹麦语": "Dansk", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "Қайта ысырып тастағаннан соң бұғаттағы метакарпалар өшіріледі. Шынымен ысырып тастауды қалайсыз ба?", "在线": "Онлайн", "离线": "Желіде емес" diff --git a/lan/lan_ko.json b/lan/lan_ko.json index d5655bf2..9155abe1 100644 --- a/lan/lan_ko.json +++ b/lan/lan_ko.json @@ -151,7 +151,6 @@ "升级": "업데이트", "空闲": "빈", "已入住": "점령", - "英文": "영어", "多语言": "언어", "添加锁": "잠금 추가", "锁地址": "주소 잠금", @@ -1047,41 +1046,42 @@ "五": "다섯", "六": "여섯", "日": "태양", - "简体中文": "중국어 간체", - "繁体中文": "중국 전통", - "法语": "프랑스어", - "俄语": "러시아어", - "德语": "독일어", - "日语": "일본어", + "英文": "English", + "简体中文": "简体中文", + "繁体中文": "繁體中文", + "法语": "Français", + "俄语": "Русский", + "德语": "Deutsch", + "日语": "日本語", "韩语": "한국어", - "意大利语": "이탈리아어", - "乌克兰语": "우크라이나어", - "葡萄牙语": "포르투갈어", - "西班牙语": "스페인어", - "阿拉伯语": "아랍어", - "越南语": "베트남", - "马莱语": "말레이", - "荷兰语": "네덜란드", - "罗马尼亚语": "루마니아어", - "立陶宛语": "리투아니아", - "瑞典语": "스웨덴", - "爱沙尼亚语": "에스토니아", - "波兰语": "폴란드어", - "斯洛伐克语": "슬로바키아어", - "捷克语": "체코", - "希腊语": "그리스어", - "希伯来语": "히브리어", - "塞尔维亚语": "세르비아어", - "土耳其语": "터키", - "匈牙利语": "헝가리", - "保加利亚语": "불가리아어", - "哈萨克斯坦语": "카자흐", - "孟加拉语": "벵골어", - "克罗地亚语": "크로아티아", - "泰语": "태국", - "印度尼西亚语": "인도네시아", - "芬兰语": "핀란드어", - "丹麦语": "덴마크어", + "意大利语": "Italiano", + "乌克兰语": "Українська", + "葡萄牙语": "Português", + "西班牙语": "Español", + "阿拉伯语": "العربية", + "越南语": "Tiếng Việt", + "马来语": "Bahasa Melayu", + "荷兰语": "Nederlands", + "罗马尼亚语": "Română", + "立陶宛语": "Lietuvių", + "瑞典语": "Svenska", + "爱沙尼亚语": "Eesti", + "波兰语": "Polski", + "斯洛伐克语": "Slovenčina", + "捷克语": "Čeština", + "希腊语": "Ελληνικά", + "希伯来语": "עברית", + "塞尔维亚语": "Српски", + "土耳其语": "Türkçe", + "匈牙利语": "Magyar", + "保加利亚语": "Български", + "哈萨克斯坦语": "Қазақ", + "孟加拉语": "বাংলা", + "克罗地亚语": "Hrvatski", + "泰语": "ไทย", + "印度尼西亚语": "Bahasa Indonesia", + "芬兰语": "Suomi", + "丹麦语": "Dansk", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "재설정 후 잠금 장치의 중수골 정맥이 삭제됩니다. 당신은 당신이 재설정 하시겠습니까?", "在线": "온라인", "离线": "오프라인" diff --git a/lan/lan_lt.json b/lan/lan_lt.json index 31fb9a90..ad5ec52e 100644 --- a/lan/lan_lt.json +++ b/lan/lan_lt.json @@ -151,7 +151,6 @@ "升级": "Atnaujinimas", "空闲": "Laisvas", "已入住": "Okupuotas", - "英文": "Anglų kalba", "多语言": "Kalbos", "添加锁": "Pridėti užraktą", "锁地址": "Užraktas adresas", @@ -1047,41 +1046,42 @@ "五": "Penki", "六": "Šeši", "日": "Saulė", - "简体中文": "Supaprastinta kinų kalba", - "繁体中文": "Tradicinė kinų kalba", - "法语": "Prancūzų kalba", - "俄语": "Rusai", - "德语": "Vokiečių kalba", - "日语": "Japonai", - "韩语": "Korėjietis", - "意大利语": "Itališki", - "乌克兰语": "Ukrainietis", - "葡萄牙语": "Portugalų kalba", - "西班牙语": "Ispanų kalba", - "阿拉伯语": "Arabų kalba", - "越南语": "Vietnamiečiai", - "马莱语": "Malajų kalba", - "荷兰语": "Olandų kalba", - "罗马尼亚语": "Rumunų kalba", - "立陶宛语": "Lietuviai", - "瑞典语": "Švedų", - "爱沙尼亚语": "Estų kalba", - "波兰语": "Lenkiškai", - "斯洛伐克语": "Slovakų", - "捷克语": "Čekai", - "希腊语": "Graikų kalba", - "希伯来语": "Hebrajų kalba", - "塞尔维亚语": "Serbų kalba", - "土耳其语": "Turkų kalba", - "匈牙利语": "Vengrai", - "保加利亚语": "Bulgarų kalba", - "哈萨克斯坦语": "Kazachai", - "孟加拉语": "Bengalų kalba", - "克罗地亚语": "Kroatų kalba", - "泰语": "Tajų", - "印度尼西亚语": "Indoneziečiai", - "芬兰语": "Suomių kalba", - "丹麦语": "Danų", + "英文": "English", + "简体中文": "简体中文", + "繁体中文": "繁體中文", + "法语": "Français", + "俄语": "Русский", + "德语": "Deutsch", + "日语": "日本語", + "韩语": "한국어", + "意大利语": "Italiano", + "乌克兰语": "Українська", + "葡萄牙语": "Português", + "西班牙语": "Español", + "阿拉伯语": "العربية", + "越南语": "Tiếng Việt", + "马来语": "Bahasa Melayu", + "荷兰语": "Nederlands", + "罗马尼亚语": "Română", + "立陶宛语": "Lietuvių", + "瑞典语": "Svenska", + "爱沙尼亚语": "Eesti", + "波兰语": "Polski", + "斯洛伐克语": "Slovenčina", + "捷克语": "Čeština", + "希腊语": "Ελληνικά", + "希伯来语": "עברית", + "塞尔维亚语": "Српски", + "土耳其语": "Türkçe", + "匈牙利语": "Magyar", + "保加利亚语": "Български", + "哈萨克斯坦语": "Қазақ", + "孟加拉语": "বাংলা", + "克罗地亚语": "Hrvatski", + "泰语": "ไทย", + "印度尼西亚语": "Bahasa Indonesia", + "芬兰语": "Suomi", + "丹麦语": "Dansk", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "Po reset užrakto metakarpinės venos bus ištrintos. Ar tikrai norite atstatyti?", "在线": "Online", "离线": "Neprisijungęs" diff --git a/lan/lan_ms.json b/lan/lan_ms.json index 9da4c324..b8dbb4d2 100644 --- a/lan/lan_ms.json +++ b/lan/lan_ms.json @@ -151,7 +151,6 @@ "升级": "Kemas kini", "空闲": "Kosong", "已入住": "Diduduki", - "英文": "Bahasa inggeris", "多语言": "Bahasa", "添加锁": "Tambah kunci", "锁地址": "Alamat kunci", @@ -1047,41 +1046,42 @@ "五": "Lima", "六": "Enam", "日": "Matahari", - "简体中文": "Cina ringkas", - "繁体中文": "Cina tradisional", - "法语": "Perancis", - "俄语": "Rusia", - "德语": "Jerman", - "日语": "Jepun", - "韩语": "Korea", - "意大利语": "Itali", - "乌克兰语": "Ukraine", - "葡萄牙语": "Portugis", - "西班牙语": "Sepanyol", - "阿拉伯语": "Bahasa arab", - "越南语": "Vietnam", - "马莱语": "Melayu", - "荷兰语": "Belanda", - "罗马尼亚语": "Romania", - "立陶宛语": "Lithuania", - "瑞典语": "Sweden", - "爱沙尼亚语": "Estonia", - "波兰语": "Poland", - "斯洛伐克语": "Slovak", - "捷克语": "Czech", - "希腊语": "Greek", - "希伯来语": "Ibrani", - "塞尔维亚语": "Serbia", - "土耳其语": "Turki", - "匈牙利语": "Hungary", - "保加利亚语": "Guru", - "哈萨克斯坦语": "Kazakhstan", - "孟加拉语": "Bengali", - "克罗地亚语": "Croatia", - "泰语": "Thai", - "印度尼西亚语": "Indonesia", - "芬兰语": "Finland", - "丹麦语": "Danish", + "英文": "English", + "简体中文": "简体中文", + "繁体中文": "繁體中文", + "法语": "Français", + "俄语": "Русский", + "德语": "Deutsch", + "日语": "日本語", + "韩语": "한국어", + "意大利语": "Italiano", + "乌克兰语": "Українська", + "葡萄牙语": "Português", + "西班牙语": "Español", + "阿拉伯语": "العربية", + "越南语": "Tiếng Việt", + "马来语": "Bahasa Melayu", + "荷兰语": "Nederlands", + "罗马尼亚语": "Română", + "立陶宛语": "Lietuvių", + "瑞典语": "Svenska", + "爱沙尼亚语": "Eesti", + "波兰语": "Polski", + "斯洛伐克语": "Slovenčina", + "捷克语": "Čeština", + "希腊语": "Ελληνικά", + "希伯来语": "עברית", + "塞尔维亚语": "Српски", + "土耳其语": "Türkçe", + "匈牙利语": "Magyar", + "保加利亚语": "Български", + "哈萨克斯坦语": "Қазақ", + "孟加拉语": "বাংলা", + "克罗地亚语": "Hrvatski", + "泰语": "ไทย", + "印度尼西亚语": "Bahasa Indonesia", + "芬兰语": "Suomi", + "丹麦语": "Dansk", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "Selepas menetapkan semula, urat metacarpal kunci akan dipadamkan. Adakah anda pasti anda mahu menetapkan semula?", "在线": "Dalam talian", "离线": "Luar talian" diff --git a/lan/lan_nl.json b/lan/lan_nl.json index 4918967f..b0c68de9 100644 --- a/lan/lan_nl.json +++ b/lan/lan_nl.json @@ -151,7 +151,6 @@ "升级": "Update", "空闲": "Leegstaand", "已入住": "Bezet", - "英文": "Engels", "多语言": "Talen", "添加锁": "Lock toevoegen", "锁地址": "Vergrendel adres", @@ -1047,41 +1046,42 @@ "五": "Vijf", "六": "Zes", "日": "Zon", - "简体中文": "Vereenvoudigd Chinees", - "繁体中文": "Traditioneel Chinees", - "法语": "Frans", - "俄语": "Russisch", - "德语": "Duits", - "日语": "Japans", - "韩语": "Koreaans", - "意大利语": "Italiaans", - "乌克兰语": "Oekraïens", - "葡萄牙语": "Portugees", - "西班牙语": "Spaans", - "阿拉伯语": "Arabisch", - "越南语": "Vietnamees", - "马莱语": "Maleis", + "英文": "English", + "简体中文": "简体中文", + "繁体中文": "繁體中文", + "法语": "Français", + "俄语": "Русский", + "德语": "Deutsch", + "日语": "日本語", + "韩语": "한국어", + "意大利语": "Italiano", + "乌克兰语": "Українська", + "葡萄牙语": "Português", + "西班牙语": "Español", + "阿拉伯语": "العربية", + "越南语": "Tiếng Việt", + "马来语": "Bahasa Melayu", "荷兰语": "Nederlands", - "罗马尼亚语": "Roemeens", - "立陶宛语": "Litouws", - "瑞典语": "Zweeds", - "爱沙尼亚语": "Estisch", - "波兰语": "Pools", - "斯洛伐克语": "Slowaaks", - "捷克语": "Tsjechisch", - "希腊语": "Grieks", - "希伯来语": "Hebreeuws", - "塞尔维亚语": "Servisch", - "土耳其语": "Turks", - "匈牙利语": "Hongaars", - "保加利亚语": "Bulgaars", - "哈萨克斯坦语": "Kazachs", - "孟加拉语": "Bengaals", - "克罗地亚语": "Kroatisch", - "泰语": "Thai", - "印度尼西亚语": "Indonesisch", - "芬兰语": "Fins", - "丹麦语": "Deens", + "罗马尼亚语": "Română", + "立陶宛语": "Lietuvių", + "瑞典语": "Svenska", + "爱沙尼亚语": "Eesti", + "波兰语": "Polski", + "斯洛伐克语": "Slovenčina", + "捷克语": "Čeština", + "希腊语": "Ελληνικά", + "希伯来语": "עברית", + "塞尔维亚语": "Српски", + "土耳其语": "Türkçe", + "匈牙利语": "Magyar", + "保加利亚语": "Български", + "哈萨克斯坦语": "Қазақ", + "孟加拉语": "বাংলা", + "克罗地亚语": "Hrvatski", + "泰语": "ไทย", + "印度尼西亚语": "Bahasa Indonesia", + "芬兰语": "Suomi", + "丹麦语": "Dansk", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "Na reset worden de middenhandsbeenaders van het slot verwijderd. Weet je zeker dat je wilt resetten?", "在线": "Online", "离线": "Offline" diff --git a/lan/lan_pl.json b/lan/lan_pl.json index a1acf888..916ab557 100644 --- a/lan/lan_pl.json +++ b/lan/lan_pl.json @@ -151,7 +151,6 @@ "升级": "Aktualizacja", "空闲": "Wolny", "已入住": "Zajęte", - "英文": "Angielski", "多语言": "Języki", "添加锁": "Dodaj blokadę", "锁地址": "Adres blokady", @@ -1047,41 +1046,42 @@ "五": "Pięć", "六": "Sześć", "日": "Słońce", - "简体中文": "Chiński uproszczony", - "繁体中文": "Tradycyjny chiński", - "法语": "Francuski", - "俄语": "Rosyjski", - "德语": "Niemiecki", - "日语": "Japońskie", - "韩语": "Koreański", - "意大利语": "Włoski", - "乌克兰语": "Ukraiński", - "葡萄牙语": "Portugalski", - "西班牙语": "Hiszpański", - "阿拉伯语": "Arabski", - "越南语": "Wietnamski", - "马莱语": "Malajski", - "荷兰语": "Holenderski", - "罗马尼亚语": "Rumuński", - "立陶宛语": "Litewski", - "瑞典语": "Szwedzki", - "爱沙尼亚语": "Estoński", - "波兰语": "Polskie", - "斯洛伐克语": "Słowacki", - "捷克语": "Czeski", - "希腊语": "Gr.", - "希伯来语": "Hebrajski", - "塞尔维亚语": "Serbski", - "土耳其语": "Turecki", - "匈牙利语": "Węgierski", - "保加利亚语": "Bułgarski", - "哈萨克斯坦语": "Kazachski", - "孟加拉语": "Bengalski", - "克罗地亚语": "Chorwacki", - "泰语": "Tajskie", - "印度尼西亚语": "Indonezyjski", - "芬兰语": "Fiński", - "丹麦语": "Duński", + "英文": "English", + "简体中文": "简体中文", + "繁体中文": "繁體中文", + "法语": "Français", + "俄语": "Русский", + "德语": "Deutsch", + "日语": "日本語", + "韩语": "한국어", + "意大利语": "Italiano", + "乌克兰语": "Українська", + "葡萄牙语": "Português", + "西班牙语": "Español", + "阿拉伯语": "العربية", + "越南语": "Tiếng Việt", + "马来语": "Bahasa Melayu", + "荷兰语": "Nederlands", + "罗马尼亚语": "Română", + "立陶宛语": "Lietuvių", + "瑞典语": "Svenska", + "爱沙尼亚语": "Eesti", + "波兰语": "Polski", + "斯洛伐克语": "Slovenčina", + "捷克语": "Čeština", + "希腊语": "Ελληνικά", + "希伯来语": "עברית", + "塞尔维亚语": "Српски", + "土耳其语": "Türkçe", + "匈牙利语": "Magyar", + "保加利亚语": "Български", + "哈萨克斯坦语": "Қазақ", + "孟加拉语": "বাংলা", + "克罗地亚语": "Hrvatski", + "泰语": "ไทย", + "印度尼西亚语": "Bahasa Indonesia", + "芬兰语": "Suomi", + "丹麦语": "Dansk", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "Po zresetowaniu żyły śródręcza zamka zostaną usunięte. Czy na pewno chcesz zresetować?", "在线": "Online", "离线": "Offline" diff --git a/lan/lan_pt.json b/lan/lan_pt.json index 0de99988..f3c61fc6 100644 --- a/lan/lan_pt.json +++ b/lan/lan_pt.json @@ -151,7 +151,6 @@ "升级": "Actualizar", "空闲": "Vago", "已入住": "Ocupado", - "英文": "Português", "多语言": "Línguas", "添加锁": "Adicionar Bloqueio", "锁地址": "Bloquear endereço", @@ -1047,41 +1046,42 @@ "五": "Cinco", "六": "Seis", "日": "Sol", - "简体中文": "Chinês simplificado", - "繁体中文": "Chinês tradicional", - "法语": "Francês", - "俄语": "Russo", - "德语": "Alemão", - "日语": "Japonês", - "韩语": "Coreano", + "英文": "English", + "简体中文": "简体中文", + "繁体中文": "繁體中文", + "法语": "Français", + "俄语": "Русский", + "德语": "Deutsch", + "日语": "日本語", + "韩语": "한국어", "意大利语": "Italiano", - "乌克兰语": "Ucraniano", + "乌克兰语": "Українська", "葡萄牙语": "Português", - "西班牙语": "Espanhol", - "阿拉伯语": "Árabe", - "越南语": "Vietnamita", - "马莱语": "Malaio", - "荷兰语": "Neerlandês", - "罗马尼亚语": "Romeno", - "立陶宛语": "Lituano", - "瑞典语": "Sueco", - "爱沙尼亚语": "Estoniano", - "波兰语": "Polonês", - "斯洛伐克语": "Eslovaco", - "捷克语": "Checa", - "希腊语": "Grego", - "希伯来语": "Hebraico", - "塞尔维亚语": "Sérvio", - "土耳其语": "Turco", - "匈牙利语": "Húngaro", - "保加利亚语": "Búlgaro", - "哈萨克斯坦语": "Cazaque", - "孟加拉语": "Bengali", - "克罗地亚语": "Croata", - "泰语": "Tailandesa", - "印度尼西亚语": "Indonésio", - "芬兰语": "Finlandês", - "丹麦语": "Dinamarquês", + "西班牙语": "Español", + "阿拉伯语": "العربية", + "越南语": "Tiếng Việt", + "马来语": "Bahasa Melayu", + "荷兰语": "Nederlands", + "罗马尼亚语": "Română", + "立陶宛语": "Lietuvių", + "瑞典语": "Svenska", + "爱沙尼亚语": "Eesti", + "波兰语": "Polski", + "斯洛伐克语": "Slovenčina", + "捷克语": "Čeština", + "希腊语": "Ελληνικά", + "希伯来语": "עברית", + "塞尔维亚语": "Српски", + "土耳其语": "Türkçe", + "匈牙利语": "Magyar", + "保加利亚语": "Български", + "哈萨克斯坦语": "Қазақ", + "孟加拉语": "বাংলা", + "克罗地亚语": "Hrvatski", + "泰语": "ไทย", + "印度尼西亚语": "Bahasa Indonesia", + "芬兰语": "Suomi", + "丹麦语": "Dansk", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "Após a reinicialização, as veias do metacarpo do bloqueio serão excluídas. Tens a certeza que queres reiniciar?", "在线": "Online", "离线": "Offline" diff --git a/lan/lan_ro.json b/lan/lan_ro.json index 8b3316d4..e0757146 100644 --- a/lan/lan_ro.json +++ b/lan/lan_ro.json @@ -151,7 +151,6 @@ "升级": "Actualizează", "空闲": "Vacanta", "已入住": "Ocupat", - "英文": "Engleză", "多语言": "Limbile", "添加锁": "Adaugă blocare", "锁地址": "Blochează adresa", @@ -1047,41 +1046,42 @@ "五": "Cinci.", "六": "Șase.", "日": "Soarele", - "简体中文": "Chineză simplificată", - "繁体中文": "Chineză tradițională", - "法语": "Franceză", - "俄语": "Rusă", - "德语": "Germană", - "日语": "Japoneză", - "韩语": "Coreeană", - "意大利语": "Italiană", - "乌克兰语": "Ucraineană", - "葡萄牙语": "Portugheză", - "西班牙语": "Spaniolă", - "阿拉伯语": "Arabă", - "越南语": "Vietnameză", - "马莱语": "Malay", - "荷兰语": "Olandeză", + "英文": "English", + "简体中文": "简体中文", + "繁体中文": "繁體中文", + "法语": "Français", + "俄语": "Русский", + "德语": "Deutsch", + "日语": "日本語", + "韩语": "한국어", + "意大利语": "Italiano", + "乌克兰语": "Українська", + "葡萄牙语": "Português", + "西班牙语": "Español", + "阿拉伯语": "العربية", + "越南语": "Tiếng Việt", + "马来语": "Bahasa Melayu", + "荷兰语": "Nederlands", "罗马尼亚语": "Română", - "立陶宛语": "Lituanian", - "瑞典语": "Suedeză", - "爱沙尼亚语": "Estonia", - "波兰语": "Polonă", - "斯洛伐克语": "Slovacă", - "捷克语": "Cehă", - "希腊语": "Greacă", - "希伯来语": "Ebraică", - "塞尔维亚语": "Sârbă", - "土耳其语": "Turcă", - "匈牙利语": "Maghiară", - "保加利亚语": "Bulgară", - "哈萨克斯坦语": "Kazahă", - "孟加拉语": "Bengaleză", - "克罗地亚语": "Croația", - "泰语": "Thai", - "印度尼西亚语": "Indonezia", - "芬兰语": "Finlandeză", - "丹麦语": "Daneză", + "立陶宛语": "Lietuvių", + "瑞典语": "Svenska", + "爱沙尼亚语": "Eesti", + "波兰语": "Polski", + "斯洛伐克语": "Slovenčina", + "捷克语": "Čeština", + "希腊语": "Ελληνικά", + "希伯来语": "עברית", + "塞尔维亚语": "Српски", + "土耳其语": "Türkçe", + "匈牙利语": "Magyar", + "保加利亚语": "Български", + "哈萨克斯坦语": "Қазақ", + "孟加拉语": "বাংলা", + "克罗地亚语": "Hrvatski", + "泰语": "ไทย", + "印度尼西亚语": "Bahasa Indonesia", + "芬兰语": "Suomi", + "丹麦语": "Dansk", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "După resetare, venele metacarpale ale încuietorii vor fi şterse. Sigur doriți să resetați?", "在线": "Online", "离线": "Deconectat" diff --git a/lan/lan_ru.json b/lan/lan_ru.json index 9336b1e0..06476911 100644 --- a/lan/lan_ru.json +++ b/lan/lan_ru.json @@ -151,7 +151,6 @@ "升级": "Обновить", "空闲": "Вакантные", "已入住": "Оккупированные", - "英文": "Английский", "多语言": "Языки", "添加锁": "Добавить блокировку", "锁地址": "Адрес блокировки", @@ -1047,41 +1046,42 @@ "五": "Пять", "六": "Шесть", "日": "Солнце", - "简体中文": "Упрощенный китайский", - "繁体中文": "Традиционный китайский", - "法语": "Французский", + "英文": "English", + "简体中文": "简体中文", + "繁体中文": "繁體中文", + "法语": "Français", "俄语": "Русский", - "德语": "Немецкий", - "日语": "Японский", - "韩语": "Корейский", - "意大利语": "Итальянский", - "乌克兰语": "Украинский", - "葡萄牙语": "Португальский", - "西班牙语": "Испанский", - "阿拉伯语": "Арабский", - "越南语": "Вьетнамский", - "马莱语": "Малайский", - "荷兰语": "Голландский", - "罗马尼亚语": "Румынский", - "立陶宛语": "Литовский", - "瑞典语": "Шведский", - "爱沙尼亚语": "Эстонский", - "波兰语": "Польский", - "斯洛伐克语": "Словацкий", - "捷克语": "Чешский", - "希腊语": "Греческий", - "希伯来语": "Иврит", - "塞尔维亚语": "Сербский", - "土耳其语": "Турецкий", - "匈牙利语": "Венгерский", - "保加利亚语": "Болгарский", - "哈萨克斯坦语": "Казахский", - "孟加拉语": "Бенгальский", - "克罗地亚语": "Хорватский", - "泰语": "Тайский", - "印度尼西亚语": "Индонезийский", - "芬兰语": "Финский", - "丹麦语": "Датский", + "德语": "Deutsch", + "日语": "日本語", + "韩语": "한국어", + "意大利语": "Italiano", + "乌克兰语": "Українська", + "葡萄牙语": "Português", + "西班牙语": "Español", + "阿拉伯语": "العربية", + "越南语": "Tiếng Việt", + "马来语": "Bahasa Melayu", + "荷兰语": "Nederlands", + "罗马尼亚语": "Română", + "立陶宛语": "Lietuvių", + "瑞典语": "Svenska", + "爱沙尼亚语": "Eesti", + "波兰语": "Polski", + "斯洛伐克语": "Slovenčina", + "捷克语": "Čeština", + "希腊语": "Ελληνικά", + "希伯来语": "עברית", + "塞尔维亚语": "Српски", + "土耳其语": "Türkçe", + "匈牙利语": "Magyar", + "保加利亚语": "Български", + "哈萨克斯坦语": "Қазақ", + "孟加拉语": "বাংলা", + "克罗地亚语": "Hrvatski", + "泰语": "ไทย", + "印度尼西亚语": "Bahasa Indonesia", + "芬兰语": "Suomi", + "丹麦语": "Dansk", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "После сброса пястные вены замка будут удалены. Вы уверены, что хотите сбросить?", "在线": "Онлайн", "离线": "Оффлайн" diff --git a/lan/lan_sk.json b/lan/lan_sk.json index 7ef4f027..c6f2da00 100644 --- a/lan/lan_sk.json +++ b/lan/lan_sk.json @@ -151,7 +151,6 @@ "升级": "Aktualizácia", "空闲": "Prázdne", "已入住": "Obsadený", - "英文": "Angl.", "多语言": "Jazyky", "添加锁": "Pridať zámok", "锁地址": "Uzamknúť adresu", @@ -1047,41 +1046,42 @@ "五": "Päť", "六": "Šesť", "日": "Sun", - "简体中文": "Zjednodušená čínština", - "繁体中文": "Tradičná čínština", - "法语": "Francúzština", - "俄语": "Rus", - "德语": "Nemčina", - "日语": "Japončina", - "韩语": "Kórejčina", - "意大利语": "Taliančina", - "乌克兰语": "Ukrajinský", - "葡萄牙语": "Portugalčina", - "西班牙语": "Španielsky", - "阿拉伯语": "Arabčina", - "越南语": "Vietnamčina", - "马莱语": "Malajčina", - "荷兰语": "Holandčina", - "罗马尼亚语": "Rumunčina", - "立陶宛语": "Litovčina", - "瑞典语": "Švédsky", - "爱沙尼亚语": "Estónčina", - "波兰语": "Poľština", + "英文": "English", + "简体中文": "简体中文", + "繁体中文": "繁體中文", + "法语": "Français", + "俄语": "Русский", + "德语": "Deutsch", + "日语": "日本語", + "韩语": "한국어", + "意大利语": "Italiano", + "乌克兰语": "Українська", + "葡萄牙语": "Português", + "西班牙语": "Español", + "阿拉伯语": "العربية", + "越南语": "Tiếng Việt", + "马来语": "Bahasa Melayu", + "荷兰语": "Nederlands", + "罗马尼亚语": "Română", + "立陶宛语": "Lietuvių", + "瑞典语": "Svenska", + "爱沙尼亚语": "Eesti", + "波兰语": "Polski", "斯洛伐克语": "Slovenčina", - "捷克语": "Česky", - "希腊语": "Gréčtina", - "希伯来语": "Hebrejčina", - "塞尔维亚语": "Srbčina", - "土耳其语": "Turečtina", - "匈牙利语": "Maďarčina", - "保加利亚语": "Bulharský", - "哈萨克斯坦语": "Kazaščina", - "孟加拉语": "Bengálčina", - "克罗地亚语": "Chorvátčina", - "泰语": "Thajčina", - "印度尼西亚语": "Indonézsky", - "芬兰语": "Fínčina", - "丹麦语": "Dánsky", + "捷克语": "Čeština", + "希腊语": "Ελληνικά", + "希伯来语": "עברית", + "塞尔维亚语": "Српски", + "土耳其语": "Türkçe", + "匈牙利语": "Magyar", + "保加利亚语": "Български", + "哈萨克斯坦语": "Қазақ", + "孟加拉语": "বাংলা", + "克罗地亚语": "Hrvatski", + "泰语": "ไทย", + "印度尼西亚语": "Bahasa Indonesia", + "芬兰语": "Suomi", + "丹麦语": "Dansk", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "Po resetovaní budú metakarpálne žily zámku vymazané. Ste si istí, že chcete obnoviť?", "在线": "Online", "离线": "Offline" diff --git a/lan/lan_sr_cyrl.json b/lan/lan_sr_cyrl.json index be4f5e46..d6d29147 100644 --- a/lan/lan_sr_cyrl.json +++ b/lan/lan_sr_cyrl.json @@ -152,8 +152,6 @@ "升级": "Ажурирање", "空闲": "Празна", "已入住": "Заузета", - "英文": "Енглески", - "简体中文": "Поједностављени кинески", "多语言": "Језика", "添加锁": "Додај закључавање", "锁地址": "Адреса за закључавање", @@ -1048,40 +1046,42 @@ "导出锁数据": "Извоз података о закључавању", "一键开锁": "Откључавање једним кликом", "已开通": "Отворио", - "繁体中文": "Традиционални кинески", - "法语": "Француски", - "俄语": "Руски", - "德语": "Немачки", - "日语": "Јапански", - "韩语": "Кореански", - "意大利语": "Италијански", - "乌克兰语": "Украјински", - "葡萄牙语": "Португалски", - "西班牙语": "Шпански", - "阿拉伯语": "Арапски", - "越南语": "Вијетнамски", - "马莱语": "Малајски", - "荷兰语": "Холандски", - "罗马尼亚语": "Румунски", - "立陶宛语": "Литвански", - "瑞典语": "Шведски", - "爱沙尼亚语": "Естонски", - "波兰语": "Пољски", - "斯洛伐克语": "Словачки", - "捷克语": "Чешки", - "希腊语": "Грчки", - "希伯来语": "Хебрејски", + "英文": "English", + "简体中文": "简体中文", + "繁体中文": "繁體中文", + "法语": "Français", + "俄语": "Русский", + "德语": "Deutsch", + "日语": "日本語", + "韩语": "한국어", + "意大利语": "Italiano", + "乌克兰语": "Українська", + "葡萄牙语": "Português", + "西班牙语": "Español", + "阿拉伯语": "العربية", + "越南语": "Tiếng Việt", + "马来语": "Bahasa Melayu", + "荷兰语": "Nederlands", + "罗马尼亚语": "Română", + "立陶宛语": "Lietuvių", + "瑞典语": "Svenska", + "爱沙尼亚语": "Eesti", + "波兰语": "Polski", + "斯洛伐克语": "Slovenčina", + "捷克语": "Čeština", + "希腊语": "Ελληνικά", + "希伯来语": "עברית", "塞尔维亚语": "Српски", - "土耳其语": "Турски", - "匈牙利语": "Мађарски", - "保加利亚语": "Бугарски", - "哈萨克斯坦语": "Казахстански", - "孟加拉语": "Бенгалски", - "克罗地亚语": "Хрватски", - "泰语": "Тајландски", - "印度尼西亚语": "Индонежански", - "芬兰语": "Фински", - "丹麦语": "Дански", + "土耳其语": "Türkçe", + "匈牙利语": "Magyar", + "保加利亚语": "Български", + "哈萨克斯坦语": "Қазақ", + "孟加拉语": "বাংলা", + "克罗地亚语": "Hrvatski", + "泰语": "ไทย", + "印度尼西亚语": "Bahasa Indonesia", + "芬兰语": "Suomi", + "丹麦语": "Dansk", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "Након ресетовања, метакарпалне вене браве ће бити избрисане. Да ли сте сигурни да желите да ресетујете?", "在线": "Онлине", "离线": "Ванмрежне" diff --git a/lan/lan_sv.json b/lan/lan_sv.json index 268d0233..57bfb633 100644 --- a/lan/lan_sv.json +++ b/lan/lan_sv.json @@ -151,7 +151,6 @@ "升级": "Uppdatera", "空闲": "Lediga", "已入住": "Upptagen", - "英文": "Engelska", "多语言": "Språk", "添加锁": "Lägg till lås", "锁地址": "Lås adress", @@ -1047,41 +1046,42 @@ "五": "Fem", "六": "Sex", "日": "Solan", - "简体中文": "Förenklad kinesisk", - "繁体中文": "Traditionell kinesisk", - "法语": "Franska", - "俄语": "Ryska", - "德语": "Tyska", - "日语": "Japanska", - "韩语": "Koreanska", - "意大利语": "Italienska", - "乌克兰语": "Ukrainska", - "葡萄牙语": "Portugisiska", - "西班牙语": "Spanska", - "阿拉伯语": "Arabiska", - "越南语": "Vietnamska", - "马莱语": "Malai", - "荷兰语": "Nederländska", - "罗马尼亚语": "Rumänska", - "立陶宛语": "Litauiska", + "英文": "English", + "简体中文": "简体中文", + "繁体中文": "繁體中文", + "法语": "Français", + "俄语": "Русский", + "德语": "Deutsch", + "日语": "日本語", + "韩语": "한국어", + "意大利语": "Italiano", + "乌克兰语": "Українська", + "葡萄牙语": "Português", + "西班牙语": "Español", + "阿拉伯语": "العربية", + "越南语": "Tiếng Việt", + "马来语": "Bahasa Melayu", + "荷兰语": "Nederlands", + "罗马尼亚语": "Română", + "立陶宛语": "Lietuvių", "瑞典语": "Svenska", - "爱沙尼亚语": "Estniska", - "波兰语": "Polska", - "斯洛伐克语": "Slovakiska", - "捷克语": "Tjeckien", - "希腊语": "Grekiska", - "希伯来语": "Hebreiska", - "塞尔维亚语": "Serbiska", - "土耳其语": "Turkiska", - "匈牙利语": "Ungerska", - "保加利亚语": "Bulgariska", - "哈萨克斯坦语": "Kazakiska", - "孟加拉语": "Bengalska", - "克罗地亚语": "Kroatiska", - "泰语": "Thai", - "印度尼西亚语": "Indonesisk", - "芬兰语": "Finska", - "丹麦语": "Danska", + "爱沙尼亚语": "Eesti", + "波兰语": "Polski", + "斯洛伐克语": "Slovenčina", + "捷克语": "Čeština", + "希腊语": "Ελληνικά", + "希伯来语": "עברית", + "塞尔维亚语": "Српски", + "土耳其语": "Türkçe", + "匈牙利语": "Magyar", + "保加利亚语": "Български", + "哈萨克斯坦语": "Қазақ", + "孟加拉语": "বাংলা", + "克罗地亚语": "Hrvatski", + "泰语": "ไทย", + "印度尼西亚语": "Bahasa Indonesia", + "芬兰语": "Suomi", + "丹麦语": "Dansk", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "Efter återställd, de metakarpal venerna i låset tas bort. Är du säker på att du vill återställa?", "在线": "Online:", "离线": "Frånkoppling" diff --git a/lan/lan_th.json b/lan/lan_th.json index 9979d726..5a1b87a0 100644 --- a/lan/lan_th.json +++ b/lan/lan_th.json @@ -151,7 +151,6 @@ "升级": "อัพเดต", "空闲": "Vacant", "已入住": "ครอบครองแล้ว", - "英文": "ภาษาอังกฤษแบบสบายๆ", "多语言": "ภาษาภาษาต่างๆ", "添加锁": "เพิ่มล็อค", "锁地址": "ล็อคที่อยู่", @@ -1047,41 +1046,42 @@ "五": "ห้าส่วน", "六": "หกตัว", "日": "ดวงอาทิตย์ดวงอาทิตย์ดวงอาทิตย์", - "简体中文": "ภาษาจีนแบบง่าย", - "繁体中文": "จีนแบบดั้งเดิม", - "法语": "ภาษาฝรั่งเศสคำ", - "俄语": "รัสเซียกัน", - "德语": "เยอรมันเชิ๊ต", - "日语": "ภาษาญี่ปุ่นญี่ปุ่น", - "韩语": "เกาหลีแบบเกาหลี", - "意大利语": "ชุดสไตล์อิตาลี", - "乌克兰语": "ยูเครนคะ", - "葡萄牙语": "ภาษาโปรตุเกส", - "西班牙语": "สเปน", - "阿拉伯语": "ภาษาอาหรับภาษา", - "越南语": "เวียดนามเวียดนาม", - "马莱语": "มาเลย์", - "荷兰语": "ดัตช์ดัตช์", - "罗马尼亚语": "โรมาเนียนิคลับ", - "立陶宛语": "ลิทัวเนีย", - "瑞典语": "สวีเดน", - "爱沙尼亚语": "เอสโตเนียปี", - "波兰语": "ที่ขัดเงา", - "斯洛伐克语": "สโลวัก", - "捷克语": "ภาษาเช็คคำ", - "希腊语": "ภาษากรีกกรีก", - "希伯来语": "ภาษาฮิบรู", - "塞尔维亚语": "ชาวเซอร์เบีย", - "土耳其语": "ตุรกีแบบ", - "匈牙利语": "ฮังการีส", - "保加利亚语": "บัลแกเรีย", - "哈萨克斯坦语": "คาซากัค", - "孟加拉语": "เบงกาลี", - "克罗地亚语": "โครเอเชียเทียม", - "泰语": "ชุดผ้าไทย", - "印度尼西亚语": "ชาวอินโดนีเซีย", - "芬兰语": "ภาษาฟินแลนด์.", - "丹麦语": "เดนมาร์กแบบเดนมาร์ก", + "英文": "English", + "简体中文": "简体中文", + "繁体中文": "繁體中文", + "法语": "Français", + "俄语": "Русский", + "德语": "Deutsch", + "日语": "日本語", + "韩语": "한국어", + "意大利语": "Italiano", + "乌克兰语": "Українська", + "葡萄牙语": "Português", + "西班牙语": "Español", + "阿拉伯语": "العربية", + "越南语": "Tiếng Việt", + "马来语": "Bahasa Melayu", + "荷兰语": "Nederlands", + "罗马尼亚语": "Română", + "立陶宛语": "Lietuvių", + "瑞典语": "Svenska", + "爱沙尼亚语": "Eesti", + "波兰语": "Polski", + "斯洛伐克语": "Slovenčina", + "捷克语": "Čeština", + "希腊语": "Ελληνικά", + "希伯来语": "עברית", + "塞尔维亚语": "Српски", + "土耳其语": "Türkçe", + "匈牙利语": "Magyar", + "保加利亚语": "Български", + "哈萨克斯坦语": "Қазақ", + "孟加拉语": "বাংলা", + "克罗地亚语": "Hrvatski", + "泰语": "ไทย", + "印度尼西亚语": "Bahasa Indonesia", + "芬兰语": "Suomi", + "丹麦语": "Dansk", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "หลังจากรีเซ็ตแล้วหลอดเลือดดำ metacarpal ของล็อคจะถูกลบออกคุณแน่ใจว่าอยากจะรีเซ็ต?", "在线": "ออนไลน์ผ่าน", "离线": "ออฟไลน์" diff --git a/lan/lan_tr.json b/lan/lan_tr.json index 4bde18e5..df7ca340 100644 --- a/lan/lan_tr.json +++ b/lan/lan_tr.json @@ -151,7 +151,6 @@ "升级": "Güncelleme", "空闲": "Boş boş", "已入住": "Işgal edildi", - "英文": "İngilizce", "多语言": "Diller", "添加锁": "Kilit ekle", "锁地址": "Kilit adresi", @@ -1047,41 +1046,42 @@ "五": "Beş", "六": "Altı", "日": "Güneş", - "简体中文": "Basitleştirilmiş çince", - "繁体中文": "Geleneksel çince", - "法语": "Fransız", - "俄语": "Rusça", - "德语": "Alman", - "日语": "Japon", - "韩语": "Korece", - "意大利语": "İtalyan", - "乌克兰语": "Ukrayna", - "葡萄牙语": "Portekizce", - "西班牙语": "İspanyolca", - "阿拉伯语": "Arapça", - "越南语": "Vietnamca", - "马莱语": "Malay", - "荷兰语": "Hollandalı", - "罗马尼亚语": "Romence", - "立陶宛语": "Litvanya", - "瑞典语": "İsveççe", - "爱沙尼亚语": "Estonya", - "波兰语": "Lehçe", - "斯洛伐克语": "Slovakça", - "捷克语": "Çek", - "希腊语": "Yunan", - "希伯来语": "İbranice", - "塞尔维亚语": "Sırpça", + "英文": "English", + "简体中文": "简体中文", + "繁体中文": "繁體中文", + "法语": "Français", + "俄语": "Русский", + "德语": "Deutsch", + "日语": "日本語", + "韩语": "한국어", + "意大利语": "Italiano", + "乌克兰语": "Українська", + "葡萄牙语": "Português", + "西班牙语": "Español", + "阿拉伯语": "العربية", + "越南语": "Tiếng Việt", + "马来语": "Bahasa Melayu", + "荷兰语": "Nederlands", + "罗马尼亚语": "Română", + "立陶宛语": "Lietuvių", + "瑞典语": "Svenska", + "爱沙尼亚语": "Eesti", + "波兰语": "Polski", + "斯洛伐克语": "Slovenčina", + "捷克语": "Čeština", + "希腊语": "Ελληνικά", + "希伯来语": "עברית", + "塞尔维亚语": "Српски", "土耳其语": "Türkçe", - "匈牙利语": "Macar", - "保加利亚语": "Bulgar", - "哈萨克斯坦语": "Kazak", - "孟加拉语": "Bengali", - "克罗地亚语": "Hırvat", - "泰语": "Tay", - "印度尼西亚语": "Endonezya dili", - "芬兰语": "Fin", - "丹麦语": "Danimarkalı", + "匈牙利语": "Magyar", + "保加利亚语": "Български", + "哈萨克斯坦语": "Қазақ", + "孟加拉语": "বাংলা", + "克罗地亚语": "Hrvatski", + "泰语": "ไทย", + "印度尼西亚语": "Bahasa Indonesia", + "芬兰语": "Suomi", + "丹麦语": "Dansk", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "Sıfırlamadan sonra, kilidin metacarpal damarları silinecektir. Sıfırlamak istediğine emin misin?", "在线": "Çevrimiçi", "离线": "Çevrimdışı" diff --git a/lan/lan_tw.json b/lan/lan_tw.json index 1b771180..367e5a43 100644 --- a/lan/lan_tw.json +++ b/lan/lan_tw.json @@ -151,7 +151,6 @@ "升级": "更新", "空闲": "空缺", "已入住": "已占用", - "英文": "英語", "多语言": "語言", "添加锁": "添加鎖定", "锁地址": "鎖地址", @@ -1047,41 +1046,42 @@ "五": "五個", "六": "六個", "日": "太陽", - "简体中文": "簡體中文", + "英文": "English", + "简体中文": "简体中文", "繁体中文": "繁體中文", - "法语": "法語", - "俄语": "俄語", - "德语": "德語", - "日语": "日語", - "韩语": "韓語", - "意大利语": "意大利語", - "乌克兰语": "烏克蘭語", - "葡萄牙语": "葡萄牙語", - "西班牙语": "西班牙語", - "阿拉伯语": "阿拉伯文", - "越南语": "越南語", - "马莱语": "馬來語", - "荷兰语": "荷蘭語", - "罗马尼亚语": "羅馬尼亞語", - "立陶宛语": "立陶宛語", - "瑞典语": "瑞典語", - "爱沙尼亚语": "愛沙尼亞語", - "波兰语": "波蘭語", - "斯洛伐克语": "斯洛伐克語", - "捷克语": "捷克語", - "希腊语": "希臘語", - "希伯来语": "希伯來語", - "塞尔维亚语": "塞爾維亞語", - "土耳其语": "土耳其語", - "匈牙利语": "匈牙利語", - "保加利亚语": "保加利亞語", - "哈萨克斯坦语": "哈薩克族", - "孟加拉语": "孟加拉語", - "克罗地亚语": "克羅地亞語", - "泰语": "泰語", - "印度尼西亚语": "印度尼西亞語", - "芬兰语": "芬蘭語", - "丹麦语": "丹麥語", + "法语": "Français", + "俄语": "Русский", + "德语": "Deutsch", + "日语": "日本語", + "韩语": "한국어", + "意大利语": "Italiano", + "乌克兰语": "Українська", + "葡萄牙语": "Português", + "西班牙语": "Español", + "阿拉伯语": "العربية", + "越南语": "Tiếng Việt", + "马来语": "Bahasa Melayu", + "荷兰语": "Nederlands", + "罗马尼亚语": "Română", + "立陶宛语": "Lietuvių", + "瑞典语": "Svenska", + "爱沙尼亚语": "Eesti", + "波兰语": "Polski", + "斯洛伐克语": "Slovenčina", + "捷克语": "Čeština", + "希腊语": "Ελληνικά", + "希伯来语": "עברית", + "塞尔维亚语": "Српски", + "土耳其语": "Türkçe", + "匈牙利语": "Magyar", + "保加利亚语": "Български", + "哈萨克斯坦语": "Қазақ", + "孟加拉语": "বাংলা", + "克罗地亚语": "Hrvatski", + "泰语": "ไทย", + "印度尼西亚语": "Bahasa Indonesia", + "芬兰语": "Suomi", + "丹麦语": "Dansk", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "重置後,鎖的掌靜脈將被刪除。 是否確實要重置?", "在线": "在線", "离线": "離線" diff --git a/lan/lan_uk.json b/lan/lan_uk.json index 5a30effd..c4cab98f 100644 --- a/lan/lan_uk.json +++ b/lan/lan_uk.json @@ -152,8 +152,6 @@ "升级": "Оновлювати", "空闲": "Вакантні", "已入住": "Зайняли", - "英文": "Англійська", - "简体中文": "Китайська мова зі спрощеним письмом", "多语言": "Мови", "添加锁": "Додати замок", "锁地址": "Адреса блокування", @@ -1048,40 +1046,42 @@ "导出锁数据": "Експорт даних блокування", "一键开锁": "Розблокування в один клік", "已开通": "Відкрив", - "繁体中文": "Традиційна китайська", - "法语": "Французька", - "俄语": "Російська", - "德语": "Німецька", - "日语": "Японська", - "韩语": "Корейська", - "意大利语": "Італійська", + "英文": "English", + "简体中文": "简体中文", + "繁体中文": "繁體中文", + "法语": "Français", + "俄语": "Русский", + "德语": "Deutsch", + "日语": "日本語", + "韩语": "한국어", + "意大利语": "Italiano", "乌克兰语": "Українська", - "葡萄牙语": "Португальська", - "西班牙语": "Іспанська", - "阿拉伯语": "Арабська", - "越南语": "В\\'єтнамська", - "马莱语": "Малайська", - "荷兰语": "Нідерландська", - "罗马尼亚语": "Румунська", - "立陶宛语": "Литовська", - "瑞典语": "Шведська", - "爱沙尼亚语": "Естонська", - "波兰语": "Польська", - "斯洛伐克语": "Словацька", - "捷克语": "Чеська", - "希腊语": "Грецька", - "希伯来语": "Іврит", - "塞尔维亚语": "Сербський", - "土耳其语": "Турецька", - "匈牙利语": "Угорська", - "保加利亚语": "Болгарська", - "哈萨克斯坦语": "Казахська", - "孟加拉语": "Бенгалі", - "克罗地亚语": "Хорватська", - "泰语": "Тайська", - "印度尼西亚语": "Індонезійська", - "芬兰语": "Фінська", - "丹麦语": "Датська", + "葡萄牙语": "Português", + "西班牙语": "Español", + "阿拉伯语": "العربية", + "越南语": "Tiếng Việt", + "马来语": "Bahasa Melayu", + "荷兰语": "Nederlands", + "罗马尼亚语": "Română", + "立陶宛语": "Lietuvių", + "瑞典语": "Svenska", + "爱沙尼亚语": "Eesti", + "波兰语": "Polski", + "斯洛伐克语": "Slovenčina", + "捷克语": "Čeština", + "希腊语": "Ελληνικά", + "希伯来语": "עברית", + "塞尔维亚语": "Српски", + "土耳其语": "Türkçe", + "匈牙利语": "Magyar", + "保加利亚语": "Български", + "哈萨克斯坦语": "Қазақ", + "孟加拉语": "বাংলা", + "克罗地亚语": "Hrvatski", + "泰语": "ไทย", + "印度尼西亚语": "Bahasa Indonesia", + "芬兰语": "Suomi", + "丹麦语": "Dansk", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "Після скидання п'ясткові вени замку будуть видалені. Ви впевнені, що хочете скинути налаштування?", "在线": "Онлайн", "离线": "Автономних" diff --git a/lan/lan_vi.json b/lan/lan_vi.json index 146a23b8..e31604ed 100644 --- a/lan/lan_vi.json +++ b/lan/lan_vi.json @@ -151,7 +151,6 @@ "升级": "Cập nhật", "空闲": "Trống", "已入住": "Chiếm dụng", - "英文": "Tiếng Anh", "多语言": "Ngôn ngữ", "添加锁": "Thêm khóa", "锁地址": "Địa chỉ khóa", @@ -1047,41 +1046,42 @@ "五": "Năm", "六": "Sáu", "日": "Mặt Trời", - "简体中文": "Tiếng Trung giản thể", - "繁体中文": "Trung Quốc truyền thống", - "法语": "Pháp", - "俄语": "Nga", - "德语": "Tiếng Đức", - "日语": "Nhật Bản", - "韩语": "Hàn Quốc", - "意大利语": "Ý", - "乌克兰语": "Tiếng Ukraina", - "葡萄牙语": "Bồ Đào Nha", - "西班牙语": "Tây Ban Nha", - "阿拉伯语": "Ả Rập", + "英文": "English", + "简体中文": "简体中文", + "繁体中文": "繁體中文", + "法语": "Français", + "俄语": "Русский", + "德语": "Deutsch", + "日语": "日本語", + "韩语": "한국어", + "意大利语": "Italiano", + "乌克兰语": "Українська", + "葡萄牙语": "Português", + "西班牙语": "Español", + "阿拉伯语": "العربية", "越南语": "Tiếng Việt", - "马莱语": "Mã Lai", - "荷兰语": "Hà Lan", - "罗马尼亚语": "Rumani", - "立陶宛语": "Litva", - "瑞典语": "Thụy Điển", - "爱沙尼亚语": "Estonia", - "波兰语": "Đánh bóng", - "斯洛伐克语": "Slovak", - "捷克语": "Séc", - "希腊语": "Hy Lạp", - "希伯来语": "Tiếng Do Thái", - "塞尔维亚语": "Serbia", - "土耳其语": "Thổ Nhĩ Kỳ", - "匈牙利语": "Hungary", - "保加利亚语": "Bulgaria", - "哈萨克斯坦语": "Kazakh", - "孟加拉语": "Bengali", - "克罗地亚语": "Croatia", - "泰语": "Thái", - "印度尼西亚语": "Indonesia", - "芬兰语": "Phần Lan", - "丹麦语": "Đan Mạch", + "马来语": "Bahasa Melayu", + "荷兰语": "Nederlands", + "罗马尼亚语": "Română", + "立陶宛语": "Lietuvių", + "瑞典语": "Svenska", + "爱沙尼亚语": "Eesti", + "波兰语": "Polski", + "斯洛伐克语": "Slovenčina", + "捷克语": "Čeština", + "希腊语": "Ελληνικά", + "希伯来语": "עברית", + "塞尔维亚语": "Српски", + "土耳其语": "Türkçe", + "匈牙利语": "Magyar", + "保加利亚语": "Български", + "哈萨克斯坦语": "Қазақ", + "孟加拉语": "বাংলা", + "克罗地亚语": "Hrvatski", + "泰语": "ไทย", + "印度尼西亚语": "Bahasa Indonesia", + "芬兰语": "Suomi", + "丹麦语": "Dansk", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "Sau khi đặt lại, các tĩnh mạch metacarpal của khóa sẽ bị xóa. Bạn có chắc muốn thiết lập lại không?", "在线": "Trực tuyến", "离线": "Ngoại tuyến" diff --git a/lan/lan_zh.json b/lan/lan_zh.json index a841f34b..e65252ab 100755 --- a/lan/lan_zh.json +++ b/lan/lan_zh.json @@ -153,8 +153,6 @@ "升级": "升级", "空闲": "空闲", "已入住": "已入住", - "英文": "英文", - "简体中文": "简体中文", "多语言": "多语言", "添加锁": "添加锁", "锁地址": "锁地址", @@ -1048,40 +1046,42 @@ "导出锁数据": "导出锁数据", "一键开锁": "一键开锁", "已开通": "已开通", - "繁体中文": "繁体中文", - "法语": "法语", - "俄语": "俄语", - "德语": "德语", - "日语": "日语", - "韩语": "韩语", - "意大利语": "意大利语", - "乌克兰语": "乌克兰语", - "葡萄牙语": "葡萄牙语", - "西班牙语": "西班牙语", - "阿拉伯语": "阿拉伯语", - "越南语": "越南语", - "马莱语": "马莱语", - "荷兰语": "荷兰语", - "罗马尼亚语": "罗马尼亚语", - "立陶宛语": "立陶宛语", - "瑞典语": "瑞典语", - "爱沙尼亚语": "爱沙尼亚语", - "波兰语": "波兰语", - "斯洛伐克语": "斯洛伐克语", - "捷克语": "捷克语", - "希腊语": "希腊语", - "希伯来语": "希伯来语", - "塞尔维亚语": "塞尔维亚语", - "土耳其语": "土耳其语", - "匈牙利语": "匈牙利语", - "保加利亚语": "保加利亚语", - "哈萨克斯坦语": "哈萨克斯坦语", - "孟加拉语": "孟加拉语", - "克罗地亚语": "克罗地亚语", - "泰语": "泰语", - "印度尼西亚语": "印度尼西亚语", - "芬兰语": "芬兰语", - "丹麦语": "丹麦语", + "英文": "English", + "简体中文": "简体中文", + "繁体中文": "繁體中文", + "法语": "Français", + "俄语": "Русский", + "德语": "Deutsch", + "日语": "日本語", + "韩语": "한국어", + "意大利语": "Italiano", + "乌克兰语": "Українська", + "葡萄牙语": "Português", + "西班牙语": "Español", + "阿拉伯语": "العربية", + "越南语": "Tiếng Việt", + "马来语": "Bahasa Melayu", + "荷兰语": "Nederlands", + "罗马尼亚语": "Română", + "立陶宛语": "Lietuvių", + "瑞典语": "Svenska", + "爱沙尼亚语": "Eesti", + "波兰语": "Polski", + "斯洛伐克语": "Slovenčina", + "捷克语": "Čeština", + "希腊语": "Ελληνικά", + "希伯来语": "עברית", + "塞尔维亚语": "Српски", + "土耳其语": "Türkçe", + "匈牙利语": "Magyar", + "保加利亚语": "Български", + "哈萨克斯坦语": "Қазақ", + "孟加拉语": "বাংলা", + "克罗地亚语": "Hrvatski", + "泰语": "ไทย", + "印度尼西亚语": "Bahasa Indonesia", + "芬兰语": "Suomi", + "丹麦语": "Dansk", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？", "在线": "在线", "离线": "离线", diff --git a/lib/blue/io_protocol/io_gateway_configuringWifi.dart b/lib/blue/io_protocol/io_gateway_configuringWifi.dart index 05d0f518..202e9da8 100644 --- a/lib/blue/io_protocol/io_gateway_configuringWifi.dart +++ b/lib/blue/io_protocol/io_gateway_configuringWifi.dart @@ -1,4 +1,3 @@ - // 网关配网 import 'dart:convert'; @@ -8,19 +7,19 @@ import '../io_tool/io_tool.dart'; import '../io_type.dart'; class GatewayConfiguringWifiCommand extends SenderProtocol { - GatewayConfiguringWifiCommand({ this.ssid, this.password, + this.gatewayConfigurationStr, }) : super(CommandType.gatewayConfiguringWifi); String? ssid; String? password; - + String? gatewayConfigurationStr; @override String toString() { - return 'SenderConfiguringWifiCommand{ssid: $ssid, password: $password}'; + return 'SenderConfiguringWifiCommand{ssid: $ssid, password: $password, gatewayConfigurationStr:$gatewayConfigurationStr}'; } @override @@ -46,6 +45,12 @@ class GatewayConfiguringWifiCommand extends SenderProtocol { subData.addAll(utf8.encode(password!)); subData = getFixedLengthList(subData, 20 - passwordLength); + //gatewayConfigurationStr + final int clientIdLength = utf8.encode(gatewayConfigurationStr!).length; + subData.add(clientIdLength); + subData.addAll(utf8.encode(gatewayConfigurationStr!)); + // subData = getFixedLengthList(subData, 20 - clientIdLength); + data.add(subData.length); data.addAll(subData); @@ -55,7 +60,8 @@ class GatewayConfiguringWifiCommand extends SenderProtocol { } class GatewayConfiguringWifiReply extends Reply { - GatewayConfiguringWifiReply.parseData(CommandType commandType, List dataDetail) + GatewayConfiguringWifiReply.parseData( + CommandType commandType, List dataDetail) : super.parseData(commandType, dataDetail) { data = dataDetail; final int status = data[2]; @@ -64,10 +70,11 @@ class GatewayConfiguringWifiReply extends Reply { } class GatewayConfiguringWifiResultReply extends Reply { - GatewayConfiguringWifiResultReply.parseData(CommandType commandType, List dataDetail) + GatewayConfiguringWifiResultReply.parseData( + CommandType commandType, List dataDetail) : super.parseData(commandType, dataDetail) { data = dataDetail; final int status = data[2]; errorWithStstus(status); } -} \ No newline at end of file +} diff --git a/lib/blue/sender_manage.dart b/lib/blue/sender_manage.dart index bfee2f39..ff52ca0d 100755 --- a/lib/blue/sender_manage.dart +++ b/lib/blue/sender_manage.dart @@ -289,13 +289,13 @@ class IoSenderManage { // 转移智能锁 static void sendTransferSmartLockCommand( {required String? lockID, - required String? userID, - required String? keyID, - required List? publicKey, - required List? privateKey, - required List? token, - required int? needAuthor, - CommandSendCallBack? callBack}) { + required String? userID, + required String? keyID, + required List? publicKey, + required List? privateKey, + required List? token, + required int? needAuthor, + CommandSendCallBack? callBack}) { CommandSenderManager().managerSendData( command: FactoryDataResetCommand( lockID: lockID, @@ -471,7 +471,7 @@ class IoSenderManage { required int? needAuthor, required List? signKey, required List? privateKey, - required bool? isBeforeAddUser, + required bool? isBeforeAddUser, CommandSendCallBack? callBack}) { CommandSenderManager().managerSendData( command: SenderAddFingerprintWithTimeCycleCoercionCommand( @@ -566,7 +566,7 @@ class IoSenderManage { required int? needAuthor, required List? signKey, required List? privateKey, - required bool? isBeforeAddUser, + required bool? isBeforeAddUser, CommandSendCallBack? callBack}) { CommandSenderManager().managerSendData( command: SenderAddICCardWithTimeCycleCoercionCommand( @@ -616,24 +616,24 @@ class IoSenderManage { // 添加遥控开始(带限时、循环、胁迫...) static void senderAddRemoteControlWithTimeCycleCoercionCommand( {required String? keyID, - required String? userID, - required int? remoteControlNo, - required int? useCountLimit, - required int? operate, - required int? isAdmin, - required int? isForce, - required List? token, - required int? isRound, - required int? weekRound, - required int? startDate, - required int? endDate, - required String? startTime, - required String? endTime, - required int? needAuthor, - required List? signKey, - required List? privateKey, - required bool? isBeforeAddUser, - CommandSendCallBack? callBack}) { + required String? userID, + required int? remoteControlNo, + required int? useCountLimit, + required int? operate, + required int? isAdmin, + required int? isForce, + required List? token, + required int? isRound, + required int? weekRound, + required int? startDate, + required int? endDate, + required String? startTime, + required String? endTime, + required int? needAuthor, + required List? signKey, + required List? privateKey, + required bool? isBeforeAddUser, + CommandSendCallBack? callBack}) { CommandSenderManager().managerSendData( command: SenderAddRemoteControlWithTimeCycleCoercionCommand( keyID: keyID, @@ -661,12 +661,12 @@ class IoSenderManage { // 取消添加遥控 static void senderCancelAddRemoteControlCommand( {required String? keyID, - required String? userID, - required List? token, - required int? needAuthor, - required List? signKey, - required List? privateKey, - CommandSendCallBack? callBack}) { + required String? userID, + required List? token, + required int? needAuthor, + required List? signKey, + required List? privateKey, + CommandSendCallBack? callBack}) { CommandSenderManager().managerSendData( command: SenderCancelAddRemoteControlCommand( keyID: keyID, @@ -748,24 +748,24 @@ class IoSenderManage { // 添加掌静脉开始(带限时、循环、胁迫...) static void senderAddPalmWithTimeCycleCoercionCommand( {required String? keyID, - required String? userID, - required int? palmNo, - required int? useCountLimit, - required int? operate, - required int? isAdmin, - required int? isForce, - required List? token, - required int? isRound, - required int? weekRound, - required int? startDate, - required int? endDate, - required String? startTime, - required String? endTime, - required int? needAuthor, - required List? signKey, - required List? privateKey, - required bool? isBeforeAddUser, - CommandSendCallBack? callBack}) { + required String? userID, + required int? palmNo, + required int? useCountLimit, + required int? operate, + required int? isAdmin, + required int? isForce, + required List? token, + required int? isRound, + required int? weekRound, + required int? startDate, + required int? endDate, + required String? startTime, + required String? endTime, + required int? needAuthor, + required List? signKey, + required List? privateKey, + required bool? isBeforeAddUser, + CommandSendCallBack? callBack}) { CommandSenderManager().managerSendData( command: SenderAddPalmWithTimeCycleCoercionCommand( keyID: keyID, @@ -793,12 +793,12 @@ class IoSenderManage { // 取消添加掌静脉 static void senderCancelAddPalmCommand( {required String? keyID, - required String? userID, - required List? token, - required int? needAuthor, - required List? signKey, - required List? privateKey, - CommandSendCallBack? callBack}) { + required String? userID, + required List? token, + required int? needAuthor, + required List? signKey, + required List? privateKey, + CommandSendCallBack? callBack}) { CommandSenderManager().managerSendData( command: SenderCancelAddPalmCommand( keyID: keyID, @@ -1373,13 +1373,13 @@ class IoSenderManage { required int? needAuthor, required List? signKey, required List? privateKey, - CommandSendCallBack? callBack}) { + CommandSendCallBack? callBack}) { CommandSenderManager().managerSendData( command: UpdataLockPasswordListCommand( lockID: lockID, userID: userID, - page:page, - countReq:countReq, + page: page, + countReq: countReq, token: token, needAuthor: needAuthor, signKey: signKey, @@ -1391,20 +1391,20 @@ class IoSenderManage { // 上传数据获取锁密码列表 static void updataLockCardListCommand( {required String? lockID, - required String? userID, - required int? page, - required int? countReq, - required List? token, - required int? needAuthor, - required List? signKey, - required List? privateKey, - CommandSendCallBack? callBack}) { + required String? userID, + required int? page, + required int? countReq, + required List? token, + required int? needAuthor, + required List? signKey, + required List? privateKey, + CommandSendCallBack? callBack}) { CommandSenderManager().managerSendData( command: UpdataLockCardListCommand( lockID: lockID, userID: userID, - page:page, - countReq:countReq, + page: page, + countReq: countReq, token: token, needAuthor: needAuthor, signKey: signKey, @@ -1416,20 +1416,20 @@ class IoSenderManage { // 上传数据获取锁指纹列表 static void updataLockFingerprintListCommand( {required String? lockID, - required String? userID, - required int? page, - required int? countReq, - required List? token, - required int? needAuthor, - required List? signKey, - required List? privateKey, - CommandSendCallBack? callBack}) { + required String? userID, + required int? page, + required int? countReq, + required List? token, + required int? needAuthor, + required List? signKey, + required List? privateKey, + CommandSendCallBack? callBack}) { CommandSenderManager().managerSendData( command: UpdataLockFingerprintListCommand( lockID: lockID, userID: userID, - page:page, - countReq:countReq, + page: page, + countReq: countReq, token: token, needAuthor: needAuthor, signKey: signKey, @@ -1441,20 +1441,20 @@ class IoSenderManage { // 上传数据获取锁人脸列表 static void updataLockFaceListCommand( {required String? lockID, - required String? userID, - required int? page, - required int? countReq, - required List? token, - required int? needAuthor, - required List? signKey, - required List? privateKey, - CommandSendCallBack? callBack}) { + required String? userID, + required int? page, + required int? countReq, + required List? token, + required int? needAuthor, + required List? signKey, + required List? privateKey, + CommandSendCallBack? callBack}) { CommandSenderManager().managerSendData( command: UpdataLockFaceListCommand( lockID: lockID, userID: userID, - page:page, - countReq:countReq, + page: page, + countReq: countReq, token: token, needAuthor: needAuthor, signKey: signKey, @@ -1466,20 +1466,20 @@ class IoSenderManage { // 上传数据获取锁掌静脉列表 static void updataLockPalmVeinListCommand( {required String? lockID, - required String? userID, - required int? page, - required int? countReq, - required List? token, - required int? needAuthor, - required List? signKey, - required List? privateKey, - CommandSendCallBack? callBack}) { + required String? userID, + required int? page, + required int? countReq, + required List? token, + required int? needAuthor, + required List? signKey, + required List? privateKey, + CommandSendCallBack? callBack}) { CommandSenderManager().managerSendData( command: UpdataLockPalmVeinListCommand( lockID: lockID, userID: userID, - page:page, - countReq:countReq, + page: page, + countReq: countReq, token: token, needAuthor: needAuthor, signKey: signKey, @@ -1491,20 +1491,20 @@ class IoSenderManage { // 上传数据获取锁掌静脉列表 static void updataLockRemoteControlListCommand( {required String? lockID, - required String? userID, - required int? page, - required int? countReq, - required List? token, - required int? needAuthor, - required List? signKey, - required List? privateKey, - CommandSendCallBack? callBack}) { + required String? userID, + required int? page, + required int? countReq, + required List? token, + required int? needAuthor, + required List? signKey, + required List? privateKey, + CommandSendCallBack? callBack}) { CommandSenderManager().managerSendData( command: UpdataLockRemoteControlListCommand( lockID: lockID, userID: userID, - page:page, - countReq:countReq, + page: page, + countReq: countReq, token: token, needAuthor: needAuthor, signKey: signKey, @@ -1516,12 +1516,12 @@ class IoSenderManage { // 上传数据获取锁设置 static void updataLockSetCommand( {required String? lockID, - required String? userID, - required List? token, - required int? needAuthor, - required List? signKey, - required List? privateKey, - CommandSendCallBack? callBack}) { + required String? userID, + required List? token, + required int? needAuthor, + required List? signKey, + required List? privateKey, + CommandSendCallBack? callBack}) { CommandSenderManager().managerSendData( command: UpdataLockSetCommand( lockID: lockID, @@ -1536,8 +1536,7 @@ class IoSenderManage { // 网关获取wifi列表 static void gatewayGetWifiCommand( - {required String? userID, - CommandSendCallBack? callBack}) { + {required String? userID, CommandSendCallBack? callBack}) { CommandSenderManager().managerSendData( command: GatewayGetWifiCommand( userID: userID, @@ -1547,31 +1546,28 @@ class IoSenderManage { } // 网关配网 - static void gatewayConfiguringWifiCommand({ - required String? ssid, - required String? password, - CommandSendCallBack? callBack}) { + static void gatewayConfiguringWifiCommand( + {required String? ssid, + required String? password, + required String? gatewayConfigurationStr, + CommandSendCallBack? callBack}) { CommandSenderManager().managerSendData( command: GatewayConfiguringWifiCommand( ssid: ssid, - password: password - ), + password: password, + gatewayConfigurationStr: gatewayConfigurationStr), isBeforeAddUser: true, callBack: callBack); } // 获取网关状态 - static void gatewayGetStatusCommand({ - required String? lockID, - required String? userID, - CommandSendCallBack? callBack}) { + static void gatewayGetStatusCommand( + {required String? lockID, + required String? userID, + CommandSendCallBack? callBack}) { CommandSenderManager().managerSendData( - command: GatewayGetStatusCommand( - lockID: lockID, - userID: userID - ), + command: GatewayGetStatusCommand(lockID: lockID, userID: userID), isBeforeAddUser: true, callBack: callBack); } - } diff --git a/lib/main/lockMian/lockMain/xhj/lockMain_xhj_logic.dart b/lib/main/lockMian/lockMain/xhj/lockMain_xhj_logic.dart index 78864e19..c731f137 100755 --- a/lib/main/lockMian/lockMain/xhj/lockMain_xhj_logic.dart +++ b/lib/main/lockMian/lockMain/xhj/lockMain_xhj_logic.dart @@ -25,13 +25,12 @@ class LockMainXHJLogic extends BaseGetXController { Future getUserInfoRequest() async { final MinePersonInfoEntity entity = await ApiRepository.to.getUserInfo(); if (entity.errorCode!.codeIsSuccessful) { - final String languageCodeAndCountryCode = entity.data!.lang ?? 'zh-CN'; - if(languageCodeAndCountryCode.contains('-')){ + if (languageCodeAndCountryCode.contains('-')) { final List parts = languageCodeAndCountryCode.split('-'); final Locale locale = Locale(parts[0], parts[1]); Get.updateLocale(locale); - }else if(languageCodeAndCountryCode.contains('_')){ + } else if (languageCodeAndCountryCode.contains('_')) { final List parts = languageCodeAndCountryCode.split('_'); final Locale locale = Locale(parts[0], parts[1]); Get.updateLocale(locale); diff --git a/lib/mine/gateway/addGateway/gatewayConfigurationWifi/gatewayConfigurationWifi_logic.dart b/lib/mine/gateway/addGateway/gatewayConfigurationWifi/gatewayConfigurationWifi_logic.dart index 80d3eac9..bbbc6d7b 100644 --- a/lib/mine/gateway/addGateway/gatewayConfigurationWifi/gatewayConfigurationWifi_logic.dart +++ b/lib/mine/gateway/addGateway/gatewayConfigurationWifi/gatewayConfigurationWifi_logic.dart @@ -1,52 +1,66 @@ - import 'dart:async'; import 'package:flutter_blue_plus/flutter_blue_plus.dart'; import 'package:get/get.dart'; import 'package:network_info_plus/network_info_plus.dart'; +import 'package:star_lock/app_settings/app_settings.dart'; import 'package:star_lock/tools/baseGetXController.dart'; import '../../../../blue/blue_manage.dart'; import '../../../../blue/io_protocol/io_gateway_configuringWifi.dart'; import '../../../../blue/io_reply.dart'; +import '../../../../blue/io_tool/io_tool.dart'; import '../../../../blue/io_tool/manager_event_bus.dart'; import '../../../../blue/sender_manage.dart'; import '../../../../login/login/entity/LoginEntity.dart'; import '../../../../network/api_repository.dart'; +import '../../../../tools/storage.dart'; import 'gatewayConfigurationWifi_state.dart'; +import 'getGatewayConfiguration_entity.dart'; class GatewayConfigurationWifiLogic extends BaseGetXController { final GatewayConfigurationWifiState state = GatewayConfigurationWifiState(); - Future gatewayDistributionNetwork() async{ - final LoginEntity entity = await ApiRepository.to.gatewayDistributionNetwork( - gatewayName: state.gatewayNamePasswardTF.text, - gatewayMac: state.gatewayModel.mac, - serialNumber:state.gatewayModel.serialNum, - gatewayType: 2, - networkName: state.wifiNameTF.text, - networkMac: state.gatewayModel.wifiMac, - version: state.gatewayModel.gatewayVersion, - ); - if(entity.errorCode!.codeIsSuccessful){ - showToast('配网成功'.tr, something:(){ + Future gatewayDistributionNetwork() async { + final LoginEntity entity = await ApiRepository.to + .gatewayDistributionNetwork( + gatewayName: state.gatewayNamePasswardTF.text, + gatewayMac: state.gatewayModel.mac, + serialNumber: state.gatewayModel.serialNum, + gatewayType: 2, + networkName: state.wifiNameTF.text, + networkMac: state.gatewayModel.wifiMac, + version: state.gatewayModel.gatewayVersion, + secretKey: state.secretKey); + if (entity.errorCode!.codeIsSuccessful) { + showToast('配网成功'.tr, something: () { // eventBus.fire(PassCurrentLockInformationEvent(state.lockSetInfoData.value)); Get.close(4); }); } } + Future getGatewayConfiguration() async { + final GetGatewayConfigurationEntity entity = + await ApiRepository.to.getGatewayConfiguration(); + if (entity.errorCode!.codeIsSuccessful) { + state.getGatewayConfigurationStr = entity.data ?? ''; + // AppLog.log('state.getGatewayConfigurationStr:${state.getGatewayConfigurationStr}'); + } + } + // 监听设备返回的数据 late StreamSubscription _replySubscription; void _initReplySubscription() { - _replySubscription = EventBusManager().eventBus!.on().listen((Reply reply) async { + _replySubscription = + EventBusManager().eventBus!.on().listen((Reply reply) async { // WIFI配网 // if(reply is GatewayConfiguringWifiReply) { // _replySenderConfiguringWifi(reply); // } // WIFI配网结果 - if(reply is GatewayConfiguringWifiResultReply) { + if (reply is GatewayConfiguringWifiResultReply) { _replySenderConfiguringWifiResult(reply); } }); @@ -74,17 +88,20 @@ class GatewayConfigurationWifiLogic extends BaseGetXController { // WIFI配网结果 Future _replySenderConfiguringWifiResult(Reply reply) async { final int status = reply.data[2]; - - switch(status){ + switch (status) { case 0x00: - //成功 + //成功 state.sureBtnState.value = 0; cancelBlueConnetctToastTimer(); dismissEasyLoading(); + + final List secretKeyList = reply.data.sublist(3, 23); + state.secretKey = utf8String(secretKeyList); + gatewayDistributionNetwork(); break; default: - //失败 + //失败 dismissEasyLoading(); showToast('配网失败'.tr); break; @@ -93,42 +110,46 @@ class GatewayConfigurationWifiLogic extends BaseGetXController { // 点击配置wifi Future senderConfiguringWifiAction() async { - if(state.wifiNameTF.text.isEmpty){ + AppLog.log( + 'state.getGatewayConfigurationStr:${state.getGatewayConfigurationStr}'); + if (state.wifiNameTF.text.isEmpty) { showToast('请输入wifi名称'.tr); return; } - if(state.wifiPasswardTF.text.isEmpty){ + if (state.wifiPasswardTF.text.isEmpty) { showToast('请输入WiFi密码'.tr); return; } - if(state.gatewayNamePasswardTF.text.isEmpty){ + if (state.gatewayNamePasswardTF.text.isEmpty) { showToast('请输入网关名称'.tr); return; } - if(state.sureBtnState.value == 1){ + if (state.sureBtnState.value == 1) { return; } state.sureBtnState.value = 1; showEasyLoading(); - showBlueConnetctToastTimer(action: (){ + showBlueConnetctToastTimer(action: () { dismissEasyLoading(); state.sureBtnState.value = 0; }); - BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async { - if (connectionState == BluetoothConnectionState.connected){ + BlueManage().blueSendData(BlueManage().connectDeviceName, + (BluetoothConnectionState connectionState) async { + if (connectionState == BluetoothConnectionState.connected) { IoSenderManage.gatewayConfiguringWifiCommand( ssid: state.wifiNameTF.text, password: state.wifiPasswardTF.text, + gatewayConfigurationStr: state.getGatewayConfigurationStr, ); } else if (connectionState == BluetoothConnectionState.disconnected) { dismissEasyLoading(); cancelBlueConnetctToastTimer(); state.sureBtnState.value = 0; - if(state.ifCurrentScreen.value == true){ + if (state.ifCurrentScreen.value == true) { showBlueConnetctToast(); } } @@ -148,7 +169,7 @@ class GatewayConfigurationWifiLogic extends BaseGetXController { void onReady() { super.onReady(); - if(state.wifiNameTF.text.isEmpty){ + if (state.wifiNameTF.text.isEmpty) { getWifiName().then((String value) { state.wifiNameTF.text = value; // update(); @@ -156,6 +177,8 @@ class GatewayConfigurationWifiLogic extends BaseGetXController { }); } + getGatewayConfiguration(); + _initReplySubscription(); } @@ -169,4 +192,4 @@ class GatewayConfigurationWifiLogic extends BaseGetXController { _replySubscription.cancel(); super.onClose(); } -} \ No newline at end of file +} diff --git a/lib/mine/gateway/addGateway/gatewayConfigurationWifi/gatewayConfigurationWifi_state.dart b/lib/mine/gateway/addGateway/gatewayConfigurationWifi/gatewayConfigurationWifi_state.dart index dbd48cfd..3f970f86 100644 --- a/lib/mine/gateway/addGateway/gatewayConfigurationWifi/gatewayConfigurationWifi_state.dart +++ b/lib/mine/gateway/addGateway/gatewayConfigurationWifi/gatewayConfigurationWifi_state.dart @@ -1,11 +1,9 @@ - import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:star_lock/app_settings/app_settings.dart'; import '../selectGateway/getGatewayInfo_model.dart'; -class GatewayConfigurationWifiState{ +class GatewayConfigurationWifiState { GatewayConfigurationWifiState() { var map = Get.arguments; if (map['wifiName'] != null && map['wifiName'] != '') { @@ -32,7 +30,9 @@ class GatewayConfigurationWifiState{ final TextEditingController firstChoiceDNSTF = TextEditingController(); final TextEditingController alternativeDNSTF = TextEditingController(); + String secretKey = ''; + String getGatewayConfigurationStr = ''; // RxString wifiName = '请选择WiFi'.obs; RxBool ifCurrentScreen = true.obs; // 是否是当前界面,用于判断是否需要针对当前界面进行展示 - RxInt sureBtnState = 0.obs;// 0普通状态(可用) 1连接中(不可用) -} \ No newline at end of file + RxInt sureBtnState = 0.obs; // 0普通状态(可用) 1连接中(不可用) +} diff --git a/lib/mine/gateway/addGateway/gatewayConfigurationWifi/getGatewayConfiguration_entity.dart b/lib/mine/gateway/addGateway/gatewayConfigurationWifi/getGatewayConfiguration_entity.dart new file mode 100644 index 00000000..869b98b8 --- /dev/null +++ b/lib/mine/gateway/addGateway/gatewayConfigurationWifi/getGatewayConfiguration_entity.dart @@ -0,0 +1,30 @@ +import 'dart:convert'; + +class GetGatewayConfigurationEntity { + GetGatewayConfigurationEntity({ + this.description, + this.errorCode, + this.data, + this.errorMsg, + }); + + GetGatewayConfigurationEntity.fromJson(dynamic json) { + description = json['description']; + errorCode = json['errorCode']; + data = jsonEncode(json['data']); + errorMsg = json['errorMsg']; + } + String? description; + int? errorCode; + String? data; + String? errorMsg; + + Map toJson() { + final map = {}; + map['description'] = description; + map['errorCode'] = errorCode; + map['data'] = data; + map['errorMsg'] = errorMsg; + return map; + } +} diff --git a/lib/mine/gateway/addGateway/selectGateway/getGatewayInfo_model.dart b/lib/mine/gateway/addGateway/selectGateway/getGatewayInfo_model.dart index b324c514..f065f48b 100644 --- a/lib/mine/gateway/addGateway/selectGateway/getGatewayInfo_model.dart +++ b/lib/mine/gateway/addGateway/selectGateway/getGatewayInfo_model.dart @@ -1,7 +1,6 @@ - -class GetGatewayInfoModel{ +class GetGatewayInfoModel { late String mac; late String serialNum; late String gatewayVersion; late String wifiMac; -} \ No newline at end of file +} diff --git a/lib/mine/gateway/addGateway/selectGateway/selectGatewayList_logic.dart b/lib/mine/gateway/addGateway/selectGateway/selectGatewayList_logic.dart index 7a782c42..ccdd0c83 100644 --- a/lib/mine/gateway/addGateway/selectGateway/selectGatewayList_logic.dart +++ b/lib/mine/gateway/addGateway/selectGateway/selectGatewayList_logic.dart @@ -1,4 +1,3 @@ - import 'dart:async'; import 'dart:io'; @@ -26,10 +25,10 @@ class SelectGatewayListLogic extends BaseGetXController { // 监听设备返回的数据 late StreamSubscription _replySubscription; void _initReplySubscription() { - _replySubscription = EventBusManager().eventBus!.on().listen((Reply reply) async { - + _replySubscription = + EventBusManager().eventBus!.on().listen((Reply reply) async { // 获取网关状态 - if(reply is GatewayGetStatusReply) { + if (reply is GatewayGetStatusReply) { _replyGatewayGetStatusReply(reply); } }); @@ -39,10 +38,10 @@ class SelectGatewayListLogic extends BaseGetXController { Future _replyGatewayGetStatusReply(Reply reply) async { final int status = reply.data[2]; - switch(status){ + switch (status) { case 0x00: - //成功 - // state.sureBtnState.value = 0; + //成功 + // state.sureBtnState.value = 0; cancelBlueConnetctToastTimer(); dismissEasyLoading(); @@ -82,11 +81,11 @@ class SelectGatewayListLogic extends BaseGetXController { gatewayModel.wifiMac = '00:00:00:00:00:00'; Get.toNamed(Routers.gatewayGetWifiListPage, arguments: { - 'gatewayModel':gatewayModel, + 'gatewayModel': gatewayModel, }); break; default: - //失败 + //失败 dismissEasyLoading(); showToast('配网失败'.tr); break; @@ -103,8 +102,8 @@ class SelectGatewayListLogic extends BaseGetXController { // : '') // .toString()[31] != // '1') { - state.devices.add(list[i]); - // AppLog.log('device:${list[i]}'); + state.devices.add(list[i]); + // AppLog.log('device:${list[i]}'); // } } }); @@ -122,7 +121,8 @@ class SelectGatewayListLogic extends BaseGetXController { Future getNearByLimits() async { if (!Platform.isIOS) { final bool bluetoothRequest = await PermissionDialog.requestBluetooth(); - final bool locationRequest = await PermissionDialog.request(Permission.location); + final bool locationRequest = + await PermissionDialog.request(Permission.location); AppLog.log('locationRequest:$locationRequest'); if (!bluetoothRequest || !locationRequest) { return; @@ -134,11 +134,12 @@ class SelectGatewayListLogic extends BaseGetXController { // 获取网关状态 Future senderGatewayGetStatusAction() async { showEasyLoading(); - showBlueConnetctToastTimer(action: (){ + showBlueConnetctToastTimer(action: () { dismissEasyLoading(); }); - BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async { - if (connectionState == BluetoothConnectionState.connected){ + BlueManage().blueSendData(BlueManage().connectDeviceName, + (BluetoothConnectionState connectionState) async { + if (connectionState == BluetoothConnectionState.connected) { IoSenderManage.gatewayGetStatusCommand( lockID: BlueManage().connectDeviceName, userID: await Storage.getUid(), @@ -146,7 +147,7 @@ class SelectGatewayListLogic extends BaseGetXController { } else if (connectionState == BluetoothConnectionState.disconnected) { dismissEasyLoading(); cancelBlueConnetctToastTimer(); - if(state.ifCurrentScreen.value == true){ + if (state.ifCurrentScreen.value == true) { showBlueConnetctToast(); } } @@ -159,7 +160,8 @@ class SelectGatewayListLogic extends BaseGetXController { showBlueConnetctToastTimer(action: () { dismissEasyLoading(); }); - BlueManage().blueSendData(device.advertisementData.advName, (BluetoothConnectionState state) async { + BlueManage().blueSendData(device.advertisementData.advName, + (BluetoothConnectionState state) async { // AppLog.log('点击要添加的设备了'); if (state == BluetoothConnectionState.connected) { dismissEasyLoading(); @@ -175,7 +177,7 @@ class SelectGatewayListLogic extends BaseGetXController { // }); senderGatewayGetStatusAction(); - } else{ + } else { dismissEasyLoading(); } }, isAddEquipment: true); @@ -199,4 +201,4 @@ class SelectGatewayListLogic extends BaseGetXController { super.dispose(); _replySubscription.cancel(); } -} \ No newline at end of file +} diff --git a/lib/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_entity.dart b/lib/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_entity.dart index 83a07e2c..47f73efa 100755 --- a/lib/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_entity.dart +++ b/lib/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_entity.dart @@ -1,9 +1,4 @@ class MinePersonInfoEntity { - int? errorCode; - String? description; - String? errorMsg; - MinePersonInfoData? data; - MinePersonInfoEntity( {this.errorCode, this.description, this.errorMsg, this.data}); @@ -14,6 +9,10 @@ class MinePersonInfoEntity { data = json['data'] != null ? MinePersonInfoData.fromJson(json['data']) : null; } + int? errorCode; + String? description; + String? errorMsg; + MinePersonInfoData? data; Map toJson() { final Map data = {}; @@ -28,19 +27,6 @@ class MinePersonInfoEntity { } class MinePersonInfoData { - String? mobile; - int? uid; - int? haveSafeAnswer; - String? nickname; - String? headUrl; - String? accountName; - int? countryId; - String? email; - String? countryName; - int? isVip; - String? deviceId; - String? lang; - MinePersonInfoData( {this.mobile, this.uid, @@ -69,6 +55,18 @@ class MinePersonInfoData { deviceId = json['deviceId']; lang = json['lang']; } + String? mobile; + int? uid; + int? haveSafeAnswer; + String? nickname; + String? headUrl; + String? accountName; + int? countryId; + String? email; + String? countryName; + int? isVip; + String? deviceId; + String? lang; Map toJson() { final Map data = {}; diff --git a/lib/network/api.dart b/lib/network/api.dart index 3b456399..e670f0c4 100755 --- a/lib/network/api.dart +++ b/lib/network/api.dart @@ -124,8 +124,10 @@ abstract class Api { final String addICCardURL = '/identityCard/add'; // 添加IC卡 final String editICCardURL = '/identityCard/update'; // 编辑IC卡 final String deleteICCardURL = '/identityCard/delete'; // 删除IC卡 - final String updateICCardUserNoURL = '/identityCard/updateCardUserNo'; // 更新ic卡用户序号 - final String checkCardNameURL = '/identityCard/checkIdentityCardName'; // 校验卡名字是否存在 + final String updateICCardUserNoURL = + '/identityCard/updateCardUserNo'; // 更新ic卡用户序号 + final String checkCardNameURL = + '/identityCard/checkIdentityCardName'; // 校验卡名字是否存在 final String getRemoteControlListURL = '/remote/list'; // 遥控列表 final String addRemoteControlURL = '/remote/add'; // 添加遥控 @@ -133,11 +135,13 @@ abstract class Api { final String editRemoteControlURL = '/remote/update'; // 编辑遥控 final String deleteRemoteControlURL = '/remote/delete'; // 删除遥控 final String clearRemoteControlURL = '/remote/clear'; // 清空遥控 - final String checkRemoteControlNameURL = '/remote/checkRemoteName'; // 校验遥控名字是否存在 + final String checkRemoteControlNameURL = + '/remote/checkRemoteName'; // 校验遥控名字是否存在 final String getPalmListURL = '/palmVein/list'; // 掌静脉列表 final String addPalmURL = '/palmVein/add'; // 添加掌静脉 - final String updatePalmUserNoURL = '/palmVein/updatePalmVeinUserNo'; // 更新掌静脉用户序号 + final String updatePalmUserNoURL = + '/palmVein/updatePalmVeinUserNo'; // 更新掌静脉用户序号 final String editPalmURL = '/palmVein/update'; // 编辑掌静脉 final String deletePalmURL = '/palmVein/delete'; // 删除掌静脉 final String clearPalmURL = '/palmVein/clear'; // 清空掌静脉 @@ -156,6 +160,7 @@ abstract class Api { final String transferGatewayURL = '/plug/transfer'; // 转移网关 final String updateGatewayURL = '/gateway/update'; // 更新网关 final String gatewayListByLockURL = '/gateway/listByLock'; // 网关-附近的锁 + final String getGatewayConfigURL = '/gateway/getGatewayConfig'; // 获取网关配置 final String getKeyDetailURL = '/key/get'; //获取单把钥匙详情信息 final String lockUserListURL = '/keyUser/listKeyUser'; //锁用户列表 @@ -275,5 +280,6 @@ abstract class Api { final String lockUpdateLockInfo = '/lock/updateLockInfo'; //更新锁固件版本 final String exportLockRecordsURL = '/lockRecords/export'; //导出锁操作记录 - final String updateZoneOffsetsAndLanguagesURL = '/cloudUser/updateSettings'; //更新云用户时区偏移与语言 + final String updateZoneOffsetsAndLanguagesURL = + '/cloudUser/updateSettings'; //更新云用户时区偏移与语言 } diff --git a/lib/network/api_provider.dart b/lib/network/api_provider.dart index aad2a490..fc59b201 100755 --- a/lib/network/api_provider.dart +++ b/lib/network/api_provider.dart @@ -342,13 +342,15 @@ class ApiProvider extends BaseProvider { ); // 锁记录上传 - Future lockReportLockSuccessfullyUploadData(int lockId, int keyId) => post( - lockRecordUploadURL.toUrl, - jsonEncode({ - 'lockId': lockId, - 'keyId': keyId, - }), - isUnShowLoading: true); + Future lockReportLockSuccessfullyUploadData( + int lockId, int keyId) => + post( + lockRecordUploadURL.toUrl, + jsonEncode({ + 'lockId': lockId, + 'keyId': keyId, + }), + isUnShowLoading: true); // 获取手机联网token Future getLockNetToken(String lockId) => post( @@ -1477,7 +1479,7 @@ class ApiProvider extends BaseProvider { // 获取遥控列表 Future getRemoteControlListData( - String lockId, String pageNo, String pageSize, String searchStr) => + String lockId, String pageNo, String pageSize, String searchStr) => post( getRemoteControlListURL.toUrl, jsonEncode({ @@ -1489,21 +1491,21 @@ class ApiProvider extends BaseProvider { // 添加遥控 Future addRemoteControlData( - String lockId, - String remoteName, - String remoteNumber, - int remoteType, - int startDate, - int endDate, - int addType, - List weekDay, - int startTime, - int endTime, - int remoteRight, - // String mac, - // int electricQuantity, - // List firmwareInfo - ) => + String lockId, + String remoteName, + String remoteNumber, + int remoteType, + int startDate, + int endDate, + int addType, + List weekDay, + int startTime, + int endTime, + int remoteRight, + // String mac, + // int electricQuantity, + // List firmwareInfo + ) => post( addRemoteControlURL.toUrl, jsonEncode({ @@ -1525,27 +1527,30 @@ class ApiProvider extends BaseProvider { // 更新遥控序号 Future updateRemoteUserNoLoadData( - int lockId, int remoteId, String remoteUserNo) => + int lockId, int remoteId, String remoteUserNo) => post( updateRemoteUserNoURL.toUrl, - jsonEncode( - {'lockId': lockId, 'remoteId': remoteId, 'remoteUserNo': remoteUserNo})); + jsonEncode({ + 'lockId': lockId, + 'remoteId': remoteId, + 'remoteUserNo': remoteUserNo + })); // 编辑遥控 Future editRemoteControlData( - int lockId, - int remoteId, - int startDate, - int endDate, - int startTime, - int endTime, - int remoteType, - List weekDay, - String remoteName, - int addType, - int isCoerced, - int remoteRight, - ) => + int lockId, + int remoteId, + int startDate, + int endDate, + int startTime, + int endTime, + int remoteType, + List weekDay, + String remoteName, + int addType, + int isCoerced, + int remoteRight, + ) => post( editRemoteControlURL.toUrl, jsonEncode({ @@ -1564,30 +1569,28 @@ class ApiProvider extends BaseProvider { })); // 删除遥控 - Future deletRemoteControlData(int remoteId) => - post( - deleteRemoteControlURL.toUrl, - jsonEncode({ - 'remoteId': remoteId, - })); + Future deletRemoteControlData(int remoteId) => post( + deleteRemoteControlURL.toUrl, + jsonEncode({ + 'remoteId': remoteId, + })); // 重置遥控 - Future resetRemoteControlData(int lockId) => - post( - clearRemoteControlURL.toUrl, - jsonEncode({ - 'lockId': lockId, - })); + Future resetRemoteControlData(int lockId) => post( + clearRemoteControlURL.toUrl, + jsonEncode({ + 'lockId': lockId, + })); // 校验遥控名字是否重复 Future checkRemoteControlNameDuplicatedData( - String lockId, String remoteName) => + String lockId, String remoteName) => post(checkRemoteControlNameURL.toUrl, jsonEncode({'lockId': lockId, 'remoteName': remoteName})); // 获取掌静脉列表 Future getPalmListData( - String lockId, String pageNo, String pageSize, String searchStr) => + String lockId, String pageNo, String pageSize, String searchStr) => post( getPalmListURL.toUrl, jsonEncode({ @@ -1599,18 +1602,17 @@ class ApiProvider extends BaseProvider { // 添加掌静脉 Future addPalmData( - String lockId, - String palmVeinName, - String palmVeinNumber, - int palmVeinType, - int startDate, - int endDate, - int addType, - List weekDay, - int startTime, - int endTime, - int palmVeinRight - ) => + String lockId, + String palmVeinName, + String palmVeinNumber, + int palmVeinType, + int startDate, + int endDate, + int addType, + List weekDay, + int startTime, + int endTime, + int palmVeinRight) => post( addPalmURL.toUrl, jsonEncode({ @@ -1629,27 +1631,30 @@ class ApiProvider extends BaseProvider { // 更新掌静脉序号 Future updatePalmUserNoLoadData( - int lockId, int palmVeinId, String palmVeinUserNo) => + int lockId, int palmVeinId, String palmVeinUserNo) => post( updatePalmUserNoURL.toUrl, - jsonEncode( - {'lockId': lockId, 'palmVeinId': palmVeinId, 'palmVeinUserNo': palmVeinUserNo})); + jsonEncode({ + 'lockId': lockId, + 'palmVeinId': palmVeinId, + 'palmVeinUserNo': palmVeinUserNo + })); // 编辑掌静脉 Future editPalmData( - int lockId, - int palmVeinId, - int startDate, - int endDate, - int startTime, - int endTime, - int palmVeinType, - List weekDay, - String palmVeinName, - int addType, - int isCoerced, - int palmVeinRight, - ) => + int lockId, + int palmVeinId, + int startDate, + int endDate, + int startTime, + int endTime, + int palmVeinType, + List weekDay, + String palmVeinName, + int addType, + int isCoerced, + int palmVeinRight, + ) => post( editPalmURL.toUrl, jsonEncode({ @@ -1668,24 +1673,22 @@ class ApiProvider extends BaseProvider { })); // 删除掌静脉 - Future deletPalmData(int palmVeinId) => - post( - deletePalmURL.toUrl, - jsonEncode({ - 'palmVeinId': palmVeinId, - })); + Future deletPalmData(int palmVeinId) => post( + deletePalmURL.toUrl, + jsonEncode({ + 'palmVeinId': palmVeinId, + })); // 重置掌静脉 - Future resetPalmData(int lockId) => - post( - clearPalmURL.toUrl, - jsonEncode({ - 'lockId': lockId, - })); + Future resetPalmData(int lockId) => post( + clearPalmURL.toUrl, + jsonEncode({ + 'lockId': lockId, + })); // 校验掌静脉名字是否重复 Future checkPalmNameDuplicatedData( - String lockId, String palmVeinName) => + String lockId, String palmVeinName) => post(checkPalmNameURL.toUrl, jsonEncode({'lockId': lockId, 'palmVeinName': palmVeinName})); @@ -1722,44 +1725,49 @@ class ApiProvider extends BaseProvider { // 添加网关 Future addGatewayNetwork( - String gatewayName, - String gatewayMac, - String serialNumber, - int gatewayType, - String networkName, - String networkMac, - String version, - ) => post( - addGatewayURL.toUrl, - jsonEncode({ - 'gatewayName': gatewayName, - 'gatewayMac': gatewayMac, - 'serialNumber': serialNumber, - 'gatewayType': gatewayType, - 'networkName': networkName, - 'networkMac': networkMac, - 'version': version, - })); + String gatewayName, + String gatewayMac, + String serialNumber, + int gatewayType, + String networkName, + String networkMac, + String version, + String secretKey, + ) => + post( + addGatewayURL.toUrl, + jsonEncode({ + 'gatewayName': gatewayName, + 'gatewayMac': gatewayMac, + 'serialNumber': serialNumber, + 'gatewayType': gatewayType, + 'networkName': networkName, + 'networkMac': networkMac, + 'version': version, + 'secretKey': secretKey, + })); // 删除网关 Future deletGateway( - int gatewayId, - ) => post( - deletGatewayURL.toUrl, - jsonEncode({ - 'gatewayId': gatewayId, - })); + int gatewayId, + ) => + post( + deletGatewayURL.toUrl, + jsonEncode({ + 'gatewayId': gatewayId, + })); // 删除网关 Future gatewayUpdate( - int gatewayId, - String gatewayName, - ) => post( - updateGatewayURL.toUrl, - jsonEncode({ - 'gatewayId': gatewayId, - 'gatewayName': gatewayName, - })); + int gatewayId, + String gatewayName, + ) => + post( + updateGatewayURL.toUrl, + jsonEncode({ + 'gatewayId': gatewayId, + 'gatewayName': gatewayName, + })); // 转移网关确认 Future transferGatewayConfirmInfoData( @@ -1783,9 +1791,12 @@ class ApiProvider extends BaseProvider { 'countryCode': countryCode })); - Future gatewayConnectionLockListLoadData(int gatewayId) => post( - gatewayListByLockURL.toUrl, - jsonEncode({'gatewayId': gatewayId})); + // 获取网关配置 + Future getGatewayConfiguration() => + post(getGatewayConfigURL.toUrl, jsonEncode({})); + + Future gatewayConnectionLockListLoadData(int gatewayId) => + post(gatewayListByLockURL.toUrl, jsonEncode({'gatewayId': gatewayId})); // 移除坏锁 Future removeBrokenLockData(List lockIdList) => @@ -2177,8 +2188,7 @@ class ApiProvider extends BaseProvider { })); // 设置面容防误开 - Future updateFacePreventMisrun( - int lockId, int faceEnErrUnlock) => + Future updateFacePreventMisrun(int lockId, int faceEnErrUnlock) => post( updateLockSettingUrl.toUrl, jsonEncode({ @@ -2640,9 +2650,9 @@ class ApiProvider extends BaseProvider { // 获取锁信息列表 Future updateZoneOffsetsAndLanguages( - int timezoneOffset, - // String language - ) => + int timezoneOffset, + // String language + ) => post( updateZoneOffsetsAndLanguagesURL.toUrl, jsonEncode({ @@ -2650,7 +2660,6 @@ class ApiProvider extends BaseProvider { // 'language': language, }), isUnShowLoading: true); - } extension ExtensionString on String { diff --git a/lib/network/api_repository.dart b/lib/network/api_repository.dart index d9bf3f0d..cf72187e 100755 --- a/lib/network/api_repository.dart +++ b/lib/network/api_repository.dart @@ -73,6 +73,7 @@ import '../main/lockDetail/palm/addPalm/addPalm_entity.dart'; import '../main/lockDetail/remoteControl/addRemoteControl/addRemoteControl_entity.dart'; import '../main/lockMian/entity/lockListInfo_entity.dart'; import '../mine/addLock/saveLock/entity/SaveLockEntity.dart'; +import '../mine/gateway/addGateway/gatewayConfigurationWifi/getGatewayConfiguration_entity.dart'; import '../mine/gateway/gatewayConnectionLock/gatewayConnectionLockList_entity.dart'; import '../mine/message/messageList/messageList_entity.dart'; import '../mine/minePersonInfo/minePersonInfoPage/minePersonGetUploadFileInfo_entity.dart'; @@ -315,7 +316,8 @@ class ApiRepository { // 电子钥匙开锁成功上报 Future lockReportLockSuccessfullyUploadData( {required int lockId, required int keyId}) async { - final res = await apiProvider.lockReportLockSuccessfullyUploadData(lockId, keyId); + final res = + await apiProvider.lockReportLockSuccessfullyUploadData(lockId, keyId); return KeyOperationRecordEntity.fromJson(res.body); } @@ -1706,8 +1708,8 @@ class ApiRepository { // 更新ICCard用户序号 Future updateRemoteUserNoLoadData( {required int lockId, - required int remoteId, - required String remoteUserNo}) async { + required int remoteId, + required String remoteUserNo}) async { final res = await apiProvider.updateRemoteUserNoLoadData( lockId, remoteId, remoteUserNo); return LoginEntity.fromJson(res.body); @@ -1759,7 +1761,8 @@ class ApiRepository { // 校验遥控名字是否重复 Future checkRemoteControlNameDuplicatedData( {required String lockId, required String remoteName}) async { - final res = await apiProvider.checkRemoteControlNameDuplicatedData(lockId, remoteName); + final res = await apiProvider.checkRemoteControlNameDuplicatedData( + lockId, remoteName); return LoginEntity.fromJson(res.body); } @@ -1770,8 +1773,8 @@ class ApiRepository { required String pageSize, required String searchStr, }) async { - final res = await apiProvider.getPalmListData( - lockId, pageNo, pageSize, searchStr); + final res = + await apiProvider.getPalmListData(lockId, pageNo, pageSize, searchStr); return FingerprintListDataEntity.fromJson(res.body); } @@ -1807,8 +1810,8 @@ class ApiRepository { // 更新掌静脉用户序号 Future updatePalmUserNoLoadData( {required int lockId, - required int palmVeinId, - required String palmVeinUserNo}) async { + required int palmVeinId, + required String palmVeinUserNo}) async { final res = await apiProvider.updatePalmUserNoLoadData( lockId, palmVeinId, palmVeinUserNo); return LoginEntity.fromJson(res.body); @@ -1860,7 +1863,8 @@ class ApiRepository { // 校验掌静脉名字是否重复 Future checkPalmNameDuplicatedData( {required String lockId, required String palmVeinName}) async { - final res = await apiProvider.checkPalmNameDuplicatedData(lockId, palmVeinName); + final res = + await apiProvider.checkPalmNameDuplicatedData(lockId, palmVeinName); return LoginEntity.fromJson(res.body); } @@ -1913,8 +1917,10 @@ class ApiRepository { required String networkName, required String networkMac, required String version, + required String secretKey, }) async { - final res = await apiProvider.addGatewayNetwork(gatewayName, gatewayMac, serialNumber, gatewayType, networkName, networkMac, version); + final res = await apiProvider.addGatewayNetwork(gatewayName, gatewayMac, + serialNumber, gatewayType, networkName, networkMac, version, secretKey); return LoginEntity.fromJson(res.body); } @@ -1962,6 +1968,12 @@ class ApiRepository { return RecipientInformationEntity.fromJson(res.body); } + // 获取网关配置 + Future getGatewayConfiguration() async { + final res = await apiProvider.getGatewayConfiguration(); + return GetGatewayConfigurationEntity.fromJson(res.body); + } + // 移除坏锁 Future removeBrokenLockData( {required List lockIdList}) async { @@ -2625,15 +2637,14 @@ class ApiRepository { } // 更新云用户时区偏移与语言 - Future updateZoneOffsetsAndLanguages( - { - required int timezoneOffset, - // required String language - }) async { - final res = await apiProvider.updateZoneOffsetsAndLanguages(timezoneOffset, - // language + Future updateZoneOffsetsAndLanguages({ + required int timezoneOffset, + // required String language + }) async { + final res = await apiProvider.updateZoneOffsetsAndLanguages( + timezoneOffset, + // language ); return LoginEntity.fromJson(res.body); } - } diff --git a/lib/tools/dateTool.dart b/lib/tools/dateTool.dart index cb7b476b..2764b3aa 100755 --- a/lib/tools/dateTool.dart +++ b/lib/tools/dateTool.dart @@ -128,23 +128,23 @@ class DateTool { String dateStr = ''; switch (type) { case 1: - // 年月日时分(2023-01-01 12:48) + // 年月日时分(2023-01-01 12:48) dateStr = - '$year-${month!.toString().padLeft(2, '0')}-${day.toString().padLeft(2, '0')} ${hour.toString().padLeft(2, '0')}:${minute.toString().padLeft(2, '0')}'; + '$year-${month!.toString().padLeft(2, '0')}-${day.toString().padLeft(2, '0')} ${hour.toString().padLeft(2, '0')}:${minute.toString().padLeft(2, '0')}'; break; case 2: - // 年月日(2023-01-01) + // 年月日(2023-01-01) dateStr = - '$year-${month!.toString().padLeft(2, '0')}-${day.toString().padLeft(2, '0')}'; + '$year-${month!.toString().padLeft(2, '0')}-${day.toString().padLeft(2, '0')}'; break; case 3: - // 时分(12:05) + // 时分(12:05) dateStr = - '${hour.toString().padLeft(2, '0')}:${minute.toString().padLeft(2, '0')}'; + '${hour.toString().padLeft(2, '0')}:${minute.toString().padLeft(2, '0')}'; break; default: dateStr = - '$year-${month!.toString().padLeft(2, '0')}-${day.toString().padLeft(2, '0')} ${hour.toString().padLeft(2, '0')}:${minute.toString().padLeft(2, '0')}'; + '$year-${month!.toString().padLeft(2, '0')}-${day.toString().padLeft(2, '0')} ${hour.toString().padLeft(2, '0')}:${minute.toString().padLeft(2, '0')}'; break; } return dateStr;