From af9a4b9ea1399c79b85f594829aa55091a35650d Mon Sep 17 00:00:00 2001 From: liyi Date: Sat, 22 Mar 2025 17:20:21 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E8=AF=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lan/lan_ar.json | 2 ++ lan/lan_bg.json | 2 ++ lan/lan_bn.json | 2 ++ lan/lan_cs.json | 2 ++ lan/lan_da.json | 2 ++ lan/lan_de.json | 2 ++ lan/lan_el.json | 2 ++ lan/lan_en.json | 2 ++ lan/lan_es.json | 2 ++ lan/lan_et.json | 2 ++ lan/lan_fi.json | 2 ++ lan/lan_fr.json | 2 ++ lan/lan_he.json | 2 ++ lan/lan_hi.json | 2 ++ lan/lan_hk.json | 2 ++ lan/lan_hr.json | 2 ++ lan/lan_hu.json | 2 ++ lan/lan_id.json | 2 ++ lan/lan_it.json | 2 ++ lan/lan_ja.json | 2 ++ lan/lan_keys.json | 2 ++ lan/lan_kk.json | 2 ++ lan/lan_ko.json | 2 ++ lan/lan_lt.json | 2 ++ lan/lan_ms.json | 2 ++ lan/lan_nl.json | 2 ++ lan/lan_pl.json | 2 ++ lan/lan_pt.json | 2 ++ lan/lan_ro.json | 2 ++ lan/lan_ru.json | 2 ++ lan/lan_sk.json | 2 ++ lan/lan_sr_cyrl.json | 2 ++ lan/lan_sv.json | 2 ++ lan/lan_th.json | 2 ++ lan/lan_tr.json | 2 ++ lan/lan_tw.json | 2 ++ lan/lan_uk.json | 2 ++ lan/lan_ur.json | 2 ++ lan/lan_vi.json | 2 ++ lan/lan_zh.json | 2 ++ lib/translations/app_dept.dart | 33 ++++++++++++++++++++++++++++++++- 41 files changed, 112 insertions(+), 1 deletion(-) diff --git a/lan/lan_ar.json b/lan/lan_ar.json index e53131c6..63371d82 100644 --- a/lan/lan_ar.json +++ b/lan/lan_ar.json @@ -1078,6 +1078,8 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", + "印地语": "हिंदीName", + "乌尔都语": "اوردو", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "بعد إعادة الضبط ، سيتم حذف الأوردة المشطية للقفل. هل أنت متأكد أنك تريد إعادة الضبط ؟", "在线": "الإنترنت", "离线": "غير متصل", diff --git a/lan/lan_bg.json b/lan/lan_bg.json index 15c1f133..56750a26 100644 --- a/lan/lan_bg.json +++ b/lan/lan_bg.json @@ -1078,6 +1078,8 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", + "印地语": "हिंदीName", + "乌尔都语": "اوردو", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "След нулиране, метакарпалните вени на ключалката ще бъдат изтрити. Сигурен ли сте, че искате да се възстанови?", "在线": "Онлайн", "离线": "Офлайн", diff --git a/lan/lan_bn.json b/lan/lan_bn.json index 994bcdf0..8a7d28df 100644 --- a/lan/lan_bn.json +++ b/lan/lan_bn.json @@ -1078,6 +1078,8 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", + "印地语": "हिंदीName", + "乌尔都语": "اوردو", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "ব্যান্ডোটারআইসেট, হাসিপাল রিরিইনস্ফথেলকবইল্ডজেডড।?", "在线": "কনলাইন", "离线": "দেউন্টলাইনCity in Ontario Canada", diff --git a/lan/lan_cs.json b/lan/lan_cs.json index 4830ba9c..08925658 100644 --- a/lan/lan_cs.json +++ b/lan/lan_cs.json @@ -1078,6 +1078,8 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", + "印地语": "हिंदीName", + "乌尔都语": "اوردو", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "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 af956511..d3db1465 100644 --- a/lan/lan_da.json +++ b/lan/lan_da.json @@ -1078,6 +1078,8 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", + "印地语": "हिंदीName", + "乌尔都语": "اوردو", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "Efter nulstilling, de metacarpal vener i låsen vil blive slettet. Er du sikker på at du vil nulstille?", "在线": "OnlineComment", "离线": "OfflineComment", diff --git a/lan/lan_de.json b/lan/lan_de.json index fc9ada5c..79e2516d 100644 --- a/lan/lan_de.json +++ b/lan/lan_de.json @@ -1078,6 +1078,8 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", + "印地语": "हिंदीName", + "乌尔都语": "اوردو", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "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 673d0f5b..8eac3390 100644 --- a/lan/lan_el.json +++ b/lan/lan_el.json @@ -1078,6 +1078,8 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", + "印地语": "हिंदीName", + "乌尔都语": "اوردو", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "Μετά την επαναφορά, οι μετακάρπιες φλέβες της κλειδαριάς θα διαγραφούν. Είστε σίγουροι ότι θέλετε να επαναφέρετε;", "在线": "Σε απευθείας σύνδεση", "离线": "Εκτός σύνδεσης:", diff --git a/lan/lan_en.json b/lan/lan_en.json index 56c9bee8..a84ceb62 100644 --- a/lan/lan_en.json +++ b/lan/lan_en.json @@ -1080,6 +1080,8 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", + "印地语": "हिंदीName", + "乌尔都语": "اوردو", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "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 21e4cf83..4dabcf0d 100644 --- a/lan/lan_es.json +++ b/lan/lan_es.json @@ -1078,6 +1078,8 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", + "印地语": "हिंदीName", + "乌尔都语": "اوردو", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "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 8493c8cf..48888bd6 100644 --- a/lan/lan_et.json +++ b/lan/lan_et.json @@ -1078,6 +1078,8 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", + "印地语": "हिंदीName", + "乌尔都语": "اوردو", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "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 c51e11f8..a6cd4aba 100644 --- a/lan/lan_fi.json +++ b/lan/lan_fi.json @@ -1078,6 +1078,8 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", + "印地语": "हिंदीName", + "乌尔都语": "اوردو", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "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 fcb50558..ffcf5c00 100644 --- a/lan/lan_fr.json +++ b/lan/lan_fr.json @@ -1078,6 +1078,8 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", + "印地语": "हिंदीName", + "乌尔都语": "اوردو", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "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 151f02c7..acc3c4f2 100644 --- a/lan/lan_he.json +++ b/lan/lan_he.json @@ -1078,6 +1078,8 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", + "印地语": "हिंदीName", + "乌尔都语": "اوردو", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "לאחר איפוס, הורידים של המנעול יימחקו. אתה בטוח שברצונך לאפס?", "在线": "באינטרנט", "离线": "מנותק", diff --git a/lan/lan_hi.json b/lan/lan_hi.json index 463d1d90..1e608b4f 100644 --- a/lan/lan_hi.json +++ b/lan/lan_hi.json @@ -1080,6 +1080,8 @@ "印度尼西亚语": "बाहसा इंडोनेशिया", "芬兰语": "सूमी", "丹麦语": "मूर्ख व्यक्ति", + "印地语": "हिंदीName", + "乌尔都语": "اوردو", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "रीसेट के बाद, लॉक के मेटाकार्पल नसों को हटा दिया जाएगा। क्या आप निश्चित रूप से रीसेट करना चाहते हैं?", "在线": "ऑनलाइन", "离线": "ऑफ़लाइन", diff --git a/lan/lan_hk.json b/lan/lan_hk.json index be282c4f..754865ba 100644 --- a/lan/lan_hk.json +++ b/lan/lan_hk.json @@ -1078,6 +1078,8 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "索米", "丹麦语": "丹斯克", + "印地语": "हिंदीName", + "乌尔都语": "اوردو", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "重置後，鎖的掌靜脈將被刪除。 你確定要重置啊？", "在线": "在線", "离线": "離線", diff --git a/lan/lan_hr.json b/lan/lan_hr.json index fd246ef3..ece14b96 100644 --- a/lan/lan_hr.json +++ b/lan/lan_hr.json @@ -1078,6 +1078,8 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", + "印地语": "हिंदीName", + "乌尔都语": "اوردو", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "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 38a5662e..894a44e3 100644 --- a/lan/lan_hu.json +++ b/lan/lan_hu.json @@ -1078,6 +1078,8 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", + "印地语": "हिंदीName", + "乌尔都语": "اوردو", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "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 5adea3d9..a0dd8c94 100644 --- a/lan/lan_id.json +++ b/lan/lan_id.json @@ -1078,6 +1078,8 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", + "印地语": "हिंदीName", + "乌尔都语": "اوردو", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "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 1cbf97ea..00fa3d12 100644 --- a/lan/lan_it.json +++ b/lan/lan_it.json @@ -1078,6 +1078,8 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", + "印地语": "हिंदीName", + "乌尔都语": "اوردو", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "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 cea8a5d0..f58e6062 100644 --- a/lan/lan_ja.json +++ b/lan/lan_ja.json @@ -1078,6 +1078,8 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", + "印地语": "हिंदीName", + "乌尔都语": "اوردو", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "リセット後、ロックの中手骨静脈が削除されます。リセットしてもよろしいですか。", "在线": "オンライン", "离线": "オフライン", diff --git a/lan/lan_keys.json b/lan/lan_keys.json index a284f512..174e1185 100755 --- a/lan/lan_keys.json +++ b/lan/lan_keys.json @@ -1081,6 +1081,8 @@ "印度尼西亚语": "印度尼西亚语", "芬兰语": "芬兰语", "丹麦语": "丹麦语", + "印地语": "印地语", + "乌尔都语": "乌尔都语", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？", "在线": "在线", "离线": "离线", diff --git a/lan/lan_kk.json b/lan/lan_kk.json index 728c1946..cf4ec926 100644 --- a/lan/lan_kk.json +++ b/lan/lan_kk.json @@ -1078,6 +1078,8 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", + "印地语": "हिंदीName", + "乌尔都语": "اوردو", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "Қайта ысырып тастағаннан соң бұғаттағы метакарпалар өшіріледі. Шынымен ысырып тастауды қалайсыз ба?", "在线": "Онлайн", "离线": "Желіде емес", diff --git a/lan/lan_ko.json b/lan/lan_ko.json index af0fab29..5d8c6ef0 100644 --- a/lan/lan_ko.json +++ b/lan/lan_ko.json @@ -1078,6 +1078,8 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", + "印地语": "हिंदीName", + "乌尔都语": "اوردو", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "재설정 후 잠금 장치의 중수골 정맥이 삭제됩니다. 당신은 당신이 재설정 하시겠습니까?", "在线": "온라인", "离线": "오프라인", diff --git a/lan/lan_lt.json b/lan/lan_lt.json index 4a84d77b..ebb9df23 100644 --- a/lan/lan_lt.json +++ b/lan/lan_lt.json @@ -1078,6 +1078,8 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", + "印地语": "हिंदीName", + "乌尔都语": "اوردو", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "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 a85297b6..d003ba80 100644 --- a/lan/lan_ms.json +++ b/lan/lan_ms.json @@ -1078,6 +1078,8 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", + "印地语": "हिंदीName", + "乌尔都语": "اوردو", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "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 ff92c9b7..afdd971d 100644 --- a/lan/lan_nl.json +++ b/lan/lan_nl.json @@ -1078,6 +1078,8 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", + "印地语": "हिंदीName", + "乌尔都语": "اوردو", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "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 9449d4c0..120281a1 100644 --- a/lan/lan_pl.json +++ b/lan/lan_pl.json @@ -1078,6 +1078,8 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", + "印地语": "हिंदीName", + "乌尔都语": "اوردو", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "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 0365fbd6..4d3a3436 100644 --- a/lan/lan_pt.json +++ b/lan/lan_pt.json @@ -1078,6 +1078,8 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", + "印地语": "हिंदीName", + "乌尔都语": "اوردو", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "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 c25f3051..a439b5fa 100644 --- a/lan/lan_ro.json +++ b/lan/lan_ro.json @@ -1078,6 +1078,8 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", + "印地语": "हिंदीName", + "乌尔都语": "اوردو", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "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 d74b4d67..3297d79a 100644 --- a/lan/lan_ru.json +++ b/lan/lan_ru.json @@ -1078,6 +1078,8 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", + "印地语": "हिंदीName", + "乌尔都语": "اوردو", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "После сброса пястные вены замка будут удалены. Вы уверены, что хотите сбросить?", "在线": "Онлайн", "离线": "Оффлайн", diff --git a/lan/lan_sk.json b/lan/lan_sk.json index 4faea5d9..18c30d61 100644 --- a/lan/lan_sk.json +++ b/lan/lan_sk.json @@ -1078,6 +1078,8 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", + "印地语": "हिंदीName", + "乌尔都语": "اوردو", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "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 7c61e6cd..67bc4ada 100644 --- a/lan/lan_sr_cyrl.json +++ b/lan/lan_sr_cyrl.json @@ -1078,6 +1078,8 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", + "印地语": "हिंदीName", + "乌尔都语": "اوردو", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "Након ресетовања, метакарпалне вене браве ће бити избрисане. Да ли сте сигурни да желите да ресетујете?", "在线": "Онлине", "离线": "Ванмрежне", diff --git a/lan/lan_sv.json b/lan/lan_sv.json index 4ec91309..22dcfa65 100644 --- a/lan/lan_sv.json +++ b/lan/lan_sv.json @@ -1078,6 +1078,8 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", + "印地语": "हिंदीName", + "乌尔都语": "اوردو", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "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 234fce02..fb568c47 100644 --- a/lan/lan_th.json +++ b/lan/lan_th.json @@ -1078,6 +1078,8 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", + "印地语": "हिंदीName", + "乌尔都语": "اوردو", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "หลังจากรีเซ็ตแล้วหลอดเลือดดำ metacarpal ของล็อคจะถูกลบออกคุณแน่ใจว่าอยากจะรีเซ็ต?", "在线": "ออนไลน์ผ่าน", "离线": "ออฟไลน์", diff --git a/lan/lan_tr.json b/lan/lan_tr.json index 34f5ab7e..34f6a7e9 100644 --- a/lan/lan_tr.json +++ b/lan/lan_tr.json @@ -1078,6 +1078,8 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", + "印地语": "हिंदीName", + "乌尔都语": "اوردو", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "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 69fd23f7..6de33a41 100644 --- a/lan/lan_tw.json +++ b/lan/lan_tw.json @@ -1078,6 +1078,8 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", + "印地语": "हिंदीName", + "乌尔都语": "اوردو", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "重置後,鎖的掌靜脈將被刪除。 是否確實要重置?", "在线": "在線", "离线": "離線", diff --git a/lan/lan_uk.json b/lan/lan_uk.json index 0ddc8868..a0451246 100644 --- a/lan/lan_uk.json +++ b/lan/lan_uk.json @@ -1078,6 +1078,8 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", + "印地语": "हिंदीName", + "乌尔都语": "اوردو", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "Після скидання п'ясткові вени замку будуть видалені. Ви впевнені, що хочете скинути налаштування?", "在线": "Онлайн", "离线": "Автономних", diff --git a/lan/lan_ur.json b/lan/lan_ur.json index 7bf3a227..90574a85 100644 --- a/lan/lan_ur.json +++ b/lan/lan_ur.json @@ -1080,6 +1080,8 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", + "印地语": "हिंदीName", + "乌尔都语": "اوردو", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "ری سیٹ کرنے کے بعد ، لاک کی میٹاکارپل رگیں حذف کردی جائیں گی۔ کیا آپ واقعی دوبارہ ترتیب دینا چاہتے ہیں؟", "在线": "آن لائن", "离线": "آف لائن", diff --git a/lan/lan_vi.json b/lan/lan_vi.json index e91661df..4086e02f 100644 --- a/lan/lan_vi.json +++ b/lan/lan_vi.json @@ -1078,6 +1078,8 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", + "印地语": "हिंदीName", + "乌尔都语": "اوردو", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "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 f2a7ff7d..f622d613 100755 --- a/lan/lan_zh.json +++ b/lan/lan_zh.json @@ -1081,6 +1081,8 @@ "印度尼西亚语": "Bahasa Indonesia", "芬兰语": "Suomi", "丹麦语": "Dansk", + "印地语": "हिंदीName", + "乌尔都语": "اوردو", "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？": "重置后，该锁的掌静脉都将被删除哦，确认要重置吗？", "在线": "在线", "离线": "离线", diff --git a/lib/translations/app_dept.dart b/lib/translations/app_dept.dart index c58d5de8..1d60fe75 100755 --- a/lib/translations/app_dept.dart +++ b/lib/translations/app_dept.dart @@ -54,6 +54,8 @@ extension ExtensionAppDept on AppDept { const Locale fiL = Locale('fi', 'FI'); const Locale daL = Locale('da', 'DK'); const Locale ukL = Locale('uk', 'UA'); + const Locale hiL = Locale('hi', 'HI'); + const Locale urL = Locale('ur', 'UR'); const Locale srCyrillic = Locale('sr', 'RS'); return [ @@ -93,6 +95,8 @@ extension ExtensionAppDept on AppDept { fiL, daL, ukL, + hiL, + urL, srCyrillic ]; } @@ -177,7 +181,12 @@ enum LanguageType { // 丹麦语 danish, // 乌克兰语 - ukrainian + ukrainian, + //印地语、 + hindi, + //乌尔都语 + urdu, + } extension ExtensionLanguageType on LanguageType { @@ -295,6 +304,12 @@ extension ExtensionLanguageType on LanguageType { case LanguageType.ukrainian: str = '乌克兰语'.tr; break; + case LanguageType.hindi: + str = '印地语'.tr; + break; + case LanguageType.urdu: + str = '乌尔都语'.tr; + break; } return str; } @@ -415,6 +430,12 @@ extension ExtensionLanguageType on LanguageType { case 'uk': languageType = LanguageType.ukrainian; break; + case 'hi': + languageType = LanguageType.hindi; + break; + case 'ur': + languageType = LanguageType.urdu; + break; default: languageType = LanguageType.english; break; @@ -610,6 +631,16 @@ extension ExtensionLanguageType on LanguageType { return locale; } break; + case LanguageType.hindi: + if (locale.languageCode == 'hi' && locale.countryCode == 'HI') { + return locale; + } + break; + case LanguageType.urdu: + if (locale.languageCode == 'ur' && locale.countryCode == 'UR') { + return locale; + } + break; case LanguageType.system: // TODO: Handle this case. break; From ff8bfa8fd0cbaab79203844bc081388ab5221826 Mon Sep 17 00:00:00 2001 From: liyi Date: Mon, 24 Mar 2025 14:14:12 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E4=BF=84=E8=AF=AD=E5=87=BA=E7=8E=B0=E7=9A=84=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lan/lan_en.json | 1 + lan/lan_keys.json | 1 + lan/lan_ru.json | 1 + lan/lan_zh.json | 1 + .../addFingerprint/addFingerprint_logic.dart | 319 ++++++++++-------- .../fingerprintList_logic.dart | 56 +-- .../fingerprintList/fingerprintList_page.dart | 28 +- .../lockDetail/lockDetail_page.dart | 32 +- .../passwordKeyDetail_logic.dart | 2 +- .../passwordKeyDetail_page.dart | 2 +- lib/tools/showCupertinoAlertView.dart | 2 +- 11 files changed, 235 insertions(+), 210 deletions(-) diff --git a/lan/lan_en.json b/lan/lan_en.json index a84ceb62..c2fbf2a7 100644 --- a/lan/lan_en.json +++ b/lan/lan_en.json @@ -1150,5 +1150,6 @@ "暂无最新记录": "There are currently no latest records available", "请将手机切换至2.4G WiFi进行手动连接": "Please switch your phone to 2.4G WiFi for manual connection", "请确保网络是2.4GHz Wi-Fi": "Please ensure that the network is 2.4GHz Wi Fi", + "是否要远程开锁": "Do you want to unlock remotely", "网关添加成功": "Gateway added successfully" } diff --git a/lan/lan_keys.json b/lan/lan_keys.json index 174e1185..f93afdae 100755 --- a/lan/lan_keys.json +++ b/lan/lan_keys.json @@ -1155,5 +1155,6 @@ "请扫描可视门铃码二维码": "请扫描可视门铃码二维码", "请确保网络是2.4GHz Wi-Fi": "请确保网络是2.4GHz Wi-Fi", "已选": "已选", + "是否要远程开锁": "是否要远程开锁", "网关添加成功": "网关添加成功" } diff --git a/lan/lan_ru.json b/lan/lan_ru.json index 3297d79a..07772f3b 100644 --- a/lan/lan_ru.json +++ b/lan/lan_ru.json @@ -1152,5 +1152,6 @@ "请扫描可视门铃码二维码": "Сканируйте код вызова", "请确保网络是2.4GHz Wi-Fi": "Убедитесь, что сеть имеет 2,4 ГГц Wi - Fi", "已选": "Выбранные", + "是否要远程开锁": "Нужно ли удалённо открывать замок", "请将手机切换至2.4G WiFi进行手动连接": "Пожалуйста, переключите телефон на 2.4G WiFi для ручного подключения" } \ No newline at end of file diff --git a/lan/lan_zh.json b/lan/lan_zh.json index f622d613..351e3fff 100755 --- a/lan/lan_zh.json +++ b/lan/lan_zh.json @@ -1155,5 +1155,6 @@ "请扫描可视门铃码二维码": "请扫描可视门铃码二维码", "请确保网络是2.4GHz Wi-Fi": "请确保网络是2.4GHz Wi-Fi", "已选": "已选", + "是否要远程开锁": "是否要远程开锁", "网关添加成功": "网关添加成功" } diff --git a/lib/main/lockDetail/fingerprint/addFingerprint/addFingerprint_logic.dart b/lib/main/lockDetail/fingerprint/addFingerprint/addFingerprint_logic.dart index bab8f1f0..c8507a3f 100755 --- a/lib/main/lockDetail/fingerprint/addFingerprint/addFingerprint_logic.dart +++ b/lib/main/lockDetail/fingerprint/addFingerprint/addFingerprint_logic.dart @@ -1,4 +1,3 @@ - import 'dart:async'; import 'package:flutter_blue_plus/flutter_blue_plus.dart'; @@ -26,20 +25,23 @@ class AddFingerprintLogic 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 SenderAddFingerprintWithTimeCycleCoercionReply) && (state.ifCurrentScreen.value == true)) { + if ((reply is SenderAddFingerprintWithTimeCycleCoercionReply) && + (state.ifCurrentScreen.value == true)) { _replyAddFingerprintBegin(reply); } // 添加指纹过程 - if(reply is SenderAddFingerprintProcessReply) { + if (reply is SenderAddFingerprintProcessReply) { _replyAddFingerprintProcess(reply); } // 添加指纹确认 - if(reply is SenderAddFingerprintConfirmationReply) { + if (reply is SenderAddFingerprintConfirmationReply) { _replyAddFingerprintConfirmation(reply); } }); @@ -49,11 +51,10 @@ class AddFingerprintLogic extends BaseGetXController { BuglyTool.uploadException( message: '添加指纹开始，解析数据', detail: '添加指纹开始，解析数据 _replyAddFingerprintBegin:${reply.data}', - upload: false - ); + upload: false); final int status = reply.data[2]; - switch(status){ + switch (status) { case 0x00: //成功 state.ifConnectScuess.value = true; @@ -67,10 +68,13 @@ class AddFingerprintLogic extends BaseGetXController { break; case 0x06: //无权限 - final List? privateKey = await Storage.getStringList(saveBluePrivateKey); - final List getPrivateKeyList = changeStringListToIntList(privateKey!); + final List? privateKey = + await Storage.getStringList(saveBluePrivateKey); + final List getPrivateKeyList = + changeStringListToIntList(privateKey!); - final List? signKey = await Storage.getStringList(saveBlueSignKey); + final List? signKey = + await Storage.getStringList(saveBlueSignKey); final List signKeyDataList = changeStringListToIntList(signKey!); final List token = reply.data.sublist(5, 9); @@ -78,30 +82,33 @@ class AddFingerprintLogic extends BaseGetXController { Storage.setStringList(saveBlueToken, saveStrList); IoSenderManage.senderAddFingerprintWithTimeCycleCoercionCommand( - keyID:'1', - userID:await Storage.getUid(), - fingerNo:0, - useCountLimit:0xffff, - isForce:state.isCoerced.value == '1' ? 1 : 0, // 是否是胁迫 - isAdmin: state.isAdministrator.value == '2' ? 1 : 0, - operate: 0, - isRound:state.selectType.value == '2' ? 1: 0, // 是否是循环 - weekRound:DateTool().accordingTheCycleIntoTheCorrespondingNumber(state.weekDay.value), // 周循环 - startDate: int.parse(state.startDate.value)~/1000, - endDate: int.parse(state.endDate.value)~/1000, - startTime:DateTool().dateToHNString(state.effectiveDateTime.value), - endTime:DateTool().dateToHNString(state.failureDateTime.value), - needAuthor:1, - signKey:signKeyDataList, - privateKey:getPrivateKeyList, - token: token, - isBeforeAddUser: false - ); + keyID: '1', + userID: await Storage.getUid(), + fingerNo: 0, + useCountLimit: 0xffff, + isForce: state.isCoerced.value == '1' ? 1 : 0, + // 是否是胁迫 + isAdmin: state.isAdministrator.value == '2' ? 1 : 0, + operate: 0, + isRound: state.selectType.value == '2' ? 1 : 0, + // 是否是循环 + weekRound: DateTool().accordingTheCycleIntoTheCorrespondingNumber( + state.weekDay.value), + // 周循环 + startDate: int.parse(state.startDate.value) ~/ 1000, + endDate: int.parse(state.endDate.value) ~/ 1000, + startTime: DateTool().dateToHNString(state.effectiveDateTime.value), + endTime: DateTool().dateToHNString(state.failureDateTime.value), + needAuthor: 1, + signKey: signKeyDataList, + privateKey: getPrivateKeyList, + token: token, + isBeforeAddUser: false); break; default: //失败 state.ifAddState.value = false; - showToast('添加指纹失败'.tr, something: (){ + showToast('添加指纹失败'.tr, something: () { Get.back(); }); break; @@ -112,13 +119,12 @@ class AddFingerprintLogic extends BaseGetXController { BuglyTool.uploadException( message: '添加指纹过程，解析数据', detail: '添加指纹过程，解析数据 _replyAddFingerprintProcess:${reply.data}', - upload: false - ); + upload: false); final int status = reply.data[2]; - switch(status){ + switch (status) { case 0x00: //成功 - switch(reply.data[5]){ + switch (reply.data[5]) { case 0xff: // 注册指纹失败 showToast('退出添加'.tr); @@ -166,35 +172,37 @@ class AddFingerprintLogic extends BaseGetXController { Future _replyAddFingerprintConfirmation(Reply reply) async { final int status = reply.data[2]; final String getMobile = (await Storage.getMobile())!; - switch(status){ + switch (status) { case 0x00: //成功 - // var fingerprintNum = listChangInt(reply.data.sublist(9, 11)).toString(); + // var fingerprintNum = listChangInt(reply.data.sublist(9, 11)).toString(); ApmHelper.instance.trackEvent('add_fingerprint', { - 'lock_name':BlueManage().connectDeviceName, - 'account':getMobile.isNotEmpty ? getMobile : (await Storage.getEmail())!, - 'date':DateTool().getNowDateWithType(1), - 'add_fingerprint_result':'成功', + 'lock_name': BlueManage().connectDeviceName, + 'account': + getMobile.isNotEmpty ? getMobile : (await Storage.getEmail())!, + 'date': DateTool().getNowDateWithType(1), + 'add_fingerprint_result': '成功', }); BuglyTool.uploadException( message: '添加指纹确认结果，解析数据', - detail: '添加指纹确认结果，解析数据 _replyAddFingerprintConfirmation:${reply.data}', - upload: false - ); + detail: + '添加指纹确认结果，解析数据 _replyAddFingerprintConfirmation:${reply.data}', + upload: false); - final List fingerprintList = reply.data.sublist(reply.data.length - 2); + final List fingerprintList = + reply.data.sublist(reply.data.length - 2); final String fingerprintNum = listChangInt(fingerprintList).toString(); state.regIndex.value++; - if(state.fingerprintNumber.value == fingerprintNum){ + if (state.fingerprintNumber.value == fingerprintNum) { return; - }else{ + } else { state.fingerprintNumber.value = fingerprintNum; } // if(state.isCoerced.value == "1"){ - // 调用添加指纹接口 + // 调用添加指纹接口 state.ifAddState.value = false; - addFingerprintsData(); + await addFingerprintsData(); // }else{ // // 如果是胁迫指纹在 添加完之后以后再调用添加胁迫指纹的 // senderAddStressFingerprint(); @@ -203,18 +211,19 @@ class AddFingerprintLogic extends BaseGetXController { default: //失败 ApmHelper.instance.trackEvent('add_fingerprint', { - 'lock_name':BlueManage().connectDeviceName, - 'account':getMobile.isNotEmpty ? getMobile : (await Storage.getEmail())!, - 'date':DateTool().getNowDateWithType(1), - 'add_fingerprint_result':'失败-${reply.data}', + 'lock_name': BlueManage().connectDeviceName, + 'account': + getMobile.isNotEmpty ? getMobile : (await Storage.getEmail())!, + 'date': DateTool().getNowDateWithType(1), + 'add_fingerprint_result': '失败-${reply.data}', }); BuglyTool.uploadException( message: '添加指纹确认结果，解析数据', - detail: '添加指纹确认结果蓝牙返回失败结果，解析数据 _replyAddFingerprintConfirmation:${reply.data}', + detail: + '添加指纹确认结果蓝牙返回失败结果，解析数据 _replyAddFingerprintConfirmation:${reply.data}', eventStr: '添加指纹事件蓝牙返回失败结果', - upload: true - ); + upload: true); state.ifAddState.value = false; break; } @@ -222,7 +231,8 @@ class AddFingerprintLogic extends BaseGetXController { // 添加指纹开始 Future senderAddFingerprint() async { - final List? privateKey = await Storage.getStringList(saveBluePrivateKey); + final List? privateKey = + await Storage.getStringList(saveBluePrivateKey); final List getPrivateKeyList = changeStringListToIntList(privateKey!); final List? signKey = await Storage.getStringList(saveBlueSignKey); @@ -232,90 +242,104 @@ class AddFingerprintLogic extends BaseGetXController { final List getTokenList = changeStringListToIntList(token!); final String command = SenderAddFingerprintWithTimeCycleCoercionCommand( - keyID:'1', - userID:await Storage.getUid(), - fingerNo:0, - useCountLimit:0xffff, - isForce:state.isCoerced.value == '1' ? 1 : 0, // 是否是胁迫 + keyID: '1', + userID: await Storage.getUid(), + fingerNo: 0, + useCountLimit: 0xffff, + isForce: state.isCoerced.value == '1' ? 1 : 0, + // 是否是胁迫 isAdmin: state.isAdministrator.value == '2' ? 1 : 0, operate: 0, - isRound:state.selectType.value == '2' ? 1: 0, // 是否是循环 - weekRound:DateTool().accordingTheCycleIntoTheCorrespondingNumber(state.weekDay.value), // 周循环 - startDate: int.parse(state.startDate.value)~/1000, - endDate: int.parse(state.endDate.value)~/1000, - startTime:DateTool().dateToHNString(state.effectiveDateTime.value), - endTime:DateTool().dateToHNString(state.failureDateTime.value), - needAuthor:1, - signKey:signKeyDataList, - privateKey:getPrivateKeyList, + isRound: state.selectType.value == '2' ? 1 : 0, + // 是否是循环 + weekRound: DateTool() + .accordingTheCycleIntoTheCorrespondingNumber(state.weekDay.value), + // 周循环 + startDate: int.parse(state.startDate.value) ~/ 1000, + endDate: int.parse(state.endDate.value) ~/ 1000, + startTime: DateTool().dateToHNString(state.effectiveDateTime.value), + endTime: DateTool().dateToHNString(state.failureDateTime.value), + needAuthor: 1, + signKey: signKeyDataList, + privateKey: getPrivateKeyList, token: getTokenList, ).toString(); showBlueConnetctToastTimer(action: () async { final String getMobile = (await Storage.getMobile())!; ApmHelper.instance.trackEvent('add_fingerprint', { - 'lock_name':BlueManage().connectDeviceName, - 'account':getMobile.isNotEmpty ? getMobile : (await Storage.getEmail())!, - 'date':DateTool().getNowDateWithType(1), - 'add_fingerprint_result':'超时', + 'lock_name': BlueManage().connectDeviceName, + 'account': + getMobile.isNotEmpty ? getMobile : (await Storage.getEmail())!, + 'date': DateTool().getNowDateWithType(1), + 'add_fingerprint_result': '超时', }); BuglyTool.uploadException( message: '添加指纹超时处理-添加指纹失败', - detail: '添加指纹超时处理，断开连接，添加指纹失败--SenderAddFingerprintWithTimeCycleCoercionCommand:$command', + detail: + '添加指纹超时处理，断开连接，添加指纹失败--SenderAddFingerprintWithTimeCycleCoercionCommand:$command', eventStr: '添加指纹事件超时', - upload: true - ); + upload: true); Get.close(1); }); - BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState deviceConnectionState) async { - if (deviceConnectionState == BluetoothConnectionState.connected){ - final List? privateKey = await Storage.getStringList(saveBluePrivateKey); - final List getPrivateKeyList = changeStringListToIntList(privateKey!); + BlueManage().blueSendData(BlueManage().connectDeviceName, + (BluetoothConnectionState deviceConnectionState) async { + if (deviceConnectionState == BluetoothConnectionState.connected) { + final List? privateKey = + await Storage.getStringList(saveBluePrivateKey); + final List getPrivateKeyList = + changeStringListToIntList(privateKey!); - final List? signKey = await Storage.getStringList(saveBlueSignKey); + final List? signKey = + await Storage.getStringList(saveBlueSignKey); final List signKeyDataList = changeStringListToIntList(signKey!); final List? token = await Storage.getStringList(saveBlueToken); final List getTokenList = changeStringListToIntList(token!); IoSenderManage.senderAddFingerprintWithTimeCycleCoercionCommand( - keyID:'1', - userID:await Storage.getUid(), - fingerNo:0, - useCountLimit:0xffff, - isForce:state.isCoerced.value == '1' ? 1 : 0, // 是否是胁迫 - isAdmin: state.isAdministrator.value == '2' ? 1 : 0, - operate: 0, - isRound:state.selectType.value == '2' ? 1: 0, // 是否是循环 - weekRound:DateTool().accordingTheCycleIntoTheCorrespondingNumber(state.weekDay.value), // 周循环 - startDate: int.parse(state.startDate.value)~/1000, - endDate: int.parse(state.endDate.value)~/1000, - startTime:DateTool().dateToHNString(state.effectiveDateTime.value), - endTime:DateTool().dateToHNString(state.failureDateTime.value), - needAuthor:1, - signKey:signKeyDataList, - privateKey:getPrivateKeyList, - token: getTokenList, - isBeforeAddUser: false - ); - }else if (deviceConnectionState == BluetoothConnectionState.disconnected){ + keyID: '1', + userID: await Storage.getUid(), + fingerNo: 0, + useCountLimit: 0xffff, + isForce: state.isCoerced.value == '1' ? 1 : 0, + // 是否是胁迫 + isAdmin: state.isAdministrator.value == '2' ? 1 : 0, + operate: 0, + isRound: state.selectType.value == '2' ? 1 : 0, + // 是否是循环 + weekRound: DateTool().accordingTheCycleIntoTheCorrespondingNumber( + state.weekDay.value), + // 周循环 + startDate: int.parse(state.startDate.value) ~/ 1000, + endDate: int.parse(state.endDate.value) ~/ 1000, + startTime: DateTool().dateToHNString(state.effectiveDateTime.value), + endTime: DateTool().dateToHNString(state.failureDateTime.value), + needAuthor: 1, + signKey: signKeyDataList, + privateKey: getPrivateKeyList, + token: getTokenList, + isBeforeAddUser: false); + } else if (deviceConnectionState == + BluetoothConnectionState.disconnected) { final String getMobile = (await Storage.getMobile())!; ApmHelper.instance.trackEvent('add_fingerprint', { - 'lock_name':BlueManage().connectDeviceName, - 'account':getMobile.isNotEmpty ? getMobile : (await Storage.getEmail())!, - 'date':DateTool().getNowDateWithType(1), - 'add_fingerprint_result':'断开', + 'lock_name': BlueManage().connectDeviceName, + 'account': + getMobile.isNotEmpty ? getMobile : (await Storage.getEmail())!, + 'date': DateTool().getNowDateWithType(1), + 'add_fingerprint_result': '断开', }); BuglyTool.uploadException( message: '添加指纹断开连接-添加指纹失败', - detail: '添加指纹断开连接-添加指纹失败--SenderAddFingerprintWithTimeCycleCoercionCommand:$command', + detail: + '添加指纹断开连接-添加指纹失败--SenderAddFingerprintWithTimeCycleCoercionCommand:$command', eventStr: '添加指纹事件断开连接', - upload: true - ); + upload: true); - if(state.ifCurrentScreen.value == true){ + if (state.ifCurrentScreen.value == true) { showBlueConnetctToast(); } cancelBlueConnetctToastTimer(); @@ -326,27 +350,32 @@ class AddFingerprintLogic extends BaseGetXController { // 取消添加指纹 Future senderCancelAddFingerprintCommand() async { - BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState deviceConnectionState) async { - if (deviceConnectionState == BluetoothConnectionState.connected){ - final List? privateKey = await Storage.getStringList(saveBluePrivateKey); - final List getPrivateKeyList = changeStringListToIntList(privateKey!); + BlueManage().blueSendData(BlueManage().connectDeviceName, + (BluetoothConnectionState deviceConnectionState) async { + if (deviceConnectionState == BluetoothConnectionState.connected) { + final List? privateKey = + await Storage.getStringList(saveBluePrivateKey); + final List getPrivateKeyList = + changeStringListToIntList(privateKey!); - final List? signKey = await Storage.getStringList(saveBlueSignKey); + final List? signKey = + await Storage.getStringList(saveBlueSignKey); final List signKeyDataList = changeStringListToIntList(signKey!); final List? token = await Storage.getStringList(saveBlueToken); final List getTokenList = changeStringListToIntList(token!); IoSenderManage.senderCancelAddFingerprintCommand( - keyID:'1', - userID:await Storage.getUid(), - needAuthor:1, - signKey:signKeyDataList, - privateKey:getPrivateKeyList, + keyID: '1', + userID: await Storage.getUid(), + needAuthor: 1, + signKey: signKeyDataList, + privateKey: getPrivateKeyList, token: getTokenList, ); - }else if (deviceConnectionState == BluetoothConnectionState.disconnected){ - if(state.ifCurrentScreen.value == true){ + } else if (deviceConnectionState == + BluetoothConnectionState.disconnected) { + if (state.ifCurrentScreen.value == true) { showBlueConnetctToast(); } cancelBlueConnetctToastTimer(); @@ -356,53 +385,54 @@ class AddFingerprintLogic extends BaseGetXController { } // 添加指纹 - Future addFingerprintsData() async{ - final AddFingerprintEntity entity = await ApiRepository.to.addFingerprintsData( + Future addFingerprintsData() async { + final AddFingerprintEntity entity = + await ApiRepository.to.addFingerprintsData( lockId: state.lockId.value.toString(), endDate: state.endDate.value, - addType:state.addType.value, + addType: state.addType.value, fingerprintName: state.fingerprintName.value, fingerprintNumber: state.fingerprintNumber.value, fingerprintType: state.fingerprintType.value, isCoerced: state.isCoerced.value, startDate: state.startDate.value, weekDay: state.weekDay.value, - fingerRight:state.isAdministrator.value == '2' ? 1 : 0, + fingerRight: state.isAdministrator.value == '2' ? 1 : 0, startTime: int.parse(state.effectiveDateTime.value), endTime: int.parse(state.failureDateTime.value), ); - if(entity.errorCode!.codeIsSuccessful){ + if (entity.errorCode!.codeIsSuccessful) { updateFingerprintUserNoLoadData(entity.data!.fingerprintId.toString()); BuglyTool.uploadException( message: '添加指纹调用接口成功', detail: '添加指纹调用接口成功', eventStr: '添加指纹事件用接口成功', - upload: true - ); - }else{ + upload: true); + } else { updateFingerprintUserNoLoadData(entity.data!.fingerprintId.toString()); BuglyTool.uploadException( message: '添加指纹调用接口失败', detail: '添加指纹调用接口添加指纹调用接口失败 - ${entity.errorMsg}', eventStr: '添加指纹事件接口失败', - upload: true - ); + upload: true); } } // 更新指纹用户账号 - Future updateFingerprintUserNoLoadData(String fingerprintId) async{ - final LoginEntity entity = await ApiRepository.to.updateFingerprintUserNoLoadData( - fingerprintId: fingerprintId, - lockId: state.lockId.value.toString(), - fingerprintUserNo: state.fingerprintNumber.value, + Future updateFingerprintUserNoLoadData(String fingerprintId) async { + final LoginEntity entity = + await ApiRepository.to.updateFingerprintUserNoLoadData( + fingerprintId: fingerprintId, + lockId: state.lockId.value.toString(), + fingerprintUserNo: state.fingerprintNumber.value, ); - if(entity.errorCode!.codeIsSuccessful){ - showToast('添加成功'.tr, something: (){ - if(state.fromType.value == 2){ + if (entity.errorCode!.codeIsSuccessful) { + showToast('添加成功'.tr, something: () { + if (state.fromType.value == 2) { // 回调指纹号 - eventBus.fire(ChickInAddStaffCardAndFingerprintBlockNumberEvent(state.fingerprintNumber.value)); - }else if(state.fromType.value == 1){ + eventBus.fire(ChickInAddStaffCardAndFingerprintBlockNumberEvent( + state.fingerprintNumber.value)); + } else if (state.fromType.value == 1) { eventBus.fire(OtherTypeRefreshListEvent()); } Get.close(2); @@ -430,5 +460,4 @@ class AddFingerprintLogic extends BaseGetXController { _replySubscription.cancel(); } - -} \ No newline at end of file +} diff --git a/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_logic.dart b/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_logic.dart index 37d56740..09523db0 100755 --- a/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_logic.dart +++ b/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_logic.dart @@ -23,6 +23,7 @@ class FingerprintListLogic extends BaseGetXController { // 获取解析后的数据 late StreamSubscription _replySubscription; + void _initReplySubscription() { _replySubscription = EventBusManager().eventBus!.on().listen((Reply reply) { @@ -74,11 +75,15 @@ class FingerprintListLogic extends BaseGetXController { userID: (await Storage.getUid())!, fingerNo: state.deletFingerNo, useCountLimit: 0xffff, - operate: state.isDeletAll == true ? 3 : 2, // 0:注册 1：修改 2:删除 3：删除全部 + operate: state.isDeletAll == true ? 3 : 2, + // 0:注册 1：修改 2:删除 3：删除全部 isAdmin: 0, - isForce: 0, // 是否是胁迫 - isRound: 0, // 是否是循环 - weekRound: 0, // 周循环 + isForce: 0, + // 是否是胁迫 + isRound: 0, + // 是否是循环 + weekRound: 0, + // 周循环 startDate: 0x11223344, endDate: 0x11223344, startTime: '0', @@ -275,11 +280,15 @@ class FingerprintListLogic extends BaseGetXController { userID: (await Storage.getUid())!, fingerNo: state.deletFingerNo, useCountLimit: 0xffff, - operate: state.isDeletAll == true ? 3 : 2, // 0:注册 1：修改 2:删除 3：删除全部 + operate: state.isDeletAll == true ? 3 : 2, + // 0:注册 1：修改 2:删除 3：删除全部 isAdmin: 0, - isForce: 0, // 是否是胁迫 - isRound: 0, // 是否是循环 - weekRound: 0, // 周循环 + isForce: 0, + // 是否是胁迫 + isRound: 0, + // 是否是循环 + weekRound: 0, + // 周循环 startDate: 0x11223344, endDate: 0x11223344, startTime: '0', @@ -299,30 +308,31 @@ class FingerprintListLogic extends BaseGetXController { } }); } + /** * //请求密码钥匙列表 - Future mockNetworkDataRequest( + Future mockNetworkDataRequest( {required bool isRefresh}) async { - // 如果是下拉刷新，清空已有数据 - if (isRefresh) { + // 如果是下拉刷新，清空已有数据 + if (isRefresh) { state.itemDataList.clear(); pageNo = 1; - } + } - final PasswordKeyListEntity entity = await ApiRepository.to.passwordKeyList( - state.keyInfo.value.keyStatus.toString(), - state.keyInfo.value.lockId.toString(), - pageNo.toString(), - pageSize.toString(), - state.searchController.text); - if (entity.errorCode!.codeIsSuccessful) { + final PasswordKeyListEntity entity = await ApiRepository.to.passwordKeyList( + state.keyInfo.value.keyStatus.toString(), + state.keyInfo.value.lockId.toString(), + pageNo.toString(), + pageSize.toString(), + state.searchController.text); + if (entity.errorCode!.codeIsSuccessful) { // 更新数据列表 state.itemDataList.addAll(entity.data!.itemList!); // 更新页码 pageNo++; - } - return entity; - } + } + return entity; + } */ @@ -390,6 +400,7 @@ class FingerprintListLogic extends BaseGetXController { // 监听修改完详情之后刷新列表 late StreamSubscription _teamEvent; + void _initRefreshAction() { _teamEvent = eventBus .on() @@ -450,6 +461,7 @@ class FingerprintListLogic extends BaseGetXController { _initReplySubscription(); _initRefreshAction(); + getFingerprintsListData(isRefresh: true); } } diff --git a/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_page.dart b/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_page.dart index acfb8e9a..15c16dbd 100755 --- a/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_page.dart +++ b/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_page.dart @@ -31,24 +31,9 @@ class _FingerprintListPageState extends State final FingerprintListLogic logic = Get.put(FingerprintListLogic()); final FingerprintListState state = Get.find().state; - Future getHttpData({required bool isRefresh}) async { - final bool? isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); - if (isDemoMode == false) { - logic - .getFingerprintsListData(isRefresh: isRefresh) - .then((FingerprintListDataEntity value) { - if (mounted) { - setState(() {}); - } - }); - } - } - @override void initState() { super.initState(); - - getHttpData(isRefresh: true); } @override @@ -91,17 +76,17 @@ class _FingerprintListPageState extends State ), body: EasyRefreshTool( onRefresh: () { - getHttpData(isRefresh: true); + logic.getFingerprintsListData(isRefresh: true); }, onLoad: () { - getHttpData(isRefresh: false); + logic.getFingerprintsListData(isRefresh: false); }, child: Column( children: [ KeySearchWidget( editingController: state.searchController, - onSubmittedAction: () { - getHttpData(isRefresh: true); + onSubmittedAction: () async { + await logic.getFingerprintsListData(isRefresh: true); }, ), SizedBox( @@ -116,7 +101,8 @@ class _FingerprintListPageState extends State 'lockId': state.lockId.value, 'fromType': 1 // 1从添加钥匙列表进入 2从考勤添加员工入口进入 })! - .then((value) => getHttpData(isRefresh: true)); + .then((value) => + logic.getFingerprintsListData(isRefresh: true)); // if (data != null) { // getHttpData(isRefresh: true); // } @@ -179,7 +165,7 @@ class _FingerprintListPageState extends State 'fingerprintItemData': fingerprintItemData, })! .then((value) { - getHttpData(isRefresh: true); + logic.getFingerprintsListData(isRefresh: true); }); // if (data == 'deletScuess') { // // state.fingerprintItemListData.removeWhere((FingerprintItemData item) => item.fingerprintId == fingerprintItemData.fingerprintId!); diff --git a/lib/main/lockDetail/lockDetail/lockDetail_page.dart b/lib/main/lockDetail/lockDetail/lockDetail_page.dart index d6740553..fc69d86b 100755 --- a/lib/main/lockDetail/lockDetail/lockDetail_page.dart +++ b/lib/main/lockDetail/lockDetail/lockDetail_page.dart @@ -55,7 +55,19 @@ class _LockDetailPageState extends State void initState() { super.initState(); - listeningAnimations(); + state.animationController = + AnimationController(duration: const Duration(seconds: 1), vsync: this); + state.animationController!.repeat(); + //动画开始、结束、向前移动或向后移动时会调用StatusListener + state.animationController!.addStatusListener((AnimationStatus status) { + if (status == AnimationStatus.completed) { + state.animationController!.reset(); + state.animationController!.forward(); + } else if (status == AnimationStatus.dismissed) { + state.animationController!.reset(); + state.animationController!.forward(); + } + }); state.pageController.addListener(() { state.currentPage.value = state.pageController.page!.round(); @@ -1321,24 +1333,6 @@ class _LockDetailPageState extends State ); } - Future listeningAnimations() async { - await Future.delayed(Duration.zero, () { - state.animationController = AnimationController( - duration: const Duration(seconds: 1), vsync: this); - state.animationController!.repeat(); - //动画开始、结束、向前移动或向后移动时会调用StatusListener - state.animationController!.addStatusListener((AnimationStatus status) { - if (status == AnimationStatus.completed) { - state.animationController!.reset(); - state.animationController!.forward(); - } else if (status == AnimationStatus.dismissed) { - state.animationController!.reset(); - state.animationController!.forward(); - } - }); - }); - } - String showElectricIcon(int electricnumber) { if (electricnumber >= 100) { return 'images/main/icon_lockElectricLevel_5.png'; diff --git a/lib/main/lockDetail/passwordKey/passwordKeyDetail/passwordKeyDetail_logic.dart b/lib/main/lockDetail/passwordKey/passwordKeyDetail/passwordKeyDetail_logic.dart index 9ed38957..04059392 100755 --- a/lib/main/lockDetail/passwordKey/passwordKeyDetail/passwordKeyDetail_logic.dart +++ b/lib/main/lockDetail/passwordKey/passwordKeyDetail/passwordKeyDetail_logic.dart @@ -202,7 +202,7 @@ class PasswordKeyDetailLogic extends BaseGetXController { break; case 2: //永久 2 从开始时间开始永久有效，必需在开始时间24小时内使用一次，否则将失效 - useDateStr = '永久'; + useDateStr = '永久'.tr; state.isCirculation.value = false; break; case 3: diff --git a/lib/main/lockDetail/passwordKey/passwordKeyDetail/passwordKeyDetail_page.dart b/lib/main/lockDetail/passwordKey/passwordKeyDetail/passwordKeyDetail_page.dart index 65be1a07..cc02af47 100755 --- a/lib/main/lockDetail/passwordKey/passwordKeyDetail/passwordKeyDetail_page.dart +++ b/lib/main/lockDetail/passwordKey/passwordKeyDetail/passwordKeyDetail_page.dart @@ -205,7 +205,7 @@ class _PasswordKeyDetailPageState extends State children: [ Expanded( child: Text( - '密码生成后，请在当日23：59前使用一次进行激活，否则过0点后未激活则失效。'.tr, + '密码生成后，请在当日23：59前使用一次进行激活，否则过0点后未激活则失效。密码激活后，有效期内不限次数使用。'.tr, textAlign: TextAlign.start, style: TextStyle(fontSize: 20.sp), )), diff --git a/lib/tools/showCupertinoAlertView.dart b/lib/tools/showCupertinoAlertView.dart index d973cc78..cf585bf1 100755 --- a/lib/tools/showCupertinoAlertView.dart +++ b/lib/tools/showCupertinoAlertView.dart @@ -297,7 +297,7 @@ class ShowCupertinoAlertView { builder: (BuildContext context) { return CupertinoAlertDialog( title: Container(), - content: Text('是否要远程开锁？'.tr), + content: Text('是否要远程开锁'.tr), actions: [ CupertinoDialogAction( onPressed: Get.back, From 09a8d7b3449678e01406aeb589e6c83d0bc881ec Mon Sep 17 00:00:00 2001 From: liyi Date: Mon, 24 Mar 2025 15:14:49 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E9=85=8D=E7=BD=91?= =?UTF-8?q?=E5=90=8E=E8=AF=BB=E5=8F=96=E9=94=81=E8=AE=BE=E7=BD=AE=E5=B9=B6?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../configuringWifi_logic.dart | 91 ++++++++++++++++++- 1 file changed, 90 insertions(+), 1 deletion(-) diff --git a/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_logic.dart b/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_logic.dart index 1ed6f736..52241914 100755 --- a/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_logic.dart +++ b/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_logic.dart @@ -12,6 +12,7 @@ import 'package:star_lock/appRouters.dart'; import 'package:star_lock/app_settings/app_settings.dart'; import 'package:star_lock/blue/io_gateway/io_gateway_configuringWifi.dart'; import 'package:star_lock/blue/io_gateway/io_gateway_getStatus.dart'; +import 'package:star_lock/blue/io_protocol/io_updataLockSet.dart'; import 'package:star_lock/login/login/entity/LoginEntity.dart'; import 'package:star_lock/main/lockDetail/lockDetail/device_network_info.dart'; import 'package:star_lock/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifiEntity.dart'; @@ -20,6 +21,7 @@ import 'package:star_lock/mine/gateway/addGateway/selectGateway/getGatewayInfo_m import 'package:star_lock/talk/starChart/entity/star_chart_register_node_entity.dart'; import 'package:star_lock/talk/starChart/star_chart_manage.dart'; import 'package:star_lock/tools/baseGetXController.dart'; +import 'package:star_lock/tools/commonDataManage.dart'; import '../../../../../blue/blue_manage.dart'; import '../../../../../blue/io_protocol/io_configuringWifi.dart'; @@ -59,7 +61,8 @@ class ConfiguringWifiLogic extends BaseGetXController { peerId: peerId, ); if (entity.errorCode!.codeIsSuccessful) { - showToast('配网成功'.tr, something: () { + showToast('配网成功'.tr, something: () async { + await _getUploadLockSet(); eventBus .fire(PassCurrentLockInformationEvent(state.lockSetInfoData.value)); // 设置锁的peerID @@ -101,6 +104,10 @@ class ConfiguringWifiLogic extends BaseGetXController { if (reply is GatewayGetStatusReply) { _replyStatusInfo(reply); } + // 上传数据获取锁设置 + if (reply is UpdataLockSetReply) { + _replyUpdataLockSetReply(reply); + } AppLog.log('蓝牙回调处理完毕${EasyLoading.isShow}'); }); } @@ -389,6 +396,88 @@ class ConfiguringWifiLogic extends BaseGetXController { void _replyStatusInfo(reply) {} + // 上传数据获取设置 + Future _getUploadLockSet() async { + // showBlueConnetctToastTimer(action: (){ + // }); + BlueManage().blueSendData(BlueManage().connectDeviceName, + (BluetoothConnectionState connectionState) async { + if (connectionState == BluetoothConnectionState.connected) { + final List? token = await Storage.getStringList(saveBlueToken); + final List getTokenList = changeStringListToIntList(token!); + + _uploadLockSet(getTokenList); + } else if (connectionState == BluetoothConnectionState.disconnected) { + // cancelBlueConnetctToastTimer(); + // if(state.ifCurrentScreen.value == true){ + // showBlueConnetctToast(); + // } + } + }); + } + + // 公共的上传锁设置 + Future _uploadLockSet(List token) async { + final List? privateKey = + await Storage.getStringList(saveBluePrivateKey); + final List getPrivateKeyList = changeStringListToIntList(privateKey!); + + final List? signKey = await Storage.getStringList(saveBlueSignKey); + final List signKeyDataList = changeStringListToIntList(signKey!); + + IoSenderManage.updataLockSetCommand( + lockID: BlueManage().connectDeviceName, + userID: await Storage.getUid(), + token: token, + needAuthor: 1, + signKey: signKeyDataList, + privateKey: getPrivateKeyList); + } + + // 上传数据获取锁设置解析 + Future _replyUpdataLockSetReply(Reply reply) async { + final int status = reply.data[2]; + switch (status) { + case 0x00: + //成功 + dismissEasyLoading(); + cancelBlueConnetctToastTimer(); + _lockDataUpload( + uploadType: 1, + recordType: 0, + records: reply.data.sublist(7, reply.data.length)); + break; + case 0x06: + //无权限 + final List token = reply.data.sublist(3, 7); + final List saveStrList = changeIntListToStringList(token); + Storage.setStringList(saveBlueToken, saveStrList); + + _uploadLockSet(token); + break; + default: + dismissEasyLoading(); + cancelBlueConnetctToastTimer(); + break; + } + } + + // 锁数据上传服务器 + Future _lockDataUpload( + {required int uploadType, + required int recordType, + required List records}) async { + final LoginEntity entity = await ApiRepository.to.lockDataUpload( + lockId: CommonDataManage().currentKeyInfo.lockId!, + uploadType: uploadType, + recordType: recordType, + records: records, + isUnShowLoading: true); + if (entity.errorCode!.codeIsSuccessful) { + update(); + } + } + @override void dispose() { // TODO: implement dispose From 6bf20abc28a721d001a2a9797d6e0202d3e066b5 Mon Sep 17 00:00:00 2001 From: liyi Date: Mon, 24 Mar 2025 15:16:04 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=E5=8F=96=E6=B6=88=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=90=8E=E6=96=AD=E5=BC=80=E8=93=9D=E7=89=99?= =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E7=9A=84=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/mine/addLock/saveLock/saveLock_logic.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/mine/addLock/saveLock/saveLock_logic.dart b/lib/mine/addLock/saveLock/saveLock_logic.dart index 9290d735..f9e20f38 100755 --- a/lib/mine/addLock/saveLock/saveLock_logic.dart +++ b/lib/mine/addLock/saveLock/saveLock_logic.dart @@ -487,7 +487,7 @@ class SaveLockLogic extends BaseGetXController { void backAction() async { eventBus.fire(RefreshLockListInfoDataEvent(clearScanDevices: true)); - BlueManage().disconnect(); + // BlueManage().disconnect(); // 查询锁设置信息 final LockSetInfoEntity entity = From 6d066a722d2bf2c199fe9dc328a7525a03fa8950 Mon Sep 17 00:00:00 2001 From: liyi Date: Mon, 24 Mar 2025 16:30:38 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E7=8C=AB=E7=9C=BC?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../configuringWifi/configuringWifi/configuringWifi_logic.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_logic.dart b/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_logic.dart index 52241914..ca0be0d9 100755 --- a/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_logic.dart +++ b/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_logic.dart @@ -61,8 +61,8 @@ class ConfiguringWifiLogic extends BaseGetXController { peerId: peerId, ); if (entity.errorCode!.codeIsSuccessful) { + await _getUploadLockSet(); showToast('配网成功'.tr, something: () async { - await _getUploadLockSet(); eventBus .fire(PassCurrentLockInformationEvent(state.lockSetInfoData.value)); // 设置锁的peerID