diff --git a/lan/lan_ar.json b/lan/lan_ar.json index 51882dae..cbdfd09c 100644 --- a/lan/lan_ar.json +++ b/lan/lan_ar.json @@ -1120,5 +1120,7 @@ "跟随系统": "اتبع النظام", "重置后，该锁的指纹都将被删除哦，确认要重置吗？": "بعد إعادة الضبط ، سيتم حذف بصمات القفل. هل أنت متأكد أنك تريد إعادة ضبطه ؟", "重置后，该锁的遥控都将被删除哦，确认要重置吗？": "بعد إعادة الضبط ، سيتم حذف جهاز التحكم عن بعد للقفل. هل تريد إعادة ضبطه ؟", - "版本说明": "تعليمات الإصدار" + "版本说明": "تعليمات الإصدار", + "网关通电后，长按重置按钮5秒，蓝色指示灯闪烁时点击下一步": "بعد تشغيل البوابة ، اضغط مع الاستمرار على زر إعادة الضبط لمدة 5 ثوانٍ. انقر فوق التالي عندما يومض ضوء المؤشر الأزرق", + "网关添加成功": "تم إضافة البوابة بنجاح" } \ No newline at end of file diff --git a/lan/lan_bg.json b/lan/lan_bg.json index 62e1410b..d911a65c 100644 --- a/lan/lan_bg.json +++ b/lan/lan_bg.json @@ -1120,5 +1120,7 @@ "跟随系统": "Следете система", "重置后，该锁的指纹都将被删除哦，确认要重置吗？": "След нулиране, пръстовите отпечатъци на заключването ще бъдат изтрити. Сигурен ли сте, че искате да го нулирате?", "重置后，该锁的遥控都将被删除哦，确认要重置吗？": "След нулиране, дистанционното управление на ключалката ще бъде изтрито. Искате ли да го нулирате?", - "版本说明": "Обяснение на версията" + "版本说明": "Обяснение на версията", + "网关通电后，长按重置按钮5秒，蓝色指示灯闪烁时点击下一步": "След като шлюзът е включен, натиснете и задръжте бутона reset за 5 секунди. Щракнете върху следващия, когато синята индикаторна светлина мига", + "网关添加成功": "Gateway added successfully" } \ No newline at end of file diff --git a/lan/lan_bn.json b/lan/lan_bn.json index 7c730be4..f8e6b0f5 100644 --- a/lan/lan_bn.json +++ b/lan/lan_bn.json @@ -1120,5 +1120,7 @@ "跟随系统": "এক্ফক্লোসিস্টেম", "重置后，该锁的指纹都将被删除哦，确认要重置吗？": "ব্যান্ডোটারট্রাসেট, thelock'sferprinতা?", "重置后，该锁的遥控都将被删除哦，确认要重置吗？": "ব্যান্ডোটারপ্রাসেট, নিয়ন্ত্রণের নিয়ন্ত্রণ। ডোডো ডাইভান্টটুরে?", - "版本说明": "ভার্সনপরিচিতি" + "版本说明": "ভার্সনপরিচিতি", + "网关通电后，长按重置按钮5秒，蓝色指示灯闪烁时点击下一步": "ব্যাস্টোকার্টারটিইসপোভেরোর্ডন, প্রেস এবং প্রেসিটিসেট গানটেটনফোর্র 5 সইভিক ds। বিকশিক", + "网关添加成功": "রুপেডডড্রোজেন্টজেক্যালি" } \ No newline at end of file diff --git a/lan/lan_cs.json b/lan/lan_cs.json index 504867c1..2fbf2f56 100644 --- a/lan/lan_cs.json +++ b/lan/lan_cs.json @@ -1120,5 +1120,7 @@ "跟随系统": "Sledovat systém", "重置后，该锁的指纹都将被删除哦，确认要重置吗？": "Po resetování budou otisky prstů zámku odstraněny. Opravdu ho chcete obnovit?", "重置后，该锁的遥控都将被删除哦，确认要重置吗？": "Po resetu bude dálkové ovládání zámku odstraněno. Chcete ho obnovit?", - "版本说明": "Verze" + "版本说明": "Verze", + "网关通电后，长按重置按钮5秒，蓝色指示灯闪烁时点击下一步": "Po zapnutí brány stiskněte a podržte tlačítko reset po dobu 5 sekund. Klepněte na tlačítko další, když modré světlo ukazatele bliká", + "网关添加成功": "Úspěšně přidaná brána" } \ No newline at end of file diff --git a/lan/lan_da.json b/lan/lan_da.json index df10a266..273816ab 100644 --- a/lan/lan_da.json +++ b/lan/lan_da.json @@ -1120,5 +1120,7 @@ "跟随系统": "Følg systemet", "重置后，该锁的指纹都将被删除哦，确认要重置吗？": "Efter nulstilling vil låsens fingeraftryk blive slettet. Er du sikker på at du vil nulstille den?", "重置后，该锁的遥控都将被删除哦，确认要重置吗？": "Efter nulstilling, fjernbetjeningen af låsen vil blive slettet. Vil du nulstille den?", - "版本说明": "Versionsbeskrivelse" + "版本说明": "Versionsbeskrivelse", + "网关通电后，长按重置按钮5秒，蓝色指示灯闪烁时点击下一步": "Når gateway er tændt, tryk på og hold nulstillingsknappen i 5 sekunder. Klik på Næste, når den blå indikator lys blinker", + "网关添加成功": "Gateway tilføjet med succet" } \ No newline at end of file diff --git a/lan/lan_de.json b/lan/lan_de.json index 32b6dcd6..e46ef9e4 100644 --- a/lan/lan_de.json +++ b/lan/lan_de.json @@ -1120,5 +1120,7 @@ "跟随系统": "System folgen", "重置后，该锁的指纹都将被删除哦，确认要重置吗？": "Nach dem Zurücksetzen werden die Finger abdrücke des Schlosses gelöscht. Sind Sie sicher, dass Sie es zurücksetzen wollen?", "重置后，该锁的遥控都将被删除哦，确认要重置吗？": "Nach dem Zurücksetzen wird die Fernbedienung des Schlosses gelöscht. Willst du es zurücksetzen?", - "版本说明": "Versionsbeschreibung" + "版本说明": "Versionsbeschreibung", + "网关通电后，长按重置按钮5秒，蓝色指示灯闪烁时点击下一步": "Nachdem das Gateway eingesc haltet ist, drücken und halten Sie die Reset-Taste für 5 Sekunden. Klicken Sie auf Weiter, wenn die blaue Anzeige leuchte blinkt", + "网关添加成功": "Gateway erfolgreich hinzugefügt" } \ No newline at end of file diff --git a/lan/lan_el.json b/lan/lan_el.json index dadf971d..99d135fd 100644 --- a/lan/lan_el.json +++ b/lan/lan_el.json @@ -1120,5 +1120,7 @@ "跟随系统": "Ακολουθήστε το σύστημα", "重置后，该锁的指纹都将被删除哦，确认要重置吗？": "Μετά την επαναφορά, τα αποτυπώματα της κλειδαριάς θα διαγραφούν. Είστε σίγουροι ότι θέλετε να το επαναφέρετε;", "重置后，该锁的遥控都将被删除哦，确认要重置吗？": "Μετά την επαναφορά, το τηλεχειριστήριο της κλειδαριάς θα διαγραφεί. Θέλεις να το επαναφέρεις;", - "版本说明": "Περιγραφή έκδοσης" + "版本说明": "Περιγραφή έκδοσης", + "网关通电后，长按重置按钮5秒，蓝色指示灯闪烁时点击下一步": "Αφού ενεργοποιηθεί η πύλη, πιέστε και κρατήστε το κουμπί επαναφοράς για 5 δευτερόλεπτα. Κάντε κλικ Επόμενο όταν το μπλε φως δείκτη αναβοσβήνει", + "网关添加成功": "Η πύλη προστέθηκε με επιτυχία" } \ No newline at end of file diff --git a/lan/lan_en.json b/lan/lan_en.json index 2be7a6c6..34252675 100644 --- a/lan/lan_en.json +++ b/lan/lan_en.json @@ -1132,5 +1132,6 @@ "下载完成,请到相册查看": "Download completed, please go to the album to view", "重置后，该锁的遥控都将被删除哦，确认要重置吗？": "After reset, the remote control of the lock will be deleted. Do you want to reset it?", "版本说明": "Version description", - "网关通电后，长按重置按钮5秒，蓝色指示灯闪烁时点击下一步": "After the gateway is powered on, press and hold the reset button for 5 seconds. Click Next when the blue indicator light flashes" + "网关通电后，长按重置按钮5秒，蓝色指示灯闪烁时点击下一步": "After the gateway is powered on, press and hold the reset button for 5 seconds. Click Next when the blue indicator light flashes", + "网关添加成功": "Gateway added successfully" } diff --git a/lan/lan_es.json b/lan/lan_es.json index f2d40436..f9aea786 100644 --- a/lan/lan_es.json +++ b/lan/lan_es.json @@ -1120,5 +1120,7 @@ "跟随系统": "Seguir sistema", "重置后，该锁的指纹都将被删除哦，确认要重置吗？": "Después de restablecer, se eliminarán las huellas dactilares del bloqueo. ¿Está seguro de que desea restablecerlo?", "重置后，该锁的遥控都将被删除哦，确认要重置吗？": "Después del reinicio, se eliminará el control remoto de la cerradura. ¿Quieres resetearlo?", - "版本说明": "Instrucciones de versión" + "版本说明": "Instrucciones de versión", + "网关通电后，长按重置按钮5秒，蓝色指示灯闪烁时点击下一步": "Después de encender la puerta de enlace, mantenga presionado el botón de reinicio durante 5 segundos. Haga clic en Siguiente cuando la luz indicadora azul parpadee", + "网关添加成功": "Gateway añadido con éxito" } \ No newline at end of file diff --git a/lan/lan_et.json b/lan/lan_et.json index 3b680872..3a13e07d 100644 --- a/lan/lan_et.json +++ b/lan/lan_et.json @@ -1120,5 +1120,7 @@ "跟随系统": "Süsteemi jälgimine", "重置后，该锁的指纹都将被删除哦，确认要重置吗？": "Pärast lähtestamist kustutatakse luku sõrmejäljed. Kas tõesti soovid see lähtestada?", "重置后，该锁的遥控都将被删除哦，确认要重置吗？": "Pärast lähtestamist kustutatakse luku kaugjuhtimine. Kas sa tahad seda lähtestada?", - "版本说明": "Versiooniteave" + "版本说明": "Versiooniteave", + "网关通电后，长按重置按钮5秒，蓝色指示灯闪烁时点击下一步": "Kui värav on sisse lülitatud, vajutage nuppu ja hoidke nuppu 5 sekundit. Klõpsa Järgmine, kui sinine indikaator valgus vilgub", + "网关添加成功": "Gateway lisati edukalt" } \ No newline at end of file diff --git a/lan/lan_fi.json b/lan/lan_fi.json index 0bc1d06e..39fe12b0 100644 --- a/lan/lan_fi.json +++ b/lan/lan_fi.json @@ -1120,5 +1120,7 @@ "跟随系统": "Seuraa järjestelmää", "重置后，该锁的指纹都将被删除哦，确认要重置吗？": "Lukon sormenjäljet poistetaan. Haluatko varmasti nollataa sen?", "重置后，该锁的遥控都将被删除哦，确认要重置吗？": "Nollauksen jälkeen lukon kaukosäädin poistetaan. Haluatko palauttaa sen?", - "版本说明": "Versio" + "版本说明": "Versio", + "网关通电后，长按重置按钮5秒，蓝色指示灯闪烁时点击下一步": "Kun portti on käytössä, paina ja pidä nollauspainiketta 5 sekunnin ajan. Napsauta Seuraava kun sininen ilmaisin valo vilkkuu", + "网关添加成功": "Gateway lisättiin onnistuneesti" } \ No newline at end of file diff --git a/lan/lan_fr.json b/lan/lan_fr.json index f2c17fcc..c823b2b6 100644 --- a/lan/lan_fr.json +++ b/lan/lan_fr.json @@ -1120,5 +1120,7 @@ "跟随系统": "Suivre le système", "重置后，该锁的指纹都将被删除哦，确认要重置吗？": "Après réinitialisation, les empreintes digitales de la serrure seront supprimées. Êtes-vous sûr de vouloir le réinitialiser?", "重置后，该锁的遥控都将被删除哦，确认要重置吗？": "Après réinitialisation, la télécommande du verrou sera supprimée. Voulez-vous le réinitialiser?", - "版本说明": "Explication de la version" + "版本说明": "Explication de la version", + "网关通电后，长按重置按钮5秒，蓝色指示灯闪烁时点击下一步": "Après la mise sous tension de la passerelle, appuyez sur le bouton de réinitialisation et maintenez-le enfoncé pendant 5 secondes. Cliquez sur Suivant lorsque le voyant bleu clignote", + "网关添加成功": "Gateway ajouté avec succès" } \ No newline at end of file diff --git a/lan/lan_he.json b/lan/lan_he.json index b5ce2fe3..f9815f0f 100644 --- a/lan/lan_he.json +++ b/lan/lan_he.json @@ -1120,5 +1120,7 @@ "跟随系统": "מערכת מעקב", "重置后，该锁的指纹都将被删除哦，确认要重置吗？": "לאחר איפוס, טביעות האצבעות של המנעול יימחקו. אתה בטוח שברצונך לאפס את זה?", "重置后，该锁的遥控都将被删除哦，确认要重置吗？": "לאחר איפוס, השליטה מרחוק של המנעול יימחק. אתה רוצה לאפס את זה?", - "版本说明": "המידע על גרסה" + "版本说明": "המידע על גרסה", + "网关通电后，长按重置按钮5秒，蓝色指示灯闪烁时点击下一步": "לאחר שהשער מופעל, לחץ והחזק את כפתור האיפוס למשך 5 שניות. לחץ על הבא כאשר האור מחוון כחול מהבהב", + "网关添加成功": "שער הוסיף בהצלחה" } \ No newline at end of file diff --git a/lan/lan_hk.json b/lan/lan_hk.json index c61800ba..74281ce1 100644 --- a/lan/lan_hk.json +++ b/lan/lan_hk.json @@ -1120,5 +1120,7 @@ "跟随系统": "跟隨系統", "重置后，该锁的指纹都将被删除哦，确认要重置吗？": "重置之後，鎖嘅指紋將被刪除。 你確定要重置它啊？", "重置后，该锁的遥控都将被删除哦，确认要重置吗？": "重置之後，鎖嘅遙控器將被刪除。 是否要重置它？", - "版本说明": "版本說明" + "版本说明": "版本說明", + "网关通电后，长按重置按钮5秒，蓝色指示灯闪烁时点击下一步": "網關上電之後，長按重置掣5秒鐘。 單擊藍色指示燈閃爍時嘅下一步", + "网关添加成功": "已成功添加網關" } \ No newline at end of file diff --git a/lan/lan_hr.json b/lan/lan_hr.json index 3eede61c..c695eab7 100644 --- a/lan/lan_hr.json +++ b/lan/lan_hr.json @@ -1120,5 +1120,7 @@ "跟随系统": "Prati sistem:", "重置后，该锁的指纹都将被删除哦，确认要重置吗？": "Nakon resetovanja, otisci brave će biti izbrisani. Jeste li sigurni da ga želite resetirati?", "重置后，该锁的遥控都将被删除哦，确认要重置吗？": "Nakon resetovanja, daljinski upravljač brave će biti izbrisan. Hoæeš da ga resetuješ?", - "版本说明": "Informacije o verziji" + "版本说明": "Informacije o verziji", + "网关通电后，长按重置按钮5秒，蓝色指示灯闪烁时点击下一步": "Nakon što se uključi prolaz, pritisnite i zadržite dugme za reset 5 sekundi. Kliknite slijedeći kada svjetlo plavog indikatora bljeska", + "网关添加成功": "Gateway je uspješno dodano" } \ No newline at end of file diff --git a/lan/lan_hu.json b/lan/lan_hu.json index f0a2c104..ed032eed 100644 --- a/lan/lan_hu.json +++ b/lan/lan_hu.json @@ -1120,5 +1120,7 @@ "跟随系统": "Follow system", "重置后，该锁的指纹都将被删除哦，确认要重置吗？": "A reset után a zár ujjlenyomatai törlődnek. Biztos vagy benne, hogy vissza szeretné állítani?", "重置后，该锁的遥控都将被删除哦，确认要重置吗？": "A reset után a zár távirányítója törlődik. Szeretné visszaállítani?", - "版本说明": "Versió leírás" + "版本说明": "Versió leírás", + "网关通电后，长按重置按钮5秒，蓝色指示灯闪烁时点击下一步": "Az átjáró bekapcsolása után 5 másodpercig nyomja meg a reset gombot. Kattintson a következő gombra, amikor a kék jelző fény villog", + "网关添加成功": "Átjáró sikeresen hozzáadott" } \ No newline at end of file diff --git a/lan/lan_id.json b/lan/lan_id.json index 735d0d50..c017ce28 100644 --- a/lan/lan_id.json +++ b/lan/lan_id.json @@ -1120,5 +1120,7 @@ "跟随系统": "Sistem mengikuti", "重置后，该锁的指纹都将被删除哦，确认要重置吗？": "Setelah mengulang, sidik jari kunci akan dihapus. Yakin ingin meresetnya?", "重置后，该锁的遥控都将被删除哦，确认要重置吗？": "Setelah reset, remote control kunci akan dihapus. Ingin mengatur ulang?", - "版本说明": "Catatan versi" + "版本说明": "Catatan versi", + "网关通电后，长按重置按钮5秒，蓝色指示灯闪烁时点击下一步": "Setelah gateway dinyalakan, tekan dan tahan tombol Atur ulang selama 5 detik. Klik berikutnya ketika lampu indikator biru berkedip", + "网关添加成功": "Gateway berhasil ditambahkan" } \ No newline at end of file diff --git a/lan/lan_it.json b/lan/lan_it.json index 91b0f6cf..c4994c84 100644 --- a/lan/lan_it.json +++ b/lan/lan_it.json @@ -1120,5 +1120,7 @@ "跟随系统": "Seguire il sistema", "重置后，该锁的指纹都将被删除哦，确认要重置吗？": "Dopo il reset, le impronte digitali del lucchetto verranno cancellate. Sei sicuro di volerlo resettare?", "重置后，该锁的遥控都将被删除哦，确认要重置吗？": "Dopo il reset, il telecomando del lucchetto verrà eliminato. Vuoi resettarlo?", - "版本说明": "Versione" + "版本说明": "Versione", + "网关通电后，长按重置按钮5秒，蓝色指示灯闪烁时点击下一步": "Dopo che il gateway è acceso, premere e tenere premuto il pulsante di reset per 5 secondi. Fai clic su Avanti quando la spia blu lampeggia", + "网关添加成功": "Gateway aggiunto correttamente" } \ No newline at end of file diff --git a/lan/lan_ja.json b/lan/lan_ja.json index 77e5ddd2..3be113b9 100644 --- a/lan/lan_ja.json +++ b/lan/lan_ja.json @@ -1120,5 +1120,7 @@ "跟随系统": "システムに従う", "重置后，该锁的指纹都将被删除哦，确认要重置吗？": "リセット後、ロックの指紋は削除されます。リセットしてもよろしいですか。", "重置后，该锁的遥控都将被删除哦，确认要重置吗？": "リセット後、ロックのリモコンが削除されます。リセットしますか?", - "版本说明": "バージョン説明" + "版本说明": "バージョン説明", + "网关通电后，长按重置按钮5秒，蓝色指示灯闪烁时点击下一步": "ゲートウェイの電源がオンになった後、リセットボタンを5秒間押し続けます。青いインジケータライトが点滅したら、 [Next] をクリックします", + "网关添加成功": "ゲートウェイの追加に成功" } \ No newline at end of file diff --git a/lan/lan_keys.json b/lan/lan_keys.json index 865c5a68..06bf63be 100755 --- a/lan/lan_keys.json +++ b/lan/lan_keys.json @@ -1132,5 +1132,6 @@ "该锁的远程开锁功能未启用": "该锁的远程开锁功能未启用", "下载完成,请到相册查看": "下载完成,请到相册查看", "重置后，该锁的遥控都将被删除哦，确认要重置吗？": "重置后，该锁的遥控都将被删除哦，确认要重置吗？", - "版本说明": "版本说明" + "版本说明": "版本说明", + "网关添加成功": "网关添加成功" } diff --git a/lan/lan_kk.json b/lan/lan_kk.json index 6bafdaca..d52ad5fa 100644 --- a/lan/lan_kk.json +++ b/lan/lan_kk.json @@ -1120,5 +1120,7 @@ "跟随系统": "Жүйені қолдану", "重置后，该锁的指纹都将被删除哦，确认要重置吗？": "Қайта ысырып тастау Шынымен ысырып тастауды қалайсыз ба?", "重置后，该锁的遥控都将被删除哦，确认要重置吗？": "Қайта ысырып ысырып тасымалдауын өшіріледі. Оны ысырып тастауды қалайсыз ба?", - "版本说明": "Версиятын көрсету" + "版本说明": "Версиятын көрсету", + "网关通电后，长按重置按钮5秒，蓝色指示灯闪烁时点击下一步": "Шығыс жегілді соң, ысырып тасымалдау батырмасын басып 5 секунд басыңыз. Көк белгісін жарыялды, келесі басыңыз", + "网关添加成功": "Шлюз сәтті қосылды" } \ No newline at end of file diff --git a/lan/lan_ko.json b/lan/lan_ko.json index ecaeda0f..97bfe25a 100644 --- a/lan/lan_ko.json +++ b/lan/lan_ko.json @@ -1120,5 +1120,7 @@ "跟随系统": "시스템을 따르십시오", "重置后，该锁的指纹都将被删除哦，确认要重置吗？": "재설정 후 잠금 장치의 지문이 삭제됩니다. 당신은 그것을 재설정 하시겠습니까?", "重置后，该锁的遥控都将被删除哦，确认要重置吗？": "재설정 후 잠금 장치의 리모컨이 삭제됩니다. 당신은 그것을 재설정 하시겠습니까?", - "版本说明": "버전 설명" + "版本说明": "버전 설명", + "网关通电后，长按重置按钮5秒，蓝色指示灯闪烁时点击下一步": "게이트웨이의 전원이 켜지면 재설정 버튼을 5 초 동안 누르고 있습니다. 파란색 표시등이 깜박일 때 다음을 클릭하십시오.", + "网关添加成功": "게이트웨이가 성공적으로 추가되었습니다." } \ No newline at end of file diff --git a/lan/lan_lt.json b/lan/lan_lt.json index fec5cf96..57cd60ac 100644 --- a/lan/lan_lt.json +++ b/lan/lan_lt.json @@ -1120,5 +1120,7 @@ "跟随系统": "Sekti sistema", "重置后，该锁的指纹都将被删除哦，确认要重置吗？": "Po reset užrakto pirštų atspaudai bus ištrinti. Ar tikrai norite jį atkurti?", "重置后，该锁的遥控都将被删除哦，确认要重置吗？": "Po reset, nuotolinis valdymo pultas užraktas bus ištrintas. Ar norite jį atkurti?", - "版本说明": "Versijos aprašymas" + "版本说明": "Versijos aprašymas", + "网关通电后，长按重置按钮5秒，蓝色指示灯闪烁时点击下一步": "Įjungus vartus, 5 sekundes paspauskite ir palaikykite mygtuką \"reset\". Spustelėkite toliau, kai mėlyna indikatoriaus šviesa mirksi", + "网关添加成功": "Vartai sėkmingai pridėta" } \ No newline at end of file diff --git a/lan/lan_ms.json b/lan/lan_ms.json index f084c7bb..a3651e49 100644 --- a/lan/lan_ms.json +++ b/lan/lan_ms.json @@ -1120,5 +1120,7 @@ "跟随系统": "Ikut system", "重置后，该锁的指纹都将被删除哦，确认要重置吗？": "Selepas menetapkan semula, cap jari kunci akan dipadamkan. Adakah anda pasti anda mahu menetapkan semula?", "重置后，该锁的遥控都将被删除哦，确认要重置吗？": "Selepas menetapkan semula, kawalan jauh kunci akan dipadamkan. Adakah anda mahu menetapkan semula?", - "版本说明": "Penerangan versi" + "版本说明": "Penerangan versi", + "网关通电后，长按重置按钮5秒，蓝色指示灯闪烁时点击下一步": "Selepas pintu masuk dihidupkan, tekan dan tahan butang reset selama 5 saat. Klik seterusnya apabila lampu penunjuk biru berkelip", + "网关添加成功": "Get laluan ditambah berjaya" } \ No newline at end of file diff --git a/lan/lan_nl.json b/lan/lan_nl.json index 3bed21f6..fe7280f8 100644 --- a/lan/lan_nl.json +++ b/lan/lan_nl.json @@ -1120,5 +1120,7 @@ "跟随系统": "Systeem volgen", "重置后，该锁的指纹都将被删除哦，确认要重置吗？": "Na het resetten worden de vingerafdrukken van het slot verwijderd. Weet je zeker dat je het wilt resetten?", "重置后，该锁的遥控都将被删除哦，确认要重置吗？": "Na het resetten wordt de afstandsbediening van het slot verwijderd. Wilt u het resetten?", - "版本说明": "Versieomschrijving" + "版本说明": "Versieomschrijving", + "网关通电后，长按重置按钮5秒，蓝色指示灯闪烁时点击下一步": "Nadat de gateway is ingeschakeld, houdt u de resetknop 5 seconden ingedrukt. Klik op Volgende wanneer het blauwe lampje knippert", + "网关添加成功": "Gateway met succes toegevoegd" } \ No newline at end of file diff --git a/lan/lan_pl.json b/lan/lan_pl.json index fe406a81..91216e70 100644 --- a/lan/lan_pl.json +++ b/lan/lan_pl.json @@ -1120,5 +1120,7 @@ "跟随系统": "Śledź system", "重置后，该锁的指纹都将被删除哦，确认要重置吗？": "Po zresetowaniu odciski palców zamka zostaną usunięte. Czy na pewno chcesz go zresetować?", "重置后，该锁的遥控都将被删除哦，确认要重置吗？": "Po zresetowaniu zdalne sterowanie zamkiem zostanie usunięte. Czy chcesz go zresetować?", - "版本说明": "Wersja" + "版本说明": "Wersja", + "网关通电后，长按重置按钮5秒，蓝色指示灯闪烁时点击下一步": "Po włączeniu bramy naciśnij i przytrzymaj przycisk resetowania przez 5 sekund. Kliknij przycisk Dalej, gdy miga niebieska lampka kontrolna", + "网关添加成功": "Gateway dodany pomyślnie" } \ No newline at end of file diff --git a/lan/lan_pt.json b/lan/lan_pt.json index bcdb2ed2..035ea4c6 100644 --- a/lan/lan_pt.json +++ b/lan/lan_pt.json @@ -1120,5 +1120,7 @@ "跟随系统": "Siga o sistema", "重置后，该锁的指纹都将被删除哦，确认要重置吗？": "Após a redefinição, as impressões digitais do bloqueio serão apagadas. Tens a certeza que queres redefini-lo?", "重置后，该锁的遥控都将被删除哦，确认要重置吗？": "Após a reinicialização, o controle remoto do bloqueio será excluído. Você quer redefini-lo?", - "版本说明": "Descrição da versão" + "版本说明": "Descrição da versão", + "网关通电后，长按重置按钮5秒，蓝色指示灯闪烁时点击下一步": "Depois que o gateway estiver ligado, pressione e segure o botão de reset por 5 segundos. Clique Próximo quando a luz indicadora azul pisca", + "网关添加成功": "Gateway adicionado com sucesso" } \ No newline at end of file diff --git a/lan/lan_ro.json b/lan/lan_ro.json index 7c6da3e2..71d132d9 100644 --- a/lan/lan_ro.json +++ b/lan/lan_ro.json @@ -1120,5 +1120,7 @@ "跟随系统": "Urmează sistemul:", "重置后，该锁的指纹都将被删除哦，确认要重置吗？": "După resetare, amprentele încuietorii vor fi şterse. Sigur doriți să-l resetați?", "重置后，该锁的遥控都将被删除哦，确认要重置吗？": "După resetare, telecomanda de blocare va fi ştersă. Vrei să-l resetezi?", - "版本说明": "Descrierea versiunii" + "版本说明": "Descrierea versiunii", + "网关通电后，长按重置按钮5秒，蓝色指示灯闪烁时点击下一步": "După pornirea poarta, apăsați și țineți butonul de resetare timp de 5 secunde. Click Next atunci când lumina indicator albastru lăturare", + "网关添加成功": "Gateway adăugat cu succes" } \ No newline at end of file diff --git a/lan/lan_ru.json b/lan/lan_ru.json index 8001445e..bd922b54 100644 --- a/lan/lan_ru.json +++ b/lan/lan_ru.json @@ -1120,5 +1120,7 @@ "跟随系统": "Следуйте системе", "重置后，该锁的指纹都将被删除哦，确认要重置吗？": "После сброса отпечатки пальцев замка будут удалены. Вы уверены, что хотите его перезагрузить?", "重置后，该锁的遥控都将被删除哦，确认要重置吗？": "После сброса пульт дистанционного управления замком будет удален. А вы хотите его сбросить?", - "版本说明": "Объяснение версии" + "版本说明": "Объяснение версии", + "网关通电后，长按重置按钮5秒，蓝色指示灯闪烁时点击下一步": "После включения шлюза нажмите и удерживайте кнопку сброса в течение 5 секунд. Нажмите Далее, когда синий индикатор мигает", + "网关添加成功": "Шлюз успешно добавлен" } \ No newline at end of file diff --git a/lan/lan_sk.json b/lan/lan_sk.json index e6c0b02f..905391a9 100644 --- a/lan/lan_sk.json +++ b/lan/lan_sk.json @@ -1120,5 +1120,7 @@ "跟随系统": "Sledovať systém", "重置后，该锁的指纹都将被删除哦，确认要重置吗？": "Po resetovaní budú prstové odtlačky zámku vymazané. Ste si istí, že chcete obnoviť?", "重置后，该锁的遥控都将被删除哦，确认要重置吗？": "Po resetovaní bude diaľkové ovládanie zámku vymazané. Chcete ho obnoviť?", - "版本说明": "Popis verzie" + "版本说明": "Popis verzie", + "网关通电后，长按重置按钮5秒，蓝色指示灯闪烁时点击下一步": "Po zapnutí brány stlačte a podržte tlačidlo reset 5 sekúnd. Kliknite na ďalšie, keď modrý indikátor svetlo bliká", + "网关添加成功": "Brána úspešne pridaná" } \ No newline at end of file diff --git a/lan/lan_sr_cyrl.json b/lan/lan_sr_cyrl.json index bdfb900b..a93ce7aa 100644 --- a/lan/lan_sr_cyrl.json +++ b/lan/lan_sr_cyrl.json @@ -1120,5 +1120,7 @@ "跟随系统": "Пратите систем", "重置后，该锁的指纹都将被删除哦，确认要重置吗？": "Након ресетовања, отисци прстију браве ће бити избрисани. Да ли сте сигурни да желите да га ресетујете?", "重置后，该锁的遥控都将被删除哦，确认要重置吗？": "Након ресетовања, даљински управљач браве ће бити избрисан. Да ли желите да га ресетујете?", - "版本说明": "Опис верзије" + "版本说明": "Опис верзије", + "网关通电后，长按重置按钮5秒，蓝色指示灯闪烁时点击下一步": "Након што је гатеваи укључен, притисните и држите дугме за ресетовање за 5 секунди. Кликните Следећи када плава лампица трепери", + "网关添加成功": "Гатеваи је успешно додао" } \ No newline at end of file diff --git a/lan/lan_sv.json b/lan/lan_sv.json index 99de674a..cc28de40 100644 --- a/lan/lan_sv.json +++ b/lan/lan_sv.json @@ -1120,5 +1120,7 @@ "跟随系统": "Följ system", "重置后，该锁的指纹都将被删除哦，确认要重置吗？": "Efter återställd, kommer låsets fingeravtryck tas bort. Är du säker på att du vill återställa den?", "重置后，该锁的遥控都将被删除哦，确认要重置吗？": "Efter återställd, fjärrkontrollen på låset tas bort. Vill du återställa den?", - "版本说明": "Versionsbeskrivning" + "版本说明": "Versionsbeskrivning", + "网关通电后，长按重置按钮5秒，蓝色指示灯闪烁时点击下一步": "När gateway är aktiverad, tryck på och håll återställningsknappen i 5 sekunder. Klicka Nästa när den blå indikator ljus blinkar", + "网关添加成功": "Gateway lagt till med lyckad" } \ No newline at end of file diff --git a/lan/lan_th.json b/lan/lan_th.json index 62fc6a47..72dadd92 100644 --- a/lan/lan_th.json +++ b/lan/lan_th.json @@ -1120,5 +1120,7 @@ "跟随系统": "ระบบติดตามผล", "重置后，该锁的指纹都将被删除哦，确认要重置吗？": "หลังจากรีเซ็ตแล้วลายนิ้วมือของล็อคจะถูกลบออกคุณแน่ใจว่าอยากจะรีเซ็ต?", "重置后，该锁的遥控都将被删除哦，确认要重置吗？": "หลังจากรีเซ็ตแล้วรีโมทคอนโทรลของล็อคจะถูกลบออกคุณต้องการรีเซ็ตไหม", - "版本说明": "คำอธิบายรุ่น" + "版本说明": "คำอธิบายรุ่น", + "网关通电后，长按重置按钮5秒，蓝色指示灯闪烁时点击下一步": "หลังจากเปิดเกตเวย์แล้วให้กดปุ่มรีเซ็ตค้างไว้5วินาทีคลิกถัดไปเมื่อไฟแสดงสถานะสีน้ำเงินกะพริบ", + "网关添加成功": "เพิ่มเกตเวย์เรียบร้อยแล้ว" } \ No newline at end of file diff --git a/lan/lan_tr.json b/lan/lan_tr.json index 8bf1e675..224695c1 100644 --- a/lan/lan_tr.json +++ b/lan/lan_tr.json @@ -1120,5 +1120,7 @@ "跟随系统": "Sistemi takip et", "重置后，该锁的指纹都将被删除哦，确认要重置吗？": "Sıfırlamadan sonra, kilidin parmak izleri silinecektir. Sıfırlamak istediğine emin misin?", "重置后，该锁的遥控都将被删除哦，确认要重置吗？": "Sıfırladıktan sonra, kilidin uzaktan kumandası silinecektir. Sıfırlamak ister misin?", - "版本说明": "Sürüm açıklaması" + "版本说明": "Sürüm açıklaması", + "网关通电后，长按重置按钮5秒，蓝色指示灯闪烁时点击下一步": "Ağ geçidi açıldıktan sonra sıfırlama düğmesine 5 saniye basılı tutun. Mavi gösterge ışığı yanıp söndüğünde İleri'ye tıklayın", + "网关添加成功": "Ağ geçidi başarıyla eklendi" } \ No newline at end of file diff --git a/lan/lan_tw.json b/lan/lan_tw.json index 3c0cf448..58974b99 100644 --- a/lan/lan_tw.json +++ b/lan/lan_tw.json @@ -1120,5 +1120,7 @@ "跟随系统": "跟蹤系統", "重置后，该锁的指纹都将被删除哦，确认要重置吗？": "重置後,鎖的指紋將被刪除。 是否確實要重置它?", "重置后，该锁的遥控都将被删除哦，确认要重置吗？": "重置後,鎖的遙控器將被刪除。 是否要重置它?", - "版本说明": "版本說明" + "版本说明": "版本說明", + "网关通电后，长按重置按钮5秒，蓝色指示灯闪烁时点击下一步": "網關通電後,按住reset按鈕5秒鐘。 當藍色指示燈閃爍時,單擊 「下一步」", + "网关添加成功": "已成功添加網關" } \ No newline at end of file diff --git a/lan/lan_uk.json b/lan/lan_uk.json index bbbe0c19..4202223b 100644 --- a/lan/lan_uk.json +++ b/lan/lan_uk.json @@ -1120,5 +1120,7 @@ "跟随系统": "Система стеження за", "重置后，该锁的指纹都将被删除哦，确认要重置吗？": "Після скидання відбитки пальців замка будуть видалені. Ви впевнені, що хочете скинути налаштування?", "重置后，该锁的遥控都将被删除哦，确认要重置吗？": "Після скидання пульт дистанційного керування замком буде видалено. Хочете його скинути?", - "版本说明": "Опис версії" + "版本说明": "Опис версії", + "网关通电后，长按重置按钮5秒，蓝色指示灯闪烁时点击下一步": "Після ввімкнення шлюзу натисніть і утримуйте кнопку скидання протягом 5 секунд. Натисніть «Далі», коли синій індикатор почне блимати", + "网关添加成功": "Шлюз успішно додано" } \ No newline at end of file diff --git a/lan/lan_vi.json b/lan/lan_vi.json index 3d23aa5b..593d87b7 100644 --- a/lan/lan_vi.json +++ b/lan/lan_vi.json @@ -1120,5 +1120,7 @@ "跟随系统": "Hệ thống theo dõi", "重置后，该锁的指纹都将被删除哦，确认要重置吗？": "Sau khi đặt lại, dấu vân tay của khóa sẽ bị xóa. Bạn có chắc chắn muốn thiết lập lại nó?", "重置后，该锁的遥控都将被删除哦，确认要重置吗？": "Sau khi đặt lại, điều khiển từ xa của khóa sẽ bị xóa. Bạn có muốn đặt lại không?", - "版本说明": "Thông tin phiên bản" + "版本说明": "Thông tin phiên bản", + "网关通电后，长按重置按钮5秒，蓝色指示灯闪烁时点击下一步": "Sau khi cổng được bật, Nhấn và giữ nút Reset trong 5 giây. Nhấp vào tiếp theo khi đèn báo màu xanh lam nhấp nháy", + "网关添加成功": "Gateway đã thêm thành công" } \ No newline at end of file diff --git a/lan/lan_zh.json b/lan/lan_zh.json index aaf5096f..e0770c09 100755 --- a/lan/lan_zh.json +++ b/lan/lan_zh.json @@ -1132,5 +1132,6 @@ "该锁的远程开锁功能未启用": "该锁的远程开锁功能未启用", "下载完成,请到相册查看": "下载完成,请到相册查看", "重置后，该锁的遥控都将被删除哦，确认要重置吗？": "重置后，该锁的遥控都将被删除哦，确认要重置吗？", - "版本说明": "版本说明" + "版本说明": "版本说明", + "网关添加成功": "网关添加成功" } diff --git a/lib/apm/apm_helper.dart b/lib/apm/apm_helper.dart index 928b940f..33fae601 100644 --- a/lib/apm/apm_helper.dart +++ b/lib/apm/apm_helper.dart @@ -37,7 +37,7 @@ class ApmHelper { UmengHelper.instance.initSdk(); // // - FirebaseHelper.instance.initSdk(); + // FirebaseHelper.instance.initSdk(); // } diff --git a/lib/main.dart b/lib/main.dart index 67d4785b..acdb013d 100755 --- a/lib/main.dart +++ b/lib/main.dart @@ -60,6 +60,8 @@ FutureOr main() async { ChangeNotifierProvider(create: (_) => DebugInfoModel()), ], child: MyApp(isLogin: isLogin))); // runApp(MyApp(isLogin: isLogin)); + }, onException: (FlutterErrorDetails details) async { + debugPrint("FlutterErrorDetails $details"); }); if (AppPlatform.isAndroid) { diff --git a/lib/main/lockDetail/lockDetail/lockDetail_logic.dart b/lib/main/lockDetail/lockDetail/lockDetail_logic.dart index 8eb2bc21..d584183f 100755 --- a/lib/main/lockDetail/lockDetail/lockDetail_logic.dart +++ b/lib/main/lockDetail/lockDetail/lockDetail_logic.dart @@ -111,9 +111,6 @@ class LockDetailLogic extends BaseGetXController { // 更新电量 await uploadElectricQuantityRequest(); - // 开锁成功上报 - lockReportLockSuccessfullyUploadData(); - resetOpenDoorState(); state.animationController!.stop(); @@ -625,23 +622,6 @@ class LockDetailLogic extends BaseGetXController { } } - // 电子钥匙开锁成功上报 - Future lockReportLockSuccessfullyUploadData() async { - final KeyOperationRecordEntity entity = await ApiRepository.to - .lockReportLockSuccessfullyUploadData( - lockId: state.keyInfos.value.lockId ?? 0, - keyId: state.keyInfos.value.keyId ?? 0); - if (entity.errorCode!.codeIsSuccessful) { - // mockNetworkDataRequest(); - AppLog.log( - 'state.keyInfos.value.keyType:${state.keyInfos.value.keyType}'); - if (state.keyInfos.value.keyType == XSConstantMacro.keyTypeOnce) { - // 单次删除 - deletKeyData(); - } - } - } - // 普通用户或者授权管理员删除钥匙 Future deletKeyData() async { final ElectronicKeyListEntity entity = await ApiRepository.to diff --git a/lib/main/lockDetail/lockDetail/lockDetail_page.dart b/lib/main/lockDetail/lockDetail/lockDetail_page.dart index 4a118b1f..d6740553 100755 --- a/lib/main/lockDetail/lockDetail/lockDetail_page.dart +++ b/lib/main/lockDetail/lockDetail/lockDetail_page.dart @@ -823,7 +823,7 @@ class _LockDetailPageState extends State ? '超级管理员英文'.tr : (state.keyInfos.value.keyRight == 1 ? '授权管理员英文'.tr - : '普通用户英文'.tr), + : '普通用户'.tr), style: TextStyle( fontSize: 20.sp, color: AppColors.darkGrayTextColor), ), diff --git a/lib/main/lockMian/lockMain/lockMain_logic.dart b/lib/main/lockMian/lockMain/lockMain_logic.dart index ed823f64..bd859377 100755 --- a/lib/main/lockMian/lockMain/lockMain_logic.dart +++ b/lib/main/lockMian/lockMain/lockMain_logic.dart @@ -129,6 +129,7 @@ class LockMainLogic extends BaseGetXController { state.dataLength.value = 2; } state.lockListInfoGroupEntity.value = entity; + state.lockListInfoGroupEntity.refresh(); // AppLog.log('entity:$entity state.lockListInfoGroupEntity.value.groupList!.length:${state.lockListInfoGroupEntity.value.groupList![0].lockList!.length}'); //检测控制器是否存在 if (Get.isRegistered()) { diff --git a/lib/mine/gateway/addGateway/gatewayConfigurationWifi/gatewayConfigurationWifi_logic.dart b/lib/mine/gateway/addGateway/gatewayConfigurationWifi/gatewayConfigurationWifi_logic.dart index 17344cda..6cd60292 100644 --- a/lib/mine/gateway/addGateway/gatewayConfigurationWifi/gatewayConfigurationWifi_logic.dart +++ b/lib/mine/gateway/addGateway/gatewayConfigurationWifi/gatewayConfigurationWifi_logic.dart @@ -34,7 +34,7 @@ class GatewayConfigurationWifiLogic extends BaseGetXController { gatewayJson: jsonDecode(state.gatewayJson), timeout: 60); if (entity.errorCode!.codeIsSuccessful) { - showToast('配网成功'.tr, something: () { + showToast('网关添加成功'.tr, something: () { // eventBus.fire(PassCurrentLockInformationEvent(state.lockSetInfoData.value)); Get.close(4); }); @@ -136,10 +136,12 @@ class GatewayConfigurationWifiLogic extends BaseGetXController { state.sureBtnState.value = 1; showEasyLoading(); - showBlueConnetctToastTimer(action: () { - dismissEasyLoading(); - state.sureBtnState.value = 0; - }); + showBlueConnetctToastTimer( + outTimer: 20, + action: () { + dismissEasyLoading(); + state.sureBtnState.value = 0; + }); BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async { if (connectionState == BluetoothConnectionState.connected) { diff --git a/lib/mine/gateway/addGateway/gatewayGetWifiList/gatewayGetWifiList_logic.dart b/lib/mine/gateway/addGateway/gatewayGetWifiList/gatewayGetWifiList_logic.dart index bc1be973..e663ae95 100644 --- a/lib/mine/gateway/addGateway/gatewayGetWifiList/gatewayGetWifiList_logic.dart +++ b/lib/mine/gateway/addGateway/gatewayGetWifiList/gatewayGetWifiList_logic.dart @@ -3,6 +3,7 @@ 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/blue/io_gateway/io_gateway_getWifiList.dart'; import 'package:star_lock/tools/baseGetXController.dart'; @@ -82,6 +83,7 @@ class GatewayGetWifiListLogic extends BaseGetXController { reply.data.removeRange(0, 4); // 把得到的数据按33位分割成数组 然后塞进一个新的数组里面 final List> getList = splitList(reply.data, 33); + AppLog.log('getList:$getList'); final List> uploadList = >[]; for (int i = 0; i < getList.length; i++) { final List indexList = getList[i]; @@ -143,12 +145,6 @@ class GatewayGetWifiListLogic extends BaseGetXController { super.onReady(); _initReplySubscription(); - - getWifiName().then((String value) { - state.phoneConnectedWiFi = value; - // update(); - // AppLog.log('wifiNameTF:${state.wifiNameTF.text} value:$value'); - }); } @override diff --git a/lib/mine/gateway/addGateway/gatewayGetWifiList/gatewayGetWifiList_page.dart b/lib/mine/gateway/addGateway/gatewayGetWifiList/gatewayGetWifiList_page.dart index 7302a69b..ffb31d8a 100644 --- a/lib/mine/gateway/addGateway/gatewayGetWifiList/gatewayGetWifiList_page.dart +++ b/lib/mine/gateway/addGateway/gatewayGetWifiList/gatewayGetWifiList_page.dart @@ -43,6 +43,7 @@ class _GatewayGetWifiListPageState extends State ], backgroundColor: AppColors.mainColor), body: Column( + crossAxisAlignment: CrossAxisAlignment.start, children: [ Expanded( child: Obx(() => state.wifiNameDataList.value.isNotEmpty @@ -65,20 +66,35 @@ class _GatewayGetWifiListPageState extends State ScreenUtil().bottomBarHeight - 64.h)), ), - SubmitBtn( - btnName: '手动配网'.tr, - fontSize: 28.sp, - borderRadius: 20.w, - padding: EdgeInsets.only(top: 25.w, bottom: 25.w), - onClick: () { + Padding( + padding: EdgeInsets.only(left: 15.w, bottom: 10.h), + child: TextButton( + onPressed: () async { Get.toNamed(Routers.gatewayConfigurationWifiPage, arguments: { 'wifiName': '', 'gatewayModel': state.gatewayModel }); - }), - SizedBox( - height: 64.h, - ) + }, + child: Text( + '手动配网'.tr, + style: TextStyle(fontSize: 22.sp), + ), + ), + ), + // SubmitBtn( + // btnName: '手动配网'.tr, + // fontSize: 28.sp, + // borderRadius: 20.w, + // padding: EdgeInsets.only(top: 25.w, bottom: 25.w), + // onClick: () { + // Get.toNamed(Routers.gatewayConfigurationWifiPage, arguments: { + // 'wifiName': '', + // 'gatewayModel': state.gatewayModel + // }); + // }), + // SizedBox( + // height: 64.h, + // ) ], )); } @@ -112,10 +128,7 @@ class _GatewayGetWifiListPageState extends State maxLines: 1, overflow: TextOverflow.ellipsis, style: TextStyle( - fontSize: 22.sp, - color: state.phoneConnectedWiFi == wifiName - ? AppColors.mainColor - : AppColors.blackColor), + fontSize: 22.sp, color: AppColors.blackColor), ), ), // Text( diff --git a/lib/mine/gateway/addGateway/gatewayGetWifiList/gatewayGetWifiList_state.dart b/lib/mine/gateway/addGateway/gatewayGetWifiList/gatewayGetWifiList_state.dart index 224c1025..46297aa9 100644 --- a/lib/mine/gateway/addGateway/gatewayGetWifiList/gatewayGetWifiList_state.dart +++ b/lib/mine/gateway/addGateway/gatewayGetWifiList/gatewayGetWifiList_state.dart @@ -16,5 +16,4 @@ class GatewayGetWifiListState { GetGatewayInfoModel gatewayModel = GetGatewayInfoModel(); RxBool ifCurrentScreen = true.obs; // 是否是当前界面,用于判断是否需要针对当前界面进行展示 RxInt sureBtnState = 0.obs; - String? phoneConnectedWiFi; } diff --git a/lib/mine/gateway/gatewayConnectionLock/gatewayConnectionLockList_logic.dart b/lib/mine/gateway/gatewayConnectionLock/gatewayConnectionLockList_logic.dart index 1865d315..2afe5039 100644 --- a/lib/mine/gateway/gatewayConnectionLock/gatewayConnectionLockList_logic.dart +++ b/lib/mine/gateway/gatewayConnectionLock/gatewayConnectionLockList_logic.dart @@ -21,8 +21,13 @@ class GatewayConnectionLockListLogic extends BaseGetXController { } Future gatewayScanDevice() async { + if (state.searchBtnState == false) { + return; + } + state.searchBtnState = false; final LoginEntity entity = await ApiRepository.to .gatewayScanDevice(gatewayId: state.gatewayId.value, timeout: 60); + state.searchBtnState = true; if (entity.errorCode!.codeIsSuccessful) { gatewayConnectionLockListDataRequest(); } diff --git a/lib/mine/gateway/gatewayConnectionLock/gatewayConnectionLockList_state.dart b/lib/mine/gateway/gatewayConnectionLock/gatewayConnectionLockList_state.dart index 5d64b9c7..6a7ae9c5 100644 --- a/lib/mine/gateway/gatewayConnectionLock/gatewayConnectionLockList_state.dart +++ b/lib/mine/gateway/gatewayConnectionLock/gatewayConnectionLockList_state.dart @@ -1,9 +1,8 @@ - import 'package:get/get.dart'; import 'gatewayConnectionLockList_entity.dart'; -class GatewayConnectionLockListState{ +class GatewayConnectionLockListState { GatewayConnectionLockListState() { var map = Get.arguments; if (map['gatewayId'] > 0) { @@ -11,7 +10,9 @@ class GatewayConnectionLockListState{ } } - var gatewayId = 0.obs; + RxInt gatewayId = 0.obs; - final itemDataList = [].obs; -} \ No newline at end of file + final RxList itemDataList = + [].obs; + bool searchBtnState = true; // 0普通状态(可用) 1不可用 +} diff --git a/lib/mine/gateway/gatewayDetail/gatewayDetail_logic.dart b/lib/mine/gateway/gatewayDetail/gatewayDetail_logic.dart index eabb827f..d7487983 100644 --- a/lib/mine/gateway/gatewayDetail/gatewayDetail_logic.dart +++ b/lib/mine/gateway/gatewayDetail/gatewayDetail_logic.dart @@ -3,6 +3,7 @@ import 'package:star_lock/tools/baseGetXController.dart'; import '../../../login/login/entity/LoginEntity.dart'; import '../../../network/api_repository.dart'; +import '../../../tools/eventBusEventManage.dart'; import '../../../tools/showTipView.dart'; import 'gatewayDetail_state.dart'; @@ -32,8 +33,10 @@ class GatewayDetailLogic extends BaseGetXController { timeout: 60); if (entity.errorCode!.codeIsSuccessful) { showToast('修改成功'.tr, something: () { - // eventBus.fire(PassCurrentLockInformationEvent(state.lockSetInfoData.value)); - Get.back(); + state.getewayItemData.update((val) { + val!.gatewayName = gatewayName; + }); + eventBus.fire(GetGatewayListRefreshUI()); }); } } diff --git a/lib/mine/gateway/gatewayDetail/gatewayDetail_page.dart b/lib/mine/gateway/gatewayDetail/gatewayDetail_page.dart index 1c1a19d6..b700ba28 100755 --- a/lib/mine/gateway/gatewayDetail/gatewayDetail_page.dart +++ b/lib/mine/gateway/gatewayDetail/gatewayDetail_page.dart @@ -78,7 +78,7 @@ class _GatewayDetailPageState extends State { ), CommonItem( leftTitel: '附近的锁'.tr, - // rightTitle: state.getewayItemData.value.lockNum.toString(), + rightTitle: state.getewayItemData.value.lockNum.toString(), isHaveLine: true, isHaveDirection: true, action: () { diff --git a/lib/mine/gateway/gatewayList/gatewayList_logic.dart b/lib/mine/gateway/gatewayList/gatewayList_logic.dart index 7606aaae..7d33216a 100644 --- a/lib/mine/gateway/gatewayList/gatewayList_logic.dart +++ b/lib/mine/gateway/gatewayList/gatewayList_logic.dart @@ -1,7 +1,10 @@ +import 'dart:async'; + import 'package:star_lock/tools/baseGetXController.dart'; import '../../../login/login/entity/LoginEntity.dart'; import '../../../network/api_repository.dart'; +import '../../../tools/eventBusEventManage.dart'; import '../../mineSet/transferGateway/selectGetewayList_entity.dart'; import 'gatewayList_state.dart'; @@ -45,9 +48,26 @@ class GatewayListLogic extends BaseGetXController { // } // } - // @override - // void onInit() { - // super.onInit(); - // gatewayDistributionNetwork(); - // } + /// 刷新密码列表 + StreamSubscription? _getGatewayListRefreshUIEvent; + void _getGatewayListRefreshUIAction() { + // 蓝牙协议通知传输跟蓝牙之外的数据传输类不一样 eventBus + _getGatewayListRefreshUIEvent = eventBus + .on() + .listen((GetGatewayListRefreshUI event) { + getGatewayListData(isRefresh: true); + }); + } + + @override + void onReady() { + super.onReady(); + _getGatewayListRefreshUIAction(); + } + + @override + void onClose() { + super.onClose(); + _getGatewayListRefreshUIEvent?.cancel(); + } } diff --git a/lib/mine/mineSet/lockGroup/groupEditLock/groupEditLock_logic.dart b/lib/mine/mineSet/lockGroup/groupEditLock/groupEditLock_logic.dart index f6223eda..bec8a2dd 100755 --- a/lib/mine/mineSet/lockGroup/groupEditLock/groupEditLock_logic.dart +++ b/lib/mine/mineSet/lockGroup/groupEditLock/groupEditLock_logic.dart @@ -18,8 +18,11 @@ class GroupEditLockLogic extends BaseGetXController { var entity = await ApiRepository.to.lockGroupAddLock( lockIds: lockIds, groupId: state.selectGroupListItem.keyGroupId!); if (entity.errorCode!.codeIsSuccessful) { + /* + TODO:这里eventbus连续发送两个事件，触发两次监听回调，会出现第一个回调中业务逻辑执行一半（方法体执行一半后续逻辑不执行），需要确定是get http或eventbus的问题 + */ + eventBus.fire(LockGroupEditGroupLockRefreshEvent()); // 锁分组列表页面先触发刷新 showToast('添加成功'.tr, something: () { - eventBus.fire(LockGroupEditGroupLockRefreshEvent()); eventBus.fire(RefreshLockListInfoDataEvent()); Get.close(2); }); @@ -34,8 +37,8 @@ class GroupEditLockLogic extends BaseGetXController { } var entity = await ApiRepository.to.lockGroupDeletLock(lockIds: lockIds); if (entity.errorCode!.codeIsSuccessful) { + eventBus.fire(LockGroupEditGroupLockRefreshEvent()); // 锁分组列表页面先触发刷新 showToast('删除成功'.tr, something: () { - eventBus.fire(LockGroupEditGroupLockRefreshEvent()); eventBus.fire(RefreshLockListInfoDataEvent()); Get.close(2); }); @@ -47,5 +50,4 @@ class GroupEditLockLogic extends BaseGetXController { state.isVip.value = isVip ?? false; state.isVip.refresh(); } - } diff --git a/lib/mine/mineSet/lockGroup/groupEditLock/groupEditLock_page.dart b/lib/mine/mineSet/lockGroup/groupEditLock/groupEditLock_page.dart index 17c507a8..e1e3f37b 100755 --- a/lib/mine/mineSet/lockGroup/groupEditLock/groupEditLock_page.dart +++ b/lib/mine/mineSet/lockGroup/groupEditLock/groupEditLock_page.dart @@ -1,4 +1,3 @@ - import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; @@ -35,9 +34,7 @@ class _GroupEditLockPageState extends State { return Scaffold( backgroundColor: AppColors.mainBackgroundColor, appBar: TitleAppBar( - barTitle: state.type == 0 - ? '添加'.tr - : '删除'.tr, + barTitle: state.type == 0 ? '添加'.tr : '删除'.tr, haveBack: true, backgroundColor: AppColors.mainColor), body: Column( @@ -50,8 +47,7 @@ class _GroupEditLockPageState extends State { margin: EdgeInsets.all(15.w), child: Row( children: [ - Text( - '选择要加入分组的锁'.tr, + Text(state.type == 0 ? '选择要加入分组的锁'.tr : '选择要从分组中删除的锁'.tr, style: TextStyle(fontSize: 25.sp)), ], ), diff --git a/lib/mine/mineSet/lockGroup/lockGroupList/lockGroupList_logic.dart b/lib/mine/mineSet/lockGroup/lockGroupList/lockGroupList_logic.dart index 0d807613..2995fb8b 100755 --- a/lib/mine/mineSet/lockGroup/lockGroupList/lockGroupList_logic.dart +++ b/lib/mine/mineSet/lockGroup/lockGroupList/lockGroupList_logic.dart @@ -1,4 +1,3 @@ - import 'dart:async'; import 'package:get/get.dart'; @@ -14,21 +13,26 @@ class LockGroupListLogic extends BaseGetXController { //分组列表请求 Future mockNetworkDataRequest() async { - final MassSendLockGroupListEntity entity = await ApiRepository.to.lockGroupList('0'); + final MassSendLockGroupListEntity entity = + await ApiRepository.to.lockGroupList('0'); if (entity.errorCode!.codeIsSuccessful) { if (entity.data != null) { - state.lockNum = 0; + state.lockNum = entity.data!.groupList!.fold( + 0, + (int previousValue, GroupListItem element) => + previousValue + element.lockNum!); state.itemDataList.value = entity.data!.groupList!; + state.itemDataList.refresh(); } } } //创建锁分组请求 Future addLockGroupRequest() async { - final MassSendLockGroupListEntity entity = - await ApiRepository.to.addLockGroup(state.changeNameController.text, '0'); + final MassSendLockGroupListEntity entity = await ApiRepository.to + .addLockGroup(state.changeNameController.text, '0'); if (entity.errorCode!.codeIsSuccessful) { - showToast('创建成功'.tr, something: (){ + showToast('创建成功'.tr, something: () { mockNetworkDataRequest(); }); } @@ -36,9 +40,11 @@ class LockGroupListLogic extends BaseGetXController { //编辑锁名字 Future editLockGroupRequest(int groupId) async { - final MassSendLockGroupListEntity entity = await ApiRepository.to.editLockGroupRequest(groupId:groupId, groupName:state.changeNameController.text); + final MassSendLockGroupListEntity entity = await ApiRepository.to + .editLockGroupRequest( + groupId: groupId, groupName: state.changeNameController.text); if (entity.errorCode!.codeIsSuccessful) { - showToast('编辑成功'.tr, something: (){ + showToast('编辑成功'.tr, something: () { mockNetworkDataRequest(); }); } @@ -46,9 +52,10 @@ class LockGroupListLogic extends BaseGetXController { //删除组 Future deleteLockGroupRequest(int groupId) async { - final MassSendLockGroupListEntity entity = await ApiRepository.to.deleteGroup(groupId); + final MassSendLockGroupListEntity entity = + await ApiRepository.to.deleteGroup(groupId); if (entity.errorCode!.codeIsSuccessful) { - showToast('删除成功'.tr, something: (){ + showToast('删除成功'.tr, something: () { mockNetworkDataRequest(); }); } @@ -56,8 +63,11 @@ class LockGroupListLogic extends BaseGetXController { // 监听修改完详情之后刷新列表 late StreamSubscription _teamEvent; + void _initRefreshAction() { - _teamEvent = eventBus.on().listen((LockGroupEditGroupLockRefreshEvent event) { + _teamEvent = eventBus + .on() + .listen((LockGroupEditGroupLockRefreshEvent event) { mockNetworkDataRequest(); }); } @@ -74,5 +84,4 @@ class LockGroupListLogic extends BaseGetXController { void onClose() { _teamEvent.cancel(); } - -} \ No newline at end of file +} diff --git a/lib/mine/mineSet/lockGroup/lockGroupList/lockGroupList_page.dart b/lib/mine/mineSet/lockGroup/lockGroupList/lockGroupList_page.dart index 1aa02f9b..400b2685 100755 --- a/lib/mine/mineSet/lockGroup/lockGroupList/lockGroupList_page.dart +++ b/lib/mine/mineSet/lockGroup/lockGroupList/lockGroupList_page.dart @@ -1,4 +1,3 @@ - import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; @@ -45,9 +44,7 @@ class _LockGroupListPageState extends State { state.changeNameController.text = ''; // showCupertinoAlertDialog(context, true, 0); ShowTipView().showTFViewAlertDialog( - state.changeNameController, - '创建新分组'.tr, - '请输入姓名'.tr, () { + state.changeNameController, '创建新分组'.tr, '请输入姓名'.tr, () { //发送编辑钥匙名称请求 if (state.changeNameController.text.isNotEmpty) { Navigator.of(context).pop(); @@ -66,19 +63,20 @@ class _LockGroupListPageState extends State { backgroundColor: AppColors.mainColor), body: Column( children: [ - Expanded( - child: Obx(() => - state.itemDataList.isEmpty ? NoData() : _buildMainUI())), + Expanded(child: Obx(_buildMainUI)), ], ), ); } Widget _buildMainUI() { - for (int i = 0; i < state.itemDataList.length; i++) { - final GroupListItem itemData = state.itemDataList[i]; - state.lockNum += itemData.lockList!.length; + if (state.itemDataList.isEmpty) { + return NoData(); } + // for (int i = 0; i < state.itemDataList.length; i++) { + // final GroupListItem itemData = state.itemDataList[i]; + // state.lockNum += itemData.lockList!.length; + // } return SlidableAutoCloseBehavior( child: ListView.separated( itemCount: state.itemDataList.length + 1, @@ -95,7 +93,8 @@ class _LockGroupListPageState extends State { child: Text( '${'锁数量'.tr}：${state.lockNum.toString()}', style: TextStyle( - color: AppColors.darkGrayTextColor, fontSize: 20.sp), + color: AppColors.darkGrayTextColor, + fontSize: 20.sp), ), ) ], @@ -108,7 +107,7 @@ class _LockGroupListPageState extends State { } if (index < state.itemDataList.length) { return Slidable( - key: ValueKey(itemData.keyGroupId), + // key: ValueKey(itemData.keyGroupId), endActionPane: ActionPane( extentRatio: 0.4, motion: const ScrollMotion(), @@ -119,13 +118,13 @@ class _LockGroupListPageState extends State { ), child: lockDataListItem( '${itemData.keyGroupName}(${itemData.lockList?.length})', - () { - Get.toNamed(Routers.lockItemListPage, - arguments: { - 'groupListItem': itemData, - 'ungrouped': state.ungrouped - }); - }), + () { + Get.toNamed(Routers.lockItemListPage, + arguments: { + 'groupListItem': itemData, + 'ungrouped': state.ungrouped + }); + }), ); // return LeftSlideActions( @@ -174,7 +173,7 @@ class _LockGroupListPageState extends State { }); }, child: Container( - width: 1.sw*0.2, + width: 1.sw * 0.2, color: const Color(0xFFF20101), alignment: Alignment.center, child: Text( @@ -197,8 +196,8 @@ class _LockGroupListPageState extends State { state.changeNameController.text = groupListItem.keyGroupName!; // showCupertinoAlertDialog(context, false, groupListItem.keyGroupId!); - ShowTipView().showTFViewAlertDialog(state.changeNameController, - '修改名称'.tr, '请输入姓名'.tr, () { + ShowTipView().showTFViewAlertDialog( + state.changeNameController, '修改名称'.tr, '请输入姓名'.tr, () { if (state.changeNameController.text.isNotEmpty) { Get.back(); logic.editLockGroupRequest(groupListItem.keyGroupId!); @@ -212,7 +211,7 @@ class _LockGroupListPageState extends State { }, isShowSuffixIcon: true); }, child: Container( - width: 1.sw*0.2, + width: 1.sw * 0.2, color: AppColors.mainColor, alignment: Alignment.center, child: Text( diff --git a/lib/mine/mineSet/mineSet/mineSet_page.dart b/lib/mine/mineSet/mineSet/mineSet_page.dart index 0f277f3a..cf62b035 100755 --- a/lib/mine/mineSet/mineSet/mineSet_page.dart +++ b/lib/mine/mineSet/mineSet/mineSet_page.dart @@ -293,8 +293,7 @@ class _MineSetPageState extends State height: 10.h, ), Obx(() { - AppLog.log( - 'state.currentLanguageName: ${state.currentLanguageName} state.currentLanguage.value: ${state.currentLanguage.value}'); + // AppLog.log('state.currentLanguageName: ${state.currentLanguageName} state.currentLanguage.value: ${state.currentLanguage.value}'); return CommonItem( leftTitel: '多语言'.tr, rightTitle: state.currentLanguageName, diff --git a/lib/mine/mineSet/mineSet/mineSet_state.dart b/lib/mine/mineSet/mineSet/mineSet_state.dart index 4962ff92..af4973f9 100755 --- a/lib/mine/mineSet/mineSet/mineSet_state.dart +++ b/lib/mine/mineSet/mineSet/mineSet_state.dart @@ -26,8 +26,7 @@ class MineSetState { /// 获取翻译后的国家名称 String get currentLanguageName { - AppLog.log( - 'currentLanguage.value:${currentLanguage.value} fsgdsgddfg:${CurrentLocaleTool.getCurrentLocaleWithLanguageCode(currentLanguage.value)}'); + // AppLog.log('currentLanguage.value:${currentLanguage.value} fsgdsgddfg:${CurrentLocaleTool.getCurrentLocaleWithLanguageCode(currentLanguage.value)}'); return StoreService.to.getLanguageCode()!.isEmpty ? '跟随系统'.tr : ExtensionLanguageType.fromLocale(CurrentLocaleTool.convertLocale( diff --git a/lib/network/api_provider.dart b/lib/network/api_provider.dart index 855df195..a758294c 100755 --- a/lib/network/api_provider.dart +++ b/lib/network/api_provider.dart @@ -341,17 +341,6 @@ class ApiProvider extends BaseProvider { isShowErrMsg: false, ); - // 锁记录上传 - Future lockReportLockSuccessfullyUploadData( - int lockId, int keyId) => - post( - lockRecordUploadURL.toUrl, - jsonEncode({ - 'lockId': lockId, - 'keyId': keyId, - }), - isUnShowLoading: true); - // 获取手机联网token Future getLockNetToken(String lockId) => post( getLockNetTokenURL.toUrl, diff --git a/lib/network/api_provider_base.dart b/lib/network/api_provider_base.dart index fb2ef118..f50997f4 100755 --- a/lib/network/api_provider_base.dart +++ b/lib/network/api_provider_base.dart @@ -1,3 +1,4 @@ +import 'package:flutter/cupertino.dart'; import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:get/get.dart'; @@ -56,9 +57,11 @@ class BaseProvider extends GetConnect with Api { query: query, decoder: decoder, uploadProgress: uploadProgress); + debugPrint("====1===$url---> ${res.bodyString}"); if (EasyLoading.isShow && !isUnShowLoading!) { await EasyLoading.dismiss(animation: true); } + debugPrint("===2====$url---> ${res.bodyString}"); if (res.body == null) { // EasyLoading.showToast("Network Error!", duration: 2000.milliseconds); if (res.statusCode == null && isShowErrMsg!) { diff --git a/lib/network/api_repository.dart b/lib/network/api_repository.dart index c2143360..7c97ae82 100755 --- a/lib/network/api_repository.dart +++ b/lib/network/api_repository.dart @@ -314,14 +314,6 @@ class ApiRepository { return LockOperatingRecordGetLastRecordTimeEntity.fromJson(res.body); } - // 电子钥匙开锁成功上报 - Future lockReportLockSuccessfullyUploadData( - {required int lockId, required int keyId}) async { - final res = - await apiProvider.lockReportLockSuccessfullyUploadData(lockId, keyId); - return KeyOperationRecordEntity.fromJson(res.body); - } - // 获取手机联网token Future getLockNetToken({required String lockId}) async { final res = await apiProvider.getLockNetToken(lockId); diff --git a/lib/talk/starChart/handle/impl/udp_talk_request_handler.dart b/lib/talk/starChart/handle/impl/udp_talk_request_handler.dart index e2d12488..d9a8c2db 100644 --- a/lib/talk/starChart/handle/impl/udp_talk_request_handler.dart +++ b/lib/talk/starChart/handle/impl/udp_talk_request_handler.dart @@ -65,9 +65,7 @@ class UdpTalkRequestHandler extends ScpMessageBaseHandle _handleSendExpect(); // 播放铃声 //test:使用自定义铃声 - if (Platform.isIOS) { - playRingtone(); - } + playRingtone(); // 显示状态栏弹窗 _showTalkRequestNotification(talkObjectName: talkObjectName); // 设置为等待接听状态 diff --git a/lib/talk/starChart/handle/scp_message_base_handle.dart b/lib/talk/starChart/handle/scp_message_base_handle.dart index d60fadfd..4cfc04c1 100644 --- a/lib/talk/starChart/handle/scp_message_base_handle.dart +++ b/lib/talk/starChart/handle/scp_message_base_handle.dart @@ -78,9 +78,7 @@ class ScpMessageBaseHandle { // 播放铃声 void playRingtone() async { //test:使用自定义铃声 - if (Platform.isIOS) { - await audioManager.playRingtone(); - } + await audioManager.playRingtone(); } // 停止播放铃声 diff --git a/lib/tools/eventBusEventManage.dart b/lib/tools/eventBusEventManage.dart index 93fb2883..5d5e7416 100755 --- a/lib/tools/eventBusEventManage.dart +++ b/lib/tools/eventBusEventManage.dart @@ -190,3 +190,8 @@ class RogerThatLockInfoDataEvent { int keyId; int lockId; } + +/// 刷新网关列表 +class GetGatewayListRefreshUI { + GetGatewayListRefreshUI(); +} diff --git a/lib/translations/current_locale_tool.dart b/lib/translations/current_locale_tool.dart index d8efd460..28bcf6d7 100644 --- a/lib/translations/current_locale_tool.dart +++ b/lib/translations/current_locale_tool.dart @@ -29,8 +29,7 @@ class CurrentLocaleTool { .first : Get.deviceLocale!; // Get.deviceLocale; final Locale getLocale = convertLocale(locale); - AppLog.log( - '222locale.toString(): ${locale.toString()} locale: $locale getLocale:$getLocale 从本地获取code:${StoreService.to.getLanguageCode()}'); + // AppLog.log('222locale.toString(): ${locale.toString()} locale: $locale getLocale:$getLocale 从本地获取code:${StoreService.to.getLanguageCode()}'); return getLocale; }